From 3e5d7444b883778663d1e31e54afffae65921da3 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 13 Jul 2009 17:45:53 +0200 Subject: Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( a3e05ad8acdead3b534d0cef772b85f002e80b8d ) Changes in WebKit since the last update: ++ b/LayoutTests/ChangeLog 2009-06-18 Chris Evans Reviewed by Adam Barth. Added test for bug 26454 (broken 8-digit hex entities). https://bugs.webkit.org/show_bug.cgi?id=26454 * fast/parser/eightdigithexentity-expected.txt: Added. * fast/parser/eightdigithexentity.html: Added. 2009-06-20 Sam Weinig Reviewed by Adam Barth. Test for https://bugs.webkit.org/show_bug.cgi?id=26554 Test writing to parent and top. * http/tests/security/cross-frame-access-put-expected.txt: * http/tests/security/cross-frame-access-put.html: * http/tests/security/resources/cross-frame-iframe-for-put-test.html: ++ b/WebCore/ChangeLog 2009-06-18 Chris Evans Reviewed by Adam Barth. Fix 8-digit long hex entities. Fixes bug 26454 https://bugs.webkit.org/show_bug.cgi?id=26454 Test: fast/parser/eightdigithexentity.html * html/HTMLTokenizer.cpp: fix off-by-ones. 2009-06-20 Sam Weinig Reviewed by Adam Barth. Fix for https://bugs.webkit.org/show_bug.cgi?id=26554 Shadowing of top and parent * page/DOMWindow.idl: --- src/3rdparty/webkit/VERSION | 4 ++-- src/3rdparty/webkit/WebCore/ChangeLog | 20 ++++++++++++++++++++ .../webkit/WebCore/generated/JSDOMWindow.cpp | 4 ++++ src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp | 8 ++++++-- src/3rdparty/webkit/WebCore/page/DOMWindow.idl | 4 ++-- 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 368d2b5d7..88f32d9f0 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -1,6 +1,6 @@ This is a snapshot of the Qt port of WebKit from - git://code.staikos.net/webkit + git://gitorious.org/qtwebkit/qtwebkit.git The commit imported was from the @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - eb4957a561d3f85d4cd5602832375c66f378b521 + a3e05ad8acdead3b534d0cef772b85f002e80b8d diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index be6922f94..19bb36afc 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,23 @@ +2009-06-18 Chris Evans + + Reviewed by Adam Barth. + + Fix 8-digit long hex entities. Fixes bug 26454 + https://bugs.webkit.org/show_bug.cgi?id=26454 + + Test: fast/parser/eightdigithexentity.html + + * html/HTMLTokenizer.cpp: fix off-by-ones. + +2009-06-20 Sam Weinig + + Reviewed by Adam Barth. + + Fix for https://bugs.webkit.org/show_bug.cgi?id=26554 + Shadowing of top and parent + + * page/DOMWindow.idl: + 2008-12-18 Bernhard Rosenkraenzer Reviewed by Darin Adler. diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp index c6906b6d7..d69215074 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp @@ -2496,11 +2496,15 @@ void setJSDOMWindowOpener(ExecState* exec, JSObject* thisObject, JSValuePtr valu void setJSDOMWindowParent(ExecState* exec, JSObject* thisObject, JSValuePtr value) { + if (!static_cast(thisObject)->allowsAccessFrom(exec)) + return; static_cast(thisObject)->putDirect(Identifier(exec, "parent"), value); } void setJSDOMWindowTop(ExecState* exec, JSObject* thisObject, JSValuePtr value) { + if (!static_cast(thisObject)->allowsAccessFrom(exec)) + return; static_cast(thisObject)->putDirect(Identifier(exec, "top"), value); } diff --git a/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp b/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp index 6de995122..b6a541803 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp @@ -867,7 +867,9 @@ HTMLTokenizer::State HTMLTokenizer::parseEntity(SegmentedString& src, UChar*& de } } else { // FIXME: We should eventually colorize entities by sending them as a special token. - checkBuffer(11); + // 12 bytes required: up to 10 bytes in m_cBuffer plus the + // leading '&' and trailing ';' + checkBuffer(12); *dest++ = '&'; for (unsigned i = 0; i < cBufferPos; i++) dest[i] = m_cBuffer[i]; @@ -878,7 +880,9 @@ HTMLTokenizer::State HTMLTokenizer::parseEntity(SegmentedString& src, UChar*& de } } } else { - checkBuffer(10); + // 11 bytes required: up to 10 bytes in m_cBuffer plus the + // leading '&' + checkBuffer(11); // ignore the sequence, add it to the buffer as plaintext *dest++ = '&'; for (unsigned i = 0; i < cBufferPos; i++) diff --git a/src/3rdparty/webkit/WebCore/page/DOMWindow.idl b/src/3rdparty/webkit/WebCore/page/DOMWindow.idl index d0114e6b5..71c3137e5 100644 --- a/src/3rdparty/webkit/WebCore/page/DOMWindow.idl +++ b/src/3rdparty/webkit/WebCore/page/DOMWindow.idl @@ -121,8 +121,8 @@ module window { attribute [Replaceable, DoNotCheckDomainSecurityOnGet] DOMWindow frames; attribute [Replaceable, DoNotCheckDomainSecurityOnGet] DOMWindow opener; - attribute [Replaceable, DoNotCheckDomainSecurity] DOMWindow parent; - attribute [Replaceable, DoNotCheckDomainSecurity] DOMWindow top; + attribute [Replaceable, DoNotCheckDomainSecurityOnGet] DOMWindow parent; + attribute [Replaceable, DoNotCheckDomainSecurityOnGet] DOMWindow top; // DOM Level 2 AbstractView Interface readonly attribute Document document; -- cgit v1.2.3 From 46df9f83cb64541f7d9ecd34645ef1558ce1c0c6 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Mon, 13 Jul 2009 17:53:34 +0200 Subject: Fixed a potential memory leak on XP Calling OpenThemeData directly causes a leak when changing the style as we do not call the corresponding CloseThemeData. Task-number:257916 Reviewed-by:prasanth --- src/gui/styles/qwindowsxpstyle.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/styles/qwindowsxpstyle.cpp b/src/gui/styles/qwindowsxpstyle.cpp index 2abf3bce9..1b8ceae10 100644 --- a/src/gui/styles/qwindowsxpstyle.cpp +++ b/src/gui/styles/qwindowsxpstyle.cpp @@ -1202,7 +1202,8 @@ QRect QWindowsXPStyle::subElementRect(SubElement sr, const QStyleOption *option, if (const QStyleOptionButton *btn = qstyleoption_cast(option)) { MARGINS borderSize; if (widget) { - HTHEME theme = pOpenThemeData(QWindowsXPStylePrivate::winId(widget), L"Button"); + XPThemeData buttontheme(widget, 0, QLatin1String("Button")); + HTHEME theme = buttontheme.handle(); if (theme) { int stateId; if (!(option->state & State_Enabled)) @@ -3611,7 +3612,8 @@ QSize QWindowsXPStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt case CT_LineEdit: case CT_ComboBox: { - HTHEME theme = pOpenThemeData(QWindowsXPStylePrivate::winId(widget), L"Button"); + XPThemeData buttontheme(widget, 0, QLatin1String("Button")); + HTHEME theme = buttontheme.handle(); MARGINS borderSize; if (theme) { int result = pGetThemeMargins(theme, -- cgit v1.2.3 From 8e186f42278c7033a2df08f4a986419087457efc Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Mon, 13 Jul 2009 11:42:07 -0700 Subject: Clean up QDirectFBPaintEngine code - Remove unnecessary copy of QTransform - Fold matrixRotShear and scale into transformationFlags. Note that transformationFlags is not a proper bitset of the types of transform but rather set to the most complex operation (from QTransform::type()) and having NegativeScale added if qMin(transform.m11(), transform.m22()) < 0 - Fix a bug whereby setState didn't call setRenderHints - Make everything more readable - Don't initialize state in QDirectFBPaintEngine::begin() QDirectFBPaintEngine::setState will be called from QPainter::begin just before QDirectFBPaintEngine::begin Reviewed-by: Donald --- .../gfxdrivers/directfb/qdirectfbpaintengine.cpp | 137 +++++++++++---------- 1 file changed, 71 insertions(+), 66 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index 27df0da15..db0824068 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -80,7 +80,7 @@ template inline const T *ptr(const T &t) { return &t; } template <> inline const bool* ptr(const bool &) { return 0; } template static void rasterFallbackWarn(const char *msg, const char *func, const device *dev, - int scale, bool matrixRotShear, bool simplePen, + uint transformationType, bool simplePen, bool dfbHandledClip, bool unsupportedCompositionMode, const char *nameOne, const T1 &one, const char *nameTwo, const T2 &two, @@ -95,8 +95,7 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device * dbg << dev << "of type" << dev->devType(); } - dbg << "scale" << scale - << "matrixRotShear" << matrixRotShear + dbg << QString("transformationType 0x%1").arg(transformationType, 3, 16, QLatin1Char('0')) << "simplePen" << simplePen << "dfbHandledClip" << dfbHandledClip << "unsupportedCompositionMode" << unsupportedCompositionMode; @@ -123,9 +122,10 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device * if (op & (QT_DIRECTFB_WARN_ON_RASTERFALLBACKS)) \ rasterFallbackWarn("Disabled raster engine operation", \ __FUNCTION__, state()->painter->device(), \ - d_func()->scale, d_func()->matrixRotShear, \ - d_func()->simplePen, d_func()->dfbCanHandleClip(), \ - d_func()->unsupportedCompositionMode, \ + d_func()->transformationType, \ + d_func()->simplePen, \ + d_func()->dfbCanHandleClip(), \ + d_func()->unsupportedCompositionMode, \ #one, one, #two, two, #three, three); \ if (op & (QT_DIRECTFB_DISABLE_RASTERFALLBACKS)) \ return; @@ -138,9 +138,10 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device * if (op & (QT_DIRECTFB_WARN_ON_RASTERFALLBACKS)) \ rasterFallbackWarn("Falling back to raster engine for", \ __FUNCTION__, state()->painter->device(), \ - d_func()->scale, d_func()->matrixRotShear, \ - d_func()->simplePen, d_func()->dfbCanHandleClip(), \ - d_func()->unsupportedCompositionMode, \ + d_func()->transformationType, \ + d_func()->simplePen, \ + d_func()->dfbCanHandleClip(), \ + d_func()->unsupportedCompositionMode, \ #one, one, #two, two, #three, three); #else #define RASTERFALLBACK(op, one, two, three) @@ -211,16 +212,19 @@ static QCache imageCache(4*1024*1024); // 4 MB class QDirectFBPaintEnginePrivate : public QRasterPaintEnginePrivate { public: - enum Scale { NoScale, Scaled, NegativeScale }; - + enum TransformationTypeFlags { + NegativeScale = 0x100, + RectsUnsupported = (QTransform::TxRotate|QTransform::TxShear|QTransform::TxProject), + BlitUnsupported = (NegativeScale|RectsUnsupported) + }; QDirectFBPaintEnginePrivate(QDirectFBPaintEngine *p); ~QDirectFBPaintEnginePrivate(); - void setTransform(const QTransform &m); - void setPen(const QPen &pen); + inline void setTransform(const QTransform &transforma); + inline void setPen(const QPen &pen); inline void setCompositionMode(QPainter::CompositionMode mode); inline void setOpacity(quint8 value); - void setRenderHints(QPainter::RenderHints hints); + inline void setRenderHints(QPainter::RenderHints hints); inline void setDFBColor(const QColor &color); @@ -263,11 +267,9 @@ private: bool simplePen; - bool matrixRotShear; - Scale scale; + uint transformationType; // this is QTransform::type() + NegativeScale if qMin(transform.m11(), transform.m22()) < 0 SurfaceCache *surfaceCache; - QTransform transform; int lastLockedHeight; IDirectFB *fb; @@ -288,6 +290,7 @@ private: friend class QDirectFBPaintEngine; }; + QDirectFBPaintEngine::QDirectFBPaintEngine(QPaintDevice *device) : QRasterPaintEngine(*(new QDirectFBPaintEnginePrivate(this)), device) { @@ -318,21 +321,11 @@ bool QDirectFBPaintEngine::begin(QPaintDevice *device) device->devType()); } d->lockedMemory = 0; - d->surface->GetSize(d->surface, &d->fbWidth, &d->fbHeight); - d->setTransform(QTransform()); - d->antialiased = false; - d->setOpacity(255); - d->setCompositionMode(state()->compositionMode()); - d->dirtyClip = true; - d->setPen(state()->pen); - const bool status = QRasterPaintEngine::begin(device); - // XXX: QRasterPaintEngine::begin() resets the capabilities gccaps |= PorterDuff; - return status; } @@ -389,30 +382,27 @@ void QDirectFBPaintEngine::renderHintsChanged() void QDirectFBPaintEngine::transformChanged() { Q_D(QDirectFBPaintEngine); - const QDirectFBPaintEnginePrivate::Scale old = d->scale; - d->setTransform(state()->transform()); - if (d->scale != old) { - d->setPen(state()->pen); - } + d->setTransform(state()->matrix); QRasterPaintEngine::transformChanged(); } -void QDirectFBPaintEngine::setState(QPainterState *s) +void QDirectFBPaintEngine::setState(QPainterState *state) { Q_D(QDirectFBPaintEngine); - QRasterPaintEngine::setState(s); + QRasterPaintEngine::setState(state); d->dirtyClip = true; - d->setPen(state()->pen); - d->setOpacity(quint8(state()->opacity * 255)); - d->setCompositionMode(state()->compositionMode()); - d->setTransform(state()->transform()); + d->setPen(state->pen); + d->setOpacity(quint8(state->opacity * 255)); + d->setCompositionMode(state->compositionMode()); + d->setTransform(state->transform()); + d->setRenderHints(state->renderHints); } void QDirectFBPaintEngine::clip(const QVectorPath &path, Qt::ClipOperation op) { Q_D(QDirectFBPaintEngine); d->dirtyClip = true; - const QPoint bottom = d->transform.map(QPoint(0, int(path.controlPointRect().y2))); + const QPoint bottom = state()->matrix.map(QPoint(0, int(path.controlPointRect().y2))); if (bottom.y() > d->lastLockedHeight) d->lock(); QRasterPaintEngine::clip(path, op); @@ -423,7 +413,7 @@ void QDirectFBPaintEngine::clip(const QRect &rect, Qt::ClipOperation op) Q_D(QDirectFBPaintEngine); d->dirtyClip = true; if (d->clip() && !d->clip()->hasRectClip && d->clip()->enabled) { - const QPoint bottom = d->transform.map(QPoint(0, rect.bottom())); + const QPoint bottom = state()->matrix.map(QPoint(0, rect.bottom())); if (bottom.y() > d->lastLockedHeight) d->lock(); } @@ -436,8 +426,11 @@ void QDirectFBPaintEngine::drawRects(const QRect *rects, int rectCount) Q_D(QDirectFBPaintEngine); d->updateClip(); const QBrush &brush = state()->brush; - if (d->unsupportedCompositionMode || !d->dfbCanHandleClip() || d->matrixRotShear - || !d->simplePen || !d->isSimpleBrush(brush)) { + if (d->unsupportedCompositionMode + || (d->transformationType & QDirectFBPaintEnginePrivate::RectsUnsupported) + || !d->simplePen + || !d->dfbCanHandleClip() + || !d->isSimpleBrush(brush)) { RASTERFALLBACK(DRAW_RECTS, rectCount, VOID_ARG(), VOID_ARG()); d->lock(); QRasterPaintEngine::drawRects(rects, rectCount); @@ -461,8 +454,11 @@ void QDirectFBPaintEngine::drawRects(const QRectF *rects, int rectCount) Q_D(QDirectFBPaintEngine); d->updateClip(); const QBrush &brush = state()->brush; - if (d->unsupportedCompositionMode || !d->dfbCanHandleClip() || d->matrixRotShear - || !d->simplePen || !d->isSimpleBrush(brush)) { + if (d->unsupportedCompositionMode + || (d->transformationType & QDirectFBPaintEnginePrivate::RectsUnsupported) + || !d->simplePen + || !d->dfbCanHandleClip() + || !d->isSimpleBrush(brush)) { RASTERFALLBACK(DRAW_RECTS, rectCount, VOID_ARG(), VOID_ARG()); d->lock(); QRasterPaintEngine::drawRects(rects, rectCount); @@ -544,8 +540,7 @@ void QDirectFBPaintEngine::drawImage(const QRectF &r, const QImage &image, d->updateClip(); #if !defined QT_NO_DIRECTFB_PREALLOCATED || defined QT_DIRECTFB_IMAGECACHE if (d->unsupportedCompositionMode - || d->matrixRotShear - || d->scale == QDirectFBPaintEnginePrivate::NegativeScale + || (d->transformationType & QDirectFBPaintEnginePrivate::BlitUnsupported) || !d->dfbCanHandleClip(r) #ifndef QT_DIRECTFB_IMAGECACHE || QDirectFBScreen::getSurfacePixelFormat(image.format()) == DSPF_UNKNOWN @@ -590,8 +585,9 @@ void QDirectFBPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pixmap, RASTERFALLBACK(DRAW_PIXMAP, r, pixmap.size(), sr); d->lock(); QRasterPaintEngine::drawPixmap(r, pixmap, sr); - } else if (d->unsupportedCompositionMode || !d->dfbCanHandleClip(r) || d->matrixRotShear - || d->scale == QDirectFBPaintEnginePrivate::NegativeScale) { + } else if (d->unsupportedCompositionMode + || (d->transformationType & QDirectFBPaintEnginePrivate::BlitUnsupported) + || !d->dfbCanHandleClip(r)) { RASTERFALLBACK(DRAW_PIXMAP, r, pixmap.size(), sr); const QImage *img = static_cast(pixmap.pixmapData())->buffer(DSLF_READ); d->lock(); @@ -623,8 +619,9 @@ void QDirectFBPaintEngine::drawTiledPixmap(const QRectF &r, RASTERFALLBACK(DRAW_TILED_PIXMAP, r, pixmap.size(), offset); d->lock(); QRasterPaintEngine::drawTiledPixmap(r, pixmap, offset); - } else if (d->unsupportedCompositionMode || !d->dfbCanHandleClip(r) || d->matrixRotShear - || d->scale == QDirectFBPaintEnginePrivate::NegativeScale) { + } else if (d->unsupportedCompositionMode + || (d->transformationType & QDirectFBPaintEnginePrivate::BlitUnsupported) + || !d->dfbCanHandleClip(r)) { RASTERFALLBACK(DRAW_TILED_PIXMAP, r, pixmap.size(), offset); const QImage *img = static_cast(pixmap.pixmapData())->buffer(DSLF_READ); d->lock(); @@ -719,7 +716,9 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QBrush &brush) { Q_D(QDirectFBPaintEngine); d->updateClip(); - if (!d->unsupportedCompositionMode && d->dfbCanHandleClip(rect) && !d->matrixRotShear) { + if (!d->unsupportedCompositionMode + && !(d->transformationType & (QDirectFBPaintEnginePrivate::RectsUnsupported)) + && d->dfbCanHandleClip(rect)) { switch (brush.style()) { case Qt::SolidPattern: { const QColor color = brush.color(); @@ -727,12 +726,12 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QBrush &brush) return; d->unlock(); d->setDFBColor(color); - const QRect r = d->transform.mapRect(rect).toRect(); + const QRect r = state()->matrix.mapRect(rect).toRect(); d->surface->FillRectangle(d->surface, r.x(), r.y(), r.width(), r.height()); return; } case Qt::TexturePattern: { - if (d->scale == QDirectFBPaintEnginePrivate::NegativeScale) + if (d->transformationType & QDirectFBPaintEnginePrivate::NegativeScale) break; const QPixmap texture = brush.texture(); @@ -757,14 +756,16 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QColor &color) return; Q_D(QDirectFBPaintEngine); d->updateClip(); - if (d->unsupportedCompositionMode || !d->dfbCanHandleClip() || d->matrixRotShear) { + if (d->unsupportedCompositionMode + || (d->transformationType & QDirectFBPaintEnginePrivate::RectsUnsupported) + || !d->dfbCanHandleClip()) { RASTERFALLBACK(FILL_RECT, rect, color, VOID_ARG()); d->lock(); QRasterPaintEngine::fillRect(rect, color); } else { d->unlock(); d->setDFBColor(color); - const QRect r = d->transform.mapRect(rect).toRect(); + const QRect r = state()->matrix.mapRect(rect).toRect(); d->surface->FillRectangle(d->surface, r.x(), r.y(), r.width(), r.height()); } @@ -835,7 +836,7 @@ void QDirectFBPaintEngine::initImageCache(int size) QDirectFBPaintEnginePrivate::QDirectFBPaintEnginePrivate(QDirectFBPaintEngine *p) : surface(0), antialiased(false), simplePen(false), - matrixRotShear(false), scale(NoScale), lastLockedHeight(-1), + transformationType(0), lastLockedHeight(-1), fbWidth(-1), fbHeight(-1), opacity(255), dirtyClip(true), dfbHandledClip(false), dfbDevice(0), lockedMemory(0), unsupportedCompositionMode(false), q(p) @@ -894,17 +895,13 @@ void QDirectFBPaintEnginePrivate::unlock() lockedMemory = 0; } -void QDirectFBPaintEnginePrivate::setTransform(const QTransform &m) +void QDirectFBPaintEnginePrivate::setTransform(const QTransform &transform) { - transform = m; - matrixRotShear = (transform.m12() != 0 || transform.m21() != 0); + transformationType = transform.type(); if (qMin(transform.m11(), transform.m22()) < 0) { - scale = NegativeScale; - } else if (transform.m11() != 1 || transform.m22() != 1) { - scale = Scaled; - } else { - scale = NoScale; + transformationType |= QDirectFBPaintEnginePrivate::NegativeScale; } + setPen(q->state()->pen); } void QDirectFBPaintEnginePrivate::setPen(const QPen &p) @@ -916,7 +913,7 @@ void QDirectFBPaintEnginePrivate::setPen(const QPen &p) && !antialiased && pen.brush().style() == Qt::SolidPattern && pen.widthF() <= 1.0 - && (scale == NoScale || pen.isCosmetic())) { + && (transformationType < QTransform::TxScale || pen.isCosmetic())) { simplePen = true; } else { simplePen = false; @@ -965,6 +962,7 @@ void QDirectFBPaintEnginePrivate::setDFBColor(const QColor &color) void QDirectFBPaintEnginePrivate::drawLines(const QLine *lines, int n) { + const QTransform &transform = q->state()->matrix; for (int i = 0; i < n; ++i) { const QLine l = transform.map(lines[i]); surface->DrawLine(surface, l.x1(), l.y1(), l.x2(), l.y2()); @@ -973,6 +971,7 @@ void QDirectFBPaintEnginePrivate::drawLines(const QLine *lines, int n) void QDirectFBPaintEnginePrivate::drawLines(const QLineF *lines, int n) { + const QTransform &transform = q->state()->matrix; for (int i = 0; i < n; ++i) { const QLine l = transform.map(lines[i]).toLine(); surface->DrawLine(surface, l.x1(), l.y1(), l.x2(), l.y2()); @@ -990,6 +989,7 @@ void QDirectFBPaintEnginePrivate::fillRegion(const QRegion ®ion) void QDirectFBPaintEnginePrivate::fillRects(const QRect *rects, int n) { + const QTransform &transform = q->state()->matrix; for (int i = 0; i < n; ++i) { const QRect r = transform.mapRect(rects[i]); surface->FillRectangle(surface, r.x(), r.y(), @@ -999,6 +999,7 @@ void QDirectFBPaintEnginePrivate::fillRects(const QRect *rects, int n) void QDirectFBPaintEnginePrivate::fillRects(const QRectF *rects, int n) { + const QTransform &transform = q->state()->matrix; for (int i = 0; i < n; ++i) { const QRect r = transform.mapRect(rects[i]).toRect(); surface->FillRectangle(surface, r.x(), r.y(), @@ -1008,6 +1009,7 @@ void QDirectFBPaintEnginePrivate::fillRects(const QRectF *rects, int n) void QDirectFBPaintEnginePrivate::drawRects(const QRect *rects, int n) { + const QTransform &transform = q->state()->matrix; for (int i = 0; i < n; ++i) { const QRect r = transform.mapRect(rects[i]); surface->DrawRectangle(surface, r.x(), r.y(), @@ -1017,6 +1019,7 @@ void QDirectFBPaintEnginePrivate::drawRects(const QRect *rects, int n) void QDirectFBPaintEnginePrivate::drawRects(const QRectF *rects, int n) { + const QTransform &transform = q->state()->matrix; for (int i = 0; i < n; ++i) { const QRect r = transform.mapRect(rects[i]).toRect(); surface->DrawRectangle(surface, r.x(), r.y(), @@ -1062,7 +1065,7 @@ IDirectFBSurface *QDirectFBPaintEnginePrivate::getSurface(const QImage &img, boo void QDirectFBPaintEnginePrivate::blit(const QRectF &dest, IDirectFBSurface *s, const QRectF &src) { const QRect sr = src.toRect(); - const QRect dr = transform.mapRect(dest).toRect(); + const QRect dr = q->state()->matrix.mapRect(dest).toRect(); if (dr.isEmpty()) return; const DFBRectangle sRect = { sr.x(), sr.y(), sr.width(), sr.height() }; @@ -1091,6 +1094,8 @@ static inline qreal fixCoord(qreal rect_pos, qreal pixmapSize, qreal offset) void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPixmap &pixmap, const QPointF &off) { Q_ASSERT(!dirtyClip); + Q_ASSERT(!(transformationType & BlitUnsupported)); + const QTransform &transform = q->state()->matrix; const QRect destinationRect = transform.mapRect(dest).toRect().normalized(); QRect newClip = destinationRect; if (!currentClip.isEmpty()) -- cgit v1.2.3 From 74c95015686ad5576b53fef5f653442ea2c4053a Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Mon, 13 Jul 2009 12:50:34 -0700 Subject: Code cleanup in QDirectFBPaintEngine Take out the QPen member. Reviewed-by: Donald --- .../gfxdrivers/directfb/qdirectfbpaintengine.cpp | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index db0824068..eda83b20b 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -261,10 +261,7 @@ public: private: IDirectFBSurface *surface; - QPen pen; - bool antialiased; - bool simplePen; uint transformationType; // this is QTransform::type() + NegativeScale if qMin(transform.m11(), transform.m22()) < 0 @@ -443,8 +440,9 @@ void QDirectFBPaintEngine::drawRects(const QRect *rects, int rectCount) d->setDFBColor(brush.color()); d->fillRects(rects, rectCount); } - if (d->pen != Qt::NoPen) { - d->setDFBColor(d->pen.color()); + const QPen &pen = state()->pen; + if (pen != Qt::NoPen) { + d->setDFBColor(pen.color()); d->drawRects(rects, rectCount); } } @@ -471,8 +469,9 @@ void QDirectFBPaintEngine::drawRects(const QRectF *rects, int rectCount) d->setDFBColor(brush.color()); d->fillRects(rects, rectCount); } - if (d->pen != Qt::NoPen) { - d->setDFBColor(d->pen.color()); + const QPen &pen = state()->pen; + if (pen != Qt::NoPen) { + d->setDFBColor(pen.color()); d->drawRects(rects, rectCount); } } @@ -488,9 +487,10 @@ void QDirectFBPaintEngine::drawLines(const QLine *lines, int lineCount) return; } - if (d->pen != Qt::NoPen) { + const QPen &pen = state()->pen; + if (pen != Qt::NoPen) { d->unlock(); - d->setDFBColor(d->pen.color()); + d->setDFBColor(pen.color()); d->drawLines(lines, lineCount); } } @@ -506,9 +506,10 @@ void QDirectFBPaintEngine::drawLines(const QLineF *lines, int lineCount) return; } - if (d->pen != Qt::NoPen) { + const QPen &pen = state()->pen; + if (pen != Qt::NoPen) { d->unlock(); - d->setDFBColor(d->pen.color()); + d->setDFBColor(pen.color()); d->drawLines(lines, lineCount); } } @@ -904,9 +905,8 @@ void QDirectFBPaintEnginePrivate::setTransform(const QTransform &transform) setPen(q->state()->pen); } -void QDirectFBPaintEnginePrivate::setPen(const QPen &p) +void QDirectFBPaintEnginePrivate::setPen(const QPen &pen) { - pen = p; if (pen.style() == Qt::NoPen) { simplePen = true; } else if (pen.style() == Qt::SolidLine -- cgit v1.2.3 From 3f14a6f5bf06ffa2451226928a925f5d23e343c3 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Mon, 13 Jul 2009 11:44:24 -0700 Subject: Remove unused variables in QDirectFBPaintEngine fbWidth/fbHeight were never used for anything Reviewed-by: Donald --- src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index eda83b20b..4ede69a5f 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -270,8 +270,6 @@ private: int lastLockedHeight; IDirectFB *fb; - int fbWidth; - int fbHeight; quint8 opacity; @@ -318,7 +316,6 @@ bool QDirectFBPaintEngine::begin(QPaintDevice *device) device->devType()); } d->lockedMemory = 0; - d->surface->GetSize(d->surface, &d->fbWidth, &d->fbHeight); const bool status = QRasterPaintEngine::begin(device); // XXX: QRasterPaintEngine::begin() resets the capabilities @@ -838,7 +835,7 @@ void QDirectFBPaintEngine::initImageCache(int size) QDirectFBPaintEnginePrivate::QDirectFBPaintEnginePrivate(QDirectFBPaintEngine *p) : surface(0), antialiased(false), simplePen(false), transformationType(0), lastLockedHeight(-1), - fbWidth(-1), fbHeight(-1), opacity(255), dirtyClip(true), + opacity(255), dirtyClip(true), dfbHandledClip(false), dfbDevice(0), lockedMemory(0), unsupportedCompositionMode(false), q(p) { -- cgit v1.2.3 From 815eec62128d9b971306d698c9beee52a604d455 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Mon, 13 Jul 2009 11:47:09 -0700 Subject: Remove QDirectFBPaintEnginePrivate::setOpacity The function only sets a variable anyway. Replace with: d->opacity = state()->opacity * 255 Reviewed-by: Donald --- src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index 4ede69a5f..1ea032597 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -223,7 +223,6 @@ public: inline void setTransform(const QTransform &transforma); inline void setPen(const QPen &pen); inline void setCompositionMode(QPainter::CompositionMode mode); - inline void setOpacity(quint8 value); inline void setRenderHints(QPainter::RenderHints hints); inline void setDFBColor(const QColor &color); @@ -355,7 +354,7 @@ void QDirectFBPaintEngine::penChanged() void QDirectFBPaintEngine::opacityChanged() { Q_D(QDirectFBPaintEngine); - d->setOpacity(quint8(state()->opacity * 255)); + d->opacity = quint8(state()->opacity * 255); QRasterPaintEngine::opacityChanged(); } @@ -386,7 +385,7 @@ void QDirectFBPaintEngine::setState(QPainterState *state) QRasterPaintEngine::setState(state); d->dirtyClip = true; d->setPen(state->pen); - d->setOpacity(quint8(state->opacity * 255)); + d->opacity = quint8(state->opacity * 255); d->setCompositionMode(state->compositionMode()); d->setTransform(state->transform()); d->setRenderHints(state->renderHints); @@ -922,12 +921,6 @@ void QDirectFBPaintEnginePrivate::setCompositionMode(QPainter::CompositionMode m unsupportedCompositionMode = (mode != QPainter::CompositionMode_SourceOver); } - -void QDirectFBPaintEnginePrivate::setOpacity(quint8 op) -{ - opacity = op; -} - void QDirectFBPaintEnginePrivate::setRenderHints(QPainter::RenderHints hints) { const bool old = antialiased; -- cgit v1.2.3 From afb4dfc7b9536b7e7f443a89e94f331f8946de07 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Mon, 13 Jul 2009 12:52:49 -0700 Subject: Move ALPHA_PREMULT It's only used once and I want to unclutter the top of qdirectfbpaintengine.cpp Reviewed-by: TrustMe --- src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index 1ea032597..605324e3b 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -147,13 +147,6 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device * #define RASTERFALLBACK(op, one, two, three) #endif -static inline uint ALPHA_MUL(uint x, uint a) -{ - uint t = x * a; - t = ((t + (t >> 8) + 0x80) >> 8) & 0xff; - return t; -} - class SurfaceCache { public: @@ -940,6 +933,13 @@ void QDirectFBPaintEnginePrivate::prepareForBlit(bool alpha) surface->SetBlittingFlags(surface, DFBSurfaceBlittingFlags(blittingFlags)); } +static inline uint ALPHA_MUL(uint x, uint a) +{ + uint t = x * a; + t = ((t + (t >> 8) + 0x80) >> 8) & 0xff; + return t; +} + void QDirectFBPaintEnginePrivate::setDFBColor(const QColor &color) { Q_ASSERT(surface); -- cgit v1.2.3 From b4b9e2908f74a61170d9d84597b90ed0d60f74fc Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Mon, 13 Jul 2009 13:03:26 -0700 Subject: Fix QDirectFBPixmap::toImage Preallocated surfaces can currently be copied to video memory behind our back. This means that we can not use this mechanism for toImage() In later versions of DirectFB this might be possible to toggle with a flag so I'll leave the code in there #if 0'ed Reviewed-by: Donald --- src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp index ce3d6e499..c75cba64a 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp @@ -329,6 +329,10 @@ QImage QDirectFBPixmapData::toImage() const if (!dfbSurface) return QImage(); +#if 0 + // In later versions of DirectFB one can set a flag to tell + // DirectFB not to move the surface to videomemory. When that + // happens we can use this (hopefully faster) codepath #ifndef QT_NO_DIRECTFB_PREALLOCATED QImage ret(size(), QDirectFBScreen::getImageFormat(dfbSurface)); if (IDirectFBSurface *imgSurface = screen->createDFBSurface(ret, QDirectFBScreen::DontTrackSurface)) { @@ -345,6 +349,7 @@ QImage QDirectFBPixmapData::toImage() const imgSurface->Release(imgSurface); return ret; } +#endif #endif QDirectFBPixmapData *that = const_cast(this); -- cgit v1.2.3 From b19a64a407a9c69b0df7fd1b12f2f1377a6bc9c0 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Tue, 14 Jul 2009 12:52:48 +0200 Subject: Doc: Review of documentation for Task-number: 254461 Reviewed-by: Alexis Menard --- src/gui/image/qpixmapcache.cpp | 61 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index 2ef42eecb..82069d09f 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -65,24 +65,22 @@ QT_BEGIN_NAMESPACE object for caching the pixmaps. The cache associates a pixmap with a string as a key or with a QPixmapCache::Key. - The QPixmapCache::Key is faster than using strings as key. The string API is - very convenient for complex keys but the QPixmapCache::Key API will be very efficient - and convenient for a 1 object <-> 1 pixmap mapping (then you can store the key as - a member). - If two pixmaps are inserted into the cache using equal keys, then the - last pixmap will hide the first pixmap. The QHash and QCache classes do - exactly the same. + Using QPixmapCache::Key for keys is faster than using strings. The string API is + very convenient for complex keys but the QPixmapCache::Key API will be very + efficient and convenient for a one-to-one object-to-pixmap mapping \mdash in + this case, you can store the keys as members of an object. + + If two pixmaps are inserted into the cache using equal keys then the + last pixmap will replace the first pixmap in the cache. This follows the + behavior of the QHash and QCache classes. The cache becomes full when the total size of all pixmaps in the cache exceeds cacheLimit(). The initial cache limit is - 2048 KB(2 MB) for Embedded, 10240 KB (10 - MB) for Desktops; it is changed with setCacheLimit(). - A pixmap takes roughly (\e{width} * \e{height} * \e{depth})/8 bytes of memory. - - The \e{Qt Quarterly} article - \l{http://doc.trolltech.com/qq/qq12-qpixmapcache.html}{Optimizing - with QPixmapCache} explains how to use QPixmapCache to speed up - applications by caching the results of painting. + 2048 KB (2 MB) on embedded platforms, 10240 KB (10 MB) on desktop + platforms; you can change this by calling setCacheLimit() with the + required value. + A pixmap takes roughly (\e{width} * \e{height} * \e{depth})/8 bytes of + memory. \sa QCache, QPixmap */ @@ -112,7 +110,7 @@ QPixmapCache::Key::Key(const Key &other) } /*! - Destructor; called immediately before the object is deleted. + Destroys the key. */ QPixmapCache::Key::~Key() { @@ -123,7 +121,8 @@ QPixmapCache::Key::~Key() /*! \internal - Returns true if this key is the same as the given \a key. + Returns true if this key is the same as the given \a key; otherwise returns + false. */ bool QPixmapCache::Key::operator ==(const Key &key) const { @@ -407,7 +406,7 @@ QPixmapCache::KeyData* QPMCache::getKeyData(QPixmapCache::Key *key) Q_GLOBAL_STATIC(QPMCache, pm_cache) /*! - \obsolete + \obsolete \overload Returns the pixmap associated with the \a key in the cache, or @@ -440,7 +439,7 @@ bool QPixmapCache::find(const QString &key, QPixmap& pixmap) } /*! - Looks for a cached pixmap associated with the \a key in the cache. + Looks for a cached pixmap associated with the given \a key in the cache. If the pixmap is found, the function sets \a pixmap to that pixmap and returns true; otherwise it leaves \a pixmap alone and returns false. @@ -459,10 +458,10 @@ bool QPixmapCache::find(const QString &key, QPixmap* pixmap) } /*! - Looks for a cached pixmap associated with the \a key in the cache. + Looks for a cached pixmap associated with the given \a key in the cache. If the pixmap is found, the function sets \a pixmap to that pixmap and returns true; otherwise it leaves \a pixmap alone and returns false. If - the pixmap is not found, it means that the \a key is not valid anymore, + the pixmap is not found, it means that the \a key is no longer valid, so it will be released for the next insertion. \since 4.6 @@ -504,8 +503,8 @@ bool QPixmapCache::insert(const QString &key, const QPixmap &pixmap) } /*! - Inserts a copy of the pixmap \a pixmap into - the cache and return you the key. + Inserts a copy of the given \a pixmap into the cache and returns a key + that can be used to retrieve it. When a pixmap is inserted and the cache is about to exceed its limit, it removes pixmaps until there is enough room for the @@ -524,9 +523,9 @@ QPixmapCache::Key QPixmapCache::insert(const QPixmap &pixmap) } /*! - Replace the pixmap associated to the \a key into - the cache. It return true if the pixmap \a pixmap has been correctly - inserted into the cache false otherwise. + Replaces the pixmap associated with the given \a key with the \a pixmap + specified. Returns true if the \a pixmap has been correctly inserted into + the cache; otherwise returns false. \sa setCacheLimit(), insert() @@ -543,8 +542,8 @@ bool QPixmapCache::replace(const Key &key, const QPixmap &pixmap) /*! Returns the cache limit (in kilobytes). - The default cache limit is 2048 KB for Embedded, 10240 KB for - Desktops. + The default cache limit is 2048 KB on embedded platforms, 10240 KB on + desktop platforms. \sa setCacheLimit() */ @@ -557,8 +556,8 @@ int QPixmapCache::cacheLimit() /*! Sets the cache limit to \a n kilobytes. - The default setting is 2048 KB for Embedded, 10240 KB for - Desktops. + The default setting is 2048 KB on embedded platforms, 10240 KB on + desktop platforms. \sa cacheLimit() */ @@ -578,7 +577,7 @@ void QPixmapCache::remove(const QString &key) } /*! - Removes the pixmap associated with \a key from the cache and release + Removes the pixmap associated with \a key from the cache and releases the key for a future insertion. \since 4.6 -- cgit v1.2.3 From c22a0186b5255af45f0b36acbde600de0e614266 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Tue, 14 Jul 2009 15:47:10 +0200 Subject: Revert "QFileDialog: When passing an invalid path in static functions the native" This reverts commit a4c4f994fa51ff216f0d43098824617e14b8a284. --- src/gui/dialogs/qfiledialog.cpp | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index 9f050de8e..d18cc7f0e 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -1599,12 +1599,7 @@ QString QFileDialog::getOpenFileName(QWidget *parent, args.parent = parent; args.caption = caption; args.directory = QFileDialogPrivate::workingDirectory(dir); - //If workingDirectory returned a different path than the initial one, - //it means that the initial path was invalid. There is no point to try select a file - if (args.directory != QFileInfo(dir).path()) - args.selection = QString(); - else - args.selection = QFileDialogPrivate::initialSelection(dir); + args.selection = QFileDialogPrivate::initialSelection(dir); args.filter = filter; args.mode = ExistingFile; args.options = options; @@ -1688,12 +1683,7 @@ QStringList QFileDialog::getOpenFileNames(QWidget *parent, args.parent = parent; args.caption = caption; args.directory = QFileDialogPrivate::workingDirectory(dir); - //If workingDirectory returned a different path than the initial one, - //it means that the initial path was invalid. There is no point to try select a file - if (args.directory != QFileInfo(dir).path()) - args.selection = QString(); - else - args.selection = QFileDialogPrivate::initialSelection(dir); + args.selection = QFileDialogPrivate::initialSelection(dir); args.filter = filter; args.mode = ExistingFiles; args.options = options; @@ -1779,12 +1769,7 @@ QString QFileDialog::getSaveFileName(QWidget *parent, args.parent = parent; args.caption = caption; args.directory = QFileDialogPrivate::workingDirectory(dir); - //If workingDirectory returned a different path than the initial one, - //it means that the initial path was invalid. There is no point to try select a file - if (args.directory != QFileInfo(dir).path()) - args.selection = QString(); - else - args.selection = QFileDialogPrivate::initialSelection(dir); + args.selection = QFileDialogPrivate::initialSelection(dir); args.filter = filter; args.mode = AnyFile; args.options = options; -- cgit v1.2.3 From 6b9328056591af2c48bed67f372693f030ba8c20 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 15 Jul 2009 09:10:16 +0200 Subject: Don't cause a rebuild of the application when mocinclude.tmp is used Since the mocinclude.tmp file was a dependency of all the generated moc files, it would always cause a rebuild of the code when doing a make. Reviewed-by: Joerg --- mkspecs/features/moc.prf | 2 -- 1 file changed, 2 deletions(-) diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 60508c8b5..40101dec3 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -65,7 +65,6 @@ moc_header.output = $$MOC_DIR/$${QMAKE_H_MOD_MOC}${QMAKE_FILE_BASE}$${first(QMAK moc_header.input = HEADERS moc_header.variable_out = SOURCES moc_header.name = MOC ${QMAKE_FILE_IN} -!isEmpty(INCLUDETEMP):moc_header.depends += $$INCLUDETEMP silent:moc_header.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_header.commands QMAKE_EXTRA_COMPILERS += moc_header INCREDIBUILD_XGE += moc_header @@ -77,7 +76,6 @@ moc_source.commands = ${QMAKE_FUNC_mocCmd} moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EXT_CPP_MOC} moc_source.input = SOURCES OBJECTIVE_SOURCES moc_source.name = MOC ${QMAKE_FILE_IN} -!isEmpty(INCLUDETEMP):moc_source.depends += $$INCLUDETEMP silent:moc_source.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_source.commands QMAKE_EXTRA_COMPILERS += moc_source INCREDIBUILD_XGE += moc_source -- cgit v1.2.3 From 503b5d00dae7e33ff7f6ac55aefc703bb8f92d5c Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Wed, 15 Jul 2009 11:24:10 +0200 Subject: QFileDialog static functions doesn't honor the DontUseNativeDialog flag. Just add a check before calling hooks. Task-number:258084 Reviewed-by:jbache --- src/gui/dialogs/qfiledialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index d18cc7f0e..c8ce162df 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -1677,7 +1677,7 @@ QStringList QFileDialog::getOpenFileNames(QWidget *parent, QString *selectedFilter, Options options) { - if (qt_filedialog_open_filenames_hook) + if (qt_filedialog_open_filenames_hook && !(options & DontUseNativeDialog)) return qt_filedialog_open_filenames_hook(parent, caption, dir, filter, selectedFilter, options); QFileDialogArgs args; args.parent = parent; @@ -1763,7 +1763,7 @@ QString QFileDialog::getSaveFileName(QWidget *parent, QString *selectedFilter, Options options) { - if (qt_filedialog_save_filename_hook) + if (qt_filedialog_save_filename_hook && !(options & DontUseNativeDialog)) return qt_filedialog_save_filename_hook(parent, caption, dir, filter, selectedFilter, options); QFileDialogArgs args; args.parent = parent; @@ -1838,7 +1838,7 @@ QString QFileDialog::getExistingDirectory(QWidget *parent, const QString &dir, Options options) { - if (qt_filedialog_existing_directory_hook) + if (qt_filedialog_existing_directory_hook && !(options & DontUseNativeDialog)) return qt_filedialog_existing_directory_hook(parent, caption, dir, options); QFileDialogArgs args; args.parent = parent; -- cgit v1.2.3 From 4dde6dac24027a4dfede4f79077df3d91de11efa Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 15 Jul 2009 11:41:38 +0200 Subject: Revert 6b9328 and fix the original dependency problem again Reviewed-by: Joerg --- mkspecs/features/moc.prf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 40101dec3..33a58ad97 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -65,6 +65,9 @@ moc_header.output = $$MOC_DIR/$${QMAKE_H_MOD_MOC}${QMAKE_FILE_BASE}$${first(QMAK moc_header.input = HEADERS moc_header.variable_out = SOURCES moc_header.name = MOC ${QMAKE_FILE_IN} +if(!contains(TEMPLATE, "vc.*") & !contains(TEMPLATE_PREFIX, "vc")) { + !isEmpty(INCLUDETEMP):moc_header.depends += $$INCLUDETEMP +} silent:moc_header.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_header.commands QMAKE_EXTRA_COMPILERS += moc_header INCREDIBUILD_XGE += moc_header @@ -76,6 +79,9 @@ moc_source.commands = ${QMAKE_FUNC_mocCmd} moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EXT_CPP_MOC} moc_source.input = SOURCES OBJECTIVE_SOURCES moc_source.name = MOC ${QMAKE_FILE_IN} +if(!contains(TEMPLATE, "vc.*") & !contains(TEMPLATE_PREFIX, "vc")) { + !isEmpty(INCLUDETEMP):moc_source.depends += $$INCLUDETEMP +} silent:moc_source.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_source.commands QMAKE_EXTRA_COMPILERS += moc_source INCREDIBUILD_XGE += moc_source -- cgit v1.2.3 From 4ce8c7af12cf9349beb692304808934f6de9cb83 Mon Sep 17 00:00:00 2001 From: Antonio Aloisio Date: Wed, 15 Jul 2009 12:49:54 +0200 Subject: Designer fails to compile if Qt is compiled without size grip support Reviewed-by: Friedemann Kleint --- tools/designer/src/lib/shared/widgetfactory.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/designer/src/lib/shared/widgetfactory.cpp b/tools/designer/src/lib/shared/widgetfactory.cpp index 6fabe1830..37c76772e 100644 --- a/tools/designer/src/lib/shared/widgetfactory.cpp +++ b/tools/designer/src/lib/shared/widgetfactory.cpp @@ -838,9 +838,11 @@ bool WidgetFactory::isPassiveInteractor(QWidget *widget) if (isTabBarInteractor(tabBar)) m_lastWasAPassiveInteractor = true; return m_lastWasAPassiveInteractor; - } else if (qobject_cast(widget)) +#ifndef QT_NO_SIZEGRIP + } else if (qobject_cast(widget)) { return (m_lastWasAPassiveInteractor = true); - else if (qobject_cast(widget)) +#endif + } else if (qobject_cast(widget)) return (m_lastWasAPassiveInteractor = true); else if (qobject_cast(widget) && (qobject_cast(widget->parent()) || qobject_cast(widget->parent()))) return (m_lastWasAPassiveInteractor = true); -- cgit v1.2.3 From 81049e49971a9f285f36204d6013c3172866718c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 15 Jul 2009 19:35:40 +0200 Subject: Add a "User-Agent" line to our HTTP proxy requests. Apparently some proxy servers can be configured to deny requests based on User-Agent, even for CONNECT connections. See https://bugs.kde.org/show_bug.cgi?id=155707#c155 for an example (packet dump in #c157, analysis in #c158). So send a User-Agent header with value "Mozilla/5.0", hoping that this will be enough to allow the connection. I hope it will, because other tools like libtool send something completely different: User-Agent: curl/7.19.5 (i586-mandriva-linux-gnu) libcurl/7.19.5 GnuTLS/2.8.1 zlib/1.2.3 c-ares/1.6.0 libidn/1.15 libssh2/1.0 Reviewed-by: TrustMe --- src/network/socket/qhttpsocketengine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 7bac1f271..156a9f4b8 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -454,6 +454,7 @@ void QHttpSocketEngine::slotSocketConnected() data += path; data += " HTTP/1.1\r\n"; data += "Proxy-Connection: keep-alive\r\n" + "User-Agent: Mozilla/5.0\r\n" "Host: " + peerAddress + "\r\n"; QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(d->authenticator); //qDebug() << "slotSocketConnected: priv=" << priv << (priv ? (int)priv->method : -1); -- cgit v1.2.3 From 1c9bb00bf6adb1f76dbcfb151a7b95a0e517ee3c Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 15 Jul 2009 10:13:03 -0700 Subject: Fix off by one bug in dfbpe::drawTiledPixmap The drawTiledPixmap code iterated while x < right and y < bottom. This should be x <= right and y <= bottom. Reviewed-by: Donald --- src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index 605324e3b..49fc5f8c9 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -1119,9 +1119,9 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix const QSizeF mappedSize(pixmapSize.width() * transform.m11(), pixmapSize.height() * transform.m22()); qreal y = ::fixCoord(destinationRect.y(), mappedSize.height(), offset.y()); const qreal startX = ::fixCoord(destinationRect.x(), mappedSize.width(), offset.x()); - while (y < destinationRect.bottom()) { + while (y <= destinationRect.bottom()) { qreal x = startX; - while (x < destinationRect.right()) { + while (x <= destinationRect.right()) { const DFBRectangle destination = { qRound(x), qRound(y), mappedSize.width(), mappedSize.height() }; surface->StretchBlit(surface, sourceSurface, 0, &destination); x += mappedSize.width(); @@ -1143,10 +1143,10 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix QVarLengthArray points(maxCount); int i = 0; - while (y < destinationRect.bottom()) { + while (y <= destinationRect.bottom()) { Q_ASSERT(i < maxCount); qreal x = startX; - while (x < destinationRect.right()) { + while (x <= destinationRect.right()) { points[i].x = qRound(x); points[i].y = qRound(y); sourceRects[i].x = 0; -- cgit v1.2.3 From bd6ad2c54ea9bd60ab8dbd5771821ab0e374488e Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 15 Jul 2009 09:32:17 -0700 Subject: Clean up rect/line drawing in dfb paintengine Slight optimization by using the pluralized functions when possible. Also make templatized helper functions to avoid near-duplication of code for the float/int cases. Reviewed-by: Donald --- .../gfxdrivers/directfb/qdirectfbpaintengine.cpp | 145 +++++++++------------ 1 file changed, 63 insertions(+), 82 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index 49fc5f8c9..de7c3e59a 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -228,15 +228,6 @@ public: inline bool dfbCanHandleClip() const; inline bool isSimpleBrush(const QBrush &brush) const; - void drawLines(const QLine *lines, int count); - void drawLines(const QLineF *lines, int count); - - void fillRegion(const QRegion &r); - void fillRects(const QRect *rects, int count); - void drawRects(const QRect *rects, int count); - void fillRects(const QRectF *rects, int count); - void drawRects(const QRectF *rects, int count); - void drawTiledPixmap(const QRectF &dest, const QPixmap &pixmap, const QPointF &pos); void blit(const QRectF &dest, IDirectFBSurface *surface, const QRectF &src); @@ -277,6 +268,12 @@ private: friend class QDirectFBPaintEngine; }; +template +static inline void drawLines(const T *lines, int n, const QTransform &transform, IDirectFBSurface *surface); +template +static inline void fillRects(const T *rects, int n, const QTransform &transform, IDirectFBSurface *surface); +template +static inline void drawRects(const T *rects, int n, const QTransform &transform, IDirectFBSurface *surface); QDirectFBPaintEngine::QDirectFBPaintEngine(QPaintDevice *device) : QRasterPaintEngine(*(new QDirectFBPaintEnginePrivate(this)), device) @@ -427,12 +424,12 @@ void QDirectFBPaintEngine::drawRects(const QRect *rects, int rectCount) if (brush != Qt::NoBrush) { d->setDFBColor(brush.color()); - d->fillRects(rects, rectCount); + ::fillRects(rects, rectCount, state()->matrix, d->surface); } const QPen &pen = state()->pen; if (pen != Qt::NoPen) { d->setDFBColor(pen.color()); - d->drawRects(rects, rectCount); + ::drawRects(rects, rectCount, state()->matrix, d->surface); } } @@ -456,12 +453,12 @@ void QDirectFBPaintEngine::drawRects(const QRectF *rects, int rectCount) if (brush != Qt::NoBrush) { d->setDFBColor(brush.color()); - d->fillRects(rects, rectCount); + ::fillRects(rects, rectCount, state()->matrix, d->surface); } const QPen &pen = state()->pen; if (pen != Qt::NoPen) { d->setDFBColor(pen.color()); - d->drawRects(rects, rectCount); + ::drawRects(rects, rectCount, state()->matrix, d->surface); } } @@ -480,7 +477,7 @@ void QDirectFBPaintEngine::drawLines(const QLine *lines, int lineCount) if (pen != Qt::NoPen) { d->unlock(); d->setDFBColor(pen.color()); - d->drawLines(lines, lineCount); + ::drawLines(lines, lineCount, state()->matrix, d->surface); } } @@ -499,7 +496,7 @@ void QDirectFBPaintEngine::drawLines(const QLineF *lines, int lineCount) if (pen != Qt::NoPen) { d->unlock(); d->setDFBColor(pen.color()); - d->drawLines(lines, lineCount); + ::drawLines(lines, lineCount, state()->matrix, d->surface); } } @@ -950,73 +947,6 @@ void QDirectFBPaintEnginePrivate::setDFBColor(const QColor &color) surface->SetDrawingFlags(surface, alpha == 255 ? DSDRAW_NOFX : DSDRAW_BLEND); } -void QDirectFBPaintEnginePrivate::drawLines(const QLine *lines, int n) -{ - const QTransform &transform = q->state()->matrix; - for (int i = 0; i < n; ++i) { - const QLine l = transform.map(lines[i]); - surface->DrawLine(surface, l.x1(), l.y1(), l.x2(), l.y2()); - } -} - -void QDirectFBPaintEnginePrivate::drawLines(const QLineF *lines, int n) -{ - const QTransform &transform = q->state()->matrix; - for (int i = 0; i < n; ++i) { - const QLine l = transform.map(lines[i]).toLine(); - surface->DrawLine(surface, l.x1(), l.y1(), l.x2(), l.y2()); - } -} - -void QDirectFBPaintEnginePrivate::fillRegion(const QRegion ®ion) -{ - Q_ASSERT(isSimpleBrush(q->state()->brush)); - setDFBColor(q->state()->brush.color()); - const QVector rects = region.rects(); - const int n = rects.size(); - fillRects(rects.constData(), n); -} - -void QDirectFBPaintEnginePrivate::fillRects(const QRect *rects, int n) -{ - const QTransform &transform = q->state()->matrix; - for (int i = 0; i < n; ++i) { - const QRect r = transform.mapRect(rects[i]); - surface->FillRectangle(surface, r.x(), r.y(), - r.width(), r.height()); - } -} - -void QDirectFBPaintEnginePrivate::fillRects(const QRectF *rects, int n) -{ - const QTransform &transform = q->state()->matrix; - for (int i = 0; i < n; ++i) { - const QRect r = transform.mapRect(rects[i]).toRect(); - surface->FillRectangle(surface, r.x(), r.y(), - r.width(), r.height()); - } -} - -void QDirectFBPaintEnginePrivate::drawRects(const QRect *rects, int n) -{ - const QTransform &transform = q->state()->matrix; - for (int i = 0; i < n; ++i) { - const QRect r = transform.mapRect(rects[i]); - surface->DrawRectangle(surface, r.x(), r.y(), - r.width() + 1, r.height() + 1); - } -} - -void QDirectFBPaintEnginePrivate::drawRects(const QRectF *rects, int n) -{ - const QTransform &transform = q->state()->matrix; - for (int i = 0; i < n; ++i) { - const QRect r = transform.mapRect(rects[i]).toRect(); - surface->DrawRectangle(surface, r.x(), r.y(), - r.width() + 1, r.height() + 1); - } -} - IDirectFBSurface *QDirectFBPaintEnginePrivate::getSurface(const QImage &img, bool *release) { #ifndef QT_DIRECTFB_IMAGECACHE @@ -1210,4 +1140,55 @@ void QDirectFBPaintEnginePrivate::systemStateChanged() QRasterPaintEnginePrivate::systemStateChanged(); } +static inline QRect mapRect(const QTransform &transform, const QRect &rect) { return transform.mapRect(rect); } +static inline QRect mapRect(const QTransform &transform, const QRectF &rect) { return transform.mapRect(rect).toRect(); } +static inline QLine map(const QTransform &transform, const QLine &line) { return transform.map(line); } +static inline QLine map(const QTransform &transform, const QLineF &line) { return transform.map(line).toLine(); } +template +static inline void drawLines(const T *lines, int n, const QTransform &transform, IDirectFBSurface *surface) +{ + if (n == 1) { + const QLine l = ::map(transform, lines[0]); + surface->DrawLine(surface, l.x1(), l.y1(), l.x2(), l.y2()); + } else { + QVarLengthArray lineArray(n); + for (int i=0; iDrawLines(surface, lineArray.constData(), n); + } +} + +template +static inline void fillRects(const T *rects, int n, const QTransform &transform, IDirectFBSurface *surface) +{ + if (n == 1) { + const QRect r = ::mapRect(transform, rects[0]); + surface->FillRectangle(surface, r.x(), r.y(), r.width(), r.height()); + } else { + QVarLengthArray rectArray(n); + for (int i=0; iFillRectangles(surface, rectArray.constData(), n); + } +} + +template +static inline void drawRects(const T *rects, int n, const QTransform &transform, IDirectFBSurface *surface) +{ + for (int i=0; iDrawRectangle(surface, r.x(), r.y(), r.width(), r.height()); + } +} + #endif // QT_NO_DIRECTFB -- cgit v1.2.3 From c413ae69ae4dc41075f3391fe4838073af657ffb Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 15 Jul 2009 10:23:18 -0700 Subject: Don't force a lock in QDirectFBPaintEngine::clip Pretty much every paint operation on DirectFB surfaces starts with a clipping operations which until now would always cause a IDirectFBSurface->Lock(). This was to make sure QRasterBuffer::prepare had been called so QClipData::initialize() would allocate a big enough array for its spans. We can safely not make QDirectFBPaintDevice::memory() return 0 until we actually fall back. Reviewed-By: Donald --- .../gfxdrivers/directfb/qdirectfbpaintdevice.cpp | 5 ---- .../gfxdrivers/directfb/qdirectfbpaintengine.cpp | 27 ++++------------------ 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp index 52f6a371c..178dbae9c 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp @@ -89,11 +89,6 @@ void QDirectFBPaintDevice::unlockDirectFB() void *QDirectFBPaintDevice::memory() const { - if (lock != (DSLF_READ|DSLF_WRITE)) { - QDirectFBPaintDevice *that = const_cast(this); - that->lockDirectFB(DSLF_READ|DSLF_WRITE); - Q_ASSERT(that->lockedImage); - } return mem; } diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index de7c3e59a..58443d45d 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -250,7 +250,6 @@ private: uint transformationType; // this is QTransform::type() + NegativeScale if qMin(transform.m11(), transform.m22()) < 0 SurfaceCache *surfaceCache; - int lastLockedHeight; IDirectFB *fb; @@ -260,7 +259,6 @@ private: bool dfbHandledClip; bool ignoreSystemClip; QDirectFBPaintDevice *dfbDevice; - void *lockedMemory; bool unsupportedCompositionMode; QDirectFBPaintEngine *q; @@ -287,7 +285,6 @@ QDirectFBPaintEngine::~QDirectFBPaintEngine() bool QDirectFBPaintEngine::begin(QPaintDevice *device) { Q_D(QDirectFBPaintEngine); - d->lastLockedHeight = -1; if (device->devType() == QInternal::CustomRaster) { d->dfbDevice = static_cast(device); } else if (device->devType() == QInternal::Pixmap) { @@ -304,11 +301,11 @@ bool QDirectFBPaintEngine::begin(QPaintDevice *device) qFatal("QDirectFBPaintEngine used on an invalid device: 0x%x", device->devType()); } - d->lockedMemory = 0; const bool status = QRasterPaintEngine::begin(device); // XXX: QRasterPaintEngine::begin() resets the capabilities gccaps |= PorterDuff; + d->prepare(d->dfbDevice); return status; } @@ -385,9 +382,6 @@ void QDirectFBPaintEngine::clip(const QVectorPath &path, Qt::ClipOperation op) { Q_D(QDirectFBPaintEngine); d->dirtyClip = true; - const QPoint bottom = state()->matrix.map(QPoint(0, int(path.controlPointRect().y2))); - if (bottom.y() > d->lastLockedHeight) - d->lock(); QRasterPaintEngine::clip(path, op); } @@ -395,12 +389,6 @@ void QDirectFBPaintEngine::clip(const QRect &rect, Qt::ClipOperation op) { Q_D(QDirectFBPaintEngine); d->dirtyClip = true; - if (d->clip() && !d->clip()->hasRectClip && d->clip()->enabled) { - const QPoint bottom = state()->matrix.map(QPoint(0, rect.bottom())); - if (bottom.y() > d->lastLockedHeight) - d->lock(); - } - QRasterPaintEngine::clip(rect, op); } @@ -823,9 +811,8 @@ void QDirectFBPaintEngine::initImageCache(int size) QDirectFBPaintEnginePrivate::QDirectFBPaintEnginePrivate(QDirectFBPaintEngine *p) : surface(0), antialiased(false), simplePen(false), - transformationType(0), lastLockedHeight(-1), - opacity(255), dirtyClip(true), - dfbHandledClip(false), dfbDevice(0), lockedMemory(0), + transformationType(0), opacity(255), dirtyClip(true), + dfbHandledClip(false), dfbDevice(0), unsupportedCompositionMode(false), q(p) { fb = QDirectFBScreen::instance()->dfb(); @@ -866,12 +853,9 @@ void QDirectFBPaintEnginePrivate::lock() // lock so we need to call the base implementation of prepare so // it updates its rasterBuffer to point to the new buffer address. Q_ASSERT(dfbDevice); - if (dfbDevice->lockFlags() != (DSLF_WRITE|DSLF_READ) - || dfbDevice->height() != lastLockedHeight - || dfbDevice->memory() != lockedMemory) { + if (dfbDevice->lockFlags() != (DSLF_WRITE|DSLF_READ)) { + dfbDevice->lockDirectFB(DSLF_READ|DSLF_WRITE); prepare(dfbDevice); - lastLockedHeight = dfbDevice->height(); - lockedMemory = dfbDevice->memory(); } } @@ -879,7 +863,6 @@ void QDirectFBPaintEnginePrivate::unlock() { Q_ASSERT(dfbDevice); dfbDevice->unlockDirectFB(); - lockedMemory = 0; } void QDirectFBPaintEnginePrivate::setTransform(const QTransform &transform) -- cgit v1.2.3 From a4b88269aae0e546580a7ad6a20866cc582afd41 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 15 Jul 2009 09:42:46 -0700 Subject: Clean up qdirectfbpaintengine.cpp - Move implementation of debug functions to the bottom of the file. - Move ImageCache stuff to under QDirectFBPaintEnginePrivate - Move SurfaceCache stuff to under QDirectFBPaintEnginePrivate Reviewed-by: Shane McLaughlin --- .../gfxdrivers/directfb/qdirectfbpaintengine.cpp | 299 +++++++++++---------- 1 file changed, 150 insertions(+), 149 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index 58443d45d..9aaae62b7 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -54,154 +54,7 @@ #include #include -#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS || defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS -#define VOID_ARG() static_cast(false) -enum PaintOperation { - DRAW_RECTS = 0x0001, - DRAW_LINES = 0x0002, - DRAW_IMAGE = 0x0004, - DRAW_PIXMAP = 0x0008, - DRAW_TILED_PIXMAP = 0x0010, - STROKE_PATH = 0x0020, - DRAW_PATH = 0x0040, - DRAW_POINTS = 0x0080, - DRAW_ELLIPSE = 0x0100, - DRAW_POLYGON = 0x0200, - DRAW_TEXT = 0x0400, - FILL_PATH = 0x0800, - FILL_RECT = 0x1000, - DRAW_COLORSPANS = 0x2000, - ALL = 0xffff -}; -#endif - -#ifdef QT_DIRECTFB_WARN_ON_RASTERFALLBACKS -template inline const T *ptr(const T &t) { return &t; } -template <> inline const bool* ptr(const bool &) { return 0; } -template -static void rasterFallbackWarn(const char *msg, const char *func, const device *dev, - uint transformationType, bool simplePen, - bool dfbHandledClip, bool unsupportedCompositionMode, - const char *nameOne, const T1 &one, - const char *nameTwo, const T2 &two, - const char *nameThree, const T3 &three) -{ - QString out; - QDebug dbg(&out); - dbg << msg << (QByteArray(func) + "()") << "painting on"; - if (dev->devType() == QInternal::Widget) { - dbg << static_cast(dev); - } else { - dbg << dev << "of type" << dev->devType(); - } - - dbg << QString("transformationType 0x%1").arg(transformationType, 3, 16, QLatin1Char('0')) - << "simplePen" << simplePen - << "dfbHandledClip" << dfbHandledClip - << "unsupportedCompositionMode" << unsupportedCompositionMode; - - const T1 *t1 = ptr(one); - const T2 *t2 = ptr(two); - const T3 *t3 = ptr(three); - - if (t1) { - dbg << nameOne << *t1; - if (t2) { - dbg << nameTwo << *t2; - if (t3) { - dbg << nameThree << *t3; - } - } - } - qWarning("%s", qPrintable(out)); -} -#endif - -#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS && defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS -#define RASTERFALLBACK(op, one, two, three) \ - if (op & (QT_DIRECTFB_WARN_ON_RASTERFALLBACKS)) \ - rasterFallbackWarn("Disabled raster engine operation", \ - __FUNCTION__, state()->painter->device(), \ - d_func()->transformationType, \ - d_func()->simplePen, \ - d_func()->dfbCanHandleClip(), \ - d_func()->unsupportedCompositionMode, \ - #one, one, #two, two, #three, three); \ - if (op & (QT_DIRECTFB_DISABLE_RASTERFALLBACKS)) \ - return; -#elif defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS -#define RASTERFALLBACK(op, one, two, three) \ - if (op & (QT_DIRECTFB_DISABLE_RASTERFALLBACKS)) \ - return; -#elif defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS -#define RASTERFALLBACK(op, one, two, three) \ - if (op & (QT_DIRECTFB_WARN_ON_RASTERFALLBACKS)) \ - rasterFallbackWarn("Falling back to raster engine for", \ - __FUNCTION__, state()->painter->device(), \ - d_func()->transformationType, \ - d_func()->simplePen, \ - d_func()->dfbCanHandleClip(), \ - d_func()->unsupportedCompositionMode, \ - #one, one, #two, two, #three, three); -#else -#define RASTERFALLBACK(op, one, two, three) -#endif - -class SurfaceCache -{ -public: - SurfaceCache() : surface(0), buffer(0), bufsize(0) {} - ~SurfaceCache() { clear(); } - - - IDirectFBSurface *getSurface(const uint *buf, int size) - { - if (buffer == buf && bufsize == size) - return surface; - - clear(); - - const DFBSurfaceDescription description = QDirectFBScreen::getSurfaceDescription(buf, size); - surface = QDirectFBScreen::instance()->createDFBSurface(description, QDirectFBScreen::TrackSurface); - if (!surface) - qWarning("QDirectFBPaintEngine: SurfaceCache: Unable to create surface"); - - buffer = const_cast(buf); - bufsize = size; - - return surface; - } - - void clear() - { - if (surface && QDirectFBScreen::instance()) - QDirectFBScreen::instance()->releaseDFBSurface(surface); - surface = 0; - buffer = 0; - bufsize = 0; - } -private: - IDirectFBSurface *surface; - uint *buffer; - int bufsize; -}; - - -#ifdef QT_DIRECTFB_IMAGECACHE -#include -struct CachedImage -{ - IDirectFBSurface *surface; - ~CachedImage() - { - if (surface && QDirectFBScreen::instance()) { - QDirectFBScreen::instance()->releaseDFBSurface(surface); - } - } -}; -static QCache imageCache(4*1024*1024); // 4 MB -#endif - +class SurfaceCache; class QDirectFBPaintEnginePrivate : public QRasterPaintEnginePrivate { public: @@ -232,7 +85,7 @@ public: void blit(const QRectF &dest, IDirectFBSurface *surface, const QRectF &src); inline void updateClip(); - void systemStateChanged(); + virtual void systemStateChanged(); static IDirectFBSurface *getSurface(const QImage &img, bool *release); @@ -266,6 +119,83 @@ private: friend class QDirectFBPaintEngine; }; +class SurfaceCache +{ +public: + SurfaceCache() : surface(0), buffer(0), bufsize(0) {} + ~SurfaceCache() { clear(); } + IDirectFBSurface *getSurface(const uint *buf, int size); + void clear(); +private: + IDirectFBSurface *surface; + uint *buffer; + int bufsize; +}; + + +#ifdef QT_DIRECTFB_IMAGECACHE +#include +struct CachedImage +{ + IDirectFBSurface *surface; + ~CachedImage() + { + if (surface && QDirectFBScreen::instance()) { + QDirectFBScreen::instance()->releaseDFBSurface(surface); + } + } +}; +static QCache imageCache(4*1024*1024); // 4 MB +#endif + +#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS || defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS +#define VOID_ARG() static_cast(false) +enum PaintOperation { + DRAW_RECTS = 0x0001, DRAW_LINES = 0x0002, DRAW_IMAGE = 0x0004, + DRAW_PIXMAP = 0x0008, DRAW_TILED_PIXMAP = 0x0010, STROKE_PATH = 0x0020, + DRAW_PATH = 0x0040, DRAW_POINTS = 0x0080, DRAW_ELLIPSE = 0x0100, + DRAW_POLYGON = 0x0200, DRAW_TEXT = 0x0400, FILL_PATH = 0x0800, + FILL_RECT = 0x1000, DRAW_COLORSPANS = 0x2000, ALL = 0xffff +}; +#endif + +#ifdef QT_DIRECTFB_WARN_ON_RASTERFALLBACKS +template +static void rasterFallbackWarn(const char *msg, const char *, const device *, uint, bool, bool, bool, + const char *, const T1 &, const char *, const T2 &, const char *, const T3 &); +#endif + +#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS && defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS +#define RASTERFALLBACK(op, one, two, three) \ + if (op & (QT_DIRECTFB_WARN_ON_RASTERFALLBACKS)) \ + rasterFallbackWarn("Disabled raster engine operation", \ + __FUNCTION__, state()->painter->device(), \ + d_func()->transformationType, \ + d_func()->simplePen, \ + d_func()->dfbCanHandleClip(), \ + d_func()->unsupportedCompositionMode, \ + #one, one, #two, two, #three, three); \ + if (op & (QT_DIRECTFB_DISABLE_RASTERFALLBACKS)) \ + return; +#elif defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS +#define RASTERFALLBACK(op, one, two, three) \ + if (op & (QT_DIRECTFB_DISABLE_RASTERFALLBACKS)) \ + return; +#elif defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS +#define RASTERFALLBACK(op, one, two, three) \ + if (op & (QT_DIRECTFB_WARN_ON_RASTERFALLBACKS)) \ + rasterFallbackWarn("Falling back to raster engine for", \ + __FUNCTION__, state()->painter->device(), \ + d_func()->transformationType, \ + d_func()->simplePen, \ + d_func()->dfbCanHandleClip(), \ + d_func()->unsupportedCompositionMode, \ + #one, one, #two, two, #three, three); +#else +#define RASTERFALLBACK(op, one, two, three) +#endif + + template static inline void drawLines(const T *lines, int n, const QTransform &transform, IDirectFBSurface *surface); template @@ -1123,6 +1053,34 @@ void QDirectFBPaintEnginePrivate::systemStateChanged() QRasterPaintEnginePrivate::systemStateChanged(); } +IDirectFBSurface *SurfaceCache::getSurface(const uint *buf, int size) +{ + if (buffer == buf && bufsize == size) + return surface; + + clear(); + + const DFBSurfaceDescription description = QDirectFBScreen::getSurfaceDescription(buf, size); + surface = QDirectFBScreen::instance()->createDFBSurface(description, QDirectFBScreen::TrackSurface); + if (!surface) + qWarning("QDirectFBPaintEngine: SurfaceCache: Unable to create surface"); + + buffer = const_cast(buf); + bufsize = size; + + return surface; +} + +void SurfaceCache::clear() +{ + if (surface && QDirectFBScreen::instance()) + QDirectFBScreen::instance()->releaseDFBSurface(surface); + surface = 0; + buffer = 0; + bufsize = 0; +} + + static inline QRect mapRect(const QTransform &transform, const QRect &rect) { return transform.mapRect(rect); } static inline QRect mapRect(const QTransform &transform, const QRectF &rect) { return transform.mapRect(rect).toRect(); } static inline QLine map(const QTransform &transform, const QLine &line) { return transform.map(line); } @@ -1174,4 +1132,47 @@ static inline void drawRects(const T *rects, int n, const QTransform &transform, } } +#ifdef QT_DIRECTFB_WARN_ON_RASTERFALLBACKS +template inline const T *ptr(const T &t) { return &t; } +template <> inline const bool* ptr(const bool &) { return 0; } +template +static void rasterFallbackWarn(const char *msg, const char *func, const device *dev, + uint transformationType, bool simplePen, + bool dfbHandledClip, bool unsupportedCompositionMode, + const char *nameOne, const T1 &one, + const char *nameTwo, const T2 &two, + const char *nameThree, const T3 &three) +{ + QString out; + QDebug dbg(&out); + dbg << msg << (QByteArray(func) + "()") << "painting on"; + if (dev->devType() == QInternal::Widget) { + dbg << static_cast(dev); + } else { + dbg << dev << "of type" << dev->devType(); + } + + dbg << QString("transformationType 0x%1").arg(transformationType, 3, 16, QLatin1Char('0')) + << "simplePen" << simplePen + << "dfbHandledClip" << dfbHandledClip + << "unsupportedCompositionMode" << unsupportedCompositionMode; + + const T1 *t1 = ptr(one); + const T2 *t2 = ptr(two); + const T3 *t3 = ptr(three); + + if (t1) { + dbg << nameOne << *t1; + if (t2) { + dbg << nameTwo << *t2; + if (t3) { + dbg << nameThree << *t3; + } + } + } + qWarning("%s", qPrintable(out)); +} +#endif + + #endif // QT_NO_DIRECTFB -- cgit v1.2.3 From 8734464e27b7a3fadb1adeefc3971d8a1e5103bd Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Thu, 16 Jul 2009 09:37:39 +0200 Subject: Better caching of file system icon providers. It turns out that we weren't doing any caching of icons provided by the file system. We now use the similar trick that's used on Windows which does some caching on the file extension. We do fill up the cache needlessly with extra information (16, 32, 64, and 128) icons. We probably could be better with a iconRef engine that generates these sizes on demand. Still performance is 100% better with this which means using it in itemviews works. Reviewed-by: Jens Bache-Wiig --- src/gui/itemviews/qfileiconprovider.cpp | 37 ++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/src/gui/itemviews/qfileiconprovider.cpp b/src/gui/itemviews/qfileiconprovider.cpp index ed663b340..6338e49b3 100644 --- a/src/gui/itemviews/qfileiconprovider.cpp +++ b/src/gui/itemviews/qfileiconprovider.cpp @@ -45,11 +45,11 @@ #include #include #include +#include #if defined(Q_WS_WIN) #define _WIN32_IE 0x0500 #include #include -#include #elif defined(Q_WS_MAC) #include #endif @@ -316,6 +316,31 @@ QIcon QFileIconProviderPrivate::getWinIcon(const QFileInfo &fileInfo) const QIcon QFileIconProviderPrivate::getMacIcon(const QFileInfo &fi) const { QIcon retIcon; + QString fileExtension = fi.suffix().toUpper(); + fileExtension.prepend(QLatin1String(".")); + + const QString keyBase = QLatin1String("qt_") + fileExtension; + + QPixmap pixmap; + if (fi.isFile() && !fi.isExecutable() && !fi.isSymLink()) { + QPixmapCache::find(keyBase + QLatin1String("16"), pixmap); + } + + if (!pixmap.isNull()) { + retIcon.addPixmap(pixmap); + if (QPixmapCache::find(keyBase + QLatin1String("32"), pixmap)) { + retIcon.addPixmap(pixmap); + if (QPixmapCache::find(keyBase + QLatin1String("64"), pixmap)) { + retIcon.addPixmap(pixmap); + if (QPixmapCache::find(keyBase + QLatin1String("128"), pixmap)) { + retIcon.addPixmap(pixmap); + return retIcon; + } + } + } + } + + FSRef macRef; OSStatus status = FSPathMakeRef(reinterpret_cast(fi.canonicalFilePath().toUtf8().constData()), &macRef, 0); @@ -334,6 +359,16 @@ QIcon QFileIconProviderPrivate::getMacIcon(const QFileInfo &fi) const extern void qt_mac_constructQIconFromIconRef(const IconRef, const IconRef, QIcon*, QStyle::StandardPixmap = QStyle::SP_CustomBase); // qmacstyle_mac.cpp qt_mac_constructQIconFromIconRef(iconRef, 0, &retIcon); ReleaseIconRef(iconRef); + + pixmap = retIcon.pixmap(16); + QPixmapCache::insert(keyBase + QLatin1String("16"), pixmap); + pixmap = retIcon.pixmap(32); + QPixmapCache::insert(keyBase + QLatin1String("32"), pixmap); + pixmap = retIcon.pixmap(64); + QPixmapCache::insert(keyBase + QLatin1String("64"), pixmap); + pixmap = retIcon.pixmap(128); + QPixmapCache::insert(keyBase + QLatin1String("128"), pixmap); + return retIcon; } #endif -- cgit v1.2.3 From 21a10dba28f6abc2659929ce8bbaf0e0fd32d3f5 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Thu, 16 Jul 2009 14:58:34 +0200 Subject: Phonon: fixed a big memory leak on Windows If you had deleted a VideoWidget, it could not free the memory taken because we still had a reference on it. Task-number: 258202 --- src/3rdparty/phonon/ds9/backendnode.cpp | 2 ++ src/3rdparty/phonon/ds9/qpin.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/phonon/ds9/backendnode.cpp b/src/3rdparty/phonon/ds9/backendnode.cpp index 7e0b3cdd6..855357a0f 100644 --- a/src/3rdparty/phonon/ds9/backendnode.cpp +++ b/src/3rdparty/phonon/ds9/backendnode.cpp @@ -57,6 +57,8 @@ namespace Phonon BackendNode::~BackendNode() { + //this will remove the filter from the graph + mediaObjectDestroyed(); } void BackendNode::setMediaObject(MediaObject *mo) diff --git a/src/3rdparty/phonon/ds9/qpin.cpp b/src/3rdparty/phonon/ds9/qpin.cpp index 37fe48d1e..f65250262 100644 --- a/src/3rdparty/phonon/ds9/qpin.cpp +++ b/src/3rdparty/phonon/ds9/qpin.cpp @@ -456,8 +456,8 @@ namespace Phonon HRESULT QPin::checkOutputMediaTypesConnection(IPin *pin) { - IEnumMediaTypes *emt = 0; - HRESULT hr = pin->EnumMediaTypes(&emt); + ComPointer emt; + HRESULT hr = pin->EnumMediaTypes(emt.pparam()); if (hr != S_OK) { return hr; } -- cgit v1.2.3 From 2883cf47431c9d944ccd40785b079d8625df14f1 Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Thu, 16 Jul 2009 16:24:03 +0200 Subject: Fixed bug where line widths were rounded to integers in the GL engine. Regression from Qt 4.4. Task-number: 257990 Reviewed-by: Tom --- src/opengl/qpaintengine_opengl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index 84151eede..de11da774 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -4171,7 +4171,7 @@ void QOpenGLPaintEnginePrivate::strokePath(const QPainterPath &path, bool use_ca QPen pen = cpen; if (txscale != 1) - pen.setWidthF(pen.width() * txscale); + pen.setWidthF(pen.widthF() * txscale); if (use_cache) fillPath(qt_opengl_stroke_cache()->getStrokedPath(temp.map(path), pen)); else -- cgit v1.2.3 From 86ea4dbb5a748491656d9621ecd58238bc3e3d82 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Thu, 16 Jul 2009 17:35:59 -0700 Subject: Don't assume that raster can do porter duff in dfb PorterDuff should only be enabled if the raster engine says it is. E.g. if we're painting on a format with alpha. Reviewed-by: TrustMe --- src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index 9aaae62b7..305d5beec 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -232,11 +232,7 @@ bool QDirectFBPaintEngine::begin(QPaintDevice *device) device->devType()); } - const bool status = QRasterPaintEngine::begin(device); - // XXX: QRasterPaintEngine::begin() resets the capabilities - gccaps |= PorterDuff; - d->prepare(d->dfbDevice); - return status; + return QRasterPaintEngine::begin(device); } bool QDirectFBPaintEngine::end() -- cgit v1.2.3 From dd2bda5cb7b08a84c36d49f946059885fbc764c9 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 17 Jul 2009 14:30:30 +1000 Subject: Fixed failure of xunit selftest on Windows. --- tests/auto/selftests/xunit/xunit.pro | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tests/auto/selftests/xunit/xunit.pro b/tests/auto/selftests/xunit/xunit.pro index 81ca15786..55aca4a6a 100644 --- a/tests/auto/selftests/xunit/xunit.pro +++ b/tests/auto/selftests/xunit/xunit.pro @@ -1,15 +1,8 @@ load(qttest_p4) SOURCES += tst_xunit.cpp -wince*: { - addImages.sources = images/* - addImages.path = images - DEPLOYMENT += addImages - DEFINES += SRCDIR=\\\".\\\" -} else { - contains(QT_CONFIG, qt3support): QT += qt3support - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +mac:CONFIG -= app_bundle +CONFIG -= debug_and_release_target TARGET = xunit -- cgit v1.2.3 From cf75d5b1a62badd5ae588aeed6b4f98ba987ca3e Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 17 Jul 2009 14:51:11 +1000 Subject: Fixed failure of badxml selftest on Windows. Don't try to write to files with special characters in the name. Also fix bizarre indent. --- src/testlib/qtestfilelogger.cpp | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/testlib/qtestfilelogger.cpp b/src/testlib/qtestfilelogger.cpp index 0c146b42c..a717058b1 100644 --- a/src/testlib/qtestfilelogger.cpp +++ b/src/testlib/qtestfilelogger.cpp @@ -72,15 +72,24 @@ void QTestFileLogger::init() QTest::qt_snprintf(filename, sizeof(filename), "%s.log", QTestResult::currentTestObjectName()); - #if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(Q_OS_WINCE) - if (::fopen_s(&QTest::stream, filename, "wt")) { - #else - QTest::stream = ::fopen(filename, "wt"); - if (!QTest::stream) { - #endif - printf("Unable to open file for simple logging: %s", filename); - ::exit(1); + // Keep filenames simple + for (int i = 0; i < sizeof(filename) && filename[i]; ++i) { + char& c = filename[i]; + if (!(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9' || c == '-' + || c == '.')) { + c = '_'; } + } + +#if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(Q_OS_WINCE) + if (::fopen_s(&QTest::stream, filename, "wt")) { +#else + QTest::stream = ::fopen(filename, "wt"); + if (!QTest::stream) { +#endif + printf("Unable to open file for simple logging: %s", filename); + ::exit(1); + } } void QTestFileLogger::flush(const char *msg) -- cgit v1.2.3 From 6664324b12a3339d18251df1cd69a1da06d1e2dc Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 17 Jul 2009 09:36:44 +0200 Subject: Fix MinGW (g++ 3.4.5) compilation. ...to be reverted once it is deprecated. Reviewed-by: Thierry Bastian --- src/gui/kernel/qapplication_win.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index ed219cd22..cbcac9aeb 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -3958,9 +3958,10 @@ qt_CloseTouchInputHandlePtr QApplicationPrivate::CloseTouchInputHandle = 0; void QApplicationPrivate::initializeMultitouch_sys() { QLibrary library(QLatin1String("user32")); - RegisterTouchWindow = reinterpret_cast(library.resolve("RegisterTouchWindow")); - GetTouchInputInfo = reinterpret_cast(library.resolve("GetTouchInputInfo")); - CloseTouchInputHandle = reinterpret_cast(library.resolve("CloseTouchInputHandle")); + // MinGW (g++ 3.4.5) accepts only C casts. + RegisterTouchWindow = (qt_RegisterTouchWindowPtr)(library.resolve("RegisterTouchWindow")); + GetTouchInputInfo = (qt_GetTouchInputInfoPtr)(library.resolve("GetTouchInputInfo")); + CloseTouchInputHandle = (qt_CloseTouchInputHandlePtr)(library.resolve("CloseTouchInputHandle")); touchInputIDToTouchPointID.clear(); } -- cgit v1.2.3 From 28c7798752b35d68eaa6f0dfe1cad91965f90729 Mon Sep 17 00:00:00 2001 From: Benjamin Poulain Date: Fri, 17 Jul 2009 09:44:45 +0200 Subject: Update the example TrafficInfo for GCC 3.3 The example TrafficInfo did not compile on GCC 3.3 due to a bug in the parser of GCC. Task-number: 258208 --- examples/xmlpatterns/trafficinfo/mainwindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/xmlpatterns/trafficinfo/mainwindow.cpp b/examples/xmlpatterns/trafficinfo/mainwindow.cpp index 428ed76d2..c6bd313bd 100644 --- a/examples/xmlpatterns/trafficinfo/mainwindow.cpp +++ b/examples/xmlpatterns/trafficinfo/mainwindow.cpp @@ -111,7 +111,9 @@ void MainWindow::mousePressEvent(QMouseEvent *event) void MainWindow::paintEvent(QPaintEvent*) { - QLinearGradient gradient(QPoint(width()/2, 0), QPoint(width()/2, height())); + const QPoint start(width()/2, 0); + const QPoint finalStop(width()/2, height()); + QLinearGradient gradient(start, finalStop); const QColor qtGreen(102, 176, 54); gradient.setColorAt(0, qtGreen.dark()); gradient.setColorAt(0.5, qtGreen); -- cgit v1.2.3 From 83d9c5978fd5089457a28f16be6d26b047d80b7d Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 17 Jul 2009 10:34:50 +0200 Subject: Doc: Fixed grammar. Reviewed-by: Trust Me --- src/corelib/xml/qxmlstream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp index 1fc2a9f08..42ed04efc 100644 --- a/src/corelib/xml/qxmlstream.cpp +++ b/src/corelib/xml/qxmlstream.cpp @@ -568,7 +568,7 @@ bool QXmlStreamReader::atEnd() const returns true, hasError() returns true, and this function returns QXmlStreamReader::Invalid. - The exception is when error() return PrematureEndOfDocumentError. + The exception is when error() returns PrematureEndOfDocumentError. This error is reported when the end of an otherwise well-formed chunk of XML is reached, but the chunk doesn't represent a complete XML document. In that case, parsing \e can be resumed by calling -- cgit v1.2.3 From 57e3851401b1098ad760073cdbc5d215b791475a Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Fri, 17 Jul 2009 10:47:50 +0200 Subject: Enhanced QDirModel documentation Reviewed-by: Volker Hilsheimer --- src/gui/itemviews/qdirmodel.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/itemviews/qdirmodel.cpp b/src/gui/itemviews/qdirmodel.cpp index d75aa6a02..c3a080c92 100644 --- a/src/gui/itemviews/qdirmodel.cpp +++ b/src/gui/itemviews/qdirmodel.cpp @@ -227,7 +227,10 @@ void QDirModelPrivate::invalidate() \note QDirModel requires an instance of a GUI application. - \sa nameFilters(), setFilter(), filter(), QListView, QTreeView, + \note The usage of QDirModel is not recommended anymore. The + QFileSystemModel class is a more performant alternative. + + \sa nameFilters(), setFilter(), filter(), QListView, QTreeView, QFileSystemModel {Dir View Example}, {Model Classes} */ -- cgit v1.2.3 From d302a3f4738226afd1f3985fe5cb0a75c87da369 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Fri, 17 Jul 2009 10:53:06 +0200 Subject: Removed outdated information from QNetworkRequest documentation Reviewed-by: TrustMe --- src/network/access/qnetworkrequest.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index 7e73d581c..645cd5201 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -153,9 +153,7 @@ QT_BEGIN_NAMESPACE future uses. If the value is false, the data obtained will not be automatically cached. If true, data may be cached, provided it is cacheable (what is cacheable depends on the protocol - being used). Note that the default QNetworkAccessManager - implementation does not support caching, so it will ignore - this attribute. + being used). \value SourceIsFromCacheAttribute Replies only, type: QVariant::Bool (default: false) -- cgit v1.2.3 From 11e010c1b72c5309cff4123a6835414283530d74 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Fri, 17 Jul 2009 11:00:26 +0200 Subject: tst_qnetworkreply: Removed warning Reviewed-by: TrustMe --- tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index ff315de4e..842befb1d 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -3124,6 +3124,7 @@ public slots: } void bytesWrittenSlot(qint64 amount) { + Q_UNUSED(amount); if (dataSent == dataSize && client) { // close eventually -- cgit v1.2.3 From ee11f5d277e9df92e58c7c1c73c9a44359ce9b0f Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Fri, 17 Jul 2009 11:02:37 +0200 Subject: Fixed another memory leak in Phonon on windows This would happen if you we didn't free the memory allocator when disconnecting the fake source from a sink (eg. video renderer) --- src/3rdparty/phonon/ds9/qpin.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/3rdparty/phonon/ds9/qpin.cpp b/src/3rdparty/phonon/ds9/qpin.cpp index 3762a90be..68a4ec0c9 100644 --- a/src/3rdparty/phonon/ds9/qpin.cpp +++ b/src/3rdparty/phonon/ds9/qpin.cpp @@ -303,9 +303,7 @@ namespace Phonon setConnected(0); setConnectedType(defaultMediaType); - if (m_direction == PINDIR_INPUT) { - setMemoryAllocator(0); - } + setMemoryAllocator(0); return S_OK; } -- cgit v1.2.3 From 4652f0e0a03083b5baa1488237084333b134c516 Mon Sep 17 00:00:00 2001 From: mae Date: Thu, 18 Jun 2009 11:52:54 +0200 Subject: Fix accidental selection of popup items under the mouse in QComboBox If the widget under mouse is hidden, Qt can generate a synthetic mouse move event which gets delivered to the already hidden widget. This can then result in the wrong item being selected. Workaround: in QListView, ignore mouse move events when the widget is hidden. Reviewed-by: Denis --- src/gui/itemviews/qlistview.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp index d410a5733..cc6277e23 100644 --- a/src/gui/itemviews/qlistview.cpp +++ b/src/gui/itemviews/qlistview.cpp @@ -827,6 +827,8 @@ void QListView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e */ void QListView::mouseMoveEvent(QMouseEvent *e) { + if (!isVisible()) + return; Q_D(QListView); QAbstractItemView::mouseMoveEvent(e); if (state() == DragSelectingState -- cgit v1.2.3 From bb5692384aef0b87362966609b8fd58c0974e4b5 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Fri, 17 Jul 2009 03:09:10 -0700 Subject: Clean up directfb bit flipping DirectFB declares variables that are bit fields as enums. E.g. DFBSurfaceCapabilities caps; caps |= DSCAPS_LOCK; // doesn't compile in C++ Work around this problem by declaring operators for these operations. This greatly improves the readability of the code. Reviewed-by: TrustMe --- src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp | 2 +- .../gfxdrivers/directfb/qdirectfbpaintdevice.cpp | 19 +++---- .../gfxdrivers/directfb/qdirectfbpaintdevice.h | 18 +++---- .../gfxdrivers/directfb/qdirectfbpixmap.cpp | 2 +- src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h | 2 +- .../gfxdrivers/directfb/qdirectfbscreen.cpp | 62 +++++++++------------- src/plugins/gfxdrivers/directfb/qdirectfbscreen.h | 18 ++++++- .../gfxdrivers/directfb/qdirectfbwindowsurface.cpp | 12 ++--- 8 files changed, 66 insertions(+), 69 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp index 15fb6f4b9..694ba51be 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp @@ -101,7 +101,7 @@ QDirectFBMouseHandlerPrivate::QDirectFBMouseHandlerPrivate(QDirectFBMouseHandler #endif DFBInputDeviceCapabilities caps; - caps = DFBInputDeviceCapabilities(DICAPS_BUTTONS | DICAPS_AXES); + caps = DICAPS_BUTTONS | DICAPS_AXES; result = fb->CreateInputEventBuffer(fb, caps, DFB_TRUE, &eventBuffer); if (result != DFB_OK) { DirectFBError("QDirectFBMouseHandler: " diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp index 178dbae9c..8ad52641b 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp @@ -56,20 +56,17 @@ IDirectFBSurface *QDirectFBPaintDevice::directFBSurface() const } -void QDirectFBPaintDevice::lockDirectFB(uint flags) +void QDirectFBPaintDevice::lockDirectFB(DFBSurfaceLockFlags flags) { if (!(lock & flags)) { if (lock) unlockDirectFB(); - if ((mem = QDirectFBScreen::lockSurface(dfbSurface, flags, &bpl))) { - const QSize s = size(); - lockedImage = new QImage(mem, s.width(), s.height(), bpl, - QDirectFBScreen::getImageFormat(dfbSurface)); - lock = flags; - Q_ASSERT(mem); - } else { - lock = 0; - } + mem = QDirectFBScreen::lockSurface(dfbSurface, flags, &bpl); + Q_ASSERT(mem); + const QSize s = size(); + lockedImage = new QImage(mem, s.width(), s.height(), bpl, + QDirectFBScreen::getImageFormat(dfbSurface)); + lock = flags; } } @@ -83,7 +80,7 @@ void QDirectFBPaintDevice::unlockDirectFB() delete lockedImage; lockedImage = 0; mem = 0; - lock = 0; + lock = DFBSurfaceLockFlags(0); } diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h index 32c49bb92..248a15b34 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h @@ -51,14 +51,14 @@ QT_BEGIN_HEADER QT_MODULE(Gui) // Inherited by both window surface and pixmap -class QDirectFBPaintDevice : public QCustomRasterPaintDevice + class QDirectFBPaintDevice : public QCustomRasterPaintDevice { public: ~QDirectFBPaintDevice(); IDirectFBSurface *directFBSurface() const; - void lockDirectFB(uint flags); + void lockDirectFB(DFBSurfaceLockFlags lock); void unlockDirectFB(); // Reimplemented from QCustomRasterPaintDevice: @@ -67,16 +67,12 @@ public: int bytesPerLine() const; QSize size() const; int metric(QPaintDevice::PaintDeviceMetric metric) const; - uint lockFlags() const { return lock; } + DFBSurfaceLockFlags lockFlags() const { return lock; } protected: // Shouldn't create QDirectFBPaintDevice by itself but only sub-class it: QDirectFBPaintDevice(QDirectFBScreen *scr = QDirectFBScreen::instance()) - : QCustomRasterPaintDevice(0), - dfbSurface(0), - lockedImage(0), - screen(scr), - lock(0), - mem(0) + : QCustomRasterPaintDevice(0), dfbSurface(0), lockedImage(0), screen(scr), + lock(DFBSurfaceLockFlags(0)), mem(0) {} inline int dotsPerMeterX() const @@ -92,11 +88,11 @@ protected: QImage *lockedImage; QDirectFBScreen *screen; int bpl; - uint lock; + DFBSurfaceLockFlags lock; uchar *mem; private: Q_DISABLE_COPY(QDirectFBPaintDevice) -}; + }; QT_END_HEADER diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp index c75cba64a..dd7faf328 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp @@ -374,7 +374,7 @@ QImage *QDirectFBPixmapData::buffer() return lockedImage; } -QImage * QDirectFBPixmapData::buffer(uint lockFlags) +QImage * QDirectFBPixmapData::buffer(DFBSurfaceLockFlags lockFlags) { lockDirectFB(lockFlags); return lockedImage; diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h index ad6c38e4e..8f3ce4161 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h @@ -70,7 +70,7 @@ public: QImage toImage() const; QPaintEngine* paintEngine() const; virtual QImage *buffer(); - QImage *buffer(uint lockFlags); + QImage *buffer(DFBSurfaceLockFlags lockFlags); // Pure virtual in QPixmapData, so re-implement here and delegate to QDirectFBPaintDevice int metric(QPaintDevice::PaintDeviceMetric m) const {return QDirectFBPaintDevice::metric(m);} diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index b2e424c16..ecead0b00 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -208,7 +208,7 @@ IDirectFBSurface *QDirectFBScreen::createDFBSurface(const QSize &size, { DFBSurfaceDescription desc; memset(&desc, 0, sizeof(DFBSurfaceDescription)); - desc.flags = DFBSurfaceDescriptionFlags(DSDESC_WIDTH|DSDESC_HEIGHT); + desc.flags |= DSDESC_WIDTH|DSDESC_HEIGHT; if (!QDirectFBScreen::initSurfaceDescriptionPixelFormat(&desc, format)) return 0; desc.width = size.width(); @@ -230,9 +230,9 @@ IDirectFBSurface *QDirectFBScreen::createDFBSurface(DFBSurfaceDescription desc, // Add the video only capability. This means the surface will be created in video ram if (!(desc.flags & DSDESC_CAPS)) { desc.caps = DSCAPS_VIDEOONLY; - desc.flags = DFBSurfaceDescriptionFlags(desc.flags | DSDESC_CAPS); + desc.flags |= DSDESC_CAPS; } else { - desc.caps = DFBSurfaceCapabilities(desc.caps | DSCAPS_VIDEOONLY); + desc.caps |= DSCAPS_VIDEOONLY; } result = d_ptr->dfb->CreateSurface(d_ptr->dfb, &desc, &newSurface); if (result != DFB_OK @@ -247,11 +247,11 @@ IDirectFBSurface *QDirectFBScreen::createDFBSurface(DFBSurfaceDescription desc, desc.preallocated[0].data, desc.preallocated[0].pitch, DirectFBErrorString(result)); } - desc.caps = DFBSurfaceCapabilities(desc.caps & ~DSCAPS_VIDEOONLY); + desc.caps &= ~DSCAPS_VIDEOONLY; } if (d_ptr->directFBFlags & SystemOnly) - desc.caps = DFBSurfaceCapabilities(desc.caps | DSCAPS_SYSTEMONLY); + desc.caps |= DSCAPS_SYSTEMONLY; if (!newSurface) result = d_ptr->dfb->CreateSurface(d_ptr->dfb, &desc, &newSurface); @@ -459,20 +459,16 @@ DFBSurfaceDescription QDirectFBScreen::getSurfaceDescription(const QImage &image const DFBSurfacePixelFormat format = getSurfacePixelFormat(image.format()); if (format == DSPF_UNKNOWN || image.isNull()) { - description.flags = DFBSurfaceDescriptionFlags(0); + description.flags = DSDESC_NONE; return description; } - description.flags = DFBSurfaceDescriptionFlags(DSDESC_WIDTH - | DSDESC_HEIGHT -#ifndef QT_NO_DIRECTFB_PREALLOCATED - | DSDESC_PREALLOCATED -#endif - | DSDESC_PIXELFORMAT); + description.flags = DSDESC_WIDTH|DSDESC_HEIGHT|DSDESC_PIXELFORMAT; QDirectFBScreen::initSurfaceDescriptionPixelFormat(&description, image.format()); description.width = image.width(); description.height = image.height(); #ifndef QT_NO_DIRECTFB_PREALLOCATED + description.flags |= DSDESC_PREALLOCATED; description.preallocated[0].data = (void*)(image.bits()); description.preallocated[0].pitch = image.bytesPerLine(); description.preallocated[1].data = 0; @@ -491,11 +487,7 @@ DFBSurfaceDescription QDirectFBScreen::getSurfaceDescription(const uint *buffer, DFBSurfaceDescription description; memset(&description, 0, sizeof(DFBSurfaceDescription)); - description.flags = DFBSurfaceDescriptionFlags(DSDESC_CAPS - | DSDESC_WIDTH - | DSDESC_HEIGHT - | DSDESC_PIXELFORMAT - | DSDESC_PREALLOCATED); + description.flags = DSDESC_CAPS|DSDESC_WIDTH|DSDESC_HEIGHT|DSDESC_PIXELFORMAT|DSDESC_PREALLOCATED; description.caps = DSCAPS_PREMULTIPLIED; description.width = length; description.height = 1; @@ -504,8 +496,7 @@ DFBSurfaceDescription QDirectFBScreen::getSurfaceDescription(const uint *buffer, description.preallocated[0].pitch = length * sizeof(uint); description.preallocated[1].data = 0; description.preallocated[1].pitch = 0; - - return description; +return description; } #ifndef QT_NO_DIRECTFB_PALETTE @@ -727,19 +718,19 @@ void QDirectFBScreenPrivate::setFlipFlags(const QStringList &args) flipFlags = DSFLIP_NONE; foreach(const QString &flip, flips) { if (flip == QLatin1String("wait")) - flipFlags = DFBSurfaceFlipFlags(flipFlags | DSFLIP_WAIT); + flipFlags |= DSFLIP_WAIT; else if (flip == QLatin1String("blit")) - flipFlags = DFBSurfaceFlipFlags(flipFlags | DSFLIP_BLIT); + flipFlags |= DSFLIP_BLIT; else if (flip == QLatin1String("onsync")) - flipFlags = DFBSurfaceFlipFlags(flipFlags | DSFLIP_ONSYNC); + flipFlags |= DSFLIP_ONSYNC; else if (flip == QLatin1String("pipeline")) - flipFlags = DFBSurfaceFlipFlags(flipFlags | DSFLIP_PIPELINE); + flipFlags |= DSFLIP_PIPELINE; else qWarning("QDirectFBScreen: Unknown flip argument: %s", qPrintable(flip)); } } else { - flipFlags = DFBSurfaceFlipFlags(DSFLIP_BLIT); + flipFlags = DSFLIP_BLIT; } } @@ -933,13 +924,13 @@ bool QDirectFBScreen::connect(const QString &displaySpec) DFBSurfaceDescription description; memset(&description, 0, sizeof(DFBSurfaceDescription)); - description.flags = DFBSurfaceDescriptionFlags(DSDESC_CAPS); + description.flags = DSDESC_CAPS; if (::setIntOption(displayArgs, QLatin1String("width"), &description.width)) - description.flags = DFBSurfaceDescriptionFlags(description.flags | DSDESC_WIDTH); + description.flags |= DSDESC_WIDTH; if (::setIntOption(displayArgs, QLatin1String("height"), &description.height)) - description.flags = DFBSurfaceDescriptionFlags(description.flags | DSDESC_HEIGHT); + description.flags |= DSDESC_HEIGHT; - uint caps = DSCAPS_PRIMARY|DSCAPS_DOUBLE; + description.caps = DSCAPS_PRIMARY|DSCAPS_DOUBLE; struct { const char *name; const DFBSurfaceCapabilities cap; @@ -953,14 +944,13 @@ bool QDirectFBScreen::connect(const QString &displaySpec) }; for (int i=0; capabilities[i].name; ++i) { if (displayArgs.contains(QString::fromLatin1(capabilities[i].name), Qt::CaseInsensitive)) - caps |= capabilities[i].cap; + description.caps |= capabilities[i].cap; } if (displayArgs.contains(QLatin1String("forcepremultiplied"), Qt::CaseInsensitive)) { - caps |= DSCAPS_PREMULTIPLIED; + description.caps |= DSCAPS_PREMULTIPLIED; } - description.caps = DFBSurfaceCapabilities(caps); // We don't track the primary surface as it's released in disconnect d_ptr->dfbSurface = createDFBSurface(description, DontTrackSurface); if (!d_ptr->dfbSurface) { @@ -1218,10 +1208,10 @@ void QDirectFBScreen::compose(const QRegion ®ion) DFBSurfaceBlittingFlags flags = DSBLIT_NOFX; if (!win->isOpaque()) { - flags = DFBSurfaceBlittingFlags(flags | DSBLIT_BLEND_ALPHACHANNEL); + flags |= DSBLIT_BLEND_ALPHACHANNEL; const uint opacity = win->opacity(); if (opacity < 255) { - flags = DFBSurfaceBlittingFlags(flags | DSBLIT_BLEND_COLORALPHA); + flags |= DSBLIT_BLEND_COLORALPHA; d_ptr->dfbSurface->SetColor(d_ptr->dfbSurface, 0xff, 0xff, 0xff, opacity); } } @@ -1361,14 +1351,14 @@ bool QDirectFBScreen::initSurfaceDescriptionPixelFormat(DFBSurfaceDescription *d const DFBSurfacePixelFormat pixelformat = QDirectFBScreen::getSurfacePixelFormat(format); if (pixelformat == DSPF_UNKNOWN) return false; - description->flags = DFBSurfaceDescriptionFlags(description->flags | DSDESC_PIXELFORMAT); + description->flags |= DSDESC_PIXELFORMAT; description->pixelformat = pixelformat; if (QDirectFBScreen::isPremultiplied(format)) { if (!(description->flags & DSDESC_CAPS)) { description->caps = DSCAPS_PREMULTIPLIED; - description->flags = DFBSurfaceDescriptionFlags(description->flags | DSDESC_CAPS); + description->flags |= DSDESC_CAPS; } else { - description->caps = DFBSurfaceCapabilities(description->caps | DSCAPS_PREMULTIPLIED); + description->caps |= DSCAPS_PREMULTIPLIED; } } return true; diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h index c2c9a593e..9d1e6709e 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h @@ -51,8 +51,24 @@ QT_MODULE(Gui) #define Q_DIRECTFB_VERSION ((DIRECTFB_MAJOR_VERSION << 16) | (DIRECTFB_MINOR_VERION << 8) | DIRECTFB_MICRO_VERSION) -class QDirectFBScreenPrivate; +#include +#define DIRECTFB_DECLARE_OPERATORS_FOR_FLAGS(F) \ + static inline F operator~(F f) { return F(~int(f)); } \ + static inline F operator&(F left, F right) { return F(int(left) & int(right)); } \ + static inline F operator|(F left, F right) { return F(int(left) | int(right)); } \ + static inline F &operator|=(F &left, F right) { left = (left | right); return left; } \ + static inline F &operator&=(F &left, F right) { left = (left & right); return left; } + +DIRECTFB_DECLARE_OPERATORS_FOR_FLAGS(DFBInputDeviceCapabilities); +DIRECTFB_DECLARE_OPERATORS_FOR_FLAGS(DFBWindowDescriptionFlags); +DIRECTFB_DECLARE_OPERATORS_FOR_FLAGS(DFBSurfaceDescriptionFlags); +DIRECTFB_DECLARE_OPERATORS_FOR_FLAGS(DFBSurfaceCapabilities); +DIRECTFB_DECLARE_OPERATORS_FOR_FLAGS(DFBSurfaceLockFlags); +DIRECTFB_DECLARE_OPERATORS_FOR_FLAGS(DFBSurfaceBlittingFlags); +DIRECTFB_DECLARE_OPERATORS_FOR_FLAGS(DFBSurfaceDrawingFlags); +DIRECTFB_DECLARE_OPERATORS_FOR_FLAGS(DFBSurfaceFlipFlags); +class QDirectFBScreenPrivate; class Q_GUI_EXPORT QDirectFBScreen : public QScreen { public: diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp index 86ee62ccf..7dcf39831 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp @@ -106,18 +106,16 @@ void QDirectFBWindowSurface::createWindow() qFatal("QDirectFBWindowSurface: Unable to get primary display layer!"); DFBWindowDescription description; - description.caps = DFBWindowCapabilities(DWCAPS_NODECORATION); - description.flags = DFBWindowDescriptionFlags(DWDESC_CAPS - |DWDESC_SURFACE_CAPS - |DWDESC_PIXELFORMAT); + description.caps = DWCAPS_NODECORATION; + description.flags = DWDESC_CAPS|DWDESC_SURFACE_CAPS|DWDESC_PIXELFORMAT; description.surface_caps = DSCAPS_NONE; if (screen->directFBFlags() & QDirectFBScreen::VideoOnly) - description.surface_caps = DFBSurfaceCapabilities(description.surface_caps|DSCAPS_VIDEOONLY); + description.surface_caps |= DSCAPS_VIDEOONLY; const QImage::Format format = screen->pixelFormat(); description.pixelformat = QDirectFBScreen::getSurfacePixelFormat(format); if (QDirectFBScreen::isPremultiplied(format)) - description.surface_caps = DFBSurfaceCapabilities(DSCAPS_PREMULTIPLIED|description.caps); + description.surface_caps = DSCAPS_PREMULTIPLIED; DFBResult result = layer->CreateWindow(layer, &description, &dfbWindow); if (result != DFB_OK) @@ -370,7 +368,7 @@ void QDirectFBWindowSurface::flush(QWidget *widget, const QRegion ®ion, } else { if (!boundingRectFlip && region.numRects() > 1) { const QVector rects = region.rects(); - const DFBSurfaceFlipFlags nonWaitFlags = DFBSurfaceFlipFlags(flipFlags & ~DSFLIP_WAIT); + const DFBSurfaceFlipFlags nonWaitFlags = flipFlags & ~DSFLIP_WAIT; for (int i=0; i Date: Fri, 17 Jul 2009 03:17:06 -0700 Subject: Don't create dfbsurface in video mem if systemonly If DSCAPS_SYSTEMONLY is specified we shouldn't try to create the surface in video memory. Reviewed-by: TrustMe --- src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index ecead0b00..0928643f1 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -226,7 +226,9 @@ IDirectFBSurface *QDirectFBScreen::createDFBSurface(DFBSurfaceDescription desc, return 0; } - if (d_ptr->directFBFlags & VideoOnly && !(desc.flags & DSDESC_PREALLOCATED)) { + if (d_ptr->directFBFlags & VideoOnly + && !(desc.flags & DSDESC_PREALLOCATED) + && (!(desc.flags & DSDESC_CAPS) || !(desc.caps & DSCAPS_SYSTEMONLY))) { // Add the video only capability. This means the surface will be created in video ram if (!(desc.flags & DSDESC_CAPS)) { desc.caps = DSCAPS_VIDEOONLY; -- cgit v1.2.3 From 7ddc0e5fb477a9bacb4093878fb0ab0d083b7e3f Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Fri, 17 Jul 2009 03:25:06 -0700 Subject: Remove unused function in QDirectFBPaintEngine drawColorSpan is never called from anywhere so we might as well get rid of the code. Reviewed-by: TrustMe --- .../gfxdrivers/directfb/qdirectfbpaintengine.cpp | 32 ---------------------- .../gfxdrivers/directfb/qdirectfbpaintengine.h | 2 -- 2 files changed, 34 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index 305d5beec..2245acc56 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -672,38 +672,6 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QColor &color) } } -void QDirectFBPaintEngine::drawColorSpans(const QSpan *spans, int count, - uint color) -{ - Q_D(QDirectFBPaintEngine); - color = INV_PREMUL(color); - - QVarLengthArray lines(count); - int j = 0; - for (int i = 0; i < count; ++i) { - if (spans[i].coverage == 255) { - lines[j].x1 = spans[i].x; - lines[j].y1 = spans[i].y; - lines[j].x2 = spans[i].x + spans[i].len - 1; - lines[j].y2 = spans[i].y; - ++j; - } else { - DFBSpan span = { spans[i].x, spans[i].len }; - uint c = BYTE_MUL(color, spans[i].coverage); - // ### how does this play with setDFBColor - d->surface->SetColor(d->surface, - qRed(c), qGreen(c), qBlue(c), qAlpha(c)); - d->surface->FillSpans(d->surface, spans[i].y, &span, 1); - } - } - if (j > 0) { - d->surface->SetColor(d->surface, - qRed(color), qGreen(color), qBlue(color), - qAlpha(color)); - d->surface->DrawLines(d->surface, lines.data(), j); - } -} - void QDirectFBPaintEngine::drawBufferSpan(const uint *buffer, int bufsize, int x, int y, int length, uint const_alpha) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h index 8c5877b83..e57fcc955 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h @@ -78,11 +78,9 @@ public: void drawPixmap(const QRectF &r, const QPixmap &pixmap, const QRectF &sr); void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &sr); - void drawColorSpans(const QSpan *spans, int count, uint color); void drawBufferSpan(const uint *buffer, int bufsize, int x, int y, int length, uint const_alpha); - // The following methods simply lock the surface & call the base implementation void stroke(const QVectorPath &path, const QPen &pen); void drawPath(const QPainterPath &path); -- cgit v1.2.3 From cb169009f99147d6f9e619b0e7cee2be92cbd82e Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Fri, 17 Jul 2009 03:26:43 -0700 Subject: Mark virtual functions as virtual in DFBPaintEng Make the code easier to read. Reviewed-by: TrustMe --- .../gfxdrivers/directfb/qdirectfbpaintengine.h | 53 +++++++++++----------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h index e57fcc955..6148b14ed 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h @@ -56,41 +56,40 @@ class QDirectFBPaintEngine : public QRasterPaintEngine Q_DECLARE_PRIVATE(QDirectFBPaintEngine) public: QDirectFBPaintEngine(QPaintDevice *device); - ~QDirectFBPaintEngine(); + virtual ~QDirectFBPaintEngine(); - bool begin(QPaintDevice *device); - bool end(); + virtual bool begin(QPaintDevice *device); + virtual bool end(); - void drawRects(const QRect *rects, int rectCount); - void drawRects(const QRectF *rects, int rectCount); + virtual void drawRects(const QRect *rects, int rectCount); + virtual void drawRects(const QRectF *rects, int rectCount); - void fillRect(const QRectF &r, const QBrush &brush); - void fillRect(const QRectF &r, const QColor &color); + virtual void fillRect(const QRectF &r, const QBrush &brush); + virtual void fillRect(const QRectF &r, const QColor &color); - void drawLines(const QLine *line, int lineCount); - void drawLines(const QLineF *line, int lineCount); + virtual void drawLines(const QLine *line, int lineCount); + virtual void drawLines(const QLineF *line, int lineCount); - void drawImage(const QPointF &p, const QImage &img); - void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlags falgs = Qt::AutoColor); + virtual void drawImage(const QPointF &p, const QImage &img); + virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, + Qt::ImageConversionFlags falgs = Qt::AutoColor); - void drawPixmap(const QPointF &p, const QPixmap &pm); - void drawPixmap(const QRectF &r, const QPixmap &pixmap, const QRectF &sr); - void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &sr); + virtual void drawPixmap(const QPointF &p, const QPixmap &pm); + virtual void drawPixmap(const QRectF &r, const QPixmap &pixmap, const QRectF &sr); + virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &sr); - void drawBufferSpan(const uint *buffer, int bufsize, - int x, int y, int length, uint const_alpha); + virtual void drawBufferSpan(const uint *buffer, int bufsize, + int x, int y, int length, uint const_alpha); - // The following methods simply lock the surface & call the base implementation - void stroke(const QVectorPath &path, const QPen &pen); - void drawPath(const QPainterPath &path); - void drawPoints(const QPointF *points, int pointCount); - void drawPoints(const QPoint *points, int pointCount); - void drawEllipse(const QRectF &rect); - void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); - void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode); - void drawTextItem(const QPointF &p, const QTextItem &textItem); - void fill(const QVectorPath &path, const QBrush &brush); + virtual void stroke(const QVectorPath &path, const QPen &pen); + virtual void drawPath(const QPainterPath &path); + virtual void drawPoints(const QPointF *points, int pointCount); + virtual void drawPoints(const QPoint *points, int pointCount); + virtual void drawEllipse(const QRectF &rect); + virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); + virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode); + virtual void drawTextItem(const QPointF &p, const QTextItem &textItem); + virtual void fill(const QVectorPath &path, const QBrush &brush); virtual void clipEnabledChanged(); virtual void penChanged(); -- cgit v1.2.3 From d2f9c8179173eeebc08b4b3207adb789efe4fb3a Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 17 Jul 2009 13:10:34 +0200 Subject: Doc: Updated the version numbers in the documentation metadata. Reviewed-by: Trust Me --- tools/qdoc3/test/assistant.qdocconf | 4 ++-- tools/qdoc3/test/designer.qdocconf | 4 ++-- tools/qdoc3/test/linguist.qdocconf | 4 ++-- tools/qdoc3/test/qmake.qdocconf | 4 ++-- tools/qdoc3/test/qt-build-docs.qdocconf | 4 ++-- tools/qdoc3/test/qt-inc.qdocconf | 2 +- tools/qdoc3/test/qt.qdocconf | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index b82507ff7..44815ff4a 100644 --- a/tools/qdoc3/test/assistant.qdocconf +++ b/tools/qdoc3/test/assistant.qdocconf @@ -6,14 +6,14 @@ include(qt-defines.qdocconf) project = Qt Assistant description = Qt Assistant Manual -url = http://doc.qtsoftware.com/4.5 +url = http://doc.qtsoftware.com/4.6 indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Assistant qhp.Assistant.file = assistant.qhp -qhp.Assistant.namespace = com.trolltech.assistant.452 +qhp.Assistant.namespace = com.trolltech.assistant.460 qhp.Assistant.virtualFolder = qdoc qhp.Assistant.indexTitle = Qt Assistant Manual qhp.Assistant.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index 9c0790eea..88f8dc912 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -6,14 +6,14 @@ include(qt-defines.qdocconf) project = Qt Designer description = Qt Designer Manual -url = http://doc.qtsoftware.com/4.5 +url = http://doc.qtsoftware.com/4.6 indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Designer qhp.Designer.file = designer.qhp -qhp.Designer.namespace = com.trolltech.designer.452 +qhp.Designer.namespace = com.trolltech.designer.460 qhp.Designer.virtualFolder = qdoc qhp.Designer.indexTitle = Qt Designer Manual qhp.Designer.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index da49abe5d..1c0a58598 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -6,14 +6,14 @@ include(qt-defines.qdocconf) project = Qt Linguist description = Qt Linguist Manual -url = http://doc.qtsoftware.com/4.5 +url = http://doc.qtsoftware.com/4.6 indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Linguist qhp.Linguist.file = linguist.qhp -qhp.Linguist.namespace = com.trolltech.linguist.452 +qhp.Linguist.namespace = com.trolltech.linguist.460 qhp.Linguist.virtualFolder = qdoc qhp.Linguist.indexTitle = Qt Linguist Manual qhp.Linguist.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index 5e2cac7fb..0f981325b 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -6,14 +6,14 @@ include(qt-defines.qdocconf) project = QMake description = QMake Manual -url = http://doc.qtsoftware.com/4.5 +url = http://doc.qtsoftware.com/4.6 indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = qmake qhp.qmake.file = qmake.qhp -qhp.qmake.namespace = com.trolltech.qmake.452 +qhp.qmake.namespace = com.trolltech.qmake.460 qhp.qmake.virtualFolder = qdoc qhp.qmake.indexTitle = QMake Manual qhp.qmake.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index 77b03d20b..b4f0c7a97 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -6,7 +6,7 @@ include(qt-defines.qdocconf) project = Qt description = Qt Reference Documentation -url = http://doc.qtsoftware.com/4.5 +url = http://doc.qtsoftware.com/4.6 edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \ QtXmlPatterns QtTest @@ -20,7 +20,7 @@ edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.452 +qhp.Qt.namespace = com.trolltech.qt.460 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation qhp.Qt.indexRoot = diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf index 542c7cac8..379511fec 100644 --- a/tools/qdoc3/test/qt-inc.qdocconf +++ b/tools/qdoc3/test/qt-inc.qdocconf @@ -3,7 +3,7 @@ include(macros.qdocconf) project = Qt description = Qt Reference Documentation -url = http://doc.qtsoftware.com/4.5 +url = http://doc.qtsoftware.com/4.6 edition.Console = QtCore QtNetwork QtSql QtXml QtScript QtTest edition.Desktop = QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript \ diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index d154254f7..10e0fcd81 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -8,7 +8,7 @@ project = Qt versionsym = version = %VERSION% description = Qt Reference Documentation -url = http://doc.qtsoftware.com/4.5 +url = http://doc.qtsoftware.com/4.6 edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \ QtXmlPatterns QtTest @@ -22,7 +22,7 @@ edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qt qhp.Qt.file = qt.qhp -qhp.Qt.namespace = com.trolltech.qt.452 +qhp.Qt.namespace = com.trolltech.qt.460 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation qhp.Qt.indexRoot = -- cgit v1.2.3 From 83670dbf53203757a28b10837b66f46515e1328d Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Fri, 17 Jul 2009 13:11:51 +0200 Subject: Animations: animations with 0 duration would never be auto-deleted --- src/corelib/animation/qabstractanimation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 75decf896..cf3e62d19 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -620,8 +620,8 @@ void QAbstractAnimation::start(DeletionPolicy policy) Q_D(QAbstractAnimation); if (d->state == Running) return; - d->setState(Running); d->deleteWhenStopped = policy; + d->setState(Running); } /*! -- cgit v1.2.3 From 430f93c3649aacea5d9ccab047f036027f0622ea Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Mon, 13 Jul 2009 17:48:04 +0200 Subject: tst_qhttpnetworkconnection: Fixes --- .../qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp index e116624d1..aa0705de5 100644 --- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp +++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp @@ -244,8 +244,8 @@ void tst_QHttpNetworkConnection::get() QByteArray ba; do { QCoreApplication::instance()->processEvents(); - if (reply->bytesAvailable()) - ba += reply->read(); + while (reply->bytesAvailable()) + ba += reply->readAny(); if (stopWatch.elapsed() >= 30000) break; } while (!reply->isFinished()); @@ -327,7 +327,8 @@ void tst_QHttpNetworkConnection::put() if (reply->isFinished()) { QByteArray ba; - ba += reply->read(); + while (reply->bytesAvailable()) + ba += reply->readAny(); } else if(finishedWithErrorCalled) { if(!succeed) { delete reply; @@ -417,8 +418,8 @@ void tst_QHttpNetworkConnection::post() QByteArray ba; do { QCoreApplication::instance()->processEvents(); - if (reply->bytesAvailable()) - ba += reply->read(); + while (reply->bytesAvailable()) + ba += reply->readAny(); if (stopWatch.elapsed() >= 30000) break; } while (!reply->isFinished()); @@ -616,8 +617,8 @@ void tst_QHttpNetworkConnection::compression() QByteArray ba; do { QCoreApplication::instance()->processEvents(); - if (reply->bytesAvailable()) - ba += reply->read(); + while (reply->bytesAvailable()) + ba += reply->readAny(); if (stopWatch.elapsed() >= 30000) break; } while (!reply->isFinished()); -- cgit v1.2.3 From 8ab072aff0527d3ef3e44cf1ceba7dca985a6f94 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Wed, 15 Jul 2009 12:40:53 +0200 Subject: QNetworkAccessManager: HTTP download performance improvements Better usage of move semantics with implicit sharing to avoid detaching (=malloc/memcpy). Also some other improvements. Download performance improvement is around 20% according to the httpDownloadPerformance autotest. Reviewed-by: Thiago Macieira --- src/corelib/tools/qbytedata_p.h | 200 +++++++++++++++++++++ src/corelib/tools/tools.pri | 1 + src/network/access/qhttpnetworkconnection.cpp | 61 ++++--- src/network/access/qhttpnetworkconnection_p.h | 8 +- src/network/access/qhttpnetworkreply.cpp | 78 ++++---- src/network/access/qhttpnetworkreply_p.h | 12 +- src/network/access/qnetworkaccessbackend.cpp | 4 +- src/network/access/qnetworkaccessbackend_p.h | 2 +- src/network/access/qnetworkaccessdatabackend.cpp | 6 +- .../access/qnetworkaccessdebugpipebackend.cpp | 6 +- src/network/access/qnetworkaccessfilebackend.cpp | 6 +- src/network/access/qnetworkaccessftpbackend.cpp | 6 +- src/network/access/qnetworkaccesshttpbackend.cpp | 11 +- src/network/access/qnetworkreplyimpl.cpp | 40 +++-- src/network/access/qnetworkreplyimpl_p.h | 5 +- 15 files changed, 338 insertions(+), 108 deletions(-) create mode 100644 src/corelib/tools/qbytedata_p.h diff --git a/src/corelib/tools/qbytedata_p.h b/src/corelib/tools/qbytedata_p.h new file mode 100644 index 000000000..e8a4dddfc --- /dev/null +++ b/src/corelib/tools/qbytedata_p.h @@ -0,0 +1,200 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QBYTEDATA_H +#define QBYTEDATA_H + +#include + + +// this class handles a list of QByteArrays. It is a variant of QRingBuffer +// that avoid malloc/realloc/memcpy. +class QByteDataBuffer +{ +private: + QList buffers; + qint64 bufferCompleteSize; +public: + QByteDataBuffer() : bufferCompleteSize(0) + { + } + + ~QByteDataBuffer() + { + clear(); + } + + inline void append(QByteDataBuffer& other) + { + if (other.isEmpty()) + return; + + buffers.append(other.buffers); + bufferCompleteSize += other.byteAmount(); + } + + + inline void append(QByteArray& bd) + { + if (bd.isEmpty()) + return; + + buffers.append(bd); + bufferCompleteSize += bd.size(); + } + + inline void prepend(QByteArray& bd) + { + if (bd.isEmpty()) + return; + + buffers.prepend(bd); + bufferCompleteSize += bd.size(); + } + + // return the first QByteData. User of this function has to qFree() its .data! + // preferably use this function to read data. + inline QByteArray read() + { + bufferCompleteSize -= buffers.first().size(); + return buffers.takeFirst(); + } + + // return everything. User of this function has to qFree() its .data! + // avoid to use this, it might malloc and memcpy. + inline QByteArray readAll() + { + return read(byteAmount()); + } + + // return amount. User of this function has to qFree() its .data! + // avoid to use this, it might malloc and memcpy. + inline QByteArray read(qint64 amount) + { + amount = qMin(byteAmount(), amount); + QByteArray byteData; + byteData.resize(amount); + read(byteData.data(), byteData.size()); + return byteData; + } + + // return amount bytes. User of this function has to qFree() its .data! + // avoid to use this, it will memcpy. + qint64 read(char* dst, qint64 amount) + { + amount = qMin(amount, byteAmount()); + qint64 originalAmount = amount; + char *writeDst = dst; + + while (amount > 0) { + QByteArray first = buffers.takeFirst(); + if (amount >= first.size()) { + // take it completely + bufferCompleteSize -= first.size(); + amount -= first.size(); + memcpy(writeDst, first.constData(), first.size()); + writeDst += first.size(); + first.clear(); + } else { + // take a part of it & it is the last one to take + bufferCompleteSize -= amount; + memcpy(writeDst, first.constData(), amount); + + qint64 newFirstSize = first.size() - amount; + QByteArray newFirstData; + newFirstData.resize(newFirstSize); + memcpy(newFirstData.data(), first.constData() + amount, newFirstSize); + buffers.prepend(newFirstData); + + amount = 0; + first.clear(); + } + } + + return originalAmount; + } + + inline char getChar() + { + char c; + read(&c, 1); + return c; + } + + inline void clear() + { + buffers.clear(); + bufferCompleteSize = 0; + } + + // The byte count of all QByteArrays + inline qint64 byteAmount() const + { + return bufferCompleteSize; + } + + // the number of QByteArrays + inline qint64 bufferCount() const + { + return buffers.length(); + } + + inline bool isEmpty() const + { + return byteAmount() == 0; + } + + inline qint64 sizeNextBlock() const + { + if(buffers.isEmpty()) + return 0; + else + return buffers.first().size(); + } + + inline QByteArray& operator[](int i) + { + return buffers[i]; + } +}; + + +#endif // QBYTEDATA_H diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index c93a065cb..08c94ac2b 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -5,6 +5,7 @@ HEADERS += \ tools/qbitarray.h \ tools/qbytearray.h \ tools/qbytearraymatcher.h \ + tools/qbytedata_p.h \ tools/qcache.h \ tools/qchar.h \ tools/qcontainerfwd.h \ diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index f1da244f4..afcdf1712 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -175,26 +175,43 @@ bool QHttpNetworkConnectionPrivate::isSocketReading(QAbstractSocket *socket) con return (i != -1 && (channels[i].state & ReadingState)); } +void QHttpNetworkConnectionPrivate::appendUncompressedData(QHttpNetworkReply &reply, QByteArray &qba) +{ + reply.d_func()->responseData.append(qba); + + // clear the original! helps with implicit sharing and + // avoiding memcpy when the user is reading the data + qba.clear(); +} -void QHttpNetworkConnectionPrivate::appendUncompressedData(QHttpNetworkReply &reply, const QByteArray &fragment) +void QHttpNetworkConnectionPrivate::appendUncompressedData(QHttpNetworkReply &reply, QByteDataBuffer &data) { - char *dst = reply.d_func()->responseData.reserve(fragment.size()); - qMemCopy(dst, fragment.constData(), fragment.size()); + reply.d_func()->responseData.append(data); + + // clear the original! helps with implicit sharing and + // avoiding memcpy when the user is reading the data + data.clear(); } -void QHttpNetworkConnectionPrivate::appendCompressedData(QHttpNetworkReply &reply, const QByteArray &fragment) +void QHttpNetworkConnectionPrivate::appendCompressedData(QHttpNetworkReply &reply, QByteDataBuffer &data) { - reply.d_func()->compressedData.append(fragment); + // Work in progress: Later we will directly use a list of QByteArray or a QRingBuffer + // instead of one QByteArray. + for(int i = 0; i < data.bufferCount(); i++) { + QByteArray &byteData = data[i]; + reply.d_func()->compressedData.append(byteData.constData(), byteData.size()); + } + data.clear(); } qint64 QHttpNetworkConnectionPrivate::uncompressedBytesAvailable(const QHttpNetworkReply &reply) const { - return reply.d_func()->responseData.size(); + return reply.d_func()->responseData.byteAmount(); } qint64 QHttpNetworkConnectionPrivate::uncompressedBytesAvailableNextBlock(const QHttpNetworkReply &reply) const { - return reply.d_func()->responseData.nextDataBlockSize(); + return reply.d_func()->responseData.sizeNextBlock(); } qint64 QHttpNetworkConnectionPrivate::compressedBytesAvailable(const QHttpNetworkReply &reply) const @@ -202,21 +219,6 @@ qint64 QHttpNetworkConnectionPrivate::compressedBytesAvailable(const QHttpNetwor return reply.d_func()->compressedData.size(); } -qint64 QHttpNetworkConnectionPrivate::read(QHttpNetworkReply &reply, QByteArray &data, qint64 maxSize) -{ - QRingBuffer *rb = &reply.d_func()->responseData; - if (maxSize == -1 || maxSize >= rb->size()) { - // read the whole data - data = rb->readAll(); - rb->clear(); - } else { - // read only the requested length - data.resize(maxSize); - rb->read(data.data(), maxSize); - } - return data.size(); -} - void QHttpNetworkConnectionPrivate::eraseData(QHttpNetworkReply *reply) { reply->d_func()->compressedData.clear(); @@ -556,6 +558,8 @@ bool QHttpNetworkConnectionPrivate::expand(QAbstractSocket *socket, QHttpNetwork reply->d_func()->totalProgress += inflated.size(); appendUncompressedData(*reply, inflated); if (shouldEmitSignals(reply)) { + // important: At the point of this readyRead(), inflated must be cleared, + // else implicit sharing will trigger memcpy when the user is reading data! emit reply->readyRead(); // make sure that the reply is valid if (channels[i].reply != reply) @@ -672,18 +676,19 @@ void QHttpNetworkConnectionPrivate::receiveReply(QAbstractSocket *socket, QHttpN { // use the traditional slower reading (for compressed encoding, chunked encoding, // no content-length etc) - QBuffer fragment; - fragment.open(QIODevice::WriteOnly); - bytes = reply->d_func()->readBody(socket, &fragment); + QByteDataBuffer byteDatas; + bytes = reply->d_func()->readBody(socket, &byteDatas); if (bytes) { if (reply->d_func()->autoDecompress) - appendCompressedData(*reply, fragment.data()); + appendCompressedData(*reply, byteDatas); else - appendUncompressedData(*reply, fragment.data()); + appendUncompressedData(*reply, byteDatas); if (!reply->d_func()->autoDecompress) { - reply->d_func()->totalProgress += fragment.size(); + reply->d_func()->totalProgress += bytes; if (shouldEmitSignals(reply)) { + // important: At the point of this readyRead(), the byteDatas list must be empty, + // else implicit sharing will trigger memcpy when the user is reading data! emit reply->readyRead(); // make sure that the reply is valid if (channels[i].reply != reply) diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index a0813d409..842a2f4f3 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -79,6 +79,7 @@ QT_BEGIN_NAMESPACE class QHttpNetworkRequest; class QHttpNetworkReply; +class QByteArray; class QHttpNetworkConnectionPrivate; class Q_AUTOTEST_EXPORT QHttpNetworkConnection : public QObject @@ -255,15 +256,14 @@ public: bool pendingAuthSignal; // there is an incomplete authentication signal bool pendingProxyAuthSignal; // there is an incomplete proxy authentication signal - void appendUncompressedData(QHttpNetworkReply &reply, const QByteArray &fragment); - void appendCompressedData(QHttpNetworkReply &reply, const QByteArray &fragment); + void appendUncompressedData(QHttpNetworkReply &reply, QByteArray &qba); + void appendUncompressedData(QHttpNetworkReply &reply, QByteDataBuffer &data); + void appendCompressedData(QHttpNetworkReply &reply, QByteDataBuffer &data); qint64 uncompressedBytesAvailable(const QHttpNetworkReply &reply) const; qint64 uncompressedBytesAvailableNextBlock(const QHttpNetworkReply &reply) const; qint64 compressedBytesAvailable(const QHttpNetworkReply &reply) const; - qint64 read(QHttpNetworkReply &reply, QByteArray &data, qint64 maxSize); - void emitReplyError(QAbstractSocket *socket, QHttpNetworkReply *reply, QNetworkReply::NetworkError errorCode); bool handleAuthenticateChallenge(QAbstractSocket *socket, QHttpNetworkReply *reply, bool isProxy, bool &resend); void allDone(QAbstractSocket *socket, QHttpNetworkReply *reply); diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp index 7a616aa7e..2fe0d78cf 100644 --- a/src/network/access/qhttpnetworkreply.cpp +++ b/src/network/access/qhttpnetworkreply.cpp @@ -176,15 +176,6 @@ qint64 QHttpNetworkReply::bytesAvailableNextBlock() const return -1; } -QByteArray QHttpNetworkReply::read(qint64 maxSize) -{ - Q_D(QHttpNetworkReply); - QByteArray data; - if (d->connection) - d->connection->d_func()->read(*this, data, maxSize); - return data; -} - QByteArray QHttpNetworkReply::readAny() { Q_D(QHttpNetworkReply); @@ -203,7 +194,7 @@ QHttpNetworkReplyPrivate::QHttpNetworkReplyPrivate(const QUrl &newUrl) majorVersion(0), minorVersion(0), bodyLength(0), contentRead(0), totalProgress(0), chunkedTransferEncoding(0), currentChunkSize(0), currentChunkRead(0), connection(0), initInflate(false), - autoDecompress(false), responseData(0), requestIsPrepared(false) + autoDecompress(false), responseData(), requestIsPrepared(false) { } @@ -561,17 +552,19 @@ bool QHttpNetworkReplyPrivate::connectionCloseEnabled() // note this function can only be used for non-chunked, non-compressed with // known content length -qint64 QHttpNetworkReplyPrivate::readBodyFast(QAbstractSocket *socket, QRingBuffer *rb) -{ - quint64 toBeRead = qMin(socket->bytesAvailable(), bodyLength - contentRead); - char* dst = rb->reserve(toBeRead); - qint64 haveRead = socket->read(dst, toBeRead); +qint64 QHttpNetworkReplyPrivate::readBodyFast(QAbstractSocket *socket, QByteDataBuffer *rb) +{ + qint64 toBeRead = qMin(socket->bytesAvailable(), bodyLength - contentRead); + QByteArray bd; + bd.resize(toBeRead); + qint64 haveRead = socket->read(bd.data(), bd.size()); if (haveRead == -1) { - rb->chop(toBeRead); + bd.clear(); return 0; // ### error checking here; } + bd.resize(haveRead); - rb->chop(toBeRead - haveRead); + rb->append(bd); if (contentRead + haveRead == bodyLength) { state = AllDoneState; @@ -583,7 +576,7 @@ qint64 QHttpNetworkReplyPrivate::readBodyFast(QAbstractSocket *socket, QRingBuff } -qint64 QHttpNetworkReplyPrivate::readBody(QAbstractSocket *socket, QIODevice *out) +qint64 QHttpNetworkReplyPrivate::readBody(QAbstractSocket *socket, QByteDataBuffer *out) { qint64 bytes = 0; if (isChunked()) { @@ -601,33 +594,35 @@ qint64 QHttpNetworkReplyPrivate::readBody(QAbstractSocket *socket, QIODevice *ou return bytes; } -qint64 QHttpNetworkReplyPrivate::readReplyBodyRaw(QIODevice *in, QIODevice *out, qint64 size) +qint64 QHttpNetworkReplyPrivate::readReplyBodyRaw(QIODevice *in, QByteDataBuffer *out, qint64 size) { qint64 bytes = 0; Q_ASSERT(in); Q_ASSERT(out); int toBeRead = qMin(128*1024, qMin(size, in->bytesAvailable())); - QByteArray raw(toBeRead, 0); - while (size > 0) { - qint64 read = in->read(raw.data(), raw.size()); - if (read == 0) - return bytes; - // ### error checking here - qint64 written = out->write(raw.data(), read); - if (written == 0) + while (toBeRead > 0) { + QByteArray byteData; + byteData.resize(toBeRead); + qint64 haveRead = in->read(byteData.data(), byteData.size()); + if (haveRead <= 0) { + // ### error checking here + byteData.clear(); return bytes; - if (read != written) - qDebug() << "### read" << read << "written" << written; - bytes += read; - size -= read; - out->waitForBytesWritten(-1); // throttle + } + + byteData.resize(haveRead); + out->append(byteData); + bytes += haveRead; + size -= haveRead; + + toBeRead = qMin(128*1024, qMin(size, in->bytesAvailable())); } return bytes; } -qint64 QHttpNetworkReplyPrivate::readReplyBodyChunked(QIODevice *in, QIODevice *out) +qint64 QHttpNetworkReplyPrivate::readReplyBodyChunked(QIODevice *in, QByteDataBuffer *out) { qint64 bytes = 0; while (in->bytesAvailable()) { // while we can read from input @@ -648,17 +643,14 @@ qint64 QHttpNetworkReplyPrivate::readReplyBodyChunked(QIODevice *in, QIODevice * state = AllDoneState; break; } - // otherwise, read data - qint64 readSize = qMin(in->bytesAvailable(), currentChunkSize - currentChunkRead); - QByteArray buffer(readSize, 0); - qint64 read = in->read(buffer.data(), readSize); - bytes += read; - currentChunkRead += read; - qint64 written = out->write(buffer); - Q_UNUSED(written); // Avoid compile warning when building release - Q_ASSERT(read == written); + + // otherwise, try to read what is missing for this chunk + qint64 haveRead = readReplyBodyRaw (in, out, currentChunkSize - currentChunkRead); + currentChunkRead += haveRead; + bytes += haveRead; + // ### error checking here - out->waitForBytesWritten(-1); + } return bytes; } diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index 5eb70ce0b..fbbee127b 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -80,6 +80,7 @@ static const unsigned char gz_magic[2] = {0x1f, 0x8b}; // gzip magic header #include #include #include +#include QT_BEGIN_NAMESPACE @@ -122,7 +123,6 @@ public: qint64 bytesAvailable() const; qint64 bytesAvailableNextBlock() const; - QByteArray read(qint64 maxSize = -1); QByteArray readAny(); bool isFinished() const; @@ -160,14 +160,14 @@ public: bool parseStatus(const QByteArray &status); qint64 readHeader(QAbstractSocket *socket); void parseHeader(const QByteArray &header); - qint64 readBody(QAbstractSocket *socket, QIODevice *out); - qint64 readBodyFast(QAbstractSocket *socket, QRingBuffer *rb); + qint64 readBody(QAbstractSocket *socket, QByteDataBuffer *out); + qint64 readBodyFast(QAbstractSocket *socket, QByteDataBuffer *rb); bool findChallenge(bool forProxy, QByteArray &challenge) const; QAuthenticatorPrivate::Method authenticationMethod(bool isProxy) const; void clear(); - qint64 readReplyBodyRaw(QIODevice *in, QIODevice *out, qint64 size); - qint64 readReplyBodyChunked(QIODevice *in, QIODevice *out); + qint64 readReplyBodyRaw(QIODevice *in, QByteDataBuffer *out, qint64 size); + qint64 readReplyBodyChunked(QIODevice *in, QByteDataBuffer *out); qint64 getChunkSize(QIODevice *in, qint64 *chunkSize); qint64 bytesAvailable() const; @@ -209,7 +209,7 @@ public: #endif bool autoDecompress; - QRingBuffer responseData; // uncompressed body + QByteDataBuffer responseData; // uncompressed body QByteArray compressedData; // compressed body (temporary) bool requestIsPrepared; }; diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp index 88ae8947f..9e17b5489 100644 --- a/src/network/access/qnetworkaccessbackend.cpp +++ b/src/network/access/qnetworkaccessbackend.cpp @@ -217,9 +217,9 @@ qint64 QNetworkAccessBackend::nextDownstreamBlockSize() const return reply->nextDownstreamBlockSize(); } -void QNetworkAccessBackend::writeDownstreamData(const QByteArray &data) +void QNetworkAccessBackend::writeDownstreamData(QByteDataBuffer &list) { - reply->appendDownstreamData(data); + reply->appendDownstreamData(list); } void QNetworkAccessBackend::writeDownstreamData(QIODevice *data) diff --git a/src/network/access/qnetworkaccessbackend_p.h b/src/network/access/qnetworkaccessbackend_p.h index 21cb4a6f9..553b79588 100644 --- a/src/network/access/qnetworkaccessbackend_p.h +++ b/src/network/access/qnetworkaccessbackend_p.h @@ -166,7 +166,7 @@ protected: // these functions control the downstream mechanism // that is, data that has come via the connection and is going out the backend qint64 nextDownstreamBlockSize() const; - void writeDownstreamData(const QByteArray &data); + void writeDownstreamData(QByteDataBuffer &list); public slots: // for task 251801, needs to be a slot to be called asynchronously diff --git a/src/network/access/qnetworkaccessdatabackend.cpp b/src/network/access/qnetworkaccessdatabackend.cpp index 609f0c5bd..4436cf4ce 100644 --- a/src/network/access/qnetworkaccessdatabackend.cpp +++ b/src/network/access/qnetworkaccessdatabackend.cpp @@ -117,7 +117,11 @@ void QNetworkAccessDataBackend::open() setHeader(QNetworkRequest::ContentLengthHeader, payload.size()); emit metaDataChanged(); - writeDownstreamData(payload); + QByteDataBuffer list; + list.append(payload); + payload.clear(); // important because of implicit sharing! + writeDownstreamData(list); + finished(); return; } diff --git a/src/network/access/qnetworkaccessdebugpipebackend.cpp b/src/network/access/qnetworkaccessdebugpipebackend.cpp index 54fcddd79..2b3c128b4 100644 --- a/src/network/access/qnetworkaccessdebugpipebackend.cpp +++ b/src/network/access/qnetworkaccessdebugpipebackend.cpp @@ -155,7 +155,11 @@ void QNetworkAccessDebugPipeBackend::pushFromSocketToDownstream() // have read something buffer.resize(haveRead); bytesDownloaded += haveRead; - writeDownstreamData(buffer); + + QByteDataBuffer list; + list.append(buffer); + buffer.clear(); // important because of implicit sharing! + writeDownstreamData(list); } } } diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp index e3fc8bf99..533fc75ab 100644 --- a/src/network/access/qnetworkaccessfilebackend.cpp +++ b/src/network/access/qnetworkaccessfilebackend.cpp @@ -263,7 +263,11 @@ bool QNetworkAccessFileBackend::readMoreFromFile() data.resize(actuallyRead); totalBytes += actuallyRead; - writeDownstreamData(data); + + QByteDataBuffer list; + list.append(data); + data.clear(); // important because of implicit sharing! + writeDownstreamData(list); } return true; } diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp index d6276a3c2..911b31a67 100644 --- a/src/network/access/qnetworkaccessftpbackend.cpp +++ b/src/network/access/qnetworkaccessftpbackend.cpp @@ -355,7 +355,11 @@ void QNetworkAccessFtpBackend::ftpDone() void QNetworkAccessFtpBackend::ftpReadyRead() { - writeDownstreamData(ftp->readAll()); + QByteArray data = ftp->readAll(); + QByteDataBuffer list; + list.append(data); + data.clear(); // important because of implicit sharing! + writeDownstreamData(list); } void QNetworkAccessFtpBackend::ftpRawCommandReply(int code, const QString &text) diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp index db84e581b..9c36026a1 100644 --- a/src/network/access/qnetworkaccesshttpbackend.cpp +++ b/src/network/access/qnetworkaccesshttpbackend.cpp @@ -653,10 +653,15 @@ void QNetworkAccessHttpBackend::readFromHttp() // this is not a critical thing since it is already in the // memory anyway - while (httpReply->bytesAvailable() != 0 && nextDownstreamBlockSize() != 0) { - const QByteArray data = httpReply->readAny(); - writeDownstreamData(data); + QByteDataBuffer list; + + while (httpReply->bytesAvailable() != 0 && nextDownstreamBlockSize() != 0 && nextDownstreamBlockSize() > list.byteAmount()) { + QByteArray data = httpReply->readAny(); + list.append(data); } + + if (!list.isEmpty()) + writeDownstreamData(list); } void QNetworkAccessHttpBackend::replyFinished() diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 55b8b7f36..44ae32858 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -103,16 +103,17 @@ void QNetworkReplyImplPrivate::_q_copyReadyRead() break; bytesToRead = qBound(1, bytesToRead, copyDevice->bytesAvailable()); - char *ptr = readBuffer.reserve(bytesToRead); - qint64 bytesActuallyRead = copyDevice->read(ptr, bytesToRead); + QByteArray byteData; + byteData.resize(bytesToRead); + qint64 bytesActuallyRead = copyDevice->read(byteData.data(), byteData.size()); if (bytesActuallyRead == -1) { - readBuffer.chop(bytesToRead); + byteData.clear(); backendNotify(NotifyCopyFinished); break; } - if (bytesActuallyRead != bytesToRead) - readBuffer.chop(bytesToRead - bytesActuallyRead); + byteData.resize(bytesActuallyRead); + readBuffer.append(byteData); if (!copyDevice->isSequential() && copyDevice->atEnd()) { backendNotify(NotifyCopyFinished); @@ -384,19 +385,17 @@ qint64 QNetworkReplyImplPrivate::nextDownstreamBlockSize() const if (readBufferMaxSize == 0) return DesiredBufferSize; - return qMax(0, readBufferMaxSize - readBuffer.size()); + return qMax(0, readBufferMaxSize - readBuffer.byteAmount()); } // we received downstream data and send this to the cache // and to our readBuffer (which in turn gets read by the user of QNetworkReply) -void QNetworkReplyImplPrivate::appendDownstreamData(const QByteArray &data) +void QNetworkReplyImplPrivate::appendDownstreamData(QByteDataBuffer &data) { Q_Q(QNetworkReplyImpl); if (!q->isOpen()) return; - readBuffer.append(data); - if (cacheEnabled && !cacheSaveDevice) { // save the meta data QNetworkCacheMetaData metaData; @@ -415,10 +414,19 @@ void QNetworkReplyImplPrivate::appendDownstreamData(const QByteArray &data) } } - if (cacheSaveDevice) - cacheSaveDevice->write(data); + qint64 bytesWritten = 0; + for (int i = 0; i < data.bufferCount(); i++) { + QByteArray item = data[i]; + + if (cacheSaveDevice) + cacheSaveDevice->write(item.constData(), item.size()); + readBuffer.append(item); + + bytesWritten += item.size(); + } + data.clear(); - bytesDownloaded += data.size(); + bytesDownloaded += bytesWritten; lastBytesDownloaded = bytesDownloaded; QPointer qq = q; @@ -427,6 +435,8 @@ void QNetworkReplyImplPrivate::appendDownstreamData(const QByteArray &data) pauseNotificationHandling(); emit q->downloadProgress(bytesDownloaded, totalSize.isNull() ? Q_INT64_C(-1) : totalSize.toLongLong()); + // important: At the point of this readyRead(), the data parameter list must be empty, + // else implicit sharing will trigger memcpy when the user is reading data! emit q->readyRead(); // hopefully we haven't been deleted here @@ -602,14 +612,14 @@ void QNetworkReplyImpl::close() */ qint64 QNetworkReplyImpl::bytesAvailable() const { - return QNetworkReply::bytesAvailable() + d_func()->readBuffer.size(); + return QNetworkReply::bytesAvailable() + d_func()->readBuffer.byteAmount(); } void QNetworkReplyImpl::setReadBufferSize(qint64 size) { Q_D(QNetworkReplyImpl); if (size > d->readBufferMaxSize && - size == d->readBuffer.size()) + size > d->readBuffer.byteAmount()) d->backendNotify(QNetworkReplyImplPrivate::NotifyDownstreamReadyWrite); QNetworkReply::setReadBufferSize(size); @@ -657,7 +667,7 @@ qint64 QNetworkReplyImpl::readData(char *data, qint64 maxlen) return 1; } - maxlen = qMin(maxlen, d->readBuffer.size()); + maxlen = qMin(maxlen, d->readBuffer.byteAmount()); return d->readBuffer.read(data, maxlen); } diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index 454185a34..83a8acacc 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -61,6 +61,7 @@ #include "QtCore/qqueue.h" #include "QtCore/qbuffer.h" #include "private/qringbuffer_p.h" +#include "private/qbytedata_p.h" QT_BEGIN_NAMESPACE @@ -144,7 +145,7 @@ public: void consume(qint64 count); void emitUploadProgress(qint64 bytesSent, qint64 bytesTotal); qint64 nextDownstreamBlockSize() const; - void appendDownstreamData(const QByteArray &data); + void appendDownstreamData(QByteDataBuffer &data); void appendDownstreamData(QIODevice *data); void finished(); void error(QNetworkReply::NetworkError code, const QString &errorString); @@ -172,7 +173,7 @@ public: QList proxyList; #endif - QRingBuffer readBuffer; + QByteDataBuffer readBuffer; qint64 bytesDownloaded; qint64 lastBytesDownloaded; qint64 bytesUploaded; -- cgit v1.2.3 From 1aa43fc4af995374c577a951fd2054d696aa3b14 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 16 Jul 2009 21:13:13 +0200 Subject: Fixes: ItemView text editor is not visible with empty text and icons It was not visible wicause its height was 0 Task-number: 257481 Reviewed-by: mbm --- src/gui/itemviews/qitemdelegate.cpp | 6 +- src/gui/styles/qcommonstyle.cpp | 14 +++- .../qabstractitemview/tst_qabstractitemview.cpp | 83 ++++++++++++++++------ 3 files changed, 76 insertions(+), 27 deletions(-) diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp index a2851133a..336ca79aa 100644 --- a/src/gui/itemviews/qitemdelegate.cpp +++ b/src/gui/itemviews/qitemdelegate.cpp @@ -861,6 +861,8 @@ void QItemDelegate::drawBackground(QPainter *painter, /*! \internal + + Code duplicated in QCommonStylePrivate::viewItemLayout */ void QItemDelegate::doLayout(const QStyleOptionViewItem &option, @@ -882,8 +884,10 @@ void QItemDelegate::doLayout(const QStyleOptionViewItem &option, int w, h; textRect->adjust(-textMargin, 0, textMargin, 0); // add width padding - if (textRect->height() == 0 && !hasPixmap) + if (textRect->height() == 0 && (!hasPixmap || !hint)) { + //if there is no text, we still want to have a decent height for the item sizeHint and the editor size textRect->setHeight(option.fontMetrics.height()); + } QSize pm(0, 0); if (hasPixmap) { diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 29176c3b0..aba89bc48 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -1182,8 +1182,14 @@ void QCommonStylePrivate::viewItemDrawText(QPainter *p, const QStyleOptionViewIt } } -/* Set sizehint to false to layout the elements inside opt->rect. Set sizehint to true to ignore - opt->rect and return rectangles in infinite space */ +/*! \internal + compute the position for the different component of an item (pixmap, text, checkbox) + + Set sizehint to false to layout the elements inside opt->rect. Set sizehint to true to ignore + opt->rect and return rectangles in infinite space + + Code duplicated in QItemDelegate::doLayout +*/ void QCommonStylePrivate::viewItemLayout(const QStyleOptionViewItemV4 *opt, QRect *checkRect, QRect *pixmapRect, QRect *textRect, bool sizehint) const { @@ -1204,8 +1210,10 @@ void QCommonStylePrivate::viewItemLayout(const QStyleOptionViewItemV4 *opt, QRe int y = opt->rect.top(); int w, h; - if (textRect->height() == 0 && !hasPixmap) + if (textRect->height() == 0 && (!hasPixmap || !sizehint)) { + //if there is no text, we still want to have a decent height for the item sizeHint and the editor size textRect->setHeight(opt->fontMetrics.height()); + } QSize pm(0, 0); if (hasPixmap) { diff --git a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp index 0bc459e32..e7b94d14e 100644 --- a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp @@ -55,6 +55,7 @@ #include #include #include +#include #include "../../shared/util.h" //TESTED_CLASS= @@ -209,10 +210,11 @@ private slots: void noFallbackToRoot(); void setCurrentIndex_data(); void setCurrentIndex(); - + void task221955_selectedEditor(); void task250754_fontChange(); void task200665_itemEntered(); + void task257481_emptyEditor(); }; class MyAbstractItemDelegate : public QAbstractItemDelegate @@ -945,12 +947,12 @@ void tst_QAbstractItemView::dragAndDropOnChild() class TestModel : public QStandardItemModel { public: - TestModel(int rows, int columns) : QStandardItemModel(rows, columns) + TestModel(int rows, int columns) : QStandardItemModel(rows, columns) { setData_count = 0; } - virtual bool setData(const QModelIndex &/*index*/, const QVariant &/*value*/, int /*role = Qt::EditRole*/) + virtual bool setData(const QModelIndex &/*index*/, const QVariant &/*value*/, int /*role = Qt::EditRole*/) { ++setData_count; return true; @@ -967,20 +969,20 @@ void tst_QAbstractItemView::setItemDelegate_data() // default is rows, a -1 will switch to columns QTest::addColumn("rowsOrColumnsWithDelegate"); QTest::addColumn("cellToEdit"); - QTest::newRow("4 columndelegates") - << (IntList() << -1 << 0 << 1 << 2 << 3) + QTest::newRow("4 columndelegates") + << (IntList() << -1 << 0 << 1 << 2 << 3) << QPoint(0, 0); - QTest::newRow("2 identical rowdelegates on the same row") - << (IntList() << 0 << 0) + QTest::newRow("2 identical rowdelegates on the same row") + << (IntList() << 0 << 0) << QPoint(0, 0); - QTest::newRow("2 identical columndelegates on the same column") - << (IntList() << -1 << 2 << 2) + QTest::newRow("2 identical columndelegates on the same column") + << (IntList() << -1 << 2 << 2) << QPoint(2, 0); - QTest::newRow("2 duplicate delegates, 1 row and 1 column") - << (IntList() << 0 << -1 << 2) + QTest::newRow("2 duplicate delegates, 1 row and 1 column") + << (IntList() << 0 << -1 << 2) << QPoint(2, 0); - QTest::newRow("4 duplicate delegates, 2 row and 2 column") - << (IntList() << 0 << 0 << -1 << 2 << 2) + QTest::newRow("4 duplicate delegates, 2 row and 2 column") + << (IntList() << 0 << 0 << -1 << 2 << 2) << QPoint(2, 0); } @@ -1002,7 +1004,7 @@ void tst_QAbstractItemView::setItemDelegate() if (row) { v.setItemDelegateForRow(rc, delegate); } else { - v.setItemDelegateForColumn(rc, delegate); + v.setItemDelegateForColumn(rc, delegate); } } } @@ -1120,42 +1122,42 @@ void tst_QAbstractItemView::setCurrentIndex() void tst_QAbstractItemView::task221955_selectedEditor() { QPushButton *button; - + QTreeWidget tree; tree.setColumnCount(2); tree.addTopLevelItem(new QTreeWidgetItem(QStringList() << "Foo" <<"1")); tree.addTopLevelItem(new QTreeWidgetItem(QStringList() << "Bar" <<"2")); tree.addTopLevelItem(new QTreeWidgetItem(QStringList() << "Baz" <<"3")); - + QTreeWidgetItem *dummy = new QTreeWidgetItem(); tree.addTopLevelItem(dummy); tree.setItemWidget(dummy, 0, button = new QPushButton("More...")); button->setAutoFillBackground(true); // as recommended in doc - + tree.show(); tree.setFocus(); tree.setCurrentIndex(tree.model()->index(1,0)); QTest::qWait(100); QApplication::setActiveWindow(&tree); - + QVERIFY(! tree.selectionModel()->selectedIndexes().contains(tree.model()->index(3,0))); //We set the focus to the button, the index need to be selected - button->setFocus(); + button->setFocus(); QTest::qWait(100); QVERIFY(tree.selectionModel()->selectedIndexes().contains(tree.model()->index(3,0))); - + tree.setCurrentIndex(tree.model()->index(1,0)); QVERIFY(! tree.selectionModel()->selectedIndexes().contains(tree.model()->index(3,0))); - + //Same thing but with the flag NoSelection, nothing can be selected. tree.setFocus(); tree.setSelectionMode(QAbstractItemView::NoSelection); tree.clearSelection(); QVERIFY(tree.selectionModel()->selectedIndexes().isEmpty()); QTest::qWait(10); - button->setFocus(); + button->setFocus(); QTest::qWait(50); QVERIFY(tree.selectionModel()->selectedIndexes().isEmpty()); } @@ -1196,7 +1198,7 @@ void tst_QAbstractItemView::task250754_fontChange() QTest::qWait(30); //now with the huge items, the scrollbar must be visible QVERIFY(tree.verticalScrollBar()->isVisible()); - + qApp->setStyleSheet(app_css); } @@ -1217,6 +1219,41 @@ void tst_QAbstractItemView::task200665_itemEntered() } +void tst_QAbstractItemView::task257481_emptyEditor() +{ + QIcon icon = qApp->style()->standardIcon(QStyle::SP_ComputerIcon); + + QStandardItemModel model; + + model.appendRow( new QStandardItem(icon, QString()) ); + model.appendRow( new QStandardItem(icon, "Editor works") ); + model.appendRow( new QStandardItem( QString() ) ); + + QTreeView treeView; + treeView.setRootIsDecorated(false); + treeView.setModel(&model); + treeView.show(); + + treeView.edit(model.index(0,0)); + QList lineEditors = qFindChildren(treeView.viewport()); + QCOMPARE(lineEditors.count(), 1); + QVERIFY(!lineEditors.first()->size().isEmpty()); + + QTest::qWait(30); + + treeView.edit(model.index(1,0)); + lineEditors = qFindChildren(treeView.viewport()); + QCOMPARE(lineEditors.count(), 1); + QVERIFY(!lineEditors.first()->size().isEmpty()); + + QTest::qWait(30); + + treeView.edit(model.index(2,0)); + lineEditors = qFindChildren(treeView.viewport()); + QCOMPARE(lineEditors.count(), 1); + QVERIFY(!lineEditors.first()->size().isEmpty()); +} + QTEST_MAIN(tst_QAbstractItemView) #include "tst_qabstractitemview.moc" -- cgit v1.2.3 From 05ae1e2cf1c1d95377b302a6b4599358107c63b1 Mon Sep 17 00:00:00 2001 From: Geir Vattekar Date: Fri, 17 Jul 2009 13:44:44 +0200 Subject: Doc: Added info on QWrappedEvent to QAbstractTransition::eventTest() Reviewed-by: Kent Hansen --- doc/src/snippets/statemachine/eventtest.cpp | 34 ++++++++++++++++++++++++ src/corelib/kernel/qcoreevent.cpp | 2 +- src/corelib/statemachine/qabstracttransition.cpp | 12 +++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 doc/src/snippets/statemachine/eventtest.cpp diff --git a/doc/src/snippets/statemachine/eventtest.cpp b/doc/src/snippets/statemachine/eventtest.cpp new file mode 100644 index 000000000..e0f359ad3 --- /dev/null +++ b/doc/src/snippets/statemachine/eventtest.cpp @@ -0,0 +1,34 @@ + +#include + +class MyTransition : public QAbstractTransition +{ + Q_OBJECT +public: + MyTransition() {} + +protected: +//![0] + bool eventTest(QEvent *event) + { + if (event->type() == QEvent::Wrapped) { + QEvent *wrappedEvent = static_cast(event)->event(); + if (wrappedEvent->type() == QEvent::KeyPress) { + QKeyEvent *keyEvent = static_cast(wrappedEvent); + // Do your event test + } + } + return false; + } +//![0] + + void onTransition(QEvent *event) + { + + } +}; + +int main(int argv, char **args) +{ + return 0; +} diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index c63671667..a682fad97 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -219,6 +219,7 @@ QT_BEGIN_NAMESPACE \value WindowStateChange The \l{QWidget::windowState()}{window's state} (minimized, maximized or full-screen) has changed (QWindowStateChangeEvent). \value WindowTitleChange The window title has changed. \value WindowUnblocked The window is unblocked after a modal dialog exited. + \value Wrapped The event is a wrapper for, i.e., contains, another event (QWrappedEvent). \value ZOrderChange The widget's z-order has changed. This event is never sent to top level windows. \value KeyboardLayoutChange The keyboard layout has changed. \value DynamicPropertyChange A dynamic property was added, changed or removed from the object. @@ -267,7 +268,6 @@ QT_BEGIN_NAMESPACE \omitvalue NetworkReplyUpdated \omitvalue FutureCallOut \omitvalue CocoaRequestModal - \omitvalue Wrapped \omitvalue Signal \omitvalue WinGesture */ diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp index 670aa7d6e..c040c584f 100644 --- a/src/corelib/statemachine/qabstracttransition.cpp +++ b/src/corelib/statemachine/qabstracttransition.cpp @@ -330,6 +330,18 @@ QList QAbstractTransition::animations() const This function is called to determine whether the given \a event should cause this transition to trigger. Reimplement this function and return true if the event should trigger the transition, otherwise return false. + + + Note that \a event is a QWrappedEvent, which contains a clone of + the event generated by Qt. For instance, if you want to check a + key press event, do the following: + + \snippet doc/src/snippets/statemachine/eventtest.cpp 0 + + You need to check if \a event is a QWrappedEvent because Qt also + uses other events for internal reasons; you don't need to concern + yourself with these in any case. + */ /*! -- cgit v1.2.3 From 587de884fadba615f86154747e116c8d6cd196e3 Mon Sep 17 00:00:00 2001 From: Marius Bugge Monsen Date: Fri, 17 Jul 2009 13:52:45 +0200 Subject: Fixes: Do not create a mapping for filtered items in QSortFilterProxyModel. Task: 258227 Details: This patch fixes the problem where items that are filtered, can sometime still have a mapping. This creates a problem when they become visible again, and the outdated mapping already exists. --- src/gui/itemviews/qsortfilterproxymodel.cpp | 42 ++++++++++++++++++----------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index 30a8c960a..fdc09ca1a 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -146,6 +146,7 @@ public: const QModelIndex &source_parent) const; QModelIndex proxy_to_source(const QModelIndex &proxyIndex) const; QModelIndex source_to_proxy(const QModelIndex &sourceIndex) const; + bool can_create_mapping(const QModelIndex &source_parent) const; void remove_from_mapping(const QModelIndex &source_parent); @@ -354,6 +355,25 @@ QModelIndex QSortFilterProxyModelPrivate::source_to_proxy(const QModelIndex &sou return create_index(proxy_row, proxy_column, it); } +bool QSortFilterProxyModelPrivate::can_create_mapping(const QModelIndex &source_parent) const +{ + if (source_parent.isValid()) { + QModelIndex source_grand_parent = source_parent.parent(); + IndexMap::const_iterator it = source_index_mapping.constFind(source_grand_parent); + if (it == source_index_mapping.constEnd()) { + // Don't care, since we don't have mapping for the grand parent + return false; + } + Mapping *gm = it.value(); + if (gm->proxy_rows.at(source_parent.row()) == -1 || + gm->proxy_columns.at(source_parent.column()) == -1) { + // Don't care, since parent is filtered + return false; + } + } + return true; +} + /*! \internal @@ -659,20 +679,8 @@ void QSortFilterProxyModelPrivate::source_items_inserted( return; IndexMap::const_iterator it = source_index_mapping.constFind(source_parent); if (it == source_index_mapping.constEnd()) { - if (source_parent.isValid()) { - QModelIndex source_grand_parent = source_parent.parent(); - it = source_index_mapping.constFind(source_grand_parent); - if (it == source_index_mapping.constEnd()) { - // Don't care, since we don't have mapping for the grand parent - return; - } - Mapping *gm = it.value(); - if (gm->proxy_rows.at(source_parent.row()) == -1 || - gm->proxy_columns.at(source_parent.column()) == -1) { - // Don't care, since parent is filtered - return; - } - } + if (!can_create_mapping(source_parent)) + return; it = create_mapping(source_parent); Mapping *m = it.value(); QModelIndex proxy_parent = q->mapFromSource(source_parent); @@ -1186,7 +1194,8 @@ void QSortFilterProxyModelPrivate::_q_sourceRowsAboutToBeInserted( Q_UNUSED(end); //Force the creation of a mapping now, even if its empty. //We need it because the proxy can be acessed at the moment it emits rowsAboutToBeInserted in insert_source_items - create_mapping(source_parent); + if (can_create_mapping(source_parent)) + create_mapping(source_parent); } void QSortFilterProxyModelPrivate::_q_sourceRowsInserted( @@ -1217,7 +1226,8 @@ void QSortFilterProxyModelPrivate::_q_sourceColumnsAboutToBeInserted( Q_UNUSED(end); //Force the creation of a mapping now, even if its empty. //We need it because the proxy can be acessed at the moment it emits columnsAboutToBeInserted in insert_source_items - create_mapping(source_parent); + if (can_create_mapping(source_parent)) + create_mapping(source_parent); } void QSortFilterProxyModelPrivate::_q_sourceColumnsInserted( -- cgit v1.2.3 From c0dfc3f7cedb889e8d68161080262e715165e771 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Fri, 17 Jul 2009 13:29:27 +0200 Subject: Handle Jens' new variable. In theory, the new "follow style" value will never be hit, let's make that explicit in the code. --- src/gui/styles/qmacstyle_mac.mm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 5d7539290..b6159182d 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -3361,6 +3361,9 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter } proxy()->drawItemPixmap(p, pr, Qt::AlignCenter, pixmap); break; } + default: + Q_ASSERT(false); + break; } if (needText) { -- cgit v1.2.3 From 68c0e6a8ba1e92bf0152adcaa86eebb83dcfd1d8 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Fri, 17 Jul 2009 13:32:21 +0200 Subject: Move QMacStyle icon handling down to the common style. This is more follow the cue of what is done on X11, mainly, if you are creating things like messageboxes or file views, you want them to follow the desktop (yes, you do). If you disable desktop settings aware, you get the old look. This also meant shifting around some functions into qt_cocoa_helpers_mac to make them more readily available instead of living in differnt files. People who use standard pixmap get the old values, but I think that's fine. If you haven't moved onto standardIcon (introduced in 4.1), you don't get the latest bling. Review-by: Jens Bache-Wiig --- src/gui/image/qpixmap_mac.cpp | 19 ----- src/gui/itemviews/qfileiconprovider.cpp | 7 +- src/gui/kernel/qt_cocoa_helpers_mac.mm | 46 ++++++++++++ src/gui/kernel/qt_cocoa_helpers_mac_p.h | 3 + src/gui/styles/qcommonstyle.cpp | 111 +++++++++++++++++++++++++++-- src/gui/styles/qmacstyle_mac.mm | 122 +------------------------------- 6 files changed, 162 insertions(+), 146 deletions(-) diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp index c281fe94a..25ef8ba7c 100644 --- a/src/gui/image/qpixmap_mac.cpp +++ b/src/gui/image/qpixmap_mac.cpp @@ -1169,25 +1169,6 @@ IconRef qt_mac_create_iconref(const QPixmap &px) } #endif -QPixmap qt_mac_convert_iconref(const IconRef icon, int width, int height) -{ - QPixmap ret(width, height); - ret.fill(QColor(0, 0, 0, 0)); - - CGRect rect = CGRectMake(0, 0, width, height); - - CGContextRef ctx = qt_mac_cg_context(&ret); - CGAffineTransform old_xform = CGContextGetCTM(ctx); - CGContextConcatCTM(ctx, CGAffineTransformInvert(old_xform)); - CGContextConcatCTM(ctx, CGAffineTransformIdentity); - - ::RGBColor b; - b.blue = b.green = b.red = 255*255; - PlotIconRefInContext(ctx, &rect, kAlignNone, kTransformNone, &b, kPlotIconRefNormalFlags, icon); - CGContextRelease(ctx); - return ret; -} - /*! \internal */ QPaintEngine* QMacPixmapData::paintEngine() const { diff --git a/src/gui/itemviews/qfileiconprovider.cpp b/src/gui/itemviews/qfileiconprovider.cpp index 1856f4dd4..53608e7b9 100644 --- a/src/gui/itemviews/qfileiconprovider.cpp +++ b/src/gui/itemviews/qfileiconprovider.cpp @@ -53,7 +53,7 @@ #include #include #elif defined(Q_WS_MAC) -#include +#include #endif #include @@ -326,10 +326,11 @@ QIcon QFileIconProviderPrivate::getMacIcon(const QFileInfo &fi) const return retIcon; IconRef iconRef; SInt16 iconLabel; - status = GetIconRefFromFileInfo(&macRef, macName.length, macName.unicode, kIconServicesCatalogInfoMask, &info, kIconServicesNormalUsageFlag, &iconRef, &iconLabel); + status = GetIconRefFromFileInfo(&macRef, macName.length, macName.unicode, + kIconServicesCatalogInfoMask, &info, kIconServicesNormalUsageFlag, + &iconRef, &iconLabel); if (status != noErr) return retIcon; - extern void qt_mac_constructQIconFromIconRef(const IconRef, const IconRef, QIcon*, QStyle::StandardPixmap = QStyle::SP_CustomBase); // qmacstyle_mac.cpp qt_mac_constructQIconFromIconRef(iconRef, 0, &retIcon); ReleaseIconRef(iconRef); return retIcon; diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index a98a7f8b8..223e36bd3 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -77,6 +77,7 @@ #include #include #include +#include #include #include #include @@ -1147,4 +1148,49 @@ QString qt_mac_get_pasteboardString() } } +QPixmap qt_mac_convert_iconref(const IconRef icon, int width, int height) +{ + QPixmap ret(width, height); + ret.fill(QColor(0, 0, 0, 0)); + + CGRect rect = CGRectMake(0, 0, width, height); + + CGContextRef ctx = qt_mac_cg_context(&ret); + CGAffineTransform old_xform = CGContextGetCTM(ctx); + CGContextConcatCTM(ctx, CGAffineTransformInvert(old_xform)); + CGContextConcatCTM(ctx, CGAffineTransformIdentity); + + ::RGBColor b; + b.blue = b.green = b.red = 255*255; + PlotIconRefInContext(ctx, &rect, kAlignNone, kTransformNone, &b, kPlotIconRefNormalFlags, icon); + CGContextRelease(ctx); + return ret; +} + +void qt_mac_constructQIconFromIconRef(const IconRef icon, const IconRef overlayIcon, QIcon *retIcon, QStyle::StandardPixmap standardIcon) +{ + int size = 16; + while (size <= 128) { + + const QString cacheKey = QLatin1String("qt_mac_constructQIconFromIconRef") + QString::number(standardIcon) + QString::number(size); + QPixmap mainIcon; + if (standardIcon >= QStyle::SP_CustomBase) { + mainIcon = qt_mac_convert_iconref(icon, size, size); + } else if (QPixmapCache::find(cacheKey, mainIcon) == false) { + mainIcon = qt_mac_convert_iconref(icon, size, size); + QPixmapCache::insert(cacheKey, mainIcon); + } + + if (overlayIcon) { + int littleSize = size / 2; + QPixmap overlayPix = qt_mac_convert_iconref(overlayIcon, littleSize, littleSize); + QPainter painter(&mainIcon); + painter.drawPixmap(size - littleSize, size - littleSize, overlayPix); + } + + retIcon->addPixmap(mainIcon); + size += size; // 16 -> 32 -> 64 -> 128 + } +} + QT_END_NAMESPACE diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h index 5f6204fcd..99f058be3 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h +++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h @@ -143,6 +143,9 @@ struct ::TabletProximityRec; void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec); Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags); Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations); +QPixmap qt_mac_convert_iconref(const IconRef icon, int width, int height); +void qt_mac_constructQIconFromIconRef(const IconRef icon, const IconRef overlayIcon, QIcon *retIcon, + QStyle::StandardPixmap standardIcon = QStyle::SP_CustomBase); inline int flipYCoordinate(int y) { return QApplication::desktop()->screenGeometry(0).height() - y; diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index aba89bc48..308a0b8ee 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -84,6 +84,8 @@ #ifdef Q_WS_X11 # include +#elif defined(Q_WS_MAC) +# include #endif QT_BEGIN_NAMESPACE @@ -4876,7 +4878,14 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid ret = int(QStyleHelper::dpiScaled(13.)); break; case PM_MessageBoxIconSize: - ret = int(QStyleHelper::dpiScaled(32.)); +#ifdef Q_WS_MAC + if (QApplication::desktopSettingsAware()) { + ret = 64; // No DPI scaling, it's handled elsewhere. + } else +#endif + { + ret = int(QStyleHelper::dpiScaled(32.)); + } break; case PM_TextCursorWidth: ret = 1; @@ -5774,9 +5783,9 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons const QWidget *widget) const { QIcon icon; -#ifdef Q_WS_X11 - Q_D(const QCommonStyle); if (QApplication::desktopSettingsAware()) { +#ifdef Q_WS_X11 + Q_D(const QCommonStyle); d->lookupIconTheme(); QPixmap pixmap; switch (standardIcon) { @@ -5794,6 +5803,7 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons } case SP_MessageBoxWarning: { + icon = d->createIcon(QLatin1String("dialog-warning.png")); icon = d->createIcon(QLatin1String("dialog-warning.png")); if (icon.isNull()) icon = d->createIcon(QLatin1String("messagebox_warning.png")); @@ -6020,8 +6030,101 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons } if (!icon.isNull()) return icon; +#elif defined(Q_WS_MAC) + OSType iconType = 0; + switch (standardIcon) { + case QStyle::SP_MessageBoxQuestion: + case QStyle::SP_MessageBoxInformation: + case QStyle::SP_MessageBoxWarning: + case QStyle::SP_MessageBoxCritical: + iconType = kGenericApplicationIcon; + break; + case SP_DesktopIcon: + iconType = kDesktopIcon; + break; + case SP_TrashIcon: + iconType = kTrashIcon; + break; + case SP_ComputerIcon: + iconType = kComputerIcon; + break; + case SP_DriveFDIcon: + iconType = kGenericFloppyIcon; + break; + case SP_DriveHDIcon: + iconType = kGenericHardDiskIcon; + break; + case SP_DriveCDIcon: + case SP_DriveDVDIcon: + iconType = kGenericCDROMIcon; + break; + case SP_DriveNetIcon: + iconType = kGenericNetworkIcon; + break; + case SP_DirOpenIcon: + iconType = kOpenFolderIcon; + break; + case SP_DirClosedIcon: + case SP_DirLinkIcon: + iconType = kGenericFolderIcon; + break; + case SP_FileLinkIcon: + case SP_FileIcon: + iconType = kGenericDocumentIcon; + break; + case SP_DirIcon: { + // A rather special case + QIcon closeIcon = QStyle::standardIcon(SP_DirClosedIcon, option, widget); + QIcon openIcon = QStyle::standardIcon(SP_DirOpenIcon, option, widget); + closeIcon.addPixmap(openIcon.pixmap(16, 16), QIcon::Normal, QIcon::On); + closeIcon.addPixmap(openIcon.pixmap(32, 32), QIcon::Normal, QIcon::On); + closeIcon.addPixmap(openIcon.pixmap(64, 64), QIcon::Normal, QIcon::On); + closeIcon.addPixmap(openIcon.pixmap(128, 128), QIcon::Normal, QIcon::On); + return closeIcon; } -#endif//Q_WS_X11 + case SP_TitleBarNormalButton: + case SP_TitleBarCloseButton: { + QIcon titleBarIcon; + if (standardIcon == SP_TitleBarCloseButton) { + titleBarIcon.addFile(QLatin1String(":/trolltech/styles/macstyle/images/closedock-16.png")); + titleBarIcon.addFile(QLatin1String(":/trolltech/styles/macstyle/images/closedock-down-16.png"), QSize(16, 16), QIcon::Normal, QIcon::On); + } else { + titleBarIcon.addFile(QLatin1String(":/trolltech/styles/macstyle/images/dockdock-16.png")); + titleBarIcon.addFile(QLatin1String(":/trolltech/styles/macstyle/images/dockdock-down-16.png"), QSize(16, 16), QIcon::Normal, QIcon::On); + } + return titleBarIcon; + } + default: + break; + } + if (iconType != 0) { + QIcon retIcon; + IconRef icon; + IconRef overlayIcon = 0; + if (iconType != kGenericApplicationIcon) { + GetIconRef(kOnSystemDisk, kSystemIconsCreator, iconType, &icon); + } else { + FSRef fsRef; + ProcessSerialNumber psn = { 0, kCurrentProcess }; + GetProcessBundleLocation(&psn, &fsRef); + GetIconRefFromFileInfo(&fsRef, 0, 0, 0, 0, kIconServicesNormalUsageFlag, &icon, 0); + if (standardIcon == SP_MessageBoxCritical) { + overlayIcon = icon; + GetIconRef(kOnSystemDisk, kSystemIconsCreator, kAlertCautionIcon, &icon); + } + } + if (icon) { + qt_mac_constructQIconFromIconRef(icon, overlayIcon, &retIcon, standardIcon); + ReleaseIconRef(icon); + } + if (overlayIcon) + ReleaseIconRef(overlayIcon); + return retIcon; + } + +#endif //Q_WS_X11 || Q_WS_MAC + } + switch (standardIcon) { #ifndef QT_NO_IMAGEFORMAT_PNG diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index b6159182d..2f930343f 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -558,7 +558,6 @@ QT_END_INCLUDE_NAMESPACE External functions *****************************************************************************/ extern CGContextRef qt_mac_cg_context(const QPaintDevice *); //qpaintdevice_mac.cpp -extern QPixmap qt_mac_convert_iconref(const IconRef, int, int); //qpixmap_mac.cpp extern QRegion qt_mac_convert_mac_region(HIShapeRef); //qregion_mac.cpp void qt_mac_dispose_rgn(RgnHandle r); //qregion_mac.cpp extern QPaintDevice *qt_mac_safe_pdev; //qapplication_mac.cpp @@ -2303,9 +2302,6 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW case PM_ToolBarItemSpacing: ret = 4; break; - case PM_MessageBoxIconSize: - ret = 64; - break; case PM_SplitterWidth: ret = qMax(7, QApplication::globalStrut().width()); break; @@ -5858,76 +5854,12 @@ bool QMacStyle::event(QEvent *e) return false; } -void qt_mac_constructQIconFromIconRef(const IconRef icon, const IconRef overlayIcon, QIcon *retIcon, QStyle::StandardPixmap standardIcon = QStyle::SP_CustomBase) -{ - int size = 16; - while (size <= 128) { - - const QString cacheKey = QLatin1String("qt_mac_constructQIconFromIconRef") + QString::number(standardIcon) + QString::number(size); - QPixmap mainIcon; - if (standardIcon >= QStyle::SP_CustomBase) { - mainIcon = qt_mac_convert_iconref(icon, size, size); - } else if (QPixmapCache::find(cacheKey, mainIcon) == false) { - mainIcon = qt_mac_convert_iconref(icon, size, size); - QPixmapCache::insert(cacheKey, mainIcon); - } - - if (overlayIcon) { - int littleSize = size / 2; - QPixmap overlayPix = qt_mac_convert_iconref(overlayIcon, littleSize, littleSize); - QPainter painter(&mainIcon); - painter.drawPixmap(size - littleSize, size - littleSize, overlayPix); - } - - retIcon->addPixmap(mainIcon); - size += size; // 16 -> 32 -> 64 -> 128 - } -} - QIcon QMacStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt, const QWidget *widget) const { - OSType iconType = 0; switch (standardIcon) { - case QStyle::SP_MessageBoxQuestion: - case QStyle::SP_MessageBoxInformation: - case QStyle::SP_MessageBoxWarning: - case QStyle::SP_MessageBoxCritical: - iconType = kGenericApplicationIcon; - break; - case SP_DesktopIcon: - iconType = kDesktopIcon; - break; - case SP_TrashIcon: - iconType = kTrashIcon; - break; - case SP_ComputerIcon: - iconType = kComputerIcon; - break; - case SP_DriveFDIcon: - iconType = kGenericFloppyIcon; - break; - case SP_DriveHDIcon: - iconType = kGenericHardDiskIcon; - break; - case SP_DriveCDIcon: - case SP_DriveDVDIcon: - iconType = kGenericCDROMIcon; - break; - case SP_DriveNetIcon: - iconType = kGenericNetworkIcon; - break; - case SP_DirOpenIcon: - iconType = kOpenFolderIcon; - break; - case SP_DirClosedIcon: - case SP_DirLinkIcon: - iconType = kGenericFolderIcon; - break; - case SP_FileLinkIcon: - case SP_FileIcon: - iconType = kGenericDocumentIcon; - break; + default: + return QWindowsStyle::standardIconImplementation(standardIcon, opt, widget); case SP_ToolBarHorizontalExtensionButton: case SP_ToolBarVerticalExtensionButton: { QPixmap pixmap(qt_mac_toolbar_ext); @@ -5941,58 +5873,8 @@ QIcon QMacStyle::standardIconImplementation(StandardPixmap standardIcon, const Q return pix2; } return pixmap; - } - break; - case SP_DirIcon: { - // A rather special case - QIcon closeIcon = QStyle::standardIcon(SP_DirClosedIcon, opt, widget); - QIcon openIcon = QStyle::standardIcon(SP_DirOpenIcon, opt, widget); - closeIcon.addPixmap(openIcon.pixmap(16, 16), QIcon::Normal, QIcon::On); - closeIcon.addPixmap(openIcon.pixmap(32, 32), QIcon::Normal, QIcon::On); - closeIcon.addPixmap(openIcon.pixmap(64, 64), QIcon::Normal, QIcon::On); - closeIcon.addPixmap(openIcon.pixmap(128, 128), QIcon::Normal, QIcon::On); - return closeIcon; } - case SP_TitleBarNormalButton: - case SP_TitleBarCloseButton: { - QIcon titleBarIcon; - if (standardIcon == SP_TitleBarCloseButton) { - titleBarIcon.addFile(QLatin1String(":/trolltech/styles/macstyle/images/closedock-16.png")); - titleBarIcon.addFile(QLatin1String(":/trolltech/styles/macstyle/images/closedock-down-16.png"), QSize(16, 16), QIcon::Normal, QIcon::On); - } else { - titleBarIcon.addFile(QLatin1String(":/trolltech/styles/macstyle/images/dockdock-16.png")); - titleBarIcon.addFile(QLatin1String(":/trolltech/styles/macstyle/images/dockdock-down-16.png"), QSize(16, 16), QIcon::Normal, QIcon::On); - } - return titleBarIcon; - } - default: - break; - } - if (iconType != 0) { - QIcon retIcon; - IconRef icon; - IconRef overlayIcon = 0; - if (iconType != kGenericApplicationIcon) { - GetIconRef(kOnSystemDisk, kSystemIconsCreator, iconType, &icon); - } else { - FSRef fsRef; - ProcessSerialNumber psn = { 0, kCurrentProcess }; - GetProcessBundleLocation(&psn, &fsRef); - GetIconRefFromFileInfo(&fsRef, 0, 0, 0, 0, kIconServicesNormalUsageFlag, &icon, 0); - if (standardIcon == SP_MessageBoxCritical) { - overlayIcon = icon; - GetIconRef(kOnSystemDisk, kSystemIconsCreator, kAlertCautionIcon, &icon); - } - } - if (icon) { - qt_mac_constructQIconFromIconRef(icon, overlayIcon, &retIcon, standardIcon); - ReleaseIconRef(icon); - } - if (overlayIcon) - ReleaseIconRef(overlayIcon); - return retIcon; } - return QWindowsStyle::standardIconImplementation(standardIcon, opt, widget); } int QMacStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1, -- cgit v1.2.3 From 7d4a3a102c562d057c7fa5de900fe4a6c662dda4 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Fri, 17 Jul 2009 05:17:23 -0700 Subject: Prepare device in DFBPaintEngine::begin 86ea4dbb5a748491656d9621ecd58238bc3e3d82 accidentally took out this line. Reviewed-by: TrustMe --- src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index 2245acc56..94f1aeb26 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -232,6 +232,8 @@ bool QDirectFBPaintEngine::begin(QPaintDevice *device) device->devType()); } + d->prepare(d->dfbDevice); + return QRasterPaintEngine::begin(device); } -- cgit v1.2.3 From 538cbb4f5b638cdfa2fff2576a723457a2c889c6 Mon Sep 17 00:00:00 2001 From: Jeremy Whiting Date: Fri, 17 Jul 2009 14:29:39 +0200 Subject: Add reading of kde colors Link and LinkVisited colors from qt apps in qapplication_x11.cpp so these two colors don't get overridden by the defaults when kde config is found. Merge-request: 917 Reviewed-by: Olivier Goffart --- src/gui/kernel/qapplication_x11.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index cc412997e..77e29a663 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -1396,6 +1396,18 @@ static void qt_set_x11_resources(const char* font = 0, const char* fg = 0, color = kdeColor(QLatin1String("Colors:Button/ForegroundNormal"), theKdeSettings); if (color.isValid()) pal.setColor(QPalette::ButtonText, color); + + color = kdeColor(QLatin1String("linkColor"), theKdeSettings); + if (!color.isValid()) + color = kdeColor(QLatin1String("Colors:View/ForegroundLink"), theKdeSettings); + if (color.isValid()) + pal.setColor(QPalette::Link, color); + + color = kdeColor(QLatin1String("visitedLinkColor"), theKdeSettings); + if (!color.isValid()) + color = kdeColor(QLatin1String("Colors:View/ForegroundVisited"), theKdeSettings); + if (color.isValid()) + pal.setColor(QPalette::LinkVisited, color); } if (highlight.isValid() && highlightText.isValid()) { -- cgit v1.2.3 From e3a34408aa65af33494b7154ab5eaefe676b5f20 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Fri, 17 Jul 2009 14:47:53 +0200 Subject: Update to also use a uifile.icns file for Designer. If we are doing it for Creator, we may as well be nice and do a similar thing for Designer. --- tools/designer/src/designer/Info_mac.plist | 2 +- tools/designer/src/designer/designer.pro | 3 +++ tools/designer/src/designer/uifile.icns | Bin 0 -> 123696 bytes 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 tools/designer/src/designer/uifile.icns diff --git a/tools/designer/src/designer/Info_mac.plist b/tools/designer/src/designer/Info_mac.plist index 8632a6df3..f19176fa7 100644 --- a/tools/designer/src/designer/Info_mac.plist +++ b/tools/designer/src/designer/Info_mac.plist @@ -22,7 +22,7 @@ ui CFBundleTypeIconFile - @ICON@ + uifile.icns CFBundleTypeRole Editor LSIsAppleDefaultForType diff --git a/tools/designer/src/designer/designer.pro b/tools/designer/src/designer/designer.pro index e7fa03874..aa6850c3b 100644 --- a/tools/designer/src/designer/designer.pro +++ b/tools/designer/src/designer/designer.pro @@ -78,6 +78,9 @@ mac { ICON = designer.icns QMAKE_INFO_PLIST = Info_mac.plist TARGET = Designer + FILETYPES.files = uifile.icns + FILETYPES.path = Contents/Resources + QMAKE_BUNDLE_DATA += FILETYPES } target.path=$$[QT_INSTALL_BINS] diff --git a/tools/designer/src/designer/uifile.icns b/tools/designer/src/designer/uifile.icns new file mode 100644 index 000000000..2473ea4dc Binary files /dev/null and b/tools/designer/src/designer/uifile.icns differ -- cgit v1.2.3 From 866e6e6338767086cef8f97bc4e7b38e78b83651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mercille?= Date: Fri, 17 Jul 2009 14:46:29 +0200 Subject: Lets the size of the completer be configurable in a way similar to QComboBox. Merge-request: 884 Reviewed-by: Olivier Goffart --- examples/tools/completer/mainwindow.cpp | 24 +++++++++-- examples/tools/completer/mainwindow.h | 3 ++ src/gui/util/qcompleter.cpp | 30 ++++++++++++-- src/gui/util/qcompleter.h | 4 ++ src/gui/util/qcompleter_p.h | 1 + tests/auto/qcompleter/tst_qcompleter.cpp | 68 ++++++++++++++++++++++++++++++++ 6 files changed, 123 insertions(+), 7 deletions(-) diff --git a/examples/tools/completer/mainwindow.cpp b/examples/tools/completer/mainwindow.cpp index 8ea1c39c0..06f16de17 100644 --- a/examples/tools/completer/mainwindow.cpp +++ b/examples/tools/completer/mainwindow.cpp @@ -75,6 +75,12 @@ MainWindow::MainWindow(QWidget *parent) caseCombo->addItem(tr("Case Insensitive")); caseCombo->addItem(tr("Case Sensitive")); caseCombo->setCurrentIndex(0); + + QLabel *maxVisibleLabel = new QLabel; + maxVisibleLabel->setText(tr("Max Visible Items")); + maxVisibleSpinBox = new QSpinBox; + maxVisibleSpinBox->setRange(3,25); + maxVisibleSpinBox->setValue(10); //! [0] //! [1] @@ -90,6 +96,7 @@ MainWindow::MainWindow(QWidget *parent) connect(modelCombo, SIGNAL(activated(int)), this, SLOT(changeModel())); connect(modeCombo, SIGNAL(activated(int)), this, SLOT(changeMode(int))); connect(caseCombo, SIGNAL(activated(int)), this, SLOT(changeCase(int))); + connect(maxVisibleSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changeMaxVisible(int))); //! [2] //! [3] @@ -99,9 +106,10 @@ MainWindow::MainWindow(QWidget *parent) layout->addWidget(modelLabel, 0, 0); layout->addWidget(modelCombo, 0, 1); layout->addWidget(modeLabel, 1, 0); layout->addWidget(modeCombo, 1, 1); layout->addWidget(caseLabel, 2, 0); layout->addWidget(caseCombo, 2, 1); - layout->addWidget(wrapCheckBox, 3, 0); - layout->addWidget(contentsLabel, 4, 0, 1, 2); - layout->addWidget(lineEdit, 5, 0, 1, 2); + layout->addWidget(maxVisibleLabel, 3, 0); layout->addWidget(maxVisibleSpinBox, 3, 1); + layout->addWidget(wrapCheckBox, 4, 0); + layout->addWidget(contentsLabel, 5, 0, 1, 2); + layout->addWidget(lineEdit, 6, 0, 1, 2); centralWidget->setLayout(layout); setCentralWidget(centralWidget); @@ -205,6 +213,7 @@ void MainWindow::changeModel() { delete completer; completer = new QCompleter(this); + completer->setMaxVisibleItems(maxVisibleSpinBox->value()); switch (modelCombo->currentIndex()) { default: @@ -256,9 +265,16 @@ void MainWindow::changeModel() //! [14] //! [15] +void MainWindow::changeMaxVisible(int max) +{ + completer->setMaxVisibleItems(max); +} +//! [15] + +//! [16] void MainWindow::about() { QMessageBox::about(this, tr("About"), tr("This example demonstrates the " "different features of the QCompleter class.")); } -//! [15] +//! [16] diff --git a/examples/tools/completer/mainwindow.h b/examples/tools/completer/mainwindow.h index f6c962b5f..30b8d263e 100644 --- a/examples/tools/completer/mainwindow.h +++ b/examples/tools/completer/mainwindow.h @@ -52,6 +52,7 @@ class QLabel; class QLineEdit; class QProgressBar; class QCheckBox; +class QSpinBox; QT_END_NAMESPACE //! [0] @@ -67,6 +68,7 @@ private slots: void changeCase(int); void changeMode(int); void changeModel(); + void changeMaxVisible(int); //! [0] //! [1] @@ -77,6 +79,7 @@ private: QComboBox *caseCombo; QComboBox *modeCombo; QComboBox *modelCombo; + QSpinBox *maxVisibleSpinBox; QCheckBox *wrapCheckBox; QCompleter *completer; QLabel *contentsLabel; diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp index d68e30950..bf1fa6a00 100644 --- a/src/gui/util/qcompleter.cpp +++ b/src/gui/util/qcompleter.cpp @@ -134,7 +134,7 @@ To provide completions, QCompleter needs to know the path from an index. This is provided by pathFromIndex(). The default implementation of - pathFromIndex(), returns the data for the \l{Qt::EditRole}{edit role} + pathFromIndex(), returns the data for the \l{Qt::EditRole}{edit role} for list models and the absolute file path if the mode is a QDirModel. \sa QAbstractItemModel, QLineEdit, QComboBox, {Completer Example} @@ -772,7 +772,7 @@ QMatchData QUnsortedModelEngine::filter(const QString& part, const QModelIndex& /////////////////////////////////////////////////////////////////////////////// QCompleterPrivate::QCompleterPrivate() : widget(0), proxy(0), popup(0), cs(Qt::CaseSensitive), role(Qt::EditRole), column(0), - sorting(QCompleter::UnsortedModel), wrap(true), eatFocusOut(true) + sorting(QCompleter::UnsortedModel), wrap(true), maxVisibleItems(7), eatFocusOut(true) { } @@ -861,7 +861,7 @@ void QCompleterPrivate::showPopup(const QRect& rect) Qt::LayoutDirection dir = widget->layoutDirection(); QPoint pos; int rw, rh, w; - int h = (popup->sizeHintForRow(0) * qMin(7, popup->model()->rowCount()) + 3) + 3; + int h = (popup->sizeHintForRow(0) * qMin(maxVisibleItems, popup->model()->rowCount()) + 3) + 3; QScrollBar *hsb = popup->horizontalScrollBar(); if (hsb && hsb->isVisible()) h += popup->horizontalScrollBar()->sizeHint().height(); @@ -1509,6 +1509,30 @@ bool QCompleter::wrapAround() const return d->wrap; } +/*! + \property QCompleter::maxVisibleItems + \brief the maximum allowed size on screen of the completer, measured in items + \since 4.6 + + By default, this property has a value of 7. +*/ +int QCompleter::maxVisibleItems() const +{ + Q_D(const QCompleter); + return d->maxVisibleItems; +} + +void QCompleter::setMaxVisibleItems(int maxItems) +{ + Q_D(QCompleter); + if (maxItems < 0) { + qWarning("QCompleter::setMaxVisibleItems: " + "Invalid max visible items (%d) must be >= 0", maxItems); + return; + } + d->maxVisibleItems = maxItems; +} + /*! \property QCompleter::caseSensitivity \brief the case sensitivity of the matching diff --git a/src/gui/util/qcompleter.h b/src/gui/util/qcompleter.h index c1169ef74..a41915421 100644 --- a/src/gui/util/qcompleter.h +++ b/src/gui/util/qcompleter.h @@ -69,6 +69,7 @@ class Q_GUI_EXPORT QCompleter : public QObject Q_PROPERTY(CompletionMode completionMode READ completionMode WRITE setCompletionMode) Q_PROPERTY(int completionColumn READ completionColumn WRITE setCompletionColumn) Q_PROPERTY(int completionRole READ completionRole WRITE setCompletionRole) + Q_PROPERTY(int maxVisibleItems READ maxVisibleItems WRITE setMaxVisibleItems) Q_PROPERTY(Qt::CaseSensitivity caseSensitivity READ caseSensitivity WRITE setCaseSensitivity) Q_PROPERTY(bool wrapAround READ wrapAround WRITE setWrapAround) @@ -118,6 +119,9 @@ public: bool wrapAround() const; + int maxVisibleItems() const; + void setMaxVisibleItems(int maxItems); + int completionCount() const; bool setCurrentRow(int row); int currentRow() const; diff --git a/src/gui/util/qcompleter_p.h b/src/gui/util/qcompleter_p.h index dc4189fbd..288f5319e 100644 --- a/src/gui/util/qcompleter_p.h +++ b/src/gui/util/qcompleter_p.h @@ -87,6 +87,7 @@ public: Qt::CaseSensitivity cs; int role; int column; + int maxVisibleItems; QCompleter::ModelSorting sorting; bool wrap; diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp index fb03e1a40..0a9c16a36 100644 --- a/tests/auto/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/qcompleter/tst_qcompleter.cpp @@ -102,6 +102,8 @@ public: ~tst_QCompleter(); private slots: + void getSetCheck(); + void multipleWidgets(); void focusIn(); @@ -268,6 +270,72 @@ void tst_QCompleter::filter() QCOMPARE(completer->currentCompletion(), completionText); } +// Testing get/set functions +void tst_QCompleter::getSetCheck() +{ + QStandardItemModel model(3,3); + QCompleter completer(&model); + + // QString QCompleter::completionPrefix() + // void QCompleter::setCompletionPrefix(QString) + completer.setCompletionPrefix(QString("te")); + QCOMPARE(completer.completionPrefix(), QString("te")); + completer.setCompletionPrefix(QString()); + QCOMPARE(completer.completionPrefix(), QString()); + + // ModelSorting QCompleter::modelSorting() + // void QCompleter::setModelSorting(ModelSorting) + completer.setModelSorting(QCompleter::CaseSensitivelySortedModel); + QCOMPARE(completer.modelSorting(), QCompleter::CaseSensitivelySortedModel); + completer.setModelSorting(QCompleter::CaseInsensitivelySortedModel); + QCOMPARE(completer.modelSorting(), QCompleter::CaseInsensitivelySortedModel); + completer.setModelSorting(QCompleter::UnsortedModel); + QCOMPARE(completer.modelSorting(), QCompleter::UnsortedModel); + + // CompletionMode QCompleter::completionMode() + // void QCompleter::setCompletionMode(CompletionMode) + QCOMPARE(completer.completionMode(), QCompleter::PopupCompletion); // default value + completer.setCompletionMode(QCompleter::UnfilteredPopupCompletion); + QCOMPARE(completer.completionMode(), QCompleter::UnfilteredPopupCompletion); + completer.setCompletionMode(QCompleter::InlineCompletion); + QCOMPARE(completer.completionMode(), QCompleter::InlineCompletion); + + // int QCompleter::completionColumn() + // void QCompleter::setCompletionColumn(int) + completer.setCompletionColumn(2); + QCOMPARE(completer.completionColumn(), 2); + completer.setCompletionColumn(1); + QCOMPARE(completer.completionColumn(), 1); + + // int QCompleter::completionRole() + // void QCompleter::setCompletionRole(int) + QCOMPARE(completer.completionRole(), static_cast(Qt::EditRole)); // default value + completer.setCompletionRole(Qt::DisplayRole); + QCOMPARE(completer.completionRole(), static_cast(Qt::DisplayRole)); + + // int QCompleter::maxVisibleItems() + // void QCompleter::setMaxVisibleItems(int) + QCOMPARE(completer.maxVisibleItems(), 7); // default value + completer.setMaxVisibleItems(10); + QCOMPARE(completer.maxVisibleItems(), 10); + QTest::ignoreMessage(QtWarningMsg, "QCompleter::setMaxVisibleItems: " + "Invalid max visible items (-2147483648) must be >= 0"); + completer.setMaxVisibleItems(INT_MIN); + QCOMPARE(completer.maxVisibleItems(), 10); // Cannot be set to something negative => old value + + // Qt::CaseSensitivity QCompleter::caseSensitivity() + // void QCompleter::setCaseSensitivity(Qt::CaseSensitivity) + QCOMPARE(completer.caseSensitivity(), Qt::CaseSensitive); // default value + completer.setCaseSensitivity(Qt::CaseInsensitive); + QCOMPARE(completer.caseSensitivity(), Qt::CaseInsensitive); + + // bool QCompleter::wrapAround() + // void QCompleter::setWrapAround(bool) + QCOMPARE(completer.wrapAround(), true); // default value + completer.setWrapAround(false); + QCOMPARE(completer.wrapAround(), false); +} + void tst_QCompleter::csMatchingOnCsSortedModel_data() { delete completer; -- cgit v1.2.3 From 1d52548c21f9ca47e2ef02cd944b7640b0d4dd6b Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Fri, 17 Jul 2009 14:24:35 +0200 Subject: QUdpSocket: Doc improvement Task-number: 236891 Reviewed-By: David Boddie --- src/network/socket/qudpsocket.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp index ea7753cdb..797becb78 100644 --- a/src/network/socket/qudpsocket.cpp +++ b/src/network/socket/qudpsocket.cpp @@ -70,6 +70,9 @@ pendingDatagramSize() to obtain the size of the first pending datagram, and readDatagram() to read it. + \note An incoming datagram should be read when you receive the readyRead() + signal, otherwise this signal will not be emitted for the next datagram. + Example: \snippet doc/src/snippets/code/src_network_socket_qudpsocket.cpp 0 -- cgit v1.2.3 From 080231536cbc5e9acc486e57e165320416f66d85 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 17 Jul 2009 15:19:45 +0200 Subject: Update the documentation after the change in the completer exemple --- doc/src/examples/completer.qdoc | 16 ++++++++++++---- examples/tools/completer/mainwindow.cpp | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/doc/src/examples/completer.qdoc b/doc/src/examples/completer.qdoc index 9aaaf6605..3805a7cbc 100644 --- a/doc/src/examples/completer.qdoc +++ b/doc/src/examples/completer.qdoc @@ -100,9 +100,9 @@ \section1 MainWindow Class Definition - The \c MainWindow class is a subclass of QMainWindow and implements four - private slots - \c about(), \c changeCase(), \c changeMode(), and - \c changeModel(). + The \c MainWindow class is a subclass of QMainWindow and implements five + private slots - \c about(), \c changeCase(), \c changeMode(), \c changeModel(), + and \c changeMaxVisible(). \snippet examples/tools/completer/mainwindow.h 0 @@ -126,6 +126,9 @@ \snippet examples/tools/completer/mainwindow.cpp 0 + The \c maxVisibleSpinBox is created and determines the number of visible + item in the completer + The \c wrapCheckBox is then set up. This \c checkBox determines if the \c{completer}'s \l{QCompleter::setWrapAround()}{setWrapAround()} property is enabled or disabled. @@ -242,10 +245,15 @@ \snippet examples/tools/completer/mainwindow.cpp 14 - The \c about() function provides a brief description about the example. + The \c changeMaxVisible() update the maximum number of visible items in + the completer. \snippet examples/tools/completer/mainwindow.cpp 15 + The \c about() function provides a brief description about the example. + + \snippet examples/tools/completer/mainwindow.cpp 16 + \section1 \c main() Function The \c main() function instantiates QApplication and \c MainWindow and diff --git a/examples/tools/completer/mainwindow.cpp b/examples/tools/completer/mainwindow.cpp index 06f16de17..c98482a53 100644 --- a/examples/tools/completer/mainwindow.cpp +++ b/examples/tools/completer/mainwindow.cpp @@ -75,15 +75,15 @@ MainWindow::MainWindow(QWidget *parent) caseCombo->addItem(tr("Case Insensitive")); caseCombo->addItem(tr("Case Sensitive")); caseCombo->setCurrentIndex(0); +//! [0] +//! [1] QLabel *maxVisibleLabel = new QLabel; maxVisibleLabel->setText(tr("Max Visible Items")); maxVisibleSpinBox = new QSpinBox; maxVisibleSpinBox->setRange(3,25); maxVisibleSpinBox->setValue(10); -//! [0] -//! [1] wrapCheckBox = new QCheckBox; wrapCheckBox->setText(tr("Wrap around completions")); wrapCheckBox->setChecked(true); -- cgit v1.2.3 From 5f6c0594f07df57af2574be0420a68f84b703b87 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Fri, 17 Jul 2009 13:36:08 +0200 Subject: Add priority property to QAction We need this to support the behavior in Gtk+ where, when Qt::ToolButtonTextBesideIcon is used, only text labels for important actions are shown. It will also enable us to prioritize actions in the future when for instance collapsing a toolbar. Task-number: 258290 Reviewed-by: thierry --- demos/textedit/textedit.cpp | 14 +++++++++++++ src/corelib/global/qnamespace.h | 2 +- src/gui/kernel/qaction.cpp | 27 +++++++++++++++++++++++++- src/gui/kernel/qaction.h | 8 ++++++++ src/gui/kernel/qaction_p.h | 1 + src/gui/styles/qstyle.cpp | 2 +- src/gui/widgets/qtoolbutton.cpp | 10 ++++++++-- tests/auto/qaction/tst_qaction.cpp | 4 ++++ tests/auto/qtoolbutton/tst_qtoolbutton.cpp | 27 ++++++++++++++++++++++++++ tools/assistant/tools/assistant/mainwindow.cpp | 8 +++++++- 10 files changed, 97 insertions(+), 6 deletions(-) diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp index 75a13a52f..7f8e1fe26 100644 --- a/demos/textedit/textedit.cpp +++ b/demos/textedit/textedit.cpp @@ -159,6 +159,7 @@ void TextEdit::setupFileActions() QAction *a; a = new QAction(QIcon(rsrcPath + "/filenew.png"), tr("&New"), this); + a->setPriority(QAction::LowPriority); a->setShortcut(QKeySequence::New); connect(a, SIGNAL(triggered()), this, SLOT(fileNew())); tb->addAction(a); @@ -180,6 +181,7 @@ void TextEdit::setupFileActions() menu->addAction(a); a = new QAction(tr("Save &As..."), this); + a->setPriority(QAction::LowPriority); connect(a, SIGNAL(triggered()), this, SLOT(fileSaveAs())); menu->addAction(a); menu->addSeparator(); @@ -196,6 +198,7 @@ void TextEdit::setupFileActions() menu->addAction(a); a = new QAction(QIcon(rsrcPath + "/exportpdf.png"), tr("&Export PDF..."), this); + a->setPriority(QAction::LowPriority); a->setShortcut(Qt::CTRL + Qt::Key_D); connect(a, SIGNAL(triggered()), this, SLOT(filePrintPdf())); tb->addAction(a); @@ -225,19 +228,23 @@ void TextEdit::setupEditActions() tb->addAction(a); menu->addAction(a); a = actionRedo = new QAction(QIcon(rsrcPath + "/editredo.png"), tr("&Redo"), this); + a->setPriority(QAction::LowPriority); a->setShortcut(QKeySequence::Redo); tb->addAction(a); menu->addAction(a); menu->addSeparator(); a = actionCut = new QAction(QIcon(rsrcPath + "/editcut.png"), tr("Cu&t"), this); + a->setPriority(QAction::LowPriority); a->setShortcut(QKeySequence::Cut); tb->addAction(a); menu->addAction(a); a = actionCopy = new QAction(QIcon(rsrcPath + "/editcopy.png"), tr("&Copy"), this); + a->setPriority(QAction::LowPriority); a->setShortcut(QKeySequence::Copy); tb->addAction(a); menu->addAction(a); a = actionPaste = new QAction(QIcon(rsrcPath + "/editpaste.png"), tr("&Paste"), this); + a->setPriority(QAction::LowPriority); a->setShortcut(QKeySequence::Paste); tb->addAction(a); menu->addAction(a); @@ -254,6 +261,7 @@ void TextEdit::setupTextActions() menuBar()->addMenu(menu); actionTextBold = new QAction(QIcon(rsrcPath + "/textbold.png"), tr("&Bold"), this); + actionTextBold->setPriority(QAction::LowPriority); actionTextBold->setShortcut(Qt::CTRL + Qt::Key_B); QFont bold; bold.setBold(true); @@ -264,6 +272,7 @@ void TextEdit::setupTextActions() actionTextBold->setCheckable(true); actionTextItalic = new QAction(QIcon(rsrcPath + "/textitalic.png"), tr("&Italic"), this); + actionTextItalic->setPriority(QAction::LowPriority); actionTextItalic->setShortcut(Qt::CTRL + Qt::Key_I); QFont italic; italic.setItalic(true); @@ -274,6 +283,7 @@ void TextEdit::setupTextActions() actionTextItalic->setCheckable(true); actionTextUnderline = new QAction(QIcon(rsrcPath + "/textunder.png"), tr("&Underline"), this); + actionTextUnderline->setPriority(QAction::LowPriority); actionTextUnderline->setShortcut(Qt::CTRL + Qt::Key_U); QFont underline; underline.setUnderline(true); @@ -302,12 +312,16 @@ void TextEdit::setupTextActions() actionAlignLeft->setShortcut(Qt::CTRL + Qt::Key_L); actionAlignLeft->setCheckable(true); + actionAlignLeft->setPriority(QAction::LowPriority); actionAlignCenter->setShortcut(Qt::CTRL + Qt::Key_E); actionAlignCenter->setCheckable(true); + actionAlignCenter->setPriority(QAction::LowPriority); actionAlignRight->setShortcut(Qt::CTRL + Qt::Key_R); actionAlignRight->setCheckable(true); + actionAlignRight->setPriority(QAction::LowPriority); actionAlignJustify->setShortcut(Qt::CTRL + Qt::Key_J); actionAlignJustify->setCheckable(true); + actionAlignJustify->setPriority(QAction::LowPriority); tb->addActions(grp->actions()); menu->addActions(grp->actions()); diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 077e4ef7f..7770fd6a1 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1411,7 +1411,7 @@ public: ToolButtonTextOnly, ToolButtonTextBesideIcon, ToolButtonTextUnderIcon, - ToolButtonSystemDefault + ToolButtonFollowStyle }; enum LayoutDirection { diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index 4ee17f4c0..09ba6cc08 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -81,7 +81,7 @@ static QString qt_strippedText(QString s) QActionPrivate::QActionPrivate() : group(0), enabled(1), forceDisabled(0), visible(1), forceInvisible(0), checkable(0), checked(0), separator(0), fontSet(false), - menuRole(QAction::TextHeuristicRole), iconVisibleInMenu(-1) + menuRole(QAction::TextHeuristicRole), priority(QAction::NormalPriority), iconVisibleInMenu(-1) { #ifdef QT3_SUPPORT static int qt_static_action_id = -1; @@ -909,6 +909,31 @@ QString QAction::whatsThis() const return d->whatsthis; } +/*! + \property QAction::priority + \since 4.6 + + \brief tells collapsible layouts how the action should be prioritized + + This property can be set to indicate that an action should be prioritied + in a layout. For instance when toolbars have the Qt::ToolButtonTextBesideIcon + mode is set, lower priority actions will hide text labels to preserve space. +*/ +void QAction::setPriority(Priority priority) +{ + Q_D(QAction); + if (d->priority == priority) + return; + + d->priority = priority; + d->sendDataChanged(); +} + +QAction::Priority QAction::priority() const +{ + Q_D(const QAction); + return d->priority; +} /*! \property QAction::checkable diff --git a/src/gui/kernel/qaction.h b/src/gui/kernel/qaction.h index 6920ec5b5..133fab46f 100644 --- a/src/gui/kernel/qaction.h +++ b/src/gui/kernel/qaction.h @@ -67,6 +67,7 @@ class Q_GUI_EXPORT QAction : public QObject Q_DECLARE_PRIVATE(QAction) Q_ENUMS(MenuRole) + Q_ENUMS(Priority) Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable) Q_PROPERTY(bool checked READ isChecked WRITE setChecked DESIGNABLE isCheckable NOTIFY toggled) Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled) @@ -85,10 +86,14 @@ class Q_GUI_EXPORT QAction : public QObject Q_PROPERTY(bool visible READ isVisible WRITE setVisible) Q_PROPERTY(MenuRole menuRole READ menuRole WRITE setMenuRole) Q_PROPERTY(bool iconVisibleInMenu READ isIconVisibleInMenu WRITE setIconVisibleInMenu) + Q_PROPERTY(Priority priority READ priority WRITE setPriority) public: enum MenuRole { NoRole, TextHeuristicRole, ApplicationSpecificRole, AboutQtRole, AboutRole, PreferencesRole, QuitRole }; + enum Priority { LowPriority = 0, + NormalPriority = 128, + HighPriority = 256}; explicit QAction(QObject* parent); QAction(const QString &text, QObject* parent); QAction(const QIcon &icon, const QString &text, QObject* parent); @@ -123,6 +128,9 @@ public: void setWhatsThis(const QString &what); QString whatsThis() const; + void setPriority(Priority priority); + Priority priority() const; + #ifndef QT_NO_MENU QMenu *menu() const; void setMenu(QMenu *menu); diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h index bae9bbf65..4745ed1de 100644 --- a/src/gui/kernel/qaction_p.h +++ b/src/gui/kernel/qaction_p.h @@ -102,6 +102,7 @@ public: uint separator : 1; uint fontSet : 1; QAction::MenuRole menuRole; + QAction::Priority priority; int iconVisibleInMenu : 3; // Only has values -1, 0, and 1 QList widgets; #ifndef QT_NO_GRAPHICSVIEW diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp index bccd766e9..d47c6105b 100644 --- a/src/gui/styles/qstyle.cpp +++ b/src/gui/styles/qstyle.cpp @@ -1865,7 +1865,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, \value SH_DockWidget_ButtonsHaveFrame Determines if dockwidget buttons should have frames. Default is true. - \value SH_ToolButtonStyle Determines the default system style for tool buttons that uses Qt::ToolButtonSystemDefault. + \value SH_ToolButtonStyle Determines the default system style for tool buttons that uses Qt::ToolButtonFollowStyle. \omitvalue SH_UnderlineAccelerator diff --git a/src/gui/widgets/qtoolbutton.cpp b/src/gui/widgets/qtoolbutton.cpp index 5d0a98af5..3901245b2 100644 --- a/src/gui/widgets/qtoolbutton.cpp +++ b/src/gui/widgets/qtoolbutton.cpp @@ -378,11 +378,17 @@ void QToolButton::initStyleOption(QStyleOptionToolButton *option) const if (d->hasMenu()) option->features |= QStyleOptionToolButton::HasMenu; #endif - if (d->toolButtonStyle == Qt::ToolButtonSystemDefault) { + if (d->toolButtonStyle == Qt::ToolButtonFollowStyle) { option->toolButtonStyle = Qt::ToolButtonStyle(style()->styleHint(QStyle::SH_ToolButtonStyle, option, this)); } else option->toolButtonStyle = d->toolButtonStyle; + if (option->toolButtonStyle == Qt::ToolButtonTextBesideIcon) { + // If the action is not prioritized, remove the text label to save space + if (d->defaultAction && d->defaultAction->priority() < QAction::NormalPriority) + option->toolButtonStyle = Qt::ToolButtonIconOnly; + } + if (d->icon.isNull() && d->arrowType == Qt::NoArrow && !forceNoText) { if (!d->text.isEmpty()) option->toolButtonStyle = Qt::ToolButtonTextOnly; @@ -482,7 +488,7 @@ QSize QToolButton::minimumSizeHint() const If you want your toolbars to depend on system settings, as is possible in GNOME and KDE desktop environments you should - use the ToolButtonSystemDefault. + use the ToolButtonFollowStyle. QToolButton automatically connects this slot to the relevant signal in the QMainWindow in which is resides. diff --git a/tests/auto/qaction/tst_qaction.cpp b/tests/auto/qaction/tst_qaction.cpp index 452ca58ba..3c71baf4b 100644 --- a/tests/auto/qaction/tst_qaction.cpp +++ b/tests/auto/qaction/tst_qaction.cpp @@ -105,6 +105,10 @@ void tst_QAction::getSetCheck() obj1.setMenu((QMenu *)0); QCOMPARE((QMenu *)0, obj1.menu()); delete var2; + + QCOMPARE(obj1.priority(), QAction::NormalPriority); + obj1.setPriority(QAction::LowPriority); + QCOMPARE(obj1.priority(), QAction::LowPriority); } class MyWidget : public QWidget diff --git a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp index 9e342ad36..417650718 100644 --- a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp +++ b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp @@ -64,6 +64,7 @@ public: private slots: void getSetCheck(); void triggered(); + void collapseTextOnPriority(); void task230994_iconSize(); void task176137_autoRepeatOfAction(); @@ -160,6 +161,32 @@ void tst_QToolButton::triggered() delete menu; } +void tst_QToolButton::collapseTextOnPriority() +{ + class MyToolButton : public QToolButton + { + friend class tst_QToolButton; + public: + void initStyleOption(QStyleOptionToolButton *option) + { + QToolButton::initStyleOption(option); + } + }; + + MyToolButton button; + button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + QAction action(button.style()->standardIcon(QStyle::SP_ArrowBack), "test", 0); + button.setDefaultAction(&action); + + QStyleOptionToolButton option; + button.initStyleOption(&option); + QVERIFY(option.toolButtonStyle == Qt::ToolButtonTextBesideIcon); + action.setPriority(QAction::LowPriority); + button.initStyleOption(&option); + QVERIFY(option.toolButtonStyle == Qt::ToolButtonIconOnly); +} + + void tst_QToolButton::task230994_iconSize() { //we check that the iconsize returned bu initStyleOption is valid diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp index ae3f7bc5f..7926020d5 100644 --- a/tools/assistant/tools/assistant/mainwindow.cpp +++ b/tools/assistant/tools/assistant/mainwindow.cpp @@ -93,7 +93,7 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) , m_qtDocInstaller(0) , m_connectedInitSignals(false) { - setToolButtonStyle(Qt::ToolButtonSystemDefault); + setToolButtonStyle(Qt::ToolButtonFollowStyle); if (usesDefaultCollection()) { MainWindow::collectionFileDirectory(true); @@ -431,6 +431,7 @@ void MainWindow::setupActions() SLOT(printPreview())); m_printAction = menu->addAction(tr("&Print..."), m_centralWidget, SLOT(print())); + m_printAction->setPriority(QAction::LowPriority); m_printAction->setIcon(QIcon(resourcePath + QLatin1String("/print.png"))); m_printAction->setShortcut(QKeySequence::Print); @@ -450,6 +451,7 @@ void MainWindow::setupActions() menu = menuBar()->addMenu(tr("&Edit")); m_copyAction = menu->addAction(tr("&Copy selected Text"), m_centralWidget, SLOT(copySelection())); + m_copyAction->setPriority(QAction::LowPriority); m_copyAction->setIconText("&Copy"); m_copyAction->setIcon(QIcon(resourcePath + QLatin1String("/editcopy.png"))); m_copyAction->setShortcuts(QKeySequence::Copy); @@ -476,16 +478,19 @@ void MainWindow::setupActions() m_viewMenu = menuBar()->addMenu(tr("&View")); m_zoomInAction = m_viewMenu->addAction(tr("Zoom &in"), m_centralWidget, SLOT(zoomIn())); + m_zoomInAction->setPriority(QAction::LowPriority); m_zoomInAction->setIcon(QIcon(resourcePath + QLatin1String("/zoomin.png"))); m_zoomInAction->setShortcut(QKeySequence::ZoomIn); m_zoomOutAction = m_viewMenu->addAction(tr("Zoom &out"), m_centralWidget, SLOT(zoomOut())); + m_zoomOutAction->setPriority(QAction::LowPriority); m_zoomOutAction->setIcon(QIcon(resourcePath + QLatin1String("/zoomout.png"))); m_zoomOutAction->setShortcut(QKeySequence::ZoomOut); m_resetZoomAction = m_viewMenu->addAction(tr("Normal &Size"), m_centralWidget, SLOT(resetZoom())); + m_resetZoomAction->setPriority(QAction::LowPriority); m_resetZoomAction->setIcon(QIcon(resourcePath + QLatin1String("/resetzoom.png"))); m_resetZoomAction->setShortcut(tr("Ctrl+0")); @@ -511,6 +516,7 @@ void MainWindow::setupActions() m_backAction->setIcon(QIcon(resourcePath + QLatin1String("/previous.png"))); m_nextAction = menu->addAction(tr("&Forward"), m_centralWidget, SLOT(forward())); + m_nextAction->setPriority(QAction::LowPriority); m_nextAction->setEnabled(false); m_nextAction->setShortcuts(QKeySequence::Forward); m_nextAction->setIcon(QIcon(resourcePath + QLatin1String("/next.png"))); -- cgit v1.2.3 From 13254da6c3192937812983f44ce95fe8e1bc602c Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 17 Jul 2009 15:40:49 +0200 Subject: Implement QDesktopWidget::screenCountChanged signal on desktop platforms, and add manual testcase. Provide replacement "screenCount" for numScreens and document numScreens as obsolete to be more consistent with other APIs. --- dist/changes-4.6.0 | 4 + doc/src/qdesktopwidget.qdoc | 83 ++++++----- src/gui/kernel/qapplication_x11.cpp | 13 +- src/gui/kernel/qdesktopwidget.h | 4 + src/gui/kernel/qdesktopwidget_mac.mm | 64 +++++---- src/gui/kernel/qdesktopwidget_mac_p.h | 3 +- src/gui/kernel/qdesktopwidget_win.cpp | 18 +-- src/gui/kernel/qdesktopwidget_x11.cpp | 25 ++++ tests/manual/qdesktopwidget/main.cpp | 188 +++++++++++++++++++++++++ tests/manual/qdesktopwidget/qdesktopwidget.pro | 2 + 10 files changed, 323 insertions(+), 81 deletions(-) create mode 100644 tests/manual/qdesktopwidget/main.cpp create mode 100644 tests/manual/qdesktopwidget/qdesktopwidget.pro diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0 index 4c7bf52bb..5e211ff5b 100644 --- a/dist/changes-4.6.0 +++ b/dist/changes-4.6.0 @@ -68,3 +68,7 @@ information about a particular change. to the item's position and transformation, you can set the flag QGraphicsItem::ItemSendsGeometryChanges (which is enabled by default by QGraphicsWidget and QGraphicsProxyWidget). + +- QDesktopWidget on X11 no longer emits the resized(int) signal when screens + are added or removed. This was not done on other platforms. Use the + screenCountChanged signal instead diff --git a/doc/src/qdesktopwidget.qdoc b/doc/src/qdesktopwidget.qdoc index 1158904a5..383ccfc4b 100644 --- a/doc/src/qdesktopwidget.qdoc +++ b/doc/src/qdesktopwidget.qdoc @@ -54,9 +54,9 @@ Systems with more than one graphics card and monitor can manage the physical screen space available either as multiple desktops, or as a large virtual desktop, which usually has the size of the bounding - rectangle of all the screens (see isVirtualDesktop()). For an + rectangle of all the screens (see virtualDesktop). For an application, one of the available screens is the primary screen, i.e. - the screen where the main widget resides (see primaryScreen()). All + the screen where the main widget resides (see primaryScreen). All windows opened in the context of the application should be constrained to the boundaries of the primary screen; for example, it would be inconvenient if a dialog box popped up on a different @@ -64,16 +64,16 @@ The QDesktopWidget provides information about the geometry of the available screens with screenGeometry(). The number of screens - available is returned by numScreens(). The screen number that a - particular point or widget is located in is returned by - screenNumber(). + available is returned by screenCount, and the screenCountChanged + signal is emitted when screens are added or removed during runtime. + The screen number that a particular point or widget is located in + is returned by screenNumber(). Widgets provided by Qt use this class, for example, to place tooltips, menus and dialog boxes according to the parent or - application widget. - - Applications can use this class to save window positions, or to place - child widgets on one screen. + application widget. Applications can use this class to save window + positions, or to place child widgets and dialogs on one particular + screen. \img qdesktopwidget.png Managing Multiple Screens @@ -114,31 +114,16 @@ Destroys the desktop widget and frees any allocated resources. */ -/*! - \fn bool QDesktopWidget::isVirtualDesktop() const - - Returns true if the system manages the available screens in a - virtual desktop; otherwise returns false. - - For virtual desktops, screen() will always return the same widget. - The size of the virtual desktop is the size of this desktop - widget. -*/ - -/*! - \fn int QDesktopWidget::primaryScreen() const - - Returns the index of the primary screen. - - \sa numScreens() -*/ - /*! \fn int QDesktopWidget::numScreens() const - + Returns the number of available screens. + + \obsolete + + This function is deprecated. Use screenCount instead. - \sa primaryScreen() + \sa primaryScreen */ /*! @@ -146,13 +131,12 @@ Returns a widget that represents the screen with index \a screen (a value of -1 means the default screen). - If the system uses a virtual desktop, the returned widget will have the geometry of the entire virtual desktop; i.e., bounding every \a screen. - \sa primaryScreen(), numScreens(), isVirtualDesktop() + \sa primaryScreen, screenCount, virtualDesktop */ /*! @@ -216,7 +200,7 @@ Returns the index of the screen that contains the largest part of \a widget, or -1 if the widget not on a screen. - \sa primaryScreen() + \sa primaryScreen */ /*! @@ -226,7 +210,7 @@ Returns the index of the screen that contains the \a point, or the screen which is the shortest distance from the \a point. - \sa primaryScreen() + \sa primaryScreen */ /*! @@ -245,3 +229,34 @@ This signal is emitted when the work area available on \a screen changes. */ + +/*! + \property QDesktopWidget::screenCount + \brief the number of screens currently available on the system. + + \sa screenCountChanged() +*/ + +/*! + \property QDesktopWidget::primaryScreen + \brief the index of the screen that is configured to be the primary screen + on the system. +*/ + +/*! + \property QDesktopWidget::virtualDesktop + + \brief if the system manages the available screens in a virtual desktop. + + For virtual desktops, screen() will always return the same widget. + The size of the virtual desktop is the size of this desktop + widget. +*/ + +/*! + \fn void QDesktopWidget::screenCountChanged(int newCount) + + This signal is emitted when the number of screens changes to \a newCount. + + \sa screenCount +*/ diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index cc412997e..a07ccdde4 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -3441,19 +3441,10 @@ int QApplication::x11ProcessEvent(XEvent* event) QSize oldSize(w->size()); w->data->crect.setWidth(DisplayWidth(X11->display, scr)); w->data->crect.setHeight(DisplayHeight(X11->display, scr)); - QVarLengthArray oldSizes(desktop->numScreens()); - for (int i = 0; i < desktop->numScreens(); ++i) - oldSizes[i] = desktop->screenGeometry(i); QResizeEvent e(w->size(), oldSize); QApplication::sendEvent(w, &e); - for (int i = 0; i < qMin(oldSizes.count(), desktop->numScreens()); ++i) { - if (oldSizes[i] != desktop->screenGeometry(i)) - emit desktop->resized(i); - } - for (int i = oldSizes.count(); i < desktop->numScreens(); ++i) - emit desktop->resized(i); // added - for (int i = desktop->numScreens(); i < oldSizes.count(); ++i) - emit desktop->resized(i); // removed + if (w != desktop) + QApplication::sendEvent(desktop, &e); } #endif // QT_NO_XRANDR diff --git a/src/gui/kernel/qdesktopwidget.h b/src/gui/kernel/qdesktopwidget.h index 470f10a43..5ac953cc4 100644 --- a/src/gui/kernel/qdesktopwidget.h +++ b/src/gui/kernel/qdesktopwidget.h @@ -85,6 +85,7 @@ public: Q_SIGNALS: void resized(int); void workAreaResized(int); + void screenCountChanged(int); protected: void resizeEvent(QResizeEvent *e); @@ -97,6 +98,9 @@ private: friend class QApplicationPrivate; }; +inline int QDesktopWidget::screenCount() const +{ return numScreens(); } + QT_END_NAMESPACE QT_END_HEADER diff --git a/src/gui/kernel/qdesktopwidget_mac.mm b/src/gui/kernel/qdesktopwidget_mac.mm index 2489fe4d6..7dd74da9a 100644 --- a/src/gui/kernel/qdesktopwidget_mac.mm +++ b/src/gui/kernel/qdesktopwidget_mac.mm @@ -97,15 +97,13 @@ QT_USE_NAMESPACE Q_GLOBAL_STATIC(QDesktopWidgetImplementation, qdesktopWidgetImplementation) QDesktopWidgetImplementation::QDesktopWidgetImplementation() - : appScreen(0), displays(0) + : appScreen(0) { onResize(); } QDesktopWidgetImplementation::~QDesktopWidgetImplementation() { - if (displays) - [displays release]; } QDesktopWidgetImplementation *QDesktopWidgetImplementation::instance() @@ -118,13 +116,7 @@ QRect QDesktopWidgetImplementation::availableRect(int screenIndex) const if (screenIndex < 0 || screenIndex >= screenCount) screenIndex = appScreen; - NSRect r = [[displays objectAtIndex:screenIndex] visibleFrame]; - NSRect primaryRect = [[displays objectAtIndex:0] frame]; - - const int flippedY = - r.origin.y + // account for position offset and - primaryRect.size.height - r.size.height; // height difference. - return QRectF(r.origin.x, flippedY, - r.size.width, r.size.height).toRect(); + return availableRects[screenIndex].toRect(); } QRect QDesktopWidgetImplementation::screenRect(int screenIndex) const @@ -132,22 +124,28 @@ QRect QDesktopWidgetImplementation::screenRect(int screenIndex) const if (screenIndex < 0 || screenIndex >= screenCount) screenIndex = appScreen; - NSRect r = [[displays objectAtIndex:screenIndex] frame]; - NSRect primaryRect = [[displays objectAtIndex:0] frame]; - - const int flippedY = - r.origin.y + // account for position offset and - primaryRect.size.height - r.size.height; // height difference. - return QRectF(r.origin.x, flippedY, - r.size.width, r.size.height).toRect(); + return screenRects[screenIndex].toRect(); } void QDesktopWidgetImplementation::onResize() { - if (displays) - [displays release]; - - displays = [[NSScreen screens] retain]; - screenCount = [displays count]; + QMacCocoaAutoReleasePool pool; + NSArray *displays = [NSScreen screens]; + screenCount = [displays count]; + + screenRects.clear(); + availableRects.clear(); + NSRect primaryRect = [[displays objectAtIndex:0] frame]; + for (int i = 0; iappScreen; QRect frame = widget->frameGeometry(); @@ -216,7 +214,7 @@ int QDesktopWidget::screenNumber(const QWidget *widget) const int QDesktopWidget::screenNumber(const QPoint &point) const { - QDesktopWidgetImplementation *d = qdesktopWidgetImplementation(); + QDesktopWidgetImplementation *d = qdesktopWidgetImplementation(); int closestScreen = -1; int shortestDistance = INT_MAX; for (int i = 0; i < d->screenCount; ++i) { @@ -232,13 +230,25 @@ int QDesktopWidget::screenNumber(const QPoint &point) const void QDesktopWidget::resizeEvent(QResizeEvent *) { - QDesktopWidgetImplementation *d = qdesktopWidgetImplementation(); + QDesktopWidgetImplementation *d = qdesktopWidgetImplementation(); + + const int oldScreenCount = d->screenCount; + const QVector oldRects(d->screenRects); + const QVector oldWorks(d->availableRects); d->onResize(); - for (int i = 0; i < d->screenCount; ++i) { - emit resized(i); + for (int i = 0; i < qMin(oldScreenCount, d->screenCount); ++i) { + if (oldRects.at(i) != d->screenRects.at(i)) + emit resized(i); + } + for (int i = 0; i < qMin(oldScreenCount, d->screenCount); ++i) { + if (oldWorks.at(i) != d->availableRects.at(i)) + emit workAreaResized(i); } + + if (oldscreencount != d->screenCount) + emit screenCountChanged(d->screenCount); } QT_END_NAMESPACE diff --git a/src/gui/kernel/qdesktopwidget_mac_p.h b/src/gui/kernel/qdesktopwidget_mac_p.h index 0fdc45511..e9d5d9fcb 100644 --- a/src/gui/kernel/qdesktopwidget_mac_p.h +++ b/src/gui/kernel/qdesktopwidget_mac_p.h @@ -64,7 +64,8 @@ public: int appScreen; int screenCount; - NSArray *displays; + QVector availableRects; + QVector screenRects; QRect availableRect(int screenIndex) const; QRect screenRect(int screenIndex) const; diff --git a/src/gui/kernel/qdesktopwidget_win.cpp b/src/gui/kernel/qdesktopwidget_win.cpp index fb176b765..a89e08f64 100644 --- a/src/gui/kernel/qdesktopwidget_win.cpp +++ b/src/gui/kernel/qdesktopwidget_win.cpp @@ -354,10 +354,8 @@ int QDesktopWidget::screenNumber(const QPoint &point) const void QDesktopWidget::resizeEvent(QResizeEvent *) { Q_D(QDesktopWidget); - QVector oldrects; - oldrects = *d->rects; - QVector oldworkrects; - oldworkrects = *d->workrects; + const QVector oldrects(*d->rects); + const QVector oldworkrects(*d->workrects); int oldscreencount = d->screenCount; QDesktopWidgetPrivate::cleanup(); @@ -368,18 +366,22 @@ void QDesktopWidget::resizeEvent(QResizeEvent *) #endif for (int i = 0; i < qMin(oldscreencount, d->screenCount); ++i) { - QRect oldrect = oldrects[i]; - QRect newrect = d->rects->at(i); + const QRect oldrect = oldrects[i]; + const QRect newrect = d->rects->at(i); if (oldrect != newrect) emit resized(i); } for (int j = 0; j < qMin(oldscreencount, d->screenCount); ++j) { - QRect oldrect = oldworkrects[j]; - QRect newrect = d->workrects->at(j); + const QRect oldrect = oldworkrects[j]; + const QRect newrect = d->workrects->at(j); if (oldrect != newrect) emit workAreaResized(j); } + + if (oldscreencount != d->screenCount) { + emit screenCountChanged(d->screenCount); + } } #ifdef Q_CC_MSVC diff --git a/src/gui/kernel/qdesktopwidget_x11.cpp b/src/gui/kernel/qdesktopwidget_x11.cpp index 59d3239f1..1555fc034 100644 --- a/src/gui/kernel/qdesktopwidget_x11.cpp +++ b/src/gui/kernel/qdesktopwidget_x11.cpp @@ -372,7 +372,32 @@ int QDesktopWidget::screenNumber(const QPoint &point) const void QDesktopWidget::resizeEvent(QResizeEvent *event) { Q_D(QDesktopWidget); + int oldScreenCount = d->screenCount; + QVector oldRects(oldScreenCount); + QVector oldWorks(oldScreenCount); + for (int i = 0; i < oldScreenCount; ++i) { + oldRects[i] = d->rects[i]; + oldWorks[i] = d->workareas[i]; + } + d->init(); + + for (int i = 0; i < qMin(oldScreenCount, d->screenCount); ++i) { + if (oldRects.at(i) != d->rects[i]) + emit resized(i); + } + + // ### workareas are just reset by init, not filled with new values + // ### so this will not work correctly + for (int j = 0; j < qMin(oldScreenCount, d->screenCount); ++j) { + if (oldWorks.at(j) != d->workareas[j]) + emit workAreaResized(j); + } + + if (oldScreenCount != d->screenCount) { + emit screenCountChanged(d->screenCount); + } + qt_desktopwidget_workarea_dirty = true; QWidget::resizeEvent(event); } diff --git a/tests/manual/qdesktopwidget/main.cpp b/tests/manual/qdesktopwidget/main.cpp new file mode 100644 index 000000000..1afc82eef --- /dev/null +++ b/tests/manual/qdesktopwidget/main.cpp @@ -0,0 +1,188 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +class DesktopView : public QGraphicsView +{ + Q_OBJECT +public: + DesktopView() + : that(0) + { + scene = new QGraphicsScene; + setScene(scene); + + QDesktopWidget *desktop = QApplication::desktop(); + connect(desktop, SIGNAL(resized(int)), this, SLOT(updateScene())); + connect(desktop, SIGNAL(workAreaResized(int)), this, SLOT(updateScene())); + connect(desktop, SIGNAL(screenCountChanged(int)), this, SLOT(updateScene())); + + updateScene(); + + QTransform transform; + transform.scale(0.25, 0.25); + setTransform(transform); + + setBackgroundBrush(Qt::darkGray); + } + +protected: + void moveEvent(QMoveEvent *e) + { + if (that) { + that->setRect(appRect()); + scene->update(); + } + QGraphicsView::moveEvent(e); + } + void resizeEvent(QResizeEvent *e) + { + if (that) { + that->setRect(appRect()); + } + QGraphicsView::resizeEvent(e); + } + +private slots: + void updateScene() + { + scene->clear(); + + const QDesktopWidget *desktop = QApplication::desktop(); + const bool isVirtualDesktop = desktop->isVirtualDesktop(); + const int homeScreen = desktop->screenNumber(this); + + QRect sceneRect; + int screenCount = desktop->screenCount(); + for (int s = 0; s < screenCount; ++s) { + const bool isPrimary = desktop->primaryScreen() == s; + const QRect screenRect = desktop->screenGeometry(s); + const QRect workRect = desktop->availableGeometry(s); + const QBrush fillBrush = palette().brush(isPrimary ? QPalette::Active : QPalette::Inactive, QPalette::Highlight); + QGraphicsRectItem *screen = new QGraphicsRectItem(0, 0, screenRect.width(), screenRect.height()); + + if (isVirtualDesktop) { + thatRoot = QPoint(); + screen->setPos(screenRect.x(), screenRect.y()); + } else { + // for non-virtual desktops we assume that screens are + // simply next to each other + if (s) + screen->setPos(sceneRect.right(), 0); + if (s == homeScreen) + thatRoot = screen->pos().toPoint(); + } + + screen->setBrush(fillBrush); + scene->addItem(screen); + sceneRect.setLeft(qMin(sceneRect.left(), screenRect.left())); + sceneRect.setRight(qMax(sceneRect.right(), screenRect.right())); + sceneRect.setTop(qMin(sceneRect.top(), screenRect.top())); + sceneRect.setBottom(qMax(sceneRect.bottom(), screenRect.bottom())); + + QGraphicsRectItem *workArea = new QGraphicsRectItem(screen); + workArea->setRect(0, 0, workRect.width(), workRect.height()); + workArea->setPos(workRect.x() - screenRect.x(), workRect.y() - screenRect.y()); + workArea->setBrush(Qt::white); + + QGraphicsSimpleTextItem *screenNumber = new QGraphicsSimpleTextItem(workArea); + screenNumber->setText(QString::number(s)); + screenNumber->setPen(QPen(Qt::black, 1)); + screenNumber->setBrush(fillBrush); + screenNumber->setFont(QFont("Arial Black", 18)); + screenNumber->setTransform(QTransform().scale(10, 10)); + screenNumber->setTransformOrigin(screenNumber->boundingRect().center()); + QSizeF center = (workRect.size() - screenNumber->boundingRect().size()) / 2; + screenNumber->setPos(center.width(), center.height()); + + screen->show(); + screen->setZValue(1); + } + + if (isVirtualDesktop) { + QGraphicsRectItem *virtualDesktop = new QGraphicsRectItem; + virtualDesktop->setRect(sceneRect); + virtualDesktop->setPen(QPen(Qt::black)); + virtualDesktop->setBrush(Qt::DiagCrossPattern); + scene->addItem(virtualDesktop); + virtualDesktop->setZValue(-1); + virtualDesktop->show(); + } + + that = new QGraphicsRectItem; + that->setBrush(Qt::red); + that->setOpacity(0.5); + that->setZValue(2); + that->setRect(appRect()); + that->show(); + scene->addItem(that); + + scene->setSceneRect(sceneRect); + scene->update(); + } + + QRect appRect() const + { + QRect rect = frameGeometry(); + if (!QApplication::desktop()->isVirtualDesktop()) { + rect.translate(thatRoot); + } + return rect; + } + +private: + QGraphicsScene *scene; + QGraphicsRectItem *that; + QPoint thatRoot; +}; + +#include "main.moc" + +int main(int argc, char **argv) +{ + QApplication app(argc, argv); + + DesktopView view; + view.show(); + + return app.exec(); +} diff --git a/tests/manual/qdesktopwidget/qdesktopwidget.pro b/tests/manual/qdesktopwidget/qdesktopwidget.pro new file mode 100644 index 000000000..93d56eb13 --- /dev/null +++ b/tests/manual/qdesktopwidget/qdesktopwidget.pro @@ -0,0 +1,2 @@ +TEMPLATE = app +SOURCES += main.cpp -- cgit v1.2.3 From 154b98ce283b3ff2d5cad26578ab22dda7af9c81 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 17 Jul 2009 15:58:13 +0200 Subject: Implement QDesktopWidget::screenCount as a property, and add Q_PROPERTY for other attributes as well. --- src/gui/kernel/qdesktopwidget.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/kernel/qdesktopwidget.h b/src/gui/kernel/qdesktopwidget.h index 5ac953cc4..a21ae9d73 100644 --- a/src/gui/kernel/qdesktopwidget.h +++ b/src/gui/kernel/qdesktopwidget.h @@ -56,6 +56,9 @@ class QDesktopWidgetPrivate; class Q_GUI_EXPORT QDesktopWidget : public QWidget { Q_OBJECT + Q_PROPERTY(bool virtualDesktop READ isVirtualDesktop) + Q_PROPERTY(int screenCount READ screenCount NOTIFY screenCountChanged) + Q_PROPERTY(int primaryScreen READ primaryScreen) public: QDesktopWidget(); ~QDesktopWidget(); @@ -63,6 +66,7 @@ public: bool isVirtualDesktop() const; int numScreens() const; + int screenCount() const; int primaryScreen() const; int screenNumber(const QWidget *widget = 0) const; -- cgit v1.2.3 From 873e502c15e7447626a470f6bf89bf697e7161fb Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Fri, 17 Jul 2009 15:59:22 +0200 Subject: Fix compile --- demos/textedit/textedit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp index 7f8e1fe26..d1e12bbf5 100644 --- a/demos/textedit/textedit.cpp +++ b/demos/textedit/textedit.cpp @@ -75,7 +75,7 @@ const QString rsrcPath = ":/images/win"; TextEdit::TextEdit(QWidget *parent) : QMainWindow(parent) { - setToolButtonStyle(Qt::ToolButtonSystemDefault); + setToolButtonStyle(Qt::ToolButtonFollowStyle); setupFileActions(); setupEditActions(); setupTextActions(); -- cgit v1.2.3 From b4d801bf4d6e664ad729e3e95b212b83cc0c784f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 17 Jul 2009 16:16:31 +0200 Subject: reorganize numerus form count normalization replace implicit normalization of individual messages on file writeout with global normalization which is called by the command line tools. this should a) be faster and b) cover the most critical case: lrelease. --- tools/linguist/lconvert/main.cpp | 5 ++++ tools/linguist/linguist/messagemodel.cpp | 2 +- tools/linguist/lrelease/main.cpp | 1 + tools/linguist/lupdate/main.cpp | 5 ++++ tools/linguist/shared/po.cpp | 4 +-- tools/linguist/shared/translator.cpp | 42 ++++++++++++++++++++------------ tools/linguist/shared/translator.h | 4 +-- tools/linguist/shared/ts.cpp | 4 +-- tools/linguist/shared/xliff.cpp | 14 +++++------ 9 files changed, 51 insertions(+), 30 deletions(-) diff --git a/tools/linguist/lconvert/main.cpp b/tools/linguist/lconvert/main.cpp index ddde578f4..553ce6e63 100644 --- a/tools/linguist/lconvert/main.cpp +++ b/tools/linguist/lconvert/main.cpp @@ -238,6 +238,11 @@ int main(int argc, char *argv[]) if (dropTranslations) tr.dropTranslations(); + tr.normalizeTranslations(cd); + if (!cd.errors().isEmpty()) { + qWarning("%s", qPrintable(cd.error())); + cd.clearErrors(); + } if (!tr.save(outFileName, cd, outFormat)) { qWarning("%s", qPrintable(cd.error())); return 3; diff --git a/tools/linguist/linguist/messagemodel.cpp b/tools/linguist/linguist/messagemodel.cpp index 6bbf6f32f..999522045 100644 --- a/tools/linguist/linguist/messagemodel.cpp +++ b/tools/linguist/linguist/messagemodel.cpp @@ -139,7 +139,7 @@ DataModel::DataModel(QObject *parent) QStringList DataModel::normalizedTranslations(const MessageItem &m) const { - return Translator::normalizedTranslations(m.message(), m_language, m_country); + return Translator::normalizedTranslations(m.message(), m_numerusForms.count()); } ContextItem *DataModel::contextItem(int context) const diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp index 845dcb8a0..843414d57 100644 --- a/tools/linguist/lrelease/main.cpp +++ b/tools/linguist/lrelease/main.cpp @@ -120,6 +120,7 @@ static bool releaseTranslator(Translator &tor, const QString &qmFileName, } ConversionData cd; + tor.normalizeTranslations(cd); cd.m_verbose = verbose; cd.m_ignoreUnfinished = ignoreUnfinished; cd.m_saveMode = mode; diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index 78e5b5f67..cedc01e49 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -199,6 +199,11 @@ static void updateTsFiles(const Translator &fetchedTor, const QStringList &tsFil out.stripObsoleteMessages(); out.stripEmptyContexts(); + out.normalizeTranslations(cd); + if (!cd.errors().isEmpty()) { + printOut(cd.error()); + cd.clearErrors(); + } if (!out.save(fileName, cd, QLatin1String("auto"))) { printOut(cd.error()); *fail = true; diff --git a/tools/linguist/shared/po.cpp b/tools/linguist/shared/po.cpp index cb943be83..a197b2589 100644 --- a/tools/linguist/shared/po.cpp +++ b/tools/linguist/shared/po.cpp @@ -547,7 +547,7 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd) return !error && cd.errors().isEmpty(); } -bool savePO(const Translator &translator, QIODevice &dev, ConversionData &cd) +bool savePO(const Translator &translator, QIODevice &dev, ConversionData &) { bool ok = true; QTextStream out(&dev); @@ -633,7 +633,7 @@ bool savePO(const Translator &translator, QIODevice &dev, ConversionData &cd) if (plural.isEmpty()) plural = msg.sourceText(); out << poEscapedString(prefix, QLatin1String("msgid_plural"), noWrap, plural); - QStringList translations = translator.normalizedTranslations(msg, cd, &ok); + const QStringList &translations = msg.translations(); for (int i = 0; i != translations.size(); ++i) { out << poEscapedString(prefix, QString::fromLatin1("msgstr[%1]").arg(i), noWrap, translations.at(i)); diff --git a/tools/linguist/shared/translator.cpp b/tools/linguist/shared/translator.cpp index b8d559fc4..e5b89328e 100644 --- a/tools/linguist/shared/translator.cpp +++ b/tools/linguist/shared/translator.cpp @@ -497,16 +497,10 @@ QList Translator::translatedMessages() const return result; } -QStringList Translator::normalizedTranslations(const TranslatorMessage &msg, - QLocale::Language language, QLocale::Country country) +QStringList Translator::normalizedTranslations(const TranslatorMessage &msg, int numPlurals) { QStringList translations = msg.translations(); - int numTranslations = 1; - if (msg.isPlural() && language != QLocale::C) { - QStringList forms; - if (getNumerusInfo(language, country, 0, &forms)) - numTranslations = forms.count(); // includes singular - } + int numTranslations = msg.isPlural() ? numPlurals : 1; // make sure that the stringlist always have the size of the // language's current numerus, or 1 if its not plural @@ -520,21 +514,39 @@ QStringList Translator::normalizedTranslations(const TranslatorMessage &msg, return translations; } -QStringList Translator::normalizedTranslations(const TranslatorMessage &msg, - ConversionData &cd, bool *ok) const +void Translator::normalizeTranslations(ConversionData &cd) { + bool truncated = false; QLocale::Language l; QLocale::Country c; languageAndCountry(languageCode(), &l, &c); - QStringList translns = normalizedTranslations(msg, l, c); - if (msg.translations().size() > translns.size() && ok) { + int numPlurals = 1; + if (l != QLocale::C) { + QStringList forms; + if (getNumerusInfo(l, c, 0, &forms)) + numPlurals = forms.count(); // includes singular + } + for (int i = 0; i < m_messages.count(); ++i) { + const TranslatorMessage &msg = m_messages.at(i); + QStringList tlns = msg.translations(); + int ccnt = msg.isPlural() ? numPlurals : 1; + if (tlns.count() != ccnt) { + while (tlns.count() < ccnt) + tlns.append(QString()); + while (tlns.count() > ccnt) { + tlns.removeLast(); + truncated = true; + } + TranslatorMessage msg2(msg); + msg2.setTranslations(tlns); + m_messages[i] = msg2; + } + } + if (truncated) cd.appendError(QLatin1String( "Removed plural forms as the target language has less " "forms.\nIf this sounds wrong, possibly the target language is " "not set or recognized.\n")); - *ok = false; - } - return translns; } QString Translator::guessLanguageCodeFromFileName(const QString &filename) diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index 77b515f83..01778d789 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -150,8 +150,8 @@ public: static QString guessLanguageCodeFromFileName(const QString &fileName); QList messages() const; QList translatedMessages() const; - static QStringList normalizedTranslations(const TranslatorMessage &m, - QLocale::Language lang, QLocale::Country country); + static QStringList normalizedTranslations(const TranslatorMessage &m, int numPlurals); + void normalizeTranslations(ConversionData &cd); QStringList normalizedTranslations(const TranslatorMessage &m, ConversionData &cd, bool *ok) const; int messageCount() const { return m_messages.size(); } diff --git a/tools/linguist/shared/ts.cpp b/tools/linguist/shared/ts.cpp index 6c95dbdab..a0ce7270a 100644 --- a/tools/linguist/shared/ts.cpp +++ b/tools/linguist/shared/ts.cpp @@ -693,8 +693,8 @@ bool saveTS(const Translator &translator, QIODevice &dev, ConversionData &cd, in t << " type=\"obsolete\""; if (msg.isPlural()) { t << ">"; - QStringList translns = translator.normalizedTranslations(msg, cd, &result); - for (int j = 0; j < qMax(1, translns.count()); ++j) { + const QStringList &translns = msg.translations(); + for (int j = 0; j < translns.count(); ++j) { t << "\n "; diff --git a/tools/linguist/shared/xliff.cpp b/tools/linguist/shared/xliff.cpp index 61e4b9fc3..969d5d425 100644 --- a/tools/linguist/shared/xliff.cpp +++ b/tools/linguist/shared/xliff.cpp @@ -243,13 +243,12 @@ static void writeComment(QTextStream &ts, const TranslatorMessage &msg, const QR } } -static void writeTransUnits(QTextStream &ts, const TranslatorMessage &msg, const QRegExp &drops, int indent, - const Translator &translator, ConversionData &cd, bool *ok) +static void writeTransUnits(QTextStream &ts, const TranslatorMessage &msg, const QRegExp &drops, int indent) { static int msgid; QString msgidstr = !msg.id().isEmpty() ? msg.id() : QString::fromAscii("_msg%1").arg(++msgid); - QStringList translns = translator.normalizedTranslations(msg, cd, ok); + QStringList translns = msg.translations(); QHash::const_iterator it; QString pluralStr; QStringList sources(msg.sourceText()); @@ -347,8 +346,7 @@ static void writeTransUnits(QTextStream &ts, const TranslatorMessage &msg, const } } -static void writeMessage(QTextStream &ts, const TranslatorMessage &msg, const QRegExp &drops, int indent, - const Translator &translator, ConversionData &cd, bool *ok) +static void writeMessage(QTextStream &ts, const TranslatorMessage &msg, const QRegExp &drops, int indent) { if (msg.isPlural()) { writeIndent(ts, indent); @@ -362,12 +360,12 @@ static void writeMessage(QTextStream &ts, const TranslatorMessage &msg, const QR writeLineNumber(ts, msg, indent); writeComment(ts, msg, drops, indent); - writeTransUnits(ts, msg, drops, indent, translator, cd, ok); + writeTransUnits(ts, msg, drops, indent); --indent; writeIndent(ts, indent); ts << "\n"; } else { - writeTransUnits(ts, msg, drops, indent, translator, cd, ok); + writeTransUnits(ts, msg, drops, indent); } } @@ -790,7 +788,7 @@ bool saveXLIFF(const Translator &translator, QIODevice &dev, ConversionData &cd) } foreach (const TranslatorMessage &msg, messageOrder[fn][ctx]) - writeMessage(ts, msg, drops, indent, translator, cd, &ok); + writeMessage(ts, msg, drops, indent); if (!ctx.isEmpty()) { --indent; -- cgit v1.2.3 From 7febf8c3eb21e5681b71910fcd08b2933ba82464 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 17 Jul 2009 16:41:50 +0200 Subject: Fix compilation on Mac. --- src/gui/kernel/qdesktopwidget_mac.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/kernel/qdesktopwidget_mac.mm b/src/gui/kernel/qdesktopwidget_mac.mm index 11aa7cf35..705387d70 100644 --- a/src/gui/kernel/qdesktopwidget_mac.mm +++ b/src/gui/kernel/qdesktopwidget_mac.mm @@ -247,7 +247,7 @@ void QDesktopWidget::resizeEvent(QResizeEvent *) emit workAreaResized(i); } - if (oldscreencount != d->screenCount) + if (oldScreenCount != d->screenCount) emit screenCountChanged(d->screenCount); } -- cgit v1.2.3 From bffc7a79c71ddebf4048242aa65173615d69030c Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 17 Jul 2009 16:46:32 +0200 Subject: Doc: Added XML Schema license information to the documentation. Reviewed-by: Trust Me Post-review-sanity-check-by: Peter Hartmann --- doc/src/qtxmlpatterns.qdoc | 48 ++++++++++++++++++++++++++++++++++++++++ tools/qdoc3/test/macros.qdocconf | 5 +++-- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/doc/src/qtxmlpatterns.qdoc b/doc/src/qtxmlpatterns.qdoc index 9532401f5..9f8677bdf 100644 --- a/doc/src/qtxmlpatterns.qdoc +++ b/doc/src/qtxmlpatterns.qdoc @@ -905,6 +905,54 @@ URIs are first passed to QAbstractUriResolver. Check QXmlQuery::setUriResolver() for possible rewrites. + \section1 License Information + + The XML Schema implementation provided by this module contains the \c xml.xsd file + (located in \c{src/xmlpatterns/schema/schemas}) which is licensed under the terms + given below. This module is always built with XML Schema support enabled. + + \legalese + W3C\copyright SOFTWARE NOTICE AND LICENSE + + This license came from: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 + + This work (and included software, documentation such as READMEs, or other + related items) is being provided by the copyright holders under the following + license. By obtaining, using and/or copying this work, you (the licensee) + agree that you have read, understood, and will comply with the following + terms and conditions. + + Permission to copy, modify, and distribute this software and its + documentation, with or without modification, for any purpose and without + fee or royalty is hereby granted, provided that you include the following on + ALL copies of the software and documentation or portions thereof, including + modifications: + + 1. The full text of this NOTICE in a location viewable to users of the + redistributed or derivative work.\br + 2. Any pre-existing intellectual property disclaimers, notices, or terms + and conditions. If none exist, the W3C Software Short Notice should be + included (hypertext is preferred, text is permitted) + within the body of any redistributed or derivative code.\br + 3. Notice of any changes or modifications to the files, including the date + changes were made. (We recommend you provide URIs to the location from + which the code is derived.) + + THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS + MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT + LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR + PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE + ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. + + COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR + CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR + DOCUMENTATION. + + The name and trademarks of copyright holders may NOT be used in + advertising or publicity pertaining to the software without specific, written + prior permission. Title to copyright in this software and any associated + documentation will at all times remain with copyright holders. + \endlegalese */ /*! diff --git a/tools/qdoc3/test/macros.qdocconf b/tools/qdoc3/test/macros.qdocconf index 85fe1dbde..f7dcdc02f 100644 --- a/tools/qdoc3/test/macros.qdocconf +++ b/tools/qdoc3/test/macros.qdocconf @@ -1,14 +1,15 @@ +macro.aacute.HTML = "á" macro.Aring.HTML = "Å" macro.aring.HTML = "å" macro.Auml.HTML = "Ä" macro.author = "\\bold{Author:}" macro.br.HTML = "
" macro.BR.HTML = "
" -macro.aacute.HTML = "á" +macro.copyright.HTML = "©" macro.eacute.HTML = "é" -macro.iacute.HTML = "í" macro.gui = "\\bold" macro.hr.HTML = "
" +macro.iacute.HTML = "í" macro.key = "\\bold" macro.menu = "\\bold" macro.note = "\\bold{Note:}" -- cgit v1.2.3 From 079f46af1a5821f981fcb53bf7484885f18b5b86 Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Fri, 17 Jul 2009 16:17:41 +0200 Subject: Fix deadlock in the QWS server when destroying lots of windows First, don't call QWSWindowSurface::winId() in the destructor, as it will actually request a new id if there isn't already one around - which is a bit silly and highlighted the "real" bug. Second, make sure QWSDisplay::Data::takeId() asks for 1 new id before waiting for more ids to arrive. This is because waitForCreation() calls QWSServer::processEventQueue(). If the events in the queue cause takeId() to be called, QWSDisplay::Data::takeId() gets called recursively. Even though there will be a create 15 ids command in the queue, that will only allow 15 QWSDisplay::Data::takeId() calls to return. The 16th call to QWSDisplay::Data::takeId() on the stack will not be able to return because all the IDs have been taken and (because it has been called recursively) no new create id commands have been generated. So the 16th call to takeId() spins in waitForCreate(). Reviewed-by: Paul --- src/gui/kernel/qapplication_qws.cpp | 8 ++++++-- src/gui/painting/qwindowsurface_qws.cpp | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_qws.cpp index 1e158fc00..ab2062c7d 100644 --- a/src/gui/kernel/qapplication_qws.cpp +++ b/src/gui/kernel/qapplication_qws.cpp @@ -661,10 +661,14 @@ void QWSDisplay::Data::sendSynchronousCommand(QWSCommand & cmd) int QWSDisplay::Data::takeId() { - if (unused_identifiers.count() == 10) + int unusedIdCount = unused_identifiers.count(); + if (unusedIdCount == 10) create(15); - if (unused_identifiers.count() == 0) + if (unusedIdCount == 0) { + create(1); // Make sure we have an incoming id to wait for, just in case we're recursive waitForCreation(); + } + return unused_identifiers.takeFirst(); } diff --git a/src/gui/painting/qwindowsurface_qws.cpp b/src/gui/painting/qwindowsurface_qws.cpp index 639bc9288..d5a5c20dc 100644 --- a/src/gui/painting/qwindowsurface_qws.cpp +++ b/src/gui/painting/qwindowsurface_qws.cpp @@ -421,7 +421,8 @@ QWSWindowSurface::QWSWindowSurface(QWidget *widget) QWSWindowSurface::~QWSWindowSurface() { #ifdef Q_BACKINGSTORE_SUBSURFACES - winIdToSurfaceMap()->remove(winId()); + if (d_ptr->winId) + winIdToSurfaceMap()->remove(d_ptr->winId); #endif delete d_ptr; -- cgit v1.2.3 From 5539b4ab311501821eb0e971432d769a25000032 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Sat, 13 Jun 2009 12:23:35 +0200 Subject: Fix for selection with Shift-Arrow/Shift-Click in QListView's IconMode This addresses the selection of items using Shift-Arrow or Shift-Click in QListView's IconMode if the items are in a grid layout. In the case that the items do not have the same size (e.g., because their text is wrapped), this commit prevents the unexpected selection of additional items. New unit tests are included. Merge-request: 666 Reviewed-by: Olivier Goffart --- src/gui/itemviews/qlistview.cpp | 10 ++++- tests/auto/qlistview/tst_qlistview.cpp | 67 ++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp index 40f28d434..148d20474 100644 --- a/src/gui/itemviews/qlistview.cpp +++ b/src/gui/itemviews/qlistview.cpp @@ -1563,7 +1563,10 @@ void QListView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFl } // middle rectangle if (top.bottom() < bottom.top()) { - middle.setTop(top.bottom() + 1); + if (gridSize().isValid() && !gridSize().isNull()) + middle.setTop(top.top() + gridSize().height()); + else + middle.setTop(top.bottom() + 1); middle.setLeft(qMin(top.left(), bottom.left())); middle.setBottom(bottom.top() - 1); middle.setRight(qMax(top.right(), bottom.right())); @@ -1590,7 +1593,10 @@ void QListView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFl // only set middle if the middle.setTop(0); middle.setBottom(ch); - middle.setLeft(left.right() + 1); + if (gridSize().isValid() && !gridSize().isNull()) + middle.setLeft(left.left() + gridSize().width()); + else + middle.setLeft(left.right() + 1); middle.setRight(right.left() - 1); } else if (left.bottom() < right.top()) { left.setBottom(right.top() - 1); diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/qlistview/tst_qlistview.cpp index a18f037d3..cc80931a6 100644 --- a/tests/auto/qlistview/tst_qlistview.cpp +++ b/tests/auto/qlistview/tst_qlistview.cpp @@ -110,6 +110,7 @@ private slots: void task196118_visualRegionForSelection(); void task254449_draggingItemToNegativeCoordinates(); void keyboardSearch(); + void shiftSelectionWithNonUniformItemSizes(); }; // Testing get/set functions @@ -1656,5 +1657,71 @@ void tst_QListView::keyboardSearch() QCOMPARE(view.currentIndex() , model.index(6,0)); //KONQUEROR } +void tst_QListView::shiftSelectionWithNonUniformItemSizes() +{ + // This checks that no items are selected unexpectedly by Shift-Arrow + // when items with non-uniform sizes are laid out in a grid + { // First test: QListView::LeftToRight flow + QStringList items; + items << "Long\nText" << "Text" << "Text" << "Text"; + QStringListModel model(items); + + QListView view; + view.setFixedSize(250, 250); + view.setFlow(QListView::LeftToRight); + view.setGridSize(QSize(100, 100)); + view.setSelectionMode(QListView::ExtendedSelection); + view.setViewMode(QListView::IconMode); + view.setModel(&model); + view.show(); + QTest::qWait(30); + + // Verfify that item sizes are non-uniform + QVERIFY(view.sizeHintForIndex(model.index(0, 0)).height() > view.sizeHintForIndex(model.index(1, 0)).height()); + + QModelIndex index = model.index(3, 0); + view.setCurrentIndex(index); + QCOMPARE(view.currentIndex(), index); + + QTest::keyClick(&view, Qt::Key_Up, Qt::ShiftModifier); + QTest::qWait(10); + QCOMPARE(view.currentIndex(), model.index(1, 0)); + + QModelIndexList selected = view.selectionModel()->selectedIndexes(); + QCOMPARE(selected.count(), 3); + QVERIFY(!selected.contains(model.index(0, 0))); + } + { // Second test: QListView::TopToBottom flow + QStringList items; + items << "ab" << "a" << "a" << "a"; + QStringListModel model(items); + + QListView view; + view.setFixedSize(250, 250); + view.setFlow(QListView::TopToBottom); + view.setGridSize(QSize(100, 100)); + view.setSelectionMode(QListView::ExtendedSelection); + view.setViewMode(QListView::IconMode); + view.setModel(&model); + view.show(); + QTest::qWait(30); + + // Verfify that item sizes are non-uniform + QVERIFY(view.sizeHintForIndex(model.index(0, 0)).width() > view.sizeHintForIndex(model.index(1, 0)).width()); + + QModelIndex index = model.index(3, 0); + view.setCurrentIndex(index); + QCOMPARE(view.currentIndex(), index); + + QTest::keyClick(&view, Qt::Key_Left, Qt::ShiftModifier); + QTest::qWait(10); + QCOMPARE(view.currentIndex(), model.index(1, 0)); + + QModelIndexList selected = view.selectionModel()->selectedIndexes(); + QCOMPARE(selected.count(), 3); + QVERIFY(!selected.contains(model.index(0, 0))); + } +} + QTEST_MAIN(tst_QListView) #include "tst_qlistview.moc" -- cgit v1.2.3 From c70fba2e0c2e00171baa46bbb0bb2e6ba0115ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Fri, 17 Jul 2009 18:40:01 +0200 Subject: Test case for QDirIterator regression introduced in 4.5.0 Task-number: 258230 Reviewed-by: Olivier Goffart --- tests/auto/qdiriterator/tst_qdiriterator.cpp | 31 +++++++++++++++++++--------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/tests/auto/qdiriterator/tst_qdiriterator.cpp b/tests/auto/qdiriterator/tst_qdiriterator.cpp index e916e8bc8..2d5758e99 100644 --- a/tests/auto/qdiriterator/tst_qdiriterator.cpp +++ b/tests/auto/qdiriterator/tst_qdiriterator.cpp @@ -183,17 +183,28 @@ void tst_QDirIterator::iterateRelativeDirectory() QFETCH(QStringList, entries); QDirIterator it(dirName, nameFilters, filters, flags); - QStringList iteratorList; - while (it.hasNext()) - iteratorList << it.next(); - - // The order of QDirIterator returning items differs on some platforms. - // Thus it is not guaranteed that all paths will be returned relative - // and we need to assure we have two valid StringLists to compare. So - // we make all entries absolute for comparison. QStringList list; - foreach(QString item, iteratorList) - list.append(QFileInfo(item).canonicalFilePath()); + while (it.hasNext()) { + QString next = it.next(); + + QString fileName = it.fileName(); + QString filePath = it.filePath(); + QString path = it.path(); + + QFileInfo info = it.fileInfo(); + + QCOMPARE(path, dirName); + QCOMPARE(next, filePath); + + QCOMPARE(info, QFileInfo(next)); + QCOMPARE(fileName, info.fileName()); + QCOMPARE(filePath, info.filePath()); + + // Using canonical file paths for final comparison + list << info.canonicalFilePath(); + } + + // The order of items returned by QDirIterator is not guaranteed. list.sort(); QStringList sortedEntries; -- cgit v1.2.3 From af643f0612f7bd560ccb94cdce91395fc4c9acdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 16 Jul 2009 13:01:05 +0200 Subject: QDirIterator was returning inconsistent data One less variable to maintain reduces the number of bugs and improves consistency. Reviewed-by: Olivier Goffart --- src/corelib/io/qdiriterator.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 006b20557..44ba9507b 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -119,7 +119,6 @@ public: QFileInfo nextFileInfo; //This fileinfo is the current that we will return from the public API QFileInfo currentFileInfo; - QString currentFilePath; QDirIterator::IteratorFlags iteratorFlags; QDir::Filters filters; QStringList nameFilters; @@ -188,10 +187,6 @@ void QDirIteratorPrivate::pushSubDirectory(const QString &path, const QStringLis */ void QDirIteratorPrivate::advance() { - // Store the current entry - if (!fileEngineIterators.isEmpty()) - currentFilePath = fileEngineIterators.top()->currentFilePath(); - // Advance to the next entry if (followNextDir) { // Start by navigating into the current directory. @@ -534,7 +529,7 @@ QString QDirIterator::fileName() const */ QString QDirIterator::filePath() const { - return d->currentFilePath; + return d->currentFileInfo.filePath(); } /*! -- cgit v1.2.3 From 62d95b8ef57f097422862cd2fa13f5debfbc8aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 16 Jul 2009 13:34:34 +0200 Subject: QDirIterator: reducing "randomness" The difference between a canonical and absolute paths is subtle, and not what QDirIterator is about. With this change, we still avoid loops generated by symbolic links but won't duplicate entries because of these differences. While at it, when avoiding loops with symbolic links, please don't mess with the next path! That only added inconsistency. Reviewed-by: Olivier Goffart --- src/corelib/io/qdiriterator.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 44ba9507b..d372ed39b 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -160,16 +160,9 @@ QDirIteratorPrivate::~QDirIteratorPrivate() void QDirIteratorPrivate::pushSubDirectory(const QString &path, const QStringList &nameFilters, QDir::Filters filters) { - if (iteratorFlags & QDirIterator::FollowSymlinks) { - if (nextFileInfo.filePath() != path) - nextFileInfo.setFile(path); - if (nextFileInfo.isSymLink()) { - visitedLinks << nextFileInfo.canonicalFilePath(); - } else { - visitedLinks << nextFileInfo.absoluteFilePath(); - } - } - + if (iteratorFlags & QDirIterator::FollowSymlinks) + visitedLinks << nextFileInfo.canonicalFilePath(); + if (engine || (engine = QAbstractFileEngine::create(this->path))) { engine->setFileName(path); QAbstractFileEngineIterator *it = engine->beginEntryList(filters, nameFilters); -- cgit v1.2.3 From c9579d44c6ce70066f90224c18ac964865290583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 16 Jul 2009 17:54:22 +0200 Subject: Refactoring QDirIteratorPrivate::pushSubDirectory pushSubDirectory was operating on nextFileInfo when it should really be using the path received as argument. This fixes an issue introduced when currentFilePath variable was removed, that was exposed in the auto-tests; fixes a regression introduced in 4.5.0 -- test case a couple of commits back. This also allows refactoring calling code and avoid repetition. Task-number: 258230 Reviewed-by: Olivier Goffart --- src/corelib/io/qdiriterator.cpp | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index d372ed39b..e48a1b9ab 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -106,7 +106,7 @@ public: QDir::Filters filters, QDirIterator::IteratorFlags flags); ~QDirIteratorPrivate(); - void pushSubDirectory(const QString &path, const QStringList &nameFilters, + void pushSubDirectory(const QFileInfo &fileInfo, const QStringList &nameFilters, QDir::Filters filters); void advance(); bool shouldFollowDirectory(const QFileInfo &); @@ -142,8 +142,7 @@ QDirIteratorPrivate::QDirIteratorPrivate(const QString &path, const QStringList this->nameFilters = nameFilters; nextFileInfo.setFile(path); - pushSubDirectory(nextFileInfo.isSymLink() ? nextFileInfo.canonicalFilePath() : path, - nameFilters, filters); + pushSubDirectory(nextFileInfo, nameFilters, filters); } /*! @@ -157,11 +156,18 @@ QDirIteratorPrivate::~QDirIteratorPrivate() /*! \internal */ -void QDirIteratorPrivate::pushSubDirectory(const QString &path, const QStringList &nameFilters, +void QDirIteratorPrivate::pushSubDirectory(const QFileInfo &fileInfo, const QStringList &nameFilters, QDir::Filters filters) { + QString path = fileInfo.filePath(); + +#ifdef Q_OS_WIN + if (fileInfo.isSymLink()) + path = fileInfo.canonicalFilePath(); +#endif + if (iteratorFlags & QDirIterator::FollowSymlinks) - visitedLinks << nextFileInfo.canonicalFilePath(); + visitedLinks << fileInfo.canonicalFilePath(); if (engine || (engine = QAbstractFileEngine::create(this->path))) { engine->setFileName(path); @@ -183,16 +189,9 @@ void QDirIteratorPrivate::advance() // Advance to the next entry if (followNextDir) { // Start by navigating into the current directory. - followNextDir = false; - QAbstractFileEngineIterator *it = fileEngineIterators.top(); - - QString subDir = it->currentFilePath(); -#ifdef Q_OS_WIN - if (nextFileInfo.isSymLink()) - subDir = nextFileInfo.canonicalFilePath(); -#endif - pushSubDirectory(subDir, it->nameFilters(), it->filters()); + pushSubDirectory(it->currentFileInfo(), it->nameFilters(), it->filters()); + followNextDir = false; } while (!fileEngineIterators.isEmpty()) { @@ -210,18 +209,8 @@ void QDirIteratorPrivate::advance() //We found a matching entry. return; - } else if (iteratorFlags & QDirIterator::Subdirectories) { - QFileInfo fileInfo = it->currentFileInfo(); - - if (!shouldFollowDirectory(fileInfo)) - continue; - QString subDir = it->currentFilePath(); -#ifdef Q_OS_WIN - if (fileInfo.isSymLink()) - subDir = fileInfo.canonicalFilePath(); -#endif - pushSubDirectory(subDir, it->nameFilters(), it->filters()); - + } else if (shouldFollowDirectory(it->currentFileInfo())) { + pushSubDirectory(it->currentFileInfo(), it->nameFilters(), it->filters()); foundDirectory = true; break; } -- cgit v1.2.3 From 74c0b4300b538b24c56abf2be2d5e09b9c59a845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 16 Jul 2009 19:12:52 +0200 Subject: QDirIterator: Doc fixes and whitespace cleanup There is no QDirIterator::isValid() function. Reviewed-by: David Boddie --- src/corelib/io/qdiriterator.cpp | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index e48a1b9ab..ca6f3ced7 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -230,17 +230,15 @@ bool QDirIteratorPrivate::shouldFollowDirectory(const QFileInfo &fileInfo) // If we're doing flat iteration, we're done. if (!(iteratorFlags & QDirIterator::Subdirectories)) return false; - + // Never follow non-directory entries if (!fileInfo.isDir()) return false; - // Never follow . and .. if (fileInfo.fileName() == QLatin1String(".") || fileInfo.fileName() == QLatin1String("..")) return false; - // Check symlinks if (fileInfo.isSymLink() && !(iteratorFlags & QDirIterator::FollowSymlinks)) { // Follow symlinks only if FollowSymlinks was passed @@ -250,10 +248,9 @@ bool QDirIteratorPrivate::shouldFollowDirectory(const QFileInfo &fileInfo) // Stop link loops if (visitedLinks.contains(fileInfo.canonicalFilePath())) return false; - + return true; } - /*! \internal @@ -315,7 +312,7 @@ bool QDirIteratorPrivate::matchesFilters(const QAbstractFileEngineIterator *it) return false; } #endif - + bool dotOrDotDot = (fileName == QLatin1String(".") || fileName == QLatin1String("..")); if ((filters & QDir::NoDotAndDotDot) && dotOrDotDot) return false; @@ -356,7 +353,7 @@ bool QDirIteratorPrivate::matchesFilters(const QAbstractFileEngineIterator *it) || (!fi.exists() && fi.isSymLink()))) { return false; } - + return true; } @@ -433,7 +430,7 @@ QDirIterator::QDirIterator(const QString &path, IteratorFlags flags) passed to the flags. \warning This constructor expects \c flags to be left at its default value. Use the - constructors that do not take the \a filters argument instead. + constructors that do not take the \a filters argument instead. \sa hasNext(), next(), IteratorFlags */ @@ -488,13 +485,12 @@ bool QDirIterator::hasNext() const /*! Returns the file name for the current directory entry, without the path - prepended. If the current entry is invalid (i.e., isValid() returns - false), a null QString is returned. + prepended. + + This function is convenient when iterating a single directory. When using + the QDirIterator::Subdirectories flag, you can use filePath() to get the + full path. - This function is provided for the convenience when iterating single - directories. For recursive iteration, you should call filePath() or - fileInfo() instead. - \sa filePath(), fileInfo() */ QString QDirIterator::fileName() const @@ -503,9 +499,7 @@ QString QDirIterator::fileName() const } /*! - Returns the full file path for the current directory entry. If the current - entry is invalid (i.e., isValid() returns false), a null QString is - returned. + Returns the full file path for the current directory entry. \sa fileInfo(), fileName() */ @@ -515,8 +509,7 @@ QString QDirIterator::filePath() const } /*! - Returns a QFileInfo for the current directory entry. If the current entry - is invalid (i.e., isValid() returns false), a null QFileInfo is returned. + Returns a QFileInfo for the current directory entry. \sa filePath(), fileName() */ -- cgit v1.2.3 From 1185386dfe9727ed591da442e97084907f0a6735 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 17 Jul 2009 19:41:23 +0200 Subject: don't rely on system codec when handling PO files - make -input-codec affect PO files, default to UTF-8 - add -output-codec for PO files, same default --- tests/auto/linguist/lconvert/data/test-broken-utf8.po.out | 2 +- tools/linguist/lconvert/main.cpp | 12 +++++++++--- tools/linguist/shared/po.cpp | 5 +++-- tools/linguist/shared/qm.cpp | 3 ++- tools/linguist/shared/translator.h | 3 ++- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/tests/auto/linguist/lconvert/data/test-broken-utf8.po.out b/tests/auto/linguist/lconvert/data/test-broken-utf8.po.out index c00fd1909..0a9f4c8bd 100644 --- a/tests/auto/linguist/lconvert/data/test-broken-utf8.po.out +++ b/tests/auto/linguist/lconvert/data/test-broken-utf8.po.out @@ -6,4 +6,4 @@ msgid "this works" msgstr "das geht: ä" msgid "this is broken" -msgstr "das ist kaputt: i" +msgstr "das ist kaputt: �i" diff --git a/tools/linguist/lconvert/main.cpp b/tools/linguist/lconvert/main.cpp index 553ce6e63..fe8d52905 100644 --- a/tools/linguist/lconvert/main.cpp +++ b/tools/linguist/lconvert/main.cpp @@ -86,8 +86,11 @@ static int usage(const QStringList &args) " --output-format \n" " Specify output format. See -if.\n\n" " --input-codec \n" - " Specify encoding for .qm input files. Default is 'Latin1'.\n" - " UTF-8 is always tried as well, corresponding to the trUtf8() function.\n\n" + " Specify encoding for .qm and .po input files. Default is 'Latin1'\n" + " for .qm and 'UTF-8' for .po files. UTF-8 is always tried as well for\n" + " .qm, corresponding to the possible use of the trUtf8() function.\n\n" + " --output-codec \n" + " Specify encoding for .po output files. Default is 'UTF-8'.\n\n" " --drop-tags \n" " Drop named extra tags when writing 'ts' or 'xlf' files.\n" " May be specified repeatedly.\n\n" @@ -139,7 +142,6 @@ int main(int argc, char *argv[]) bool verbose = false; ConversionData cd; - cd.m_codecForSource = "Latin1"; Translator tr; for (int i = 1; i < args.size(); ++i) { @@ -172,6 +174,10 @@ int main(int argc, char *argv[]) if (++i >= args.size()) return usage(args); cd.m_codecForSource = args[i].toLatin1(); + } else if (args[i] == QLatin1String("-output-codec")) { + if (++i >= args.size()) + return usage(args); + cd.m_outputCodec = args[i].toLatin1(); } else if (args[i] == QLatin1String("-drop-tag")) { if (++i >= args.size()) return usage(args); diff --git a/tools/linguist/shared/po.cpp b/tools/linguist/shared/po.cpp index a197b2589..4850cfdee 100644 --- a/tools/linguist/shared/po.cpp +++ b/tools/linguist/shared/po.cpp @@ -359,6 +359,7 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd) const QChar quote = QLatin1Char('"'); const QChar newline = QLatin1Char('\n'); QTextStream in(&dev); + in.setCodec(cd.m_codecForSource.isEmpty() ? "UTF-8" : cd.m_codecForSource); bool error = false; // format of a .po file entry: @@ -547,11 +548,11 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd) return !error && cd.errors().isEmpty(); } -bool savePO(const Translator &translator, QIODevice &dev, ConversionData &) +bool savePO(const Translator &translator, QIODevice &dev, ConversionData &cd) { bool ok = true; QTextStream out(&dev); - //qDebug() << "OUT CODEC: " << out.codec()->name(); + out.setCodec(cd.m_outputCodec.isEmpty() ? "UTF-8" : cd.m_outputCodec); bool first = true; if (translator.messages().isEmpty() || !translator.messages().first().sourceText().isEmpty()) { diff --git a/tools/linguist/shared/qm.cpp b/tools/linguist/shared/qm.cpp index 323bd29e8..381f5c5df 100644 --- a/tools/linguist/shared/qm.cpp +++ b/tools/linguist/shared/qm.cpp @@ -545,7 +545,8 @@ bool loadQM(Translator &translator, QIODevice &dev, ConversionData &cd) size_t numItems = offsetLength / (2 * sizeof(quint32)); //qDebug() << "NUMITEMS: " << numItems; - QTextCodec *codec = QTextCodec::codecForName(cd.m_codecForSource); + QTextCodec *codec = QTextCodec::codecForName( + cd.m_codecForSource.isEmpty() ? "Latin1" : cd.m_codecForSource); QTextCodec *utf8Codec = 0; if (codec->name() != "UTF-8") utf8Codec = QTextCodec::codecForName("UTF-8"); diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index 01778d789..762a77baf 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -81,7 +81,8 @@ public: public: QString m_defaultContext; - QByteArray m_codecForSource; // CPP specific + QByteArray m_codecForSource; // CPP, PO & QM specific + QByteArray m_outputCodec; // PO specific QString m_sourceFileName; QString m_targetFileName; QDir m_sourceDir; -- cgit v1.2.3 From 11abe2114aca5bc07d797680550d08ce268ff353 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 8 Jul 2009 11:19:23 +0200 Subject: optimize painting of dithered disabled text no need to calculate the bounding rect twice Reviewed-by: jbache --- src/gui/styles/qstyle.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp index d47c6105b..a5ab80ef8 100644 --- a/src/gui/styles/qstyle.cpp +++ b/src/gui/styles/qstyle.cpp @@ -526,8 +526,9 @@ void QStyle::drawItemText(QPainter *painter, const QRect &rect, int alignment, c } if (!enabled) { if (styleHint(SH_DitherDisabledText)) { - painter->drawText(rect, alignment, text); - painter->fillRect(painter->boundingRect(rect, alignment, text), QBrush(painter->background().color(), Qt::Dense5Pattern)); + QRect br; + painter->drawText(rect, alignment, text, &br); + painter->fillRect(br, QBrush(painter->background().color(), Qt::Dense5Pattern)); return; } else if (styleHint(SH_EtchDisabledText)) { QPen pen = painter->pen(); -- cgit v1.2.3 From b09f6312060ca24ccd5702f43a129b92e8b3d705 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 9 Jun 2009 15:43:50 +0200 Subject: some directory separator cleanup - don't duplicate slashes during path concatenation - always use forward slashes when dealing with Option::output_dir - rely on Option::output_dir being normalized at all times still a *very* long way to go, for which we have no time now. Reviewed-by: mariusSO --- qmake/generators/makefile.cpp | 32 +++++++++++++++++++------------- qmake/generators/metamakefile.cpp | 4 ++-- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index d6bb65238..2108ad96a 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -201,13 +201,13 @@ MakefileGenerator::initOutPaths() if(Option::mkfile::do_cache && !Option::mkfile::cachefile.isEmpty() && v.contains("QMAKE_ABSOLUTE_SOURCE_ROOT")) { QString root = v["QMAKE_ABSOLUTE_SOURCE_ROOT"].first(); - root = Option::fixPathToTargetOS(root); + root = QDir::fromNativeSeparators(root); if(!root.isEmpty()) { QFileInfo fi = fileInfo(Option::mkfile::cachefile); if(!fi.makeAbsolute()) { QString cache_r = fi.path(), pwd = Option::output_dir; if(pwd.startsWith(cache_r) && !pwd.startsWith(root)) { - pwd = Option::fixPathToTargetOS(root + pwd.mid(cache_r.length())); + pwd = root + pwd.mid(cache_r.length()); if(exists(pwd)) v.insert("QMAKE_ABSOLUTE_SOURCE_PATH", QStringList(pwd)); } @@ -217,7 +217,7 @@ MakefileGenerator::initOutPaths() } if(!v["QMAKE_ABSOLUTE_SOURCE_PATH"].isEmpty()) { QString &asp = v["QMAKE_ABSOLUTE_SOURCE_PATH"].first(); - asp = Option::fixPathToTargetOS(asp); + asp = QDir::fromNativeSeparators(asp); if(asp.isEmpty() || asp == Option::output_dir) //if they're the same, why bother? v["QMAKE_ABSOLUTE_SOURCE_PATH"].clear(); } @@ -723,14 +723,14 @@ MakefileGenerator::init() if(project->isActiveConfig("qmake_cache")) { QString cache_file; if(!project->isEmpty("QMAKE_INTERNAL_CACHE_FILE")) { - cache_file = Option::fixPathToLocalOS(project->first("QMAKE_INTERNAL_CACHE_FILE")); + cache_file = QDir::fromNativeSeparators(project->first("QMAKE_INTERNAL_CACHE_FILE")); } else { cache_file = ".qmake.internal.cache"; if(project->isActiveConfig("build_pass")) cache_file += ".BUILD." + project->first("BUILD_PASS"); } - if(cache_file.indexOf(QDir::separator()) == -1) - cache_file.prepend(Option::output_dir + QDir::separator()); + if(cache_file.indexOf('/') == -1) + cache_file.prepend(Option::output_dir + '/'); QMakeSourceFileInfo::setCacheFile(cache_file); } @@ -2727,11 +2727,13 @@ MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const Q return cacheVal; //do the fixin' - const QString pwd = qmake_getpwd() + "/"; + QString pwd = qmake_getpwd(); + if (!pwd.endsWith('/')) + pwd += '/'; QString orig_file = ret; if(ret.startsWith(QLatin1Char('~'))) { if(ret.startsWith(QLatin1String("~/"))) - ret = QDir::homePath() + Option::dir_sep + ret.mid(1); + ret = QDir::homePath() + ret.mid(1); else warn_msg(WarnLogic, "Unable to expand ~ in %s", ret.toLatin1().constData()); } @@ -2980,7 +2982,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const file.setFileName(Option::output_dir + "/" + file.fileName()); //pwd when qmake was run QFileInfo fi(fileInfo(file.fileName())); if(fi.isDir()) - outdir = file.fileName() + QDir::separator(); + outdir = file.fileName() + '/'; } if(!outdir.isEmpty() || file.fileName().isEmpty()) { QString fname = "Makefile"; @@ -3000,7 +3002,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const file.setFileName(file.fileName() + "." + build); if(project->isEmpty("QMAKE_MAKEFILE")) project->values("QMAKE_MAKEFILE").append(file.fileName()); - int slsh = file.fileName().lastIndexOf(Option::dir_sep); + int slsh = file.fileName().lastIndexOf('/'); if(slsh != -1) mkdir(file.fileName().left(slsh)); if(file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) { @@ -3010,9 +3012,13 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const od = fileInfo(fi.readLink()).absolutePath(); else od = fi.path(); - od = Option::fixPathToTargetOS(od); - if(QDir::isRelativePath(od)) - od.prepend(Option::output_dir); + od = QDir::fromNativeSeparators(od); + if(QDir::isRelativePath(od)) { + QString dir = Option::output_dir; + if (!dir.endsWith('/') && !od.isEmpty()) + dir += '/'; + od.prepend(dir); + } Option::output_dir = od; return true; } diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index 7f4e914e3..34d369845 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -293,9 +293,9 @@ SubdirsMetaMakefileGenerator::init() init_flag = true; if(Option::recursive) { - QString old_output_dir = QDir::cleanPath(Option::output_dir); + QString old_output_dir = Option::output_dir; QString old_output = Option::output.fileName(); - QString oldpwd = QDir::cleanPath(qmake_getpwd()); + QString oldpwd = qmake_getpwd(); QString thispwd = oldpwd; if(!thispwd.endsWith('/')) thispwd += '/'; -- cgit v1.2.3 From f5a4344ed9ab4e2a79c0a798c92eea3d2bd914a7 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 10 Jul 2009 14:19:16 +0200 Subject: micro-optimization of some string operations --- qmake/generators/makefile.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 2108ad96a..665821398 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -121,7 +121,7 @@ bool MakefileGenerator::mkdir(const QString &in_path) const QDir d; if(path.startsWith(QDir::separator())) { d.cd(QString(QDir::separator())); - path = path.right(path.length() - 1); + path.remove(0, 1); } bool ret = true; #ifdef Q_OS_WIN @@ -129,7 +129,7 @@ bool MakefileGenerator::mkdir(const QString &in_path) const if(!QDir::isRelativePath(path)) { if(QFile::exists(path.left(3))) { d.cd(path.left(3)); - path = path.right(path.length() - 3); + path.remove(0, 3); } else { warn_msg(WarnLogic, "Cannot access drive '%s' (%s)", path.left(3).toLatin1().data(), path.toLatin1().data()); @@ -243,7 +243,7 @@ MakefileGenerator::initOutPaths() if(!(dirs[x] == "DLLDESTDIR")) #endif { - if(pathRef.right(Option::dir_sep.length()) != Option::dir_sep) + if(!pathRef.endsWith(Option::dir_sep)) pathRef += Option::dir_sep; } @@ -344,7 +344,7 @@ MakefileGenerator::findFilesInVPATH(QStringList l, uchar flags, const QString &v QString real_dir = Option::fixPathToLocalOS((*vpath_it)); if(exists(real_dir + QDir::separator() + val)) { QString dir = (*vpath_it); - if(dir.right(Option::dir_sep.length()) != Option::dir_sep) + if(!dir.endsWith(Option::dir_sep)) dir += Option::dir_sep; val = dir + val; if(!(flags & VPATH_NoFixify)) @@ -363,7 +363,7 @@ MakefileGenerator::findFilesInVPATH(QStringList l, uchar flags, const QString &v real_dir = dir; if(!(flags & VPATH_NoFixify)) real_dir = fileFixify(real_dir, qmake_getpwd(), Option::output_dir); - regex = regex.right(regex.length() - dir.length()); + regex.remove(0, dir.length()); } if(real_dir.isEmpty() || exists(real_dir)) { QStringList files = QDir(real_dir).entryList(QStringList(regex)); @@ -787,7 +787,7 @@ MakefileGenerator::init() QString dir, regex = Option::fixPathToLocalOS((*dep_it)); if(regex.lastIndexOf(Option::dir_sep) != -1) { dir = regex.left(regex.lastIndexOf(Option::dir_sep) + 1); - regex = regex.right(regex.length() - dir.length()); + regex.remove(0, dir.length()); } QStringList files = QDir(dir).entryList(QStringList(regex)); if(files.isEmpty()) { @@ -937,7 +937,7 @@ MakefileGenerator::writePrlFile(QTextStream &t) QString target = project->first("TARGET"); int slsh = target.lastIndexOf(Option::dir_sep); if(slsh != -1) - target = target.right(target.length() - slsh - 1); + target.remove(0, slsh + 1); QString bdir = Option::output_dir; if(bdir.isEmpty()) bdir = qmake_getpwd(); @@ -1055,11 +1055,11 @@ MakefileGenerator::prlFileName(bool fixify) ret = project->first("TARGET"); int slsh = ret.lastIndexOf(Option::dir_sep); if(slsh != -1) - ret = ret.right(ret.length() - slsh); + ret.remove(0, slsh); if(!ret.endsWith(Option::prl_ext)) { int dot = ret.indexOf('.'); if(dot != -1) - ret = ret.left(dot); + ret.truncate(dot); ret += Option::prl_ext; } if(!project->isEmpty("QMAKE_BUNDLE")) @@ -1209,7 +1209,7 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n if(project->values((*it) + ".CONFIG").indexOf("no_path") == -1 && project->values((*it) + ".CONFIG").indexOf("dummy_install") == -1) { dst = fileFixify(unescapeFilePath(project->values(pvar).first()), FileFixifyAbsolute, false); - if(dst.right(1) != Option::dir_sep) + if(!dst.endsWith(Option::dir_sep)) dst += Option::dir_sep; } dst = escapeFilePath(dst); @@ -1238,9 +1238,9 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n int slsh = filestr.lastIndexOf(Option::dir_sep); if(slsh != -1) { dirstr = filestr.left(slsh+1); - filestr = filestr.right(filestr.length() - slsh - 1); + filestr.remove(0, slsh+1); } - if(dirstr.right(Option::dir_sep.length()) != Option::dir_sep) + if(!dirstr.endsWith(Option::dir_sep)) dirstr += Option::dir_sep; if(exists(wild)) { //real file QString file = wild; @@ -1340,7 +1340,7 @@ MakefileGenerator::writeInstalls(QTextStream &t, const QString &installs, bool n const QStringList &dirs = project->values(pvar); for(QStringList::ConstIterator pit = dirs.begin(); pit != dirs.end(); ++pit) { QString tmp_dst = fileFixify((*pit), FileFixifyAbsolute, false); - if (!isWindowsShell() && tmp_dst.right(1) != Option::dir_sep) + if (!isWindowsShell() && !tmp_dst.endsWith(Option::dir_sep)) tmp_dst += Option::dir_sep; t << mkdir_p_asstring(filePrefixRoot(root, tmp_dst)) << "\n\t"; } @@ -2215,8 +2215,8 @@ MakefileGenerator::writeSubDirs(QTextStream &t) st->profile = file.section(Option::dir_sep, -1) + Option::pro_ext; st->in_directory = file; } - while(st->in_directory.right(1) == Option::dir_sep) - st->in_directory = st->in_directory.left(st->in_directory.length() - 1); + while(st->in_directory.endsWith(Option::dir_sep)) + st->in_directory.chop(1); if(fileInfo(st->in_directory).isRelative()) st->out_directory = st->in_directory; else @@ -2288,7 +2288,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList Date: Thu, 16 Jul 2009 10:17:34 +0200 Subject: make test immune to qt header changes ... by hiding the include from lupdate's view --- tests/auto/linguist/lupdate/testdata/good/lacksqobject/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/main.cpp b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/main.cpp index 05fcd79b9..0e42d5212 100644 --- a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/main.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/main.cpp @@ -1,8 +1,8 @@ // IMPORTANT!!!! If you want to add testdata to this file, // always add it to the end in order to not change the linenumbers of translations!!! -#include - +#define QTCORE +#include QTCORE // Hidden from lupdate, but compiles // // Test 'lacks Q_OBJECT' reporting on namespace scopes -- cgit v1.2.3 From b001f1d4d8870dd1094aa38ee36eeb19825b3140 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 18 Jul 2009 11:42:53 +0200 Subject: Doc: Documentation for QTouchEventSequence --- src/testlib/qtestcase.cpp | 114 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 102 insertions(+), 12 deletions(-) diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 9ac956204..e9d58f9b7 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -403,7 +403,8 @@ QT_BEGIN_NAMESPACE \overload - Simulates clicking of \a key with an optional \a modifier on a \a widget. If \a delay is larger than 0, the test will wait for \a delay milliseconds. + Simulates clicking of \a key with an optional \a modifier on a \a widget. + If \a delay is larger than 0, the test will wait for \a delay milliseconds. Example: \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 13 @@ -416,7 +417,8 @@ QT_BEGIN_NAMESPACE /*! \fn void QTest::keyClick(QWidget *widget, Qt::Key key, Qt::KeyboardModifiers modifier = Qt::NoModifier, int delay=-1) - Simulates clicking of \a key with an optional \a modifier on a \a widget. If \a delay is larger than 0, the test will wait for \a delay milliseconds. + Simulates clicking of \a key with an optional \a modifier on a \a widget. + If \a delay is larger than 0, the test will wait for \a delay milliseconds. Examples: \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 14 @@ -431,20 +433,25 @@ QT_BEGIN_NAMESPACE /*! \fn void QTest::keyEvent(KeyAction action, QWidget *widget, Qt::Key key, Qt::KeyboardModifiers modifier = Qt::NoModifier, int delay=-1) - Sends a Qt key event to \a widget with the given \a key and an associated \a action. Optionally, a keyboard \a modifier can be specified, as well as a \a delay (in milliseconds) of the test before sending the event. + Sends a Qt key event to \a widget with the given \a key and an associated \a action. + Optionally, a keyboard \a modifier can be specified, as well as a \a delay + (in milliseconds) of the test before sending the event. */ /*! \fn void QTest::keyEvent(KeyAction action, QWidget *widget, char ascii, Qt::KeyboardModifiers modifier = Qt::NoModifier, int delay=-1) \overload - Sends a Qt key event to \a widget with the given key \a ascii and an associated \a action. Optionally, a keyboard \a modifier can be specified, as well as a \a delay (in milliseconds) of the test before sending the event. + Sends a Qt key event to \a widget with the given key \a ascii and an associated \a action. + Optionally, a keyboard \a modifier can be specified, as well as a \a delay + (in milliseconds) of the test before sending the event. */ /*! \fn void QTest::keyPress(QWidget *widget, Qt::Key key, Qt::KeyboardModifiers modifier = Qt::NoModifier, int delay=-1) - Simulates pressing a \a key with an optional \a modifier on a \a widget. If \a delay is larger than 0, the test will wait for \a delay milliseconds. + Simulates pressing a \a key with an optional \a modifier on a \a widget. If \a delay + is larger than 0, the test will wait for \a delay milliseconds. \bold {Note:} At some point you should release the key using \l keyRelease(). @@ -455,7 +462,8 @@ QT_BEGIN_NAMESPACE \overload - Simulates pressing a \a key with an optional \a modifier on a \a widget. If \a delay is larger than 0, the test will wait for \a delay milliseconds. + Simulates pressing a \a key with an optional \a modifier on a \a widget. + If \a delay is larger than 0, the test will wait for \a delay milliseconds. \bold {Note:} At some point you should release the key using \l keyRelease(). @@ -464,7 +472,8 @@ QT_BEGIN_NAMESPACE /*! \fn void QTest::keyRelease(QWidget *widget, Qt::Key key, Qt::KeyboardModifiers modifier = Qt::NoModifier, int delay=-1) - Simulates releasing a \a key with an optional \a modifier on a \a widget. If \a delay is larger than 0, the test will wait for \a delay milliseconds. + Simulates releasing a \a key with an optional \a modifier on a \a widget. + If \a delay is larger than 0, the test will wait for \a delay milliseconds. \sa QTest::keyPress(), QTest::keyClick() */ @@ -473,7 +482,8 @@ QT_BEGIN_NAMESPACE \overload - Simulates releasing a \a key with an optional \a modifier on a \a widget. If \a delay is larger than 0, the test will wait for \a delay milliseconds. + Simulates releasing a \a key with an optional \a modifier on a \a widget. + If \a delay is larger than 0, the test will wait for \a delay milliseconds. \sa QTest::keyClick() */ @@ -689,6 +699,90 @@ QT_BEGIN_NAMESPACE \sa QTest::qSleep() */ +/*! + \class QTest::QTouchEventSequence + \inmodule QtTest + \since 4.6 + + \brief The QTouchEventSequence class is used to simulate a sequence of touch events. + + To simulate a sequence of touch events on a specific device for a widget, call + QTest::touchEvent to create a QTouchEventSequence instance. Add touch events to + the sequence by calling press(), move(), release() and stationary(), and let the + instance run out of scope to commit the sequence to the event system. +*/ + +/*! + \fn QTest::QTouchEventSequence::~QTouchEventSequence() + \since 4.6 + + Commits this sequence of touch events and frees allocated resources. +*/ + +/*! + \fn QTouchEventSequence &QTest::QTouchEventSequence::press(int touchId, const QPoint &pt, QWidget *widget) + \since 4.6 + + Adds a press event for touchpoint \a touchId at position \a pt to this sequence and returns + a reference to this QTouchEventSequence. + + The position \a pt is interpreted as relative to \a widget. If \a widget is the null pointer, then + \a pt is interpreted as relative to the widget provided when instantiating this QTouchEventSequence. + + Simulates that the user pressed the touch screen or pad with the finger identified by \a touchId. +*/ + +/*! + \fn QTouchEventSequence &QTest::QTouchEventSequence::move(int touchId, const QPoint &pt, QWidget *widget) + \since 4.6 + + Adds a move event for touchpoint \a touchId at position \a pt to this sequence and returns + a reference to this QTouchEventSequence. + + The position \a pt is interpreted as relative to \a widget. If \a widget is the null pointer, then + \a pt is interpreted as relative to the widget provided when instantiating this QTouchEventSequence. + + Simulates that the user moved the finger identified by \a touchId. +*/ + +/*! + \fn QTouchEventSequence &QTest::QTouchEventSequence::release(int touchId, const QPoint &pt, QWidget *widget) + \since 4.6 + + Adds a release event for touchpoint \a touchId at position \a pt to this sequence and returns + a reference to this QTouchEventSequence. + + The position \a pt is interpreted as relative to \a widget. If \a widget is the null pointer, then + \a pt is interpreted as relative to the widget provided when instantiating this QTouchEventSequence. + + Simulates that the user lifted the finger identified by \a touchId. +*/ + +/*! + \fn QTouchEventSequence &QTest::QTouchEventSequence::stationary(int touchId) + \since 4.6 + + Adds a stationary event for touchpoint \a touchId to this sequence and returns + a reference to this QTouchEventSequence. + + Simulates that the user did not move the finger identified by \a touchId. +*/ + +/*! + \fn QTouchEventSequence QTest::touchEvent(QWidget *widget, QTouchEvent::DeviceType deviceType) + \since 4.6 + + Creates and returns a QTouchEventSequence for the device \a deviceType to + simulate events for \a widget. + + When adding touch events to the sequence, \a widget will also be used to translate + the position provided to screen coordinates, unless another widget is provided in the + respective calls to press(), move() etc. + + The touch events are committed to the event system when the destructor of the + QTouchEventSequence is called (ie when the object returned runs out of scope). +*/ + namespace QTest { static QObject *currentTestObject = 0; @@ -2003,8 +2097,4 @@ bool QTest::compare_string_helper(const char *t1, const char *t2, const char *ac \internal */ -/*! \fn int QTest::qt_snprintf(char *str, int size, const char *format, ...) - \internal -*/ - QT_END_NAMESPACE -- cgit v1.2.3 From 3338292e48671a71c8edb69626df13ae615901c0 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 18 Jul 2009 12:20:45 +0200 Subject: Doc: add documentation for new overloads, and mark old overloads that might lead to incorrect results as obsolete (and explain why). --- src/gui/graphicsview/qgraphicsscene.cpp | 62 ++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 5 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 6b6080b1d..53aea5821 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -1587,10 +1587,16 @@ QList QGraphicsScene::items(Qt::SortOrder order) const } /*! + \obsolete + Returns all visible items at position \a pos in the scene. The items are listed in descending stacking order (i.e., the first item in the list is the top-most item, and the last item is the bottom-most item). + This function is deprecated and returns incorrect results if the scene + contains items that ignore transformations. Use the overload that takes + a QTransform instead. + \sa itemAt() */ QList QGraphicsScene::items(const QPointF &pos) const @@ -1600,9 +1606,8 @@ QList QGraphicsScene::items(const QPointF &pos) const } /*! - \fn QList QGraphicsScene::items(const QRectF &rectangle, Qt::ItemSelectionMode mode) const - \overload + \obsolete Returns all visible items that, depending on \a mode, are either inside or intersect with the specified \a rectangle. @@ -1610,19 +1615,28 @@ QList QGraphicsScene::items(const QPointF &pos) const The default value for \a mode is Qt::IntersectsItemShape; all items whose exact shape intersects with or is contained by \a rectangle are returned. + This function is deprecated and returns incorrect results if the scene + contains items that ignore transformations. Use the overload that takes + a QTransform instead. + \sa itemAt() */ -QList QGraphicsScene::items(const QRectF &rect, Qt::ItemSelectionMode mode) const +QList QGraphicsScene::items(const QRectF &rectangle, Qt::ItemSelectionMode mode) const { Q_D(const QGraphicsScene); - return d->index->items(rect, mode, Qt::AscendingOrder); + return d->index->items(rectangle, mode, Qt::AscendingOrder); } /*! \fn QList QGraphicsScene::items(qreal x, qreal y, qreal w, qreal h, Qt::ItemSelectionMode mode) const + \obsolete \since 4.3 This convenience function is equivalent to calling items(QRectF(\a x, \a y, \a w, \a h), \a mode). + + This function is deprecated and returns incorrect results if the scene + contains items that ignore transformations. Use the overload that takes + a QTransform instead. */ /*! @@ -1641,6 +1655,7 @@ QList QGraphicsScene::items(const QRectF &rect, Qt::ItemSelecti /*! \overload + \obsolete Returns all visible items that, depending on \a mode, are either inside or intersect with the polygon \a polygon. @@ -1648,6 +1663,10 @@ QList QGraphicsScene::items(const QRectF &rect, Qt::ItemSelecti The default value for \a mode is Qt::IntersectsItemShape; all items whose exact shape intersects with or is contained by \a polygon are returned. + This function is deprecated and returns incorrect results if the scene + contains items that ignore transformations. Use the overload that takes + a QTransform instead. + \sa itemAt() */ QList QGraphicsScene::items(const QPolygonF &polygon, Qt::ItemSelectionMode mode) const @@ -1658,6 +1677,7 @@ QList QGraphicsScene::items(const QPolygonF &polygon, Qt::ItemS /*! \overload + \obsolete Returns all visible items that, depending on \a path, are either inside or intersect with the path \a path. @@ -1665,6 +1685,10 @@ QList QGraphicsScene::items(const QPolygonF &polygon, Qt::ItemS The default value for \a mode is Qt::IntersectsItemShape; all items whose exact shape intersects with or is contained by \a path are returned. + This function is deprecated and returns incorrect results if the scene + contains items that ignore transformations. Use the overload that takes + a QTransform instead. + \sa itemAt() */ QList QGraphicsScene::items(const QPainterPath &path, Qt::ItemSelectionMode mode) const @@ -1790,11 +1814,18 @@ QList QGraphicsScene::collidingItems(const QGraphicsItem *item, } /*! + \overload + \obsolete + Returns the topmost visible item at the specified \a position, or 0 if there are no items at this position. \note The topmost item is the one with the highest Z-value. + This function is deprecated and returns incorrect results if the scene + contains items that ignore transformations. Use the overload that takes + a QTransform instead. + \sa items(), collidingItems(), QGraphicsItem::setZValue() */ QGraphicsItem *QGraphicsScene::itemAt(const QPointF &position) const @@ -1804,7 +1835,6 @@ QGraphicsItem *QGraphicsScene::itemAt(const QPointF &position) const } /*! - \overload \since 4.6 Returns the topmost visible item at the specified \a position, or 0 @@ -1824,9 +1854,27 @@ QGraphicsItem *QGraphicsScene::itemAt(const QPointF &position, const QTransform return itemsAtPoint.isEmpty() ? 0 : itemsAtPoint.first(); } +/*! + \fn QGraphicsScene::itemAt(qreal x, qreal y, const QTransform &deviceTransform) const + \overload + \since 4.6 + + Returns the topmost item at the position specified by (\a x, \a + y), or 0 if there are no items at this position. + + \a deviceTransform is the transformation that applies to the view, and needs to + be provided if the scene contains items that ignore transformations. + + This convenience function is equivalent to calling \c + {itemAt(QPointF(x, y), deviceTransform)}. + + \note The topmost item is the one with the highest Z-value. +*/ + /*! \fn QGraphicsScene::itemAt(qreal x, qreal y) const \overload + \obsolete Returns the topmost item at the position specified by (\a x, \a y), or 0 if there are no items at this position. @@ -1834,6 +1882,10 @@ QGraphicsItem *QGraphicsScene::itemAt(const QPointF &position, const QTransform This convenience function is equivalent to calling \c {itemAt(QPointF(x, y))}. + This function is deprecated and returns incorrect results if the scene + contains items that ignore transformations. Use the overload that takes + a QTransform instead. + \note The topmost item is the one with the highest Z-value. */ -- cgit v1.2.3 From 50624a969d130ec55a6fd8e908b5b5e4e17636fb Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 18 Jul 2009 13:21:25 +0200 Subject: Doc: Document QAction::Priority and Qt::ToolButtonFollowStyle. --- doc/src/qnamespace.qdoc | 1 + src/gui/kernel/qaction.cpp | 29 +++++++++++++++++++++++++---- src/gui/widgets/qtoolbutton.cpp | 5 ++--- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc index ded1577e2..2d40fdd50 100644 --- a/doc/src/qnamespace.qdoc +++ b/doc/src/qnamespace.qdoc @@ -1697,6 +1697,7 @@ \value ToolButtonTextOnly Only display the text. \value ToolButtonTextBesideIcon The text appears beside the icon. \value ToolButtonTextUnderIcon The text appears under the icon. + \value ToolButtonFollowStyle Follow the \l{QStyle::SH_ToolButtonStyle}{style}. */ /*! diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index 09ba6cc08..5952320ce 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -909,15 +909,36 @@ QString QAction::whatsThis() const return d->whatsthis; } +/*! + \enum QAction::Priority + \since 4.6 + + This enum defines priorities for actions in user interface. + + \value LowPriority The action will not be prioritized in + collapsible layouts when not enough space for all actions is + available. + + \value NormalPriority + + \value HighPriority The action will be prioritized by + collapsible layouts when not enough space for all actions is + available. + + \sa priority +*/ + + /*! \property QAction::priority \since 4.6 - \brief tells collapsible layouts how the action should be prioritized + \brief the actions's priority in the user interface. - This property can be set to indicate that an action should be prioritied - in a layout. For instance when toolbars have the Qt::ToolButtonTextBesideIcon - mode is set, lower priority actions will hide text labels to preserve space. + This property can be set to indicate how the action should be prioritized + in a collapsible layout. For instance, when toolbars have the Qt::ToolButtonTextBesideIcon + mode set, then lower priority actions will hide text labels to preserve + horizontal space if necessary. */ void QAction::setPriority(Priority priority) { diff --git a/src/gui/widgets/qtoolbutton.cpp b/src/gui/widgets/qtoolbutton.cpp index 3901245b2..2c85dc50d 100644 --- a/src/gui/widgets/qtoolbutton.cpp +++ b/src/gui/widgets/qtoolbutton.cpp @@ -486,9 +486,8 @@ QSize QToolButton::minimumSizeHint() const The default is Qt::ToolButtonIconOnly. - If you want your toolbars to depend on system settings, - as is possible in GNOME and KDE desktop environments you should - use the ToolButtonFollowStyle. + To have the style of toolbuttons follow the system settings (as available + in GNOME and KDE desktop environments), set this property to Qt::ToolButtonFollowStyle. QToolButton automatically connects this slot to the relevant signal in the QMainWindow in which is resides. -- cgit v1.2.3 From 2475afbcc7e245cd3739af02f12b8508adea3738 Mon Sep 17 00:00:00 2001 From: Guido Seifert Date: Sun, 19 Jul 2009 22:32:49 +0200 Subject: Fix: Qt::ToolButtonSystemDefault replaced with Qt::ToolButtonFollowStyle Reviewed-by: Thiago Macieira --- demos/browser/browsermainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp index 2a0138c9d..0636f1d9c 100644 --- a/demos/browser/browsermainwindow.cpp +++ b/demos/browser/browsermainwindow.cpp @@ -81,7 +81,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags) , m_stop(0) , m_reload(0) { - setToolButtonStyle(Qt::ToolButtonSystemDefault); + setToolButtonStyle(Qt::ToolButtonFollowStyle); setAttribute(Qt::WA_DeleteOnClose, true); statusBar()->setSizeGripEnabled(true); setupMenu(); -- cgit v1.2.3 From 7a1891b2f308377e67204bbc812716cbc148af4a Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sun, 19 Jul 2009 22:42:08 +0200 Subject: Doc: add \since 4.6 for new APIs --- doc/src/qdesktopwidget.qdoc | 4 ++++ src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 2 ++ src/corelib/kernel/qmetaobject.cpp | 2 ++ src/corelib/tools/qcontiguouscache.cpp | 1 + src/corelib/tools/qpoint.cpp | 2 ++ src/corelib/tools/qtimeline.cpp | 2 ++ src/gui/graphicsview/qgraphicsitem.cpp | 24 ++++++++++++++-------- src/gui/graphicsview/qgraphicslayoutitem.cpp | 4 ++++ src/gui/graphicsview/qgraphicsscene.cpp | 2 ++ src/gui/graphicsview/qgraphicsview.cpp | 2 ++ src/gui/image/qpixmap.cpp | 3 +++ src/gui/text/qabstracttextdocumentlayout.cpp | 1 + src/gui/text/qtextcursor.cpp | 2 ++ src/network/access/qabstractnetworkcache.cpp | 4 ++++ src/opengl/qglframebufferobject.cpp | 24 ---------------------- src/script/qscriptvalue.cpp | 16 +++++++++------ src/sql/kernel/qsqldatabase.cpp | 28 ++++++++++++++++---------- src/sql/kernel/qsqldriver.cpp | 26 +++++++++++++++--------- src/testlib/qtestcase.cpp | 6 ------ src/xmlpatterns/api/qabstractxmlnodemodel.cpp | 10 ++++----- 20 files changed, 96 insertions(+), 69 deletions(-) diff --git a/doc/src/qdesktopwidget.qdoc b/doc/src/qdesktopwidget.qdoc index 383ccfc4b..56a882d61 100644 --- a/doc/src/qdesktopwidget.qdoc +++ b/doc/src/qdesktopwidget.qdoc @@ -233,6 +233,8 @@ /*! \property QDesktopWidget::screenCount \brief the number of screens currently available on the system. + + \since 4.6 \sa screenCountChanged() */ @@ -256,6 +258,8 @@ /*! \fn void QDesktopWidget::screenCountChanged(int newCount) + \since 4.6 + This signal is emitted when the number of screens changes to \a newCount. \sa screenCount diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index 84753bd5d..3c2151b37 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -1315,6 +1315,8 @@ QWebFrame *QWebPage::currentFrame() const /*! + \since 4.6 + Returns the frame at the given point \a pos. \sa mainFrame(), currentFrame() diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 318424430..08cecaffc 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -2304,6 +2304,8 @@ QMetaMethod QMetaProperty::notifySignal() const } /*! + \since 4.6 + Returns the index of the property change notifying signal if one was specified, otherwise returns -1. diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp index e738ec845..8a1415273 100644 --- a/src/corelib/tools/qcontiguouscache.cpp +++ b/src/corelib/tools/qcontiguouscache.cpp @@ -61,6 +61,7 @@ void QContiguousCacheData::dump() const \ingroup tools \ingroup shared \reentrant + \since 4.6 The QContiguousCache class provides an efficient way of caching items for display in a user interface view. Unlike QCache, it adds a restriction diff --git a/src/corelib/tools/qpoint.cpp b/src/corelib/tools/qpoint.cpp index 49afdcaca..af60f523d 100644 --- a/src/corelib/tools/qpoint.cpp +++ b/src/corelib/tools/qpoint.cpp @@ -444,6 +444,8 @@ QDebug operator<<(QDebug d, const QPointF &p) /*! + \since 4.6 + Returns the sum of the absolute values of x() and y(), traditionally known as the "Manhattan length" of the vector from the origin to the point. diff --git a/src/corelib/tools/qtimeline.cpp b/src/corelib/tools/qtimeline.cpp index 04aed39a4..e32fc0358 100644 --- a/src/corelib/tools/qtimeline.cpp +++ b/src/corelib/tools/qtimeline.cpp @@ -555,6 +555,8 @@ void QTimeLine::setCurveShape(CurveShape shape) /*! \property QTimeLine::easingCurve + \since 4.6 + Specifies the easing curve that the timeline will use. If both easing curve and curveShape are set, the last set property will override the previous one. (If valueForTime() is reimplemented it will diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index cb0418c70..7d5ce7bf1 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1260,7 +1260,7 @@ QGraphicsItem *QGraphicsItem::topLevelItem() const } /*! - \since 4.4 + \since 4.6 Returns a pointer to the item's parent, cast to a QGraphicsObject. returns 0 if the parent item is not a QGraphicsObject. @@ -2361,6 +2361,8 @@ void QGraphicsItem::setAcceptTouchEvents(bool enabled) } /*! + \since 4.6 + Returns true if this item filters child events (i.e., all events intended for any of its children are instead sent to this item); otherwise, false is returned. @@ -2375,13 +2377,15 @@ bool QGraphicsItem::filtersChildEvents() const } /*! + \since 4.6 + If \a enabled is true, this item is set to filter all events for all its children (i.e., all events intented for any of its children are instead sent to this item); otherwise, if \a enabled is false, this item will only handle its own events. The default value is false. - \sa filtersChildEvents() + \sa filtersChildEvents() */ void QGraphicsItem::setFiltersChildEvents(bool enabled) { @@ -2661,10 +2665,12 @@ QPointF QGraphicsItem::pos() const */ /*! - Set's the \a x coordinate of the item's position. Equivalent to - calling setPos(x, y()). + \since 4.6 + + Set's the \a x coordinate of the item's position. Equivalent to + calling setPos(x, y()). - \sa x(), setPos() + \sa x(), setPos() */ void QGraphicsItem::setX(qreal x) { @@ -2680,10 +2686,12 @@ void QGraphicsItem::setX(qreal x) */ /*! - Set's the \a y coordinate of the item's position. Equivalent to - calling setPos(x(), y). + \since 4.6 + + Set's the \a y coordinate of the item's position. Equivalent to + calling setPos(x(), y). - \sa x(), setPos() + \sa x(), setPos() */ void QGraphicsItem::setY(qreal y) { diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp index 656af3372..e28016246 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem.cpp +++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp @@ -808,6 +808,8 @@ bool QGraphicsLayoutItem::isLayout() const } /*! + \since 4.6 + Returns whether a layout should delete this item in its destructor. If its true, then the layout will delete it. If its false, then it is assumed that another object has the ownership of it, and the layout won't @@ -834,6 +836,8 @@ bool QGraphicsLayoutItem::ownedByLayout() const return d_func()->ownedByLayout; } /*! + \since 4.6 + Sets whether a layout should delete this item in its destructor or not. \a ownership must be true to in order for the layout to delete it. \sa ownedByLayout() diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 53aea5821..38e59382b 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -2675,6 +2675,8 @@ void QGraphicsScene::clearFocus() \property QGraphicsScene::stickyFocus \brief whether or not clicking the scene will clear focus + \since 4.6 + If this property is false (the default), then clicking on the scene background or on an item that does not accept focus, will clear focus. Otherwise, focus will remain unchanged. diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 1cea8db61..6ef226dd8 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -3552,6 +3552,8 @@ QTransform QGraphicsView::viewportTransform() const } /*! + \since 4.6 + Returns true if the view is transformed (i.e., a non-identity transform has been assigned, or the scrollbars are adjusted). diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 61be832c4..15bbccb17 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -380,6 +380,7 @@ QPixmap QPixmap::copy(const QRect &rect) const /*! \fn QPixmap::scroll(int dx, int dy, int x, int y, int width, int height, QRegion *exposed) + \since 4.6 This convenience function is equivalent to calling QPixmap::scroll(\a dx, \a dy, QRect(\a x, \a y, \a width, \a height), \a exposed). @@ -388,6 +389,8 @@ QPixmap QPixmap::copy(const QRect &rect) const */ /*! + \since 4.6 + Scrolls the area \a rect of this pixmap by (\a dx, \a dy). The exposed region is left unchanged. You can optionally pass a pointer to an empty QRegion to get the region that is \a exposed by the scroll operation. diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp index 8d7540c5d..04df2aa67 100644 --- a/src/gui/text/qabstracttextdocumentlayout.cpp +++ b/src/gui/text/qabstracttextdocumentlayout.cpp @@ -79,6 +79,7 @@ QT_BEGIN_NAMESPACE \class QTextObjectInterface \brief The QTextObjectInterface class allows drawing of custom text objects in \l{QTextDocument}s. + \since 4.5 A text object describes the structure of one or more elements in a text document; for instance, images imported from HTML are diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp index 0e3cb569b..19d4cc46a 100644 --- a/src/gui/text/qtextcursor.cpp +++ b/src/gui/text/qtextcursor.cpp @@ -1856,6 +1856,8 @@ bool QTextCursor::atStart() const } /*! + \since 4.6 + Returns true if the cursor is at the end of the document; otherwise returns false. diff --git a/src/network/access/qabstractnetworkcache.cpp b/src/network/access/qabstractnetworkcache.cpp index cfc9fe7f6..3f4405989 100644 --- a/src/network/access/qabstractnetworkcache.cpp +++ b/src/network/access/qabstractnetworkcache.cpp @@ -283,6 +283,8 @@ void QNetworkCacheMetaData::setExpirationDate(const QDateTime &dateTime) } /*! + \since 4.6 + Returns all the attributes stored with this cache item. \sa setAttributes(), QNetworkRequest::Attribute @@ -293,6 +295,8 @@ QNetworkCacheMetaData::AttributesMap QNetworkCacheMetaData::attributes() const } /*! + \since 4.6 + Sets all attributes of this cache item to be the map \a attributes. \sa attributes(), QNetworkRequest::setAttribute() diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index eacf5bb83..df89e24a8 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -109,8 +109,6 @@ public: */ /*! - \since 4.6 - Creates a QGLFramebufferObjectFormat object with properties specifying the format of an OpenGL framebuffer object. @@ -146,8 +144,6 @@ QGLFramebufferObjectFormat::QGLFramebufferObjectFormat(int samples, } /*! - \since 4.6 - Constructs a copy of \a other. */ @@ -158,8 +154,6 @@ QGLFramebufferObjectFormat::QGLFramebufferObjectFormat(const QGLFramebufferObjec } /*! - \since 4.6 - Assigns \a other to this object. */ @@ -170,8 +164,6 @@ QGLFramebufferObjectFormat &QGLFramebufferObjectFormat::operator=(const QGLFrame } /*! - \since 4.6 - Destroys the QGLFramebufferObjectFormat. */ QGLFramebufferObjectFormat::~QGLFramebufferObjectFormat() @@ -180,8 +172,6 @@ QGLFramebufferObjectFormat::~QGLFramebufferObjectFormat() } /*! - \since 4.6 - Sets the number of samples per pixel for a multisample framebuffer object to \a samples. A sample count of 0 represents a regular non-multisample framebuffer object. @@ -194,8 +184,6 @@ void QGLFramebufferObjectFormat::setSamples(int samples) } /*! - \since 4.6 - Returns the number of samples per pixel if a framebuffer object is a multisample framebuffer object. Otherwise, returns 0. @@ -207,8 +195,6 @@ int QGLFramebufferObjectFormat::samples() const } /*! - \since 4.6 - Sets the attachments a framebuffer object should have to \a attachment. \sa attachment() @@ -219,8 +205,6 @@ void QGLFramebufferObjectFormat::setAttachment(QGLFramebufferObject::Attachment } /*! - \since 4.6 - Returns the status of the depth and stencil buffers attached to a framebuffer object. @@ -232,8 +216,6 @@ QGLFramebufferObject::Attachment QGLFramebufferObjectFormat::attachment() const } /*! - \since 4.6 - Sets the texture target of the texture attached to a framebuffer object to \a target. Ignored for multisample framebuffer objects. @@ -245,8 +227,6 @@ void QGLFramebufferObjectFormat::setTextureTarget(GLenum target) } /*! - \since 4.6 - Returns the texture target of the texture attached to a framebuffer object. Ignored for multisample framebuffer objects. @@ -258,8 +238,6 @@ GLenum QGLFramebufferObjectFormat::textureTarget() const } /*! - \since 4.6 - Sets the internal format of a framebuffer object's texture or multisample framebuffer object's color buffer to \a internalFormat. @@ -271,8 +249,6 @@ void QGLFramebufferObjectFormat::setInternalFormat(GLenum internalFormat) } /*! - \since 4.6 - Returns the internal format of a framebuffer object's texture or multisample framebuffer object's color buffer. diff --git a/src/script/qscriptvalue.cpp b/src/script/qscriptvalue.cpp index 97ce61abe..48e1318b5 100644 --- a/src/script/qscriptvalue.cpp +++ b/src/script/qscriptvalue.cpp @@ -574,9 +574,11 @@ void QScriptValue::setPrototype(const QScriptValue &prototype) } /*! - Returns the scope object of this QScriptValue. This function is only - relevant for function objects. The scope determines how variables are - resolved when the function is invoked. + \since 4.6 + + Returns the scope object of this QScriptValue. This function is only + relevant for function objects. The scope determines how variables are + resolved when the function is invoked. */ QScriptValue QScriptValue::scope() const { @@ -588,9 +590,11 @@ QScriptValue QScriptValue::scope() const } /*! - Sets the \a scope object of this QScriptValue. This function is only - relevant for function objects. Changing the scope is useful when creating - closures; see \l{Nested Functions and the Scope Chain}. + \since 4.6 + + Sets the \a scope object of this QScriptValue. This function is only + relevant for function objects. Changing the scope is useful when creating + closures; see \l{Nested Functions and the Scope Chain}. */ void QScriptValue::setScope(const QScriptValue &scope) { diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 5aef39eb3..495030345 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -1481,18 +1481,21 @@ QString QSqlDatabase::connectionName() const } /*! - Sets the default numerical precision policy used by queries created - on this database connection to \a precisionPolicy. + \since 4.6 - Note: Drivers that don't support fetching numerical values with low - precision will ignore the precision policy. You can use - QSqlDriver::hasFeature() to find out whether a driver supports this - feature. + Sets the default numerical precision policy used by queries created + on this database connection to \a precisionPolicy. - Note: Setting the default precision policy to \a precisionPolicy - doesn't affect any currently active queries. + Note: Drivers that don't support fetching numerical values with low + precision will ignore the precision policy. You can use + QSqlDriver::hasFeature() to find out whether a driver supports this + feature. - \sa QSql::NumericalPrecisionPolicy, numericalPrecisionPolicy(), QSqlQuery::setNumericalPrecisionPolicy(), QSqlQuery::numericalPrecisionPolicy() + Note: Setting the default precision policy to \a precisionPolicy + doesn't affect any currently active queries. + + \sa QSql::NumericalPrecisionPolicy, numericalPrecisionPolicy(), + QSqlQuery::setNumericalPrecisionPolicy(), QSqlQuery::numericalPrecisionPolicy() */ void QSqlDatabase::setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy precisionPolicy) { @@ -1502,9 +1505,12 @@ void QSqlDatabase::setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy pr } /*! - Returns the current default precision policy for the database connection. + \since 4.6 + + Returns the current default precision policy for the database connection. - \sa QSql::NumericalPrecisionPolicy, setNumericalPrecisionPolicy(), QSqlQuery::numericalPrecisionPolicy(), QSqlQuery::setNumericalPrecisionPolicy() + \sa QSql::NumericalPrecisionPolicy, setNumericalPrecisionPolicy(), + QSqlQuery::numericalPrecisionPolicy(), QSqlQuery::setNumericalPrecisionPolicy() */ QSql::NumericalPrecisionPolicy QSqlDatabase::numericalPrecisionPolicy() const { diff --git a/src/sql/kernel/qsqldriver.cpp b/src/sql/kernel/qsqldriver.cpp index 77e389fd3..ca0da66da 100644 --- a/src/sql/kernel/qsqldriver.cpp +++ b/src/sql/kernel/qsqldriver.cpp @@ -865,6 +865,8 @@ QStringList QSqlDriver::subscribedToNotificationsImplementation() const } /*! + \since 4.6 + This slot returns whether \a identifier is escaped according to the database rules. \a identifier can either be a table name or field name, dependent on \a type. @@ -876,7 +878,6 @@ QStringList QSqlDriver::subscribedToNotificationsImplementation() const slot in your own QSqlDriver if your database engine uses a different delimiter character. - \since 4.5 \sa isIdentifierEscaped() */ bool QSqlDriver::isIdentifierEscapedImplementation(const QString &identifier, IdentifierType type) const @@ -888,6 +889,8 @@ bool QSqlDriver::isIdentifierEscapedImplementation(const QString &identifier, Id } /*! + \since 4.6 + This slot returns \a identifier with the leading and trailing delimiters removed, \a identifier can either be a tablename or field name, dependent on \a type. If \a identifier does not have leading and trailing delimiter characters, \a @@ -898,7 +901,6 @@ bool QSqlDriver::isIdentifierEscapedImplementation(const QString &identifier, Id dynamically detect and call \e this slot. It generally unnecessary to reimplement this slot. - \since 4.5 \sa stripDelimiters() */ QString QSqlDriver::stripDelimitersImplementation(const QString &identifier, IdentifierType type) const @@ -914,13 +916,16 @@ QString QSqlDriver::stripDelimitersImplementation(const QString &identifier, Ide } /*! - Sets the default numerical precision policy used by queries created - by this driver to \a precisionPolicy. + \since 4.6 + + Sets the default numerical precision policy used by queries created + by this driver to \a precisionPolicy. - Note: Setting the default precision policy to \a precisionPolicy - doesn't affect any currently active queries. + Note: Setting the default precision policy to \a precisionPolicy + doesn't affect any currently active queries. - \sa QSql::NumericalPrecisionPolicy, numericalPrecisionPolicy(), QSqlQuery::setNumericalPrecisionPolicy(), QSqlQuery::numericalPrecisionPolicy() + \sa QSql::NumericalPrecisionPolicy, numericalPrecisionPolicy(), + QSqlQuery::setNumericalPrecisionPolicy(), QSqlQuery::numericalPrecisionPolicy() */ void QSqlDriver::setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy precisionPolicy) { @@ -928,9 +933,12 @@ void QSqlDriver::setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy prec } /*! - Returns the current default precision policy for the database connection. + \since 4.6 + + Returns the current default precision policy for the database connection. - \sa QSql::NumericalPrecisionPolicy, setNumericalPrecisionPolicy(), QSqlQuery::numericalPrecisionPolicy(), QSqlQuery::setNumericalPrecisionPolicy() + \sa QSql::NumericalPrecisionPolicy, setNumericalPrecisionPolicy(), + QSqlQuery::numericalPrecisionPolicy(), QSqlQuery::setNumericalPrecisionPolicy() */ QSql::NumericalPrecisionPolicy QSqlDriver::numericalPrecisionPolicy() const { diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index e9d58f9b7..70c8c8d0f 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -714,14 +714,12 @@ QT_BEGIN_NAMESPACE /*! \fn QTest::QTouchEventSequence::~QTouchEventSequence() - \since 4.6 Commits this sequence of touch events and frees allocated resources. */ /*! \fn QTouchEventSequence &QTest::QTouchEventSequence::press(int touchId, const QPoint &pt, QWidget *widget) - \since 4.6 Adds a press event for touchpoint \a touchId at position \a pt to this sequence and returns a reference to this QTouchEventSequence. @@ -734,7 +732,6 @@ QT_BEGIN_NAMESPACE /*! \fn QTouchEventSequence &QTest::QTouchEventSequence::move(int touchId, const QPoint &pt, QWidget *widget) - \since 4.6 Adds a move event for touchpoint \a touchId at position \a pt to this sequence and returns a reference to this QTouchEventSequence. @@ -747,7 +744,6 @@ QT_BEGIN_NAMESPACE /*! \fn QTouchEventSequence &QTest::QTouchEventSequence::release(int touchId, const QPoint &pt, QWidget *widget) - \since 4.6 Adds a release event for touchpoint \a touchId at position \a pt to this sequence and returns a reference to this QTouchEventSequence. @@ -760,7 +756,6 @@ QT_BEGIN_NAMESPACE /*! \fn QTouchEventSequence &QTest::QTouchEventSequence::stationary(int touchId) - \since 4.6 Adds a stationary event for touchpoint \a touchId to this sequence and returns a reference to this QTouchEventSequence. @@ -770,7 +765,6 @@ QT_BEGIN_NAMESPACE /*! \fn QTouchEventSequence QTest::touchEvent(QWidget *widget, QTouchEvent::DeviceType deviceType) - \since 4.6 Creates and returns a QTouchEventSequence for the device \a deviceType to simulate events for \a widget. diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp index 0a2ca9140..06f03e6e3 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp @@ -1667,12 +1667,12 @@ void QAbstractXmlNodeModel::copyNodeTo(const QXmlNodeModelIndex &node, } /*! - Returns the source location for the object with the given \a index - or a default constructed QSourceLocation in case no location - information is available. + Returns the source location for the object with the given \a index + or a default constructed QSourceLocation in case no location + information is available. - \since TODO - */ + \since 4.6 +*/ QSourceLocation QAbstractXmlNodeModel::sourceLocation(const QXmlNodeModelIndex &index) const { // TODO: make this method virtual in Qt5 to allow source location support in custom models -- cgit v1.2.3 From 3728c5221e4cd1fb15f73df8b9efba9c56531a89 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sun, 19 Jul 2009 23:24:40 +0200 Subject: Doc: A few cleanups, fixes and improvements. --- src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp | 2 +- src/activeqt/container/qaxobject.cpp | 8 ++++---- src/activeqt/container/qaxwidget.cpp | 8 ++++---- src/corelib/animation/qabstractanimation.cpp | 5 ++--- src/corelib/animation/qsequentialanimationgroup.cpp | 4 +++- src/corelib/tools/qcontiguouscache.cpp | 15 ++++++++------- src/gui/graphicsview/qgraphicsitem.cpp | 10 +++++----- src/gui/image/qimage.cpp | 2 +- src/gui/image/qpicture.cpp | 2 ++ src/gui/image/qpixmap.cpp | 4 ++-- src/gui/painting/qprinter.cpp | 3 ++- src/gui/text/qsyntaxhighlighter.cpp | 4 ++-- src/opengl/qglframebufferobject.cpp | 3 +-- src/opengl/qglpixelbuffer.cpp | 2 +- 14 files changed, 38 insertions(+), 34 deletions(-) diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp index 2b25f9577..7e85eaaf2 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp @@ -149,7 +149,7 @@ QWebSecurityOrigin QWebDatabase::origin() const } /*! - Removes the database, \a db, from its security origin. All data stored in this database + Removes the database \a db from its security origin. All data stored in this database will be destroyed. */ void QWebDatabase::removeDatabase(const QWebDatabase &db) diff --git a/src/activeqt/container/qaxobject.cpp b/src/activeqt/container/qaxobject.cpp index 412c5b5cc..63bdd5eff 100644 --- a/src/activeqt/container/qaxobject.cpp +++ b/src/activeqt/container/qaxobject.cpp @@ -122,7 +122,7 @@ QAxObject::~QAxObject() } /*! - \reimp + \internal */ const QMetaObject *QAxObject::metaObject() const { @@ -130,7 +130,7 @@ const QMetaObject *QAxObject::metaObject() const } /*! - \reimp + \internal */ const QMetaObject *QAxObject::parentMetaObject() const { @@ -148,7 +148,7 @@ void *QAxObject::qt_metacast(const char *cname) } /*! - \reimp + \internal */ const char *QAxObject::className() const { @@ -156,7 +156,7 @@ const char *QAxObject::className() const } /*! - \reimp + \internal */ int QAxObject::qt_metacall(QMetaObject::Call call, int id, void **v) { diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index 615887f4f..ae468ef52 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -2034,7 +2034,7 @@ bool QAxWidget::doVerb(const QString &verb) */ /*! - \reimp + \internal */ const QMetaObject *QAxWidget::metaObject() const { @@ -2042,7 +2042,7 @@ const QMetaObject *QAxWidget::metaObject() const } /*! - \reimp + \internal */ const QMetaObject *QAxWidget::parentMetaObject() const { @@ -2060,7 +2060,7 @@ void *QAxWidget::qt_metacast(const char *cname) } /*! - \reimp + \internal */ const char *QAxWidget::className() const { @@ -2068,7 +2068,7 @@ const char *QAxWidget::className() const } /*! - \reimp + \internal */ int QAxWidget::qt_metacall(QMetaObject::Call call, int id, void **v) { diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index cf3e62d19..ced86d2c8 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -643,9 +643,8 @@ void QAbstractAnimation::stop() /*! Pauses the animation. When the animation is paused, state() returns Paused. - The currenttime will remain unchanged until resume() or start() is called. - If you want to continue from the current time, call resume(). - + The value of currentTime will remain unchanged until resume() or start() + is called. If you want to continue from the current time, call resume(). \sa start(), state(), resume() */ diff --git a/src/corelib/animation/qsequentialanimationgroup.cpp b/src/corelib/animation/qsequentialanimationgroup.cpp index 5932e7c44..05dc307d9 100644 --- a/src/corelib/animation/qsequentialanimationgroup.cpp +++ b/src/corelib/animation/qsequentialanimationgroup.cpp @@ -269,8 +269,10 @@ QSequentialAnimationGroup::~QSequentialAnimationGroup() /*! Adds a pause of \a msecs to this animation group. - The pause is considered as a special type of animation, thus count() will be + The pause is considered as a special type of animation, thus + \l{QAnimationGroup::animationCount()}{animationCount} will be increased by one. + \sa insertPauseAt(), QAnimationGroup::addAnimation() */ QPauseAnimation *QSequentialAnimationGroup::addPause(int msecs) diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp index 8a1415273..61cda52cd 100644 --- a/src/corelib/tools/qcontiguouscache.cpp +++ b/src/corelib/tools/qcontiguouscache.cpp @@ -96,7 +96,7 @@ MyRecord record(int row) const in the case where the requested row is a long way from the currently cached items. If there is a gap between where the new item is inserted and the currently cached items then the existing cached items are first removed to retain - the contiguous nature of the cache. Hence it is important to take some care then + the contiguous nature of the cache. Hence it is important to take some care then when using insert() in order to avoid unwanted clearing of the cache. The range of valid indexes for the QContiguousCache class are from @@ -105,9 +105,9 @@ MyRecord record(int row) const than INT_MAX can result in the indexes of the cache being invalid. When the cache indexes are invalid it is important to call normalizeIndexes() before calling any of containsIndex(), firstIndex(), - lastIndex(), at() or the [] operator. Calling these - functions when the cache has invalid indexes will result in undefined - behavior. The indexes can be checked by using areIndexesValid() + lastIndex(), at() or \l{QContiguousCache::operator[]()}{operator[]()}. + Calling these functions when the cache has invalid indexes will result in + undefined behavior. The indexes can be checked by using areIndexesValid() In most cases the indexes will not exceed 0 to INT_MAX, and normalizeIndexes() will not need to be used. @@ -259,14 +259,15 @@ MyRecord record(int row) const /*! \fn T &QContiguousCache::operator[](int i) - Returns the item at index position \a i as a modifiable reference. If + Returns the item at index position \a i as a modifiable reference. If the cache does not contain an item at the given index position \a i then it will first insert an empty item at that position. In most cases it is better to use either at() or insert(). - Note that using non-const operators can cause QContiguousCache to do a deep - copy. + \note This non-const overload of operator[] requires QContiguousCache + to make a deep copy. Use at() for read-only access to a non-const + QContiguousCache. \sa insert(), at() */ diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 7d5ce7bf1..5ef6219f9 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3189,7 +3189,7 @@ void QGraphicsItem::setShear(qreal sh, qreal sv) /*! \since 4.6 - Returns the origin point used for transformation in item coordinate. + Returns the origin point for the transformation in item coordinates. The default is QPointF(0,0). @@ -3205,7 +3205,7 @@ QPointF QGraphicsItem::transformOrigin() const /*! \since 4.6 - Sets the \a origin for transformation in item coordinate + Sets the \a origin point for the transformation in item coordinates. \sa transformOrigin(), {Transformations} */ @@ -3226,9 +3226,9 @@ void QGraphicsItem::setTransformOrigin(const QPointF &origin) \since 4.6 \overload - Sets the origin for the transformation to the point - composed of \a x and \a y. - + Sets the origin point for the transformation in item coordinates. + This is equivalent to calling setTransformOrigin(QPointF(\a x, \a y)). + \sa setTransformOrigin(), {Transformations} */ diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index fa1ce29b9..ad55dcd71 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -5269,7 +5269,7 @@ QPaintEngine *QImage::paintEngine() const /*! - \reimp + \internal Returns the size for the specified \a metric on the device. */ diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 874de81ab..ea1392bd1 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -954,6 +954,8 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords) } /*! + \internal + Internal implementation of the virtual QPaintDevice::metric() function. diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 15bbccb17..72fdec08b 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -1782,7 +1782,7 @@ bool QPixmap::hasAlphaChannel() const } /*! - \reimp + \internal */ int QPixmap::metric(PaintDeviceMetric metric) const { @@ -1857,7 +1857,7 @@ QPixmap QPixmap::alphaChannel() const } /*! - \reimp + \internal */ QPaintEngine *QPixmap::paintEngine() const { diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp index 8823b1864..411b74dd6 100644 --- a/src/gui/painting/qprinter.cpp +++ b/src/gui/painting/qprinter.cpp @@ -793,7 +793,8 @@ QPrinter::OutputFormat QPrinter::outputFormat() const -/*! \reimp */ +/*! \internal +*/ int QPrinter::devType() const { return QInternal::Printer; diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp index f69562d8c..56c7ca1dd 100644 --- a/src/gui/text/qsyntaxhighlighter.cpp +++ b/src/gui/text/qsyntaxhighlighter.cpp @@ -367,7 +367,7 @@ QTextDocument *QSyntaxHighlighter::document() const /*! \since 4.2 - Redoes the highlighting of the whole document. + Reapplies the highlighting to the whole document. \sa rehighlightBlock() */ @@ -384,7 +384,7 @@ void QSyntaxHighlighter::rehighlight() /*! \since 4.6 - Redoes the highlighting of the given QTextBlock \a block. + Reapplies the highlighting to the given QTextBlock \a block. \sa rehighlight() */ diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index df89e24a8..3685661c7 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -1032,8 +1032,7 @@ GLuint QGLFramebufferObject::handle() const } /*! \fn int QGLFramebufferObject::devType() const - - \reimp + \internal */ diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp index 38fad4e43..440694d5f 100644 --- a/src/opengl/qglpixelbuffer.cpp +++ b/src/opengl/qglpixelbuffer.cpp @@ -591,7 +591,7 @@ QGLFormat QGLPixelBuffer::format() const } /*! \fn int QGLPixelBuffer::devType() const - \reimp + \internal */ QT_END_NAMESPACE -- cgit v1.2.3 From 7a3ae63fc95ebb9fd7e380aa35cfdf7d5e68fc03 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Mon, 20 Jul 2009 09:40:10 +1000 Subject: Make openvg.prf work properly This change makes "QT += openvg" include the right includes and libs via openvg.prf automatically. Reviewed-by: trustme --- mkspecs/features/qt.prf | 1 + mkspecs/features/unix/openvg.prf | 10 ++++++++-- src/plugins/graphicssystems/openvg/openvg.pro | 8 -------- src/plugins/graphicssystems/shivavg/shivavg.pro | 4 ---- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 332eaca63..1bac953fa 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -159,6 +159,7 @@ for(QTLIB, $$list($$lower($$unique(QT)))) { } else { DEFINES *= $$upper(QT_$${QTLIB}_LIB) isEqual(QTLIB, opengl):CONFIG += opengl + isEqual(QTLIB, openvg):CONFIG += openvg isEqual(QTLIB, qt3support):DEFINES *= QT3_SUPPORT isEqual(QTLIB, testlib):CONFIG += console isEqual(QTLIB, dbus):CONFIG += dbusadaptors dbusinterfaces diff --git a/mkspecs/features/unix/openvg.prf b/mkspecs/features/unix/openvg.prf index a21d1ca30..29acec18f 100644 --- a/mkspecs/features/unix/openvg.prf +++ b/mkspecs/features/unix/openvg.prf @@ -1,9 +1,15 @@ !isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG !isEmpty(QMAKE_LIBDIR_OPENVG): QMAKE_LIBDIR += -L$$QMAKE_LIBDIR_OPENVG -!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $QMAKE_LIBS_OPENVG +!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG + +contains(QT_CONFIG, egl) { + !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL + !isEmpty(QMAKE_LIBDIR_EGL): LIBS += -L$$QMAKE_LIBDIR_EGL + !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL +} contains(QT_CONFIG, openvg_on_opengl) { !isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL !isEmpty(QMAKE_LIBDIR_OPENGL): QMAKE_LIBDIR += -L$$QMAKE_LIBDIR_OPENGL - !isEmpty(QMAKE_LIBS_OPENGL): LIBS += $QMAKE_LIBS_OPENGL + !isEmpty(QMAKE_LIBS_OPENGL): LIBS += $$QMAKE_LIBS_OPENGL } diff --git a/src/plugins/graphicssystems/openvg/openvg.pro b/src/plugins/graphicssystems/openvg/openvg.pro index 0abbfbd13..d36570cdd 100644 --- a/src/plugins/graphicssystems/openvg/openvg.pro +++ b/src/plugins/graphicssystems/openvg/openvg.pro @@ -10,11 +10,3 @@ HEADERS = qgraphicssystem_vg_p.h target.path += $$[QT_INSTALL_PLUGINS]/graphicssystems INSTALLS += target - -!isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG -!isEmpty(QMAKE_LIBDIR_OPENVG): LIBS += -L$$QMAKE_LIBDIR_OPENVG -!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG - -!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL -!isEmpty(QMAKE_LIBDIR_EGL): LIBS += -L$$QMAKE_LIBDIR_EGL -!isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL diff --git a/src/plugins/graphicssystems/shivavg/shivavg.pro b/src/plugins/graphicssystems/shivavg/shivavg.pro index 68345afcc..b8ea12ac4 100644 --- a/src/plugins/graphicssystems/shivavg/shivavg.pro +++ b/src/plugins/graphicssystems/shivavg/shivavg.pro @@ -10,7 +10,3 @@ HEADERS = shivavggraphicssystem.h shivavgwindowsurface.h target.path += $$[QT_INSTALL_PLUGINS]/graphicssystems INSTALLS += target - -!isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG -!isEmpty(QMAKE_LIBDIR_OPENVG): LIBS += -L$$QMAKE_LIBDIR_OPENVG -!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG -- cgit v1.2.3 From 3d6ae0a55eb8d57b6914fc5d6ddff07d29a40317 Mon Sep 17 00:00:00 2001 From: Bill King Date: Mon, 20 Jul 2009 08:15:52 +1000 Subject: Fix compilation for db2 driver after win9x removal spree --- src/sql/drivers/db2/qsql_db2.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sql/drivers/db2/qsql_db2.cpp b/src/sql/drivers/db2/qsql_db2.cpp index e4f564ab8..474c53dc4 100644 --- a/src/sql/drivers/db2/qsql_db2.cpp +++ b/src/sql/drivers/db2/qsql_db2.cpp @@ -59,6 +59,8 @@ #define SQL_BIGUINT_TYPE quint64 #endif +#define UNICODE + #include #include -- cgit v1.2.3 From d3a2ba13342880e2912b9a669c8b6f8bc217eb56 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 20 Jul 2009 15:45:47 +1000 Subject: fix crash due to null pointer referencing during application desctruction globalEngineCache is deleted as part of Q_GLOBAL_STATIC macro. Other instances of code that happen to use QRegex after the cache destruction will subsequently crash. Most common reason are other Q_GLOBAL_STATIC instances which happen to use QRegExp as part of their destructor. Reviewed-by: Rhys Weatherley --- src/corelib/tools/qregexp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index 8dad6e556..908b4045c 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -3296,7 +3296,7 @@ static void prepareEngine_helper(QRegExpPrivate *priv) { bool initMatchState = !priv->eng; #if !defined(QT_NO_REGEXP_OPTIM) - if (!priv->eng) { + if (!priv->eng && globalEngineCache()) { QMutexLocker locker(mutex()); priv->eng = globalEngineCache()->take(priv->engineKey); if (priv->eng != 0) -- cgit v1.2.3 From 27a07955d796a9c2b52302ad7f5ce0cd9d6179e1 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Mon, 20 Jul 2009 15:56:29 +1000 Subject: Add the "star" example, which demonstrates how to mix OpenVG and QPainter Reviewed-by: trustme --- examples/examples.pro | 1 + examples/openvg/README | 40 +++++++++++++ examples/openvg/openvg.pro | 8 +++ examples/openvg/star/main.cpp | 54 +++++++++++++++++ examples/openvg/star/star.pro | 6 ++ examples/openvg/star/starwidget.cpp | 115 ++++++++++++++++++++++++++++++++++++ examples/openvg/star/starwidget.h | 66 +++++++++++++++++++++ 7 files changed, 290 insertions(+) create mode 100644 examples/openvg/README create mode 100644 examples/openvg/openvg.pro create mode 100644 examples/openvg/star/main.cpp create mode 100644 examples/openvg/star/star.pro create mode 100644 examples/openvg/star/starwidget.cpp create mode 100644 examples/openvg/star/starwidget.h diff --git a/examples/examples.pro b/examples/examples.pro index 5382e28fc..5855e4f38 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -36,6 +36,7 @@ embedded:SUBDIRS += qws contains(QT_BUILD_PARTS, tools):SUBDIRS += qtestlib } contains(QT_CONFIG, opengl): SUBDIRS += opengl +contains(QT_CONFIG, openvg): SUBDIRS += openvg contains(QT_CONFIG, dbus): SUBDIRS += dbus win32: SUBDIRS += activeqt contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns diff --git a/examples/openvg/README b/examples/openvg/README new file mode 100644 index 000000000..5e385ea0c --- /dev/null +++ b/examples/openvg/README @@ -0,0 +1,40 @@ +Qt provides support for integration with OpenVG implementations on +platforms with appropriate hardware acceleration. + +These examples demonstrate the basic techniques used to take advantage of +OpenVG in Qt applications. In particular, the "star" example shows how +to mix QPainter and OpenVG calls in the same paint event. + +The example launcher provided with Qt can be used to explore each of the +examples in this directory. + +Documentation for these examples can be found via the Tutorial and Examples +link in the main Qt documentation. + + +Finding the Qt Examples and Demos launcher +========================================== + +On Windows: + +The launcher can be accessed via the Windows Start menu. Select the menu +entry entitled "Qt Examples and Demos" entry in the submenu containing +the Qt tools. + +On Mac OS X: + +For the binary distribution, the qtdemo executable is installed in the +/Developer/Applications/Qt directory. For the source distribution, it is +installed alongside the other Qt tools on the path specified when Qt is +configured. + +On Unix/Linux: + +The qtdemo executable is installed alongside the other Qt tools on the path +specified when Qt is configured. + +On all platforms: + +The source code for the launcher can be found in the demos/qtdemo directory +in the Qt package. This example is built at the same time as the Qt libraries, +tools, examples, and demonstrations. diff --git a/examples/openvg/openvg.pro b/examples/openvg/openvg.pro new file mode 100644 index 000000000..d76a38963 --- /dev/null +++ b/examples/openvg/openvg.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs +SUBDIRS = star + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/openvg +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS openvg.pro README +sources.path = $$[QT_INSTALL_EXAMPLES]/openvg +INSTALLS += target sources diff --git a/examples/openvg/star/main.cpp b/examples/openvg/star/main.cpp new file mode 100644 index 000000000..eec218693 --- /dev/null +++ b/examples/openvg/star/main.cpp @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtOpenGL module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include "starwidget.h" + +int main(int argc, char *argv[]) +{ +#ifdef Q_OS_SYMBIAN + QApplication::setGraphicsSystem("openvg"); +#endif + QApplication app(argc, argv); + StarWidget mw; + mw.show(); + return app.exec(); +} diff --git a/examples/openvg/star/star.pro b/examples/openvg/star/star.pro new file mode 100644 index 000000000..90c236ddf --- /dev/null +++ b/examples/openvg/star/star.pro @@ -0,0 +1,6 @@ +TEMPLATE = app +TARGET = star +CONFIG += qt debug warn_on +QT += openvg +SOURCES = starwidget.cpp main.cpp +HEADERS = starwidget.h diff --git a/examples/openvg/star/starwidget.cpp b/examples/openvg/star/starwidget.cpp new file mode 100644 index 000000000..9d2a25586 --- /dev/null +++ b/examples/openvg/star/starwidget.cpp @@ -0,0 +1,115 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtOpenGL module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "starwidget.h" + +StarWidget::StarWidget(QWidget *parent) + : QWidget(parent) + , path(VG_INVALID_HANDLE) + , pen(Qt::red, 4.0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin) + , brush(Qt::yellow) +{ + setMinimumSize(220, 250); + setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); +} + +static VGubyte const starSegments[] = { + VG_MOVE_TO_ABS, + VG_LINE_TO_REL, + VG_LINE_TO_REL, + VG_LINE_TO_REL, + VG_LINE_TO_REL, + VG_CLOSE_PATH +}; +static VGfloat const starCoords[] = { + 110, 35, + 50, 160, + -130, -100, + 160, 0, + -130, 100 +}; + +void StarWidget::paintEvent(QPaintEvent *) +{ + QPainter painter; + painter.begin(this); + + // Make sure that we are using the OpenVG paint engine. + if (painter.paintEngine()->type() != QPaintEngine::OpenVG) { +#ifdef Q_WS_QWS + qWarning("Not using OpenVG: use the '-display' option to specify an OpenVG driver"); +#else + qWarning("Not using OpenVG: specify '-graphicssystem OpenVG'"); +#endif + return; + } + + // Select a pen and a brush for drawing the star. + painter.setPen(pen); + painter.setBrush(brush); + + // We want the star border to be anti-aliased. + painter.setRenderHints(QPainter::Antialiasing); + + // Flush the state changes to the OpenVG implementation + // and prepare to perform raw OpenVG calls. + painter.paintEngine()->syncState(); + + // Cache the path if we haven't already. + if (path == VG_INVALID_HANDLE) { + path = vgCreatePath(VG_PATH_FORMAT_STANDARD, + VG_PATH_DATATYPE_F, + 1.0f, // scale + 0.0f, // bias + 6, // segmentCapacityHint + 10, // coordCapacityHint + VG_PATH_CAPABILITY_ALL); + vgAppendPathData(path, sizeof(starSegments), starSegments, starCoords); + } + + // Draw the star directly using the OpenVG API. + vgDrawPath(path, VG_FILL_PATH | VG_STROKE_PATH); + + // Restore normal QPainter operations. + painter.paintEngine()->syncState(); + + painter.end(); +} diff --git a/examples/openvg/star/starwidget.h b/examples/openvg/star/starwidget.h new file mode 100644 index 000000000..883f8c40a --- /dev/null +++ b/examples/openvg/star/starwidget.h @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtOpenGL module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef STARWIDGET_H +#define STARWIDGET_H + +#include +#include +#include +#include "qvg.h" + +class StarWidget : public QWidget +{ + Q_OBJECT +public: + StarWidget(QWidget *parent = 0); + ~StarWidget() {} + +protected: + void paintEvent(QPaintEvent *); + +private: + VGPath path; + QPen pen; + QBrush brush; +}; + +#endif -- cgit v1.2.3 From f900b675047c2e595a270b2a65edf8a9731b252a Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Mon, 20 Jul 2009 10:08:52 +0200 Subject: Get monotonic time working on Mac OS X for corelib programs. Mac OS X does not provide POSIX monotonic timers. Instead it does provide a Mach call to get the absolute time (a.k.a., number of CPU ticks) for the next timer event. This gets us around the bug in select(2) on Mac, that it doesn't wakeup when the times been changed. Of course, if you used the GUI event dispatcher, which is based on CFRunLoopTimers, this is not an issue, but if you really just need corelib, it's a bear to bring in the other stuff. Thanks to the nice guys at Parallels for the basics of the patch! Task-number: 237384 Reviewed-by: Bradley T. Hughes --- src/corelib/kernel/qeventdispatcher_unix.cpp | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 0eeea04b8..9deb78ff3 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -59,6 +59,10 @@ # include #endif +#ifdef Q_OS_MAC +#include +#endif + QT_BEGIN_NAMESPACE Q_CORE_EXPORT bool qt_disable_lowpriority_timers=false; @@ -259,7 +263,7 @@ int QEventDispatcherUNIXPrivate::doSelect(QEventLoop::ProcessEventsFlags flags, QTimerInfoList::QTimerInfoList() { -#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) +#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) useMonotonicTimers = false; # if (_POSIX_MONOTONIC_CLOCK == 0) @@ -287,6 +291,9 @@ QTimerInfoList::QTimerInfoList() msPerTick = 0; } #else +# if defined(Q_OS_MAC) + useMonotonicTimers = true; +# endif // using monotonic timers unconditionally getTime(currentTime); #endif @@ -335,7 +342,19 @@ bool QTimerInfoList::timeChanged(timeval *delta) void QTimerInfoList::getTime(timeval &t) { -#if !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_BOOTSTRAPPED) +#if defined(Q_OS_MAC) + { + static mach_timebase_info_data_t info = {0,0}; + if (info.denom == 0) + mach_timebase_info(&info); + + uint64_t cpu_time = mach_absolute_time(); + uint64_t nsecs = cpu_time * (info.numer / info.denom); + t.tv_sec = nsecs * 1e-9; + t.tv_usec = nsecs * 1e-3 - (t.tv_sec * 1e6); + return; + } +#elif !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_BOOTSTRAPPED) if (useMonotonicTimers) { timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); -- cgit v1.2.3 From a1b179cccbdd9100c2524c9a3ee4ddc0631dd760 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Mon, 20 Jul 2009 10:58:10 +0200 Subject: Xml Schema: license header update Reviewed-by: TrustMe --- src/xmlpatterns/api/qabstractxmlpullprovider_p.h | 2 +- src/xmlpatterns/api/qpullbridge_p.h | 2 +- src/xmlpatterns/api/qxmlschema.h | 2 +- src/xmlpatterns/api/qxmlschema_p.cpp | 2 +- src/xmlpatterns/api/qxmlschema_p.h | 2 +- src/xmlpatterns/api/qxmlschemavalidator.h | 2 +- src/xmlpatterns/api/qxmlschemavalidator_p.h | 2 +- src/xmlpatterns/data/qcomparisonfactory_p.h | 2 +- src/xmlpatterns/data/qvaluefactory_p.h | 2 +- src/xmlpatterns/schema/qnamespacesupport_p.h | 2 +- src/xmlpatterns/schema/qxsdalternative_p.h | 2 +- src/xmlpatterns/schema/qxsdannotated_p.h | 2 +- src/xmlpatterns/schema/qxsdannotation_p.h | 2 +- src/xmlpatterns/schema/qxsdapplicationinformation_p.h | 2 +- src/xmlpatterns/schema/qxsdassertion_p.h | 2 +- src/xmlpatterns/schema/qxsdattribute_p.h | 2 +- src/xmlpatterns/schema/qxsdattributegroup_p.h | 2 +- src/xmlpatterns/schema/qxsdattributereference_p.h | 2 +- src/xmlpatterns/schema/qxsdattributeterm_p.h | 2 +- src/xmlpatterns/schema/qxsdattributeuse_p.h | 2 +- src/xmlpatterns/schema/qxsdcomplextype_p.h | 2 +- src/xmlpatterns/schema/qxsddocumentation_p.h | 2 +- src/xmlpatterns/schema/qxsdelement_p.h | 2 +- src/xmlpatterns/schema/qxsdfacet_p.h | 2 +- src/xmlpatterns/schema/qxsdidcache_p.h | 2 +- src/xmlpatterns/schema/qxsdidchelper_p.h | 2 +- src/xmlpatterns/schema/qxsdidentityconstraint_p.h | 2 +- src/xmlpatterns/schema/qxsdinstancereader_p.h | 2 +- src/xmlpatterns/schema/qxsdmodelgroup_p.h | 2 +- src/xmlpatterns/schema/qxsdnotation_p.h | 2 +- src/xmlpatterns/schema/qxsdparticle_p.h | 2 +- src/xmlpatterns/schema/qxsdparticlechecker_p.h | 2 +- src/xmlpatterns/schema/qxsdreference_p.h | 2 +- src/xmlpatterns/schema/qxsdschema_p.h | 2 +- src/xmlpatterns/schema/qxsdschemachecker_p.h | 2 +- src/xmlpatterns/schema/qxsdschemacontext_p.h | 2 +- src/xmlpatterns/schema/qxsdschemadebugger_p.h | 2 +- src/xmlpatterns/schema/qxsdschemahelper_p.h | 2 +- src/xmlpatterns/schema/qxsdschemamerger_p.h | 2 +- src/xmlpatterns/schema/qxsdschemaparser_p.h | 2 +- src/xmlpatterns/schema/qxsdschemaparsercontext_p.h | 2 +- src/xmlpatterns/schema/qxsdschemaresolver_p.h | 2 +- src/xmlpatterns/schema/qxsdschematoken_p.h | 2 +- src/xmlpatterns/schema/qxsdschematypesfactory_p.h | 2 +- src/xmlpatterns/schema/qxsdsimpletype_p.h | 2 +- src/xmlpatterns/schema/qxsdstatemachine_p.h | 2 +- src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h | 2 +- src/xmlpatterns/schema/qxsdterm_p.h | 2 +- src/xmlpatterns/schema/qxsdtypechecker_p.h | 2 +- src/xmlpatterns/schema/qxsduserschematype_p.h | 2 +- src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h | 2 +- src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h | 2 +- src/xmlpatterns/schema/qxsdwildcard_p.h | 2 +- src/xmlpatterns/schema/qxsdxpathexpression_p.h | 2 +- src/xmlpatterns/type/qnamedschemacomponent_p.h | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/xmlpatterns/api/qabstractxmlpullprovider_p.h b/src/xmlpatterns/api/qabstractxmlpullprovider_p.h index 484bc426e..59dce727a 100644 --- a/src/xmlpatterns/api/qabstractxmlpullprovider_p.h +++ b/src/xmlpatterns/api/qabstractxmlpullprovider_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/api/qpullbridge_p.h b/src/xmlpatterns/api/qpullbridge_p.h index 6a8e376e6..23b954296 100644 --- a/src/xmlpatterns/api/qpullbridge_p.h +++ b/src/xmlpatterns/api/qpullbridge_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/api/qxmlschema.h b/src/xmlpatterns/api/qxmlschema.h index d254a9290..b6ac01078 100644 --- a/src/xmlpatterns/api/qxmlschema.h +++ b/src/xmlpatterns/api/qxmlschema.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/api/qxmlschema_p.cpp b/src/xmlpatterns/api/qxmlschema_p.cpp index bf9cc9950..0bcb56579 100644 --- a/src/xmlpatterns/api/qxmlschema_p.cpp +++ b/src/xmlpatterns/api/qxmlschema_p.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/api/qxmlschema_p.h b/src/xmlpatterns/api/qxmlschema_p.h index d59a3098f..be2ebb825 100644 --- a/src/xmlpatterns/api/qxmlschema_p.h +++ b/src/xmlpatterns/api/qxmlschema_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/api/qxmlschemavalidator.h b/src/xmlpatterns/api/qxmlschemavalidator.h index 82cab6841..f32ac07cf 100644 --- a/src/xmlpatterns/api/qxmlschemavalidator.h +++ b/src/xmlpatterns/api/qxmlschemavalidator.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/api/qxmlschemavalidator_p.h b/src/xmlpatterns/api/qxmlschemavalidator_p.h index 7d94c4f82..40dbefcdf 100644 --- a/src/xmlpatterns/api/qxmlschemavalidator_p.h +++ b/src/xmlpatterns/api/qxmlschemavalidator_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/data/qcomparisonfactory_p.h b/src/xmlpatterns/data/qcomparisonfactory_p.h index 46db8c062..1234548a9 100644 --- a/src/xmlpatterns/data/qcomparisonfactory_p.h +++ b/src/xmlpatterns/data/qcomparisonfactory_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/data/qvaluefactory_p.h b/src/xmlpatterns/data/qvaluefactory_p.h index 6490c6eb9..acc573325 100644 --- a/src/xmlpatterns/data/qvaluefactory_p.h +++ b/src/xmlpatterns/data/qvaluefactory_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qnamespacesupport_p.h b/src/xmlpatterns/schema/qnamespacesupport_p.h index 031cebad0..47c21a571 100644 --- a/src/xmlpatterns/schema/qnamespacesupport_p.h +++ b/src/xmlpatterns/schema/qnamespacesupport_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdalternative_p.h b/src/xmlpatterns/schema/qxsdalternative_p.h index 9b0d06db3..8dcfb12cc 100644 --- a/src/xmlpatterns/schema/qxsdalternative_p.h +++ b/src/xmlpatterns/schema/qxsdalternative_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdannotated_p.h b/src/xmlpatterns/schema/qxsdannotated_p.h index 602b3761c..05010d940 100644 --- a/src/xmlpatterns/schema/qxsdannotated_p.h +++ b/src/xmlpatterns/schema/qxsdannotated_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdannotation_p.h b/src/xmlpatterns/schema/qxsdannotation_p.h index ee1f5a154..27fb555de 100644 --- a/src/xmlpatterns/schema/qxsdannotation_p.h +++ b/src/xmlpatterns/schema/qxsdannotation_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdapplicationinformation_p.h b/src/xmlpatterns/schema/qxsdapplicationinformation_p.h index cf9f69127..2eec83a89 100644 --- a/src/xmlpatterns/schema/qxsdapplicationinformation_p.h +++ b/src/xmlpatterns/schema/qxsdapplicationinformation_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdassertion_p.h b/src/xmlpatterns/schema/qxsdassertion_p.h index c942e78b2..56674e5c9 100644 --- a/src/xmlpatterns/schema/qxsdassertion_p.h +++ b/src/xmlpatterns/schema/qxsdassertion_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdattribute_p.h b/src/xmlpatterns/schema/qxsdattribute_p.h index 503d4b38a..220dd28a9 100644 --- a/src/xmlpatterns/schema/qxsdattribute_p.h +++ b/src/xmlpatterns/schema/qxsdattribute_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdattributegroup_p.h b/src/xmlpatterns/schema/qxsdattributegroup_p.h index ec16184ff..3684df2bb 100644 --- a/src/xmlpatterns/schema/qxsdattributegroup_p.h +++ b/src/xmlpatterns/schema/qxsdattributegroup_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdattributereference_p.h b/src/xmlpatterns/schema/qxsdattributereference_p.h index c1dda7eeb..0d2bdc1d1 100644 --- a/src/xmlpatterns/schema/qxsdattributereference_p.h +++ b/src/xmlpatterns/schema/qxsdattributereference_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdattributeterm_p.h b/src/xmlpatterns/schema/qxsdattributeterm_p.h index e02a239c6..4852d46b4 100644 --- a/src/xmlpatterns/schema/qxsdattributeterm_p.h +++ b/src/xmlpatterns/schema/qxsdattributeterm_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdattributeuse_p.h b/src/xmlpatterns/schema/qxsdattributeuse_p.h index 21799023b..eb1dc4046 100644 --- a/src/xmlpatterns/schema/qxsdattributeuse_p.h +++ b/src/xmlpatterns/schema/qxsdattributeuse_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdcomplextype_p.h b/src/xmlpatterns/schema/qxsdcomplextype_p.h index da923b5c7..ad04f9917 100644 --- a/src/xmlpatterns/schema/qxsdcomplextype_p.h +++ b/src/xmlpatterns/schema/qxsdcomplextype_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsddocumentation_p.h b/src/xmlpatterns/schema/qxsddocumentation_p.h index 681a57582..049ba8092 100644 --- a/src/xmlpatterns/schema/qxsddocumentation_p.h +++ b/src/xmlpatterns/schema/qxsddocumentation_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdelement_p.h b/src/xmlpatterns/schema/qxsdelement_p.h index 3eccaf0d6..304e88804 100644 --- a/src/xmlpatterns/schema/qxsdelement_p.h +++ b/src/xmlpatterns/schema/qxsdelement_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdfacet_p.h b/src/xmlpatterns/schema/qxsdfacet_p.h index 3a3220107..5d16b4ef6 100644 --- a/src/xmlpatterns/schema/qxsdfacet_p.h +++ b/src/xmlpatterns/schema/qxsdfacet_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdidcache_p.h b/src/xmlpatterns/schema/qxsdidcache_p.h index 03a714766..dae967e58 100644 --- a/src/xmlpatterns/schema/qxsdidcache_p.h +++ b/src/xmlpatterns/schema/qxsdidcache_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdidchelper_p.h b/src/xmlpatterns/schema/qxsdidchelper_p.h index 39a65cce4..ee593b8e3 100644 --- a/src/xmlpatterns/schema/qxsdidchelper_p.h +++ b/src/xmlpatterns/schema/qxsdidchelper_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdidentityconstraint_p.h b/src/xmlpatterns/schema/qxsdidentityconstraint_p.h index ca80634e2..b6bb3d039 100644 --- a/src/xmlpatterns/schema/qxsdidentityconstraint_p.h +++ b/src/xmlpatterns/schema/qxsdidentityconstraint_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdinstancereader_p.h b/src/xmlpatterns/schema/qxsdinstancereader_p.h index b2325eacf..af189e32e 100644 --- a/src/xmlpatterns/schema/qxsdinstancereader_p.h +++ b/src/xmlpatterns/schema/qxsdinstancereader_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdmodelgroup_p.h b/src/xmlpatterns/schema/qxsdmodelgroup_p.h index ef70f19f9..f01d5bfe5 100644 --- a/src/xmlpatterns/schema/qxsdmodelgroup_p.h +++ b/src/xmlpatterns/schema/qxsdmodelgroup_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdnotation_p.h b/src/xmlpatterns/schema/qxsdnotation_p.h index 2c8038540..1ad2c47ac 100644 --- a/src/xmlpatterns/schema/qxsdnotation_p.h +++ b/src/xmlpatterns/schema/qxsdnotation_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdparticle_p.h b/src/xmlpatterns/schema/qxsdparticle_p.h index 5fcb91f5a..a1831926b 100644 --- a/src/xmlpatterns/schema/qxsdparticle_p.h +++ b/src/xmlpatterns/schema/qxsdparticle_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdparticlechecker_p.h b/src/xmlpatterns/schema/qxsdparticlechecker_p.h index a94092222..feed108a2 100644 --- a/src/xmlpatterns/schema/qxsdparticlechecker_p.h +++ b/src/xmlpatterns/schema/qxsdparticlechecker_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdreference_p.h b/src/xmlpatterns/schema/qxsdreference_p.h index 9d44f81a4..1354d774f 100644 --- a/src/xmlpatterns/schema/qxsdreference_p.h +++ b/src/xmlpatterns/schema/qxsdreference_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdschema_p.h b/src/xmlpatterns/schema/qxsdschema_p.h index 2ce610f71..d697673ae 100644 --- a/src/xmlpatterns/schema/qxsdschema_p.h +++ b/src/xmlpatterns/schema/qxsdschema_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdschemachecker_p.h b/src/xmlpatterns/schema/qxsdschemachecker_p.h index c0d4344a3..843f90929 100644 --- a/src/xmlpatterns/schema/qxsdschemachecker_p.h +++ b/src/xmlpatterns/schema/qxsdschemachecker_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdschemacontext_p.h b/src/xmlpatterns/schema/qxsdschemacontext_p.h index 44bdf20c5..9c00964a5 100644 --- a/src/xmlpatterns/schema/qxsdschemacontext_p.h +++ b/src/xmlpatterns/schema/qxsdschemacontext_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdschemadebugger_p.h b/src/xmlpatterns/schema/qxsdschemadebugger_p.h index 798d3f92f..cc3f7de83 100644 --- a/src/xmlpatterns/schema/qxsdschemadebugger_p.h +++ b/src/xmlpatterns/schema/qxsdschemadebugger_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdschemahelper_p.h b/src/xmlpatterns/schema/qxsdschemahelper_p.h index 54b10d623..71fdfe745 100644 --- a/src/xmlpatterns/schema/qxsdschemahelper_p.h +++ b/src/xmlpatterns/schema/qxsdschemahelper_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdschemamerger_p.h b/src/xmlpatterns/schema/qxsdschemamerger_p.h index 35a8725cf..8b522c5a5 100644 --- a/src/xmlpatterns/schema/qxsdschemamerger_p.h +++ b/src/xmlpatterns/schema/qxsdschemamerger_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdschemaparser_p.h b/src/xmlpatterns/schema/qxsdschemaparser_p.h index 5a0b1f220..51a8e3d76 100644 --- a/src/xmlpatterns/schema/qxsdschemaparser_p.h +++ b/src/xmlpatterns/schema/qxsdschemaparser_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h b/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h index 9220a1557..572d5e3a9 100644 --- a/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h +++ b/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdschemaresolver_p.h b/src/xmlpatterns/schema/qxsdschemaresolver_p.h index 90bff9e8e..60901b512 100644 --- a/src/xmlpatterns/schema/qxsdschemaresolver_p.h +++ b/src/xmlpatterns/schema/qxsdschemaresolver_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdschematoken_p.h b/src/xmlpatterns/schema/qxsdschematoken_p.h index 6b757da2c..f54f63308 100644 --- a/src/xmlpatterns/schema/qxsdschematoken_p.h +++ b/src/xmlpatterns/schema/qxsdschematoken_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h index d05234e3e..ed082ac68 100644 --- a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h +++ b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdsimpletype_p.h b/src/xmlpatterns/schema/qxsdsimpletype_p.h index dff5dc6b3..12053f01e 100644 --- a/src/xmlpatterns/schema/qxsdsimpletype_p.h +++ b/src/xmlpatterns/schema/qxsdsimpletype_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdstatemachine_p.h b/src/xmlpatterns/schema/qxsdstatemachine_p.h index 90f29d541..68bc801ff 100644 --- a/src/xmlpatterns/schema/qxsdstatemachine_p.h +++ b/src/xmlpatterns/schema/qxsdstatemachine_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h index 508e6b645..08d69de44 100644 --- a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h +++ b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdterm_p.h b/src/xmlpatterns/schema/qxsdterm_p.h index c6270fa05..c42bb408f 100644 --- a/src/xmlpatterns/schema/qxsdterm_p.h +++ b/src/xmlpatterns/schema/qxsdterm_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdtypechecker_p.h b/src/xmlpatterns/schema/qxsdtypechecker_p.h index 3656221ce..88a0c6391 100644 --- a/src/xmlpatterns/schema/qxsdtypechecker_p.h +++ b/src/xmlpatterns/schema/qxsdtypechecker_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsduserschematype_p.h b/src/xmlpatterns/schema/qxsduserschematype_p.h index 8b0fd767c..9138d0959 100644 --- a/src/xmlpatterns/schema/qxsduserschematype_p.h +++ b/src/xmlpatterns/schema/qxsduserschematype_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h index 40b458151..6b6c03df6 100644 --- a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h +++ b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h b/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h index 4757430f4..8ea4d2867 100644 --- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h +++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdwildcard_p.h b/src/xmlpatterns/schema/qxsdwildcard_p.h index 5b421c31a..a925ab468 100644 --- a/src/xmlpatterns/schema/qxsdwildcard_p.h +++ b/src/xmlpatterns/schema/qxsdwildcard_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/schema/qxsdxpathexpression_p.h b/src/xmlpatterns/schema/qxsdxpathexpression_p.h index de9547c76..6f149d766 100644 --- a/src/xmlpatterns/schema/qxsdxpathexpression_p.h +++ b/src/xmlpatterns/schema/qxsdxpathexpression_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** diff --git a/src/xmlpatterns/type/qnamedschemacomponent_p.h b/src/xmlpatterns/type/qnamedschemacomponent_p.h index 29407b3cd..ab8a916d2 100644 --- a/src/xmlpatterns/type/qnamedschemacomponent_p.h +++ b/src/xmlpatterns/type/qnamedschemacomponent_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the QtXmlPatterns of the Qt Toolkit. ** -- cgit v1.2.3 From 5620c3ff86944f19e2b2b65b67baa5e4418792d4 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 20 Jul 2009 11:18:58 +0200 Subject: Doc: add \since 4.6 --- src/corelib/tools/qsharedpointer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index fe3d9e0b8..85085c595 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -341,6 +341,7 @@ /*! \fn QSharedPointer QSharedPointer::objectCast() const + \since 4.6 Performs a \l qobject_cast() from this pointer's type to \tt X and returns a QSharedPointer that shares the reference. If this @@ -737,6 +738,7 @@ /*! \fn QSharedPointer qSharedPointerObjectCast(const QSharedPointer &other) \relates QSharedPointer + \since 4.6 Returns a shared pointer to the pointer held by \a other, using a \l qobject_cast() to type \tt X to obtain an internal pointer of the @@ -754,6 +756,7 @@ \fn QSharedPointer qSharedPointerObjectCast(const QWeakPointer &other) \relates QSharedPointer \relates QWeakPointer + \since 4.6 Returns a shared pointer to the pointer held by \a other, using a \l qobject_cast() to type \tt X to obtain an internal pointer of the -- cgit v1.2.3 From 84abdaa41e6c3bde6ac653e02bd72300b6681572 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Mon, 20 Jul 2009 10:58:28 +0200 Subject: Fix crash when native socket notifiers would send a notification after being disabled. Spend a lot of time looking at this and at the CoreFoundation source code and it seems that we really do get a notification even after the notifier is disabled. I suspect there's a race condition between when we disable the socket notifier, but the kernel flags it as needing a read, then CoreFoundation just sends the notification without checking if the CFSocket has been disabled. No further notifications come of course. Since this breaks the invariant that was set in the assert, I'm replacing it with an if check. Task-number: 258198 Reviewed-by: Bradley T. Hughes --- src/gui/kernel/qeventdispatcher_mac.mm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm index 99a1fc11a..cde0c4748 100644 --- a/src/gui/kernel/qeventdispatcher_mac.mm +++ b/src/gui/kernel/qeventdispatcher_mac.mm @@ -264,12 +264,16 @@ void qt_mac_socket_callback(CFSocketRef s, CFSocketCallBackType callbackType, CF int nativeSocket = CFSocketGetNative(s); MacSocketInfo *socketInfo = eventDispatcher->macSockets.value(nativeSocket); QEvent notifierEvent(QEvent::SockAct); + + // There is a race condition that happen where we disable the notifier and + // the kernel still has a notification to pass on. We then get this + // notification after we've successfully disabled the CFSocket, but our Qt + // notifier is now gone. The upshot is we have to check the notifier + // everytime. if (callbackType == kCFSocketReadCallBack) { - Q_ASSERT(socketInfo->readNotifier); - QApplication::sendEvent(socketInfo->readNotifier, ¬ifierEvent); + if (socketInfo->readNotifier) + QApplication::sendEvent(socketInfo->readNotifier, ¬ifierEvent); } else if (callbackType == kCFSocketWriteCallBack) { - // ### Bug in Apple socket notifiers seems to send write even - // ### after the notifier has been disabled, need to investigate further. if (socketInfo->writeNotifier) QApplication::sendEvent(socketInfo->writeNotifier, ¬ifierEvent); } -- cgit v1.2.3 From b75607522205fd822e64eeebad676ce8c040f829 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Mon, 20 Jul 2009 10:58:48 +0200 Subject: Compile fix for windows and wince Added qtextcodec and qutfcodec to bootstrapped applications (checksdk and configure) Reviewed-by: trustme --- tools/checksdk/checksdk.pro | 2 ++ tools/configure/configure.pro | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tools/checksdk/checksdk.pro b/tools/checksdk/checksdk.pro index e364f26f3..3aa72d727 100644 --- a/tools/checksdk/checksdk.pro +++ b/tools/checksdk/checksdk.pro @@ -36,6 +36,8 @@ HEADERS += \ SOURCES += \ $$QT_SOURCE_TREE/src/corelib/kernel/qmetatype.cpp \ $$QT_SOURCE_TREE/src/corelib/kernel/qvariant.cpp \ + $$QT_SOURCE_TREE/src/corelib/codecs/qutfcodec.cpp \ + $$QT_SOURCE_TREE/src/corelib/codecs/qtextcodec.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qstring.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qstringlist.cpp \ $$QT_SOURCE_TREE/src/corelib/io/qfile.cpp \ diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro index fdeab2992..eeec62a8b 100644 --- a/tools/configure/configure.pro +++ b/tools/configure/configure.pro @@ -32,6 +32,7 @@ HEADERS = configureapp.h environment.h tools.h\ $$QT_SOURCE_TREE/src/corelib/tools/qlist.h \ $$QT_SOURCE_TREE/src/corelib/tools/qlocale.h \ $$QT_SOURCE_TREE/src/corelib/tools/qvector.h \ + $$QT_SOURCE_TREE/src/corelib/codecs/qutfcodec_p.h \ $$QT_SOURCE_TREE/src/corelib/codecs/qtextcodec.h \ $$QT_SOURCE_TREE/src/corelib/global/qglobal.h \ $$QT_SOURCE_TREE/src/corelib/global/qnumeric.h \ @@ -64,6 +65,7 @@ SOURCES = main.cpp configureapp.cpp environment.cpp tools.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qlistdata.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qlocale.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qvector.cpp \ + $$QT_SOURCE_TREE/src/corelib/codecs/qutfcodec.cpp \ $$QT_SOURCE_TREE/src/corelib/codecs/qtextcodec.cpp \ $$QT_SOURCE_TREE/src/corelib/global/qglobal.cpp \ $$QT_SOURCE_TREE/src/corelib/global/qnumeric.cpp \ -- cgit v1.2.3 From b2a9bdc7a72253ecba77b1a53c9a2497cfd21b7e Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 20 Jul 2009 11:34:52 +0200 Subject: Compile fix with namespaces after 8ab072aff0 broke it. --- src/corelib/tools/qbytedata_p.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/corelib/tools/qbytedata_p.h b/src/corelib/tools/qbytedata_p.h index e8a4dddfc..cc10ea2d2 100644 --- a/src/corelib/tools/qbytedata_p.h +++ b/src/corelib/tools/qbytedata_p.h @@ -45,6 +45,8 @@ #include +QT_BEGIN_NAMESPACE + // this class handles a list of QByteArrays. It is a variant of QRingBuffer // that avoid malloc/realloc/memcpy. class QByteDataBuffer @@ -196,5 +198,6 @@ public: } }; +QT_END_NAMESPACE #endif // QBYTEDATA_H -- cgit v1.2.3 From 2d6caf67f8e2a49c5c5516e6837ed6b2862130c2 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Mon, 20 Jul 2009 11:35:44 +0200 Subject: Fix the hand scrolling in QGraphicsView that will stop unexpectedly. If you start a hand scrolling and during moving, you press another button of the mouse than the left one, the scrolling suddently stop working. In mouseReleaseEvent we just stop the hand scrolling if the button is left. Task:258356 Reviewed-by:janarve --- src/gui/graphicsview/qgraphicsview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index a3fe307f4..b888b0139 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -3342,7 +3342,7 @@ void QGraphicsView::mouseReleaseEvent(QMouseEvent *event) } } else #endif - if (d->dragMode == QGraphicsView::ScrollHandDrag) { + if (d->dragMode == QGraphicsView::ScrollHandDrag && event->button() == Qt::LeftButton) { #ifndef QT_NO_CURSOR // Restore the open hand cursor. ### There might be items // under the mouse that have a valid cursor at this time, so -- cgit v1.2.3 From 0f494029a61a2f9f31917be6e6e954b6bb606085 Mon Sep 17 00:00:00 2001 From: Frans Englich Date: Mon, 20 Jul 2009 11:29:00 +0200 Subject: Fix assert in message handling. Trivial fix. Reported by Michael Brasser. Task-number: 258337 Reviewed-By: Peter Hartmann --- src/xmlpatterns/data/qboolean.cpp | 2 +- tests/auto/qxmlquery/tst_qxmlquery.cpp | 18 ++++++++++++++++++ tools/xmlpatterns/qcoloringmessagehandler.cpp | 12 +++++++++--- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/xmlpatterns/data/qboolean.cpp b/src/xmlpatterns/data/qboolean.cpp index 07562fd52..bb4ece1ff 100644 --- a/src/xmlpatterns/data/qboolean.cpp +++ b/src/xmlpatterns/data/qboolean.cpp @@ -76,7 +76,7 @@ bool Boolean::evaluateEBV(const Item &first, { Q_ASSERT(context); context->error(QtXmlPatterns::tr("Effective Boolean Value cannot be calculated for a sequence " - "containing two or more atomic values."), + "containing two or more atomic values."), ReportContext::FORG0006, QSourceLocation()); return false; diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index 28af64128..b27331194 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -219,6 +219,7 @@ private Q_SLOTS: void bindVariableQXmlNameQXmlQuerySignature() const; void bindVariableQXmlNameQXmlQuery() const; void bindVariableQXmlQueryInvalidate() const; + void unknownSourceLocation() const; // TODO call all URI resolving functions where 1) the URI resolver return a null QUrl(); 2) resolves into valid, existing URI, 3) invalid, non-existing URI. // TODO bind stringlists, variant lists, both ways. @@ -3222,6 +3223,23 @@ void tst_QXmlQuery::bindVariableQXmlQueryInvalidate() const QVERIFY(!query.isValid()); } +void tst_QXmlQuery::unknownSourceLocation() const +{ + QBuffer b; + b.setData(""); + b.open(QIODevice::ReadOnly); + + MessageSilencer silencer; + QXmlQuery query; + query.bindVariable(QLatin1String("inputDocument"), &b); + query.setMessageHandler(&silencer); + + query.setQuery(QLatin1String("doc($inputDocument)/a/(let $v := b/string() return if ($v) then $v else ())")); + + QString output; + query.evaluateTo(&output); +} + QTEST_MAIN(tst_QXmlQuery) #include "tst_qxmlquery.moc" diff --git a/tools/xmlpatterns/qcoloringmessagehandler.cpp b/tools/xmlpatterns/qcoloringmessagehandler.cpp index 9616097dd..0ddb24669 100644 --- a/tools/xmlpatterns/qcoloringmessagehandler.cpp +++ b/tools/xmlpatterns/qcoloringmessagehandler.cpp @@ -100,12 +100,18 @@ void ColoringMessageHandler::handleMessage(QtMsgType type, } case QtFatalMsg: { - Q_ASSERT(!sourceLocation.isNull()); const QString errorCode(identifier.fragment()); Q_ASSERT(!errorCode.isEmpty()); QUrl uri(identifier); uri.setFragment(QString()); + QString location; + + if(sourceLocation.isNull()) + location = QXmlPatternistCLI::tr("Unknown location"); + else + location = QString::fromLatin1(sourceLocation.uri().toEncoded()); + QString errorId; /* If it's a standard error code, we don't want to output the * whole URI. */ @@ -117,7 +123,7 @@ void ColoringMessageHandler::handleMessage(QtMsgType type, if(hasLine) { writeUncolored(QXmlPatternistCLI::tr("Error %1 in %2, at line %3, column %4: %5").arg(colorify(errorId, ErrorCode), - colorify(QString::fromLatin1(sourceLocation.uri().toEncoded()), Location), + colorify(location, Location), colorify(QString::number(sourceLocation.line()), Location), colorify(QString::number(sourceLocation.column()), Location), colorifyDescription(description))); @@ -125,7 +131,7 @@ void ColoringMessageHandler::handleMessage(QtMsgType type, else { writeUncolored(QXmlPatternistCLI::tr("Error %1 in %2: %3").arg(colorify(errorId, ErrorCode), - colorify(QString::fromLatin1(sourceLocation.uri().toEncoded()), Location), + colorify(location, Location), colorifyDescription(description))); } break; -- cgit v1.2.3 From 9582eefb6004207028d3d50dbeffa2279aa55bbd Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 20 Jul 2009 11:57:55 +0200 Subject: Compile fix with namepaces Some QT_{BEGIN,END}_HEADER macros had been missing or misplaced. Reviewed-by: thiago --- src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp | 2 ++ src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h | 13 ++++--------- src/gui/graphicsview/qgraphicsscenelinearindex_p.h | 14 +++++++------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp index c409a9ecc..3cb33d147 100644 --- a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp +++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp @@ -75,6 +75,8 @@ \sa QGraphicsScene, QGraphicsView, QGraphicsSceneIndex */ +#include + #ifndef QT_NO_GRAPHICSVIEW #include diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h index ed5fa8eec..2293a8e1f 100644 --- a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h +++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h @@ -53,11 +53,7 @@ #ifndef QGRAPHICSBSPTREEINDEX_H #define QGRAPHICSBSPTREEINDEX_H -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) +#include #if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW @@ -65,10 +61,11 @@ QT_MODULE(Gui) #include "qgraphicsitem_p.h" #include "qgraphicsscene_bsp_p.h" -#include #include #include +QT_BEGIN_NAMESPACE + static const int QGRAPHICSSCENE_INDEXTIMER_TIMEOUT = 2000; class QGraphicsScene; @@ -204,10 +201,8 @@ static inline bool QRectF_intersects(const QRectF &s, const QRectF &r) return !(t1 >= b2 || t2 >= b1); } -#endif // QT_NO_GRAPHICSVIEW - QT_END_NAMESPACE -QT_END_HEADER +#endif // QT_NO_GRAPHICSVIEW #endif // QGRAPHICSBSPTREEINDEX_H diff --git a/src/gui/graphicsview/qgraphicsscenelinearindex_p.h b/src/gui/graphicsview/qgraphicsscenelinearindex_p.h index 3dbbc6346..1f3d58bcc 100644 --- a/src/gui/graphicsview/qgraphicsscenelinearindex_p.h +++ b/src/gui/graphicsview/qgraphicsscenelinearindex_p.h @@ -53,13 +53,7 @@ // We mean it. // -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) +#include #if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW @@ -68,6 +62,12 @@ QT_MODULE(Gui) #include #include +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + class Q_AUTOTEST_EXPORT QGraphicsSceneLinearIndex : public QGraphicsSceneIndex { Q_OBJECT -- cgit v1.2.3 From 3d6381b47a6048d04dbfc7b6984cae81c02d4fe6 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 16 Jul 2009 23:46:10 +0200 Subject: Fix QTextCodec case-insensitive comparison while in a Turkish locale. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Turkish, lowercase('I') is 'ı', which means comparing "iso-8859-1" to "ISO-8859-1" will fail. Reviewed-by: Denis Dzyubenko --- src/corelib/codecs/qtextcodec.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index df150bd67..2187cbe5e 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -99,6 +99,10 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QTextCodecFactoryInterface_iid, QLatin1String("/codecs"))) #endif +static char qtolower(register char c) +{ if (c >= 'A' && c <= 'Z') return c + 0x20; return c; } +static bool qisalnum(register char c) +{ return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'z'); } static bool nameMatch(const QByteArray &name, const QByteArray &test) { @@ -111,21 +115,21 @@ static bool nameMatch(const QByteArray &name, const QByteArray &test) // if the letters and numbers are the same, we have a match while (*n != '\0') { - if (isalnum((uchar)*n)) { + if (qisalnum(*n)) { for (;;) { if (*h == '\0') return false; - if (isalnum((uchar)*h)) + if (qisalnum(*h)) break; ++h; } - if (tolower((uchar)*n) != tolower((uchar)*h)) + if (qtolower(*n) != qtolower(*h)) return false; ++h; } ++n; } - while (*h && !isalnum((uchar)*h)) + while (*h && !qisalnum(*h)) ++h; return (*h == '\0'); } -- cgit v1.2.3 From 2352454bdcc33f5914a245fd318e1591c3301711 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Mon, 20 Jul 2009 11:58:29 +0200 Subject: QDesktopServices::openUrl failed for local file paths with a file schema OpenUrl couldn't open relative urls because we were passing 'file:///' schema to the ShellExecute on Windows Reviewed-by: Prasanth Ullattil # with '#' will be ignored, and an empty message aborts the commit. --- src/gui/util/qdesktopservices_win.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/util/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp index 00cb4aef2..dc016b63e 100644 --- a/src/gui/util/qdesktopservices_win.cpp +++ b/src/gui/util/qdesktopservices_win.cpp @@ -66,8 +66,10 @@ static bool openDocument(const QUrl &file) { if (!file.isValid()) return false; - - quintptr returnValue = (quintptr)ShellExecute(0, 0, (wchar_t*)file.toString().utf16(), 0, 0, SW_SHOWNORMAL); + QString filePath = file.toLocalFile(); + if (filePath.isEmpty() + filePath = file.toString(); + quintptr returnValue = (quintptr)ShellExecute(0, 0, (wchar_t*)filePath.utf16(), 0, 0, SW_SHOWNORMAL); return (returnValue > 32); //ShellExecute returns a value greater than 32 if successful } -- cgit v1.2.3 From 41c1049db2202c1ef5e97243f1ee2695db78d9de Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Mon, 20 Jul 2009 12:57:09 +0200 Subject: compile fix after the last commit --- src/gui/util/qdesktopservices_win.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/util/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp index dc016b63e..62ab2f756 100644 --- a/src/gui/util/qdesktopservices_win.cpp +++ b/src/gui/util/qdesktopservices_win.cpp @@ -67,7 +67,7 @@ static bool openDocument(const QUrl &file) if (!file.isValid()) return false; QString filePath = file.toLocalFile(); - if (filePath.isEmpty() + if (filePath.isEmpty()) filePath = file.toString(); quintptr returnValue = (quintptr)ShellExecute(0, 0, (wchar_t*)filePath.utf16(), 0, 0, SW_SHOWNORMAL); return (returnValue > 32); //ShellExecute returns a value greater than 32 if successful -- cgit v1.2.3 From 329c9329a61267ede929a96af6b26a286c666fc8 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 20 Jul 2009 11:10:17 +0200 Subject: WinCE build fixes. Use qgetenv instead of getenv... Reviewed-by: thartman --- tests/auto/bic/tst_bic.cpp | 4 ++-- tests/auto/compilerwarnings/tst_compilerwarnings.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp index e7a0c04cd..cec5e76ea 100644 --- a/tests/auto/bic/tst_bic.cpp +++ b/tests/auto/bic/tst_bic.cpp @@ -145,7 +145,7 @@ void tst_Bic::initTestCase_data() void tst_Bic::initTestCase() { - QString qtDir = QString::fromLocal8Bit(getenv("QTDIR")); + QString qtDir = QString::fromLocal8Bit(qgetenv("QTDIR")); QVERIFY2(!qtDir.isEmpty(), "This test needs $QTDIR"); if (qgetenv("PATH").contains("teambuilder")) @@ -220,7 +220,7 @@ QBic::Info tst_Bic::getCurrentInfo(const QString &libName) tmpQFile.write(tmpFileContents); tmpQFile.flush(); - QString qtDir = QString::fromLocal8Bit(getenv("QTDIR")); + QString qtDir = QString::fromLocal8Bit(qgetenv("QTDIR")); #ifdef Q_OS_WIN qtDir.replace('\\', '/'); #endif diff --git a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp index 2f5cf6caa..57795c963 100644 --- a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp +++ b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp @@ -67,8 +67,8 @@ private slots: static QStringList getFeatures() { QStringList srcDirs; - srcDirs << QString::fromLocal8Bit(getenv("QTDIR")) - << QString::fromLocal8Bit(getenv("QTSRCDIR")); + srcDirs << QString::fromLocal8Bit(qgetenv("QTDIR")) + << QString::fromLocal8Bit(qgetenv("QTSRCDIR")); QString featurefile; foreach (QString dir, srcDirs) { @@ -157,7 +157,7 @@ void tst_CompilerWarnings::warnings() QStringList args; QString compilerName; - static QString qtDir = QString::fromLocal8Bit(getenv("QTDIR")); + static QString qtDir = QString::fromLocal8Bit(qgetenv("QTDIR")); QVERIFY2(!qtDir.isEmpty(), "This test needs $QTDIR"); args << cflags; -- cgit v1.2.3 From acea2ceaeb168f0ceaa04988a541bbf11a7af85e Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 20 Jul 2009 12:53:09 +0200 Subject: make the boostrap lib work for projects that aren't in src/tools This is preparation for making Windows CE checksdk use the bootstrap lib. Reviewed-by: thartman --- src/tools/bootstrap/bootstrap.pri | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 1cf103b2e..b4f9b2ff1 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -28,26 +28,26 @@ win32:DEFINES += QT_NODLL INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ $$QT_BUILD_TREE/include/QtXml \ - ../../xml + $$QT_SOURCE_TREE/src/xml DEPENDPATH += $$INCLUDEPATH \ - ../../corelib/global \ - ../../corelib/kernel \ - ../../corelib/tools \ - ../../corelib/io \ - ../../corelib/codecs \ - ../../xml + $$QT_SOURCE_TREE/src/corelib/global \ + $$QT_SOURCE_TREE/src/corelib/kernel \ + $$QT_SOURCE_TREE/src/corelib/tools \ + $$QT_SOURCE_TREE/src/corelib/io \ + $$QT_SOURCE_TREE/src/corelib/codecs \ + $$QT_SOURCE_TREE/src/xml hpux-acc*|hpuxi-acc* { LIBS += ../bootstrap/libbootstrap.a } else { contains(CONFIG, debug_and_release_target) { CONFIG(debug, debug|release) { - LIBS+=-L../bootstrap/debug + LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/debug } else { - LIBS+=-L../bootstrap/release + LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/release } } else { - LIBS += -L../bootstrap + LIBS += -L$$QT_BUILD_TREE/src/tools/bootstrap } LIBS += -lbootstrap } -- cgit v1.2.3 From 94fe8043579d398feddecae86c7359dfd300e25f Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 20 Jul 2009 12:55:04 +0200 Subject: checksdk now uses the bootstrap lib The checksdk build was broken and it makes no sense to maintain two seperate bootstrap configurations. The checksdk sources had to be corrected in certain cases to work with the bootstrap lib. Esp. using qDebug for ouput message is not a good idea. Reviewed-by: thartman --- tools/checksdk/cesdkhandler.cpp | 7 ++++--- tools/checksdk/cesdkhandler.h | 4 ++-- tools/checksdk/checksdk.pro | 41 ++-------------------------------------- tools/checksdk/main.cpp | 42 +++++++++++++++++++++++------------------ 4 files changed, 32 insertions(+), 62 deletions(-) diff --git a/tools/checksdk/cesdkhandler.cpp b/tools/checksdk/cesdkhandler.cpp index 48452a365..677d003e0 100644 --- a/tools/checksdk/cesdkhandler.cpp +++ b/tools/checksdk/cesdkhandler.cpp @@ -71,15 +71,15 @@ bool CeSdkHandler::parse() // look at the file at %VCInstallDir%/vcpackages/WCE.VCPlatform.config // and scan through all installed sdks... m_list.clear(); - VCInstallDir = qgetenv("VCInstallDir"); + VCInstallDir = QString::fromLatin1(qgetenv("VCInstallDir")); VCInstallDir += QLatin1String("\\"); - VSInstallDir = qgetenv("VSInstallDir"); + VSInstallDir = QString::fromLatin1(qgetenv("VSInstallDir")); VSInstallDir += QLatin1String("\\"); if (VCInstallDir.isEmpty() || VSInstallDir.isEmpty()) return false; QDir vStudioDir(VCInstallDir); - if (!vStudioDir.cd("vcpackages")) + if (!vStudioDir.cd(QLatin1String("vcpackages"))) return false; QFile configFile(vStudioDir.absoluteFilePath(QLatin1String("WCE.VCPlatform.config"))); @@ -118,6 +118,7 @@ bool CeSdkHandler::parse() qWarning() << "XML ERROR:" << xml.lineNumber() << ": " << xml.errorString(); return false; } + return m_list.size() > 0 ? true : false; } diff --git a/tools/checksdk/cesdkhandler.h b/tools/checksdk/cesdkhandler.h index 04d3bdf7a..6ec26dbb6 100644 --- a/tools/checksdk/cesdkhandler.h +++ b/tools/checksdk/cesdkhandler.h @@ -102,8 +102,8 @@ inline QList CeSdkHandler::listAll() const inline QString CeSdkHandler::fixPaths(QString path) const { - QString str = QDir::toNativeSeparators(QDir::cleanPath(path.replace(VCINSTALL_MACRO, VCInstallDir).replace(VSINSTALL_MACRO, VSInstallDir).replace(QLatin1String("$(PATH)"), QLatin1String("%PATH%")))); - if (str.endsWith(';')) + QString str = QDir::toNativeSeparators(QDir::cleanPath(path.replace(QLatin1String(VCINSTALL_MACRO), VCInstallDir).replace(QLatin1String(VSINSTALL_MACRO), VSInstallDir).replace(QLatin1String("$(PATH)"), QLatin1String("%PATH%")))); + if (str.endsWith(QLatin1Char(';'))) str.truncate(str.length() - 1); return str; } diff --git a/tools/checksdk/checksdk.pro b/tools/checksdk/checksdk.pro index 3aa72d727..a513981af 100644 --- a/tools/checksdk/checksdk.pro +++ b/tools/checksdk/checksdk.pro @@ -32,42 +32,5 @@ SOURCES += \ HEADERS += \ cesdkhandler.h -# Bootstrapped Input -SOURCES += \ - $$QT_SOURCE_TREE/src/corelib/kernel/qmetatype.cpp \ - $$QT_SOURCE_TREE/src/corelib/kernel/qvariant.cpp \ - $$QT_SOURCE_TREE/src/corelib/codecs/qutfcodec.cpp \ - $$QT_SOURCE_TREE/src/corelib/codecs/qtextcodec.cpp \ - $$QT_SOURCE_TREE/src/corelib/tools/qstring.cpp \ - $$QT_SOURCE_TREE/src/corelib/tools/qstringlist.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qfile.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qdir.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qabstractfileengine.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_win.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_iterator.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_iterator_win.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qfileinfo.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qtemporaryfile.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qdiriterator.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qiodevice.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qbuffer.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qtextstream.cpp \ - $$QT_SOURCE_TREE/src/corelib/io/qurl.cpp \ - $$QT_SOURCE_TREE/src/corelib/tools/qdatetime.cpp \ - $$QT_SOURCE_TREE/src/corelib/tools/qlocale.cpp \ - $$QT_SOURCE_TREE/src/corelib/tools/qbytearray.cpp \ - $$QT_SOURCE_TREE/src/corelib/tools/qbytearraymatcher.cpp \ - $$QT_SOURCE_TREE/src/corelib/tools/qvector.cpp \ - $$QT_SOURCE_TREE/src/corelib/tools/qvsnprintf.cpp \ - $$QT_SOURCE_TREE/src/corelib/tools/qlistdata.cpp \ - $$QT_SOURCE_TREE/src/corelib/tools/qhash.cpp \ - $$QT_SOURCE_TREE/src/corelib/global/qglobal.cpp \ - $$QT_SOURCE_TREE/src/corelib/global/qmalloc.cpp \ - $$QT_SOURCE_TREE/src/corelib/global/qnumeric.cpp \ - $$QT_SOURCE_TREE/src/corelib/xml/qxmlstream.cpp \ - $$QT_SOURCE_TREE/src/corelib/xml/qxmlutils.cpp \ - $$QT_SOURCE_TREE/src/corelib/tools/qregexp.cpp \ - $$QT_SOURCE_TREE/src/corelib/tools/qmap.cpp \ - $$QT_SOURCE_TREE/src/corelib/tools/qbitarray.cpp \ - $$QT_BUILD_TREE/src/corelib/global/qconfig.cpp +include(../../src/tools/bootstrap/bootstrap.pri) + diff --git a/tools/checksdk/main.cpp b/tools/checksdk/main.cpp index 2dd72141f..6322eb7bf 100644 --- a/tools/checksdk/main.cpp +++ b/tools/checksdk/main.cpp @@ -46,17 +46,17 @@ void usage() { - qDebug() << "SDK Scanner - Convenience Tool to setup your environment"; - qDebug() << " for crosscompilation to Windows CE"; - qDebug() << "Options:"; - qDebug() << "-help This output"; - qDebug() << "-list List all available SDKs"; - qDebug() << "-sdk Select specified SDK."; - qDebug() << " Note: SDK names with spaces need to be"; - qDebug() << " specified in parenthesis"; - qDebug() << " default: Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"; - qDebug() << "-script Create a script file which can be launched"; - qDebug() << " to setup your environment for specified SDK"; + printf("SDK Scanner - Convenience Tool to setup your environment\n"); + printf(" for crosscompilation to Windows CE\n"); + printf("Options:\n"); + printf("-help This output\n"); + printf("-list List all available SDKs\n"); + printf("-sdk Select specified SDK.\n"); + printf(" Note: SDK names with spaces need to be\n"); + printf(" specified in parenthesis\n"); + printf(" default: Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\n"); + printf("-script Create a script file which can be launched\n"); + printf(" to setup your environment for specified SDK\n"); } int main(int argc, char **argv) @@ -106,9 +106,12 @@ int main(int argc, char **argv) QList list = handler.listAll(); if (operationList) { - qDebug() << "Available SDKs:"; - for (QList::iterator it = list.begin(); it != list.end(); ++it) - qDebug() << "SDK Name:" << it->name(); + printf("Available SDKs:\n"); + for (QList::iterator it = list.begin(); it != list.end(); ++it) { + printf("SDK Name: "); + printf(qPrintable(it->name())); + printf("\n"); + } return 0; } @@ -132,10 +135,13 @@ int main(int argc, char **argv) includePath = QString::fromLatin1("INCLUDE=") + it->includePath(); libPath = QString::fromLatin1("LIB=") + it->libPath(); if (scriptFile.isEmpty()) { - qDebug() << "Please set up your environment with the following paths:"; - qDebug() << qPrintable(binPath); - qDebug() << qPrintable(includePath); - qDebug() << qPrintable(libPath); + printf("Please set up your environment with the following paths:\n"); + printf(qPrintable(binPath)); + printf("\n"); + printf(qPrintable(includePath)); + printf("\n"); + printf(qPrintable(libPath)); + printf("\n"); return 0; } else { QFile file(scriptFile); -- cgit v1.2.3 From 74a6ab4e1c7db31eebab3bdef1baf376fce84ae0 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 20 Jul 2009 13:06:07 +0200 Subject: doc: Increased memitemleft width from 160px to 180px. --- tools/qdoc3/qdoc3.pro | 3 ++- tools/qdoc3/test/classic.css | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index 6c1cfd24d..129127245 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -7,9 +7,10 @@ DEFINES += QT_NO_CAST_TO_ASCII QT = core xml CONFIG += console CONFIG -= debug_and_release_target +CONFIG += debug build_all:!build_pass { CONFIG -= build_all - CONFIG += release + CONFIG += debug } mac:CONFIG -= app_bundle HEADERS += apigenerator.h \ diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css index 7f228618d..381616498 100644 --- a/tools/qdoc3/test/classic.css +++ b/tools/qdoc3/test/classic.css @@ -125,7 +125,7 @@ table.generic, table.annotated } table td.memItemLeft { - width: 160px; + width: 180px; padding: 2px 0px 0px 8px; margin: 4px; border-width: 1px; -- cgit v1.2.3 From 19c8e9b133abe02199e57682a7bbd6df51b17cac Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 20 Jul 2009 13:13:28 +0200 Subject: Doc: some rephrasing and fixing Reviewed-by: Thiago --- src/network/access/qnetworkaccessmanager.cpp | 65 ++++++++++++++-------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 907aaef97..61e560118 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -540,10 +540,10 @@ void QNetworkAccessManager::setCookieJar(QNetworkCookieJar *cookieJar) } /*! - This function is used to post a request to obtain the network - headers for \a request. It takes its name after the HTTP request - associated (HEAD). It returns a new QNetworkReply object which - will contain such headers. + Posts a request to obtain the network headers for \a request + and returns a new QNetworkReply object which will contain such headers + + The function is named after the HTTP request associated (HEAD). */ QNetworkReply *QNetworkAccessManager::head(const QNetworkRequest &request) { @@ -551,11 +551,12 @@ QNetworkReply *QNetworkAccessManager::head(const QNetworkRequest &request) } /*! - This function is used to post a request to obtain the contents of - the target \a request. It will cause the contents to be - downloaded, along with the headers associated with it. It returns - a new QNetworkReply object opened for reading which emits its - QIODevice::readyRead() signal whenever new data arrives. + Posts a request to obtain the contents of the target \a request + and returns a new QNetworkReply object opened for reading which emits the + \l{QIODevice::readyRead()}{readyRead()} signal whenever new data + arrives. + + The contents as well as associated headers will be downloaded. \sa post(), put(), deleteResource() */ @@ -565,18 +566,15 @@ QNetworkReply *QNetworkAccessManager::get(const QNetworkRequest &request) } /*! - This function is used to send an HTTP POST request to the - destination specified by \a request. The contents of the \a data + Sends an HTTP POST request to the destination specified by \a request + and returns a new QNetworkReply object opened for reading that will + contain the reply sent by the server. The contents of the \a data device will be uploaded to the server. - \a data must be opened for reading when this function is called - and must remain valid until the finished() signal is emitted for - this reply. - - The returned QNetworkReply object will be open for reading and - will contain the reply sent by the server to the POST request. + \a data must be open for reading and must remain valid until the + finished() signal is emitted for this reply. - Note: sending a POST request on protocols other than HTTP and + \note Sending a POST request on protocols other than HTTP and HTTPS is undefined and will probably fail. \sa get(), put(), deleteResource() @@ -588,8 +586,9 @@ QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, QIODe /*! \overload - This function sends the contents of the \a data byte array to the - destination specified by \a request. + + Sends the contents of the \a data byte array to the destination + specified by \a request. */ QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, const QByteArray &data) { @@ -603,20 +602,19 @@ QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, const } /*! - This function is used to upload the contents of \a data to the - destination \a request. + Uploads the contents of \a data to the destination \a request and + returnes a new QNetworkReply object that will be open for reply. \a data must be opened for reading when this function is called and must remain valid until the finished() signal is emitted for this reply. - The returned QNetworkReply object will be open for reply, but - whether anything will be available for reading is protocol - dependent. For HTTP, the server may send a small HTML page - indicating the upload was successful (or not). Other protocols - will probably have content in their replies. + Whether anything will be available for reading from the returned + object is protocol dependent. For HTTP, the server may send a + small HTML page indicating the upload was successful (or not). + Other protocols will probably have content in their replies. - For HTTP, this request will send a PUT request, which most servers + \note For HTTP, this request will send a PUT request, which most servers do not allow. Form upload mechanisms, including that of uploading files through HTML forms, use the POST mechanism. @@ -629,8 +627,8 @@ QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, QIODev /*! \overload - This function sends the contents of the \a data byte array to the - destination specified by \a request. + Sends the contents of the \a data byte array to the destination + specified by \a request. */ QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, const QByteArray &data) { @@ -646,9 +644,10 @@ QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, const /*! \since 4.6 - This function is used to send a request to delete the resource - identified by the URL of \a request. - This feature is currently available for HTTP only, performing an HTTP DELETE request. + Sends a request to delete the resource identified by the URL of \a request. + + \note This feature is currently available for HTTP only, performing an + HTTP DELETE request. \sa get(), post(), put() */ -- cgit v1.2.3 From 9bd8df2b405ef517d2d1b209b8004aaaa4994242 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 1 Jul 2009 12:11:59 +0200 Subject: Mention Milan Burda's Windows 9x/ME support removal contribution With the exception of cfadf08a, all the commits from adc1c08e to a6e32ae1 were from Milan, even if the Author were on some of the commits mangled into my name. This was my mistake, when splitting and reorganizing his massive contribution. My appologies Milan. --- dist/changes-4.6.0 | 2 ++ doc/src/credits.qdoc | 1 + 2 files changed, 3 insertions(+) diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0 index 5e211ff5b..bef292349 100644 --- a/dist/changes-4.6.0 +++ b/dist/changes-4.6.0 @@ -31,6 +31,8 @@ information about a particular change. * Platform Specific Changes * **************************************************************************** + - Significant external contribution from Milan Burda for planned removal + of (non-unicode) Windows 9x/ME support. **************************************************************************** diff --git a/doc/src/credits.qdoc b/doc/src/credits.qdoc index 81ded04b3..15bf1e24e 100644 --- a/doc/src/credits.qdoc +++ b/doc/src/credits.qdoc @@ -247,6 +247,7 @@ Mike Perik \br Mike Sharkey \br Mikko Ala-Fossi \br + Milan Burda \br Miroslav Flidr \br Miyata Shigeru \br Myron Uecker \br -- cgit v1.2.3 From 5cc26e1fafb299a89daabb55f2aad66fa0a105c4 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 20 Jul 2009 13:54:58 +0200 Subject: doc: Print warning where \reimp is used where \internal should be used. e.g. '\reimp' in myFunc() should be '\internal' because its base function is private or internal --- tools/qdoc3/cppcodeparser.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index cb6caa900..dd10c1cdd 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -726,21 +726,25 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc, tr("The function either doesn't exist in any base class " "with the same signature or it exists but isn't virtual.")); } -#if 0 // Ideally, we would enable this check to warn whenever \reimp is used - // incorrectly, and only make the node internal if the function is a - // reimplementation of another function in a base class. + /* + Ideally, we would enable this check to warn whenever + \reimp is used incorrectly, and only make the node + internal if the function is a reimplementation of + another function in a base class. + */ else if (from->access() == Node::Private || from->parent()->access() == Node::Private) { - doc.location().warning( - tr("Base function for '\\%1' in %2() is private or internal") + doc.location().warning(tr("'\\%1' in %2() should be '\\internal' because its base function is private or internal") .arg(COMMAND_REIMP).arg(node->name())); } -#endif - // Note: Setting the access to Private hides the documentation, - // but setting the status to Internal makes the node available - // in the XML output when the WebXMLGenerator is used. + #if 0 // Reimplemented functions now reported in separate sections. + /* + Note: Setting the access to Private hides the documentation, + but setting the status to Internal makes the node available + in the XML output when the WebXMLGenerator is used. + */ func->setAccess(Node::Private); func->setStatus(Node::Internal); #endif -- cgit v1.2.3 From 0967835a847915907da354a2104322ba8c5b441e Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Mon, 20 Jul 2009 10:25:19 +0200 Subject: On Vista the native file dialog search feature return wrong paths. Windows Vista (& above) allows users to search from file dialogs. If user selects multiple files belonging to different folders from these search results, the GetOpenFileName() will return only one folder name for all the files. To retrieve the correct path for all selected files, we have to use Common Item Dialog interfaces. Task-number: 258087 Reviewed-by: Jens Bache-Wiig --- src/gui/dialogs/qfiledialog_win.cpp | 212 +++++++++++++++++++++++++++++++++++- 1 file changed, 208 insertions(+), 4 deletions(-) diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/gui/dialogs/qfiledialog_win.cpp index 6883bf999..6e9e776ff 100644 --- a/src/gui/dialogs/qfiledialog_win.cpp +++ b/src/gui/dialogs/qfiledialog_win.cpp @@ -60,6 +60,14 @@ #include +#include +#include + +#if defined(__IFileDialog_INTERFACE_DEFINED__) \ + && defined(__IFileOpenDialog_INTERFACE_DEFINED__) +#define USE_COMMON_ITEM_DIALOG +#endif + #ifdef Q_WS_WINCE #include # ifndef BFFM_SETSELECTION @@ -401,14 +409,202 @@ QString qt_win_get_save_file_name(const QFileDialogArgs &args, return fi.absoluteFilePath(); } + +#if defined(USE_COMMON_ITEM_DIALOG) + +typedef HRESULT (WINAPI *PtrSHCreateItemFromParsingName)(PCWSTR pszPath, IBindCtx *pbc, REFIID riid, void **ppv); +static PtrSHCreateItemFromParsingName pSHCreateItemFromParsingName = 0; + +static bool qt_win_set_IFileDialogOptions(IFileDialog *pfd, + const QString& initialSelection, + const QString& initialDirectory, + const QString& title, + const QStringList& filterLst, + QFileDialog::FileMode mode, + QFileDialog::Options options) +{ + if (!pSHCreateItemFromParsingName) { + // This function is available only in Vista & above. + QLibrary shellLib(QLatin1String("Shell32")); + pSHCreateItemFromParsingName = (PtrSHCreateItemFromParsingName) + shellLib.resolve("SHCreateItemFromParsingName"); + if (!pSHCreateItemFromParsingName) + return false; + } + HRESULT hr; + QString winfilters; + int numFilters = 0; + quint32 currentOffset = 0; + QList offsets; + QStringList::ConstIterator it = filterLst.begin(); + // Create the native filter string and save offset to each entry. + for (; it != filterLst.end(); ++it) { + QString subfilter = *it; + if (!subfilter.isEmpty()) { + offsets<SetFileTypes(numFilters, filterSpec); + delete []filterSpec; + } + // Set the starting folder. + tInitDir = QDir::toNativeSeparators(initialDirectory); + if (!tInitDir.isEmpty()) { + IShellItem *psiDefaultFolder; + hr = pSHCreateItemFromParsingName((wchar_t*)tInitDir.utf16(), + NULL, + IID_PPV_ARGS(&psiDefaultFolder)); + + if (SUCCEEDED(hr)) { + hr = pfd->SetFolder(psiDefaultFolder); + psiDefaultFolder->Release(); + } + } + // Set the currently selected file. + QString initSel = QDir::toNativeSeparators(initialSelection); + if (!initSel.isEmpty()) { + initSel.remove(QLatin1Char('<')); + initSel.remove(QLatin1Char('>')); + initSel.remove(QLatin1Char('\"')); + initSel.remove(QLatin1Char('|')); + } + if (!initSel.isEmpty()) { + hr = pfd->SetFileName((wchar_t*)initSel.utf16()); + } + // Set the title for the file dialog. + if (!title.isEmpty()) { + hr = pfd->SetTitle((wchar_t*)title.utf16()); + } + // Set other flags for the dialog. + DWORD newOptions; + hr = pfd->GetOptions(&newOptions); + if (SUCCEEDED(hr)) { + newOptions |= (FOS_NOCHANGEDIR | FOS_NOREADONLYRETURN); + if (mode == QFileDialog::ExistingFile || + mode == QFileDialog::ExistingFiles) + newOptions |= (FOS_FILEMUSTEXIST | FOS_PATHMUSTEXIST); + if (mode == QFileDialog::ExistingFiles) + newOptions |= FOS_ALLOWMULTISELECT; + if (!(options & QFileDialog::DontConfirmOverwrite)) + newOptions |= FOS_OVERWRITEPROMPT; + hr = pfd->SetOptions(newOptions); + } + return SUCCEEDED(hr); +} + +QStringList qt_win_CID_get_open_file_names(const QFileDialogArgs &args, + QString *initialDirectory, + const QStringList &filterList, + QString *selectedFilter, + int selectedFilterIndex) +{ + QStringList result; + QDialog modal_widget; + modal_widget.setAttribute(Qt::WA_NoChildEventsForParent, true); + modal_widget.setParent(args.parent, Qt::Window); + QApplicationPrivate::enterModal(&modal_widget); + // Multiple selection is allowed only in IFileOpenDialog. + IFileOpenDialog *pfd; + HRESULT hr = CoCreateInstance(CLSID_FileOpenDialog, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARGS(&pfd)); + + if (SUCCEEDED(hr)) { + qt_win_set_IFileDialogOptions(pfd, args.selection, + args.directory, args.caption, + filterList, QFileDialog::ExistingFiles, + args.options); + // Set the currently selected filter (one-based index). + hr = pfd->SetFileTypeIndex(selectedFilterIndex+1); + QWidget *parentWindow = args.parent; + if (parentWindow) + parentWindow = parentWindow->window(); + else + parentWindow = QApplication::activeWindow(); + // Show the file dialog. + hr = pfd->Show(parentWindow ? parentWindow->winId() : 0); + if (SUCCEEDED(hr)) { + // Retrieve the results. + IShellItemArray *psiaResults; + hr = pfd->GetResults(&psiaResults); + if (SUCCEEDED(hr)) { + DWORD numItems = 0; + psiaResults->GetCount(&numItems); + for (DWORD i = 0; iGetItemAt(i, &psi); + if (SUCCEEDED(hr)) { + // Retrieve the file name from shell item. + wchar_t *pszPath; + hr = psi->GetDisplayName(SIGDN_FILESYSPATH, &pszPath); + if (SUCCEEDED(hr)) { + QString fileName = QString::fromWCharArray(pszPath); + result.append(fileName); + CoTaskMemFree(pszPath); + } + psi->Release(); // Free the current item. + } + } + psiaResults->Release(); // Free the array of items. + } + } + } + QApplicationPrivate::leaveModal(&modal_widget); + + qt_win_eatMouseMove(); + + if (!result.isEmpty()) { + // Retrieve the current folder name. + IShellItem *psi = 0; + hr = pfd->GetFolder(&psi); + if (SUCCEEDED(hr)) { + wchar_t *pszPath; + hr = psi->GetDisplayName(SIGDN_FILESYSPATH, &pszPath); + if (SUCCEEDED(hr)) { + *initialDirectory = QString::fromWCharArray(pszPath); + CoTaskMemFree(pszPath); + } + psi->Release(); + } + // Retrieve the currently selected filter. + if (selectedFilter) { + quint32 filetype = 0; + hr = pfd->GetFileTypeIndex(&filetype); + if (SUCCEEDED(hr) && filetype && filetype <= (quint32)filterList.length()) { + // This is a one-based index, not zero-based. + *selectedFilter = filterList[filetype-1]; + } + } + } + return result; +} + +#endif + QStringList qt_win_get_open_file_names(const QFileDialogArgs &args, QString *initialDirectory, QString *selectedFilter) { - QStringList result; QFileInfo fi; QDir dir; - QString isel; if (initialDirectory && initialDirectory->left(5) == QLatin1String("file:")) initialDirectory->remove(0, 5); @@ -416,7 +612,6 @@ QStringList qt_win_get_open_file_names(const QFileDialogArgs &args, if (initialDirectory && !fi.isDir()) { *initialDirectory = fi.absolutePath(); - isel = fi.fileName(); } if (!fi.exists()) @@ -424,12 +619,21 @@ QStringList qt_win_get_open_file_names(const QFileDialogArgs &args, DWORD selFilIdx = 0; + QStringList filterLst = qt_win_make_filters_list(args.filter); int idx = 0; if (selectedFilter) { - QStringList filterLst = qt_win_make_filters_list(args.filter); idx = filterLst.indexOf(*selectedFilter); } + // Windows Vista (& above) allows users to search from file dialogs. If user selects + // multiple files belonging to different folders from these search results, the + // GetOpenFileName() will return only one folder name for all the files. To retrieve + // the correct path for all selected files, we have to use Common Item Dialog interfaces. +#if defined(USE_COMMON_ITEM_DIALOG) + if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based) + return qt_win_CID_get_open_file_names(args, initialDirectory, filterLst, selectedFilter, idx); +#endif + QStringList result; QDialog modal_widget; modal_widget.setAttribute(Qt::WA_NoChildEventsForParent, true); modal_widget.setParent(args.parent, Qt::Window); -- cgit v1.2.3 From bc4779f6b03a9f601381b0994ad5c2adf2257cc2 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 20 Jul 2009 14:10:43 +0200 Subject: doc: Changed several \reimp to \internal The base function was \internal pr private. --- src/qt3support/widgets/q3datetimeedit.cpp | 20 ++++++++++---------- .../qscriptdebuggerscriptedconsolecommand.cpp | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/qt3support/widgets/q3datetimeedit.cpp b/src/qt3support/widgets/q3datetimeedit.cpp index 9c2f289b0..71a8ffdc7 100644 --- a/src/qt3support/widgets/q3datetimeedit.cpp +++ b/src/qt3support/widgets/q3datetimeedit.cpp @@ -1244,7 +1244,7 @@ Q3DateEdit::Order Q3DateEdit::order() const } -/*! \reimp +/*! \internal */ void Q3DateEdit::stepUp() @@ -1276,7 +1276,7 @@ void Q3DateEdit::stepUp() -/*! \reimp +/*! \internal */ @@ -1440,7 +1440,7 @@ bool Q3DateEdit::outOfRange(int y, int m, int d) const return false; /* assume ok */ } -/*! \reimp +/*! \internal */ @@ -1534,7 +1534,7 @@ void Q3DateEdit::addNumber(int sec, int num) } -/*! \reimp +/*! \internal */ @@ -1681,7 +1681,7 @@ void Q3DateEdit::removeFirstNumber(int sec) d->ed->repaint(d->ed->rect()); } -/*! \reimp +/*! \internal */ @@ -2059,7 +2059,7 @@ void Q3TimeEdit::timerEvent(QTimerEvent *) } -/*! \reimp +/*! \internal */ @@ -2105,7 +2105,7 @@ void Q3TimeEdit::stepUp() } -/*! \reimp +/*! \internal */ @@ -2173,7 +2173,7 @@ QString Q3TimeEdit::sectionFormattedText(int sec) } -/*! \reimp +/*! \internal */ @@ -2308,7 +2308,7 @@ bool Q3TimeEdit::outOfRange(int h, int m, int s) const return true; } -/*! \reimp +/*! \internal */ @@ -2477,7 +2477,7 @@ void Q3TimeEdit::removeFirstNumber(int sec) d->ed->repaint(d->ed->rect()); } -/*! \reimp +/*! \internal */ void Q3TimeEdit::removeLastNumber(int sec) diff --git a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp index 1324c01a0..92fa36c8f 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp +++ b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp @@ -460,7 +460,7 @@ void QScriptDebuggerScriptedConsoleCommandJob::handleResponse( } /*! - \reimp + \internal */ QString QScriptDebuggerScriptedConsoleCommand::name() const { @@ -469,7 +469,7 @@ QString QScriptDebuggerScriptedConsoleCommand::name() const } /*! - \reimp + \internal */ QString QScriptDebuggerScriptedConsoleCommand::group() const { @@ -478,7 +478,7 @@ QString QScriptDebuggerScriptedConsoleCommand::group() const } /*! - \reimp + \internal */ QString QScriptDebuggerScriptedConsoleCommand::shortDescription() const { @@ -487,7 +487,7 @@ QString QScriptDebuggerScriptedConsoleCommand::shortDescription() const } /*! - \reimp + \internal */ QString QScriptDebuggerScriptedConsoleCommand::longDescription() const { @@ -496,7 +496,7 @@ QString QScriptDebuggerScriptedConsoleCommand::longDescription() const } /*! - \reimp + \internal */ QStringList QScriptDebuggerScriptedConsoleCommand::aliases() const { @@ -505,7 +505,7 @@ QStringList QScriptDebuggerScriptedConsoleCommand::aliases() const } /*! - \reimp + \internal */ QStringList QScriptDebuggerScriptedConsoleCommand::seeAlso() const { @@ -514,7 +514,7 @@ QStringList QScriptDebuggerScriptedConsoleCommand::seeAlso() const } /*! - \reimp + \internal */ QStringList QScriptDebuggerScriptedConsoleCommand::argumentTypes() const { @@ -523,7 +523,7 @@ QStringList QScriptDebuggerScriptedConsoleCommand::argumentTypes() const } /*! - \reimp + \internal */ QStringList QScriptDebuggerScriptedConsoleCommand::subCommands() const { @@ -532,7 +532,7 @@ QStringList QScriptDebuggerScriptedConsoleCommand::subCommands() const } /*! - \reimp + \internal */ QScriptDebuggerConsoleCommandJob *QScriptDebuggerScriptedConsoleCommand::createJob( const QStringList &arguments, -- cgit v1.2.3 From 9fd0fe0cb21df661ec69320e156372843496b4c8 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 20 Jul 2009 14:26:25 +0200 Subject: compile against the Windows 7 SDK RC --- src/gui/kernel/qapplication_p.h | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 90eaba08b..3692160c6 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -196,6 +196,21 @@ typedef BOOL (WINAPI *qt_RegisterTouchWindowPtr)(HWND, ULONG); typedef BOOL (WINAPI *qt_GetTouchInputInfoPtr)(HANDLE, UINT, PVOID, int); typedef BOOL (WINAPI *qt_CloseTouchInputHandlePtr)(HANDLE); +typedef BOOL (WINAPI *PtrGetGestureInfo)(HANDLE hGestureInfo, PVOID pGestureInfo); +typedef BOOL (WINAPI *PtrGetGestureExtraArgs)(HANDLE hGestureInfo, UINT cbExtraArgs, PBYTE pExtraArgs); +typedef BOOL (WINAPI *PtrCloseGestureInfoHandle)(HANDLE hGestureInfo); +typedef BOOL (WINAPI *PtrSetGestureConfig)(HWND hwnd, DWORD dwReserved, UINT cIDs, + PVOID pGestureConfig, + UINT cbSize); +typedef BOOL (WINAPI *PtrGetGestureConfig)(HWND hwnd, DWORD dwReserved, + DWORD dwFlags, PUINT pcIDs, + PVOID pGestureConfig, + UINT cbSize); + +typedef BOOL (WINAPI *PtrBeginPanningFeedback)(HWND hwnd); +typedef BOOL (WINAPI *PtrUpdatePanningFeedback)(HWND hwnd, LONG, LONG, BOOL); +typedef BOOL (WINAPI *PtrEndPanningFeedback)(HWND hwnd, BOOL); + #ifndef WM_GESTURE #define WM_GESTURE 0x0119 @@ -271,22 +286,8 @@ typedef struct tagGESTURECONFIG { #define GCF_INCLUDE_ANCESTORS 0x00000001 // If specified, GetGestureConfig returns consolidated configuration // for the specified window and it's parent window chain -typedef BOOL (*PtrGetGestureInfo)(HGESTUREINFO hGestureInfo, PGESTUREINFO pGestureInfo); -typedef BOOL (*PtrGetGestureExtraArgs)(HGESTUREINFO hGestureInfo, UINT cbExtraArgs, PBYTE pExtraArgs); -typedef BOOL (*PtrCloseGestureInfoHandle)(HGESTUREINFO hGestureInfo); -typedef BOOL (*PtrSetGestureConfig)(HWND hwnd, DWORD dwReserved, UINT cIDs, - PGESTURECONFIG pGestureConfig, - UINT cbSize); -typedef BOOL (*PtrGetGestureConfig)(HWND hwnd, DWORD dwReserved, - DWORD dwFlags, PUINT pcIDs, - PGESTURECONFIG pGestureConfig, - UINT cbSize); - -typedef BOOL (*PtrBeginPanningFeedback)(HWND hwnd); -typedef BOOL (*PtrUpdatePanningFeedback)(HWND hwnd, LONG, LONG, BOOL); -typedef BOOL (*PtrEndPanningFeedback)(HWND hwnd, BOOL); - #endif // WM_GESTURE + #endif // Q_WS_WIN class QPanGesture; -- cgit v1.2.3 From 523143ae59c8165c102fc3d7240ff183ec87e4ac Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 3 Jun 2009 20:45:49 +0200 Subject: ifdef cleanup cherry-picked from d2a8449bea58275723e769cd41c085468cb56295 from creator --- tools/linguist/shared/profileevaluator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index 0ce27afa0..303f89739 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -60,7 +60,7 @@ #ifdef Q_OS_UNIX #include #include -#elif defined(Q_OS_WIN32) +#else #include #endif #include -- cgit v1.2.3 From c22f9b0ab5446b229cdf998187f063077432b288 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 12 May 2009 17:15:54 +0200 Subject: return value cleanup functions which have essentially two return values are kinda confusing. so represent file & parse errors as false in the regular evaluation result (like qmake effectively does). cherry-picked cee3ca324e6979d6c476001cafb452a286f09a69 from creator --- tools/linguist/shared/profileevaluator.cpp | 158 +++++++++++------------------ 1 file changed, 61 insertions(+), 97 deletions(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index 303f89739..92f588f89 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -198,9 +198,9 @@ public: QString currentDirectory() const; ProFile *currentProFile() const; - bool evaluateConditionalFunction(const QString &function, const QString &arguments, bool *result); - bool evaluateFile(const QString &fileName, bool *result); - bool evaluateFeatureFile(const QString &fileName, bool *result); + bool evaluateConditionalFunction(const QString &function, const QString &arguments); + bool evaluateFile(const QString &fileName); + bool evaluateFeatureFile(const QString &fileName); QStringList qmakeFeaturePaths(); @@ -644,7 +644,6 @@ bool ProFileEvaluator::Private::visitBeginProFile(ProFile * pro) PRE(pro); bool ok = true; m_lineNo = pro->lineNumber(); - if (m_origfile.isEmpty()) m_origfile = pro->fileName(); if (m_oldPath.isEmpty()) { @@ -662,8 +661,8 @@ bool ProFileEvaluator::Private::visitBeginProFile(ProFile * pro) m_cumulative = false; // This is what qmake does, everything set in the mkspec is also set // But this also creates a lot of problems - evaluateFile(mkspecDirectory + QLatin1String("/default/qmake.conf"), &ok); - evaluateFile(mkspecDirectory + QLatin1String("/features/default_pre.prf"), &ok); + evaluateFile(mkspecDirectory + QLatin1String("/default/qmake.conf")); + evaluateFile(mkspecDirectory + QLatin1String("/features/default_pre.prf")); m_cumulative = cumulative; } @@ -684,7 +683,7 @@ bool ProFileEvaluator::Private::visitEndProFile(ProFile * pro) bool cumulative = m_cumulative; m_cumulative = false; - evaluateFile(mkspecDirectory + QLatin1String("/features/default_post.prf"), &ok); + evaluateFile(mkspecDirectory + QLatin1String("/features/default_post.prf")); QSet processed; forever { @@ -694,9 +693,8 @@ bool ProFileEvaluator::Private::visitEndProFile(ProFile * pro) const QString config = configs[i].toLower(); if (!processed.contains(config)) { processed.insert(config); - evaluateFile(mkspecDirectory + QLatin1String("/features/") - + config + QLatin1String(".prf"), &ok); - if (ok) { + if (evaluateFile(mkspecDirectory + QLatin1String("/features/") + + config + QLatin1String(".prf"))) { finished = false; break; } @@ -807,13 +805,13 @@ bool ProFileEvaluator::Private::visitProValue(ProValue *value) // FIXME: qmake variable-expands val first. if (val.length() < 4 || val[0] != QLatin1Char('s')) { q->logMessage(format("the ~= operator can handle only the s/// function.")); - return false; + break; } QChar sep = val.at(1); QStringList func = val.split(sep); if (func.count() < 3 || func.count() > 4) { q->logMessage(format("the s/// function expects 3 or 4 arguments.")); - return false; + break; } bool global = false, quote = false, case_sense = false; @@ -853,11 +851,7 @@ bool ProFileEvaluator::Private::visitProFunction(ProFunction *func) QString arguments = text.mid(lparen + 1, rparen - lparen - 1); QString funcName = text.left(lparen); m_lineNo = func->lineNumber(); - bool result; - if (!evaluateConditionalFunction(funcName.trimmed(), arguments, &result)) { - m_invertNext = false; - return false; - } + bool result = evaluateConditionalFunction(funcName.trimmed(), arguments); if (!m_skipLevel && (result ^ m_invertNext)) m_condition = ConditionTrue; } @@ -1610,8 +1604,8 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun return ret; } -bool ProFileEvaluator::Private::evaluateConditionalFunction(const QString &function, - const QString &arguments, bool *result) +bool ProFileEvaluator::Private::evaluateConditionalFunction( + const QString &function, const QString &arguments) { QStringList argumentsList = split_arg_list(arguments); QString sep; @@ -1659,9 +1653,6 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(const QString &funct functions->insert(QLatin1String("error"), T_MESSAGE); //v } - bool cond = false; - bool ok = true; - TestFunc func_t = (TestFunc)functions->value(function); switch (func_t) { @@ -1684,31 +1675,27 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(const QString &funct case T_CONFIG: { if (args.count() < 1 || args.count() > 2) { q->logMessage(format("CONFIG(config) requires one or two arguments.")); - ok = false; - break; + return false; } if (args.count() == 1) { //cond = isActiveConfig(args.first()); XXX - break; + return false; } const QStringList mutuals = args[1].split(QLatin1Char('|')); const QStringList &configs = valuesDirect(QLatin1String("CONFIG")); for (int i = configs.size() - 1; i >= 0; i--) { for (int mut = 0; mut < mutuals.count(); mut++) { if (configs[i] == mutuals[mut].trimmed()) { - cond = (configs[i] == args[0]); - goto done_T_CONFIG; + return (configs[i] == args[0]); } } } - done_T_CONFIG: - break; + return false; } case T_CONTAINS: { if (args.count() < 2 || args.count() > 3) { q->logMessage(format("contains(var, val) requires two or three arguments.")); - ok = false; - break; + return false; } QRegExp regx(args[1]); @@ -1717,8 +1704,7 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(const QString &funct for (int i = 0; i < l.size(); ++i) { const QString val = l[i]; if (regx.exactMatch(val) || val == args[1]) { - cond = true; - break; + return true; } } } else { @@ -1727,63 +1713,57 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(const QString &funct const QString val = l[i]; for (int mut = 0; mut < mutuals.count(); mut++) { if (val == mutuals[mut].trimmed()) { - cond = (regx.exactMatch(val) || val == args[1]); - goto done_T_CONTAINS; + return (regx.exactMatch(val) || val == args[1]); } } } } - done_T_CONTAINS: - break; + return false; } case T_COUNT: { if (args.count() != 2 && args.count() != 3) { q->logMessage(format("count(var, count, op=\"equals\") requires two or three arguments.")); - ok = false; - break; + return false; } if (args.count() == 3) { QString comp = args[2]; if (comp == QLatin1String(">") || comp == QLatin1String("greaterThan")) { - cond = values(args.first()).count() > args[1].toInt(); + return (values(args.first()).count() > args[1].toInt()); } else if (comp == QLatin1String(">=")) { - cond = values(args.first()).count() >= args[1].toInt(); + return (values(args.first()).count() >= args[1].toInt()); } else if (comp == QLatin1String("<") || comp == QLatin1String("lessThan")) { - cond = values(args.first()).count() < args[1].toInt(); + return (values(args.first()).count() < args[1].toInt()); } else if (comp == QLatin1String("<=")) { - cond = values(args.first()).count() <= args[1].toInt(); - } else if (comp == QLatin1String("equals") || comp == QLatin1String("isEqual") || comp == QLatin1String("=") || comp == QLatin1String("==")) { - cond = values(args.first()).count() == args[1].toInt(); + return (values(args.first()).count() <= args[1].toInt()); + } else if (comp == QLatin1String("equals") || comp == QLatin1String("isEqual") + || comp == QLatin1String("=") || comp == QLatin1String("==")) { + return (values(args.first()).count() == args[1].toInt()); } else { - ok = false; q->logMessage(format("unexpected modifier to count(%2)").arg(comp)); + return false; } - break; } - cond = values(args.first()).count() == args[1].toInt(); - break; + return (values(args.first()).count() == args[1].toInt()); } case T_INCLUDE: { if (m_skipLevel && !m_cumulative) - break; + return false; QString parseInto; if (args.count() == 2) { parseInto = args[1]; } else if (args.count() != 1) { q->logMessage(format("include(file) requires one or two arguments.")); - ok = false; - break; + return false; } QString fileName = args.first(); // ### this breaks if we have include(c:/reallystupid.pri) but IMHO that's really bad style. QDir currentProPath(currentDirectory()); fileName = QDir::cleanPath(currentProPath.absoluteFilePath(fileName)); - ok = evaluateFile(fileName, &ok); - break; + return evaluateFile(fileName); } case T_LOAD: { if (m_skipLevel && !m_cumulative) - break; + return false; QString parseInto; bool ignore_error = false; if (args.count() == 2) { @@ -1791,20 +1771,18 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(const QString &funct ignore_error = (sarg.toLower() == QLatin1String("true") || sarg.toInt()); } else if (args.count() != 1) { q->logMessage(format("load(feature) requires one or two arguments.")); - ok = false; - break; + return false; } - ok = evaluateFeatureFile( args.first(), &cond); - break; + // XXX ignore_error unused + return evaluateFeatureFile(args.first()); } case T_DEBUG: // Yup - do nothing. Nothing is going to enable debug output anyway. - break; + return false; case T_MESSAGE: { if (args.count() != 1) { q->logMessage(format("%1(message) requires one argument.").arg(function)); - ok = false; - break; + return false; } QString msg = fixEnvVariables(args.first()); if (function == QLatin1String("error")) { @@ -1821,46 +1799,42 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(const QString &funct } else { q->fileMessage(format("Project MESSAGE: %1").arg(msg)); } - break; + return false; } #if 0 // Way too dangerous to enable. case T_SYSTEM: { if (args.count() != 1) { q->logMessage(format("system(exec) requires one argument.")); - ok = false; - break; + false; } - ok = system(args.first().toLatin1().constData()) == 0; - break; + return (system(args.first().toLatin1().constData()) == 0); } #endif case T_ISEMPTY: { if (args.count() != 1) { q->logMessage(format("isEmpty(var) requires one argument.")); - ok = false; - break; + return false; } QStringList sl = values(args.first()); if (sl.count() == 0) { - cond = true; + return true; } else if (sl.count() > 0) { QString var = sl.first(); - cond = (var.isEmpty()); + if (var.isEmpty()) + return true; } - break; + return false; } case T_EXISTS: { if (args.count() != 1) { q->logMessage(format("exists(file) requires one argument.")); - ok = false; - break; + return false; } QString file = args.first(); file = Option::fixPathToLocalOS(file); if (QFile::exists(file)) { - cond = true; - break; + return true; } //regular expression I guess QString dirstr = currentDirectory(); @@ -1870,23 +1844,19 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(const QString &funct file = file.right(file.length() - slsh - 1); } if (file.contains(QLatin1Char('*')) || file.contains(QLatin1Char('?'))) - cond = QDir(dirstr).entryList(QStringList(file)).count(); + if (!QDir(dirstr).entryList(QStringList(file)).isEmpty()) + return true; - break; + return false; } case 0: // This is too chatty currently (missing defineTest and defineReplace) //q->logMessage(format("'%1' is not a recognized test function").arg(function)); - break; + return false; default: q->logMessage(format("Function '%1' is not implemented").arg(function)); - break; + return false; } - - if (result) - *result = cond; - - return ok; } QStringList ProFileEvaluator::Private::values(const QString &variableName, @@ -2039,27 +2009,21 @@ void ProFileEvaluator::releaseParsedProFile(ProFile *proFile) delete proFile; } -bool ProFileEvaluator::Private::evaluateFile(const QString &fileName, bool *result) +bool ProFileEvaluator::Private::evaluateFile(const QString &fileName) { - bool ok = true; ProFile *pro = q->parsedProFile(fileName); if (pro) { m_profileStack.push(pro); - ok = pro->Accept(this); + bool ok = pro->Accept(this); m_profileStack.pop(); q->releaseParsedProFile(pro); - - if (result) - *result = true; + return ok; } else { - if (result) - *result = false; + return false; } - - return ok; } -bool ProFileEvaluator::Private::evaluateFeatureFile(const QString &fileName, bool *result) +bool ProFileEvaluator::Private::evaluateFeatureFile(const QString &fileName) { QString fn; foreach (const QString &path, qmakeFeaturePaths()) { @@ -2078,7 +2042,7 @@ bool ProFileEvaluator::Private::evaluateFeatureFile(const QString &fileName, boo return false; bool cumulative = m_cumulative; m_cumulative = false; - bool ok = evaluateFile(fn, result); + bool ok = evaluateFile(fn); m_cumulative = cumulative; return ok; } -- cgit v1.2.3 From a76c1d097f14e93517f27debde806da4fd7498b9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 13 May 2009 12:32:24 +0200 Subject: put condition state variables into a structure to enable cleaner save/restore - for later cherry-picked 51f5ee959f58ee198e0fc51e2ad0161c612bf8d1 and 3104e4c121f3209890823db69a7c09d644b90951 from creator --- tools/linguist/shared/profileevaluator.cpp | 52 +++++++++++++++++------------- tools/linguist/shared/profileevaluator.h | 3 ++ 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index 92f588f89..d4c4df8b5 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -204,11 +204,13 @@ public: QStringList qmakeFeaturePaths(); - enum { ConditionTrue, ConditionFalse, ConditionElse }; - int m_condition; - int m_prevCondition; - bool m_updateCondition; - bool m_invertNext; + enum Condition { ConditionFalse, ConditionTrue, ConditionElse }; + struct State { + Condition condition; + Condition prevCondition; + bool updateCondition; // == !(enclosingBlock()->kind() & ScopeContents) + } m_sts; + bool m_invertNext; // Short-lived, so not in State int m_skipLevel; bool m_cumulative; bool m_isFirstVariableValue; @@ -232,6 +234,10 @@ public: ProFile *m_prevProFile; // See m_prevLineNo }; +#if !defined(__GNUC__) || __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3) +Q_DECLARE_TYPEINFO(ProFileEvaluator::Private::State, Q_PRIMITIVE_TYPE); +#endif + ProFileEvaluator::Private::Private(ProFileEvaluator *q_) : q(q_) { @@ -244,8 +250,8 @@ ProFileEvaluator::Private::Private(ProFileEvaluator *q_) m_cumulative = true; // Evaluator state - m_updateCondition = false; - m_condition = ConditionFalse; + m_sts.updateCondition = false; + m_sts.condition = ConditionFalse; m_invertNext = false; m_skipLevel = 0; m_isFirstVariableValue = true; @@ -563,16 +569,16 @@ void ProFileEvaluator::Private::updateItem() bool ProFileEvaluator::Private::visitBeginProBlock(ProBlock *block) { if (block->blockKind() == ProBlock::ScopeKind) { - m_updateCondition = true; + m_sts.updateCondition = true; if (!m_skipLevel) { - m_prevCondition = m_condition; - m_condition = ConditionFalse; + m_sts.prevCondition = m_sts.condition; + m_sts.condition = ConditionFalse; } else { - Q_ASSERT(m_condition != ConditionTrue); + Q_ASSERT(m_sts.condition != ConditionTrue); } } else if (block->blockKind() & ProBlock::ScopeContentsKind) { - m_updateCondition = false; - if (m_condition != ConditionTrue) + m_sts.updateCondition = false; + if (m_sts.condition != ConditionTrue) ++m_skipLevel; else Q_ASSERT(!m_skipLevel); @@ -584,12 +590,12 @@ bool ProFileEvaluator::Private::visitEndProBlock(ProBlock *block) { if (block->blockKind() & ProBlock::ScopeContentsKind) { if (m_skipLevel) { - Q_ASSERT(m_condition != ConditionTrue); + Q_ASSERT(m_sts.condition != ConditionTrue); --m_skipLevel; } else { // Conditionals contained inside this block may have changed the state. // So we reset it here to make an else following us do the right thing. - m_condition = ConditionTrue; + m_sts.condition = ConditionTrue; } } return true; @@ -626,13 +632,13 @@ bool ProFileEvaluator::Private::visitProCondition(ProCondition *cond) if (cond->text().toLower() == QLatin1String("else")) { // The state ConditionElse makes sure that subsequential elses are ignored. // That's braindead, but qmake is like that. - if (m_prevCondition == ConditionTrue) - m_condition = ConditionElse; - else if (m_prevCondition == ConditionFalse) - m_condition = ConditionTrue; - } else if (m_condition == ConditionFalse) { + if (m_sts.prevCondition == ConditionTrue) + m_sts.condition = ConditionElse; + else if (m_sts.prevCondition == ConditionFalse) + m_sts.condition = ConditionTrue; + } else if (m_sts.condition == ConditionFalse) { if (isActiveConfig(cond->text(), true) ^ m_invertNext) - m_condition = ConditionTrue; + m_sts.condition = ConditionTrue; } } m_invertNext = false; @@ -843,7 +849,7 @@ bool ProFileEvaluator::Private::visitProValue(ProValue *value) bool ProFileEvaluator::Private::visitProFunction(ProFunction *func) { - if (!m_updateCondition || m_condition == ConditionFalse) { + if (!m_sts.updateCondition || m_sts.condition == ConditionFalse) { QString text = func->text(); int lparen = text.indexOf(QLatin1Char('(')); int rparen = text.lastIndexOf(QLatin1Char(')')); @@ -853,7 +859,7 @@ bool ProFileEvaluator::Private::visitProFunction(ProFunction *func) m_lineNo = func->lineNumber(); bool result = evaluateConditionalFunction(funcName.trimmed(), arguments); if (!m_skipLevel && (result ^ m_invertNext)) - m_condition = ConditionTrue; + m_sts.condition = ConditionTrue; } m_invertNext = false; return true; diff --git a/tools/linguist/shared/profileevaluator.h b/tools/linguist/shared/profileevaluator.h index 688022bda..88b7590d2 100644 --- a/tools/linguist/shared/profileevaluator.h +++ b/tools/linguist/shared/profileevaluator.h @@ -95,6 +95,9 @@ public: private: class Private; Private *d; + + // This doesn't help gcc 3.3 ... + template friend class QTypeInfo; }; QT_END_NAMESPACE -- cgit v1.2.3 From ed3dbbab45125ea74daa31d5c08411d3e5dac03b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 14 May 2009 14:30:08 +0200 Subject: fix m_invertNext effect scoping an evaluation function can be an include statement. the included code must neither inherit nor change the current inversion state. cherry-picked 68b1b828e6030b4fe26ca9ffc4ee7a0b4bfe8f4e from creator --- tools/linguist/shared/profileevaluator.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index d4c4df8b5..95f3b1a96 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -849,6 +849,9 @@ bool ProFileEvaluator::Private::visitProValue(ProValue *value) bool ProFileEvaluator::Private::visitProFunction(ProFunction *func) { + // Make sure that called subblocks don't inherit & destroy the state + bool invertThis = m_invertNext; + m_invertNext = false; if (!m_sts.updateCondition || m_sts.condition == ConditionFalse) { QString text = func->text(); int lparen = text.indexOf(QLatin1Char('(')); @@ -858,10 +861,9 @@ bool ProFileEvaluator::Private::visitProFunction(ProFunction *func) QString funcName = text.left(lparen); m_lineNo = func->lineNumber(); bool result = evaluateConditionalFunction(funcName.trimmed(), arguments); - if (!m_skipLevel && (result ^ m_invertNext)) + if (!m_skipLevel && (result ^ invertThis)) m_sts.condition = ConditionTrue; } - m_invertNext = false; return true; } -- cgit v1.2.3 From ab906fbeab7916b13196bd28569d5b8753d244aa Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 14 May 2009 14:35:37 +0200 Subject: fix conditionals, in particular the nested else handling this also removes the optimization to skip test function calls which appear to be part of a failed test, as this could skip includes, etc. as well. cherry-picked ed00bd2c85cbf2c1bea63dc18d0ae7084b4fb65f from creator --- tools/linguist/shared/profileevaluator.cpp | 58 ++++++++++++++---------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index 95f3b1a96..c93a96ecb 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -204,11 +204,9 @@ public: QStringList qmakeFeaturePaths(); - enum Condition { ConditionFalse, ConditionTrue, ConditionElse }; struct State { - Condition condition; - Condition prevCondition; - bool updateCondition; // == !(enclosingBlock()->kind() & ScopeContents) + bool condition; + bool prevCondition; } m_sts; bool m_invertNext; // Short-lived, so not in State int m_skipLevel; @@ -250,8 +248,8 @@ ProFileEvaluator::Private::Private(ProFileEvaluator *q_) m_cumulative = true; // Evaluator state - m_sts.updateCondition = false; - m_sts.condition = ConditionFalse; + m_sts.condition = false; + m_sts.prevCondition = false; m_invertNext = false; m_skipLevel = 0; m_isFirstVariableValue = true; @@ -568,20 +566,20 @@ void ProFileEvaluator::Private::updateItem() bool ProFileEvaluator::Private::visitBeginProBlock(ProBlock *block) { - if (block->blockKind() == ProBlock::ScopeKind) { - m_sts.updateCondition = true; - if (!m_skipLevel) { - m_sts.prevCondition = m_sts.condition; - m_sts.condition = ConditionFalse; - } else { - Q_ASSERT(m_sts.condition != ConditionTrue); - } - } else if (block->blockKind() & ProBlock::ScopeContentsKind) { - m_sts.updateCondition = false; - if (m_sts.condition != ConditionTrue) + if (block->blockKind() & ProBlock::ScopeContentsKind) { + if (!m_sts.condition) ++m_skipLevel; else Q_ASSERT(!m_skipLevel); + } else { + if (!m_skipLevel) { + if (m_sts.condition) { + m_sts.prevCondition = true; + m_sts.condition = false; + } + } else { + Q_ASSERT(!m_sts.condition); + } } return true; } @@ -590,12 +588,12 @@ bool ProFileEvaluator::Private::visitEndProBlock(ProBlock *block) { if (block->blockKind() & ProBlock::ScopeContentsKind) { if (m_skipLevel) { - Q_ASSERT(m_sts.condition != ConditionTrue); + Q_ASSERT(!m_sts.condition); --m_skipLevel; - } else { + } else if (!(block->blockKind() & ProBlock::SingleLine)) { // Conditionals contained inside this block may have changed the state. // So we reset it here to make an else following us do the right thing. - m_sts.condition = ConditionTrue; + m_sts.condition = true; } } return true; @@ -630,15 +628,11 @@ bool ProFileEvaluator::Private::visitProCondition(ProCondition *cond) { if (!m_skipLevel) { if (cond->text().toLower() == QLatin1String("else")) { - // The state ConditionElse makes sure that subsequential elses are ignored. - // That's braindead, but qmake is like that. - if (m_sts.prevCondition == ConditionTrue) - m_sts.condition = ConditionElse; - else if (m_sts.prevCondition == ConditionFalse) - m_sts.condition = ConditionTrue; - } else if (m_sts.condition == ConditionFalse) { - if (isActiveConfig(cond->text(), true) ^ m_invertNext) - m_sts.condition = ConditionTrue; + m_sts.condition = !m_sts.prevCondition; + } else { + m_sts.prevCondition = false; + if (!m_sts.condition && isActiveConfig(cond->text(), true) ^ m_invertNext) + m_sts.condition = true; } } m_invertNext = false; @@ -852,7 +846,9 @@ bool ProFileEvaluator::Private::visitProFunction(ProFunction *func) // Make sure that called subblocks don't inherit & destroy the state bool invertThis = m_invertNext; m_invertNext = false; - if (!m_sts.updateCondition || m_sts.condition == ConditionFalse) { + if (!m_skipLevel) + m_sts.prevCondition = false; + if (m_cumulative || !m_sts.condition) { QString text = func->text(); int lparen = text.indexOf(QLatin1Char('(')); int rparen = text.lastIndexOf(QLatin1Char(')')); @@ -862,7 +858,7 @@ bool ProFileEvaluator::Private::visitProFunction(ProFunction *func) m_lineNo = func->lineNumber(); bool result = evaluateConditionalFunction(funcName.trimmed(), arguments); if (!m_skipLevel && (result ^ invertThis)) - m_sts.condition = ConditionTrue; + m_sts.condition = true; } return true; } -- cgit v1.2.3 From f5bc08b10143e888257ca64be09f9135b2328616 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 14 May 2009 14:36:37 +0200 Subject: surround file inclusion with saving/restoring condition state cherry-picked a86bdfdde40ca3bff03da590d98ee31f6d704751 from creator --- tools/linguist/shared/profileevaluator.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index c93a96ecb..f2e643339 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -1763,7 +1763,10 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction( // ### this breaks if we have include(c:/reallystupid.pri) but IMHO that's really bad style. QDir currentProPath(currentDirectory()); fileName = QDir::cleanPath(currentProPath.absoluteFilePath(fileName)); - return evaluateFile(fileName); + State sts = m_sts; + bool ok = evaluateFile(fileName); + m_sts = sts; + return ok; } case T_LOAD: { if (m_skipLevel && !m_cumulative) -- cgit v1.2.3 From abf8b1c273776fa16afacd04e7bb3c5c07a35ab7 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 18 May 2009 17:25:41 +0200 Subject: remove return values from the visitors which need none cherry-picked 6ca93b31fd95ef7cce78a5e0d5225e50d6007f2f from creator --- tools/linguist/shared/abstractproitemvisitor.h | 16 +++++------ tools/linguist/shared/profileevaluator.cpp | 40 +++++++++++--------------- tools/linguist/shared/proitems.cpp | 18 ++++++++---- 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/tools/linguist/shared/abstractproitemvisitor.h b/tools/linguist/shared/abstractproitemvisitor.h index 0691fdc07..0f312ae7a 100644 --- a/tools/linguist/shared/abstractproitemvisitor.h +++ b/tools/linguist/shared/abstractproitemvisitor.h @@ -49,19 +49,19 @@ QT_BEGIN_NAMESPACE struct AbstractProItemVisitor { virtual ~AbstractProItemVisitor() {} - virtual bool visitBeginProBlock(ProBlock *block) = 0; - virtual bool visitEndProBlock(ProBlock *block) = 0; + virtual void visitBeginProBlock(ProBlock *block) = 0; + virtual void visitEndProBlock(ProBlock *block) = 0; - virtual bool visitBeginProVariable(ProVariable *variable) = 0; - virtual bool visitEndProVariable(ProVariable *variable) = 0; + virtual void visitBeginProVariable(ProVariable *variable) = 0; + virtual void visitEndProVariable(ProVariable *variable) = 0; virtual bool visitBeginProFile(ProFile *value) = 0; virtual bool visitEndProFile(ProFile *value) = 0; - virtual bool visitProValue(ProValue *value) = 0; - virtual bool visitProFunction(ProFunction *function) = 0; - virtual bool visitProOperator(ProOperator *function) = 0; - virtual bool visitProCondition(ProCondition *function) = 0; + virtual void visitProValue(ProValue *value) = 0; + virtual void visitProFunction(ProFunction *function) = 0; + virtual void visitProOperator(ProOperator *function) = 0; + virtual void visitProCondition(ProCondition *function) = 0; }; QT_END_NAMESPACE diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index f2e643339..71d1d61cf 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -171,16 +171,16 @@ public: /////////////// Evaluating pro file contents // implementation of AbstractProItemVisitor - bool visitBeginProBlock(ProBlock *block); - bool visitEndProBlock(ProBlock *block); - bool visitBeginProVariable(ProVariable *variable); - bool visitEndProVariable(ProVariable *variable); + void visitBeginProBlock(ProBlock *block); + void visitEndProBlock(ProBlock *block); + void visitBeginProVariable(ProVariable *variable); + void visitEndProVariable(ProVariable *variable); bool visitBeginProFile(ProFile *value); bool visitEndProFile(ProFile *value); - bool visitProValue(ProValue *value); - bool visitProFunction(ProFunction *function); - bool visitProOperator(ProOperator *oper); - bool visitProCondition(ProCondition *condition); + void visitProValue(ProValue *value); + void visitProFunction(ProFunction *function); + void visitProOperator(ProOperator *oper); + void visitProCondition(ProCondition *condition); QStringList valuesDirect(const QString &variableName) const { return m_valuemap[variableName]; } QStringList values(const QString &variableName) const; @@ -564,7 +564,7 @@ void ProFileEvaluator::Private::updateItem() } -bool ProFileEvaluator::Private::visitBeginProBlock(ProBlock *block) +void ProFileEvaluator::Private::visitBeginProBlock(ProBlock *block) { if (block->blockKind() & ProBlock::ScopeContentsKind) { if (!m_sts.condition) @@ -581,10 +581,9 @@ bool ProFileEvaluator::Private::visitBeginProBlock(ProBlock *block) Q_ASSERT(!m_sts.condition); } } - return true; } -bool ProFileEvaluator::Private::visitEndProBlock(ProBlock *block) +void ProFileEvaluator::Private::visitEndProBlock(ProBlock *block) { if (block->blockKind() & ProBlock::ScopeContentsKind) { if (m_skipLevel) { @@ -596,35 +595,31 @@ bool ProFileEvaluator::Private::visitEndProBlock(ProBlock *block) m_sts.condition = true; } } - return true; } -bool ProFileEvaluator::Private::visitBeginProVariable(ProVariable *variable) +void ProFileEvaluator::Private::visitBeginProVariable(ProVariable *variable) { m_lastVarName = variable->variable(); m_variableOperator = variable->variableOperator(); m_isFirstVariableValue = true; m_tempValuemap = m_valuemap; m_tempFilevaluemap = m_filevaluemap; - return true; } -bool ProFileEvaluator::Private::visitEndProVariable(ProVariable *variable) +void ProFileEvaluator::Private::visitEndProVariable(ProVariable *variable) { Q_UNUSED(variable); m_valuemap = m_tempValuemap; m_filevaluemap = m_tempFilevaluemap; m_lastVarName.clear(); - return true; } -bool ProFileEvaluator::Private::visitProOperator(ProOperator *oper) +void ProFileEvaluator::Private::visitProOperator(ProOperator *oper) { m_invertNext = (oper->operatorKind() == ProOperator::NotOperator); - return true; } -bool ProFileEvaluator::Private::visitProCondition(ProCondition *cond) +void ProFileEvaluator::Private::visitProCondition(ProCondition *cond) { if (!m_skipLevel) { if (cond->text().toLower() == QLatin1String("else")) { @@ -636,7 +631,6 @@ bool ProFileEvaluator::Private::visitProCondition(ProCondition *cond) } } m_invertNext = false; - return true; } bool ProFileEvaluator::Private::visitBeginProFile(ProFile * pro) @@ -731,7 +725,7 @@ static void replaceInList(QStringList *varlist, } } -bool ProFileEvaluator::Private::visitProValue(ProValue *value) +void ProFileEvaluator::Private::visitProValue(ProValue *value) { PRE(value); m_lineNo = value->lineNumber(); @@ -838,10 +832,9 @@ bool ProFileEvaluator::Private::visitProValue(ProValue *value) } m_isFirstVariableValue = false; - return true; } -bool ProFileEvaluator::Private::visitProFunction(ProFunction *func) +void ProFileEvaluator::Private::visitProFunction(ProFunction *func) { // Make sure that called subblocks don't inherit & destroy the state bool invertThis = m_invertNext; @@ -860,7 +853,6 @@ bool ProFileEvaluator::Private::visitProFunction(ProFunction *func) if (!m_skipLevel && (result ^ invertThis)) m_sts.condition = true; } - return true; } diff --git a/tools/linguist/shared/proitems.cpp b/tools/linguist/shared/proitems.cpp index 471417ec9..83d4a0f28 100644 --- a/tools/linguist/shared/proitems.cpp +++ b/tools/linguist/shared/proitems.cpp @@ -116,7 +116,8 @@ bool ProBlock::Accept(AbstractProItemVisitor *visitor) if (!item->Accept(visitor)) return false; } - return visitor->visitEndProBlock(this); + visitor->visitEndProBlock(this); + return true; } // --------------- ProVariable ---------------- @@ -155,7 +156,8 @@ bool ProVariable::Accept(AbstractProItemVisitor *visitor) if (!item->Accept(visitor)) return false; } - return visitor->visitEndProVariable(this); + visitor->visitEndProVariable(this); + return true; } // --------------- ProValue ---------------- @@ -192,7 +194,8 @@ ProItem::ProItemKind ProValue::kind() const bool ProValue::Accept(AbstractProItemVisitor *visitor) { - return visitor->visitProValue(this); + visitor->visitProValue(this); + return true; } // --------------- ProFunction ---------------- @@ -218,7 +221,8 @@ ProItem::ProItemKind ProFunction::kind() const bool ProFunction::Accept(AbstractProItemVisitor *visitor) { - return visitor->visitProFunction(this); + visitor->visitProFunction(this); + return true; } // --------------- ProCondition ---------------- @@ -244,7 +248,8 @@ ProItem::ProItemKind ProCondition::kind() const bool ProCondition::Accept(AbstractProItemVisitor *visitor) { - return visitor->visitProCondition(this); + visitor->visitProCondition(this); + return true; } // --------------- ProOperator ---------------- @@ -270,7 +275,8 @@ ProItem::ProItemKind ProOperator::kind() const bool ProOperator::Accept(AbstractProItemVisitor *visitor) { - return visitor->visitProOperator(this); + visitor->visitProOperator(this); + return true; } // --------------- ProFile ---------------- -- cgit v1.2.3 From 7074ea4c4160f50aa40aade5cd983df6ea9ebacd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 18 May 2009 17:46:30 +0200 Subject: support custom functions: implement defineTest(), defineReplace(), defined(), return() & export() cherry-picked d077ba29c34782d1699693b6e3f07c2037eecdba and 93571f7d42a81a8236ceac1f745ef277f194f1ca from creator --- tools/linguist/shared/abstractproitemvisitor.h | 9 +- tools/linguist/shared/profileevaluator.cpp | 293 +++++++++++++++++++------ tools/linguist/shared/proitems.cpp | 61 ++--- tools/linguist/shared/proitems.h | 30 ++- 4 files changed, 283 insertions(+), 110 deletions(-) diff --git a/tools/linguist/shared/abstractproitemvisitor.h b/tools/linguist/shared/abstractproitemvisitor.h index 0f312ae7a..dd72dfe09 100644 --- a/tools/linguist/shared/abstractproitemvisitor.h +++ b/tools/linguist/shared/abstractproitemvisitor.h @@ -49,17 +49,18 @@ QT_BEGIN_NAMESPACE struct AbstractProItemVisitor { virtual ~AbstractProItemVisitor() {} - virtual void visitBeginProBlock(ProBlock *block) = 0; + + virtual ProItem::ProItemReturn visitBeginProBlock(ProBlock *block) = 0; virtual void visitEndProBlock(ProBlock *block) = 0; virtual void visitBeginProVariable(ProVariable *variable) = 0; virtual void visitEndProVariable(ProVariable *variable) = 0; - virtual bool visitBeginProFile(ProFile *value) = 0; - virtual bool visitEndProFile(ProFile *value) = 0; + virtual ProItem::ProItemReturn visitBeginProFile(ProFile *value) = 0; + virtual ProItem::ProItemReturn visitEndProFile(ProFile *value) = 0; virtual void visitProValue(ProValue *value) = 0; - virtual void visitProFunction(ProFunction *function) = 0; + virtual ProItem::ProItemReturn visitProFunction(ProFunction *function) = 0; virtual void visitProOperator(ProOperator *function) = 0; virtual void visitProCondition(ProCondition *function) = 0; }; diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index 71d1d61cf..c17f9f60f 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -171,14 +171,14 @@ public: /////////////// Evaluating pro file contents // implementation of AbstractProItemVisitor - void visitBeginProBlock(ProBlock *block); + ProItem::ProItemReturn visitBeginProBlock(ProBlock *block); void visitEndProBlock(ProBlock *block); void visitBeginProVariable(ProVariable *variable); void visitEndProVariable(ProVariable *variable); - bool visitBeginProFile(ProFile *value); - bool visitEndProFile(ProFile *value); + ProItem::ProItemReturn visitBeginProFile(ProFile *value); + ProItem::ProItemReturn visitEndProFile(ProFile *value); void visitProValue(ProValue *value); - void visitProFunction(ProFunction *function); + ProItem::ProItemReturn visitProFunction(ProFunction *function); void visitProOperator(ProOperator *oper); void visitProCondition(ProCondition *condition); @@ -198,10 +198,15 @@ public: QString currentDirectory() const; ProFile *currentProFile() const; - bool evaluateConditionalFunction(const QString &function, const QString &arguments); + ProItem::ProItemReturn evaluateConditionalFunction(const QString &function, const QString &arguments); bool evaluateFile(const QString &fileName); bool evaluateFeatureFile(const QString &fileName); + static inline ProItem::ProItemReturn returnBool(bool b) + { return b ? ProItem::ReturnTrue : ProItem::ReturnFalse; } + + QStringList evaluateFunction(ProBlock *funcPtr, const QStringList &argumentsList, bool *ok); + QStringList qmakeFeaturePaths(); struct State { @@ -228,6 +233,14 @@ public: QHash m_properties; QString m_outputDir; + bool m_definingTest; + QString m_definingFunc; + QHash m_testFunctions; + QHash m_replaceFunctions; + QStringList m_returnValue; + QStack > m_valuemapStack; + QStack > > m_filevaluemapStack; + int m_prevLineNo; // Checking whether we're assigning the same TARGET ProFile *m_prevProFile; // See m_prevLineNo }; @@ -253,6 +266,7 @@ ProFileEvaluator::Private::Private(ProFileEvaluator *q_) m_invertNext = false; m_skipLevel = 0; m_isFirstVariableValue = true; + m_definingFunc.clear(); } bool ProFileEvaluator::Private::read(ProFile *pro) @@ -564,13 +578,27 @@ void ProFileEvaluator::Private::updateItem() } -void ProFileEvaluator::Private::visitBeginProBlock(ProBlock *block) +ProItem::ProItemReturn ProFileEvaluator::Private::visitBeginProBlock(ProBlock *block) { if (block->blockKind() & ProBlock::ScopeContentsKind) { - if (!m_sts.condition) - ++m_skipLevel; - else - Q_ASSERT(!m_skipLevel); + if (!m_definingFunc.isEmpty()) { + if (!m_skipLevel || m_cumulative) { + QHash *hash = + (m_definingTest ? &m_testFunctions : &m_replaceFunctions); + if (ProBlock *def = hash->value(m_definingFunc)) + def->deref(); + hash->insert(m_definingFunc, block); + block->ref(); + block->setBlockKind(block->blockKind() | ProBlock::FunctionBodyKind); + } + m_definingFunc.clear(); + return ProItem::ReturnSkip; + } else if (!(block->blockKind() & ProBlock::FunctionBodyKind)) { + if (!m_sts.condition) + ++m_skipLevel; + else + Q_ASSERT(!m_skipLevel); + } } else { if (!m_skipLevel) { if (m_sts.condition) { @@ -581,11 +609,13 @@ void ProFileEvaluator::Private::visitBeginProBlock(ProBlock *block) Q_ASSERT(!m_sts.condition); } } + return ProItem::ReturnTrue; } void ProFileEvaluator::Private::visitEndProBlock(ProBlock *block) { - if (block->blockKind() & ProBlock::ScopeContentsKind) { + if ((block->blockKind() & ProBlock::ScopeContentsKind) + && !(block->blockKind() & ProBlock::FunctionBodyKind)) { if (m_skipLevel) { Q_ASSERT(!m_sts.condition); --m_skipLevel; @@ -633,10 +663,9 @@ void ProFileEvaluator::Private::visitProCondition(ProCondition *cond) m_invertNext = false; } -bool ProFileEvaluator::Private::visitBeginProFile(ProFile * pro) +ProItem::ProItemReturn ProFileEvaluator::Private::visitBeginProFile(ProFile * pro) { PRE(pro); - bool ok = true; m_lineNo = pro->lineNumber(); if (m_origfile.isEmpty()) m_origfile = pro->fileName(); @@ -660,16 +689,15 @@ bool ProFileEvaluator::Private::visitBeginProFile(ProFile * pro) m_cumulative = cumulative; } - ok = QDir::setCurrent(pro->directoryName()); + return returnBool(QDir::setCurrent(pro->directoryName())); } - return ok; + return ProItem::ReturnTrue; } -bool ProFileEvaluator::Private::visitEndProFile(ProFile * pro) +ProItem::ProItemReturn ProFileEvaluator::Private::visitEndProFile(ProFile * pro) { PRE(pro); - bool ok = true; m_lineNo = pro->lineNumber(); if (m_profileStack.count() == 1 && !m_oldPath.isEmpty()) { const QString &mkspecDirectory = propertyValue(QLatin1String("QMAKE_MKSPECS")); @@ -698,13 +726,21 @@ bool ProFileEvaluator::Private::visitEndProFile(ProFile * pro) break; } + foreach (ProBlock *itm, m_replaceFunctions) + itm->deref(); + m_replaceFunctions.clear(); + foreach (ProBlock *itm, m_testFunctions) + itm->deref(); + m_testFunctions.clear(); + m_cumulative = cumulative; } m_profileStack.pop(); - ok = QDir::setCurrent(m_oldPath); + return returnBool(QDir::setCurrent(m_oldPath)); } - return ok; + + return ProItem::ReturnTrue; } static void replaceInList(QStringList *varlist, @@ -834,7 +870,7 @@ void ProFileEvaluator::Private::visitProValue(ProValue *value) m_isFirstVariableValue = false; } -void ProFileEvaluator::Private::visitProFunction(ProFunction *func) +ProItem::ProItemReturn ProFileEvaluator::Private::visitProFunction(ProFunction *func) { // Make sure that called subblocks don't inherit & destroy the state bool invertThis = m_invertNext; @@ -849,10 +885,13 @@ void ProFileEvaluator::Private::visitProFunction(ProFunction *func) QString arguments = text.mid(lparen + 1, rparen - lparen - 1); QString funcName = text.left(lparen); m_lineNo = func->lineNumber(); - bool result = evaluateConditionalFunction(funcName.trimmed(), arguments); - if (!m_skipLevel && (result ^ invertThis)) + ProItem::ProItemReturn result = evaluateConditionalFunction(funcName.trimmed(), arguments); + if (result != ProItem::ReturnFalse && result != ProItem::ReturnTrue) + return result; + if (!m_skipLevel && ((result == ProItem::ReturnTrue) ^ invertThis)) m_sts.condition = true; } + return ProItem::ReturnTrue; } @@ -1192,10 +1231,49 @@ bool ProFileEvaluator::Private::isActiveConfig(const QString &config, bool regex return false; } +QStringList ProFileEvaluator::Private::evaluateFunction( + ProBlock *funcPtr, const QStringList &argumentsList, bool *ok) +{ + bool oki; + QStringList ret; + + if (m_valuemapStack.count() >= 100) { + q->errorMessage(format("ran into infinite recursion (depth > 100).")); + oki = false; + } else { + State sts = m_sts; + m_valuemapStack.push(m_valuemap); + m_filevaluemapStack.push(m_filevaluemap); + + QStringList args; + for (int i = 0; i < argumentsList.count(); ++i) { + QStringList theArgs = expandVariableReferences(argumentsList[i]); + args += theArgs; + m_valuemap[QString::number(i+1)] = theArgs; + } + m_valuemap[QLatin1String("ARGS")] = args; + oki = (funcPtr->Accept(this) != ProItem::ReturnFalse); // True || Return + ret = m_returnValue; + m_returnValue.clear(); + + m_valuemap = m_valuemapStack.pop(); + m_filevaluemap = m_filevaluemapStack.pop(); + m_sts = sts; + } + if (ok) + *ok = oki; + if (oki) + return ret; + return QStringList(); +} + QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &func, const QString &arguments) { QStringList argumentsList = split_arg_list(arguments); + if (ProBlock *funcPtr = m_replaceFunctions.value(func, 0)) + return evaluateFunction(funcPtr, argumentsList, 0); + QStringList args; for (int i = 0; i < argumentsList.count(); ++i) args += expandVariableReferences(argumentsList[i]).join(Option::field_sep); @@ -1600,13 +1678,40 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun return ret; } -bool ProFileEvaluator::Private::evaluateConditionalFunction( +ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( const QString &function, const QString &arguments) { QStringList argumentsList = split_arg_list(arguments); + + if (ProBlock *funcPtr = m_testFunctions.value(function, 0)) { + bool ok; + QStringList ret = evaluateFunction(funcPtr, argumentsList, &ok); + if (ok) { + if (ret.isEmpty()) { + return ProItem::ReturnTrue; + } else { + if (ret.first() != QLatin1String("false")) { + if (ret.first() == QLatin1String("true")) { + return ProItem::ReturnTrue; + } else { + bool ok; + int val = ret.first().toInt(&ok); + if (ok) { + if (val) + return ProItem::ReturnTrue; + } else { + q->logMessage(format("Unexpected return value from test '%1': %2") + .arg(function).arg(ret.join(QLatin1String(" :: ")))); + } + } + } + } + } + return ProItem::ReturnFalse; + } + QString sep; sep.append(Option::field_sep); - QStringList args; for (int i = 0; i < argumentsList.count(); ++i) args += expandVariableReferences(argumentsList[i]).join(sep); @@ -1614,7 +1719,8 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction( enum TestFunc { T_REQUIRES=1, T_GREATERTHAN, T_LESSTHAN, T_EQUALS, T_EXISTS, T_EXPORT, T_CLEAR, T_UNSET, T_EVAL, T_CONFIG, T_SYSTEM, T_RETURN, T_BREAK, T_NEXT, T_DEFINED, T_CONTAINS, T_INFILE, - T_COUNT, T_ISEMPTY, T_INCLUDE, T_LOAD, T_DEBUG, T_MESSAGE, T_IF }; + T_COUNT, T_ISEMPTY, T_INCLUDE, T_LOAD, T_DEBUG, T_MESSAGE, T_IF, + T_DEFINE_TEST, T_DEFINE_REPLACE }; static QHash *functions = 0; if (!functions) { @@ -1647,51 +1753,103 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction( functions->insert(QLatin1String("message"), T_MESSAGE); //v functions->insert(QLatin1String("warning"), T_MESSAGE); //v functions->insert(QLatin1String("error"), T_MESSAGE); //v + functions->insert(QLatin1String("defineTest"), T_DEFINE_TEST); //v + functions->insert(QLatin1String("defineReplace"), T_DEFINE_REPLACE); //v } TestFunc func_t = (TestFunc)functions->value(function); switch (func_t) { + case T_DEFINE_TEST: + m_definingTest = true; + goto defineFunc; + case T_DEFINE_REPLACE: + m_definingTest = false; + defineFunc: + if (args.count() != 1) { + q->logMessage(format("%s(function) requires one argument.").arg(function)); + return ProItem::ReturnFalse; + } + m_definingFunc = args.first(); + return ProItem::ReturnTrue; + case T_DEFINED: + if (args.count() < 1 || args.count() > 2) { + q->logMessage(format("defined(function, [\"test\"|\"replace\"])" + " requires one or two arguments.")); + return ProItem::ReturnFalse; + } + if (args.count() > 1) { + if (args[1] == QLatin1String("test")) + return returnBool(m_testFunctions.contains(args[0])); + else if (args[1] == QLatin1String("replace")) + return returnBool(m_replaceFunctions.contains(args[0])); + q->logMessage(format("defined(function, type):" + " unexpected type [%1].\n").arg(args[1])); + return ProItem::ReturnFalse; + } + return returnBool(m_replaceFunctions.contains(args[0]) + || m_testFunctions.contains(args[0])); + case T_RETURN: + m_returnValue = args; + // It is "safe" to ignore returns - due to qmake brokeness + // they cannot be used to terminate loops anyway. + if (m_skipLevel || m_cumulative) + return ProItem::ReturnTrue; + if (m_valuemapStack.isEmpty()) { + q->logMessage(format("unexpected return().")); + return ProItem::ReturnFalse; + } + return ProItem::ReturnReturn; + case T_EXPORT: + if (m_skipLevel && !m_cumulative) + return ProItem::ReturnTrue; + if (args.count() != 1) { + q->logMessage(format("export(variable) requires one argument.")); + return ProItem::ReturnFalse; + } + for (int i = 0; i < m_valuemapStack.size(); ++i) { + m_valuemapStack[i][args[0]] = m_valuemap[args[0]]; + m_filevaluemapStack[i][currentProFile()][args[0]] = + m_filevaluemap[currentProFile()][args[0]]; + } + return ProItem::ReturnTrue; #if 0 case T_INFILE: case T_REQUIRES: case T_GREATERTHAN: case T_LESSTHAN: case T_EQUALS: - case T_EXPORT: case T_CLEAR: case T_UNSET: case T_EVAL: case T_IF: - case T_RETURN: case T_BREAK: case T_NEXT: - case T_DEFINED: #endif case T_CONFIG: { if (args.count() < 1 || args.count() > 2) { q->logMessage(format("CONFIG(config) requires one or two arguments.")); - return false; + return ProItem::ReturnFalse; } if (args.count() == 1) { //cond = isActiveConfig(args.first()); XXX - return false; + return ProItem::ReturnFalse; } const QStringList mutuals = args[1].split(QLatin1Char('|')); const QStringList &configs = valuesDirect(QLatin1String("CONFIG")); for (int i = configs.size() - 1; i >= 0; i--) { for (int mut = 0; mut < mutuals.count(); mut++) { if (configs[i] == mutuals[mut].trimmed()) { - return (configs[i] == args[0]); + return returnBool(configs[i] == args[0]); } } } - return false; + return ProItem::ReturnFalse; } case T_CONTAINS: { if (args.count() < 2 || args.count() > 3) { q->logMessage(format("contains(var, val) requires two or three arguments.")); - return false; + return ProItem::ReturnFalse; } QRegExp regx(args[1]); @@ -1700,7 +1858,7 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction( for (int i = 0; i < l.size(); ++i) { const QString val = l[i]; if (regx.exactMatch(val) || val == args[1]) { - return true; + return ProItem::ReturnTrue; } } } else { @@ -1709,47 +1867,47 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction( const QString val = l[i]; for (int mut = 0; mut < mutuals.count(); mut++) { if (val == mutuals[mut].trimmed()) { - return (regx.exactMatch(val) || val == args[1]); + return returnBool(regx.exactMatch(val) || val == args[1]); } } } } - return false; + return ProItem::ReturnFalse; } case T_COUNT: { if (args.count() != 2 && args.count() != 3) { q->logMessage(format("count(var, count, op=\"equals\") requires two or three arguments.")); - return false; + return ProItem::ReturnFalse; } if (args.count() == 3) { QString comp = args[2]; if (comp == QLatin1String(">") || comp == QLatin1String("greaterThan")) { - return (values(args.first()).count() > args[1].toInt()); + return returnBool(values(args.first()).count() > args[1].toInt()); } else if (comp == QLatin1String(">=")) { - return (values(args.first()).count() >= args[1].toInt()); + return returnBool(values(args.first()).count() >= args[1].toInt()); } else if (comp == QLatin1String("<") || comp == QLatin1String("lessThan")) { - return (values(args.first()).count() < args[1].toInt()); + return returnBool(values(args.first()).count() < args[1].toInt()); } else if (comp == QLatin1String("<=")) { - return (values(args.first()).count() <= args[1].toInt()); + return returnBool(values(args.first()).count() <= args[1].toInt()); } else if (comp == QLatin1String("equals") || comp == QLatin1String("isEqual") || comp == QLatin1String("=") || comp == QLatin1String("==")) { - return (values(args.first()).count() == args[1].toInt()); + return returnBool(values(args.first()).count() == args[1].toInt()); } else { q->logMessage(format("unexpected modifier to count(%2)").arg(comp)); - return false; + return ProItem::ReturnFalse; } } - return (values(args.first()).count() == args[1].toInt()); + return returnBool(values(args.first()).count() == args[1].toInt()); } case T_INCLUDE: { if (m_skipLevel && !m_cumulative) - return false; + return ProItem::ReturnFalse; QString parseInto; if (args.count() == 2) { parseInto = args[1]; } else if (args.count() != 1) { q->logMessage(format("include(file) requires one or two arguments.")); - return false; + return ProItem::ReturnFalse; } QString fileName = args.first(); // ### this breaks if we have include(c:/reallystupid.pri) but IMHO that's really bad style. @@ -1758,11 +1916,11 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction( State sts = m_sts; bool ok = evaluateFile(fileName); m_sts = sts; - return ok; + return returnBool(ok); } case T_LOAD: { if (m_skipLevel && !m_cumulative) - return false; + return ProItem::ReturnFalse; QString parseInto; bool ignore_error = false; if (args.count() == 2) { @@ -1770,18 +1928,18 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction( ignore_error = (sarg.toLower() == QLatin1String("true") || sarg.toInt()); } else if (args.count() != 1) { q->logMessage(format("load(feature) requires one or two arguments.")); - return false; + return ProItem::ReturnFalse; } // XXX ignore_error unused - return evaluateFeatureFile(args.first()); + return returnBool(evaluateFeatureFile(args.first())); } case T_DEBUG: // Yup - do nothing. Nothing is going to enable debug output anyway. - return false; + return ProItem::ReturnFalse; case T_MESSAGE: { if (args.count() != 1) { q->logMessage(format("%1(message) requires one argument.").arg(function)); - return false; + return ProItem::ReturnFalse; } QString msg = fixEnvVariables(args.first()); if (function == QLatin1String("error")) { @@ -1798,42 +1956,42 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction( } else { q->fileMessage(format("Project MESSAGE: %1").arg(msg)); } - return false; + return ProItem::ReturnFalse; } #if 0 // Way too dangerous to enable. case T_SYSTEM: { if (args.count() != 1) { q->logMessage(format("system(exec) requires one argument.")); - false; + ProItem::ReturnFalse; } - return (system(args.first().toLatin1().constData()) == 0); + return returnBool(system(args.first().toLatin1().constData()) == 0); } #endif case T_ISEMPTY: { if (args.count() != 1) { q->logMessage(format("isEmpty(var) requires one argument.")); - return false; + return ProItem::ReturnFalse; } QStringList sl = values(args.first()); if (sl.count() == 0) { - return true; + return ProItem::ReturnTrue; } else if (sl.count() > 0) { QString var = sl.first(); if (var.isEmpty()) - return true; + return ProItem::ReturnTrue; } - return false; + return ProItem::ReturnFalse; } case T_EXISTS: { if (args.count() != 1) { q->logMessage(format("exists(file) requires one argument.")); - return false; + return ProItem::ReturnFalse; } QString file = args.first(); file = Option::fixPathToLocalOS(file); if (QFile::exists(file)) { - return true; + return ProItem::ReturnTrue; } //regular expression I guess QString dirstr = currentDirectory(); @@ -1844,17 +2002,16 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction( } if (file.contains(QLatin1Char('*')) || file.contains(QLatin1Char('?'))) if (!QDir(dirstr).entryList(QStringList(file)).isEmpty()) - return true; + return ProItem::ReturnTrue; - return false; + return ProItem::ReturnFalse; } case 0: - // This is too chatty currently (missing defineTest and defineReplace) - //q->logMessage(format("'%1' is not a recognized test function").arg(function)); - return false; + q->logMessage(format("'%1' is not a recognized test function").arg(function)); + return ProItem::ReturnFalse; default: q->logMessage(format("Function '%1' is not implemented").arg(function)); - return false; + return ProItem::ReturnFalse; } } @@ -2013,7 +2170,7 @@ bool ProFileEvaluator::Private::evaluateFile(const QString &fileName) ProFile *pro = q->parsedProFile(fileName); if (pro) { m_profileStack.push(pro); - bool ok = pro->Accept(this); + bool ok = (pro->Accept(this) == ProItem::ReturnTrue); m_profileStack.pop(); q->releaseParsedProFile(pro); return ok; diff --git a/tools/linguist/shared/proitems.cpp b/tools/linguist/shared/proitems.cpp index 83d4a0f28..0d9f5c430 100644 --- a/tools/linguist/shared/proitems.cpp +++ b/tools/linguist/shared/proitems.cpp @@ -58,15 +58,21 @@ QString ProItem::comment() const } // --------------- ProBlock ---------------- + ProBlock::ProBlock(ProBlock *parent) { m_blockKind = 0; m_parent = parent; + m_refCount = 1; } ProBlock::~ProBlock() { - qDeleteAll(m_proitems); + foreach (ProItem *itm, m_proitems) + if (itm->kind() == BlockKind) + static_cast(itm)->deref(); + else + delete itm; } void ProBlock::appendItem(ProItem *proitem) @@ -109,15 +115,16 @@ ProItem::ProItemKind ProBlock::kind() const return ProItem::BlockKind; } -bool ProBlock::Accept(AbstractProItemVisitor *visitor) +ProItem::ProItemReturn ProBlock::Accept(AbstractProItemVisitor *visitor) { - visitor->visitBeginProBlock(this); - foreach (ProItem *item, m_proitems) { - if (!item->Accept(visitor)) - return false; - } + if (visitor->visitBeginProBlock(this) == ReturnSkip) + return ReturnTrue; + ProItemReturn rt = ReturnTrue; + foreach (ProItem *item, m_proitems) + if ((rt = item->Accept(visitor)) != ReturnTrue && rt != ReturnFalse) + break; visitor->visitEndProBlock(this); - return true; + return rt; } // --------------- ProVariable ---------------- @@ -149,15 +156,13 @@ QString ProVariable::variable() const return m_variable; } -bool ProVariable::Accept(AbstractProItemVisitor *visitor) +ProItem::ProItemReturn ProVariable::Accept(AbstractProItemVisitor *visitor) { visitor->visitBeginProVariable(this); - foreach (ProItem *item, m_proitems) { - if (!item->Accept(visitor)) - return false; - } + foreach (ProItem *item, m_proitems) + item->Accept(visitor); // cannot fail visitor->visitEndProVariable(this); - return true; + return ReturnTrue; } // --------------- ProValue ---------------- @@ -192,10 +197,10 @@ ProItem::ProItemKind ProValue::kind() const return ProItem::ValueKind; } -bool ProValue::Accept(AbstractProItemVisitor *visitor) +ProItem::ProItemReturn ProValue::Accept(AbstractProItemVisitor *visitor) { visitor->visitProValue(this); - return true; + return ReturnTrue; } // --------------- ProFunction ---------------- @@ -219,10 +224,9 @@ ProItem::ProItemKind ProFunction::kind() const return ProItem::FunctionKind; } -bool ProFunction::Accept(AbstractProItemVisitor *visitor) +ProItem::ProItemReturn ProFunction::Accept(AbstractProItemVisitor *visitor) { - visitor->visitProFunction(this); - return true; + return visitor->visitProFunction(this); } // --------------- ProCondition ---------------- @@ -246,10 +250,10 @@ ProItem::ProItemKind ProCondition::kind() const return ProItem::ConditionKind; } -bool ProCondition::Accept(AbstractProItemVisitor *visitor) +ProItem::ProItemReturn ProCondition::Accept(AbstractProItemVisitor *visitor) { visitor->visitProCondition(this); - return true; + return ReturnTrue; } // --------------- ProOperator ---------------- @@ -273,10 +277,10 @@ ProItem::ProItemKind ProOperator::kind() const return ProItem::OperatorKind; } -bool ProOperator::Accept(AbstractProItemVisitor *visitor) +ProItem::ProItemReturn ProOperator::Accept(AbstractProItemVisitor *visitor) { visitor->visitProOperator(this); - return true; + return ReturnTrue; } // --------------- ProFile ---------------- @@ -321,13 +325,12 @@ bool ProFile::isModified() const return m_modified; } -bool ProFile::Accept(AbstractProItemVisitor *visitor) +ProItem::ProItemReturn ProFile::Accept(AbstractProItemVisitor *visitor) { - visitor->visitBeginProFile(this); - foreach (ProItem *item, m_proitems) { - if (!item->Accept(visitor)) - return false; - } + ProItemReturn rt; + if ((rt = visitor->visitBeginProFile(this)) != ReturnTrue) + return rt; + ProBlock::Accept(visitor); // cannot fail return visitor->visitEndProFile(this); } diff --git a/tools/linguist/shared/proitems.h b/tools/linguist/shared/proitems.h index aad0ba2a5..be086acde 100644 --- a/tools/linguist/shared/proitems.h +++ b/tools/linguist/shared/proitems.h @@ -60,6 +60,13 @@ public: BlockKind }; + enum ProItemReturn { + ReturnFalse, + ReturnTrue, + ReturnSkip, + ReturnReturn + }; + ProItem() : m_lineNumber(0) {} virtual ~ProItem() {} @@ -68,7 +75,7 @@ public: void setComment(const QString &comment); QString comment() const; - virtual bool Accept(AbstractProItemVisitor *visitor) = 0; + virtual ProItemReturn Accept(AbstractProItemVisitor *visitor) = 0; int lineNumber() const { return m_lineNumber; } void setLineNumber(int lineNumber) { m_lineNumber = lineNumber; } @@ -86,7 +93,8 @@ public: ScopeContentsKind = 0x02, VariableKind = 0x04, ProFileKind = 0x08, - SingleLine = 0x10 + FunctionBodyKind = 0x10, + SingleLine = 0x80 }; ProBlock(ProBlock *parent); @@ -102,14 +110,18 @@ public: void setParent(ProBlock *parent); ProBlock *parent() const; + void ref() { ++m_refCount; } + void deref() { if (!--m_refCount) delete this; } + ProItem::ProItemKind kind() const; - virtual bool Accept(AbstractProItemVisitor *visitor); + virtual ProItemReturn Accept(AbstractProItemVisitor *visitor); protected: QList m_proitems; private: ProBlock *m_parent; int m_blockKind; + int m_refCount; }; class ProVariable : public ProBlock @@ -131,7 +143,7 @@ public: void setVariable(const QString &name); QString variable() const; - virtual bool Accept(AbstractProItemVisitor *visitor); + virtual ProItemReturn Accept(AbstractProItemVisitor *visitor); private: VariableOperator m_variableKind; QString m_variable; @@ -150,7 +162,7 @@ public: ProItem::ProItemKind kind() const; - virtual bool Accept(AbstractProItemVisitor *visitor); + virtual ProItemReturn Accept(AbstractProItemVisitor *visitor); private: QString m_value; ProVariable *m_variable; @@ -166,7 +178,7 @@ public: ProItem::ProItemKind kind() const; - virtual bool Accept(AbstractProItemVisitor *visitor); + virtual ProItemReturn Accept(AbstractProItemVisitor *visitor); private: QString m_text; }; @@ -181,7 +193,7 @@ public: ProItem::ProItemKind kind() const; - virtual bool Accept(AbstractProItemVisitor *visitor); + virtual ProItemReturn Accept(AbstractProItemVisitor *visitor); private: QString m_text; }; @@ -201,7 +213,7 @@ public: ProItem::ProItemKind kind() const; - virtual bool Accept(AbstractProItemVisitor *visitor); + virtual ProItemReturn Accept(AbstractProItemVisitor *visitor); private: OperatorKind m_operatorKind; }; @@ -219,7 +231,7 @@ public: void setModified(bool modified); bool isModified() const; - virtual bool Accept(AbstractProItemVisitor *visitor); + virtual ProItemReturn Accept(AbstractProItemVisitor *visitor); private: QString m_fileName; -- cgit v1.2.3 From b8159c06ca621b29fe1d61a1a52fb67223b5c0e0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 14 May 2009 17:14:37 +0200 Subject: implement {greater,less}Than(), equals(), clear() & unset() cherry-picked dbdbe92d5d66cbd466bcc0aea532ce79a034ab84 from creator --- tools/linguist/shared/profileevaluator.cpp | 58 +++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index c17f9f60f..ac653b0a8 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -1816,11 +1816,6 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( #if 0 case T_INFILE: case T_REQUIRES: - case T_GREATERTHAN: - case T_LESSTHAN: - case T_EQUALS: - case T_CLEAR: - case T_UNSET: case T_EVAL: case T_IF: case T_BREAK: @@ -1899,6 +1894,59 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( } return returnBool(values(args.first()).count() == args[1].toInt()); } + case T_GREATERTHAN: + case T_LESSTHAN: { + if (args.count() != 2) { + q->logMessage(format("%1(variable, value) requires two arguments.").arg(function)); + return ProItem::ReturnFalse; + } + QString rhs(args[1]), lhs(values(args[0]).join(QString(Option::field_sep))); + bool ok; + int rhs_int = rhs.toInt(&ok); + if (ok) { // do integer compare + int lhs_int = lhs.toInt(&ok); + if (ok) { + if (func_t == T_GREATERTHAN) + return returnBool(lhs_int > rhs_int); + return returnBool(lhs_int < rhs_int); + } + } + if (func_t == T_GREATERTHAN) + return returnBool(lhs > rhs); + return returnBool(lhs < rhs); + } + case T_EQUALS: + if (args.count() != 2) { + q->logMessage(format("%1(variable, value) requires two arguments.").arg(function)); + return ProItem::ReturnFalse; + } + return returnBool(values(args[0]).join(QString(Option::field_sep)) == args[1]); + case T_CLEAR: { + if (m_skipLevel && !m_cumulative) + return ProItem::ReturnFalse; + if (args.count() != 1) { + q->logMessage(format("%1(variable) requires one argument.").arg(function)); + return ProItem::ReturnFalse; + } + QHash::Iterator it = m_valuemap.find(args[0]); + if (it == m_valuemap.end()) + return ProItem::ReturnFalse; + it->clear(); + return ProItem::ReturnTrue; + } + case T_UNSET: { + if (m_skipLevel && !m_cumulative) + return ProItem::ReturnFalse; + if (args.count() != 1) { + q->logMessage(format("%1(variable) requires one argument.").arg(function)); + return ProItem::ReturnFalse; + } + QHash::Iterator it = m_valuemap.find(args[0]); + if (it == m_valuemap.end()) + return ProItem::ReturnFalse; + m_valuemap.erase(it); + return ProItem::ReturnTrue; + } case T_INCLUDE: { if (m_skipLevel && !m_cumulative) return ProItem::ReturnFalse; -- cgit v1.2.3 From 1aae7631bf7d98acdbe0c1e64846d96a0d914c70 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 18 May 2009 15:42:45 +0200 Subject: implement if() test cherry-picked d89338aa810861c636278be4a5bb5d8b23ce99b8 from creator --- tools/linguist/shared/profileevaluator.cpp | 82 +++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index ac653b0a8..daf75c8f1 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -1817,10 +1817,90 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( case T_INFILE: case T_REQUIRES: case T_EVAL: - case T_IF: case T_BREAK: case T_NEXT: #endif + case T_IF: { + if (args.count() != 1) { + q->logMessage(format("if(condition) requires one argument.")); + return ProItem::ReturnFalse; + } + QString cond = args.first(); + bool escaped = false; // This is more than qmake does + bool quoted = false; + bool ret = true; + bool orOp = false; + bool invert = false; + bool isFunc = false; + int parens = 0; + QString test; + test.reserve(20); + QString args; + args.reserve(50); + const QChar *d = cond.unicode(); + const QChar *ed = d + cond.length(); + while (d < ed) { + ushort c = (d++)->unicode(); + if (!escaped) { + if (c == '\\') { + escaped = true; + args += c; // Assume no-one quotes the test name + continue; + } else if (c == '"') { + quoted = !quoted; + args += c; // Ditto + continue; + } + } else { + escaped = false; + } + if (quoted) { + args += c; // Ditto + } else { + bool isOp = false; + if (c == '(') { + isFunc = true; + if (parens) + args += c; + ++parens; + } else if (c == ')') { + --parens; + if (parens) + args += c; + } else if (!parens) { + if (c == ':' || c == '|') + isOp = true; + else if (c == '!') + invert = true; + else + test += c; + } else { + args += c; + } + if (!parens && (isOp || d == ed)) { + // Yes, qmake doesn't shortcut evaluations here. We can't, either, + // as some test functions have side effects. + bool success; + if (isFunc) { + success = evaluateConditionalFunction(test, args); + } else { + success = isActiveConfig(test, true); + } + success ^= invert; + if (orOp) + ret |= success; + else + ret &= success; + orOp = (c == '|'); + invert = false; + isFunc = false; + test.clear(); + args.clear(); + } + } + } + return returnBool(ret); + } case T_CONFIG: { if (args.count() < 1 || args.count() > 2) { q->logMessage(format("CONFIG(config) requires one or two arguments.")); -- cgit v1.2.3 From a6ad14165e34b6c740e9d6a25c4443ed953b899b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 19 May 2009 19:00:06 +0200 Subject: support loops: implement for(), next() & break() cherry-picked 88de3e6a45a41baecb7e56e7cbab7fec30ac0a1c from creator --- tools/linguist/shared/abstractproitemvisitor.h | 3 + tools/linguist/shared/profileevaluator.cpp | 122 ++++++++++++++++++++++++- tools/linguist/shared/proitems.cpp | 25 ++++- tools/linguist/shared/proitems.h | 3 + 4 files changed, 149 insertions(+), 4 deletions(-) diff --git a/tools/linguist/shared/abstractproitemvisitor.h b/tools/linguist/shared/abstractproitemvisitor.h index dd72dfe09..43e79e085 100644 --- a/tools/linguist/shared/abstractproitemvisitor.h +++ b/tools/linguist/shared/abstractproitemvisitor.h @@ -53,6 +53,9 @@ struct AbstractProItemVisitor virtual ProItem::ProItemReturn visitBeginProBlock(ProBlock *block) = 0; virtual void visitEndProBlock(ProBlock *block) = 0; + virtual ProItem::ProItemReturn visitProLoopIteration() = 0; + virtual void visitProLoopCleanup() = 0; + virtual void visitBeginProVariable(ProVariable *variable) = 0; virtual void visitEndProVariable(ProVariable *variable) = 0; diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index daf75c8f1..d250217d8 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -173,6 +173,8 @@ public: // implementation of AbstractProItemVisitor ProItem::ProItemReturn visitBeginProBlock(ProBlock *block); void visitEndProBlock(ProBlock *block); + ProItem::ProItemReturn visitProLoopIteration(); + void visitProLoopCleanup(); void visitBeginProVariable(ProVariable *variable); void visitEndProVariable(ProVariable *variable); ProItem::ProItemReturn visitBeginProFile(ProFile *value); @@ -191,6 +193,7 @@ public: bool isActiveConfig(const QString &config, bool regex = false); QStringList expandVariableReferences(const QString &value); + void doVariableReplace(QString *str); QStringList evaluateExpandFunction(const QString &function, const QString &arguments); QString format(const char *format) const; @@ -222,6 +225,14 @@ public: QString m_origfile; QString m_oldPath; // To restore the current path to the path QStack m_profileStack; // To handle 'include(a.pri), so we can track back to 'a.pro' when finished with 'a.pri' + struct ProLoop { + QString variable; + QStringList oldVarVal; + QStringList list; + int index; + bool infinite; + }; + QStack m_loopStack; // we need the following two variables for handling // CONFIG = foo bar $$CONFIG @@ -247,6 +258,7 @@ public: #if !defined(__GNUC__) || __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3) Q_DECLARE_TYPEINFO(ProFileEvaluator::Private::State, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(ProFileEvaluator::Private::ProLoop, Q_MOVABLE_TYPE); #endif ProFileEvaluator::Private::Private(ProFileEvaluator *q_) @@ -627,6 +639,36 @@ void ProFileEvaluator::Private::visitEndProBlock(ProBlock *block) } } +ProItem::ProItemReturn ProFileEvaluator::Private::visitProLoopIteration() +{ + ProLoop &loop = m_loopStack.top(); + + if (loop.infinite) { + if (!loop.variable.isEmpty()) + m_valuemap[loop.variable] = QStringList(QString::number(loop.index++)); + if (loop.index > 1000) { + q->errorMessage(format("ran into infinite loop (> 1000 iterations).")); + return ProItem::ReturnFalse; + } + } else { + QString val; + do { + if (loop.index >= loop.list.count()) + return ProItem::ReturnFalse; + val = loop.list.at(loop.index++); + } while (val.isEmpty()); // stupid, but qmake is like that + m_valuemap[loop.variable] = QStringList(val); + } + return ProItem::ReturnTrue; +} + +void ProFileEvaluator::Private::visitProLoopCleanup() +{ + ProLoop &loop = m_loopStack.top(); + m_valuemap[loop.variable] = loop.oldVarVal; + m_loopStack.pop_back(); +} + void ProFileEvaluator::Private::visitBeginProVariable(ProVariable *variable) { m_lastVarName = variable->variable(); @@ -1017,6 +1059,11 @@ QString ProFileEvaluator::Private::currentDirectory() const return cur->directoryName(); } +void ProFileEvaluator::Private::doVariableReplace(QString *str) +{ + *str = expandVariableReferences(*str).join(QString(Option::field_sep)); +} + QStringList ProFileEvaluator::Private::expandVariableReferences(const QString &str) { QStringList ret; @@ -1720,7 +1767,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( T_EXISTS, T_EXPORT, T_CLEAR, T_UNSET, T_EVAL, T_CONFIG, T_SYSTEM, T_RETURN, T_BREAK, T_NEXT, T_DEFINED, T_CONTAINS, T_INFILE, T_COUNT, T_ISEMPTY, T_INCLUDE, T_LOAD, T_DEBUG, T_MESSAGE, T_IF, - T_DEFINE_TEST, T_DEFINE_REPLACE }; + T_FOR, T_DEFINE_TEST, T_DEFINE_REPLACE }; static QHash *functions = 0; if (!functions) { @@ -1753,6 +1800,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( functions->insert(QLatin1String("message"), T_MESSAGE); //v functions->insert(QLatin1String("warning"), T_MESSAGE); //v functions->insert(QLatin1String("error"), T_MESSAGE); //v + functions->insert(QLatin1String("for"), T_FOR); //v functions->insert(QLatin1String("defineTest"), T_DEFINE_TEST); //v functions->insert(QLatin1String("defineReplace"), T_DEFINE_REPLACE); //v } @@ -1817,9 +1865,79 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( case T_INFILE: case T_REQUIRES: case T_EVAL: +#endif + case T_FOR: { + if (m_cumulative) // This is a no-win situation, so just pretend it's no loop + return ProItem::ReturnTrue; + if (m_skipLevel) + return ProItem::ReturnFalse; + if (args.count() > 2 || args.count() < 1) { + q->logMessage(format("for({var, list|var, forever|ever})" + " requires one or two arguments.")); + return ProItem::ReturnFalse; + } + ProLoop loop; + loop.infinite = false; + loop.index = 0; + QString it_list; + if (args.count() == 1) { + doVariableReplace(&args[0]); + it_list = args[0]; + if (args[0] != QLatin1String("ever")) { + q->logMessage(format("for({var, list|var, forever|ever})" + " requires one or two arguments.")); + return ProItem::ReturnFalse; + } + it_list = QLatin1String("forever"); + } else { + loop.variable = args[0]; + loop.oldVarVal = m_valuemap.value(loop.variable); + doVariableReplace(&args[1]); + it_list = args[1]; + } + loop.list = m_valuemap[it_list]; + if (loop.list.isEmpty()) { + if (it_list == QLatin1String("forever")) { + loop.infinite = true; + } else { + int dotdot = it_list.indexOf(QLatin1String("..")); + if (dotdot != -1) { + bool ok; + int start = it_list.left(dotdot).toInt(&ok); + if (ok) { + int end = it_list.mid(dotdot+2).toInt(&ok); + if (ok) { + if (start < end) { + for (int i = start; i <= end; i++) + loop.list << QString::number(i); + } else { + for (int i = start; i >= end; i--) + loop.list << QString::number(i); + } + } + } + } + } + } + m_loopStack.push(loop); + m_sts.condition = true; + return ProItem::ReturnLoop; + } case T_BREAK: + if (m_skipLevel) + return ProItem::ReturnFalse; + if (!m_loopStack.isEmpty()) + return ProItem::ReturnBreak; + // ### missing: breaking out of multiline blocks + q->logMessage(format("unexpected break().")); + return ProItem::ReturnFalse; case T_NEXT: -#endif + if (m_skipLevel) + return ProItem::ReturnFalse; + if (!m_loopStack.isEmpty()) + return ProItem::ReturnNext; + q->logMessage(format("unexpected next().")); + return ProItem::ReturnFalse; case T_IF: { if (args.count() != 1) { q->logMessage(format("if(condition) requires one argument.")); diff --git a/tools/linguist/shared/proitems.cpp b/tools/linguist/shared/proitems.cpp index 0d9f5c430..905c67e62 100644 --- a/tools/linguist/shared/proitems.cpp +++ b/tools/linguist/shared/proitems.cpp @@ -120,9 +120,30 @@ ProItem::ProItemReturn ProBlock::Accept(AbstractProItemVisitor *visitor) if (visitor->visitBeginProBlock(this) == ReturnSkip) return ReturnTrue; ProItemReturn rt = ReturnTrue; - foreach (ProItem *item, m_proitems) - if ((rt = item->Accept(visitor)) != ReturnTrue && rt != ReturnFalse) + for (int i = 0; i < m_proitems.count(); ++i) { + rt = m_proitems.at(i)->Accept(visitor); + if (rt != ReturnTrue && rt != ReturnFalse) { + if (rt == ReturnLoop) { + rt = ReturnTrue; + while (visitor->visitProLoopIteration()) + for (int j = i; ++j < m_proitems.count(); ) { + rt = m_proitems.at(j)->Accept(visitor); + if (rt != ReturnTrue && rt != ReturnFalse) { + if (rt == ReturnNext) { + rt = ReturnTrue; + break; + } + if (rt == ReturnBreak) + rt = ReturnTrue; + goto do_break; + } + } + do_break: + visitor->visitProLoopCleanup(); + } break; + } + } visitor->visitEndProBlock(this); return rt; } diff --git a/tools/linguist/shared/proitems.h b/tools/linguist/shared/proitems.h index be086acde..7833be188 100644 --- a/tools/linguist/shared/proitems.h +++ b/tools/linguist/shared/proitems.h @@ -63,6 +63,9 @@ public: enum ProItemReturn { ReturnFalse, ReturnTrue, + ReturnBreak, + ReturnNext, + ReturnLoop, ReturnSkip, ReturnReturn }; -- cgit v1.2.3 From 56fe2c35c8dc07ec8cbbcdb4d0371837c5e77321 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 3 Jun 2009 19:04:43 +0200 Subject: expand arguments to s// operator cherry-picked e083ad2920d6e5695f309fe5b4b7c7d1b3060d61 from creator --- tools/linguist/shared/profileevaluator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index d250217d8..50027de39 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -874,7 +874,7 @@ void ProFileEvaluator::Private::visitProValue(ProValue *value) { // DEFINES ~= s/a/b/?[gqi] - // FIXME: qmake variable-expands val first. + doVariableReplace(&val); if (val.length() < 4 || val[0] != QLatin1Char('s')) { q->logMessage(format("the ~= operator can handle only the s/// function.")); break; -- cgit v1.2.3 From 219f4635dab0c5a8a56753bee429ebd6c935c623 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 May 2009 14:34:22 +0200 Subject: make message() & co. handling more qmake-like which basically means cutting features. heh cherry-picked a03f8643a7a1df8b7c857446a19cb25f9314cdb2 from creator --- tools/linguist/shared/profileevaluator.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index 50027de39..83fcb3e5e 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -2188,20 +2188,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( return ProItem::ReturnFalse; } QString msg = fixEnvVariables(args.first()); - if (function == QLatin1String("error")) { - QStringList parents; - foreach (ProFile *proFile, m_profileStack) - parents.append(proFile->fileName()); - if (!parents.isEmpty()) - parents.takeLast(); - if (parents.isEmpty()) - q->fileMessage(format("Project ERROR: %1").arg(msg)); - else - q->fileMessage(format("Project ERROR: %1. File was included from: '%2'") - .arg(msg).arg(parents.join(QLatin1String("', '")))); - } else { - q->fileMessage(format("Project MESSAGE: %1").arg(msg)); - } + q->fileMessage(QString::fromLatin1("Project %1: %2").arg(function.toUpper(), msg)); return ProItem::ReturnFalse; } #if 0 // Way too dangerous to enable. -- cgit v1.2.3 From c56cf26df98476b3679c859dfcdb7acb5f34012c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 May 2009 14:35:00 +0200 Subject: fix return value of error() & co cherry-picked bd0f0aa182b1422b942ae8efdc773c1a92344eb5 from creator --- tools/linguist/shared/profileevaluator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index 83fcb3e5e..aadf1176f 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -2189,7 +2189,8 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( } QString msg = fixEnvVariables(args.first()); q->fileMessage(QString::fromLatin1("Project %1: %2").arg(function.toUpper(), msg)); - return ProItem::ReturnFalse; + // ### Consider real termination in non-cumulative mode + return returnBool(function != QLatin1String("error")); } #if 0 // Way too dangerous to enable. case T_SYSTEM: { -- cgit v1.2.3 From 0e868a296df300e86c6e0055121b99b0d89da0f7 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 25 May 2009 15:58:58 +0200 Subject: micro-optimize: (x.toLower() == y) => !x.compare(y, Qt:: CaseInsensitive) cherry-picked dc0bc586462e2a74fba38f054d303d2226eec4e5 from creator --- tools/linguist/shared/profileevaluator.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index aadf1176f..26deed694 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -694,7 +694,7 @@ void ProFileEvaluator::Private::visitProOperator(ProOperator *oper) void ProFileEvaluator::Private::visitProCondition(ProCondition *cond) { if (!m_skipLevel) { - if (cond->text().toLower() == QLatin1String("else")) { + if (!cond->text().compare(QLatin1String("else"), Qt::CaseInsensitive)) { m_sts.condition = !m_sts.prevCondition; } else { m_sts.prevCondition = false; @@ -1516,7 +1516,7 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun bool singleLine = true; if (args.count() > 1) - singleLine = (args[1].toLower() == QLatin1String("true")); + singleLine = (!args[1].compare(QLatin1String("true"), Qt::CaseInsensitive)); QFile qfile(file); if (qfile.open(QIODevice::ReadOnly)) { @@ -1590,7 +1590,7 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun FILE *proc = QT_POPEN(args[0].toLatin1(), "r"); bool singleLine = true; if (args.count() > 1) - singleLine = (args[1].toLower() == QLatin1String("true")); + singleLine = (!args[1].compare(QLatin1String("true"), Qt::CaseInsensitive)); QString output; while (proc && !feof(proc)) { int read_in = int(fread(buff, 1, 255, proc)); @@ -1672,7 +1672,7 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun } else { bool recursive = false; if (args.count() == 2) - recursive = (args[1].toLower() == QLatin1String("true") || args[1].toInt()); + recursive = (!args[1].compare(QLatin1String("true"), Qt::CaseInsensitive) || args[1].toInt()); QStringList dirs; QString r = Option::fixPathToLocalOS(args[0]); int slash = r.lastIndexOf(QDir::separator()); @@ -2171,7 +2171,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( bool ignore_error = false; if (args.count() == 2) { QString sarg = args[1]; - ignore_error = (sarg.toLower() == QLatin1String("true") || sarg.toInt()); + ignore_error = (!sarg.compare(QLatin1String("true"), Qt::CaseInsensitive) || sarg.toInt()); } else if (args.count() != 1) { q->logMessage(format("load(feature) requires one or two arguments.")); return ProItem::ReturnFalse; @@ -2544,14 +2544,14 @@ ProFileEvaluator::TemplateType ProFileEvaluator::templateType() { QStringList templ = values(QLatin1String("TEMPLATE")); if (templ.count() >= 1) { - QString t = templ.last().toLower(); - if (t == QLatin1String("app")) + const QString &t = templ.last(); + if (!t.compare(QLatin1String("app"), Qt::CaseInsensitive)) return TT_Application; - if (t == QLatin1String("lib")) + if (!t.compare(QLatin1String("lib"), Qt::CaseInsensitive)) return TT_Library; - if (t == QLatin1String("script")) + if (!t.compare(QLatin1String("script"), Qt::CaseInsensitive)) return TT_Script; - if (t == QLatin1String("subdirs")) + if (!t.compare(QLatin1String("subdirs"), Qt::CaseInsensitive)) return TT_Subdirs; } return TT_Unknown; -- cgit v1.2.3 From 04ff3c6a2afdceb61126be9094d44beb35b600eb Mon Sep 17 00:00:00 2001 From: dt Date: Thu, 4 Jun 2009 15:25:07 +0200 Subject: Fix static leak to make valgrinding easier. Reviewed-By: ossi cherry-picked 98f8fc78bc0f8bcc0e36f19f9728d21063379a51 from creator --- tools/linguist/shared/profileevaluator.cpp | 124 ++++++++++++++--------------- 1 file changed, 61 insertions(+), 63 deletions(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index 26deed694..9a27eb094 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -1331,35 +1331,34 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun E_UPPER, E_LOWER, E_FILES, E_PROMPT, E_RE_ESCAPE, E_REPLACE }; - static QHash *expands = 0; - if (!expands) { - expands = new QHash; - expands->insert(QLatin1String("member"), E_MEMBER); - expands->insert(QLatin1String("first"), E_FIRST); - expands->insert(QLatin1String("last"), E_LAST); - expands->insert(QLatin1String("cat"), E_CAT); - expands->insert(QLatin1String("fromfile"), E_FROMFILE); // implementation disabled (see comment below) - expands->insert(QLatin1String("eval"), E_EVAL); - expands->insert(QLatin1String("list"), E_LIST); - expands->insert(QLatin1String("sprintf"), E_SPRINTF); - expands->insert(QLatin1String("join"), E_JOIN); - expands->insert(QLatin1String("split"), E_SPLIT); - expands->insert(QLatin1String("basename"), E_BASENAME); - expands->insert(QLatin1String("dirname"), E_DIRNAME); - expands->insert(QLatin1String("section"), E_SECTION); - expands->insert(QLatin1String("find"), E_FIND); - expands->insert(QLatin1String("system"), E_SYSTEM); - expands->insert(QLatin1String("unique"), E_UNIQUE); - expands->insert(QLatin1String("quote"), E_QUOTE); - expands->insert(QLatin1String("escape_expand"), E_ESCAPE_EXPAND); - expands->insert(QLatin1String("upper"), E_UPPER); - expands->insert(QLatin1String("lower"), E_LOWER); - expands->insert(QLatin1String("re_escape"), E_RE_ESCAPE); - expands->insert(QLatin1String("files"), E_FILES); - expands->insert(QLatin1String("prompt"), E_PROMPT); // interactive, so cannot be implemented - expands->insert(QLatin1String("replace"), E_REPLACE); + static QHash expands; + if (expands.isEmpty()) { + expands.insert(QLatin1String("member"), E_MEMBER); + expands.insert(QLatin1String("first"), E_FIRST); + expands.insert(QLatin1String("last"), E_LAST); + expands.insert(QLatin1String("cat"), E_CAT); + expands.insert(QLatin1String("fromfile"), E_FROMFILE); // implementation disabled (see comment below) + expands.insert(QLatin1String("eval"), E_EVAL); + expands.insert(QLatin1String("list"), E_LIST); + expands.insert(QLatin1String("sprintf"), E_SPRINTF); + expands.insert(QLatin1String("join"), E_JOIN); + expands.insert(QLatin1String("split"), E_SPLIT); + expands.insert(QLatin1String("basename"), E_BASENAME); + expands.insert(QLatin1String("dirname"), E_DIRNAME); + expands.insert(QLatin1String("section"), E_SECTION); + expands.insert(QLatin1String("find"), E_FIND); + expands.insert(QLatin1String("system"), E_SYSTEM); + expands.insert(QLatin1String("unique"), E_UNIQUE); + expands.insert(QLatin1String("quote"), E_QUOTE); + expands.insert(QLatin1String("escape_expand"), E_ESCAPE_EXPAND); + expands.insert(QLatin1String("upper"), E_UPPER); + expands.insert(QLatin1String("lower"), E_LOWER); + expands.insert(QLatin1String("re_escape"), E_RE_ESCAPE); + expands.insert(QLatin1String("files"), E_FILES); + expands.insert(QLatin1String("prompt"), E_PROMPT); // interactive, so cannot be implemented + expands.insert(QLatin1String("replace"), E_REPLACE); } - ExpandFunc func_t = ExpandFunc(expands->value(func.toLower())); + ExpandFunc func_t = ExpandFunc(expands.value(func.toLower())); QStringList ret; @@ -1769,43 +1768,42 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( T_COUNT, T_ISEMPTY, T_INCLUDE, T_LOAD, T_DEBUG, T_MESSAGE, T_IF, T_FOR, T_DEFINE_TEST, T_DEFINE_REPLACE }; - static QHash *functions = 0; - if (!functions) { - functions = new QHash; - functions->insert(QLatin1String("requires"), T_REQUIRES); - functions->insert(QLatin1String("greaterThan"), T_GREATERTHAN); - functions->insert(QLatin1String("lessThan"), T_LESSTHAN); - functions->insert(QLatin1String("equals"), T_EQUALS); - functions->insert(QLatin1String("isEqual"), T_EQUALS); - functions->insert(QLatin1String("exists"), T_EXISTS); - functions->insert(QLatin1String("export"), T_EXPORT); - functions->insert(QLatin1String("clear"), T_CLEAR); - functions->insert(QLatin1String("unset"), T_UNSET); - functions->insert(QLatin1String("eval"), T_EVAL); - functions->insert(QLatin1String("CONFIG"), T_CONFIG); - functions->insert(QLatin1String("if"), T_IF); - functions->insert(QLatin1String("isActiveConfig"), T_CONFIG); - functions->insert(QLatin1String("system"), T_SYSTEM); - functions->insert(QLatin1String("return"), T_RETURN); - functions->insert(QLatin1String("break"), T_BREAK); - functions->insert(QLatin1String("next"), T_NEXT); - functions->insert(QLatin1String("defined"), T_DEFINED); - functions->insert(QLatin1String("contains"), T_CONTAINS); - functions->insert(QLatin1String("infile"), T_INFILE); - functions->insert(QLatin1String("count"), T_COUNT); - functions->insert(QLatin1String("isEmpty"), T_ISEMPTY); - functions->insert(QLatin1String("load"), T_LOAD); //v - functions->insert(QLatin1String("include"), T_INCLUDE); //v - functions->insert(QLatin1String("debug"), T_DEBUG); - functions->insert(QLatin1String("message"), T_MESSAGE); //v - functions->insert(QLatin1String("warning"), T_MESSAGE); //v - functions->insert(QLatin1String("error"), T_MESSAGE); //v - functions->insert(QLatin1String("for"), T_FOR); //v - functions->insert(QLatin1String("defineTest"), T_DEFINE_TEST); //v - functions->insert(QLatin1String("defineReplace"), T_DEFINE_REPLACE); //v + static QHash functions; + if (functions.isEmpty()) { + functions.insert(QLatin1String("requires"), T_REQUIRES); + functions.insert(QLatin1String("greaterThan"), T_GREATERTHAN); + functions.insert(QLatin1String("lessThan"), T_LESSTHAN); + functions.insert(QLatin1String("equals"), T_EQUALS); + functions.insert(QLatin1String("isEqual"), T_EQUALS); + functions.insert(QLatin1String("exists"), T_EXISTS); + functions.insert(QLatin1String("export"), T_EXPORT); + functions.insert(QLatin1String("clear"), T_CLEAR); + functions.insert(QLatin1String("unset"), T_UNSET); + functions.insert(QLatin1String("eval"), T_EVAL); + functions.insert(QLatin1String("CONFIG"), T_CONFIG); + functions.insert(QLatin1String("if"), T_IF); + functions.insert(QLatin1String("isActiveConfig"), T_CONFIG); + functions.insert(QLatin1String("system"), T_SYSTEM); + functions.insert(QLatin1String("return"), T_RETURN); + functions.insert(QLatin1String("break"), T_BREAK); + functions.insert(QLatin1String("next"), T_NEXT); + functions.insert(QLatin1String("defined"), T_DEFINED); + functions.insert(QLatin1String("contains"), T_CONTAINS); + functions.insert(QLatin1String("infile"), T_INFILE); + functions.insert(QLatin1String("count"), T_COUNT); + functions.insert(QLatin1String("isEmpty"), T_ISEMPTY); + functions.insert(QLatin1String("load"), T_LOAD); //v + functions.insert(QLatin1String("include"), T_INCLUDE); //v + functions.insert(QLatin1String("debug"), T_DEBUG); + functions.insert(QLatin1String("message"), T_MESSAGE); //v + functions.insert(QLatin1String("warning"), T_MESSAGE); //v + functions.insert(QLatin1String("error"), T_MESSAGE); //v + functions.insert(QLatin1String("for"), T_FOR); //v + functions.insert(QLatin1String("defineTest"), T_DEFINE_TEST); //v + functions.insert(QLatin1String("defineReplace"), T_DEFINE_REPLACE); //v } - TestFunc func_t = (TestFunc)functions->value(function); + TestFunc func_t = (TestFunc)functions.value(function); switch (func_t) { case T_DEFINE_TEST: -- cgit v1.2.3 From e519e1363527429c0ce2a17e894fc3b542787497 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 20 Jul 2009 14:25:33 +0200 Subject: absolute lupdate path for the new test as well --- tests/auto/linguist/lrelease/tst_lrelease.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/linguist/lrelease/tst_lrelease.cpp b/tests/auto/linguist/lrelease/tst_lrelease.cpp index 45e9d6b16..4928a4f46 100644 --- a/tests/auto/linguist/lrelease/tst_lrelease.cpp +++ b/tests/auto/linguist/lrelease/tst_lrelease.cpp @@ -200,7 +200,7 @@ void tst_lrelease::compressed() void tst_lrelease::idbased() { - QVERIFY(!QProcess::execute("lrelease -idbased testdata/idbased.ts")); + QVERIFY(!QProcess::execute(binDir + "/lrelease -idbased testdata/idbased.ts")); QTranslator translator; QVERIFY(translator.load("testdata/idbased.qm")); -- cgit v1.2.3 From f634c8024dcdc2b26642cc7987c9a70ed28697d2 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 20 Jul 2009 14:36:26 +0200 Subject: doc: Changed several \reimp to \internal The base function was \internal pr private. --- src/gui/graphicsview/qgraphicsscenelinearindex.cpp | 2 +- src/gui/image/qpixmapfilter.cpp | 10 ---------- src/gui/itemviews/qtreeview.cpp | 2 +- src/gui/widgets/qdatetimeedit.cpp | 4 ---- src/network/access/qhttp.cpp | 4 ++-- src/qt3support/canvas/q3canvas.cpp | 2 +- src/qt3support/network/q3http.cpp | 4 ++-- src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp | 2 +- 8 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscenelinearindex.cpp b/src/gui/graphicsview/qgraphicsscenelinearindex.cpp index 45cf70212..52bbc79b4 100644 --- a/src/gui/graphicsview/qgraphicsscenelinearindex.cpp +++ b/src/gui/graphicsview/qgraphicsscenelinearindex.cpp @@ -77,7 +77,7 @@ /*! \fn void QGraphicsSceneLinearIndex::clear() - \reimp + \internal Clear the all the BSP index. */ diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp index c5f3663bd..184bd6587 100644 --- a/src/gui/image/qpixmapfilter.cpp +++ b/src/gui/image/qpixmapfilter.cpp @@ -293,8 +293,6 @@ int QPixmapConvolutionFilter::columns() const /*! - \reimp - \internal */ QRectF QPixmapConvolutionFilter::boundingRectFor(const QRectF &rect) const @@ -405,8 +403,6 @@ static void convolute( } /*! - \reimp - \internal */ void QPixmapConvolutionFilter::draw(QPainter *painter, const QPointF &p, const QPixmap &src, const QRectF& srcRect) const @@ -581,8 +577,6 @@ void QPixmapColorizeFilter::setColor(const QColor &color) } /*! - \reimp - \internal */ void QPixmapColorizeFilter::draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect) const @@ -805,8 +799,6 @@ void QPixmapDropShadowFilter::setOffset(const QPointF &offset) */ /*! - \reimp - \internal */ QRectF QPixmapDropShadowFilter::boundingRectFor(const QRectF &rect) const @@ -822,8 +814,6 @@ QRectF QPixmapDropShadowFilter::boundingRectFor(const QRectF &rect) const } /*! - \reimp - \internal */ void QPixmapDropShadowFilter::draw(QPainter *p, diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp index f7fa3ad45..7536d72c6 100644 --- a/src/gui/itemviews/qtreeview.cpp +++ b/src/gui/itemviews/qtreeview.cpp @@ -2853,7 +2853,7 @@ int QTreeView::rowHeight(const QModelIndex &index) const } /*! - \reimp + \internal */ void QTreeView::horizontalScrollbarAction(int action) { diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp index 1a5fa8d4a..5ddf7f774 100644 --- a/src/gui/widgets/qdatetimeedit.cpp +++ b/src/gui/widgets/qdatetimeedit.cpp @@ -1934,7 +1934,6 @@ QDateTime QDateTimeEditPrivate::validateAndInterpret(QString &input, int &positi /*! \internal - \reimp */ QString QDateTimeEditPrivate::textFromValue(const QVariant &f) const @@ -1945,7 +1944,6 @@ QString QDateTimeEditPrivate::textFromValue(const QVariant &f) const /*! \internal - \reimp This function's name is slightly confusing; it is not to be confused with QAbstractSpinBox::valueFromText(). @@ -2103,7 +2101,6 @@ QDateTime QDateTimeEditPrivate::stepBy(int sectionIndex, int steps, bool test) c /*! \internal - \reimp */ void QDateTimeEditPrivate::emitSignals(EmitPolicy ep, const QVariant &old) @@ -2133,7 +2130,6 @@ void QDateTimeEditPrivate::emitSignals(EmitPolicy ep, const QVariant &old) /*! \internal - \reimp */ void QDateTimeEditPrivate::_q_editorCursorPositionChanged(int oldpos, int newpos) diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp index 7a02ab614..790b48a2d 100644 --- a/src/network/access/qhttp.cpp +++ b/src/network/access/qhttp.cpp @@ -1152,7 +1152,7 @@ int QHttpResponseHeader::minorVersion() const return d->minVer; } -/*! \reimp +/*! \internal */ bool QHttpResponseHeader::parseLine(const QString &line, int number) { @@ -1366,7 +1366,7 @@ int QHttpRequestHeader::minorVersion() const return d->minVer; } -/*! \reimp +/*! \internal */ bool QHttpRequestHeader::parseLine(const QString &line, int number) { diff --git a/src/qt3support/canvas/q3canvas.cpp b/src/qt3support/canvas/q3canvas.cpp index 034aff579..948935c65 100644 --- a/src/qt3support/canvas/q3canvas.cpp +++ b/src/qt3support/canvas/q3canvas.cpp @@ -4828,7 +4828,7 @@ void Q3CanvasText::draw(QPainter& painter) } /*! - \reimp + \internal */ void Q3CanvasText::changeChunks() { diff --git a/src/qt3support/network/q3http.cpp b/src/qt3support/network/q3http.cpp index 59adc2713..dba4e88ce 100644 --- a/src/qt3support/network/q3http.cpp +++ b/src/qt3support/network/q3http.cpp @@ -785,7 +785,7 @@ int Q3HttpResponseHeader::minorVersion() const return minVer; } -/*! \reimp +/*! \internal */ bool Q3HttpResponseHeader::parseLine( const QString& line, int number ) { @@ -952,7 +952,7 @@ int Q3HttpRequestHeader::minorVersion() const return minVer; } -/*! \reimp +/*! \internal */ bool Q3HttpRequestHeader::parseLine( const QString& line, int number ) { diff --git a/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp b/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp index c5e21ef48..5b58c52be 100644 --- a/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp +++ b/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp @@ -323,7 +323,7 @@ QScriptDebuggerBackend *QScriptEngineDebuggerFrontend::backend() const } /*! - \reimp + \internal */ void QScriptEngineDebuggerFrontend::processCommand(int id, const QScriptDebuggerCommand &command) { -- cgit v1.2.3 From bf305bc2e488ad4f08c49767246f31a81218991e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 20 Jul 2009 15:27:44 +0200 Subject: Fixes build for Windows Mobile Reviewed-by: Joerg --- src/gui/dialogs/qfiledialog_win.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/gui/dialogs/qfiledialog_win.cpp index 6e9e776ff..9bf82c334 100644 --- a/src/gui/dialogs/qfiledialog_win.cpp +++ b/src/gui/dialogs/qfiledialog_win.cpp @@ -60,7 +60,6 @@ #include -#include #include #if defined(__IFileDialog_INTERFACE_DEFINED__) \ -- cgit v1.2.3 From c1ae1c566bc78faae2c7861c4c6c0a7a341d034f Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Mon, 20 Jul 2009 16:28:00 +0200 Subject: Fixed includes in the gestures public headers. Reviewed-by: trustme --- src/gui/kernel/qgesture.h | 12 ++++++------ src/gui/kernel/qstandardgestures.h | 7 +++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/gui/kernel/qgesture.h b/src/gui/kernel/qgesture.h index cc46916db..1cd9caeaa 100644 --- a/src/gui/kernel/qgesture.h +++ b/src/gui/kernel/qgesture.h @@ -42,12 +42,12 @@ #ifndef QGESTURE_H #define QGESTURE_H -#include "qobject.h" -#include "qlist.h" -#include "qdatetime.h" -#include "qpoint.h" -#include "qrect.h" -#include "qmetatype.h" +#include +#include +#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/gui/kernel/qstandardgestures.h b/src/gui/kernel/qstandardgestures.h index db96ef62f..2234702cc 100644 --- a/src/gui/kernel/qstandardgestures.h +++ b/src/gui/kernel/qstandardgestures.h @@ -42,11 +42,10 @@ #ifndef QSTANDARDGESTURES_H #define QSTANDARDGESTURES_H -#include "qevent.h" -#include "qbasictimer.h" -#include "qdebug.h" +#include +#include -#include "qgesture.h" +#include QT_BEGIN_HEADER -- cgit v1.2.3 From 19c5938da4832fc5a92d55e69c201b408a329517 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 20 Jul 2009 15:28:22 +0200 Subject: Doc: Make QAction::priority/Priority documentation clearer --- src/gui/kernel/qaction.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index 5952320ce..e7cb5c297 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -915,15 +915,13 @@ QString QAction::whatsThis() const This enum defines priorities for actions in user interface. - \value LowPriority The action will not be prioritized in - collapsible layouts when not enough space for all actions is - available. + \value LowPriority The action should not be prioritized in + the user interface. \value NormalPriority - \value HighPriority The action will be prioritized by - collapsible layouts when not enough space for all actions is - available. + \value HighPriority The action should be prioritized in + the user interface. \sa priority */ @@ -936,9 +934,11 @@ QString QAction::whatsThis() const \brief the actions's priority in the user interface. This property can be set to indicate how the action should be prioritized - in a collapsible layout. For instance, when toolbars have the Qt::ToolButtonTextBesideIcon - mode set, then lower priority actions will hide text labels to preserve - horizontal space if necessary. + in the user interface. + + For instance, when toolbars have the Qt::ToolButtonTextBesideIcon + mode set, then actions with LowPriority will not show the text + labels. */ void QAction::setPriority(Priority priority) { -- cgit v1.2.3 From 52bc8a751aa5b02028aaef915ac7a97664acb747 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 20 Jul 2009 17:26:15 +0200 Subject: Doc: small improvements --- src/corelib/codecs/qtextcodec.cpp | 25 ++++++++++++++++++++----- src/gui/widgets/qtoolbar.cpp | 2 +- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index bdf7cd5e4..f49e34a53 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -1536,9 +1536,13 @@ QTextCodec *QTextCodec::codecForHtml(const QByteArray &ba, QTextCodec *defaultCo } /*! - \overload + \overload - If the codec cannot be detected, this overload returns a Latin-1 QTextCodec. + Tries to detect the encoding of the provided snippet of HTML in + the given byte array, \a ba, by checking the BOM (Byte Order Mark) + and the content-type meta header and returns a QTextCodec instance + that is capable of decoding the html to unicode. If the codec cannot + be detected, this overload returns a Latin-1 QTextCodec. */ QTextCodec *QTextCodec::codecForHtml(const QByteArray &ba) { @@ -1550,10 +1554,13 @@ QTextCodec *QTextCodec::codecForHtml(const QByteArray &ba) Tries to detect the encoding of the provided snippet \a ba by using the BOM (Byte Order Mark) and returns a QTextCodec instance - that is capable of decoding the text to unicode. If the codec + that is capable of decoding the text to unicode. If the codec cannot be detected from the content provided, \a defaultCodec is returned. + The behavior of this function is undefined if \a ba is not + encoded in unicode. + \sa codecForHtml() */ QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba, QTextCodec *defaultCodec) @@ -1591,9 +1598,17 @@ QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba, QTextCodec *defaul } /*! - \overload + \overload + + Tries to detect the encoding of the provided snippet \a ba by + using the BOM (Byte Order Mark) and returns a QTextCodec instance + that is capable of decoding the text to unicode. If the codec + cannot be detected, this overload returns a Latin-1 QTextCodec. + + The behavior of this function is undefined if \a ba is not + encoded in unicode. - If the codec cannot be detected, this overload returns a Latin-1 QTextCodec. + \sa codecForHtml() */ QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba) { diff --git a/src/gui/widgets/qtoolbar.cpp b/src/gui/widgets/qtoolbar.cpp index b65f1ba52..426c3e137 100644 --- a/src/gui/widgets/qtoolbar.cpp +++ b/src/gui/widgets/qtoolbar.cpp @@ -874,7 +874,7 @@ QAction *QToolBar::insertSeparator(QAction *before) If you add a QToolButton with this method, the tools bar's Qt::ToolButtonStyle will not be respected. - Note: You should use QAction::setVisible() to change the + \note You should use QAction::setVisible() to change the visibility of the widget. Using QWidget::setVisible(), QWidget::show() and QWidget::hide() does not work. -- cgit v1.2.3 From 20e056ec5f8abf68beee9bb45bbaf3570a4bd9c6 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 20 Jul 2009 17:36:47 +0200 Subject: Doc: clarify relevance for QGraphicsItem and add a few \sa --- src/gui/kernel/qevent.cpp | 110 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 26 deletions(-) diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 4fc3643d6..d1eb5cdb8 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -3531,21 +3531,23 @@ QMenubarUpdatedEvent::QMenubarUpdatedEvent(QMenuBar * const menuBar) #endif /*! \class QTouchEvent - \brief The QTouchEvent class contains parameters that describe a touch event -. + \brief The QTouchEvent class contains parameters that describe a touch event. \since 4.6 \ingroup events Touch events occur when pressing, releasing, or moving one or more touch points on a touch device (such as a touch-screen or - track-pad), and if the widget has the Qt::WA_AcceptTouchEvents - attribute. + track-pad). To receive touch events, widgets have to have the + Qt::WA_AcceptTouchEvents attribute set and graphics items need to have + the \l{QGraphicsItem::setAcceptsTouchEvents}{setAcceptsTouchEvents} + attribute set to true. All touch events are of type QEvent::TouchBegin, QEvent::TouchUpdate, or QEvent::TouchEnd. The touchPoints() function returns a list of all touch points contained in the event. Information about each touch point can be retreived using the - QTouchEvent::TouchPoint class. + QTouchEvent::TouchPoint class. The Qt::TouchPointState enum + describes the different states that a touch point may have. Similar to QMouseEvent, Qt automatically grabs each touch point on the first press inside a widget; the widget will receive all @@ -3563,10 +3565,11 @@ QMenubarUpdatedEvent::QMenubarUpdatedEvent(QMenuBar * const menuBar) then mouse events are simulated from the state of the first touch point. - The Qt::TouchPointState enum describes the different states that a - touch point may have. + Reimplement QWidget::event() for widgets and QGraphicsItem::sceneEvent() + for items in a graphics view to receive touch events. - QTouchEvent::TouchPoint Qt::TouchPointState Qt::WA_AcceptTouchEvents + \sa QTouchEvent::TouchPoint, Qt::TouchPointState, Qt::WA_AcceptTouchEvents, + QGraphicsItem::acceptTouchEvents */ /*! \enum Qt::TouchPointState @@ -3584,13 +3587,7 @@ QMenubarUpdatedEvent::QMenubarUpdatedEvent(QMenuBar * const menuBar) \omitvalue TouchPointPrimary */ -/*! \class QTouchEvent::TouchPoint - \brief The QTouchEvent::TouchPoint class provide information about a touch point in a QTouchEvent. - \since 4.6 -*/ - /*! \enum QTouchEvent::DeviceType - \since 4.6 This enum represents the type of device that generated a QTouchEvent. @@ -3669,6 +3666,11 @@ QTouchEvent::~QTouchEvent() Sets the list of touch points for this event. */ +/*! \class QTouchEvent::TouchPoint + \brief The QTouchEvent::TouchPoint class provides information about a touch point in a QTouchEvent. + \since 4.6 +*/ + /*! \internal Constructs a QTouchEvent::TouchPoint for use in a QTouchEvent. @@ -3728,7 +3730,9 @@ bool QTouchEvent::TouchPoint::isPrimary() const /*! Returns the position of this touch point, relative to the widget - or item that received the event. + or QGraphicsItem that received the event. + + \sa startPos(), lastPos(), screenPos(), scenePos(), normalizedPos() */ QPointF QTouchEvent::TouchPoint::pos() const { @@ -3737,6 +3741,13 @@ QPointF QTouchEvent::TouchPoint::pos() const /*! Returns the scene position of this touch point. + + The scene position is the position in QGraphicsScene coordinates + if the QTouchEvent is handled by a QGraphicsItem::touchEvent() + reimplementation, and identical to the screen position for + widgets. + + \sa startScenePos(), lastScenePos(), pos() */ QPointF QTouchEvent::TouchPoint::scenePos() const { @@ -3745,6 +3756,8 @@ QPointF QTouchEvent::TouchPoint::scenePos() const /*! Returns the screen position of this touch point. + + \sa startScreenPos(), lastScreenPos(), pos() */ QPointF QTouchEvent::TouchPoint::screenPos() const { @@ -3752,8 +3765,12 @@ QPointF QTouchEvent::TouchPoint::screenPos() const } /*! - Returns the position of this touch point. The coordinates are normalized to size of the touch - device, i.e. (0,0) is the top-left corner and (1,1) is the bottom-right corner. + Returns the normalized position of this touch point. + + The coordinates are normalized to the size of the touch device, + i.e. (0,0) is the top-left corner and (1,1) is the bottom-right corner. + + \sa startNormalizedPos(), lastNormalizedPos(), pos() */ QPointF QTouchEvent::TouchPoint::normalizedPos() const { @@ -3762,7 +3779,9 @@ QPointF QTouchEvent::TouchPoint::normalizedPos() const /*! Returns the starting position of this touch point, relative to the - widget that received the event. + widget or QGraphicsItem that received the event. + + \sa pos(), lastPos() */ QPointF QTouchEvent::TouchPoint::startPos() const { @@ -3771,6 +3790,13 @@ QPointF QTouchEvent::TouchPoint::startPos() const /*! Returns the starting scene position of this touch point. + + The scene position is the position in QGraphicsScene coordinates + if the QTouchEvent is handled by a QGraphicsItem::touchEvent() + reimplementation, and identical to the screen position for + widgets. + + \sa scenePos(), lastScenePos() */ QPointF QTouchEvent::TouchPoint::startScenePos() const { @@ -3779,6 +3805,8 @@ QPointF QTouchEvent::TouchPoint::startScenePos() const /*! Returns the starting screen position of this touch point. + + \sa screenPos(), lastScreenPos() */ QPointF QTouchEvent::TouchPoint::startScreenPos() const { @@ -3786,8 +3814,12 @@ QPointF QTouchEvent::TouchPoint::startScreenPos() const } /*! - Returns the starting position of this touch point. The coordinates are normalized to size of - the touch device, i.e. (0,0) is the top-left corner and (1,1) is the bottom-right corner. + Returns the normalized starting position of this touch point. + + The coordinates are normalized to the size of the touch device, + i.e. (0,0) is the top-left corner and (1,1) is the bottom-right corner. + + \sa normalizedPos(), lastNormalizedPos() */ QPointF QTouchEvent::TouchPoint::startNormalizedPos() const { @@ -3796,7 +3828,9 @@ QPointF QTouchEvent::TouchPoint::startNormalizedPos() const /*! Returns the position of this touch point from the previous touch - event, relative to the widget that received the event. + event, relative to the widget or QGraphicsItem that received the event. + + \sa pos(), startPos() */ QPointF QTouchEvent::TouchPoint::lastPos() const { @@ -3806,6 +3840,13 @@ QPointF QTouchEvent::TouchPoint::lastPos() const /*! Returns the scene position of this touch point from the previous touch event. + + The scene position is the position in QGraphicsScene coordinates + if the QTouchEvent is handled by a QGraphicsItem::touchEvent() + reimplementation, and identical to the screen position for + widgets. + + \sa scenePos(), startScenePos() */ QPointF QTouchEvent::TouchPoint::lastScenePos() const { @@ -3815,6 +3856,8 @@ QPointF QTouchEvent::TouchPoint::lastScenePos() const /*! Returns the screen position of this touch point from the previous touch event. + + \sa screenPos(), startScreenPos() */ QPointF QTouchEvent::TouchPoint::lastScreenPos() const { @@ -3822,9 +3865,13 @@ QPointF QTouchEvent::TouchPoint::lastScreenPos() const } /*! - Returns the position of this touch point from the previous touch event. The coordinates are - normalized to size of the touch device, i.e. (0,0) is the top-left corner and (1,1) is the - bottom-right corner. + Returns the normalized position of this touch point from the + previous touch event. + + The coordinates are normalized to the size of the touch device, + i.e. (0,0) is the top-left corner and (1,1) is the bottom-right corner. + + \sa normalizedPos(), startNormalizedPos() */ QPointF QTouchEvent::TouchPoint::lastNormalizedPos() const { @@ -3832,8 +3879,11 @@ QPointF QTouchEvent::TouchPoint::lastNormalizedPos() const } /*! - Returns the rect for this touch point. The rect is centered around the point returned by pos(). - Note this function returns an empty rect if the device does not report touch point sizes. + Returns the rect for this touch point, relative to the widget + or QGraphicsItem that received the event. The rect is centered + around the point returned by pos(). + + \note This function returns an empty rect if the device does not report touch point sizes. */ QRectF QTouchEvent::TouchPoint::rect() const { @@ -3842,6 +3892,10 @@ QRectF QTouchEvent::TouchPoint::rect() const /*! Returns the rect for this touch point in scene coordinates. + + \note This function returns an empty rect if the device does not report touch point sizes. + + \sa scenePos(), rect() */ QRectF QTouchEvent::TouchPoint::sceneRect() const { @@ -3850,6 +3904,10 @@ QRectF QTouchEvent::TouchPoint::sceneRect() const /*! Returns the rect for this touch point in screen coordinates. + + \note This function returns an empty rect if the device does not report touch point sizes. + + \sa screenPos(), rect() */ QRectF QTouchEvent::TouchPoint::screenRect() const { -- cgit v1.2.3 From dc76e15214c2ad2f49bf62bc969a89438dc36ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= Date: Mon, 20 Jul 2009 17:42:39 +0200 Subject: Return selectedFilter in QGtkStyle file dialogs Function setupGtkFileChooser is modified to optionally build a map of GtkFileFilters. File dialog methods then use gtk_file_chooser_get_filename to get the current GtkFileFilter and look it up in the map produced by setupGtkFileChooser. This value is then saved in the selectedFilter pointer. Merge-request: 846 Reviewed-by: Jens Bache-Wiig --- src/gui/styles/gtksymbols.cpp | 30 +++++++++++++++++++++++++----- src/gui/styles/gtksymbols_p.h | 2 ++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/gui/styles/gtksymbols.cpp b/src/gui/styles/gtksymbols.cpp index 2b3245031..c2c787612 100644 --- a/src/gui/styles/gtksymbols.cpp +++ b/src/gui/styles/gtksymbols.cpp @@ -167,6 +167,7 @@ Ptr_gtk_file_filter_set_name QGtk::gtk_file_filter_set_name = 0; Ptr_gtk_file_filter_add_pattern QGtk::gtk_file_filter_add_pattern = 0; Ptr_gtk_file_chooser_add_filter QGtk::gtk_file_chooser_add_filter = 0; Ptr_gtk_file_chooser_set_filter QGtk::gtk_file_chooser_set_filter = 0; +Ptr_gtk_file_chooser_get_filter QGtk::gtk_file_chooser_get_filter = 0; Ptr_gtk_file_chooser_dialog_new QGtk::gtk_file_chooser_dialog_new = 0; Ptr_gtk_file_chooser_set_current_folder QGtk::gtk_file_chooser_set_current_folder = 0; Ptr_gtk_file_chooser_get_filename QGtk::gtk_file_chooser_get_filename = 0; @@ -221,6 +222,7 @@ static void resolveGtk() QGtk::gtk_file_filter_add_pattern = (Ptr_gtk_file_filter_add_pattern)libgtk.resolve("gtk_file_filter_add_pattern"); QGtk::gtk_file_chooser_add_filter = (Ptr_gtk_file_chooser_add_filter)libgtk.resolve("gtk_file_chooser_add_filter"); QGtk::gtk_file_chooser_set_filter = (Ptr_gtk_file_chooser_set_filter)libgtk.resolve("gtk_file_chooser_set_filter"); + QGtk::gtk_file_chooser_get_filter = (Ptr_gtk_file_chooser_get_filter)libgtk.resolve("gtk_file_chooser_get_filter"); QGtk::gtk_file_chooser_dialog_new = (Ptr_gtk_file_chooser_dialog_new)libgtk.resolve("gtk_file_chooser_dialog_new"); QGtk::gtk_file_chooser_set_current_folder = (Ptr_gtk_file_chooser_set_current_folder)libgtk.resolve("gtk_file_chooser_set_current_folder"); QGtk::gtk_file_chooser_get_filename = (Ptr_gtk_file_chooser_get_filename)libgtk.resolve("gtk_file_chooser_get_filename"); @@ -736,7 +738,8 @@ extern QStringList qt_make_filter_list(const QString &filter); static void setupGtkFileChooser(GtkWidget* gtkFileChooser, QWidget *parent, const QString &dir, const QString &filter, QString *selectedFilter, - QFileDialog::Options options, bool isSaveDialog = false) + QFileDialog::Options options, bool isSaveDialog = false, + QMap *filterMap = 0) { g_object_set(gtkFileChooser, "do-overwrite-confirmation", gboolean(!(options & QFileDialog::DontConfirmOverwrite)), NULL); g_object_set(gtkFileChooser, "local_only", gboolean(true), NULL); @@ -751,6 +754,8 @@ static void setupGtkFileChooser(GtkWidget* gtkFileChooser, QWidget *parent, foreach (const QString &fileExtension, extensions) { QGtk::gtk_file_filter_add_pattern (gtkFilter, qPrintable(fileExtension)); } + if (filterMap) + filterMap->insert(gtkFilter, rawfilter); QGtk::gtk_file_chooser_add_filter((GtkFileChooser*)gtkFileChooser, gtkFilter); if (selectedFilter && (rawfilter == *selectedFilter)) QGtk::gtk_file_chooser_set_filter((GtkFileChooser*)gtkFileChooser, gtkFilter); @@ -787,7 +792,7 @@ static void setupGtkFileChooser(GtkWidget* gtkFileChooser, QWidget *parent, QString QGtk::openFilename(QWidget *parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options) { - + QMap filterMap; GtkWidget *gtkFileChooser = QGtk::gtk_file_chooser_dialog_new (qPrintable(caption), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, @@ -795,7 +800,7 @@ QString QGtk::openFilename(QWidget *parent, const QString &caption, const QStrin GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - setupGtkFileChooser(gtkFileChooser, parent, dir, filter, selectedFilter, options); + setupGtkFileChooser(gtkFileChooser, parent, dir, filter, selectedFilter, options, false, &filterMap); QWidget modal_widget; modal_widget.setAttribute(Qt::WA_NoChildEventsForParent, true); @@ -807,6 +812,10 @@ QString QGtk::openFilename(QWidget *parent, const QString &caption, const QStrin char *gtk_filename = QGtk::gtk_file_chooser_get_filename ((GtkFileChooser*)gtkFileChooser); filename = QString::fromUtf8(gtk_filename); g_free (gtk_filename); + if (selectedFilter) { + GtkFileFilter *gtkFilter = QGtk::gtk_file_chooser_get_filter ((GtkFileChooser*)gtkFileChooser); + *selectedFilter = filterMap.value(gtkFilter); + } } QApplicationPrivate::leaveModal(&modal_widget); @@ -817,6 +826,7 @@ QString QGtk::openFilename(QWidget *parent, const QString &caption, const QStrin QString QGtk::openDirectory(QWidget *parent, const QString &caption, const QString &dir, QFileDialog::Options options) { + QMap filterMap; GtkWidget *gtkFileChooser = QGtk::gtk_file_chooser_dialog_new (qPrintable(caption), NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, @@ -846,6 +856,7 @@ QStringList QGtk::openFilenames(QWidget *parent, const QString &caption, const Q QString *selectedFilter, QFileDialog::Options options) { QStringList filenames; + QMap filterMap; GtkWidget *gtkFileChooser = QGtk::gtk_file_chooser_dialog_new (qPrintable(caption), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, @@ -853,7 +864,7 @@ QStringList QGtk::openFilenames(QWidget *parent, const QString &caption, const Q GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - setupGtkFileChooser(gtkFileChooser, parent, dir, filter, selectedFilter, options); + setupGtkFileChooser(gtkFileChooser, parent, dir, filter, selectedFilter, options, false, &filterMap); g_object_set(gtkFileChooser, "select-multiple", gboolean(true), NULL); QWidget modal_widget; @@ -866,6 +877,10 @@ QStringList QGtk::openFilenames(QWidget *parent, const QString &caption, const Q for (GSList *iterator = gtk_file_names ; iterator; iterator = iterator->next) filenames << QString::fromUtf8((const char*)iterator->data); g_slist_free(gtk_file_names); + if (selectedFilter) { + GtkFileFilter *gtkFilter = QGtk::gtk_file_chooser_get_filter ((GtkFileChooser*)gtkFileChooser); + *selectedFilter = filterMap.value(gtkFilter); + } } QApplicationPrivate::leaveModal(&modal_widget); @@ -876,13 +891,14 @@ QStringList QGtk::openFilenames(QWidget *parent, const QString &caption, const Q QString QGtk::saveFilename(QWidget *parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options) { + QMap filterMap; GtkWidget *gtkFileChooser = QGtk::gtk_file_chooser_dialog_new (qPrintable(caption), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); - setupGtkFileChooser(gtkFileChooser, parent, dir, filter, selectedFilter, options, true); + setupGtkFileChooser(gtkFileChooser, parent, dir, filter, selectedFilter, options, true, &filterMap); QWidget modal_widget; modal_widget.setAttribute(Qt::WA_NoChildEventsForParent, true); @@ -894,6 +910,10 @@ QString QGtk::saveFilename(QWidget *parent, const QString &caption, const QStrin char *gtk_filename = QGtk::gtk_file_chooser_get_filename ((GtkFileChooser*)gtkFileChooser); filename = QString::fromUtf8(gtk_filename); g_free (gtk_filename); + if (selectedFilter) { + GtkFileFilter *gtkFilter = QGtk::gtk_file_chooser_get_filter ((GtkFileChooser*)gtkFileChooser); + *selectedFilter = filterMap.value(gtkFilter); + } } QApplicationPrivate::leaveModal(&modal_widget); diff --git a/src/gui/styles/gtksymbols_p.h b/src/gui/styles/gtksymbols_p.h index b0195d282..18c6dc55f 100644 --- a/src/gui/styles/gtksymbols_p.h +++ b/src/gui/styles/gtksymbols_p.h @@ -162,6 +162,7 @@ typedef void (*Ptr_gtk_file_filter_set_name)(GtkFileFilter *, const gchar *); typedef void (*Ptr_gtk_file_filter_add_pattern)(GtkFileFilter *filter, const gchar *pattern); typedef void (*Ptr_gtk_file_chooser_add_filter)(GtkFileChooser *chooser, GtkFileFilter *filter); typedef void (*Ptr_gtk_file_chooser_set_filter)(GtkFileChooser *chooser, GtkFileFilter *filter); +typedef GtkFileFilter* (*Ptr_gtk_file_chooser_get_filter)(GtkFileChooser *chooser); typedef gchar* (*Ptr_gtk_file_chooser_get_filename)(GtkFileChooser *chooser); typedef GSList* (*Ptr_gtk_file_chooser_get_filenames)(GtkFileChooser *chooser); typedef GtkWidget* (*Ptr_gtk_file_chooser_dialog_new)(const gchar *title, @@ -302,6 +303,7 @@ public: static Ptr_gtk_file_filter_add_pattern gtk_file_filter_add_pattern; static Ptr_gtk_file_chooser_add_filter gtk_file_chooser_add_filter; static Ptr_gtk_file_chooser_set_filter gtk_file_chooser_set_filter; + static Ptr_gtk_file_chooser_get_filter gtk_file_chooser_get_filter; static Ptr_gtk_file_chooser_dialog_new gtk_file_chooser_dialog_new; static Ptr_gtk_file_chooser_set_current_folder gtk_file_chooser_set_current_folder; static Ptr_gtk_file_chooser_get_filename gtk_file_chooser_get_filename; -- cgit v1.2.3 From 5396e4de1146220e9fb57e42fa30083148af7798 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 20 Jul 2009 18:44:34 +0200 Subject: fix qmake syntax Reviewed-by: TrustMe --- mkspecs/features/moc.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 33a58ad97..62d90924c 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -65,7 +65,7 @@ moc_header.output = $$MOC_DIR/$${QMAKE_H_MOD_MOC}${QMAKE_FILE_BASE}$${first(QMAK moc_header.input = HEADERS moc_header.variable_out = SOURCES moc_header.name = MOC ${QMAKE_FILE_IN} -if(!contains(TEMPLATE, "vc.*") & !contains(TEMPLATE_PREFIX, "vc")) { +if(!contains(TEMPLATE, "vc.*"):!contains(TEMPLATE_PREFIX, "vc")) { !isEmpty(INCLUDETEMP):moc_header.depends += $$INCLUDETEMP } silent:moc_header.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_header.commands @@ -79,7 +79,7 @@ moc_source.commands = ${QMAKE_FUNC_mocCmd} moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EXT_CPP_MOC} moc_source.input = SOURCES OBJECTIVE_SOURCES moc_source.name = MOC ${QMAKE_FILE_IN} -if(!contains(TEMPLATE, "vc.*") & !contains(TEMPLATE_PREFIX, "vc")) { +if(!contains(TEMPLATE, "vc.*"):!contains(TEMPLATE_PREFIX, "vc")) { !isEmpty(INCLUDETEMP):moc_source.depends += $$INCLUDETEMP } silent:moc_source.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_source.commands -- cgit v1.2.3 From 1768c145e07417a53abeb18bebda085b21d8f1d5 Mon Sep 17 00:00:00 2001 From: miniak Date: Mon, 20 Jul 2009 18:47:37 +0200 Subject: Partial fix for Qt issue #244648 - QtIcoHandler does not support large & Vista PNG format icons Merge-request: 431 Reviewed-by: Joerg Bornemann --- src/plugins/imageformats/ico/qicohandler.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index 43e35c08e..c9e04a4c6 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -522,6 +522,18 @@ QImage ICOReader::iconAt(int index) ICONDIRENTRY iconEntry; if (readIconEntry(index, &iconEntry)) { + static const uchar pngMagicData[] = { 137, 80, 78, 71, 13, 10, 26, 10 }; + + iod->seek(iconEntry.dwImageOffset); + + const QByteArray pngMagic = QByteArray::fromRawData((char*)pngMagicData, sizeof(pngMagicData)); + const bool isPngImage = (iod->read(pngMagic.size()) == pngMagic); + + if (isPngImage) { + iod->seek(iconEntry.dwImageOffset); + return QImage::fromData(iod->read(iconEntry.dwBytesInRes), "png"); + } + BMP_INFOHDR header; if (readBMPHeader(iconEntry.dwImageOffset, &header)) { icoAttrib.nbits = header.biBitCount ? header.biBitCount : iconEntry.wBitCount; -- cgit v1.2.3 From a1314799a70db18d54123956b92a239bd50387a9 Mon Sep 17 00:00:00 2001 From: miniak Date: Mon, 20 Jul 2009 18:47:40 +0200 Subject: Adding test case for PNG compression icon loading Merge-request: 431 Reviewed-by: Joerg Bornemann --- tests/auto/qicoimageformat/icons/valid/Qt.ico | Bin 0 -> 31371 bytes .../auto/qicoimageformat/tst_qticoimageformat.cpp | 33 +++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 tests/auto/qicoimageformat/icons/valid/Qt.ico diff --git a/tests/auto/qicoimageformat/icons/valid/Qt.ico b/tests/auto/qicoimageformat/icons/valid/Qt.ico new file mode 100644 index 000000000..fef1dee14 Binary files /dev/null and b/tests/auto/qicoimageformat/icons/valid/Qt.ico differ diff --git a/tests/auto/qicoimageformat/tst_qticoimageformat.cpp b/tests/auto/qicoimageformat/tst_qticoimageformat.cpp index 51ee4aace..fbd382137 100644 --- a/tests/auto/qicoimageformat/tst_qticoimageformat.cpp +++ b/tests/auto/qicoimageformat/tst_qticoimageformat.cpp @@ -70,6 +70,8 @@ private slots: void loopCount(); void nextImageDelay_data(); void nextImageDelay(); + void pngCompression_data(); + void pngCompression(); private: QString m_IconPath; @@ -130,6 +132,7 @@ void tst_QtIcoImageFormat::canRead_data() QTest::newRow("invalid floppy (first 8 bytes = 0xff)") << "invalid/35floppy.ico" << 0; QTest::newRow("103x16px, 24BPP") << "valid/trolltechlogo_tiny.ico" << 1; QTest::newRow("includes 32BPP w/alpha") << "valid/semitransparent.ico" << 1; + QTest::newRow("PNG compression") << "valid/Qt.ico" << 1; } void tst_QtIcoImageFormat::canRead() @@ -199,6 +202,7 @@ void tst_QtIcoImageFormat::imageCount_data() QTest::newRow("16px16c, 32px32c, 32px256c") << "valid/WORLDH.ico" << 3; QTest::newRow("invalid floppy (first 8 bytes = 0xff)") << "invalid/35floppy.ico" << 0; QTest::newRow("includes 32BPP w/alpha") << "valid/semitransparent.ico" << 9; + QTest::newRow("PNG compression") << "valid/Qt.ico" << 4; } @@ -226,6 +230,7 @@ void tst_QtIcoImageFormat::jumpToNextImage_data() QTest::newRow("16px16c, 32px32c, 32px256c") << "valid/WORLD.ico" << 3; QTest::newRow("16px16c, 32px32c, 32px256c") << "valid/WORLDH.ico" << 3; QTest::newRow("includes 32BPP w/alpha") << "valid/semitransparent.ico" << 9; + QTest::newRow("PNG compression") << "valid/Qt.ico" << 4; } void tst_QtIcoImageFormat::jumpToNextImage() @@ -275,6 +280,7 @@ void tst_QtIcoImageFormat::nextImageDelay_data() QTest::newRow("16px16c, 32px32c, 32px256c") << "valid/WORLDH.ico" << 3; QTest::newRow("invalid floppy (first 8 bytes = 0xff)") << "invalid/35floppy.ico" << -1; QTest::newRow("includes 32BPP w/alpha") << "valid/semitransparent.ico" << 9; + QTest::newRow("PNG compression") << "valid/Qt.ico" << 4; } void tst_QtIcoImageFormat::nextImageDelay() @@ -294,5 +300,32 @@ void tst_QtIcoImageFormat::nextImageDelay() } } +void tst_QtIcoImageFormat::pngCompression_data() +{ + QTest::addColumn("fileName"); + QTest::addColumn("index"); + QTest::addColumn("width"); + QTest::addColumn("height"); + + QTest::newRow("PNG compression") << "valid/Qt.ico" << 4 << 256 << 256; +} + +void tst_QtIcoImageFormat::pngCompression() +{ + QFETCH(QString, fileName); + QFETCH(int, index); + QFETCH(int, width); + QFETCH(int, height); + + QImageReader reader(m_IconPath + "/" + fileName); + + QImage image; + reader.jumpToImage(index); + reader.read(&image); + + QCOMPARE(image.width(), width); + QCOMPARE(image.height(), height); +} + QTEST_MAIN(tst_QtIcoImageFormat) #include "tst_qticoimageformat.moc" -- cgit v1.2.3 From a522652fc919f3bff8772bb2b7bd291d10eb4f12 Mon Sep 17 00:00:00 2001 From: Ritt Konstantin Date: Mon, 20 Jul 2009 18:44:56 +0200 Subject: Add low level POSIX bench on Windows Merge-request: 702 Reviewed-by: Olivier Goffart --- tests/benchmarks/qdir/tst_qdir.cpp | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/tests/benchmarks/qdir/tst_qdir.cpp b/tests/benchmarks/qdir/tst_qdir.cpp index 64056451f..edb28118f 100644 --- a/tests/benchmarks/qdir/tst_qdir.cpp +++ b/tests/benchmarks/qdir/tst_qdir.cpp @@ -1,9 +1,13 @@ #include -#include -#include -#include -#include +#ifdef Q_OS_WIN +# include +#else +# include +# include +# include +# include +#endif class Test : public QObject{ Q_OBJECT @@ -73,10 +77,31 @@ private slots: } } } -#ifndef Q_OS_WIN + void testLowLevel() { +#ifdef Q_OS_WIN + const wchar_t *dirpath = (wchar_t*)testdir.absolutePath().utf16(); + wchar_t appendedPath[MAX_PATH]; + wcscpy(appendedPath, dirpath); + wcscat(appendedPath, L"\\*"); + + WIN32_FIND_DATA fd; + HANDLE hSearch = FindFirstFileW(appendedPath, &fd); + if (hSearch != INVALID_HANDLE_VALUE) + return; + + QBENCHMARK { + do { + + } while (FindNextFile(hSearch, &fd)); + } + FindClose(hSearch); +#else QDir testdir(QDir::tempPath() + QLatin1String("/test_speed")); DIR *dir = opendir(qPrintable(testdir.absolutePath())); + if (!dir) + return; + QVERIFY(!chdir(qPrintable(testdir.absolutePath()))); QBENCHMARK { struct dirent *item = readdir(dir); @@ -90,8 +115,8 @@ private slots: } } closedir(dir); - } #endif + } }; QTEST_MAIN(Test) -- cgit v1.2.3 From 4c0c652b846e248d076739a6e2f00a3a3d9a414f Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 20 Jul 2009 18:55:44 +0200 Subject: Use QVERIFY in benchmarks, insteads of returning silently in case of error --- tests/benchmarks/qdir/tst_qdir.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/benchmarks/qdir/tst_qdir.cpp b/tests/benchmarks/qdir/tst_qdir.cpp index edb28118f..7977e2892 100644 --- a/tests/benchmarks/qdir/tst_qdir.cpp +++ b/tests/benchmarks/qdir/tst_qdir.cpp @@ -87,8 +87,7 @@ private slots: WIN32_FIND_DATA fd; HANDLE hSearch = FindFirstFileW(appendedPath, &fd); - if (hSearch != INVALID_HANDLE_VALUE) - return; + QVERIFY(hSearch == INVALID_HANDLE_VALUE); QBENCHMARK { do { @@ -99,8 +98,7 @@ private slots: #else QDir testdir(QDir::tempPath() + QLatin1String("/test_speed")); DIR *dir = opendir(qPrintable(testdir.absolutePath())); - if (!dir) - return; + QVERIFY(dir); QVERIFY(!chdir(qPrintable(testdir.absolutePath()))); QBENCHMARK { -- cgit v1.2.3 From d3053c64e6e61656f8ea1fa809648228d0393957 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Mon, 20 Jul 2009 09:53:21 -0700 Subject: s/slots/Q_SLOTS/ Fix QDirectFBMousePrivate and QDirectFBKeyboardPrivate Reviewed-by: TrustMe --- src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp | 2 +- src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp index ed59db89a..b5376b142 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp @@ -78,7 +78,7 @@ private: DFBEvent event; int bytesRead; -private slots: +private Q_SLOTS: void readKeyboardData(); }; diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp index 694ba51be..142993d1d 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp @@ -71,7 +71,7 @@ private: DFBEvent event; uint bytesRead; -private slots: +private Q_SLOTS: void readMouseData(); }; -- cgit v1.2.3 From 09f7707fda4242c70cb58464d329c704bfaf2a34 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 20 Jul 2009 18:05:35 +0200 Subject: Doc: not an overload --- src/corelib/tools/qcontiguouscache.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp index 61cda52cd..f42b7a030 100644 --- a/src/corelib/tools/qcontiguouscache.cpp +++ b/src/corelib/tools/qcontiguouscache.cpp @@ -191,8 +191,6 @@ MyRecord record(int row) const /*! \fn int QContiguousCache::count() const - \overload - Same as size(). */ -- cgit v1.2.3 From 8f2a9e7060f751113999feae4b907e065c9a4e19 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 20 Jul 2009 18:57:22 +0200 Subject: Doc: fix formatting of lists. --- src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp | 29 +++++++++++++++----------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp index c634a7f6a..f5afbecd3 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp @@ -270,19 +270,24 @@ void QWebView::setPage(QWebPage *page) 'ftp'. The result is then passed through QUrl's tolerant parser, and in the case or success, a valid QUrl is returned, or else a QUrl(). - Examples - - webkit.org becomes http://webkit.org - - ftp.webkit.org becomes ftp://ftp.webkit.org - - localhost becomes http://localhost - - /home/user/test.html becomes file:///home/user/test.html (if exists) - - Tips when dealing with URLs and strings - - When creating a QString from a QByteArray or a char*, always use - QString::fromUtf8(). - - Do not use QUrl(string), nor QUrl::toString() anywhere where the URL might - be used, such as in the location bar, as those functions loose data. - Instead use QUrl::fromEncoded() and QUrl::toEncoded(), respectively. + \section2 Examples: + + \list + \o webkit.org becomes http://webkit.org + \o ftp.webkit.org becomes ftp://ftp.webkit.org + \o localhost becomes http://localhost + \o /home/user/test.html becomes file:///home/user/test.html (if exists) + \endlist + \section2 Tips when dealing with URLs and strings: + + \list + \o When creating a QString from a QByteArray or a char*, always use + QString::fromUtf8(). + \o Do not use QUrl(string), nor QUrl::toString() anywhere where the URL might + be used, such as in the location bar, as those functions loose data. + Instead use QUrl::fromEncoded() and QUrl::toEncoded(), respectively. + \endlist */ QUrl QWebView::guessUrlFromString(const QString &string) { -- cgit v1.2.3 From ee4a76e2a1afade93ec89e9a7875837b195706e9 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 20 Jul 2009 19:32:56 +0200 Subject: Doc: fix links between QGraphicsItem and QTouchEvent --- src/gui/graphicsview/qgraphicsitem.cpp | 6 +++--- src/gui/kernel/qevent.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 5ef6219f9..ae2a2c3f8 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -2332,8 +2332,8 @@ void QGraphicsItem::setAcceptsHoverEvents(bool enabled) /*! \since 4.6 - Returns true if an item accepts touch events (QTouchEvent); otherwise, returns false. By - default, items do not accept touch events. + Returns true if an item accepts \l{QTouchEvent}{touch events}; + otherwise, returns false. By default, items do not accept touch events. \sa setAcceptTouchEvents() */ @@ -2345,7 +2345,7 @@ bool QGraphicsItem::acceptTouchEvents() const /*! \since 4.6 - If \a enabled is true, this item will accept touch events; + If \a enabled is true, this item will accept \l{QTouchEvent}{touch events}; otherwise, it will ignore them. By default, items do not accept touch events. */ diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index d1eb5cdb8..328ba3d02 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -119,7 +119,7 @@ QInputEvent::~QInputEvent() will not be propagated further up the parent widget chain. The state of the keyboard modifier keys can be found by calling the - \l{QInputEvent::modifiers()}{modifiers()} function, inhertied from + \l{QInputEvent::modifiers()}{modifiers()} function, inherited from QInputEvent. The functions pos(), x(), and y() give the cursor position @@ -3539,13 +3539,13 @@ QMenubarUpdatedEvent::QMenubarUpdatedEvent(QMenuBar * const menuBar) touch points on a touch device (such as a touch-screen or track-pad). To receive touch events, widgets have to have the Qt::WA_AcceptTouchEvents attribute set and graphics items need to have - the \l{QGraphicsItem::setAcceptsTouchEvents}{setAcceptsTouchEvents} + the \l{QGraphicsItem::setAcceptTouchEvents()}{acceptTouchEvents} attribute set to true. All touch events are of type QEvent::TouchBegin, QEvent::TouchUpdate, or QEvent::TouchEnd. The touchPoints() function returns a list of all touch points contained in the event. - Information about each touch point can be retreived using the + Information about each touch point can be retrieved using the QTouchEvent::TouchPoint class. The Qt::TouchPointState enum describes the different states that a touch point may have. @@ -3569,7 +3569,7 @@ QMenubarUpdatedEvent::QMenubarUpdatedEvent(QMenuBar * const menuBar) for items in a graphics view to receive touch events. \sa QTouchEvent::TouchPoint, Qt::TouchPointState, Qt::WA_AcceptTouchEvents, - QGraphicsItem::acceptTouchEvents + QGraphicsItem::acceptTouchEvents() */ /*! \enum Qt::TouchPointState -- cgit v1.2.3 From 6ca14dce65634e202b36499c76c268c87f78ceb6 Mon Sep 17 00:00:00 2001 From: Ritt Konstantin Date: Mon, 20 Jul 2009 19:47:32 +0200 Subject: Workaround for transacted, locked and inaccesible files wich can not be stat'ed in a natural way. FindFirstFile solves this problem. Task-number: 167099 Task-number: 189202 Merge-request: 880 Reviewed-by: Joerg Bornemann --- src/corelib/io/qfsfileengine_win.cpp | 88 ++++++++++++++++++++++++++++++++++ tests/auto/qfileinfo/tst_qfileinfo.cpp | 18 ++++++- 2 files changed, 104 insertions(+), 2 deletions(-) diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index d4e2e9303..53f01449f 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -527,6 +527,29 @@ qint64 QFSFileEnginePrivate::nativeSize() const WIN32_FILE_ATTRIBUTE_DATA attribData; bool ok = ::GetFileAttributesEx((const wchar_t*)nativeFilePath.constData(), GetFileExInfoStandard, &attribData); + if (!ok) { + int errorCode = GetLastError(); + if (errorCode != ERROR_INVALID_NAME + && errorCode != ERROR_FILE_NOT_FOUND && errorCode != ERROR_PATH_NOT_FOUND) { + QByteArray path = nativeFilePath; + // path for the FindFirstFile should not end with a trailing slash + while (path.endsWith('\\')) + path.chop(1); + + // FindFirstFile can not handle drives + if (!path.endsWith(':')) { + WIN32_FIND_DATA findData; + HANDLE hFind = ::FindFirstFile((const wchar_t*)path.constData(), + &findData); + if (hFind != INVALID_HANDLE_VALUE) { + ::FindClose(hFind); + ok = true; + attribData.nFileSizeHigh = findData.nFileSizeHigh; + attribData.nFileSizeLow = findData.nFileSizeLow; + } + } + } + } if (ok) { qint64 size = attribData.nFileSizeHigh; size <<= 32; @@ -878,6 +901,26 @@ static inline bool isDirPath(const QString &dirPath, bool *existed) path += QLatin1Char('\\'); DWORD fileAttrib = ::GetFileAttributes((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16()); + if (fileAttrib == INVALID_FILE_ATTRIBUTES) { + int errorCode = GetLastError(); + if (errorCode != ERROR_INVALID_NAME + && errorCode != ERROR_FILE_NOT_FOUND && errorCode != ERROR_PATH_NOT_FOUND) { + // path for the FindFirstFile should not end with a trailing slash + while (path.endsWith(QLatin1Char('\\'))) + path.chop(1); + + // FindFirstFile can not handle drives + if (!path.endsWith(QLatin1Char(':'))) { + WIN32_FIND_DATA findData; + HANDLE hFind = ::FindFirstFile((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16(), + &findData); + if (hFind != INVALID_HANDLE_VALUE) { + ::FindClose(hFind); + fileAttrib = findData.dwFileAttributes; + } + } + } + } if (existed) *existed = fileAttrib != INVALID_FILE_ATTRIBUTES; @@ -1149,6 +1192,27 @@ bool QFSFileEnginePrivate::doStat() const #endif } else { fileAttrib = GetFileAttributes((wchar_t*)QFSFileEnginePrivate::longFileName(fname).utf16()); + if (fileAttrib == INVALID_FILE_ATTRIBUTES) { + int errorCode = GetLastError(); + if (errorCode != ERROR_INVALID_NAME + && errorCode != ERROR_FILE_NOT_FOUND && errorCode != ERROR_PATH_NOT_FOUND) { + QString path = QDir::toNativeSeparators(fname); + // path for the FindFirstFile should not end with a trailing slash + while (path.endsWith(QLatin1Char('\\'))) + path.chop(1); + + // FindFirstFile can not handle drives + if (!path.endsWith(QLatin1Char(':'))) { + WIN32_FIND_DATA findData; + HANDLE hFind = ::FindFirstFile((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16(), + &findData); + if (hFind != INVALID_HANDLE_VALUE) { + ::FindClose(hFind); + fileAttrib = findData.dwFileAttributes; + } + } + } + } could_stat = fileAttrib != INVALID_FILE_ATTRIBUTES; if (!could_stat) { #if !defined(Q_OS_WINCE) @@ -1744,6 +1808,30 @@ QDateTime QFSFileEngine::fileTime(FileTime time) const } else { WIN32_FILE_ATTRIBUTE_DATA attribData; bool ok = ::GetFileAttributesEx((wchar_t*)QFSFileEnginePrivate::longFileName(d->filePath).utf16(), GetFileExInfoStandard, &attribData); + if (!ok) { + int errorCode = GetLastError(); + if (errorCode != ERROR_INVALID_NAME + && errorCode != ERROR_FILE_NOT_FOUND && errorCode != ERROR_PATH_NOT_FOUND) { + QString path = QDir::toNativeSeparators(d->filePath); + // path for the FindFirstFile should not end with a trailing slash + while (path.endsWith(QLatin1Char('\\'))) + path.chop(1); + + // FindFirstFile can not handle drives + if (!path.endsWith(QLatin1Char(':'))) { + WIN32_FIND_DATA findData; + HANDLE hFind = ::FindFirstFile((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16(), + &findData); + if (hFind != INVALID_HANDLE_VALUE) { + ::FindClose(hFind); + ok = true; + attribData.ftCreationTime = findData.ftCreationTime; + attribData.ftLastWriteTime = findData.ftLastWriteTime; + attribData.ftLastAccessTime = findData.ftLastAccessTime; + } + } + } + } if (ok) { if(time == CreationTime) ret = fileTimeToQDateTime(&attribData.ftCreationTime); diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index 48dc357f1..e5831fdde 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -127,6 +127,8 @@ private slots: void size_data(); void size(); + void systemFiles(); + void compare_data(); void compare(); @@ -354,8 +356,9 @@ void tst_QFileInfo::exists_data() QTest::newRow("data6") << "resources/*" << false; QTest::newRow("data7") << "resources/*.foo" << false; QTest::newRow("data8") << "resources/*.ext1" << false; - QTest::newRow("data9") << "." << true; - QTest::newRow("data10") << ". " << false; + QTest::newRow("data9") << "resources/file?.ext1" << false; + QTest::newRow("data10") << "." << true; + QTest::newRow("data11") << ". " << false; QTest::newRow("simple dir") << "resources" << true; QTest::newRow("simple dir with slash") << "resources/" << true; @@ -741,6 +744,17 @@ void tst_QFileInfo::size() QTEST(int(fi.size()), "size"); } +void tst_QFileInfo::systemFiles() +{ +#ifndef Q_OS_WIN + QSKIP("This is a Windows only test", SkipAll); +#endif + QFileInfo fi("c:\\pagefile.sys"); + QVERIFY(fi.exists()); // task 167099 + QVERIFY(fi.size() > 0); // task 189202 + QVERIFY(fi.lastModified().isValid()); +} + void tst_QFileInfo::compare_data() { QTest::addColumn("file1"); -- cgit v1.2.3 From 08834e4f7af8c1a4fe34ccfbbb8d2c973e91eb48 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 21 Jul 2009 09:03:20 +1000 Subject: Fixed compile on certain Solaris versions. Every source file must end with a newline, otherwise: "Error: There is extra text on this line." --- src/sql/drivers/mysql/qsql_mysql.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index dd4127cba..8f377bd37 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -1473,4 +1473,4 @@ QString QMYSQLDriver::escapeIdentifier(const QString &identifier, IdentifierType QT_END_NAMESPACE -#include "qsql_mysql.moc" \ No newline at end of file +#include "qsql_mysql.moc" -- cgit v1.2.3 From 5538d52eec9454404d3e02d9d23cc562b91a68e0 Mon Sep 17 00:00:00 2001 From: Benjamin C Meyer Date: Tue, 21 Jul 2009 13:46:20 +1000 Subject: Match the behavior of the Windows configure and allow the user to type 'y' rather then 'yes' Merge-request: 945 Reviewed-by: Rohan McGovern --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index f7e80058f..13bdf7fc2 100755 --- a/configure +++ b/configure @@ -3769,7 +3769,7 @@ elif [ "$Edition" = "OpenSource" ]; then read acceptance fi echo - if [ "$acceptance" = "yes" ]; then + if [ "$acceptance" = "yes" ] || [ "$acceptance" = "y" ]; then break elif [ "$acceptance" = "no" ]; then echo "You are not licensed to use this software." -- cgit v1.2.3 From c6d243df383514f2bf30e178eba087a312191b0f Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 21 Jul 2009 10:03:17 +0200 Subject: Doc: mark QImage/QPixmap alphaChannel and setAlphaChannel as obsolete. They are expensive - which is why QImage::setALphaChannel had been obsoleted in Qt 4.5. Reviewed-by: Gunnar --- src/gui/image/qimage.cpp | 9 +++--- src/gui/image/qpixmap.cpp | 70 +++++++++++++++++++++++------------------------ 2 files changed, 38 insertions(+), 41 deletions(-) diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index ad55dcd71..7d7dde1b1 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -612,9 +612,6 @@ bool QImageData::checkForAlphaPixels() const \table \header \o Function \o Description \row - \o setAlphaChannel() - \o Sets the alpha channel of the image. - \row \o setDotsPerMeterX() \o Defines the aspect ratio by setting the number of pixels that fit horizontally in a physical meter. @@ -5587,7 +5584,7 @@ bool QImage::isDetached() const Note that the image will be converted to the Format_ARGB32_Premultiplied format if the function succeeds. - Use one of the composition mods in QPainter::CompositionMode instead. + Use one of the composition modes in QPainter::CompositionMode instead. \warning This function is expensive. @@ -5665,6 +5662,8 @@ void QImage::setAlphaChannel(const QImage &alphaChannel) /*! + \obsolete + Returns the alpha channel of the image as a new grayscale QImage in which each pixel's red, green, and blue values are given the alpha value of the original image. The color depth of the returned image is 8-bit. @@ -5744,7 +5743,7 @@ QImage QImage::alphaChannel() const Returns true if the image has a format that respects the alpha channel, otherwise returns false. - \sa alphaChannel(), {QImage#Image Information}{Image Information} + \sa {QImage#Image Information}{Image Information} */ bool QImage::hasAlphaChannel() const { diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 72fdec08b..3e5c9b7cd 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -1572,24 +1572,24 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) designed and optimized for showing images on screen. QBitmap is only a convenience class that inherits QPixmap, ensuring a depth of 1. The isQBitmap() function returns true if a QPixmap object is - really a bitmap, otherwise returns false. Finally, the QPicture class is a - paint device that records and replays QPainter commands. + really a bitmap, otherwise returns false. Finally, the QPicture class + is a paint device that records and replays QPainter commands. A QPixmap can easily be displayed on the screen using QLabel or one of QAbstractButton's subclasses (such as QPushButton and QToolButton). QLabel has a pixmap property, whereas - QAbstractButton has an icon property. And because QPixmap is a - QPaintDevice subclass, QPainter can be used to draw directly onto - pixmaps. + QAbstractButton has an icon property. In addition to the ordinary constructors, a QPixmap can be constructed using the static grabWidget() and grabWindow() functions which creates a QPixmap and paints the given widget, or - window, in it. + window, into it. + + QPixmap objects can be passed around by value since the QPixmap + class uses implicit data sharing. For more information, see the \l + {Implicit Data Sharing} documentation. QPixmap objects can also be + streamed. - Note that the pixel data in a pixmap is internal and is managed by - the underlying window system. Pixels can only be accessed through - QPainter functions or by converting the QPixmap to a QImage. Depending on the system, QPixmap is stored using a RGB32 or a premultiplied alpha format. If the image has an alpha channel, and if the system allows, the preferred format is premultiplied alpha. @@ -1600,6 +1600,13 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) QPixmap are stored on the client side and don't use any GDI resources). + Note that the pixel data in a pixmap is internal and is managed by + the underlying window system. Because QPixmap is a QPaintDevice + subclass, QPainter can be used to draw directly onto pixmaps. + Pixels can only be accessed through QPainter functions or by + converting the QPixmap to a QImage. However, the fill() function + is available for initializing the entire pixmap with a given color. + There are functions to convert between QImage and QPixmap. Typically, the QImage class is used to load an image file, optionally manipulating the image data, before the QImage @@ -1614,11 +1621,6 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) there are several functions that enables transformation of the pixmap. - QPixmap objects can be passed around by value since the QPixmap - class uses implicit data sharing. For more information, see the \l - {Implicit Data Sharing} documentation. QPixmap objects can also be - streamed. - \tableofcontents \section1 Reading and Writing Image Files @@ -1675,12 +1677,15 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) The hasAlphaChannel() returns true if the pixmap has a format that respects the alpha channel, otherwise returns false, while the hasAlpha() function returns true if the pixmap has an alpha - channel \e or a mask (otherwise false). + channel \e or a mask (otherwise false). The mask() function returns + the mask as a QBitmap object, which can be set using setMask(). - The alphaChannel() function returns the alpha channel as a new - QPixmap object, while the mask() function returns the mask as a - QBitmap object. The alpha channel and mask can be set using the - setAlphaChannel() and setMask() functions, respectively. + The createHeuristicMask() function creates and returns a 1-bpp + heuristic mask (i.e. a QBitmap) for this pixmap. It works by + selecting a color from one of the corners and then chipping away + pixels of that color, starting at all the edges. The + createMaskFromColor() function creates and returns a mask (i.e. a + QBitmap) for the pixmap based on a given color. \row \o Low-level information @@ -1718,14 +1723,7 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) \section1 Pixmap Transformations QPixmap supports a number of functions for creating a new pixmap - that is a transformed version of the original: The - createHeuristicMask() function creates and returns a 1-bpp - heuristic mask (i.e. a QBitmap) for this pixmap. It works by - selecting a color from one of the corners and then chipping away - pixels of that color, starting at all the edges. The - createMaskFromColor() function creates and returns a mask (i.e. a - QBitmap) for the pixmap based on a given color. - + that is a transformed version of the original: The scaled(), scaledToWidth() and scaledToHeight() functions return scaled copies of the pixmap, while the copy() function @@ -1740,11 +1738,6 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) function returns the actual matrix used for transforming the pixmap. - There are also functions for changing attributes of a pixmap. - in-place: The fill() function fills the entire image with the - given color, the setMask() function sets a mask bitmap, and the - setAlphaChannel() function sets the pixmap's alpha channel. - \sa QBitmap, QImage, QImageReader, QImageWriter */ @@ -1763,7 +1756,7 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) Returns true if this pixmap has an alpha channel, \e or has a mask, otherwise returns false. - \sa hasAlphaChannel(), alphaChannel(), mask() + \sa hasAlphaChannel(), mask() */ bool QPixmap::hasAlpha() const { @@ -1774,7 +1767,7 @@ bool QPixmap::hasAlpha() const Returns true if the pixmap has a format that respects the alpha channel, otherwise returns false. - \sa alphaChannel(), hasAlpha() + \sa hasAlpha() */ bool QPixmap::hasAlphaChannel() const { @@ -1791,6 +1784,7 @@ int QPixmap::metric(PaintDeviceMetric metric) const /*! \fn void QPixmap::setAlphaChannel(const QPixmap &alphaChannel) + \obsolete Sets the alpha channel of this pixmap to the given \a alphaChannel by converting the \a alphaChannel into 32 bit and using the @@ -1828,6 +1822,8 @@ void QPixmap::setAlphaChannel(const QPixmap &alphaChannel) } /*! + \obsolete + Returns the alpha channel of the pixmap as a new grayscale QPixmap in which each pixel's red, green, and blue values are given the alpha value of the original pixmap. The color depth of the returned pixmap is the system depth @@ -1846,7 +1842,9 @@ void QPixmap::setAlphaChannel(const QPixmap &alphaChannel) \image alphachannelimage.png The pixmap and channelImage QPixmaps \warning This is an expensive operation. The alpha channel of the - pixmap is extracted dynamically from the pixeldata. + pixmap is extracted dynamically from the pixeldata. Most usecases of this + function are covered by QPainter and compositionModes which will normally + execute faster. \sa setAlphaChannel(), {QPixmap#Pixmap Information}{Pixmap Information} @@ -1867,7 +1865,7 @@ QPaintEngine *QPixmap::paintEngine() const /*! \fn QBitmap QPixmap::mask() const - Extracts a bitmap mask from the pixmap's alphachannel. + Extracts a bitmap mask from the pixmap's alpha channel. \warning This is potentially an expensive operation. The mask of the pixmap is extracted dynamically from the pixeldata. -- cgit v1.2.3 From 0571d9617633a993f3a40e388ac426d78a376ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Tue, 21 Jul 2009 10:02:27 +0200 Subject: LayeredPane should not be reported as an IP address edit control to MSAA The reason was that ROLE_SYSTEM_IPADDRESS = 0x3F has been added to MSAA at one point in time. (Can be found in recent versions of OleAcc.idl). Since the MSAA bridge used a direct mapping between QAccessible::Role and MSAA roles this lead to that LayeredPane was interpreted to be an IP address edit control, affecting QStackedWidget (and some relatives). This caused some screen readers to be confused when the same accessible interface had children such as push buttons. I also discussed this change with Harald. Task-number: 257958 --- src/gui/accessible/qaccessible.h | 1 + src/gui/accessible/qaccessible_win.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 19080dec2..8dc8159c7 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -210,6 +210,7 @@ public: PageTabList = 0x0000003C, Clock = 0x0000003D, Splitter = 0x0000003E, + // Additional Qt roles where enum value does not map directly to MSAA: LayeredPane = 0x0000003F, UserRole = 0x0000ffff }; diff --git a/src/gui/accessible/qaccessible_win.cpp b/src/gui/accessible/qaccessible_win.cpp index bfacb940a..85f1a8da7 100644 --- a/src/gui/accessible/qaccessible_win.cpp +++ b/src/gui/accessible/qaccessible_win.cpp @@ -1051,6 +1051,8 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::get_accRole(VARIANT varID, VARIANT Role role = accessible->role(varID.lVal); if (role != NoRole) { + if (role == LayeredPane) + role = QAccessible::Pane; (*pvarRole).vt = VT_I4; (*pvarRole).lVal = role; } else { -- cgit v1.2.3 From 1341fe5198bbf58c1a25a5680fbffec3b9b75eb6 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Mon, 20 Jul 2009 17:25:06 +0200 Subject: Fixes memory leak of global data. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: related to 253013 Reviewed-by: João Abecasis --- src/corelib/tools/qlocale.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 296d5a0ed..85e49c734 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -5299,7 +5299,11 @@ struct p5s_deleter { ~p5s_deleter() { - Bfree(p5s); + while (p5s) { + Bigint *next = p5s->next; + Bfree(p5s); + p5s = next; + } } }; -- cgit v1.2.3 From 1ccdf7cb7d5da92676d401105e9b03bfa747a926 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 21 Jul 2009 11:30:49 +0200 Subject: Compile fix with namespaced Qt --- src/xmlpatterns/api/qxmlschema.cpp | 4 ++++ src/xmlpatterns/api/qxmlschema_p.cpp | 4 ++++ src/xmlpatterns/api/qxmlschemavalidator.cpp | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/xmlpatterns/api/qxmlschema.cpp b/src/xmlpatterns/api/qxmlschema.cpp index af4c715df..e64b38863 100644 --- a/src/xmlpatterns/api/qxmlschema.cpp +++ b/src/xmlpatterns/api/qxmlschema.cpp @@ -45,6 +45,8 @@ #include #include +QT_BEGIN_NAMESPACE + /*! \class QXmlSchema @@ -293,3 +295,5 @@ QNetworkAccessManager *QXmlSchema::networkAccessManager() const { return d->networkAccessManager(); } + +QT_END_NAMESPACE diff --git a/src/xmlpatterns/api/qxmlschema_p.cpp b/src/xmlpatterns/api/qxmlschema_p.cpp index 0bcb56579..2dad35928 100644 --- a/src/xmlpatterns/api/qxmlschema_p.cpp +++ b/src/xmlpatterns/api/qxmlschema_p.cpp @@ -47,6 +47,8 @@ #include #include +QT_BEGIN_NAMESPACE + QXmlSchemaPrivate::QXmlSchemaPrivate(const QXmlNamePool &namePool) : m_namePool(namePool) , m_userMessageHandler(0) @@ -197,3 +199,5 @@ QNetworkAccessManager *QXmlSchemaPrivate::networkAccessManager() const return m_networkAccessManager.data()->value; } + +QT_END_NAMESPACE diff --git a/src/xmlpatterns/api/qxmlschemavalidator.cpp b/src/xmlpatterns/api/qxmlschemavalidator.cpp index 9234d8337..a864d4072 100644 --- a/src/xmlpatterns/api/qxmlschemavalidator.cpp +++ b/src/xmlpatterns/api/qxmlschemavalidator.cpp @@ -51,6 +51,8 @@ #include #include +QT_BEGIN_NAMESPACE + /*! \class QXmlSchemaValidator @@ -338,3 +340,5 @@ QNetworkAccessManager *QXmlSchemaValidator::networkAccessManager() const return d->m_networkAccessManager.data()->value; } + +QT_END_NAMESPACE -- cgit v1.2.3 From 42e469bc5edcc6dee2401a104bd30de6b4be54fe Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Wed, 15 Jul 2009 14:56:57 +0200 Subject: QNAM: Proper loading of meta data when having AlwaysCache mode Properly load the raw headers and properly handle the redirection when having a network cache in AlwaysCache mode (equals the offline mode in web browser). Task-number: 256240 Reviewed-by: Thiago Macieira --- src/network/access/qnetworkaccesscachebackend.cpp | 14 ++++++++++++++ src/network/access/qnetworkreplyimpl.cpp | 10 ++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/network/access/qnetworkaccesscachebackend.cpp b/src/network/access/qnetworkaccesscachebackend.cpp index f46a50a44..8571ba32a 100644 --- a/src/network/access/qnetworkaccesscachebackend.cpp +++ b/src/network/access/qnetworkaccesscachebackend.cpp @@ -86,6 +86,20 @@ bool QNetworkAccessCacheBackend::sendCacheContents() setAttribute(QNetworkRequest::HttpReasonPhraseAttribute, attributes.value(QNetworkRequest::HttpReasonPhraseAttribute)); setAttribute(QNetworkRequest::SourceIsFromCacheAttribute, true); + // set the raw headers + QNetworkCacheMetaData::RawHeaderList rawHeaders = item.rawHeaders(); + QNetworkCacheMetaData::RawHeaderList::ConstIterator it = rawHeaders.constBegin(), + end = rawHeaders.constEnd(); + for ( ; it != end; ++it) + setRawHeader(it->first, it->second); + + // handle a possible redirect + QVariant redirectionTarget = attributes.value(QNetworkRequest::RedirectionTargetAttribute); + if (redirectionTarget.isValid()) { + setAttribute(QNetworkRequest::RedirectionTargetAttribute, redirectionTarget); + redirectionRequested(redirectionTarget.toUrl()); + } + // signal we're open metaDataChanged(); diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 98944fd74..4ec3a7593 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -376,7 +376,17 @@ void QNetworkReplyImplPrivate::feed(const QByteArray &data) QNetworkCacheMetaData metaData; metaData.setUrl(url); metaData = backend->fetchCacheMetaData(metaData); + + // save the redirect request also in the cache + QVariant redirectionTarget = q->attribute(QNetworkRequest::RedirectionTargetAttribute); + if (redirectionTarget.isValid()) { + QNetworkCacheMetaData::AttributesMap attributes = metaData.attributes(); + attributes.insert(QNetworkRequest::RedirectionTargetAttribute, redirectionTarget); + metaData.setAttributes(attributes); + } + cacheSaveDevice = networkCache->prepare(metaData); + if (!cacheSaveDevice || (cacheSaveDevice && !cacheSaveDevice->isOpen())) { if (cacheSaveDevice && !cacheSaveDevice->isOpen()) qCritical("QNetworkReplyImpl: network cache returned a device that is not open -- " -- cgit v1.2.3 From d159db5214b6bd489d4a1e16d6b8077eb242e6da Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 21 Jul 2009 12:30:58 +0200 Subject: Fix compiler warning about initialization order reviewed-by: Kim Motoyoshi Kalland --- src/svg/qsvgstyle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index 4c8247b5d..b693429c9 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -81,12 +81,12 @@ void QSvgQualityStyle::revert(QPainter *, QSvgExtraStates &) } QSvgFillStyle::QSvgFillStyle(const QBrush &brush) - : m_fill(brush), m_style(0), m_fillRuleSet(false), m_fillOpacitySet(false), m_fillRule(Qt::WindingFill), m_fillOpacity(1.0), m_gradientResolved (true) + : m_fill(brush), m_style(0), m_fillRuleSet(false), m_fillRule(Qt::WindingFill), m_fillOpacitySet(false), m_fillOpacity(1.0), m_gradientResolved (true) { } QSvgFillStyle::QSvgFillStyle(QSvgStyleProperty *style) - : m_style(style), m_fillRuleSet(false), m_fillOpacitySet(false), m_fillRule(Qt::WindingFill), m_fillOpacity(1.0), m_gradientResolved (true) + : m_style(style), m_fillRuleSet(false), m_fillRule(Qt::WindingFill), m_fillOpacitySet(false), m_fillOpacity(1.0), m_gradientResolved (true) { } -- cgit v1.2.3 From 573235120825c6d95c73adf374fde6ed4f38cafa Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 21 Jul 2009 12:24:42 +0200 Subject: sunpro doesn't like templated friend classes, either --- tools/linguist/shared/profileevaluator.cpp | 2 +- tools/linguist/shared/profileevaluator.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index 9a27eb094..5a9095a04 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -256,7 +256,7 @@ public: ProFile *m_prevProFile; // See m_prevLineNo }; -#if !defined(__GNUC__) || __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3) +#if (!defined(__GNUC__) || __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)) && !defined(__SUNPRO_CC) Q_DECLARE_TYPEINFO(ProFileEvaluator::Private::State, Q_PRIMITIVE_TYPE); Q_DECLARE_TYPEINFO(ProFileEvaluator::Private::ProLoop, Q_MOVABLE_TYPE); #endif diff --git a/tools/linguist/shared/profileevaluator.h b/tools/linguist/shared/profileevaluator.h index 88b7590d2..f3498c1c5 100644 --- a/tools/linguist/shared/profileevaluator.h +++ b/tools/linguist/shared/profileevaluator.h @@ -96,7 +96,7 @@ private: class Private; Private *d; - // This doesn't help gcc 3.3 ... + // This doesn't help gcc 3.3 and sunpro ... template friend class QTypeInfo; }; -- cgit v1.2.3 From 2ee9e0ea326540ebb29ed5a60eb32ac686c45730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Tue, 21 Jul 2009 11:09:23 +0200 Subject: Doc fixes to QEasingCurve. * Remove some references to QAnimation. QAnimation does not exist. * Clarify the documentation for QEasingCurve::Linear. (avoid "tweening" and "no easing") * In the diagrams, change "ease" to "value". * Change the diagram generation code to use antialiased drawing (just as we do in the easingcurve example) Reviewed-by: leo --- doc/src/diagrams/programs/easingcurve/main.cpp | 29 +++++++++++++++---------- doc/src/images/qeasingcurve-cosinecurve.png | Bin 2544 -> 3419 bytes doc/src/images/qeasingcurve-inback.png | Bin 2225 -> 2808 bytes doc/src/images/qeasingcurve-inbounce.png | Bin 2378 -> 3154 bytes doc/src/images/qeasingcurve-incirc.png | Bin 2138 -> 2605 bytes doc/src/images/qeasingcurve-incubic.png | Bin 2230 -> 2722 bytes doc/src/images/qeasingcurve-incurve.png | Bin 2325 -> 2692 bytes doc/src/images/qeasingcurve-inelastic.png | Bin 2314 -> 3304 bytes doc/src/images/qeasingcurve-inexpo.png | Bin 2183 -> 2675 bytes doc/src/images/qeasingcurve-inoutback.png | Bin 2460 -> 3241 bytes doc/src/images/qeasingcurve-inoutbounce.png | Bin 2522 -> 3386 bytes doc/src/images/qeasingcurve-inoutcirc.png | Bin 2352 -> 2843 bytes doc/src/images/qeasingcurve-inoutcubic.png | Bin 2410 -> 2931 bytes doc/src/images/qeasingcurve-inoutelastic.png | Bin 2485 -> 3461 bytes doc/src/images/qeasingcurve-inoutexpo.png | Bin 2383 -> 3004 bytes doc/src/images/qeasingcurve-inoutquad.png | Bin 2392 -> 2893 bytes doc/src/images/qeasingcurve-inoutquart.png | Bin 2331 -> 2925 bytes doc/src/images/qeasingcurve-inoutquint.png | Bin 2244 -> 2823 bytes doc/src/images/qeasingcurve-inoutsine.png | Bin 2405 -> 2891 bytes doc/src/images/qeasingcurve-inquad.png | Bin 2283 -> 2733 bytes doc/src/images/qeasingcurve-inquart.png | Bin 2261 -> 2727 bytes doc/src/images/qeasingcurve-inquint.png | Bin 2178 -> 2630 bytes doc/src/images/qeasingcurve-insine.png | Bin 2167 -> 2567 bytes doc/src/images/qeasingcurve-linear.png | Bin 2165 -> 2318 bytes doc/src/images/qeasingcurve-outback.png | Bin 2371 -> 2852 bytes doc/src/images/qeasingcurve-outbounce.png | Bin 2481 -> 3360 bytes doc/src/images/qeasingcurve-outcirc.png | Bin 2269 -> 2796 bytes doc/src/images/qeasingcurve-outcubic.png | Bin 2336 -> 2792 bytes doc/src/images/qeasingcurve-outcurve.png | Bin 2389 -> 2724 bytes doc/src/images/qeasingcurve-outelastic.png | Bin 2402 -> 3423 bytes doc/src/images/qeasingcurve-outexpo.png | Bin 2299 -> 2803 bytes doc/src/images/qeasingcurve-outinback.png | Bin 2400 -> 3026 bytes doc/src/images/qeasingcurve-outinbounce.png | Bin 2568 -> 3629 bytes doc/src/images/qeasingcurve-outincirc.png | Bin 2339 -> 2822 bytes doc/src/images/qeasingcurve-outincubic.png | Bin 2393 -> 2872 bytes doc/src/images/qeasingcurve-outinelastic.png | Bin 2517 -> 3941 bytes doc/src/images/qeasingcurve-outinexpo.png | Bin 2377 -> 2923 bytes doc/src/images/qeasingcurve-outinquad.png | Bin 2380 -> 2858 bytes doc/src/images/qeasingcurve-outinquart.png | Bin 2319 -> 2830 bytes doc/src/images/qeasingcurve-outinquint.png | Bin 2248 -> 2724 bytes doc/src/images/qeasingcurve-outinsine.png | Bin 2388 -> 2817 bytes doc/src/images/qeasingcurve-outquad.png | Bin 2324 -> 2760 bytes doc/src/images/qeasingcurve-outquart.png | Bin 2304 -> 2764 bytes doc/src/images/qeasingcurve-outquint.png | Bin 2242 -> 2687 bytes doc/src/images/qeasingcurve-outsine.png | Bin 2364 -> 2773 bytes doc/src/images/qeasingcurve-sinecurve.png | Bin 2470 -> 3329 bytes src/corelib/tools/qeasingcurve.cpp | 15 +++++++------ 47 files changed, 25 insertions(+), 19 deletions(-) diff --git a/doc/src/diagrams/programs/easingcurve/main.cpp b/doc/src/diagrams/programs/easingcurve/main.cpp index 8a2d53bd6..f249dbce8 100644 --- a/doc/src/diagrams/programs/easingcurve/main.cpp +++ b/doc/src/diagrams/programs/easingcurve/main.cpp @@ -85,32 +85,37 @@ void createCurveIcons() qreal curveScale = iconSize.height()/2; - painter.drawLine(yAxis - 2, xAxis - curveScale, yAxis + 2, xAxis - curveScale); // hor + painter.drawLine(yAxis - 2, xAxis - curveScale, yAxis + 2, xAxis - curveScale); // hor painter.drawLine(yAxis + curveScale, xAxis + 2, yAxis + curveScale, xAxis - 2); // ver painter.drawText(yAxis + curveScale - 8, xAxis - curveScale - 4, QLatin1String("(1,1)")); - + painter.drawText(yAxis + 42, xAxis + 10, QLatin1String("progress")); - painter.drawText(15, xAxis - curveScale - 10, QLatin1String("ease")); - - painter.setPen(QPen(Qt::red, 1, Qt::DotLine)); + painter.drawText(15, xAxis - curveScale - 10, QLatin1String("value")); + + painter.setPen(QPen(Qt::red, 1, Qt::DotLine)); painter.drawLine(yAxis, xAxis - curveScale, yAxis + curveScale, xAxis - curveScale); // hor painter.drawLine(yAxis + curveScale, xAxis, yAxis + curveScale, xAxis - curveScale); // ver - - QPoint currentPos(yAxis, xAxis); - + + QPoint start(yAxis, xAxis - curveScale * curve.valueForProgress(0)); + painter.setPen(Qt::black); QFont font = oldFont; font.setPixelSize(oldFont.pixelSize() + 15); painter.setFont(font); painter.drawText(0, iconSize.height() - 20, iconSize.width(), 20, Qt::AlignHCenter, name); - - for (qreal t = 0; t < 1.0; t+=1.0/curveScale) { + + QPainterPath curvePath; + curvePath.moveTo(start); + for (qreal t = 0; t <= 1.0; t+=1.0/curveScale) { QPoint to; to.setX(yAxis + curveScale * t); to.setY(xAxis - curveScale * curve.valueForProgress(t)); - painter.drawLine(currentPos, to); - currentPos = to; + curvePath.lineTo(to); } + painter.setRenderHint(QPainter::Antialiasing, true); + painter.strokePath(curvePath, QColor(32, 32, 32)); + painter.setRenderHint(QPainter::Antialiasing, false); + QString fileName(QString::fromAscii("qeasingcurve-%1.png").arg(name.toLower())); printf("%s\n", qPrintable(fileName)); pix.save(QString::fromAscii("%1/%2").arg(output).arg(fileName), "PNG"); diff --git a/doc/src/images/qeasingcurve-cosinecurve.png b/doc/src/images/qeasingcurve-cosinecurve.png index b27e76367..8cee97800 100644 Binary files a/doc/src/images/qeasingcurve-cosinecurve.png and b/doc/src/images/qeasingcurve-cosinecurve.png differ diff --git a/doc/src/images/qeasingcurve-inback.png b/doc/src/images/qeasingcurve-inback.png index 8506c0fdd..0064cb341 100644 Binary files a/doc/src/images/qeasingcurve-inback.png and b/doc/src/images/qeasingcurve-inback.png differ diff --git a/doc/src/images/qeasingcurve-inbounce.png b/doc/src/images/qeasingcurve-inbounce.png index 275b38c64..eaa64f8c4 100644 Binary files a/doc/src/images/qeasingcurve-inbounce.png and b/doc/src/images/qeasingcurve-inbounce.png differ diff --git a/doc/src/images/qeasingcurve-incirc.png b/doc/src/images/qeasingcurve-incirc.png index b985e9c8d..7bd0f09d4 100644 Binary files a/doc/src/images/qeasingcurve-incirc.png and b/doc/src/images/qeasingcurve-incirc.png differ diff --git a/doc/src/images/qeasingcurve-incubic.png b/doc/src/images/qeasingcurve-incubic.png index e417ee184..1ac9eafba 100644 Binary files a/doc/src/images/qeasingcurve-incubic.png and b/doc/src/images/qeasingcurve-incubic.png differ diff --git a/doc/src/images/qeasingcurve-incurve.png b/doc/src/images/qeasingcurve-incurve.png index d9a934089..578259e4a 100644 Binary files a/doc/src/images/qeasingcurve-incurve.png and b/doc/src/images/qeasingcurve-incurve.png differ diff --git a/doc/src/images/qeasingcurve-inelastic.png b/doc/src/images/qeasingcurve-inelastic.png index b242fd31d..f976b5a57 100644 Binary files a/doc/src/images/qeasingcurve-inelastic.png and b/doc/src/images/qeasingcurve-inelastic.png differ diff --git a/doc/src/images/qeasingcurve-inexpo.png b/doc/src/images/qeasingcurve-inexpo.png index f06316ced..1af365298 100644 Binary files a/doc/src/images/qeasingcurve-inexpo.png and b/doc/src/images/qeasingcurve-inexpo.png differ diff --git a/doc/src/images/qeasingcurve-inoutback.png b/doc/src/images/qeasingcurve-inoutback.png index 9fd144627..480bc051e 100644 Binary files a/doc/src/images/qeasingcurve-inoutback.png and b/doc/src/images/qeasingcurve-inoutback.png differ diff --git a/doc/src/images/qeasingcurve-inoutbounce.png b/doc/src/images/qeasingcurve-inoutbounce.png index fb65f3198..de623091c 100644 Binary files a/doc/src/images/qeasingcurve-inoutbounce.png and b/doc/src/images/qeasingcurve-inoutbounce.png differ diff --git a/doc/src/images/qeasingcurve-inoutcirc.png b/doc/src/images/qeasingcurve-inoutcirc.png index 123cc548b..b4be8ac21 100644 Binary files a/doc/src/images/qeasingcurve-inoutcirc.png and b/doc/src/images/qeasingcurve-inoutcirc.png differ diff --git a/doc/src/images/qeasingcurve-inoutcubic.png b/doc/src/images/qeasingcurve-inoutcubic.png index b07695c87..49dfbef1b 100644 Binary files a/doc/src/images/qeasingcurve-inoutcubic.png and b/doc/src/images/qeasingcurve-inoutcubic.png differ diff --git a/doc/src/images/qeasingcurve-inoutelastic.png b/doc/src/images/qeasingcurve-inoutelastic.png index 65851e1f5..5b0e54a01 100644 Binary files a/doc/src/images/qeasingcurve-inoutelastic.png and b/doc/src/images/qeasingcurve-inoutelastic.png differ diff --git a/doc/src/images/qeasingcurve-inoutexpo.png b/doc/src/images/qeasingcurve-inoutexpo.png index 7cbfb1378..776984a11 100644 Binary files a/doc/src/images/qeasingcurve-inoutexpo.png and b/doc/src/images/qeasingcurve-inoutexpo.png differ diff --git a/doc/src/images/qeasingcurve-inoutquad.png b/doc/src/images/qeasingcurve-inoutquad.png index c5eed060a..264333085 100644 Binary files a/doc/src/images/qeasingcurve-inoutquad.png and b/doc/src/images/qeasingcurve-inoutquad.png differ diff --git a/doc/src/images/qeasingcurve-inoutquart.png b/doc/src/images/qeasingcurve-inoutquart.png index 3b66c0d34..31fc0c885 100644 Binary files a/doc/src/images/qeasingcurve-inoutquart.png and b/doc/src/images/qeasingcurve-inoutquart.png differ diff --git a/doc/src/images/qeasingcurve-inoutquint.png b/doc/src/images/qeasingcurve-inoutquint.png index c74efe92e..4d7a745be 100644 Binary files a/doc/src/images/qeasingcurve-inoutquint.png and b/doc/src/images/qeasingcurve-inoutquint.png differ diff --git a/doc/src/images/qeasingcurve-inoutsine.png b/doc/src/images/qeasingcurve-inoutsine.png index 5964f3174..012ff751c 100644 Binary files a/doc/src/images/qeasingcurve-inoutsine.png and b/doc/src/images/qeasingcurve-inoutsine.png differ diff --git a/doc/src/images/qeasingcurve-inquad.png b/doc/src/images/qeasingcurve-inquad.png index 337331059..e697c208a 100644 Binary files a/doc/src/images/qeasingcurve-inquad.png and b/doc/src/images/qeasingcurve-inquad.png differ diff --git a/doc/src/images/qeasingcurve-inquart.png b/doc/src/images/qeasingcurve-inquart.png index 28086d86c..6d6517551 100644 Binary files a/doc/src/images/qeasingcurve-inquart.png and b/doc/src/images/qeasingcurve-inquart.png differ diff --git a/doc/src/images/qeasingcurve-inquint.png b/doc/src/images/qeasingcurve-inquint.png index 330aa8581..faaaea71f 100644 Binary files a/doc/src/images/qeasingcurve-inquint.png and b/doc/src/images/qeasingcurve-inquint.png differ diff --git a/doc/src/images/qeasingcurve-insine.png b/doc/src/images/qeasingcurve-insine.png index 63d9238e1..09449034b 100644 Binary files a/doc/src/images/qeasingcurve-insine.png and b/doc/src/images/qeasingcurve-insine.png differ diff --git a/doc/src/images/qeasingcurve-linear.png b/doc/src/images/qeasingcurve-linear.png index 2a0588537..fb3aaf354 100644 Binary files a/doc/src/images/qeasingcurve-linear.png and b/doc/src/images/qeasingcurve-linear.png differ diff --git a/doc/src/images/qeasingcurve-outback.png b/doc/src/images/qeasingcurve-outback.png index 7cb34c698..83b3fa233 100644 Binary files a/doc/src/images/qeasingcurve-outback.png and b/doc/src/images/qeasingcurve-outback.png differ diff --git a/doc/src/images/qeasingcurve-outbounce.png b/doc/src/images/qeasingcurve-outbounce.png index 932fc16ac..27ac97964 100644 Binary files a/doc/src/images/qeasingcurve-outbounce.png and b/doc/src/images/qeasingcurve-outbounce.png differ diff --git a/doc/src/images/qeasingcurve-outcirc.png b/doc/src/images/qeasingcurve-outcirc.png index a1a6cb6ed..00193700e 100644 Binary files a/doc/src/images/qeasingcurve-outcirc.png and b/doc/src/images/qeasingcurve-outcirc.png differ diff --git a/doc/src/images/qeasingcurve-outcubic.png b/doc/src/images/qeasingcurve-outcubic.png index aa1d60448..45477c045 100644 Binary files a/doc/src/images/qeasingcurve-outcubic.png and b/doc/src/images/qeasingcurve-outcubic.png differ diff --git a/doc/src/images/qeasingcurve-outcurve.png b/doc/src/images/qeasingcurve-outcurve.png index a949ae4a1..295b47147 100644 Binary files a/doc/src/images/qeasingcurve-outcurve.png and b/doc/src/images/qeasingcurve-outcurve.png differ diff --git a/doc/src/images/qeasingcurve-outelastic.png b/doc/src/images/qeasingcurve-outelastic.png index 2a9ba3922..1d407ed84 100644 Binary files a/doc/src/images/qeasingcurve-outelastic.png and b/doc/src/images/qeasingcurve-outelastic.png differ diff --git a/doc/src/images/qeasingcurve-outexpo.png b/doc/src/images/qeasingcurve-outexpo.png index e771c2ea6..56851554e 100644 Binary files a/doc/src/images/qeasingcurve-outexpo.png and b/doc/src/images/qeasingcurve-outexpo.png differ diff --git a/doc/src/images/qeasingcurve-outinback.png b/doc/src/images/qeasingcurve-outinback.png index 752372792..4700ab02e 100644 Binary files a/doc/src/images/qeasingcurve-outinback.png and b/doc/src/images/qeasingcurve-outinback.png differ diff --git a/doc/src/images/qeasingcurve-outinbounce.png b/doc/src/images/qeasingcurve-outinbounce.png index ab73d029c..12cc1a8bd 100644 Binary files a/doc/src/images/qeasingcurve-outinbounce.png and b/doc/src/images/qeasingcurve-outinbounce.png differ diff --git a/doc/src/images/qeasingcurve-outincirc.png b/doc/src/images/qeasingcurve-outincirc.png index ec4b8d359..c8a5c86a2 100644 Binary files a/doc/src/images/qeasingcurve-outincirc.png and b/doc/src/images/qeasingcurve-outincirc.png differ diff --git a/doc/src/images/qeasingcurve-outincubic.png b/doc/src/images/qeasingcurve-outincubic.png index 8b8ae6808..42af870d9 100644 Binary files a/doc/src/images/qeasingcurve-outincubic.png and b/doc/src/images/qeasingcurve-outincubic.png differ diff --git a/doc/src/images/qeasingcurve-outinelastic.png b/doc/src/images/qeasingcurve-outinelastic.png index 89dde2c20..308be5790 100644 Binary files a/doc/src/images/qeasingcurve-outinelastic.png and b/doc/src/images/qeasingcurve-outinelastic.png differ diff --git a/doc/src/images/qeasingcurve-outinexpo.png b/doc/src/images/qeasingcurve-outinexpo.png index 590990143..0692baa26 100644 Binary files a/doc/src/images/qeasingcurve-outinexpo.png and b/doc/src/images/qeasingcurve-outinexpo.png differ diff --git a/doc/src/images/qeasingcurve-outinquad.png b/doc/src/images/qeasingcurve-outinquad.png index 7ddefeee6..9e3cd8389 100644 Binary files a/doc/src/images/qeasingcurve-outinquad.png and b/doc/src/images/qeasingcurve-outinquad.png differ diff --git a/doc/src/images/qeasingcurve-outinquart.png b/doc/src/images/qeasingcurve-outinquart.png index 00ef59714..9a3c16f12 100644 Binary files a/doc/src/images/qeasingcurve-outinquart.png and b/doc/src/images/qeasingcurve-outinquart.png differ diff --git a/doc/src/images/qeasingcurve-outinquint.png b/doc/src/images/qeasingcurve-outinquint.png index 361bfaa4d..add9feb26 100644 Binary files a/doc/src/images/qeasingcurve-outinquint.png and b/doc/src/images/qeasingcurve-outinquint.png differ diff --git a/doc/src/images/qeasingcurve-outinsine.png b/doc/src/images/qeasingcurve-outinsine.png index 1737041d6..4bc2aaf9e 100644 Binary files a/doc/src/images/qeasingcurve-outinsine.png and b/doc/src/images/qeasingcurve-outinsine.png differ diff --git a/doc/src/images/qeasingcurve-outquad.png b/doc/src/images/qeasingcurve-outquad.png index 6f27cbd62..c505ff9e7 100644 Binary files a/doc/src/images/qeasingcurve-outquad.png and b/doc/src/images/qeasingcurve-outquad.png differ diff --git a/doc/src/images/qeasingcurve-outquart.png b/doc/src/images/qeasingcurve-outquart.png index d45a0b80a..6eac058d1 100644 Binary files a/doc/src/images/qeasingcurve-outquart.png and b/doc/src/images/qeasingcurve-outquart.png differ diff --git a/doc/src/images/qeasingcurve-outquint.png b/doc/src/images/qeasingcurve-outquint.png index 6e7df0ed0..77a9ad417 100644 Binary files a/doc/src/images/qeasingcurve-outquint.png and b/doc/src/images/qeasingcurve-outquint.png differ diff --git a/doc/src/images/qeasingcurve-outsine.png b/doc/src/images/qeasingcurve-outsine.png index 7546a0d67..d135b2f98 100644 Binary files a/doc/src/images/qeasingcurve-outsine.png and b/doc/src/images/qeasingcurve-outsine.png differ diff --git a/doc/src/images/qeasingcurve-sinecurve.png b/doc/src/images/qeasingcurve-sinecurve.png index ca67d443b..6134a0159 100644 Binary files a/doc/src/images/qeasingcurve-sinecurve.png and b/doc/src/images/qeasingcurve-sinecurve.png differ diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp index 18a252a54..34ad599fa 100644 --- a/src/corelib/tools/qeasingcurve.cpp +++ b/src/corelib/tools/qeasingcurve.cpp @@ -60,8 +60,8 @@ Easing curves describe a function that controls how the speed of the interpolation between 0 and 1 should be. Easing curves allow transitions from one value to another to appear more natural than a simple constant speed would allow. - The QEasingCurve class is usually used in conjunction with the QAnimation class, - but can be used on its own. + The QEasingCurve class is usually used in conjunction with the QVariantAnimation and + QPropertyAnimation classes but can be used on its own. To calculate the speed of the interpolation, the easing curve provides the function valueForProgress(), where the \a progress argument specifies the progress of the @@ -80,10 +80,10 @@ \endcode will print the effective progress of the interpolation between 0 and 1. - When using a QAnimation, the easing curve will be used to control the + When using a QPropertyAnimation, the associated easing curve will be used to control the progress of the interpolation between startValue and endValue: \code - QAnimation animation; + QPropertyAnimation animation; animation.setStartValue(0); animation.setEndValue(1000); animation.setDuration(1000); @@ -98,8 +98,7 @@ \value Linear \inlineimage qeasingcurve-linear.png \br - Easing equation function for a simple linear tweening, - with no easing. + Easing equation function for a linear (t) easing curve. \value InQuad \inlineimage qeasingcurve-inquad.png \br Easing equation function for a quadratic (t^2) easing @@ -280,7 +279,9 @@ \omitvalue OutCurve \omitvalue SineCurve \omitvalue CosineCurve - \value Custom This is returned if the user have specified a custom curve type with setCustomType(). Note that you cannot call setType() with this value, but type() can return it. + \value Custom This is returned if the user specified a custom curve type with + setCustomType(). Note that you cannot call setType() with this value, + but type() can return it. \omitvalue NCurveTypes */ -- cgit v1.2.3 From 99ddd27d400c92949d730ebf4f31eb2fea857650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Tue, 21 Jul 2009 12:43:58 +0200 Subject: Try to express ourselves better in the explanation for the curve types. Don't use easing too much. Also add an explanation of what "ease in" and "ease out" is. --- src/corelib/tools/qeasingcurve.cpp | 165 +++++++++++++++++++------------------ 1 file changed, 84 insertions(+), 81 deletions(-) diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp index 34ad599fa..0828c61e4 100644 --- a/src/corelib/tools/qeasingcurve.cpp +++ b/src/corelib/tools/qeasingcurve.cpp @@ -61,7 +61,9 @@ between 0 and 1 should be. Easing curves allow transitions from one value to another to appear more natural than a simple constant speed would allow. The QEasingCurve class is usually used in conjunction with the QVariantAnimation and - QPropertyAnimation classes but can be used on its own. + QPropertyAnimation classes but can be used on its own. It is usually used to accelerate + the interpolation from zero velocity (ease in) or decelerate to zero velocity (ease out). + Ease in and ease out can also be combined in the same easing curve. To calculate the speed of the interpolation, the easing curve provides the function valueForProgress(), where the \a progress argument specifies the progress of the @@ -98,182 +100,183 @@ \value Linear \inlineimage qeasingcurve-linear.png \br - Easing equation function for a linear (t) easing curve. + Easing curve for a linear (t) function: + velocity is constant. \value InQuad \inlineimage qeasingcurve-inquad.png \br - Easing equation function for a quadratic (t^2) easing - in: accelerating from zero velocity. + Easing curve for a quadratic (t^2) function: + accelerating from zero velocity. \value OutQuad \inlineimage qeasingcurve-outquad.png \br - Easing equation function for a quadratic (t^2) easing - out: decelerating to zero velocity. + Easing curve for a quadratic (t^2) function: + decelerating to zero velocity. \value InOutQuad \inlineimage qeasingcurve-inoutquad.png \br - Easing equation function for a quadratic (t^2) easing - in/out: acceleration until halfway, then deceleration. + Easing curve for a quadratic (t^2) function: + acceleration until halfway, then deceleration. \value OutInQuad \inlineimage qeasingcurve-outinquad.png \br - Easing equation function for a quadratic (t^2) easing - out/in: deceleration until halfway, then acceleration. + Easing curve for a quadratic (t^2) function: + deceleration until halfway, then acceleration. \value InCubic \inlineimage qeasingcurve-incubic.png \br - Easing equation function for a cubic (t^3) easing - in: accelerating from zero velocity. + Easing curve for a cubic (t^3) function: + accelerating from zero velocity. \value OutCubic \inlineimage qeasingcurve-outcubic.png \br - Easing equation function for a cubic (t^3) easing - out: decelerating from zero velocity. + Easing curve for a cubic (t^3) function: + decelerating from zero velocity. \value InOutCubic \inlineimage qeasingcurve-inoutcubic.png \br - Easing equation function for a cubic (t^3) easing - in/out: acceleration until halfway, then deceleration. + Easing curve for a cubic (t^3) function: + acceleration until halfway, then deceleration. \value OutInCubic \inlineimage qeasingcurve-outincubic.png \br - Easing equation function for a cubic (t^3) easing - out/in: deceleration until halfway, then acceleration. + Easing curve for a cubic (t^3) function: + deceleration until halfway, then acceleration. \value InQuart \inlineimage qeasingcurve-inquart.png \br - Easing equation function for a quartic (t^4) easing - in: accelerating from zero velocity. + Easing curve for a quartic (t^4) function: + accelerating from zero velocity. \value OutQuart \inlineimage qeasingcurve-outquart.png \br - Easing equation function for a quartic (t^4) easing - out: decelerating from zero velocity. + Easing curve for a cubic (t^4) function: + decelerating from zero velocity. \value InOutQuart \inlineimage qeasingcurve-inoutquart.png \br - Easing equation function for a quartic (t^4) easing - in/out: acceleration until halfway, then deceleration. + Easing curve for a cubic (t^4) function: + acceleration until halfway, then deceleration. \value OutInQuart \inlineimage qeasingcurve-outinquart.png \br - Easing equation function for a quartic (t^4) easing - out/in: deceleration until halfway, then acceleration. + Easing curve for a cubic (t^4) function: + deceleration until halfway, then acceleration. \value InQuint \inlineimage qeasingcurve-inquint.png \br - Easing equation function for a quintic (t^5) easing + Easing curve for a quintic (t^5) easing in: accelerating from zero velocity. \value OutQuint \inlineimage qeasingcurve-outquint.png \br - Easing equation function for a quintic (t^5) easing - out: decelerating from zero velocity. + Easing curve for a cubic (t^5) function: + decelerating from zero velocity. \value InOutQuint \inlineimage qeasingcurve-inoutquint.png \br - Easing equation function for a quintic (t^5) easing - in/out: acceleration until halfway, then deceleration. + Easing curve for a cubic (t^5) function: + acceleration until halfway, then deceleration. \value OutInQuint \inlineimage qeasingcurve-outinquint.png \br - Easing equation function for a quintic (t^5) easing - out/in: deceleration until halfway, then acceleration. + Easing curve for a cubic (t^5) function: + deceleration until halfway, then acceleration. \value InSine \inlineimage qeasingcurve-insine.png \br - Easing equation function for a sinusoidal (sin(t)) easing - in: accelerating from zero velocity. + Easing curve for a sinusoidal (sin(t)) function: + accelerating from zero velocity. \value OutSine \inlineimage qeasingcurve-outsine.png \br - Easing equation function for a sinusoidal (sin(t)) easing - out: decelerating from zero velocity. + Easing curve for a sinusoidal (sin(t)) function: + decelerating from zero velocity. \value InOutSine \inlineimage qeasingcurve-inoutsine.png \br - Easing equation function for a sinusoidal (sin(t)) easing - in/out: acceleration until halfway, then deceleration. + Easing curve for a sinusoidal (sin(t)) function: + acceleration until halfway, then deceleration. \value OutInSine \inlineimage qeasingcurve-outinsine.png \br - Easing equation function for a sinusoidal (sin(t)) easing - out/in: deceleration until halfway, then acceleration. + Easing curve for a sinusoidal (sin(t)) function: + deceleration until halfway, then acceleration. \value InExpo \inlineimage qeasingcurve-inexpo.png \br - Easing equation function for an exponential (2^t) easing - in: accelerating from zero velocity. + Easing curve for an exponential (2^t) function: + accelerating from zero velocity. \value OutExpo \inlineimage qeasingcurve-outexpo.png \br - Easing equation function for an exponential (2^t) easing - out: decelerating from zero velocity. + Easing curve for an exponential (2^t) function: + decelerating from zero velocity. \value InOutExpo \inlineimage qeasingcurve-inoutexpo.png \br - Easing equation function for an exponential (2^t) easing - in/out: acceleration until halfway, then deceleration. + Easing curve for an exponential (2^t) function: + acceleration until halfway, then deceleration. \value OutInExpo \inlineimage qeasingcurve-outinexpo.png \br - Easing equation function for an exponential (2^t) easing - out/in: deceleration until halfway, then acceleration. + Easing curve for an exponential (2^t) function: + deceleration until halfway, then acceleration. \value InCirc \inlineimage qeasingcurve-incirc.png \br - Easing equation function for a circular (sqrt(1-t^2)) easing - in: accelerating from zero velocity. + Easing curve for a circular (sqrt(1-t^2)) function: + accelerating from zero velocity. \value OutCirc \inlineimage qeasingcurve-outcirc.png \br - Easing equation function for a circular (sqrt(1-t^2)) easing - out: decelerating from zero velocity. + Easing curve for a circular (sqrt(1-t^2)) function: + decelerating from zero velocity. \value InOutCirc \inlineimage qeasingcurve-inoutcirc.png \br - Easing equation function for a circular (sqrt(1-t^2)) easing - in/out: acceleration until halfway, then deceleration. + Easing curve for a circular (sqrt(1-t^2)) function: + acceleration until halfway, then deceleration. \value OutInCirc \inlineimage qeasingcurve-outincirc.png \br - Easing equation function for a circular (sqrt(1-t^2)) easing - out/in: deceleration until halfway, then acceleration. + Easing curve for a circular (sqrt(1-t^2)) function: + deceleration until halfway, then acceleration. \value InElastic \inlineimage qeasingcurve-inelastic.png \br - Easing equation function for an elastic - (exponentially decaying sine wave) easing in: + Easing curve for an elastic + (exponentially decaying sine wave) function: accelerating from zero velocity. The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter. \value OutElastic \inlineimage qeasingcurve-outelastic.png \br - Easing equation function for an elastic - (exponentially decaying sine wave) easing out: + Easing curve for an elastic + (exponentially decaying sine wave) function: decelerating from zero velocity. The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter. \value InOutElastic \inlineimage qeasingcurve-inoutelastic.png \br - Easing equation function for an elastic - (exponentially decaying sine wave) easing in/out: + Easing curve for an elastic + (exponentially decaying sine wave) function: acceleration until halfway, then deceleration. \value OutInElastic \inlineimage qeasingcurve-outinelastic.png \br - Easing equation function for an elastic - (exponentially decaying sine wave) easing out/in: + Easing curve for an elastic + (exponentially decaying sine wave) function: deceleration until halfway, then acceleration. \value InBack \inlineimage qeasingcurve-inback.png \br - Easing equation function for a back (overshooting - cubic easing: (s+1)*t^3 - s*t^2) easing in: + Easing curve for a back (overshooting + cubic function: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity. \value OutBack \inlineimage qeasingcurve-outback.png \br - Easing equation function for a back (overshooting - cubic easing: (s+1)*t^3 - s*t^2) easing out: - decelerating from zero velocity. + Easing curve for a back (overshooting + cubic function: (s+1)*t^3 - s*t^2) easing out: + decelerating to zero velocity. \value InOutBack \inlineimage qeasingcurve-inoutback.png \br - Easing equation function for a back (overshooting - cubic easing: (s+1)*t^3 - s*t^2) easing in/out: + Easing curve for a back (overshooting + cubic function: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration. \value OutInBack \inlineimage qeasingcurve-outinback.png \br - Easing equation function for a back (overshooting + Easing curve for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration. \value InBounce \inlineimage qeasingcurve-inbounce.png \br - Easing equation function for a bounce (exponentially - decaying parabolic bounce) easing in: accelerating + Easing curve for a bounce (exponentially + decaying parabolic bounce) function: accelerating from zero velocity. \value OutBounce \inlineimage qeasingcurve-outbounce.png \br - Easing equation function for a bounce (exponentially - decaying parabolic bounce) easing out: decelerating + Easing curve for a bounce (exponentially + decaying parabolic bounce) function: decelerating from zero velocity. \value InOutBounce \inlineimage qeasingcurve-inoutbounce.png \br - Easing equation function for a bounce (exponentially - decaying parabolic bounce) easing in/out: + Easing curve for a bounce (exponentially + decaying parabolic bounce) function easing in/out: acceleration until halfway, then deceleration. \value OutInBounce \inlineimage qeasingcurve-outinbounce.png \br - Easing equation function for a bounce (exponentially - decaying parabolic bounce) easing out/in: + Easing curve for a bounce (exponentially + decaying parabolic bounce) function easing out/in: deceleration until halfway, then acceleration. \omitvalue InCurve \omitvalue OutCurve -- cgit v1.2.3 From c5eff466432988b338d9d0f340e9d31955109eea Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Tue, 21 Jul 2009 12:51:14 +0200 Subject: Compile with QT_NO_PROCESS or QT_NO_SETTINGS Feature define logic was wrong Reviewed-by: Robert Griebl --- src/testlib/qtestcase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 70c8c8d0f..5de37dc6a 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -937,7 +937,7 @@ static void qParseArgs(int argc, char *argv[]) " -iterations n : Sets the number of accumulation iterations.\n" " -median n : Sets the number of median iterations.\n" " -vb : Print out verbose benchmarking information.\n" -#if !defined(QT_NO_PROCESS) || !defined(QT_NO_SETTINGS) +#if !defined(QT_NO_PROCESS) && !defined(QT_NO_SETTINGS) " -chart : Create chart based on the benchmark result.\n" #endif "\n" @@ -1053,7 +1053,7 @@ static void qParseArgs(int argc, char *argv[]) } else if (strcmp(argv[i], "-vb") == 0) { QBenchmarkGlobalData::current->verboseOutput = true; -#if !defined(QT_NO_PROCESS) || !defined(QT_NO_SETTINGS) +#if !defined(QT_NO_PROCESS) && !defined(QT_NO_SETTINGS) } else if (strcmp(argv[i], "-chart") == 0) { QBenchmarkGlobalData::current->createChart = true; QTestLog::setLogMode(QTestLog::XML); @@ -1627,7 +1627,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv) #endif -#if !defined(QT_NO_PROCESS) || !defined(QT_NO_SETTINGS) +#if !defined(QT_NO_PROCESS) && !defined(QT_NO_SETTINGS) if (QBenchmarkGlobalData::current->createChart) { QString chartLocation = QLibraryInfo::location(QLibraryInfo::BinariesPath); #ifdef Q_OS_WIN -- cgit v1.2.3 From ffd978a76d91aaef92a36c465325256633f2fa97 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Tue, 21 Jul 2009 12:27:42 +0200 Subject: Remove unused gesture related defines and structures We don't use all of them. I also changed the typedefs for the touch related functions to follow the same naming convention. --- src/gui/kernel/qapplication_p.h | 141 ++++++++++++------------------------ src/gui/kernel/qapplication_win.cpp | 16 ++-- 2 files changed, 56 insertions(+), 101 deletions(-) diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 3692160c6..595f22034 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -192,99 +192,54 @@ extern "C" { #endif #if defined(Q_WS_WIN) -typedef BOOL (WINAPI *qt_RegisterTouchWindowPtr)(HWND, ULONG); -typedef BOOL (WINAPI *qt_GetTouchInputInfoPtr)(HANDLE, UINT, PVOID, int); -typedef BOOL (WINAPI *qt_CloseTouchInputHandlePtr)(HANDLE); - -typedef BOOL (WINAPI *PtrGetGestureInfo)(HANDLE hGestureInfo, PVOID pGestureInfo); -typedef BOOL (WINAPI *PtrGetGestureExtraArgs)(HANDLE hGestureInfo, UINT cbExtraArgs, PBYTE pExtraArgs); -typedef BOOL (WINAPI *PtrCloseGestureInfoHandle)(HANDLE hGestureInfo); -typedef BOOL (WINAPI *PtrSetGestureConfig)(HWND hwnd, DWORD dwReserved, UINT cIDs, - PVOID pGestureConfig, - UINT cbSize); -typedef BOOL (WINAPI *PtrGetGestureConfig)(HWND hwnd, DWORD dwReserved, - DWORD dwFlags, PUINT pcIDs, - PVOID pGestureConfig, - UINT cbSize); - -typedef BOOL (WINAPI *PtrBeginPanningFeedback)(HWND hwnd); -typedef BOOL (WINAPI *PtrUpdatePanningFeedback)(HWND hwnd, LONG, LONG, BOOL); -typedef BOOL (WINAPI *PtrEndPanningFeedback)(HWND hwnd, BOOL); +typedef BOOL (WINAPI *PtrRegisterTouchWindow)(HWND, ULONG); +typedef BOOL (WINAPI *PtrGetTouchInputInfo)(HANDLE, UINT, PVOID, int); +typedef BOOL (WINAPI *PtrCloseTouchInputHandle)(HANDLE); + +typedef BOOL (WINAPI *PtrGetGestureInfo)(HANDLE, PVOID); +typedef BOOL (WINAPI *PtrGetGestureExtraArgs)(HANDLE, UINT, PBYTE); +typedef BOOL (WINAPI *PtrCloseGestureInfoHandle)(HANDLE); +typedef BOOL (WINAPI *PtrSetGestureConfig)(HWND, DWORD, UINT, PVOID, UINT); +typedef BOOL (WINAPI *PtrGetGestureConfig)(HWND, DWORD, DWORD, PUINT, PVOID, UINT); + +typedef BOOL (WINAPI *PtrBeginPanningFeedback)(HWND); +typedef BOOL (WINAPI *PtrUpdatePanningFeedback)(HWND, LONG, LONG, BOOL); +typedef BOOL (WINAPI *PtrEndPanningFeedback)(HWND, BOOL); #ifndef WM_GESTURE +# define WM_GESTURE 0x0119 + +# define GID_BEGIN 1 +# define GID_END 2 +# define GID_ZOOM 3 +# define GID_PAN 4 +# define GID_ROTATE 5 +# define GID_TWOFINGERTAP 6 +# define GID_ROLLOVER 7 -#define WM_GESTURE 0x0119 -#define WM_GESTURE_NOTIFY 0x011A - -DECLARE_HANDLE(HGESTUREINFO); - -#define GF_BEGIN 0x00000001 -#define GF_INERTIA 0x00000002 -#define GF_END 0x00000004 - -/* - * Gesture IDs - */ -#define GID_BEGIN 1 -#define GID_END 2 -#define GID_ZOOM 3 -#define GID_PAN 4 -#define GID_ROTATE 5 -#define GID_TWOFINGERTAP 6 -#define GID_ROLLOVER 7 - -typedef struct tagGESTUREINFO { - UINT cbSize; // size, in bytes, of this structure (including variable length Args field) - DWORD dwFlags; // see GF_* flags - DWORD dwID; // gesture ID, see GID_* defines - HWND hwndTarget; // handle to window targeted by this gesture - POINTS ptsLocation; // current location of this gesture - DWORD dwInstanceID; // internally used - DWORD dwSequenceID; // internally used - ULONGLONG ullArguments; // arguments for gestures whose arguments fit in 8 BYTES - UINT cbExtraArgs; // size, in bytes, of extra arguments, if any, that accompany this gesture -} GESTUREINFO, *PGESTUREINFO; -typedef GESTUREINFO const * PCGESTUREINFO; - -typedef struct tagGESTURENOTIFYSTRUCT { - UINT cbSize; // size, in bytes, of this structure - DWORD dwFlags; // unused - HWND hwndTarget; // handle to window targeted by the gesture - POINTS ptsLocation; // starting location - DWORD dwInstanceID; // internally used -} GESTURENOTIFYSTRUCT, *PGESTURENOTIFYSTRUCT; - -/* - * Gesture argument helpers - * - Angle should be a double in the range of -2pi to +2pi - * - Argument should be an unsigned 16-bit value - */ -#define GID_ROTATE_ANGLE_TO_ARGUMENT(_arg_) ((USHORT)((((_arg_) + 2.0 * 3.14159265) / (4.0 * 3.14159265)) * 65535.0)) -#define GID_ROTATE_ANGLE_FROM_ARGUMENT(_arg_) ((((double)(_arg_) / 65535.0) * 4.0 * 3.14159265) - 2.0 * 3.14159265) - -typedef struct tagGESTURECONFIG { - DWORD dwID; // gesture ID - DWORD dwWant; // settings related to gesture ID that are to be turned on - DWORD dwBlock; // settings related to gesture ID that are to be turned off -} GESTURECONFIG, *PGESTURECONFIG; - -#define GC_ALLGESTURES 0x00000001 -#define GC_ZOOM 0x00000001 -#define GC_PAN 0x00000001 -#define GC_PAN_WITH_SINGLE_FINGER_VERTICALLY 0x00000002 -#define GC_PAN_WITH_SINGLE_FINGER_HORIZONTALLY 0x00000004 -#define GC_PAN_WITH_GUTTER 0x00000008 -#define GC_PAN_WITH_INERTIA 0x00000010 -#define GC_ROTATE 0x00000001 -#define GC_TWOFINGERTAP 0x00000001 -#define GC_ROLLOVER 0x00000001 -#define GESTURECONFIGMAXCOUNT 256 // Maximum number of gestures that can be included - // in a single call to SetGestureConfig / GetGestureConfig - - - -#define GCF_INCLUDE_ANCESTORS 0x00000001 // If specified, GetGestureConfig returns consolidated configuration - // for the specified window and it's parent window chain +typedef struct tagGESTUREINFO +{ + UINT cbSize; + DWORD dwFlags; + DWORD dwID; + HWND hwndTarget; + POINTS ptsLocation; + DWORD dwInstanceID; + DWORD dwSequenceID; + ULONGLONG ullArguments; + UINT cbExtraArgs; +} GESTUREINFO; + +# define GC_PAN 0x00000001 +# define GC_PAN_WITH_SINGLE_FINGER_VERTICALLY 0x00000002 +# define GC_PAN_WITH_SINGLE_FINGER_HORIZONTALLY 0x00000004 + +typedef struct tagGESTURECONFIG +{ + DWORD dwID; + DWORD dwWant; + DWORD dwBlock; +} GESTURECONFIG; #endif // WM_GESTURE @@ -559,9 +514,9 @@ public: const QList &touchPoints); #if defined(Q_WS_WIN) - static qt_RegisterTouchWindowPtr RegisterTouchWindow; - static qt_GetTouchInputInfoPtr GetTouchInputInfo; - static qt_CloseTouchInputHandlePtr CloseTouchInputHandle; + static PtrRegisterTouchWindow RegisterTouchWindow; + static PtrGetTouchInputInfo GetTouchInputInfo; + static PtrCloseTouchInputHandle CloseTouchInputHandle; QHash touchInputIDToTouchPointID; QList appAllTouchPoints; diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index cbcac9aeb..d5c820c21 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -3727,7 +3727,7 @@ bool QETWidget::translateGestureEvent(const MSG &msg) gi.dwSequenceID = 0; QApplicationPrivate *qAppPriv = getQApplicationPrivateInternal(); - BOOL bResult = qAppPriv->GetGestureInfo((HGESTUREINFO)msg.lParam, &gi); + BOOL bResult = qAppPriv->GetGestureInfo((HANDLE)msg.lParam, &gi); const QPoint widgetPos = QPoint(gi.ptsLocation.x, gi.ptsLocation.y); QWidget *alienWidget = !internalWinId() ? this : childAt(widgetPos); @@ -3765,7 +3765,7 @@ bool QETWidget::translateGestureEvent(const MSG &msg) if (dwErr > 0) qWarning() << "translateGestureEvent: error = " << dwErr; } - qAppPriv->CloseGestureInfoHandle((HGESTUREINFO)msg.lParam); + qAppPriv->CloseGestureInfoHandle((HANDLE)msg.lParam); return true; } @@ -3951,17 +3951,17 @@ void QSessionManager::cancel() #endif //QT_NO_SESSIONMANAGER -qt_RegisterTouchWindowPtr QApplicationPrivate::RegisterTouchWindow = 0; -qt_GetTouchInputInfoPtr QApplicationPrivate::GetTouchInputInfo = 0; -qt_CloseTouchInputHandlePtr QApplicationPrivate::CloseTouchInputHandle = 0; +PtrRegisterTouchWindow QApplicationPrivate::RegisterTouchWindow = 0; +PtrGetTouchInputInfo QApplicationPrivate::GetTouchInputInfo = 0; +PtrCloseTouchInputHandle QApplicationPrivate::CloseTouchInputHandle = 0; void QApplicationPrivate::initializeMultitouch_sys() { QLibrary library(QLatin1String("user32")); // MinGW (g++ 3.4.5) accepts only C casts. - RegisterTouchWindow = (qt_RegisterTouchWindowPtr)(library.resolve("RegisterTouchWindow")); - GetTouchInputInfo = (qt_GetTouchInputInfoPtr)(library.resolve("GetTouchInputInfo")); - CloseTouchInputHandle = (qt_CloseTouchInputHandlePtr)(library.resolve("CloseTouchInputHandle")); + RegisterTouchWindow = (PtrRegisterTouchWindow)(library.resolve("RegisterTouchWindow")); + GetTouchInputInfo = (PtrGetTouchInputInfo)(library.resolve("GetTouchInputInfo")); + CloseTouchInputHandle = (PtrCloseTouchInputHandle)(library.resolve("CloseTouchInputHandle")); touchInputIDToTouchPointID.clear(); } -- cgit v1.2.3 From 4b4e4ecf808b036e906c3bf22ce97b56808bb20e Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 21 Jul 2009 12:58:07 +0200 Subject: Remove Stickman editor The editor was a just a detail to make the animations and shouldn't be included in the example. --- .../animation/stickman/editor/animationdialog.cpp | 192 --------------------- .../animation/stickman/editor/animationdialog.h | 84 --------- examples/animation/stickman/editor/editor.pri | 2 - examples/animation/stickman/editor/mainwindow.cpp | 76 -------- examples/animation/stickman/editor/mainwindow.h | 58 ------- examples/animation/stickman/graphicsview.cpp | 23 --- examples/animation/stickman/stickman.pro | 2 - 7 files changed, 437 deletions(-) delete mode 100644 examples/animation/stickman/editor/animationdialog.cpp delete mode 100644 examples/animation/stickman/editor/animationdialog.h delete mode 100644 examples/animation/stickman/editor/editor.pri delete mode 100644 examples/animation/stickman/editor/mainwindow.cpp delete mode 100644 examples/animation/stickman/editor/mainwindow.h diff --git a/examples/animation/stickman/editor/animationdialog.cpp b/examples/animation/stickman/editor/animationdialog.cpp deleted file mode 100644 index 853046d6f..000000000 --- a/examples/animation/stickman/editor/animationdialog.cpp +++ /dev/null @@ -1,192 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "animationdialog.h" -#include "stickman.h" -#include "animation.h" -#include "node.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -AnimationDialog::AnimationDialog(StickMan *stickman, QWidget *parent) - : QDialog(parent), m_animation(0), m_stickman(stickman) -{ - initUi(); -} - -AnimationDialog::~AnimationDialog() -{ - delete m_animation; -} - -void AnimationDialog::initUi() -{ - setWindowTitle("Animation"); - setEnabled(false); - - // Second page - m_currentFrame = new QSpinBox(); - m_totalFrames = new QSpinBox(); - m_name = new QLineEdit(); - - connect(m_currentFrame, SIGNAL(valueChanged(int)), this, SLOT(currentFrameChanged(int))); - connect(m_totalFrames, SIGNAL(valueChanged(int)), this, SLOT(totalFramesChanged(int))); - connect(m_name, SIGNAL(textChanged(QString)), this, SLOT(setCurrentAnimationName(QString))); - - QGridLayout *gridLayout = new QGridLayout(this); - gridLayout->addWidget(new QLabel("Name:"), 0, 0, 1, 2); - gridLayout->addWidget(m_name, 0, 2, 1, 2); - gridLayout->addWidget(new QLabel("Frame:"), 1, 0); - gridLayout->addWidget(m_currentFrame, 1, 1); - gridLayout->addWidget(new QLabel("of total # of frames: "), 1, 2); - gridLayout->addWidget(m_totalFrames, 1, 3); -} - -void AnimationDialog::initFromAnimation() -{ - m_currentFrame->setRange(0, m_animation->totalFrames()-1); - m_currentFrame->setValue(m_animation->currentFrame()); - - m_totalFrames->setRange(1, 1000); - m_totalFrames->setValue(m_animation->totalFrames()); - - m_name->setText(m_animation->name()); -} - -void AnimationDialog::saveAnimation() -{ - saveCurrentFrame(); - - QString fileName = QFileDialog::getSaveFileName(this, "Save animation"); - - QFile file(fileName); - if (file.open(QIODevice::WriteOnly)) - m_animation->save(&file); -} - -void AnimationDialog::loadAnimation() -{ - if (maybeSave() != QMessageBox::Cancel) { - QString fileName = QFileDialog::getOpenFileName(this, "Open animation"); - - QFile file(fileName); - if (file.open(QIODevice::ReadOnly)) { - if (m_animation == 0) - newAnimation(); - - m_animation->load(&file); - stickManFromCurrentFrame(); - initFromAnimation(); - } - } -} - -QMessageBox::StandardButton AnimationDialog::maybeSave() -{ - if (m_animation == 0) - return QMessageBox::No; - - QMessageBox::StandardButton button = QMessageBox::question(this, "Save?", "Do you want to save your changes?", - QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel); - if (button == QMessageBox::Save) - saveAnimation(); - - return button; -} - -void AnimationDialog::newAnimation() -{ - if (maybeSave() != QMessageBox::Cancel) { - setEnabled(true); - delete m_animation; - m_animation = new Animation(); - initFromAnimation(); - } -} - -// Gets the data from the stickman and stores it in current frame -void AnimationDialog::saveCurrentFrame() -{ - int count = m_stickman->nodeCount(); - m_animation->setNodeCount(count); - for (int i=0; inode(i); - m_animation->setNodePos(i, node->pos()); - } -} - -// Gets the data from the current frame and sets the stickman -void AnimationDialog::stickManFromCurrentFrame() -{ - int count = m_animation->nodeCount(); - for (int i=0;inode(i); - node->setPos(m_animation->nodePos(i)); - } -} - -void AnimationDialog::currentFrameChanged(int currentFrame) -{ - saveCurrentFrame(); - qDebug("currentFrame: %d", currentFrame); - m_animation->setCurrentFrame(currentFrame); - stickManFromCurrentFrame(); - initFromAnimation(); -} - -void AnimationDialog::totalFramesChanged(int totalFrames) -{ - m_animation->setTotalFrames(totalFrames); - stickManFromCurrentFrame(); - initFromAnimation(); -} - -void AnimationDialog::setCurrentAnimationName(const QString &name) -{ - m_animation->setName(name); -} diff --git a/examples/animation/stickman/editor/animationdialog.h b/examples/animation/stickman/editor/animationdialog.h deleted file mode 100644 index 293f0d48e..000000000 --- a/examples/animation/stickman/editor/animationdialog.h +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef ANIMATIONDIALOG_H -#define ANIMATIONDIALOG_H - -#include -#include - -QT_BEGIN_NAMESPACE -class QSpinBox; -class QLineEdit; -QT_END_NAMESPACE -class StickMan; -class Animation; -class AnimationDialog: public QDialog -{ - Q_OBJECT -public: - AnimationDialog(StickMan *stickMan, QWidget *parent = 0); - ~AnimationDialog(); - -public slots: - void currentFrameChanged(int currentFrame); - void totalFramesChanged(int totalFrames); - void setCurrentAnimationName(const QString &name); - - void newAnimation(); - void saveAnimation(); - void loadAnimation(); - -private: - void saveCurrentFrame(); - void stickManFromCurrentFrame(); - void initFromAnimation(); - void initUi(); - QMessageBox::StandardButton maybeSave(); - - QSpinBox *m_currentFrame; - QSpinBox *m_totalFrames; - QLineEdit *m_name; - Animation *m_animation; - StickMan *m_stickman; -}; - -#endif diff --git a/examples/animation/stickman/editor/editor.pri b/examples/animation/stickman/editor/editor.pri deleted file mode 100644 index 7ad9edba4..000000000 --- a/examples/animation/stickman/editor/editor.pri +++ /dev/null @@ -1,2 +0,0 @@ -SOURCES += $$PWD/animationdialog.cpp $$PWD/mainwindow.cpp -HEADERS += $$PWD/animationdialog.h $$PWD/mainwindow.h diff --git a/examples/animation/stickman/editor/mainwindow.cpp b/examples/animation/stickman/editor/mainwindow.cpp deleted file mode 100644 index e1d08cc51..000000000 --- a/examples/animation/stickman/editor/mainwindow.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "mainwindow.h" -#include "animationdialog.h" -#include "stickman.h" - -#include -#include - -MainWindow::MainWindow(StickMan *stickMan) -{ - initActions(stickMan); -} - -MainWindow::~MainWindow() -{ -} - -void MainWindow::initActions(StickMan *stickMan) -{ - AnimationDialog *dialog = new AnimationDialog(stickMan, this); - dialog->show(); - - QMenu *fileMenu = menuBar()->addMenu("&File"); - QAction *loadAction = fileMenu->addAction("&Open"); - QAction *saveAction = fileMenu->addAction("&Save"); - QAction *exitAction = fileMenu->addAction("E&xit"); - - QMenu *animationMenu = menuBar()->addMenu("&Animation"); - QAction *newAnimationAction = animationMenu->addAction("&New animation"); - - connect(loadAction, SIGNAL(triggered()), dialog, SLOT(loadAnimation())); - connect(saveAction, SIGNAL(triggered()), dialog, SLOT(saveAnimation())); - connect(exitAction, SIGNAL(triggered()), QApplication::instance(), SLOT(quit())); - connect(newAnimationAction, SIGNAL(triggered()), dialog, SLOT(newAnimation())); - -} diff --git a/examples/animation/stickman/editor/mainwindow.h b/examples/animation/stickman/editor/mainwindow.h deleted file mode 100644 index ef122d902..000000000 --- a/examples/animation/stickman/editor/mainwindow.h +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include - -class StickMan; -class MainWindow: public QMainWindow -{ -public: - MainWindow(StickMan *stickMan); - ~MainWindow(); - -private: - void initActions(StickMan *stickMan); -}; - -#endif diff --git a/examples/animation/stickman/graphicsview.cpp b/examples/animation/stickman/graphicsview.cpp index 760c31b55..89f24303b 100644 --- a/examples/animation/stickman/graphicsview.cpp +++ b/examples/animation/stickman/graphicsview.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include "graphicsview.h" -#include "editor/mainwindow.h" #include "stickman.h" #include @@ -53,28 +52,6 @@ void GraphicsView::keyPressEvent(QKeyEvent *e) { if (e->key() == Qt::Key_Escape) close(); - -#if 0 - if (e->key() == Qt::Key_F1) { - if (m_editor == 0) { - QGraphicsScene *scene = new QGraphicsScene; - StickMan *stickMan = new StickMan; - stickMan->setDrawSticks(true); - scene->addItem(stickMan); - - QGraphicsView *view = new QGraphicsView; - view->setBackgroundBrush(Qt::black); - view->setRenderHints(QPainter::Antialiasing); - view->setScene(scene); - - m_editor = new MainWindow(stickMan); - m_editor->setCentralWidget(view); - } - - m_editor->showMaximized(); - } -#endif - emit keyPressed(Qt::Key(e->key())); } diff --git a/examples/animation/stickman/stickman.pro b/examples/animation/stickman/stickman.pro index 1dbbce998..7f8be33a8 100644 --- a/examples/animation/stickman/stickman.pro +++ b/examples/animation/stickman/stickman.pro @@ -12,8 +12,6 @@ SOURCES += main.cpp \ INCLUDEPATH += $$PWD -include(editor/editor.pri) - # install target.path = $$[QT_INSTALL_EXAMPLES]/animation/stickman sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stickman.pro -- cgit v1.2.3 From 2db22b1b12cc7579d08a83ad889efe7f8f07c843 Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Tue, 21 Jul 2009 13:18:46 +0200 Subject: use /usr/bin/env perl as interpreter --- tests/auto/test.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/test.pl b/tests/auto/test.pl index 9fd5c9dbd..a9e3da80f 100755 --- a/tests/auto/test.pl +++ b/tests/auto/test.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use strict; use Cwd; -- cgit v1.2.3 From 31e358f2290c145b839fc5b7b277922c1ab6e19b Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Tue, 21 Jul 2009 13:19:49 +0200 Subject: fix tests for QT_NO_PROCESS and when running tests as root --- tests/auto/bic/tst_bic.cpp | 6 ++++- .../auto/compilerwarnings/tst_compilerwarnings.cpp | 6 ++++- tests/auto/moc/tst_moc.cpp | 20 ++++++++-------- tests/auto/qapplication/tst_qapplication.cpp | 2 ++ tests/auto/qbytearray/tst_qbytearray.cpp | 2 ++ tests/auto/qclipboard/tst_qclipboard.cpp | 2 ++ tests/auto/qcopchannel/tst_qcopchannel.cpp | 2 +- tests/auto/qdir/tst_qdir.cpp | 17 ++++++++++--- tests/auto/qdirectpainter/tst_qdirectpainter.cpp | 4 ++++ tests/auto/qfile/tst_qfile.cpp | 28 +++++++++++++++------- tests/auto/qobject/tst_qobject.cpp | 4 ++++ tests/auto/qprocess/tst_qprocess.cpp | 5 ++++ tests/auto/qsettings/tst_qsettings.cpp | 6 +++-- tests/auto/qtextcodec/tst_qtextcodec.cpp | 4 ++++ 14 files changed, 82 insertions(+), 26 deletions(-) diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp index cec5e76ea..36c35ff08 100644 --- a/tests/auto/bic/tst_bic.cpp +++ b/tests/auto/bic/tst_bic.cpp @@ -43,6 +43,10 @@ #include #include +#ifdef QT_NO_PROCESS +QTEST_NOOP_MAIN +#else + #include "qbic.h" #include @@ -367,4 +371,4 @@ void tst_Bic::sizesAndVTables() QTEST_APPLESS_MAIN(tst_Bic) #include "tst_bic.moc" - +#endif diff --git a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp index 57795c963..d5fef1bfc 100644 --- a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp +++ b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp @@ -47,6 +47,10 @@ #include +#ifdef QT_NO_PROCESS +QTEST_NOOP_MAIN +#else + #include QT_USE_NAMESPACE @@ -248,4 +252,4 @@ void tst_CompilerWarnings::warnings() QTEST_APPLESS_MAIN(tst_CompilerWarnings) #include "tst_compilerwarnings.moc" - +#endif // QT_NO_PROCESS diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp index 3a40ae074..898cfe16e 100644 --- a/tests/auto/moc/tst_moc.cpp +++ b/tests/auto/moc/tst_moc.cpp @@ -510,7 +510,7 @@ private: void tst_Moc::initTestCase() { -#if defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) && !defined(QT_NO_PROCESS) QProcess proc; proc.start("qmake", QStringList() << "-query" << "QT_INSTALL_HEADERS"); QVERIFY(proc.waitForFinished()); @@ -555,7 +555,7 @@ void tst_Moc::oldStyleCasts() #ifdef MOC_CROSS_COMPILED QSKIP("Not tested when cross-compiled", SkipAll); #endif -#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) +#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) QProcess proc; proc.start("moc", QStringList(srcify("/oldstyle-casts.h"))); QVERIFY(proc.waitForFinished()); @@ -585,7 +585,7 @@ void tst_Moc::warnOnExtraSignalSlotQualifiaction() #ifdef MOC_CROSS_COMPILED QSKIP("Not tested when cross-compiled", SkipAll); #endif -#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) +#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) QProcess proc; proc.start("moc", QStringList(srcify("extraqualification.h"))); QVERIFY(proc.waitForFinished()); @@ -627,7 +627,7 @@ void tst_Moc::inputFileNameWithDotsButNoExtension() #ifdef MOC_CROSS_COMPILED QSKIP("Not tested when cross-compiled", SkipAll); #endif -#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) +#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) QProcess proc; proc.setWorkingDirectory(QString(SRCDIR) + "/task71021"); proc.start("moc", QStringList("../Header")); @@ -835,7 +835,7 @@ void tst_Moc::warnOnMultipleInheritance() #ifdef MOC_CROSS_COMPILED QSKIP("Not tested when cross-compiled", SkipAll); #endif -#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) +#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) QProcess proc; QStringList args; args << "-I" << qtIncludePath + "/QtGui" @@ -858,7 +858,7 @@ void tst_Moc::forgottenQInterface() #ifdef MOC_CROSS_COMPILED QSKIP("Not tested when cross-compiled", SkipAll); #endif -#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) +#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) QProcess proc; QStringList args; args << "-I" << qtIncludePath + "/QtCore" @@ -940,7 +940,7 @@ void tst_Moc::frameworkSearchPath() #ifdef MOC_CROSS_COMPILED QSKIP("Not tested when cross-compiled", SkipAll); #endif -#if defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) && !defined(QT_NO_PROCESS) QStringList args; args << "-F" << srcify(".") << srcify("interface-from-framework.h") @@ -978,7 +978,7 @@ void tst_Moc::templateGtGt() #ifdef MOC_CROSS_COMPILED QSKIP("Not tested when cross-compiled", SkipAll); #endif -#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) +#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) QProcess proc; proc.start("moc", QStringList(srcify("template-gtgt.h"))); QVERIFY(proc.waitForFinished()); @@ -994,7 +994,7 @@ void tst_Moc::templateGtGt() void tst_Moc::defineMacroViaCmdline() { -#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) +#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) QProcess proc; QStringList args; @@ -1082,7 +1082,7 @@ void tst_Moc::warnOnPropertyWithoutREAD() #ifdef MOC_CROSS_COMPILED QSKIP("Not tested when cross-compiled", SkipAll); #endif -#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) +#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) QProcess proc; proc.start("moc", QStringList(srcify("warn-on-property-without-read.h"))); QVERIFY(proc.waitForFinished()); diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/qapplication/tst_qapplication.cpp index 853272341..7cb6bfa87 100644 --- a/tests/auto/qapplication/tst_qapplication.cpp +++ b/tests/auto/qapplication/tst_qapplication.cpp @@ -1382,6 +1382,7 @@ void tst_QApplication::testDeleteLaterProcessEvents() */ void tst_QApplication::desktopSettingsAware() { +#ifndef QT_NO_PROCESS QProcess testProcess; #ifdef Q_OS_WINCE int argc = 0; @@ -1399,6 +1400,7 @@ void tst_QApplication::desktopSettingsAware() QVERIFY(testProcess.waitForFinished(10000)); QCOMPARE(int(testProcess.state()), int(QProcess::NotRunning)); QVERIFY(int(testProcess.error()) != int(QProcess::Crashed)); +#endif } void tst_QApplication::setActiveWindow() diff --git a/tests/auto/qbytearray/tst_qbytearray.cpp b/tests/auto/qbytearray/tst_qbytearray.cpp index 78fbf32c7..b7e47170e 100644 --- a/tests/auto/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/qbytearray/tst_qbytearray.cpp @@ -235,6 +235,8 @@ void tst_QByteArray::qUncompress() QSKIP("Corrupt data causes this tests to lock up on HP-UX / PA-RISC with gcc", SkipAll); #elif defined Q_OS_SOLARIS QSKIP("Corrupt data causes this tests to lock up on Solaris", SkipAll); +#elif defined Q_OS_QNX + QSKIP("Currupt data cuases this test to lock up on QNX", SkipAll); #endif QTEST(::qUncompress(in), "out"); diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/qclipboard/tst_qclipboard.cpp index f400754fc..bcdf04372 100644 --- a/tests/auto/qclipboard/tst_qclipboard.cpp +++ b/tests/auto/qclipboard/tst_qclipboard.cpp @@ -192,6 +192,7 @@ void tst_QClipboard::testSignals() */ void tst_QClipboard::copy_exit_paste() { +#ifndef QT_NO_PROCESS #if defined Q_WS_X11 || defined Q_WS_QWS QSKIP("This test does not make sense on X11 and embedded, copied data disappears from the clipboard when the application exits ", SkipAll); // ### It's still possible to test copy/paste - just keep the apps running @@ -205,6 +206,7 @@ void tst_QClipboard::copy_exit_paste() QTest::qWait(100); #endif QCOMPARE(QProcess::execute("paster/paster", stringArgument), 0); +#endif } void tst_QClipboard::setMimeData() diff --git a/tests/auto/qcopchannel/tst_qcopchannel.cpp b/tests/auto/qcopchannel/tst_qcopchannel.cpp index d07898ace..ce97eaee2 100644 --- a/tests/auto/qcopchannel/tst_qcopchannel.cpp +++ b/tests/auto/qcopchannel/tst_qcopchannel.cpp @@ -42,7 +42,7 @@ #include -#ifdef Q_WS_QWS +#if defined(Q_WS_QWS) && !defined(QT_NO_PROCESS) //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp index 1fd5e88a3..e5b23ab3f 100644 --- a/tests/auto/qdir/tst_qdir.cpp +++ b/tests/auto/qdir/tst_qdir.cpp @@ -571,10 +571,21 @@ void tst_QDir::entryList() return; } - for (int i=0; i 100); // sanity check proc.kill(); +#endif } class MyObject : public QObject diff --git a/tests/auto/qfile/tst_qfile.cpp b/tests/auto/qfile/tst_qfile.cpp index 8d9c2beeb..66f29dd54 100644 --- a/tests/auto/qfile/tst_qfile.cpp +++ b/tests/auto/qfile/tst_qfile.cpp @@ -382,6 +382,12 @@ void tst_QFile::open() QFETCH( bool, ok ); +#ifdef Q_OS_UNIX + if (::getuid() == 0) + // root and Chuck Norris don't care for file permissions. Skip. + QSKIP("Running this test as root doesn't make sense", SkipAll); +#endif + #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) QEXPECT_FAIL("noreadfile", "Windows does not currently support non-readable files.", Abort); #endif @@ -2493,14 +2499,20 @@ void tst_QFile::map() file.close(); - // Change permissions on a file, just to confirm it would fail - QFile::Permissions originalPermissions = file.permissions(); - QVERIFY(file.setPermissions(QFile::ReadOther)); - QVERIFY(!file.open(QFile::ReadWrite)); - memory = file.map(offset, size); - QCOMPARE(file.error(), QFile::PermissionsError); - QVERIFY(!memory); - QVERIFY(file.setPermissions(originalPermissions)); +#ifdef Q_OS_UNIX + if (::getuid() != 0) + // root always has permissions +#endif + { + // Change permissions on a file, just to confirm it would fail + QFile::Permissions originalPermissions = file.permissions(); + QVERIFY(file.setPermissions(QFile::ReadOther)); + QVERIFY(!file.open(QFile::ReadWrite)); + memory = file.map(offset, size); + QCOMPARE(file.error(), QFile::PermissionsError); + QVERIFY(!memory); + QVERIFY(file.setPermissions(originalPermissions)); + } QVERIFY(file.remove()); } diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp index 8ce7c3a3b..4f25af6fc 100644 --- a/tests/auto/qobject/tst_qobject.cpp +++ b/tests/auto/qobject/tst_qobject.cpp @@ -2426,11 +2426,15 @@ void tst_QObject::dynamicProperties() void tst_QObject::recursiveSignalEmission() { +#ifdef QT_NO_PROCESS + QSKIP("Test requires QProcess", SkipAll); +#else QProcess proc; proc.start("./signalbug"); QVERIFY(proc.waitForFinished()); QVERIFY(proc.exitStatus() == QProcess::NormalExit); QCOMPARE(proc.exitCode(), 0); +#endif } void tst_QObject::blockingQueuedConnection() diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index c19d0a580..d235dff95 100644 --- a/tests/auto/qprocess/tst_qprocess.cpp +++ b/tests/auto/qprocess/tst_qprocess.cpp @@ -50,6 +50,10 @@ #include #include +#ifdef QT_NO_PROCESS +QTEST_NOOP_MAIN +#else + #if defined(Q_OS_WIN) #include #endif @@ -2132,3 +2136,4 @@ void tst_QProcess::invalidProgramString() QTEST_MAIN(tst_QProcess) #include "tst_qprocess.moc" +#endif diff --git a/tests/auto/qsettings/tst_qsettings.cpp b/tests/auto/qsettings/tst_qsettings.cpp index 77fef1f35..5b9e9e1ec 100644 --- a/tests/auto/qsettings/tst_qsettings.cpp +++ b/tests/auto/qsettings/tst_qsettings.cpp @@ -716,6 +716,9 @@ void tst_QSettings::testErrorHandling() #ifdef QT_BUILD_INTERNAL #ifdef Q_OS_WIN QSKIP("Windows doesn't support most file modes, including read-only directories, so this test is moot.", SkipAll); +#elif defined(Q_OS_UNIX) + if (::getuid() == 0) + QSKIP("Running this test as root doesn't work, since file perms do not bother him", SkipAll); #else QFETCH(int, filePerms); QFETCH(int, dirPerms); @@ -724,8 +727,7 @@ void tst_QSettings::testErrorHandling() QFETCH(int, statusAfterGet); QFETCH(int, statusAfterSetAndSync); - - system(QString("chmod 700 %1 2>/dev/null").arg(settingsPath("someDir")).toLatin1()); + system(QString("chmod 700 %1 2>/dev/null").arg(settingsPath("someDir")).toLatin1()); system(QString("chmod -R u+rwx %1 2>/dev/null").arg(settingsPath("someDir")).toLatin1()); system(QString("rm -fr %1").arg(settingsPath("someDir")).toLatin1()); diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index f2da1ecce..9f5180513 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -1875,6 +1875,9 @@ void tst_QTextCodec::codecForUtfText() #ifdef Q_OS_UNIX void tst_QTextCodec::toLocal8Bit() { +#ifdef QT_NO_PROCESS + QSKIP("This test requires QProcess", SkipAll); +#else QProcess process; process.start("echo/echo"); QString string(QChar(0x410)); @@ -1884,6 +1887,7 @@ void tst_QTextCodec::toLocal8Bit() process.waitForFinished(); QCOMPARE(process.exitStatus(), QProcess::NormalExit); QCOMPARE(process.exitCode(), 0); +#endif } #endif -- cgit v1.2.3 From 08b3511a0c20cfbfdec91e547a2592afce67f0e6 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 21 Jul 2009 13:48:25 +0200 Subject: configure -dont-process must build the host tools on Windows CE Reviewed-by: mauricek --- configure.exe | Bin 1102848 -> 1131520 bytes tools/configure/configureapp.cpp | 2 +- tools/configure/main.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.exe b/configure.exe index b4b7c50a5..14eaef42c 100644 Binary files a/configure.exe and b/configure.exe differ diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index a899adbc3..61daca8b4 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3109,6 +3109,7 @@ void Configure::buildQmake() void Configure::buildHostTools() { + dictionary[ "DONE" ] = "yes"; if (!dictionary.contains("XQMAKESPEC")) return; @@ -3332,7 +3333,6 @@ void Configure::generateMakefiles() } else { cout << "Processing of project files have been disabled." << endl; cout << "Only use this option if you really know what you're doing." << endl << endl; - dictionary[ "DONE" ] = "yes"; return; } } diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp index 0e13c7a3b..e5c04cc91 100644 --- a/tools/configure/main.cpp +++ b/tools/configure/main.cpp @@ -95,7 +95,7 @@ int runConfigure( int argc, char** argv ) #endif if( !app.isDone() ) app.generateMakefiles(); - if( !app.isDone() && app.isOk() ) + if( !app.isDone() ) app.buildHostTools(); if( !app.isDone() ) app.showSummary(); -- cgit v1.2.3 From 2c1e529e4d9edf9892d9a8d30806ecdfa8d093a3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 21 Jul 2009 13:53:00 +0200 Subject: New Binary --- configure.exe | Bin 1131520 -> 1892397 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/configure.exe b/configure.exe index 14eaef42c..5c5c199d5 100644 Binary files a/configure.exe and b/configure.exe differ -- cgit v1.2.3 From 7624741ce0d2ab709f7a7418632c3e7969f536a6 Mon Sep 17 00:00:00 2001 From: Andy Date: Tue, 21 Jul 2009 14:03:13 +0200 Subject: Fix building in a namespace when building with -arch ppc on Mac OS X Task-number: 257080 Reviewed-by: nrc --- src/corelib/arch/qatomic_powerpc.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/corelib/arch/qatomic_powerpc.h b/src/corelib/arch/qatomic_powerpc.h index ea3f45823..c3b31f92a 100644 --- a/src/corelib/arch/qatomic_powerpc.h +++ b/src/corelib/arch/qatomic_powerpc.h @@ -101,8 +101,6 @@ template Q_INLINE_TEMPLATE bool QBasicAtomicPointer::isFetchAndAddWaitFree() { return false; } -QT_BEGIN_NAMESPACE - #if defined(Q_CC_GNU) #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2) \ -- cgit v1.2.3 From f616cebd67a6044d6e26d57bc26975ee153479ea Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 21 Jul 2009 14:06:07 +0200 Subject: Disable visibility on CC 5.9 since the compiler doesn't like it --- src/corelib/global/qglobal.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 0ef48fa6b..866247a7c 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -665,7 +665,8 @@ namespace QT_NAMESPACE {} # define Q_ALIGNOF(type) __alignof__(type) # define Q_TYPEOF(expr) __typeof__(expr) # define Q_DECL_ALIGN(n) __attribute__((__aligned__(n))) -# define Q_DECL_EXPORT __attribute__((__visibility__("default"))) +// using CC 5.9: Warning: attribute visibility is unsupported and will be skipped.. +//# define Q_DECL_EXPORT __attribute__((__visibility__("default"))) # endif # if !defined(_BOOL) # define Q_NO_BOOL_TYPE -- cgit v1.2.3 From 8714892977269591bb9b348c6eb549a7f2c45cbc Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 21 Jul 2009 14:06:50 +0200 Subject: There's no need to include qstringmatcher.h in qstringlist.h --- src/corelib/tools/qstringlist.cpp | 1 + src/corelib/tools/qstringlist.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index 5a2b37ae2..5c550af15 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -41,6 +41,7 @@ #include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h index 665c0d070..f36567adb 100644 --- a/src/corelib/tools/qstringlist.h +++ b/src/corelib/tools/qstringlist.h @@ -47,7 +47,6 @@ #include #include #include -#include #ifdef QT_INCLUDE_COMPAT #include #endif -- cgit v1.2.3 From c5e9b0238f0bfe0b8e2c415078011c6d6b34fb11 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Tue, 21 Jul 2009 14:16:12 +0200 Subject: QHttpNetworkConnection: Clarifying code comment about compression Reviewed-by: TrustMe --- src/network/access/qhttpnetworkconnection.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 726b95491..2169f9718 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -228,7 +228,12 @@ void QHttpNetworkConnectionPrivate::prepareRequest(HttpMessagePair &messagePair) #ifndef QT_NO_NETWORKPROXY } #endif - // set the gzip header + + // If the request had a accept-encoding set, we better not mess + // with it. If it was not set, we announce that we understand gzip + // and remember this fact in request.d->autoDecompress so that + // we can later decompress the HTTP reply if it has such an + // encoding. value = request.headerField("accept-encoding"); if (value.isEmpty()) { #ifndef QT_NO_COMPRESS -- cgit v1.2.3 From 21556aeb9bbfe86b742af9b75a160c44c914f41c Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 21 Jul 2009 14:19:50 +0200 Subject: Another fix needed to build in a namespace on Mac with -arch ppc Don't know how this got lost in the original submit since I had added both. Task-number: 257080 Reviewed-by: nrc --- src/gui/kernel/qt_cocoa_helpers_mac_p.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h index 5156b9c74..9cb539841 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h +++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h @@ -105,6 +105,8 @@ #include #include "private/qt_mac_p.h" +struct HIContentBorderMetrics; + #ifdef Q_WS_MAC32 typedef struct _NSPoint NSPoint; // Just redefine here so I don't have to pull in all of Cocoa. #else @@ -121,7 +123,6 @@ void macWindowToolbarSet( void * /*OSWindowRef*/ window, void* toolbarRef ); bool macWindowToolbarVisible( void * /*OSWindowRef*/ window ); void macWindowSetHasShadow( void * /*OSWindowRef*/ window, bool hasShadow ); void macWindowFlush(void * /*OSWindowRef*/ window); -struct HIContentBorderMetrics; void qt_mac_updateContentBorderMetricts(void * /*OSWindowRef */window, const ::HIContentBorderMetrics &metrics); void * /*NSImage */qt_mac_create_nsimage(const QPixmap &pm); void qt_mac_update_mouseTracking(QWidget *widget); -- cgit v1.2.3 From ba191b0a26b966ad1fb596a905307399922bc44a Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 21 Jul 2009 14:28:01 +0200 Subject: Fix warning with Sun CC 5.9 and xlC 7: no new types inside anonymous unions. These compilers compile this code fine, but this warning shows up *everywhere* when building Qt (or used to, since qstringlist.h included qstringmatcher.h). Move the structure definition to outside the union. --- src/corelib/tools/qstringmatcher.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/tools/qstringmatcher.h index 2b8edc945..61b7a9530 100644 --- a/src/corelib/tools/qstringmatcher.h +++ b/src/corelib/tools/qstringmatcher.h @@ -81,13 +81,14 @@ private: // explicitely allow anonymous unions for RVCT to prevent compiler warnings #pragma anon_unions #endif + struct Data { + uchar q_skiptable[256]; + const QChar *uc; + int len; + }; union { uint q_data[256]; - struct { - uchar q_skiptable[256]; - const QChar *uc; - int len; - } p; + Data p; }; }; -- cgit v1.2.3 From 650f11129b74297f502f5ddd81f52a3193ea65c0 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 21 Jul 2009 14:15:01 +0200 Subject: Doc: Updated link and a bit more documentation for QWebSecurityOrigin and QWebDatabase. --- src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp | 21 ++++++++++++++++----- .../webkit/WebKit/qt/Api/qwebsecurityorigin.cpp | 15 ++++++++++----- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp index 7e85eaaf2..0d1138167 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp @@ -34,9 +34,20 @@ using namespace WebCore; \brief The QWebDatabase class provides access to HTML 5 databases created with JavaScript. The upcoming HTML 5 standard includes support for SQL databases that web sites can create and - access on a local computer through JavaScript. QWebDatabase is the C++ interface to these databases. + access on a local computer through JavaScript. QWebDatabase is the C++ interface to these + databases. - For more information refer to the \l{http://www.w3.org/html/wg/html5/#sql}{HTML 5 Draft Standard}. + To get access to all databases defined by a security origin, use QWebSecurityOrigin::databases(). + Each database has an internal name(), as well as a user-friendly name, provided by displayName(). + + WebKit uses SQLite to create and access the local SQL databases. The location of the database + file in the local file system is returned by fileName(). You can access the database directly + through the QtSql database module. + + For each database the web site can define an expectedSize(). The current size of the database + in bytes is returned by size(). + + For more information refer to the \l{http://dev.w3.org/html5/webdatabase/}{HTML 5 Draft Standard}. \sa QWebSecurityOrigin */ @@ -127,7 +138,7 @@ QWebDatabase::QWebDatabase(QWebDatabasePrivate* priv) \endcode \note Concurrent access to a database from multiple threads or processes - is not very efficient because Sqlite is used as WebKit's database backend. + is not very efficient because SQLite is used as WebKit's database backend. */ QString QWebDatabase::fileName() const { @@ -149,8 +160,8 @@ QWebSecurityOrigin QWebDatabase::origin() const } /*! - Removes the database \a db from its security origin. All data stored in this database - will be destroyed. + Removes the database \a db from its security origin. All data stored in the + database \a db will be destroyed. */ void QWebDatabase::removeDatabase(const QWebDatabase &db) { diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp index da9278c1a..d2eaf1021 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp @@ -36,10 +36,9 @@ using namespace WebCore; \brief The QWebSecurityOrigin class defines a security boundary for web sites. QWebSecurityOrigin provides access to the security domains defined by web sites. - An origin consists of a host name, a scheme, and a port number. Web sites with the same - security origin can access each other's resources for client-side scripting or databases. - - ### diagram + An origin consists of a host name, a scheme, and a port number. Web sites + with the same security origin can access each other's resources for client-side + scripting or databases. For example the site \c{http://www.example.com/my/page.html} is allowed to share the same database as \c{http://www.example.com/my/overview.html}, or access each other's @@ -47,7 +46,13 @@ using namespace WebCore; \c{http://www.malicious.com/evil.html} from accessing \c{http://www.example.com/}'s resources, because they are of a different security origin. - QWebSecurity also provides access to all databases defined within a security origin. + Call QWebFrame::securityOrigin() to get the QWebSecurityOrigin for a frame in a + web page, and use host(), scheme() and port() to identify the security origin. + + Use databases() to access the databases defined within a security origin. The + disk usage of the origin's databases can be limited with setDatabaseQuota(). + databaseQuota() and databaseUsage() report the current limit as well as the + current usage. For more information refer to the \l{http://en.wikipedia.org/wiki/Same_origin_policy}{"Same origin policy" Wikipedia Article}. -- cgit v1.2.3 From 1ba8d525d3c898c198821e493c7fa6c4eb4689a3 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 16 Jul 2009 13:55:04 +0200 Subject: Fix compilation with xlC 7: the cast is necessary to get delete[] to understand what to delete Reviewed-By: Trust Me --- src/corelib/kernel/qobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index eb1bd0b2a..6503ab07d 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -854,7 +854,7 @@ QObject::~QObject() QObjectPrivate::Connection::~Connection() { if (argumentTypes != &DIRECT_CONNECTION_ONLY) - delete [] argumentTypes; + delete [] static_cast(argumentTypes); } -- cgit v1.2.3 From 6c5cbdbee91ea200321480dcee243ae061a3a902 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 16 Jul 2009 14:14:28 +0200 Subject: Add code to the Unix configure script to get the xlC version number --- configure | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 13bdf7fc2..87fe28181 100755 --- a/configure +++ b/configure @@ -6114,8 +6114,34 @@ case "$XPLATFORM" in canBuildWebKit="no" ;; aix-xlc*) - canBuildWebKit="no" - canBuildQtXmlPatterns="no" + # Get the xlC version + cat > xlcver.c < +int main() +{ + printf("%d.%d\n", __xlC__ >> 8, __xlC__ & 0xFF); + return 0; +} +EOF + xlcver= + if ${QMAKE_CONF_COMPILER} -o xlcver xlcver.c >/dev/null 2>/dev/null; then + xlcver=`./xlcver 2>/dev/null` + rm -f ./xlcver + fi + if [ "$OPT_VERBOSE" = "yes" ]; then + if [ -n "$xlcver" ]; then + echo Found IBM xlC version: $xlcver. + else + echo Could not determine IBM xlC version, assuming oldest supported. + fi + fi + + case "$xlcver" in + *) + canBuildWebKit="no" + canBuildQtXmlPatterns="no" + ;; + esac ;; irix-cc*) canBuildWebKit="no" -- cgit v1.2.3 From cb64ac587249f5dc6563a035e2ef5a3ad2bc5d13 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 16 Jul 2009 15:38:27 +0200 Subject: xlC 7 cannot compile QtConcurrent with these templates here --- src/corelib/concurrent/qfuture.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/concurrent/qfuture.h b/src/corelib/concurrent/qfuture.h index 47015ee66..f2db5ac18 100644 --- a/src/corelib/concurrent/qfuture.h +++ b/src/corelib/concurrent/qfuture.h @@ -210,7 +210,7 @@ public: bool operator==(const QFuture &other) const { return (d == other.d); } bool operator!=(const QFuture &other) const { return (d != other.d); } -#ifndef QT_NO_MEMBER_TEMPLATES +#if !defined(QT_NO_MEMBER_TEMPLATES) && !defined(Q_CC_XLC) template QFuture(const QFuture &other) : d(other.d) -- cgit v1.2.3 From 9025b909da8e52c700b0e0ac2f62bf441233c8c5 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 19 Jul 2009 13:42:06 +0200 Subject: Fix compilation of QHash with xlC 7. Make sure that the function is found properly. It can't be static, for whatever reason. Reviewed-By: Peter Hartmann --- src/xmlpatterns/type/qprimitives_p.h | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/xmlpatterns/type/qprimitives_p.h b/src/xmlpatterns/type/qprimitives_p.h index 78bd4ae13..b77698a84 100644 --- a/src/xmlpatterns/type/qprimitives_p.h +++ b/src/xmlpatterns/type/qprimitives_p.h @@ -73,17 +73,6 @@ QT_BEGIN_NAMESPACE class QString; -/** - * @internal - * - * A method to allow a QHash or QSet with QUrl - * as key type. - */ -inline uint qHash(const QUrl &uri) -{ - return qHash(uri.toString()); -} - /** * @short The namespace for the internal API of QtXmlPatterns * @internal @@ -91,6 +80,17 @@ inline uint qHash(const QUrl &uri) namespace QPatternist { + /** + * @internal + * + * A method to allow a QHash or QSet with QUrl + * as key type. + */ + inline uint qHash(const QUrl &uri) + { + return qHash(uri.toString()); + } + /** * @defgroup Patternist_cppWXSTypes C++ Primitives for W3C XML Schema Number Types * @@ -208,6 +208,8 @@ namespace QPatternist QString Q_AUTOTEST_EXPORT escape(const QString &input); } +using QPatternist::qHash; + QT_END_NAMESPACE QT_END_HEADER -- cgit v1.2.3 From 4278109e1f6cca83e687977db55b193ef4f7fcd7 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 19 Jul 2009 14:02:10 +0200 Subject: Fix compilation with xlC 7: the compiler doesn't find statics in template expansions. parser/qmaintainingreader.cpp", line 175.40: 1540-0274 (S) The name lookup for "formatKeyword" did not find a declaration. parser/qmaintainingreader.cpp", line 175.40: 1540-1292 (I) Static declarations are not considered for a function call if the function is not qualified. Reviewed-By: Peter Hartmann Reviewed-By: Frans Englich --- src/xmlpatterns/utils/qpatternistlocale_p.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/xmlpatterns/utils/qpatternistlocale_p.h b/src/xmlpatterns/utils/qpatternistlocale_p.h index dc287bde2..d8288c7bd 100644 --- a/src/xmlpatterns/utils/qpatternistlocale_p.h +++ b/src/xmlpatterns/utils/qpatternistlocale_p.h @@ -93,7 +93,8 @@ namespace QPatternist Q_DISABLE_COPY(QtXmlPatterns) }; - static inline QString formatKeyword(const QString &keyword) + // don't make this function static, otherwise xlC 7 cannot find it + inline QString formatKeyword(const QString &keyword) { return QLatin1String("") + escape(keyword) + -- cgit v1.2.3 From 9317e521f0b0f689c87b95b927102dbf55edb89f Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 19 Jul 2009 14:03:49 +0200 Subject: Fix compilation with xlC 7: the compiler tries to expand qIsForwardIteratorEnd with QString This is used in other places too, so move the definition to the header. Reviewed-By: Trust Me --- src/xmlpatterns/api/qabstractxmlforwarditerator_p.h | 15 ++++++++++++++- src/xmlpatterns/functions/qsequencegeneratingfns.cpp | 13 ------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h index d3188d31a..b4eefebc6 100644 --- a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h +++ b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h @@ -55,7 +55,7 @@ #include #include #include - +#include QT_BEGIN_HEADER @@ -74,6 +74,19 @@ inline bool qIsForwardIteratorEnd(const T &unit) return !unit; } +/** + * @short Helper class for StringSplitter + * + * Needed by the QAbstractXmlForwardIterator sub-class. + * + * @relates StringSplitter + */ +template<> +inline bool qIsForwardIteratorEnd(const QString &unit) +{ + return unit.isNull(); +} + template class QAbstractXmlForwardIterator; class QAbstractXmlForwardIteratorPrivate; diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp index 81724f87a..e3f30c545 100644 --- a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp +++ b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp @@ -68,19 +68,6 @@ Item IdFN::mapToItem(const QString &id, return context.second->elementById(context.first->namePool()->allocateQName(QString(), id)); } -/** - * @short Helper class for StringSplitter - * - * Needed by the QAbstractXmlForwardIterator sub-class. - * - * @relates StringSplitter - */ -template<> -bool qIsForwardIteratorEnd(const QString &unit) -{ - return unit.isNull(); -} - /** * @short Helper class for IdFN. * -- cgit v1.2.3 From 08ff267fe37dcccb7f63a8158b260e2e3b1e0965 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 16 Jul 2009 15:37:54 +0200 Subject: Use the configure script to enable/disable QtConcurrent and QtXmlPatterns Using qglobal.h and checking the compiler version with the preprocessor has the side-effect that moc won't generate proper code since it doesn't know about the compiler version. Enable both modules under Sun CC 5.9 and IBM xlC 7.0. --- configure | 44 +++++++++++++++++++++++++++++++------------- src/corelib/global/qglobal.h | 23 +++++------------------ 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/configure b/configure index 87fe28181..e05e1d547 100755 --- a/configure +++ b/configure @@ -6057,6 +6057,7 @@ fi # canBuildQtXmlPatterns="yes" canBuildWebKit="$HAVE_STL" +canBuildQtConcurrent="yes" # WebKit requires stdint.h "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stdint "Stdint" $L_FLAGS $I_FLAGS $l_FLAGS @@ -6088,9 +6089,9 @@ case "$XPLATFORM" in case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in 4*|3.4*) ;; - 3.3*) - canBuildWebKit="no" - ;; + 3.3*) + canBuildWebKit="no" + ;; *) canBuildWebKit="no" canBuildQtXmlPatterns="no" @@ -6098,17 +6099,22 @@ case "$XPLATFORM" in esac ;; solaris-cc*) - # Check the compiler version - case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in - *) - canBuildWebKit="no" - canBuildQtXmlPatterns="no" - ;; - esac - ;; + # Check the compiler version + case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in + 5.[012345678]) + canBuildWebKit="no" + canBuildQtXmlPatterns="no" + canBuildQtConcurrent="no" + ;; + 5.9) + canBuildWebKit="no" + ;; + esac + ;; hpux-acc*) canBuildWebKit="no" canBuildQtXmlPatterns="no" + canBuildQtConcurrent="no" ;; hpuxi-acc*) canBuildWebKit="no" @@ -6137,17 +6143,28 @@ EOF fi case "$xlcver" in - *) + [123456].*) canBuildWebKit="no" canBuildQtXmlPatterns="no" + canBuildQtConcurrent="no" + ;; + *) + canBuildWebKit="no" ;; esac - ;; + ;; irix-cc*) canBuildWebKit="no" + canBuildQtConcurrent="no" ;; esac +CFG_CONCURRENT="yes" +if [ "$canBuildQtConcurrent" = "no" ]; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT" + CFG_CONCURRENT="no" +fi + if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then echo "QtXmlPatterns was requested, but it can't be built due to exceptions being disabled." exit 1 @@ -7056,6 +7073,7 @@ echo "Qt 3 compatibility .. $CFG_QT3SUPPORT" [ "$CFG_DBUS" = "no" ] && echo "QtDBus module ....... no" [ "$CFG_DBUS" = "yes" ] && echo "QtDBus module ....... yes (run-time)" [ "$CFG_DBUS" = "linked" ] && echo "QtDBus module ....... yes (linked)" +echo "QtConcurrent code.... $CFG_CONCURRENT" echo "QtScriptTools module $CFG_SCRIPTTOOLS" echo "QtXmlPatterns module $CFG_XMLPATTERNS" echo "Phonon module ....... $CFG_PHONON" diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 866247a7c..7b16dff42 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2408,28 +2408,15 @@ QT_LICENSED_MODULE(DBus) # define QT_NO_QFUTURE #endif -/* - Turn off certain features for compilers that have problems parsing - the code. -*/ -#if (defined(Q_CC_HPACC) && defined(QT_ARCH_PARISC)) \ - || defined(Q_CC_MIPS) \ - || defined(Q_CC_XLC) -// HP aCC A.03.*, MIPSpro, and xlC cannot handle -// the template function declarations for the QtConcurrent functions -# define QT_NO_QFUTURE -# define QT_NO_CONCURRENT -#endif - -// MSVC 6.0, MSVC .NET 2002, and old versions of Sun CC can`t handle the map(), etc templates, +// MSVC 6.0 and MSVC .NET 2002, can`t handle the map(), etc templates, // but the QFuture class compiles. -#if (defined(Q_CC_MSVC) && _MSC_VER <= 1300) || (defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x590) +#if (defined(Q_CC_MSVC) && _MSC_VER <= 1300) # define QT_NO_CONCURRENT #endif -// Mingw uses a gcc 3 version which has problems with some of the -// map/filter overloads. So does IRIX and Solaris. -#if (defined(Q_OS_IRIX) || defined(Q_CC_MINGW) || defined (Q_OS_SOLARIS)) && (__GNUC__ < 4) +// gcc 3 version has problems with some of the +// map/filter overloads. +#if defined(Q_CC_GNU) && (__GNUC__ < 4) # define QT_NO_CONCURRENT_MAP # define QT_NO_CONCURRENT_FILTER #endif -- cgit v1.2.3 From 77d9528d802b4e36423814ae2c52abc3e36de40c Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 21 Jul 2009 15:27:50 +0200 Subject: Doc: More docu for the QPixmapCache::Key --- src/gui/image/qpixmapcache.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index 82069d09f..ecdcd8ce4 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -64,7 +64,8 @@ QT_BEGIN_NAMESPACE access the global pixmap cache. It creates an internal QCache object for caching the pixmaps. - The cache associates a pixmap with a string as a key or with a QPixmapCache::Key. + The cache associates a pixmap with a user-provided string as a key, + or with a QPixmapCache::Key that the cache generates. Using QPixmapCache::Key for keys is faster than using strings. The string API is very convenient for complex keys but the QPixmapCache::Key API will be very efficient and convenient for a one-to-one object-to-pixmap mapping \mdash in @@ -91,6 +92,17 @@ static int cache_limit = 2048; // 2048 KB cache limit for embedded static int cache_limit = 10240; // 10 MB cache limit for desktop #endif +/*! + \class QPixmapCache::Key + \brief The QPixmapCache::Key class can be used for efficient access + to the QPixmapCache. + \since 4.6 + + Use QPixmapCache::insert() to receive an instance of Key generated + by the pixmap cache. You can store the key in your own objects for + a very efficient one-to-one object-to-pixmap mapping. +*/ + /*! Constructs an empty Key object. */ -- cgit v1.2.3 From dcb735f92d87aacade6aa65079fe3da06efca553 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Tue, 21 Jul 2009 15:23:17 +0200 Subject: add autotest for adding transition from state machine's root It's not supported because the root state has no ancestor, which is a requirement for the state machine's transition selection algorithm. --- tests/auto/qstatemachine/tst_qstatemachine.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp index efcb983d6..bafd8485c 100644 --- a/tests/auto/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp @@ -127,6 +127,7 @@ private slots: void targetStateWithNoParent(); void targetStateDeleted(); void transitionToRootState(); + void transitionFromRootState(); void transitionEntersParent(); void defaultErrorState(); @@ -279,6 +280,15 @@ void tst_QStateMachine::transitionToRootState() QVERIFY(machine.configuration().contains(initialState)); } +void tst_QStateMachine::transitionFromRootState() +{ + QStateMachine machine; + QState *root = machine.rootState(); + QState *s1 = new QState(root); + QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: cannot add transition from root state"); + root->addTransition(new EventTransition(QEvent::User, s1)); +} + void tst_QStateMachine::transitionEntersParent() { QStateMachine machine; -- cgit v1.2.3 From 641ba0bb2c144a4bef25982d90ac49d9af354202 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Tue, 21 Jul 2009 15:41:16 +0200 Subject: Fix memory leak with wrapped events Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/corelib/statemachine/qstatemachine.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index bf3ee3107..a00e7e173 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -2155,6 +2155,8 @@ QSignalEvent::~QSignalEvent() Constructs a new QWrappedEvent object with the given \a object and \a event. + + The QWrappedEvent object takes ownership of \a event. */ QWrappedEvent::QWrappedEvent(QObject *object, QEvent *event) : QEvent(QEvent::Wrapped), m_object(object), m_event(event) @@ -2166,6 +2168,7 @@ QWrappedEvent::QWrappedEvent(QObject *object, QEvent *event) */ QWrappedEvent::~QWrappedEvent() { + delete m_event; } /*! -- cgit v1.2.3 From ea7830a2551f1c68e5dbc53ee9a5ce3a8fcbe872 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Tue, 21 Jul 2009 15:47:37 +0200 Subject: Fix memleaks in the autotests --- tests/auto/qstatemachine/tst_qstatemachine.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp index bafd8485c..44fc9986a 100644 --- a/tests/auto/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp @@ -285,8 +285,11 @@ void tst_QStateMachine::transitionFromRootState() QStateMachine machine; QState *root = machine.rootState(); QState *s1 = new QState(root); + EventTransition *trans = new EventTransition(QEvent::User, s1); QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: cannot add transition from root state"); - root->addTransition(new EventTransition(QEvent::User, s1)); + root->addTransition(trans); + QCOMPARE(trans->sourceState(), (QState*)0); + delete trans; } void tst_QStateMachine::transitionEntersParent() @@ -3113,6 +3116,8 @@ void tst_QStateMachine::specificTargetValueOfAnimation() QVERIFY(machine.configuration().contains(s3)); QCOMPARE(object->property("foo").toDouble(), 2.0); QCOMPARE(anim->endValue().toDouble(), 10.0); + + delete anim; } void tst_QStateMachine::addDefaultAnimation() @@ -3145,6 +3150,8 @@ void tst_QStateMachine::addDefaultAnimation() QVERIFY(machine.configuration().contains(s3)); QCOMPARE(object->property("foo").toDouble(), 2.0); + + delete object; } void tst_QStateMachine::addDefaultAnimationWithUnusedAnimation() @@ -3224,6 +3231,9 @@ void tst_QStateMachine::removeDefaultAnimation() machine.removeDefaultAnimation(anim2); QCOMPARE(machine.defaultAnimations().size(), 0); + + delete anim; + delete anim2; } void tst_QStateMachine::overrideDefaultAnimationWithSpecific() @@ -3264,6 +3274,9 @@ void tst_QStateMachine::overrideDefaultAnimationWithSpecific() QVERIFY(machine.configuration().contains(s3)); QCOMPARE(counter.counter, 2); // specific animation started and stopped + + delete defaultAnimation; + delete moreSpecificAnimation; } /* -- cgit v1.2.3 From b6b12bc6b8296d7e199cab0ece35c9eb9ae7fe64 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 18 Mar 2009 14:36:52 +0100 Subject: Implement strict STD3 checking of hostnames in URLs. Made the toPunycodeHelper function write to a QString. Renamed qt_from_ACE to qt_ACE_do to indicate what it actually does. Added the STD3 rules for hostnames, forcing hostnames to have to strictly comply to STD3. Also, execute nameprep in the correct order (before trying to encode to Punycode). Validate hostnames when QUrlPrivate::canonicalHost() called, including validation of IP Literals. Validation of IPv4 is missing. Adapted other functions to use qt_ACE_do, notably QUrl::toAce (avoid code duplication). --- src/corelib/io/qurl.cpp | 241 ++++++++++++++++++++++++++++++------------- tests/auto/qurl/tst_qurl.cpp | 96 ++++++++++++++--- 2 files changed, 256 insertions(+), 81 deletions(-) diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 180e9ec04..dc27dfb0d 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -2901,8 +2901,17 @@ static bool isBidirectionalL(const QChar &ch) return false; } +#ifdef QT_BUILD_INTERNAL +// export for tst_qurl.cpp +Q_AUTOTEST_EXPORT QString qt_nameprep(const QString &); +Q_AUTOTEST_EXPORT bool qt_check_std3rules(const QStringRef &); +#else +// non-test build, keep the symbols for ourselves +static QString qt_nameprep(const QString &); +static bool qt_check_std3rules(const QStringRef &); +#endif -Q_AUTOTEST_EXPORT QString qt_nameprep(const QString &source) +QString qt_nameprep(const QString &source) { QString mapped = source; @@ -2959,8 +2968,32 @@ Q_AUTOTEST_EXPORT QString qt_nameprep(const QString &source) return mapped; } +bool qt_check_std3rules(const QStringRef &source) +{ + int len = source.length(); + if (len > 63) + return false; + + for (int i = 0; i < len; ++i) { + register ushort c = source.at(i).unicode(); + if (c == '-' && (i == 0 || i == len - 1)) + return false; -static inline char encodeDigit(uint digit) + // verifying the absence of LDH is the same as verifying that + // only LDH is present + if (c == '-' || (c >= '0' && c <= '9') + || (c >= 'A' && c <= 'Z') + || (c >= 'a' && c <= 'z')) + continue; + + return false; + } + + return true; +} + + +static inline uint encodeDigit(uint digit) { return digit + 22 + 75 * (digit < 26); } @@ -2977,7 +3010,7 @@ static inline uint adapt(uint delta, uint numpoints, bool firsttime) return k + (((base - tmin + 1) * delta) / (delta + skew)); } -static inline void appendEncode(QByteArray* output, uint& delta, uint& bias, uint& b, uint& h) +static inline void appendEncode(QString* output, uint& delta, uint& bias, uint& b, uint& h) { uint qq; uint k; @@ -2991,17 +3024,17 @@ static inline void appendEncode(QByteArray* output, uint& delta, uint& bias, uin t = (k <= bias) ? tmin : (k >= bias + tmax) ? tmax : k - bias; if (qq < t) break; - *output += encodeDigit(t + (qq - t) % (base - t)); + *output += QChar(encodeDigit(t + (qq - t) % (base - t))); qq = (qq - t) / (base - t); } - *output += encodeDigit(qq); + *output += QChar(encodeDigit(qq)); bias = adapt(delta, h + 1, h == b); delta = 0; ++h; } -static void toPunycodeHelper(const QChar *s, int ucLength, QByteArray *output) +static void toPunycodeHelper(const QChar *s, int ucLength, QString *output) { uint n = initial_n; uint delta = 0; @@ -3010,7 +3043,7 @@ static void toPunycodeHelper(const QChar *s, int ucLength, QByteArray *output) int outLen = output->length(); output->resize(outLen + ucLength); - char *d = output->data() + outLen; + QChar *d = output->data() + outLen; bool skipped = false; // copy all basic code points verbatim to output. for (uint j = 0; j < (uint) ucLength; ++j) { @@ -3035,7 +3068,7 @@ static void toPunycodeHelper(const QChar *s, int ucLength, QByteArray *output) // if basic code points were copied, add the delimiter character. if (h > 0) - *output += 0x2d; + *output += QChar(0x2d); // while there are still unprocessed non-basic code points left in // the input string... @@ -3083,7 +3116,7 @@ static void toPunycodeHelper(const QChar *s, int ucLength, QByteArray *output) } // prepend ACE prefix - output->insert(outLen, "xn--"); + output->insert(outLen, QLatin1String("xn--")); return; } @@ -3164,46 +3197,118 @@ static bool qt_is_idn_enabled(const QString &domain) return equal(tld, len, idn_whitelist[i]); } -static QString qt_from_ACE(const QString &domainMC) +static inline bool isDotDelimiter(ushort uc) { + // IDNA / rfc3490 describes these four delimiters used for + // separating labels in unicode international domain + // names. + return uc == 0x2e || uc == 0x3002 || uc == 0xff0e || uc == 0xff61; +} + +static int nextDotDelimiter(const QString &domain, int from = 0) +{ + const QChar *b = domain.unicode(); + const QChar *ch = b + from; + const QChar *e = b + domain.length(); + while (ch < e) { + if (isDotDelimiter(ch->unicode())) + break; + else + ++ch; + } + return ch - b; +} + +enum AceOperation { ToAceOnly, NormalizeAce }; +static QString qt_ACE_do(const QString &domainMC, AceOperation op) +{ + if (domainMC.isEmpty()) + return domainMC; QString domain = domainMC.toLower(); - int idx = domain.indexOf(QLatin1Char('.')); - if (idx != -1) { - if (!domain.contains(QLatin1String("xn--"))) { - bool simple = true; - for (int i = 0; i < domain.size(); ++i) { - ushort ch = domain.at(i).unicode(); - if (ch > 'z' || ch < '-' || ch == '/' || (ch > '9' && ch < 'A') || (ch > 'Z' && ch < 'a')) { - simple = false; - break; - } + + QString result; + result.reserve(domain.length()); + + const bool isIdnEnabled = op == NormalizeAce ? qt_is_idn_enabled(domain) : false; + int lastIdx = 0; + while (1) { + int idx = nextDotDelimiter(domain, lastIdx); + if (idx == lastIdx) + return QString(); // two delimiters in a row -- empty label not allowed + + // RFC 3490 says, about the ToASCII operation: + // 3. If the UseSTD3ASCIIRules flag is set, then perform these checks: + // + // (a) Verify the absence of non-LDH ASCII code points; that is, the + // absence of 0..2C, 2E..2F, 3A..40, 5B..60, and 7B..7F. + // + // (b) Verify the absence of leading and trailing hyphen-minus; that + // is, the absence of U+002D at the beginning and end of the + // sequence. + // and: + // 8. Verify that the number of code points is in the range 1 to 63 + // inclusive. + + bool simple = true; + for (int i = lastIdx; i < idx; ++i) { + ushort ch = domain.at(i).unicode(); + if (ch > 0x7f) { + simple = false; + break; } - if (simple) - return domain; } - - const bool isIdnEnabled = qt_is_idn_enabled(domain); - int lastIdx = 0; - QString result; - while (1) { + + if (simple && idx > lastIdx + 4) { + // ACE form domains are simple, but we can't consider them simple + // is this an ACE form? + static const ushort acePrefixUtf16[] = { 'x', 'n', '-', '-' }; + if (memcmp(domain.utf16() + lastIdx, acePrefixUtf16, sizeof acePrefixUtf16) == 0) + simple = false; + } + + QString aux; + QStringRef label; + if (simple) { + // fastest conversion: this is the common case (non IDN-domains) + // just memcpy from source (domain) to destination (result) + // there's no need to nameprep since everything is ASCII already + int prevLen = result.size(); + result.resize(prevLen + idx - lastIdx); + memcpy(result.data() + prevLen, domain.constData() + lastIdx, (idx - lastIdx) * sizeof(QChar)); + + label = QStringRef(&result, prevLen, result.length() - prevLen); + } else { // Nameprep the host. If the labels in the hostname are Punycode // encoded, we decode them immediately, then nameprep them. - QByteArray label; - toPunycodeHelper(domain.constData() + lastIdx, idx - lastIdx, &label); - result += qt_nameprep(isIdnEnabled ? QUrl::fromPunycode(label) : QString::fromLatin1(label)); - lastIdx = idx + 1; - if (lastIdx < domain.size() + 1) - result += QLatin1Char('.'); - else - break; - idx = domain.indexOf(QLatin1Char('.'), lastIdx); - if (idx == -1) - idx = domain.size(); + QString tmp = domain.mid(lastIdx, idx - lastIdx); + tmp = qt_nameprep(tmp); + + if (isIdnEnabled) { + toPunycodeHelper(tmp.constData(), tmp.size(), &aux); + label = QStringRef(&aux); + + tmp = QUrl::fromPunycode(aux.toLatin1()); + if (tmp.isEmpty()) + return QString(); + result += tmp; + } else { + int prevLen = result.size(); + toPunycodeHelper(tmp.constData(), tmp.size(), &result); + + label = QStringRef(&result, prevLen, result.length() - prevLen); + } } - return result; - } else { - return qt_nameprep(domain); + + if (!qt_check_std3rules(label)) + return QString(); + + lastIdx = idx + 1; + if (lastIdx < domain.size() + 1) + result += QLatin1Char('.'); + else + break; } + return result; } @@ -3246,12 +3351,27 @@ QUrlPrivate::QUrlPrivate(const QUrlPrivate ©) QString QUrlPrivate::canonicalHost() const { - if (QURL_HASFLAG(stateFlags, HostCanonicalized)) + if (QURL_HASFLAG(stateFlags, HostCanonicalized) || host.isEmpty()) return host; QUrlPrivate *that = const_cast(this); QURL_SETFLAG(that->stateFlags, HostCanonicalized); - that->host = qt_from_ACE(host); + if (host.contains(QLatin1Char(':'))) { + // This is an IP Literal, use _IPLiteral to validate + QByteArray ba = host.toLatin1(); + if (!ba.startsWith('[')) { + // surround the IP Literal with [ ] if it's not already done so + ba.reserve(ba.length() + 2); + ba.prepend('['); + ba.append(']'); + } + + const char *ptr = ba.constData(); + if (!_IPLiteral(&ptr)) + that->host.clear(); + } else { + that->host = qt_ACE_do(host, NormalizeAce); + } return that->host; } @@ -3737,7 +3857,10 @@ QByteArray QUrlPrivate::toEncoded(QUrl::FormattingOptions options) const } } - url += QUrl::toAce(host); + if (host.startsWith(QLatin1Char('['))) + url += host.toLatin1(); + else + url += QUrl::toAce(host); if (!(options & QUrl::RemovePort) && port != -1) { url += ':'; url += QString::number(port).toAscii(); @@ -4412,8 +4535,6 @@ void QUrl::setHost(const QString &host) QURL_UNSETFLAG(d->stateFlags, QUrlPrivate::Validated | QUrlPrivate::Normalized | QUrlPrivate::HostCanonicalized); d->host = host; - if (d->host.contains(QLatin1Char(':'))) - d->host = QLatin1Char('[') + d->host + QLatin1Char(']'); } /*! @@ -5425,9 +5546,9 @@ QByteArray QUrl::toPercentEncoding(const QString &input, const QByteArray &exclu */ QByteArray QUrl::toPunycode(const QString &uc) { - QByteArray output; + QString output; toPunycodeHelper(uc.constData(), uc.size(), &output); - return output; + return output.toLatin1(); } /*! @@ -5528,7 +5649,7 @@ QString QUrl::fromPunycode(const QByteArray &pc) */ QString QUrl::fromAce(const QByteArray &domain) { - return qt_from_ACE(QString::fromLatin1(domain)); + return qt_ACE_do(QString::fromLatin1(domain), NormalizeAce); } /*! @@ -5545,26 +5666,8 @@ QString QUrl::fromAce(const QByteArray &domain) */ QByteArray QUrl::toAce(const QString &domain) { - // IDNA / rfc3490 describes these four delimiters used for - // separating labels in unicode international domain - // names. - QString nameprepped = qt_nameprep(domain); - int lastIdx = 0; - QByteArray result; - for (int i = 0; i < nameprepped.size(); ++i) { - ushort uc = nameprepped.at(i).unicode(); - if (uc == 0x2e || uc == 0x3002 || uc == 0xff0e || uc == 0xff61) { - if (lastIdx) - result += '.'; - toPunycodeHelper(nameprepped.constData() + lastIdx, i - lastIdx, &result); - lastIdx = i + 1; - } - } - if (lastIdx) - result += '.'; - toPunycodeHelper(nameprepped.constData() + lastIdx, nameprepped.size() - lastIdx, &result); - - return result; + QString result = qt_ACE_do(domain, ToAceOnly); + return result.toLatin1(); } /*! diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index 723f8829a..fcced3704 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -162,6 +162,8 @@ private slots: void nameprep_testsuite(); void ace_testsuite_data(); void ace_testsuite(); + void std3violations_data(); + void std3violations(); void tldRestrictions_data(); void tldRestrictions(); void emptyQueryOrFragment(); @@ -3100,6 +3102,11 @@ void tst_QUrl::ace_testsuite_data() QTest::newRow("ascii-upper") << "FLUKE" << "fluke" << "fluke" << "fluke"; QTest::newRow("asciifolded") << QString::fromLatin1("stra\337e") << "strasse" << "." << "strasse"; + QTest::newRow("asciifolded-dotcom") << QString::fromLatin1("stra\337e.example.com") << "strasse.example.com" << "." << "strasse.example.com"; + QTest::newRow("greek-mu") << QString::fromLatin1("\265V") + <<"xn--v-lmb" + << "." + << QString::fromUtf8("\316\274v"); QTest::newRow("non-ascii-lower") << QString::fromLatin1("alqualond\353") << "xn--alqualond-34a" @@ -3132,6 +3139,9 @@ void tst_QUrl::ace_testsuite_data() QTest::newRow("idn-upper") << "XN--ALQUALOND-34A" << "xn--alqualond-34a" << QString::fromLatin1("alqualond\353") << QString::fromLatin1("alqualond\353"); + + QTest::newRow("separator-3002") << QString::fromUtf8("example\343\200\202com") + << "example.com" << "." << "example.com"; } void tst_QUrl::ace_testsuite() @@ -3142,23 +3152,85 @@ void tst_QUrl::ace_testsuite() QFETCH(QString, fromace); QFETCH(QString, unicode); - QString domain = in + canonsuffix; - QCOMPARE(QString::fromLatin1(QUrl::toAce(domain)), toace + canonsuffix); + const char *suffix = canonsuffix; + if (toace.contains('.')) + suffix = 0; + + QString domain = in + suffix; + QCOMPARE(QString::fromLatin1(QUrl::toAce(domain)), toace + suffix); if (fromace != ".") - QCOMPARE(QUrl::fromAce(domain.toLatin1()), fromace + canonsuffix); - QCOMPARE(QUrl::fromAce(QUrl::toAce(domain)), unicode + canonsuffix); + QCOMPARE(QUrl::fromAce(domain.toLatin1()), fromace + suffix); + QCOMPARE(QUrl::fromAce(QUrl::toAce(domain)), unicode + suffix); - domain = in + ".troll.No"; - QCOMPARE(QString::fromLatin1(QUrl::toAce(domain)), toace + canonsuffix); + domain = in + (suffix ? ".troll.No" : ""); + QCOMPARE(QString::fromLatin1(QUrl::toAce(domain)), toace + suffix); if (fromace != ".") - QCOMPARE(QUrl::fromAce(domain.toLatin1()), fromace + canonsuffix); - QCOMPARE(QUrl::fromAce(QUrl::toAce(domain)), unicode + canonsuffix); + QCOMPARE(QUrl::fromAce(domain.toLatin1()), fromace + suffix); + QCOMPARE(QUrl::fromAce(QUrl::toAce(domain)), unicode + suffix); - domain = in + ".troll.NO"; - QCOMPARE(QString::fromLatin1(QUrl::toAce(domain)), toace + canonsuffix); + domain = in + (suffix ? ".troll.NO" : ""); + QCOMPARE(QString::fromLatin1(QUrl::toAce(domain)), toace + suffix); if (fromace != ".") - QCOMPARE(QUrl::fromAce(domain.toLatin1()), fromace + canonsuffix); - QCOMPARE(QUrl::fromAce(QUrl::toAce(domain)), unicode + canonsuffix); + QCOMPARE(QUrl::fromAce(domain.toLatin1()), fromace + suffix); + QCOMPARE(QUrl::fromAce(QUrl::toAce(domain)), unicode + suffix); +} + +void tst_QUrl::std3violations_data() +{ + QTest::addColumn("source"); + QTest::addColumn("validUrl"); + + QTest::newRow("too-long") << "this-domain-is-far-too-long-for-its-own-good-and-should-have-been-limited-to-63-chars" << false; + QTest::newRow("dash-begin") << "-x-foo" << false; + QTest::newRow("dash-end") << "x-foo-" << false; + QTest::newRow("dash-begin-end") << "-foo-" << false; + + QTest::newRow("control") << "\033foo" << false; + QTest::newRow("bang") << "foo!" << false; + QTest::newRow("plus") << "foo+bar" << false; + QTest::newRow("dot") << "foo.bar"; + QTest::newRow("slash") << "foo/bar" << true; + QTest::newRow("colon") << "foo:80" << true; + QTest::newRow("question") << "foo?bar" << true; + QTest::newRow("at") << "foo@bar" << true; + QTest::newRow("backslash") << "foo\\bar" << false; + QTest::newRow("underline") << "foo_bar" << false; + + // these characters are transformed by NFKC to non-LDH characters + QTest::newRow("dot-like") << QString::fromUtf8("foo\342\200\244bar") << false; // U+2024 ONE DOT LEADER + QTest::newRow("slash-like") << QString::fromUtf8("foo\357\274\217bar") << false; // U+FF0F FULLWIDTH SOLIDUS + + // The following should be invalid but isn't + // the DIVISON SLASH doesn't case-fold to a slash + // is this a problem with RFC 3490? + //QTest::newRow("slash-like2") << QString::fromUtf8("foo\342\210\225bar") << false; // U+2215 DIVISION SLASH +} + +void tst_QUrl::std3violations() +{ + QFETCH(QString, source); + + extern QString qt_nameprep(const QString &); + extern bool qt_check_std3rules(const QStringRef &); + + { + QString prepped = qt_nameprep(source); + QVERIFY(!qt_check_std3rules(QStringRef(&prepped))); + } + + if (source.contains('.')) + return; // this test ends here + + QUrl url; + url.setHost(source); + QVERIFY(url.host().isEmpty()); + + QFETCH(bool, validUrl); + if (validUrl) + return; // test ends here for these cases + + url = QUrl("http://" + source + "/some/path"); + QVERIFY(!url.isValid()); } void tst_QUrl::tldRestrictions_data() -- cgit v1.2.3 From e3c5ca076ee15975dd2d8973b871ec0115c614fc Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 18 Mar 2009 21:42:04 +0100 Subject: Add qt_string_normalize to do in-place Unicode normalization. This way, we can improve QUrl parsing performance by avoiding unnecessary copies. --- src/corelib/tools/qchar.cpp | 28 +++++++++++--------------- src/corelib/tools/qstring.cpp | 46 ++++++++++++++++++++++++------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp index 88053d618..1558f7d8a 100644 --- a/src/corelib/tools/qchar.cpp +++ b/src/corelib/tools/qchar.cpp @@ -1421,16 +1421,15 @@ QDataStream &operator>>(QDataStream &in, QChar &chr) // --------------------------------------------------------------------------- -static QString decomposeHelper - (const QString &str, bool canonical, QChar::UnicodeVersion version) +static void decomposeHelper(QString *str, bool canonical, QChar::UnicodeVersion version, int from) { unsigned short buffer[3]; - QString s = str; + QString &s = *str; const unsigned short *utf16 = s.utf16(); const unsigned short *uc = utf16 + s.length(); - while (uc != utf16) { + while (uc != utf16 + from) { uint ucs4 = *(--uc); if (QChar(ucs4).isLowSurrogate() && uc != utf16) { ushort high = *(uc - 1); @@ -1453,8 +1452,6 @@ static QString decomposeHelper utf16 = s.utf16(); uc = utf16 + pos + length; } - - return s; } @@ -1489,17 +1486,17 @@ static ushort ligatureHelper(ushort u1, ushort u2) return 0; } -static QString composeHelper(const QString &str) +static void composeHelper(QString *str, int from) { - QString s = str; + QString &s = *str; - if (s.length() < 2) - return s; + if (s.length() - from < 2) + return; // the loop can partly ignore high Unicode as all ligatures are in the BMP int starter = 0; int lastCombining = 0; - int pos = 0; + int pos = from; while (pos < s.length()) { uint uc = s.utf16()[pos]; if (QChar(uc).isHighSurrogate() && pos < s.length()-1) { @@ -1524,16 +1521,14 @@ static QString composeHelper(const QString &str) lastCombining = combining; ++pos; } - return s; } -static QString canonicalOrderHelper - (const QString &str, QChar::UnicodeVersion version) +static void canonicalOrderHelper(QString *str, QChar::UnicodeVersion version, int from) { - QString s = str; + QString &s = *str; const int l = s.length()-1; - int pos = 0; + int pos = from; while (pos < l) { int p2 = pos+1; uint u1 = s.at(pos).unicode(); @@ -1593,7 +1588,6 @@ static QString canonicalOrderHelper ++pos; } } - return s; } int QT_FASTCALL QUnicodeTables::script(unsigned int uc) diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index b97ba458c..99fbaa9de 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -6028,6 +6028,7 @@ QString QString::repeated(int times) const return result; } +void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar::UnicodeVersion version, int from); /*! \overload \fn QString QString::normalized(NormalizationForm mode, QChar::UnicodeVersion version) const @@ -6036,43 +6037,49 @@ QString QString::repeated(int times) const according to the given \a version of the Unicode standard. */ QString QString::normalized(QString::NormalizationForm mode, QChar::UnicodeVersion version) const +{ + QString copy = *this; + qt_string_normalize(©, mode, version, 0); + return copy; +} + +void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar::UnicodeVersion version, int from) { bool simple = true; - for (int i = 0; i < d->size; ++i) { - if (d->data[i] >= 0x80) { + const QChar *p = data->constData(); + int len = data->length(); + for (int i = from; i < len; ++i) { + if (p[i].unicode() >= 0x80) { simple = false; break; } } if (simple) - return *this; + return; - QString s = *this; + QString &s = *data; if (version != CURRENT_VERSION) { for (int i = 0; i < NumNormalizationCorrections; ++i) { const NormalizationCorrection &n = uc_normalization_corrections[i]; if (n.version > version) { + int pos = from; if (n.ucs4 > 0xffff) { ushort ucs4High = QChar::highSurrogate(n.ucs4); ushort ucs4Low = QChar::lowSurrogate(n.ucs4); ushort oldHigh = QChar::highSurrogate(n.old_mapping); ushort oldLow = QChar::lowSurrogate(n.old_mapping); - int pos = 0; - while (pos < s.d->size - 1) { - if (s.d->data[pos] == ucs4High && s.d->data[pos + 1] == ucs4Low) { - s.detach(); - s.d->data[pos] = oldHigh; - s.d->data[pos + 1] = oldLow; + while (pos < s.length() - 1) { + if (s.at(pos).unicode() == ucs4High && s.at(pos + 1).unicode() == ucs4Low) { + s[pos] = oldHigh; + s[pos + 1] = oldLow; ++pos; } ++pos; } } else { - int pos = 0; - while (pos < s.d->size) { - if (s.d->data[pos] == n.ucs4) { - s.detach(); - s.d->data[pos] = n.old_mapping; + while (pos < s.length()) { + if (s.at(pos).unicode() == n.ucs4) { + s[pos] = n.old_mapping; } ++pos; } @@ -6080,15 +6087,14 @@ QString QString::normalized(QString::NormalizationForm mode, QChar::UnicodeVersi } } } - s = decomposeHelper(s, mode < QString::NormalizationForm_KD, version); + decomposeHelper(data, mode < QString::NormalizationForm_KD, version, from); - s = canonicalOrderHelper(s, version); + canonicalOrderHelper(data, version, from); if (mode == QString::NormalizationForm_D || mode == QString::NormalizationForm_KD) - return s; - - return composeHelper(s); + return; + composeHelper(data, from); } -- cgit v1.2.3 From 3b545a4008fed0250d61ce1bb54af1a47fd8df92 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 18 Mar 2009 22:39:03 +0100 Subject: Change qt_nameprep to do in-line nameprepping This will allow to do less allocations in qt_ACE_do. --- src/corelib/io/qurl.cpp | 50 +++++++++++++++++++++----------------------- tests/auto/qurl/tst_qurl.cpp | 12 +++++------ 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index dc27dfb0d..d65cee26f 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -2336,12 +2336,12 @@ static const NameprepCaseFoldingEntry NameprepCaseFolding[] = { { 0x1D7BB, { 0x03C3, 0x0000, 0x0000, 0x0000 } } }; -static void mapToLowerCase(QString *str) +static void mapToLowerCase(QString *str, int from) { int N = sizeof(NameprepCaseFolding) / sizeof(NameprepCaseFolding[0]); QChar *d = 0; - for (int i = 0; i < str->size(); ++i) { + for (int i = from; i < str->size(); ++i) { int uc = str->at(i).unicode(); if (uc < 0x80) { if (uc <= 'Z' && uc >= 'A') { @@ -2388,11 +2388,11 @@ static bool isMappedToNothing(const QChar &ch) } -static void stripProhibitedOutput(QString *str) +static void stripProhibitedOutput(QString *str, int from) { - ushort *out = (ushort *)str->data(); + ushort *out = (ushort *)str->data() + from; const ushort *in = out; - const ushort *end = out + str->size(); + const ushort *end = (ushort *)str->data() + str->size(); while (in < end) { ushort uc = *in; if (uc < 0x80 || @@ -2903,36 +2903,34 @@ static bool isBidirectionalL(const QChar &ch) #ifdef QT_BUILD_INTERNAL // export for tst_qurl.cpp -Q_AUTOTEST_EXPORT QString qt_nameprep(const QString &); +Q_AUTOTEST_EXPORT void qt_nameprep(QString *source, int from); Q_AUTOTEST_EXPORT bool qt_check_std3rules(const QStringRef &); #else // non-test build, keep the symbols for ourselves -static QString qt_nameprep(const QString &); +static QString void qt_nameprep(QString *source, int from) static bool qt_check_std3rules(const QStringRef &); #endif -QString qt_nameprep(const QString &source) +void qt_nameprep(QString *source, int from) { - QString mapped = source; + QString &mapped = *source; - bool simple = true; - for (int i = 0; i < mapped.size(); ++i) { - ushort uc = mapped.at(i).unicode(); + for ( ; from < mapped.size(); ++from) { + ushort uc = mapped.at(from).unicode(); if (uc > 0x80) { - simple = false; break; } else if (uc >= 'A' && uc <= 'Z') { - mapped[i] = QChar(uc | 0x20); + mapped[from] = QChar(uc | 0x20); } } - if (simple) - return mapped; + if (from == mapped.size()) + return; // everything was mapped easily (lowercased, actually) // Characters commonly mapped to nothing are simply removed // (Table B.1) - QChar *out = mapped.data(); + QChar *out = mapped.data() + from; const QChar *in = out; - const QChar *e = in + mapped.size(); + const QChar *e = mapped.constData() + mapped.size(); while (in < e) { if (!isMappedToNothing(*in)) *out++ = *in; @@ -2942,30 +2940,30 @@ QString qt_nameprep(const QString &source) mapped.truncate(out - mapped.constData()); // Map to lowercase (Table B.2) - mapToLowerCase(&mapped); + mapToLowerCase(&mapped, from); // Normalize to Unicode 3.2 form KC - mapped = mapped.normalized(QString::NormalizationForm_KC, QChar::Unicode_3_2); + extern void qt_string_normalize(QString *data, QString::NormalizationForm mode, + QChar::UnicodeVersion version, int from); + qt_string_normalize(&mapped, QString::NormalizationForm_KC, QChar::Unicode_3_2, from); // Strip prohibited output - stripProhibitedOutput(&mapped); + stripProhibitedOutput(&mapped, from); // Check for valid bidirectional characters bool containsLCat = false; bool containsRandALCat = false; - for (int j = 0; j < mapped.size() && (!containsLCat || !containsRandALCat); ++j) { + for (int j = from; j < mapped.size() && (!containsLCat || !containsRandALCat); ++j) { if (isBidirectionalL(mapped.at(j))) containsLCat = true; else if (isBidirectionalRorAL(mapped.at(j))) containsRandALCat = true; } if (containsRandALCat) { - if (containsLCat || (!isBidirectionalRorAL(mapped.at(0)) + if (containsLCat || (!isBidirectionalRorAL(mapped.at(from)) || !isBidirectionalRorAL(mapped.at(mapped.size() - 1)))) mapped.clear(); } - - return mapped; } bool qt_check_std3rules(const QStringRef &source) @@ -3281,7 +3279,7 @@ static QString qt_ACE_do(const QString &domainMC, AceOperation op) // Nameprep the host. If the labels in the hostname are Punycode // encoded, we decode them immediately, then nameprep them. QString tmp = domain.mid(lastIdx, idx - lastIdx); - tmp = qt_nameprep(tmp); + qt_nameprep(&tmp, 0); if (isIdnEnabled) { toPunycodeHelper(tmp.constData(), tmp.size(), &aux); diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index fcced3704..94abbb348 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -3061,7 +3061,8 @@ void tst_QUrl::nameprep_testsuite_data() #ifdef QT_BUILD_INTERNAL QT_BEGIN_NAMESPACE -extern QString qt_nameprep(const QString &source); +extern void qt_nameprep(QString *source, int from); +extern bool qt_check_std3rules(const QStringRef &); QT_END_NAMESPACE #endif @@ -3086,7 +3087,8 @@ void tst_QUrl::nameprep_testsuite() "Investigate further", Continue); QEXPECT_FAIL("Larger test (expanding)", "Investigate further", Continue); - QCOMPARE(qt_nameprep(in), out); + qt_nameprep(&in, 0); + QCOMPARE(in, out); #endif } @@ -3210,11 +3212,9 @@ void tst_QUrl::std3violations() { QFETCH(QString, source); - extern QString qt_nameprep(const QString &); - extern bool qt_check_std3rules(const QStringRef &); - { - QString prepped = qt_nameprep(source); + QString prepped = source; + qt_nameprep(&prepped, 0); QVERIFY(!qt_check_std3rules(QStringRef(&prepped))); } -- cgit v1.2.3 From b01ae86c02d2ca81f30055be4641ca418ac94d9b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 19 Mar 2009 11:34:54 +0100 Subject: Improve performance in QUrl parsing by doing in-line operations. Unfortunately, I can't do it all inline because the punycode encoding and decoding requires reading the source several times. (Maybe the decoding can be done with some effort in the future) --- src/corelib/io/qurl.cpp | 63 ++++++++++++++++++++++---------------------- tests/auto/qurl/tst_qurl.cpp | 4 +-- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index d65cee26f..fcae0d6d1 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -2904,11 +2904,11 @@ static bool isBidirectionalL(const QChar &ch) #ifdef QT_BUILD_INTERNAL // export for tst_qurl.cpp Q_AUTOTEST_EXPORT void qt_nameprep(QString *source, int from); -Q_AUTOTEST_EXPORT bool qt_check_std3rules(const QStringRef &); +Q_AUTOTEST_EXPORT bool qt_check_std3rules(const QChar *uc, int len); #else // non-test build, keep the symbols for ourselves -static QString void qt_nameprep(QString *source, int from) -static bool qt_check_std3rules(const QStringRef &); +static void qt_nameprep(QString *source, int from); +static bool qt_check_std3rules(const QChar *uc, int len); #endif void qt_nameprep(QString *source, int from) @@ -2966,14 +2966,13 @@ void qt_nameprep(QString *source, int from) } } -bool qt_check_std3rules(const QStringRef &source) +bool qt_check_std3rules(const QChar *uc, int len) { - int len = source.length(); if (len > 63) return false; for (int i = 0; i < len; ++i) { - register ushort c = source.at(i).unicode(); + register ushort c = uc[i].unicode(); if (c == '-' && (i == 0 || i == len - 1)) return false; @@ -3264,41 +3263,43 @@ static QString qt_ACE_do(const QString &domainMC, AceOperation op) simple = false; } - QString aux; - QStringRef label; + // copy the label to the destination, which also serves as our scratch area + int prevLen = result.size(); + result.resize(prevLen + idx - lastIdx); + memcpy(result.data() + prevLen, domain.constData() + lastIdx, (idx - lastIdx) * sizeof(QChar)); + if (simple) { - // fastest conversion: this is the common case (non IDN-domains) - // just memcpy from source (domain) to destination (result) + // fastest case: this is the common case (non IDN-domains) // there's no need to nameprep since everything is ASCII already - int prevLen = result.size(); - result.resize(prevLen + idx - lastIdx); - memcpy(result.data() + prevLen, domain.constData() + lastIdx, (idx - lastIdx) * sizeof(QChar)); - - label = QStringRef(&result, prevLen, result.length() - prevLen); - } else { + // so we're done + if (!qt_check_std3rules(result.constData() + prevLen, result.length() - prevLen)) + return QString(); + } else { // Nameprep the host. If the labels in the hostname are Punycode - // encoded, we decode them immediately, then nameprep them. - QString tmp = domain.mid(lastIdx, idx - lastIdx); - qt_nameprep(&tmp, 0); + // encoded, we decode them immediately. + qt_nameprep(&result, prevLen); - if (isIdnEnabled) { - toPunycodeHelper(tmp.constData(), tmp.size(), &aux); - label = QStringRef(&aux); + // Punycode encoding and decoding cannot be done in-place + // That means we need one or two temporaries + QString aceForm; + aceForm.reserve(result.size() - prevLen + 4 + 4); // "xn--" and "-xyz" + toPunycodeHelper(result.constData() + prevLen, result.size() - prevLen, &aceForm); - tmp = QUrl::fromPunycode(aux.toLatin1()); + if (isIdnEnabled) { + QString tmp = QUrl::fromPunycode(aceForm.toLatin1()); if (tmp.isEmpty()) - return QString(); - result += tmp; + return QString(); // shouldn't happen, since we've just punycode-encoded it + result.resize(prevLen + tmp.size()); + memcpy(result.data() + prevLen, tmp.constData(), tmp.size() * sizeof(QChar)); } else { - int prevLen = result.size(); - toPunycodeHelper(tmp.constData(), tmp.size(), &result); - - label = QStringRef(&result, prevLen, result.length() - prevLen); + result.resize(prevLen + aceForm.size()); + memcpy(result.data() + prevLen, aceForm.constData(), aceForm.size() * sizeof(QChar)); } + + if (!qt_check_std3rules(aceForm.constData(), aceForm.size())) + return QString(); } - if (!qt_check_std3rules(label)) - return QString(); lastIdx = idx + 1; if (lastIdx < domain.size() + 1) diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index 94abbb348..78ea14665 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -3062,7 +3062,7 @@ void tst_QUrl::nameprep_testsuite_data() #ifdef QT_BUILD_INTERNAL QT_BEGIN_NAMESPACE extern void qt_nameprep(QString *source, int from); -extern bool qt_check_std3rules(const QStringRef &); +extern bool qt_check_std3rules(const QChar *, int); QT_END_NAMESPACE #endif @@ -3215,7 +3215,7 @@ void tst_QUrl::std3violations() { QString prepped = source; qt_nameprep(&prepped, 0); - QVERIFY(!qt_check_std3rules(QStringRef(&prepped))); + QVERIFY(!qt_check_std3rules(prepped.constData(), prepped.length())); } if (source.contains('.')) -- cgit v1.2.3 From 8e6293712a9126c2740bf5628e02325d04721b2e Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 19 Mar 2009 11:55:18 +0100 Subject: One more improvement in QUrl: avoid an extra lowercasing step. Since we're going to do nameprepping anyways, avoid the lowercasing step at the function entry (and thus, one extra temporary). The nameprepping step is also faster than QString::toLower for the ASCII case. --- src/corelib/io/qurl.cpp | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index fcae0d6d1..fe3ad8266 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -3178,7 +3178,7 @@ static bool qt_is_idn_enabled(const QString &domain) int len = domain.size() - idx - 1; if (user_idn_whitelist) - return user_idn_whitelist->contains(QString(tld, len)); + return user_idn_whitelist->contains(QString::fromRawData(tld, len).toLower()); int l = 0; int r = sizeof(idn_whitelist)/sizeof(const char *) - 1; @@ -3217,11 +3217,10 @@ static int nextDotDelimiter(const QString &domain, int from = 0) } enum AceOperation { ToAceOnly, NormalizeAce }; -static QString qt_ACE_do(const QString &domainMC, AceOperation op) +static QString qt_ACE_do(const QString &domain, AceOperation op) { - if (domainMC.isEmpty()) - return domainMC; - QString domain = domainMC.toLower(); + if (domain.isEmpty()) + return domain; QString result; result.reserve(domain.length()); @@ -3255,30 +3254,27 @@ static QString qt_ACE_do(const QString &domainMC, AceOperation op) } } + // copy the label to the destination, which also serves as our scratch area + // then nameprep it (in the case of "simple", it will cause a simple lowercasing) + int prevLen = result.size(); + result.resize(prevLen + idx - lastIdx); + memcpy(result.data() + prevLen, domain.constData() + lastIdx, (idx - lastIdx) * sizeof(QChar)); + qt_nameprep(&result, prevLen); + if (simple && idx > lastIdx + 4) { - // ACE form domains are simple, but we can't consider them simple + // ACE form domains contain only ASCII characters, but we can't consider them simple // is this an ACE form? static const ushort acePrefixUtf16[] = { 'x', 'n', '-', '-' }; - if (memcmp(domain.utf16() + lastIdx, acePrefixUtf16, sizeof acePrefixUtf16) == 0) + if (memcmp(result.utf16() + prevLen, acePrefixUtf16, sizeof acePrefixUtf16) == 0) simple = false; } - // copy the label to the destination, which also serves as our scratch area - int prevLen = result.size(); - result.resize(prevLen + idx - lastIdx); - memcpy(result.data() + prevLen, domain.constData() + lastIdx, (idx - lastIdx) * sizeof(QChar)); - if (simple) { // fastest case: this is the common case (non IDN-domains) - // there's no need to nameprep since everything is ASCII already // so we're done if (!qt_check_std3rules(result.constData() + prevLen, result.length() - prevLen)) return QString(); } else { - // Nameprep the host. If the labels in the hostname are Punycode - // encoded, we decode them immediately. - qt_nameprep(&result, prevLen); - // Punycode encoding and decoding cannot be done in-place // That means we need one or two temporaries QString aceForm; -- cgit v1.2.3 From 4c64137c6dfbfcc5a6fecbb04f5159ec491842e1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 19 Mar 2009 14:43:41 +0100 Subject: Fix bug in locating non-lowercase TLDs: must lowercase. Use qt_nameprep after all since it's extremely fast for ASCII only and it does in-place replacement. --- src/corelib/io/qurl.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index fe3ad8266..78e314e68 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -3174,11 +3174,15 @@ static bool qt_is_idn_enabled(const QString &domain) int idx = domain.lastIndexOf(QLatin1Char('.')); if (idx == -1) return false; - const QChar *tld = domain.constData() + idx + 1; + int len = domain.size() - idx - 1; + QString tldString(domain.constData() + idx + 1, len); + qt_nameprep(&tldString, 0); + + const QChar *tld = tldString.constData(); if (user_idn_whitelist) - return user_idn_whitelist->contains(QString::fromRawData(tld, len).toLower()); + return user_idn_whitelist->contains(tldString); int l = 0; int r = sizeof(idn_whitelist)/sizeof(const char *) - 1; -- cgit v1.2.3 From 52f5eee17a629fca785f79dcfc8b7bf0b23d1da2 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 19 Mar 2009 14:45:41 +0100 Subject: Minor performance improvements in nameprepping. Avoid calling functions that may have other side effects, like QString::utf16(). Use pointers whenever possible when iterating over the string. --- src/corelib/io/qurl.cpp | 43 +++++++++++++++++++++++-------------------- src/corelib/tools/qchar.cpp | 10 +++++----- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 78e314e68..49c0d538e 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -2913,56 +2913,59 @@ static bool qt_check_std3rules(const QChar *uc, int len); void qt_nameprep(QString *source, int from) { - QString &mapped = *source; - - for ( ; from < mapped.size(); ++from) { - ushort uc = mapped.at(from).unicode(); + QChar *src = source->data(); // causes a detach, so we're sure the only one using it + QChar *out = src + from; + const QChar *e = src + source->size(); + + for ( ; out < e; ++out) { + register ushort uc = out->unicode(); if (uc > 0x80) { break; } else if (uc >= 'A' && uc <= 'Z') { - mapped[from] = QChar(uc | 0x20); + *out = QChar(uc | 0x20); } } - if (from == mapped.size()) + if (out == e) return; // everything was mapped easily (lowercased, actually) - + int firstNonAscii = out - src; + // Characters commonly mapped to nothing are simply removed // (Table B.1) - QChar *out = mapped.data() + from; const QChar *in = out; - const QChar *e = mapped.constData() + mapped.size(); while (in < e) { if (!isMappedToNothing(*in)) *out++ = *in; ++in; } if (out != in) - mapped.truncate(out - mapped.constData()); + source->truncate(out - src); // Map to lowercase (Table B.2) - mapToLowerCase(&mapped, from); + mapToLowerCase(source, firstNonAscii); // Normalize to Unicode 3.2 form KC extern void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar::UnicodeVersion version, int from); - qt_string_normalize(&mapped, QString::NormalizationForm_KC, QChar::Unicode_3_2, from); + qt_string_normalize(source, QString::NormalizationForm_KC, QChar::Unicode_3_2, firstNonAscii); // Strip prohibited output - stripProhibitedOutput(&mapped, from); + stripProhibitedOutput(source, firstNonAscii); // Check for valid bidirectional characters bool containsLCat = false; bool containsRandALCat = false; - for (int j = from; j < mapped.size() && (!containsLCat || !containsRandALCat); ++j) { - if (isBidirectionalL(mapped.at(j))) + src = source->data(); + e = src + source->size(); + for (in = src + from; in < e && (!containsLCat || !containsRandALCat); ++in) { + if (isBidirectionalL(*in)) containsLCat = true; - else if (isBidirectionalRorAL(mapped.at(j))) + else if (isBidirectionalRorAL(*in)) containsRandALCat = true; } if (containsRandALCat) { - if (containsLCat || (!isBidirectionalRorAL(mapped.at(from)) - || !isBidirectionalRorAL(mapped.at(mapped.size() - 1)))) - mapped.clear(); + if (containsLCat || (!isBidirectionalRorAL(src[from]) + || !isBidirectionalRorAL(e[-1]))) + source->resize(from); // not allowed, clear the label } } @@ -3269,7 +3272,7 @@ static QString qt_ACE_do(const QString &domain, AceOperation op) // ACE form domains contain only ASCII characters, but we can't consider them simple // is this an ACE form? static const ushort acePrefixUtf16[] = { 'x', 'n', '-', '-' }; - if (memcmp(result.utf16() + prevLen, acePrefixUtf16, sizeof acePrefixUtf16) == 0) + if (memcmp(result.constData() + prevLen, acePrefixUtf16, sizeof acePrefixUtf16) == 0) simple = false; } diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp index 1558f7d8a..458a3830b 100644 --- a/src/corelib/tools/qchar.cpp +++ b/src/corelib/tools/qchar.cpp @@ -1427,7 +1427,7 @@ static void decomposeHelper(QString *str, bool canonical, QChar::UnicodeVersion QString &s = *str; - const unsigned short *utf16 = s.utf16(); + const unsigned short *utf16 = reinterpret_cast(s.data()); const unsigned short *uc = utf16 + s.length(); while (uc != utf16 + from) { uint ucs4 = *(--uc); @@ -1449,7 +1449,7 @@ static void decomposeHelper(QString *str, bool canonical, QChar::UnicodeVersion s.replace(uc - utf16, ucs4 > 0x10000 ? 2 : 1, (const QChar *)d, length); // since the insert invalidates the pointers and we do decomposition recursive int pos = uc - utf16; - utf16 = s.utf16(); + utf16 = reinterpret_cast(s.data()); uc = utf16 + pos + length; } } @@ -1498,9 +1498,9 @@ static void composeHelper(QString *str, int from) int lastCombining = 0; int pos = from; while (pos < s.length()) { - uint uc = s.utf16()[pos]; + uint uc = s.at(pos).unicode(); if (QChar(uc).isHighSurrogate() && pos < s.length()-1) { - ushort low = s.utf16()[pos+1]; + ushort low = s.at(pos+1).unicode(); if (QChar(low).isLowSurrogate()) { uc = QChar::surrogateToUcs4(uc, low); ++pos; @@ -1509,7 +1509,7 @@ static void composeHelper(QString *str, int from) int combining = QChar::combiningClass(uc); if (starter == pos - 1 || combining > lastCombining) { // allowed to form ligature with S - QChar ligature = ligatureHelper(s.utf16()[starter], uc); + QChar ligature = ligatureHelper(s.at(starter).unicode(), uc); if (ligature.unicode()) { s[starter] = ligature; s.remove(pos, 1); -- cgit v1.2.3 From f15d4e5e02e109003b6e28cad71441f19b6ea608 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 19 Mar 2009 15:27:45 +0100 Subject: Slight performance improvement by caching the label size. --- src/corelib/io/qurl.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 49c0d538e..096e37e45 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -3234,9 +3234,12 @@ static QString qt_ACE_do(const QString &domain, AceOperation op) const bool isIdnEnabled = op == NormalizeAce ? qt_is_idn_enabled(domain) : false; int lastIdx = 0; + QString aceForm; // this variable is here for caching + while (1) { int idx = nextDotDelimiter(domain, lastIdx); - if (idx == lastIdx) + int labelLength = idx - lastIdx; + if (labelLength == 0) return QString(); // two delimiters in a row -- empty label not allowed // RFC 3490 says, about the ToASCII operation: @@ -3264,13 +3267,15 @@ static QString qt_ACE_do(const QString &domain, AceOperation op) // copy the label to the destination, which also serves as our scratch area // then nameprep it (in the case of "simple", it will cause a simple lowercasing) int prevLen = result.size(); - result.resize(prevLen + idx - lastIdx); - memcpy(result.data() + prevLen, domain.constData() + lastIdx, (idx - lastIdx) * sizeof(QChar)); + result.resize(prevLen + labelLength); + memcpy(result.data() + prevLen, domain.constData() + lastIdx, labelLength * sizeof(QChar)); qt_nameprep(&result, prevLen); + labelLength = result.length() - prevLen; - if (simple && idx > lastIdx + 4) { + if (simple && labelLength > 6) { // ACE form domains contain only ASCII characters, but we can't consider them simple // is this an ACE form? + // the shortest valid ACE domain is 6 characters long (U+0080 would be 1, but it's not allowed) static const ushort acePrefixUtf16[] = { 'x', 'n', '-', '-' }; if (memcmp(result.constData() + prevLen, acePrefixUtf16, sizeof acePrefixUtf16) == 0) simple = false; @@ -3279,15 +3284,17 @@ static QString qt_ACE_do(const QString &domain, AceOperation op) if (simple) { // fastest case: this is the common case (non IDN-domains) // so we're done - if (!qt_check_std3rules(result.constData() + prevLen, result.length() - prevLen)) + if (!qt_check_std3rules(result.constData() + prevLen, labelLength)) return QString(); } else { // Punycode encoding and decoding cannot be done in-place // That means we need one or two temporaries - QString aceForm; - aceForm.reserve(result.size() - prevLen + 4 + 4); // "xn--" and "-xyz" + register int toReserve = labelLength + 4 + 6; // "xn--" plus some extra bytes + if (toReserve > aceForm.capacity()) + aceForm.reserve(toReserve); toPunycodeHelper(result.constData() + prevLen, result.size() - prevLen, &aceForm); + // We use resize()+memcpy() here because we're overwriting the data we've copied if (isIdnEnabled) { QString tmp = QUrl::fromPunycode(aceForm.toLatin1()); if (tmp.isEmpty()) -- cgit v1.2.3 From ff1280178ac8739e5943fd081be5317b70717fa8 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 19 Mar 2009 15:46:32 +0100 Subject: Merge the memcpy with the lowercasing and the non-ASCII detection. This gives a 5% improvement in performance by avoiding iterating over the contents more than once. --- src/corelib/io/qurl.cpp | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 096e37e45..79cd2f03e 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -3255,23 +3255,25 @@ static QString qt_ACE_do(const QString &domain, AceOperation op) // 8. Verify that the number of code points is in the range 1 to 63 // inclusive. + // copy the label to the destination, which also serves as our scratch area, lowercasing it + int prevLen = result.size(); bool simple = true; - for (int i = lastIdx; i < idx; ++i) { - ushort ch = domain.at(i).unicode(); - if (ch > 0x7f) { - simple = false; - break; + result.resize(prevLen + labelLength); + { + QChar *out = result.data() + prevLen; + const QChar *in = domain.constData() + lastIdx; + const QChar *e = in + labelLength; + for (; in < e; ++in, ++out) { + register ushort uc = in->unicode(); + if (uc > 0x7f) + simple = false; + if (uc >= 'A' && uc <= 'Z') + *out = QChar(uc | 0x20); + else + *out = *in; } } - // copy the label to the destination, which also serves as our scratch area - // then nameprep it (in the case of "simple", it will cause a simple lowercasing) - int prevLen = result.size(); - result.resize(prevLen + labelLength); - memcpy(result.data() + prevLen, domain.constData() + lastIdx, labelLength * sizeof(QChar)); - qt_nameprep(&result, prevLen); - labelLength = result.length() - prevLen; - if (simple && labelLength > 6) { // ACE form domains contain only ASCII characters, but we can't consider them simple // is this an ACE form? @@ -3289,6 +3291,8 @@ static QString qt_ACE_do(const QString &domain, AceOperation op) } else { // Punycode encoding and decoding cannot be done in-place // That means we need one or two temporaries + qt_nameprep(&result, prevLen); + labelLength = result.length() - prevLen; register int toReserve = labelLength + 4 + 6; // "xn--" plus some extra bytes if (toReserve > aceForm.capacity()) aceForm.reserve(toReserve); -- cgit v1.2.3 From 3c2ebb7f209035f85a35dbb05e76dd7e80238ecb Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 21 Jul 2009 15:46:29 +0200 Subject: Add the information about QUrl being more strict to the changelog --- dist/changes-4.6.0 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0 index bef292349..6c7e450e3 100644 --- a/dist/changes-4.6.0 +++ b/dist/changes-4.6.0 @@ -72,5 +72,18 @@ information about a particular change. QGraphicsWidget and QGraphicsProxyWidget). - QDesktopWidget on X11 no longer emits the resized(int) signal when screens - are added or removed. This was not done on other platforms. Use the + are added or removed. This was not done on other platforms. Use the screenCountChanged signal instead + +- QUrl's parser is more strict when for hostnames in URLs. QUrl now + enforces STD 3 rules: + + * each individual hostname section (between dots) must be at most + 63 ASCII characters in length; + + * only letters, digits, and the hyphen character are allowed in the + ASCII range; letters outside the ASCII range follow the normal + IDN rules + + That means QUrl no longer accepts some URLs that were invalid + before, but weren't interpreted as such. -- cgit v1.2.3 From 40649c420601bcc1f639fc8b337bfd7375d2b37e Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Mon, 20 Jul 2009 15:49:15 +0200 Subject: Fixed inheritence of SVG 'use' element fill attributes. Inheritence of fill attributes was implemented by copying attributes from the parent node. This approach wouldn't work if the node is referenced by a 'use' element. Now, only the fill attributes which have been explicitly set are applied on the painter while drawing. Reviewed-by: Tor Arne --- src/svg/qsvghandler.cpp | 25 +++++-------------------- src/svg/qsvgstyle.cpp | 38 ++++++++++++++++++++++++++++++-------- src/svg/qsvgstyle_p.h | 1 + 3 files changed, 36 insertions(+), 28 deletions(-) diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 5f9d1dd44..5857e1c44 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -644,26 +644,19 @@ static void parseBrush(QSvgNode *node, QString opacity = attributes.value(QLatin1String("fill-opacity")).toString(); QString myId = someId(attributes); - QSvgFillStyle *inherited = - static_cast(node->parent()->styleProperty( - QSvgStyleProperty::FILL)); - QSvgFillStyle *prop = new QSvgFillStyle(QColor(Qt::black)); + QSvgFillStyle *prop = new QSvgFillStyle(0); //fill-rule attribute handling - Qt::FillRule f = Qt::WindingFill; if (!fillRule.isEmpty() && fillRule != QLatin1String("inherit")) { if (fillRule == QLatin1String("evenodd")) - f = Qt::OddEvenFill; - } else if (inherited) { - f = inherited->fillRule(); + prop->setFillRule(Qt::OddEvenFill); + else if (fillRule == QLatin1String("nonzero")) + prop->setFillRule(Qt::WindingFill); } //fill-opacity atttribute handling - qreal fillOpacity = 1.0; if (!opacity.isEmpty() && opacity != QLatin1String("inherit")) { - fillOpacity = qMin(qreal(1.0), qMax(qreal(0.0), toDouble(opacity))); - } else if (inherited) { - fillOpacity = inherited->fillOpacity(); + prop->setFillOpacity(qMin(qreal(1.0), qMax(qreal(0.0), toDouble(opacity)))); } //fill attribute handling @@ -685,15 +678,7 @@ static void parseBrush(QSvgNode *node, } else { prop->setBrush(QBrush(Qt::NoBrush)); } - } else if (inherited) { - if (inherited->style()) { - prop->setFillStyle(inherited->style()); - } else { - prop->setBrush(inherited->qbrush()); - } } - prop->setFillOpacity(fillOpacity); - prop->setFillRule(f); node->appendStyleProperty(prop,myId); } diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index b693429c9..c3c0a683c 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -81,12 +81,25 @@ void QSvgQualityStyle::revert(QPainter *, QSvgExtraStates &) } QSvgFillStyle::QSvgFillStyle(const QBrush &brush) - : m_fill(brush), m_style(0), m_fillRuleSet(false), m_fillRule(Qt::WindingFill), m_fillOpacitySet(false), m_fillOpacity(1.0), m_gradientResolved (true) + : m_fill(brush) + , m_style(0) + , m_fillRuleSet(false) + , m_fillRule(Qt::WindingFill) + , m_fillOpacitySet(false) + , m_fillOpacity(1.0) + , m_gradientResolved(true) + , m_fillSet(true) { } QSvgFillStyle::QSvgFillStyle(QSvgStyleProperty *style) - : m_style(style), m_fillRuleSet(false), m_fillRule(Qt::WindingFill), m_fillOpacitySet(false), m_fillOpacity(1.0), m_gradientResolved (true) + : m_style(style) + , m_fillRuleSet(false) + , m_fillRule(Qt::WindingFill) + , m_fillOpacitySet(false) + , m_fillOpacity(1.0) + , m_gradientResolved(true) + , m_fillSet(style != 0) { } @@ -105,11 +118,14 @@ void QSvgFillStyle::setFillOpacity(qreal opacity) void QSvgFillStyle::setFillStyle(QSvgStyleProperty* style) { m_style = style; + m_fillSet = true; } void QSvgFillStyle::setBrush(QBrush brush) { m_fill = brush; + m_style = 0; + m_fillSet = true; } static void recursivelySetFill(QSvgNode *node, Qt::FillRule f) @@ -136,20 +152,26 @@ void QSvgFillStyle::apply(QPainter *p, const QRectF &rect, QSvgNode *node, QSvgE recursivelySetFill(node, m_fillRule); m_fillRuleSet = false;//set it only on the first run } - p->setBrush(m_fill); + if (m_fillSet) { + if (m_style) + m_style->apply(p, rect, node, states); + else + p->setBrush(m_fill); + } if (m_fillOpacitySet) states.fillOpacity = m_fillOpacity; - if (m_style) - m_style->apply(p, rect, node, states); } void QSvgFillStyle::revert(QPainter *p, QSvgExtraStates &states) { - if (m_style) - m_style->revert(p, states); - p->setBrush(m_oldFill); if (m_fillOpacitySet) states.fillOpacity = m_oldOpacity; + if (m_fillSet) { + if (m_style) + m_style->revert(p, states); + else + p->setBrush(m_oldFill); + } } QSvgViewportFillStyle::QSvgViewportFillStyle(const QBrush &brush) diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h index ac5e10915..70ecf5b49 100644 --- a/src/svg/qsvgstyle_p.h +++ b/src/svg/qsvgstyle_p.h @@ -281,6 +281,7 @@ private: qreal m_oldOpacity; QString m_gradientId; bool m_gradientResolved; + bool m_fillSet; }; class QSvgViewportFillStyle : public QSvgStyleProperty -- cgit v1.2.3 From 8c97cd7a91e99a2665e871efe1bf577e33eaff3a Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Mon, 20 Jul 2009 12:41:47 +0200 Subject: Fixed GL2 engine shader manager to work with more than one context. I added a QGLContextResource class which can be used internally in Qt for sharing resources between contexts. The QGLContextResource is a hash map where the context is used as 'key', and the resource is the 'value'. All the sharing contexts point to the same resource, and the resource is automatically deleted when it is not referenced any more. Now, the shader manager uses the QGLContextResource class. I also added a pointer to a struct in the QGLContextPrivate class. The struct is shared between all the sharing contexts and is deleted automatically. Currently, the struct only contains the resolved OpenGL function pointers. The shared context register code has been simplified. Reviewed-by: Tom --- .../gl2paintengineex/qglengineshadermanager.cpp | 22 +++ .../gl2paintengineex/qglengineshadermanager_p.h | 3 + .../gl2paintengineex/qpaintengineex_opengl2.cpp | 11 +- src/opengl/qgl.cpp | 159 ++++++++++++++++++++- src/opengl/qgl.h | 1 + src/opengl/qgl_p.h | 95 ++++++------ 6 files changed, 228 insertions(+), 63 deletions(-) diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp index 27636f43f..d7c91b8f7 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp +++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp @@ -49,6 +49,28 @@ QT_BEGIN_NAMESPACE +static void QGLEngineShaderManager_free(void *ptr) +{ + delete reinterpret_cast(ptr); +} + +Q_GLOBAL_STATIC_WITH_ARGS(QGLContextResource, qt_shader_managers, (QGLEngineShaderManager_free)) + +QGLEngineShaderManager *QGLEngineShaderManager::managerForContext(const QGLContext *context) +{ + QGLEngineShaderManager *p = reinterpret_cast(qt_shader_managers()->value(context)); + if (!p) { + QGLContext *oldContext = const_cast(QGLContext::currentContext()); + if (oldContext != context) + const_cast(context)->makeCurrent(); + p = new QGLEngineShaderManager(const_cast(context)); + qt_shader_managers()->insert(context, p); + if (oldContext && oldContext != context) + oldContext->makeCurrent(); + } + return p; +} + const char* QGLEngineShaderManager::qglEngineShaderSourceCode[] = { 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h index 442edfe88..99711bd40 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h +++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h @@ -220,6 +220,7 @@ #include #include #include +#include QT_BEGIN_HEADER @@ -314,6 +315,8 @@ public: QGLShaderProgram* simpleProgram(); // Used to draw into e.g. stencil buffers QGLShaderProgram* blitProgram(); // Used to blit a texture into the framebuffer + static QGLEngineShaderManager *managerForContext(const QGLContext *context); + enum ShaderName { MainVertexShader, MainWithTexCoordsVertexShader, diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 2bfbf4a25..9b0321d43 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -266,10 +266,6 @@ extern QImage qt_imageForBrush(int brushStyle, bool invert); QGL2PaintEngineExPrivate::~QGL2PaintEngineExPrivate() { - if (shaderManager) { - delete shaderManager; - shaderManager = 0; - } } void QGL2PaintEngineExPrivate::updateTextureFilter(GLenum target, GLenum wrapMode, bool smoothPixmapTransform, GLuint id) @@ -1209,11 +1205,8 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev) qt_resolve_version_2_0_functions(d->ctx); #endif - if (d->shaderManager) { - d->shaderManager->setDirty(); - } else { - d->shaderManager = new QGLEngineShaderManager(d->ctx); - } + d->shaderManager = QGLEngineShaderManager::managerForContext(d->ctx); + d->shaderManager->setDirty(); glViewport(0, 0, d->width, d->height); diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 0169ea2c6..f51b271b0 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -3363,8 +3363,13 @@ bool QGLWidget::event(QEvent *e) #elif defined(Q_WS_WIN) if (e->type() == QEvent::ParentChange) { QGLContext *newContext = new QGLContext(d->glcx->requestedFormat(), this); - qgl_share_reg()->replaceShare(d->glcx, newContext); + QList shares = qgl_share_reg()->shares(d->glcx); setContext(newContext); + for (int i = 0; i < shares.size(); ++i) { + if (newContext != shares.at(i)) + qgl_share_reg()->addShare(newContext, shares.at(i)); + } + // the overlay needs to be recreated as well delete d->olcx; if (isValid() && context()->format().hasOverlay()) { @@ -4612,4 +4617,156 @@ bool QGLDrawable::autoFillBackground() const return false; } + +bool QGLShareRegister::checkSharing(const QGLContext *context1, const QGLContext *context2) { + bool sharing = (context1 && context2 && context1->d_ptr->groupResources == context2->d_ptr->groupResources); + return sharing; +} + +void QGLShareRegister::addShare(const QGLContext *context, const QGLContext *share) { + Q_ASSERT(context && share); + if (context->d_ptr->groupResources == share->d_ptr->groupResources) + return; + + // Make sure 'context' is not already shared with another group of contexts. + Q_ASSERT(reg.find(context->d_ptr->groupResources) == reg.end()); + Q_ASSERT(context->d_ptr->groupResources->refs == 1); + + // Free 'context' group resources and make it use the same resources as 'share'. + delete context->d_ptr->groupResources; + context->d_ptr->groupResources = share->d_ptr->groupResources; + context->d_ptr->groupResources->refs.ref(); + + // Maintain a list of all the contexts in each group of sharing contexts. + SharingHash::iterator it = reg.find(share->d_ptr->groupResources); + if (it == reg.end()) + it = reg.insert(share->d_ptr->groupResources, ContextList() << share); + it.value() << context; +} + +QList QGLShareRegister::shares(const QGLContext *context) { + SharingHash::const_iterator it = reg.find(context->d_ptr->groupResources); + if (it == reg.end()) + return ContextList(); + return it.value(); +} + +void QGLShareRegister::removeShare(const QGLContext *context) { + SharingHash::iterator it = reg.find(context->d_ptr->groupResources); + if (it == reg.end()) + return; + + int count = it.value().removeAll(context); + Q_ASSERT(count == 1); + + Q_ASSERT(it.value().size() != 0); + if (it.value().size() == 1) + reg.erase(it); +} + +QGLContextResource::QGLContextResource(FreeFunc f, QObject *parent) + : QObject(parent), free(f) +{ + connect(QGLSignalProxy::instance(), SIGNAL(aboutToDestroyContext(const QGLContext *)), this, SLOT(aboutToDestroyContext(const QGLContext *))); +} + +QGLContextResource::~QGLContextResource() +{ + while (!m_resources.empty()) + remove(m_resources.begin().key()); +} + +void QGLContextResource::insert(const QGLContext *key, void *value) +{ + QList shares = qgl_share_reg()->shares(key); + if (shares.size() == 0) + shares.append(key); + void *oldValue = 0; + for (int i = 0; i < shares.size(); ++i) { + ResourceHash::iterator it = m_resources.find(shares.at(i)); + if (it != m_resources.end()) { + Q_ASSERT(oldValue == 0 || oldValue == it.value()); + oldValue = it.value(); + it.value() = value; + } else { + m_resources.insert(shares.at(i), value); + } + } + if (oldValue != 0 && oldValue != value) { + QGLContext *oldContext = const_cast(QGLContext::currentContext()); + if (oldContext != key) + const_cast(key)->makeCurrent(); + free(oldValue); + if (oldContext && oldContext != key) + oldContext->makeCurrent(); + } +} + +void *QGLContextResource::value(const QGLContext *key) +{ + ResourceHash::const_iterator it = m_resources.find(key); + // Check if there is a value associated with 'key'. + if (it != m_resources.end()) + return it.value(); + // Check if there is a value associated with sharing contexts. + QList shares = qgl_share_reg()->shares(key); + for (int i = 0; i < shares.size() && it == m_resources.end(); ++i) + it = m_resources.find(shares.at(i)); + if (it == m_resources.end()) + return 0; // Didn't find anything. + + // Found something! Share this info with all the buddies. + for (int i = 0; i < shares.size(); ++i) + m_resources.insert(shares.at(i), it.value()); + return it.value(); +} + +void QGLContextResource::remove(const QGLContext *key) +{ + QList shares = qgl_share_reg()->shares(key); + if (shares.size() == 0) + shares.append(key); + void *oldValue = 0; + for (int i = 0; i < shares.size(); ++i) { + ResourceHash::iterator it = m_resources.find(shares.at(i)); + if (it != m_resources.end()) { + Q_ASSERT(oldValue == 0 || oldValue == it.value()); + oldValue = it.value(); + m_resources.erase(it); + } + } + if (oldValue != 0) { + QGLContext *oldContext = const_cast(QGLContext::currentContext()); + if (oldContext != key) + const_cast(key)->makeCurrent(); + free(oldValue); + if (oldContext && oldContext != key) + oldContext->makeCurrent(); + } +} + +void QGLContextResource::aboutToDestroyContext(const QGLContext *key) +{ + ResourceHash::iterator it = m_resources.find(key); + if (it == m_resources.end()) + return; + + QList shares = qgl_share_reg()->shares(key); + if (shares.size() > 1) { + Q_ASSERT(key->isSharing()); + // At least one of the shared contexts must stay in the cache. + // Otherwise, the value pointer is lost. + for (int i = 0; i < 2/*shares.size()*/; ++i) + m_resources.insert(shares.at(i), it.value()); + } else { + QGLContext *oldContext = const_cast(QGLContext::currentContext()); + if (oldContext != key) + const_cast(key)->makeCurrent(); + free(it.value()); + if (oldContext && oldContext != key) + oldContext->makeCurrent(); + } + m_resources.erase(it); +} + QT_END_NAMESPACE diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 86555dae1..31b9543b0 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -364,6 +364,7 @@ private: friend class QGLPixmapData; friend class QGLPixmapFilterBase; friend class QGLTextureGlyphCache; + friend class QGLShareRegister; friend QGLFormat::OpenGLVersionFlags QGLFormat::openGLVersionFlags(); #ifdef Q_WS_MAC public: diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index ac19d6417..fda025730 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -196,12 +196,19 @@ public: #endif }; +struct QGLContextGroupResources +{ + QGLContextGroupResources() : refs(1) { } + QGLExtensionFuncs extensionFuncs; + QAtomicInt refs; +}; + class QGLContextPrivate { Q_DECLARE_PUBLIC(QGLContext) public: - explicit QGLContextPrivate(QGLContext *context) : internal_context(false), q_ptr(context) {} - ~QGLContextPrivate() {} + explicit QGLContextPrivate(QGLContext *context) : internal_context(false), q_ptr(context) {groupResources = new QGLContextGroupResources;} + ~QGLContextPrivate() {if (!groupResources->refs.deref()) delete groupResources;} GLuint bindTexture(const QImage &image, GLenum target, GLint format, const qint64 key, bool clean = false); GLuint bindTexture(const QPixmap &pixmap, GLenum target, GLint format, bool clean); @@ -257,14 +264,14 @@ public: QGLContext *q_ptr; QGLFormat::OpenGLVersionFlags version_flags; - QGLExtensionFuncs extensionFuncs; + QGLContextGroupResources *groupResources; GLint max_texture_size; GLuint current_fbo; QPaintEngine *active_engine; #ifdef Q_WS_WIN - static inline QGLExtensionFuncs& qt_get_extension_funcs(const QGLContext *ctx) { return ctx->d_ptr->extensionFuncs; } + static inline QGLExtensionFuncs& qt_get_extension_funcs(const QGLContext *ctx) { return ctx->d_ptr->groupResources->extensionFuncs; } #endif #if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) @@ -371,62 +378,21 @@ struct QGLThreadContext { }; extern QThreadStorage qgl_context_storage; -typedef QMultiHash QGLSharingHash; class QGLShareRegister { public: QGLShareRegister() {} ~QGLShareRegister() { reg.clear(); } - bool checkSharing(const QGLContext *context1, const QGLContext *context2, const QGLContext * skip=0) { - if (context1 == context2) - return true; - QList shares = reg.values(context1); - for (int k=0; k shares(const QGLContext *context) { - return reg.values(context); - } - + bool checkSharing(const QGLContext *context1, const QGLContext *context2); + void addShare(const QGLContext *context, const QGLContext *share); + QList shares(const QGLContext *context); + void removeShare(const QGLContext *context); private: - QGLSharingHash reg; + // Use a context's 'groupResources' pointer to uniquely identify a group. + typedef QList ContextList; + typedef QHash SharingHash; + SharingHash reg; }; extern Q_OPENGL_EXPORT QGLShareRegister* qgl_share_reg(); @@ -464,6 +430,29 @@ inline GLenum qt_gl_preferredTextureTarget() #endif } +// One resource per group of shared contexts. +class QGLContextResource : public QObject +{ + Q_OBJECT +public: + typedef void (*FreeFunc)(void *); + QGLContextResource(FreeFunc f, QObject *parent = 0); + ~QGLContextResource(); + // Set resource 'value' for 'key' and all its shared contexts. + void insert(const QGLContext *key, void *value); + // Return resource for 'key' or a shared context. + void *value(const QGLContext *key); + // Free resource for 'key' and all its shared contexts. + void remove(const QGLContext *key); +private slots: + // Remove entry 'key' from cache and delete resource if there are no shared contexts. + void aboutToDestroyContext(const QGLContext *key); +private: + typedef QHash ResourceHash; + ResourceHash m_resources; + FreeFunc free; +}; + QT_END_NAMESPACE #endif // QGL_P_H -- cgit v1.2.3 From 6aeb2f208f2978f1445ba2ac0043491db75359aa Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Tue, 30 Jun 2009 10:54:59 +0200 Subject: Used QGLContextResource for the gradient cache in the GL2 paint engine. Reviewed-by: Tom --- src/opengl/gl2paintengineex/qglgradientcache.cpp | 29 +++++++++++++++++----- src/opengl/gl2paintengineex/qglgradientcache_p.h | 27 ++++++-------------- .../gl2paintengineex/qpaintengineex_opengl2.cpp | 5 +--- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/opengl/gl2paintengineex/qglgradientcache.cpp b/src/opengl/gl2paintengineex/qglgradientcache.cpp index 8c6b4f029..7c54bb958 100644 --- a/src/opengl/gl2paintengineex/qglgradientcache.cpp +++ b/src/opengl/gl2paintengineex/qglgradientcache.cpp @@ -46,6 +46,28 @@ QT_BEGIN_NAMESPACE +static void QGL2GradientCache_free(void *ptr) +{ + delete reinterpret_cast(ptr); +} + +Q_GLOBAL_STATIC_WITH_ARGS(QGLContextResource, qt_gradient_caches, (QGL2GradientCache_free)) + +QGL2GradientCache *QGL2GradientCache::cacheForContext(const QGLContext *context) +{ + QGL2GradientCache *p = reinterpret_cast(qt_gradient_caches()->value(context)); + if (!p) { + QGLContext *oldContext = const_cast(QGLContext::currentContext()); + if (oldContext != context) + const_cast(context)->makeCurrent(); + p = new QGL2GradientCache; + qt_gradient_caches()->insert(context, p); + if (oldContext && oldContext != context) + oldContext->makeCurrent(); + } + return p; +} + void QGL2GradientCache::cleanCache() { QGLGradientColorTableHash::const_iterator it = cache.constBegin(); for (; it != cache.constEnd(); ++it) { @@ -55,13 +77,8 @@ void QGL2GradientCache::cleanCache() { cache.clear(); } -GLuint QGL2GradientCache::getBuffer(const QGradient &gradient, qreal opacity, const QGLContext *ctx) +GLuint QGL2GradientCache::getBuffer(const QGradient &gradient, qreal opacity) { - if (buffer_ctx && !qgl_share_reg()->checkSharing(buffer_ctx, ctx)) - cleanCache(); - - buffer_ctx = ctx; - quint64 hash_val = 0; QGradientStops stops = gradient.stops(); diff --git a/src/opengl/gl2paintengineex/qglgradientcache_p.h b/src/opengl/gl2paintengineex/qglgradientcache_p.h index 55c7b6502..ba698bc7b 100644 --- a/src/opengl/gl2paintengineex/qglgradientcache_p.h +++ b/src/opengl/gl2paintengineex/qglgradientcache_p.h @@ -53,12 +53,12 @@ #include #include #include +#include QT_BEGIN_NAMESPACE -class QGL2GradientCache : public QObject +class QGL2GradientCache { - Q_OBJECT struct CacheInfo { inline CacheInfo(QGradientStops s, qreal op, QGradient::InterpolationMode mode) : @@ -73,16 +73,12 @@ class QGL2GradientCache : public QObject typedef QMultiHash QGLGradientColorTableHash; public: - QGL2GradientCache() : QObject(), buffer_ctx(0) - { -/* - connect(QGLSignalProxy::instance(), - SIGNAL(aboutToDestroyContext(const QGLContext *)), - SLOT(cleanupGLContextRefs(const QGLContext *))); -*/ - } + static QGL2GradientCache *cacheForContext(const QGLContext *context); + + QGL2GradientCache() { } + ~QGL2GradientCache() {cleanCache();} - GLuint getBuffer(const QGradient &gradient, qreal opacity, const QGLContext *ctx); + GLuint getBuffer(const QGradient &gradient, qreal opacity); inline int paletteSize() const { return 1024; } protected: @@ -95,15 +91,6 @@ protected: void cleanCache(); QGLGradientColorTableHash cache; - const QGLContext *buffer_ctx; - -public slots: - void cleanupGLContextRefs(const QGLContext *context) { - if (context == buffer_ctx) { - cleanCache(); - buffer_ctx = 0; - } - } }; QT_END_NAMESPACE diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 9b0321d43..939cd0d96 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -334,9 +334,6 @@ void QGL2PaintEngineExPrivate::useSimpleShader() } } - -Q_GLOBAL_STATIC(QGL2GradientCache, qt_opengl_gradient_cache) - void QGL2PaintEngineExPrivate::updateBrushTexture() { // qDebug("QGL2PaintEngineExPrivate::updateBrushTexture()"); @@ -357,7 +354,7 @@ void QGL2PaintEngineExPrivate::updateBrushTexture() // We apply global opacity in the fragment shaders, so we always pass 1.0 // for opacity to the cache. - GLuint texId = qt_opengl_gradient_cache()->getBuffer(*g, 1.0, ctx); + GLuint texId = QGL2GradientCache::cacheForContext(ctx)->getBuffer(*g, 1.0); if (g->spread() == QGradient::RepeatSpread || g->type() == QGradient::ConicalGradient) updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, true); -- cgit v1.2.3 From fdacdd4335f80aea8385b5cfb745df9eda99ece6 Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Thu, 2 Jul 2009 13:16:45 +0200 Subject: Fixed crash in the GL2 engine's texture glyph cache. Reviewed-by: Tom --- src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 939cd0d96..3007b4cbd 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -115,6 +115,7 @@ public Q_SLOTS: glDeleteFramebuffers(1, &m_fbo); if (m_width || m_height) glDeleteTextures(1, &m_texture); + ctx = 0; } else { // since the context holding the texture is shared, and // about to be destroyed, we have to transfer ownership @@ -151,10 +152,17 @@ QGLTextureGlyphCache::QGLTextureGlyphCache(QGLContext *context, QFontEngineGlyph QGLTextureGlyphCache::~QGLTextureGlyphCache() { - glDeleteFramebuffers(1, &m_fbo); - - if (m_width || m_height) - glDeleteTextures(1, &m_texture); + if (ctx) { + QGLContext *oldContext = const_cast(QGLContext::currentContext()); + if (oldContext != ctx) + ctx->makeCurrent(); + glDeleteFramebuffers(1, &m_fbo); + + if (m_width || m_height) + glDeleteTextures(1, &m_texture); + if (oldContext && oldContext != ctx) + oldContext->makeCurrent(); + } } void QGLTextureGlyphCache::createTextureData(int width, int height) -- cgit v1.2.3 From 492a32d53f31a0617f0aac45aad3e8a5c9e3f5ed Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Mon, 6 Jul 2009 11:17:39 +0200 Subject: Corrected the value of GL_MAX_SAMPLES_EXT. Reviewed-by: Tom --- src/opengl/qglextensions_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengl/qglextensions_p.h b/src/opengl/qglextensions_p.h index 3bb42c810..4f1519752 100644 --- a/src/opengl/qglextensions_p.h +++ b/src/opengl/qglextensions_p.h @@ -535,7 +535,7 @@ struct QGLExtensionFuncs #endif #ifndef GL_MAX_SAMPLES_EXT -#define GL_MAX_SAMPLES_EXT 0x8D5 +#define GL_MAX_SAMPLES_EXT 0x8D57 #endif #ifndef GL_DRAW_FRAMEBUFFER_EXT -- cgit v1.2.3 From 89038235d08a039145792e545c3efedfd3d93323 Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Tue, 21 Jul 2009 14:39:30 +0200 Subject: Fixed gradient bug in the GL2 paint engine. Texture filtering was set before binding the texture, so the gradient spread was not set correctly. Reviewed-by: Tom --- src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 3007b4cbd..fa6b96699 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -364,15 +364,15 @@ void QGL2PaintEngineExPrivate::updateBrushTexture() // for opacity to the cache. GLuint texId = QGL2GradientCache::cacheForContext(ctx)->getBuffer(*g, 1.0); + glActiveTexture(GL_TEXTURE0 + QT_BRUSH_TEXTURE_UNIT); + glBindTexture(GL_TEXTURE_2D, texId); + if (g->spread() == QGradient::RepeatSpread || g->type() == QGradient::ConicalGradient) updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, true); else if (g->spread() == QGradient::ReflectSpread) updateTextureFilter(GL_TEXTURE_2D, GL_MIRRORED_REPEAT_IBM, true); else updateTextureFilter(GL_TEXTURE_2D, GL_CLAMP_TO_EDGE, true); - - glActiveTexture(GL_TEXTURE0 + QT_BRUSH_TEXTURE_UNIT); - glBindTexture(GL_TEXTURE_2D, texId); } else if (style == Qt::TexturePattern) { const QPixmap& texPixmap = currentBrush->texture(); -- cgit v1.2.3 From 704bfb1c67dd20d465f56bb1704500cd044f9494 Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Fri, 17 Jul 2009 14:36:47 +0200 Subject: Fixed opacity bug in the GL2 paint engine. When premultiplying a color with the opacity, the color's alpha channel was not set correcly. Reviewed-by: Tom --- src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index fa6b96699..7e8a28135 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -299,6 +299,7 @@ void QGL2PaintEngineExPrivate::updateTextureFilter(GLenum target, GLenum wrapMod QColor QGL2PaintEngineExPrivate::premultiplyColor(QColor c, GLfloat opacity) { qreal alpha = c.alphaF() * opacity; + c.setAlphaF(alpha); c.setRedF(c.redF() * alpha); c.setGreenF(c.greenF() * alpha); c.setBlueF(c.blueF() * alpha); -- cgit v1.2.3 From 134396b0100c33e271561edc8f5ec141fe0d611e Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 21 Jul 2009 16:01:56 +0200 Subject: Doc: document reimplementations of internal functions as internal. --- src/gui/embedded/qscreenproxy_qws.cpp | 8 ++++---- src/qt3support/dialogs/q3tabdialog.cpp | 2 +- src/qt3support/itemviews/q3table.cpp | 2 +- src/qt3support/widgets/q3scrollview.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gui/embedded/qscreenproxy_qws.cpp b/src/gui/embedded/qscreenproxy_qws.cpp index ade16cafc..3d7451b9e 100644 --- a/src/gui/embedded/qscreenproxy_qws.cpp +++ b/src/gui/embedded/qscreenproxy_qws.cpp @@ -537,7 +537,7 @@ int QProxyScreen::transformOrientation() const } /*! -\reimp +\internal */ int QProxyScreen::memoryNeeded(const QString &str) { @@ -548,7 +548,7 @@ int QProxyScreen::memoryNeeded(const QString &str) } /*! -\reimp +\internal */ int QProxyScreen::sharedRamSize(void *ptr) { @@ -559,7 +559,7 @@ int QProxyScreen::sharedRamSize(void *ptr) } /*! -\reimp +\internal */ void QProxyScreen::haltUpdates() { @@ -568,7 +568,7 @@ void QProxyScreen::haltUpdates() } /*! -\reimp +\internal */ void QProxyScreen::resumeUpdates() { diff --git a/src/qt3support/dialogs/q3tabdialog.cpp b/src/qt3support/dialogs/q3tabdialog.cpp index 50dbd4843..a65affc47 100644 --- a/src/qt3support/dialogs/q3tabdialog.cpp +++ b/src/qt3support/dialogs/q3tabdialog.cpp @@ -1038,7 +1038,7 @@ QString Q3TabDialog::tabLabel(QWidget * w) } -/*! \reimp +/*! \internal */ void Q3TabDialog::styleChange(QStyle& s) { diff --git a/src/qt3support/itemviews/q3table.cpp b/src/qt3support/itemviews/q3table.cpp index 11c70b44d..6c3e90c19 100644 --- a/src/qt3support/itemviews/q3table.cpp +++ b/src/qt3support/itemviews/q3table.cpp @@ -6411,7 +6411,7 @@ void Q3Table::startDrag() #endif -/*! \reimp */ +/*! \internal */ void Q3Table::windowActivationChange(bool oldActive) { if (oldActive && autoScrollTimer) diff --git a/src/qt3support/widgets/q3scrollview.cpp b/src/qt3support/widgets/q3scrollview.cpp index cea385a54..95e2117e0 100644 --- a/src/qt3support/widgets/q3scrollview.cpp +++ b/src/qt3support/widgets/q3scrollview.cpp @@ -669,7 +669,7 @@ bool Q3ScrollView::isVerticalSliderPressed() } /*! - \reimp + \internal */ void Q3ScrollView::styleChange(QStyle& old) { @@ -679,7 +679,7 @@ void Q3ScrollView::styleChange(QStyle& old) } /*! - \reimp + \internal */ void Q3ScrollView::fontChange(const QFont &old) { -- cgit v1.2.3 From 5fd5f9da3b4b433d43a4fe5c6d1a07cbc4712128 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 21 Jul 2009 16:33:25 +0200 Subject: Silence compiler warnings on shadowing of member functions. --- src/corelib/tools/qcontiguouscache.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h index 7d52f1ee7..0020d2227 100644 --- a/src/corelib/tools/qcontiguouscache.h +++ b/src/corelib/tools/qcontiguouscache.h @@ -166,8 +166,8 @@ void QContiguousCache::detach_helper() T *dest = x.d->array + x.d->start; T *src = d->array + d->start; - int count = x.d->count; - while (count--) { + int oldcount = x.d->count; + while (oldcount--) { if (QTypeInfo::isComplex) { new (dest) T(*src); } else { @@ -200,8 +200,8 @@ void QContiguousCache::setCapacity(int asize) x.d->start = x.d->offset % x.d->alloc; T *dest = x.d->array + (x.d->start + x.d->count-1) % x.d->alloc; T *src = d->array + (d->start + d->count-1) % d->alloc; - int count = x.d->count; - while (count--) { + int oldcount = x.d->count; + while (oldcount--) { if (QTypeInfo::isComplex) { new (dest) T(*src); } else { @@ -224,10 +224,10 @@ void QContiguousCache::clear() { if (d->ref == 1) { if (QTypeInfo::isComplex) { - int count = d->count; + int oldcount = d->count; T * i = d->array + d->start; T * e = d->array + d->alloc; - while (count--) { + while (oldcount--) { i->~T(); i++; if (i == e) @@ -254,11 +254,11 @@ inline QContiguousCacheData *QContiguousCache::malloc(int aalloc) } template -QContiguousCache::QContiguousCache(int capacity) +QContiguousCache::QContiguousCache(int cap) { - p = malloc(capacity); + p = malloc(cap); d->ref = 1; - d->alloc = capacity; + d->alloc = cap; d->count = d->start = d->offset = 0; d->sharable = true; } @@ -295,10 +295,10 @@ template void QContiguousCache::free(Data *x) { if (QTypeInfo::isComplex) { - int count = d->count; + int oldcount = d->count; T * i = d->array + d->start; T * e = d->array + d->alloc; - while (count--) { + while (oldcount--) { i->~T(); i++; if (i == e) -- cgit v1.2.3 From a033edc2517a0a108fc3c23190557a22465c96fb Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 21 Jul 2009 18:06:13 +0200 Subject: Doc: make potentially incorrect overloads obsolete. Also add additional overload. Reviewed-by: Andreas --- src/gui/graphicsview/qgraphicsscene.cpp | 23 ++++++++++++++++++++++- src/gui/graphicsview/qgraphicsscene.h | 5 +++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 38e59382b..21fe49a9c 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -1926,21 +1926,42 @@ QPainterPath QGraphicsScene::selectionArea() const } /*! + \since 4.6 + Sets the selection area to \a path. All items within this area are immediately selected, and all items outside are unselected. You can get the list of all selected items by calling selectedItems(). + \a deviceTransform is the transformation that applies to the view, and needs to + be provided if the scene contains items that ignore transformations. + For an item to be selected, it must be marked as \e selectable (QGraphicsItem::ItemIsSelectable). \sa clearSelection(), selectionArea() */ +void QGraphicsScene::setSelectionArea(const QPainterPath &path, const QTransform &deviceTransform) +{ + setSelectionArea(path, Qt::IntersectsItemShape, deviceTransform); +} + +/*! + \obsolete + \overload + + Sets the selection area to \a path. + + This function is deprecated and leads to incorrect results if the scene + contains items that ignore transformations. Use the overload that takes + a QTransform instead. +*/ void QGraphicsScene::setSelectionArea(const QPainterPath &path) { - setSelectionArea(path, Qt::IntersectsItemShape); + setSelectionArea(path, Qt::IntersectsItemShape, QTransform()); } /*! + \obsolete \overload \since 4.3 diff --git a/src/gui/graphicsview/qgraphicsscene.h b/src/gui/graphicsview/qgraphicsscene.h index d790f90ab..c0c6e75f4 100644 --- a/src/gui/graphicsview/qgraphicsscene.h +++ b/src/gui/graphicsview/qgraphicsscene.h @@ -182,8 +182,9 @@ public: QList selectedItems() const; QPainterPath selectionArea() const; - void setSelectionArea(const QPainterPath &path); - void setSelectionArea(const QPainterPath &path, Qt::ItemSelectionMode mode); + void setSelectionArea(const QPainterPath &path); // ### obsolete + void setSelectionArea(const QPainterPath &path, const QTransform &deviceTransform); + void setSelectionArea(const QPainterPath &path, Qt::ItemSelectionMode mode); // ### obsolete void setSelectionArea(const QPainterPath &path, Qt::ItemSelectionMode mode, const QTransform &deviceTransform); QGraphicsItemGroup *createItemGroup(const QList &items); -- cgit v1.2.3 From 685e98b24ce27fee3085e9f2359494960a7952ff Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 21 Jul 2009 18:27:04 +0200 Subject: Doc: documentation for boolean properties should say what happens when the property is set, not what doesn't happen when the property is not set. --- src/gui/graphicsview/qgraphicsscene.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 21fe49a9c..b017022ef 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -2694,15 +2694,17 @@ void QGraphicsScene::clearFocus() /*! \property QGraphicsScene::stickyFocus - \brief whether or not clicking the scene will clear focus + \brief whether clicking into the scene background will clear focus \since 4.6 - If this property is false (the default), then clicking on the scene - background or on an item that does not accept focus, will clear - focus. Otherwise, focus will remain unchanged. + In a QGraphicsScene with stickyFocus set to true, focus will remain + unchanged when the user clicks into the scene background or on an item + that does not accept focus. Otherwise, focus will be cleared. - The focus change happens in response to a mouse press. You can reimplement + By default, this property is false. + + Focus changes in response to a mouse press. You can reimplement mousePressEvent() in a subclass of QGraphicsScene to toggle this property based on where the user has clicked. -- cgit v1.2.3 From 150470d47d6871d163226de19f27c8b11a0131cf Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Tue, 21 Jul 2009 16:00:32 -0700 Subject: Make sure DFB version macros are defined Reviewed-by: Donald --- src/plugins/gfxdrivers/directfb/qdirectfbscreen.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h index 9d1e6709e..090a6858f 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h @@ -44,6 +44,7 @@ #include #include +#include QT_BEGIN_HEADER -- cgit v1.2.3 From b9b6258729585803e00b71280e175618b6bd50c2 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 22 Jul 2009 09:28:35 +1000 Subject: Fixed valgrind warnings related to sigaction from every testcase. Whoops, don't do sigaction for (nonexistent) signal 0. --- src/testlib/qtestcase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 5de37dc6a..1d0bbcf0b 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1480,7 +1480,7 @@ FatalSignalHandler::~FatalSignalHandler() struct sigaction oldact; - for (int i = 0; i < 32; ++i) { + for (int i = 1; i < 32; ++i) { if (!sigismember(&handledSignals, i)) continue; sigaction(i, &act, &oldact); -- cgit v1.2.3 From 5be62fbd822206c625cab4892ab485923dc79a00 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 22 Jul 2009 10:19:34 +1000 Subject: Fixed compile with -qtnamespace and MSVC. When an extern function is declared in the scope of another function, MSVC sometimes ignores the enclosing namespace {}. --- src/gui/kernel/qapplication.cpp | 10 ++++++---- src/opengl/qpixmapdata_gl.cpp | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index b168188c7..3453408f2 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -819,6 +819,12 @@ QApplication::QApplication(Display *dpy, int &argc, char **argv, #endif // Q_WS_X11 extern void qInitDrawhelperAsm(); +extern int qRegisterGuiVariant(); +extern int qUnregisterGuiVariant(); +#ifndef QT_NO_STATEMACHINE +extern int qRegisterGuiStateMachine(); +extern int qUnregisterGuiStateMachine(); +#endif /*! \fn void QApplicationPrivate::initialize() @@ -832,11 +838,9 @@ void QApplicationPrivate::initialize() if (qt_appType != QApplication::Tty) (void) QApplication::style(); // trigger creation of application style // trigger registering of QVariant's GUI types - extern int qRegisterGuiVariant(); qRegisterGuiVariant(); #ifndef QT_NO_STATEMACHINE // trigger registering of QStateMachine's GUI types - extern int qRegisterGuiStateMachine(); qRegisterGuiStateMachine(); #endif @@ -1060,11 +1064,9 @@ QApplication::~QApplication() #ifndef QT_NO_STATEMACHINE // trigger unregistering of QStateMachine's GUI types - extern int qUnregisterGuiStateMachine(); qUnregisterGuiStateMachine(); #endif // trigger unregistering of QVariant's GUI types - extern int qUnregisterGuiVariant(); qUnregisterGuiVariant(); } diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp index f0c7e204b..fe3bb0c16 100644 --- a/src/opengl/qpixmapdata_gl.cpp +++ b/src/opengl/qpixmapdata_gl.cpp @@ -303,6 +303,8 @@ QImage QGLPixmapData::fillImage(const QColor &color) const return img; } +extern QImage qt_gl_read_texture(const QSize &size, bool alpha_format, bool include_alpha); + QImage QGLPixmapData::toImage() const { if (!isValid()) @@ -319,7 +321,6 @@ QImage QGLPixmapData::toImage() const } QGLShareContextScope ctx(qt_gl_share_widget()->context()); - extern QImage qt_gl_read_texture(const QSize &size, bool alpha_format, bool include_alpha); glBindTexture(GL_TEXTURE_2D, m_textureId); return qt_gl_read_texture(QSize(w, h), true, true); } -- cgit v1.2.3 From d0a4c6ab4d801b8b02638324505b29dbaa822f5c Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Wed, 22 Jul 2009 13:49:39 +1000 Subject: Make "-graphicssystem openvg" select OpenVG as default graphics system Reviewed-by: Lincoln Ramsay --- configure | 9 +++++++++ src/gui/painting/qgraphicssystemfactory.cpp | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/configure b/configure index f7e80058f..60222a76e 100755 --- a/configure +++ b/configure @@ -1166,6 +1166,8 @@ while [ "$#" -gt 0 ]; do else if [ "$VAL" = "opengl" ]; then CFG_GRAPHICS_SYSTEM="opengl" + elif [ "$VAL" = "openvg" ]; then + CFG_GRAPHICS_SYSTEM="openvg" elif [ "$VAL" = "raster" ]; then CFG_GRAPHICS_SYSTEM="raster" else @@ -5612,6 +5614,12 @@ if [ "$CFG_OPENVG" != "no" ]; then fi fi +# if openvg is disabled and the user specified graphicssystem vg, disable it... +if [ "$CFG_GRAPHICS_SYSTEM" = "openvg" ] && [ "$CFG_OPENVG" = "no" ]; then + echo "OpenVG Graphics System is disabled due to missing OpenVG support..." + CFG_GRAPHICS_SYSTEM=default +fi + if [ "$CFG_PTMALLOC" != "no" ]; then # build ptmalloc, copy .a file to lib/ echo "Building ptmalloc. Please wait..." @@ -6638,6 +6646,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" if [ "$PLATFORM_QWS" != "yes" ]; then [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENGL" + [ "$CFG_GRAPHICS_SYSTEM" = "openvg" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENVG" fi # X11/Unix/Mac only configs diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp index b618d8b39..ddc66f37b 100644 --- a/src/gui/painting/qgraphicssystemfactory.cpp +++ b/src/gui/painting/qgraphicssystemfactory.cpp @@ -64,6 +64,10 @@ QGraphicsSystem *QGraphicsSystemFactory::create(const QString& key) if (system.isEmpty()) { system = QLatin1String("opengl"); } +#elif defined (QT_GRAPHICSSYSTEM_OPENVG) + if (system.isEmpty()) { + system = QLatin1String("openvg"); + } #elif defined (QT_GRAPHICSSYSTEM_RASTER) && !defined(Q_WS_WIN) if (system.isEmpty()) { system = QLatin1String("raster"); -- cgit v1.2.3 From 220b1cbcd253c8133ad185cd2be55db584071e67 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 22 Jul 2009 15:33:39 +1000 Subject: Add a (failing) test for QProcess bug 258462. --- tests/auto/qprocess/tst_qprocess.cpp | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index 6318d1d56..3ce080a69 100644 --- a/tests/auto/qprocess/tst_qprocess.cpp +++ b/tests/auto/qprocess/tst_qprocess.cpp @@ -141,6 +141,7 @@ private slots: void startFinishStartFinish(); void invalidProgramString_data(); void invalidProgramString(); + void processEventsInAReadyReadSlot(); // keep these at the end, since they use lots of processes and sometimes // caused obscure failures to occur in tests that followed them (esp. on the Mac) @@ -154,6 +155,7 @@ protected slots: void restartProcess(); void waitForReadyReadInAReadyReadSlotSlot(); void waitForBytesWrittenInABytesWrittenSlotSlot(); + void processEventsInAReadyReadSlotSlot(); private: QProcess *process; @@ -2024,5 +2026,34 @@ void tst_QProcess::invalidProgramString() QVERIFY(!QProcess::startDetached(programString)); } +//----------------------------------------------------------------------------- +void tst_QProcess::processEventsInAReadyReadSlot() +{ +#ifdef Q_OS_WINCE + QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll); +#endif + + QProcess process; + QVERIFY(QObject::connect(&process, SIGNAL(readyReadStandardOutput()), this, SLOT(processEventsInAReadyReadSlotSlot()))); + + for (int i = 0; i < 10; ++i) { + QCOMPARE(process.state(), QProcess::NotRunning); + +#ifdef Q_OS_MAC + process.start("testProcessOutput/testProcessOutput.app"); +#else + process.start("testProcessOutput/testProcessOutput"); +#endif + + QVERIFY(process.waitForFinished(10000)); + } +} + +//----------------------------------------------------------------------------- +void tst_QProcess::processEventsInAReadyReadSlotSlot() +{ + qApp->processEvents(); +} + QTEST_MAIN(tst_QProcess) #include "tst_qprocess.moc" -- cgit v1.2.3 From e43eae35b242bf90c801e719d61fff4a20549ead Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 21 Jul 2009 19:32:28 +0200 Subject: Fix Warning saying that signal cannot be made virtual The test for virtual signal did not work. But we cannot make an error right now or it might break existing code (exemple in task 210879) Reviewed-by: Kent Hansen --- src/tools/moc/moc.cpp | 20 +++++++++----------- tests/auto/moc/tst_moc.cpp | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index da5733a3c..797595f83 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -337,11 +337,10 @@ bool Moc::testFunctionAttribute(Token tok, FunctionDef *def) bool Moc::parseFunction(FunctionDef *def, bool inMacro) { def->isVirtual = false; - while (test(INLINE) || test(STATIC) || test(VIRTUAL) - || testFunctionAttribute(def)) { - if (lookup() == VIRTUAL) - def->isVirtual = true; - } + //skip modifiers and attributes + while (test(INLINE) || test(STATIC) || + (test(VIRTUAL) && (def->isVirtual = true)) //mark as virtual + || testFunctionAttribute(def)) {} bool templateFunction = (lookup() == TEMPLATE); def->type = parseType(); if (def->type.name.isEmpty()) { @@ -429,11 +428,10 @@ bool Moc::parseFunction(FunctionDef *def, bool inMacro) bool Moc::parseMaybeFunction(const ClassDef *cdef, FunctionDef *def) { def->isVirtual = false; - while (test(EXPLICIT) || test(INLINE) || test(STATIC) || test(VIRTUAL) - || testFunctionAttribute(def)) { - if (lookup() == VIRTUAL) - def->isVirtual = true; - } + //skip modifiers and attributes + while (test(INLINE) || test(STATIC) || + (test(VIRTUAL) && (def->isVirtual = true)) //mark as virtual + || testFunctionAttribute(def)) {} bool tilde = test(TILDE); def->type = parseType(); if (def->type.name.isEmpty()) @@ -862,7 +860,7 @@ void Moc::parseSignals(ClassDef *def) funcDef.access = FunctionDef::Protected; parseFunction(&funcDef); if (funcDef.isVirtual) - error("Signals cannot be declared virtual"); + warning("Signals cannot be declared virtual"); if (funcDef.inlineCode) error("Not a signal declaration"); def->signalList += funcDef; diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp index 898cfe16e..d66791f17 100644 --- a/tests/auto/moc/tst_moc.cpp +++ b/tests/auto/moc/tst_moc.cpp @@ -488,6 +488,7 @@ private slots: void warnOnPropertyWithoutREAD(); void constructors(); void typenameWithUnsigned(); + void warnOnVirtualSignal(); signals: void sigWithUnsignedArg(unsigned foo); @@ -1180,6 +1181,27 @@ void tst_Moc::typenameWithUnsigned() QVERIFY(mobj->indexOfSlot("l(unsignedQImage)") != -1); } + +void tst_Moc::warnOnVirtualSignal() +{ +#ifdef MOC_CROSS_COMPILED + QSKIP("Not tested when cross-compiled", SkipAll); +#endif +#if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(QT_NO_PROCESS) + QProcess proc; + proc.start("moc", QStringList(srcify("pure-virtual-signals.h"))); + QVERIFY(proc.waitForFinished()); + QCOMPARE(proc.exitCode(), 0); + QByteArray mocOut = proc.readAllStandardOutput(); + QVERIFY(!mocOut.isEmpty()); + QString mocWarning = QString::fromLocal8Bit(proc.readAllStandardError()); + QCOMPARE(mocWarning, QString(SRCDIR) + QString("/pure-virtual-signals.h:48: Warning: Signals cannot be declared virtual\n") + + QString(SRCDIR) + QString("/pure-virtual-signals.h:50: Warning: Signals cannot be declared virtual\n")); +#else + QSKIP("Only tested on linux/gcc", SkipAll); +#endif +} + QTEST_MAIN(tst_Moc) #include "tst_moc.moc" -- cgit v1.2.3 From cdff58107507a1a7a2d81e8b824d1c5361a77905 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Wed, 22 Jul 2009 10:28:03 +0200 Subject: delete incorrect documentation --- src/corelib/statemachine/qabstracttransition.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp index c040c584f..670aa7d6e 100644 --- a/src/corelib/statemachine/qabstracttransition.cpp +++ b/src/corelib/statemachine/qabstracttransition.cpp @@ -330,18 +330,6 @@ QList QAbstractTransition::animations() const This function is called to determine whether the given \a event should cause this transition to trigger. Reimplement this function and return true if the event should trigger the transition, otherwise return false. - - - Note that \a event is a QWrappedEvent, which contains a clone of - the event generated by Qt. For instance, if you want to check a - key press event, do the following: - - \snippet doc/src/snippets/statemachine/eventtest.cpp 0 - - You need to check if \a event is a QWrappedEvent because Qt also - uses other events for internal reasons; you don't need to concern - yourself with these in any case. - */ /*! -- cgit v1.2.3 From 6ecce8dfe0c71bc4dcc510d7920f70f7799cb0a7 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 22 Jul 2009 10:35:03 +0200 Subject: Fix a potential crash due to the fact that _q_UpdateIndex() is reentered This is confirmed to resolve a number of problems from the original reportee. It's already fixed in Qt 4.6 in a more wider fix, but this one liner is a good to have in Qt 4.5.x anyway. Task-number: 258194 Reviewed-by: alexis --- src/gui/graphicsview/qgraphicsscene.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 053338b68..247347a40 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -542,7 +542,7 @@ void QGraphicsScenePrivate::_q_updateIndex() // Regenerate the tree. if (regenerateIndex) { regenerateIndex = false; - bspTree.initialize(q->sceneRect(), depth); + bspTree.initialize(sceneRect, depth); unindexedItems = indexedItems; lastItemCount = indexedItems.size(); q->update(); -- cgit v1.2.3 From b0f37b81cb1972bc66ebc53ef5d4ea237ae83525 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 22 Jul 2009 10:46:41 +0200 Subject: qdoc: Changed to build qdoc3 in release mode. --- tools/qdoc3/qdoc3.pro | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index 129127245..49a16e6bc 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -7,10 +7,11 @@ DEFINES += QT_NO_CAST_TO_ASCII QT = core xml CONFIG += console CONFIG -= debug_and_release_target -CONFIG += debug +#CONFIG += debug build_all:!build_pass { CONFIG -= build_all - CONFIG += debug + CONFIG += release +# CONFIG += debug } mac:CONFIG -= app_bundle HEADERS += apigenerator.h \ -- cgit v1.2.3 From 236579465c8328fd4022a3dbbb68bf6fa9ffe4f4 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 22 Jul 2009 10:57:24 +0200 Subject: qdoc: Added page for obsolete classes. The classes marked \obsolete are no longer included in the "All Classes" list. They are listed separately on an "Obsolete Classes" list. The new page is reachable from the "All Classes" page and from the "Grouped Classes" page. --- doc/src/classes.qdoc | 10 +++--- doc/src/obsoleteclasses.qdoc | 59 +++++++++++++++++++++++++++++++++ tools/qdoc3/htmlgenerator.cpp | 77 ++++++++++++++++++++++++++++++++----------- tools/qdoc3/htmlgenerator.h | 3 +- 4 files changed, 124 insertions(+), 25 deletions(-) create mode 100644 doc/src/obsoleteclasses.qdoc diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc index dddc96fed..9a5d3ec8a 100644 --- a/doc/src/classes.qdoc +++ b/doc/src/classes.qdoc @@ -44,13 +44,15 @@ \title Qt's Classes \ingroup classlists - This is a list of all Qt classes excluding the \l{Qt 3 - compatibility classes}. For a shorter list that only includes the - most frequently used classes, see \l{Qt's Main Classes}. + This is a list of all Qt classes. For a shorter list of the most + frequently used Qt classes, see \l{Qt's Main Classes}. For a list + of the classes provided for compatibility with Qt3, see \l{Qt 3 + compatibility classes}. For classes that have been deprecated, see + the \l{Obsolete Classes} list. \generatelist classes - \sa {Qt 3 Compatibility Classes}, {Qt's Modules} + \sa {Qt 3 Compatibility Classes}, {Qt's Modules}, {Obsolete Classes} */ /*! diff --git a/doc/src/obsoleteclasses.qdoc b/doc/src/obsoleteclasses.qdoc new file mode 100644 index 000000000..3658dfcc4 --- /dev/null +++ b/doc/src/obsoleteclasses.qdoc @@ -0,0 +1,59 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \page obsoleteclasses.html + \group obsolete + \title Obsolete Classes + \ingroup classlists + \ingroup groups + + \brief Qt classes that are obsolete (deprecated). + + This is a list of Qt classes that are obsolete (deprecated). These + classes are provided to keep old source code working but they are + no longer maintained. We strongly advise against using these + classes in new code. + + \generatelist obsoleteclasses + + \sa {Qt's Classes}, {Qt's Modules} +*/ diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index c007b9b07..8d5e3d3bf 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -294,6 +294,7 @@ void HtmlGenerator::generateTree(const Tree *tree, CodeMarker *marker) nonCompatClasses.clear(); mainClasses.clear(); compatClasses.clear(); + obsoleteClasses.clear(); moduleClassMap.clear(); moduleNamespaceMap.clear(); funcIndex.clear(); @@ -381,7 +382,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, case Atom::AutoLink: if (!inLink && !inContents && !inSectionHeading) { const Node *node = 0; - QString link = getLink(atom, relative, marker, node); + QString link = getLink(atom, relative, marker, &node); if (!link.isEmpty()) { beginLink(link, node, relative, marker); generateLink(atom, relative, marker); @@ -567,6 +568,9 @@ int HtmlGenerator::generateAtom(const Atom *atom, else if (atom->string() == "compatclasses") { generateCompactList(relative, marker, compatClasses); } + else if (atom->string() == "obsoleteclasses") { + generateCompactList(relative, marker, obsoleteClasses); + } else if (atom->string() == "functionindex") { generateFunctionIndex(relative, marker); } @@ -648,11 +652,12 @@ int HtmlGenerator::generateAtom(const Atom *atom, case Atom::Link: { const Node *node = 0; - QString myLink = getLink(atom, relative, marker, node); - if (myLink.isEmpty()) + QString myLink = getLink(atom, relative, marker, &node); + if (myLink.isEmpty()) { relative->doc().location().warning(tr("Cannot link to '%1' in %2") .arg(atom->string()) .arg(marker->plainFullName(relative))); + } beginLink(myLink, node, relative, marker); skipAhead = 1; } @@ -3261,6 +3266,9 @@ void HtmlGenerator::findAllClasses(const InnerNode *node) if ((*c)->status() == Node::Compat) { compatClasses.insert(className, *c); } + else if ((*c)->status() == Node::Obsolete) { + obsoleteClasses.insert(className, *c); + } else { nonCompatClasses.insert(className, *c); if ((*c)->status() == Node::Main) @@ -3457,10 +3465,10 @@ const QPair HtmlGenerator::anchorForNode(const Node *node) QString HtmlGenerator::getLink(const Atom *atom, const Node *relative, CodeMarker *marker, - const Node *node) + const Node** node) { QString link; - node = 0; + *node = 0; if (atom->string().contains(":") && (atom->string().startsWith("file:") @@ -3484,40 +3492,69 @@ QString HtmlGenerator::getLink(const Atom *atom, QString first = path.first().trimmed(); if (first.isEmpty()) { - node = relative; + *node = relative; } else if (first.endsWith(".html")) { - node = tre->root()->findNode(first, Node::Fake); + *node = tre->root()->findNode(first, Node::Fake); } else { - node = marker->resolveTarget(first, tre, relative); - if (!node) - node = tre->findFakeNodeByTitle(first); - if (!node) - node = tre->findUnambiguousTarget(first, targetAtom); + *node = marker->resolveTarget(first, tre, relative); + if (!*node) + *node = tre->findFakeNodeByTitle(first); + if (!*node) + *node = tre->findUnambiguousTarget(first, targetAtom); } - if (node) { - if (!node->url().isEmpty()) - return node->url(); + if (*node) { + if (!(*node)->url().isEmpty()) + return (*node)->url(); else path.removeFirst(); } else { - node = relative; + *node = relative; + } +#if 0 + if (*node) { + if ((*node)->status() == Node::Obsolete) { + if (relative) { + if (relative->parent() != *node) { + if (relative->status() != Node::Obsolete) { + qDebug() << "Link to Obsolete entity" + << (*node)->name(); + qDebug() << " relative entity" + << relative->name(); + } + } + } + else { + qDebug() << "Link to Obsolete entity" + << (*node)->name() << "no relative"; + } + } +#if 0 + else if ((*node)->status() == Node::Deprecated) { + qDebug() << "Link to Deprecated entity"; + } + else if ((*node)->status() == Node::Internal) { + qDebug() << "Link to Internal entity"; + } + //else + //qDebug() << "Node Status:" << (*node)->status(); +#endif } - +#endif while (!path.isEmpty()) { - targetAtom = tre->findTarget(path.first(), node); + targetAtom = tre->findTarget(path.first(), *node); if (targetAtom == 0) break; path.removeFirst(); } if (path.isEmpty()) { - link = linkForNode(node, relative); + link = linkForNode(*node, relative); if (targetAtom) - link += "#" + refForAtom(targetAtom, node); + link += "#" + refForAtom(targetAtom, *node); } } return link; diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index dc5e5cf22..a7f4009ce 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -202,7 +202,7 @@ class HtmlGenerator : public PageGenerator virtual QString getLink(const Atom *atom, const Node *relative, CodeMarker *marker, - const Node *node = 0); + const Node** node); virtual void generateDcf(const QString &fileBase, const QString &startPage, const QString &title, DcfSection &dcfRoot); @@ -256,6 +256,7 @@ class HtmlGenerator : public PageGenerator QMap nonCompatClasses; QMap mainClasses; QMap compatClasses; + QMap obsoleteClasses; QMap namespaceIndex; QMap serviceClasses; #ifdef QDOC_QML -- cgit v1.2.3 From 3a8968dd2aab9c4e40ed34222f557bec6a98349e Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 22 Jul 2009 11:47:02 +0200 Subject: qdoc: Reported links to obsolete things that appear in non-obsolete things. Also marked the other QHttpXxx classes as \obsolete. --- src/network/access/qhttp.cpp | 3 +++ tools/qdoc3/htmlgenerator.cpp | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp index 790b48a2d..faa239870 100644 --- a/src/network/access/qhttp.cpp +++ b/src/network/access/qhttp.cpp @@ -513,6 +513,7 @@ public: /*! \class QHttpHeader + \obsolete \brief The QHttpHeader class contains header information for HTTP. \ingroup io @@ -1007,6 +1008,7 @@ public: /*! \class QHttpResponseHeader + \obsolete \brief The QHttpResponseHeader class contains response header information for HTTP. \ingroup io @@ -1211,6 +1213,7 @@ public: /*! \class QHttpRequestHeader + \obsolete \brief The QHttpRequestHeader class contains request header information for HTTP. \ingroup io diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 8d5e3d3bf..e31f6cf47 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -3514,16 +3514,21 @@ QString HtmlGenerator::getLink(const Atom *atom, else { *node = relative; } -#if 0 + if (*node) { if ((*node)->status() == Node::Obsolete) { if (relative) { if (relative->parent() != *node) { if (relative->status() != Node::Obsolete) { + relative->doc().location().warning(tr("Link to obsolete item '%1' in %2") + .arg(atom->string()) + .arg(marker->plainFullName(relative))); +#if 0 qDebug() << "Link to Obsolete entity" << (*node)->name(); qDebug() << " relative entity" << relative->name(); +#endif } } } @@ -3543,7 +3548,7 @@ QString HtmlGenerator::getLink(const Atom *atom, //qDebug() << "Node Status:" << (*node)->status(); #endif } -#endif + while (!path.isEmpty()) { targetAtom = tre->findTarget(path.first(), *node); if (targetAtom == 0) -- cgit v1.2.3 From 336954fb9b990c6d7c44ed3a8d676a6e21b2057f Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 22 Jul 2009 13:19:32 +0200 Subject: Simplify the computation of the QProgressBar progress. This is also a work around for a bug in gcc on powerpc (embedded-linux) Task-number: 258358 Reviewed-by: jbache --- src/gui/styles/qcleanlooksstyle.cpp | 7 +++---- src/gui/styles/qgtkstyle.cpp | 4 ++-- src/gui/widgets/qprogressbar.cpp | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp index 01f19c6f5..779fbc2ea 100644 --- a/src/gui/styles/qcleanlooksstyle.cpp +++ b/src/gui/styles/qcleanlooksstyle.cpp @@ -1745,10 +1745,9 @@ void QCleanlooksStyle::drawControl(ControlElement element, const QStyleOption *o int maxWidth = rect.width() - 4; int minWidth = 4; - qint64 progress = (qint64)qMax(bar->progress, bar->minimum); // workaround for bug in QProgressBar - double vc6_workaround = ((progress - qint64(bar->minimum)) / qMax(double(1.0), double(qint64(bar->maximum) - qint64(bar->minimum))) * maxWidth); - int progressBarWidth = (int(vc6_workaround) > minWidth ) ? int(vc6_workaround) : minWidth; - int width = indeterminate ? maxWidth : progressBarWidth; + int progress = qMax(bar->progress, bar->minimum); // workaround for bug in QProgressBar + int progressBarWidth = qMax(minWidth, (progress - bar->minimum) * maxWidth / qMax(1, bar->maximum - bar->minimum)); + int width = indeterminate ? maxWidth : progressBarWidth; bool reverse = (!vertical && (bar->direction == Qt::RightToLeft)) || vertical; if (inverted) diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index b6ef4c93d..2ba151ec9 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -2075,8 +2075,8 @@ void QGtkStyle::drawControl(ControlElement element, } if (vertical) rect = QRect(rect.left(), rect.top(), rect.height(), rect.width()); // flip width and height - const int progressIndicatorPos = static_cast((bar->progress - qint64(bar->minimum)) / - qMax(double(1.0), double(qint64(bar->maximum) - qint64(bar->minimum))) * rect.width()); + const int progressIndicatorPos = (bar->progress - bar->minimum) * rect.width() / + qMax(1, bar->maximum - bar->minimum); if (progressIndicatorPos >= 0 && progressIndicatorPos <= rect.width()) leftRect = QRect(rect.left(), rect.top(), progressIndicatorPos, rect.height()); if (vertical) diff --git a/src/gui/widgets/qprogressbar.cpp b/src/gui/widgets/qprogressbar.cpp index d168028ea..846f127f1 100644 --- a/src/gui/widgets/qprogressbar.cpp +++ b/src/gui/widgets/qprogressbar.cpp @@ -447,7 +447,7 @@ QString QProgressBar::text() const || (d->value == INT_MIN && d->minimum == INT_MIN)) return QString(); - qint64 totalSteps = qint64(d->maximum) - qint64(d->minimum); + int totalSteps = d->maximum - d->minimum; QString result = d->format; result.replace(QLatin1String("%m"), QString::number(totalSteps)); @@ -461,7 +461,7 @@ QString QProgressBar::text() const return result; } - int progress = int(((qreal(d->value) - qreal(d->minimum)) * 100.0) / totalSteps); + int progress = (d->value - d->minimum) * 100 / totalSteps; result.replace(QLatin1String("%p"), QString::number(progress)); return result; } -- cgit v1.2.3 From 27e5a1f9542b03a6930f002e8d7dafd97cf88a1a Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 22 Jul 2009 13:56:51 +0200 Subject: Support for very large range in QProgressBar Regression since my last commit. Task-number: 152227 --- src/gui/styles/qcleanlooksstyle.cpp | 6 +++--- src/gui/styles/qgtkstyle.cpp | 4 ++-- src/gui/styles/qplastiquestyle.cpp | 3 +-- src/gui/widgets/qprogressbar.cpp | 4 ++-- tests/auto/qprogressbar/tst_qprogressbar.cpp | 32 +++++++++++++++++++++++++++- 5 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp index 779fbc2ea..ccf81cb3a 100644 --- a/src/gui/styles/qcleanlooksstyle.cpp +++ b/src/gui/styles/qcleanlooksstyle.cpp @@ -1745,9 +1745,9 @@ void QCleanlooksStyle::drawControl(ControlElement element, const QStyleOption *o int maxWidth = rect.width() - 4; int minWidth = 4; - int progress = qMax(bar->progress, bar->minimum); // workaround for bug in QProgressBar - int progressBarWidth = qMax(minWidth, (progress - bar->minimum) * maxWidth / qMax(1, bar->maximum - bar->minimum)); - int width = indeterminate ? maxWidth : progressBarWidth; + qreal progress = qMax(bar->progress, bar->minimum); // workaround for bug in QProgressBar + int progressBarWidth = (progress - bar->minimum) * qreal(maxWidth) / qMax(1.0, qreal(bar->maximum) - bar->minimum); + int width = indeterminate ? maxWidth : qMax(minWidth, progressBarWidth); bool reverse = (!vertical && (bar->direction == Qt::RightToLeft)) || vertical; if (inverted) diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index 2ba151ec9..53f3db99c 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -2075,8 +2075,8 @@ void QGtkStyle::drawControl(ControlElement element, } if (vertical) rect = QRect(rect.left(), rect.top(), rect.height(), rect.width()); // flip width and height - const int progressIndicatorPos = (bar->progress - bar->minimum) * rect.width() / - qMax(1, bar->maximum - bar->minimum); + const int progressIndicatorPos = (bar->progress - qreal(bar->minimum)) * rect.width() / + qMax(1.0, qreal(bar->maximum) - bar->minimum); if (progressIndicatorPos >= 0 && progressIndicatorPos <= rect.width()) leftRect = QRect(rect.left(), rect.top(), progressIndicatorPos, rect.height()); if (vertical) diff --git a/src/gui/styles/qplastiquestyle.cpp b/src/gui/styles/qplastiquestyle.cpp index cd0bd0aec..80c988107 100644 --- a/src/gui/styles/qplastiquestyle.cpp +++ b/src/gui/styles/qplastiquestyle.cpp @@ -2571,8 +2571,7 @@ void QPlastiqueStyle::drawControl(ControlElement element, const QStyleOption *op painter->setTransform(m, true); } - double vc6_workaround = ((bar->progress - qint64(bar->minimum)) / qMax(double(1.0), double(qint64(bar->maximum) - qint64(bar->minimum))) * rect.width()); - int progressIndicatorPos = int(vc6_workaround); + int progressIndicatorPos = (bar->progress - qreal(bar->minimum)) / qMax(qreal(1.0), qreal(bar->maximum) - bar->minimum) * rect.width(); bool flip = (!vertical && (((bar->direction == Qt::RightToLeft) && !inverted) || ((bar->direction == Qt::LeftToRight) && inverted))) || (vertical && ((!inverted && !bottomToTop) || (inverted && bottomToTop))); diff --git a/src/gui/widgets/qprogressbar.cpp b/src/gui/widgets/qprogressbar.cpp index 846f127f1..6b38e9fb2 100644 --- a/src/gui/widgets/qprogressbar.cpp +++ b/src/gui/widgets/qprogressbar.cpp @@ -447,7 +447,7 @@ QString QProgressBar::text() const || (d->value == INT_MIN && d->minimum == INT_MIN)) return QString(); - int totalSteps = d->maximum - d->minimum; + qint64 totalSteps = qint64(d->maximum) - d->minimum; QString result = d->format; result.replace(QLatin1String("%m"), QString::number(totalSteps)); @@ -461,7 +461,7 @@ QString QProgressBar::text() const return result; } - int progress = (d->value - d->minimum) * 100 / totalSteps; + int progress = (qreal(d->value) - d->minimum) * 100.0 / totalSteps; result.replace(QLatin1String("%p"), QString::number(progress)); return result; } diff --git a/tests/auto/qprogressbar/tst_qprogressbar.cpp b/tests/auto/qprogressbar/tst_qprogressbar.cpp index 403b56b6a..452250c49 100644 --- a/tests/auto/qprogressbar/tst_qprogressbar.cpp +++ b/tests/auto/qprogressbar/tst_qprogressbar.cpp @@ -62,6 +62,8 @@ private slots: void format(); void setValueRepaint(); void sizeHint(); + void formatedText_data(); + void formatedText(); void task245201_testChangeStyleAndDelete_data(); void task245201_testChangeStyleAndDelete(); @@ -174,7 +176,7 @@ void tst_QProgressBar::format() bar.repainted = false; bar.setFormat("%v of %m (%p%)"); qApp->processEvents(); -#ifndef Q_WS_MAC +#ifndef Q_WS_MAC // The Mac scroll bar is animated, which means we get paint events all the time. QVERIFY(!bar.repainted); #endif @@ -225,6 +227,34 @@ void tst_QProgressBar::sizeHint() QCOMPARE(barSize.height(), size.height()); } +void tst_QProgressBar::formatedText_data() +{ + QTest::addColumn("minimum"); + QTest::addColumn("maximum"); + QTest::addColumn("value"); + QTest::addColumn("format"); + QTest::addColumn("text"); + + QTest::newRow("1") << -100 << 100 << 0 << QString::fromLatin1(" %p - %v - %m ") << QString::fromLatin1(" 50 - 0 - 200 "); +// QTest::newRow("2") << -100 << 0 << -25 << QString::fromLatin1(" %p - %v - %m ") << QString::fromLatin1(" 75 - -25 - 100 "); + QTest::newRow("3") << 10 << 10 << 10 << QString::fromLatin1(" %p - %v - %m ") << QString::fromLatin1(" 100 - 10 - 0 "); + QTest::newRow("task152227") << INT_MIN << INT_MAX << 42 << QString::fromLatin1(" %p - %v - %m ") << QString::fromLatin1(" 50 - 42 - 4294967295 "); +} + +void tst_QProgressBar::formatedText() +{ + QFETCH(int, minimum); + QFETCH(int, maximum); + QFETCH(int, value); + QFETCH(QString, format); + QFETCH(QString, text); + QProgressBar bar; + bar.setRange(minimum, maximum); + bar.setValue(value); + bar.setFormat(format); + QCOMPARE(bar.text(), text); +} + void tst_QProgressBar::task245201_testChangeStyleAndDelete_data() { QTest::addColumn("style1_str"); -- cgit v1.2.3 From e3994b506c21b9967248ea404cfdfef82060c13e Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 22 Jul 2009 14:05:03 +0200 Subject: Show text even if maximum == 0 --- src/gui/widgets/qprogressbar.cpp | 2 +- tests/auto/qprogressbar/tst_qprogressbar.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/widgets/qprogressbar.cpp b/src/gui/widgets/qprogressbar.cpp index 6b38e9fb2..6593cd6ab 100644 --- a/src/gui/widgets/qprogressbar.cpp +++ b/src/gui/widgets/qprogressbar.cpp @@ -443,7 +443,7 @@ QSize QProgressBar::minimumSizeHint() const QString QProgressBar::text() const { Q_D(const QProgressBar); - if (d->maximum == 0 || d->value < d->minimum + if ((d->maximum == 0 && d->minimum == 0) || d->value < d->minimum || (d->value == INT_MIN && d->minimum == INT_MIN)) return QString(); diff --git a/tests/auto/qprogressbar/tst_qprogressbar.cpp b/tests/auto/qprogressbar/tst_qprogressbar.cpp index 452250c49..911d6b7fc 100644 --- a/tests/auto/qprogressbar/tst_qprogressbar.cpp +++ b/tests/auto/qprogressbar/tst_qprogressbar.cpp @@ -236,7 +236,7 @@ void tst_QProgressBar::formatedText_data() QTest::addColumn("text"); QTest::newRow("1") << -100 << 100 << 0 << QString::fromLatin1(" %p - %v - %m ") << QString::fromLatin1(" 50 - 0 - 200 "); -// QTest::newRow("2") << -100 << 0 << -25 << QString::fromLatin1(" %p - %v - %m ") << QString::fromLatin1(" 75 - -25 - 100 "); + QTest::newRow("2") << -100 << 0 << -25 << QString::fromLatin1(" %p - %v - %m ") << QString::fromLatin1(" 75 - -25 - 100 "); QTest::newRow("3") << 10 << 10 << 10 << QString::fromLatin1(" %p - %v - %m ") << QString::fromLatin1(" 100 - 10 - 0 "); QTest::newRow("task152227") << INT_MIN << INT_MAX << 42 << QString::fromLatin1(" %p - %v - %m ") << QString::fromLatin1(" 50 - 42 - 4294967295 "); } -- cgit v1.2.3 From 6c25a7cdea912f212ce00f43c7cfc862c1ecdd50 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 22 Jul 2009 14:08:07 +0200 Subject: Designer: Fixed bug in setting QUrl property values from resources. Setting a file from a resource would result in 'qrc::/file' as the resource browser returns ':/file'. Reviewed-by: Jarek Kobus Initial-patch-by: andy --- .../src/components/propertyeditor/designerpropertymanager.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp b/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp index 2f6a51ec3..1092b92ec 100644 --- a/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp +++ b/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp @@ -254,8 +254,11 @@ void TextEditor::resourceActionActivated() { QString oldPath = m_editor->text(); if (oldPath.startsWith(QLatin1String("qrc:"))) - oldPath = oldPath.mid(4); - const QString newPath = IconSelector::choosePixmapResource(m_core, m_core->resourceModel(), oldPath, this); + oldPath.remove(0, 4); + // returns ':/file' + QString newPath = IconSelector::choosePixmapResource(m_core, m_core->resourceModel(), oldPath, this); + if (newPath.startsWith(QLatin1Char(':'))) + newPath.remove(0, 1); if (newPath.isEmpty() || newPath == oldPath) return; const QString newText = QLatin1String("qrc:") + newPath; -- cgit v1.2.3 From 6f9d5e9435b2c518df62278cc6fc1ab0fdf23ffe Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Wed, 22 Jul 2009 14:25:26 +0200 Subject: Update documentation for QMessageBox::open(). I had missed this one in my rounds of updates. Bad me. Reviewed-by: Thorbjorn --- src/gui/dialogs/qmessagebox.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index b3522cea5..eeec95ff6 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -1368,8 +1368,10 @@ void QMessageBox::setVisible(bool visible) /*! \overload - Opens the dialog and connects its accepted() signal to the slot specified - by \a receiver and \a member. + Opens the dialog and connects its finished() or buttonClicked() signal to + the slot specified by \a receiver and \a member. If the slot in \a member + has a pointer for its first parameter the connection is to buttonClicked(), + otherwise the connection is to finished(). The signal will be disconnected from the slot when the dialog is closed. */ -- cgit v1.2.3 From be1d9a4288e2b17a3d5a699da229076682ef99bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 16 Jul 2009 18:27:11 +0200 Subject: QDirIterator: refactor initializations in private constructor There's no need for initializing variables twice. Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index c9c80bb06..7de0a0b0b 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -134,12 +134,12 @@ public: */ QDirIteratorPrivate::QDirIteratorPrivate(const QString &path, const QStringList &nameFilters, QDir::Filters filters, QDirIterator::IteratorFlags flags) - : engine(0), path(path), nextFileInfo(path), iteratorFlags(flags), followNextDir(false), first(true), done(false) + : engine(0), path(path), nextFileInfo(path), iteratorFlags(flags), + filters(filters), nameFilters(nameFilters), + followNextDir(false), first(true), done(false) { - if (filters == QDir::NoFilter) - filters = QDir::AllEntries; - this->filters = filters; - this->nameFilters = nameFilters; + if (QDir::NoFilter == filters) + this->filters = QDir::AllEntries; pushSubDirectory(nextFileInfo, nameFilters, filters); } -- cgit v1.2.3 From e316b2249f329b4754b23d9cc8c418c3645dc6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 16 Jul 2009 19:02:23 +0200 Subject: Faster condition comes first Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 7de0a0b0b..eae1dfa0d 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -240,7 +240,7 @@ bool QDirIteratorPrivate::shouldFollowDirectory(const QFileInfo &fileInfo) return false; // Check symlinks - if (fileInfo.isSymLink() && !(iteratorFlags & QDirIterator::FollowSymlinks)) { + if (!(iteratorFlags & QDirIterator::FollowSymlinks) && fileInfo.isSymLink()) { // Follow symlinks only if FollowSymlinks was passed return false; } -- cgit v1.2.3 From 5f18fa27a6e87ee7cd568388cdf59cf85a3620e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 16 Jul 2009 20:48:39 +0200 Subject: QDirIterator moving around conditions Which is faster QFileInfo::isSymlink() or QFileInfo::fileName() followed by string comparisons? Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index eae1dfa0d..6d6542fcb 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -235,15 +235,14 @@ bool QDirIteratorPrivate::shouldFollowDirectory(const QFileInfo &fileInfo) if (!fileInfo.isDir()) return false; - // Never follow . and .. - if (fileInfo.fileName() == QLatin1String(".") || fileInfo.fileName() == QLatin1String("..")) + // Follow symlinks only when asked + if (!(iteratorFlags & QDirIterator::FollowSymlinks) && fileInfo.isSymLink()) return false; - // Check symlinks - if (!(iteratorFlags & QDirIterator::FollowSymlinks) && fileInfo.isSymLink()) { - // Follow symlinks only if FollowSymlinks was passed + // Never follow . and .. + QString fileName = fileInfo.fileName(); + if (QLatin1String(".") == fileName || QLatin1String("..") == fileName) return false; - } // Stop link loops if (visitedLinks.contains(fileInfo.canonicalFilePath())) -- cgit v1.2.3 From 316fec414c651fb4c5dc9666344219b0137e704f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Fri, 17 Jul 2009 12:21:15 +0200 Subject: QDirIterator: Don't recurse into hidden directories unless asked If we're skipping hidden files, we should skip hidden directories as well. The user can still request that hidden directories not be skipped by specifying QDir::AllDirs in the filter. Incidentally, all other filters are ignored when recursing into sub-directories. Perhaps that should be addressed as well. Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 6d6542fcb..f36320e92 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -244,6 +244,10 @@ bool QDirIteratorPrivate::shouldFollowDirectory(const QFileInfo &fileInfo) if (QLatin1String(".") == fileName || QLatin1String("..") == fileName) return false; + // No hidden directories unless requested + if (!(filters & QDir::AllDirs) && !(filters & QDir::Hidden) && fileInfo.isHidden()) + return false; + // Stop link loops if (visitedLinks.contains(fileInfo.canonicalFilePath())) return false; -- cgit v1.2.3 From 3e1476237996a99f7da77bd6abcfcd130c1bb126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 16 Jul 2009 19:11:30 +0200 Subject: QDirIterator cleanup The authoritative copy of filters and nameFilters is available, there is no need to get this from the file engine iterators. Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index f36320e92..df2b0c906 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -106,8 +106,7 @@ public: QDir::Filters filters, QDirIterator::IteratorFlags flags); ~QDirIteratorPrivate(); - void pushSubDirectory(const QFileInfo &fileInfo, const QStringList &nameFilters, - QDir::Filters filters); + void pushSubDirectory(const QFileInfo &fileInfo); void advance(); bool shouldFollowDirectory(const QFileInfo &); bool matchesFilters(const QString &fileName, const QFileInfo &fi) const; @@ -141,7 +140,7 @@ QDirIteratorPrivate::QDirIteratorPrivate(const QString &path, const QStringList if (QDir::NoFilter == filters) this->filters = QDir::AllEntries; - pushSubDirectory(nextFileInfo, nameFilters, filters); + pushSubDirectory(nextFileInfo); } /*! @@ -155,8 +154,7 @@ QDirIteratorPrivate::~QDirIteratorPrivate() /*! \internal */ -void QDirIteratorPrivate::pushSubDirectory(const QFileInfo &fileInfo, const QStringList &nameFilters, - QDir::Filters filters) +void QDirIteratorPrivate::pushSubDirectory(const QFileInfo &fileInfo) { QString path = fileInfo.filePath(); @@ -189,7 +187,7 @@ void QDirIteratorPrivate::advance() if (followNextDir) { // Start by navigating into the current directory. QAbstractFileEngineIterator *it = fileEngineIterators.top(); - pushSubDirectory(it->currentFileInfo(), it->nameFilters(), it->filters()); + pushSubDirectory(it->currentFileInfo()); followNextDir = false; } @@ -210,7 +208,7 @@ void QDirIteratorPrivate::advance() return; } else if (shouldFollowDirectory(info)) { - pushSubDirectory(info, it->nameFilters(), it->filters()); + pushSubDirectory(info); foundDirectory = true; break; } -- cgit v1.2.3 From 40276797e5a1e723826afe0c4d4cdeef99f1d309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Fri, 17 Jul 2009 11:37:23 +0200 Subject: Still fixing QDirIterator... Setting nextFileInfo in the constructor would generate visible behavior changes on the first call to QDirIterator::hasNext(), and that's just wrong. Namely, fileName(), filePath() would return different results before and after calling hasNext(). Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index df2b0c906..5f37bd71d 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -133,14 +133,14 @@ public: */ QDirIteratorPrivate::QDirIteratorPrivate(const QString &path, const QStringList &nameFilters, QDir::Filters filters, QDirIterator::IteratorFlags flags) - : engine(0), path(path), nextFileInfo(path), iteratorFlags(flags), + : engine(0), path(path), iteratorFlags(flags), filters(filters), nameFilters(nameFilters), followNextDir(false), first(true), done(false) { if (QDir::NoFilter == filters) this->filters = QDir::AllEntries; - pushSubDirectory(nextFileInfo); + pushSubDirectory(QFileInfo(path)); } /*! -- cgit v1.2.3 From 615e3e55fc56a5f5378db404cd89a443e7e74e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 16 Jul 2009 19:17:45 +0200 Subject: QDirIterator: another one bites the dust Removing another data member in QDirIteratorPrivate. The only reason I see for not doing this is to delay doing work as much as possible. Since copy constructors are disabled anyway, once QDirIterator is instantiated one has already signed up for the pain. The code also looks cleaner this way. Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 5f37bd71d..51bb98ab5 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -121,7 +121,6 @@ public: QDirIterator::IteratorFlags iteratorFlags; QDir::Filters filters; QStringList nameFilters; - bool followNextDir; bool first; bool done; @@ -135,7 +134,7 @@ QDirIteratorPrivate::QDirIteratorPrivate(const QString &path, const QStringList QDir::Filters filters, QDirIterator::IteratorFlags flags) : engine(0), path(path), iteratorFlags(flags), filters(filters), nameFilters(nameFilters), - followNextDir(false), first(true), done(false) + first(true), done(false) { if (QDir::NoFilter == filters) this->filters = QDir::AllEntries; @@ -183,14 +182,6 @@ void QDirIteratorPrivate::pushSubDirectory(const QFileInfo &fileInfo) */ void QDirIteratorPrivate::advance() { - // Advance to the next entry - if (followNextDir) { - // Start by navigating into the current directory. - QAbstractFileEngineIterator *it = fileEngineIterators.top(); - pushSubDirectory(it->currentFileInfo()); - followNextDir = false; - } - while (!fileEngineIterators.isEmpty()) { QAbstractFileEngineIterator *it = fileEngineIterators.top(); @@ -202,8 +193,10 @@ void QDirIteratorPrivate::advance() if (matchesFilters(it->currentFileName(), info)) { currentFileInfo = nextFileInfo; nextFileInfo = info; - // Signal that we want to follow this entry. - followNextDir = shouldFollowDirectory(nextFileInfo); + + if(shouldFollowDirectory(nextFileInfo)) + pushSubDirectory(nextFileInfo); + //We found a matching entry. return; -- cgit v1.2.3 From f2dce82831706a38cd97225edb2edc0ed2a1520e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Fri, 17 Jul 2009 15:29:12 +0200 Subject: QDirIterator refactoring done was set no sooner and no later than the file engine iterators stack was emptied (in a single threaded setting, anyway). There is no need to maintain additional state separately. Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 51bb98ab5..0ea7097c1 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -122,7 +122,6 @@ public: QDir::Filters filters; QStringList nameFilters; bool first; - bool done; QDirIterator *q; }; @@ -134,7 +133,7 @@ QDirIteratorPrivate::QDirIteratorPrivate(const QString &path, const QStringList QDir::Filters filters, QDirIterator::IteratorFlags flags) : engine(0), path(path), iteratorFlags(flags), filters(filters), nameFilters(nameFilters), - first(true), done(false) + first(true) { if (QDir::NoFilter == filters) this->filters = QDir::AllEntries; @@ -209,8 +208,8 @@ void QDirIteratorPrivate::advance() if (!foundDirectory) delete fileEngineIterators.pop(); } + currentFileInfo = nextFileInfo; - done = true; } /*! @@ -464,7 +463,7 @@ bool QDirIterator::hasNext() const d->first = false; d->advance(); } - return !d->done; + return !d->fileEngineIterators.isEmpty(); } /*! -- cgit v1.2.3 From 0ba33d83108f21abbd98cde1accdbba5bce625d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Fri, 17 Jul 2009 15:31:41 +0200 Subject: QDirIterator: no point in delaying the inevitable The only reason I see for not calling advance() directly in the constructor is to delay potentially unnecessary work. However, since copy constructors have been explicitly disabled, once QDirIterator is instantiated one has signed up for all the pain that comes with it. That's also a couple less conditionals in each iteration of normal use cases. Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 0ea7097c1..0e4d563f8 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -121,7 +121,6 @@ public: QDirIterator::IteratorFlags iteratorFlags; QDir::Filters filters; QStringList nameFilters; - bool first; QDirIterator *q; }; @@ -132,13 +131,14 @@ public: QDirIteratorPrivate::QDirIteratorPrivate(const QString &path, const QStringList &nameFilters, QDir::Filters filters, QDirIterator::IteratorFlags flags) : engine(0), path(path), iteratorFlags(flags), - filters(filters), nameFilters(nameFilters), - first(true) + filters(filters), nameFilters(nameFilters) { if (QDir::NoFilter == filters) this->filters = QDir::AllEntries; + // Populate fields for hasNext() and next() pushSubDirectory(QFileInfo(path)); + advance(); } /*! @@ -459,10 +459,6 @@ QString QDirIterator::next() */ bool QDirIterator::hasNext() const { - if (d->first) { - d->first = false; - d->advance(); - } return !d->fileEngineIterators.isEmpty(); } -- cgit v1.2.3 From 3d5b6f694f477a3529e79e72d66824b8befa0dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 16 Jul 2009 21:17:38 +0200 Subject: QDirIterator refactoring Some pointless renaming and mashing up... Actually, some of it sets the stage for (yes, you guessed it!) more refactoring! Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 0e4d563f8..ae5318f3f 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -106,9 +106,10 @@ public: QDir::Filters filters, QDirIterator::IteratorFlags flags); ~QDirIteratorPrivate(); - void pushSubDirectory(const QFileInfo &fileInfo); void advance(); - bool shouldFollowDirectory(const QFileInfo &); + + void pushDirectory(const QFileInfo &fileInfo); + bool checkAndPushDirectory(const QFileInfo &); bool matchesFilters(const QString &fileName, const QFileInfo &fi) const; QSet visitedLinks; @@ -137,7 +138,7 @@ QDirIteratorPrivate::QDirIteratorPrivate(const QString &path, const QStringList this->filters = QDir::AllEntries; // Populate fields for hasNext() and next() - pushSubDirectory(QFileInfo(path)); + pushDirectory(QFileInfo(path)); advance(); } @@ -152,7 +153,7 @@ QDirIteratorPrivate::~QDirIteratorPrivate() /*! \internal */ -void QDirIteratorPrivate::pushSubDirectory(const QFileInfo &fileInfo) +void QDirIteratorPrivate::pushDirectory(const QFileInfo &fileInfo) { QString path = fileInfo.filePath(); @@ -193,14 +194,12 @@ void QDirIteratorPrivate::advance() currentFileInfo = nextFileInfo; nextFileInfo = info; - if(shouldFollowDirectory(nextFileInfo)) - pushSubDirectory(nextFileInfo); + checkAndPushDirectory(nextFileInfo); //We found a matching entry. return; - } else if (shouldFollowDirectory(info)) { - pushSubDirectory(info); + } else if (checkAndPushDirectory(info)) { foundDirectory = true; break; } @@ -215,7 +214,7 @@ void QDirIteratorPrivate::advance() /*! \internal */ -bool QDirIteratorPrivate::shouldFollowDirectory(const QFileInfo &fileInfo) +bool QDirIteratorPrivate::checkAndPushDirectory(const QFileInfo &fileInfo) { // If we're doing flat iteration, we're done. if (!(iteratorFlags & QDirIterator::Subdirectories)) @@ -242,6 +241,7 @@ bool QDirIteratorPrivate::shouldFollowDirectory(const QFileInfo &fileInfo) if (visitedLinks.contains(fileInfo.canonicalFilePath())) return false; + pushDirectory(fileInfo); return true; } -- cgit v1.2.3 From a8aa2c7a7f40883680b7989465873554dfbba3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 16 Jul 2009 21:20:31 +0200 Subject: QDirIterator refactoring Now that the heavy lifting has been done, we can condense QDirIteratorPrivate::advance() further. It almost looks nice, even! Using fileEngineIterators.top() directly in the loop condition allows us to manipulate the stack without the foundDirectory check. Since QStack can be inlined, this shouldn't severely affect performance... Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index ae5318f3f..8c7645ef7 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -183,29 +183,25 @@ void QDirIteratorPrivate::pushDirectory(const QFileInfo &fileInfo) void QDirIteratorPrivate::advance() { while (!fileEngineIterators.isEmpty()) { - QAbstractFileEngineIterator *it = fileEngineIterators.top(); // Find the next valid iterator that matches the filters. - bool foundDirectory = false; - while (it->hasNext()) { + while (fileEngineIterators.top()->hasNext()) { + QAbstractFileEngineIterator *it = fileEngineIterators.top(); it->next(); + const QFileInfo info = it->currentFileInfo(); + checkAndPushDirectory(it->currentFileInfo()); + if (matchesFilters(it->currentFileName(), info)) { currentFileInfo = nextFileInfo; nextFileInfo = info; - checkAndPushDirectory(nextFileInfo); - //We found a matching entry. return; - - } else if (checkAndPushDirectory(info)) { - foundDirectory = true; - break; } } - if (!foundDirectory) - delete fileEngineIterators.pop(); + + delete fileEngineIterators.pop(); } currentFileInfo = nextFileInfo; -- cgit v1.2.3 From 4c58b5936b6d169f6745d5eea3e65744956b8d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 16 Jul 2009 21:21:35 +0200 Subject: QDirIterator cleanup after refactoring Return value for checkAndPushDirectory is no longer used, we can just throw it out. Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 8c7645ef7..2e8d9c40d 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -109,7 +109,7 @@ public: void advance(); void pushDirectory(const QFileInfo &fileInfo); - bool checkAndPushDirectory(const QFileInfo &); + void checkAndPushDirectory(const QFileInfo &); bool matchesFilters(const QString &fileName, const QFileInfo &fi) const; QSet visitedLinks; @@ -210,35 +210,34 @@ void QDirIteratorPrivate::advance() /*! \internal */ -bool QDirIteratorPrivate::checkAndPushDirectory(const QFileInfo &fileInfo) +void QDirIteratorPrivate::checkAndPushDirectory(const QFileInfo &fileInfo) { // If we're doing flat iteration, we're done. if (!(iteratorFlags & QDirIterator::Subdirectories)) - return false; + return; // Never follow non-directory entries if (!fileInfo.isDir()) - return false; + return; // Follow symlinks only when asked if (!(iteratorFlags & QDirIterator::FollowSymlinks) && fileInfo.isSymLink()) - return false; + return; // Never follow . and .. QString fileName = fileInfo.fileName(); if (QLatin1String(".") == fileName || QLatin1String("..") == fileName) - return false; + return; // No hidden directories unless requested if (!(filters & QDir::AllDirs) && !(filters & QDir::Hidden) && fileInfo.isHidden()) - return false; + return; // Stop link loops if (visitedLinks.contains(fileInfo.canonicalFilePath())) - return false; + return; pushDirectory(fileInfo); - return true; } /*! -- cgit v1.2.3 From 3da795b77f3bb0752eb14057086241f25293e26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Thu, 16 Jul 2009 21:22:04 +0200 Subject: QDirIterator: Cleaning up after one's self Well, why not? Resetting nextFileInfo when we're done allows removing unnecessary check in QDirIterator::next(), while retaining behavior. Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 2e8d9c40d..09001c6f3 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -205,6 +205,7 @@ void QDirIteratorPrivate::advance() } currentFileInfo = nextFileInfo; + nextFileInfo = QFileInfo(); } /*! @@ -440,8 +441,6 @@ QDirIterator::~QDirIterator() */ QString QDirIterator::next() { - if (!hasNext()) - return QString(); d->advance(); return filePath(); } -- cgit v1.2.3 From 919e6f1ba2a6441c554bdb1b2c7d8ca78e33c557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Fri, 17 Jul 2009 12:23:57 +0200 Subject: QDirIterator: fail early, fail often If nothing else changes, there's no point to keep trying. Let a broken QDirIterator be broken. Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 09001c6f3..ea549413e 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -131,7 +131,7 @@ public: */ QDirIteratorPrivate::QDirIteratorPrivate(const QString &path, const QStringList &nameFilters, QDir::Filters filters, QDirIterator::IteratorFlags flags) - : engine(0), path(path), iteratorFlags(flags), + : engine(QAbstractFileEngine::create(path)), path(path), iteratorFlags(flags), filters(filters), nameFilters(nameFilters) { if (QDir::NoFilter == filters) @@ -165,7 +165,7 @@ void QDirIteratorPrivate::pushDirectory(const QFileInfo &fileInfo) if (iteratorFlags & QDirIterator::FollowSymlinks) visitedLinks << fileInfo.canonicalFilePath(); - if (engine || (engine = QAbstractFileEngine::create(this->path))) { + if (engine) { engine->setFileName(path); QAbstractFileEngineIterator *it = engine->beginEntryList(filters, nameFilters); if (it) { -- cgit v1.2.3 From eabc4109a2703aa761eff7a26cfa7001af8577a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Fri, 17 Jul 2009 12:31:29 +0200 Subject: QDirIterator refactoring Moving member data around and marking immutable data as such. Reviewed-by: Marius Storm-Olsen --- src/corelib/io/qdiriterator.cpp | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index ea549413e..371e82212 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -112,16 +112,19 @@ public: void checkAndPushDirectory(const QFileInfo &); bool matchesFilters(const QString &fileName, const QFileInfo &fi) const; - QSet visitedLinks; - QAbstractFileEngine *engine; + QAbstractFileEngine * const engine; + + const QString path; + const QStringList nameFilters; + const QDir::Filters filters; + const QDirIterator::IteratorFlags iteratorFlags; + QStack fileEngineIterators; - QString path; - QFileInfo nextFileInfo; - //This fileinfo is the current that we will return from the public API QFileInfo currentFileInfo; - QDirIterator::IteratorFlags iteratorFlags; - QDir::Filters filters; - QStringList nameFilters; + QFileInfo nextFileInfo; + + // Loop protection + QSet visitedLinks; QDirIterator *q; }; @@ -131,12 +134,12 @@ public: */ QDirIteratorPrivate::QDirIteratorPrivate(const QString &path, const QStringList &nameFilters, QDir::Filters filters, QDirIterator::IteratorFlags flags) - : engine(QAbstractFileEngine::create(path)), path(path), iteratorFlags(flags), - filters(filters), nameFilters(nameFilters) + : engine(QAbstractFileEngine::create(path)) + , path(path) + , nameFilters(nameFilters) + , filters(QDir::NoFilter == filters ? QDir::AllEntries : filters) + , iteratorFlags(flags) { - if (QDir::NoFilter == filters) - this->filters = QDir::AllEntries; - // Populate fields for hasNext() and next() pushDirectory(QFileInfo(path)); advance(); -- cgit v1.2.3 From 8aaf775d3746529e8efa5110673a274ac6a7f8d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Wed, 22 Jul 2009 12:49:01 +0200 Subject: QDirIterator refactoring '*' is functionally the same as having no name filters. Equating the equivalence in the constructor avoids repeated checks in the advance "loop". Reviewed-by: Olivier Goffart --- src/corelib/io/qdiriterator.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 371e82212..f7df8362f 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -136,7 +136,7 @@ QDirIteratorPrivate::QDirIteratorPrivate(const QString &path, const QStringList QDir::Filters filters, QDirIterator::IteratorFlags flags) : engine(QAbstractFileEngine::create(path)) , path(path) - , nameFilters(nameFilters) + , nameFilters(nameFilters.contains(QLatin1String("*")) ? QStringList() : nameFilters) , filters(QDir::NoFilter == filters ? QDir::AllEntries : filters) , iteratorFlags(flags) { @@ -270,10 +270,9 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf return false; // name filter -#ifndef QT_NO_REGEXP - const bool hasNameFilters = !nameFilters.isEmpty() && !(nameFilters.contains(QLatin1String("*"))); +#ifndef QT_NO_REGEXP // Pass all entries through name filters, except dirs if the AllDirs - if (hasNameFilters && !((filters & QDir::AllDirs) && fi.isDir())) { + if (!nameFilters.isEmpty() && !((filters & QDir::AllDirs) && fi.isDir())) { bool matched = false; for (int i = 0; i < nameFilters.size(); ++i) { QRegExp regexp(nameFilters.at(i), @@ -377,7 +376,7 @@ QDirIterator::QDirIterator(const QDir &dir, IteratorFlags flags) \sa hasNext(), next(), IteratorFlags */ QDirIterator::QDirIterator(const QString &path, QDir::Filters filters, IteratorFlags flags) - : d(new QDirIteratorPrivate(path, QStringList(QLatin1String("*")), filters, flags)) + : d(new QDirIteratorPrivate(path, QStringList(), filters, flags)) { d->q = this; } @@ -395,7 +394,7 @@ QDirIterator::QDirIterator(const QString &path, QDir::Filters filters, IteratorF \sa hasNext(), next(), IteratorFlags */ QDirIterator::QDirIterator(const QString &path, IteratorFlags flags) - : d(new QDirIteratorPrivate(path, QStringList(QLatin1String("*")), QDir::NoFilter, flags)) + : d(new QDirIteratorPrivate(path, QStringList(), QDir::NoFilter, flags)) { d->q = this; } -- cgit v1.2.3 From 023f285c3ac8ea71aa8d4662242b41fb82fb7896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Wed, 22 Jul 2009 12:56:52 +0200 Subject: QDirIterator refactoring Name filters and resulting regular expressions are stable, no need to regenerate the latter on each iteration. Reviewed-by: Olivier Goffart --- src/corelib/io/qdiriterator.cpp | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index f7df8362f..9dda4f656 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -119,6 +119,10 @@ public: const QDir::Filters filters; const QDirIterator::IteratorFlags iteratorFlags; +#ifndef QT_NO_REGEXP + QVector nameRegExps; +#endif + QStack fileEngineIterators; QFileInfo currentFileInfo; QFileInfo nextFileInfo; @@ -140,6 +144,15 @@ QDirIteratorPrivate::QDirIteratorPrivate(const QString &path, const QStringList , filters(QDir::NoFilter == filters ? QDir::AllEntries : filters) , iteratorFlags(flags) { +#ifndef QT_NO_REGEXP + nameRegExps.reserve(nameFilters.size()); + for (int i = 0; i < nameFilters.size(); ++i) + nameRegExps.append( + QRegExp(nameFilters.at(i), + (filters & QDir::CaseSensitive) ? Qt::CaseSensitive : Qt::CaseInsensitive, + QRegExp::Wildcard)); +#endif + // Populate fields for hasNext() and next() pushDirectory(QFileInfo(path)); advance(); @@ -274,11 +287,11 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf // Pass all entries through name filters, except dirs if the AllDirs if (!nameFilters.isEmpty() && !((filters & QDir::AllDirs) && fi.isDir())) { bool matched = false; - for (int i = 0; i < nameFilters.size(); ++i) { - QRegExp regexp(nameFilters.at(i), - (filters & QDir::CaseSensitive) ? Qt::CaseSensitive : Qt::CaseInsensitive, - QRegExp::Wildcard); - if (regexp.exactMatch(fileName)) { + for (QVector::const_iterator iter = nameRegExps.constBegin(), + end = nameRegExps.constEnd(); + iter != end; ++iter) { + + if (iter->exactMatch(fileName)) { matched = true; break; } -- cgit v1.2.3 From 8e743bc5e4d697d3204a8d7d861afe81927af3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Wed, 22 Jul 2009 12:59:00 +0200 Subject: Don't hide errors in QDirIterator Empty filenames should only show up from bugs in file engine iterators's hasNext() function. We shouldn't try to hide those here. Reviewed-by: Olivier Goffart --- src/corelib/io/qdiriterator.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 9dda4f656..3bfea6544 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -269,10 +269,7 @@ void QDirIteratorPrivate::checkAndPushDirectory(const QFileInfo &fileInfo) */ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInfo &fi) const { - if (fileName.isEmpty()) { - // invalid entry - return false; - } + Q_ASSERT(!fileName.isEmpty()); // filter . and ..? const int fileNameSize = fileName.size(); -- cgit v1.2.3 From e3821cbae6f961a0e3a44f0863a3fd3424b540ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Wed, 22 Jul 2009 13:02:38 +0200 Subject: Off-by-one error in QResourceFileEngineIterator This was making the resource iterator return empty entries after listing resources. This showed up after QDirIterator stopped filtering empty entries. Reviewed-by: Olivier Goffart --- src/corelib/io/qresource_iterator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/io/qresource_iterator.cpp b/src/corelib/io/qresource_iterator.cpp index e97ac5940..025fccfa2 100644 --- a/src/corelib/io/qresource_iterator.cpp +++ b/src/corelib/io/qresource_iterator.cpp @@ -79,7 +79,7 @@ bool QResourceFileEngineIterator::hasNext() const that->index = 0; } - return index <= entries.size(); + return index < entries.size(); } QString QResourceFileEngineIterator::currentFileName() const -- cgit v1.2.3 From 90a3286841255132c96a2481a76c8b80c0728750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Wed, 22 Jul 2009 13:08:45 +0200 Subject: Bugfix/optimization in QResourceFileEngineIterator If the resource is valid, children should not be empty. If it happens to be, hasNext() should then return false. Setting the index to 0 ensures this and also that we don't keep trying the same thing over and over. Reviewed-by: Olivier Goffart --- src/corelib/io/qresource_iterator.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/corelib/io/qresource_iterator.cpp b/src/corelib/io/qresource_iterator.cpp index 025fccfa2..7e2260083 100644 --- a/src/corelib/io/qresource_iterator.cpp +++ b/src/corelib/io/qresource_iterator.cpp @@ -75,8 +75,7 @@ bool QResourceFileEngineIterator::hasNext() const // Initialize and move to the next entry. QResourceFileEngineIterator *that = const_cast(this); that->entries = resource.children(); - if (!that->entries.isEmpty()) - that->index = 0; + that->index = 0; } return index < entries.size(); -- cgit v1.2.3 From 51f4d0c1926335977c2aa814746a61b194d2f9d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Wed, 22 Jul 2009 13:39:12 +0200 Subject: Prefer mutable over const_cast. Reviewed-by: Simon Hausmann Reviewed-by: Frans Englich --- src/corelib/io/qresource_iterator.cpp | 5 ++--- src/corelib/io/qresource_iterator_p.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/corelib/io/qresource_iterator.cpp b/src/corelib/io/qresource_iterator.cpp index 7e2260083..11f4acf46 100644 --- a/src/corelib/io/qresource_iterator.cpp +++ b/src/corelib/io/qresource_iterator.cpp @@ -73,9 +73,8 @@ bool QResourceFileEngineIterator::hasNext() const return false; // Initialize and move to the next entry. - QResourceFileEngineIterator *that = const_cast(this); - that->entries = resource.children(); - that->index = 0; + entries = resource.children(); + index = 0; } return index < entries.size(); diff --git a/src/corelib/io/qresource_iterator_p.h b/src/corelib/io/qresource_iterator_p.h index b5e83825c..51651579f 100644 --- a/src/corelib/io/qresource_iterator_p.h +++ b/src/corelib/io/qresource_iterator_p.h @@ -71,8 +71,8 @@ public: QString currentFileName() const; private: - QStringList entries; - int index; + mutable QStringList entries; + mutable int index; }; QT_END_NAMESPACE -- cgit v1.2.3 From 1223a21a737e9fded46f2c761532bf535fb943b1 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 22 Jul 2009 14:33:19 +0200 Subject: Fix memory leak. The signal could be connected a huge number of times This is already fixed in master with Qt:UniqueConnection Task-number: 258381 --- src/gui/widgets/qtoolbarlayout.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/widgets/qtoolbarlayout.cpp b/src/gui/widgets/qtoolbarlayout.cpp index 0d1a4b3aa..e55b754e2 100644 --- a/src/gui/widgets/qtoolbarlayout.cpp +++ b/src/gui/widgets/qtoolbarlayout.cpp @@ -127,6 +127,8 @@ void QToolBarLayout::setUsePopupMenu(bool set) if (!dirty && ((popupMenu == 0) == set)) invalidate(); if (!set) { + QObject::disconnect(extension, SIGNAL(clicked(bool)), + this, SLOT(setExpanded(bool))); QObject::connect(extension, SIGNAL(clicked(bool)), this, SLOT(setExpanded(bool))); extension->setPopupMode(QToolButton::DelayedPopup); -- cgit v1.2.3 From 1a55f40b6223511d0eb388064597ab38a0d37627 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Wed, 22 Jul 2009 15:10:35 +0200 Subject: Make QStateMachine inherit QState This removes the need for a "root state" in the machine; or rather, the machine _is_ the root state. User code can now pass in a QStateMachine directly to the QState constructor, instead of machine->rootState(). This also means we could get rid of the "proxying" from the machine to the root state for things like properties (initialState et al), finished() signal and auto-reparenting of states (the ChildAdded event hack). A fun little side-effect of this change is that it's now possible to embed state machines within state machines. We can't think of a good use case yet where you would rather embed a stand-alone state machine (with its own event processing etc.) rather than having just a regular nested state, but it's neat and it works. Reviewed-by: Eskil Abrahamsen Blomfeldt --- examples/animation/appchooser/main.cpp | 2 +- examples/animation/moveblocks/main.cpp | 6 +- examples/animation/states/main.cpp | 7 +- examples/animation/stickman/lifecycle.cpp | 6 +- examples/animation/sub-attaq/boat.cpp | 10 +- examples/animation/sub-attaq/bomb.cpp | 4 +- examples/animation/sub-attaq/graphicsscene.cpp | 8 +- examples/animation/sub-attaq/states.cpp | 8 +- examples/animation/sub-attaq/submarine.cpp | 6 +- examples/animation/sub-attaq/torpedo.cpp | 4 +- examples/statemachine/factorial/main.cpp | 4 +- examples/statemachine/tankgame/mainwindow.cpp | 6 +- src/corelib/statemachine/qabstracttransition.cpp | 15 +- src/corelib/statemachine/qstate.cpp | 24 +- src/corelib/statemachine/qstatemachine.cpp | 255 ++++------- src/corelib/statemachine/qstatemachine.h | 22 +- src/corelib/statemachine/qstatemachine_p.h | 17 +- tests/auto/qstate/tst_qstate.cpp | 12 +- tests/auto/qstatemachine/tst_qstatemachine.cpp | 511 ++++++++++++----------- 19 files changed, 428 insertions(+), 499 deletions(-) diff --git a/examples/animation/appchooser/main.cpp b/examples/animation/appchooser/main.cpp index fe4be1fb8..97751b272 100644 --- a/examples/animation/appchooser/main.cpp +++ b/examples/animation/appchooser/main.cpp @@ -134,7 +134,7 @@ int main(int argc, char **argv) QStateMachine machine; machine.setGlobalRestorePolicy(QStateMachine::RestoreProperties); - QState *group = new QState(machine.rootState()); + QState *group = new QState(&machine); group->setObjectName("group"); QRect selectedRect(86, 86, 128, 128); diff --git a/examples/animation/moveblocks/main.cpp b/examples/animation/moveblocks/main.cpp index c43e84101..97d3f8130 100644 --- a/examples/animation/moveblocks/main.cpp +++ b/examples/animation/moveblocks/main.cpp @@ -108,8 +108,7 @@ class StateSwitcher : public QState Q_OBJECT public: StateSwitcher(QStateMachine *machine) - : QState(machine->rootState()), m_machine(machine), - m_stateCount(0), m_lastIndex(0) + : QState(machine), m_stateCount(0), m_lastIndex(0) { } //![10] @@ -120,7 +119,7 @@ public: while ((n = (qrand() % m_stateCount + 1)) == m_lastIndex) { } m_lastIndex = n; - m_machine->postEvent(new StateSwitchEvent(n)); + machine()->postEvent(new StateSwitchEvent(n)); } virtual void onExit(QEvent *) {} //![11] @@ -135,7 +134,6 @@ public: //![12] private: - QStateMachine *m_machine; int m_stateCount; int m_lastIndex; }; diff --git a/examples/animation/states/main.cpp b/examples/animation/states/main.cpp index b3c28f249..99e04c360 100644 --- a/examples/animation/states/main.cpp +++ b/examples/animation/states/main.cpp @@ -124,10 +124,9 @@ int main(int argc, char *argv[]) scene.addItem(p6); QStateMachine machine; - QState *root = machine.rootState(); - QState *state1 = new QState(root); - QState *state2 = new QState(root); - QState *state3 = new QState(root); + QState *state1 = new QState(&machine); + QState *state2 = new QState(&machine); + QState *state3 = new QState(&machine); machine.setInitialState(state1); // State 1 diff --git a/examples/animation/stickman/lifecycle.cpp b/examples/animation/stickman/lifecycle.cpp index 2a54c826d..c761d87a3 100644 --- a/examples/animation/stickman/lifecycle.cpp +++ b/examples/animation/stickman/lifecycle.cpp @@ -108,11 +108,11 @@ LifeCycle::LifeCycle(StickMan *stickMan, GraphicsView *keyReceiver) m_machine->addDefaultAnimation(m_animationGroup); //! [3] - m_alive = new QState(m_machine->rootState()); + m_alive = new QState(m_machine); m_alive->setObjectName("alive"); // Make it blink when lightning strikes before entering dead animation - QState *lightningBlink = new QState(m_machine->rootState()); + QState *lightningBlink = new QState(m_machine); lightningBlink->assignProperty(m_stickMan->scene(), "backgroundBrush", Qt::white); lightningBlink->assignProperty(m_stickMan, "penColor", Qt::black); lightningBlink->assignProperty(m_stickMan, "fillColor", Qt::white); @@ -126,7 +126,7 @@ LifeCycle::LifeCycle(StickMan *stickMan, GraphicsView *keyReceiver) QObject::connect(lightningBlink, SIGNAL(exited()), timer, SLOT(stop())); //! [5] - m_dead = new QState(m_machine->rootState()); + m_dead = new QState(m_machine); m_dead->assignProperty(m_stickMan->scene(), "backgroundBrush", Qt::black); m_dead->assignProperty(m_stickMan, "penColor", Qt::white); m_dead->assignProperty(m_stickMan, "fillColor", Qt::black); diff --git a/examples/animation/sub-attaq/boat.cpp b/examples/animation/sub-attaq/boat.cpp index d286be587..68e646e0b 100644 --- a/examples/animation/sub-attaq/boat.cpp +++ b/examples/animation/sub-attaq/boat.cpp @@ -142,14 +142,14 @@ Boat::Boat(QGraphicsItem * parent, Qt::WindowFlags wFlags) //We setup the state machien of the boat machine = new QStateMachine(this); - QState *moving = new QState(machine->rootState()); + QState *moving = new QState(machine); StopState *stopState = new StopState(this, moving); machine->setInitialState(moving); moving->setInitialState(stopState); MoveStateRight *moveStateRight = new MoveStateRight(this, moving); MoveStateLeft *moveStateLeft = new MoveStateLeft(this, moving); - LaunchStateRight *launchStateRight = new LaunchStateRight(this, machine->rootState()); - LaunchStateLeft *launchStateLeft = new LaunchStateLeft(this, machine->rootState()); + LaunchStateRight *launchStateRight = new LaunchStateRight(this, machine); + LaunchStateLeft *launchStateLeft = new LaunchStateLeft(this, machine); //then setup the transitions for the rightMove state KeyStopTransition *leftStopRight = new KeyStopTransition(this, QEvent::KeyPress, Qt::Key_Left); @@ -216,10 +216,10 @@ Boat::Boat(QGraphicsItem * parent, Qt::WindowFlags wFlags) launchStateLeft->addTransition(historyState); launchStateRight->addTransition(historyState); - QFinalState *final = new QFinalState(machine->rootState()); + QFinalState *final = new QFinalState(machine); //This state play the destroyed animation - QAnimationState *destroyedState = new QAnimationState(machine->rootState()); + QAnimationState *destroyedState = new QAnimationState(machine); destroyedState->setAnimation(destroyAnimation); //Play a nice animation when the boat is destroyed diff --git a/examples/animation/sub-attaq/bomb.cpp b/examples/animation/sub-attaq/bomb.cpp index 454970a90..e92a72330 100644 --- a/examples/animation/sub-attaq/bomb.cpp +++ b/examples/animation/sub-attaq/bomb.cpp @@ -85,11 +85,11 @@ void Bomb::launch(Bomb::Direction direction) QStateMachine *machine = new QStateMachine(this); //This state is when the launch animation is playing - QAnimationState *launched = new QAnimationState(machine->rootState()); + QAnimationState *launched = new QAnimationState(machine); launched->setAnimation(launchAnimation); //End - QFinalState *final = new QFinalState(machine->rootState()); + QFinalState *final = new QFinalState(machine); machine->setInitialState(launched); diff --git a/examples/animation/sub-attaq/graphicsscene.cpp b/examples/animation/sub-attaq/graphicsscene.cpp index bd37ce2f4..fcbc1b392 100644 --- a/examples/animation/sub-attaq/graphicsscene.cpp +++ b/examples/animation/sub-attaq/graphicsscene.cpp @@ -230,17 +230,17 @@ void GraphicsScene::setupScene(const QList &actions) QStateMachine *machine = new QStateMachine(this); //This state is when the player is playing - PlayState *gameState = new PlayState(this,machine->rootState()); + PlayState *gameState = new PlayState(this,machine); //Final state - QFinalState *final = new QFinalState(machine->rootState()); + QFinalState *final = new QFinalState(machine); //Animation when the player enter in the game - QAnimationState *lettersMovingState = new QAnimationState(machine->rootState()); + QAnimationState *lettersMovingState = new QAnimationState(machine); lettersMovingState->setAnimation(lettersGroupMoving); //Animation when the welcome screen disappear - QAnimationState *lettersFadingState = new QAnimationState(machine->rootState()); + QAnimationState *lettersFadingState = new QAnimationState(machine); lettersFadingState->setAnimation(lettersGroupFading); //if new game then we fade out the welcome screen and start playing diff --git a/examples/animation/sub-attaq/states.cpp b/examples/animation/sub-attaq/states.cpp index 81fd2ded1..d63737f52 100644 --- a/examples/animation/sub-attaq/states.cpp +++ b/examples/animation/sub-attaq/states.cpp @@ -83,7 +83,7 @@ void PlayState::onEntry(QEvent *) machine = new QStateMachine(this); //This state is when player is playing - LevelState *levelState = new LevelState(scene, this, machine->rootState()); + LevelState *levelState = new LevelState(scene, this, machine); //This state is when the player is actually playing but the game is not paused QState *playingState = new QState(levelState); @@ -105,10 +105,10 @@ void PlayState::onEntry(QEvent *) pauseState->addTransition(pressPpause); //This state is when player have lost - LostState *lostState = new LostState(scene, this, machine->rootState()); + LostState *lostState = new LostState(scene, this, machine); //This state is when player have won - WinState *winState = new WinState(scene, this, machine->rootState()); + WinState *winState = new WinState(scene, this, machine); //The boat has been destroyed then the game is finished levelState->addTransition(scene->boat, SIGNAL(boatExecutionFinished()),lostState); @@ -136,7 +136,7 @@ void PlayState::onEntry(QEvent *) machine->setInitialState(levelState); //Final state - QFinalState *final = new QFinalState(machine->rootState()); + QFinalState *final = new QFinalState(machine); //This transition is triggered when the player press space after completing a level CustomSpaceTransition *spaceTransition = new CustomSpaceTransition(scene->views().at(0), this, QEvent::KeyPress, Qt::Key_Space); diff --git a/examples/animation/sub-attaq/submarine.cpp b/examples/animation/sub-attaq/submarine.cpp index 04b79169c..78a953989 100644 --- a/examples/animation/sub-attaq/submarine.cpp +++ b/examples/animation/sub-attaq/submarine.cpp @@ -115,7 +115,7 @@ SubMarine::SubMarine(int type, const QString &name, int points, QGraphicsItem * QStateMachine *machine = new QStateMachine(this); //This state is when the boat is moving/rotating - QState *moving = new QState(machine->rootState()); + QState *moving = new QState(machine); //This state is when the boat is moving from left to right MovementState *movement = new MovementState(this, moving); @@ -132,7 +132,7 @@ SubMarine::SubMarine(int type, const QString &name, int points, QGraphicsItem * machine->setInitialState(moving); //End - QFinalState *final = new QFinalState(machine->rootState()); + QFinalState *final = new QFinalState(machine); //If the moving animation is finished we move to the return state movement->addTransition(movement, SIGNAL(animationFinished()), rotation); @@ -141,7 +141,7 @@ SubMarine::SubMarine(int type, const QString &name, int points, QGraphicsItem * rotation->addTransition(rotation, SIGNAL(animationFinished()), movement); //This state play the destroyed animation - QAnimationState *destroyedState = new QAnimationState(machine->rootState()); + QAnimationState *destroyedState = new QAnimationState(machine); destroyedState->setAnimation(setupDestroyAnimation(this)); //Play a nice animation when the submarine is destroyed diff --git a/examples/animation/sub-attaq/torpedo.cpp b/examples/animation/sub-attaq/torpedo.cpp index 5ef237a32..fe79488c5 100644 --- a/examples/animation/sub-attaq/torpedo.cpp +++ b/examples/animation/sub-attaq/torpedo.cpp @@ -74,11 +74,11 @@ void Torpedo::launch() QStateMachine *machine = new QStateMachine(this); //This state is when the launch animation is playing - QAnimationState *launched = new QAnimationState(machine->rootState()); + QAnimationState *launched = new QAnimationState(machine); launched->setAnimation(launchAnimation); //End - QFinalState *final = new QFinalState(machine->rootState()); + QFinalState *final = new QFinalState(machine); machine->setInitialState(launched); diff --git a/examples/statemachine/factorial/main.cpp b/examples/statemachine/factorial/main.cpp index 18a952199..505034770 100644 --- a/examples/statemachine/factorial/main.cpp +++ b/examples/statemachine/factorial/main.cpp @@ -151,14 +151,14 @@ int main(int argc, char **argv) //! [3] //! [4] - QState *compute = new QState(machine.rootState()); + QState *compute = new QState(&machine); compute->assignProperty(&factorial, "fac", 1); compute->assignProperty(&factorial, "x", 6); compute->addTransition(new FactorialLoopTransition(&factorial)); //! [4] //! [5] - QFinalState *done = new QFinalState(machine.rootState()); + QFinalState *done = new QFinalState(&machine); FactorialDoneTransition *doneTransition = new FactorialDoneTransition(&factorial); doneTransition->setTargetState(done); compute->addTransition(doneTransition); diff --git a/examples/statemachine/tankgame/mainwindow.cpp b/examples/statemachine/tankgame/mainwindow.cpp index 68a8d68a4..596cdfe70 100644 --- a/examples/statemachine/tankgame/mainwindow.cpp +++ b/examples/statemachine/tankgame/mainwindow.cpp @@ -160,7 +160,7 @@ void MainWindow::init() connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); m_machine = new QStateMachine(this); - QState *stoppedState = new QState(m_machine->rootState()); + QState *stoppedState = new QState(m_machine); stoppedState->setObjectName("stoppedState"); stoppedState->assignProperty(runGameAction, "enabled", true); stoppedState->assignProperty(stopGameAction, "enabled", false); @@ -188,14 +188,14 @@ void MainWindow::init() stoppedState->setInitialState(hs); //! [0] - m_runningState = new QState(QState::ParallelStates, m_machine->rootState()); + m_runningState = new QState(QState::ParallelStates, m_machine); //! [0] m_runningState->setObjectName("runningState"); m_runningState->assignProperty(addTankAction, "enabled", false); m_runningState->assignProperty(runGameAction, "enabled", false); m_runningState->assignProperty(stopGameAction, "enabled", true); - QState *gameOverState = new QState(m_machine->rootState()); + QState *gameOverState = new QState(m_machine); gameOverState->setObjectName("gameOverState"); gameOverState->assignProperty(stopGameAction, "enabled", false); connect(gameOverState, SIGNAL(entered()), this, SLOT(gameOver())); diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp index 670aa7d6e..0004d3e12 100644 --- a/src/corelib/statemachine/qabstracttransition.cpp +++ b/src/corelib/statemachine/qabstracttransition.cpp @@ -115,13 +115,10 @@ QAbstractTransitionPrivate *QAbstractTransitionPrivate::get(QAbstractTransition QStateMachine *QAbstractTransitionPrivate::machine() const { - QObject *par = parent; - while (par != 0) { - if (QStateMachine *mach = qobject_cast(par)) - return mach; - par = par->parent(); - } - return 0; + QState *source = sourceState(); + if (!source) + return 0; + return source->machine(); } bool QAbstractTransitionPrivate::callEventTest(QEvent *e) @@ -256,10 +253,6 @@ void QAbstractTransition::setTargetStates(const QList &targets) qWarning("QAbstractTransition::setTargetStates: target state(s) cannot be null"); return; } - if (target->machine() != 0 && target->machine()->rootState() == target) { - qWarning("QAbstractTransition::setTargetStates: root state cannot be target of transition"); - return; - } } d->targetStates.clear(); diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp index 83dd86957..f74edc3c5 100644 --- a/src/corelib/statemachine/qstate.cpp +++ b/src/corelib/statemachine/qstate.cpp @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE The assignProperty() function is used for defining property assignments that should be performed when a state is entered. - Top-level states must be passed QStateMachine::rootState() as their parent + Top-level states must be passed a QStateMachine object as their parent state, or added to a state machine using QStateMachine::addState(). \section1 States with Child States @@ -242,7 +242,7 @@ void QState::assignProperty(QObject *object, const char *name, /*! Returns this state's error state. - \sa QStateMachine::errorState(), QStateMachine::setErrorState() + \sa QStateMachine::error() */ QAbstractState *QState::errorState() const { @@ -256,19 +256,17 @@ QAbstractState *QState::errorState() const state recursively. If no error state is set for the state itself or any of its ancestors, an error will cause the machine to stop executing and an error will be printed to the console. - - \sa QStateMachine::setErrorState(), QStateMachine::errorState() */ void QState::setErrorState(QAbstractState *state) { Q_D(QState); - if (state != 0 && state->machine() != machine()) { - qWarning("QState::setErrorState: error state cannot belong " - "to a different state machine"); + if (state != 0 && qobject_cast(state)) { + qWarning("QStateMachine::setErrorState: root state cannot be error state"); return; } - if (state != 0 && state->machine() != 0 && state->machine()->rootState() == state) { - qWarning("QStateMachine::setErrorState: root state cannot be error state"); + if (state != 0 && (!state->machine() || ((state->machine() != machine()) && !qobject_cast(this)))) { + qWarning("QState::setErrorState: error state cannot belong " + "to a different state machine"); return; } @@ -288,12 +286,7 @@ QAbstractTransition *QState::addTransition(QAbstractTransition *transition) return 0; } - // machine() will always be non-null for root state - if (machine() != 0 && machine()->rootState() == this) { - qWarning("QState::addTransition: cannot add transition from root state"); - return 0; - } - + transition->setParent(this); const QList > &targets = QAbstractTransitionPrivate::get(transition)->targetStates; for (int i = 0; i < targets.size(); ++i) { QAbstractState *t = targets.at(i); @@ -308,7 +301,6 @@ QAbstractTransition *QState::addTransition(QAbstractTransition *transition) return 0; } } - transition->setParent(this); if (machine() != 0 && machine()->configuration().contains(this)) QStateMachinePrivate::get(machine())->registerTransitions(this); return transition; diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index a00e7e173..5402b0497 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -102,14 +102,9 @@ QT_BEGIN_NAMESPACE Framework}{overview} gives several state graphs and the code to build them. - The rootState() is the parent of all top-level states in the - machine; it is used, for instance, when the state graph is - deleted. It is created by the machine. - - Use the addState() function to add a state to the state machine. - All top-level states are added to the root state. States are - removed with the removeState() function. Removing states while the - machine is running is discouraged. + Use the addState() function to add a top-level state to the state machine. + States are removed with the removeState() function. Removing states while + the machine is running is discouraged. Before the machine can be started, the \l{initialState}{initial state} must be set. The initial state is the state that the @@ -178,26 +173,6 @@ This is \sa QAbstractState, QAbstractTransition, QState, {The State Machine Framework} */ -/*! - \property QStateMachine::rootState - - \brief the root state of this state machine -*/ - -/*! - \property QStateMachine::initialState - - \brief the initial state of this state machine - - The initial state must be one of the rootState()'s child states. -*/ - -/*! - \property QStateMachine::errorState - - \brief the error state of this state machine -*/ - /*! \property QStateMachine::errorString @@ -235,7 +210,6 @@ QStateMachinePrivate::QStateMachinePrivate() stop = false; error = QStateMachine::NoError; globalRestorePolicy = QStateMachine::DoNotRestoreProperties; - rootState = 0; signalEventGenerator = 0; #ifndef QT_NO_ANIMATION animationsEnabled = true; @@ -255,6 +229,11 @@ QStateMachinePrivate *QStateMachinePrivate::get(QStateMachine *q) return 0; } +QState *QStateMachinePrivate::rootState() const +{ + return const_cast(q_func()); +} + static QEvent *cloneEvent(QEvent *e) { switch (e->type()) { @@ -302,7 +281,9 @@ bool QStateMachinePrivate::stateEntryLessThan(QAbstractState *s1, QAbstractState } else if (isDescendantOf(s2, s1)) { return true; } else { - QState *lca = findLCA(QList() << s1 << s2); + Q_ASSERT(s1->machine() != 0); + QStateMachinePrivate *mach = QStateMachinePrivate::get(s1->machine()); + QState *lca = mach->findLCA(QList() << s1 << s2); Q_ASSERT(lca != 0); return (indexOfDescendant(lca, s1) < indexOfDescendant(lca, s2)); } @@ -318,17 +299,19 @@ bool QStateMachinePrivate::stateExitLessThan(QAbstractState *s1, QAbstractState } else if (isDescendantOf(s2, s1)) { return false; } else { - QState *lca = findLCA(QList() << s1 << s2); + Q_ASSERT(s1->machine() != 0); + QStateMachinePrivate *mach = QStateMachinePrivate::get(s1->machine()); + QState *lca = mach->findLCA(QList() << s1 << s2); Q_ASSERT(lca != 0); return (indexOfDescendant(lca, s1) < indexOfDescendant(lca, s2)); } } -QState *QStateMachinePrivate::findLCA(const QList &states) +QState *QStateMachinePrivate::findLCA(const QList &states) const { if (states.isEmpty()) return 0; - QList ancestors = properAncestors(states.at(0), 0); + QList ancestors = properAncestors(states.at(0), rootState()->parentState()); for (int i = 0; i < ancestors.size(); ++i) { QState *anc = ancestors.at(i); bool ok = true; @@ -376,7 +359,7 @@ QSet QStateMachinePrivate::selectTransitions(QEvent *event continue; if (isPreempted(state, enabledTransitions)) continue; - QList lst = properAncestors(state, 0); + QList lst = properAncestors(state, rootState()->parentState()); if (QState *grp = qobject_cast(state)) lst.prepend(grp); bool found = false; @@ -557,11 +540,13 @@ QList QStateMachinePrivate::enterStates(QEvent *event, const QL if (isFinal(s)) { QState *parent = s->parentState(); if (parent) { - QState *grandparent = parent->parentState(); + if (parent != rootState()) { #ifdef QSTATEMACHINE_DEBUG - qDebug() << q << ": emitting finished signal for" << parent; + qDebug() << q << ": emitting finished signal for" << parent; #endif - QStatePrivate::get(parent)->emitFinished(); + QStatePrivate::get(parent)->emitFinished(); + } + QState *grandparent = parent->parentState(); if (grandparent && isParallel(grandparent)) { bool allChildStatesFinal = true; QList childStates = QStatePrivate::get(grandparent)->childStates(); @@ -572,7 +557,7 @@ QList QStateMachinePrivate::enterStates(QEvent *event, const QL break; } } - if (allChildStatesFinal) { + if (allChildStatesFinal && (grandparent != rootState())) { #ifdef QSTATEMACHINE_DEBUG qDebug() << q << ": emitting finished signal for" << grandparent; #endif @@ -585,7 +570,7 @@ QList QStateMachinePrivate::enterStates(QEvent *event, const QL { QSet::const_iterator it; for (it = configuration.constBegin(); it != configuration.constEnd(); ++it) { - if (isFinal(*it) && (*it)->parentState() == rootState) { + if (isFinal(*it) && (*it)->parentState() == rootState()) { processing = false; stopProcessingReason = Finished; break; @@ -630,6 +615,11 @@ void QStateMachinePrivate::addStatesToEnter(QAbstractState *s, QState *root, } } } else { + if (s == rootState()) { + // Error has already been set by exitStates(). + Q_ASSERT(error != QStateMachine::NoError); + return; + } statesToEnter.insert(s); if (isParallel(s)) { QState *grp = qobject_cast(s); @@ -643,6 +633,7 @@ void QStateMachinePrivate::addStatesToEnter(QAbstractState *s, QState *root, QState *grp = qobject_cast(s); QAbstractState *initial = grp->initialState(); if (initial != 0) { + Q_ASSERT(initial->machine() == q_func()); addStatesToEnter(initial, grp, statesToEnter, statesForDefaultEntry); } else { setError(QStateMachine::NoInitialStateError, grp); @@ -873,20 +864,26 @@ bool QStateMachinePrivate::isParallel(const QAbstractState *s) return ss && (QStatePrivate::get(ss)->childMode == QState::ParallelStates); } -bool QStateMachinePrivate::isCompound(const QAbstractState *s) +bool QStateMachinePrivate::isCompound(const QAbstractState *s) const { const QState *group = qobject_cast(s); if (!group) return false; + bool isMachine = (qobject_cast(group) != 0); + // Don't treat the machine as compound if it's a sub-state of this machine + if (isMachine && (group != rootState())) + return false; return (!isParallel(group) && !QStatePrivate::get(group)->childStates().isEmpty()) - || (qobject_cast(group->parent()) != 0); + || isMachine; } -bool QStateMachinePrivate::isAtomic(const QAbstractState *s) +bool QStateMachinePrivate::isAtomic(const QAbstractState *s) const { const QState *ss = qobject_cast(s); return (ss && QStatePrivate::get(ss)->childStates().isEmpty()) - || isFinal(s); + || isFinal(s) + // Treat the machine as atomic if it's a sub-state of this machine + || (ss && (qobject_cast(ss) != 0) && (ss != rootState())); } @@ -1034,7 +1031,7 @@ void QStateMachinePrivate::setError(QStateMachine::Error errorCode, QAbstractSta if (currentContext == currentErrorState) currentErrorState = 0; - Q_ASSERT(currentErrorState != rootState); + Q_ASSERT(currentErrorState != rootState()); if (currentErrorState != 0) { QState *lca = findLCA(QList() << currentErrorState << currentContext); @@ -1141,11 +1138,8 @@ void QStateMachinePrivate::_q_start() { Q_Q(QStateMachine); Q_ASSERT(state == Starting); - if (!rootState) { - state = NotRunning; - return; - } - QAbstractState *initial = rootState->initialState(); + Q_ASSERT(rootState() != 0); + QAbstractState *initial = rootState()->initialState(); configuration.clear(); qDeleteAll(internalEventQueue); internalEventQueue.clear(); @@ -1159,7 +1153,7 @@ void QStateMachinePrivate::_q_start() processingScheduled = true; // we call _q_process() below emit q->started(); - StartState *start = new StartState(rootState); + StartState *start = new StartState(rootState()); QAbstractTransition *initialTransition = new InitialTransition(initial); start->addTransition(initialTransition); QList transitions; @@ -1371,15 +1365,22 @@ void QStateMachinePrivate::unregisterSignalTransition(QSignalTransition *transit void QStateMachinePrivate::unregisterAllTransitions() { + Q_Q(QStateMachine); { - QList transitions = qFindChildren(rootState); - for (int i = 0; i < transitions.size(); ++i) - unregisterSignalTransition(transitions.at(i)); + QList transitions = qFindChildren(rootState()); + for (int i = 0; i < transitions.size(); ++i) { + QSignalTransition *t = transitions.at(i); + if (t->machine() == q) + unregisterSignalTransition(t); + } } { - QList transitions = qFindChildren(rootState); - for (int i = 0; i < transitions.size(); ++i) - unregisterEventTransition(transitions.at(i)); + QList transitions = qFindChildren(rootState()); + for (int i = 0; i < transitions.size(); ++i) { + QEventTransition *t = transitions.at(i); + if (t->machine() == q) + unregisterEventTransition(t); + } } } @@ -1457,16 +1458,20 @@ void QStateMachinePrivate::handleTransitionSignal(const QObject *sender, int sig Constructs a new state machine with the given \a parent. */ QStateMachine::QStateMachine(QObject *parent) - : QObject(*new QStateMachinePrivate, parent) + : QState(*new QStateMachinePrivate, /*parentState=*/0) { + // Can't pass the parent to the QState constructor, as it expects a QState + // But this works as expected regardless of whether parent is a QState or not + setParent(parent); } /*! \internal */ QStateMachine::QStateMachine(QStateMachinePrivate &dd, QObject *parent) - : QObject(dd, parent) + : QState(dd, /*parentState=*/0) { + setParent(parent); } /*! @@ -1476,69 +1481,6 @@ QStateMachine::~QStateMachine() { } -namespace { - -class RootState : public QState -{ -public: - RootState(QState *parent) - : QState(parent) - { - } - - void onEntry(QEvent *) {} - void onExit(QEvent *) {} -}; - -} // namespace - -/*! - Returns this state machine's root state. -*/ -QState *QStateMachine::rootState() const -{ - Q_D(const QStateMachine); - if (!d->rootState) { - const_cast(d)->rootState = new RootState(0); - d->rootState->setParent(const_cast(this)); - } - return d->rootState; -} - -/*! - Returns the error state of the state machine's root state. - - \sa QState::errorState() -*/ -QAbstractState *QStateMachine::errorState() const -{ - return rootState()->errorState(); -} - -/*! - Sets the error state of this state machine's root state to be \a state. When a running state - machine encounters an error which puts it in an undefined state, it will enter an error state - based on the context of the error that occurred. It will enter this state regardless of what - is currently in the event queue. - - If the erroneous state has an error state set, this will be entered by the machine. If no error - state has been set, the state machine will search the parent hierarchy recursively for an - error state. The error state of the root state can thus be seen as a global error state that - applies for all states for which a more specific error state has not been set. - - Before entering the error state, the state machine will set the error code returned by error() and - error message returned by errorString(). - - If there is no error state available for the erroneous state, the state machine will print a - warning message on the console and stop executing. - - \sa QState::setErrorState(), rootState() -*/ -void QStateMachine::setErrorState(QAbstractState *state) -{ - rootState()->setErrorState(state); -} - /*! \enum QStateMachine::Error This enum type defines errors that can occur in the state machine at run time. When the state @@ -1639,40 +1581,14 @@ void QStateMachine::setGlobalRestorePolicy(QStateMachine::RestorePolicy restoreP d->globalRestorePolicy = restorePolicy; } -/*! - Returns this state machine's initial state, or 0 if no initial state has - been set. -*/ -QAbstractState *QStateMachine::initialState() const -{ - Q_D(const QStateMachine); - if (!d->rootState) - return 0; - return d->rootState->initialState(); -} - -/*! - Sets this state machine's initial \a state. -*/ -void QStateMachine::setInitialState(QAbstractState *state) -{ - Q_D(QStateMachine); - if (!d->rootState) { - if (!state) - return; - rootState()->setInitialState(state); - } - d->rootState->setInitialState(state); -} - /*! Adds the given \a state to this state machine. The state becomes a top-level - state (i.e. a child of the rootState()). + state. If the state is already in a different machine, it will first be removed from its old machine, and then added to this machine. - \sa removeState(), rootState(), setInitialState() + \sa removeState(), setInitialState() */ void QStateMachine::addState(QAbstractState *state) { @@ -1684,7 +1600,7 @@ void QStateMachine::addState(QAbstractState *state) qWarning("QStateMachine::addState: state has already been added to this machine"); return; } - state->setParent(rootState()); + state->setParent(this); } /*! @@ -1730,7 +1646,7 @@ void QStateMachine::start() { Q_D(QStateMachine); - if (rootState()->initialState() == 0) { + if (initialState() == 0) { qWarning("QStateMachine::start: No initial state set for machine. Refusing to start."); return; } @@ -1821,7 +1737,7 @@ void QStateMachine::postInternalEvent(QEvent *event) Returns the maximal consistent set of states (including parallel and final states) that this state machine is currently in. If a state \c s is in the configuration, it is always the case that the parent of \c s is also in - c. Note, however, that the rootState() is not an explicit member of the + c. Note, however, that the machine itself is not an explicit member of the configuration. */ QSet QStateMachine::configuration() const @@ -1839,15 +1755,6 @@ QSet QStateMachine::configuration() const \sa QStateMachine::finished(), QStateMachine::start() */ -/*! - \fn QStateMachine::finished() - - This signal is emitted when the state machine has reached a top-level final - state (QFinalState). - - \sa QStateMachine::started() -*/ - /*! \fn QStateMachine::stopped() @@ -1872,14 +1779,6 @@ bool QStateMachine::event(QEvent *e) d->scheduleProcess(); return true; } - } else if (e->type() == QEvent::ChildAdded) { - QChildEvent *ce = static_cast(e); - if (QAbstractState *state = qobject_cast(ce->child())) { - if (state != rootState()) { - state->setParent(rootState()); - return true; - } - } } return QObject::event(e); } @@ -1949,6 +1848,24 @@ void QStateMachine::endMicrostep(QEvent *event) Q_UNUSED(event); } +/*! + \reimp +*/ +void QStateMachine::onEntry(QEvent *event) +{ + start(); + QState::onEntry(event); +} + +/*! + \reimp +*/ +void QStateMachine::onExit(QEvent *event) +{ + stop(); + QState::onExit(event); +} + #ifndef QT_NO_ANIMATION /*! diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index 30d0e3a59..230d8525b 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -42,7 +42,7 @@ #ifndef QSTATEMACHINE_H #define QSTATEMACHINE_H -#include +#include #include #include @@ -57,18 +57,12 @@ QT_MODULE(Core) #ifndef QT_NO_STATEMACHINE class QEvent; -class QAbstractState; -class QState; class QStateMachinePrivate; class QAbstractAnimation; -class QAbstractState; -class Q_CORE_EXPORT QStateMachine : public QObject +class Q_CORE_EXPORT QStateMachine : public QState { Q_OBJECT - Q_PROPERTY(QState* rootState READ rootState) - Q_PROPERTY(QAbstractState* initialState READ initialState WRITE setInitialState) - Q_PROPERTY(QAbstractState* errorState READ errorState WRITE setErrorState) Q_PROPERTY(QString errorString READ errorString) Q_PROPERTY(RestorePolicy globalRestorePolicy READ globalRestorePolicy WRITE setGlobalRestorePolicy) Q_ENUMS(RestorePolicy) @@ -94,14 +88,6 @@ public: void addState(QAbstractState *state); void removeState(QAbstractState *state); - QState *rootState() const; - - QAbstractState *initialState() const; - void setInitialState(QAbstractState *state); - - QAbstractState *errorState() const; - void setErrorState(QAbstractState *state); - Error error() const; QString errorString() const; void clearError(); @@ -135,9 +121,11 @@ public Q_SLOTS: Q_SIGNALS: void started(); void stopped(); - void finished(); protected: + void onEntry(QEvent *event); + void onExit(QEvent *event); + void postInternalEvent(QEvent *event); virtual void beginSelectTransitions(QEvent *event); diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index 1335b9375..21e405d2a 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -53,7 +53,8 @@ // We mean it. // -#include +#include "private/qstate_p.h" + #include #include #include @@ -61,9 +62,6 @@ #include #include -#include "qstate.h" -#include "private/qstate_p.h" - QT_BEGIN_NAMESPACE class QEvent; @@ -81,7 +79,7 @@ class QAbstractAnimation; #endif class QStateMachine; -class QStateMachinePrivate : public QObjectPrivate +class QStateMachinePrivate : public QStatePrivate { Q_DECLARE_PUBLIC(QStateMachine) public: @@ -101,7 +99,7 @@ public: static QStateMachinePrivate *get(QStateMachine *q); - static QState *findLCA(const QList &states); + QState *findLCA(const QList &states) const; static bool stateEntryLessThan(QAbstractState *s1, QAbstractState *s2); static bool stateExitLessThan(QAbstractState *s1, QAbstractState *s2); @@ -116,6 +114,8 @@ public: void _q_animationFinished(); #endif + QState *rootState() const; + void microstep(QEvent *event, const QList &transitionList); bool isPreempted(const QAbstractState *s, const QSet &transitions) const; QSet selectTransitions(QEvent *event) const; @@ -133,8 +133,8 @@ public: bool isInFinalState(QAbstractState *s) const; static bool isFinal(const QAbstractState *s); static bool isParallel(const QAbstractState *s); - static bool isCompound(const QAbstractState *s); - static bool isAtomic(const QAbstractState *s); + bool isCompound(const QAbstractState *s) const; + bool isAtomic(const QAbstractState *s) const; static bool isDescendantOf(const QAbstractState *s, const QAbstractState *other); static QList properAncestors(const QAbstractState *s, const QState *upperBound); @@ -164,7 +164,6 @@ public: bool processingScheduled; bool stop; StopProcessingReason stopProcessingReason; - QState *rootState; QSet configuration; QList internalEventQueue; QList externalEventQueue; diff --git a/tests/auto/qstate/tst_qstate.cpp b/tests/auto/qstate/tst_qstate.cpp index ab8776759..78b98530d 100644 --- a/tests/auto/qstate/tst_qstate.cpp +++ b/tests/auto/qstate/tst_qstate.cpp @@ -60,10 +60,10 @@ tst_QState::~tst_QState() void tst_QState::test() { QStateMachine machine; - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); QCOMPARE(s1->machine(), &machine); - QCOMPARE(s1->parentState(), machine.rootState()); + QCOMPARE(s1->parentState(), &machine); QCOMPARE(s1->initialState(), (QState*)0); QVERIFY(s1->childStates().isEmpty()); QVERIFY(s1->transitions().isEmpty()); @@ -218,7 +218,7 @@ void tst_QState::assignProperty() QObject *object = new QObject(); object->setProperty("fooBar", 10); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); s1->assignProperty(object, "fooBar", 20); machine.setInitialState(s1); @@ -235,7 +235,7 @@ void tst_QState::assignPropertyTwice() QObject *object = new QObject(); object->setProperty("fooBar", 10); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); s1->assignProperty(object, "fooBar", 20); s1->assignProperty(object, "fooBar", 30); @@ -271,9 +271,9 @@ void tst_QState::historyInitialState() { QStateMachine machine; - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); QHistoryState *h1 = new QHistoryState(s2); s2->setInitialState(h1); diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp index 44fc9986a..7f4d9f55c 100644 --- a/tests/auto/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp @@ -190,6 +190,8 @@ private slots: // void overrideDefaultSourceAnimationWithSpecific(); // void overrideDefaultTargetAnimationWithSpecific(); // void overrideDefaultTargetAnimationWithSource(); + + void nestedStateMachines(); }; tst_QStateMachine::tst_QStateMachine() @@ -259,13 +261,17 @@ private: void tst_QStateMachine::transitionToRootState() { QStateMachine machine; + machine.setObjectName("machine"); QState *initialState = new QState(); + initialState->setObjectName("initial"); machine.addState(initialState); machine.setInitialState(initialState); - QTest::ignoreMessage(QtWarningMsg, "QAbstractTransition::setTargetStates: root state cannot be target of transition"); - initialState->addTransition(new EventTransition(QEvent::User, machine.rootState())); + QAbstractTransition *trans = initialState->addTransition(new EventTransition(QEvent::User, &machine)); + QVERIFY(trans != 0); + QCOMPARE(trans->sourceState(), initialState); + QCOMPARE(trans->targetState(), &machine); machine.start(); QCoreApplication::processEvents(); @@ -274,22 +280,21 @@ void tst_QStateMachine::transitionToRootState() QVERIFY(machine.configuration().contains(initialState)); machine.postEvent(new QEvent(QEvent::User)); + QTest::ignoreMessage(QtWarningMsg, "Unrecoverable error detected in running state machine: No common ancestor for targets and source of transition from state 'initial'"); QCoreApplication::processEvents(); - - QCOMPARE(machine.configuration().count(), 1); - QVERIFY(machine.configuration().contains(initialState)); + QVERIFY(machine.configuration().isEmpty()); + QVERIFY(!machine.isRunning()); } void tst_QStateMachine::transitionFromRootState() { QStateMachine machine; - QState *root = machine.rootState(); + QState *root = &machine; QState *s1 = new QState(root); EventTransition *trans = new EventTransition(QEvent::User, s1); - QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: cannot add transition from root state"); - root->addTransition(trans); - QCOMPARE(trans->sourceState(), (QState*)0); - delete trans; + QCOMPARE(root->addTransition(trans), trans); + QCOMPARE(trans->sourceState(), root); + QCOMPARE(trans->targetState(), s1); } void tst_QStateMachine::transitionEntersParent() @@ -671,7 +676,7 @@ void tst_QStateMachine::errorStateIsRootState() { QStateMachine machine; QTest::ignoreMessage(QtWarningMsg, "QStateMachine::setErrorState: root state cannot be error state"); - machine.setErrorState(machine.rootState()); + machine.setErrorState(&machine); QState *initialState = new QState(); initialState->setObjectName("initialState"); @@ -772,7 +777,7 @@ void tst_QStateMachine::errorStateEntersParentFirst() void tst_QStateMachine::customErrorStateIsNull() { QStateMachine machine; - machine.rootState()->setErrorState(0); + machine.setErrorState(0); QState *initialState = new QState(); machine.addState(initialState); @@ -798,9 +803,9 @@ void tst_QStateMachine::customErrorStateIsNull() void tst_QStateMachine::clearError() { QStateMachine machine; - machine.setErrorState(new QState(machine.rootState())); // avoid warnings + machine.setErrorState(new QState(&machine)); // avoid warnings - QState *brokenState = new QState(machine.rootState()); + QState *brokenState = new QState(&machine); brokenState->setObjectName("brokenState"); machine.setInitialState(brokenState); new QState(brokenState); @@ -822,13 +827,13 @@ void tst_QStateMachine::historyStateAsInitialState() { QStateMachine machine; - QHistoryState *hs = new QHistoryState(machine.rootState()); + QHistoryState *hs = new QHistoryState(&machine); machine.setInitialState(hs); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); hs->setDefaultState(s1); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); QHistoryState *s2h = new QHistoryState(s2); s2->setInitialState(s2h); @@ -856,11 +861,11 @@ void tst_QStateMachine::historyStateHasNowhereToGo() { QStateMachine machine; - QState *initialState = new QState(machine.rootState()); + QState *initialState = new QState(&machine); machine.setInitialState(initialState); - machine.setErrorState(new QState(machine.rootState())); // avoid warnings + machine.setErrorState(new QState(&machine)); // avoid warnings - QState *brokenState = new QState(machine.rootState()); + QState *brokenState = new QState(&machine); brokenState->setObjectName("brokenState"); brokenState->setInitialState(new QState(brokenState)); @@ -890,14 +895,14 @@ void tst_QStateMachine::brokenStateIsNeverEntered() entryController->setProperty("childStateEntered", false); entryController->setProperty("errorStateEntered", false); - QState *initialState = new QState(machine.rootState()); + QState *initialState = new QState(&machine); machine.setInitialState(initialState); - QState *errorState = new QState(machine.rootState()); + QState *errorState = new QState(&machine); errorState->assignProperty(entryController, "errorStateEntered", true); machine.setErrorState(errorState); - QState *brokenState = new QState(machine.rootState()); + QState *brokenState = new QState(&machine); brokenState->assignProperty(entryController, "brokenStateEntered", true); brokenState->setObjectName("brokenState"); @@ -921,7 +926,7 @@ void tst_QStateMachine::transitionToStateNotInGraph() { QStateMachine machine; - QState *initialState = new QState(machine.rootState()); + QState *initialState = new QState(&machine); initialState->setObjectName("initialState"); machine.setInitialState(initialState); @@ -946,7 +951,7 @@ void tst_QStateMachine::customErrorStateNotInGraph() machine.setErrorState(&errorState); QCOMPARE(machine.errorState(), reinterpret_cast(0)); - QState *initialBrokenState = new QState(machine.rootState()); + QState *initialBrokenState = new QState(&machine); initialBrokenState->setObjectName("initialBrokenState"); machine.setInitialState(initialBrokenState); new QState(initialBrokenState); @@ -1012,25 +1017,22 @@ void tst_QStateMachine::restoreProperties() void tst_QStateMachine::rootState() { QStateMachine machine; - QVERIFY(machine.rootState() != 0); - QVERIFY(qobject_cast(machine.rootState()) != 0); - QCOMPARE(qobject_cast(machine.rootState())->parentState(), (QState*)0); - QCOMPARE(machine.rootState()->parent(), (QObject*)&machine); - QCOMPARE(machine.rootState()->machine(), &machine); + QCOMPARE(qobject_cast(machine.parentState()), (QState*)0); + QCOMPARE(machine.machine(), (QStateMachine*)0); - QState *s1 = new QState(machine.rootState()); - QCOMPARE(s1->parentState(), machine.rootState()); + QState *s1 = new QState(&machine); + QCOMPARE(s1->parentState(), &machine); QState *s2 = new QState(); s2->setParent(&machine); - QCOMPARE(s2->parentState(), machine.rootState()); + QCOMPARE(s2->parentState(), &machine); } void tst_QStateMachine::addAndRemoveState() { #ifdef QT_BUILD_INTERNAL QStateMachine machine; - QStatePrivate *root_d = QStatePrivate::get(machine.rootState()); + QStatePrivate *root_d = QStatePrivate::get(&machine); QCOMPARE(root_d->childStates().size(), 0); QTest::ignoreMessage(QtWarningMsg, "QStateMachine::addState: cannot add null state"); @@ -1041,7 +1043,7 @@ void tst_QStateMachine::addAndRemoveState() QCOMPARE(s1->machine(), (QStateMachine*)0); machine.addState(s1); QCOMPARE(s1->machine(), &machine); - QCOMPARE(s1->parentState(), machine.rootState()); + QCOMPARE(s1->parentState(), &machine); QCOMPARE(root_d->childStates().size(), 1); QCOMPARE(root_d->childStates().at(0), (QAbstractState*)s1); @@ -1051,7 +1053,7 @@ void tst_QStateMachine::addAndRemoveState() QState *s2 = new QState(); QCOMPARE(s2->parentState(), (QState*)0); machine.addState(s2); - QCOMPARE(s2->parentState(), machine.rootState()); + QCOMPARE(s2->parentState(), &machine); QCOMPARE(root_d->childStates().size(), 2); QCOMPARE(root_d->childStates().at(0), (QAbstractState*)s1); QCOMPARE(root_d->childStates().at(1), (QAbstractState*)s2); @@ -1076,13 +1078,13 @@ void tst_QStateMachine::addAndRemoveState() { QString warning; warning.sprintf("QStateMachine::removeState: state %p's machine (%p) is different from this machine (%p)", - machine2.rootState(), &machine2, &machine); + &machine2, (void*)0, &machine); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); - machine.removeState(machine2.rootState()); + machine.removeState(&machine2); } // ### check this behavior - machine.addState(machine2.rootState()); - QCOMPARE(machine2.rootState()->parent(), (QObject*)machine.rootState()); + machine.addState(&machine2); + QCOMPARE(machine2.parent(), (QObject*)&machine); } delete s1; @@ -1098,7 +1100,7 @@ void tst_QStateMachine::stateEntryAndExit() { QStateMachine machine; - TestState *s1 = new TestState(machine.rootState()); + TestState *s1 = new TestState(&machine); QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: cannot add transition to null state"); s1->addTransition((QAbstractState*)0); QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: cannot add null transition"); @@ -1106,8 +1108,8 @@ void tst_QStateMachine::stateEntryAndExit() QTest::ignoreMessage(QtWarningMsg, "QState::removeTransition: cannot remove null transition"); s1->removeTransition((QAbstractTransition*)0); - TestState *s2 = new TestState(machine.rootState()); - QFinalState *s3 = new QFinalState(machine.rootState()); + TestState *s2 = new TestState(&machine); + QFinalState *s3 = new QFinalState(&machine); TestTransition *t = new TestTransition(s2); QCOMPARE(t->machine(), (QStateMachine*)0); @@ -1156,9 +1158,9 @@ void tst_QStateMachine::stateEntryAndExit() QCOMPARE(machine.initialState(), (QAbstractState*)s1); { QString warning; - warning.sprintf("QState::setInitialState: state %p is not a child of this state (%p)", machine.rootState(), machine.rootState()); + warning.sprintf("QState::setInitialState: state %p is not a child of this state (%p)", &machine, &machine); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); - machine.setInitialState(machine.rootState()); + machine.setInitialState(&machine); QCOMPARE(machine.initialState(), (QAbstractState*)s1); } QVERIFY(machine.configuration().isEmpty()); @@ -1205,11 +1207,11 @@ void tst_QStateMachine::stateEntryAndExit() { QStateMachine machine; - TestState *s1 = new TestState(machine.rootState()); + TestState *s1 = new TestState(&machine); TestState *s11 = new TestState(s1); TestState *s12 = new TestState(s1); - TestState *s2 = new TestState(machine.rootState()); - QFinalState *s3 = new QFinalState(machine.rootState()); + TestState *s2 = new TestState(&machine); + QFinalState *s3 = new QFinalState(&machine); s1->setInitialState(s11); TestTransition *t1 = new TestTransition(s12); s11->addTransition(t1); @@ -1268,13 +1270,13 @@ void tst_QStateMachine::stateEntryAndExit() void tst_QStateMachine::assignProperty() { QStateMachine machine; - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); QTest::ignoreMessage(QtWarningMsg, "QState::assignProperty: cannot assign property 'foo' of null object"); s1->assignProperty(0, "foo", QVariant()); s1->assignProperty(s1, "objectName", "s1"); - QFinalState *s2 = new QFinalState(machine.rootState()); + QFinalState *s2 = new QFinalState(&machine); s1->addTransition(s2); machine.setInitialState(s1); machine.start(); @@ -1320,9 +1322,9 @@ void tst_QStateMachine::assignPropertyWithAnimation() QObject obj; obj.setProperty("foo", 321); obj.setProperty("bar", 654); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); s1->assignProperty(&obj, "foo", 123); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(&obj, "foo", 456); s2->assignProperty(&obj, "bar", 789); QAbstractTransition *trans = s1->addTransition(s2); @@ -1342,7 +1344,7 @@ void tst_QStateMachine::assignPropertyWithAnimation() trans->addAnimation(&anim); QCOMPARE(trans->animations().size(), 1); QCOMPARE(trans->animations().at(0), (QAbstractAnimation*)&anim); - QFinalState *s3 = new QFinalState(machine.rootState()); + QFinalState *s3 = new QFinalState(&machine); s2->addTransition(s2, SIGNAL(polished()), s3); machine.setInitialState(s1); @@ -1358,9 +1360,9 @@ void tst_QStateMachine::assignPropertyWithAnimation() QObject obj; obj.setProperty("foo", 321); obj.setProperty("bar", 654); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); s1->assignProperty(&obj, "foo", 123); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(&obj, "foo", 456); s2->assignProperty(&obj, "bar", 789); QAbstractTransition *trans = s1->addTransition(s2); @@ -1370,7 +1372,7 @@ void tst_QStateMachine::assignPropertyWithAnimation() QPropertyAnimation anim2(&obj, "bar"); anim2.setDuration(150); trans->addAnimation(&anim2); - QFinalState *s3 = new QFinalState(machine.rootState()); + QFinalState *s3 = new QFinalState(&machine); s2->addTransition(s2, SIGNAL(polished()), s3); machine.setInitialState(s1); @@ -1386,10 +1388,10 @@ void tst_QStateMachine::assignPropertyWithAnimation() QObject obj; obj.setProperty("foo", 321); obj.setProperty("bar", 654); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); s1->assignProperty(&obj, "foo", 123); s1->assignProperty(&obj, "bar", 321); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(&obj, "foo", 456); s2->assignProperty(&obj, "bar", 654); s2->assignProperty(&obj, "baz", 789); @@ -1398,7 +1400,7 @@ void tst_QStateMachine::assignPropertyWithAnimation() group.addAnimation(new QPropertyAnimation(&obj, "foo")); group.addAnimation(new QPropertyAnimation(&obj, "bar")); trans->addAnimation(&group); - QFinalState *s3 = new QFinalState(machine.rootState()); + QFinalState *s3 = new QFinalState(&machine); s2->addTransition(s2, SIGNAL(polished()), s3); machine.setInitialState(s1); @@ -1415,7 +1417,7 @@ void tst_QStateMachine::assignPropertyWithAnimation() QObject obj; obj.setProperty("foo", 321); obj.setProperty("bar", 654); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); QCOMPARE(s1->childMode(), QState::ExclusiveStates); s1->setChildMode(QState::ParallelStates); QCOMPARE(s1->childMode(), QState::ParallelStates); @@ -1425,7 +1427,7 @@ void tst_QStateMachine::assignPropertyWithAnimation() s1->setObjectName("s1"); s1->assignProperty(&obj, "foo", 123); s1->assignProperty(&obj, "bar", 456); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->setObjectName("s2"); s2->assignProperty(&obj, "foo", 321); QState *s21 = new QState(s2); @@ -1447,7 +1449,7 @@ void tst_QStateMachine::assignPropertyWithAnimation() s21->addTransition(s21, SIGNAL(polished()), s22); - QFinalState *s3 = new QFinalState(machine.rootState()); + QFinalState *s3 = new QFinalState(&machine); s22->addTransition(s2, SIGNAL(polished()), s3); machine.setInitialState(s1); @@ -1464,7 +1466,7 @@ void tst_QStateMachine::assignPropertyWithAnimation() QObject obj; obj.setProperty("foo", 321); obj.setProperty("bar", 654); - QState *group = new QState(machine.rootState()); + QState *group = new QState(&machine); QState *s1 = new QState(group); group->setInitialState(s1); s1->assignProperty(&obj, "foo", 123); @@ -1590,12 +1592,12 @@ void tst_QStateMachine::postEvent() void tst_QStateMachine::stateFinished() { QStateMachine machine; - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); QState *s1_1 = new QState(s1); QFinalState *s1_2 = new QFinalState(s1); s1_1->addTransition(s1_2); s1->setInitialState(s1_1); - QFinalState *s2 = new QFinalState(machine.rootState()); + QFinalState *s2 = new QFinalState(&machine); s1->addTransition(s1, SIGNAL(finished()), s2); machine.setInitialState(s1); QSignalSpy finishedSpy(&machine, SIGNAL(finished())); @@ -1645,7 +1647,7 @@ void tst_QStateMachine::parallelStates() void tst_QStateMachine::parallelRootState() { QStateMachine machine; - QState *root = machine.rootState(); + QState *root = &machine; QCOMPARE(root->childMode(), QState::ExclusiveStates); root->setChildMode(QState::ParallelStates); QCOMPARE(root->childMode(), QState::ParallelStates); @@ -1668,7 +1670,7 @@ void tst_QStateMachine::parallelRootState() void tst_QStateMachine::allSourceToTargetConfigurations() { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); + QState *s0 = new QState(&machine); s0->setObjectName("s0"); QState *s1 = new QState(s0); s1->setObjectName("s1"); @@ -1680,7 +1682,7 @@ void tst_QStateMachine::allSourceToTargetConfigurations() s21->setObjectName("s21"); QState *s211 = new QState(s21); s211->setObjectName("s211"); - QFinalState *f = new QFinalState(machine.rootState()); + QFinalState *f = new QFinalState(&machine); f->setObjectName("f"); s0->setInitialState(s1); @@ -1754,7 +1756,7 @@ void tst_QStateMachine::signalTransitions() { { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); + QState *s0 = new QState(&machine); QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: sender cannot be null"); QCOMPARE(s0->addTransition(0, SIGNAL(noSuchSignal()), 0), (QSignalTransition*)0); @@ -1765,7 +1767,7 @@ void tst_QStateMachine::signalTransitions() QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: cannot add transition to null state"); QCOMPARE(s0->addTransition(&emitter, SIGNAL(signalWithNoArg()), 0), (QSignalTransition*)0); - QFinalState *s1 = new QFinalState(machine.rootState()); + QFinalState *s1 = new QFinalState(&machine); QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: no such signal SignalEmitter::noSuchSignal()"); QCOMPARE(s0->addTransition(&emitter, SIGNAL(noSuchSignal()), s1), (QSignalTransition*)0); @@ -1816,8 +1818,8 @@ void tst_QStateMachine::signalTransitions() } { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); - QFinalState *s1 = new QFinalState(machine.rootState()); + QState *s0 = new QState(&machine); + QFinalState *s1 = new QFinalState(&machine); SignalEmitter emitter; QSignalTransition *trans = s0->addTransition(&emitter, "signalWithNoArg()", s1); QVERIFY(trans != 0); @@ -1844,8 +1846,8 @@ void tst_QStateMachine::signalTransitions() } { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); - QFinalState *s1 = new QFinalState(machine.rootState()); + QState *s0 = new QState(&machine); + QFinalState *s1 = new QFinalState(&machine); SignalEmitter emitter; TestSignalTransition *trans = new TestSignalTransition(&emitter, SIGNAL(signalWithIntArg(int)), s1); s0->addTransition(trans); @@ -1863,8 +1865,8 @@ void tst_QStateMachine::signalTransitions() } { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); - QFinalState *s1 = new QFinalState(machine.rootState()); + QState *s0 = new QState(&machine); + QFinalState *s1 = new QFinalState(&machine); SignalEmitter emitter; TestSignalTransition *trans = new TestSignalTransition(&emitter, SIGNAL(signalWithStringArg(QString)), s1); s0->addTransition(trans); @@ -1883,8 +1885,8 @@ void tst_QStateMachine::signalTransitions() } { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); - QFinalState *s1 = new QFinalState(machine.rootState()); + QState *s0 = new QState(&machine); + QFinalState *s1 = new QFinalState(&machine); TestSignalTransition *trans = new TestSignalTransition(); QCOMPARE(trans->senderObject(), (QObject*)0); @@ -1911,8 +1913,8 @@ void tst_QStateMachine::signalTransitions() { QStateMachine machine; SignalEmitter emitter; - QState *s0 = new QState(machine.rootState()); - QState *s1 = new QState(machine.rootState()); + QState *s0 = new QState(&machine); + QState *s1 = new QState(&machine); QSignalTransition *t0 = s0->addTransition(&emitter, SIGNAL(signalWithNoArg()), s1); QSignalTransition *t1 = s1->addTransition(&emitter, SIGNAL(signalWithNoArg()), s0); @@ -1956,12 +1958,12 @@ void tst_QStateMachine::signalTransitions() { QStateMachine machine; SignalEmitter emitter; - QState *s0 = new QState(machine.rootState()); - QFinalState *s1 = new QFinalState(machine.rootState()); + QState *s0 = new QState(&machine); + QFinalState *s1 = new QFinalState(&machine); s0->addTransition(&emitter, SIGNAL(signalWithNoArg()), s1); - QFinalState *s2 = new QFinalState(machine.rootState()); + QFinalState *s2 = new QFinalState(&machine); s0->addTransition(&emitter, SIGNAL(signalWithIntArg(int)), s2); - QFinalState *s3 = new QFinalState(machine.rootState()); + QFinalState *s3 = new QFinalState(&machine); s0->addTransition(&emitter, SIGNAL(signalWithStringArg(QString)), s3); QSignalSpy startedSpy(&machine, SIGNAL(started())); @@ -1993,8 +1995,8 @@ void tst_QStateMachine::signalTransitions() { QStateMachine machine; SignalEmitter emitter; - QState *s0 = new QState(machine.rootState()); - QFinalState *s1 = new QFinalState(machine.rootState()); + QState *s0 = new QState(&machine); + QFinalState *s1 = new QFinalState(&machine); QSignalTransition *t0 = s0->addTransition(&emitter, SIGNAL( signalWithNoArg( ) ), s1); QVERIFY(t0 != 0); QCOMPARE(t0->signal(), QByteArray(SIGNAL( signalWithNoArg( ) ))); @@ -2021,8 +2023,8 @@ void tst_QStateMachine::eventTransitions() QPushButton button; for (int x = 0; x < 2; ++x) { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); - QFinalState *s1 = new QFinalState(machine.rootState()); + QState *s0 = new QState(&machine); + QFinalState *s1 = new QFinalState(&machine); QMouseEventTransition *trans; if (x == 0) { @@ -2070,8 +2072,8 @@ void tst_QStateMachine::eventTransitions() } for (int x = 0; x < 3; ++x) { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); - QFinalState *s1 = new QFinalState(machine.rootState()); + QState *s0 = new QState(&machine); + QFinalState *s1 = new QFinalState(&machine); QEventTransition *trans; if (x == 0) { @@ -2105,8 +2107,8 @@ void tst_QStateMachine::eventTransitions() } { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); - QFinalState *s1 = new QFinalState(machine.rootState()); + QState *s0 = new QState(&machine); + QFinalState *s1 = new QFinalState(&machine); QMouseEventTransition *trans = new QMouseEventTransition(); QCOMPARE(trans->eventObject(), (QObject*)0); @@ -2131,8 +2133,8 @@ void tst_QStateMachine::eventTransitions() { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); - QFinalState *s1 = new QFinalState(machine.rootState()); + QState *s0 = new QState(&machine); + QFinalState *s1 = new QFinalState(&machine); QKeyEventTransition *trans = new QKeyEventTransition(&button, QEvent::KeyPress, Qt::Key_A); QCOMPARE(trans->eventType(), QEvent::KeyPress); @@ -2152,8 +2154,8 @@ void tst_QStateMachine::eventTransitions() } { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); - QFinalState *s1 = new QFinalState(machine.rootState()); + QState *s0 = new QState(&machine); + QFinalState *s1 = new QFinalState(&machine); QKeyEventTransition *trans = new QKeyEventTransition(); QCOMPARE(trans->eventObject(), (QObject*)0); @@ -2178,8 +2180,8 @@ void tst_QStateMachine::eventTransitions() // Multiple transitions for same (object,event) { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); - QState *s1 = new QState(machine.rootState()); + QState *s0 = new QState(&machine); + QState *s1 = new QState(&machine); QEventTransition *t0 = new QEventTransition(&button, QEvent::MouseButtonPress); t0->setTargetState(s1); s0->addTransition(t0); @@ -2226,9 +2228,9 @@ void tst_QStateMachine::eventTransitions() // multiple event transitions from same source { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); - QFinalState *s1 = new QFinalState(machine.rootState()); - QFinalState *s2 = new QFinalState(machine.rootState()); + QState *s0 = new QState(&machine); + QFinalState *s1 = new QFinalState(&machine); + QFinalState *s2 = new QFinalState(&machine); QEventTransition *t0 = new QEventTransition(&button, QEvent::MouseButtonPress); t0->setTargetState(s1); s0->addTransition(t0); @@ -2257,8 +2259,8 @@ void tst_QStateMachine::eventTransitions() // custom event { QStateMachine machine; - QState *s0 = new QState(machine.rootState()); - QFinalState *s1 = new QFinalState(machine.rootState()); + QState *s0 = new QState(&machine); + QFinalState *s1 = new QFinalState(&machine); QEventTransition *trans = new QEventTransition(&button, QEvent::Type(QEvent::User+1)); trans->setTargetState(s1); @@ -2276,7 +2278,7 @@ void tst_QStateMachine::historyStates() { for (int x = 0; x < 2; ++x) { QStateMachine machine; - QState *root = machine.rootState(); + QState *root = &machine; QState *s0 = new QState(root); QState *s00 = new QState(s0); QState *s01 = new QState(s0); @@ -2360,7 +2362,7 @@ void tst_QStateMachine::startAndStop() QCOMPARE(stoppedSpy.count(), 0); QCOMPARE(finishedSpy.count(), 0); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); machine.setInitialState(s1); machine.start(); QTRY_COMPARE(machine.isRunning(), true); @@ -2391,7 +2393,7 @@ void tst_QStateMachine::startAndStop() void tst_QStateMachine::targetStateWithNoParent() { QStateMachine machine; - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); s1->setObjectName("s1"); QState s2; s1->addTransition(&s2); @@ -2411,9 +2413,9 @@ void tst_QStateMachine::targetStateWithNoParent() void tst_QStateMachine::targetStateDeleted() { QStateMachine machine; - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); s1->setObjectName("s1"); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); QAbstractTransition *trans = s1->addTransition(s2); delete s2; QCOMPARE(trans->targetState(), (QAbstractState*)0); @@ -2428,13 +2430,13 @@ void tst_QStateMachine::defaultGlobalRestorePolicy() propertyHolder->setProperty("a", 1); propertyHolder->setProperty("b", 2); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); s1->assignProperty(propertyHolder, "a", 3); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(propertyHolder, "b", 4); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); s1->addTransition(new EventTransition(QEvent::User, s2)); s2->addTransition(new EventTransition(QEvent::User, s3)); @@ -2463,11 +2465,12 @@ void tst_QStateMachine::noInitialStateForInitialState() { QStateMachine machine; - QState *initialState = new QState(machine.rootState()); + QState *initialState = new QState(&machine); initialState->setObjectName("initialState"); machine.setInitialState(initialState); QState *childState = new QState(initialState); + (void)childState; QTest::ignoreMessage(QtWarningMsg, "Unrecoverable error detected in running state machine: " "Missing initial state in compound state 'initialState'"); @@ -2487,7 +2490,7 @@ void tst_QStateMachine::restorePolicyNotInherited() propertyHolder->setProperty("a", 1); propertyHolder->setProperty("b", 2); - QState *parentState = new QState(machine.rootState()); + QState *parentState = new QState(&machine); parentState->setObjectName("parentState"); parentState->setRestorePolicy(QState::RestoreProperties); @@ -2536,13 +2539,13 @@ void tst_QStateMachine::globalRestorePolicySetToDoNotRestore() propertyHolder->setProperty("a", 1); propertyHolder->setProperty("b", 2); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); s1->assignProperty(propertyHolder, "a", 3); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(propertyHolder, "b", 4); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); s1->addTransition(new EventTransition(QEvent::User, s2)); s2->addTransition(new EventTransition(QEvent::User, s3)); @@ -2646,7 +2649,7 @@ void tst_QStateMachine::restorePolicyOnChildState() propertyHolder->setProperty("a", 1); propertyHolder->setProperty("b", 2); - QState *parentState = new QState(machine.rootState()); + QState *parentState = new QState(&machine); parentState->setObjectName("parentState"); QState *s1 = new QState(parentState); @@ -2697,13 +2700,13 @@ void tst_QStateMachine::globalRestorePolicySetToRestore() propertyHolder->setProperty("a", 1); propertyHolder->setProperty("b", 2); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); s1->assignProperty(propertyHolder, "a", 3); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(propertyHolder, "b", 4); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); s1->addTransition(new EventTransition(QEvent::User, s2)); s2->addTransition(new EventTransition(QEvent::User, s3)); @@ -2736,19 +2739,19 @@ void tst_QStateMachine::mixedRestoreProperties() QObject *propertyHolder = new QObject(); propertyHolder->setProperty("a", 1); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); s1->setRestorePolicy(QState::RestoreProperties); s1->assignProperty(propertyHolder, "a", 3); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(propertyHolder, "a", 4); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); - QState *s4 = new QState(machine.rootState()); + QState *s4 = new QState(&machine); s4->assignProperty(propertyHolder, "a", 5); - QState *s5 = new QState(machine.rootState()); + QState *s5 = new QState(&machine); s5->setRestorePolicy(QState::RestoreProperties); s5->assignProperty(propertyHolder, "a", 6); @@ -2800,8 +2803,8 @@ void tst_QStateMachine::mixedRestoreProperties() void tst_QStateMachine::transitionWithParent() { QStateMachine machine; - QState *s1 = new QState(machine.rootState()); - QState *s2 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); + QState *s2 = new QState(&machine); EventTransition *trans = new EventTransition(QEvent::User, s2, s1); QCOMPARE(trans->sourceState(), s1); QCOMPARE(trans->targetState(), (QAbstractState*)s2); @@ -2816,8 +2819,8 @@ void tst_QStateMachine::simpleAnimation() QObject *object = new QObject(&machine); object->setProperty("fooBar", 1.0); - QState *s1 = new QState(machine.rootState()); - QState *s2 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); + QState *s2 = new QState(&machine); s2->assignProperty(object, "fooBar", 2.0); EventTransition *et = new EventTransition(QEvent::User, s2); @@ -2825,7 +2828,7 @@ void tst_QStateMachine::simpleAnimation() et->addAnimation(animation); s1->addTransition(et); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); s2->addTransition(animation, SIGNAL(finished()), s3); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); @@ -2860,8 +2863,8 @@ void tst_QStateMachine::twoAnimations() object->setProperty("foo", 1.0); object->setProperty("bar", 3.0); - QState *s1 = new QState(machine.rootState()); - QState *s2 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); s2->assignProperty(object, "bar", 10.0); @@ -2878,7 +2881,7 @@ void tst_QStateMachine::twoAnimations() et->addAnimation(animationBar); s1->addTransition(et); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); s2->addTransition(s2, SIGNAL(polished()), s3); @@ -2903,23 +2906,23 @@ void tst_QStateMachine::twoAnimatedTransitions() QObject *object = new QObject(&machine); object->setProperty("foo", 1.0); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 5.0); QPropertyAnimation *fooAnimation = new QPropertyAnimation(object, "foo", s2); s1->addTransition(new EventTransition(QEvent::User, s2))->addAnimation(fooAnimation); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); s2->addTransition(fooAnimation, SIGNAL(finished()), s3); - QState *s4 = new QState(machine.rootState()); + QState *s4 = new QState(&machine); s4->assignProperty(object, "foo", 2.0); QPropertyAnimation *fooAnimation2 = new QPropertyAnimation(object, "foo", s4); s3->addTransition(new EventTransition(QEvent::User, s4))->addAnimation(fooAnimation2); - QState *s5 = new QState(machine.rootState()); + QState *s5 = new QState(&machine); QObject::connect(s5, SIGNAL(entered()), QApplication::instance(), SLOT(quit())); s4->addTransition(fooAnimation2, SIGNAL(finished()), s5); @@ -2947,22 +2950,22 @@ void tst_QStateMachine::playAnimationTwice() QObject *object = new QObject(&machine); object->setProperty("foo", 1.0); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 5.0); QPropertyAnimation *fooAnimation = new QPropertyAnimation(object, "foo", s2); s1->addTransition(new EventTransition(QEvent::User, s2))->addAnimation(fooAnimation); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); s2->addTransition(fooAnimation, SIGNAL(finished()), s3); - QState *s4 = new QState(machine.rootState()); + QState *s4 = new QState(&machine); s4->assignProperty(object, "foo", 2.0); s3->addTransition(new EventTransition(QEvent::User, s4))->addAnimation(fooAnimation); - QState *s5 = new QState(machine.rootState()); + QState *s5 = new QState(&machine); QObject::connect(s5, SIGNAL(entered()), QApplication::instance(), SLOT(quit())); s4->addTransition(fooAnimation, SIGNAL(finished()), s5); @@ -2993,8 +2996,8 @@ void tst_QStateMachine::nestedTargetStateForAnimation() SlotCalledCounter counter; - QState *s1 = new QState(machine.rootState()); - QState *s2 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); @@ -3021,7 +3024,7 @@ void tst_QStateMachine::nestedTargetStateForAnimation() connect(animation, SIGNAL(finished()), &counter, SLOT(slot())); at->addAnimation(animation); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); s2->addTransition(s2Child, SIGNAL(polished()), s3); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); @@ -3049,13 +3052,13 @@ void tst_QStateMachine::animatedGlobalRestoreProperty() SlotCalledCounter counter; - QState *s1 = new QState(machine.rootState()); - QState *s2 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); - QState *s4 = new QState(machine.rootState()); + QState *s4 = new QState(&machine); QObject::connect(s4, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); QAbstractTransition *at = s1->addTransition(new EventTransition(QEvent::User, s2)); @@ -3093,16 +3096,16 @@ void tst_QStateMachine::specificTargetValueOfAnimation() QObject *object = new QObject(&machine); object->setProperty("foo", 1.0); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); QPropertyAnimation *anim = new QPropertyAnimation(object, "foo"); anim->setEndValue(10.0); s1->addTransition(new EventTransition(QEvent::User, s2))->addAnimation(anim); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); s2->addTransition(anim, SIGNAL(finished()), s3); @@ -3127,12 +3130,12 @@ void tst_QStateMachine::addDefaultAnimation() QObject *object = new QObject(); object->setProperty("foo", 1.0); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); s1->addTransition(new EventTransition(QEvent::User, s2)); @@ -3164,12 +3167,12 @@ void tst_QStateMachine::addDefaultAnimationWithUnusedAnimation() SlotCalledCounter counter; - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); s1->addTransition(new EventTransition(QEvent::User, s2)); @@ -3245,13 +3248,13 @@ void tst_QStateMachine::overrideDefaultAnimationWithSpecific() SlotCalledCounter counter; - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); machine.setInitialState(s1); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); QAbstractTransition *at = s1->addTransition(new EventTransition(QEvent::User, s2)); @@ -3287,12 +3290,12 @@ void tst_QStateMachine::addDefaultAnimationForSource() QObject *object = new QObject(); object->setProperty("foo", 1.0); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); s1->addTransition(new EventTransition(QEvent::User, s2)); @@ -3319,12 +3322,12 @@ void tst_QStateMachine::addDefaultAnimationForTarget() QObject *object = new QObject(); object->setProperty("foo", 1.0); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); s1->addTransition(new EventTransition(QEvent::User, s2)); @@ -3348,88 +3351,88 @@ void tst_QStateMachine::removeDefaultAnimationForSource() { QStateMachine machine; - QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 0); + QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 0); QPropertyAnimation *anim = new QPropertyAnimation(this, "foo"); - machine.addDefaultAnimationForSourceState(machine.rootState(), anim); + machine.addDefaultAnimationForSourceState(&machine, anim); QCOMPARE(machine.defaultAnimations().size(), 0); - QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 0); - QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 1); - QVERIFY(machine.defaultAnimationsForSourceState(machine.rootState()).contains(anim)); + QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 0); + QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 1); + QVERIFY(machine.defaultAnimationsForSourceState(&machine).contains(anim)); - machine.removeDefaultAnimationForTargetState(machine.rootState(), anim); + machine.removeDefaultAnimationForTargetState(&machine, anim); QCOMPARE(machine.defaultAnimations().size(), 0); - QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 0); - QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 1); - QVERIFY(machine.defaultAnimationsForSourceState(machine.rootState()).contains(anim)); + QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 0); + QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 1); + QVERIFY(machine.defaultAnimationsForSourceState(&machine).contains(anim)); - machine.removeDefaultAnimationForSourceState(machine.rootState(), anim); + machine.removeDefaultAnimationForSourceState(&machine, anim); - QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 0); + QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 0); - machine.addDefaultAnimationForSourceState(machine.rootState(), anim); + machine.addDefaultAnimationForSourceState(&machine, anim); QPropertyAnimation *anim2 = new QPropertyAnimation(this, "foo"); - machine.addDefaultAnimationForSourceState(machine.rootState(), anim2); + machine.addDefaultAnimationForSourceState(&machine, anim2); - QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 2); - QVERIFY(machine.defaultAnimationsForSourceState(machine.rootState()).contains(anim)); - QVERIFY(machine.defaultAnimationsForSourceState(machine.rootState()).contains(anim2)); + QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 2); + QVERIFY(machine.defaultAnimationsForSourceState(&machine).contains(anim)); + QVERIFY(machine.defaultAnimationsForSourceState(&machine).contains(anim2)); - machine.removeDefaultAnimationForSourceState(machine.rootState(), anim); + machine.removeDefaultAnimationForSourceState(&machine, anim); - QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 1); - QVERIFY(machine.defaultAnimationsForSourceState(machine.rootState()).contains(anim2)); + QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 1); + QVERIFY(machine.defaultAnimationsForSourceState(&machine).contains(anim2)); - machine.removeDefaultAnimationForSourceState(machine.rootState(), anim2); - QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 0); + machine.removeDefaultAnimationForSourceState(&machine, anim2); + QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 0); } void tst_QStateMachine::removeDefaultAnimationForTarget() { QStateMachine machine; - QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 0); + QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 0); QPropertyAnimation *anim = new QPropertyAnimation(this, "foo"); - machine.addDefaultAnimationForTargetState(machine.rootState(), anim); + machine.addDefaultAnimationForTargetState(&machine, anim); QCOMPARE(machine.defaultAnimations().size(), 0); - QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 0); - QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 1); - QVERIFY(machine.defaultAnimationsForTargetState(machine.rootState()).contains(anim)); + QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 0); + QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 1); + QVERIFY(machine.defaultAnimationsForTargetState(&machine).contains(anim)); - machine.removeDefaultAnimationForSourceState(machine.rootState(), anim); + machine.removeDefaultAnimationForSourceState(&machine, anim); QCOMPARE(machine.defaultAnimations().size(), 0); - QCOMPARE(machine.defaultAnimationsForSourceState(machine.rootState()).size(), 0); - QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 1); - QVERIFY(machine.defaultAnimationsForTargetState(machine.rootState()).contains(anim)); + QCOMPARE(machine.defaultAnimationsForSourceState(&machine).size(), 0); + QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 1); + QVERIFY(machine.defaultAnimationsForTargetState(&machine).contains(anim)); - machine.removeDefaultAnimationForTargetState(machine.rootState(), anim); + machine.removeDefaultAnimationForTargetState(&machine, anim); - QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 0); + QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 0); - machine.addDefaultAnimationForTargetState(machine.rootState(), anim); + machine.addDefaultAnimationForTargetState(&machine, anim); QPropertyAnimation *anim2 = new QPropertyAnimation(this, "foo"); - machine.addDefaultAnimationForTargetState(machine.rootState(), anim2); + machine.addDefaultAnimationForTargetState(&machine, anim2); - QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 2); - QVERIFY(machine.defaultAnimationsForTargetState(machine.rootState()).contains(anim)); - QVERIFY(machine.defaultAnimationsForTargetState(machine.rootState()).contains(anim2)); + QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 2); + QVERIFY(machine.defaultAnimationsForTargetState(&machine).contains(anim)); + QVERIFY(machine.defaultAnimationsForTargetState(&machine).contains(anim2)); - machine.removeDefaultAnimationForTargetState(machine.rootState(), anim); + machine.removeDefaultAnimationForTargetState(&machine, anim); - QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 1); - QVERIFY(machine.defaultAnimationsForTargetState(machine.rootState()).contains(anim2)); + QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 1); + QVERIFY(machine.defaultAnimationsForTargetState(&machine).contains(anim2)); - machine.removeDefaultAnimationForTargetState(machine.rootState(), anim2); - QCOMPARE(machine.defaultAnimationsForTargetState(machine.rootState()).size(), 0); + machine.removeDefaultAnimationForTargetState(&machine, anim2); + QCOMPARE(machine.defaultAnimationsForTargetState(&machine).size(), 0); } void tst_QStateMachine::overrideDefaultAnimationWithSource() @@ -3441,13 +3444,13 @@ void tst_QStateMachine::overrideDefaultAnimationWithSource() SlotCalledCounter counter; - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); machine.setInitialState(s1); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); s1->addTransition(new EventTransition(QEvent::User, s2)); @@ -3481,13 +3484,13 @@ void tst_QStateMachine::overrideDefaultAnimationWithTarget() SlotCalledCounter counter; - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); machine.setInitialState(s1); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); s1->addTransition(new EventTransition(QEvent::User, s2)); @@ -3522,13 +3525,13 @@ void tst_QStateMachine::overrideDefaultSourceAnimationWithSpecific() SlotCalledCounter counter; - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); machine.setInitialState(s1); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); QAbstractTransition *at = s1->addTransition(new EventTransition(QEvent::User, s2)); @@ -3562,13 +3565,13 @@ void tst_QStateMachine::overrideDefaultTargetAnimationWithSpecific() SlotCalledCounter counter; - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); machine.setInitialState(s1); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); QAbstractTransition *at = s1->addTransition(new EventTransition(QEvent::User, s2)); @@ -3602,13 +3605,13 @@ void tst_QStateMachine::overrideDefaultTargetAnimationWithSource() SlotCalledCounter counter; - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); machine.setInitialState(s1); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(object, "foo", 2.0); - QState *s3 = new QState(machine.rootState()); + QState *s3 = new QState(&machine); QObject::connect(s3, SIGNAL(entered()), QCoreApplication::instance(), SLOT(quit())); s1->addTransition(new EventTransition(QEvent::User, s2)); @@ -3644,10 +3647,10 @@ void tst_QStateMachine::parallelStateAssignmentsDone() propertyHolder->setProperty("bar", 456); propertyHolder->setProperty("zoot", 789); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); machine.setInitialState(s1); - QState *parallelState = new QState(QState::ParallelStates, machine.rootState()); + QState *parallelState = new QState(QState::ParallelStates, &machine); parallelState->assignProperty(propertyHolder, "foo", 321); QState *s2 = new QState(parallelState); @@ -3676,10 +3679,10 @@ void tst_QStateMachine::transitionsFromParallelStateWithNoChildren() { QStateMachine machine; - QState *parallelState = new QState(QState::ParallelStates, machine.rootState()); + QState *parallelState = new QState(QState::ParallelStates, &machine); machine.setInitialState(parallelState); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); parallelState->addTransition(new EventTransition(QEvent::User, s1)); machine.start(); @@ -3700,7 +3703,7 @@ void tst_QStateMachine::parallelStateTransition() { QStateMachine machine; - QState *parallelState = new QState(QState::ParallelStates, machine.rootState()); + QState *parallelState = new QState(QState::ParallelStates, &machine); machine.setInitialState(parallelState); QState *s1 = new QState(parallelState); @@ -3749,10 +3752,10 @@ void tst_QStateMachine::nestedRestoreProperties() propertyHolder->setProperty("foo", 1); propertyHolder->setProperty("bar", 2); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); machine.setInitialState(s1); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(propertyHolder, "foo", 3); QState *s21 = new QState(s2); @@ -3801,10 +3804,10 @@ void tst_QStateMachine::nestedRestoreProperties2() propertyHolder->setProperty("foo", 1); propertyHolder->setProperty("bar", 2); - QState *s1 = new QState(machine.rootState()); + QState *s1 = new QState(&machine); machine.setInitialState(s1); - QState *s2 = new QState(machine.rootState()); + QState *s2 = new QState(&machine); s2->assignProperty(propertyHolder, "foo", 3); QState *s21 = new QState(s2); @@ -3856,6 +3859,46 @@ void tst_QStateMachine::nestedRestoreProperties2() } +void tst_QStateMachine::nestedStateMachines() +{ + QStateMachine machine; + QState *group = new QState(&machine); + group->setChildMode(QState::ParallelStates); + QStateMachine *subMachines[3]; + for (int i = 0; i < 3; ++i) { + QState *subGroup = new QState(group); + QStateMachine *subMachine = new QStateMachine(subGroup); + { + QState *initial = new QState(subMachine); + QFinalState *done = new QFinalState(subMachine); + initial->addTransition(new EventTransition(QEvent::User, done)); + subMachine->setInitialState(initial); + } + QFinalState *subMachineDone = new QFinalState(subGroup); + subMachine->addTransition(subMachine, SIGNAL(finished()), subMachineDone); + subGroup->setInitialState(subMachine); + subMachines[i] = subMachine; + } + QFinalState *final = new QFinalState(&machine); + group->addTransition(group, SIGNAL(finished()), final); + machine.setInitialState(group); + + QSignalSpy startedSpy(&machine, SIGNAL(started())); + QSignalSpy finishedSpy(&machine, SIGNAL(finished())); + machine.start(); + QTRY_COMPARE(startedSpy.count(), 1); + QTRY_COMPARE(machine.configuration().count(), 1+2*3); + QVERIFY(machine.configuration().contains(group)); + for (int i = 0; i < 3; ++i) + QVERIFY(machine.configuration().contains(subMachines[i])); + + QCoreApplication::processEvents(); // starts the submachines + + for (int i = 0; i < 3; ++i) + subMachines[i]->postEvent(new QEvent(QEvent::User)); + + QTRY_COMPARE(finishedSpy.count(), 1); +} QTEST_MAIN(tst_QStateMachine) #include "tst_qstatemachine.moc" -- cgit v1.2.3 From e2aa651aba89bcc409dd090466b04036277a9a7c Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 22 Jul 2009 15:59:58 +0200 Subject: Compile on embedded --- src/gui/styles/qcleanlooksstyle.cpp | 2 +- src/gui/styles/qgtkstyle.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp index ccf81cb3a..8f8878177 100644 --- a/src/gui/styles/qcleanlooksstyle.cpp +++ b/src/gui/styles/qcleanlooksstyle.cpp @@ -1746,7 +1746,7 @@ void QCleanlooksStyle::drawControl(ControlElement element, const QStyleOption *o int maxWidth = rect.width() - 4; int minWidth = 4; qreal progress = qMax(bar->progress, bar->minimum); // workaround for bug in QProgressBar - int progressBarWidth = (progress - bar->minimum) * qreal(maxWidth) / qMax(1.0, qreal(bar->maximum) - bar->minimum); + int progressBarWidth = (progress - bar->minimum) * qreal(maxWidth) / qMax(qreal(1.0), qreal(bar->maximum) - bar->minimum); int width = indeterminate ? maxWidth : qMax(minWidth, progressBarWidth); bool reverse = (!vertical && (bar->direction == Qt::RightToLeft)) || vertical; diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index 53f3db99c..660b4c3de 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -2076,7 +2076,7 @@ void QGtkStyle::drawControl(ControlElement element, if (vertical) rect = QRect(rect.left(), rect.top(), rect.height(), rect.width()); // flip width and height const int progressIndicatorPos = (bar->progress - qreal(bar->minimum)) * rect.width() / - qMax(1.0, qreal(bar->maximum) - bar->minimum); + qMax(qreal(1.0), qreal(bar->maximum) - bar->minimum); if (progressIndicatorPos >= 0 && progressIndicatorPos <= rect.width()) leftRect = QRect(rect.left(), rect.top(), progressIndicatorPos, rect.height()); if (vertical) -- cgit v1.2.3 From 9f176a9953e42ae08aaed5fa92ed55bbc8526142 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Wed, 22 Jul 2009 16:26:28 +0200 Subject: Fix table borders in multiline tables when printing to PostScript. I'm not all to happy with this fix, but its the best that one can acheive given the current design. The problem is that QPdfBaseEngine sets a number of states as part of updateState(), but only when we are playing back through the alpha engine. These states are used in some draw functions, also when we are recording in the alpha engine. This leads to the states and their checks being out of sync. So to follow the existing pattern in the code we need to not touch d-> vars prior to a check to usesAlphaEngine. Reviewed-By: Eskil --- src/gui/painting/qpdf.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index 2017fdd25..8a991e3a2 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -964,8 +964,7 @@ QPdfBaseEngine::QPdfBaseEngine(QPdfBaseEnginePrivate &dd, PaintEngineFeatures f) void QPdfBaseEngine::drawPoints (const QPointF *points, int pointCount) { - Q_D(QPdfBaseEngine); - if (!points || !d->hasPen) + if (!points) return; QPainterPath p; @@ -995,6 +994,12 @@ void QPdfBaseEngine::drawRects (const QRectF *rects, int rectCount) return; Q_D(QPdfBaseEngine); + if (d->useAlphaEngine) { + QAlphaPaintEngine::drawRects(rects, rectCount); + if (!continueCall()) + return; + } + if (d->clipEnabled && d->allClipped) return; if (!d->hasPen && !d->hasBrush) -- cgit v1.2.3 From 3597a5b82610752cf95372a5a5f7b33afc8d30b9 Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Tue, 21 Jul 2009 16:15:57 +0200 Subject: Use texture_from_pixmap on X11 & avoid copies The patch tries to use texture_from_pixmap extentions on glX to properly bind an X Pixmap to a texture in QGLContextPrivate::bindTexture(QPixmap,). Because GL & X have different coordinate systems, the pixmap will be inverted about the y-axis. The extension does however allow a GLX_Y_INVERTED_EXT attribute to be set which will bind the pixmap the correct way up. If the underlying driver doesn't support this, texture_from_pixmap can't be used for QGLContext::bindTexture, because that function expects the resulting texture to be the right way up. However, it can still be used internally by the paint engine for drawPixmap operations. For these cases, if the pixmap is inverted, the paint engine can simply invert the texture coords to compensate. This is why this patch also moves QGLTexture into qgl_p.h. QGLContextPrivate::bindTexture(QPixmap,) now returns a QGLTexture which the paint engine can inspect to see if it needs to invert the texture coords. Finally, it seems on some (probably all) drivers, deleting an X pixmap which has been bound to a texture before calling glFinish/swapBuffers renders garbage. Presumably this is because X deletes the pixmap behind the driver's back before it's had a chance to use it. To fix this, we reference all QPixmaps which have been bound to stop them being deleted and only deref them after we swap the buffer, when they can be safely deleted. Reviewed-By: Kim --- .../gl2paintengineex/qpaintengineex_opengl2.cpp | 22 +- src/opengl/qgl.cpp | 296 +++++++++++---------- src/opengl/qgl_p.h | 80 +++++- src/opengl/qgl_x11.cpp | 133 +++++++++ src/opengl/qgl_x11egl.cpp | 11 + src/opengl/qglpixmapfilter.cpp | 2 +- src/opengl/qpixmapdata_gl.cpp | 46 ++-- src/opengl/qpixmapdata_gl_p.h | 6 +- 8 files changed, 422 insertions(+), 174 deletions(-) diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 7e8a28135..167eb6489 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -74,6 +74,7 @@ #include #include #include +#include #include "qglgradientcache_p.h" #include "qglengineshadermanager_p.h" @@ -1054,14 +1055,18 @@ void QGL2PaintEngineEx::drawPixmap(const QRectF& dest, const QPixmap & pixmap, c QGLContext *ctx = d->ctx; glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT); - GLuint id = ctx->d_func()->bindTexture(pixmap, GL_TEXTURE_2D, GL_RGBA, true); + QGLTexture *texture = ctx->d_func()->bindTexture(pixmap, GL_TEXTURE_2D, GL_RGBA, true, true); + + GLfloat top = texture->yInverted ? (pixmap.height() - src.top()) : src.top(); + GLfloat bottom = texture->yInverted ? (pixmap.height() - src.bottom()) : src.bottom(); + QGLRect srcRect(src.left(), top, src.right(), bottom); bool isBitmap = pixmap.isQBitmap(); bool isOpaque = !isBitmap && !pixmap.hasAlphaChannel(); d->updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, - state()->renderHints & QPainter::SmoothPixmapTransform, id); - d->drawTexture(dest, src, pixmap.size(), isOpaque, isBitmap); + state()->renderHints & QPainter::SmoothPixmapTransform, texture->id); + d->drawTexture(dest, srcRect, pixmap.size(), isOpaque, isBitmap); } void QGL2PaintEngineEx::drawImage(const QRectF& dest, const QImage& image, const QRectF& src, @@ -1073,7 +1078,8 @@ void QGL2PaintEngineEx::drawImage(const QRectF& dest, const QImage& image, const QGLContext *ctx = d->ctx; glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT); - GLuint id = ctx->d_func()->bindTexture(image, GL_TEXTURE_2D, GL_RGBA, true); + QGLTexture *texture = ctx->d_func()->bindTexture(image, GL_TEXTURE_2D, GL_RGBA, true); + GLuint id = texture->id; d->updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, state()->renderHints & QPainter::SmoothPixmapTransform, id); @@ -1287,6 +1293,14 @@ bool QGL2PaintEngineEx::end() glUseProgram(0); d->transferMode(BrushDrawingMode); d->drawable.swapBuffers(); +#if defined(Q_WS_X11) + // On some (probably all) drivers, deleting an X pixmap which has been bound to a texture + // before calling glFinish/swapBuffers renders garbage. Presumably this is because X deletes + // the pixmap behind the driver's back before it's had a chance to use it. To fix this, we + // reference all QPixmaps which have been bound to stop them being deleted and only deref + // them here, after swapBuffers, where they can be safely deleted. + ctx->d_func()->boundPixmaps.clear(); +#endif d->drawable.doneCurrent(); d->ctx->d_ptr->active_engine = 0; diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index f51b271b0..392e7505b 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -87,7 +87,6 @@ #include #include #include "qcolormap.h" -#include "qcache.h" #include "qfile.h" #include "qlibrary.h" @@ -1395,39 +1394,99 @@ int qt_next_power_of_two(int v) return v; } -class QGLTexture { -public: - QGLTexture(const QGLContext *ctx, GLuint tx_id, GLenum tx_target, bool _clean = false) - : context(ctx), id(tx_id), target(tx_target), clean(_clean) {} - ~QGLTexture() { - if (clean) { - QGLContext *current = const_cast(QGLContext::currentContext()); - QGLContext *ctx = const_cast(context); - bool switch_context = current && current != ctx && !qgl_share_reg()->checkSharing(current, ctx); - if (switch_context) - ctx->makeCurrent(); - glDeleteTextures(1, &id); - if (switch_context) - current->makeCurrent(); - } - } - - const QGLContext *context; - GLuint id; - GLenum target; - bool clean; -}; - -typedef QCache QGLTextureCache; -static int qt_tex_cache_limit = 64*1024; // cache ~64 MB worth of textures - this is not accurate though -static QGLTextureCache *qt_tex_cache = 0; - typedef void (*_qt_pixmap_cleanup_hook_64)(qint64); typedef void (*_qt_image_cleanup_hook_64)(qint64); extern Q_GUI_EXPORT _qt_pixmap_cleanup_hook_64 qt_pixmap_cleanup_hook_64; extern Q_GUI_EXPORT _qt_image_cleanup_hook_64 qt_image_cleanup_hook_64; +static QGLTextureCache *qt_gl_texture_cache = 0; + +QGLTextureCache::QGLTextureCache() + : m_cache(64*1024) // cache ~64 MB worth of textures - this is not accurate though +{ + Q_ASSERT(qt_gl_texture_cache == 0); + qt_gl_texture_cache = this; + qt_pixmap_cleanup_hook_64 = cleanupHook; + qt_image_cleanup_hook_64 = cleanupHook; +} + +QGLTextureCache::~QGLTextureCache() +{ + qt_gl_texture_cache = 0; + qt_pixmap_cleanup_hook_64 = 0; + qt_image_cleanup_hook_64 = 0; +} + +void QGLTextureCache::insert(QGLContext* ctx, qint64 key, QGLTexture* texture, int cost) +{ + if (m_cache.totalCost() + cost > m_cache.maxCost()) { + // the cache is full - make an attempt to remove something + const QList keys = m_cache.keys(); + int i = 0; + while (i < m_cache.count() + && (m_cache.totalCost() + cost > m_cache.maxCost())) { + QGLTexture *tex = m_cache.object(keys.at(i)); + if (tex->context == ctx) + m_cache.remove(keys.at(i)); + ++i; + } + } + m_cache.insert(key, texture, cost); +} + +bool QGLTextureCache::remove(QGLContext* ctx, GLuint textureId) +{ + QList keys = m_cache.keys(); + for (int i = 0; i < keys.size(); ++i) { + QGLTexture *tex = m_cache.object(keys.at(i)); + if (tex->id == textureId && tex->context == ctx) { + tex->clean = true; // forces a glDeleteTextures() call + m_cache.remove(keys.at(i)); + return true; + } + } + return false; +} + +void QGLTextureCache::removeContextTextures(QGLContext* ctx) +{ + QList keys = m_cache.keys(); + for (int i = 0; i < keys.size(); ++i) { + const qint64 &key = keys.at(i); + if (m_cache.object(key)->context == ctx) + m_cache.remove(key); + } +} + +QGLTextureCache* QGLTextureCache::instance() +{ + if (!qt_gl_texture_cache) + qt_gl_texture_cache = new QGLTextureCache; + + return qt_gl_texture_cache; +} + +/* + a hook that removes textures from the cache when a pixmap/image + is deref'ed +*/ +void QGLTextureCache::cleanupHook(qint64 cacheKey) +{ + // ### remove when the GL texture cache becomes thread-safe + if (qApp->thread() != QThread::currentThread()) + return; + QGLTexture *texture = instance()->getTexture(cacheKey); + if (texture && texture->clean) + instance()->remove(cacheKey); +} + +void QGLTextureCache::deleteIfEmpty() +{ + if (instance()->size() == 0) + delete instance(); +} + // DDS format structure struct DDSFormat { quint32 dwSize; @@ -1556,21 +1615,8 @@ QGLContext::~QGLContext() { Q_D(QGLContext); // remove any textures cached in this context - if (qt_tex_cache) { - QList keys = qt_tex_cache->keys(); - for (int i = 0; i < keys.size(); ++i) { - const qint64 &key = keys.at(i); - if (qt_tex_cache->object(key)->context == this) - qt_tex_cache->remove(key); - } - // ### thread safety - if (qt_tex_cache->size() == 0) { - qt_pixmap_cleanup_hook_64 = 0; - qt_image_cleanup_hook_64 = 0; - delete qt_tex_cache; - qt_tex_cache = 0; - } - } + QGLTextureCache::instance()->removeContextTextures(this); + QGLTextureCache::deleteIfEmpty(); // ### thread safety QGLSignalProxy::instance()->emitAboutToDestroyContext(this); reset(); @@ -1701,21 +1747,6 @@ GLuint QGLContext::bindTexture(const QString &fileName) return tx_id; } -/* - a hook that removes textures from the cache when a pixmap/image - is deref'ed -*/ -static void qt_gl_clean_cache(qint64 cacheKey) -{ - // ### remove when the GL texture cache becomes thread-safe - if (qApp->thread() != QThread::currentThread()) - return; - if (qt_tex_cache) { - QGLTexture *texture = qt_tex_cache->object(cacheKey); - if (texture && texture->clean) - qt_tex_cache->remove(cacheKey); - } -} static void convertToGLFormatHelper(QImage &dst, const QImage &img, GLenum texture_format) { @@ -1835,7 +1866,7 @@ QImage QGLContextPrivate::convertToGLFormat(const QImage &image, bool force_prem return result; } -GLuint QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint format, +QGLTexture* QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint format, const qint64 key, bool clean) { Q_Q(QGLContext); @@ -1853,11 +1884,6 @@ GLuint QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint // the GL_BGRA format is only present in GL version >= 1.2 GLenum texture_format = (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_2) ? GL_BGRA : GL_RGBA; - if (!qt_tex_cache) { - qt_tex_cache = new QGLTextureCache(qt_tex_cache_limit); - qt_pixmap_cleanup_hook_64 = qt_gl_clean_cache; - qt_image_cleanup_hook_64 = qt_gl_clean_cache; - } // Scale the pixmap if needed. GL textures needs to have the // dimensions 2^n+2(border) x 2^m+2(border), unless we're using GL @@ -1930,53 +1956,26 @@ GLuint QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint // this assumes the size of a texture is always smaller than the max cache size int cost = img.width()*img.height()*4/1024; - if (qt_tex_cache->totalCost() + cost > qt_tex_cache->maxCost()) { - // the cache is full - make an attempt to remove something - const QList keys = qt_tex_cache->keys(); - int i = 0; - while (i < qt_tex_cache->count() - && (qt_tex_cache->totalCost() + cost > qt_tex_cache->maxCost())) { - QGLTexture *tex = qt_tex_cache->object(keys.at(i)); - if (tex->context == q) - qt_tex_cache->remove(keys.at(i)); - ++i; - } - } - qt_tex_cache->insert(key, new QGLTexture(q, tx_id, target, clean), cost); - return tx_id; + QGLTexture *texture = new QGLTexture(q, tx_id, target, clean, false); + QGLTextureCache::instance()->insert(q, key, texture, cost); + return texture; } -bool QGLContextPrivate::textureCacheLookup(const qint64 key, GLenum target, GLuint *id) +QGLTexture *QGLContextPrivate::textureCacheLookup(const qint64 key, GLenum target) { Q_Q(QGLContext); - if (qt_tex_cache) { - QGLTexture *texture = qt_tex_cache->object(key); - if (texture && texture->target == target - && (texture->context == q || qgl_share_reg()->checkSharing(q, texture->context))) - { - *id = texture->id; - return true; - } + QGLTexture *texture = QGLTextureCache::instance()->getTexture(key); + if (texture && texture->target == target + && (texture->context == q || qgl_share_reg()->checkSharing(q, texture->context))) + { + return texture; } - return false; + return 0; } -/*! \internal */ -GLuint QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint format, bool clean) -{ - const qint64 key = image.cacheKey(); - GLuint id; - if (textureCacheLookup(key, target, &id)) { - glBindTexture(target, id); - return id; - } - GLuint cached = bindTexture(image, target, format, key, clean); - const_cast(image).data_ptr()->is_cached = (cached > 0); - return cached; -} /*! \internal */ -GLuint QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target, GLint format, bool clean) +QGLTexture *QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target, GLint format, bool clean, bool canInvert) { Q_Q(QGLContext); QPixmapData *pd = pixmap.pixmapData(); @@ -1984,20 +1983,45 @@ GLuint QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target, GLin if (target == GL_TEXTURE_2D && pd->classId() == QPixmapData::OpenGLClass) { const QGLPixmapData *data = static_cast(pd); - if (data->isValidContext(q)) - return data->bind(); + if (data->isValidContext(q)) { + data->bind(); + return data->texture(); + } } #endif const qint64 key = pixmap.cacheKey(); - GLuint id; - if (textureCacheLookup(key, target, &id)) { - glBindTexture(target, id); - return id; + QGLTexture *texture = textureCacheLookup(key, target); + if (texture) { + glBindTexture(target, texture->id); + return texture; + } + +#if defined(Q_WS_X11) + // Try to use texture_from_pixmap + if (pd->classId() == QPixmapData::X11Class) { + QPixmap *thatPixmap = const_cast(&pixmap); + texture = bindTextureFromNativePixmap(thatPixmap, key, canInvert); + if (texture) { + texture->clean = clean; + boundPixmaps.insert(thatPixmap->data_ptr(), QPixmap(pixmap)); + } } - GLuint cached = bindTexture(pixmap.toImage(), target, format, key, clean); - const_cast(pixmap).data_ptr()->is_cached = (cached > 0); - return cached; +#endif + + if (!texture) + texture = bindTexture(pixmap.toImage(), target, format, key, clean); + + // We should never return 0 as callers shouldn't need to null-check + static QGLTexture invalidTexture; + if (!texture) + texture = &invalidTexture; + + if (texture->id > 0) + const_cast(pixmap).data_ptr()->is_cached = true; + + Q_ASSERT(texture); + return texture; } /*! \internal */ @@ -2063,7 +2087,8 @@ int QGLContextPrivate::maxTextureSize() GLuint QGLContext::bindTexture(const QImage &image, GLenum target, GLint format) { Q_D(QGLContext); - return d->bindTexture(image, target, format, false); + QGLTexture *texture = d->bindTexture(image, target, format, false); + return texture->id; } #ifdef Q_MAC_COMPAT_GL_FUNCTIONS @@ -2082,7 +2107,8 @@ GLuint QGLContext::bindTexture(const QImage &image, QMacCompatGLenum target, QMa GLuint QGLContext::bindTexture(const QPixmap &pixmap, GLenum target, GLint format) { Q_D(QGLContext); - return d->bindTexture(pixmap, target, format, false); + QGLTexture *texture = d->bindTexture(pixmap, target, format, false, false); + return texture->id; } #ifdef Q_MAC_COMPAT_GL_FUNCTIONS @@ -2103,17 +2129,8 @@ GLuint QGLContext::bindTexture(const QPixmap &pixmap, QMacCompatGLenum target, Q */ void QGLContext::deleteTexture(GLuint id) { - if (qt_tex_cache) { - QList keys = qt_tex_cache->keys(); - for (int i = 0; i < keys.size(); ++i) { - QGLTexture *tex = qt_tex_cache->object(keys.at(i)); - if (tex->id == id && tex->context == this) { - tex->clean = true; // forces a glDeleteTextures() call - qt_tex_cache->remove(keys.at(i)); - return; - } - } - } + if (QGLTextureCache::instance()->remove(this, id)) + return; // check the DDS cache if the texture wasn't found in the pixmap/image // cache @@ -2307,9 +2324,7 @@ void QGLContext::drawTexture(const QPointF &point, QMacCompatGLuint textureId, Q */ void QGLContext::setTextureCacheLimit(int size) { - qt_tex_cache_limit = size; - if (qt_tex_cache) - qt_tex_cache->setMaxCost(qt_tex_cache_limit); + QGLTextureCache::instance()->setMaxCost(size); } /*! @@ -2319,7 +2334,7 @@ void QGLContext::setTextureCacheLimit(int size) */ int QGLContext::textureCacheLimit() { - return qt_tex_cache_limit; + return QGLTextureCache::instance()->maxCost(); } @@ -4339,6 +4354,9 @@ void QGLExtensions::init_extensions() if (extensions.contains(QLatin1String("EXT_framebuffer_blit"))) glExtensions |= FramebufferBlit; + if (extensions.contains(QLatin1String("GL_ARB_texture_non_power_of_two"))) + glExtensions |= NPOTTextures; + QGLContext cx(QGLFormat::defaultFormat()); if (glExtensions & TextureCompression) { qt_glCompressedTexImage2DARB = (pfn_glCompressedTexImage2DARB) cx.getProcAddress(QLatin1String("glCompressedTexImage2DARB")); @@ -4546,32 +4564,34 @@ QGLFormat QGLDrawable::format() const GLuint QGLDrawable::bindTexture(const QImage &image, GLenum target, GLint format) { + QGLTexture *texture; if (widget) - return widget->d_func()->glcx->d_func()->bindTexture(image, target, format, true); + texture = widget->d_func()->glcx->d_func()->bindTexture(image, target, format, true); else if (buffer) - return buffer->d_func()->qctx->d_func()->bindTexture(image, target, format, true); + texture = buffer->d_func()->qctx->d_func()->bindTexture(image, target, format, true); else if (fbo && QGLContext::currentContext()) - return const_cast(QGLContext::currentContext())->d_func()->bindTexture(image, target, format, true); + texture = const_cast(QGLContext::currentContext())->d_func()->bindTexture(image, target, format, true); #if defined(Q_WS_QWS) || (!defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)) else if (wsurf) - return wsurf->context()->d_func()->bindTexture(image, target, format, true); + texture = wsurf->context()->d_func()->bindTexture(image, target, format, true); #endif - return 0; + return texture->id; } GLuint QGLDrawable::bindTexture(const QPixmap &pixmap, GLenum target, GLint format) { + QGLTexture *texture; if (widget) - return widget->d_func()->glcx->d_func()->bindTexture(pixmap, target, format, true); + texture = widget->d_func()->glcx->d_func()->bindTexture(pixmap, target, format, true, true); else if (buffer) - return buffer->d_func()->qctx->d_func()->bindTexture(pixmap, target, format, true); + texture = buffer->d_func()->qctx->d_func()->bindTexture(pixmap, target, format, true, true); else if (fbo && QGLContext::currentContext()) - return const_cast(QGLContext::currentContext())->d_func()->bindTexture(pixmap, target, format, true); + texture = const_cast(QGLContext::currentContext())->d_func()->bindTexture(pixmap, target, format, true, true); #if defined(Q_WS_QWS) || (!defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)) else if (wsurf) - return wsurf->context()->d_func()->bindTexture(pixmap, target, format, true); + texture = wsurf->context()->d_func()->bindTexture(pixmap, target, format, true, true); #endif - return 0; + return texture->id; } QColor QGLDrawable::backgroundColor() const diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index fda025730..01385f053 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -60,10 +60,7 @@ #include "QtCore/qthreadstorage.h" #include "QtCore/qhash.h" #include "private/qwidget_p.h" - -#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL) -#include "private/qpixmapdata_gl_p.h" -#endif +#include "qcache.h" #ifndef QT_OPENGL_ES_1_CL #define q_vertexType float @@ -203,17 +200,18 @@ struct QGLContextGroupResources QAtomicInt refs; }; +class QGLTexture; + class QGLContextPrivate { Q_DECLARE_PUBLIC(QGLContext) public: explicit QGLContextPrivate(QGLContext *context) : internal_context(false), q_ptr(context) {groupResources = new QGLContextGroupResources;} ~QGLContextPrivate() {if (!groupResources->refs.deref()) delete groupResources;} - GLuint bindTexture(const QImage &image, GLenum target, GLint format, const qint64 key, + QGLTexture *bindTexture(const QImage &image, GLenum target, GLint format, const qint64 key, bool clean = false); - GLuint bindTexture(const QPixmap &pixmap, GLenum target, GLint format, bool clean); - GLuint bindTexture(const QImage &image, GLenum target, GLint format, bool clean); - bool textureCacheLookup(const qint64 key, GLenum target, GLuint *id); + QGLTexture *bindTexture(const QPixmap &pixmap, GLenum target, GLint format, bool clean, bool canInvert = false); + QGLTexture *textureCacheLookup(const qint64 key, GLenum target); void init(QPaintDevice *dev, const QGLFormat &format); QImage convertToGLFormat(const QImage &image, bool force_premul, GLenum texture_format); int maxTextureSize(); @@ -241,6 +239,8 @@ public: void* pbuf; quint32 gpm; int screen; + QHash boundPixmaps; + QGLTexture *bindTextureFromNativePixmap(QPixmap *pm, const qint64 key, bool internal); #endif #if defined(Q_WS_MAC) bool update; @@ -300,6 +300,7 @@ class QGLPixelBuffer; class QGLFramebufferObject; class QWSGLWindowSurface; class QGLWindowSurface; +class QGLPixmapData; class QGLDrawable { public: QGLDrawable() : widget(0), buffer(0), fbo(0) @@ -360,7 +361,8 @@ public: PackedDepthStencil = 0x00000200, NVFloatBuffer = 0x00000400, PixelBufferObject = 0x00000800, - FramebufferBlit = 0x00001000 + FramebufferBlit = 0x00001000, + NPOTTextures = 0x00002000 }; Q_DECLARE_FLAGS(Extensions, Extension) @@ -397,6 +399,66 @@ private: extern Q_OPENGL_EXPORT QGLShareRegister* qgl_share_reg(); +class QGLTexture { +public: + QGLTexture(QGLContext *ctx = 0, GLuint tx_id = 0, GLenum tx_target = GL_TEXTURE_2D, + bool _clean = true, bool _yInverted = false) + : context(ctx), id(tx_id), target(tx_target), clean(_clean), yInverted(_yInverted) +#if defined(Q_WS_X11) + , boundPixmap(0) +#endif + {} + + ~QGLTexture() { + if (clean) { + QGLContext *current = const_cast(QGLContext::currentContext()); + QGLContext *ctx = const_cast(context); + bool switch_context = current && current != ctx && !qgl_share_reg()->checkSharing(current, ctx); + if (switch_context) + ctx->makeCurrent(); +#if defined(Q_WS_X11) + deleteBoundPixmap(); +#endif + glDeleteTextures(1, &id); + if (switch_context) + current->makeCurrent(); + } + } + + QGLContext *context; + GLuint id; + GLenum target; + bool clean; + bool yInverted; // NOTE: Y-Inverted textures are for internal use only! +#if defined(Q_WS_X11) + Qt::HANDLE boundPixmap; + void deleteBoundPixmap(); // in qgl_x11.cpp/qgl_x11egl.cpp +#endif +}; + +class QGLTextureCache { +public: + QGLTextureCache(); + ~QGLTextureCache(); + + void insert(QGLContext *ctx, qint64 key, QGLTexture *texture, int cost); + void remove(quint64 key) { m_cache.remove(key); } + bool remove(QGLContext *ctx, GLuint textureId); + void removeContextTextures(QGLContext *ctx); + int size() { return m_cache.size(); } + void setMaxCost(int newMax) { m_cache.setMaxCost(newMax); } + int maxCost() {return m_cache.maxCost(); } + QGLTexture* getTexture(quint64 key) { return m_cache.object(key); } + + static QGLTextureCache *instance(); + static void deleteIfEmpty(); + static void cleanupHook(qint64 cacheKey); + +private: + QCache m_cache; +}; + + #ifdef Q_WS_QWS extern QPaintEngine* qt_qgl_paint_engine(); diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 631625b72..0399b4825 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -52,6 +52,7 @@ #include "qdebug.h" #include #include +#include #ifdef Q_OS_HPUX // for GLXPBuffer #include @@ -1516,4 +1517,136 @@ void QGLExtensions::init() } } + +typedef void (*qt_glXBindTexImageEXT)(Display*, GLXDrawable, int, const int*); +typedef void (*qt_glXReleaseTexImageEXT)(Display*, GLXDrawable, int); +static qt_glXBindTexImageEXT glXBindTexImageEXT = 0; +static qt_glXReleaseTexImageEXT glXReleaseTexImageEXT = 0; +static bool qt_resolved_texture_from_pixmap = false; + +QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qint64 key, bool canInvert) +{ + Q_Q(QGLContext); + + if (pm->data_ptr()->classId() != QPixmapData::X11Class) + return 0; + QX11PixmapData *pixmapData = static_cast(pm->data_ptr()); + const QX11Info *x11Info = qt_x11Info(pm); + + + // Check to see if we have NPOT texture support + // TODO: Use GLX_TEXTURE_RECTANGLE_EXT texture target on systems without npot textures + if ( !(QGLExtensions::glExtensions & QGLExtensions::NPOTTextures) && + !(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0)) + return 0; + + if (!qt_resolved_texture_from_pixmap) { + qt_resolved_texture_from_pixmap = true; + + QString glxExt = QLatin1String(glXGetClientString(QX11Info::display(), GLX_EXTENSIONS)); + if (glxExt.contains(QLatin1String("GLX_EXT_texture_from_pixmap"))) { +#if defined(Q_OS_LINUX) || defined(Q_OS_BSD4) + void *handle = dlopen(NULL, RTLD_LAZY); + if (handle) { + glXBindTexImageEXT = (qt_glXBindTexImageEXT) dlsym(handle, "glXBindTexImageEXT"); + glXReleaseTexImageEXT = (qt_glXReleaseTexImageEXT) dlsym(handle, "glXReleaseTexImageEXT"); + dlclose(handle); + } + if (!glXBindTexImageEXT) +#endif + { + extern const QString qt_gl_library_name(); + QLibrary lib(qt_gl_library_name()); + glXBindTexImageEXT = (qt_glXBindTexImageEXT) lib.resolve("glXBindTexImageEXT"); + glXReleaseTexImageEXT = (qt_glXReleaseTexImageEXT) lib.resolve("glXReleaseTexImageEXT"); + } + } + } + + if (!glXBindTexImageEXT) + return 0; + +#if !defined(GLX_VERSION_1_3) || defined(Q_OS_HPUX) + return 0; +#else + GLXFBConfig *configList = 0; + GLXFBConfig glxPixmapConfig; + int configCount = 0; + bool hasAlpha = pixmapData->hasAlphaChannel(); + + int configAttribs[] = { + hasAlpha ? GLX_BIND_TO_TEXTURE_RGBA_EXT : GLX_BIND_TO_TEXTURE_RGB_EXT, True, + GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT, + GLX_BIND_TO_TEXTURE_TARGETS_EXT, GLX_TEXTURE_2D_BIT_EXT, + // QGLContext::bindTexture() can't return an inverted texture, but QPainter::drawPixmap() can: + GLX_Y_INVERTED_EXT, canInvert ? GLX_DONT_CARE : False, + XNone +// GLX_BIND_TO_MIPMAP_TEXTURE_EXT, False, +// GLX_BIND_TO_TEXTURE_TARGETS_EXT, GLX_TEXTURE_1D_BIT_EXT or GLX_TEXTURE_2D_BIT_EXT or GLX_TEXTURE_RECTANGLE_BIT_EXT + }; + configList = glXChooseFBConfig(x11Info->display(), x11Info->screen(), configAttribs, &configCount); + if (!configList) + return 0; + glxPixmapConfig = configList[0]; + XFree(configList); + + GLXPixmap glxPixmap; + int pixmapAttribs[] = { + GLX_TEXTURE_FORMAT_EXT, hasAlpha ? GLX_TEXTURE_FORMAT_RGBA_EXT : GLX_TEXTURE_FORMAT_RGB_EXT, + GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT, + GLX_MIPMAP_TEXTURE_EXT, False, + XNone +// GLX_TEXTURE_FORMAT_EXT, GLX_TEXTURE_FORMAT_RGBA_EXT or GLX_TEXTURE_FORMAT_RGB_EXT or GLX_TEXTURE_FORMAT_NONE_EXT, +// GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT or GLX_TEXTURE_RECTANGLE_EXT, +// GLX_MIPMAP_TEXTURE_EXT, True or False, + }; + + // Wrap the X Pixmap into a GLXPixmap: + glxPixmap = glXCreatePixmap(x11Info->display(), glxPixmapConfig, pixmapData->handle(), pixmapAttribs); + + if (!glxPixmap) + return 0; + + int yInverted; + glXGetFBConfigAttrib(x11Info->display(), glxPixmapConfig, GLX_Y_INVERTED_EXT, &yInverted); + + GLuint textureId; + glGenTextures(1, &textureId); + glBindTexture(GL_TEXTURE_2D, textureId); + glXBindTexImageEXT(x11Info->display(), glxPixmap, GLX_FRONT_LEFT_EXT, 0); + + glBindTexture(GL_TEXTURE_2D, textureId); + + QGLTexture *texture = new QGLTexture(q, textureId, GL_TEXTURE_2D, canInvert, yInverted); + texture->boundPixmap = glxPixmap; + + // We assume the cost of bound pixmaps is zero + QGLTextureCache::instance()->insert(q, key, texture, 0); + + return texture; +#endif //!defined(GLX_VERSION_1_3) || defined(Q_OS_HPUX) +} + +void QGLTexture::deleteBoundPixmap() +{ + if (boundPixmap) { + // Although glXReleaseTexImage is a glX call, it must be called while there + // is a current context - the context the pixmap was bound to a texture in. + // Otherwise the relese doesn't do anything and you get BadDrawable errors + // when you come to delete the context. + + QGLContext *oldContext = const_cast(QGLContext::currentContext()); + if (oldContext != context) + context->makeCurrent(); + glXReleaseTexImageEXT(QX11Info::display(), boundPixmap, GLX_FRONT_LEFT_EXT); + if (oldContext && oldContext != context) + oldContext->makeCurrent(); + + glXDestroyPixmap(QX11Info::display(), boundPixmap); + } + + boundPixmap = 0; +} + + QT_END_NAMESPACE diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp index 9db3a3098..11131ea67 100644 --- a/src/opengl/qgl_x11egl.cpp +++ b/src/opengl/qgl_x11egl.cpp @@ -469,4 +469,15 @@ void QGLWidgetPrivate::recreateEglSurface(bool force) } } +GLuint QGLContextPrivate::bindTextureFromNativePixmap(const QPixmap& pm, const qint64 key, bool canInvert) +{ + // TODO + return 0; +} + +void QGLTexture::deleteBoundPixmap() +{ + //TODO +} + QT_END_NAMESPACE diff --git a/src/opengl/qglpixmapfilter.cpp b/src/opengl/qglpixmapfilter.cpp index 7514743d9..5a06763bd 100644 --- a/src/opengl/qglpixmapfilter.cpp +++ b/src/opengl/qglpixmapfilter.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE void QGLPixmapFilterBase::bindTexture(const QPixmap &src) const { - const_cast(QGLContext::currentContext())->d_func()->bindTexture(src, GL_TEXTURE_2D, GL_RGBA, true); + const_cast(QGLContext::currentContext())->d_func()->bindTexture(src, GL_TEXTURE_2D, GL_RGBA, true, false); } void QGLPixmapFilterBase::drawImpl(QPainter *painter, const QPointF &pos, const QPixmap &src, const QRectF& source) const diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp index fe3bb0c16..e3ee2b286 100644 --- a/src/opengl/qpixmapdata_gl.cpp +++ b/src/opengl/qpixmapdata_gl.cpp @@ -97,7 +97,6 @@ static int qt_gl_pixmap_serial = 0; QGLPixmapData::QGLPixmapData(PixelType type) : QPixmapData(type, OpenGLClass) , m_renderFbo(0) - , m_textureId(0) , m_engine(0) , m_ctx(0) , m_dirty(false) @@ -113,9 +112,9 @@ QGLPixmapData::~QGLPixmapData() if (!shareWidget) return; - if (m_textureId) { + if (m_texture.id) { QGLShareContextScope ctx(shareWidget->context()); - glDeleteTextures(1, &m_textureId); + glDeleteTextures(1, &m_texture.id); } } @@ -148,10 +147,10 @@ void QGLPixmapData::resize(int width, int height) is_null = (w <= 0 || h <= 0); d = pixelType() == QPixmapData::PixmapType ? 32 : 1; - if (m_textureId) { + if (m_texture.id) { QGLShareContextScope ctx(qt_gl_share_widget()->context()); - glDeleteTextures(1, &m_textureId); - m_textureId = 0; + glDeleteTextures(1, &m_texture.id); + m_texture.id = 0; } m_source = QImage(); @@ -172,9 +171,9 @@ void QGLPixmapData::ensureCreated() const const GLenum format = qt_gl_preferredTextureFormat(); const GLenum target = GL_TEXTURE_2D; - if (!m_textureId) { - glGenTextures(1, &m_textureId); - glBindTexture(target, m_textureId); + if (!m_texture.id) { + glGenTextures(1, &m_texture.id); + glBindTexture(target, m_texture.id); GLenum format = m_hasAlpha ? GL_RGBA : GL_RGB; glTexImage2D(target, 0, format, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0); @@ -185,13 +184,15 @@ void QGLPixmapData::ensureCreated() const if (!m_source.isNull()) { const QImage tx = ctx->d_func()->convertToGLFormat(m_source, true, format); - glBindTexture(target, m_textureId); + glBindTexture(target, m_texture.id); glTexSubImage2D(target, 0, 0, 0, w, h, format, GL_UNSIGNED_BYTE, tx.bits()); if (useFramebufferObjects()) m_source = QImage(); } + + m_texture.clean = false; } QGLFramebufferObject *QGLPixmapData::fbo() const @@ -223,10 +224,10 @@ void QGLPixmapData::fromImage(const QImage &image, is_null = (w <= 0 || h <= 0); d = pixelType() == QPixmapData::PixmapType ? 32 : 1; - if (m_textureId) { + if (m_texture.id) { QGLShareContextScope ctx(qt_gl_share_widget()->context()); - glDeleteTextures(1, &m_textureId); - m_textureId = 0; + glDeleteTextures(1, &m_texture.id); + m_texture.id = 0; } } @@ -256,9 +257,9 @@ void QGLPixmapData::fill(const QColor &color) bool hasAlpha = color.alpha() != 255; if (hasAlpha && !m_hasAlpha) { - if (m_textureId) { - glDeleteTextures(1, &m_textureId); - m_textureId = 0; + if (m_texture.id) { + glDeleteTextures(1, &m_texture.id); + m_texture.id = 0; m_dirty = true; } m_hasAlpha = color.alpha() != 255; @@ -321,7 +322,7 @@ QImage QGLPixmapData::toImage() const } QGLShareContextScope ctx(qt_gl_share_widget()->context()); - glBindTexture(GL_TEXTURE_2D, m_textureId); + glBindTexture(GL_TEXTURE_2D, m_texture.id); return qt_gl_read_texture(QSize(w, h), true, true); } @@ -351,7 +352,7 @@ void QGLPixmapData::copyBackFromRenderFbo(bool keepCurrentFboBound) const glBindFramebuffer(GL_FRAMEBUFFER_EXT, ctx->d_ptr->fbo); glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, m_textureId, 0); + GL_TEXTURE_2D, m_texture.id, 0); const int x0 = 0; const int x1 = w; @@ -489,7 +490,7 @@ GLuint QGLPixmapData::bind(bool copyBack) const ensureCreated(); } - GLuint id = m_textureId; + GLuint id = m_texture.id; glBindTexture(GL_TEXTURE_2D, id); return id; } @@ -497,7 +498,12 @@ GLuint QGLPixmapData::bind(bool copyBack) const GLuint QGLPixmapData::textureId() const { ensureCreated(); - return m_textureId; + return m_texture.id; +} + +QGLTexture* QGLPixmapData::texture() const +{ + return &m_texture; } extern int qt_defaultDpiX(); diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h index a6aa22d09..671f9a79b 100644 --- a/src/opengl/qpixmapdata_gl_p.h +++ b/src/opengl/qpixmapdata_gl_p.h @@ -53,6 +53,7 @@ // We mean it. // +#include "qgl_p.h" #include "qgl.h" #include "private/qpixmapdata_p.h" @@ -80,10 +81,11 @@ public: void fill(const QColor &color); bool hasAlphaChannel() const; QImage toImage() const; - QPaintEngine* paintEngine() const; + QPaintEngine *paintEngine() const; GLuint bind(bool copyBack = true) const; GLuint textureId() const; + QGLTexture *texture() const; bool isValidContext(const QGLContext *ctx) const; @@ -116,10 +118,10 @@ private: QImage fillImage(const QColor &color) const; mutable QGLFramebufferObject *m_renderFbo; - mutable GLuint m_textureId; mutable QPaintEngine *m_engine; mutable QGLContext *m_ctx; mutable QImage m_source; + mutable QGLTexture m_texture; // the texture is not in sync with the source image mutable bool m_dirty; -- cgit v1.2.3 From 979a0f4e3625811997be40816adc2c5b53ec6da0 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 22 Jul 2009 16:52:53 +0200 Subject: QSslSocket autotest: adapt to new certificate on test server got a new certificate, which is self-signed now Reviewed-by: Thiago --- .../qsslsocket/certs/qt-test-server-cacert.pem | 35 ++++++++++------------ tests/auto/qsslsocket/tst_qsslsocket.cpp | 4 +-- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/tests/auto/qsslsocket/certs/qt-test-server-cacert.pem b/tests/auto/qsslsocket/certs/qt-test-server-cacert.pem index 83adca257..25bd4046e 100644 --- a/tests/auto/qsslsocket/certs/qt-test-server-cacert.pem +++ b/tests/auto/qsslsocket/certs/qt-test-server-cacert.pem @@ -1,22 +1,17 @@ -----BEGIN CERTIFICATE----- -MIIDuDCCAyGgAwIBAgIJAM17QpZu2GP7MA0GCSqGSIb3DQEBBAUAMIGaMQ4wDAYD -VQQKEwVOb2tpYTEUMBIGA1UECxMLUXQgU29mdHdhcmUxIjAgBgkqhkiG9w0BCQEW -E25vYm9keUBub2RvbWFpbi5vcmcxDTALBgNVBAcTBE9zbG8xDTALBgNVBAgTBE9z -bG8xCzAJBgNVBAYTAk5PMSMwIQYDVQQDExpxdC10ZXN0LXNlcnZlci5xdC10ZXN0 -LW5ldDAeFw0wODEyMDIxNDQ3MjZaFw0xODExMzAxNDQ3MjZaMIGaMQ4wDAYDVQQK -EwVOb2tpYTEUMBIGA1UECxMLUXQgU29mdHdhcmUxIjAgBgkqhkiG9w0BCQEWE25v -Ym9keUBub2RvbWFpbi5vcmcxDTALBgNVBAcTBE9zbG8xDTALBgNVBAgTBE9zbG8x -CzAJBgNVBAYTAk5PMSMwIQYDVQQDExpxdC10ZXN0LXNlcnZlci5xdC10ZXN0LW5l -dDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz7dQ0l6IYpwVUcvj0mQxvG80 -yzoRzYr+alh7HMmOFI6/xjBHD6zAEEmLBafY7M/xe8PGH7ds2l2BFJkz0OS+IJRX -8CdOoeFvmVyp+L84tzXk81NKnMQ3y8DiFc6aUkfnyybA0whIv/TlqNyrYeQUin+t -61dPf1vr0LAAm5HdeYECAwEAAaOCAQIwgf8wDAYDVR0TBAUwAwEB/zAdBgNVHQ4E -FgQUwhEr5xV4r0deMQd3XwFkFtwls20wgc8GA1UdIwSBxzCBxIAUwhEr5xV4r0de -MQd3XwFkFtwls22hgaCkgZ0wgZoxDjAMBgNVBAoTBU5va2lhMRQwEgYDVQQLEwtR -dCBTb2Z0d2FyZTEiMCAGCSqGSIb3DQEJARYTbm9ib2R5QG5vZG9tYWluLm9yZzEN -MAsGA1UEBxMET3NsbzENMAsGA1UECBMET3NsbzELMAkGA1UEBhMCTk8xIzAhBgNV -BAMTGnF0LXRlc3Qtc2VydmVyLnF0LXRlc3QtbmV0ggkAzXtClm7YY/swDQYJKoZI -hvcNAQEEBQADgYEAQ/8YDtHrUoEsu9j5J6GY8iuuT8jvs/W1se5vXzoITgld+vLM -RWzxz35Hwzy2n31MNmUagRyQsTNOvEtJTxPCP97eLLxxrHDAbRmY/PPcZfolfOQf -xKQYf9naBv2F9Bs0WcY9z0Dgdl27szTAN67vGddYx5HpU9UE8Or5hdFJI3I= +MIICrTCCAhYCCQCdDn5rci6VDjANBgkqhkiG9w0BAQQFADCBmjEOMAwGA1UEChMF +Tm9raWExFDASBgNVBAsTC1F0IFNvZnR3YXJlMSIwIAYJKoZIhvcNAQkBFhNub2Jv +ZHlAbm9kb21haW4ub3JnMQ0wCwYDVQQHEwRPc2xvMQ0wCwYDVQQIEwRPc2xvMQsw +CQYDVQQGEwJOTzEjMCEGA1UEAxMacXQtdGVzdC1zZXJ2ZXIucXQtdGVzdC1uZXQw +HhcNMDkwNzEwMDc0MTIzWhcNMTkwNzA4MDc0MTIzWjCBmjEOMAwGA1UEChMFTm9r +aWExFDASBgNVBAsTC1F0IFNvZnR3YXJlMSIwIAYJKoZIhvcNAQkBFhNub2JvZHlA +bm9kb21haW4ub3JnMQ0wCwYDVQQHEwRPc2xvMQ0wCwYDVQQIEwRPc2xvMQswCQYD +VQQGEwJOTzEjMCEGA1UEAxMacXQtdGVzdC1zZXJ2ZXIucXQtdGVzdC1uZXQwgZ8w +DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM2q22/WNMmn8cC+5EEYGeICySLmp9W6 +Ay6eKHr0Xxp3X3epETuPfvAuxp7rOtkS18EMUegkUj8jw0IMEcbyHKFC/rTCaYOt +93CxGBXMIChiMPAsFeYzGa/D6xzAkfcRaJRQ+Ek3CDLXPnXfo7xpABXezYcPXAJr +gsgBfWrwHdxzAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAy7YOLCZABQy2Ygkchq1I ++TUpvMn+gLwAyW8TNErM1V4lNY2+K78RawzKx3SqM97ymCy4TD45EA3A2gmi32NI +xSKBNjFyzngUqsXBdcSasALiowlZCiJrGwlGX5qCkBlxXvJeUEbuJLPYVl5FBjXZ +6o00K4cSPCqtqUez7WSmDZU= -----END CERTIFICATE----- diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index bdfa9ddaf..6cc6c0097 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -1388,9 +1388,7 @@ void tst_QSslSocket::verifyMode() QVERIFY(!socket.waitForEncrypted()); QList expectedErrors = QList() - << QSslError(QSslError::UnableToGetLocalIssuerCertificate, socket.peerCertificate()) - << QSslError(QSslError::CertificateUntrusted, socket.peerCertificate()) - << QSslError(QSslError::UnableToVerifyFirstCertificate, socket.peerCertificate()); + << QSslError(QSslError::SelfSignedCertificate, socket.peerCertificate()); QCOMPARE(socket.sslErrors(), expectedErrors); socket.abort(); -- cgit v1.2.3 From 9e5fa633913ef952ca4ef5312fe396bcfc885321 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Wed, 22 Jul 2009 17:12:17 +0200 Subject: Revert "Added a check that X11 timestamp goes forward only." In some cases we might get an invalid timestamp that is far away in the future, so remembering it will break all consequent X calls that require a timestamp because it just contains junk (for example clipboard will stop working). This happens with XIM+SCIM pair - whenever we start input method and type something to the widget, we get a XKeyPress event with a commited string, however the 'serial' and 'time' members of the XEvent structure are not initialized (according to valgrind) and contain junk. This reverts commit 2ed015b8a0ffad63f0f59b0e2255057f416895fb. Reviewed-By: Brad --- src/gui/kernel/qapplication_x11.cpp | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 163ceb68a..abedfd6c2 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -3142,48 +3142,43 @@ int QApplication::x11ProcessEvent(XEvent* event) #ifdef ALIEN_DEBUG //qDebug() << "QApplication::x11ProcessEvent:" << event->type; #endif - Time time = 0, userTime = 0; switch (event->type) { case ButtonPress: pressed_window = event->xbutton.window; - userTime = event->xbutton.time; + X11->userTime = event->xbutton.time; // fallthrough intended case ButtonRelease: - time = event->xbutton.time; + X11->time = event->xbutton.time; break; case MotionNotify: - time = event->xmotion.time; + X11->time = event->xmotion.time; break; case XKeyPress: - userTime = event->xkey.time; + X11->userTime = event->xkey.time; // fallthrough intended case XKeyRelease: - time = event->xkey.time; + X11->time = event->xkey.time; break; case PropertyNotify: - time = event->xproperty.time; + X11->time = event->xproperty.time; break; case EnterNotify: case LeaveNotify: - time = event->xcrossing.time; + X11->time = event->xcrossing.time; break; case SelectionClear: - time = event->xselectionclear.time; + X11->time = event->xselectionclear.time; break; default: -#ifndef QT_NO_XFIXES - if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) { - XFixesSelectionNotifyEvent *req = - reinterpret_cast(event); - time = req->selection_timestamp; - } -#endif break; } - if (time > X11->time) - X11->time = time; - if (userTime > X11->userTime) - X11->userTime = userTime; +#ifndef QT_NO_XFIXES + if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) { + XFixesSelectionNotifyEvent *req = + reinterpret_cast(event); + X11->time = req->selection_timestamp; + } +#endif QETWidget *widget = (QETWidget*)QWidget::find((WId)event->xany.window); -- cgit v1.2.3 From 7a208874ae5d69d2b70b08f03675ef8f0c843a7f Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 22 Jul 2009 17:30:01 +0200 Subject: Fix handling of invalid object paths and signatures in release mode. I had this #ifdef __OPTIMIZE__ there so that the compiler would know not to generate unnecessary calls and a long jump table for the switch of the marshalling code. Turns out that in release mode, the checks I added to make sure we detect invalid object paths and signatures were never hit (we always treated them as pure strings). So use the signature- and object path-checking code in both release and debug mode. Task-number: reported via email (tst_qdbusmarshall failing) Reviewed-by: Peter Hartmann --- src/dbus/qdbusmarshaller.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp index 7ada1edd0..646f68a95 100644 --- a/src/dbus/qdbusmarshaller.cpp +++ b/src/dbus/qdbusmarshaller.cpp @@ -388,16 +388,6 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg) case DBUS_TYPE_DOUBLE: qIterAppend(&iterator, ba, *signature, arg.constData()); return true; - - case DBUS_TYPE_STRING: - case DBUS_TYPE_OBJECT_PATH: - case DBUS_TYPE_SIGNATURE: { - const QByteArray data = - reinterpret_cast(arg.constData())->toUtf8(); - const char *rawData = data.constData(); - qIterAppend(&iterator, ba, *signature, &rawData); - return true; - } #else case DBUS_TYPE_BYTE: append( qvariant_cast(arg) ); @@ -426,6 +416,8 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg) case DBUS_TYPE_DOUBLE: append( arg.toDouble() ); return true; +#endif + case DBUS_TYPE_STRING: append( arg.toString() ); return true; @@ -435,7 +427,6 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg) case DBUS_TYPE_SIGNATURE: append( qvariant_cast(arg) ); return true; -#endif // compound types: case DBUS_TYPE_VARIANT: -- cgit v1.2.3 From 8e05fd54935be488165abe6762e69aabb9adf232 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Thu, 2 Jul 2009 11:32:49 +0200 Subject: QNetworkReply: add possibility to ignore specific SSL errors the same method was also added to QSslSocket. previously, it was only possible to ignore all SSL errors; now, it is also possible to only ignore specific SSL errors, given by a QList of QSslErrors. Moreover, it is possible to call this newly added method right after connecting, not just when we get the SSL error. Reviewed-by: Thiago Task-number: 257322 --- .../code/src_network_access_qnetworkreply.cpp | 10 +++ .../snippets/code/src_network_ssl_qsslsocket.cpp | 11 +++ src/network/access/qhttpnetworkconnection.cpp | 24 +++++- src/network/access/qhttpnetworkconnection_p.h | 6 +- src/network/access/qhttpnetworkreply.cpp | 7 ++ src/network/access/qhttpnetworkreply_p.h | 1 + src/network/access/qnetworkaccessbackend.cpp | 6 ++ src/network/access/qnetworkaccessbackend_p.h | 1 + .../access/qnetworkaccessdebugpipebackend.cpp | 1 + src/network/access/qnetworkaccesshttpbackend.cpp | 18 ++++- src/network/access/qnetworkaccesshttpbackend_p.h | 4 +- src/network/access/qnetworkreply.cpp | 34 ++++++++- src/network/access/qnetworkreply.h | 1 + src/network/access/qnetworkreplyimpl.cpp | 6 ++ src/network/access/qnetworkreplyimpl_p.h | 1 + src/network/ssl/qsslsocket.cpp | 36 ++++++++- src/network/ssl/qsslsocket.h | 1 + src/network/ssl/qsslsocket_openssl.cpp | 22 +++++- src/network/ssl/qsslsocket_p.h | 3 +- tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 88 +++++++++++++++++++++- tests/auto/qsslsocket/tst_qsslsocket.cpp | 84 ++++++++++++++++++++- 21 files changed, 348 insertions(+), 17 deletions(-) create mode 100644 doc/src/snippets/code/src_network_access_qnetworkreply.cpp diff --git a/doc/src/snippets/code/src_network_access_qnetworkreply.cpp b/doc/src/snippets/code/src_network_access_qnetworkreply.cpp new file mode 100644 index 000000000..78b388bd7 --- /dev/null +++ b/doc/src/snippets/code/src_network_access_qnetworkreply.cpp @@ -0,0 +1,10 @@ +//! [0] +QList cert = QSslCertificate::fromPath(QLatin1String("server-certificate.pem")); +QSslError error(QSslError::SelfSignedCertificate, cert.at(0)); +QList expectedSslErrors; +expectedSslErrors.append(error); + +QNetworkReply *reply = manager.get(QNetworkRequest(QUrl("https://server.tld/index.html"))); +reply->ignoreSslErrors(expectedSslErrors); +// here connect signals etc. +//! [0] diff --git a/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp b/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp index afffbab1e..7845e9b86 100644 --- a/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp +++ b/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp @@ -54,3 +54,14 @@ socket->connectToHostEncrypted("imap", 993); if (socket->waitForEncrypted(1000)) qDebug("Encrypted!"); //! [5] + +//! [6] +QList cert = QSslCertificate::fromPath(QLatin1String("server-certificate.pem")); +QSslError error(QSslError::SelfSignedCertificate, cert.at(0)); +QList expectedSslErrors; +expectedSslErrors.append(error); + +QSslSocket socket; +socket.ignoreSslErrors(expectedSslErrors); +socket.connectToHostEncrypted("server.tld", 443); +//! [6] diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index c66159661..c824faca5 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -340,8 +340,9 @@ bool QHttpNetworkConnectionPrivate::ensureConnection(QAbstractSocket *socket) #ifndef QT_NO_OPENSSL QSslSocket *sslSocket = qobject_cast(socket); sslSocket->connectToHostEncrypted(connectHost, connectPort); - if (channels[index].ignoreSSLErrors) + if (channels[index].ignoreAllSslErrors) sslSocket->ignoreSslErrors(); + sslSocket->ignoreSslErrors(channels[index].ignoreSslErrorsList); #else emitReplyError(socket, channels[index].reply, QNetworkReply::ProtocolUnknownError); #endif @@ -1448,15 +1449,32 @@ void QHttpNetworkConnection::ignoreSslErrors(int channel) if (channel == -1) { // ignore for all channels for (int i = 0; i < d->channelCount; ++i) { static_cast(d->channels[i].socket)->ignoreSslErrors(); - d->channels[i].ignoreSSLErrors = true; + d->channels[i].ignoreAllSslErrors = true; } } else { static_cast(d->channels[channel].socket)->ignoreSslErrors(); - d->channels[channel].ignoreSSLErrors = true; + d->channels[channel].ignoreAllSslErrors = true; } } +void QHttpNetworkConnection::ignoreSslErrors(const QList &errors, int channel) +{ + Q_D(QHttpNetworkConnection); + if (!d->encrypt) + return; + + if (channel == -1) { // ignore for all channels + for (int i = 0; i < d->channelCount; ++i) { + static_cast(d->channels[i].socket)->ignoreSslErrors(errors); + d->channels[i].ignoreSslErrorsList = errors; + } + + } else { + static_cast(d->channels[channel].socket)->ignoreSslErrors(errors); + d->channels[channel].ignoreSslErrorsList = errors; + } +} #endif //QT_NO_OPENSSL diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index 842a2f4f3..52a73a765 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -117,6 +117,7 @@ public: #ifndef QT_NO_OPENSSL void setSslConfiguration(const QSslConfiguration &config); void ignoreSslErrors(int channel = -1); + void ignoreSslErrors(const QList &errors, int channel = -1); Q_SIGNALS: void sslErrors(const QList &errors); @@ -241,13 +242,14 @@ public: QAuthenticator authenticator; QAuthenticator proxyAuthenticator; #ifndef QT_NO_OPENSSL - bool ignoreSSLErrors; + bool ignoreAllSslErrors; + QList ignoreSslErrorsList; #endif Channel() : socket(0), state(IdleState), reply(0), written(0), bytesTotal(0), resendCurrent(false), lastStatus(0), pendingEncrypt(false), reconnectAttempts(2), authMehtod(QAuthenticatorPrivate::None), proxyAuthMehtod(QAuthenticatorPrivate::None) #ifndef QT_NO_OPENSSL - , ignoreSSLErrors(false) + , ignoreAllSslErrors(false) #endif {} }; diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp index 2fe0d78cf..a62399908 100644 --- a/src/network/access/qhttpnetworkreply.cpp +++ b/src/network/access/qhttpnetworkreply.cpp @@ -712,6 +712,13 @@ void QHttpNetworkReply::ignoreSslErrors() d->connection->ignoreSslErrors(); } +void QHttpNetworkReply::ignoreSslErrors(const QList &errors) +{ + Q_D(QHttpNetworkReply); + if (d->connection) + d->connection->ignoreSslErrors(errors); +} + #endif //QT_NO_OPENSSL diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index fbbee127b..575e824b6 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -131,6 +131,7 @@ public: QSslConfiguration sslConfiguration() const; void setSslConfiguration(const QSslConfiguration &config); void ignoreSslErrors(); + void ignoreSslErrors(const QList &errors); Q_SIGNALS: void sslErrors(const QList &errors); diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp index 9e17b5489..caaa38e21 100644 --- a/src/network/access/qnetworkaccessbackend.cpp +++ b/src/network/access/qnetworkaccessbackend.cpp @@ -165,6 +165,12 @@ void QNetworkAccessBackend::ignoreSslErrors() // do nothing } +void QNetworkAccessBackend::ignoreSslErrors(const QList &errors) +{ + Q_UNUSED(errors); + // do nothing +} + void QNetworkAccessBackend::fetchSslConfiguration(QSslConfiguration &) const { // do nothing diff --git a/src/network/access/qnetworkaccessbackend_p.h b/src/network/access/qnetworkaccessbackend_p.h index 553b79588..27da5bc10 100644 --- a/src/network/access/qnetworkaccessbackend_p.h +++ b/src/network/access/qnetworkaccessbackend_p.h @@ -118,6 +118,7 @@ public: virtual void downstreamReadyWrite(); virtual void copyFinished(QIODevice *); virtual void ignoreSslErrors(); + virtual void ignoreSslErrors(const QList &errors); virtual void fetchSslConfiguration(QSslConfiguration &configuration) const; virtual void setSslConfiguration(const QSslConfiguration &configuration); diff --git a/src/network/access/qnetworkaccessdebugpipebackend.cpp b/src/network/access/qnetworkaccessdebugpipebackend.cpp index 2b3c128b4..394e19616 100644 --- a/src/network/access/qnetworkaccessdebugpipebackend.cpp +++ b/src/network/access/qnetworkaccessdebugpipebackend.cpp @@ -280,6 +280,7 @@ void QNetworkAccessDebugPipeBackend::socketConnected() bool QNetworkAccessDebugPipeBackend::waitForDownstreamReadyRead(int ms) { + Q_UNUSED(ms); qCritical("QNetworkAccess: Debug pipe backend does not support waitForReadyRead()"); return false; } diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp index 9c36026a1..5c8573575 100644 --- a/src/network/access/qnetworkaccesshttpbackend.cpp +++ b/src/network/access/qnetworkaccesshttpbackend.cpp @@ -294,7 +294,7 @@ public: QNetworkAccessHttpBackend::QNetworkAccessHttpBackend() : QNetworkAccessBackend(), httpReply(0), http(0), uploadDevice(0) #ifndef QT_NO_OPENSSL - , pendingSslConfiguration(0), pendingIgnoreSslErrors(false) + , pendingSslConfiguration(0), pendingIgnoreAllSslErrors(false) #endif { } @@ -521,8 +521,9 @@ void QNetworkAccessHttpBackend::postRequest() #ifndef QT_NO_OPENSSL if (pendingSslConfiguration) httpReply->setSslConfiguration(*pendingSslConfiguration); - if (pendingIgnoreSslErrors) + if (pendingIgnoreAllSslErrors) httpReply->ignoreSslErrors(); + httpReply->ignoreSslErrors(pendingIgnoreSslErrorsList); #endif connect(httpReply, SIGNAL(readyRead()), SLOT(replyReadyRead())); @@ -883,7 +884,18 @@ void QNetworkAccessHttpBackend::ignoreSslErrors() if (httpReply) httpReply->ignoreSslErrors(); else - pendingIgnoreSslErrors = true; + pendingIgnoreAllSslErrors = true; +} + +void QNetworkAccessHttpBackend::ignoreSslErrors(const QList &errors) +{ + if (httpReply) { + httpReply->ignoreSslErrors(errors); + } else { + // the pending list is set if QNetworkReply::ignoreSslErrors(const QList &errors) + // is called before QNetworkAccessManager::get() (or post(), etc.) + pendingIgnoreSslErrorsList = errors; + } } void QNetworkAccessHttpBackend::fetchSslConfiguration(QSslConfiguration &config) const diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h index dec69d047..968f4a5ff 100644 --- a/src/network/access/qnetworkaccesshttpbackend_p.h +++ b/src/network/access/qnetworkaccesshttpbackend_p.h @@ -85,6 +85,7 @@ public: virtual void copyFinished(QIODevice *); #ifndef QT_NO_OPENSSL virtual void ignoreSslErrors(); + virtual void ignoreSslErrors(const QList &errors); virtual void fetchSslConfiguration(QSslConfiguration &configuration) const; virtual void setSslConfiguration(const QSslConfiguration &configuration); @@ -112,7 +113,8 @@ private: #ifndef QT_NO_OPENSSL QSslConfiguration *pendingSslConfiguration; - bool pendingIgnoreSslErrors; + bool pendingIgnoreAllSslErrors; + QList pendingIgnoreSslErrorsList; #endif void disconnectFromHttp(); diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp index e807d2905..3abf92789 100644 --- a/src/network/access/qnetworkreply.cpp +++ b/src/network/access/qnetworkreply.cpp @@ -584,6 +584,38 @@ void QNetworkReply::setSslConfiguration(const QSslConfiguration &config) qt_metacall(QMetaObject::InvokeMetaMethod, id, arr); } } + +/*! + \overload + \since 4.6 + + If this function is called, the SSL errors given in \a errors + will be ignored. + + Note that you can set the expected certificate in the SSL error: + If, for instance, you want to issue a request to a server that uses + a self-signed certificate, consider the following snippet: + + \snippet doc/src/snippets/code/src_network_access_qnetworkreply.cpp 0 + + Multiple calls to this function will replace the list of errors that + were passed in previous calls. + You can clear the list of errors you want to ignore by calling this + function with an empty list. + + \sa sslConfiguration(), sslErrors(), QSslSocket::ignoreSslErrors() +*/ +void QNetworkReply::ignoreSslErrors(const QList &errors) +{ + // do this cryptic trick, because we could not add a virtual method to this class later on + // since that breaks binary compatibility + int id = metaObject()->indexOfMethod("ignoreSslErrorsImplementation(QList)"); + if (id != -1) { + QList copy(errors); + void *arr[] = { 0, © }; + qt_metacall(QMetaObject::InvokeMetaMethod, id, arr); + } +} #endif /*! @@ -598,7 +630,7 @@ void QNetworkReply::setSslConfiguration(const QSslConfiguration &config) sslErrors() signal, which indicates which errors were found. - \sa sslConfiguration(), sslErrors() + \sa sslConfiguration(), sslErrors(), QSslSocket::ignoreSslErrors() */ void QNetworkReply::ignoreSslErrors() { diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index 30e89f179..679ab71aa 100644 --- a/src/network/access/qnetworkreply.h +++ b/src/network/access/qnetworkreply.h @@ -134,6 +134,7 @@ public: #ifndef QT_NO_OPENSSL QSslConfiguration sslConfiguration() const; void setSslConfiguration(const QSslConfiguration &configuration); + void ignoreSslErrors(const QList &errors); #endif public Q_SLOTS: diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 1d4f70ede..de7f8b4f7 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -659,6 +659,12 @@ void QNetworkReplyImpl::ignoreSslErrors() d->backend->ignoreSslErrors(); } +void QNetworkReplyImpl::ignoreSslErrorsImplementation(const QList &errors) +{ + Q_D(QNetworkReplyImpl); + if (d->backend) + d->backend->ignoreSslErrors(errors); +} #endif // QT_NO_OPENSSL /*! diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index 83a8acacc..fba8d3455 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -89,6 +89,7 @@ public: Q_INVOKABLE QSslConfiguration sslConfigurationImplementation() const; Q_INVOKABLE void setSslConfigurationImplementation(const QSslConfiguration &configuration); virtual void ignoreSslErrors(); + Q_INVOKABLE virtual void ignoreSslErrorsImplementation(const QList &errors); #endif Q_DECLARE_PRIVATE(QNetworkReplyImpl) diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index fc297e436..df0afe3e8 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -356,7 +356,7 @@ QSslSocket::~QSslSocket() want to ignore the errors and continue connecting, you must call ignoreSslErrors(), either from inside a slot function connected to the sslErrors() signal, or prior to entering encrypted mode. If - ignoreSslErrors is not called, the connection is dropped, signal + ignoreSslErrors() is not called, the connection is dropped, signal disconnected() is emitted, and QSslSocket returns to the UnconnectedState. @@ -1592,7 +1592,33 @@ void QSslSocket::startServerEncryption() void QSslSocket::ignoreSslErrors() { Q_D(QSslSocket); - d->ignoreSslErrors = true; + d->ignoreAllSslErrors = true; +} + +/*! + \overload + \since 4.6 + + This method tells QSslSocket to ignore only the errors given in \a + errors. + + Note that you can set the expected certificate in the SSL error: + If, for instance, you want to connect to a server that uses + a self-signed certificate, consider the following snippet: + + \snippet doc/src/snippets/code/src_network_ssl_qsslsocket.cpp 6 + + Multiple calls to this function will replace the list of errors that + were passed in previous calls. + You can clear the list of errors you want to ignore by calling this + function with an empty list. + + \sa sslErrors() +*/ +void QSslSocket::ignoreSslErrors(const QList &errors) +{ + Q_D(QSslSocket); + d->ignoreErrorsList = errors; } /*! @@ -1732,7 +1758,11 @@ void QSslSocketPrivate::init() mode = QSslSocket::UnencryptedMode; autoStartHandshake = false; connectionEncrypted = false; - ignoreSslErrors = false; + ignoreAllSslErrors = false; + + // we don't want to clear the ignoreErrorsList, so + // that it is possible setting it before connecting +// ignoreErrorsList.clear(); readBuffer.clear(); writeBuffer.clear(); diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index 785a0835e..cab06671a 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -169,6 +169,7 @@ public: QList sslErrors() const; static bool supportsSsl(); + void ignoreSslErrors(const QList &errors); public Q_SLOTS: void startClientEncryption(); diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index ea62a4df7..130494e71 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -839,7 +839,27 @@ bool QSslSocketBackendPrivate::startHandshake() if (!errors.isEmpty()) { sslErrors = errors; emit q->sslErrors(errors); - if (doVerifyPeer && !ignoreSslErrors) { + + bool doEmitSslError; + if (!ignoreErrorsList.empty()) { + // check whether the errors we got are all in the list of expected errors + // (applies only if the method QSslSocket::ignoreSslErrors(const QList &errors) + // was called) + doEmitSslError = false; + for (int a = 0; a < errors.count(); a++) { + if (!ignoreErrorsList.contains(errors.at(a))) { + doEmitSslError = true; + break; + } + } + } else { + // if QSslSocket::ignoreSslErrors(const QList &errors) was not called and + // we get an SSL error, emit a signal unless we ignored all errors (by calling + // QSslSocket::ignoreSslErrors() ) + doEmitSslError = !ignoreAllSslErrors; + } + // check whether we need to emit an SSL handshake error + if (doVerifyPeer && doEmitSslError) { q->setErrorString(sslErrors.first().errorString()); q->setSocketError(QAbstractSocket::SslHandshakeFailedError); emit q->error(QAbstractSocket::SslHandshakeFailedError); diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index dc8e4f5ea..8fd2154e8 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -79,7 +79,8 @@ public: QSslSocket::SslMode mode; bool autoStartHandshake; bool connectionEncrypted; - bool ignoreSslErrors; + bool ignoreAllSslErrors; + QList ignoreErrorsList; bool* readyReadEmittedPointer; QRingBuffer readBuffer; diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index b67c727e3..788be1e34 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -114,6 +114,7 @@ class tst_QNetworkReply: public QObject MyCookieJar *cookieJar; #ifndef QT_NO_OPENSSL QSslConfiguration storedSslConfiguration; + QList storedExpectedSslErrors; #endif public: @@ -126,9 +127,11 @@ public Q_SLOTS: void gotError(); void authenticationRequired(QNetworkReply*,QAuthenticator*); void proxyAuthenticationRequired(const QNetworkProxy &,QAuthenticator*); + #ifndef QT_NO_OPENSSL void sslErrors(QNetworkReply*,const QList &); void storeSslConfiguration(); + void ignoreSslErrorListSlot(QNetworkReply *reply, const QList &); #endif protected Q_SLOTS: @@ -247,6 +250,13 @@ private Q_SLOTS: void httpConnectionCount(); void httpDownloadPerformance_data(); void httpDownloadPerformance(); + +#ifndef QT_NO_OPENSSL + void ignoreSslErrorsList_data(); + void ignoreSslErrorsList(); + void ignoreSslErrorsListWithSlot_data(); + void ignoreSslErrorsListWithSlot(); +#endif }; QT_BEGIN_NAMESPACE @@ -3540,7 +3550,7 @@ void tst_QNetworkReply::httpProxyCommands_data() << QUrl("http://0.0.0.0:4443/http-request") << QByteArray("HTTP/1.0 200 OK\r\nProxy-Connection: close\r\nContent-Length: 1\r\n\r\n1") << "GET http://0.0.0.0:4443/http-request HTTP/1."; -#ifndef QT_NO_SSL +#ifndef QT_NO_OPENSSL QTest::newRow("https") << QUrl("https://0.0.0.0:4443/https-request") << QByteArray("HTTP/1.0 200 Connection Established\r\n\r\n") @@ -3832,5 +3842,81 @@ void tst_QNetworkReply::httpDownloadPerformance() delete reply; } +#ifndef QT_NO_OPENSSL +void tst_QNetworkReply::ignoreSslErrorsList_data() +{ + QTest::addColumn("url"); + QTest::addColumn >("expectedSslErrors"); + QTest::addColumn("expectedNetworkError"); + + QList expectedSslErrors; + // apparently, because of some weird behaviour of SRCDIR, the file name below needs to start with a slash + QList certs = QSslCertificate::fromPath(QLatin1String(SRCDIR "/../qsslsocket/certs/qt-test-server-cacert.pem")); + QSslError rightError(QSslError::SelfSignedCertificate, certs.at(0)); + QSslError wrongError(QSslError::SelfSignedCertificate); + + QTest::newRow("SSL-failure-empty-list") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::SslHandshakeFailedError; + expectedSslErrors.append(wrongError); + QTest::newRow("SSL-failure-wrong-error") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::SslHandshakeFailedError; + expectedSslErrors.append(rightError); + QTest::newRow("allErrorsInExpectedList1") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::NoError; + expectedSslErrors.removeAll(wrongError); + QTest::newRow("allErrorsInExpectedList2") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::NoError; + expectedSslErrors.removeAll(rightError); + QTest::newRow("SSL-failure-empty-list-again") << "https://" + QtNetworkSettings::serverName() + "/index.html" << expectedSslErrors << QNetworkReply::SslHandshakeFailedError; +} + +void tst_QNetworkReply::ignoreSslErrorsList() +{ + QFETCH(QString, url); + QNetworkRequest request(url); + QNetworkReply *reply = manager.get(request); + + QFETCH(QList, expectedSslErrors); + reply->ignoreSslErrors(expectedSslErrors); + + connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); + QTestEventLoop::instance().enterLoop(10); + QVERIFY(!QTestEventLoop::instance().timeout()); + + QFETCH(QNetworkReply::NetworkError, expectedNetworkError); + QCOMPARE(reply->error(), expectedNetworkError); +} + +void tst_QNetworkReply::ignoreSslErrorsListWithSlot_data() +{ + ignoreSslErrorsList_data(); +} + +// this is not a test, just a slot called in the test below +void tst_QNetworkReply::ignoreSslErrorListSlot(QNetworkReply *reply, const QList &) +{ + reply->ignoreSslErrors(storedExpectedSslErrors); +} + +// do the same as in ignoreSslErrorsList, but ignore the errors in the slot +void tst_QNetworkReply::ignoreSslErrorsListWithSlot() +{ + QFETCH(QString, url); + QNetworkRequest request(url); + QNetworkReply *reply = manager.get(request); + + QFETCH(QList, expectedSslErrors); + // store the errors to ignore them later in the slot connected below + storedExpectedSslErrors = expectedSslErrors; + connect(&manager, SIGNAL(sslErrors(QNetworkReply *, const QList &)), + this, SLOT(ignoreSslErrorListSlot(QNetworkReply *, const QList &))); + + + connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); + QTestEventLoop::instance().enterLoop(10); + QVERIFY(!QTestEventLoop::instance().timeout()); + + QFETCH(QNetworkReply::NetworkError, expectedNetworkError); + QCOMPARE(reply->error(), expectedNetworkError); +} + +#endif // QT_NO_OPENSSL + QTEST_MAIN(tst_QNetworkReply) #include "tst_qnetworkreply.moc" diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index bc9d1ca7c..23eee2925 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -173,6 +173,10 @@ private slots: void disconnectFromHostWhenConnecting(); void disconnectFromHostWhenConnected(); void resetProxy(); + void ignoreSslErrorsList_data(); + void ignoreSslErrorsList(); + void ignoreSslErrorsListWithSlot_data(); + void ignoreSslErrorsListWithSlot(); static void exitLoop() { @@ -194,9 +198,11 @@ protected slots: if (errors.size() == 1 && errors.first().error() == QSslError::CertificateUntrusted) socket->ignoreSslErrors(); } + void ignoreErrorListSlot(const QList &errors); private: QSslSocket *socket; + QList storedExpectedSslErrors; #endif // QT_NO_OPENSSL private: static int loopLevel; @@ -609,7 +615,7 @@ void tst_QSslSocket::connectToHostEncryptedWithVerificationPeerName() QSslSocketPtr socket = newSocket(); this->socket = socket; - socket->addCaCertificates(QLatin1String("certs/qt-test-server-cacert.pem")); + socket->addCaCertificates(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem")); #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND connect(&socket, SIGNAL(sslErrors(QList)), this, SLOT(untrustedWorkaroundSlot(QList))); @@ -1537,6 +1543,82 @@ void tst_QSslSocket::resetProxy() QVERIFY2(socket2.waitForConnected(10000), qPrintable(socket.errorString())); } +void tst_QSslSocket::ignoreSslErrorsList_data() +{ + QTest::addColumn >("expectedSslErrors"); + QTest::addColumn("expectedSslErrorSignalCount"); + + // construct the list of errors that we will get with the SSL handshake and that we will ignore + QList expectedSslErrors; + // fromPath gives us a list of certs, but it actually only contains one + QList certs = QSslCertificate::fromPath(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem")); + QSslError rightError(QSslError::SelfSignedCertificate, certs.at(0)); + QSslError wrongError(QSslError::SelfSignedCertificate); + + + QTest::newRow("SSL-failure-empty-list") << expectedSslErrors << 1; + expectedSslErrors.append(wrongError); + QTest::newRow("SSL-failure-wrong-error") << expectedSslErrors << 1; + expectedSslErrors.append(rightError); + QTest::newRow("allErrorsInExpectedList1") << expectedSslErrors << 0; + expectedSslErrors.removeAll(wrongError); + QTest::newRow("allErrorsInExpectedList2") << expectedSslErrors << 0; + expectedSslErrors.removeAll(rightError); + QTest::newRow("SSL-failure-empty-list-again") << expectedSslErrors << 1; +} + +void tst_QSslSocket::ignoreSslErrorsList() +{ + QSslSocket socket; + connect(&socket, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), + this, SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*))); + +// this->socket = &socket; + QSslCertificate cert; + + QFETCH(QList, expectedSslErrors); + socket.ignoreSslErrors(expectedSslErrors); + + QFETCH(int, expectedSslErrorSignalCount); + QSignalSpy sslErrorsSpy(&socket, SIGNAL(error(QAbstractSocket::SocketError))); + + socket.connectToHostEncrypted(QtNetworkSettings::serverName(), 443); + + bool expectEncryptionSuccess = (expectedSslErrorSignalCount == 0); + QCOMPARE(socket.waitForEncrypted(10000), expectEncryptionSuccess); + QCOMPARE(sslErrorsSpy.count(), expectedSslErrorSignalCount); +} + +void tst_QSslSocket::ignoreSslErrorsListWithSlot_data() +{ + ignoreSslErrorsList_data(); +} + +// this is not a test, just a slot called in the test below +void tst_QSslSocket::ignoreErrorListSlot(const QList &) +{ + socket->ignoreSslErrors(storedExpectedSslErrors); +} + +void tst_QSslSocket::ignoreSslErrorsListWithSlot() +{ + QSslSocket socket; + this->socket = &socket; + + QFETCH(QList, expectedSslErrors); + // store the errors to ignore them later in the slot connected below + storedExpectedSslErrors = expectedSslErrors; + connect(&socket, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), + this, SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*))); + connect(&socket, SIGNAL(sslErrors(const QList &)), + this, SLOT(ignoreErrorListSlot(const QList &))); + socket.connectToHostEncrypted(QtNetworkSettings::serverName(), 443); + + QFETCH(int, expectedSslErrorSignalCount); + bool expectEncryptionSuccess = (expectedSslErrorSignalCount == 0); + QCOMPARE(socket.waitForEncrypted(10000), expectEncryptionSuccess); +} + #endif // QT_NO_OPENSSL QTEST_MAIN(tst_QSslSocket) -- cgit v1.2.3 From f81fcf7ea92e3d2a2291cca9b4908f5303dab00d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 22 Jul 2009 18:26:30 +0200 Subject: fix linker error for the cetest tool Reviewed-by: TrustMe --- tools/qtestlib/wince/cetest/bootstrapped.pri | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/qtestlib/wince/cetest/bootstrapped.pri b/tools/qtestlib/wince/cetest/bootstrapped.pri index 39f24c257..a31374e83 100644 --- a/tools/qtestlib/wince/cetest/bootstrapped.pri +++ b/tools/qtestlib/wince/cetest/bootstrapped.pri @@ -35,4 +35,5 @@ SOURCES += \ $$QT_SOURCE_TREE/src/corelib/tools/qmap.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qbitarray.cpp \ $$QT_SOURCE_TREE/src/corelib/kernel/qmetatype.cpp \ - $$QT_SOURCE_TREE/src/corelib/kernel/qvariant.cpp + $$QT_SOURCE_TREE/src/corelib/kernel/qvariant.cpp \ + $$QT_SOURCE_TREE/src/corelib/codecs/qutfcodec.cpp -- cgit v1.2.3 From d1eca480acd39c478957e39243ff61b55c0113b4 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Wed, 22 Jul 2009 18:28:18 +0200 Subject: Fix autotest compile failure --- tests/auto/qtoolbar/tst_qtoolbar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/qtoolbar/tst_qtoolbar.cpp b/tests/auto/qtoolbar/tst_qtoolbar.cpp index 002ea0439..856a93572 100644 --- a/tests/auto/qtoolbar/tst_qtoolbar.cpp +++ b/tests/auto/qtoolbar/tst_qtoolbar.cpp @@ -797,8 +797,8 @@ void tst_QToolBar::toolButtonStyle() QCOMPARE(tb.toolButtonStyle(), Qt::ToolButtonTextUnderIcon); QCOMPARE(spy.count(), 0); - tb.setToolButtonStyle(Qt::ToolButtonSystemDefault); - QCOMPARE(tb.toolButtonStyle(), Qt::ToolButtonSystemDefault); + tb.setToolButtonStyle(Qt::ToolButtonFollowStyle); + QCOMPARE(tb.toolButtonStyle(), Qt::ToolButtonFollowStyle); QCOMPARE(spy.count(), 1); } -- cgit v1.2.3 From 8768bcfa0000bc216a7f722cd82ac6b06b85a70d Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Wed, 22 Jul 2009 17:38:12 +0200 Subject: Plug a texture leak when deleting QPixmaps without a current context ~QGLTexture wouldn't make the texture's context current if the current context was zero, meaning the texture would leak. This also means deleteBoundPixmap doesn't need to make the context currnet anymore (as it's only called from ~QGLTexture). Reviewed-By: Kim --- src/opengl/qgl_p.h | 11 ++++++++--- src/opengl/qgl_x11.cpp | 14 +------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 01385f053..2ee3e1d7a 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -402,7 +402,7 @@ extern Q_OPENGL_EXPORT QGLShareRegister* qgl_share_reg(); class QGLTexture { public: QGLTexture(QGLContext *ctx = 0, GLuint tx_id = 0, GLenum tx_target = GL_TEXTURE_2D, - bool _clean = true, bool _yInverted = false) + bool _clean = false, bool _yInverted = false) : context(ctx), id(tx_id), target(tx_target), clean(_clean), yInverted(_yInverted) #if defined(Q_WS_X11) , boundPixmap(0) @@ -413,14 +413,19 @@ public: if (clean) { QGLContext *current = const_cast(QGLContext::currentContext()); QGLContext *ctx = const_cast(context); - bool switch_context = current && current != ctx && !qgl_share_reg()->checkSharing(current, ctx); + Q_ASSERT(ctx); + bool switch_context = current != ctx && !qgl_share_reg()->checkSharing(current, ctx); if (switch_context) ctx->makeCurrent(); #if defined(Q_WS_X11) + // Although glXReleaseTexImage is a glX call, it must be called while there + // is a current context - the context the pixmap was bound to a texture in. + // Otherwise the release doesn't do anything and you get BadDrawable errors + // when you come to delete the context. deleteBoundPixmap(); #endif glDeleteTextures(1, &id); - if (switch_context) + if (switch_context && current) current->makeCurrent(); } } diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 0399b4825..d8af4d546 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1630,22 +1630,10 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qi void QGLTexture::deleteBoundPixmap() { if (boundPixmap) { - // Although glXReleaseTexImage is a glX call, it must be called while there - // is a current context - the context the pixmap was bound to a texture in. - // Otherwise the relese doesn't do anything and you get BadDrawable errors - // when you come to delete the context. - - QGLContext *oldContext = const_cast(QGLContext::currentContext()); - if (oldContext != context) - context->makeCurrent(); glXReleaseTexImageEXT(QX11Info::display(), boundPixmap, GLX_FRONT_LEFT_EXT); - if (oldContext && oldContext != context) - oldContext->makeCurrent(); - glXDestroyPixmap(QX11Info::display(), boundPixmap); + boundPixmap = 0; } - - boundPixmap = 0; } -- cgit v1.2.3 From 5796404298446038878da065c32429a0e31e9506 Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Wed, 22 Jul 2009 18:43:06 +0200 Subject: Fix build on Mac The texture_from_pixmap patch removed a bindTexture overload from QGLContextPrivate which is actually needed by all architectures. It was just it's use in the mac compat methods which broke the build and highlighted the issue. Reviewed-By: Trustme --- src/opengl/qgl.cpp | 35 +++++++++++++++++++++++++++-------- src/opengl/qgl_p.h | 1 + 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 392e7505b..edda6b6d8 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1866,6 +1866,27 @@ QImage QGLContextPrivate::convertToGLFormat(const QImage &image, bool force_prem return result; } +/*! \internal */ +QGLTexture *QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint format, bool clean) +{ + const qint64 key = image.cacheKey(); + QGLTexture *texture = textureCacheLookup(key, target); + if (texture) { + glBindTexture(target, texture->id); + return texture; + } + + if (!texture) + texture = bindTexture(image, target, format, key, clean); + // NOTE: bindTexture(const QImage&, GLenum, GLint, const qint64, bool) should never return null + Q_ASSERT(texture); + + if (texture->id > 0) + const_cast(image).data_ptr()->is_cached = true; + + return texture; +} + QGLTexture* QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint format, const qint64 key, bool clean) { @@ -2011,16 +2032,12 @@ QGLTexture *QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target, if (!texture) texture = bindTexture(pixmap.toImage(), target, format, key, clean); - - // We should never return 0 as callers shouldn't need to null-check - static QGLTexture invalidTexture; - if (!texture) - texture = &invalidTexture; + // NOTE: bindTexture(const QImage&, GLenum, GLint, const qint64, bool) should never return null + Q_ASSERT(texture); if (texture->id > 0) const_cast(pixmap).data_ptr()->is_cached = true; - Q_ASSERT(texture); return texture; } @@ -2096,7 +2113,8 @@ GLuint QGLContext::bindTexture(const QImage &image, GLenum target, GLint format) GLuint QGLContext::bindTexture(const QImage &image, QMacCompatGLenum target, QMacCompatGLint format) { Q_D(QGLContext); - return d->bindTexture(image, GLenum(target), GLint(format), false); + QGLTexture *texture = d->bindTexture(image, GLenum(target), GLint(format), false); + return texture->id; } #endif @@ -2116,7 +2134,8 @@ GLuint QGLContext::bindTexture(const QPixmap &pixmap, GLenum target, GLint forma GLuint QGLContext::bindTexture(const QPixmap &pixmap, QMacCompatGLenum target, QMacCompatGLint format) { Q_D(QGLContext); - return d->bindTexture(pixmap, GLenum(target), GLint(format), false); + QGLTexture *texture = d->bindTexture(pixmap, GLenum(target), GLint(format), false, false); + return texture->id; } #endif diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 2ee3e1d7a..85dae0ddf 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -208,6 +208,7 @@ class QGLContextPrivate public: explicit QGLContextPrivate(QGLContext *context) : internal_context(false), q_ptr(context) {groupResources = new QGLContextGroupResources;} ~QGLContextPrivate() {if (!groupResources->refs.deref()) delete groupResources;} + QGLTexture *bindTexture(const QImage &image, GLenum target, GLint format, bool clean); QGLTexture *bindTexture(const QImage &image, GLenum target, GLint format, const qint64 key, bool clean = false); QGLTexture *bindTexture(const QPixmap &pixmap, GLenum target, GLint format, bool clean, bool canInvert = false); -- cgit v1.2.3 From 95baddfc2f5dc719188f52519c95206959983206 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Jul 2009 09:47:19 -0700 Subject: Rewrite QDFBScreen::exposeRegion This code should be a noop in the case where one has a proper dfb cursor and proper dfb window handling. This was the only case it actually worked. This patch makes it work for a screen cursor rendered by Qt and sets exposeRegion up to work for using an offscreen backing store. Since one can't query the background color set by directfb this patch also adds a connect option to set the background color. This is needed for erasing the background when the mouse cursor moves. Reviewed-by: Donald --- .../gfxdrivers/directfb/qdirectfbscreen.cpp | 286 +++++++++------------ src/plugins/gfxdrivers/directfb/qdirectfbscreen.h | 14 +- 2 files changed, 124 insertions(+), 176 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index 0928643f1..88e304cf0 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -70,7 +70,6 @@ public: IDirectFBDisplayLayer *dfbLayer; #endif IDirectFBScreen *dfbScreen; - QRegion prevExpose; QSet allocatedSurfaces; @@ -82,6 +81,7 @@ public: #endif QDirectFBScreen::DirectFBFlags directFBFlags; QImage::Format alphaPixmapFormat; + QColor backgroundColor; }; QDirectFBScreenPrivate::QDirectFBScreenPrivate(QDirectFBScreen *screen) @@ -1047,6 +1047,14 @@ bool QDirectFBScreen::connect(const QString &displaySpec) printDirectFBInfo(d_ptr->dfb, d_ptr->dfbSurface); #endif + QRegExp backgroundColorRegExp("bgcolor=?(.+)"); + backgroundColorRegExp.setCaseSensitivity(Qt::CaseInsensitive); + if (displayArgs.indexOf(backgroundColorRegExp) != -1) { + d_ptr->backgroundColor.setNamedColor(backgroundColorRegExp.cap(1)); + } + if (!d_ptr->backgroundColor.isValid()) + d_ptr->backgroundColor = Qt::green; + return true; } @@ -1087,7 +1095,7 @@ bool QDirectFBScreen::initDevice() #endif #ifndef QT_NO_QWS_CURSOR -#ifdef QT_NO_DIRECTFB_LAYER +#ifdef QT_NO_DIRECTFB_WM QScreenCursor::initSoftwareCursor(); #else qt_screencursor = new QDirectFBScreenCursor; @@ -1145,203 +1153,119 @@ QWSWindowSurface *QDirectFBScreen::createSurface(const QString &key) const return QScreen::createSurface(key); } -void QDirectFBScreen::compose(const QRegion ®ion) -{ - const QList windows = QWSServer::instance()->clientWindows(); - - QRegion blitRegion = region; - QRegion blendRegion; - - d_ptr->dfbSurface->SetBlittingFlags(d_ptr->dfbSurface, DSBLIT_NOFX); - - // blit opaque region - for (int i = 0; i < windows.size(); ++i) { - QWSWindow *win = windows.at(i); - QWSWindowSurface *surface = win->windowSurface(); - if (!surface) - continue; - - const QRegion r = win->allocatedRegion() & blitRegion; - if (r.isEmpty()) - continue; - - blitRegion -= r; - - if (surface->isRegionReserved()) { - // nothing - } else if (win->isOpaque()) { - const QPoint offset = win->requestedRegion().boundingRect().topLeft(); - - if (surface->key() == QLatin1String("directfb")) { - QDirectFBWindowSurface *s = static_cast(surface); - blit(s->directFBSurface(), offset, r); - } else { - blit(surface->image(), offset, r); - } - } else { - blendRegion += r; - } - if (blitRegion.isEmpty()) - break; - } - - { // fill background - const QRegion fill = blitRegion + blendRegion; - if (!fill.isEmpty()) { - const QColor color = QWSServer::instance()->backgroundBrush().color(); - solidFill(color, fill); - blitRegion = QRegion(); - } - } - - if (blendRegion.isEmpty()) - return; - - // blend non-opaque region - for (int i = windows.size() - 1; i >= 0; --i) { - QWSWindow *win = windows.at(i); - QWSWindowSurface *surface = win->windowSurface(); - if (!surface) - continue; - - const QRegion r = win->allocatedRegion() & blendRegion; - if (r.isEmpty()) - continue; - - DFBSurfaceBlittingFlags flags = DSBLIT_NOFX; - if (!win->isOpaque()) { - flags |= DSBLIT_BLEND_ALPHACHANNEL; - const uint opacity = win->opacity(); - if (opacity < 255) { - flags |= DSBLIT_BLEND_COLORALPHA; - d_ptr->dfbSurface->SetColor(d_ptr->dfbSurface, 0xff, 0xff, 0xff, opacity); - } - } - d_ptr->dfbSurface->SetBlittingFlags(d_ptr->dfbSurface, flags); - - const QPoint offset = win->requestedRegion().boundingRect().topLeft(); - - if (surface->key() == QLatin1String("directfb")) { - QDirectFBWindowSurface *s = static_cast(surface); - blit(s->directFBSurface(), offset, r); - } else { - blit(surface->image(), offset, r); - } - } -#if (Q_DIRECTFB_VERSION >= 0x010000) - d_ptr->dfbSurface->ReleaseSource(d_ptr->dfbSurface); -#endif -} - // Normally, when using DirectFB to compose the windows (I.e. when // QT_NO_DIRECTFB_WM isn't set), exposeRegion will simply return. If // QT_NO_DIRECTFB_WM is set, exposeRegion will compose only non-directFB // window surfaces. Normal, directFB surfaces are handled by DirectFB. +static inline bool needExposeRegion() +{ +#ifdef QT_NO_DIRECTFB_WM + return true; +#endif +#ifdef QT_NO_DIRECTFB_LAYER +#ifndef QT_NO_QWS_CURSOR + return true; +#endif +#endif + return false; +} + void QDirectFBScreen::exposeRegion(QRegion r, int changing) { + if (!needExposeRegion()) { + return; + } + const QList windows = QWSServer::instance()->clientWindows(); if (changing < 0 || changing >= windows.size()) return; -#ifndef QT_NO_DIRECTFB_WM + QWSWindow *win = windows.at(changing); QWSWindowSurface *s = win->windowSurface(); - if (s && s->key() == QLatin1String("directfb")) - return; -#endif - r &= region(); if (r.isEmpty()) return; - if (d_ptr->flipFlags & DSFLIP_BLIT) { - const QRect brect = r.boundingRect(); - DFBRegion dfbRegion = { brect.left(), brect.top(), - brect.right(), brect.bottom() }; - compose(r); - d_ptr->dfbSurface->Flip(d_ptr->dfbSurface, &dfbRegion, - d_ptr->flipFlags); + const QRect brect = r.boundingRect(); + + if (!s) { + solidFill(d_ptr->backgroundColor, r); } else { - compose(r + d_ptr->prevExpose); - d_ptr->dfbSurface->Flip(d_ptr->dfbSurface, 0, d_ptr->flipFlags); + const QRect windowGeometry = s->geometry(); + const QRegion outsideWindow = r.subtracted(windowGeometry); + if (!outsideWindow.isEmpty()) { + solidFill(d_ptr->backgroundColor, outsideWindow); + } + const QRegion insideWindow = r.intersected(windowGeometry); + if (!insideWindow.isEmpty()) { + QDirectFBWindowSurface *dfbWindowSurface = (s->key() == QLatin1String("directfb")) + ? static_cast(s) : 0; + if (dfbWindowSurface) { + IDirectFBSurface *surface = dfbWindowSurface->directFBSurface(); + if (d_ptr->directFBFlags & BoundingRectFlip || insideWindow.numRects() == 1) { + const QRect source = (insideWindow.boundingRect().intersected(windowGeometry)).translated(-windowGeometry.topLeft()); + const DFBRectangle rect = { + source.x(), source.y(), source.width(), source.height() + }; + d_ptr->dfbSurface->Blit(d_ptr->dfbSurface, surface, &rect, + windowGeometry.x() + source.x(), + windowGeometry.y() + source.y()); + } else { + const QVector rects = insideWindow.rects(); + const int count = rects.size(); + Q_ASSERT(count > 1); + for (int i=0; idfbSurface->Blit(d_ptr->dfbSurface, surface, &rect, + windowGeometry.x() + source.x(), + windowGeometry.y() + source.y()); + } + } + } + } } - d_ptr->prevExpose = r; -} - -void QDirectFBScreen::blit(const QImage &img, const QPoint &topLeft, - const QRegion ®) -{ - IDirectFBSurface *src = createDFBSurface(img, QDirectFBScreen::DontTrackSurface); - if (!src) { - qWarning("QDirectFBScreen::blit(): Error creating surface"); - return; - } - blit(src, topLeft, reg); + if (QScreenCursor *cursor = QScreenCursor::instance()) { + const QRect cursorRectangle = cursor->boundingRect(); + if (cursor->isVisible() && !cursor->isAccelerated() && cursorRectangle.intersects(brect)) { + const QImage image = cursor->image(); + IDirectFBSurface *surface = createDFBSurface(image, QDirectFBScreen::DontTrackSurface); + d_ptr->dfbSurface->SetBlittingFlags(d_ptr->dfbSurface, DSBLIT_BLEND_ALPHACHANNEL); + d_ptr->dfbSurface->Blit(d_ptr->dfbSurface, surface, 0, cursorRectangle.x(), cursorRectangle.y()); + surface->Release(surface); #if (Q_DIRECTFB_VERSION >= 0x010000) - d_ptr->dfbSurface->ReleaseSource(d_ptr->dfbSurface); + d_ptr->dfbSurface->ReleaseSource(d_ptr->dfbSurface); #endif - src->Release(src); -} - -void QDirectFBScreen::blit(IDirectFBSurface *src, const QPoint &topLeft, - const QRegion ®ion) -{ - const QVector rs = region.translated(-offset()).rects(); - const int size = rs.size(); - const QPoint tl = topLeft - offset(); - - QVarLengthArray rects(size); - QVarLengthArray points(size); - - int n = 0; - for (int i = 0; i < size; ++i) { - const QRect r = rs.at(i); - if (!r.isValid()) - continue; - rects[n].x = r.x() - tl.x(); - rects[n].y = r.y() - tl.y(); - rects[n].w = r.width(); - rects[n].h = r.height(); - points[n].x = r.x(); - points[n].y = r.y(); - ++n; + } } - - d_ptr->dfbSurface->BatchBlit(d_ptr->dfbSurface, src, rects.data(), - points.data(), n); + flipSurface(d_ptr->dfbSurface, d_ptr->flipFlags, r, QPoint()); } -// This function is only ever called by QScreen::drawBackground which -// is only ever called by QScreen::compose which is never called with -// DirectFB so it's really a noop. void QDirectFBScreen::solidFill(const QColor &color, const QRegion ®ion) { if (region.isEmpty()) return; - if (QDirectFBScreen::getImageFormat(d_ptr->dfbSurface) == QImage::Format_RGB32) { - data = QDirectFBScreen::lockSurface(d_ptr->dfbSurface, DSLF_WRITE, &lstep); - if (!data) - return; - - QScreen::solidFill(color, region); - d_ptr->dfbSurface->Unlock(d_ptr->dfbSurface); - data = 0; - lstep = 0; - } else { - d_ptr->dfbSurface->SetColor(d_ptr->dfbSurface, - color.red(), color.green(), color.blue(), - color.alpha()); - const QVector rects = region.rects(); - for (int i=0; idfbSurface->FillRectangle(d_ptr->dfbSurface, - r.x(), r.y(), r.width(), r.height()); - } + d_ptr->dfbSurface->SetColor(d_ptr->dfbSurface, + color.red(), color.green(), color.blue(), + color.alpha()); + const QVector rects = region.rects(); + for (int i=0; idfbSurface->FillRectangle(d_ptr->dfbSurface, + r.x(), r.y(), r.width(), r.height()); } } +void QDirectFBScreen::erase(const QRegion ®ion) +{ + solidFill(d_ptr->backgroundColor, region); +} + QImage::Format QDirectFBScreen::alphaPixmapFormat() const { return d_ptr->alphaPixmapFormat; @@ -1377,3 +1301,31 @@ uchar *QDirectFBScreen::lockSurface(IDirectFBSurface *surface, uint flags, int * return reinterpret_cast(mem); } + +void QDirectFBScreen::flipSurface(IDirectFBSurface *surface, DFBSurfaceFlipFlags flipFlags, + const QRegion ®ion, const QPoint &offset) +{ + if (!(flipFlags & DSFLIP_BLIT)) { + surface->Flip(surface, 0, flipFlags); + } else { + if (!(d_ptr->directFBFlags & BoundingRectFlip) && region.numRects() > 1) { + const QVector rects = region.rects(); + const DFBSurfaceFlipFlags nonWaitFlags = flipFlags & ~DSFLIP_WAIT; + for (int i=0; iFlip(surface, &dfbReg, i + 1 < rects.size() ? nonWaitFlags : flipFlags); + } + } else { + const QRect r = region.boundingRect(); + const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(), + r.x() + r.width() + offset.x(), + r.y() + r.height() + offset.y() }; + surface->Flip(surface, &dfbReg, flipFlags); + } + } +} + + diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h index 090a6858f..c1289325a 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h @@ -52,7 +52,6 @@ QT_MODULE(Gui) #define Q_DIRECTFB_VERSION ((DIRECTFB_MAJOR_VERSION << 16) | (DIRECTFB_MINOR_VERION << 8) | DIRECTFB_MICRO_VERSION) -#include #define DIRECTFB_DECLARE_OPERATORS_FOR_FLAGS(F) \ static inline F operator~(F f) { return F(~int(f)); } \ static inline F operator&(F left, F right) { return F(int(left) & int(right)); } \ @@ -94,7 +93,6 @@ public: void shutdownDevice(); void exposeRegion(QRegion r, int changing); - void blit(const QImage &img, const QPoint &topLeft, const QRegion ®ion); void scroll(const QRegion ®ion, const QPoint &offset); void solidFill(const QColor &color, const QRegion ®ion); @@ -131,9 +129,12 @@ public: QImage::Format format, SurfaceCreationOptions options); IDirectFBSurface *copyToDFBSurface(const QImage &image, - QImage::Format format, - SurfaceCreationOptions options); + QImage::Format format, + SurfaceCreationOptions options); + void flipSurface(IDirectFBSurface *surface, DFBSurfaceFlipFlags flipFlags, + const QRegion ®ion, const QPoint &offset); void releaseDFBSurface(IDirectFBSurface *surface); + void erase(const QRegion ®ion); static int depth(DFBSurfacePixelFormat format); @@ -154,14 +155,9 @@ public: #endif static uchar *lockSurface(IDirectFBSurface *surface, uint flags, int *bpl = 0); - private: IDirectFBSurface *createDFBSurface(DFBSurfaceDescription desc, SurfaceCreationOptions options); - void compose(const QRegion &r); - void blit(IDirectFBSurface *src, const QPoint &topLeft, - const QRegion ®ion); - QDirectFBScreenPrivate *d_ptr; friend class SurfaceCache; }; -- cgit v1.2.3 From eb6fa7e03a5c91e3da93d0c6203d9bad52dfcbb9 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Jul 2009 09:50:49 -0700 Subject: Fix dfbwindowsurface handling for offscreen mode This patch vastly simplifies the geometry handling (setGeometry/move) It also implements a mode in which DirectFB implementations that do not support windows can use an offscreen buffer as its backing store. Previously the only way to do this was to paint directly on the primary surface. This didn't work when the dfb driver didn't support an accelerated mouse cursor. It also detects the situation when the cursor isn't accelerated and takes care of painting it manually when needed. Reviewed-by: Donald --- .../gfxdrivers/directfb/qdirectfbwindowsurface.cpp | 268 +++++++++++---------- .../gfxdrivers/directfb/qdirectfbwindowsurface.h | 10 +- 2 files changed, 151 insertions(+), 127 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp index 7dcf39831..ed4b2d900 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp @@ -44,10 +44,10 @@ #include "qdirectfbpaintengine.h" #include +#include #include #include - //#define QT_DIRECTFB_DEBUG_SURFACES 1 QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirectFBScreen *scr) @@ -59,6 +59,11 @@ QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirect , flipFlags(flip) , boundingRectFlip(scr->directFBFlags() & QDirectFBScreen::BoundingRectFlip) { +#ifdef QT_NO_DIRECTFB_WM + mode = Offscreen; +#else + mode = Window; +#endif setSurfaceFlags(Opaque | Buffered); #ifdef QT_DIRECTFB_TIMING frames = 0; @@ -75,11 +80,17 @@ QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirect , flipFlags(flip) , boundingRectFlip(scr->directFBFlags() & QDirectFBScreen::BoundingRectFlip) { - onscreen = widget->testAttribute(Qt::WA_PaintOnScreen); - if (onscreen) + if (widget && widget->testAttribute(Qt::WA_PaintOnScreen)) { setSurfaceFlags(Opaque | RegionReserved); - else + mode = Primary; + } else { +#ifdef QT_NO_DIRECTFB_WM + mode = Offscreen; +#else + mode = Window; +#endif setSurfaceFlags(Opaque | Buffered); + } #ifdef QT_DIRECTFB_TIMING frames = 0; timer.start(); @@ -99,7 +110,7 @@ bool QDirectFBWindowSurface::isValid() const void QDirectFBWindowSurface::createWindow() { #ifdef QT_NO_DIRECTFB_LAYER -#warning QT_NO_DIRECTFB_LAYER requires QT_NO_DIRECTFB_WM +#error QT_NO_DIRECTFB_LAYER requires QT_NO_DIRECTFB_WM #else IDirectFBDisplayLayer *layer = screen->dfbDisplayLayer(); if (!layer) @@ -129,8 +140,40 @@ void QDirectFBWindowSurface::createWindow() } #endif // QT_NO_DIRECTFB_WM -void QDirectFBWindowSurface::setGeometry(const QRect &rect, const QRegion &mask) +#ifndef QT_NO_DIRECTFB_WM +static DFBResult setGeometry(IDirectFBWindow *dfbWindow, const QRect &old, const QRect &rect) +{ + DFBResult result = DFB_OK; + const bool isMove = old.isEmpty() || rect.topLeft() != old.topLeft(); + const bool isResize = rect.size() != old.size(); + +#if (Q_DIRECTFB_VERSION >= 0x010000) + if (isResize && isMove) { + result = dfbWindow->SetBounds(dfbWindow, rect.x(), rect.y(), + rect.width(), rect.height()); + } else if (isResize) { + result = dfbWindow->Resize(dfbWindow, + rect.width(), rect.height()); + } else if (isMove) { + result = dfbWindow->MoveTo(dfbWindow, rect.x(), rect.y()); + } +#else + if (isResize) { + result = dfbWindow->Resize(dfbWindow, + rect.width(), rect.height()); + } + if (isMove) { + result = dfbWindow->MoveTo(dfbWindow, rect.x(), rect.y()); + } +#endif + return result; +} +#endif + +void QDirectFBWindowSurface::setGeometry(const QRect &rect) { + IDirectFBSurface *primarySurface = screen->dfbSurface(); + Q_ASSERT(primarySurface); if (rect.isNull()) { #ifndef QT_NO_DIRECTFB_WM if (dfbWindow) { @@ -138,22 +181,21 @@ void QDirectFBWindowSurface::setGeometry(const QRect &rect, const QRegion &mask) dfbWindow = 0; } #endif - if (dfbSurface && dfbSurface != screen->dfbSurface()) { - dfbSurface->Release(dfbSurface); + if (dfbSurface) { + if (dfbSurface != primarySurface) { + dfbSurface->Release(dfbSurface); + } dfbSurface = 0; } } else if (rect != geometry()) { + const QRect oldRect = geometry(); DFBResult result = DFB_OK; - // If we're in a resize, the surface shouldn't be locked Q_ASSERT((lockedImage == 0) || (rect.size() == geometry().size())); - - if (onscreen) { - IDirectFBSurface *primarySurface = screen->dfbSurface(); - Q_ASSERT(primarySurface); + switch (mode) { + case Primary: if (dfbSurface && dfbSurface != primarySurface) dfbSurface->Release(dfbSurface); - if (rect == screen->region().boundingRect()) { dfbSurface = primarySurface; } else { @@ -161,58 +203,32 @@ void QDirectFBWindowSurface::setGeometry(const QRect &rect, const QRegion &mask) rect.width(), rect.height() }; result = primarySurface->GetSubSurface(primarySurface, &r, &dfbSurface); } - } else { - const bool isResize = rect.size() != geometry().size(); -#ifdef QT_NO_DIRECTFB_WM - if (isResize) { + break; + case Window: +#ifndef QT_NO_DIRECTFB_WM + if (!dfbWindow) + createWindow(); + ::setGeometry(dfbWindow, oldRect, rect); + // ### do I need to release and get the surface again here? +#endif + break; + case Offscreen: { + if (!dfbSurface || oldRect.size() != rect.size()) { if (dfbSurface) dfbSurface->Release(dfbSurface); - - IDirectFB *dfb = screen->dfb(); - if (!dfb) { - qFatal("QDirectFBWindowSurface::setGeometry(): " - "Unable to get DirectFB handle!"); - } - dfbSurface = screen->createDFBSurface(rect.size(), screen->pixelFormat(), QDirectFBScreen::DontTrackSurface); - } else { - Q_ASSERT(dfbSurface); - } -#else - const QRect oldRect = geometry(); - const bool isMove = oldRect.isEmpty() || - rect.topLeft() != oldRect.topLeft(); - - if (!dfbWindow) - createWindow(); - -#if (Q_DIRECTFB_VERSION >= 0x010000) - if (isResize && isMove) { - result = dfbWindow->SetBounds(dfbWindow, rect.x(), rect.y(), - rect.width(), rect.height()); - } else if (isResize) { - result = dfbWindow->Resize(dfbWindow, - rect.width(), rect.height()); - } else if (isMove) { - result = dfbWindow->MoveTo(dfbWindow, rect.x(), rect.y()); - } -#else - if (isResize) { - result = dfbWindow->Resize(dfbWindow, - rect.width(), rect.height()); } - if (isMove) { - result = dfbWindow->MoveTo(dfbWindow, rect.x(), rect.y()); - } -#endif -#endif + const QRegion region = QRegion(oldRect.isEmpty() ? screen->region() : QRegion(oldRect)).subtracted(rect); + screen->erase(region); + screen->flipSurface(primarySurface, flipFlags, region, QPoint()); + break; } } if (result != DFB_OK) DirectFBErrorFatal("QDirectFBWindowSurface::setGeometry()", result); } - QWSWindowSurface::setGeometry(rect, mask); + QWSWindowSurface::setGeometry(rect); } QByteArray QDirectFBWindowSurface::permanentState() const @@ -254,7 +270,6 @@ static inline void scrollSurface(IDirectFBSurface *surface, const QRect &r, int surface->Blit(surface, surface, &rect, r.x() + dx, r.y() + dy); } - bool QDirectFBWindowSurface::scroll(const QRegion ®ion, int dx, int dy) { if (!dfbSurface || !(flipFlags & DSFLIP_BLIT) || region.isEmpty()) @@ -272,35 +287,13 @@ bool QDirectFBWindowSurface::scroll(const QRegion ®ion, int dx, int dy) return true; } -bool QDirectFBWindowSurface::move(const QPoint &offset) -{ - QWSWindowSurface::move(offset); - -#ifdef QT_NO_DIRECTFB_WM - return true; // buffered -#else - if (!dfbWindow) - return false; - - DFBResult status = dfbWindow->Move(dfbWindow, offset.x(), offset.y()); - return (status == DFB_OK); -#endif -} - -QRegion QDirectFBWindowSurface::move(const QPoint &offset, const QRegion &newClip) +bool QDirectFBWindowSurface::move(const QPoint &moveBy) { -#ifdef QT_NO_DIRECTFB_WM - return QWSWindowSurface::move(offset, newClip); -#else - Q_UNUSED(offset); - Q_UNUSED(newClip); - - // DirectFB handles the entire move, so there's no need to blit. - return QRegion(); -#endif + setGeometry(geometry().translated(moveBy)); + return true; } -QPaintEngine* QDirectFBWindowSurface::paintEngine() const +QPaintEngine *QDirectFBWindowSurface::paintEngine() const { if (!engine) { QDirectFBWindowSurface *that = const_cast(this); @@ -333,57 +326,86 @@ inline bool isWidgetOpaque(const QWidget *w) return false; } -void QDirectFBWindowSurface::flush(QWidget *widget, const QRegion ®ion, + +void QDirectFBWindowSurface::flush(QWidget *, const QRegion ®ion, const QPoint &offset) { - Q_UNUSED(widget); -#ifdef QT_NO_DIRECTFB_WM - Q_UNUSED(region); - Q_UNUSED(offset); -#endif - - QWidget *win = window(); - // hw: make sure opacity information is updated before compositing - const bool opaque = isWidgetOpaque(win); - if (opaque != isOpaque()) { - SurfaceFlags flags = Buffered; - if (opaque) - flags |= Opaque; - setSurfaceFlags(flags); - } + if (QWidget *win = window()) { + + const bool opaque = isWidgetOpaque(win); + if (opaque != isOpaque()) { + SurfaceFlags flags = surfaceFlags(); + if (opaque) { + flags |= Opaque; + } else { + flags &= ~Opaque; + } + setSurfaceFlags(flags); + } #ifndef QT_NO_DIRECTFB_WM - const quint8 winOpacity = quint8(win->windowOpacity() * 255); - quint8 opacity; + const quint8 winOpacity = quint8(win->windowOpacity() * 255); + quint8 opacity; - if (dfbWindow) { - dfbWindow->GetOpacity(dfbWindow, &opacity); - if (winOpacity != opacity) - dfbWindow->SetOpacity(dfbWindow, winOpacity); - } + if (dfbWindow) { + dfbWindow->GetOpacity(dfbWindow, &opacity); + if (winOpacity != opacity) + dfbWindow->SetOpacity(dfbWindow, winOpacity); + } #endif - if (!(flipFlags & DSFLIP_BLIT)) { - dfbSurface->Flip(dfbSurface, 0, flipFlags); - } else { - if (!boundingRectFlip && region.numRects() > 1) { + } + + if (mode == Offscreen) { + IDirectFBSurface *primarySurface = screen->dfbSurface(); + primarySurface->SetBlittingFlags(primarySurface, DSBLIT_NOFX); + const QRect windowGeometry = QDirectFBWindowSurface::geometry(); + const QRect windowRect(0, 0, windowGeometry.width(), windowGeometry.height()); + if (boundingRectFlip || region.numRects() == 1) { + const QRect regionBoundingRect = region.boundingRect().translated(offset); + const QRect source = windowRect & regionBoundingRect; + const DFBRectangle rect = { + source.x(), source.y(), source.width(), source.height() + }; + primarySurface->Blit(primarySurface, dfbSurface, &rect, + windowGeometry.x() + source.x(), + windowGeometry.y() + source.y()); + } else { const QVector rects = region.rects(); - const DFBSurfaceFlipFlags nonWaitFlags = flipFlags & ~DSFLIP_WAIT; - for (int i=0; iFlip(dfbSurface, &dfbReg, i + 1 < rects.size() ? nonWaitFlags : flipFlags); + const int count = rects.size(); + for (int i=0; iBlit(primarySurface, dfbSurface, &rect, + windowGeometry.x() + source.x(), + windowGeometry.y() + source.y()); } - } else { - const QRect r = region.boundingRect(); - const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(), - r.x() + r.width() + offset.x(), - r.y() + r.height() + offset.y() }; - dfbSurface->Flip(dfbSurface, &dfbReg, flipFlags); } + if (QScreenCursor *cursor = QScreenCursor::instance()) { + const QRect cursorRectangle = cursor->boundingRect(); + if (cursor->isVisible() && !cursor->isAccelerated() + && region.intersects(cursorRectangle.translated(-(offset + windowGeometry.topLeft())))) { + const QImage image = cursor->image(); + + IDirectFBSurface *surface = screen->createDFBSurface(image, QDirectFBScreen::DontTrackSurface); + primarySurface->SetBlittingFlags(primarySurface, DSBLIT_BLEND_ALPHACHANNEL); + primarySurface->Blit(primarySurface, surface, 0, cursorRectangle.x(), cursorRectangle.y()); + surface->Release(surface); +#if (Q_DIRECTFB_VERSION >= 0x010000) + primarySurface->ReleaseSource(primarySurface); +#endif + } + } + + screen->flipSurface(primarySurface, flipFlags, region, offset + windowGeometry.topLeft()); + } else { + screen->flipSurface(dfbSurface, flipFlags, region, offset); } + + #ifdef QT_DIRECTFB_TIMING enum { Secs = 3 }; ++frames; diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h index 7885b735b..c46d93bf4 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h @@ -67,7 +67,7 @@ public: bool isValid() const; - void setGeometry(const QRect &rect, const QRegion &mask); + void setGeometry(const QRect &rect); QString key() const { return QLatin1String("directfb"); } QByteArray permanentState() const; @@ -76,7 +76,6 @@ public: bool scroll(const QRegion &area, int dx, int dy); bool move(const QPoint &offset); - QRegion move(const QPoint &offset, const QRegion &newClip); QImage image() const { return QImage(); } QPaintDevice *paintDevice() { return this; } @@ -88,7 +87,6 @@ public: void endPaint(const QRegion &); QImage *buffer(const QWidget *widget); - private: #ifndef QT_NO_DIRECTFB_WM void createWindow(); @@ -96,7 +94,11 @@ private: #endif QDirectFBPaintEngine *engine; - bool onscreen; + enum Mode { + Primary, + Offscreen, + Window + } mode; QList bufferImages; DFBSurfaceFlipFlags flipFlags; -- cgit v1.2.3 From d79f61b51868712590f423483f4d3b39cb60aa64 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Jul 2009 11:20:32 -0700 Subject: Fix IDirectFBSurface::ReleaseSource calls Make sure that these calls are in the right order. Reviewed-by: Donald --- src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp | 2 +- src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index 94f1aeb26..68f37ff4f 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -466,7 +466,7 @@ void QDirectFBPaintEngine::drawImage(const QRectF &r, const QImage &image, d->blit(r, imgSurface, sr); if (release) { #if (Q_DIRECTFB_VERSION >= 0x010000) - imgSurface->ReleaseSource(imgSurface); + d->surface->ReleaseSource(d->surface); #endif imgSurface->Release(imgSurface); } diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index 88e304cf0..e12cbc40c 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -141,6 +141,7 @@ IDirectFBSurface *QDirectFBScreen::createDFBSurface(const QImage &img, SurfaceCr { if (img.isNull()) // assert? return 0; + if (QDirectFBScreen::getSurfacePixelFormat(img.format()) == DSPF_UNKNOWN) { QImage image = img.convertToFormat(img.hasAlphaChannel() ? d_ptr->alphaPixmapFormat @@ -321,10 +322,10 @@ IDirectFBSurface *QDirectFBScreen::copyToDFBSurface(const QImage &img, DFBResult result = dfbSurface->Blit(dfbSurface, imgSurface, 0, 0, 0); if (result != DFB_OK) DirectFBError("QDirectFBScreen::copyToDFBSurface()", result); + imgSurface->Release(imgSurface); #if (Q_DIRECTFB_VERSION >= 0x010000) dfbSurface->ReleaseSource(dfbSurface); #endif - imgSurface->Release(imgSurface); #else // QT_NO_DIRECTFB_PREALLOCATED Q_ASSERT(image.format() == pixmapFormat); int bpl; -- cgit v1.2.3 From 18728d2ddd725199017a36cb290c30d6e8c9e647 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Jul 2009 11:25:47 -0700 Subject: Use dfbsurface::FillRectangles in solidFill Minor optimization Reviewed-by: Donald --- src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index e12cbc40c..ae2e38ba3 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -1254,11 +1254,21 @@ void QDirectFBScreen::solidFill(const QColor &color, const QRegion ®ion) d_ptr->dfbSurface->SetColor(d_ptr->dfbSurface, color.red(), color.green(), color.blue(), color.alpha()); - const QVector rects = region.rects(); - for (int i=0; idfbSurface->FillRectangle(d_ptr->dfbSurface, - r.x(), r.y(), r.width(), r.height()); + const int n = region.numRects(); + if (n > 1) { + const QRect r = region.boundingRect(); + d_ptr->dfbSurface->FillRectangle(d_ptr->dfbSurface, r.x(), r.y(), r.width(), r.height()); + } else { + const QVector rects = region.rects(); + QVarLengthArray rectArray(n); + for (int i=0; idfbSurface->FillRectangles(d_ptr->dfbSurface, rectArray.constData(), n); } } -- cgit v1.2.3 From fa854a8ed0eaefa3a65c6b3b66e98ba5bdc6d6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= Date: Wed, 22 Jul 2009 20:06:37 +0200 Subject: Fix potential deadlock in QAbstractFileEngine There's a possibility for deadlocking with user code in QAbstractFileEngine. Changing the QMutex there to a QReadWriteLock should reduce the possibilities for this happening. Also reduced the scope of the lock in QAbstractFileEngine. Reviewed-by: Thiago Macieira --- src/corelib/io/qabstractfileengine.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp index 93097bcf2..9eb3305d7 100644 --- a/src/corelib/io/qabstractfileengine.cpp +++ b/src/corelib/io/qabstractfileengine.cpp @@ -42,7 +42,7 @@ #include "qabstractfileengine.h" #include "private/qabstractfileengine_p.h" #include "qdatetime.h" -#include "qmutex.h" +#include "qreadwritelock.h" #include "qvariant.h" // built-in handlers #include "qfsfileengine.h" @@ -98,14 +98,14 @@ QT_BEGIN_NAMESPACE All application-wide handlers are stored in this list. The mutex must be acquired to ensure thread safety. */ -Q_GLOBAL_STATIC_WITH_ARGS(QMutex, fileEngineHandlerMutex, (QMutex::Recursive)) +Q_GLOBAL_STATIC_WITH_ARGS(QReadWriteLock, fileEngineHandlerMutex, (QReadWriteLock::Recursive)) static bool qt_abstractfileenginehandlerlist_shutDown = false; class QAbstractFileEngineHandlerList : public QList { public: ~QAbstractFileEngineHandlerList() { - QMutexLocker locker(fileEngineHandlerMutex()); + QWriteLocker locker(fileEngineHandlerMutex()); qt_abstractfileenginehandlerlist_shutDown = true; } }; @@ -122,7 +122,7 @@ Q_GLOBAL_STATIC(QAbstractFileEngineHandlerList, fileEngineHandlers) */ QAbstractFileEngineHandler::QAbstractFileEngineHandler() { - QMutexLocker locker(fileEngineHandlerMutex()); + QWriteLocker locker(fileEngineHandlerMutex()); fileEngineHandlers()->prepend(this); } @@ -132,7 +132,7 @@ QAbstractFileEngineHandler::QAbstractFileEngineHandler() */ QAbstractFileEngineHandler::~QAbstractFileEngineHandler() { - QMutexLocker locker(fileEngineHandlerMutex()); + QWriteLocker locker(fileEngineHandlerMutex()); // Remove this handler from the handler list only if the list is valid. if (!qt_abstractfileenginehandlerlist_shutDown) fileEngineHandlers()->removeAll(this); @@ -166,12 +166,14 @@ QAbstractFileEngineHandler::~QAbstractFileEngineHandler() */ QAbstractFileEngine *QAbstractFileEngine::create(const QString &fileName) { - QMutexLocker locker(fileEngineHandlerMutex()); + { + QReadLocker locker(fileEngineHandlerMutex()); - // check for registered handlers that can load the file - for (int i = 0; i < fileEngineHandlers()->size(); i++) { - if (QAbstractFileEngine *ret = fileEngineHandlers()->at(i)->create(fileName)) - return ret; + // check for registered handlers that can load the file + for (int i = 0; i < fileEngineHandlers()->size(); i++) { + if (QAbstractFileEngine *ret = fileEngineHandlers()->at(i)->create(fileName)) + return ret; + } } #ifdef QT_BUILD_CORE_LIB -- cgit v1.2.3 From e38aed0bf5ea35db7dc82a943dfffcd31cca4700 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Jul 2009 11:54:01 -0700 Subject: Use BatchBlit in flush/exposeRegion Minor optimization. Also make sure cursor is drawn in flush even if we're not in Offscreen mode. Reviewed-by: TrustMe --- .../gfxdrivers/directfb/qdirectfbscreen.cpp | 25 ++++++---- .../gfxdrivers/directfb/qdirectfbwindowsurface.cpp | 57 ++++++++++++---------- 2 files changed, 47 insertions(+), 35 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index ae2e38ba3..1efebd9b1 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -1204,7 +1204,8 @@ void QDirectFBScreen::exposeRegion(QRegion r, int changing) ? static_cast(s) : 0; if (dfbWindowSurface) { IDirectFBSurface *surface = dfbWindowSurface->directFBSurface(); - if (d_ptr->directFBFlags & BoundingRectFlip || insideWindow.numRects() == 1) { + const int n = insideWindow.numRects(); + if (n == 1 || d_ptr->directFBFlags & BoundingRectFlip) { const QRect source = (insideWindow.boundingRect().intersected(windowGeometry)).translated(-windowGeometry.topLeft()); const DFBRectangle rect = { source.x(), source.y(), source.width(), source.height() @@ -1214,17 +1215,21 @@ void QDirectFBScreen::exposeRegion(QRegion r, int changing) windowGeometry.y() + source.y()); } else { const QVector rects = insideWindow.rects(); - const int count = rects.size(); - Q_ASSERT(count > 1); - for (int i=0; i dfbRectangles(n); + QVarLengthArray dfbPoints(n); + + for (int i=0; idfbSurface->Blit(d_ptr->dfbSurface, surface, &rect, - windowGeometry.x() + source.x(), - windowGeometry.y() + source.y()); + DFBRectangle &rect = dfbRectangles[i]; + rect.x = source.x(); + rect.y = source.y(); + rect.w = source.width(); + rect.h = source.height(); + dfbPoints[i].x = (windowGeometry.x() + source.x()); + dfbPoints[i].y = (windowGeometry.y() + source.y()); } + d_ptr->dfbSurface->BatchBlit(d_ptr->dfbSurface, surface, dfbRectangles.constData(), + dfbPoints.constData(), n); } } } diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp index ed4b2d900..a1009ac0d 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp @@ -356,12 +356,13 @@ void QDirectFBWindowSurface::flush(QWidget *, const QRegion ®ion, #endif } + const QRect windowGeometry = QDirectFBWindowSurface::geometry(); + IDirectFBSurface *primarySurface = screen->dfbSurface(); if (mode == Offscreen) { - IDirectFBSurface *primarySurface = screen->dfbSurface(); primarySurface->SetBlittingFlags(primarySurface, DSBLIT_NOFX); - const QRect windowGeometry = QDirectFBWindowSurface::geometry(); const QRect windowRect(0, 0, windowGeometry.width(), windowGeometry.height()); - if (boundingRectFlip || region.numRects() == 1) { + const int n = region.numRects(); + if (n == 1 || boundingRectFlip ) { const QRect regionBoundingRect = region.boundingRect().translated(offset); const QRect source = windowRect & regionBoundingRect; const DFBRectangle rect = { @@ -372,40 +373,46 @@ void QDirectFBWindowSurface::flush(QWidget *, const QRegion ®ion, windowGeometry.y() + source.y()); } else { const QVector rects = region.rects(); - const int count = rects.size(); - for (int i=0; i dfbRectangles(n); + QVarLengthArray dfbPoints(n); + + for (int i=0; iBlit(primarySurface, dfbSurface, &rect, - windowGeometry.x() + source.x(), - windowGeometry.y() + source.y()); + DFBRectangle &rect = dfbRectangles[i]; + rect.x = source.x(); + rect.y = source.y(); + rect.w = source.width(); + rect.h = source.height(); + dfbPoints[i].x = (windowGeometry.x() + source.x()); + dfbPoints[i].y = (windowGeometry.y() + source.y()); } + primarySurface->BatchBlit(primarySurface, dfbSurface, dfbRectangles.constData(), + dfbPoints.constData(), n); } - if (QScreenCursor *cursor = QScreenCursor::instance()) { - const QRect cursorRectangle = cursor->boundingRect(); - if (cursor->isVisible() && !cursor->isAccelerated() - && region.intersects(cursorRectangle.translated(-(offset + windowGeometry.topLeft())))) { - const QImage image = cursor->image(); - - IDirectFBSurface *surface = screen->createDFBSurface(image, QDirectFBScreen::DontTrackSurface); - primarySurface->SetBlittingFlags(primarySurface, DSBLIT_BLEND_ALPHACHANNEL); - primarySurface->Blit(primarySurface, surface, 0, cursorRectangle.x(), cursorRectangle.y()); - surface->Release(surface); + } + + if (QScreenCursor *cursor = QScreenCursor::instance()) { + const QRect cursorRectangle = cursor->boundingRect(); + if (cursor->isVisible() && !cursor->isAccelerated() + && region.intersects(cursorRectangle.translated(-(offset + windowGeometry.topLeft())))) { + const QImage image = cursor->image(); + + IDirectFBSurface *surface = screen->createDFBSurface(image, QDirectFBScreen::DontTrackSurface); + primarySurface->SetBlittingFlags(primarySurface, DSBLIT_BLEND_ALPHACHANNEL); + primarySurface->Blit(primarySurface, surface, 0, cursorRectangle.x(), cursorRectangle.y()); + surface->Release(surface); #if (Q_DIRECTFB_VERSION >= 0x010000) - primarySurface->ReleaseSource(primarySurface); + primarySurface->ReleaseSource(primarySurface); #endif - } } - + } + if (mode == Offscreen) { screen->flipSurface(primarySurface, flipFlags, region, offset + windowGeometry.topLeft()); } else { screen->flipSurface(dfbSurface, flipFlags, region, offset); } - #ifdef QT_DIRECTFB_TIMING enum { Secs = 3 }; ++frames; -- cgit v1.2.3 From 9e54faf9eae05f66b6772ef25cc63ce52babf7cd Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Wed, 22 Jul 2009 21:02:48 +0200 Subject: Doc - Clarified that Graphics View does not support the inverted y-axis coordinate system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task: 258259 Reviewed-By: João Abecasis --- doc/src/graphicsview.qdoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/src/graphicsview.qdoc b/doc/src/graphicsview.qdoc index 4c408cda8..f42c0d470 100644 --- a/doc/src/graphicsview.qdoc +++ b/doc/src/graphicsview.qdoc @@ -201,6 +201,9 @@ using an untransformed view, one unit on the scene is represented by one pixel on the screen. + \note The inverted Y-axis coordinate system (where \c y grows upwards) + is unsupported as Graphics Views uses Qt's coordinate system. + There are three effective coordinate systems in play in Graphics View: Item coordinates, scene coordinates, and view coordinates. To simplify your implementation, Graphics View provides convenience functions that -- cgit v1.2.3 From a974ce81d6324d8d85ade0153b5ce7c757ba4fdf Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Jul 2009 12:15:57 -0700 Subject: Fix a bug in directfb mouse handling Always check the mouse data we read for coordinates rather than asking the layer. This approach works whether we have layers enabled/window management enabled or any combination thereof. Also, make sure we use a software cursor when either of NO_WM or NO_LAYER is defined. Reviewed: Donald --- src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp | 14 -------------- src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp index 142993d1d..4365a5d24 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp @@ -203,7 +203,6 @@ void QDirectFBMouseHandlerPrivate::readMouseData() int wheel = 0; if (input.type == DIET_AXISMOTION) { -#ifdef QT_NO_DIRECTFB_LAYER if (input.flags & DIEF_AXISABS) { switch (input.axis) { case DIAI_X: x = input.axisabs; break; @@ -223,19 +222,6 @@ void QDirectFBMouseHandlerPrivate::readMouseData() "unknown axis (releative) %d", input.axis); } } -#else - if (input.axis == DIAI_X || input.axis == DIAI_Y) { - DFBResult result = layer->GetCursorPosition(layer, &x, &y); - if (result != DFB_OK) { - DirectFBError("QDirectFBMouseHandler::readMouseData", - result); - } - } else if (input.axis == DIAI_Z) { - Q_ASSERT(input.flags & DIEF_AXISREL); - wheel = input.axisrel; - wheel *= -120; - } -#endif } Qt::MouseButtons buttons = Qt::NoButton; diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index 1efebd9b1..4b76ef6c3 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -1096,7 +1096,7 @@ bool QDirectFBScreen::initDevice() #endif #ifndef QT_NO_QWS_CURSOR -#ifdef QT_NO_DIRECTFB_WM +#if defined QT_NO_DIRECTFB_WM || defined QT_NO_DIRECTFB_LAYER QScreenCursor::initSoftwareCursor(); #else qt_screencursor = new QDirectFBScreenCursor; -- cgit v1.2.3 From ed7b578fa09155458be48a419f29cc709129984a Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Jul 2009 14:39:35 -0700 Subject: Compile The dummy implementaion of QReadWriteLock wasn't source compatible with the real implementation and this lead to compilation errors in qabstractfileengine.cpp which now has a global static QReadWriteLock that takes a Recursive argument. Reviewed-by: Noam Rosenthal --- src/corelib/thread/qreadwritelock.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/thread/qreadwritelock.h b/src/corelib/thread/qreadwritelock.h index 51d42b54c..4742beaa2 100644 --- a/src/corelib/thread/qreadwritelock.h +++ b/src/corelib/thread/qreadwritelock.h @@ -190,7 +190,8 @@ inline QWriteLocker::QWriteLocker(QReadWriteLock *areadWriteLock) class Q_CORE_EXPORT QReadWriteLock { public: - inline explicit QReadWriteLock() { } + enum RecursionMode { NonRecursive, Recursive }; + inline explicit QReadWriteLock(RecursionMode = NonRecursive) { } inline ~QReadWriteLock() { } static inline void lockForRead() { } -- cgit v1.2.3 From b11f173a57128416ce314796e7b0320ad7c05bf7 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Jul 2009 15:07:38 -0700 Subject: Compile in release mode for DFB version > 0.9 Something went wrong with the integrate from 4.5 to master. Reviewed-by: TrustMe --- src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index 67cad6f2e..0928643f1 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -744,7 +744,12 @@ QPixmapData *QDirectFBScreenPrivate::createPixmapData(QPixmapData::PixelType typ return new QDirectFBPixmapData(type); } -#ifndef QT_NO_DEBUG +#ifdef QT_NO_DEBUG +struct FlagDescription; +static const FlagDescription *accelerationDescriptions = 0; +static const FlagDescription *blitDescriptions = 0; +static const FlagDescription *drawDescriptions = 0; +#else struct FlagDescription { const char *name; uint flag; -- cgit v1.2.3 From 08d549d00816c753096d9cb97a29f4d9dd7c5573 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Wed, 22 Jul 2009 17:16:43 -0700 Subject: return when brush is NoBrush in DFBPaintEngine Reviewed-by: Noam Rosenthal --- src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index 68f37ff4f..b264ac0ce 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -608,6 +608,8 @@ void QDirectFBPaintEngine::drawTextItem(const QPointF &p, void QDirectFBPaintEngine::fill(const QVectorPath &path, const QBrush &brush) { + if (brush.style() == Qt::NoBrush) + return; RASTERFALLBACK(FILL_PATH, path, brush, VOID_ARG()); Q_D(QDirectFBPaintEngine); d->lock(); @@ -618,6 +620,8 @@ void QDirectFBPaintEngine::fill(const QVectorPath &path, const QBrush &brush) void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QBrush &brush) { Q_D(QDirectFBPaintEngine); + if (brush.style() == Qt::NoBrush) + return; d->updateClip(); if (!d->unsupportedCompositionMode && !(d->transformationType & (QDirectFBPaintEnginePrivate::RectsUnsupported)) -- cgit v1.2.3 From 5027f869f8fc759148871b378e9cae6e88694bcb Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Thu, 23 Jul 2009 10:43:31 +1000 Subject: Remove autotest for "Won't fix" bug 258462. --- tests/auto/qprocess/tst_qprocess.cpp | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index 3ce080a69..6318d1d56 100644 --- a/tests/auto/qprocess/tst_qprocess.cpp +++ b/tests/auto/qprocess/tst_qprocess.cpp @@ -141,7 +141,6 @@ private slots: void startFinishStartFinish(); void invalidProgramString_data(); void invalidProgramString(); - void processEventsInAReadyReadSlot(); // keep these at the end, since they use lots of processes and sometimes // caused obscure failures to occur in tests that followed them (esp. on the Mac) @@ -155,7 +154,6 @@ protected slots: void restartProcess(); void waitForReadyReadInAReadyReadSlotSlot(); void waitForBytesWrittenInABytesWrittenSlotSlot(); - void processEventsInAReadyReadSlotSlot(); private: QProcess *process; @@ -2026,34 +2024,5 @@ void tst_QProcess::invalidProgramString() QVERIFY(!QProcess::startDetached(programString)); } -//----------------------------------------------------------------------------- -void tst_QProcess::processEventsInAReadyReadSlot() -{ -#ifdef Q_OS_WINCE - QSKIP("Reading and writing to a process is not supported on Qt/CE", SkipAll); -#endif - - QProcess process; - QVERIFY(QObject::connect(&process, SIGNAL(readyReadStandardOutput()), this, SLOT(processEventsInAReadyReadSlotSlot()))); - - for (int i = 0; i < 10; ++i) { - QCOMPARE(process.state(), QProcess::NotRunning); - -#ifdef Q_OS_MAC - process.start("testProcessOutput/testProcessOutput.app"); -#else - process.start("testProcessOutput/testProcessOutput"); -#endif - - QVERIFY(process.waitForFinished(10000)); - } -} - -//----------------------------------------------------------------------------- -void tst_QProcess::processEventsInAReadyReadSlotSlot() -{ - qApp->processEvents(); -} - QTEST_MAIN(tst_QProcess) #include "tst_qprocess.moc" -- cgit v1.2.3 From c42f7058dfd7ea551b2d3bca5651b0c802c91259 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Thu, 23 Jul 2009 10:58:55 +1000 Subject: Add the math3d types to QVariant Reviewed-by: Sarah Smith --- src/corelib/kernel/qmetatype.cpp | 20 +++++ src/corelib/kernel/qmetatype.h | 14 +++- src/corelib/kernel/qvariant.cpp | 7 +- src/corelib/kernel/qvariant.h | 7 +- src/gui/kernel/qguivariant.cpp | 161 ++++++++++++++++++++++++++++++++++++++- src/gui/math3d/qmatrix4x4.cpp | 47 +++++++++++- src/gui/math3d/qmatrix4x4.h | 9 ++- src/gui/math3d/qquaternion.cpp | 45 +++++++++++ src/gui/math3d/qquaternion.h | 9 ++- src/gui/math3d/qvector2d.cpp | 42 +++++++++- src/gui/math3d/qvector2d.h | 9 ++- src/gui/math3d/qvector3d.cpp | 45 ++++++++++- src/gui/math3d/qvector3d.h | 9 ++- src/gui/math3d/qvector4d.cpp | 47 +++++++++++- src/gui/math3d/qvector4d.h | 9 ++- 15 files changed, 452 insertions(+), 28 deletions(-) diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 6d9daec34..bd27ec274 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -171,6 +171,11 @@ QT_BEGIN_NAMESPACE \value QBitmap QBitmap \value QMatrix QMatrix \value QTransform QTransform + \value QMatrix4x4 QMatrix4x4 + \value QVector2D QVector2D + \value QVector3D QVector3D + \value QVector4D QVector4D + \value QQuaternion QQuaternion \value User Base value for user types @@ -272,6 +277,11 @@ static const struct { const char * typeName; int type; } types[] = { {"QTextFormat", QMetaType::QTextFormat}, {"QMatrix", QMetaType::QMatrix}, {"QTransform", QMetaType::QTransform}, + {"QMatrix4x4", QMetaType::QMatrix4x4}, + {"QVector2D", QMetaType::QVector2D}, + {"QVector3D", QMetaType::QVector3D}, + {"QVector4D", QMetaType::QVector4D}, + {"QQuaternion", QMetaType::QQuaternion}, /* All Metatype builtins */ {"void*", QMetaType::VoidStar}, @@ -670,6 +680,11 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) case QMetaType::QTextFormat: case QMetaType::QMatrix: case QMetaType::QTransform: + case QMetaType::QMatrix4x4: + case QMetaType::QVector2D: + case QMetaType::QVector3D: + case QMetaType::QVector4D: + case QMetaType::QQuaternion: if (!qMetaTypeGuiHelper) return false; qMetaTypeGuiHelper[type - FirstGuiType].saveOp(stream, data); @@ -862,6 +877,11 @@ bool QMetaType::load(QDataStream &stream, int type, void *data) case QMetaType::QTextFormat: case QMetaType::QMatrix: case QMetaType::QTransform: + case QMetaType::QMatrix4x4: + case QMetaType::QVector2D: + case QMetaType::QVector3D: + case QMetaType::QVector4D: + case QMetaType::QQuaternion: if (!qMetaTypeGuiHelper) return false; qMetaTypeGuiHelper[type - FirstGuiType].loadOp(stream, data); diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 497c01407..052312c0a 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -79,7 +79,9 @@ public: QIcon = 69, QImage = 70, QPolygon = 71, QRegion = 72, QBitmap = 73, QCursor = 74, QSizePolicy = 75, QKeySequence = 76, QPen = 77, QTextLength = 78, QTextFormat = 79, QMatrix = 80, QTransform = 81, - LastGuiType = 81 /* QTransform */, + QMatrix4x4 = 82, QVector2D = 83, QVector3D = 84, QVector4D = 85, + QQuaternion = 86, + LastGuiType = 86 /* QQuaternion */, FirstCoreExtType = 128 /* VoidStar */, VoidStar = 128, Long = 129, Short = 130, Char = 131, ULong = 132, @@ -292,6 +294,11 @@ class QTextLength; class QTextFormat; class QMatrix; class QTransform; +class QMatrix4x4; +class QVector2D; +class QVector3D; +class QVector4D; +class QQuaternion; QT_END_NAMESPACE @@ -354,6 +361,11 @@ Q_DECLARE_BUILTIN_METATYPE(QTextLength, QTextLength) Q_DECLARE_BUILTIN_METATYPE(QTextFormat, QTextFormat) Q_DECLARE_BUILTIN_METATYPE(QMatrix, QMatrix) Q_DECLARE_BUILTIN_METATYPE(QTransform, QTransform) +Q_DECLARE_BUILTIN_METATYPE(QMatrix4x4, QMatrix4x4) +Q_DECLARE_BUILTIN_METATYPE(QVector2D, QVector2D) +Q_DECLARE_BUILTIN_METATYPE(QVector3D, QVector3D) +Q_DECLARE_BUILTIN_METATYPE(QVector4D, QVector4D) +Q_DECLARE_BUILTIN_METATYPE(QQuaternion, QQuaternion) QT_END_HEADER diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 2ef9de405..2b5ea0ae5 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1264,6 +1264,7 @@ const QVariant::Handler *QVariant::handler = &qt_kernel_variant_handler; \value Map a QVariantMap \value Matrix a QMatrix \value Transform a QTransform + \value Matrix4x4 a QMatrix4x4 \value Palette a QPalette \value Pen a QPen \value Pixmap a QPixmap @@ -1271,6 +1272,7 @@ const QVariant::Handler *QVariant::handler = &qt_kernel_variant_handler; \value PointArray a QPointArray \value PointF a QPointF \value Polygon a QPolygon + \value Quaternion a QQuaternion \value Rect a QRect \value RectF a QRectF \value RegExp a QRegExp @@ -1286,6 +1288,9 @@ const QVariant::Handler *QVariant::handler = &qt_kernel_variant_handler; \value UInt a \l uint \value ULongLong a \l qulonglong \value Url a QUrl + \value Vector2D a QVector2D + \value Vector3D a QVector3D + \value Vector4D a QVector4D \value UserType Base value for user-defined types. @@ -1677,7 +1682,7 @@ QVariant::QVariant(Qt::GlobalColor color) { create(62, &color); } Note that return values in the ranges QVariant::Char through QVariant::RegExp and QVariant::Font through QVariant::Transform correspond to the values in the ranges QMetaType::QChar through - QMetaType::QRegExp and QMetaType::QFont through QMetaType::QTransform. + QMetaType::QRegExp and QMetaType::QFont through QMetaType::QQuaternion. Pay particular attention when working with char and QChar variants. Note that there is no QVariant constructor specifically diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index e92384473..a68939d48 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -154,7 +154,12 @@ class Q_CORE_EXPORT QVariant TextFormat = 79, Matrix = 80, Transform = 81, - LastGuiType = Transform, + Matrix4x4 = 82, + Vector2D = 83, + Vector3D = 84, + Vector4D = 85, + Quaternion = 86, + LastGuiType = Quaternion, UserType = 127, #ifdef QT3_SUPPORT diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 01df47dbf..ab69cdf4f 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -60,6 +60,11 @@ #include "qregion.h" #include "qsizepolicy.h" #include "qtextformat.h" +#include "qmatrix4x4.h" +#include "qvector2d.h" +#include "qvector3d.h" +#include "qvector4d.h" +#include "qquaternion.h" #include "private/qvariant_p.h" @@ -148,6 +153,31 @@ static void construct(QVariant::Private *x, const void *copy) v_construct(x, &color); break; } +#ifndef QT_NO_MATRIX4X4 + case QVariant::Matrix4x4: + v_construct(x, copy); + break; +#endif +#ifndef QT_NO_VECTOR2D + case QVariant::Vector2D: + v_construct(x, copy); + break; +#endif +#ifndef QT_NO_VECTOR3D + case QVariant::Vector3D: + v_construct(x, copy); + break; +#endif +#ifndef QT_NO_VECTOR4D + case QVariant::Vector4D: + v_construct(x, copy); + break; +#endif +#ifndef QT_NO_QUATERNION + case QVariant::Quaternion: + v_construct(x, copy); + break; +#endif default: qcoreVariantHandler()->construct(x, copy); return; @@ -221,6 +251,31 @@ static void clear(QVariant::Private *d) case QVariant::Pen: v_clear(d); break; +#ifndef QT_NO_MATRIX4X4 + case QVariant::Matrix4x4: + v_clear(d); + break; +#endif +#ifndef QT_NO_VECTOR2D + case QVariant::Vector2D: + v_clear(d); + break; +#endif +#ifndef QT_NO_VECTOR3D + case QVariant::Vector3D: + v_clear(d); + break; +#endif +#ifndef QT_NO_VECTOR4D + case QVariant::Vector4D: + v_clear(d); + break; +#endif +#ifndef QT_NO_QUATERNION + case QVariant::Quaternion: + v_clear(d); + break; +#endif default: qcoreVariantHandler()->clear(d); return; @@ -266,7 +321,26 @@ static bool isNull(const QVariant::Private *d) case QVariant::KeySequence: #endif case QVariant::Pen: +#ifndef QT_NO_MATRIX4X4 + case QVariant::Matrix4x4: +#endif break; +#ifndef QT_NO_VECTOR2D + case QVariant::Vector2D: + return v_cast(d)->isNull(); +#endif +#ifndef QT_NO_VECTOR3D + case QVariant::Vector3D: + return v_cast(d)->isNull(); +#endif +#ifndef QT_NO_VECTOR4D + case QVariant::Vector4D: + return v_cast(d)->isNull(); +#endif +#ifndef QT_NO_QUATERNION + case QVariant::Quaternion: + return v_cast(d)->isNull(); +#endif default: return qcoreVariantHandler()->isNull(d); } @@ -326,6 +400,26 @@ static bool compare(const QVariant::Private *a, const QVariant::Private *b) #endif case QVariant::Pen: return *v_cast(a) == *v_cast(b); +#ifndef QT_NO_MATRIX4X4 + case QVariant::Matrix4x4: + return *v_cast(a) == *v_cast(b); +#endif +#ifndef QT_NO_VECTOR2D + case QVariant::Vector2D: + return *v_cast(a) == *v_cast(b); +#endif +#ifndef QT_NO_VECTOR3D + case QVariant::Vector3D: + return *v_cast(a) == *v_cast(b); +#endif +#ifndef QT_NO_VECTOR4D + case QVariant::Vector4D: + return *v_cast(a) == *v_cast(b); +#endif +#ifndef QT_NO_QUATERNION + case QVariant::Quaternion: + return *v_cast(a) == *v_cast(b); +#endif default: break; } @@ -513,6 +607,31 @@ static void streamDebug(QDebug dbg, const QVariant &v) case QVariant::Pen: dbg.nospace() << qvariant_cast(v); break; +#ifndef QT_NO_MATRIX4X4 + case QVariant::Matrix4x4: + dbg.nospace() << qvariant_cast(v); + break; +#endif +#ifndef QT_NO_VECTOR2D + case QVariant::Vector2D: + dbg.nospace() << qvariant_cast(v); + break; +#endif +#ifndef QT_NO_VECTOR3D + case QVariant::Vector3D: + dbg.nospace() << qvariant_cast(v); + break; +#endif +#ifndef QT_NO_VECTOR4D + case QVariant::Vector4D: + dbg.nospace() << qvariant_cast(v); + break; +#endif +#ifndef QT_NO_QUATERNION + case QVariant::Quaternion: + dbg.nospace() << qvariant_cast(v); + break; +#endif default: qcoreVariantHandler()->debugStream(dbg, v); break; @@ -596,6 +715,21 @@ Q_DECL_METATYPE_HELPER(QTextLength) Q_DECL_METATYPE_HELPER(QTextFormat) Q_DECL_METATYPE_HELPER(QMatrix) Q_DECL_METATYPE_HELPER(QTransform) +#ifndef QT_NO_MATRIX4X4 +Q_DECL_METATYPE_HELPER(QMatrix4x4) +#endif +#ifndef QT_NO_VECTOR2D +Q_DECL_METATYPE_HELPER(QVector2D) +#endif +#ifndef QT_NO_VECTOR3D +Q_DECL_METATYPE_HELPER(QVector3D) +#endif +#ifndef QT_NO_VECTOR4D +Q_DECL_METATYPE_HELPER(QVector4D) +#endif +#ifndef QT_NO_QUATERNION +Q_DECL_METATYPE_HELPER(QQuaternion) +#endif #ifdef QT_NO_DATASTREAM # define Q_IMPL_METATYPE_HELPER(TYPE) \ @@ -645,7 +779,32 @@ static const QMetaTypeGuiHelper qVariantGuiHelper[] = { Q_IMPL_METATYPE_HELPER(QTextLength), Q_IMPL_METATYPE_HELPER(QTextFormat), Q_IMPL_METATYPE_HELPER(QMatrix), - Q_IMPL_METATYPE_HELPER(QTransform) + Q_IMPL_METATYPE_HELPER(QTransform), +#ifndef QT_NO_MATRIX4X4 + Q_IMPL_METATYPE_HELPER(QMatrix4x4), +#else + {0, 0, 0, 0}, +#endif +#ifndef QT_NO_VECTOR2D + Q_IMPL_METATYPE_HELPER(QVector2D), +#else + {0, 0, 0, 0}, +#endif +#ifndef QT_NO_VECTOR3D + Q_IMPL_METATYPE_HELPER(QVector3D), +#else + {0, 0, 0, 0}, +#endif +#ifndef QT_NO_VECTOR4D + Q_IMPL_METATYPE_HELPER(QVector4D), +#else + {0, 0, 0, 0}, +#endif +#ifndef QT_NO_QUATERNION + Q_IMPL_METATYPE_HELPER(QQuaternion) +#else + {0, 0, 0, 0} +#endif }; static const QVariant::Handler *qt_guivariant_last_handler = 0; diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp index 88f58c80d..b4c54a0c6 100644 --- a/src/gui/math3d/qmatrix4x4.cpp +++ b/src/gui/math3d/qmatrix4x4.cpp @@ -1794,6 +1794,51 @@ QDebug operator<<(QDebug dbg, const QMatrix4x4 &m) #endif -#endif +#ifndef QT_NO_DATASTREAM + +/*! + \fn QDataStream &operator<<(QDataStream &stream, const QMatrix4x4 &matrix) + \relates QMatrix4x4 + + Writes the given \a matrix to the given \a stream and returns a + reference to the stream. + + \sa {Format of the QDataStream Operators} +*/ + +QDataStream &operator<<(QDataStream &stream, const QMatrix4x4 &matrix) +{ + for (int row = 0; row < 4; ++row) + for (int col = 0; col < 4; ++col) + stream << double(matrix(row, col)); + return stream; +} + +/*! + \fn QDataStream &operator>>(QDataStream &stream, QMatrix4x4 &matrix) + \relates QMatrix4x4 + + Reads a 4x4 matrix from the given \a stream into the given \a matrix + and returns a reference to the stream. + + \sa {Format of the QDataStream Operators} +*/ + +QDataStream &operator>>(QDataStream &stream, QMatrix4x4 &matrix) +{ + double x; + for (int row = 0; row < 4; ++row) { + for (int col = 0; col < 4; ++col) { + stream >> x; + matrix(row, col) = float(x); + } + } + matrix.inferSpecialType(); + return stream; +} + +#endif // QT_NO_DATASTREAM + +#endif // QT_NO_MATRIX4X4 QT_END_NAMESPACE diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h index d63de7017..f7246bb9b 100644 --- a/src/gui/math3d/qmatrix4x4.h +++ b/src/gui/math3d/qmatrix4x4.h @@ -960,6 +960,11 @@ inline float *QMatrix4x4::data() Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QMatrix4x4 &m); #endif +#ifndef QT_NO_DATASTREAM +Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QMatrix4x4 &); +Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QMatrix4x4 &); +#endif + template QMatrix4x4 qGenericMatrixToMatrix4x4(const QGenericMatrix& matrix) { @@ -989,10 +994,6 @@ QGenericMatrix qGenericMatrixFromMatrix4x4(const QMatrix4x4& QT_END_NAMESPACE -#ifndef QT_NO_MATRIX4X4 -Q_DECLARE_METATYPE(QMatrix4x4) -#endif - QT_END_HEADER #endif diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp index d9d416081..841a4c0c3 100644 --- a/src/gui/math3d/qquaternion.cpp +++ b/src/gui/math3d/qquaternion.cpp @@ -571,6 +571,51 @@ QDebug operator<<(QDebug dbg, const QQuaternion &q) #endif +#ifndef QT_NO_DATASTREAM + +/*! + \fn QDataStream &operator<<(QDataStream &stream, const QQuaternion &quaternion) + \relates QQuaternion + + Writes the given \a quaternion to the given \a stream and returns a + reference to the stream. + + \sa {Format of the QDataStream Operators} +*/ + +QDataStream &operator<<(QDataStream &stream, const QQuaternion &quaternion) +{ + stream << double(quaternion.scalar()) << double(quaternion.x()) + << double(quaternion.y()) << double(quaternion.z()); + return stream; +} + +/*! + \fn QDataStream &operator>>(QDataStream &stream, QQuaternion &quaternion) + \relates QQuaternion + + Reads a quaternion from the given \a stream into the given \a quaternion + and returns a reference to the stream. + + \sa {Format of the QDataStream Operators} +*/ + +QDataStream &operator>>(QDataStream &stream, QQuaternion &quaternion) +{ + double scalar, x, y, z; + stream >> scalar; + stream >> x; + stream >> y; + stream >> z; + quaternion.setScalar(qreal(scalar)); + quaternion.setX(qreal(x)); + quaternion.setY(qreal(y)); + quaternion.setZ(qreal(z)); + return stream; +} + +#endif // QT_NO_DATASTREAM + #endif QT_END_NAMESPACE diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h index 6b24a04e3..55c871d2b 100644 --- a/src/gui/math3d/qquaternion.h +++ b/src/gui/math3d/qquaternion.h @@ -324,14 +324,15 @@ inline QVector4D QQuaternion::toVector4D() const Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QQuaternion &q); #endif +#ifndef QT_NO_DATASTREAM +Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QQuaternion &); +Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QQuaternion &); #endif -QT_END_NAMESPACE - -#ifndef QT_NO_QUATERNION -Q_DECLARE_METATYPE(QQuaternion) #endif +QT_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/gui/math3d/qvector2d.cpp b/src/gui/math3d/qvector2d.cpp index b492aa883..28f6b7ae2 100644 --- a/src/gui/math3d/qvector2d.cpp +++ b/src/gui/math3d/qvector2d.cpp @@ -410,6 +410,46 @@ QDebug operator<<(QDebug dbg, const QVector2D &vector) #endif -#endif +#ifndef QT_NO_DATASTREAM + +/*! + \fn QDataStream &operator<<(QDataStream &stream, const QVector2D &vector) + \relates QVector2D + + Writes the given \a vector to the given \a stream and returns a + reference to the stream. + + \sa {Format of the QDataStream Operators} +*/ + +QDataStream &operator<<(QDataStream &stream, const QVector2D &vector) +{ + stream << double(vector.x()) << double(vector.y()); + return stream; +} + +/*! + \fn QDataStream &operator>>(QDataStream &stream, QVector2D &vector) + \relates QVector2D + + Reads a 2D vector from the given \a stream into the given \a vector + and returns a reference to the stream. + + \sa {Format of the QDataStream Operators} +*/ + +QDataStream &operator>>(QDataStream &stream, QVector2D &vector) +{ + double x, y; + stream >> x; + stream >> y; + vector.setX(qreal(x)); + vector.setY(qreal(y)); + return stream; +} + +#endif // QT_NO_DATASTREAM + +#endif // QT_NO_VECTOR2D QT_END_NAMESPACE diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h index bb62afe92..d473c2fd7 100644 --- a/src/gui/math3d/qvector2d.h +++ b/src/gui/math3d/qvector2d.h @@ -243,14 +243,15 @@ inline QPointF QVector2D::toPointF() const Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QVector2D &vector); #endif +#ifndef QT_NO_DATASTREAM +Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QVector2D &); +Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QVector2D &); #endif -QT_END_NAMESPACE - -#ifndef QT_NO_VECTOR2D -Q_DECLARE_METATYPE(QVector2D) #endif +QT_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp index 95550cde2..881f47c84 100644 --- a/src/gui/math3d/qvector3d.cpp +++ b/src/gui/math3d/qvector3d.cpp @@ -558,6 +558,49 @@ QDebug operator<<(QDebug dbg, const QVector3D &vector) #endif -#endif +#ifndef QT_NO_DATASTREAM + +/*! + \fn QDataStream &operator<<(QDataStream &stream, const QVector3D &vector) + \relates QVector3D + + Writes the given \a vector to the given \a stream and returns a + reference to the stream. + + \sa {Format of the QDataStream Operators} +*/ + +QDataStream &operator<<(QDataStream &stream, const QVector3D &vector) +{ + stream << double(vector.x()) << double(vector.y()) + << double(vector.z()); + return stream; +} + +/*! + \fn QDataStream &operator>>(QDataStream &stream, QVector3D &vector) + \relates QVector3D + + Reads a 3D vector from the given \a stream into the given \a vector + and returns a reference to the stream. + + \sa {Format of the QDataStream Operators} +*/ + +QDataStream &operator>>(QDataStream &stream, QVector3D &vector) +{ + double x, y, z; + stream >> x; + stream >> y; + stream >> z; + vector.setX(qreal(x)); + vector.setY(qreal(y)); + vector.setZ(qreal(z)); + return stream; +} + +#endif // QT_NO_DATASTREAM + +#endif // QT_NO_VECTOR3D QT_END_NAMESPACE diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h index 873b388e4..7494dcf34 100644 --- a/src/gui/math3d/qvector3d.h +++ b/src/gui/math3d/qvector3d.h @@ -271,14 +271,15 @@ inline QPointF QVector3D::toPointF() const Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QVector3D &vector); #endif +#ifndef QT_NO_DATASTREAM +Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QVector3D &); +Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QVector3D &); #endif -QT_END_NAMESPACE - -#ifndef QT_NO_VECTOR3D -Q_DECLARE_METATYPE(QVector3D) #endif +QT_END_NAMESPACE + QT_END_HEADER #endif diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp index 1f7d9217a..1a84db600 100644 --- a/src/gui/math3d/qvector4d.cpp +++ b/src/gui/math3d/qvector4d.cpp @@ -509,6 +509,51 @@ QDebug operator<<(QDebug dbg, const QVector4D &vector) #endif -#endif +#ifndef QT_NO_DATASTREAM + +/*! + \fn QDataStream &operator<<(QDataStream &stream, const QVector4D &vector) + \relates QVector4D + + Writes the given \a vector to the given \a stream and returns a + reference to the stream. + + \sa {Format of the QDataStream Operators} +*/ + +QDataStream &operator<<(QDataStream &stream, const QVector4D &vector) +{ + stream << double(vector.x()) << double(vector.y()) + << double(vector.z()) << double(vector.w()); + return stream; +} + +/*! + \fn QDataStream &operator>>(QDataStream &stream, QVector4D &vector) + \relates QVector4D + + Reads a 4D vector from the given \a stream into the given \a vector + and returns a reference to the stream. + + \sa {Format of the QDataStream Operators} +*/ + +QDataStream &operator>>(QDataStream &stream, QVector4D &vector) +{ + double x, y, z, w; + stream >> x; + stream >> y; + stream >> z; + stream >> w; + vector.setX(qreal(x)); + vector.setY(qreal(y)); + vector.setZ(qreal(z)); + vector.setW(qreal(w)); + return stream; +} + +#endif // QT_NO_DATASTREAM + +#endif // QT_NO_VECTOR4D QT_END_NAMESPACE diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h index dcfd87a5a..cd6149652 100644 --- a/src/gui/math3d/qvector4d.h +++ b/src/gui/math3d/qvector4d.h @@ -276,14 +276,15 @@ inline QPointF QVector4D::toPointF() const Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QVector4D &vector); #endif +#ifndef QT_NO_DATASTREAM +Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QVector4D &); +Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QVector4D &); #endif -QT_END_NAMESPACE - -#ifndef QT_NO_VECTOR4D -Q_DECLARE_METATYPE(QVector4D) #endif +QT_END_NAMESPACE + QT_END_HEADER #endif -- cgit v1.2.3 From 708150e3a88fdc5f7c3d1998f2b5132cea264a71 Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Thu, 23 Jul 2009 08:35:03 +0200 Subject: Add texture_from_pixmap defines for systems without them This fixes the build on older Solaris machines which don't have the GLX_EXT_texture_from_pixmap defines in glxext.h. Reviewed-By: Trustme --- src/opengl/qgl_x11.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index d8af4d546..43bdec706 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -82,6 +82,25 @@ extern const QX11Info *qt_x11Info(const QPaintDevice *pd); #define GLX_SAMPLES_ARB 100001 #endif +#ifndef GLX_EXT_texture_from_pixmap +#define GLX_TEXTURE_2D_BIT_EXT 0x00000002 +#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004 +#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0 +#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1 +#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2 +#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3 +#define GLX_Y_INVERTED_EXT 0x20D4 +#define GLX_TEXTURE_FORMAT_EXT 0x20D5 +#define GLX_TEXTURE_TARGET_EXT 0x20D6 +#define GLX_MIPMAP_TEXTURE_EXT 0x20D7 +#define GLX_TEXTURE_FORMAT_NONE_EXT 0x20D8 +#define GLX_TEXTURE_FORMAT_RGB_EXT 0x20D9 +#define GLX_TEXTURE_FORMAT_RGBA_EXT 0x20DA +#define GLX_TEXTURE_2D_EXT 0x20DC +#define GLX_TEXTURE_RECTANGLE_EXT 0x20DD +#define GLX_FRONT_LEFT_EXT 0x20DE +#endif + /* The qt_gl_choose_cmap function is internal and used by QGLWidget::setContext() and GLX (not Windows). If the application can't find any sharable -- cgit v1.2.3 From 3f630677d415d4a67938fa6cf64754c80aa30ba0 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Wed, 22 Jul 2009 09:19:12 +0200 Subject: Add QGraphicsItem::focusProxy(), focus proxy support. Following QWidget's behavior, you can not assign any item in the same scene as a focus proxy for another item. Also supports nested focus proxies. You can only assign items in the same scene as focus proxies. Autotests are included. Reviewed-By: mbm --- src/gui/graphicsview/qgraphicsitem.cpp | 76 ++++++++++++++-- src/gui/graphicsview/qgraphicsitem.h | 3 + src/gui/graphicsview/qgraphicsitem_p.h | 2 + src/gui/graphicsview/qgraphicsscene.cpp | 106 +++++++++++++--------- src/gui/graphicsview/qgraphicsscene_p.h | 2 + tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 120 +++++++++++++++++++++++++ 6 files changed, 261 insertions(+), 48 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index ae2a2c3f8..4e3677a22 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -2455,6 +2455,8 @@ void QGraphicsItem::setHandlesChildEvents(bool enabled) */ bool QGraphicsItem::hasFocus() const { + if (d_ptr->focusProxy) + return d_ptr->focusProxy->hasFocus(); return (d_ptr->scene && d_ptr->scene->focusItem() == this); } @@ -2480,12 +2482,16 @@ void QGraphicsItem::setFocus(Qt::FocusReason focusReason) { if (!d_ptr->scene || !isEnabled() || hasFocus() || !(d_ptr->flags & ItemIsFocusable)) return; - if (isVisible()) { + QGraphicsItem *item = this; + QGraphicsItem *f; + while ((f = item->d_ptr->focusProxy)) + item = f; + if (item->isVisible()) { // Visible items immediately gain focus from scene. - d_ptr->scene->setFocusItem(this, focusReason); - } else if (d_ptr->isWidget) { + d_ptr->scene->d_func()->setFocusItemHelper(item, focusReason); + } else if (item->d_ptr->isWidget) { // Just set up subfocus. - static_cast(this)->d_func()->setFocusWidget(); + static_cast(item)->d_func()->setFocusWidget(); } } @@ -2508,12 +2514,72 @@ void QGraphicsItem::clearFocus() // Invisible widget items with focus must explicitly clear subfocus. static_cast(this)->d_func()->clearFocusWidget(); } - if (d_ptr->scene->focusItem() == this) { + if (hasFocus()) { // If this item has the scene's input focus, clear it. d_ptr->scene->setFocusItem(0); } } +/*! + \since 4.6 + + Returns this item's focus proxy, or 0 if the item + does not have any focus proxy. + + \sa setFocusProxy() +*/ +QGraphicsItem *QGraphicsItem::focusProxy() const +{ + return d_ptr->focusProxy; +} + +/*! + \since 4.6 + + Sets the item's focus proxy to \a item. + + If an item has a focus proxy, the focus proxy will receive + input focus when the item gains input focus. The item itself + will still have focus (i.e., hasFocus() will return true), + but only the focus proxy will receive the keyboard input. + + A focus proxy can itself have a focus proxy, and so on. In + such case, keyboard input will be handled by the outermost + focus proxy. + + \sa focusProxy() +*/ +void QGraphicsItem::setFocusProxy(QGraphicsItem *item) +{ + if (item == d_ptr->focusProxy) + return; + if (item == this) { + qWarning("QGraphicsItem::setFocusProxy: cannot assign self as focus proxy"); + return; + } + if (item) { + if (item->d_ptr->scene != d_ptr->scene) { + qWarning("QGraphicsItem::setFocusProxy: focus proxy must be in same scene"); + return; + } + for (QGraphicsItem *f = item->focusProxy(); f != 0; f = f->focusProxy()) { + if (f == this) { + qWarning("QGraphicsItem::setFocusProxy: %p is already in the focus proxy chain", item); + return; + } + } + } + + QGraphicsItem *lastFocusProxy = d_ptr->focusProxy; + d_ptr->focusProxy = item; + if (d_ptr->scene) { + if (lastFocusProxy) + d_ptr->scene->d_func()->focusProxyReverseMap.remove(lastFocusProxy, this); + if (item) + d_ptr->scene->d_func()->focusProxyReverseMap.insert(item, this); + } +} + /*! \since 4.4 Grabs the mouse input. diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index a3076224b..5c9297f6e 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -226,6 +226,9 @@ public: void setFocus(Qt::FocusReason focusReason = Qt::OtherFocusReason); void clearFocus(); + QGraphicsItem *focusProxy() const; + void setFocusProxy(QGraphicsItem *item); + void grabMouse(); void ungrabMouse(); void grabKeyboard(); diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 472963468..fee7083dc 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -122,6 +122,7 @@ public: index(-1), siblingIndex(-1), depth(0), + focusProxy(0), acceptedMouseButtons(0x1f), visible(1), explicitlyHidden(0), @@ -409,6 +410,7 @@ public: int index; int siblingIndex; int depth; + QGraphicsItem *focusProxy; // Packed 32 bytes quint32 acceptedMouseButtons : 5; diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index b017022ef..4796436c4 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -491,6 +491,13 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item) item->d_func()->scene = 0; + // Unregister focus proxy. + QMultiHash::iterator it = focusProxyReverseMap.find(item); + while (it != focusProxyReverseMap.end() && it.key() == item) { + it.value()->d_ptr->focusProxy = 0; + it = focusProxyReverseMap.erase(it); + } + // Remove from parent, or unregister from toplevels. if (QGraphicsItem *parentItem = item->parentItem()) { if (parentItem->scene()) { @@ -556,6 +563,58 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item) emit q->selectionChanged(); } +/*! + \internal +*/ +void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item, + Qt::FocusReason focusReason) +{ + Q_Q(QGraphicsScene); + if (item == focusItem) + return; + if (item && (!(item->flags() & QGraphicsItem::ItemIsFocusable) + || !item->isVisible() || !item->isEnabled())) { + item = 0; + } + + if (item) { + q->setFocus(focusReason); + if (item == focusItem) + return; + } + + if (focusItem) { + QFocusEvent event(QEvent::FocusOut, focusReason); + lastFocusItem = focusItem; + focusItem = 0; + sendEvent(lastFocusItem, &event); + + if (lastFocusItem + && (lastFocusItem->flags() & QGraphicsItem::ItemAcceptsInputMethod)) { + // Reset any visible preedit text + QInputMethodEvent imEvent; + sendEvent(lastFocusItem, &imEvent); + + // Close any external input method panel + for (int i = 0; i < views.size(); ++i) + views.at(i)->inputContext()->reset(); + } + } + + if (item) { + if (item->isWidget()) { + // Update focus child chain. + static_cast(item)->d_func()->setFocusWidget(); + } + + focusItem = item; + QFocusEvent event(QEvent::FocusIn, focusReason); + sendEvent(item, &event); + } + + updateInputMethodSensitivityInViews(); +} + /*! \internal */ @@ -2597,49 +2656,10 @@ QGraphicsItem *QGraphicsScene::focusItem() const void QGraphicsScene::setFocusItem(QGraphicsItem *item, Qt::FocusReason focusReason) { Q_D(QGraphicsScene); - if (item == d->focusItem) - return; - if (item && (!(item->flags() & QGraphicsItem::ItemIsFocusable) - || !item->isVisible() || !item->isEnabled())) { - item = 0; - } - - if (item) { - setFocus(focusReason); - if (item == d->focusItem) - return; - } - - if (d->focusItem) { - QFocusEvent event(QEvent::FocusOut, focusReason); - d->lastFocusItem = d->focusItem; - d->focusItem = 0; - d->sendEvent(d->lastFocusItem, &event); - - if (d->lastFocusItem - && (d->lastFocusItem->flags() & QGraphicsItem::ItemAcceptsInputMethod)) { - // Reset any visible preedit text - QInputMethodEvent imEvent; - d->sendEvent(d->lastFocusItem, &imEvent); - - // Close any external input method panel - for (int i = 0; i < d->views.size(); ++i) - d->views.at(i)->inputContext()->reset(); - } - } - - if (item) { - if (item->isWidget()) { - // Update focus child chain. - static_cast(item)->d_func()->setFocusWidget(); - } - - d->focusItem = item; - QFocusEvent event(QEvent::FocusIn, focusReason); - d->sendEvent(item, &event); - } - - d->updateInputMethodSensitivityInViews(); + if (item) + item->setFocus(focusReason); + else + d->setFocusItemHelper(item, focusReason); } /*! diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h index 9a91accbf..a4bbdd2aa 100644 --- a/src/gui/graphicsview/qgraphicsscene_p.h +++ b/src/gui/graphicsview/qgraphicsscene_p.h @@ -130,6 +130,8 @@ public: QGraphicsWidget *tabFocusFirst; QGraphicsWidget *activeWindow; int activationRefCount; + void setFocusItemHelper(QGraphicsItem *item, Qt::FocusReason focusReason); + QMultiHash focusProxyReverseMap; QList popupWidgets; void addPopup(QGraphicsWidget *widget); diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index f58cad21a..011e480b0 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -76,6 +76,46 @@ Q_DECLARE_METATYPE(QRectF) #define Q_CHECK_PAINTEVENTS #endif +class EventSpy : public QGraphicsWidget +{ + Q_OBJECT +public: + EventSpy(QObject *watched, QEvent::Type type) + : _count(0), spied(type) + { + watched->installEventFilter(this); + } + + EventSpy(QGraphicsScene *scene, QGraphicsItem *watched, QEvent::Type type) + : _count(0), spied(type) + { + scene->addItem(this); + watched->installSceneEventFilter(this); + } + + int count() const { return _count; } + +protected: + bool eventFilter(QObject *watched, QEvent *event) + { + Q_UNUSED(watched); + if (event->type() == spied) + ++_count; + return false; + } + + bool sceneEventFilter(QGraphicsItem *watched, QEvent *event) + { + Q_UNUSED(watched); + if (event->type() == spied) + ++_count; + return false; + } + + int _count; + QEvent::Type spied; +}; + class EventTester : public QGraphicsItem { public: @@ -234,6 +274,7 @@ private slots: void sorting(); void itemHasNoContents(); void hitTestUntransformableItem(); + void focusProxy(); // task specific tests below me void task141694_textItemEnsureVisible(); @@ -7344,5 +7385,84 @@ void tst_QGraphicsItem::hitTestUntransformableItem() QCOMPARE(items.at(0), static_cast(item3)); } +void tst_QGraphicsItem::focusProxy() +{ + QGraphicsScene scene; + QGraphicsItem *item = scene.addRect(0, 0, 10, 10); + item->setFlag(QGraphicsItem::ItemIsFocusable); + QVERIFY(!item->focusProxy()); + + QGraphicsItem *item2 = scene.addRect(0, 0, 10, 10); + item2->setFlag(QGraphicsItem::ItemIsFocusable); + item->setFocusProxy(item2); + QCOMPARE(item->focusProxy(), item2); + + item->setFocus(); + QVERIFY(item->hasFocus()); + QVERIFY(item2->hasFocus()); + + // Try to make a focus chain loop + QString err; + QTextStream stream(&err); + stream << "QGraphicsItem::setFocusProxy: " + << (void*)item << " is already in the focus proxy chain" << flush; + QTest::ignoreMessage(QtWarningMsg, err.toLatin1().constData()); + item2->setFocusProxy(item); // fails + QCOMPARE(item->focusProxy(), (QGraphicsItem *)item2); + QCOMPARE(item2->focusProxy(), (QGraphicsItem *)0); + + // Try to assign self as focus proxy + QTest::ignoreMessage(QtWarningMsg, "QGraphicsItem::setFocusProxy: cannot assign self as focus proxy"); + item->setFocusProxy(item); // fails + QCOMPARE(item->focusProxy(), (QGraphicsItem *)item2); + QCOMPARE(item2->focusProxy(), (QGraphicsItem *)0); + + // Reset the focus proxy + item->setFocusProxy(0); + QCOMPARE(item->focusProxy(), (QGraphicsItem *)0); + QVERIFY(!item->hasFocus()); + QVERIFY(item2->hasFocus()); + + // Test deletion + item->setFocusProxy(item2); + QCOMPARE(item->focusProxy(), (QGraphicsItem *)item2); + delete item2; + QCOMPARE(item->focusProxy(), (QGraphicsItem *)0); + + // Test event delivery + item2 = scene.addRect(0, 0, 10, 10); + item2->setFlag(QGraphicsItem::ItemIsFocusable); + item->setFocusProxy(item2); + item->clearFocus(); + + EventSpy focusInSpy(&scene, item, QEvent::FocusIn); + EventSpy focusOutSpy(&scene, item, QEvent::FocusOut); + EventSpy focusInSpy2(&scene, item2, QEvent::FocusIn); + EventSpy focusOutSpy2(&scene, item2, QEvent::FocusOut); + QCOMPARE(focusInSpy.count(), 0); + QCOMPARE(focusOutSpy.count(), 0); + QCOMPARE(focusInSpy2.count(), 0); + QCOMPARE(focusOutSpy2.count(), 0); + + item->setFocus(); + QCOMPARE(focusInSpy.count(), 0); + QCOMPARE(focusInSpy2.count(), 1); + item->clearFocus(); + QCOMPARE(focusOutSpy.count(), 0); + QCOMPARE(focusOutSpy2.count(), 1); + + // Test two items proxying one item. + QGraphicsItem *item3 = scene.addRect(0, 0, 10, 10); + item3->setFlag(QGraphicsItem::ItemIsFocusable); + item3->setFocusProxy(item2); // item and item3 use item2 as proxy + + QCOMPARE(item->focusProxy(), item2); + QCOMPARE(item2->focusProxy(), (QGraphicsItem *)0); + QCOMPARE(item3->focusProxy(), item2); + delete item2; + QCOMPARE(item->focusProxy(), (QGraphicsItem *)0); + QCOMPARE(item3->focusProxy(), (QGraphicsItem *)0); +} + QTEST_MAIN(tst_QGraphicsItem) #include "tst_qgraphicsitem.moc" -- cgit v1.2.3 From 5234d083c9b00ed508dae7cc8c47d21da46325c6 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Thu, 23 Jul 2009 07:52:38 +0200 Subject: Fix merge error, restore size of bit field. Change 34fde4a4 removes one bit from the flags bitfield, which was added in change 7bc98d7b. This happened during resolving of a merge conflict and caused some input method related autotests in tst_QGraphicsView to fail. Reviewed-by: mbm --- src/gui/graphicsview/qgraphicsitem_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index fee7083dc..1cf188e6a 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -440,7 +440,7 @@ public: // New 32 bits quint32 fullUpdatePending : 1; - quint32 flags : 12; + quint32 flags : 13; quint32 dirtyChildrenBoundingRect : 1; quint32 paintedViewBoundingRectsNeedRepaint : 1; quint32 dirtySceneTransform : 1; @@ -453,7 +453,7 @@ public: quint32 acceptedTouchBeginEvent : 1; quint32 filtersDescendantEvents : 1; quint32 sceneTransformTranslateOnly : 1; - quint32 unused : 7; // feel free to use + quint32 unused : 6; // feel free to use // Optional stacking order int globalStackingOrder; -- cgit v1.2.3 From f9103011abc672059cda53078e84d9e73e687e12 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Thu, 23 Jul 2009 17:12:55 +1000 Subject: Build with rvct compiler. Reviewed-by: akennedy --- src/xmlpatterns/parser/qmaintainingreader.cpp | 4 ++-- src/xmlpatterns/parser/qmaintainingreader_p.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/xmlpatterns/parser/qmaintainingreader.cpp b/src/xmlpatterns/parser/qmaintainingreader.cpp index 051355588..8569f05ea 100644 --- a/src/xmlpatterns/parser/qmaintainingreader.cpp +++ b/src/xmlpatterns/parser/qmaintainingreader.cpp @@ -172,7 +172,7 @@ void MaintainingReader::validateElement(const Looku QStringList allowed; for(int i = 0; i < totalCount; ++i) - allowed.append(formatKeyword(toString(all.at(i)))); + allowed.append(QPatternist::formatKeyword(TokenLookupClass::toString(all.at(i)))); /* Note, we can't run toString() on attrName, because we're in this branch, * the token lookup doesn't have the string(!).*/ @@ -229,7 +229,7 @@ void MaintainingReader::validateElement(const Looku if(!requiredButMissing.isEmpty()) { error(QtXmlPatterns::tr("The attribute %1 must appear on element %2.") - .arg(formatKeyword(toString(*requiredButMissing.constBegin())), + .arg(QPatternist::formatKeyword(TokenLookupClass::toString(*requiredButMissing.constBegin())), formatKeyword(name())), ReportContext::XTSE0010); } diff --git a/src/xmlpatterns/parser/qmaintainingreader_p.h b/src/xmlpatterns/parser/qmaintainingreader_p.h index c2c991ef8..eb20bdba3 100644 --- a/src/xmlpatterns/parser/qmaintainingreader_p.h +++ b/src/xmlpatterns/parser/qmaintainingreader_p.h @@ -59,6 +59,7 @@ #include #include "qxpathhelper_p.h" +#include "qxslttokenlookup_p.h" class QUrl; -- cgit v1.2.3 From 91f85abc13a4dc75bfb810f6c6cc290a3ff75d27 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 23 Jul 2009 09:18:26 +0200 Subject: Recognize .jui file format in lupdate The translator had been installed for the jui format, but the extension wasn't recognized. Task-number: 258547 Reviewed-by: Gunnar --- tools/linguist/lupdate/main.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index cedc01e49..6b454ef5e 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -485,6 +485,9 @@ int main(int argc, char **argv) fetchedTor.load(*it, cd, QLatin1String("java")); //fetchtr_java(*it, &fetchedTor, defaultContext, true, codecForSource); } + else if (it->endsWith(QLatin1String(".jui"), Qt::CaseInsensitive)) { + fetchedTor.load(*it, cd, QLatin1String("jui")); + } else if (it->endsWith(QLatin1String(".ui"), Qt::CaseInsensitive)) { fetchedTor.load(*it, cd, QLatin1String("ui")); //fetchedTor.load(*it + QLatin1String(".h"), cd, QLatin1String("cpp")); -- cgit v1.2.3 From bf095defcbc6f025e39aab32f2ab8102639fd0d2 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 23 Jul 2009 09:42:55 +0200 Subject: Remove the close shortcut from the example since QMdiArea provides this Since QMdiArea provides this already via the standard keys, then we don't want to add it ourselves otherwise it triggers an ambigious shortcut on the platforms which already has CTRL+F4. Task-number: 161999 Reviewed-by: Kavindra Palaraja --- examples/mainwindows/mdi/mainwindow.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/mainwindows/mdi/mainwindow.cpp b/examples/mainwindows/mdi/mainwindow.cpp index 3cb54f1d3..9ef2caef0 100644 --- a/examples/mainwindows/mdi/mainwindow.cpp +++ b/examples/mainwindows/mdi/mainwindow.cpp @@ -259,7 +259,6 @@ void MainWindow::createActions() connect(pasteAct, SIGNAL(triggered()), this, SLOT(paste())); closeAct = new QAction(tr("Cl&ose"), this); - closeAct->setShortcut(tr("Ctrl+F4")); closeAct->setStatusTip(tr("Close the active window")); connect(closeAct, SIGNAL(triggered()), mdiArea, SLOT(closeActiveSubWindow())); -- cgit v1.2.3 From a2d64535d011a47cb2bdf91002f9210cf6b656b1 Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Thu, 23 Jul 2009 09:38:51 +0200 Subject: Fix build on Harmattan Reviewed-By: Trustme --- src/opengl/qgl_x11egl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp index 11131ea67..99b026d85 100644 --- a/src/opengl/qgl_x11egl.cpp +++ b/src/opengl/qgl_x11egl.cpp @@ -469,7 +469,7 @@ void QGLWidgetPrivate::recreateEglSurface(bool force) } } -GLuint QGLContextPrivate::bindTextureFromNativePixmap(const QPixmap& pm, const qint64 key, bool canInvert) +QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qint64 key, bool canInvert) { // TODO return 0; -- cgit v1.2.3 From 350f857f116a734ea25f91887999eeb17e064350 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 23 Jul 2009 10:13:37 +0200 Subject: Ensure all the standard shorcuts are used for the Close Action in MDI Since there is more than one standard shorcut for closing a MDI window, then ensure that all of them can be used. Task-number: 161999 Reviewed-by: Simon Hausmann --- src/gui/widgets/qmdisubwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/widgets/qmdisubwindow.cpp b/src/gui/widgets/qmdisubwindow.cpp index 24dea378a..e8de95723 100644 --- a/src/gui/widgets/qmdisubwindow.cpp +++ b/src/gui/widgets/qmdisubwindow.cpp @@ -1066,7 +1066,7 @@ void QMdiSubWindowPrivate::createSystemMenu() addToSystemMenu(CloseAction, QMdiSubWindow::tr("&Close"), SLOT(close())); actions[CloseAction]->setIcon(style->standardIcon(QStyle::SP_TitleBarCloseButton, 0, q)); #if !defined(QT_NO_SHORTCUT) - actions[CloseAction]->setShortcut(QKeySequence::Close); + actions[CloseAction]->setShortcuts(QKeySequence::Close); #endif updateActions(); } -- cgit v1.2.3 From 9377881d6d6f5c07aa134c8f1708d0afd0d06e86 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Wed, 22 Jul 2009 16:53:49 +0200 Subject: "Emacs" style keyboard shortcuts don't work on Cocoa. Mac supports only single key shortcuts as key equivalent for menu items. So if a multiple key QKeySequence is set, use Qt's shortcut mechanism instead of the native menu shortcut mechanism. Task-number: 258438 Reviewed-by: Norwegian Rock Cat --- src/gui/kernel/qcocoaview_mac.mm | 9 ++++++++- src/gui/widgets/qmenu_mac.mm | 6 ++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 3e5bfb670..3bc348ccc 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -1039,7 +1039,7 @@ extern "C" { - (void) insertText:(id)aString { - if ([aString length]) { + if ([aString length] && composing) { // Send the commit string to the widget. QString commitText; if ([aString isKindOfClass:[NSAttributedString class]]) { @@ -1052,7 +1052,14 @@ extern "C" { QInputMethodEvent e; e.setCommitString(commitText); qt_sendSpontaneousEvent(qwidget, &e); + } else { + // The key sequence "`q" on a French Keyboard will generate two calls to insertText before + // it returns from interpretKeyEvents. The first call will turn off 'composing' and accept + // the "`" key. The last keyDown event needs to be processed by the widget to get the + // character "q". The string parameter is ignored for the second call. + sendKeyEvents = true; } + composingText->clear(); } diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm index 77e98c46b..a5620761a 100644 --- a/src/gui/widgets/qmenu_mac.mm +++ b/src/gui/widgets/qmenu_mac.mm @@ -1376,8 +1376,9 @@ QMenuPrivate::QMacMenuPrivate::syncAction(QMacMenuAction *action) accel = qt_mac_menu_merge_accel(action); } } + // Show multiple key sequences as part of the menu text. if (accel.count() > 1) - text += QLatin1String(" (****)"); //just to denote a multi stroke shortcut + text += QLatin1String(" (") + accel.toString(QKeySequence::NativeText) + QLatin1String(")"); QString finalString = qt_mac_removeMnemonics(text); @@ -1466,7 +1467,8 @@ QMenuPrivate::QMacMenuPrivate::syncAction(QMacMenuAction *action) } #else [item setSubmenu:0]; - if (!accel.isEmpty()) { + // No key equivalent set for multiple key QKeySequence. + if (!accel.isEmpty() && accel.count() == 1) { [item setKeyEquivalent:keySequenceToKeyEqivalent(accel)]; [item setKeyEquivalentModifierMask:keySequenceModifierMask(accel)]; } else { -- cgit v1.2.3 From ec679d7d49012996bc43a7f4152616af15d97dfd Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 23 Jul 2009 11:27:45 +0200 Subject: Enabled setting of DESIGNABLE=false-properties using FormWindowCursor API Regression breakage introduced by the PropertySheet::isEnabled handling in 4.5. Task-number: 253278 Reviewed-by: Jarek Kobus --- .../src/lib/shared/qdesigner_propertysheet.cpp | 28 ++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp index f43b52714..5b22a868e 100644 --- a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp +++ b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp @@ -1381,6 +1381,24 @@ bool QDesignerPropertySheet::isFakeLayoutProperty(int index) const return false; } +// Determine the "designable" state of a property. Properties, which have +// a per-object boolean test function that returns false are shown in +// disabled state ("checked" depending on "checkable", etc.) +// Properties, which are generally not designable independent +// of the object are not shown at all. +enum DesignableState { PropertyIsDesignable, + // Object has a Designable test function that returns false. + PropertyOfObjectNotDesignable, + PropertyNotDesignable }; + +static inline DesignableState designableState(const QDesignerMetaPropertyInterface *p, const QObject *object) +{ + if (p->attributes(object) & QDesignerMetaPropertyInterface::DesignableAttribute) + return PropertyIsDesignable; + return (p->attributes() & QDesignerMetaPropertyInterface::DesignableAttribute) ? + PropertyOfObjectNotDesignable : PropertyNotDesignable; +} + bool QDesignerPropertySheet::isVisible(int index) const { if (d->invalidIndex(Q_FUNC_INFO, index)) @@ -1450,9 +1468,8 @@ bool QDesignerPropertySheet::isVisible(int index) const if (!(p->accessFlags() & QDesignerMetaPropertyInterface::WriteAccess)) return false; - // Enabled handling - return (p->attributes(d->m_object) & QDesignerMetaPropertyInterface::DesignableAttribute) || - (p->attributes() & QDesignerMetaPropertyInterface::DesignableAttribute); + // Enabled handling: Hide only statically not designable properties + return designableState(p, d->m_object) != PropertyNotDesignable; } void QDesignerPropertySheet::setVisible(int index, bool visible) @@ -1482,9 +1499,12 @@ bool QDesignerPropertySheet::isEnabled(int index) const if (d->m_info.value(index).visible == true) // Sun CC 5.5 oddity, wants true return true; + // Enable setting of properties for statically non-designable properties + // as this might be done via TaskMenu/Cursor::setProperty. Note that those + // properties are not visible. const QDesignerMetaPropertyInterface *p = d->m_meta->property(index); return (p->accessFlags() & QDesignerMetaPropertyInterface::WriteAccess) && - (p->attributes(d->m_object) & QDesignerMetaPropertyInterface::DesignableAttribute); + designableState(p, d->m_object) != PropertyOfObjectNotDesignable; } bool QDesignerPropertySheet::isAttribute(int index) const -- cgit v1.2.3 From d6a01d0f948361ac5cacab0bf9f8585041485259 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Wed, 22 Jul 2009 09:59:54 +0200 Subject: Sockets: Added support for SO_KEEPALIVE and TCP_NODELAY Introduce QAbstractSocket::setSocketOption that allows to set the socket options for TCP Keep Alive and TCP_NODELAY (disabling Nagle's Algorithm). Reviewed-by: Thiago --- src/network/socket/qabstractsocket.cpp | 64 +++++++++++++++++++++++++ src/network/socket/qabstractsocket.h | 8 ++++ src/network/socket/qabstractsocketengine_p.h | 4 +- src/network/socket/qhttpsocketengine.cpp | 21 +++++++- src/network/socket/qnativesocketengine_unix.cpp | 24 +++++++++- src/network/socket/qnativesocketengine_win.cpp | 22 ++++++++- src/network/socket/qsocks5socketengine.cpp | 20 ++++++-- src/network/socket/qtcpsocket.h | 1 + 8 files changed, 154 insertions(+), 10 deletions(-) diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index d099382a6..be90b9645 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -332,6 +332,22 @@ \sa QAbstractSocket::state() */ +/*! + \enum QAbstractSocket::SocketOption + \since 4.6 + + This enum represents the options that can be set on a socket. + If desired, they can be set after having received the connected() signal from + the socket or after having received a new socket from a QTcpServer. + + \value LowDelayOption Try to optimize the socket for low latency. For a QTcpSocket + this would set the TCP_NODELAY option and disable Nagle's algorithm. Set this to 1 + to enable. + \value KeepAliveOption Set this to 1 to enable the SO_KEEPALIVE socket option + + \sa QAbstractSocket::setSocketOption(), QAbstractSocket::socketOption() +*/ + #include "qabstractsocket.h" #include "qabstractsocket_p.h" @@ -1548,6 +1564,54 @@ bool QAbstractSocket::setSocketDescriptor(int socketDescriptor, SocketState sock return true; } +/*! + Sets the option \a option to the value described by \a value. + + \sa socketOption() +*/ +void QAbstractSocket::setSocketOption(QAbstractSocket::SocketOption option, QVariant value) +{ + if (!d_func()->socketEngine) + return; + + switch (option) { + case LowDelayOption: + d_func()->socketEngine->setOption(QAbstractSocketEngine::LowDelayOption, value.toInt()); + break; + + case KeepAliveOption: + d_func()->socketEngine->setOption(QAbstractSocketEngine::KeepAliveOption, value.toInt()); + break; + } +} + +/*! + Returns the value of the \a option option. + + \sa setSocketOption() +*/ +QVariant QAbstractSocket::socketOption(QAbstractSocket::SocketOption option) +{ + if (!d_func()->socketEngine) + return QVariant(); + + int ret = -1; + switch (option) { + case LowDelayOption: + ret = d_func()->socketEngine->option(QAbstractSocketEngine::LowDelayOption); + break; + + case KeepAliveOption: + ret = d_func()->socketEngine->option(QAbstractSocketEngine::KeepAliveOption); + break; + } + if (ret == -1) + return QVariant(); + else + return QVariant(ret); +} + + /* Returns the difference between msecs and elapsed. If msecs is -1, however, -1 is returned. diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index ed187e54e..50a38bb7a 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -116,6 +116,10 @@ public: Connection = ConnectedState #endif }; + enum SocketOption { + LowDelayOption, // TCP_NODELAY + KeepAliveOption // SO_KEEPALIVE + }; QAbstractSocket(SocketType socketType, QObject *parent); virtual ~QAbstractSocket(); @@ -149,6 +153,10 @@ public: bool setSocketDescriptor(int socketDescriptor, SocketState state = ConnectedState, OpenMode openMode = ReadWrite); + // ### Qt 5: Make virtual? + void setSocketOption(QAbstractSocket::SocketOption o, QVariant v); + QVariant socketOption(QAbstractSocket::SocketOption o); + SocketType socketType() const; SocketState state() const; SocketError error() const; diff --git a/src/network/socket/qabstractsocketengine_p.h b/src/network/socket/qabstractsocketengine_p.h index b784f6585..39c00cc15 100644 --- a/src/network/socket/qabstractsocketengine_p.h +++ b/src/network/socket/qabstractsocketengine_p.h @@ -92,7 +92,9 @@ public: SendBufferSocketOption, AddressReusable, BindExclusively, - ReceiveOutOfBandData + ReceiveOutOfBandData, + LowDelayOption, + KeepAliveOption }; virtual bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) = 0; diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 156a9f4b8..84b7c1403 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -276,13 +276,30 @@ qint64 QHttpSocketEngine::pendingDatagramSize() const } #endif // QT_NO_UDPSOCKET -int QHttpSocketEngine::option(SocketOption) const +int QHttpSocketEngine::option(SocketOption option) const { + Q_D(const QHttpSocketEngine); + if (d->socket) { + // convert the enum and call the real socket + if (option == QAbstractSocketEngine::LowDelayOption) + return d->socket->socketOption(QAbstractSocket::LowDelayOption).toInt(); + if (option == QAbstractSocketEngine::KeepAliveOption) + return d->socket->socketOption(QAbstractSocket::KeepAliveOption).toInt(); + } return -1; } -bool QHttpSocketEngine::setOption(SocketOption, int) +bool QHttpSocketEngine::setOption(SocketOption option, int value) { + Q_D(QHttpSocketEngine); + if (d->socket) { + // convert the enum and call the real socket + if (option == QAbstractSocketEngine::LowDelayOption) + d->socket->setSocketOption(QAbstractSocket::LowDelayOption, value); + if (option == QAbstractSocketEngine::KeepAliveOption) + d->socket->setSocketOption(QAbstractSocket::KeepAliveOption, value); + return true; + } return false; } diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index 3991ae61c..b4b673a4e 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -65,6 +65,8 @@ #include #endif +#include + QT_BEGIN_NAMESPACE #if defined QNATIVESOCKETENGINE_DEBUG @@ -203,6 +205,8 @@ int QNativeSocketEnginePrivate::option(QNativeSocketEngine::SocketOption opt) co return -1; int n = -1; + int level = SOL_SOCKET; // default + switch (opt) { case QNativeSocketEngine::ReceiveBufferSocketOption: n = SO_RCVBUF; @@ -222,11 +226,18 @@ int QNativeSocketEnginePrivate::option(QNativeSocketEngine::SocketOption opt) co case QNativeSocketEngine::ReceiveOutOfBandData: n = SO_OOBINLINE; break; + case QNativeSocketEngine::LowDelayOption: + level = IPPROTO_TCP; + n = TCP_NODELAY; + break; + case QNativeSocketEngine::KeepAliveOption: + n = SO_KEEPALIVE; + break; } int v = -1; QT_SOCKOPTLEN_T len = sizeof(v); - if (getsockopt(socketDescriptor, SOL_SOCKET, n, (char *) &v, &len) != -1) + if (getsockopt(socketDescriptor, level, n, (char *) &v, &len) != -1) return v; return -1; } @@ -242,6 +253,8 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt return false; int n = 0; + int level = SOL_SOCKET; // default + switch (opt) { case QNativeSocketEngine::ReceiveBufferSocketOption: n = SO_RCVBUF; @@ -282,9 +295,16 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt case QNativeSocketEngine::ReceiveOutOfBandData: n = SO_OOBINLINE; break; + case QNativeSocketEngine::LowDelayOption: + level = IPPROTO_TCP; + n = TCP_NODELAY; + break; + case QNativeSocketEngine::KeepAliveOption: + n = SO_KEEPALIVE; + break; } - return ::setsockopt(socketDescriptor, SOL_SOCKET, n, (char *) &v, sizeof(v)) == 0; + return ::setsockopt(socketDescriptor, level, n, (char *) &v, sizeof(v)) == 0; } bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16 port) diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index 6bc23ceb7..f0b9f0bd9 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -362,6 +362,8 @@ int QNativeSocketEnginePrivate::option(QNativeSocketEngine::SocketOption opt) co return -1; int n = -1; + int level = SOL_SOCKET; // default + switch (opt) { case QNativeSocketEngine::ReceiveBufferSocketOption: n = SO_RCVBUF; @@ -389,11 +391,18 @@ int QNativeSocketEnginePrivate::option(QNativeSocketEngine::SocketOption opt) co case QNativeSocketEngine::ReceiveOutOfBandData: n = SO_OOBINLINE; break; + case QNativeSocketEngine::LowDelayOption: + level = IPPROTO_TCP; + n = TCP_NODELAY; + break; + case QNativeSocketEngine::KeepAliveOption: + n = SO_KEEPALIVE; + break; } int v = -1; QT_SOCKOPTLEN_T len = sizeof(v); - if (getsockopt(socketDescriptor, SOL_SOCKET, n, (char *) &v, &len) != -1) + if (getsockopt(socketDescriptor, level, n, (char *) &v, &len) != -1) return v; return -1; } @@ -409,6 +418,8 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt return false; int n = 0; + int level = SOL_SOCKET; // default + switch (opt) { case QNativeSocketEngine::ReceiveBufferSocketOption: n = SO_RCVBUF; @@ -440,9 +451,16 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt case QNativeSocketEngine::ReceiveOutOfBandData: n = SO_OOBINLINE; break; + case QNativeSocketEngine::LowDelayOption: + level = IPPROTO_TCP; + n = TCP_NODELAY; + break; + case QNativeSocketEngine::KeepAliveOption: + n = SO_KEEPALIVE; + break; } - if (::setsockopt(socketDescriptor, SOL_SOCKET, n, (char*)&v, sizeof(v)) != 0) { + if (::setsockopt(socketDescriptor, level, n, (char*)&v, sizeof(v)) != 0) { WS_ERROR_DEBUG(WSAGetLastError()); return false; } diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp index c9e515089..d226f21da 100644 --- a/src/network/socket/qsocks5socketengine.cpp +++ b/src/network/socket/qsocks5socketengine.cpp @@ -1621,14 +1621,28 @@ qint64 QSocks5SocketEngine::pendingDatagramSize() const int QSocks5SocketEngine::option(SocketOption option) const { - Q_UNUSED(option); + Q_D(const QSocks5SocketEngine); + if (d->data && d->data->controlSocket) { + // convert the enum and call the real socket + if (option == QAbstractSocketEngine::LowDelayOption) + return d->data->controlSocket->socketOption(QAbstractSocket::LowDelayOption).toInt(); + if (option == QAbstractSocketEngine::KeepAliveOption) + return d->data->controlSocket->socketOption(QAbstractSocket::KeepAliveOption).toInt(); + } return -1; } bool QSocks5SocketEngine::setOption(SocketOption option, int value) { - Q_UNUSED(option); - Q_UNUSED(value); + Q_D(QSocks5SocketEngine); + if (d->data && d->data->controlSocket) { + // convert the enum and call the real socket + if (option == QAbstractSocketEngine::LowDelayOption) + d->data->controlSocket->setSocketOption(QAbstractSocket::LowDelayOption, value); + if (option == QAbstractSocketEngine::KeepAliveOption) + d->data->controlSocket->setSocketOption(QAbstractSocket::KeepAliveOption, value); + return true; + } return false; } diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h index 81f81dea9..4e1003ab7 100644 --- a/src/network/socket/qtcpsocket.h +++ b/src/network/socket/qtcpsocket.h @@ -43,6 +43,7 @@ #define QTCPSOCKET_H #include +#include QT_BEGIN_HEADER -- cgit v1.2.3 From 23fcdf1a78d981a6d986a907450b71a82bed5efa Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Wed, 22 Jul 2009 10:40:42 +0200 Subject: QFtp: Also set LowDelay option on the control socket Reviewed-by: Thiago --- src/network/access/qftp.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index 35e0a1876..421e6714e 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -869,6 +869,9 @@ void QFtpPI::connected() #if defined(QFTPPI_DEBUG) // qDebug("QFtpPI state: %d [connected()]", state); #endif + // try to improve performance by setting TCP_NODELAY + commandSocket.setSocketOption(QAbstractSocket::LowDelayOption, 1); + emit connectState(QFtp::Connected); } -- cgit v1.2.3 From 6844c1b37514a7ceed2378049f8bad887f58d4bf Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Wed, 22 Jul 2009 10:59:37 +0200 Subject: tst_qnetworkreply: Small and simple latency testing Reviewed-by: Thiago --- tests/benchmarks/benchmarks.pro | 1 + tests/benchmarks/qnetworkreply/main.cpp | 74 ++++++++++++++++++++++++ tests/benchmarks/qnetworkreply/qnetworkreply.pro | 13 +++++ 3 files changed, 88 insertions(+) create mode 100644 tests/benchmarks/qnetworkreply/main.cpp create mode 100644 tests/benchmarks/qnetworkreply/qnetworkreply.pro diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro index 1ee0c4179..bf02731f4 100644 --- a/tests/benchmarks/benchmarks.pro +++ b/tests/benchmarks/benchmarks.pro @@ -11,6 +11,7 @@ SUBDIRS = containers-associative \ qstring \ qstringlist \ qmatrix4x4 \ + qnetworkreply \ qobject \ qrect \ qregexp \ diff --git a/tests/benchmarks/qnetworkreply/main.cpp b/tests/benchmarks/qnetworkreply/main.cpp new file mode 100644 index 000000000..3f1e9f790 --- /dev/null +++ b/tests/benchmarks/qnetworkreply/main.cpp @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ +// This file contains benchmarks for QNetworkReply functions. + +#include +#include +#include +#include +#include +#include +#include "../../auto/network-settings.h" + +class tst_qnetworkreply : public QObject +{ + Q_OBJECT +private slots: + void httpLatency(); + +}; + +void tst_qnetworkreply::httpLatency() +{ + QNetworkAccessManager manager; + QBENCHMARK{ + QNetworkRequest request(QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/")); + QNetworkReply* reply = manager.get(request); + connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()), Qt::QueuedConnection); + QTestEventLoop::instance().enterLoop(5); + QVERIFY(!QTestEventLoop::instance().timeout()); + delete reply; + } +} + +QTEST_MAIN(tst_qnetworkreply) + +#include "main.moc" diff --git a/tests/benchmarks/qnetworkreply/qnetworkreply.pro b/tests/benchmarks/qnetworkreply/qnetworkreply.pro new file mode 100644 index 000000000..060acf53d --- /dev/null +++ b/tests/benchmarks/qnetworkreply/qnetworkreply.pro @@ -0,0 +1,13 @@ +load(qttest_p4) +TEMPLATE = app +TARGET = tst_qnetworkreply +DEPENDPATH += . +INCLUDEPATH += . + +QT -= gui +QT += network + +CONFIG += release + +# Input +SOURCES += main.cpp -- cgit v1.2.3 From e5207123dff4eb6b6eaea244d697ec14c08a502e Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Wed, 22 Jul 2009 10:28:13 +0200 Subject: QNAM HTTP Code: Use new LowDelay socket option Reviewed-by: Thiago --- src/network/access/qhttpnetworkconnection.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index c824faca5..3f0b24460 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -409,6 +409,7 @@ bool QHttpNetworkConnectionPrivate::sendRequest(QAbstractSocket *socket) channels[i].bytesTotal = channels[i].request.contentLength(); } else { + socket->flush(); // ### Remove this when pipelining is implemented. We want less TCP packets! channels[i].state = WaitingState; break; } @@ -1198,6 +1199,10 @@ void QHttpNetworkConnectionPrivate::_q_connected() QAbstractSocket *socket = qobject_cast(q->sender()); if (!socket) return; // ### error + + // improve performance since we get the request sent by the kernel ASAP + socket->setSocketOption(QAbstractSocket::LowDelayOption, 1); + int i = indexOf(socket); // ### FIXME: if the server closes the connection unexpectedly, we shouldn't send the same broken request again! //channels[i].reconnectAttempts = 2; -- cgit v1.2.3 From 30f6a1d06723aac5168dcef32cba10cd99b85242 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Thu, 23 Jul 2009 12:10:46 +0200 Subject: linker fix for WinCE - link against correct library - theoretically it should be ok to use QHostInfo::localHostName(), but for this test it is fine Reviewed-by: Thomas Hartmann --- tests/auto/qsqldatabase/qsqldatabase.pro | 5 ++++- tests/auto/qsqldriver/qsqldriver.pro | 3 ++- tests/auto/qsqlquery/qsqlquery.pro | 3 ++- tests/auto/qsqlquerymodel/qsqlquerymodel.pro | 1 + tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro | 1 + tests/auto/qsqltablemodel/qsqltablemodel.pro | 3 ++- tests/auto/qsqlthread/qsqlthread.pro | 3 ++- 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/auto/qsqldatabase/qsqldatabase.pro b/tests/auto/qsqldatabase/qsqldatabase.pro index 534a2d3c4..3bca79a1a 100644 --- a/tests/auto/qsqldatabase/qsqldatabase.pro +++ b/tests/auto/qsqldatabase/qsqldatabase.pro @@ -5,7 +5,10 @@ QT += sql contains(QT_CONFIG, qt3support): QT += qt3support -win32:!wince*: LIBS += -lws2_32 +win32: { + !wince*: LIBS += -lws2_32 + else: LIBS += -lws2 +} wince*: { DEPLOYMENT_PLUGIN += qsqlite diff --git a/tests/auto/qsqldriver/qsqldriver.pro b/tests/auto/qsqldriver/qsqldriver.pro index 0024841e1..84f1cb2ae 100644 --- a/tests/auto/qsqldriver/qsqldriver.pro +++ b/tests/auto/qsqldriver/qsqldriver.pro @@ -6,7 +6,8 @@ QT += sql wince*: { plugFiles.sources = ../../../plugins/sqldrivers plugFiles.path = . - DEPLOYMENT += plugFiles + DEPLOYMENT += plugFiles + LIBS += -lws2 } else { win32-g++ { LIBS += -lws2_32 diff --git a/tests/auto/qsqlquery/qsqlquery.pro b/tests/auto/qsqlquery/qsqlquery.pro index d70ede36b..79966374d 100644 --- a/tests/auto/qsqlquery/qsqlquery.pro +++ b/tests/auto/qsqlquery/qsqlquery.pro @@ -10,5 +10,6 @@ QT = core sql wince*: { plugFiles.sources = ../../../plugins/sqldrivers plugFiles.path = . - DEPLOYMENT += plugFiles + DEPLOYMENT += plugFiles + LIBS += -lws2 } diff --git a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro index 669db6e2b..6004ab02e 100644 --- a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro +++ b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro @@ -5,6 +5,7 @@ QT += sql wince*: { DEPLOYMENT_PLUGIN += qsqlite + LIBS += -lws2 } else { win32:LIBS += -lws2_32 } diff --git a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro b/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro index a35a56ca3..a25cb93a8 100644 --- a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro +++ b/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro @@ -7,6 +7,7 @@ wince*: { plugFiles.sources = ../../../plugins/sqldrivers plugFiles.path = . DEPLOYMENT += plugFiles + LIBS += -lws2 } else { win32-g++ { LIBS += -lws2_32 diff --git a/tests/auto/qsqltablemodel/qsqltablemodel.pro b/tests/auto/qsqltablemodel/qsqltablemodel.pro index cf5fbea3c..170862e19 100644 --- a/tests/auto/qsqltablemodel/qsqltablemodel.pro +++ b/tests/auto/qsqltablemodel/qsqltablemodel.pro @@ -6,7 +6,8 @@ QT += sql wince*: { plugFiles.sources = ../../../plugins/sqldrivers plugFiles.path = . - DEPLOYMENT += plugFiles + DEPLOYMENT += plugFiles + LIBS += -lws2 } else { win32:LIBS += -lws2_32 } diff --git a/tests/auto/qsqlthread/qsqlthread.pro b/tests/auto/qsqlthread/qsqlthread.pro index 23aa5988f..9049f4c65 100644 --- a/tests/auto/qsqlthread/qsqlthread.pro +++ b/tests/auto/qsqlthread/qsqlthread.pro @@ -7,7 +7,8 @@ QT = core sql wince*: { plugFiles.sources = ../../../plugins/sqldrivers plugFiles.path = . - DEPLOYMENT += plugFiles + DEPLOYMENT += plugFiles + LIBS += -lws2 } else { win32:LIBS += -lws2_32 } -- cgit v1.2.3 From 588f8daeb52cfea461cbcb8c128de5997ab5a6cf Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Thu, 23 Jul 2009 12:41:52 +0200 Subject: make statemachine compile with QT_NO_PROPERTIES --- src/corelib/statemachine/qstate.cpp | 4 ++++ src/corelib/statemachine/qstate.h | 2 ++ src/corelib/statemachine/qstatemachine.cpp | 14 ++++++++++++++ src/corelib/statemachine/qstatemachine_p.h | 2 ++ 4 files changed, 22 insertions(+) diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp index f74edc3c5..2042288ce 100644 --- a/src/corelib/statemachine/qstate.cpp +++ b/src/corelib/statemachine/qstate.cpp @@ -215,6 +215,8 @@ QList QStatePrivate::transitions() const return result; } +#ifndef QT_NO_PROPERTIES + /*! Instructs this state to set the property with the given \a name of the given \a object to the given \a value when the state is entered. @@ -239,6 +241,8 @@ void QState::assignProperty(QObject *object, const char *name, d->propertyAssignments.append(QPropertyAssignment(object, name, value)); } +#endif // QT_NO_PROPERTIES + /*! Returns this state's error state. diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h index 41d32be21..ce88b253f 100644 --- a/src/corelib/statemachine/qstate.h +++ b/src/corelib/statemachine/qstate.h @@ -87,8 +87,10 @@ public: ChildMode childMode() const; void setChildMode(ChildMode mode); +#ifndef QT_NO_PROPERTIES void assignProperty(QObject *object, const char *name, const QVariant &value); +#endif Q_SIGNALS: void finished(); diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 5402b0497..a02480bff 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -395,7 +395,9 @@ void QStateMachinePrivate::microstep(QEvent *event, const QList enteredStates = enterStates(event, enabledTransitions); +#ifndef QT_NO_PROPERTIES applyProperties(enabledTransitions, exitedStates, enteredStates); +#endif #ifdef QSTATEMACHINE_DEBUG qDebug() << q_func() << ": configuration after entering states:" << configuration; qDebug() << q_func() << ": end microstep"; @@ -666,6 +668,8 @@ void QStateMachinePrivate::addStatesToEnter(QAbstractState *s, QState *root, } } +#ifndef QT_NO_PROPERTIES + void QStateMachinePrivate::applyProperties(const QList &transitionList, const QList &exitedStates, const QList &enteredStates) @@ -853,6 +857,8 @@ void QStateMachinePrivate::applyProperties(const QList &tr } } +#endif // QT_NO_PROPERTIES + bool QStateMachinePrivate::isFinal(const QAbstractState *s) { return qobject_cast(s) != 0; @@ -932,6 +938,8 @@ bool QStateMachinePrivate::isInFinalState(QAbstractState* s) const return false; } +#ifndef QT_NO_PROPERTIES + void QStateMachinePrivate::registerRestorable(QObject *object, const QByteArray &propertyName) { RestorableId id(object, propertyName); @@ -976,6 +984,8 @@ void QStateMachinePrivate::unregisterRestorable(QObject *object, const QByteArra registeredRestorables.remove(id); } +#endif // QT_NO_PROPERTIES + QAbstractState *QStateMachinePrivate::findErrorState(QAbstractState *context) { // Find error state recursively in parent hierarchy if not set explicitly for context state @@ -1088,12 +1098,14 @@ void QStateMachinePrivate::_q_animationFinished() resetAnimationEndValues.remove(anim); } +#ifndef QT_NO_PROPERTIES // Set the final property value. QPropertyAssignment assn = propertyForAnimation.take(anim); Q_ASSERT(assn.object != 0); assn.object->setProperty(assn.propertyName, assn.value); if (!assn.explicitlySet) unregisterRestorable(assn.object, assn.propertyName); +#endif QAbstractState *state = stateForAnimation.take(anim); Q_ASSERT(state != 0); @@ -1161,8 +1173,10 @@ void QStateMachinePrivate::_q_start() QEvent nullEvent(QEvent::None); executeTransitionContent(&nullEvent, transitions); QList enteredStates = enterStates(&nullEvent, transitions); +#ifndef QT_NO_PROPERTIES applyProperties(transitions, QList() << start, enteredStates); +#endif delete start; #ifdef QSTATEMACHINE_DEBUG diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index 21e405d2a..cae21aad2 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -151,6 +151,7 @@ public: void **args); void scheduleProcess(); +#ifndef QT_NO_PROPERTIES typedef QPair RestorableId; QHash registeredRestorables; void registerRestorable(QObject *object, const QByteArray &propertyName); @@ -158,6 +159,7 @@ public: bool hasRestorable(QObject *object, const QByteArray &propertyName) const; QVariant restorableValue(QObject *object, const QByteArray &propertyName) const; QList restorablesToPropertyList(const QHash &restorables) const; +#endif State state; bool processing; -- cgit v1.2.3 From 7ade13540e6caa6449c02a8832e670a499e97189 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Thu, 23 Jul 2009 11:59:30 +0200 Subject: "Emacs" style keyboard shortcuts don't work on Carbon. Set the native key equivalent for menu items only for single key shortcuts. Qt's shortcut mechanism will take care of sending the multiple key shortcut events. Task-number: 258438 Reviewed-by: Norwegian Rock Cat --- src/gui/widgets/qmenu_mac.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm index a5620761a..87f6f8238 100644 --- a/src/gui/widgets/qmenu_mac.mm +++ b/src/gui/widgets/qmenu_mac.mm @@ -1460,7 +1460,7 @@ QMenuPrivate::QMacMenuPrivate::syncAction(QMacMenuAction *action) data.whichData |= kMenuItemDataCmdKey; data.whichData |= kMenuItemDataCmdKeyModifiers; data.whichData |= kMenuItemDataCmdKeyGlyph; - if (!accel.isEmpty()) { + if (accel.count() == 1) { qt_mac_get_accel(accel[0], (quint32*)&data.cmdKeyModifiers, (quint32*)&data.cmdKeyGlyph); if (data.cmdKeyGlyph == 0) data.cmdKey = (UniChar)accel[0]; @@ -1468,7 +1468,7 @@ QMenuPrivate::QMacMenuPrivate::syncAction(QMacMenuAction *action) #else [item setSubmenu:0]; // No key equivalent set for multiple key QKeySequence. - if (!accel.isEmpty() && accel.count() == 1) { + if (accel.count() == 1) { [item setKeyEquivalent:keySequenceToKeyEqivalent(accel)]; [item setKeyEquivalentModifierMask:keySequenceModifierMask(accel)]; } else { -- cgit v1.2.3 From c2fe149aa4bc5ca212fcee3d149abb96098f31b5 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Thu, 23 Jul 2009 13:14:35 +0200 Subject: Omit monotonic timer detection/conditional code on Mac OS X Now that we have a monotonic time source on the Mac, we don't need to compile in the code to detect wall-time changes and do timer adjustments. Reviewed-by: nrc --- src/corelib/kernel/qeventdispatcher_unix.cpp | 30 ++++++++++++---------------- src/corelib/kernel/qeventdispatcher_unix_p.h | 2 +- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 9deb78ff3..fac8a2842 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -291,9 +291,6 @@ QTimerInfoList::QTimerInfoList() msPerTick = 0; } #else -# if defined(Q_OS_MAC) - useMonotonicTimers = true; -# endif // using monotonic timers unconditionally getTime(currentTime); #endif @@ -307,7 +304,7 @@ timeval QTimerInfoList::updateCurrentTime() return currentTime; } -#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) || defined(QT_BOOTSTRAPPED) +#if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC)) || defined(QT_BOOTSTRAPPED) /* Returns true if the real time clock has changed by more than 10% @@ -342,19 +339,7 @@ bool QTimerInfoList::timeChanged(timeval *delta) void QTimerInfoList::getTime(timeval &t) { -#if defined(Q_OS_MAC) - { - static mach_timebase_info_data_t info = {0,0}; - if (info.denom == 0) - mach_timebase_info(&info); - - uint64_t cpu_time = mach_absolute_time(); - uint64_t nsecs = cpu_time * (info.numer / info.denom); - t.tv_sec = nsecs * 1e-9; - t.tv_usec = nsecs * 1e-3 - (t.tv_sec * 1e6); - return; - } -#elif !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_BOOTSTRAPPED) +#if !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_BOOTSTRAPPED) if (useMonotonicTimers) { timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); @@ -394,10 +379,21 @@ void QTimerInfoList::repairTimersIfNeeded() void QTimerInfoList::getTime(timeval &t) { +#if defined(Q_OS_MAC) + static mach_timebase_info_data_t info = {0,0}; + if (info.denom == 0) + mach_timebase_info(&info); + + uint64_t cpu_time = mach_absolute_time(); + uint64_t nsecs = cpu_time * (info.numer / info.denom); + t.tv_sec = nsecs * 1e-9; + t.tv_usec = nsecs * 1e-3 - (t.tv_sec * 1e6); +#else timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); t.tv_sec = ts.tv_sec; t.tv_usec = ts.tv_nsec / 1000; +#endif } void QTimerInfoList::repairTimersIfNeeded() diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index d1f743125..ebba21b49 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -116,7 +116,7 @@ struct QTimerInfo { class QTimerInfoList : public QList { -#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) || defined(QT_BOOTSTRAPPED) +#if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC)) || defined(QT_BOOTSTRAPPED) bool useMonotonicTimers; timeval previousTime; -- cgit v1.2.3 From 86422951df8073babe8d9dcfbd63fe216aa4662e Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 23 Jul 2009 13:35:39 +0200 Subject: doc: Removed a few links to obsolete functions (not controversial). --- src/gui/graphicsview/qgraphicsitem.cpp | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 4e3677a22..0ff3685f3 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -307,8 +307,6 @@ QStyleOptionGraphicsItem::exposedRect or QStyleOptionGraphicsItem::matrix. By default, the exposedRect is initialized to the item's boundingRect and the matrix is untransformed. Enable this flag for more fine-grained values. - Note that QStyleOptionGraphicsItem::levelOfDetail is unaffected by this flag - and is always initialized to 1. Use QStyleOptionGraphicsItem::levelOfDetailFromTransform for a more fine-grained value. @@ -1237,7 +1235,7 @@ void QGraphicsItem::setGroup(QGraphicsItemGroup *group) Returns a pointer to this item's parent item. If this item does not have a parent, 0 is returned. - \sa setParentItem(), children() + \sa setParentItem(), childItems() */ QGraphicsItem *QGraphicsItem::parentItem() const { @@ -1353,7 +1351,7 @@ const QGraphicsObject *QGraphicsItem::toGraphicsObject() const the parent. You should not \l{QGraphicsScene::addItem()}{add} the item to the scene yourself. - \sa parentItem(), children() + \sa parentItem(), childItems() */ void QGraphicsItem::setParentItem(QGraphicsItem *parent) { @@ -2298,10 +2296,10 @@ bool QGraphicsItem::acceptsHoverEvents() const stays "hovered" until the cursor leaves its area, including its children's areas. - If a parent item handles child events (setHandlesChildEvents()), it will - receive hover move, drag move, and drop events as the cursor passes - through its children, but it does not receive hover enter and hover leave, - nor drag enter and drag leave events on behalf of its children. + If a parent item handles child events, it will receive hover move, + drag move, and drop events as the cursor passes through its + children, but it does not receive hover enter and hover leave, nor + drag enter and drag leave events on behalf of its children. A QGraphicsWidget with window decorations will accept hover events regardless of the value of acceptHoverEvents(). @@ -2715,7 +2713,7 @@ void QGraphicsItem::ungrabKeyboard() For convenience, you can also call scenePos() to determine the item's position in scene coordinates, regardless of its parent. - \sa x(), y(), setPos(), matrix(), {The Graphics View Coordinate System} + \sa x(), y(), setPos(), transform(), {The Graphics View Coordinate System} */ QPointF QGraphicsItem::pos() const { @@ -9706,13 +9704,10 @@ QVariant QGraphicsSimpleTextItem::extension(const QVariant &variant) const setParentItem(). The boundingRect() function of QGraphicsItemGroup returns the - bounding rectangle of all items in the item group. In addition, - item groups have handlesChildEvents() enabled by default, so all - events sent to a member of the group go to the item group (i.e., - selecting one item in a group will select them all). - QGraphicsItemGroup ignores the ItemIgnoresTransformations flag on its - children (i.e., with respect to the geometry of the group item, the - children are treated as if they were transformable). + bounding rectangle of all items in the item group. + QGraphicsItemGroup ignores the ItemIgnoresTransformations flag on + its children (i.e., with respect to the geometry of the group + item, the children are treated as if they were transformable). There are two ways to construct an item group. The easiest and most common approach is to pass a list of items (e.g., all -- cgit v1.2.3 From 9081c1b97532f76b350a712c8e8e6d0bd4cadfdc Mon Sep 17 00:00:00 2001 From: Benjamin Poulain Date: Thu, 23 Jul 2009 14:04:19 +0200 Subject: Fix two errors of QDirIteratorPrivate::matchesFilters() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The filter for includeSystem was exectuted twice. The second time was not correct according to d9a620633d0a5fa5e69ab06ec9a706118f3df2a6 (QFileInfo::exists() can return false for system file). For skipDirs, a parenthesis was missing in the test of includeHidden and includeSystem. This was introduced in the refactoring of 44766d265c16551043d2739171069fe042c40091 Reviewed-by: João Abecasis --- src/corelib/io/qdiriterator.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index 3bfea6544..30d255809 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -309,17 +309,11 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf || (!fi.exists() && fi.isSymLink()))) return false; - - if (!includeSystem && !dotOrDotDot && ((fi.exists() && !fi.isFile() && !fi.isDir() && !fi.isSymLink()) - || (!fi.exists() && fi.isSymLink()))) { - return false; - } - // skip directories const bool skipDirs = !(filters & (QDir::Dirs | QDir::AllDirs)); if (skipDirs && fi.isDir()) { - if (!(includeHidden && !dotOrDotDot && fi.isHidden()) - || (includeSystem && !fi.exists() && fi.isSymLink())) + if (!((includeHidden && !dotOrDotDot && fi.isHidden()) + || (includeSystem && !fi.exists() && fi.isSymLink()))) return false; } -- cgit v1.2.3 From 1e25ea7f04a44c84562216e5d305eddd12e9b4d7 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Thu, 23 Jul 2009 14:19:18 +0200 Subject: Socket code: Forgot since 4.6 doc tag Reviewed-by: TrustMe --- src/network/socket/qabstractsocket.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index be90b9645..290522cbf 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1568,6 +1568,7 @@ bool QAbstractSocket::setSocketDescriptor(int socketDescriptor, SocketState sock Sets the option \a option to the value described by \a value. \sa socketOption() + \since 4.6 */ void QAbstractSocket::setSocketOption(QAbstractSocket::SocketOption option, QVariant value) { @@ -1589,6 +1590,7 @@ void QAbstractSocket::setSocketOption(QAbstractSocket::SocketOption option, QVar Returns the value of the \a option option. \sa setSocketOption() + \since 4.6 */ QVariant QAbstractSocket::socketOption(QAbstractSocket::SocketOption option) { -- cgit v1.2.3 From df4fe401f98e53c9d93b9a4cb683f23f45043d2b Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 23 Jul 2009 14:50:23 +0200 Subject: Doc: Removed invalid statements about item views and QTextDocument. Task-number: 257669 Reviewed-by: Trust Me Bikeshed-value-for-reviewed-by-field: 11 --- doc/src/richtext.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/richtext.qdoc b/doc/src/richtext.qdoc index 1c762680d..c43db0c5b 100644 --- a/doc/src/richtext.qdoc +++ b/doc/src/richtext.qdoc @@ -714,8 +714,8 @@ Ideas for other sections: \previouspage Common Rich Text Editing Tasks Qt's text widgets are able to display rich text, specified using a subset of \l{HTML 4} - markup. Widgets that use QTextDocument, such as QLabel, QTextEdit, QTreeWidgetItem and - the other item widgets, are able to display rich text specified in this way. + markup. Widgets that use QTextDocument, such as QLabel and QTextEdit, are able to display + rich text specified in this way. \tableofcontents -- cgit v1.2.3 From 4b148a23d4c524ec0abc67415b596c6952c517a8 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 23 Jul 2009 14:52:24 +0200 Subject: Doc: Fixed qdoc warnings Reviewed-by: Trust Me --- src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp | 2 +- src/qt3support/widgets/q3dockarea.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp index f5afbecd3..34da64426 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp @@ -270,7 +270,7 @@ void QWebView::setPage(QWebPage *page) 'ftp'. The result is then passed through QUrl's tolerant parser, and in the case or success, a valid QUrl is returned, or else a QUrl(). - \section2 Examples: + \section1 Examples: \list \o webkit.org becomes http://webkit.org diff --git a/src/qt3support/widgets/q3dockarea.cpp b/src/qt3support/widgets/q3dockarea.cpp index a823caa0c..d76835ab7 100644 --- a/src/qt3support/widgets/q3dockarea.cpp +++ b/src/qt3support/widgets/q3dockarea.cpp @@ -482,7 +482,7 @@ int Q3DockAreaLayout::widthForHeight(int h) const \img qmainwindow-qdockareas.png QMainWindow's Q3DockAreas \target lines - \section2 Lines. + \section1 Lines. Q3DockArea uses the concept of lines. A line is a horizontal region which may contain dock windows side-by-side. A dock area -- cgit v1.2.3 From 9ad53e9404889b119f26d0a7bc7c70bf93364e23 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 23 Jul 2009 14:59:31 +0200 Subject: qdoc: Removed obsolete classes from annotated lists. --- tools/qdoc3/htmlgenerator.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index e31f6cf47..d82e9f814 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1848,6 +1848,9 @@ HtmlGenerator::generateAnnotatedList(const Node *relative, foreach (const QString &name, nodeMap.keys()) { const Node *node = nodeMap[name]; + if (node->status() == Node::Obsolete) + continue; + if (++row % 2 == 1) out() << ""; else -- cgit v1.2.3 From 9fd510721a140c46ce371b0c7bbc6917e3709c1d Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Thu, 23 Jul 2009 14:20:14 +0200 Subject: Implement clipping in the QPaintEngineEx::stroke() function. This is a huge impact on performance whenever this path is taken. Reviewed-By: Tom Cooksey --- src/gui/painting/qpaintengine_raster.cpp | 3 +++ src/gui/painting/qpaintengineex.cpp | 12 ++++++------ src/gui/painting/qpaintengineex_p.h | 2 ++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 8e91101fb..a34c26439 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -1101,6 +1101,9 @@ void QRasterPaintEnginePrivate::systemStateChanged() #ifdef QT_DEBUG_DRAW qDebug() << "systemStateChanged" << this << "deviceRect" << deviceRect << clipRect << systemClip; #endif + + exDeviceRect = deviceRect; + Q_Q(QRasterPaintEngine); q->state()->strokeFlags |= QPaintEngine::DirtyClipRegion; q->state()->fillFlags |= QPaintEngine::DirtyClipRegion; diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index df7dc3e9a..95355f31d 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -296,12 +296,12 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) d->activeStroker = 0; } else { // ### re-enable... -// if (pen.isCosmetic()) { -// d->dashStroker->setClipRect(d->deviceRect); -// } else { -// QRectF clipRect = s->matrix.inverted().mapRect(QRectF(d->deviceRect)); -// d->dashStroker->setClipRect(clipRect); -// } + if (pen.isCosmetic()) { + d->dasher.setClipRect(d->exDeviceRect); + } else { + QRectF clipRect = state()->matrix.inverted().mapRect(QRectF(d->exDeviceRect)); + d->dasher.setClipRect(clipRect); + } d->dasher.setDashPattern(pen.dashPattern()); d->dasher.setDashOffset(pen.dashOffset()); d->activeStroker = &d->dasher; diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h index 89b14eb72..6e7e3b62d 100644 --- a/src/gui/painting/qpaintengineex_p.h +++ b/src/gui/painting/qpaintengineex_p.h @@ -150,6 +150,8 @@ public: StrokeHandler *strokeHandler; QStrokerOps *activeStroker; QPen strokerPen; + + QRect exDeviceRect; }; class QPixmapFilter; -- cgit v1.2.3 From 2851458fbefcc4785a1a76f5216af6159d6c7116 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Thu, 23 Jul 2009 14:30:57 +0200 Subject: Diagonal dashes are moving when touching the clip boundary. We normally pad the clip rect with the size of the pen and miterlimit to avoid this, but this didn't handle the case where there was a long diagonal dash. We also need to multiply the padding with the longest dash. Reviewed-By: Tom Cooksey --- src/gui/painting/qstroker.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp index ceafe4c39..362b0b3fa 100644 --- a/src/gui/painting/qstroker.cpp +++ b/src/gui/painting/qstroker.cpp @@ -1012,10 +1012,13 @@ void QDashStroker::processCurrentSubpath() int dashCount = qMin(m_dashPattern.size(), 32); qfixed dashes[32]; + qreal longestLength = 0; qreal sumLength = 0; for (int i=0; istrokeWidth(); sumLength += dashes[i]; + if (dashes[i] > longestLength) + longestLength = dashes[i]; } if (qFuzzyCompare(sumLength + 1, qreal(1))) @@ -1053,7 +1056,7 @@ void QDashStroker::processCurrentSubpath() qfixed2d line_to_pos; // Pad to avoid clipping the borders of thick pens. - qfixed padding = qMax(m_stroker->strokeWidth(), m_stroker->miterLimit()); + qfixed padding = qt_real_to_fixed(qMax(m_stroker->strokeWidth(), m_stroker->miterLimit()) * longestLength); qfixed2d clip_tl = { qt_real_to_fixed(m_clip_rect.left()) - padding, qt_real_to_fixed(m_clip_rect.top()) - padding }; qfixed2d clip_br = { qt_real_to_fixed(m_clip_rect.right()) + padding , -- cgit v1.2.3 From 9a1e0047d02fd94f92eda6cd6751bfe4cd876cd2 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Thu, 23 Jul 2009 13:21:51 +0200 Subject: Fix time change detection on UNIX systems without monotonic timers A few fixes in one: 1. Don't loop on select() when not using monotonic timers... when select returns, the time may have changed, and the offset calculated in the loop may be very wrong on the next iteration. 2. Calculate the elapsed time deltas using timevals instead of integers using milliseconds. This handles changing the time by more than a few hours or days (i.e. months and years) without overflow. 3. When repairing the timers, the diff is already the correct sign, so we should just add the diff. Task-number: 250681 Reviewed-by: Thiago --- src/corelib/kernel/qeventdispatcher_unix.cpp | 75 +++++++++++++++++++--------- src/corelib/kernel/qeventdispatcher_unix_p.h | 46 ++++++++++------- 2 files changed, 79 insertions(+), 42 deletions(-) diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index fac8a2842..21395450b 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -67,6 +67,25 @@ QT_BEGIN_NAMESPACE Q_CORE_EXPORT bool qt_disable_lowpriority_timers=false; +// check for _POSIX_MONOTONIC_CLOCK support +static bool supportsMonotonicClock() +{ + bool returnValue; + +#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) + returnValue = false; +# if (_POSIX_MONOTONIC_CLOCK == 0) + // detect if the system support monotonic timers + long x = sysconf(_SC_MONOTONIC_CLOCK); + returnValue = x >= 200112L; +# endif +#else + returnValue = true; +#endif + + return returnValue; +} + /***************************************************************************** UNIX signal handling *****************************************************************************/ @@ -262,18 +281,11 @@ int QEventDispatcherUNIXPrivate::doSelect(QEventLoop::ProcessEventsFlags flags, */ QTimerInfoList::QTimerInfoList() + : useMonotonicTimers(supportsMonotonicClock()) { -#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) - useMonotonicTimers = false; - -# if (_POSIX_MONOTONIC_CLOCK == 0) - // detect if the system support monotonic timers - long x = sysconf(_SC_MONOTONIC_CLOCK); - useMonotonicTimers = x != -1; -# endif - getTime(currentTime); +#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) if (!useMonotonicTimers) { // not using monotonic timers, initialize the timeChanged() machinery previousTime = currentTime; @@ -290,9 +302,6 @@ QTimerInfoList::QTimerInfoList() ticksPerSecond = 0; msPerTick = 0; } -#else - // using monotonic timers unconditionally - getTime(currentTime); #endif firstTimerInfo = currentTimerInfo = 0; @@ -306,6 +315,20 @@ timeval QTimerInfoList::updateCurrentTime() #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC)) || defined(QT_BOOTSTRAPPED) +template <> +timeval qAbs(const timeval &t) +{ + timeval tmp = t; + if (tmp.tv_sec < 0) { + tmp.tv_sec = -tmp.tv_sec - 1; + tmp.tv_usec -= 1000000; + } + if (tmp.tv_sec == 0 && tmp.tv_usec < 0) { + tmp.tv_usec = -tmp.tv_usec; + } + return normalizedTimeval(tmp); +} + /* Returns true if the real time clock has changed by more than 10% relative to the processor time since the last time this function was @@ -318,23 +341,27 @@ bool QTimerInfoList::timeChanged(timeval *delta) tms unused; clock_t currentTicks = times(&unused); - int elapsedTicks = currentTicks - previousTicks; + clock_t elapsedTicks = currentTicks - previousTicks; timeval elapsedTime = currentTime - previousTime; - int elapsedMsecTicks = (elapsedTicks * 1000) / ticksPerSecond; - int deltaMsecs = (elapsedTime.tv_sec * 1000 + elapsedTime.tv_usec / 1000) - - elapsedMsecTicks; - if (delta) { - delta->tv_sec = deltaMsecs / 1000; - delta->tv_usec = (deltaMsecs % 1000) * 1000; - } + timeval elapsedTimeTicks; + elapsedTimeTicks.tv_sec = elapsedTicks / ticksPerSecond; + elapsedTimeTicks.tv_usec = (((elapsedTicks * 1000) / ticksPerSecond) % 1000) * 1000; + + timeval dummy; + if (!delta) + delta = &dummy; + *delta = elapsedTime - elapsedTimeTicks; + previousTicks = currentTicks; previousTime = currentTime; // If tick drift is more than 10% off compared to realtime, we assume that the clock has // been set. Of course, we have to allow for the tick granularity as well. - - return (qAbs(deltaMsecs) - msPerTick) * 10 > elapsedMsecTicks; + timeval tickGranularity; + tickGranularity.tv_sec = 0; + tickGranularity.tv_usec = msPerTick * 1000; + return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); } void QTimerInfoList::getTime(timeval &t) @@ -424,7 +451,7 @@ void QTimerInfoList::timerRepair(const timeval &diff) // repair all timers for (int i = 0; i < size(); ++i) { register QTimerInfo *t = at(i); - t->timeout = t->timeout - diff; + t->timeout = t->timeout + diff; } } @@ -622,7 +649,7 @@ int QEventDispatcherUNIX::select(int nfds, fd_set *readfds, fd_set *writefds, fd timeval *timeout) { Q_D(QEventDispatcherUNIX); - if (timeout) { + if (timeout && d->timerList.useMonotonicTimers) { // handle the case where select returns with a timeout, too // soon. timeval tvStart = d->timerList.currentTime; diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index ebba21b49..28e7f9be5 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -71,6 +71,18 @@ QT_BEGIN_NAMESPACE #endif // Internal operator functions for timevals +inline timeval &normalizedTimeval(timeval &t) +{ + while (t.tv_usec > 1000000l) { + ++t.tv_sec; + t.tv_usec -= 1000000l; + } + while (t.tv_usec < 0l) { + --t.tv_sec; + t.tv_usec += 1000000l; + } + return t; +} inline bool operator<(const timeval &t1, const timeval &t2) { return t1.tv_sec < t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_usec < t2.tv_usec); } inline bool operator==(const timeval &t1, const timeval &t2) @@ -78,31 +90,29 @@ inline bool operator==(const timeval &t1, const timeval &t2) inline timeval &operator+=(timeval &t1, const timeval &t2) { t1.tv_sec += t2.tv_sec; - if ((t1.tv_usec += t2.tv_usec) >= 1000000l) { - ++t1.tv_sec; - t1.tv_usec -= 1000000l; - } - return t1; + t1.tv_usec += t2.tv_usec; + return normalizedTimeval(t1); } inline timeval operator+(const timeval &t1, const timeval &t2) { timeval tmp; tmp.tv_sec = t1.tv_sec + t2.tv_sec; - if ((tmp.tv_usec = t1.tv_usec + t2.tv_usec) >= 1000000l) { - ++tmp.tv_sec; - tmp.tv_usec -= 1000000l; - } - return tmp; + tmp.tv_usec = t1.tv_usec + t2.tv_usec; + return normalizedTimeval(tmp); } inline timeval operator-(const timeval &t1, const timeval &t2) { timeval tmp; - tmp.tv_sec = t1.tv_sec - t2.tv_sec; - if ((tmp.tv_usec = t1.tv_usec - t2.tv_usec) < 0l) { - --tmp.tv_sec; - tmp.tv_usec += 1000000l; - } - return tmp; + tmp.tv_sec = t1.tv_sec - (t2.tv_sec - 1); + tmp.tv_usec = t1.tv_usec - (t2.tv_usec + 1000000); + return normalizedTimeval(tmp); +} +inline timeval operator*(const timeval &t1, int mul) +{ + timeval tmp; + tmp.tv_sec = t1.tv_sec * mul; + tmp.tv_usec = t1.tv_usec * mul; + return normalizedTimeval(tmp); } // internal timer info @@ -117,8 +127,6 @@ struct QTimerInfo { class QTimerInfoList : public QList { #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC)) || defined(QT_BOOTSTRAPPED) - bool useMonotonicTimers; - timeval previousTime; clock_t previousTicks; int ticksPerSecond; @@ -133,6 +141,8 @@ class QTimerInfoList : public QList public: QTimerInfoList(); + const bool useMonotonicTimers; + void getTime(timeval &t); timeval currentTime; -- cgit v1.2.3 From c29d1cc49998ef895df9dcbccafe1b6d6d8e7efc Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Thu, 23 Jul 2009 15:26:11 +0200 Subject: QPainter::stroke() on raster engine would draw moveto's as lines The reason being that there was an assumption that any non-curved path was a continous polyline. For paths with multiple subpaths in it we need to split this up into multiple strokePolygonCosmetic calls. Task-number: 257621 Reviewed-by: Kim Motoyoshi Kalland --- src/gui/painting/qpaintengine_raster.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index a34c26439..51764441a 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -1682,11 +1682,23 @@ void QRasterPaintEngine::stroke(const QVectorPath &path, const QPen &pen) if (!s->penData.blend) return; - if (s->flags.fast_pen && path.shape() <= QVectorPath::NonCurvedShapeHint && s->lastPen.brush().isOpaque()) { - strokePolygonCosmetic((QPointF *) path.points(), path.elementCount(), - path.hasImplicitClose() - ? WindingMode - : PolylineMode); + if (s->flags.fast_pen && path.shape() <= QVectorPath::NonCurvedShapeHint + && s->lastPen.brush().isOpaque()) { + int count = path.elementCount(); + QPointF *points = (QPointF *) path.points(); + const QPainterPath::ElementType *types = path.elements(); + int first = 0; + int last; + while (first < count) { + while (first < count && types[first] != QPainterPath::MoveToElement) ++first; + last = first + 1; + while (last < count && types[last] == QPainterPath::LineToElement) ++last; + strokePolygonCosmetic(points + first, last - first, + path.hasImplicitClose() && last == count // only close last one.. + ? WindingMode + : PolylineMode); + first = last; + } } else if (s->flags.non_complex_pen && path.shape() == QVectorPath::LinesHint) { qreal width = s->lastPen.isCosmetic() -- cgit v1.2.3 From 6689850242c524cea7877d5fdb41d235e0b55d87 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Thu, 23 Jul 2009 15:45:51 +0200 Subject: Doc: link to bugreport form and the public repository --- doc/src/bughowto.qdoc | 8 +++++--- doc/src/trolltech-webpages.qdoc | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/doc/src/bughowto.qdoc b/doc/src/bughowto.qdoc index 927cb0471..fae118055 100644 --- a/doc/src/bughowto.qdoc +++ b/doc/src/bughowto.qdoc @@ -52,7 +52,9 @@ Notes}, and the \l{Task Tracker} on the Qt website to see if the issue is already known. - Always include the following information in your bug report: + If you have found a new bug, please submit a bug report using + the \l{Bug Report Form}. Always include the following information + in your bug report: \list 1 \o The name and version number of your compiler @@ -66,6 +68,6 @@ such a program can be created with some minor changes to one of the many example programs in Qt's \c examples directory. - Please submit the bug report using the \l{Task Tracker} on the Qt - website. + If you have implemented a bug fix and want to contribute your fix + directly, then you can do so through the \l{Public Qt Repository}. */ diff --git a/doc/src/trolltech-webpages.qdoc b/doc/src/trolltech-webpages.qdoc index 7d48167c4..abbe4e09f 100644 --- a/doc/src/trolltech-webpages.qdoc +++ b/doc/src/trolltech-webpages.qdoc @@ -164,11 +164,6 @@ \title Qt 4 Platforms Overview */ -/*! - \externalpage http://www.qtsoftware.com/developer/supported-platforms/supported-platforms/ - \title Qt 4 Supported Platforms -*/ - /*! \externalpage http://www.qtsoftware.com/products/qtopia/ \title Qt Extended @@ -243,3 +238,8 @@ \externalpage http://www.qtsoftware.com/developer/faqs/qt/installation \title Installation FAQ */ + +/*! + \externalpage http://qt.gitorious.org + \title Public Qt Repository +*/ -- cgit v1.2.3 From fdaed851ce71fc474a7959d8fc30b50465a98d0d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 23 Jul 2009 16:14:01 +0200 Subject: Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 1535d41a668e5f74f44ff3aa1313a84d5718d2d7 ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-07-23 Simon Hausmann Reviewed by Holger Freyther. Fix crashes with the QObject bindings after garbage collection. There is one QtInstance per wrapped QObject, and that QtInstance keeps references to cached JSObjects for slots. When those objects get deleted due to GC, then they becoming dangling pointers. When a cached member dies, it is now removed from the QtInstance's cache. As we cannot track the lifetime of the children, we have to remove them from QtInstance alltogether. They are not cached and were only used for mark(), but we _want_ them to be subject to gc. * bridge/qt/qt_instance.cpp: (JSC::Bindings::QtInstance::~QtInstance): Minor coding style cleanup, use qDeleteAll(). (JSC::Bindings::QtInstance::removeCachedMethod): New function, to clean m_methods and m_defaultMethod. (JSC::Bindings::QtInstance::mark): Avoid marking already marked objects. (JSC::Bindings::QtField::valueFromInstance): Don't save children for marking. * bridge/qt/qt_instance.h: Declare removeCachedMethod. * bridge/qt/qt_runtime.cpp: (JSC::Bindings::QtRuntimeMethod::~QtRuntimeMethod): Call removeCachedMethod with this on the instance. 2009-05-04 Jakub Wieczorek Reviewed by Simon Hausmann. As Qtish implementation of MIMETypeRegistry::getMIMETypeForExtension() returns the application/octet-stream mimetype when it can't associate extension with any mimetype, it can happen that the application/octet-stream mimetype will hit the list of supported image formats. For instance, it is possible when QImageReader or QImageWriter support an extension that is not in the extensions map. Make sure that this mimetype is not treated as displayable image type. * platform/MIMETypeRegistry.cpp: (WebCore::initializeSupportedImageMIMETypes): (WebCore::initializeSupportedImageMIMETypesForEncoding): ++ b/WebKit/qt/ChangeLog 2009-07-23 Simon Hausmann Reviewed by Holger Freyther. Added a testcase to verify that cached methods in the QOBject bindings remain alife even after garbage collection. * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::protectBindingsRuntimeObjectsFromCollector): --- src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebCore/ChangeLog | 47 ++++++++++++++++++++++ .../webkit/WebCore/bridge/qt/qt_instance.cpp | 31 +++++++------- .../webkit/WebCore/bridge/qt/qt_instance.h | 3 +- .../webkit/WebCore/bridge/qt/qt_runtime.cpp | 2 + .../webkit/WebCore/platform/MIMETypeRegistry.cpp | 5 +++ src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp | 6 +++ src/3rdparty/webkit/WebKit/qt/ChangeLog | 10 +++++ .../WebKit/qt/tests/qwebpage/tst_qwebpage.cpp | 25 ++++++++++++ 9 files changed, 114 insertions(+), 17 deletions(-) diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 88f32d9f0..eaa0479d0 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - a3e05ad8acdead3b534d0cef772b85f002e80b8d + 1535d41a668e5f74f44ff3aa1313a84d5718d2d7 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 19bb36afc..83f5e6f63 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,50 @@ +2009-07-23 Simon Hausmann + + Reviewed by Holger Freyther. + + Fix crashes with the QObject bindings after garbage collection. + + There is one QtInstance per wrapped QObject, and that QtInstance keeps + references to cached JSObjects for slots. When those objects get + deleted due to GC, then they becoming dangling pointers. + + When a cached member dies, it is now removed from the QtInstance's + cache. + + As we cannot track the lifetime of the children, we have to remove + them from QtInstance alltogether. They are not cached and were + only used for mark(), but we _want_ them to be subject to gc. + + * bridge/qt/qt_instance.cpp: + (JSC::Bindings::QtInstance::~QtInstance): Minor coding style cleanup, + use qDeleteAll(). + (JSC::Bindings::QtInstance::removeCachedMethod): New function, to + clean m_methods and m_defaultMethod. + (JSC::Bindings::QtInstance::mark): Avoid marking already marked objects. + (JSC::Bindings::QtField::valueFromInstance): Don't save children for + marking. + * bridge/qt/qt_instance.h: Declare removeCachedMethod. + * bridge/qt/qt_runtime.cpp: + (JSC::Bindings::QtRuntimeMethod::~QtRuntimeMethod): Call removeCachedMethod + with this on the instance. + +2009-05-04 Jakub Wieczorek + + Reviewed by Simon Hausmann. + + As Qtish implementation of MIMETypeRegistry::getMIMETypeForExtension() + returns the application/octet-stream mimetype when it can't associate + extension with any mimetype, it can happen that the application/octet-stream + mimetype will hit the list of supported image formats. For instance, + it is possible when QImageReader or QImageWriter support an extension + that is not in the extensions map. + + Make sure that this mimetype is not treated as displayable image type. + + * platform/MIMETypeRegistry.cpp: + (WebCore::initializeSupportedImageMIMETypes): + (WebCore::initializeSupportedImageMIMETypesForEncoding): + 2009-06-18 Chris Evans Reviewed by Adam Barth. diff --git a/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp b/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp index 4b94a94b0..4fc95fa62 100644 --- a/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp @@ -110,9 +110,7 @@ QtInstance::~QtInstance() // clean up (unprotect from gc) the JSValues we've created m_methods.clear(); - foreach(QtField* f, m_fields.values()) { - delete f; - } + qDeleteAll(m_fields); m_fields.clear(); if (m_object) { @@ -158,6 +156,19 @@ RuntimeObjectImp* QtInstance::getRuntimeObject(ExecState* exec, PassRefPtr::Iterator it = m_methods.begin(), + end = m_methods.end(); it != end; ++it) + if (it.value() == method) { + m_methods.erase(it); + return; + } +} + Class* QtInstance::getClass() const { if (!m_class) @@ -167,16 +178,12 @@ Class* QtInstance::getClass() const void QtInstance::mark() { - if (m_defaultMethod) + if (m_defaultMethod && !m_defaultMethod->marked()) m_defaultMethod->mark(); foreach(JSObject* val, m_methods.values()) { if (val && !val->marked()) val->mark(); } - foreach(JSValuePtr val, m_children.values()) { - if (val && !val->marked()) - val->mark(); - } } void QtInstance::begin() @@ -329,13 +336,7 @@ JSValuePtr QtField::valueFromInstance(ExecState* exec, const Instance* inst) con else if (m_type == DynamicProperty) val = obj->property(m_dynamicProperty); - JSValuePtr ret = convertQVariantToValue(exec, inst->rootObject(), val); - - // Need to save children so we can mark them - if (m_type == ChildObject) - instance->m_children.insert(ret); - - return ret; + return convertQVariantToValue(exec, inst->rootObject(), val); } else { QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg(QLatin1String(name())); return throwError(exec, GeneralError, msg.toLatin1().constData()); diff --git a/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h b/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h index 50d4cf14c..bc2272590 100644 --- a/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h +++ b/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h @@ -64,6 +64,8 @@ public: static PassRefPtr getQtInstance(QObject*, PassRefPtr, QScriptEngine::ValueOwnership ownership); static RuntimeObjectImp* getRuntimeObject(ExecState* exec, PassRefPtr); + void removeCachedMethod(JSObject*); + private: static PassRefPtr create(QObject *instance, PassRefPtr rootObject, QScriptEngine::ValueOwnership ownership) { @@ -78,7 +80,6 @@ private: QObject* m_hashkey; mutable QHash m_methods; mutable QHash m_fields; - mutable QSet m_children; mutable QtRuntimeMetaMethod* m_defaultMethod; QScriptEngine::ValueOwnership m_ownership; }; diff --git a/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp b/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp index c7ba6c2d4..c0883a98f 100644 --- a/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp @@ -913,6 +913,8 @@ QtRuntimeMethod::QtRuntimeMethod(QtRuntimeMethodData* dd, ExecState* exec, const QtRuntimeMethod::~QtRuntimeMethod() { + QW_D(QtRuntimeMethod); + d->m_instance->removeCachedMethod(this); delete d_ptr; } diff --git a/src/3rdparty/webkit/WebCore/platform/MIMETypeRegistry.cpp b/src/3rdparty/webkit/WebCore/platform/MIMETypeRegistry.cpp index 8f987357f..a85d706b6 100644 --- a/src/3rdparty/webkit/WebCore/platform/MIMETypeRegistry.cpp +++ b/src/3rdparty/webkit/WebCore/platform/MIMETypeRegistry.cpp @@ -100,6 +100,9 @@ static void initializeSupportedImageMIMETypes() supportedImageMIMETypes->add(mimeType); supportedImageResourceMIMETypes->add(mimeType); } + + supportedImageMIMETypes->remove("application/octet-stream"); + supportedImageResourceMIMETypes->remove("application/octet-stream"); #else // assume that all implementations at least support the following standard // image types: @@ -145,6 +148,8 @@ static void initializeSupportedImageMIMETypesForEncoding() String mimeType = MIMETypeRegistry::getMIMETypeForExtension(formats.at(i).constData()); supportedImageMIMETypesForEncoding->add(mimeType); } + + supportedImageMIMETypesForEncoding->remove("application/octet-stream"); #elif PLATFORM(CAIRO) supportedImageMIMETypesForEncoding->add("image/png"); #endif diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp index e56547641..bd43ce38d 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp @@ -32,6 +32,7 @@ #include "Frame.h" #include "FrameTree.h" #include "FrameView.h" +#include "GCController.h" #include "IconDatabase.h" #include "InspectorController.h" #include "Page.h" @@ -105,6 +106,11 @@ void QWEBKIT_EXPORT qt_drt_setJavaScriptProfilingEnabled(QWebFrame* qframe, bool controller->disableProfiler(); } +void QWEBKIT_EXPORT qt_drt_garbageCollector_collect() +{ + gcController().garbageCollectNow(); +} + void QWebFramePrivate::init(QWebFrame *qframe, WebCore::Page *webcorePage, QWebFrameData *frameData) { q = qframe; diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index a7e176d8e..125e556ad 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,13 @@ +2009-07-23 Simon Hausmann + + Reviewed by Holger Freyther. + + Added a testcase to verify that cached methods in the QOBject bindings + remain alife even after garbage collection. + + * tests/qwebpage/tst_qwebpage.cpp: + (tst_QWebPage::protectBindingsRuntimeObjectsFromCollector): + 2009-06-16 Morten Engvoldsen Reviewed by Ariya Hidayat. diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp index 620aa31a6..c3ed54cc1 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp @@ -107,6 +107,7 @@ private slots: void textEditing(); void requestCache(); + void protectBindingsRuntimeObjectsFromCollector(); private: @@ -1037,5 +1038,29 @@ void tst_QWebPage::requestCache() (int)QNetworkRequest::PreferCache); } +void QWEBKIT_EXPORT qt_drt_garbageCollector_collect(); + +void tst_QWebPage::protectBindingsRuntimeObjectsFromCollector() +{ + QSignalSpy loadSpy(m_view, SIGNAL(loadFinished(bool))); + + PluginPage* newPage = new PluginPage(m_view); + m_view->setPage(newPage); + + m_view->settings()->setAttribute(QWebSettings::PluginsEnabled, true); + + m_view->setHtml(QString("")); + QTRY_COMPARE(loadSpy.count(), 1); + + newPage->mainFrame()->evaluateJavaScript("function testme(text) { var lineedit = document.getElementById('mylineedit'); lineedit.setText(text); lineedit.selectAll(); }"); + + newPage->mainFrame()->evaluateJavaScript("testme('foo')"); + + qt_drt_garbageCollector_collect(); + + // don't crash! + newPage->mainFrame()->evaluateJavaScript("testme('bar')"); +} + QTEST_MAIN(tst_QWebPage) #include "tst_qwebpage.moc" -- cgit v1.2.3 From 9a77d6c409b991957fc069a2b47476a419ea1aab Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Thu, 23 Jul 2009 16:21:32 +0200 Subject: Finish up my AA_DontSwapMetaAndControl feature. Ugh. The whole reason I added this was so that the text() would be preserved for people that did stuff with Control. Somehow in all the other fixes I did, I forgot to actually do that part. Reviewed-by: Denis --- src/gui/kernel/qkeymapper_mac.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qkeymapper_mac.cpp b/src/gui/kernel/qkeymapper_mac.cpp index 017c13cf5..8eee66543 100644 --- a/src/gui/kernel/qkeymapper_mac.cpp +++ b/src/gui/kernel/qkeymapper_mac.cpp @@ -729,8 +729,10 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, EventHandlerCallRef e QString text(ourChar); /* This is actually wrong - but unfortunatly it is the best that can be done for now because of the Control/Meta mapping problems */ - if (modifiers & (Qt::ControlModifier | Qt::MetaModifier)) + if (modifiers & (Qt::ControlModifier | Qt::MetaModifier) + && !qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta)) { text = QString(); + } if (widget) { -- cgit v1.2.3 From 29016ad7cf1e11ae9967748f91acac6f0054bbf8 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Thu, 23 Jul 2009 13:36:44 +0200 Subject: Fixed embedded mouse and keyboard docu for 4.6 Reviewed-By: Paul --- doc/src/emb-charinput.qdoc | 54 ++++++++++++--- doc/src/emb-kmap2qmap.qdoc | 84 ++++++++++++++++++++++++ doc/src/emb-pointer.qdoc | 17 ++--- doc/src/snippets/code/doc_src_emb-charinput.qdoc | 2 +- src/gui/embedded/qkbd_qws.cpp | 8 +-- 5 files changed, 139 insertions(+), 26 deletions(-) create mode 100644 doc/src/emb-kmap2qmap.qdoc diff --git a/doc/src/emb-charinput.qdoc b/doc/src/emb-charinput.qdoc index c9c768ca9..565d9539e 100644 --- a/doc/src/emb-charinput.qdoc +++ b/doc/src/emb-charinput.qdoc @@ -82,13 +82,13 @@ \section1 Available Keyboard Drivers - \l {Qt for Embedded Linux} provides ready-made drivers for the SL5000, Yopy, - Vr41XX, console (TTY) and USB protocols. Run the \c configure - script to list the available drivers: + \l {Qt for Embedded Linux} provides ready-made drivers for the console + (TTY) and the standard Linux Input Subsystem (USB, PS/2, ...). Run the + \c configure script to list the available drivers: \snippet doc/src/snippets/code/doc_src_emb-charinput.qdoc 0 - Note that the console keyboard driver also handles console + Note that only the console (TTY) keyboard driver handles console switching (\bold{Ctrl+Alt+F1}, ..., \bold{Ctrl+Alt+F10}) and termination (\bold{Ctrl+Alt+Backspace}). @@ -105,6 +105,17 @@ detect the plugin, loading the driver into the server application at run-time. + \section1 Keymaps + + Starting with 4.6, \l {Qt for Embedded Linux} has gained support for + user defined keymaps. Keymap handling is supported by the builtin + keyboard drivers \c TTY and \c LinuxInput. Custom keyboard drivers can + use the existing keymap handling code via + QWSKeyboardHandler::processKeycode(). + + By default Qt will use an internal, compiled-in US keymap. + See the options below for how to load a different keymap. + \section1 Specifying a Keyboard Driver To specify which driver to use, set the QWS_KEYBOARD environment @@ -113,14 +124,41 @@ \snippet doc/src/snippets/code/doc_src_emb-charinput.qdoc 2 - The \c argument are \c SL5000, \c Yopy, \c VR41xx, \c - TTY, \c USB and \l {QKbdDriverPlugin::keys()}{keys} identifying - custom drivers, and the driver specific options are typically a - device, e.g., \c /dev/tty0. + The \c argument are \c TTY, \c LinuxInput and \l + {QKbdDriverPlugin::keys()}{keys} identifying custom drivers, and the + driver specific options are typically a device, e.g., \c /dev/tty0. Multiple keyboard drivers can be specified in one go: \snippet doc/src/snippets/code/doc_src_emb-charinput.qdoc 3 Input will be read from all specified drivers. + + Currently the following options are supported by both the \c TTY and \c + LinuxInput driver: + + \table + \header \o Option \o Description + \row \o \c /dev/xxx \o + Open the specified device, instead of the driver's default device. + \row \o \c repeat-delay= \o + Time in milliseconds until auto-repeat kicks in. + \row \o \c repeat-rate= \o + Time in milliseconds specifying interval between auto-repeats. + \row \o \c keymap=xx.qmap \o + File name of a keymap file in Qt's \c qmap format. See \l {kmap2qmap} + for instructions on how to create thoes files.\br Please note that the + file name can of course also be the name of a QResource. + \row \o \c disable-zap \o + Disable the QWS server "Zap" shortcut \bold{Ctrl+Alt+Backspace} + \row \o \c enable-compose \o + Activate Latin-1 composing features in the builtin US keymap. You can + use the right \c AltGr or right \c Alt is used as a dead key modifier, + while \c AltGr+. is the compose key. For example: + \list + \o \c AltGr + \c " + \c u = \uuml (u with diaeresis / umlaut u) + \o \c AltGr + \c . + \c / + \c o = \oslash (slashed o) + \endlist + \endtable + */ diff --git a/doc/src/emb-kmap2qmap.qdoc b/doc/src/emb-kmap2qmap.qdoc new file mode 100644 index 000000000..2b3f6876c --- /dev/null +++ b/doc/src/emb-kmap2qmap.qdoc @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \page qt-embedded-kmap2qmap.html + \title kmap2qmap + \ingroup qt-embedded-linux + + \c kmap2qmap is a tool to generate keymaps for use on Embedded Linux. + The source files have to be in standard Linux \c kmap format that is + e.g. understood by the kernel's \c loadkeys command. This means you + can use the following sources to generate \c qmap files: + + \list + \o The \l {http://lct.sourceforge.net/}{Linux Console Tools (LCT)} project. + \o \l {http://www.x.org/}{Xorg} X11 keymaps can be converted to the \c + kmap format with the \c ckbcomp utility. + \o Since \c kmap files are plain text files, they can also be hand crafted. + \endlist + + The generated \c qmap files are size optimized binary files. + + \c kmap2qmap is a command line program, that needs at least 2 files as + parameters. The last one will be the generated \c .qmap file, while all + the others will be parsed as input \c .kmap files. For example: + + \code + kmap2qmap i386/qwertz/de-latin1-nodeadkeys.kmap include/compose.latin1.inc de-latin1-nodeadkeys.qmap + \endcode + + \c kmap2qmap doesn't support all the (pseudo) symbols that the Linux + kernel supports. If you are converting a standard keymap you will get a + lot of warnings for things like \c Show_Registers, \c Hex_A, etc.: you + can safely ignore those. + + It also doesn't support numeric symbols (e.g. \c{keycode 1 = 4242}, + instead of \c{keycode 1 = colon}), since these are deprecated and can + change from one kernel version to the other. + + On the other hand, \c kmap2qmap supports one additional, Qt specific, + symbol: \c QtZap. The built-in US keymap has that symbol mapped tp + \c{Ctrl+Alt+Backspace} and it serves as a shortcut to kill your QWS + server (similiar to the X11 server). + + See also \l {Qt for Embedded Linux Character Input} +*/ diff --git a/doc/src/emb-pointer.qdoc b/doc/src/emb-pointer.qdoc index b13dec08e..49504fe6e 100644 --- a/doc/src/emb-pointer.qdoc +++ b/doc/src/emb-pointer.qdoc @@ -64,9 +64,10 @@ \section1 Available Drivers \l{Qt for Embedded Linux} provides ready-made drivers for the MouseMan, - IntelliMouse, Microsoft, NEC Vr41XX, Linux Touch Panel and Yopy - protocols as well as the universal touch screen library, - tslib. Run the \c configure script to list the available drivers: + IntelliMouse, Microsoft and Linux Touch Panel protocols, for the + standard Linux Input Subsystem as well as the universal touch screen + library, tslib. Run the \c configure script to list the available + drivers: \if defined(QTOPIA_PHONE) @@ -125,7 +126,7 @@ \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 4 The valid values for the \c argument are \c MouseMan, \c - IntelliMouse, \c Microsoft, \c VR41xx, \c LinuxTP, \c Yopy, \c + IntelliMouse, \c Microsoft, \c LinuxTP, \c LinuxInput, \c Tslib and \l {QMouseDriverPlugin::keys()}{keys} identifying custom drivers, and the driver specific options are typically a device, e.g., \c /dev/mouse for mouse devices and \c /dev/ts for touch @@ -137,14 +138,6 @@ Input will be read from all specified drivers. - Note that the \c Vr41xx driver also accepts two optional - arguments: \c press= defining a mouse click (the default - value is 750) and \c filter= specifying the length of the - filter used to eliminate noise (the default length is 3). For - example: - - \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 6 - \table \header \o The Tslib Mouse Driver \row diff --git a/doc/src/snippets/code/doc_src_emb-charinput.qdoc b/doc/src/snippets/code/doc_src_emb-charinput.qdoc index 2539e1367..f6b33fec4 100644 --- a/doc/src/snippets/code/doc_src_emb-charinput.qdoc +++ b/doc/src/snippets/code/doc_src_emb-charinput.qdoc @@ -4,7 +4,7 @@ //! [1] -configure -qt-kbd-s15000 +configure -qt-kbd-linuxinput //! [1] diff --git a/src/gui/embedded/qkbd_qws.cpp b/src/gui/embedded/qkbd_qws.cpp index 7799339a3..756a39837 100644 --- a/src/gui/embedded/qkbd_qws.cpp +++ b/src/gui/embedded/qkbd_qws.cpp @@ -453,8 +453,9 @@ void QWSKeyboardHandler::endAutoRepeat() Maps \a keycode according to a keymap and sends that key event to the \l{Qt for Embedded Linux} server application. - Please see the QWS_KEYBOARD documentation for a description on how to - create and use keymap files. + Please see the \l{Qt for Embedded Linux Character Input} and the \l + {kmap2qmap} documentations for a description on how to create and use + keymap files. The key event is identified by its \a keycode value and the \a isPress and \a autoRepeat parameters. @@ -475,9 +476,6 @@ void QWSKeyboardHandler::endAutoRepeat() implementation needs to take care of a special action, like console switching or LED handling. - Standard Linux console keymaps can be found at the - \l {http://lct.sourceforege.net}{LCT project} - If standard Linux console keymaps are used, \a keycode must be one of the standardized values defined in \c /usr/include/linux/input.h -- cgit v1.2.3 From 89fc5334c2ef0b92114284d0ffb26d65f76fdb3b Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Wed, 22 Jul 2009 16:21:43 +0200 Subject: Qt/EL mouse and keyboard driver cleanup. * removed the vr41xx, yopy and sl5000 drivers (old PDAs) * removed the bus mouse driver (ISA days should be over) * renamed the LinuxIS mouse driver to LinuxInput (consistency with the key driver) * unified the LinuxInput mouse and key driver I/O handling Reviewed-By: Paul --- configure | 4 +- src/gui/embedded/embedded.pri | 40 +-- src/gui/embedded/qkbddriverfactory_qws.cpp | 24 -- src/gui/embedded/qkbdlinuxinput_qws.cpp | 13 +- src/gui/embedded/qkbdsl5000_qws.cpp | 367 --------------------- src/gui/embedded/qkbdsl5000_qws.h | 92 ------ src/gui/embedded/qkbdtty_qws.cpp | 20 +- src/gui/embedded/qkbdvr41xx_qws.cpp | 186 ----------- src/gui/embedded/qkbdvr41xx_qws.h | 73 ---- src/gui/embedded/qkbdyopy_qws.cpp | 211 ------------ src/gui/embedded/qkbdyopy_qws.h | 73 ---- src/gui/embedded/qmousebus_qws.cpp | 239 -------------- src/gui/embedded/qmousebus_qws.h | 76 ----- src/gui/embedded/qmousedriverfactory_qws.cpp | 34 +- src/gui/embedded/qmouselinuxinput_qws.cpp | 205 ++++++++++++ src/gui/embedded/qmouselinuxinput_qws.h | 78 +++++ src/gui/embedded/qmousevr41xx_qws.cpp | 251 -------------- src/gui/embedded/qmousevr41xx_qws.h | 80 ----- src/gui/embedded/qmouseyopy_qws.cpp | 185 ----------- src/gui/embedded/qmouseyopy_qws.h | 80 ----- src/plugins/kbddrivers/kbddrivers.pro | 3 - src/plugins/kbddrivers/sl5000/main.cpp | 76 ----- src/plugins/kbddrivers/sl5000/sl5000.pro | 16 - src/plugins/kbddrivers/vr41xx/main.cpp | 76 ----- src/plugins/kbddrivers/vr41xx/vr41xx.pro | 14 - src/plugins/kbddrivers/yopy/main.cpp | 76 ----- src/plugins/kbddrivers/yopy/yopy.pro | 14 - src/plugins/mousedrivers/bus/bus.pro | 14 - src/plugins/mousedrivers/bus/main.cpp | 76 ----- src/plugins/mousedrivers/linuxis/linuxis.pro | 10 - .../linuxis/linuxismousedriverplugin.cpp | 83 ----- .../linuxis/linuxismousedriverplugin.h | 58 ---- .../mousedrivers/linuxis/linuxismousehandler.cpp | 180 ---------- .../mousedrivers/linuxis/linuxismousehandler.h | 72 ---- src/plugins/mousedrivers/mousedrivers.pro | 5 +- src/plugins/mousedrivers/vr41xx/main.cpp | 76 ----- src/plugins/mousedrivers/vr41xx/vr41xx.pro | 14 - src/plugins/mousedrivers/yopy/main.cpp | 76 ----- src/plugins/mousedrivers/yopy/yopy.pro | 14 - 39 files changed, 319 insertions(+), 2965 deletions(-) delete mode 100644 src/gui/embedded/qkbdsl5000_qws.cpp delete mode 100644 src/gui/embedded/qkbdsl5000_qws.h delete mode 100644 src/gui/embedded/qkbdvr41xx_qws.cpp delete mode 100644 src/gui/embedded/qkbdvr41xx_qws.h delete mode 100644 src/gui/embedded/qkbdyopy_qws.cpp delete mode 100644 src/gui/embedded/qkbdyopy_qws.h delete mode 100644 src/gui/embedded/qmousebus_qws.cpp delete mode 100644 src/gui/embedded/qmousebus_qws.h create mode 100644 src/gui/embedded/qmouselinuxinput_qws.cpp create mode 100644 src/gui/embedded/qmouselinuxinput_qws.h delete mode 100644 src/gui/embedded/qmousevr41xx_qws.cpp delete mode 100644 src/gui/embedded/qmousevr41xx_qws.h delete mode 100644 src/gui/embedded/qmouseyopy_qws.cpp delete mode 100644 src/gui/embedded/qmouseyopy_qws.h delete mode 100644 src/plugins/kbddrivers/sl5000/main.cpp delete mode 100644 src/plugins/kbddrivers/sl5000/sl5000.pro delete mode 100644 src/plugins/kbddrivers/vr41xx/main.cpp delete mode 100644 src/plugins/kbddrivers/vr41xx/vr41xx.pro delete mode 100644 src/plugins/kbddrivers/yopy/main.cpp delete mode 100644 src/plugins/kbddrivers/yopy/yopy.pro delete mode 100644 src/plugins/mousedrivers/bus/bus.pro delete mode 100644 src/plugins/mousedrivers/bus/main.cpp delete mode 100644 src/plugins/mousedrivers/linuxis/linuxis.pro delete mode 100644 src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.cpp delete mode 100644 src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.h delete mode 100644 src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp delete mode 100644 src/plugins/mousedrivers/linuxis/linuxismousehandler.h delete mode 100644 src/plugins/mousedrivers/vr41xx/main.cpp delete mode 100644 src/plugins/mousedrivers/vr41xx/vr41xx.pro delete mode 100644 src/plugins/mousedrivers/yopy/main.cpp delete mode 100644 src/plugins/mousedrivers/yopy/yopy.pro diff --git a/configure b/configure index b65e6d54e..4b75a7555 100755 --- a/configure +++ b/configure @@ -614,9 +614,9 @@ CFG_GFX_ON="linuxfb multiscreen" CFG_GFX_PLUGIN_AVAILABLE= CFG_GFX_PLUGIN= CFG_GFX_OFF= -CFG_KBD_AVAILABLE="tty linuxinput sl5000 yopy vr41xx qvfb" +CFG_KBD_AVAILABLE="tty linuxinput qvfb" CFG_KBD_ON="tty" #default, see QMakeVar above -CFG_MOUSE_AVAILABLE="pc bus linuxtp yopy vr41xx tslib qvfb" +CFG_MOUSE_AVAILABLE="pc linuxtp linuxinput tslib qvfb" CFG_MOUSE_ON="pc linuxtp" #default, see QMakeVar above CFG_ARCH= diff --git a/src/gui/embedded/embedded.pri b/src/gui/embedded/embedded.pri index 4a9aa3f2f..53a251293 100644 --- a/src/gui/embedded/embedded.pri +++ b/src/gui/embedded/embedded.pri @@ -141,15 +141,7 @@ embedded { !contains( kbd-drivers, qvfb ) { kbd-drivers += qvfb } - } - - contains( kbd-drivers, sl5000 ) { - HEADERS +=embedded/qkbdsl5000_qws.h - SOURCES +=embedded/qkbdsl5000_qws.cpp - !contains( kbd-drivers, tty ) { - kbd-drivers += tty - } - } + } contains( kbd-drivers, tty ) { HEADERS +=embedded/qkbdtty_qws.h @@ -166,16 +158,6 @@ embedded { SOURCES +=embedded/qkbdum_qws.cpp } - contains( kbd-drivers, yopy ) { - HEADERS +=embedded/qkbdyopy_qws.h - SOURCES +=embedded/qkbdyopy_qws.cpp - } - - contains( kbd-drivers, vr41xx ) { - HEADERS +=embedded/qkbdvr41xx_qws.h - SOURCES +=embedded/qkbdvr41xx_qws.cpp - } - # # Mouse drivers # @@ -189,29 +171,19 @@ embedded { SOURCES +=embedded/qmousepc_qws.cpp } - contains( mouse-drivers, bus ) { - HEADERS +=embedded/qmousebus_qws.h - SOURCES +=embedded/qmousebus_qws.cpp - } - contains( mouse-drivers, linuxtp ) { HEADERS +=embedded/qmouselinuxtp_qws.h SOURCES +=embedded/qmouselinuxtp_qws.cpp } - contains( mouse-drivers, vr41xx ) { - HEADERS +=embedded/qmousevr41xx_qws.h - SOURCES +=embedded/qmousevr41xx_qws.cpp - } - - contains( mouse-drivers, yopy ) { - HEADERS +=embedded/qmouseyopy_qws.h - SOURCES +=embedded/qmouseyopy_qws.cpp - } - contains( mouse-drivers, tslib ) { LIBS += -lts HEADERS +=embedded/qmousetslib_qws.h SOURCES +=embedded/qmousetslib_qws.cpp } + + contains( mouse-drivers, linuxinput ) { + HEADERS +=embedded/qmouselinuxinput_qws.h + SOURCES +=embedded/qmouselinuxinput_qws.cpp + } } diff --git a/src/gui/embedded/qkbddriverfactory_qws.cpp b/src/gui/embedded/qkbddriverfactory_qws.cpp index c59939684..b77eb72fa 100644 --- a/src/gui/embedded/qkbddriverfactory_qws.cpp +++ b/src/gui/embedded/qkbddriverfactory_qws.cpp @@ -47,10 +47,7 @@ #include "qkbdtty_qws.h" #include "qkbdlinuxinput_qws.h" #include "qkbdum_qws.h" -#include "qkbdsl5000_qws.h" #include "qkbdvfb_qws.h" -#include "qkbdyopy_qws.h" -#include "qkbdvr41xx_qws.h" #include #include "private/qfactoryloader_p.h" #include "qkbddriverplugin_qws.h" @@ -104,18 +101,6 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, QWSKeyboardHandler *QKbdDriverFactory::create(const QString& key, const QString& device) { QString driver = key.toLower(); -#ifndef QT_NO_QWS_KBD_SL5000 - if (driver == QLatin1String("sl5000") || driver.isEmpty()) - return new QWSSL5000KeyboardHandler(device); -#endif -#ifndef QT_NO_QWS_KBD_YOPY - if (driver == QLatin1String("yopy") || driver.isEmpty()) - return new QWSYopyKeyboardHandler(device); -#endif -#ifndef QT_NO_QWS_KBD_VR41XX - if (driver == QLatin1String("vr41xx") || driver.isEmpty()) - return new QWSVr41xxKeyboardHandler(device); -#endif #ifndef QT_NO_QWS_KEYBOARD # ifndef QT_NO_QWS_KBD_TTY if (driver == QLatin1String("tty") || driver.isEmpty()) @@ -158,15 +143,6 @@ QStringList QKbdDriverFactory::keys() { QStringList list; -#ifndef QT_NO_QWS_KBD_SL5000 - list << QLatin1String("SL5000"); -#endif -#ifndef QT_NO_QWS_KBD_YOPY - list << QLatin1String("YOPY"); -#endif -#ifndef QT_NO_QWS_KBD_VR41XX - list << QLatin1String("VR41xx"); -#endif #ifndef QT_NO_QWS_KBD_TTY list << QLatin1String("TTY"); #endif diff --git a/src/gui/embedded/qkbdlinuxinput_qws.cpp b/src/gui/embedded/qkbdlinuxinput_qws.cpp index e55273129..6aa6633c1 100644 --- a/src/gui/embedded/qkbdlinuxinput_qws.cpp +++ b/src/gui/embedded/qkbdlinuxinput_qws.cpp @@ -76,6 +76,7 @@ private: int m_fd; int m_tty_fd; struct termios m_tty_attr; + int m_orig_kbmode; }; QWSLinuxInputKeyboardHandler::QWSLinuxInputKeyboardHandler(const QString &device) @@ -95,8 +96,7 @@ bool QWSLinuxInputKeyboardHandler::filterInputEvent(quint16 &, qint32 &) } QWSLinuxInputKbPrivate::QWSLinuxInputKbPrivate(QWSLinuxInputKeyboardHandler *h, const QString &device) - : m_handler(h), m_fd(-1), m_tty_fd(-1) - + : m_handler(h), m_fd(-1), m_tty_fd(-1), m_orig_kbmode(K_XLATE) { setObjectName(QLatin1String("LinuxInputSubsystem Keyboard Handler")); @@ -135,7 +135,10 @@ QWSLinuxInputKbPrivate::QWSLinuxInputKbPrivate(QWSLinuxInputKeyboardHandler *h, struct ::termios termdata; tcgetattr(m_tty_fd, &termdata); - // setting this tranlation mode is also needed in INPUT mode to prevent + // record the original mode so we can restore it again in the destructor. + ::ioctl(m_tty_fd, KDGKBMODE, &m_orig_kbmode); + + // setting this tranlation mode is even needed in INPUT mode to prevent // the shell from also interpreting codes, if the process has a tty // attached: e.g. Ctrl+C wouldn't copy, but kill the application. ::ioctl(m_tty_fd, KDSKBMODE, K_MEDIUMRAW); @@ -152,7 +155,7 @@ QWSLinuxInputKbPrivate::QWSLinuxInputKbPrivate(QWSLinuxInputKeyboardHandler *h, tcsetattr(m_tty_fd, TCSANOW, &termdata); } } else { - qWarning("Cannot open input device '%s': %s", qPrintable(dev), strerror(errno)); + qWarning("Cannot open keyboard input device '%s': %s", qPrintable(dev), strerror(errno)); return; } } @@ -160,7 +163,7 @@ QWSLinuxInputKbPrivate::QWSLinuxInputKbPrivate(QWSLinuxInputKeyboardHandler *h, QWSLinuxInputKbPrivate::~QWSLinuxInputKbPrivate() { if (m_tty_fd >= 0) { - ::ioctl(m_tty_fd, KDSKBMODE, K_XLATE); + ::ioctl(m_tty_fd, KDSKBMODE, m_orig_kbmode); tcsetattr(m_tty_fd, TCSANOW, &m_tty_attr); } if (m_fd >= 0) diff --git a/src/gui/embedded/qkbdsl5000_qws.cpp b/src/gui/embedded/qkbdsl5000_qws.cpp deleted file mode 100644 index cf82c104e..000000000 --- a/src/gui/embedded/qkbdsl5000_qws.cpp +++ /dev/null @@ -1,367 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qkbdsl5000_qws.h" - -#ifndef QT_NO_QWS_KBD_SL5000 - -#include "qwindowsystem_qws.h" -#include "qwsutils_qws.h" -#include "qscreen_qws.h" - -#include "qapplication.h" -#include "qnamespace.h" -#include "qtimer.h" - -#include // overrides QT_OPEN - -#include -#include -#include -#include -#include -#include -#include - -#include - -#include - -QT_BEGIN_NAMESPACE - -static const QWSKeyMap sl5000KeyMap[] = { - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 00 - { Qt::Key_A, 'a' , 'A' , 'A'-64 }, // 01 - { Qt::Key_B, 'b' , 'B' , 'B'-64 }, // 02 - { Qt::Key_C, 'c' , 'C' , 'C'-64 }, // 03 - { Qt::Key_D, 'd' , 'D' , 'D'-64 }, // 04 - { Qt::Key_E, 'e' , 'E' , 'E'-64 }, // 05 - { Qt::Key_F, 'f' , 'F' , 'F'-64 }, // 06 - { Qt::Key_G, 'g' , 'G' , 'G'-64 }, // 07 - { Qt::Key_H, 'h' , 'H' , 'H'-64 }, // 08 - { Qt::Key_I, 'i' , 'I' , 'I'-64 }, // 09 - { Qt::Key_J, 'j' , 'J' , 'J'-64 }, // 0a 10 - { Qt::Key_K, 'k' , 'K' , 'K'-64 }, // 0b - { Qt::Key_L, 'l' , 'L' , 'L'-64 }, // 0c - { Qt::Key_M, 'm' , 'M' , 'M'-64 }, // 0d - { Qt::Key_N, 'n' , 'N' , 'N'-64 }, // 0e - { Qt::Key_O, 'o' , 'O' , 'O'-64 }, // 0f - { Qt::Key_P, 'p' , 'P' , 'P'-64 }, // 10 - { Qt::Key_Q, 'q' , 'Q' , 'Q'-64 }, // 11 - { Qt::Key_R, 'r' , 'R' , 'R'-64 }, // 12 - { Qt::Key_S, 's' , 'S' , 'S'-64 }, // 13 - { Qt::Key_T, 't' , 'T' , 'T'-64 }, // 14 20 - { Qt::Key_U, 'u' , 'U' , 'U'-64 }, // 15 - { Qt::Key_V, 'v' , 'V' , 'V'-64 }, // 16 - { Qt::Key_W, 'w' , 'W' , 'W'-64 }, // 17 - { Qt::Key_X, 'x' , 'X' , 'X'-64 }, // 18 - { Qt::Key_Y, 'y' , 'Y' , 'Y'-64 }, // 19 - { Qt::Key_Z, 'z' , 'Z' , 'Z'-64 }, // 1a - { Qt::Key_Shift, 0xffff , 0xffff , 0xffff }, // 1b - { Qt::Key_Return, 13 , 13 , 0xffff }, // 1c - { Qt::Key_F11, 0xffff , 0xffff , 0xffff }, // 1d todo - { Qt::Key_F22, 0xffff , 0xffff , 0xffff }, // 1e 30 - { Qt::Key_Backspace, 8 , 8 , 0xffff }, // 1f - { Qt::Key_F31, 0xffff , 0xffff , 0xffff }, // 20 - { Qt::Key_F35, 0xffff , 0xffff , 0xffff }, // 21 light - { Qt::Key_Escape, 0xffff , 0xffff , 0xffff }, // 22 - - // Direction key code are for *UNROTATED* display. - { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 23 - { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 24 - { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 25 - { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 26 - - { Qt::Key_F33, 0xffff , 0xffff , 0xffff }, // 27 OK - { Qt::Key_F12, 0xffff , 0xffff , 0xffff }, // 28 40 home - { Qt::Key_1, '1' , 'q' , 'Q'-64 }, // 29 - { Qt::Key_2, '2' , 'w' , 'W'-64 }, // 2a - { Qt::Key_3, '3' , 'e' , 'E'-64 }, // 2b - { Qt::Key_4, '4' , 'r' , 'R'-64 }, // 2c - { Qt::Key_5, '5' , 't' , 'T'-64 }, // 2d - { Qt::Key_6, '6' , 'y' , 'Y'-64 }, // 2e - { Qt::Key_7, '7' , 'u' , 'U'-64 }, // 2f - { Qt::Key_8, '8' , 'i' , 'I'-64 }, // 30 - { Qt::Key_9, '9' , 'o' , 'O'-64 }, // 31 - { Qt::Key_0, '0' , 'p' , 'P'-64 }, // 32 50 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 33 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 34 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 35 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 36 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 37 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 38 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 39 - { Qt::Key_Minus, '-' , 'b' , 'B'-64 }, // 3a - { Qt::Key_Plus, '+' , 'n' , 'N'-64 }, // 3b - { Qt::Key_CapsLock, 0xffff , 0xffff , 0xffff }, // 3c 60 - { Qt::Key_At, '@' , 's' , 'S'-64 }, // 3d - { Qt::Key_Question, '?' , '?' , 0xffff }, // 3e - { Qt::Key_Comma, ',' , ',' , 0xffff }, // 3f - { Qt::Key_Period, '.' , '.' , 0xffff }, // 40 - { Qt::Key_Tab, 9 , '\\' , 0xffff }, // 41 - { Qt::Key_X, 0xffff , 'x' , 'X'-64 }, // 42 - { Qt::Key_C, 0xffff , 'c' , 'C'-64 }, // 43 - { Qt::Key_V, 0xffff , 'v' , 'V'-64 }, // 44 - { Qt::Key_Slash, '/' , '/' , 0xffff }, // 45 - { Qt::Key_Apostrophe, '\'' , '\'' , 0xffff }, // 46 70 - { Qt::Key_Semicolon, ';' , ';' , 0xffff }, // 47 - { Qt::Key_QuoteDbl, '\"' , '\"' , 0xffff }, // 48 - { Qt::Key_Colon, ':' , ':' , 0xffff }, // 49 - { Qt::Key_NumberSign, '#' , 'd' , 'D'-64 }, // 4a - { Qt::Key_Dollar, '$' , 'f' , 'F'-64 }, // 4b - { Qt::Key_Percent, '%' , 'g' , 'G'-64 }, // 4c - { Qt::Key_Underscore, '_' , 'h' , 'H'-64 }, // 4d - { Qt::Key_Ampersand, '&' , 'j' , 'J'-64 }, // 4e - { Qt::Key_Asterisk, '*' , 'k' , 'K'-64 }, // 4f - { Qt::Key_ParenLeft, '(' , 'l' , 'L'-64 }, // 50 80 - { Qt::Key_Delete, '[' , '[' , '[' }, // 51 - { Qt::Key_Z, 0xffff , 'z' , 'Z'-64 }, // 52 - { Qt::Key_Equal, '=' , 'm' , 'M'-64 }, // 53 - { Qt::Key_ParenRight, ')' , ']' , ']' }, // 54 - { Qt::Key_AsciiTilde, '~' , '^' , '^' }, // 55 - { Qt::Key_Less, '<' , '{' , '{' }, // 56 - { Qt::Key_Greater, '>' , '}' , '}' }, // 57 - { Qt::Key_F9, 0xffff , 0xffff , 0xffff }, // 58 datebook - { Qt::Key_F10, 0xffff , 0xffff , 0xffff }, // 59 address - { Qt::Key_F13, 0xffff , 0xffff , 0xffff }, // 5a 90 email - { Qt::Key_F30, ' ' , ' ' , 0xffff }, // 5b select - { Qt::Key_Space, ' ' , '|' , '`' }, // 5c - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 5d - { Qt::Key_Exclam, '!' , 'a' , 'A'-64 }, // 5e - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 5f - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 60 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 61 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 62 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 63 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 64 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 65 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 66 - { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 68 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 69 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 6a - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 6b - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 6c - { Qt::Key_F34, 0xffff , 0xffff , 0xffff }, // 6d power - { Qt::Key_F13, 0xffff , 0xffff , 0xffff }, // 6e mail long - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 6f - { Qt::Key_NumLock, 0xffff , 0xffff , 0xffff }, // 70 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 71 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 72 - { 0x20ac, 0xffff , 0x20ac , 0x20ac }, // 73 Euro sign - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 74 - { Qt::Key_F32, 0xffff , 0xffff , 0xffff }, // 75 Sync - { 0, 0xffff , 0xffff , 0xffff } -}; - -static const int keyMSize = sizeof(sl5000KeyMap)/sizeof(QWSKeyMap)-1; - -QWSSL5000KeyboardHandler::QWSSL5000KeyboardHandler(const QString &device) - : QWSTtyKeyboardHandler(device) -{ - shift = false; - alt = false; - ctrl = false; - extended = 0; - prevuni = 0; - prevkey = 0; - caps = false; - meta = false; - fn = false; - numLock = false; - - sharp_kbdctl_modifstat st; - int dev = QT_OPEN(device.isEmpty()?"/dev/sharp_kbdctl":device.toLocal8Bit().constData(), O_RDWR); - if (dev >= 0) { - memset(&st, 0, sizeof(st)); - st.which = 3; - int ret = ioctl(dev, SHARP_KBDCTL_GETMODIFSTAT, (char*)&st); - if(!ret) - numLock = (bool)st.stat; - QT_CLOSE(dev); - } -} - -QWSSL5000KeyboardHandler::~QWSSL5000KeyboardHandler() -{ -} - -const QWSKeyMap *QWSSL5000KeyboardHandler::keyMap() const -{ - return sl5000KeyMap; -} - -bool QWSSL5000KeyboardHandler::filterKeycode(char &code) -{ - int keyCode = Qt::Key_unknown; - bool release = false; - - if (code & 0x80) { - release = true; - code &= 0x7f; - } - - if (fn && !meta && (code >= 0x42 && code <= 0x52)) { - ushort unicode=0; - int scan=0; - if (code == 0x42) { unicode='X'-'@'; scan=Qt::Key_X; } // Cut - else if (code == 0x43) { unicode='C'-'@'; scan=Qt::Key_C; } // Copy - else if (code == 0x44) { unicode='V'-'@'; scan=Qt::Key_V; } // Paste - else if (code == 0x52) { unicode='Z'-'@'; scan=Qt::Key_Z; } // Undo - if (scan) { - processKeyEvent(unicode, scan, Qt::ControlModifier, !release, false); - return true; - } - } - - if (code < keyMSize) { - keyCode = keyMap()[int(code)].key_code; - } - - bool repeatable = true; - - if (release && (keyCode == Qt::Key_F34 || keyCode == Qt::Key_F35)) - return true; // no release for power and light keys - if ((keyCode >= Qt::Key_F1 && keyCode <= Qt::Key_F35) - || keyCode == Qt::Key_Escape || keyCode == Qt::Key_Home - || keyCode == Qt::Key_Shift || keyCode == Qt::Key_Meta) - repeatable = false; - - if (qt_screen->isTransformed() - && keyCode >= Qt::Key_Left && keyCode <= Qt::Key_Down) - { - keyCode = transformDirKey(keyCode); - } - - // Ctrl-Alt-Delete exits qws - if (ctrl && alt && keyCode == Qt::Key_Delete) { - qApp->quit(); - } - - if (keyCode == Qt::Key_F22) { /* Fn key */ - fn = !release; - } else if (keyCode == Qt::Key_NumLock) { - if (release) - numLock = !numLock; - } else if (keyCode == Qt::AltModifier) { - alt = !release; - } else if (keyCode == Qt::ControlModifier) { - ctrl = !release; - } else if (keyCode == Qt::ShiftModifier) { - shift = !release; - } else if (keyCode == Qt::MetaModifier) { - meta = !release; - } else if (keyCode == Qt::Key_CapsLock && release) { - caps = !caps; - } - if (keyCode != Qt::Key_unknown) { - bool bAlt = alt; - bool bCtrl = ctrl; - bool bShift = shift; - int unicode = 0; - if (code < keyMSize) { - bool bCaps = caps ^ shift; - if (fn) { - if (shift) { - bCaps = bShift = false; - bCtrl = true; - } - if (meta) { - bCaps = bShift = true; - bAlt = true; - } - } else if (meta) { - bCaps = bShift = true; - } - if (code > 40 && caps) { - // fn-keys should only react to shift, not caps - bCaps = bShift = shift; - } - if (numLock) { - if (keyCode != Qt::Key_Space && keyCode != Qt::Key_Tab) - bCaps = bShift = false; - } - if (keyCode == Qt::Key_Delete && (bAlt || bCtrl)) { - keyCode = Qt::Key_BraceLeft; - unicode = '['; - bCaps = bShift = bAlt = bCtrl = false; - } else if (keyCode == Qt::Key_F31 && bCtrl) { - keyCode = Qt::Key_QuoteLeft; - unicode = '`'; - } else if (bCtrl) - unicode = keyMap()[int(code)].ctrl_unicode ? keyMap()[int(code)].ctrl_unicode : 0xffff; - else if (bCaps) - unicode = keyMap()[int(code)].shift_unicode ? keyMap()[int(code)].shift_unicode : 0xffff; - else - unicode = keyMap()[int(code)].unicode ? keyMap()[int(code)].unicode : 0xffff; - } - - modifiers = 0; - if (bAlt) modifiers |= Qt::AltModifier; - if (bCtrl) modifiers |= Qt::ControlModifier; - if (bShift) modifiers |= Qt::ShiftModifier; - - // looks wrong -- WWA - bool repeat = false; - if (prevuni == unicode && prevkey == keyCode && !release) - repeat = true; - - processKeyEvent(unicode, keyCode, modifiers, !release, repeat); - - if (!release) { - prevuni = unicode; - prevkey = keyCode; - } else { - prevkey = prevuni = 0; - } - } - - if (repeatable && !release) - beginAutoRepeat(prevuni, prevkey, modifiers); - else - endAutoRepeat(); - - return true; -} - -QT_END_NAMESPACE - -#endif // QT_NO_QWS_KBD_SL5000 diff --git a/src/gui/embedded/qkbdsl5000_qws.h b/src/gui/embedded/qkbdsl5000_qws.h deleted file mode 100644 index 42afbe153..000000000 --- a/src/gui/embedded/qkbdsl5000_qws.h +++ /dev/null @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QKBDSL5000_QWS_H -#define QKBDSL5000_QWS_H - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) - -#ifndef QT_NO_QWS_KBD_SL5000 - -struct QWSKeyMap { - uint key_code; - ushort unicode; - ushort shift_unicode; - ushort ctrl_unicode; -}; - - -class QWSSL5000KeyboardHandler : public QWSTtyKeyboardHandler -{ -public: - explicit QWSSL5000KeyboardHandler(const QString&); - virtual ~QWSSL5000KeyboardHandler(); - - bool filterKeycode(char &keycode); - virtual const QWSKeyMap *keyMap() const; - -private: - bool shift; - bool alt; - bool ctrl; - bool caps; - uint extended:2; - Qt::KeyboardModifiers modifiers; - int prevuni; - int prevkey; - bool meta; - bool fn; - bool numLock; -}; - -#endif // QT_NO_QWS_KBD_SL5000 - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QKBDSL5000_QWS_H diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp index 8c1e79b45..f10756777 100644 --- a/src/gui/embedded/qkbdtty_qws.cpp +++ b/src/gui/embedded/qkbdtty_qws.cpp @@ -90,7 +90,7 @@ private: struct termios m_tty_attr; char m_last_keycode; int m_vt_qws; - int m_originalKbdMode; + int m_orig_kbmode; }; @@ -111,7 +111,7 @@ bool QWSTtyKeyboardHandler::filterKeycode(char &) } QWSTtyKbPrivate::QWSTtyKbPrivate(QWSTtyKeyboardHandler *h, const QString &device) - : m_handler(h), m_tty_fd(-1), m_last_keycode(0), m_vt_qws(0) + : m_handler(h), m_tty_fd(-1), m_last_keycode(0), m_vt_qws(0), m_orig_kbmode(K_XLATE) { setObjectName(QLatin1String("TTY Keyboard Handler")); #ifndef QT_NO_QWS_SIGNALHANDLER @@ -152,15 +152,15 @@ QWSTtyKbPrivate::QWSTtyKbPrivate(QWSTtyKeyboardHandler *h, const QString &device tcgetattr(m_tty_fd, &termdata); #if defined(Q_OS_LINUX) - // record the original mode so we can restore it again in the constructor - ::ioctl(m_tty_fd, KDGKBMODE, m_originalKbdMode); + // record the original mode so we can restore it again in the destructor. + ::ioctl(m_tty_fd, KDGKBMODE, &m_orig_kbmode); // PLEASE NOTE: - // The tty keycode interface can only report keycodes 0x01 .. 0x7f + // the tty keycode interface can only report keycodes 0x01 .. 0x7f // KEY_MAX is however defined to 0x1ff. In practice this is sufficient // for a PC style keyboard though. - // we don't support K_RAW anymore - if you need, you habe to add a - // scan- to keycode converter. + // we don't support K_RAW anymore - if you need that, you have to add + // a scan- to keycode converter yourself. ::ioctl(m_tty_fd, KDSKBMODE, K_MEDIUMRAW); #endif @@ -211,12 +211,10 @@ QWSTtyKbPrivate::~QWSTtyKbPrivate() { if (m_tty_fd >= 0) { #if defined(Q_OS_LINUX) - ::ioctl(m_tty_fd, KDSKBMODE, m_originalKbdMode); + ::ioctl(m_tty_fd, KDSKBMODE, m_orig_kbmode); #endif tcsetattr(m_tty_fd, TCSANOW, &m_tty_attr); - - // we're leaking m_tty_fd here? - //QT_CLOSE(m_tty_fd); + QT_CLOSE(m_tty_fd); } } diff --git a/src/gui/embedded/qkbdvr41xx_qws.cpp b/src/gui/embedded/qkbdvr41xx_qws.cpp deleted file mode 100644 index 6d8299b00..000000000 --- a/src/gui/embedded/qkbdvr41xx_qws.cpp +++ /dev/null @@ -1,186 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qkbdvr41xx_qws.h" - -#if !defined(QT_NO_QWS_KEYBOARD) && !defined(QT_NO_QWS_KBD_VR41XX) - -#include -#include -#include -#include -#include -#include -#include - -#include -#include // overrides QT_OPEN - -QT_BEGIN_NAMESPACE - -class QWSVr41xxKbPrivate : public QObject -{ - Q_OBJECT -public: - QWSVr41xxKbPrivate(QWSVr41xxKeyboardHandler *h, const QString&); - virtual ~QWSVr41xxKbPrivate(); - - bool isOpen() { return buttonFD > 0; } - -private slots: - void readKeyboardData(); - -private: - QString terminalName; - int buttonFD; - int kbdIdx; - int kbdBufferLen; - unsigned char *kbdBuffer; - QSocketNotifier *notifier; - QWSVr41xxKeyboardHandler *handler; -}; - -QWSVr41xxKeyboardHandler::QWSVr41xxKeyboardHandler(const QString &device) -{ - d = new QWSVr41xxKbPrivate(this, device); -} - -QWSVr41xxKeyboardHandler::~QWSVr41xxKeyboardHandler() -{ - delete d; -} - -QWSVr41xxKbPrivate::QWSVr41xxKbPrivate(QWSVr41xxKeyboardHandler *h, const QString &device) : handler(h) -{ - terminalName = device; - if (terminalName.isEmpty()) - terminalName = QLatin1String("/dev/buttons"); - buttonFD = -1; - notifier = 0; - - buttonFD = QT_OPEN(terminalName.toLatin1().constData(), O_RDWR | O_NDELAY, 0);; - if (buttonFD < 0) { - qWarning("Cannot open %s\n", qPrintable(terminalName)); - return; - } - - if (buttonFD >= 0) { - notifier = new QSocketNotifier(buttonFD, QSocketNotifier::Read, this); - connect(notifier, SIGNAL(activated(int)),this, - SLOT(readKeyboardData())); - } - - kbdBufferLen = 80; - kbdBuffer = new unsigned char [kbdBufferLen]; - kbdIdx = 0; -} - -QWSVr41xxKbPrivate::~QWSVr41xxKbPrivate() -{ - if (buttonFD > 0) { - QT_CLOSE(buttonFD); - buttonFD = -1; - } - delete notifier; - notifier = 0; - delete [] kbdBuffer; -} - -void QWSVr41xxKbPrivate::readKeyboardData() -{ - int n = 0; - do { - n = QT_READ(buttonFD, kbdBuffer+kbdIdx, kbdBufferLen - kbdIdx); - if (n > 0) - kbdIdx += n; - } while (n > 0); - - int idx = 0; - while (kbdIdx - idx >= 2) { - unsigned char *next = kbdBuffer + idx; - unsigned short *code = (unsigned short *)next; - int keycode = Qt::Key_unknown; - switch ((*code) & 0x0fff) { - case 0x7: - keycode = Qt::Key_Up; - break; - case 0x9: - keycode = Qt::Key_Right; - break; - case 0x8: - keycode = Qt::Key_Down; - break; - case 0xa: - keycode = Qt::Key_Left; - break; - case 0x3: - keycode = Qt::Key_Up; - break; - case 0x4: - keycode = Qt::Key_Down; - break; - case 0x1: - keycode = Qt::Key_Return; - break; - case 0x2: - keycode = Qt::Key_F4; - break; - default: - qDebug("Unrecognised key sequence %d", *code); - } - if ((*code) & 0x8000) - handler->processKeyEvent(0, keycode, 0, false, false); - else - handler->processKeyEvent(0, keycode, 0, true, false); - idx += 2; - } - - int surplus = kbdIdx - idx; - for (int i = 0; i < surplus; i++) - kbdBuffer[i] = kbdBuffer[idx+i]; - kbdIdx = surplus; -} - -QT_END_NAMESPACE - -#include "qkbdvr41xx_qws.moc" - -#endif // QT_NO_QWS_KBD_VR41XX diff --git a/src/gui/embedded/qkbdvr41xx_qws.h b/src/gui/embedded/qkbdvr41xx_qws.h deleted file mode 100644 index 1a657b924..000000000 --- a/src/gui/embedded/qkbdvr41xx_qws.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QKBDVR41XX_QWS_H -#define QKBDVR41XX_QWS_H - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) - -#if !defined(QT_NO_QWS_KEYBOARD) && !defined(QT_NO_QWS_KBD_VR41XX) - -class QWSVr41xxKbPrivate; - -class QWSVr41xxKeyboardHandler : public QWSKeyboardHandler -{ -public: - explicit QWSVr41xxKeyboardHandler(const QString&); - virtual ~QWSVr41xxKeyboardHandler(); - -private: - QWSVr41xxKbPrivate *d; -}; - -#endif // QT_NO_QWS_KBD_VR41XX - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QKBDVR41XX_QWS_H diff --git a/src/gui/embedded/qkbdyopy_qws.cpp b/src/gui/embedded/qkbdyopy_qws.cpp deleted file mode 100644 index edb732cca..000000000 --- a/src/gui/embedded/qkbdyopy_qws.cpp +++ /dev/null @@ -1,211 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* - * YOPY buttons driver - * Contributed by Ron Victorelli (victorrj at icubed.com) - */ - -#include "qkbdyopy_qws.h" - -#ifndef QT_NO_QWS_KBD_YOPY - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include // overrides QT_OPEN - -extern "C" { - int getpgid(int); -} - -#include -#include - -QT_BEGIN_NAMESPACE - -class QWSYopyKbPrivate : public QObject -{ - Q_OBJECT -public: - QWSYopyKbPrivate(QWSYopyKeyboardHandler *h, const QString&); - virtual ~QWSYopyKbPrivate(); - - bool isOpen() { return buttonFD > 0; } - -private slots: - void readKeyboardData(); - -private: - QString terminalName; - int buttonFD; - struct termios newT, oldT; - QSocketNotifier *notifier; - QWSYopyKeyboardHandler *handler; -}; - -QWSYopyKeyboardHandler::QWSYopyKeyboardHandler(const QString &device) -{ - d = new QWSYopyKbPrivate(this, device); -} - -QWSYopyKeyboardHandler::~QWSYopyKeyboardHandler() -{ - delete d; -} - -QWSYopyKbPrivate::QWSYopyKbPrivate(QWSYopyKeyboardHandler *h, const QString &device) : handler(h) -{ - terminalName = device.isEmpty()?"/dev/tty1":device.toLatin1().constData(); - buttonFD = -1; - notifier = 0; - - buttonFD = QT_OPEN(terminalName.toLatin1().constData(), O_RDWR | O_NDELAY, 0); - if (buttonFD < 0) { - qWarning("Cannot open %s\n", qPrintable(terminalName)); - return; - } else { - - tcsetpgrp(buttonFD, getpgid(0)); - - /* put tty into "straight through" mode. - */ - if (tcgetattr(buttonFD, &oldT) < 0) { - qFatal("Linux-kbd: tcgetattr failed"); - } - - newT = oldT; - newT.c_lflag &= ~(ICANON | ECHO | ISIG); - newT.c_iflag &= ~(ISTRIP | IGNCR | ICRNL | INLCR | IXOFF | IXON); - newT.c_iflag |= IGNBRK; - newT.c_cc[VMIN] = 0; - newT.c_cc[VTIME] = 0; - - - if (tcsetattr(buttonFD, TCSANOW, &newT) < 0) { - qFatal("Linux-kbd: TCSANOW tcsetattr failed"); - } - - if (ioctl(buttonFD, KDSKBMODE, K_MEDIUMRAW) < 0) { - qFatal("Linux-kbd: KDSKBMODE tcsetattr failed"); - } - - notifier = new QSocketNotifier(buttonFD, QSocketNotifier::Read, this); - connect(notifier, SIGNAL(activated(int)),this, - SLOT(readKeyboardData())); - } -} - -QWSYopyKbPrivate::~QWSYopyKbPrivate() -{ - if (buttonFD > 0) { - ::close(buttonFD); - buttonFD = -1; - } -} - -void QWSYopyKbPrivate::readKeyboardData() -{ - uchar buf[1]; - char c='1'; - int fd; - - int n=read(buttonFD,buf,1); - if (n<0) { - qDebug("Keyboard read error %s",strerror(errno)); - } else { - uint code = buf[0]&YPBUTTON_CODE_MASK; - bool press = !(buf[0]&0x80); - // printf("Key=%d/%d/%d\n",buf[1],code,press); - int k=(-1); - switch(code) { - case 39: k=Qt::Key_Up; break; - case 44: k=Qt::Key_Down; break; - case 41: k=Qt::Key_Left; break; - case 42: k=Qt::Key_Right; break; - case 56: k=Qt::Key_F1; break; //windows - case 29: k=Qt::Key_F2; break; //cycle - case 24: k=Qt::Key_F3; break; //record - case 23: k=Qt::Key_F4; break; //mp3 - case 4: k=Qt::Key_F5; break; // PIMS - case 1: k=Qt::Key_Escape; break; // Escape - case 40: k=Qt::Key_Up; break; // prev - case 45: k=Qt::Key_Down; break; // next - case 35: if(!press) { - fd = QT_OPEN("/proc/sys/pm/sleep",O_RDWR,0); - if(fd >= 0) { - QT_WRITE(fd,&c,sizeof(c)); - QT_CLOSE(fd); - // - // Updates all widgets. - // - QWidgetList list = QApplication::allWidgets(); - for (int i = 0; i < list.size(); ++i) { - QWidget *w = list.at(i); - w->update(); - } - } - } - break; - - default: k=(-1); break; - } - - if (k >= 0) { - handler->processKeyEvent(0, k, 0, press, false); - } - } -} - -QT_END_NAMESPACE - -#include "qkbdyopy_qws.moc" - -#endif // QT_NO_QWS_KBD_YOPY diff --git a/src/gui/embedded/qkbdyopy_qws.h b/src/gui/embedded/qkbdyopy_qws.h deleted file mode 100644 index b4e45bd46..000000000 --- a/src/gui/embedded/qkbdyopy_qws.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QKBDYOPY_QWS_H -#define QKBDYOPY_QWS_H - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) - -#ifndef QT_NO_QWS_KBD_YOPY - -class QWSYopyKbPrivate; - -class QWSYopyKeyboardHandler : public QWSKeyboardHandler -{ -public: - explicit QWSYopyKeyboardHandler(const QString&); - virtual ~QWSYopyKeyboardHandler(); - -private: - QWSYopyKbPrivate *d; -}; - -#endif // QT_NO_QWS_KBD_YOPY - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QKBDYOPY_QWS_H diff --git a/src/gui/embedded/qmousebus_qws.cpp b/src/gui/embedded/qmousebus_qws.cpp deleted file mode 100644 index 0b674b696..000000000 --- a/src/gui/embedded/qmousebus_qws.cpp +++ /dev/null @@ -1,239 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qmousebus_qws.h" - -#ifndef QT_NO_QWS_MOUSE_BUS - -#include "qwindowsystem_qws.h" -#include "qsocketnotifier.h" - -#include "qapplication.h" -#include // overrides QT_OPEN - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -/* - * bus mouse driver (a.k.a. Logitech busmouse) - */ - -class QWSBusMouseHandlerPrivate : public QObject -{ - Q_OBJECT -public: - QWSBusMouseHandlerPrivate(QWSBusMouseHandler *h, const QString &driver, const QString &device); - ~QWSBusMouseHandlerPrivate(); - - void suspend(); - void resume(); - -private slots: - void readMouseData(); - -protected: - enum { mouseBufSize = 128 }; - QWSBusMouseHandler *handler; - QSocketNotifier *mouseNotifier; - int mouseFD; - int mouseIdx; - int obstate; - uchar mouseBuf[mouseBufSize]; -}; - -QWSBusMouseHandler::QWSBusMouseHandler(const QString &driver, const QString &device) - : QWSMouseHandler(driver, device) -{ - d = new QWSBusMouseHandlerPrivate(this, driver, device); -} - -QWSBusMouseHandler::~QWSBusMouseHandler() -{ - delete d; -} - -void QWSBusMouseHandler::suspend() -{ - d->suspend(); -} - -void QWSBusMouseHandler::resume() -{ - d->resume(); -} - - -QWSBusMouseHandlerPrivate::QWSBusMouseHandlerPrivate(QWSBusMouseHandler *h, - const QString &, const QString &device) - : handler(h) - -{ - QString mouseDev = device; - if (mouseDev.isEmpty()) - mouseDev = QLatin1String("/dev/mouse"); - obstate = -1; - mouseFD = -1; - mouseFD = QT_OPEN(mouseDev.toLocal8Bit(), O_RDWR | O_NDELAY); - if (mouseFD < 0) - mouseFD = QT_OPEN(mouseDev.toLocal8Bit(), O_RDONLY | O_NDELAY); - if (mouseFD < 0) - qDebug("Cannot open %s (%s)", qPrintable(mouseDev), strerror(errno)); - - // Clear pending input - tcflush(mouseFD,TCIFLUSH); - usleep(50000); - - char buf[100]; // busmouse driver will not read if bufsize < 3, YYD - while (QT_READ(mouseFD, buf, 100) > 0) { } // eat unwanted replies - - mouseIdx = 0; - - mouseNotifier = new QSocketNotifier(mouseFD, QSocketNotifier::Read, this); - connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); -} - -QWSBusMouseHandlerPrivate::~QWSBusMouseHandlerPrivate() -{ - if (mouseFD >= 0) { - tcflush(mouseFD,TCIFLUSH); // yyd. - QT_CLOSE(mouseFD); - } -} - - -void QWSBusMouseHandlerPrivate::suspend() -{ - mouseNotifier->setEnabled(false); -} - - -void QWSBusMouseHandlerPrivate::resume() -{ - mouseIdx = 0; - obstate = -1; - mouseNotifier->setEnabled(true); -} - -void QWSBusMouseHandlerPrivate::readMouseData() -{ - int n; - // It'll only read 3 bytes a time and return all other buffer zeroed, thus cause protocol errors - for (;;) { - if (mouseBufSize - mouseIdx < 3) - break; - n = QT_READ(mouseFD, mouseBuf+mouseIdx, 3); - if (n != 3) - break; - mouseIdx += 3; - } - - static const int accel_limit = 5; - static const int accel = 2; - - int idx = 0; - int bstate = 0; - int dx = 0, dy = 0; - bool sendEvent = false; - int tdx = 0, tdy = 0; - - while (mouseIdx-idx >= 3) { -#if 0 // debug - qDebug("Got mouse data"); -#endif - uchar *mb = mouseBuf+idx; - bstate = 0; - dx = 0; - dy = 0; - sendEvent = false; - if (((mb[0] & 0x04))) - bstate |= Qt::LeftButton; - if (((mb[0] & 0x01))) - bstate |= Qt::RightButton; - - dx=(signed char)mb[1]; - dy=(signed char)mb[2]; - sendEvent=true; - - if (sendEvent) { - if (qAbs(dx) > accel_limit || qAbs(dy) > accel_limit) { - dx *= accel; - dy *= accel; - } - tdx += dx; - tdy += dy; - if (bstate != obstate) { - QPoint pos = handler->pos() + QPoint(tdx,-tdy); - handler->limitToScreen(pos); - handler->mouseChanged(pos,bstate); - sendEvent = false; - tdx = 0; - tdy = 0; - obstate = bstate; - } - } - idx += 3; - } - if (sendEvent) { - QPoint pos = handler->pos() + QPoint(tdx,-tdy); - handler->limitToScreen(pos); - handler->mouseChanged(pos,bstate); - } - - int surplus = mouseIdx - idx; - for (int i = 0; i < surplus; i++) - mouseBuf[i] = mouseBuf[idx+i]; - mouseIdx = surplus; -} - -QT_END_NAMESPACE - -#include "qmousebus_qws.moc" - -#endif // QT_NO_QWS_MOUSE_BUS diff --git a/src/gui/embedded/qmousebus_qws.h b/src/gui/embedded/qmousebus_qws.h deleted file mode 100644 index 407da9817..000000000 --- a/src/gui/embedded/qmousebus_qws.h +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QMOUSEBUS_QWS_H -#define QMOUSEBUS_QWS_H - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) - -#ifndef QT_NO_QWS_MOUSE_BUS - -class QWSBusMouseHandlerPrivate; - -class QWSBusMouseHandler : public QWSMouseHandler -{ -public: - explicit QWSBusMouseHandler(const QString & = QString(), - const QString & = QString()); - ~QWSBusMouseHandler(); - - void suspend(); - void resume(); -protected: - QWSBusMouseHandlerPrivate *d; -}; - -#endif // QT_NO_QWS_MOUSE_BUS - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QMOUSEBUS_QWS_H diff --git a/src/gui/embedded/qmousedriverfactory_qws.cpp b/src/gui/embedded/qmousedriverfactory_qws.cpp index 7e518186b..46898aed8 100644 --- a/src/gui/embedded/qmousedriverfactory_qws.cpp +++ b/src/gui/embedded/qmousedriverfactory_qws.cpp @@ -43,10 +43,8 @@ #include "qapplication.h" #include "qmousepc_qws.h" -#include "qmousebus_qws.h" -#include "qmousevr41xx_qws.h" -#include "qmouseyopy_qws.h" #include "qmouselinuxtp_qws.h" +#include "qmouselinuxinput_qws.h" #include "qmousevfb_qws.h" #include "qmousetslib_qws.h" #include @@ -108,14 +106,6 @@ QWSMouseHandler *QMouseDriverFactory::create(const QString& key, const QString & if (driver == QLatin1String("linuxtp") || driver.isEmpty()) return new QWSLinuxTPMouseHandler(key, device); #endif -#ifndef QT_NO_QWS_MOUSE_YOPY - if (driver == QLatin1String("yopy") || driver.isEmpty()) - return new QWSYopyMouseHandler(key, device); -#endif -#ifndef QT_NO_QWS_MOUSE_VR41XX - if (driver == QLatin1String("vr41xx") || driver.isEmpty()) - return new QWSVr41xxMouseHandler(key, device); -#endif #ifndef QT_NO_QWS_MOUSE_PC if (driver == QLatin1String("auto") || driver == QLatin1String("intellimouse") @@ -126,14 +116,16 @@ QWSMouseHandler *QMouseDriverFactory::create(const QString& key, const QString & return new QWSPcMouseHandler(key, device); } #endif -#ifndef QT_NO_QWS_MOUSE_BUS - if (driver == QLatin1String("bus")) - return new QWSBusMouseHandler(key, device); -#endif #ifndef QT_NO_QWS_MOUSE_TSLIB if (driver == QLatin1String("tslib") || driver.isEmpty()) return new QWSTslibMouseHandler(key, device); #endif +# ifndef QT_NO_QWS_MOUSE_LINUXINPUT + if (driver == QLatin1String("linuxinput") || \ + driver == QLatin1String("usb") || \ + driver == QLatin1String("linuxis")) + return new QWSLinuxInputMouseHandler(device); +# endif #ifndef QT_NO_QWS_MOUSE_QVFB if (driver == QLatin1String("qvfbmouse") || driver == QLatin1String("qvfb")) return new QVFbMouseHandler(key, device); @@ -160,12 +152,6 @@ QStringList QMouseDriverFactory::keys() #ifndef QT_NO_QWS_MOUSE_LINUXTP list << QLatin1String("LinuxTP"); #endif -#ifndef QT_NO_QWS_MOUSE_YOPY - list << QLatin1String("Yopy"); -#endif -#ifndef QT_NO_QWS_MOUSE_VR41XX - list << QLatin1String("VR41xx"); -#endif #ifndef QT_NO_QWS_MOUSE_PC list << QLatin1String("Auto") << QLatin1String("IntelliMouse") @@ -173,12 +159,12 @@ QStringList QMouseDriverFactory::keys() << QLatin1String("MouseSystems") << QLatin1String("MouseMan"); #endif -#ifndef QT_NO_QWS_MOUSE_BUS - list << QLatin1String("Bus"); -#endif #ifndef QT_NO_QWS_MOUSE_TSLIB list << QLatin1String("Tslib"); #endif +#ifndef QT_NO_QWS_MOUSE_LINUXINPUT + list << QLatin1String("LinuxInput"); +#endif #if !defined(Q_OS_WIN32) || defined(QT_MAKEDLL) #ifndef QT_NO_LIBRARY diff --git a/src/gui/embedded/qmouselinuxinput_qws.cpp b/src/gui/embedded/qmouselinuxinput_qws.cpp new file mode 100644 index 000000000..6ea880771 --- /dev/null +++ b/src/gui/embedded/qmouselinuxinput_qws.cpp @@ -0,0 +1,205 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qmouselinuxinput_qws.h" + +#include +#include + +#include +#include // overrides QT_OPEN + +#include + +#include + +QT_BEGIN_NAMESPACE + + +class QWSLinuxInputMousePrivate : public QObject +{ + Q_OBJECT +public: + QWSLinuxInputMousePrivate(QWSLinuxInputMouseHandler *, const QString &); + ~QWSLinuxInputMousePrivate(); + + void enable(bool on); + +private Q_SLOTS: + void readMouseData(); + +private: + QWSLinuxInputMouseHandler *m_handler; + QSocketNotifier * m_notify; + int m_fd; + int m_x, m_y; + int m_buttons; +}; + +QWSLinuxInputMouseHandler::QWSLinuxInputMouseHandler(const QString &device) + : QWSCalibratedMouseHandler(device) +{ + d = new QWSLinuxInputMousePrivate(this, device); +} + +QWSLinuxInputMouseHandler::~QWSLinuxInputMouseHandler() +{ + delete d; +} + +void QWSLinuxInputMouseHandler::suspend() +{ + d->enable(false); +} + +void QWSLinuxInputMouseHandler::resume() +{ + d->enable(true); +} + +QWSLinuxInputMousePrivate::QWSLinuxInputMousePrivate(QWSLinuxInputMouseHandler *h, const QString &device) + : m_handler(h), m_notify(0), m_x(0), m_y(0), m_buttons(0) +{ + setObjectName(QLatin1String("LinuxInputSubsystem Mouse Handler")); + + QString dev = QLatin1String("/dev/input/event0"); + if (device.startsWith(QLatin1String("/dev/"))) + dev = device; + + m_fd = QT_OPEN(dev.toLocal8Bit().constData(), O_RDONLY | O_NDELAY, 0); + if (m_fd >= 0) { + m_notify = new QSocketNotifier(m_fd, QSocketNotifier::Read, this); + connect(m_notify, SIGNAL(activated(int)), this, SLOT(readMouseData())); + } else { + qWarning("Cannot open mouse input device '%s': %s", qPrintable(dev), strerror(errno)); + return; + } +} + +QWSLinuxInputMousePrivate::~QWSLinuxInputMousePrivate() +{ + if (m_fd >= 0) + QT_CLOSE(m_fd); +} + +void QWSLinuxInputMousePrivate::enable(bool on) +{ + if (m_notify) + m_notify->setEnabled(on); +} + +void QWSLinuxInputMousePrivate::readMouseData() +{ + if (!qt_screen) + return; + + struct ::input_event buffer[32]; + int n = 0; + + forever { + n = QT_READ(m_fd, reinterpret_cast(buffer) + n, sizeof(buffer) - n); + + if (n == 0) { + qWarning("Got EOF from the input device."); + return; + } else if (n < 0 && (errno != EINTR && errno != EAGAIN)) { + qWarning("Could not read from input device: %s", strerror(errno)); + return; + } else if (n % sizeof(buffer[0]) == 0) { + break; + } + } + + n /= sizeof(buffer[0]); + + for (int i = 0; i < n; ++i) { + struct ::input_event *data = &buffer[i]; + + bool unknown = false; + if (data->type == EV_ABS) { + if (data->code == ABS_X) { + m_x = data->value; + } else if (data->code == ABS_Y) { + m_y = data->value; + } else { + unknown = true; + } + } else if (data->type == EV_REL) { + if (data->code == REL_X) { + m_x += data->value; + } else if (data->code == REL_Y) { + m_y += data->value; + } else { + unknown = true; + } + } else if (data->type == EV_KEY && data->code == BTN_TOUCH) { + m_buttons = data->value ? Qt::LeftButton : 0; + } else if (data->type == EV_KEY) { + int button = 0; + switch (data->code) { + case BTN_LEFT: button = Qt::LeftButton; break; + case BTN_MIDDLE: button = Qt::MidButton; break; + case BTN_RIGHT: button = Qt::RightButton; break; + } + if (data->value) + m_buttons |= button; + else + m_buttons &= ~button; + } else if (data->type == EV_SYN && data->code == SYN_REPORT) { + QPoint pos(m_x, m_y); + pos = m_handler->transform(pos); + m_handler->limitToScreen(pos); + m_handler->mouseChanged(pos, m_buttons); + } else if (data->type == EV_MSC && data->code == MSC_SCAN) { + // kernel encountered an unmapped key - just ignore it + continue; + } else { + unknown = true; + } + if (unknown) { + qWarning("unknown mouse event type=%x, code=%x, value=%x", data->type, data->code, data->value); + } + } +} + +QT_END_NAMESPACE + +#include "qmouselinuxinput_qws.moc" diff --git a/src/gui/embedded/qmouselinuxinput_qws.h b/src/gui/embedded/qmouselinuxinput_qws.h new file mode 100644 index 000000000..25e351fa5 --- /dev/null +++ b/src/gui/embedded/qmouselinuxinput_qws.h @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QMOUSELINUXINPUT_QWS_H +#define QMOUSELINUXINPUT_QWS_H + +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + +#ifndef QT_NO_QWS_MOUSE_LINUXINPUT + +class QWSLinuxInputMousePrivate; + +class QWSLinuxInputMouseHandler : public QWSCalibratedMouseHandler +{ +public: + QWSLinuxInputMouseHandler(const QString &); + ~QWSLinuxInputMouseHandler(); + + void suspend(); + void resume(); + +private: + QWSLinuxInputMousePrivate *d; + + friend class QWSLinuxInputMousePrivate; +}; + +#endif // QT_NO_QWS_MOUSE_LINUXINPUT + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QMOUSELINUXINPUT_QWS_H diff --git a/src/gui/embedded/qmousevr41xx_qws.cpp b/src/gui/embedded/qmousevr41xx_qws.cpp deleted file mode 100644 index b7491d917..000000000 --- a/src/gui/embedded/qmousevr41xx_qws.cpp +++ /dev/null @@ -1,251 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qmousevr41xx_qws.h" - -#ifndef QT_NO_QWS_MOUSE_VR41XX -#include "qwindowsystem_qws.h" -#include "qsocketnotifier.h" -#include "qtimer.h" -#include "qapplication.h" -#include "qscreen_qws.h" -#include -#include -#include // overrides QT_OPEN - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -static const int defaultFilterSize = 3; - -class QWSVr41xxMouseHandlerPrivate : public QObject -{ - Q_OBJECT -public: - QWSVr41xxMouseHandlerPrivate(QWSVr41xxMouseHandler *, const QString &, const QString &); - ~QWSVr41xxMouseHandlerPrivate(); - - void resume(); - void suspend(); - -private slots: - void sendRelease(); - void readMouseData(); - -private: - bool getSample(); - ushort currSample[6]; - uint currLength; - - int mouseFD; - int mouseIdx; - QTimer *rtimer; - QSocketNotifier *mouseNotifier; - QWSVr41xxMouseHandler *handler; - QPoint lastPos; - bool isPressed; - int filterSize; - int pressLimit; -}; - -QWSVr41xxMouseHandler::QWSVr41xxMouseHandler(const QString &drv, const QString &dev) - : QWSCalibratedMouseHandler(drv, dev) -{ - d = new QWSVr41xxMouseHandlerPrivate(this, drv, dev); -} - -QWSVr41xxMouseHandler::~QWSVr41xxMouseHandler() -{ - delete d; -} - -void QWSVr41xxMouseHandler::resume() -{ - d->resume(); -} - -void QWSVr41xxMouseHandler::suspend() -{ - d->suspend(); -} - -QWSVr41xxMouseHandlerPrivate::QWSVr41xxMouseHandlerPrivate(QWSVr41xxMouseHandler *h, const QString &, const QString &device) - : currLength(0), handler(h) -{ - QStringList options = device.split(QLatin1String(":")); - int index = -1; - - filterSize = defaultFilterSize; - QRegExp filterRegExp(QLatin1String("filter=(\\d+)")); - index = options.indexOf(filterRegExp); - if (index != -1) { - filterSize = qMax(1, filterRegExp.cap(1).toInt()); - options.removeAt(index); - } - handler->setFilterSize(filterSize); - - pressLimit = 750; - QRegExp pressRegExp(QLatin1String("press=(\\d+)")); - index = options.indexOf(pressRegExp); - if (index != -1) { - pressLimit = filterRegExp.cap(1).toInt(); - options.removeAt(index); - } - - QString dev; - if (options.isEmpty()) - dev = QLatin1String("/dev/vrtpanel"); - else - dev = options.first(); - - if ((mouseFD = QT_OPEN(dev.toLocal8Bit().constData(), O_RDONLY)) < 0) { - qWarning("Cannot open %s (%s)", qPrintable(dev), strerror(errno)); - return; - } - sleep(1); - - if (fcntl(mouseFD, F_SETFL, O_NONBLOCK) < 0) { - qWarning("Error initializing touch panel."); - return; - } - - mouseNotifier = new QSocketNotifier(mouseFD, QSocketNotifier::Read, this); - connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); - - rtimer = new QTimer(this); - rtimer->setSingleShot(true); - connect(rtimer, SIGNAL(timeout()), this, SLOT(sendRelease())); - mouseIdx = 0; -} - -QWSVr41xxMouseHandlerPrivate::~QWSVr41xxMouseHandlerPrivate() -{ - if (mouseFD >= 0) - QT_CLOSE(mouseFD); -} - -void QWSVr41xxMouseHandlerPrivate::suspend() -{ - mouseNotifier->setEnabled(false); -} - - -void QWSVr41xxMouseHandlerPrivate::resume() -{ - mouseIdx = 0; - mouseNotifier->setEnabled(true); -} - -void QWSVr41xxMouseHandlerPrivate::sendRelease() -{ - handler->sendFiltered(lastPos, Qt::NoButton); - isPressed = false; -} - -bool QWSVr41xxMouseHandlerPrivate::getSample() -{ - const int n = QT_READ(mouseFD, - reinterpret_cast(currSample) + currLength, - sizeof(currSample) - currLength); - - if (n > 0) - currLength += n; - - if (currLength < sizeof(currSample)) - return false; - - currLength = 0; - return true; -} - -void QWSVr41xxMouseHandlerPrivate::readMouseData() -{ - const int sampleLength = sizeof(currSample) / sizeof(ushort); - QVarLengthArray samples(sampleLength * filterSize); - - // Only return last 'filterSize' samples - int head = 0; - int tail = 0; - int nSamples = 0; - while (getSample()) { - if (!(currSample[0] & 0x8000) || (currSample[5] < pressLimit)) - continue; - - ushort *data = samples.data() + head * sampleLength; - memcpy(data, currSample, sizeof(currSample)); - ++nSamples; - head = (head + 1) % filterSize; - if (nSamples >= filterSize) - tail = (tail + 1) % filterSize; - } - - if (nSamples == 0) - return; - - // send mouse events - while (tail != head || filterSize == 1) { - const ushort *data = samples.data() + tail * sampleLength; - lastPos = QPoint(data[3] - data[4], data[2] - data[1]); - handler->sendFiltered(lastPos, Qt::LeftButton); - isPressed = true; - tail = (tail + 1) % filterSize; - if (filterSize == 1) - break; - } - - if (isPressed) - rtimer->start(50); // release unreliable -} - -QT_END_NAMESPACE - -#include "qmousevr41xx_qws.moc" - -#endif //QT_NO_QWS_MOUSE_VR41 diff --git a/src/gui/embedded/qmousevr41xx_qws.h b/src/gui/embedded/qmousevr41xx_qws.h deleted file mode 100644 index 46d07e008..000000000 --- a/src/gui/embedded/qmousevr41xx_qws.h +++ /dev/null @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QMOUSEVR41XX_QWS_H -#define QMOUSEVR41XX_QWS_H - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) - -#ifndef QT_NO_QWS_MOUSE_VR41XX - -class QWSVr41xxMouseHandlerPrivate; - -class QWSVr41xxMouseHandler : public QWSCalibratedMouseHandler -{ -public: - explicit QWSVr41xxMouseHandler(const QString & = QString(), - const QString & = QString()); - ~QWSVr41xxMouseHandler(); - - void resume(); - void suspend(); - -protected: - QWSVr41xxMouseHandlerPrivate *d; - -private: - friend class QWSVr41xxMouseHandlerPrivate; -}; - -#endif // QT_NO_QWS_MOUSE_VR41XX - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QMOUSEVR41XX_QWS_H diff --git a/src/gui/embedded/qmouseyopy_qws.cpp b/src/gui/embedded/qmouseyopy_qws.cpp deleted file mode 100644 index 3a541d370..000000000 --- a/src/gui/embedded/qmouseyopy_qws.cpp +++ /dev/null @@ -1,185 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qmouseyopy_qws.h" - -#ifndef QT_NO_QWS_MOUSE_YOPY -#include "qwindowsystem_qws.h" -#include "qsocketnotifier.h" -#include "qapplication.h" -#include "qscreen_qws.h" -#include // overrides QT_OPEN - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QWSYopyMouseHandlerPrivate : public QObject -{ - Q_OBJECT -public: - QWSYopyMouseHandlerPrivate(QWSYopyMouseHandler *h); - ~QWSYopyMouseHandlerPrivate(); - - void suspend(); - void resume(); - -private slots: - void readMouseData(); - -private: - int mouseFD; - int prevstate; - QSocketNotifier *mouseNotifier; - QWSYopyMouseHandler *handler; -}; - -QWSYopyMouseHandler::QWSYopyMouseHandler(const QString &driver, const QString &device) - : QWSMouseHandler(driver, device) -{ - d = new QWSYopyMouseHandlerPrivate(this); -} - -QWSYopyMouseHandler::~QWSYopyMouseHandler() -{ - delete d; -} - -void QWSYopyMouseHandler::resume() -{ - d->resume(); -} - -void QWSYopyMouseHandler::suspend() -{ - d->suspend(); -} - -QWSYopyMouseHandlerPrivate::QWSYopyMouseHandlerPrivate(QWSYopyMouseHandler *h) - : handler(h) -{ - if ((mouseFD = QT_OPEN("/dev/ts", O_RDONLY)) < 0) { - qWarning("Cannot open /dev/ts (%s)", strerror(errno)); - return; - } else { - sleep(1); - } - prevstate=0; - mouseNotifier = new QSocketNotifier(mouseFD, QSocketNotifier::Read, - this); - connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); -} - -QWSYopyMouseHandlerPrivate::~QWSYopyMouseHandlerPrivate() -{ - if (mouseFD >= 0) - QT_CLOSE(mouseFD); -} - -#define YOPY_XPOS(d) (d[1]&0x3FF) -#define YOPY_YPOS(d) (d[2]&0x3FF) -#define YOPY_PRES(d) (d[0]&0xFF) -#define YOPY_STAT(d) (d[3]&0x01) - -struct YopyTPdata { - - unsigned char status; - unsigned short xpos; - unsigned short ypos; - -}; - -void QWSYopyMouseHandlerPrivate::suspend() -{ - mouseNotifier->setEnabled(false); -} - - -void QWSYopyMouseHandlerPrivate::resume() -{ - prevstate = 0; - mouseNotifier->setEnabled(true); -} - -void QWSYopyMouseHandlerPrivate::readMouseData() -{ - if(!qt_screen) - return; - YopyTPdata data; - - unsigned int yopDat[4]; - - int ret; - - ret=QT_READ(mouseFD,&yopDat,sizeof(yopDat)); - - if(ret) { - data.status= (YOPY_PRES(yopDat)) ? 1 : 0; - data.xpos=YOPY_XPOS(yopDat); - data.ypos=YOPY_YPOS(yopDat); - QPoint q; - q.setX(data.xpos); - q.setY(data.ypos); - if (data.status && !prevstate) { - handler->mouseChanged(q,Qt::LeftButton); - } else if(!data.status && prevstate) { - handler->mouseChanged(q,0); - } - prevstate = data.status; - } - if(ret<0) { - qDebug("Error %s",strerror(errno)); - } -} - -QT_END_NAMESPACE - -#include "qmouseyopy_qws.moc" - -#endif //QT_NO_QWS_MOUSE_YOPY diff --git a/src/gui/embedded/qmouseyopy_qws.h b/src/gui/embedded/qmouseyopy_qws.h deleted file mode 100644 index 0d24a8f03..000000000 --- a/src/gui/embedded/qmouseyopy_qws.h +++ /dev/null @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QMOUSEYOPY_QWS_H -#define QMOUSEYOPY_QWS_H - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) - -#ifndef QT_NO_QWS_MOUSE_YOPY - -// YOPY touch panel support based on changes contributed by Ron Victorelli -// (victorrj at icubed.com) to Custom TP driver. - -class QWSYopyMouseHandlerPrivate; - -class QWSYopyMouseHandler : public QWSMouseHandler -{ -public: - explicit QWSYopyMouseHandler(const QString & = QString(), - const QString & = QString()); - ~QWSYopyMouseHandler(); - - void resume(); - void suspend(); - -protected: - QWSYopyMouseHandlerPrivate *d; -}; - -#endif // QT_NO_QWS_MOUSE_YOPY - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QMOUSEYOPY_QWS_H diff --git a/src/plugins/kbddrivers/kbddrivers.pro b/src/plugins/kbddrivers/kbddrivers.pro index a34b780e3..dbab47b36 100644 --- a/src/plugins/kbddrivers/kbddrivers.pro +++ b/src/plugins/kbddrivers/kbddrivers.pro @@ -1,5 +1,2 @@ TEMPLATE = subdirs contains(kbd-plugins, linuxinput): SUBDIRS += linuxinput -contains(kbd-plugins, sl5000): SUBDIRS += sl5000 -contains(kbd-plugins, vr41xx): SUBDIRS += vr41xx -contains(kbd-plugins, yopy): SUBDIRS += yopy diff --git a/src/plugins/kbddrivers/sl5000/main.cpp b/src/plugins/kbddrivers/sl5000/main.cpp deleted file mode 100644 index cc68747dd..000000000 --- a/src/plugins/kbddrivers/sl5000/main.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -QT_BEGIN_NAMESPACE - -class QSL5000KbdDriver : public QKbdDriverPlugin -{ -public: - QSL5000KbdDriver(); - - QStringList keys() const; - QWSKeyboardHandler* create(const QString &driver, const QString &device); -}; - -QSL5000KbdDriver::QSL5000KbdDriver() - : QKbdDriverPlugin() -{ -} - -QStringList QSL5000KbdDriver::keys() const -{ - return (QStringList() << QLatin1String("SL5000")); -} - -QWSKeyboardHandler* QSL5000KbdDriver::create(const QString &driver, - const QString &device) -{ - if (driver.compare(QLatin1String("SL5000"), Qt::CaseInsensitive)) - return 0; - return new QWSSL5000KeyboardHandler(device); -} - -Q_EXPORT_PLUGIN2(qwssl5000kbddriver, QSL5000KbdDriver) - -QT_END_NAMESPACE diff --git a/src/plugins/kbddrivers/sl5000/sl5000.pro b/src/plugins/kbddrivers/sl5000/sl5000.pro deleted file mode 100644 index e52cf0d97..000000000 --- a/src/plugins/kbddrivers/sl5000/sl5000.pro +++ /dev/null @@ -1,16 +0,0 @@ -TARGET = qsl5000kbddriver -include(../../qpluginbase.pri) - -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/kbddrivers -target.path = $$[QT_INSTALL_PLUGINS]/kbddrivers -INSTALLS += target - -DEFINES += QT_QWS_KBD_SL5000 QT_QWS_KBD_TTY - -HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qkbdsl5000_qws.h \ - $$QT_SOURCE_TREE/src/gui/embedded/qkbdtty_qws.h - -SOURCES = main.cpp \ - $$QT_SOURCE_TREE/src/gui/embedded/qkbdsl5000_qws.cpp \ - $$QT_SOURCE_TREE/src/gui/embedded/qkbdtty_qws.cpp - diff --git a/src/plugins/kbddrivers/vr41xx/main.cpp b/src/plugins/kbddrivers/vr41xx/main.cpp deleted file mode 100644 index c9ba4d77c..000000000 --- a/src/plugins/kbddrivers/vr41xx/main.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -QT_BEGIN_NAMESPACE - -class QVr41xxKbdDriver : public QKbdDriverPlugin -{ -public: - QVr41xxKbdDriver(); - - QStringList keys() const; - QWSKeyboardHandler* create(const QString &driver, const QString &device); -}; - -QVr41xxKbdDriver::QVr41xxKbdDriver() - : QKbdDriverPlugin() -{ -} - -QStringList QVr41xxKbdDriver::keys() const -{ - return (QStringList() << QLatin1String("VR41xx")); -} - -QWSKeyboardHandler* QVr41xxKbdDriver::create(const QString &driver, - const QString &device) -{ - if (driver.compare(QLatin1String("VR41xx"), Qt::CaseInsensitive)) - return 0; - return new QWSVr41xxKeyboardHandler(device); -} - -Q_EXPORT_PLUGIN2(qwsvr41xxkbddriver, QVr41xxKbdDriver) - -QT_END_NAMESPACE diff --git a/src/plugins/kbddrivers/vr41xx/vr41xx.pro b/src/plugins/kbddrivers/vr41xx/vr41xx.pro deleted file mode 100644 index f9f103f10..000000000 --- a/src/plugins/kbddrivers/vr41xx/vr41xx.pro +++ /dev/null @@ -1,14 +0,0 @@ -TARGET = qvr41xxkbddriver -include(../../qpluginbase.pri) - -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/kbddrivers -target.path = $$[QT_INSTALL_PLUGINS]/kbddrivers -INSTALLS += target - -DEFINES += QT_QWS_KBD_VR41XX - -HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qkbdvr41xx_qws.h - -SOURCES = main.cpp \ - $$QT_SOURCE_TREE/src/gui/embedded/qkbdvr41xx_qws.cpp - diff --git a/src/plugins/kbddrivers/yopy/main.cpp b/src/plugins/kbddrivers/yopy/main.cpp deleted file mode 100644 index 7079d881f..000000000 --- a/src/plugins/kbddrivers/yopy/main.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -QT_BEGIN_NAMESPACE - -class QYopyKbdDriver : public QKbdDriverPlugin -{ -public: - QYopyKbdDriver(); - - QStringList keys() const; - QWSKeyboardHandler* create(const QString &driver, const QString &device); -}; - -QYopyKbdDriver::QYopyKbdDriver() - : QKbdDriverPlugin() -{ -} - -QStringList QYopyKbdDriver::keys() const -{ - return (QStringList() << QLatin1String("Yopy")); -} - -QWSKeyboardHandler* QYopyKbdDriver::create(const QString &driver, - const QString &device) -{ - if (driver.compare(QLatin1String("Yopy"), Qt::CaseInsensitive)) - return 0; - return new QWSYopyKeyboardHandler(device); -} - -Q_EXPORT_PLUGIN2(qwsyopykbddriver, QYopyKbdDriver) - -QT_END_NAMESPACE diff --git a/src/plugins/kbddrivers/yopy/yopy.pro b/src/plugins/kbddrivers/yopy/yopy.pro deleted file mode 100644 index 66a663c1d..000000000 --- a/src/plugins/kbddrivers/yopy/yopy.pro +++ /dev/null @@ -1,14 +0,0 @@ -TARGET = qyopykbddriver -include(../../qpluginbase.pri) - -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/kbddrivers -target.path = $$[QT_INSTALL_PLUGINS]/kbddrivers -INSTALLS += target - -DEFINES += QT_QWS_KBD_YOPY - -HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qkbdyopy_qws.h - -SOURCES = main.cpp \ - $$QT_SOURCE_TREE/src/gui/embedded/qkbdyopy_qws.cpp - diff --git a/src/plugins/mousedrivers/bus/bus.pro b/src/plugins/mousedrivers/bus/bus.pro deleted file mode 100644 index cdb033272..000000000 --- a/src/plugins/mousedrivers/bus/bus.pro +++ /dev/null @@ -1,14 +0,0 @@ -TARGET = qbusmousedriver -include(../../qpluginbase.pri) - -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers -target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers -INSTALLS += target - -DEFINES += QT_QWS_MOUSE_BUS - -HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qmousebus_qws.h - -SOURCES = main.cpp \ - $$QT_SOURCE_TREE/src/gui/embedded/qmousebus_qws.cpp - diff --git a/src/plugins/mousedrivers/bus/main.cpp b/src/plugins/mousedrivers/bus/main.cpp deleted file mode 100644 index f56c89059..000000000 --- a/src/plugins/mousedrivers/bus/main.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -QT_BEGIN_NAMESPACE - -class QBusMouseDriver : public QMouseDriverPlugin -{ -public: - QBusMouseDriver(); - - QStringList keys() const; - QWSMouseHandler* create(const QString &driver, const QString &device); -}; - -QBusMouseDriver::QBusMouseDriver() - : QMouseDriverPlugin() -{ -} - -QStringList QBusMouseDriver::keys() const -{ - return (QStringList() << "Bus"); -} - -QWSMouseHandler* QBusMouseDriver::create(const QString &driver, - const QString &device) -{ - if (driver.compare(QLatin1String("Bus"), Qt::CaseInsensitive)) - return 0; - return new QWSBusMouseHandler(driver, device); -} - -Q_EXPORT_PLUGIN2(qwsbusmousehandler, QBusMouseDriver) - -QT_END_NAMESPACE diff --git a/src/plugins/mousedrivers/linuxis/linuxis.pro b/src/plugins/mousedrivers/linuxis/linuxis.pro deleted file mode 100644 index bcc209bf3..000000000 --- a/src/plugins/mousedrivers/linuxis/linuxis.pro +++ /dev/null @@ -1,10 +0,0 @@ -TARGET = linuxismousehandler -include(../../qpluginbase.pri) - -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers -target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers -INSTALLS += target - -HEADERS = linuxismousedriverplugin.h linuxismousehandler.h -SOURCES = linuxismousedriverplugin.cpp linuxismousehandler.cpp - diff --git a/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.cpp b/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.cpp deleted file mode 100644 index 4d530d92d..000000000 --- a/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "linuxismousedriverplugin.h" -#include "linuxismousehandler.h" - -#include -#if 1 -#define qLog(x) qDebug() -#else -#define qLog(x) while (0) qDebug() -#endif -LinuxInputSubsystemMouseDriverPlugin::LinuxInputSubsystemMouseDriverPlugin( QObject *parent ) - : QMouseDriverPlugin( parent ) -{ -} - -LinuxInputSubsystemMouseDriverPlugin::~LinuxInputSubsystemMouseDriverPlugin() -{ -} - -QWSMouseHandler* LinuxInputSubsystemMouseDriverPlugin::create(const QString& driver, const QString& device) -{ - if ( driver.toLower() == "linuxis" ) { - qLog(Input) << "Before call LinuxInputSubsystemMouseHandler()"; - return new LinuxInputSubsystemMouseHandler(device); - } - return 0; -} - -QWSMouseHandler* LinuxInputSubsystemMouseDriverPlugin::create(const QString& driver) -{ - if( driver.toLower() == "linuxis" ) { - qLog(Input) << "Before call LinuxInputSubsystemMouseHandler()"; - return new LinuxInputSubsystemMouseHandler(); - } - return 0; -} - -QStringList LinuxInputSubsystemMouseDriverPlugin::keys() const -{ - return QStringList() << "linuxis"; -} - -Q_EXPORT_PLUGIN2(qwslinuxismousehandler, LinuxInputSubsystemMouseDriverPlugin) diff --git a/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.h b/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.h deleted file mode 100644 index 57759c512..000000000 --- a/src/plugins/mousedrivers/linuxis/linuxismousedriverplugin.h +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef LINUXISMOUSEDRIVERPLUGIN_H -#define LINUXISMOUSEDRIVERPLUGIN_H - -#include - -class LinuxInputSubsystemMouseDriverPlugin : public QMouseDriverPlugin { - Q_OBJECT -public: - LinuxInputSubsystemMouseDriverPlugin( QObject *parent = 0 ); - ~LinuxInputSubsystemMouseDriverPlugin(); - - QWSMouseHandler* create(const QString& driver); - QWSMouseHandler* create(const QString& driver, const QString& device); - QStringList keys()const; -}; - -#endif // LINUXISMOUSEDRIVERPLUGIN_H diff --git a/src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp b/src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp deleted file mode 100644 index aaa6eae7c..000000000 --- a/src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp +++ /dev/null @@ -1,180 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "linuxismousehandler.h" - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include - -#include - - -#if 1 -#define qLog(x) qDebug() -#else -#define qLog(x) while (0) qDebug() -#endif - - -// sanity check values of the range of possible mouse positions -#define MOUSE_SAMPLE_MIN 0 -#define MOUSE_SAMPLE_MAX 2000 - -LinuxInputSubsystemMouseHandler::LinuxInputSubsystemMouseHandler(const QString &device) - : mouseX(0), mouseY(0), mouseBtn(0), mouseIdx(0) -{ - qLog(Input) << "Loaded LinuxInputSubsystem touchscreen plugin!"; - setObjectName("LinuxInputSubsystem Mouse Handler"); - mouseFd = ::open(device.toLocal8Bit().constData(), O_RDONLY | O_NDELAY); - // mouseFd = ::open(device.toLocal8Bit().constData(), O_RDONLY); - if (mouseFd >= 0) { - qLog(Input) << "Opened" << device << "as touchscreen input"; - m_notify = new QSocketNotifier(mouseFd, QSocketNotifier::Read, this); - connect(m_notify, SIGNAL(activated(int)), this, SLOT(readMouseData())); - } else { - qWarning("Cannot open %s for touchscreen input (%s)", - device.toLocal8Bit().constData(), strerror(errno)); - return; - } -} - -LinuxInputSubsystemMouseHandler::~LinuxInputSubsystemMouseHandler() -{ - if (mouseFd >= 0) - ::close(mouseFd); -} - -void LinuxInputSubsystemMouseHandler::suspend() -{ - m_notify->setEnabled( false ); -} - -void LinuxInputSubsystemMouseHandler::resume() -{ - m_notify->setEnabled( true ); -} - -void LinuxInputSubsystemMouseHandler::readMouseData() -{ - if (!qt_screen) - return; - - int n; - - do { - n = read(mouseFd, mouseBuf + mouseIdx, mouseBufSize - mouseIdx); - if (n > 0) - mouseIdx += n; - - struct input_event *data; - int idx = 0; - - while (mouseIdx-idx >= (int)sizeof(struct input_event)) { - uchar *mb = mouseBuf + idx; - data = (struct input_event *) mb; - // qLog(Input) << "mouse event type =" << data->type << "code =" << data->code << "value =" << data->value; - bool unknown = false; - if (data->type == EV_ABS) { - if (data->code == ABS_X) { - //qLog(Input) << "\tABS_X" << data->value; - mouseX = data->value; - } else if (data->code == ABS_Y) { - //qLog(Input) << "\tABS_Y" << data->value; - mouseY = data->value; - } else { - unknown = true; - } - } else if (data->type == EV_REL) { - //qLog(Input) << "\tEV_REL" << hex << data->code << dec << data->value; - if (data->code == REL_X) { - mouseX += data->value; - } else if (data->code == REL_Y) { - mouseY += data->value; - } else { - unknown = true; - } - } else if (data->type == EV_KEY && data->code == BTN_TOUCH) { - qLog(Input) << "\tBTN_TOUCH" << data->value; - mouseBtn = data->value ? Qt::LeftButton : 0; - } else if (data->type == EV_KEY) { - int button = 0; - switch (data->code) { - case BTN_LEFT: button = Qt::LeftButton; break; - case BTN_MIDDLE: button = Qt::MidButton; break; - case BTN_RIGHT: button = Qt::RightButton; break; - } - if (data->value) - mouseBtn |= button; - else - mouseBtn &= ~button; - } else if (data->type == EV_SYN && data->code == SYN_REPORT) { - QPoint pos( mouseX, mouseY ); - oldmouse = transform( pos ); - //qLog(Input) << "\tSYN_REPORT" << mouseBtn << pos << oldmouse; - emit mouseChanged(oldmouse, mouseBtn); - - } else { - unknown = true; - } - if (unknown) { - qWarning("unknown mouse event type=%x, code=%x, value=%x", data->type, data->code, data->value); - } - idx += sizeof(struct input_event); - } - int surplus = mouseIdx - idx; - for (int i = 0; i < surplus; i++) - mouseBuf[i] = mouseBuf[idx+i]; - mouseIdx = surplus; - } while (n > 0); -} - diff --git a/src/plugins/mousedrivers/linuxis/linuxismousehandler.h b/src/plugins/mousedrivers/linuxis/linuxismousehandler.h deleted file mode 100644 index c898ddb04..000000000 --- a/src/plugins/mousedrivers/linuxis/linuxismousehandler.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef LINUXISMOUSEHANDLER_H -#define LINUXISMOUSEHANDLER_H - -#include - -class QSocketNotifier; -class LinuxInputSubsystemMouseHandler : public QObject, public QWSCalibratedMouseHandler { - Q_OBJECT -public: - LinuxInputSubsystemMouseHandler(const QString &device = QString("/dev/input/event0")); - ~LinuxInputSubsystemMouseHandler(); - - void suspend(); - void resume(); - -private: - int mouseX, mouseY; - int mouseBtn; - static const int mouseBufSize = 2048; - uchar mouseBuf[mouseBufSize]; - int mouseIdx; - QPoint oldmouse; - - QSocketNotifier *m_notify; - int mouseFd; - -private Q_SLOTS: - void readMouseData(); -}; - -#endif // LINUXISMOUSEHANDLER_H diff --git a/src/plugins/mousedrivers/mousedrivers.pro b/src/plugins/mousedrivers/mousedrivers.pro index e644361dd..f89682b88 100644 --- a/src/plugins/mousedrivers/mousedrivers.pro +++ b/src/plugins/mousedrivers/mousedrivers.pro @@ -1,8 +1,5 @@ TEMPLATE = subdirs -contains(mouse-plugins, bus): SUBDIRS += bus contains(mouse-plugins, linuxtp): SUBDIRS += linuxtp contains(mouse-plugins, pc): SUBDIRS += pc contains(mouse-plugins, tslib): SUBDIRS += tslib -contains(mouse-plugins, vr41xx): SUBDIRS += vr41xx -contains(mouse-plugins, yopy): SUBDIRS += yopy -contains(mouse-plugins, linuxis): SUBDIRS += linuxis +contains(mouse-plugins, linuxinput): SUBDIRS += linuxinput diff --git a/src/plugins/mousedrivers/vr41xx/main.cpp b/src/plugins/mousedrivers/vr41xx/main.cpp deleted file mode 100644 index 8802a0252..000000000 --- a/src/plugins/mousedrivers/vr41xx/main.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -QT_BEGIN_NAMESPACE - -class QVr41xxMouseDriver : public QMouseDriverPlugin -{ -public: - QVr41xxMouseDriver(); - - QStringList keys() const; - QWSMouseHandler* create(const QString &driver, const QString &device); -}; - -QVr41xxMouseDriver::QVr41xxMouseDriver() - : QMouseDriverPlugin() -{ -} - -QStringList QVr41xxMouseDriver::keys() const -{ - return (QStringList() << QLatin1String("VR41xx")); -} - -QWSMouseHandler* QVr41xxMouseDriver::create(const QString &driver, - const QString &device) -{ - if (driver.compare(QLatin1String("VR41xx"), Qt::CaseInsensitive)) - return 0; - return new QWSVr41xxMouseHandler(driver, device); -} - -Q_EXPORT_PLUGIN2(qwsvr41xxmousehandler, QVr41xxMouseDriver) - -QT_END_NAMESPACE diff --git a/src/plugins/mousedrivers/vr41xx/vr41xx.pro b/src/plugins/mousedrivers/vr41xx/vr41xx.pro deleted file mode 100644 index 1c22d0468..000000000 --- a/src/plugins/mousedrivers/vr41xx/vr41xx.pro +++ /dev/null @@ -1,14 +0,0 @@ -TARGET = qvr41xxmousedriver -include(../../qpluginbase.pri) - -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers -target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers -INSTALLS += target - -DEFINES += QT_QWS_MOUSE_VR41XX - -HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qmousevr41xx_qws.h - -SOURCES = main.cpp \ - $$QT_SOURCE_TREE/src/gui/embedded/qmousevr41xx_qws.cpp - diff --git a/src/plugins/mousedrivers/yopy/main.cpp b/src/plugins/mousedrivers/yopy/main.cpp deleted file mode 100644 index 9db9c4fb1..000000000 --- a/src/plugins/mousedrivers/yopy/main.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -QT_BEGIN_NAMESPACE - -class QYopyMouseDriver : public QMouseDriverPlugin -{ -public: - QYopyMouseDriver(); - - QStringList keys() const; - QWSMouseHandler* create(const QString &driver, const QString &device); -}; - -QYopyMouseDriver::QYopyMouseDriver() - : QMouseDriverPlugin() -{ -} - -QStringList QYopyMouseDriver::keys() const -{ - return (QStringList() << QLatin1String("Yopy")); -} - -QWSMouseHandler* QYopyMouseDriver::create(const QString &driver, - const QString &device) -{ - if (driver.compare(QLatin1String("yopy"), Qt::CaseInsensitive)) - return 0; - return new QWSYopyMouseHandler(driver, device); -} - -Q_EXPORT_PLUGIN2(qwsyopymousehandler, QYopyMouseDriver) - -QT_END_NAMESPACE diff --git a/src/plugins/mousedrivers/yopy/yopy.pro b/src/plugins/mousedrivers/yopy/yopy.pro deleted file mode 100644 index 30454303f..000000000 --- a/src/plugins/mousedrivers/yopy/yopy.pro +++ /dev/null @@ -1,14 +0,0 @@ -TARGET = qyopymousedriver -include(../../qpluginbase.pri) - -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers -target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers -INSTALLS += target - -DEFINES += QT_QWS_MOUSE_YOPY - -HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qmouseyopy_qws.h - -SOURCES = main.cpp \ - $$QT_SOURCE_TREE/src/gui/embedded/qmouseyopy_qws.cpp - -- cgit v1.2.3 From c36139c665e61866aff4bf8572890a735167a7d0 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 23 Jul 2009 16:49:55 +0200 Subject: repair showSummary after commit 08b3511a0c Reviewed-by: thartman --- tools/configure/configureapp.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 61daca8b4..ae6ebab75 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3109,7 +3109,9 @@ void Configure::buildQmake() void Configure::buildHostTools() { - dictionary[ "DONE" ] = "yes"; + if (dictionary[ "NOPROCESS" ] == "yes") + dictionary[ "DONE" ] = "yes"; + if (!dictionary.contains("XQMAKESPEC")) return; -- cgit v1.2.3 From 6ac3cbc61a1fc80df0bac755028037586f1fdc3d Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Thu, 23 Jul 2009 16:56:05 +0200 Subject: Some minor doc fixes. Reviewed-by: Kavindra --- doc/src/emb-charinput.qdoc | 14 +++++++------- doc/src/emb-kmap2qmap.qdoc | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/src/emb-charinput.qdoc b/doc/src/emb-charinput.qdoc index 565d9539e..dc4eed5db 100644 --- a/doc/src/emb-charinput.qdoc +++ b/doc/src/emb-charinput.qdoc @@ -108,7 +108,7 @@ \section1 Keymaps Starting with 4.6, \l {Qt for Embedded Linux} has gained support for - user defined keymaps. Keymap handling is supported by the builtin + user defined keymaps. Keymap handling is supported by the built-in keyboard drivers \c TTY and \c LinuxInput. Custom keyboard drivers can use the existing keymap handling code via QWSKeyboardHandler::processKeycode(). @@ -124,7 +124,7 @@ \snippet doc/src/snippets/code/doc_src_emb-charinput.qdoc 2 - The \c argument are \c TTY, \c LinuxInput and \l + The \c arguments are \c TTY, \c LinuxInput and \l {QKbdDriverPlugin::keys()}{keys} identifying custom drivers, and the driver specific options are typically a device, e.g., \c /dev/tty0. @@ -142,17 +142,17 @@ \row \o \c /dev/xxx \o Open the specified device, instead of the driver's default device. \row \o \c repeat-delay= \o - Time in milliseconds until auto-repeat kicks in. + Time (in milliseconds) until auto-repeat kicks in. \row \o \c repeat-rate= \o - Time in milliseconds specifying interval between auto-repeats. + Time (in milliseconds) specifying the interval between auto-repeats. \row \o \c keymap=xx.qmap \o File name of a keymap file in Qt's \c qmap format. See \l {kmap2qmap} - for instructions on how to create thoes files.\br Please note that the - file name can of course also be the name of a QResource. + for instructions on how to create thoes files.\br Note that the file + name can of course also be the name of a QResource. \row \o \c disable-zap \o Disable the QWS server "Zap" shortcut \bold{Ctrl+Alt+Backspace} \row \o \c enable-compose \o - Activate Latin-1 composing features in the builtin US keymap. You can + Activate Latin-1 composing features in the built-in US keymap. You can use the right \c AltGr or right \c Alt is used as a dead key modifier, while \c AltGr+. is the compose key. For example: \list diff --git a/doc/src/emb-kmap2qmap.qdoc b/doc/src/emb-kmap2qmap.qdoc index 2b3f6876c..19d33c137 100644 --- a/doc/src/emb-kmap2qmap.qdoc +++ b/doc/src/emb-kmap2qmap.qdoc @@ -66,7 +66,7 @@ kmap2qmap i386/qwertz/de-latin1-nodeadkeys.kmap include/compose.latin1.inc de-latin1-nodeadkeys.qmap \endcode - \c kmap2qmap doesn't support all the (pseudo) symbols that the Linux + \c kmap2qmap does not support all the (pseudo) symbols that the Linux kernel supports. If you are converting a standard keymap you will get a lot of warnings for things like \c Show_Registers, \c Hex_A, etc.: you can safely ignore those. -- cgit v1.2.3 From 3ce677f1375bc723b5fd5a11ccc21f2af0c45ca1 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 23 Jul 2009 16:55:29 +0200 Subject: configure shows Windows CE specific build steps when its done For cross compilation of Qt for Windows CE the user must call setcepaths before nmake. Now configure shows a helpful message if the xplatform configure switch was used. Task-number: 257352 Reviewed-by: thartman --- tools/configure/configureapp.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index ae6ebab75..39588e657 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3342,8 +3342,16 @@ void Configure::generateMakefiles() void Configure::showSummary() { QString make = dictionary[ "MAKE" ]; - cout << endl << endl << "Qt is now configured for building. Just run " << qPrintable(make) << "." << endl; - cout << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl; + if (!dictionary.contains("XQMAKESPEC")) { + cout << endl << endl << "Qt is now configured for building. Just run " << qPrintable(make) << "." << endl; + cout << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl; + } else { + // we are cross compiling for Windows CE + cout << endl << endl << "Qt is now configured for building. To start the build run:" << endl + << "\tsetcepaths " << dictionary.value("XQMAKESPEC") << endl + << "\t" << qPrintable(make) << endl + << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl; + } } Configure::ProjectType Configure::projectType( const QString& proFileName ) -- cgit v1.2.3 From f439550632c0552514f73d2778c7920811e225f7 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Thu, 23 Jul 2009 17:04:18 +0200 Subject: Fix incorrect button positioning on tabs For tabs with RoundedWest or TriangularWest the button offset was reversed on tab selection. This was very visible on windows where they could actually move outside the tab border. Task-number: 255139 Reviewed-by: paul --- src/gui/styles/qcommonstyle.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 308a0b8ee..ba28e753d 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -2960,6 +2960,9 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, horizontalShift *= -1; verticalShift *= -1; } + if (tab->shape == QTabBar::RoundedWest || tab->shape == QTabBar::TriangularWest) + horizontalShift = -horizontalShift; + tr.adjust(0, 0, horizontalShift, verticalShift); if (selected) { -- cgit v1.2.3 From 098be4ffcf4c9ba615332f853fd440ea630a4453 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Thu, 9 Jul 2009 11:51:13 +0200 Subject: Implement an FSEvents-based QFileSystemWatcherEngine This has been around for a while and really should have been put in earlier. Mac OS X (client) has a much lower ulimit for open files than what some other Unix-like OS's have (in defense it does save memory). However, if you start watching a lot of files, it will start to fall down. You can adjust the ulimit, but it's a bit inconvenient. FSEvents watches the directory and notifies you of changes that happen in that directory (and below, but we don't really use it). It also can be adjusted for latency so that performance isn't affected by heavy file system use (but Qt doesn't use that either at the moment). The other thing is that it doesn't require any open files, so it's much better for our number of open files. This feature is only on Leopard and up, so people wanting to deploy Tiger will still have the "open files" problem to deal with. There are still some optimizations available in this code. For example, we could coalesce things down to watch only one high-level directory without changing much of the implementation. The current implementation has some very simplistic ways of handling things, but this simplicity works well. I documented it, so you can see that, yes, I really meant to do that. Task-Id: 164068 (and others) Reviewed-by: Denis --- src/corelib/io/io.pri | 5 +- src/corelib/io/qfilesystemwatcher.cpp | 10 +- src/corelib/io/qfilesystemwatcher_fsevents.cpp | 467 +++++++++++++++++++++ src/corelib/io/qfilesystemwatcher_fsevents_p.h | 127 ++++++ .../qfilesystemwatcher/tst_qfilesystemwatcher.cpp | 80 ++++ 5 files changed, 687 insertions(+), 2 deletions(-) create mode 100644 src/corelib/io/qfilesystemwatcher_fsevents.cpp create mode 100644 src/corelib/io/qfilesystemwatcher_fsevents_p.h diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index 5033b21a7..bd41f5e4e 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -65,7 +65,10 @@ win32 { SOURCES += io/qfsfileengine_unix.cpp SOURCES += io/qfsfileengine_iterator_unix.cpp SOURCES += io/qprocess_unix.cpp - mac:SOURCES += io/qsettings_mac.cpp + macx-*: { + HEADERS += io/qfilesystemwatcher_fsevents_p.h + SOURCES += io/qsettings_mac.cpp io/qfilesystemwatcher_fsevents.cpp + } linux-*:{ SOURCES += \ diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp index b321644c9..902e2408a 100644 --- a/src/corelib/io/qfilesystemwatcher.cpp +++ b/src/corelib/io/qfilesystemwatcher.cpp @@ -58,6 +58,9 @@ # include "qfilesystemwatcher_inotify_p.h" # include "qfilesystemwatcher_dnotify_p.h" #elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) +# if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) +# include "qfilesystemwatcher_fsevents_p.h" +# endif //MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) # include "qfilesystemwatcher_kqueue_p.h" #endif @@ -243,7 +246,12 @@ QFileSystemWatcherEngine *QFileSystemWatcherPrivate::createNativeEngine() eng = QDnotifyFileSystemWatcherEngine::create(); return eng; #elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) - return QKqueueFileSystemWatcherEngine::create(); +# if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) + if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5) + return QFSEventsFileSystemWatcherEngine::create(); + else +# endif + return QKqueueFileSystemWatcherEngine::create(); #else return 0; #endif diff --git a/src/corelib/io/qfilesystemwatcher_fsevents.cpp b/src/corelib/io/qfilesystemwatcher_fsevents.cpp new file mode 100644 index 000000000..3e0aee89c --- /dev/null +++ b/src/corelib/io/qfilesystemwatcher_fsevents.cpp @@ -0,0 +1,467 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include + +#include "qfilesystemwatcher.h" +#include "qfilesystemwatcher_fsevents_p.h" + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +// Static operator overloading so for the sake of some convieniece. +// They only live in this compilation unit to avoid polluting Qt in general. +static bool operator==(const struct ::timespec &left, const struct ::timespec &right) +{ + return left.tv_sec == right.tv_sec + && left.tv_nsec == right.tv_nsec; +} + +static bool operator==(const struct ::stat64 &left, const struct ::stat64 &right) +{ + return left.st_dev == right.st_dev + && left.st_mode == right.st_mode + && left.st_size == right.st_size + && left.st_ino == right.st_ino + && left.st_uid == right.st_uid + && left.st_gid == right.st_gid + && left.st_mtimespec == right.st_mtimespec + && left.st_ctimespec == right.st_ctimespec + && left.st_flags == right.st_flags; +} + +static bool operator!=(const struct ::stat64 &left, const struct ::stat64 &right) +{ + return !(operator==(left, right)); +} + + +static void addPathToHash(PathHash &pathHash, const QString &key, const QFileInfo &fileInfo, + const QString &path) +{ + PathInfoList &list = pathHash[key]; + list.push_back(PathInfo(path, + fileInfo.absoluteFilePath().normalized(QString::NormalizationForm_D).toUtf8())); + pathHash.insert(key, list); +} + +static void removePathFromHash(PathHash &pathHash, const QString &key, const QString &path) +{ + PathInfoList &list = pathHash[key]; + // We make the assumption that the list contains unique paths + PathInfoList::iterator End = list.end(); + PathInfoList::iterator it = list.begin(); + while (it != End) { + if (it->originalPath == path) { + list.erase(it); + break; + } + ++it; + } + if (list.isEmpty()) + pathHash.remove(key); +} + +static void stopFSStream(FSEventStreamRef stream) +{ + if (stream) { + FSEventStreamStop(stream); + FSEventStreamInvalidate(stream); + } +} + +static QString createFSStreamPath(const QString &absolutePath) +{ + // The path returned has a trailing slash, so ensure that here. + QString string = absolutePath; + string.reserve(string.size() + 1); + string.append(QLatin1Char('/')); + return string; +} + +static void cleanupFSStream(FSEventStreamRef stream) +{ + if (stream) + FSEventStreamRelease(stream); +} + +const FSEventStreamCreateFlags QtFSEventFlags = (kFSEventStreamCreateFlagUseCFTypes | kFSEventStreamCreateFlagNoDefer /* | kFSEventStreamCreateFlagWatchRoot*/); + +const CFTimeInterval Latency = 0.033; // This will do updates 30 times a second which is probably more than you need. +#endif + +QFSEventsFileSystemWatcherEngine::QFSEventsFileSystemWatcherEngine() + : fsStream(0), pathsToWatch(0), threadsRunLoop(0) +{ +} + +QFSEventsFileSystemWatcherEngine::~QFSEventsFileSystemWatcherEngine() +{ +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + // I assume that at this point, QFileSystemWatcher has already called stop + // on me, so I don't need to invalidate or stop my stream, simply + // release it. + cleanupFSStream(fsStream); + if (pathsToWatch) + CFRelease(pathsToWatch); +#endif +} + +QFSEventsFileSystemWatcherEngine *QFSEventsFileSystemWatcherEngine::create() +{ + return new QFSEventsFileSystemWatcherEngine(); +} + +QStringList QFSEventsFileSystemWatcherEngine::addPaths(const QStringList &paths, + QStringList *files, + QStringList *directories) +{ +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + stop(); + QMutexLocker locker(&mutex); + QStringList failedToAdd; + // if we have a running FSStreamEvent, we have to kill it, we'll re-add the stream soon. + FSEventStreamEventId idToCheck; + if (fsStream) { + idToCheck = FSEventStreamGetLatestEventId(fsStream); + cleanupFSStream(fsStream); + } else { + idToCheck = kFSEventStreamEventIdSinceNow; + } + + // Brain-dead approach, but works. FSEvents actually can already read sub-trees, but since it's + // work to figure out if we are doing a double register, we just register it twice as FSEvents + // seems smart enough to only deliver one event. We also duplicate directory entries in here + // (e.g., if you watch five files in the same directory, you get that directory included in the + // array 5 times). This stupidity also makes remove work correctly though. I'll freely admit + // that we could make this a bit smarter. If you do, check the auto-tests, they should catch at + // least a couple of the issues. + QCFType tmpArray = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); + for (int i = 0; i < paths.size(); ++i) { + const QString &path = paths.at(i); + + QFileInfo fileInfo(path); + if (!fileInfo.exists()) { + failedToAdd.append(path); + continue; + } + + if (fileInfo.isDir()) { + if (directories->contains(path)) { + failedToAdd.append(path); + continue; + } else { + directories->append(path); + // Full file path for dirs. + QCFString cfpath(createFSStreamPath(fileInfo.absoluteFilePath())); + addPathToHash(dirPathInfoHash, cfpath, fileInfo, path); + CFArrayAppendValue(tmpArray, cfpath); + } + } else { + if (files->contains(path)) { + failedToAdd.append(path); + continue; + } else { + // Just the absolute path (minus it's filename) for files. + QCFString cfpath(createFSStreamPath(fileInfo.absolutePath())); + files->append(path); + addPathToHash(filePathInfoHash, cfpath, fileInfo, path); + CFArrayAppendValue(tmpArray, cfpath); + } + } + } + if (CFArrayGetCount(tmpArray) > 0) { + if (pathsToWatch) { + CFArrayAppendArray(tmpArray, pathsToWatch, CFRangeMake(0, CFArrayGetCount(pathsToWatch))); + CFRelease(pathsToWatch); + } + pathsToWatch = CFArrayCreateCopy(kCFAllocatorDefault, tmpArray); + } + FSEventStreamContext context = { 0, this, 0, 0, 0 }; + fsStream = FSEventStreamCreate(kCFAllocatorDefault, + QFSEventsFileSystemWatcherEngine::fseventsCallback, + &context, pathsToWatch, + idToCheck, Latency, QtFSEventFlags); + warmUpFSEvents(); + + return failedToAdd; +#else + Q_UNUSED(paths); + Q_UNUSED(files); + Q_UNUSED(directories); + return QStringList(); +#endif +} + +void QFSEventsFileSystemWatcherEngine::warmUpFSEvents() +{ +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + // This function assumes that the mutex has already been grabbed before calling it. + // It exits with the mutex still locked (Q_ASSERT(mutex.isLocked()) ;-). + start(); + waitCondition.wait(&mutex); +#endif +} + +QStringList QFSEventsFileSystemWatcherEngine::removePaths(const QStringList &paths, + QStringList *files, + QStringList *directories) +{ +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + stop(); + QMutexLocker locker(&mutex); + // short circuit for smarties that call remove before add and we have nothing. + if (pathsToWatch == 0) + return paths; + QStringList failedToRemove; + // if we have a running FSStreamEvent, we have to stop it, we'll re-add the stream soon. + FSEventStreamEventId idToCheck; + if (fsStream) { + idToCheck = FSEventStreamGetLatestEventId(fsStream); + cleanupFSStream(fsStream); + fsStream = 0; + } else { + idToCheck = kFSEventStreamEventIdSinceNow; + } + + CFIndex itemCount = CFArrayGetCount(pathsToWatch); + QCFType tmpArray = CFArrayCreateMutableCopy(kCFAllocatorDefault, itemCount, + pathsToWatch); + CFRelease(pathsToWatch); + pathsToWatch = 0; + for (int i = 0; i < paths.size(); ++i) { + // Get the itemCount at the beginning to avoid any overruns during the iteration. + itemCount = CFArrayGetCount(tmpArray); + const QString &path = paths.at(i); + QFileInfo fi(path); + QCFString cfpath(createFSStreamPath(fi.absolutePath())); + + CFIndex index = CFArrayGetFirstIndexOfValue(tmpArray, CFRangeMake(0, itemCount), cfpath); + if (index != -1) { + CFArrayRemoveValueAtIndex(tmpArray, index); + files->removeAll(path); + removePathFromHash(filePathInfoHash, cfpath, path); + } else { + // Could be a directory we are watching instead. + QCFString cfdirpath(createFSStreamPath(fi.absoluteFilePath())); + index = CFArrayGetFirstIndexOfValue(tmpArray, CFRangeMake(0, itemCount), cfdirpath); + if (index != -1) { + CFArrayRemoveValueAtIndex(tmpArray, index); + directories->removeAll(path); + removePathFromHash(dirPathInfoHash, cfpath, path); + } else { + failedToRemove.append(path); + } + } + } + itemCount = CFArrayGetCount(tmpArray); + if (itemCount != 0) { + pathsToWatch = CFArrayCreateCopy(kCFAllocatorDefault, tmpArray); + + FSEventStreamContext context = { 0, this, 0, 0, 0 }; + fsStream = FSEventStreamCreate(kCFAllocatorDefault, + QFSEventsFileSystemWatcherEngine::fseventsCallback, + &context, pathsToWatch, idToCheck, Latency, QtFSEventFlags); + warmUpFSEvents(); + } + return failedToRemove; +#else + Q_UNUSED(paths); + Q_UNUSED(files); + Q_UNUSED(directories); + return QStringList(); +#endif +} + +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +void QFSEventsFileSystemWatcherEngine::updateList(PathInfoList &list, bool directory, bool emitSignals) +{ + PathInfoList::iterator End = list.end(); + PathInfoList::iterator it = list.begin(); + while (it != End) { + struct ::stat64 newInfo; + if (::stat64(it->absolutePath, &newInfo) == 0) { + if (emitSignals) { + if (newInfo != it->savedInfo) { + it->savedInfo = newInfo; + if (directory) + emit directoryChanged(it->originalPath, false); + else + emit fileChanged(it->originalPath, false); + } + } else { + it->savedInfo = newInfo; + } + } else { + if (errno == ENOENT) { + if (emitSignals) { + if (directory) + emit directoryChanged(it->originalPath, true); + else + emit fileChanged(it->originalPath, true); + } + it = list.erase(it); + continue; + } else { + qWarning("%s:%d:QFSEventsFileSystemWatcherEngine: stat error on %s:%s", + __FILE__, __LINE__, qPrintable(it->originalPath), strerror(errno)); + + } + } + ++it; + } +} + +void QFSEventsFileSystemWatcherEngine::updateHash(PathHash &pathHash) +{ + PathHash::iterator HashEnd = pathHash.end(); + PathHash::iterator it = pathHash.begin(); + const bool IsDirectory = (&pathHash == &dirPathInfoHash); + while (it != HashEnd) { + updateList(it.value(), IsDirectory, false); + if (it.value().isEmpty()) + it = pathHash.erase(it); + else + ++it; + } +} +#endif + +void QFSEventsFileSystemWatcherEngine::fseventsCallback(ConstFSEventStreamRef , + void *clientCallBackInfo, size_t numEvents, + void *eventPaths, + const FSEventStreamEventFlags eventFlags[], + const FSEventStreamEventId []) +{ +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + QFSEventsFileSystemWatcherEngine *watcher = static_cast(clientCallBackInfo); + QMutexLocker locker(&watcher->mutex); + CFArrayRef paths = static_cast(eventPaths); + for (size_t i = 0; i < numEvents; ++i) { + const QString path = QCFString::toQString( + static_cast(CFArrayGetValueAtIndex(paths, i))); + const FSEventStreamEventFlags pathFlags = eventFlags[i]; + // There are several flags that may be passed, but we really don't care about them ATM. + // Here they are and why we don't care. + // kFSEventStreamEventFlagHistoryDone--(very unlikely to be gotten, but even then, not much changes). + // kFSEventStreamEventFlagMustScanSubDirs--Likely means the data is very much out of date, we + // aren't coalescing our directories, so again not so much of an issue + // kFSEventStreamEventFlagRootChanged | kFSEventStreamEventFlagMount | kFSEventStreamEventFlagUnmount-- + // These three flags indicate something has changed, but the stat will likely show this, so + // there's not really much to worry about. + // (btw, FSEvents is not the correct way of checking for mounts/unmounts, + // there are real CarbonCore events for that.) + Q_UNUSED(pathFlags); + if (watcher->filePathInfoHash.contains(path)) + watcher->updateList(watcher->filePathInfoHash[path], false, true); + + if (watcher->dirPathInfoHash.contains(path)) + watcher->updateList(watcher->dirPathInfoHash[path], true, true); + } +#else + Q_UNUSED(clientCallBackInfo); + Q_UNUSED(numEvents); + Q_UNUSED(eventPaths); + Q_UNUSED(eventFlags); +#endif +} + +void QFSEventsFileSystemWatcherEngine::stop() +{ +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + stopFSStream(fsStream); + if (threadsRunLoop) + CFRunLoopStop(threadsRunLoop); +#endif +} + +void QFSEventsFileSystemWatcherEngine::updateFiles() +{ +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + QMutexLocker locker(&mutex); + updateHash(filePathInfoHash); + updateHash(dirPathInfoHash); + if (filePathInfoHash.isEmpty() && dirPathInfoHash.isEmpty()) { + // Everything disappeared before we got to start, don't bother. + stop(); + cleanupFSStream(fsStream); + } + waitCondition.wakeAll(); +#endif +} + +void QFSEventsFileSystemWatcherEngine::run() +{ +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + threadsRunLoop = CFRunLoopGetCurrent(); + FSEventStreamScheduleWithRunLoop(fsStream, threadsRunLoop, kCFRunLoopDefaultMode); + bool startedOK = FSEventStreamStart(fsStream); + // It's recommended by Apple that you only update the files after you've started + // the stream, because otherwise you might miss an update in between starting it. + updateFiles(); +#ifdef QT_NO_DEBUG + Q_UNUSED(startedOK); +#else + Q_ASSERT(startedOK); +#endif + // If for some reason we called stop up above (and invalidated our stream), this call will return + // immediately. + CFRunLoopRun(); + threadsRunLoop = 0; +#endif +} + +QT_END_NAMESPACE diff --git a/src/corelib/io/qfilesystemwatcher_fsevents_p.h b/src/corelib/io/qfilesystemwatcher_fsevents_p.h new file mode 100644 index 000000000..2e8b78889 --- /dev/null +++ b/src/corelib/io/qfilesystemwatcher_fsevents_p.h @@ -0,0 +1,127 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#ifndef FILEWATCHER_FSEVENTS_P_H +#define FILEWATCHER_FSEVENTS_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of the QLibrary class. This header file may change from +// version to version without notice, or even be removed. +// +// We mean it. +// + +#include "qfilesystemwatcher_p.h" + +#include +#include +#include +#include +#include +#include +#include + +typedef struct __FSEventStream *FSEventStreamRef; +typedef const struct __FSEventStream *ConstFSEventStreamRef; +typedef const struct __CFArray *CFArrayRef; +typedef uint FSEventStreamEventFlags; +typedef uint64_t FSEventStreamEventId; + +QT_BEGIN_NAMESPACE + +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +// Yes, I use a stat64 element here. QFileInfo requires too much knowledge about implementation +// details to be used as a long-standing record. Since I'm going to have to store this information, I can +// do the stat myself too. +struct PathInfo { + PathInfo(const QString &path, const QByteArray &absPath) + : originalPath(path), absolutePath(absPath) {} + QString originalPath; // The path we need to emit + QByteArray absolutePath; // The path we need to stat. + struct ::stat64 savedInfo; // All the info for the path so we can compare it. +}; +typedef QLinkedList PathInfoList; +typedef QHash PathHash; +#endif + +class QFSEventsFileSystemWatcherEngine : public QFileSystemWatcherEngine +{ + Q_OBJECT +public: + ~QFSEventsFileSystemWatcherEngine(); + + static QFSEventsFileSystemWatcherEngine *create(); + + QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories); + QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories); + + void stop(); + +private: + QFSEventsFileSystemWatcherEngine(); + void warmUpFSEvents(); + void updateFiles(); + + static void fseventsCallback(ConstFSEventStreamRef streamRef, void *clientCallBackInfo, size_t numEvents, + void *eventPaths, const FSEventStreamEventFlags eventFlags[], + const FSEventStreamEventId eventIds[]); + void run(); + FSEventStreamRef fsStream; + CFArrayRef pathsToWatch; + CFRunLoopRef threadsRunLoop; + QMutex mutex; + QWaitCondition waitCondition; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + PathHash filePathInfoHash; + PathHash dirPathInfoHash; + void updateHash(PathHash &pathHash); + void updateList(PathInfoList &list, bool directory, bool emitSignals); +#endif +}; + +#endif + +QT_END_NAMESPACE diff --git a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp index da067426a..c883c6331 100644 --- a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp +++ b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp @@ -73,6 +73,8 @@ private slots: void removePath(); void addPaths(); void removePaths(); + void watchFileAndItsDirectory(); + void watchFileAndItsDirectory_data() { basicTest_data(); } private: QStringList do_force_engines; @@ -397,5 +399,83 @@ void tst_QFileSystemWatcher::removePaths() watcher.removePaths(paths); } +void tst_QFileSystemWatcher::watchFileAndItsDirectory() +{ + QFETCH(QString, backend); + QDir().mkdir("testDir"); + QDir testDir("testDir"); + + QString testFileName = testDir.filePath("testFile.txt"); + QString secondFileName = testDir.filePath("testFile2.txt"); + QFile::remove(secondFileName); + + QFile testFile(testFileName); + testFile.setPermissions(QFile::ReadOwner | QFile::WriteOwner); + testFile.remove(); + + QVERIFY(testFile.open(QIODevice::WriteOnly | QIODevice::Truncate)); + testFile.write(QByteArray("hello")); + testFile.close(); + + QFileSystemWatcher watcher; + watcher.setObjectName(QLatin1String("_qt_autotest_force_engine_") + backend); + + watcher.addPath(testDir.dirName()); + watcher.addPath(testFileName); + + QSignalSpy fileChangedSpy(&watcher, SIGNAL(fileChanged(const QString &))); + QSignalSpy dirChangedSpy(&watcher, SIGNAL(directoryChanged(const QString &))); + QEventLoop eventLoop; + QTimer timer; + connect(&timer, SIGNAL(timeout()), &eventLoop, SLOT(quit())); + + // resolution of the modification time is system dependent, but it's at most 1 second when using + // the polling engine. From what I know, FAT32 has a 2 second resolution. So we have to + // wait before modifying the directory... + QTest::qWait(2000); + + QVERIFY(testFile.open(QIODevice::WriteOnly | QIODevice::Truncate)); + testFile.write(QByteArray("hello again")); + testFile.close(); + + timer.start(3000); + eventLoop.exec(); + QCOMPARE(fileChangedSpy.count(), 1); + QCOMPARE(dirChangedSpy.count(), 0); + + fileChangedSpy.clear(); + QFile secondFile(secondFileName); + secondFile.open(QIODevice::WriteOnly | QIODevice::Truncate); + secondFile.write("Foo"); + secondFile.close(); + + timer.start(3000); + eventLoop.exec(); + QCOMPARE(fileChangedSpy.count(), 0); + QCOMPARE(dirChangedSpy.count(), 1); + + dirChangedSpy.clear(); + + QFile::remove(testFileName); + + timer.start(3000); + eventLoop.exec(); + QCOMPARE(fileChangedSpy.count(), 1); + QCOMPARE(dirChangedSpy.count(), 1); + + fileChangedSpy.clear(); + dirChangedSpy.clear(); + + watcher.removePath(testFileName); + QFile::remove(secondFileName); + + timer.start(3000); + eventLoop.exec(); + QCOMPARE(fileChangedSpy.count(), 0); + QCOMPARE(dirChangedSpy.count(), 1); + + QVERIFY(QDir().rmdir("testDir")); +} + QTEST_MAIN(tst_QFileSystemWatcher) #include "tst_qfilesystemwatcher.moc" -- cgit v1.2.3 From 2410f261eaa13442baa46537202d31ad26d797e7 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Thu, 23 Jul 2009 15:14:34 +0200 Subject: Reverted commits that changed the behavior of the keypresses with modifiers. Apparently it changes the behavior of Qt too much and also breaks the text input in some keyboard layouts (for example in German layout you need to be able to use Ctrl and Alt or AltGr modifiers to type text). Revert "Don't insert text into a text widget when a modifier is pressed." This reverts commit 099a32d121cbc80a1a234c3146f4be9b5237e7e8. Revert "Fixed the qlineedit autotest." This reverts commit 9210e8cdc83b6812d10f5f5847d05703ef2e5f7c. --- src/gui/text/qtextcontrol.cpp | 3 +-- src/gui/widgets/qlineedit.cpp | 3 +-- tests/auto/qlineedit/tst_qlineedit.cpp | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 2a590fd3c..b2ad6867d 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1245,8 +1245,7 @@ void QTextControlPrivate::keyPressEvent(QKeyEvent *e) process: { QString text = e->text(); - if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t')) && - ((e->modifiers() & (Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier)) == Qt::NoModifier)) { + if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t'))) { if (overwriteMode // no need to call deleteChar() if we have a selection, insertText // does it already diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index d1067a85f..c7f3e979b 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -2169,8 +2169,7 @@ void QLineEdit::keyPressEvent(QKeyEvent *event) if (unknown && !d->readOnly) { QString t = event->text(); - if (!t.isEmpty() && t.at(0).isPrint() && - ((event->modifiers() & (Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier)) == Qt::NoModifier)) { + if (!t.isEmpty() && t.at(0).isPrint()) { insert(t); #ifndef QT_NO_COMPLETER d->complete(event->key()); diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp index 7fc831666..3519afa2b 100644 --- a/tests/auto/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/qlineedit/tst_qlineedit.cpp @@ -3025,11 +3025,11 @@ void tst_QLineEdit::charWithAltOrCtrlModifier() QTest::keyPress(testWidget, Qt::Key_Plus); QCOMPARE(testWidget->text(), QString("+")); QTest::keyPress(testWidget, Qt::Key_Plus, Qt::ControlModifier); - QCOMPARE(testWidget->text(), QString("+")); + QCOMPARE(testWidget->text(), QString("++")); QTest::keyPress(testWidget, Qt::Key_Plus, Qt::AltModifier); - QCOMPARE(testWidget->text(), QString("+")); + QCOMPARE(testWidget->text(), QString("+++")); QTest::keyPress(testWidget, Qt::Key_Plus, Qt::AltModifier | Qt::ControlModifier); - QCOMPARE(testWidget->text(), QString("+")); + QCOMPARE(testWidget->text(), QString("++++")); } void tst_QLineEdit::leftKeyOnSelectedText() -- cgit v1.2.3 From 1368c210ef9976f68eb9fb1c3e4dc14f4fa4edd2 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 23 Jul 2009 19:42:51 +0200 Subject: Doc: Clarified that the format used in QImage::fromData() is the image format, not the pixel format. Reviewed-by: Trust Me --- src/gui/image/qimage.cpp | 58 ++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 7d7dde1b1..ec362242e 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -612,6 +612,9 @@ bool QImageData::checkForAlphaPixels() const \table \header \o Function \o Description \row + \o setAlphaChannel() + \o Sets the alpha channel of the image. + \row \o setDotsPerMeterX() \o Defines the aspect ratio by setting the number of pixels that fit horizontally in a physical meter. @@ -1688,12 +1691,8 @@ void QImage::setColorTable(const QVector colors) d->colortable = colors; d->has_alpha_clut = false; - for (int i = 0; i < d->colortable.size(); ++i) { - if (qAlpha(d->colortable.at(i)) != 255) { - d->has_alpha_clut = true; - break; - } - } + for (int i = 0; i < d->colortable.size(); ++i) + d->has_alpha_clut |= (qAlpha(d->colortable.at(i)) != 255); } /*! @@ -3948,8 +3947,10 @@ QImage QImage::scaled(const QSize& s, Qt::AspectRatioMode aspectMode, Qt::Transf if (newSize == size()) return copy(); - QTransform wm = QTransform::fromScale((qreal)newSize.width() / width(), (qreal)newSize.height() / height()); - QImage img = transformed(wm, mode); + QImage img; + QTransform wm; + wm.scale((qreal)newSize.width() / width(), (qreal)newSize.height() / height()); + img = transformed(wm, mode); return img; } @@ -3976,8 +3977,9 @@ QImage QImage::scaledToWidth(int w, Qt::TransformationMode mode) const if (w <= 0) return QImage(); + QTransform wm; qreal factor = (qreal) w / width(); - QTransform wm = QTransform::fromScale(factor, factor); + wm.scale(factor, factor); return transformed(wm, mode); } @@ -4004,8 +4006,9 @@ QImage QImage::scaledToHeight(int h, Qt::TransformationMode mode) const if (h <= 0) return QImage(); + QTransform wm; qreal factor = (qreal) h / height(); - QTransform wm = QTransform::fromScale(factor, factor); + wm.scale(factor, factor); return transformed(wm, mode); } @@ -4626,14 +4629,17 @@ bool QImage::loadFromData(const uchar *data, int len, const char *format) \fn QImage QImage::fromData(const uchar *data, int size, const char *format) Constructs a QImage from the first \a size bytes of the given - binary \a data. The loader attempts to read the image using the - specified \a format. If \a format is not specified (which is the default), - the loader probes the file for a header to guess the file format. + binary \a data. The loader attempts to read the image, either using the + optional image \a format specified or by determining the image format from + the data. - If the loading of the image failed, this object is a null image. + If \a format is not specified (which is the default), the loader probes the + file for a header to determine the file format. If \a format is specified, + it must be one of the values returned by QImageReader::supportedImageFormats(). - \sa load(), save(), {QImage#Reading and Writing Image - Files}{Reading and Writing Image Files} + If the loading of the image fails, the image returned will be a null image. + + \sa load(), save(), {QImage#Reading and Writing Image Files}{Reading and Writing Image Files} */ QImage QImage::fromData(const uchar *data, int size, const char *format) { @@ -4761,7 +4767,7 @@ QDataStream &operator>>(QDataStream &s, QImage &image) image = QImageReader(s.device(), 0).read(); return s; } -#endif // QT_NO_DATASTREAM +#endif #ifdef QT3_SUPPORT @@ -4851,6 +4857,8 @@ bool QImage::operator==(const QImage & i) const return false; if (d->format != Format_RGB32) { + if (d->colortable != i.d->colortable) + return false; if (d->format >= Format_ARGB32) { // all bits defined const int n = d->width * d->depth / 8; if (n == d->bytes_per_line && n == i.d->bytes_per_line) { @@ -4863,13 +4871,11 @@ bool QImage::operator==(const QImage & i) const } } } else { - const int w = width(); - const int h = height(); - const QVector &colortable = d->colortable; - const QVector &icolortable = i.d->colortable; + int w = width(); + int h = height(); for (int y=0; y Date: Fri, 24 Jul 2009 10:46:21 +1000 Subject: #250741 Doc for Making task editable --- doc/src/model-view-programming.qdoc | 9 +++++++-- doc/src/snippets/stringlistmodel/model.cpp | 32 +++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/doc/src/model-view-programming.qdoc b/doc/src/model-view-programming.qdoc index e21659163..7d7db19ed 100644 --- a/doc/src/model-view-programming.qdoc +++ b/doc/src/model-view-programming.qdoc @@ -1352,7 +1352,7 @@ The \l{QAbstractItemModel::data()}{data()} function is responsible for returning the item of data that corresponds to the index argument: - \snippet doc/src/snippets/stringlistmodel/model.cpp 1 + \snippet doc/src/snippets/stringlistmodel/model.cpp 1-data-read-only We only return a valid QVariant if the model index supplied is valid, the row number is within the range of items in the string list, and the @@ -1390,6 +1390,7 @@ The read-only model shows how simple choices could be presented to the user but, for many applications, an editable list model is much more useful. We can modify the read-only model to make the items editable + by changing the data() function we implemented for read-only, and by implementing two extra functions: \l{QAbstractItemModel::flags()}{flags()} and \l{QAbstractItemModel::setData()}{setData()}. @@ -1399,7 +1400,7 @@ \snippet doc/src/snippets/stringlistmodel/model.h 3 \section2 Making the Model Editable - + A delegate checks whether an item is editable before creating an editor. The model must let the delegate know that its items are editable. We do this by returning the correct flags for each item in @@ -1434,6 +1435,10 @@ one item of data has changed, the range of items specified in the signal is limited to just one model index. + Also the data() function needs to be changed to add the Qt::EditRole test: + + \snippet doc/src/snippets/stringlistmodel/model.cpp 1 + \section2 Inserting and Removing Rows It is possible to change the number of rows and columns in a model. In the diff --git a/doc/src/snippets/stringlistmodel/model.cpp b/doc/src/snippets/stringlistmodel/model.cpp index 76329ddcf..49e0fc7dc 100644 --- a/doc/src/snippets/stringlistmodel/model.cpp +++ b/doc/src/snippets/stringlistmodel/model.cpp @@ -59,6 +59,11 @@ int StringListModel::rowCount(const QModelIndex &parent) const } //! [0] + +#ifdef 0 +// This represents a read-only version of data(), an early stage in the +// development of the example leading to an editable StringListModel. + /*! Returns an appropriate value for the requested data. If the view requests an invalid index, an invalid variant is returned. @@ -66,7 +71,7 @@ int StringListModel::rowCount(const QModelIndex &parent) const string to be returned. */ -//! [1] +//! [1-data-read-only] QVariant StringListModel::data(const QModelIndex &index, int role) const { if (!index.isValid()) @@ -80,6 +85,31 @@ QVariant StringListModel::data(const QModelIndex &index, int role) const else return QVariant(); } +//! [1-data-read-only] +#endif + + +/*! + Returns an appropriate value for the requested data. + If the view requests an invalid index, an invalid variant is returned. + Any valid index that corresponds to a string in the list causes that + string to be returned. +*/ + +//! [1] +QVariant StringListModel::data(const QModelIndex &index, int role) const +{ + if (!index.isValid()) + return QVariant(); + + if (index.row() >= stringList.size()) + return QVariant(); + + if (role == Qt::DisplayRole || role == Qt::EditRole) + return stringList.at(index.row()); + else + return QVariant(); +} //! [1] /*! -- cgit v1.2.3 From 851fc0fdb1dcb54cbde82ffad0b54cfe3f896b83 Mon Sep 17 00:00:00 2001 From: Peter Yard Date: Fri, 24 Jul 2009 10:49:35 +1000 Subject: #159306 QAbstractItemModel::reset Doc change --- src/corelib/kernel/qabstractitemmodel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp index 1c3371fa4..3d9263ebc 100644 --- a/src/corelib/kernel/qabstractitemmodel.cpp +++ b/src/corelib/kernel/qabstractitemmodel.cpp @@ -2278,7 +2278,8 @@ void QAbstractItemModel::endRemoveColumns() \note The view to which the model is attached to will be reset as well. When a model is reset it means that any previous data reported from the - model is now invalid and has to be queried for again. + model is now invalid and has to be queried for again. This also means + that the current item and any selected items will become invalid. When a model radically changes its data it can sometimes be easier to just call this function rather than emit dataChanged() to inform other -- cgit v1.2.3 From 3d272951dc9f055e9fc5064098f6a165a8c3e623 Mon Sep 17 00:00:00 2001 From: Peter Yard Date: Fri, 24 Jul 2009 11:22:30 +1000 Subject: #215745 Doc Change, virtual function (operator) called from constructor --- src/gui/itemviews/qlistwidget.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp index 7113217ff..121b1df33 100644 --- a/src/gui/itemviews/qlistwidget.cpp +++ b/src/gui/itemviews/qlistwidget.cpp @@ -561,6 +561,13 @@ Qt::DropActions QListModel::supportedDropActions() const given \a parent. If the parent is not specified, the item will need to be inserted into a list widget with QListWidget::insertItem(). + + \note that this constructor inserts this same object into the model of + the parent that is passed to the constructor. If the model is sorted then + the behavior of the insert is undetermined since the model will call + the '<' operator method on this object which has still not yet been + constructed. In this case it would be better not to specify the parent + and use the QListWidget::insertItem method to insert the item instead. \sa type() */ @@ -582,6 +589,13 @@ QListWidgetItem::QListWidgetItem(QListWidget *view, int type) given \a text and \a parent. If the parent is not specified, the item will need to be inserted into a list widget with QListWidget::insertItem(). + + \note that this constructor inserts this same object into the model of + the parent that is passed to the constructor. If the model is sorted then + the behavior of the insert is undetermined since the model will call + the '<' operator method on this object which has still not yet been + constructed. In this case it would be better not to specify the parent + and use the QListWidget::insertItem method to insert the item instead. \sa type() */ @@ -605,7 +619,14 @@ QListWidgetItem::QListWidgetItem(const QString &text, QListWidget *view, int typ given \a icon, \a text and \a parent. If the parent is not specified, the item will need to be inserted into a list widget with QListWidget::insertItem(). - + + \note that this constructor inserts this same object into the model of + the parent that is passed to the constructor. If the model is sorted then + the behavior of the insert is undetermined since the model will call + the '<' operator method on this object which has still not yet been + constructed. In this case it would be better not to specify the parent + and use the QListWidget::insertItem method to insert the item instead. + \sa type() */ QListWidgetItem::QListWidgetItem(const QIcon &icon,const QString &text, -- cgit v1.2.3 From c3ca46544548a95f99c8b1e320b65ff7ac1c42c2 Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Fri, 24 Jul 2009 09:08:00 +0200 Subject: Fix build on HPUX Reviewed-By: Trustme --- src/opengl/qgl_x11.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 43bdec706..64f5810d2 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1648,11 +1648,13 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qi void QGLTexture::deleteBoundPixmap() { +#if !defined(GLX_VERSION_1_3) || defined(Q_OS_HPUX) if (boundPixmap) { glXReleaseTexImageEXT(QX11Info::display(), boundPixmap, GLX_FRONT_LEFT_EXT); glXDestroyPixmap(QX11Info::display(), boundPixmap); boundPixmap = 0; } +#endif } -- cgit v1.2.3 From b4f2e138422076ed5d615181fc336dbb90279935 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Fri, 24 Jul 2009 09:50:10 +0200 Subject: Compile. It appears that uint != UInt32 in 32-bit world, don't ask why. Correct the typedef. Reviewed-by: Carlos Duclos --- src/corelib/io/qfilesystemwatcher_fsevents_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/io/qfilesystemwatcher_fsevents_p.h b/src/corelib/io/qfilesystemwatcher_fsevents_p.h index 2e8b78889..477086725 100644 --- a/src/corelib/io/qfilesystemwatcher_fsevents_p.h +++ b/src/corelib/io/qfilesystemwatcher_fsevents_p.h @@ -67,7 +67,7 @@ typedef struct __FSEventStream *FSEventStreamRef; typedef const struct __FSEventStream *ConstFSEventStreamRef; typedef const struct __CFArray *CFArrayRef; -typedef uint FSEventStreamEventFlags; +typedef UInt32 FSEventStreamEventFlags; typedef uint64_t FSEventStreamEventId; QT_BEGIN_NAMESPACE -- cgit v1.2.3 From c8dbff8b5ae8e4b5ef8a46a5e3b513a5f6f4a205 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Fri, 24 Jul 2009 09:35:41 +0200 Subject: Fixed crash when vectorpath was polygonal only in raster::stroke() Polygonal vector paths may have types==null, in which case this would have crashed. Reviewed-by: Eskil --- src/gui/painting/qpaintengine_raster.cpp | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 51764441a..069c350cb 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -1687,17 +1687,24 @@ void QRasterPaintEngine::stroke(const QVectorPath &path, const QPen &pen) int count = path.elementCount(); QPointF *points = (QPointF *) path.points(); const QPainterPath::ElementType *types = path.elements(); - int first = 0; - int last; - while (first < count) { - while (first < count && types[first] != QPainterPath::MoveToElement) ++first; - last = first + 1; - while (last < count && types[last] == QPainterPath::LineToElement) ++last; - strokePolygonCosmetic(points + first, last - first, - path.hasImplicitClose() && last == count // only close last one.. + if (types) { + int first = 0; + int last; + while (first < count) { + while (first < count && types[first] != QPainterPath::MoveToElement) ++first; + last = first + 1; + while (last < count && types[last] == QPainterPath::LineToElement) ++last; + strokePolygonCosmetic(points + first, last - first, + path.hasImplicitClose() && last == count // only close last one.. + ? WindingMode + : PolylineMode); + first = last; + } + } else { + strokePolygonCosmetic(points, count, + path.hasImplicitClose() ? WindingMode : PolylineMode); - first = last; } } else if (s->flags.non_complex_pen && path.shape() == QVectorPath::LinesHint) { -- cgit v1.2.3 From 9dadc219814cd9baaa4be4cee6ee2b3cf7df4a19 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 24 Jul 2009 10:22:11 +0200 Subject: Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( eb3afcbfb4006de4015047555cb256fcde93b954 ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-05-27 John Sullivan fixed repro crash in WebCore::DragController::dragExited dropping bookmarks (at least) over Top Sites (at least) Reviewed by Kevin Decker * page/DragController.cpp: (WebCore::DragController::dragExited): nil check m_documentUnderMouse and take the "local file" case if it's nil --- src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebCore/ChangeLog | 11 +++++++++++ src/3rdparty/webkit/WebCore/html/HTMLElement.cpp | 1 + src/3rdparty/webkit/WebCore/page/DragController.cpp | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index eaa0479d0..12018e17b 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - 1535d41a668e5f74f44ff3aa1313a84d5718d2d7 + eb3afcbfb4006de4015047555cb256fcde93b954 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 83f5e6f63..7dc4f7123 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,14 @@ +2009-05-27 John Sullivan + + fixed repro crash in WebCore::DragController::dragExited dropping + bookmarks (at least) over Top Sites (at least) + + Reviewed by Kevin Decker + + * page/DragController.cpp: + (WebCore::DragController::dragExited): + nil check m_documentUnderMouse and take the "local file" case if it's nil + 2009-07-23 Simon Hausmann Reviewed by Holger Freyther. diff --git a/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp index 4caf336f7..b21a3fe07 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp @@ -44,6 +44,7 @@ #include "XMLTokenizer.h" #include "markup.h" #include +#include namespace WebCore { diff --git a/src/3rdparty/webkit/WebCore/page/DragController.cpp b/src/3rdparty/webkit/WebCore/page/DragController.cpp index 10a11f2a6..c756da87e 100644 --- a/src/3rdparty/webkit/WebCore/page/DragController.cpp +++ b/src/3rdparty/webkit/WebCore/page/DragController.cpp @@ -157,7 +157,7 @@ void DragController::dragExited(DragData* dragData) Frame* mainFrame = m_page->mainFrame(); if (RefPtr v = mainFrame->view()) { - ClipboardAccessPolicy policy = m_document->securityOrigin()->isLocal() ? ClipboardReadable : ClipboardTypesReadable; + ClipboardAccessPolicy policy = (!m_document || m_document->securityOrigin()->isLocal()) ? ClipboardReadable : ClipboardTypesReadable; RefPtr clipboard = dragData->createClipboard(policy); clipboard->setSourceOperation(dragData->draggingSourceOperationMask()); mainFrame->eventHandler()->cancelDragAndDrop(createMouseEvent(dragData), clipboard.get()); -- cgit v1.2.3 From 5f9454326cf3768bdc973832de76daa49f5f6830 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Fri, 24 Jul 2009 10:00:21 +0200 Subject: Once enabled, the emulation engine never got switched back off The check in QPainter::checkEmulation was just plain wrong. Reviewed-By: Eskil --- src/gui/painting/qpainter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 34305c24c..04600718c 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -184,7 +184,7 @@ void QPainterPrivate::checkEmulation() extended = emulationEngine; extended->setState(state); } - } else if (emulationEngine && emulationEngine != extended) { + } else if (emulationEngine == extended) { extended = emulationEngine->real_engine; } } -- cgit v1.2.3 From d7a054e9a887c3e73536a0ea1667492dca46adb0 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 24 Jul 2009 10:46:25 +0200 Subject: Built configure.exe. --- configure.exe | Bin 1892397 -> 1896493 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/configure.exe b/configure.exe index 5c5c199d5..322819ef2 100644 Binary files a/configure.exe and b/configure.exe differ -- cgit v1.2.3 From f04b5ea9e0f06904f15d93245ef597483ba9e790 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Thu, 23 Jul 2009 15:44:33 +0200 Subject: Doc: Split qdoc file for various platform and compiler specific pages, and update with information relevant for Qt 4.6 --- doc/src/compiler-notes.qdoc | 278 +++++++++++++++++++++++++++++++ doc/src/platform-notes.qdoc | 344 +-------------------------------------- doc/src/supported-platforms.qdoc | 141 ++++++++++++++++ 3 files changed, 421 insertions(+), 342 deletions(-) create mode 100644 doc/src/compiler-notes.qdoc create mode 100644 doc/src/supported-platforms.qdoc diff --git a/doc/src/compiler-notes.qdoc b/doc/src/compiler-notes.qdoc new file mode 100644 index 000000000..4a7451d08 --- /dev/null +++ b/doc/src/compiler-notes.qdoc @@ -0,0 +1,278 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \page compiler-notes.html + \ingroup platform-notes + \title Compiler Notes + \brief Information about the C++ compilers and tools used to build Qt. + + This page contains information about the C++ compilers and tools used + to build Qt on various platforms. + + \tableofcontents + + Please refer to the \l{Platform Notes} for information on the platforms + Qt is currently known to run on, and see the \l{Supported Platforms} + page for information about the status of each platform. + + If you have anything to add to this list or any of the platform or + compiler-specific pages, please submit it via the \l{Bug Report Form} + or through the \l{Public Qt Repository}. + + \section1 Supported Features + + Not all compilers used to build Qt are able to compile all modules. The following table + shows the compiler support for five modules that are not uniformly available for all + platforms and compilers. + + \table + \header \o Compiler \o{5,1} Features + \header \o \o Concurrent \o XmlPatterns \o WebKit \o CLucene \o Phonon + \row \o g++ 3.3 \o \o \bold{X} \o \o \bold{X} \o \bold{X} + \row \o g++ 3.4 and up \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} + \row + \row \o SunCC 5.5 \o \o \o \o \bold{X} \o \bold{X} + \row + \row \o aCC series 3 \o \o \o \o \bold{X} \o \bold{X} + \row \o aCC series 6 \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} + \row \o xlC 6 \o \o \o \o \bold{X} \o \bold{X} + \row \o Intel CC 10 \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} + \row + \row \o MSVC 2003 \o \bold{X} \o \bold{X} \o \o \bold{X} \o \bold{X} + \row \o MSVC 2005 and up \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} + \endtable + + \target GCC + \section1 GCC + + \section2 GCC on Windows (MinGW) + + We have tested Qt with this compiler on Windows XP. + The minimal version of MinGW supported is: + + \list + \o GCC 3.4.2 + \o MinGW runtime 3.7 + \o win32api 3.2 + \o binutils 2.15.91 + \o mingw32-make 3.80.0-3 + \endlist + + \section2 GCC 4.0.0 + + The released package of the compiler has some bugs that lead to miscompilations. + We recommend using GCC 4.0.1 or later, or to use a recent CVS snapshot of the + GCC 4.0 branch. The version of GCC 4.0.0 that is shipped with Mac OS X 10.4 + "Tiger" is known to work with Qt for Mac OS X. + + \section2 HP-UX + + The hpux-g++ platform is tested with GCC 3.4.4. + + \section2 Solaris + + Please use GCC 3.4.2 or later. + + \section2 Mac OS X + + Please use the latest GCC 3.3 from Apple or a later version of GCC 3. + The gcc 3.3 that is provided with Xcode 1.5 is known to generate bad code. + Use the November 2004 GCC 3.3 updater \l{http://connect.apple.com}{available from Apple}. + + \section2 GCC 3.4.6 (Debian 3.4.6-5) on AMD64 (x86_64) + + This compiler is known to miscompile some parts of Qt when doing a + release build. There are several workarounds: + + \list 1 + \o Use a debug build instead. + \o For each miscompilation encountered, recompile the file, removing the -O2 option. + \o Add -fno-gcse to the QMAKE_CXXFLAGS_RELEASE. + \endlist + + \section1 HP ANSI C++ (aCC) + + The hpux-acc-32 and hpux-acc-64 platforms are tested with aCC A.03.57. The + hpuxi-acc-32 and hpuxi-acc-64 platforms are tested with aCC A.06.10. + + \section1 Intel C++ Compiler + + Qt supports the Intel C++ compiler on both Windows and Linux. + However, there are a few issues on Linux (see the following + section). + + \section2 Intel C++ Compiler for Linux + + Nokia currently tests the following compilers: + + \list + + \o Intel(R) C++ Compiler for applications running on IA-32, + Version 10.1 Build 20080602 Package ID: l_cc_p_10.1.017 + + \o Intel(R) C++ Compiler for applications running on Intel(R) 64, + Version 10.1 Build 20080602 Package ID: l_cc_p_10.1.017 + + \endlist + + We do not currently test the IA-64 (Itanium) compiler. + + \section2 Known Issues with Intel C++ Compiler for Linux + + \list + + \o Precompiled header support does not work in version 10.0.025 + and older. For these compilers, you should configure Qt with + -no-pch. Precompiled header support works properly in version + 10.0.026 and later. + \o Version 10.0.026 for Intel 64 is known to miscompile qmake when + building in release mode. For now, configure Qt with + -debug. Version 10.1.008 and later can compile qmake in release + mode. + \o Versions 10.1.008 to 10.1.015 for both IA-32 and Intel 64 are + known crash with "(0): internal error: 0_47021" when compiling + QtXmlPatterns, QtWebKit, and Designer in release mode. Version + 10.1.017 compiles these modules correctly in release mode. + \endlist + + \section2 Intel C++ Compiler (Windows, Altix) + + Qt 4 has been tested successfully with: + + \list + \o Windows - Intel(R) C++ Compiler for 32-bit applications, + Version 8.1 Build 20050309Z Package ID: W_CC_PC_8.1.026 + \o Altix - Intel(R) C++ Itanium(R) Compiler for Itanium(R)-based + applications Version 8.1 Build 20050406 Package ID: l_cc_pc_8.1.030 + \endlist + + We currently only test the Intel compiler on 32-bit Windows versions. + + \section1 MIPSpro (IRIX) + + \bold{IRIX is an unsupported platform. See the \l{Supported Platforms} page + and Qt's Software's online \l{Platform Support Policy} page for details.} + + Qt 4.4.x requires MIPSpro version 7.4.2m. + + Note that MIPSpro version 7.4.4m is currently not supported, since it has + introduced a number of problems that have not yet been resolved. + We recommend using 7.4.2m for Qt development. However, please note the + unsupported status of this platform. + + \target Sun Studio + \section1 Forte Developer / Sun Studio (Solaris) + + \section2 Sun Studio + + Qt is tested using Sun Studio 8 (Sun CC 5.5). Go to + \l{Sun Studio Patches} page on Sun's Web site to download + the latest patches for your Sun compiler. + + \section2 Sun WorkShop 5.0 + + Sun WorkShop 5.0 is not supported with Qt 4. + + \section1 Visual Studio (Windows) + + We do most of our Windows development on Windows XP, using Microsoft + Visual Studio .NET 2005 and Visual Studio 2008 (both the 32- and 64-bit + versions). + + Qt works with the Standard Edition, the Professional Edition and Team + System Edition of Visual Studio 2005. + + We also test Qt 4 on Windows XP with Visual Studio .NET and Visual Studio 2003. + + In order to use Qt with the Visual Studio 2005/2008 Express Edition you need + to download and install the platform SDK. Due to limitations in the + Express Edition it is not possible for us to install the Qt Visual + Studio Integration. You will need to use our command line tools to + build Qt applications with this edition. + + The Visual C++ Linker doesn't understand filenames with spaces (as in + \c{C:\Program files\Qt\}) so you will have to move it to another place, + or explicitly set the path yourself; for example: + + \snippet doc/src/snippets/code/doc_src_compiler-notes.qdoc 0 + + If you are experiencing strange problems with using special flags that + modify the alignment of structure and union members (such as \c{/Zp2}) + then you will need to recompile Qt with the flags set for the + application as well. + + If you're using Visual Studio .NET (2002) Standard Edition, you should be + using the Qt binary package provided, and not the source package. + As the Standard Edition does not optimize compiled code, your compiled + version of Qt would perform suboptimally with respect to speed. + + With Visual Studio 2005 Service Pack 1 a bug was introduced which + causes Qt not to compile, this has been fixed with a hotfix available + from Microsoft. See this + \l{http://www.qtsoftware.com/developer/faqs/faq.2006-12-18.3281869860}{Knowledge Base entry} + for more information. + + \section1 IBM xlC (AIX) + + The makeC++SharedLib utility must be in your PATH and be up to date to + build shared libraries. From IBM's + \l{http://www.redbooks.ibm.com/abstracts/sg245674.html}{C and C++ Application Development on AIX} + Redbook: + + \list + \o "The second step is to use the makeC++SharedLib command to create the + shared object. The command has many optional arguments, but in its + simplest form, can be used as follows:" + \snippet doc/src/snippets/code/doc_src_compiler-notes.qdoc 1 + \o "The full path name to the command is not required; however, to avoid + this, you will have to add the directory in which it is located to + your PATH environment variable. The command is located in the + /usr/vacpp/bin directory with the VisualAge C++ Professional for AIX, + Version 5 compiler." + \endlist + + \section2 VisualAge C++ for AIX, Version 6.0 + + Make sure you have the + \l{http://www-1.ibm.com/support/search.wss?rs=32&tc=SSEP5D&dc=D400}{latest upgrades} + installed. +*/ diff --git a/doc/src/platform-notes.qdoc b/doc/src/platform-notes.qdoc index 8fe817025..c788024f9 100644 --- a/doc/src/platform-notes.qdoc +++ b/doc/src/platform-notes.qdoc @@ -67,7 +67,8 @@ supported by Qt can be found on the \l{Supported Platforms} page. If you have anything to add to this list or any of the platform or - compiler-specific pages, please submit it via the \l{Bug Report Form}. + compiler-specific pages, please submit it via the \l{Bug Report Form} + or through the \l{Public Qt Repository}. */ /*! @@ -373,132 +374,6 @@ improve support for this feature. */ -/*! - \page supported-platforms.html - \title Supported Platforms - \brief The platforms supported by Nokia for Qt. - \ingroup platform-notes - - Qt is supported on a variety of 32-bit and 64-bit platforms, and can - usually be built on each platform with GCC, a vendor-supplied compiler, or - a third party compiler. Although Qt may be built on a range of platform-compiler - combinations, only a subset of these are actively supported by Qt. - - A more general overview of the platforms Qt runs on can be found on the - \l{Platform Notes} page. Information about the compilers used on each platform - can be found on the \l{Compiler Notes} page. - - \tableofcontents - - \section1 Most Common Actively Supported Platforms - - \table - \header \o Platform \o Compilers - \row \o Apple Mac OS X (32-bit) \o gcc 4.0.1 - \row \o Linux (32 and 64-bit) \o gcc 4.1, 4.2, 4.3 - \row \o Microsoft Windows \o gcc 3.4.2 (MinGW) (32-bit), MSVC 2003, 2005 (32 and 64-bit), 2008, - \l{Intel C++ Compiler}{Intel icc (see note)} - \endtable - - Any platform-compiler combinations not listed here should be considered unsupported. - - \section1 Actively Supported Platforms - - \table - \header \o OS \o Architecture \o Makespec \o Compiler version(s) - \row \o AIX \o PowerPC \o aix-xlc \o xlC 6 - \row \o AIX \o PowerPC \o aix-xlc-64 \o xlC 6 - \row \o HPUX \o PA/RISC \o hpux-acc* \o A.03.57 (aCC 3.57) - \row \o HPUX \o PA/RISC \o hpux-g++ \o GCC 3.4.4 - \row \o HPUX \o PA/RISC \o hpux-g++-64 \o GCC 3.4.4 - \row \o HPUX \o Itanium \o hpuxi-acc* \o A.06.10 (aCC 6.10) - \row \o Embedded Linux \o ARM \o qws/linux-arm-g++ \o GCC 3.4, 4.1, 4.2, 4.3 - \row \o Embedded Linux \o Intel 32-bit \o qws/linux-x86-g++ \o GCC 3.4, 4.1, 4.2, 4.3 - \row \o Linux \o Intel 32/64-bit \o linux-g++ \o GCC 4.1, 4.2, 4.3 - \row \o Linux \o Intel 32/64-bit \o linux-icc \o icc 10.1 - \row \o Linux \o Intel 32-bit \o linux-icc-32 \o icc 10.1 - \row \o Linux \o Intel 64-bit \o linux-icc-64 \o icc 10.1 - \row \o Mac OS X \o Intel 32/64-bit, PowerPC \o macx-g++ \o GCC 4.0.1 - \row \o Mac OS X \o Intel 32/64-bit, PowerPC \o macx-g++42 \o GCC 4.2 - \row \o Solaris \o SPARC, Intel 32-bit \o solaris-cc* \o Sun CC 5.5 - \row \o Solaris \o SPARC, Intel 32-bit \o solaris-g++* \o GCC 3.4.2 - \row \o Windows XP/Vista \o Intel 32/64-bit \o win32-g++ \o GCC 3.4.2 (MinGW 5.1.4) - \row \o Windows XP/Vista \o Intel 32/64-bit \o win32-icc \o icc 9.1 - \row \o Windows XP/Vista \o Intel 32/64-bit \o win32-msvc2003 \o Visual Studio 2003 - \row \o Windows XP/Vista \o Intel 32/64-bit \o win32-msvc2005 \o Visual Studio 2005 - \row \o Windows XP/Vista \o Intel 32/64-bit \o win32-msvc2008 \o Visual Studio 2008 - \row \o Windows CE \o Intel 32-bit, ARMv4i, MIPS - \o wince*-msvc2005 \o Visual Studio 2005 - \row \o Windows CE \o Intel 32-bit, ARMv4i, MIPS - \o wince*-msvc2008 \o Visual Studio 2008 - \endtable - - \section1 Community Supported Platforms - - \table - \header \o OS \o Architecture \o Makespec \o Compiler version(s) - \row \o Mac OS X \o Intel 32-bit, PowerPC \o darwin-g++ \o - - \row \o FreeBSD \o - \o freebsd-g++ \o - - \row \o FreeBSD \o - \o freebsd-g++34 \o - - \row \o FreeBSD \o - \o freebsd-g++40 \o - - \row \o FreeBSD \o - \o freebsd-icc \o - - \row \o HPUX \o Itanium \o hpuxi-g++* \o GCC 4.1 - \row \o Linux \o - \o linux-cxx \o - - \row \o Linux \o - \o linux-ecc-64 \o - - \row \o Linux \o Itanium \o linux-g++ \o GCC 3.4 - \row \o Linux \o Intel 32/64-bit \o linux-g++ \o GCC 3.3, 3.4 - \row \o Linux \o Intel 32/64-bit \o linux-g++ \o GCC 4.0 - \row \o Linux \o - \o linux-kcc \o - - \row \o Linux \o - \o linux-llvm \o - - \row \o Linux \o - \o linux-lsb-g++ \o - - \row \o LynxOS \o - \o lynxos-g++ \o - - \row \o Mac OS X \o - \o macx-llvm \o - - \row \o NetBSD \o - \o netbsd-g++ \o - - \row \o OpenBSD \o - \o openbsd-g++ \o - - \row \o Embedded Linux \o MIPS, PowerPC \o qws/linux-g++ \o GCC 3.4, 4.1, 4.2, 4.3 - \endtable - - \section1 Unsupported Platforms - - The following platforms were supported in previous releases, either as actively supported - or community supported platforms, but are now unsupported. - - \table - \header \o OS \o Architecture \o Makespec \o Compiler version(s) - \row \o IRIX \o MIPS \o irix-cc* \o MIPS Pro - \row \o IRIX \o MIPS \o irix-g++* \o GCC 3.3 - \row \o Windows XP/Vista \o Intel 32/64-bit \o win32-msvc \o Visual C++ 6.0 - \row \o Windows XP/Vista \o Intel 32/64-bit \o win32-msvc2002 \o Visual Studio 2002 - \row \o Windows XP/Vista \o Intel 32/64-bit \o win32-msvc.net \o Visual Studio 2002 - \endtable - - Qt's online \l{Platform Support Policy} for Qt describes the level of - support you should expect for these platforms. - - \section1 Supported Features - - Not all compilers used to build Qt are able to compile all modules. The following table - shows the compiler support for five modules that are not uniformly available for all - platforms and compilers. - - \table - \header \o Compiler \o{5,1} Features - \header \o \o Concurrent \o XmlPatterns \o WebKit \o CLucene \o Phonon - \row \o g++ 3.3 \o \o \bold{X} \o \o \bold{X} \o \bold{X} - \row \o g++ 3.4 and up \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} - \row - \row \o SunCC 5.5 \o \o \o \o \bold{X} \o \bold{X} - \row - \row \o aCC series 3 \o \o \o \o \bold{X} \o \bold{X} - \row \o aCC series 6 \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} - \row \o xlC 6 \o \o \o \o \bold{X} \o \bold{X} - \row \o \l{Known Issues in %VERSION%}{Intel CC 10 (see note)} - \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} - \row - \row \o MSVC 2003 \o \bold{X} \o \bold{X} \o \o \bold{X} \o \bold{X} - \row \o MSVC 2005 and up \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} - \endtable -*/ /*! \page platform-notes-windows-ce.html @@ -521,218 +396,3 @@ information about the combinations of platforms and compilers supported by Qt can be found on the \l{Supported Platforms} page. */ - -/*! - \page compiler-notes.html - \ingroup platform-notes - \title Compiler Notes - \brief Information about the C++ compilers and tools used to build Qt. - - This page contains information about the C++ compilers and tools used - to build Qt on various platforms. - - \tableofcontents - - Please refer to the \l{Platform Notes} for information on the platforms - Qt is currently known to run on, and see the \l{Supported Platforms} - page for information about the status of each platform. - - If you have anything to add to this list or any of the platform or - compiler-specific pages, please submit it via the - \l{Bug Report Form}. - - \target GCC - \section1 GCC - - \section2 GCC on Windows (MinGW) - - We have tested Qt with this compiler on Windows XP. - The minimal version of MinGW supported is: - - \list - \o GCC 3.4.2 - \o MinGW runtime 3.7 - \o win32api 3.2 - \o binutils 2.15.91 - \o mingw32-make 3.80.0-3 - \endlist - - \section2 GCC 4.0.0 - - The released package of the compiler has some bugs that lead to miscompilations. - We recommend using GCC 4.0.1 or later, or to use a recent CVS snapshot of the - GCC 4.0 branch. The version of GCC 4.0.0 that is shipped with Mac OS X 10.4 - "Tiger" is known to work with Qt for Mac OS X. - - \section2 HP-UX - - The hpux-g++ platform is tested with GCC 3.4.4. - - \section2 Solaris - - Please use GCC 3.4.2 or later. - - \section2 Mac OS X - - Please use the latest GCC 3.3 from Apple or a later version of GCC 3. - The gcc 3.3 that is provided with Xcode 1.5 is known to generate bad code. - Use the November 2004 GCC 3.3 updater \l{http://connect.apple.com}{available from Apple}. - - \section2 GCC 3.4.6 (Debian 3.4.6-5) on AMD64 (x86_64) - - This compiler is known to miscompile some parts of Qt when doing a - release build. There are several workarounds: - - \list 1 - \o Use a debug build instead. - \o For each miscompilation encountered, recompile the file, removing the -O2 option. - \o Add -fno-gcse to the QMAKE_CXXFLAGS_RELEASE. - \endlist - - \section1 HP ANSI C++ (aCC) - - The hpux-acc-32 and hpux-acc-64 platforms are tested with aCC A.03.57. The - hpuxi-acc-32 and hpuxi-acc-64 platforms are tested with aCC A.06.10. - - \section1 Intel C++ Compiler - - Qt supports the Intel C++ compiler on both Windows and Linux. - However, there are a few issues on Linux (see the following - section). - - \section2 Intel C++ Compiler for Linux - - Nokia currently tests the following compilers: - - \list - - \o Intel(R) C++ Compiler for applications running on IA-32, - Version 10.1 Build 20080602 Package ID: l_cc_p_10.1.017 - - \o Intel(R) C++ Compiler for applications running on Intel(R) 64, - Version 10.1 Build 20080602 Package ID: l_cc_p_10.1.017 - - \endlist - - We do not currently test the IA-64 (Itanium) compiler. - - \section2 Known Issues with Intel C++ Compiler for Linux - - \list - - \o Precompiled header support does not work in version 10.0.025 - and older. For these compilers, you should configure Qt with - -no-pch. Precompiled header support works properly in version - 10.0.026 and later. - \o Version 10.0.026 for Intel 64 is known to miscompile qmake when - building in release mode. For now, configure Qt with - -debug. Version 10.1.008 and later can compile qmake in release - mode. - \o Versions 10.1.008 to 10.1.015 for both IA-32 and Intel 64 are - known crash with "(0): internal error: 0_47021" when compiling - QtXmlPatterns, QtWebKit, and Designer in release mode. Version - 10.1.017 compiles these modules correctly in release mode. - \endlist - - \section2 Intel C++ Compiler (Windows, Altix) - - Qt 4 has been tested successfully with: - - \list - \o Windows - Intel(R) C++ Compiler for 32-bit applications, - Version 8.1 Build 20050309Z Package ID: W_CC_PC_8.1.026 - \o Altix - Intel(R) C++ Itanium(R) Compiler for Itanium(R)-based - applications Version 8.1 Build 20050406 Package ID: l_cc_pc_8.1.030 - \endlist - - We currently only test the Intel compiler on 32-bit Windows versions. - - \section1 MIPSpro (IRIX) - - \bold{IRIX is an unsupported platform. See the \l{Supported Platforms} page - and Qt's Software's online \l{Platform Support Policy} page for details.} - - Qt 4.4.x requires MIPSpro version 7.4.2m. - - Note that MIPSpro version 7.4.4m is currently not supported, since it has - introduced a number of problems that have not yet been resolved. - We recommend using 7.4.2m for Qt development. However, please note the - unsupported status of this platform. - - \target Sun Studio - \section1 Forte Developer / Sun Studio (Solaris) - - \section2 Sun Studio - - Qt is tested using Sun Studio 8 (Sun CC 5.5). Go to - \l{Sun Studio Patches} page on Sun's Web site to download - the latest patches for your Sun compiler. - - \section2 Sun WorkShop 5.0 - - Sun WorkShop 5.0 is not supported with Qt 4. - - \section1 Visual Studio (Windows) - - We do most of our Windows development on Windows XP, using Microsoft - Visual Studio .NET 2005 and Visual Studio 2008 (both the 32- and 64-bit - versions). - - Qt works with the Standard Edition, the Professional Edition and Team - System Edition of Visual Studio 2005. - - We also test Qt 4 on Windows XP with Visual Studio .NET and Visual Studio 2003. - - In order to use Qt with the Visual Studio 2005/2008 Express Edition you need - to download and install the platform SDK. Due to limitations in the - Express Edition it is not possible for us to install the Qt Visual - Studio Integration. You will need to use our command line tools to - build Qt applications with this edition. - - The Visual C++ Linker doesn't understand filenames with spaces (as in - \c{C:\Program files\Qt\}) so you will have to move it to another place, - or explicitly set the path yourself; for example: - - \snippet doc/src/snippets/code/doc_src_compiler-notes.qdoc 0 - - If you are experiencing strange problems with using special flags that - modify the alignment of structure and union members (such as \c{/Zp2}) - then you will need to recompile Qt with the flags set for the - application as well. - - If you're using Visual Studio .NET (2002) Standard Edition, you should be - using the Qt binary package provided, and not the source package. - As the Standard Edition does not optimize compiled code, your compiled - version of Qt would perform suboptimally with respect to speed. - - With Visual Studio 2005 Service Pack 1 a bug was introduced which - causes Qt not to compile, this has been fixed with a hotfix available - from Microsoft. See this - \l{http://www.qtsoftware.com/developer/faqs/faq.2006-12-18.3281869860}{Knowledge Base entry} - for more information. - - \section1 IBM xlC (AIX) - - The makeC++SharedLib utility must be in your PATH and be up to date to - build shared libraries. From IBM's - \l{http://www.redbooks.ibm.com/abstracts/sg245674.html}{C and C++ Application Development on AIX} - Redbook: - - \list - \o "The second step is to use the makeC++SharedLib command to create the - shared object. The command has many optional arguments, but in its - simplest form, can be used as follows:" - \snippet doc/src/snippets/code/doc_src_compiler-notes.qdoc 1 - \o "The full path name to the command is not required; however, to avoid - this, you will have to add the directory in which it is located to - your PATH environment variable. The command is located in the - /usr/vacpp/bin directory with the VisualAge C++ Professional for AIX, - Version 5 compiler." - \endlist - - \section2 VisualAge C++ for AIX, Version 6.0 - - Make sure you have the - \l{http://www-1.ibm.com/support/search.wss?rs=32&tc=SSEP5D&dc=D400}{latest upgrades} - installed. -*/ diff --git a/doc/src/supported-platforms.qdoc b/doc/src/supported-platforms.qdoc new file mode 100644 index 000000000..25251fec2 --- /dev/null +++ b/doc/src/supported-platforms.qdoc @@ -0,0 +1,141 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \page supported-platforms.html + \title Supported Platforms + \brief The platforms supported by Nokia for Qt. + \ingroup platform-notes + + Qt Software strives to provide support for the platforms most + frequently used by Qt users. We have designed our internal testing procedure to + divide platforms into three test categories (Tier 1, Tier 2 and Tier 3) in order + to prioritize internal testing and development resources so that the most + frequently used platforms are subjected to our most rigorous testing processes. + + Qt is supported on a variety of 32-bit and 64-bit platforms, and can + usually be built on each platform with GCC, a vendor-supplied compiler, or + a third party compiler. Although Qt may be built on a range of platform-compiler + combinations, only a subset of these are actively supported by Qt. + + \tableofcontents + + Information about the specific platforms Qt runs on can be found on the + \l{Platform Notes} page. Information about the compilers used on each platform + can be found on the \l{Compiler Notes} page. + + \section1 Tier 1 Platforms + + All Tier 1 platforms are subjected to our unit test suite and other internal + testing tools on a frequent basis (prior to new version releases, source tree + branching, and at other significant period points in the development process). + Errors or bugs discovered in these platforms are prioritized for correction + by the development team. Significant errors discovered in Tier 1 platforms can + impact release dates and Qt Development Frameworks strives to resolve all known + high priority errors in Tier 1 platforms prior to new version releases. + + \table + \header \o Platform + \o Compilers + \row \o Linux (32 and 64-bit) + \o gcc 4.2 + \row \o Microsoft Windows XP + \o gcc 3.4.2 (MinGW) (32-bit), MSVC 2003, 2005 (32 and 64-bit) + \row \o Microsoft Windows Vista + \o MSVC 2005, 2008 + \row \o Microsoft Windows Vista 64bit + \o MSVC 2008 + \row \o Apple Mac OS X 10.5 "Leopard" x86_64 (Carbon, Cocoa 32 and 64bit) + \o As provided by Apple + \row \o Embedded Linux QWS (ARM) + \o gcc (\l{http:\\www.codesourcery.com}{Codesourcery version)} + \row \o Windows CE 5.0 (ARMv4i, x86, MIPS) + \o MSVC 2005 WinCE 5.0 Standard (x86, pocket, smart, mipsii) + \endtable + + \section1 Tier 2 Platforms + + Tier 2 platforms are subjected to our unit test suite and other internal testing + tools prior to release of new product versions. Qt users should note, however, + that errors may be present in released product versions for Tier 2 platforms and, + subject to resource availability, known errors in Tier 2 platforms may or may not + be corrected prior to new version releases. + + \table + \header \o Platform + \o Compilers + \row \o Apple Mac OS X 10.4 "Tiger" + \o As provided by Apple + \row \o HPUXi 11.11 + \o aCC 3.57, gcc 3.4 + \row \o HPUXi 11.23 + \o aCC 6.10 + \row \o Solaris 10 UltraSparc + \o Sun Studio 12 + \row \o AIX 6 + \o Power5 xlC 7 + \row \o Microsoft Windows XP + \o Intel Compiler + \row \o Linux + \o Intel Compiler + \row \o Embedded Linux QWS (Mips, PowerPC) + \o gcc (\l{http:\\www.codesourcery.com}{Codesourcery version)} + \row \o Windows CE 6.0 (ARMv4i, x86, MIPS) + \o MSVC 2008 WinCE 6.0 Professional + \endtable + + \section1 Tier 3 Platforms (Not supported by Nokia) + + All platforms not specifically listed above are not supported by Nokia. Nokia does + not run its unit test suite or perform any other internal tests on platforms not + listed above. Qt users should note, however, that there may be various open source + projects, community users and/or Qt partners who are able to provide assistance with + platforms not supported by Nokia. + + \section1 General Legal Disclaimer + + Please note that Qt Software’s products are offered on an "as is" basis without warranty + of any kind and that our products are not error or bug free. To the maximum extent + permitted by applicable law, Nokia on behalf of itself and its suppliers, disclaims all + warranties and conditions, either express or implied, including, but not limited to, + implied warranties of merchantability, fitness for a particular purpose, title and + non-infringement with regard to the Licensed Software. +*/ -- cgit v1.2.3 From 777b93a0a48096e68124feec4c0e0cab3d60c36a Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Thu, 16 Jul 2009 16:59:15 +0200 Subject: Get collapsible menus working correctly. There was an attempt to do this earlier, but it was a bit more complex than it needed to be. We now do the update on show in Cocoa. Carbon actually does it all for us, we just need to flip the bit. We may do the updates to often, but it's better than not enough. Task-Id: 195445 Reviewed-by: Denis --- src/gui/kernel/qt_cocoa_helpers_mac.mm | 29 ++++++++++++ src/gui/kernel/qt_cocoa_helpers_mac_p.h | 1 + src/gui/widgets/qcocoamenu_mac.mm | 4 +- src/gui/widgets/qmenu.cpp | 7 +++ src/gui/widgets/qmenu_mac.mm | 81 +++++++++++++-------------------- src/gui/widgets/qmenu_p.h | 6 +-- 6 files changed, 74 insertions(+), 54 deletions(-) diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index 223e36bd3..3d4164a31 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -74,6 +74,7 @@ ****************************************************************************/ #include +#include #include #include #include @@ -1193,4 +1194,32 @@ void qt_mac_constructQIconFromIconRef(const IconRef icon, const IconRef overlayI } } +void qt_mac_menu_collapseSeparators(void */*NSMenu **/ theMenu, bool collapse) +{ + OSMenuRef menu = static_cast(theMenu); + if (collapse) { + bool previousIsSeparator = true; // setting to true kills all the separators placed at the top. + NSMenuItem *previousItem = nil; + for (NSMenuItem *item in [menu itemArray]) { + if ([item isSeparatorItem]) { + [item setHidden:previousIsSeparator]; + } + + if (![item isHidden]) { + previousItem = item; + previousIsSeparator = ([previousItem isSeparatorItem]); + } + } + + // We now need to check the final item since we don't want any separators at the end of the list. + if (previousItem && previousIsSeparator) + [previousItem setHidden:YES]; + } else { + for (NSMenuItem *item in [menu itemArray]) { + if (QAction *action = reinterpret_cast([item tag])) + [item setHidden:!action->isVisible()]; + } + } +} + QT_END_NAMESPACE diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h index af3b4cb78..2cc7dee03 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h +++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h @@ -133,6 +133,7 @@ void qt_dispatchTabletProximityEvent(void * /*NSEvent * */ tabletEvent); #ifdef QT_MAC_USE_COCOA bool qt_dispatchKeyEventWithCocoa(void * /*NSEvent * */ keyEvent, QWidget *widgetToGetEvent); #endif +void qt_mac_menu_collapseSeparators(void * /*NSMenu */ menu, bool collapse); bool qt_dispatchKeyEvent(void * /*NSEvent * */ keyEvent, QWidget *widgetToGetEvent); void qt_dispatchModifiersChanged(void * /*NSEvent * */flagsChangedEvent, QWidget *widgetToGetEvent); void qt_mac_dispatchNCMouseMessage(void */* NSWindow* */eventWindow, void */* NSEvent* */mouseEvent, diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm index 3338fd869..f3bb73e32 100644 --- a/src/gui/widgets/qcocoamenu_mac.mm +++ b/src/gui/widgets/qcocoamenu_mac.mm @@ -98,7 +98,9 @@ QT_USE_NAMESPACE while (QWidget *popup = QApplication::activePopupWidget()) popup->close(); - qt_mac_emit_menuSignals(((QT_MANGLE_NAMESPACE(QCocoaMenu) *)menu)->qmenu, true); + QMenu *qtmenu = static_cast(menu)->qmenu; + qt_mac_emit_menuSignals(qtmenu, true); + qt_mac_menu_collapseSeparators(menu, qtmenu->separatorsCollapsible()); } - (void)menuWillClose:(NSMenu*)menu; diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 99f3880dd..8eec0fc84 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -3013,12 +3013,19 @@ bool QMenu::separatorsCollapsible() const void QMenu::setSeparatorsCollapsible(bool collapse) { Q_D(QMenu); + if (d->collapsibleSeparators == collapse) + return; + d->collapsibleSeparators = collapse; d->itemsDirty = 1; if (isVisible()) { d->updateActionRects(); update(); } +#ifdef Q_WS_MAC + if (d->mac_menu) + d->syncSeparatorsCollapsible(collapse); +#endif } #ifdef QT3_SUPPORT diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm index 87f6f8238..e6239f4ec 100644 --- a/src/gui/widgets/qmenu_mac.mm +++ b/src/gui/widgets/qmenu_mac.mm @@ -458,7 +458,8 @@ OSStatus qt_mac_menu_event(EventHandlerCallRef er, EventRef event, void *) int merged = 0; const QMenuPrivate::QMacMenuPrivate *mac_menu = qmenu->d_func()->mac_menu; - for(int i = 0; i < mac_menu->actionItems.size(); ++i) { + const int ActionItemsCount = mac_menu->actionItems.size(); + for(int i = 0; i < ActionItemsCount; ++i) { QMacMenuAction *action = mac_menu->actionItems.at(i); if (action->action->isSeparator()) { bool hide = false; @@ -972,7 +973,7 @@ void Q_GUI_EXPORT qt_mac_set_menubar_merge(bool b) { qt_mac_no_menubar_merge = ! /***************************************************************************** QMenu bindings *****************************************************************************/ -QMenuPrivate::QMacMenuPrivate::QMacMenuPrivate(QMenuPrivate *menu) : menu(0), qmenu(menu) +QMenuPrivate::QMacMenuPrivate::QMacMenuPrivate() : menu(0) { } @@ -1300,61 +1301,22 @@ QMenuPrivate::QMacMenuPrivate::syncAction(QMacMenuAction *action) #else int itemIndex = [menu indexOfItem:item]; Q_ASSERT(itemIndex != -1); - - // Separator handling: Menu items and separators can be added to a QMenu in - // any order (for example, add all the separators first and then "fill inn" - // the menu items). Create NSMenuItem seperatorItems for the Qt separators, - // and make sure that there are no double separators and no seprators - // at the top or bottom of the menu. - bool itemIsSeparator = action->action->isSeparator(); - bool previousItemIsSeparator = false; - if (itemIndex > 0) { - if ([[menu itemAtIndex : itemIndex - 1] isSeparatorItem]) - previousItemIsSeparator = true; - } - bool nexItemIsSeparator = false; - if (itemIndex > 0 && itemIndex < [menu numberOfItems] -1) { - if ([[menu itemAtIndex : itemIndex + 1] isSeparatorItem]) - nexItemIsSeparator = true; - } - bool itemIsAtBottomOfMenu = (itemIndex == [menu numberOfItems] - 1); - bool itemIsAtTopOfMenu = (itemIndex == 0); - - - if (itemIsSeparator) { - // Create separators items for actions that are now separators + if (action->action->isSeparator()) { action->menuItem = [NSMenuItem separatorItem]; [action->menuItem retain]; - - // Hide duplicate/top/bottom separators. - if (qmenu->collapsibleSeparators && (previousItemIsSeparator || itemIsAtBottomOfMenu || itemIsAtTopOfMenu)) { - [action->menuItem setHidden : true]; - } - [menu insertItem: action->menuItem atIndex:itemIndex]; [menu removeItem:item]; [item release]; item = action->menuItem; return; - } else { - // Create standard menu items for actions that are no longer separators - if ([item isSeparatorItem]) { - action->menuItem = createNSMenuItem(action->action->text()); - [menu insertItem:action->menuItem atIndex:itemIndex]; - [menu removeItem:item]; - [item release]; - item = action->menuItem; - } - - // Show separators that should now be visible since a non-separator - // item (the current item) was added. - if (previousItemIsSeparator) { - [[menu itemAtIndex : itemIndex - 1] setHidden : false]; - } else if (itemIsAtTopOfMenu && nexItemIsSeparator) { - [[menu itemAtIndex : itemIndex + 1] setHidden : false]; - } + } else if ([item isSeparatorItem]) { + // I'm no longer a separator... + action->menuItem = createNSMenuItem(action->action->text()); + [menu insertItem:action->menuItem atIndex:itemIndex]; + [menu removeItem:item]; + [item release]; + item = action->menuItem; } - #endif //find text (and accel) @@ -1540,7 +1502,7 @@ QMenuPrivate::macMenu(OSMenuRef merge) if (mac_menu && mac_menu->menu) return mac_menu->menu; if (!mac_menu) - mac_menu = new QMacMenuPrivate(this); + mac_menu = new QMacMenuPrivate; mac_menu->menu = qt_mac_create_menu(q); if (merge) { #ifndef QT_MAC_USE_COCOA @@ -1552,9 +1514,28 @@ QMenuPrivate::macMenu(OSMenuRef merge) QList items = q->actions(); for(int i = 0; i < items.count(); i++) mac_menu->addAction(items[i], 0, this); + syncSeparatorsCollapsible(collapsibleSeparators); return mac_menu->menu; } +/*! + \internal +*/ +void +QMenuPrivate::syncSeparatorsCollapsible(bool collapse) +{ +#ifndef QT_MAC_USE_COCOA + if (collapse) + ChangeMenuAttributes(mac_menu->menu, kMenuAttrCondenseSeparators, 0); + else + ChangeMenuAttributes(mac_menu->menu, 0, kMenuAttrCondenseSeparators); +#else + qt_mac_menu_collapseSeparators(mac_menu->menu, collapse); +#endif +} + + + /*! \internal */ diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h index 4e428fe8d..8697771c9 100644 --- a/src/gui/widgets/qmenu_p.h +++ b/src/gui/widgets/qmenu_p.h @@ -263,9 +263,8 @@ public: struct QMacMenuPrivate { QList actionItems; OSMenuRef menu; - QMenuPrivate *qmenu; - QMacMenuPrivate(QMenuPrivate *menu); - ~QMacMenuPrivate(); + QMacMenuPrivate(); + ~QMacMenuPrivate(); bool merged(const QAction *action) const; void addAction(QAction *, QMacMenuAction* =0, QMenuPrivate *qmenu = 0); @@ -285,6 +284,7 @@ public: } *mac_menu; OSMenuRef macMenu(OSMenuRef merge); void setMacMenuEnabled(bool enable = true); + void syncSeparatorsCollapsible(bool collapsible); static QHash mergeMenuHash; static QHash mergeMenuItemsHash; #endif -- cgit v1.2.3 From 5e157ed2fc5a3780959da0246ceb2b20fabbbeb5 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Fri, 24 Jul 2009 11:48:33 +0200 Subject: Document my new backend. Also rephrase some sentences. --- src/corelib/io/qfilesystemwatcher.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp index 902e2408a..27fe1c2cf 100644 --- a/src/corelib/io/qfilesystemwatcher.cpp +++ b/src/corelib/io/qfilesystemwatcher.cpp @@ -384,15 +384,17 @@ void QFileSystemWatcherPrivate::_q_directoryChanged(const QString &path, bool re \note The act of monitoring files and directories for modifications consumes system resources. This implies there is a limit to the number of files and directories your process can - monitor simultaneously. On Mac OS and all BSD variants, for + monitor simultaneously. On Mac OS X 10.4 and all BSD variants, for example, an open file descriptor is required for each monitored - file. The system limits the number of open file descriptors to 256 + file. Some system limits the number of open file descriptors to 256 by default. This means that addPath() and addPaths() will fail if your process tries to add more than 256 files or directories to the file system monitor. Also note that your process may have other file descriptors open in addition to the ones for files being monitored, and these other open descriptors also count in - the total. + the total. Mac OS X 10.5 and up use a different backend and do not + suffer from this issue. + \sa QFile, QDir */ -- cgit v1.2.3 From ed2a03b3bc85be056eca87928d18a746faa07bca Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Fri, 24 Jul 2009 13:28:12 +0200 Subject: Remove all the last vestiges of QuickDraw in Qt/Mac. Panther was the last reason for having this around. We don't touch this code anywhere else in Qt. As a result it's orphaned and can be safely removed. It truly is the end of an era, but it's definitely worth celebrating. Quartz4Life! --- src/corelib/global/qglobal.h | 4 -- src/gui/image/qpixmap.cpp | 12 +--- src/gui/image/qpixmap_mac.cpp | 80 +------------------------ src/gui/image/qpixmap_mac_p.h | 5 -- src/gui/kernel/qeventdispatcher_mac.mm | 10 ---- src/gui/kernel/qwidget_mac.mm | 18 ------ src/gui/painting/qpaintengine_mac_p.h | 105 --------------------------------- 7 files changed, 3 insertions(+), 231 deletions(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 7b16dff42..461bd3649 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -319,10 +319,6 @@ namespace QT_NAMESPACE {} # endif #endif -#ifdef QT_MAC_USE_COCOA -#define QT_MAC_NO_QUICKDRAW 1 -#endif - #ifdef __LSB_VERSION__ # if __LSB_VERSION__ < 40 # error "This version of the Linux Standard Base is unsupported" diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 3e5c9b7cd..18829f4a8 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -671,12 +671,7 @@ void QPixmap::resize_helper(const QSize &s) p.drawPixmap(0, 0, *this, 0, 0, qMin(width(), w), qMin(height(), h)); } -#if defined(Q_WS_MAC) -#ifndef QT_MAC_NO_QUICKDRAW - if(macData && macData->qd_alpha) - macData->macQDUpdateAlpha(); -#endif -#elif defined(Q_WS_X11) +#if defined(Q_WS_X11) if (x11Data && x11Data->x11_mask) { QX11PixmapData *pmData = static_cast(pm.data); pmData->x11_mask = (Qt::HANDLE)XCreatePixmap(X11->display, @@ -1945,11 +1940,6 @@ void QPixmap::detach() if (data->ref != 1) { *this = copy(); -#if defined(Q_WS_MAC) && !defined(QT_MAC_NO_QUICKDRAW) - if (id == QPixmapData::MacClass) { - macData->qd_alpha = 0; - } -#endif } ++data->detach_no; diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp index 25ef8ba7c..c14c05939 100644 --- a/src/gui/image/qpixmap_mac.cpp +++ b/src/gui/image/qpixmap_mac.cpp @@ -166,9 +166,6 @@ QMacPixmapData::QMacPixmapData(PixelType type) : QPixmapData(type, MacClass), has_alpha(0), has_mask(0), uninit(true), pixels(0), pixelsToFree(0), bytesPerRow(0), cg_data(0), cg_dataBeingReleased(0), cg_mask(0), -#ifndef QT_MAC_NO_QUICKDRAW - qd_data(0), qd_alpha(0), -#endif pengine(0) { } @@ -494,13 +491,6 @@ int QMacPixmapData::metric(QPaintDevice::PaintDeviceMetric theMetric) const QMacPixmapData::~QMacPixmapData() { validDataPointers.remove(this); -#ifndef QT_MAC_NO_QUICKDRAW - macQDDisposeAlpha(); - if (qd_data) { - DisposeGWorld(qd_data); - qd_data = 0; - } -#endif if (cg_mask) { CGImageRelease(cg_mask); cg_mask = 0; @@ -589,48 +579,9 @@ void QMacPixmapData::macGetAlphaChannel(QMacPixmapData *pix, bool asMask) const void QMacPixmapData::macSetHasAlpha(bool b) { has_alpha = b; -#ifndef QT_MAC_NO_QUICKDRAW - macQDDisposeAlpha(); //let it get created lazily -#endif macReleaseCGImageRef(); } -#ifndef QT_MAC_NO_QUICKDRAW -void QMacPixmapData::macQDDisposeAlpha() -{ - if (qd_alpha) { - DisposeGWorld(qd_alpha); - qd_alpha = 0; - } -} - -void QMacPixmapData::macQDUpdateAlpha() -{ - macQDDisposeAlpha(); // get rid of alpha pixmap - if (!has_alpha && !has_mask) - return; - - //setup - Rect rect; - SetRect(&rect, 0, 0, w, h); - const int params = alignPix | stretchPix | newDepth; - NewGWorld(&qd_alpha, 32, &rect, 0, 0, params); - int *dptr = (int *)GetPixBaseAddr(GetGWorldPixMap(qd_alpha)), *drow; - unsigned short dbpr = GetPixRowBytes(GetGWorldPixMap(qd_alpha)); - const int *sptr = (int*)pixels, *srow; - const uint sbpr = bytesPerRow; - uchar clr; - for (int y = 0; y < h; ++y) { - drow = (int*)((char *)dptr + (y * dbpr)); - srow = (int*)((char *)sptr + (y * sbpr)); - for (int x=0; x < w; x++) { - clr = qAlpha(*(srow + x)); - *(drow + x) = qRgba(~clr, ~clr, ~clr, 0); - } - } -} -#endif - void QMacPixmapData::macCreateCGImageRef() { Q_ASSERT(cg_data == 0); @@ -979,31 +930,12 @@ QPixmap QPixmap::grabWindow(WId window, int x, int y, int w, int h) relocated. \warning This function is only available on Mac OS X. + \warning As of Qt 4.6, this function \em{always} returns zero. */ Qt::HANDLE QPixmap::macQDHandle() const { -#ifndef QT_MAC_NO_QUICKDRAW - QMacPixmapData *d = static_cast(data); - if (!d->qd_data) { //create the qd data - Rect rect; - SetRect(&rect, 0, 0, d->w, d->h); - unsigned long qdformat = k32ARGBPixelFormat; - GWorldFlags qdflags = 0; - //we play such games so we can use the same buffer in CG as QD this - //makes our merge much simpler, at some point the hacks will go away - //because QD will be removed, but until that day this keeps them coexisting - if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) - qdformat = k32BGRAPixelFormat; - - if(NewGWorldFromPtr(&d->qd_data, qdformat, &rect, 0, 0, qdflags, - (char*)d->pixels, d->bytesPerRow) != noErr) - qWarning("Qt: internal: QPixmap::init error (%d %d %d %d)", rect.left, rect.top, rect.right, rect.bottom); - } - return d->qd_data; -#else return 0; -#endif } /*! \internal @@ -1013,18 +945,11 @@ Qt::HANDLE QPixmap::macQDHandle() const long as it can be relocated. \warning This function is only available on Mac OS X. + \warning As of Qt 4.6, this function \em{always} returns zero. */ Qt::HANDLE QPixmap::macQDAlphaHandle() const { -#ifndef QT_MAC_NO_QUICKDRAW - QMacPixmapData *d = static_cast(data); - if (d->has_alpha || d->has_mask) { - if (!d->qd_alpha) //lazily created - d->macQDUpdateAlpha(); - return d->qd_alpha; - } -#endif return 0; } @@ -1094,7 +1019,6 @@ IconRef qt_mac_create_iconref(const QPixmap &px) if (px.isNull()) return 0; - QMacSavedPortInfo pi; //save the current state //create icon IconFamilyHandle iconFamily = reinterpret_cast(NewHandle(0)); //create data diff --git a/src/gui/image/qpixmap_mac_p.h b/src/gui/image/qpixmap_mac_p.h index a3ff0d388..ea6fe6034 100644 --- a/src/gui/image/qpixmap_mac_p.h +++ b/src/gui/image/qpixmap_mac_p.h @@ -109,11 +109,6 @@ private: uint bytesPerRow; QRectF cg_mask_rect; CGImageRef cg_data, cg_dataBeingReleased, cg_mask; -#ifndef QT_MAC_NO_QUICKDRAW - GWorldPtr qd_data, qd_alpha; - void macQDDisposeAlpha(); - void macQDUpdateAlpha(); -#endif static QSet validDataPointers; QPaintEngine *pengine; diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm index cde0c4748..af36d9f55 100644 --- a/src/gui/kernel/qeventdispatcher_mac.mm +++ b/src/gui/kernel/qeventdispatcher_mac.mm @@ -506,16 +506,6 @@ bool QEventDispatcherMac::processEvents(QEventLoop::ProcessEventsFlags flags) wakeUp(); emit awake(); -#ifndef QT_MAC_NO_QUICKDRAW - if(!qt_mac_safe_pdev) { //create an empty widget and this can be used for a port anytime - QWidget *tlw = new QWidget; - tlw->setAttribute(Qt::WA_DeleteOnClose); - tlw->setObjectName(QLatin1String("empty_widget")); - tlw->hide(); - qt_mac_safe_pdev = tlw; - } -#endif - bool retVal = false; forever { if (d->interrupt) diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 1717fbd67..70eea3aef 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -1116,23 +1116,9 @@ OSStatus QWidgetPrivate::qt_widget_event(EventHandlerCallRef er, EventRef event, //update handles GrafPtr qd = 0; CGContextRef cg = 0; -#ifndef QT_MAC_NO_QUICKDRAW - { - if(GetEventParameter(event, kEventParamGrafPort, typeGrafPtr, 0, sizeof(qd), 0, &qd) != noErr) { - GDHandle dev = 0; - GetGWorld(&qd, &dev); //just use the global port.. - } - } - bool end_cg_context = false; - if(GetEventParameter(event, kEventParamCGContextRef, typeCGContextRef, 0, sizeof(cg), 0, &cg) != noErr && qd) { - end_cg_context = true; - QDBeginCGContext(qd, &cg); - } -#else if(GetEventParameter(event, kEventParamCGContextRef, typeCGContextRef, 0, sizeof(cg), 0, &cg) != noErr) { Q_ASSERT(false); } -#endif widget->d_func()->hd = cg; widget->d_func()->qd_hd = qd; CGContextSaveGState(cg); @@ -1252,10 +1238,6 @@ OSStatus QWidgetPrivate::qt_widget_event(EventHandlerCallRef er, EventRef event, widget->d_func()->hd = 0; widget->d_func()->qd_hd = 0; CGContextRestoreGState(cg); -#ifndef QT_MAC_NO_QUICKDRAW - if(end_cg_context) - QDEndCGContext(qd, &cg); -#endif } else if(!HIObjectIsOfClass((HIObjectRef)hiview, kObjectQWidget)) { CallNextEventHandler(er, event); } diff --git a/src/gui/painting/qpaintengine_mac_p.h b/src/gui/painting/qpaintengine_mac_p.h index 755b7b1d5..20a4a08cf 100644 --- a/src/gui/painting/qpaintengine_mac_p.h +++ b/src/gui/painting/qpaintengine_mac_p.h @@ -58,9 +58,6 @@ #include "private/qpaintengine_p.h" #include "private/qpolygonclipper_p.h" #include "QtCore/qhash.h" -#ifndef QT_MAC_NO_QUICKDRAW -#include -#endif typedef struct CGColorSpace *CGColorSpaceRef; QT_BEGIN_NAMESPACE @@ -69,108 +66,6 @@ extern int qt_defaultDpi(); extern int qt_defaultDpiX(); extern int qt_defaultDpiY(); -#ifndef QT_MAC_NO_QUICKDRAW -class QMacSavedPortInfo -{ - RgnHandle clip; - GWorldPtr world; - GDHandle handle; - PenState pen; //go pennstate - RGBColor back, fore; - bool valid_gworld; - void init(); - -public: - inline QMacSavedPortInfo() { init(); } - inline QMacSavedPortInfo(QPaintDevice *pd) { init(); setPaintDevice(pd); } - inline QMacSavedPortInfo(QPaintDevice *pd, const QRect &r) - { init(); setPaintDevice(pd); setClipRegion(r); } - inline QMacSavedPortInfo(QPaintDevice *pd, const QRegion &r) - { init(); setPaintDevice(pd); setClipRegion(r); } - ~QMacSavedPortInfo(); - static inline bool setClipRegion(const QRect &r); - static inline bool setClipRegion(const QRegion &r); - static inline bool setPaintDevice(QPaintDevice *); -}; - -inline bool -QMacSavedPortInfo::setClipRegion(const QRect &rect) -{ - Rect r; - SetRect(&r, rect.x(), rect.y(), rect.right()+1, rect.bottom()+1); - ClipRect(&r); - return true; -} - -inline bool -QMacSavedPortInfo::setClipRegion(const QRegion &r) -{ - if(r.isEmpty()) - return setClipRegion(QRect()); - QMacSmartQuickDrawRegion rgn(r.toQDRgn()); - SetClip(rgn); - return true; -} - -inline bool -QMacSavedPortInfo::setPaintDevice(QPaintDevice *pd) -{ - if(!pd) - return false; - bool ret = true; - extern GrafPtr qt_mac_qd_context(const QPaintDevice *); // qpaintdevice_mac.cpp - if(pd->devType() == QInternal::Widget) - SetPortWindowPort(qt_mac_window_for(static_cast(pd))); - else if(pd->devType() == QInternal::Pixmap || pd->devType() == QInternal::Printer) - SetGWorld((GrafPtr)qt_mac_qd_context(pd), 0); //set the gworld - return ret; -} - -inline void -QMacSavedPortInfo::init() -{ - GetBackColor(&back); - GetForeColor(&fore); - GetGWorld(&world, &handle); - valid_gworld = true; - clip = NewRgn(); - GetClip(clip); - GetPenState(&pen); -} - -inline QMacSavedPortInfo::~QMacSavedPortInfo() -{ - bool set_state = false; - if(valid_gworld) { - set_state = IsValidPort(world); - if(set_state) - SetGWorld(world,handle); //always do this one first - } else { - setPaintDevice(qt_mac_safe_pdev); - } - if(set_state) { - SetClip(clip); - SetPenState(&pen); - RGBForeColor(&fore); - RGBBackColor(&back); - } - DisposeRgn(clip); -} -#else -class QMacSavedPortInfo -{ -public: - inline QMacSavedPortInfo() { } - inline QMacSavedPortInfo(QPaintDevice *) { } - inline QMacSavedPortInfo(QPaintDevice *, const QRect &) { } - inline QMacSavedPortInfo(QPaintDevice *, const QRegion &) { } - ~QMacSavedPortInfo() { } - static inline bool setClipRegion(const QRect &) { return false; } - static inline bool setClipRegion(const QRegion &) { return false; } - static inline bool setPaintDevice(QPaintDevice *) { return false; } -}; -#endif - class QCoreGraphicsPaintEnginePrivate; class QCoreGraphicsPaintEngine : public QPaintEngine { -- cgit v1.2.3 From 11fb6f876b94869921fa9b560ce8a3f6ae38e1f5 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 24 Jul 2009 13:49:30 +0200 Subject: qdoc: Fixed all references to obsolete QHttp classes. --- doc/src/ipc.qdoc | 12 ++++++------ doc/src/porting4-overview.qdoc | 6 +++--- doc/src/porting4.qdoc | 20 ++++++++++---------- doc/src/qt4-network.qdoc | 10 +++++----- doc/src/qtnetwork.qdoc | 18 +++++++++--------- doc/src/threads.qdoc | 13 ++++++------- src/corelib/xml/qxmlstream.cpp | 17 +++++++++++------ src/gui/widgets/qprogressbar.cpp | 9 +++++---- src/network/access/qftp.cpp | 6 +++--- src/network/kernel/qauthenticator.cpp | 4 ++-- src/network/kernel/qnetworkproxy.cpp | 11 +++++------ src/network/socket/qabstractsocket.cpp | 2 +- src/network/socket/qtcpsocket.cpp | 8 ++++---- src/xml/sax/qxml.cpp | 18 ++++++------------ tools/qdoc3/htmlgenerator.cpp | 14 +++++++++++--- 15 files changed, 87 insertions(+), 81 deletions(-) diff --git a/doc/src/ipc.qdoc b/doc/src/ipc.qdoc index 1349fde13..1f9d36d76 100644 --- a/doc/src/ipc.qdoc +++ b/doc/src/ipc.qdoc @@ -61,12 +61,12 @@ \section1 TCP/IP - The cross-platform \l{QtNetwork} module - provides classes that make network programming portable and - easy. It offers high-level classes (e.g., QHttp, QFtp) that - communicate using specific application-level protocols, and - lower-level classes (e.g., QTcpSocket, QTcpServer, QSslSocket) for - implementing protocols. + The cross-platform \l{QtNetwork} module provides classes that make + network programming portable and easy. It offers high-level + classes (e.g., QNetworkAccessManager, QFtp) that communicate using + specific application-level protocols, and lower-level classes + (e.g., QTcpSocket, QTcpServer, QSslSocket) for implementing + protocols. \section1 Shared Memory diff --git a/doc/src/porting4-overview.qdoc b/doc/src/porting4-overview.qdoc index 3494c6de9..3c3c0851b 100644 --- a/doc/src/porting4-overview.qdoc +++ b/doc/src/porting4-overview.qdoc @@ -195,9 +195,9 @@ QNetworkRequest, QNetworkReply, and QNetworkAccessManager documentation for further details. - It is also possible to perform operations on remote files - through the QHttp and QFtp classes, and on local files with - the QFile class. + It is also possible to perform operations on remote files through + the QNetworkAccessManager and QFtp classes, and on local files + with the QFile class. \section2 SQL Cursors (QSqlCursor) diff --git a/doc/src/porting4.qdoc b/doc/src/porting4.qdoc index 2414c4da5..963b91823 100644 --- a/doc/src/porting4.qdoc +++ b/doc/src/porting4.qdoc @@ -1977,7 +1977,7 @@ \table \header \o Qt 3 function \o Qt 4 equivalents - \row \o QImageIO::description() \o QImageWriter::description() + \row \o QImageIO::description() \o QImageWriter::text() \row \o QImageIO::fileName() \o QImageReader::fileName() and QImageWriter::fileName() \row \o QImageIO::format() \o QImageReader::format() and QImageWriter::format() \row \o QImageIO::gamma() \o QImageWriter::gamma() @@ -1988,7 +1988,7 @@ \row \o QImageIO::parameters() \o N/A \row \o QImageIO::quality() \o QImageWriter::quality() \row \o QImageIO::read() \o QImageReader::read() - \row \o QImageIO::setDescription() \o QImageWriter::setDescription() + \row \o QImageIO::setDescription() \o QImageWriter::setText() \row \o QImageIO::setFileName() \o QImageReader::setFileName() and QImageWriter::setFileName() \row \o QImageIO::setFormat() \o QImageReader::setFormat() and QImageWriter::setFormat() \row \o QImageIO::setGamma() \o QImageWriter::setGamma() @@ -2350,8 +2350,9 @@ Q3NetworkProtocolFactory, and Q3NetworkOperation and have been moved to the Qt3Support library. - In Qt 4 applications, you can use classes like QFtp and QHttp - directly to perform file-related actions on a remote host. + In Qt 4 applications, you can use classes like QFtp and + QNetworkAccessManager directly to perform file-related actions on + a remote host. \section1 QObject @@ -3241,12 +3242,11 @@ moved to the Qt3Support library. In Qt 4, there is no direct equivalent to Q3SocketDevice: - \list - \o If you use Q3SocketDevice in a thread to perform blocking network - I/O (a technique encouraged by the \e{Qt Quarterly} article - \l{http://doc.trolltech.com/qq/qq09-networkthread.html}{Unblocking Networking}), - you can now use QTcpSocket, QFtp, or QHttp instead, which can now be used from - non-GUI threads. + \list \o If you use Q3SocketDevice in a thread to perform blocking + network I/O (a technique encouraged by the \e{Qt Quarterly} + article \l{http://doc.trolltech.com/qq/qq09-networkthread.html} + {Unblocking Networking}), you can now use QTcpSocket, QFtp, or + QNetworkAccessManager, which can be used from non-GUI threads. \o If you use Q3SocketDevice for UDP, you can now use QUdpSocket instead. diff --git a/doc/src/qt4-network.qdoc b/doc/src/qt4-network.qdoc index 3b3091eda..5e1999e4e 100644 --- a/doc/src/qt4-network.qdoc +++ b/doc/src/qt4-network.qdoc @@ -109,9 +109,10 @@ of programming, with the networking logic concentrated in one or two functions instead of spread across multiple slots. - QFtp and QHttp use QTcpSocket internally to implement the FTP and - HTTP protocols. Both classes work asynchronously and can schedule - (i.e., queue) requests. + QFtp and QNetworkAccessManager and its associated classes use + QTcpSocket internally to implement the FTP and HTTP protocols. The + classes work asynchronously and can schedule (i.e., queue) + requests. The network module contains four helper classes: QHostAddress, QHostInfo, QUrl, and QUrlInfo. QHostAddress stores an IPv4 or IPv6 @@ -198,8 +199,7 @@ level QNetworkProtocol and QUrlOperator abstraction has been eliminated. These classes attempted the impossible (unify FTP and HTTP under one roof), and unsurprisingly failed at that. Qt 4 - still provides QFtp and QHttp classes, but only with the more - mature API that appeared in Qt 3.1. + still provides QFtp, and it also proveds the QNetworkAccessManager. The QSocket class in Qt 3 has been renamed QTcpSocket. The new class is reentrant and supports blocking. It's also easier to diff --git a/doc/src/qtnetwork.qdoc b/doc/src/qtnetwork.qdoc index 0443f0ffa..3802273ca 100644 --- a/doc/src/qtnetwork.qdoc +++ b/doc/src/qtnetwork.qdoc @@ -145,11 +145,11 @@ \l{QFtp::commandFinished()}{commandFinished()} signal with the command ID for each command that is executed. - \o \e{Data transfer progress indicators.} QFtp emits - signals whenever data is transferred - (QFtp::dataTransferProgress(), QHttp::dataReadProgress(), and - QHttp::dataSendProgress()). You could connect these signals to - QProgressBar::setProgress() or QProgressDialog::setProgress(), + \o \e{Data transfer progress indicators.} QFtp emits signals + whenever data is transferred (QFtp::dataTransferProgress(), + QNetworkReply::downloadProgress(), and + QNetworkReply::uploadProgress()). You could connect these signals + to QProgressBar::setProgress() or QProgressDialog::setProgress(), for example. \o \e{QIODevice support.} The class supports convenient @@ -196,10 +196,10 @@ will then stop immediately. QTcpSocket works asynchronously and emits signals to report status - changes and errors, just like QHttp and QFtp. It relies on the - event loop to detect incoming data and to automatically flush - outgoing data. You can write data to the socket using - QTcpSocket::write(), and read data using + changes and errors, just like QNetworkAccessManager and QFtp. It + relies on the event loop to detect incoming data and to + automatically flush outgoing data. You can write data to the + socket using QTcpSocket::write(), and read data using QTcpSocket::read(). QTcpSocket represents two independent streams of data: one for reading and one for writing. diff --git a/doc/src/threads.qdoc b/doc/src/threads.qdoc index 8469f5156..067de5f1d 100644 --- a/doc/src/threads.qdoc +++ b/doc/src/threads.qdoc @@ -362,13 +362,12 @@ \section2 QObject Reentrancy QObject is reentrant. Most of its non-GUI subclasses, such as - QTimer, QTcpSocket, QUdpSocket, QHttp, QFtp, and QProcess, are - also reentrant, making it possible to use these classes from - multiple threads simultaneously. Note that these classes are - designed to be created and used from within a single thread; - creating an object in one thread and calling its functions from - another thread is not guaranteed to work. There are three - constraints to be aware of: + QTimer, QTcpSocket, QUdpSocket, QFtp, and QProcess, are also + reentrant, making it possible to use these classes from multiple + threads simultaneously. Note that these classes are designed to be + created and used from within a single thread; creating an object + in one thread and calling its functions from another thread is not + guaranteed to work. There are three constraints to be aware of: \list \o \e{The child of a QObject must always be created in the thread diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp index 42ed04efc..3e8f73e48 100644 --- a/src/corelib/xml/qxmlstream.cpp +++ b/src/corelib/xml/qxmlstream.cpp @@ -334,12 +334,17 @@ QXmlStreamEntityResolver *QXmlStreamReader::entityResolver() const from the PrematureEndOfDocumentError error and continues parsing the new data with the next call to readNext(). - For example, if you read data from the network using QHttp, you - would connect its \l{QHttp::readyRead()}{readyRead()} signal to a - custom slot. In this slot, you read all available data with - \l{QHttp::readAll()}{readAll()} and pass it to the XML stream reader - using addData(). Then you call your custom parsing function that - reads the XML events from the reader. + For example, if your application reads data from the network using a + \l{QNetworkAccessManager} {network access manager}, you would issue + a \l{QNetworkRequest} {network request} to the manager and receive a + \l{QNetworkReply} {network reply} in return. Since a QNetworkReply + is a QIODevice, you connect its \l{QNetworkReply::readyRead()} + {readyRead()} signal to a custom slot, e.g. \c{slotReadyRead()} in + the code snippet shown in the discussion for QNetworkAccessManager. + In this slot, you read all available data with + \l{QNetworkReply::readAll()} {readAll()} and pass it to the XML + stream reader using addData(). Then you call your custom parsing + function that reads the XML events from the reader. \section1 Performance and memory consumption diff --git a/src/gui/widgets/qprogressbar.cpp b/src/gui/widgets/qprogressbar.cpp index 6593cd6ab..7e40c0d1d 100644 --- a/src/gui/widgets/qprogressbar.cpp +++ b/src/gui/widgets/qprogressbar.cpp @@ -190,10 +190,11 @@ bool QProgressBarPrivate::repaintRequired() const with setValue(). The progress bar can be rewound to the beginning with reset(). - If minimum and maximum both are set to 0, the bar shows a busy indicator - instead of a percentage of steps. This is useful, for example, when using - QFtp or QHttp to download items when they are unable to determine the - size of the item being downloaded. + If minimum and maximum both are set to 0, the bar shows a busy + indicator instead of a percentage of steps. This is useful, for + example, when using QFtp or QNetworkAccessManager to download + items when they are unable to determine the size of the item being + downloaded. \table \row \o \inlineimage macintosh-progressbar.png Screenshot of a Macintosh style progress bar diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index 421e6714e..b00f4a414 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -1388,7 +1388,7 @@ int QFtpPrivate::addCommand(QFtpCommand *cmd) \warning The current version of QFtp doesn't fully support non-Unix FTP servers. - \sa QHttp, QNetworkAccessManager, QNetworkRequest, QNetworkReply, + \sa QNetworkAccessManager, QNetworkRequest, QNetworkReply, {FTP Example} */ @@ -1733,8 +1733,8 @@ int QFtp::setTransferMode(TransferMode mode) Enables use of the FTP proxy on host \a host and port \a port. Calling this function with \a host empty disables proxying. - QFtp does not support FTP-over-HTTP proxy servers. Use QHttp for - this. + QFtp does not support FTP-over-HTTP proxy servers. Use + QNetworkAccessManager for this. */ int QFtp::setProxy(const QString &host, quint16 port) { diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp index a26a1fcb9..8bad6d3ee 100644 --- a/src/network/kernel/qauthenticator.cpp +++ b/src/network/kernel/qauthenticator.cpp @@ -68,8 +68,8 @@ static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phas \inmodule QtNetwork The QAuthenticator class is usually used in the - \l{QHttp::}{authenticationRequired()} and - \l{QHttp::}{proxyAuthenticationRequired()} signals of QHttp and + \l{QNetworkAccessManager::}{authenticationRequired()} and + \l{QNetworkAccessManager::}{proxyAuthenticationRequired()} signals of QNetworkAccessManager and QAbstractSocket. The class provides a way to pass back the required authentication information to the socket when accessing services that require authentication. diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 608db65c3..df478fdb0 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -54,10 +54,10 @@ QNetworkProxy provides the method for configuring network layer proxy support to the Qt network classes. The currently supported classes are QAbstractSocket, QTcpSocket, QUdpSocket, QTcpServer, - QHttp and QFtp. The proxy support is designed to be as transparent - as possible. This means that existing network-enabled applications - that you have written should automatically support network proxy - using the following code. + QNetworkAccessManager and QFtp. The proxy support is designed to + be as transparent as possible. This means that existing + network-enabled applications that you have written should + automatically support network proxy using the following code. \snippet doc/src/snippets/code/src_network_kernel_qnetworkproxy.cpp 0 @@ -160,8 +160,7 @@ \row \o Caching-only HTTP \o Implemented using normal HTTP commands, it is useful only - in the context of HTTP requests (see QHttp, - QNetworkAccessManager) + in the context of HTTP requests (see QNetworkAccessManager) \o CachingCapability, HostNameLookupCapability \row diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 290522cbf..c8ddce001 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -160,7 +160,7 @@ issue to be aware of, though: You must make sure that enough data is available before attempting to read it using operator>>(). - \sa QFtp, QHttp, QTcpServer + \sa QFtp, QNetworkAccessManager, QTcpServer */ /*! diff --git a/src/network/socket/qtcpsocket.cpp b/src/network/socket/qtcpsocket.cpp index dc0439d13..60722cce1 100644 --- a/src/network/socket/qtcpsocket.cpp +++ b/src/network/socket/qtcpsocket.cpp @@ -60,10 +60,10 @@ \bold{Note:} TCP sockets cannot be opened in QIODevice::Unbuffered mode. - \sa QTcpServer, QUdpSocket, QFtp, QHttp, {Fortune Server Example}, - {Fortune Client Example}, {Threaded Fortune Server Example}, - {Blocking Fortune Client Example}, {Loopback Example}, - {Torrent Example} + \sa QTcpServer, QUdpSocket, QFtp, QNetworkAccessManager, + {Fortune Server Example}, {Fortune Client Example}, + {Threaded Fortune Server Example}, {Blocking Fortune Client Example}, + {Loopback Example}, {Torrent Example} */ #include "qlist.h" diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index 6be698842..fe1e74056 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -3012,19 +3012,13 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() parse() to work incrementally, and making subsequent calls to the parseContinue() function, until all the data has been processed. - A common way to perform incremental parsing is to connect the - \c readyRead() signal of the input source to a slot, and handle the - incoming data there. For example, the following code shows how a - parser for \l{http://web.resource.org/rss/1.0/}{RSS feeds} can be - used to incrementally parse data that it receives from a QHttp - object: - - \snippet doc/src/snippets/xml/rsslisting/rsslisting.cpp 1 - + A common way to perform incremental parsing is to connect the \c + readyRead() signal of a \l{QNetworkReply} {network reply} a slot, + and handle the incoming data there. See QNetworkAccessManager. + Aspects of the parsing behavior can be adapted using setFeature() - and setProperty(). For example, the following code could be used - to enable reporting of namespace prefixes to the content handler: - + and setProperty(). + QXmlSimpleReader is not reentrant. If you want to use the class in threaded code, lock the code using QXmlSimpleReader with a locking mechanism, such as a QMutex. diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index d82e9f814..ab74f13c9 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -3523,9 +3523,17 @@ QString HtmlGenerator::getLink(const Atom *atom, if (relative) { if (relative->parent() != *node) { if (relative->status() != Node::Obsolete) { - relative->doc().location().warning(tr("Link to obsolete item '%1' in %2") - .arg(atom->string()) - .arg(marker->plainFullName(relative))); + bool porting = false; + if (relative->type() == Node::Fake) { + const FakeNode* fake = static_cast(relative); + if (fake->title().startsWith("Porting")) + porting = true; + } + QString name = marker->plainFullName(relative); + if (!porting && !name.startsWith("Q3")) + relative->doc().location().warning(tr("Link to obsolete item '%1' in %2") + .arg(atom->string()) + .arg(name)); #if 0 qDebug() << "Link to Obsolete entity" << (*node)->name(); -- cgit v1.2.3 From 034e3b490238bacded8b5c7db3d296833a850d6b Mon Sep 17 00:00:00 2001 From: Ritt Konstantin Date: Fri, 24 Jul 2009 14:25:36 +0200 Subject: fix minor issue introduced in 6ca14dc GetFileAttributes call can fire at least one more error - ERROR_NOT_READY (21) since now the fallback code will be executed for basic cases only Merge-request: 984 Reviewed-by: Joerg Bornemann --- src/corelib/io/qfsfileengine_win.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index 53f01449f..819034a2d 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -529,8 +529,7 @@ qint64 QFSFileEnginePrivate::nativeSize() const GetFileExInfoStandard, &attribData); if (!ok) { int errorCode = GetLastError(); - if (errorCode != ERROR_INVALID_NAME - && errorCode != ERROR_FILE_NOT_FOUND && errorCode != ERROR_PATH_NOT_FOUND) { + if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) { QByteArray path = nativeFilePath; // path for the FindFirstFile should not end with a trailing slash while (path.endsWith('\\')) @@ -903,8 +902,7 @@ static inline bool isDirPath(const QString &dirPath, bool *existed) DWORD fileAttrib = ::GetFileAttributes((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16()); if (fileAttrib == INVALID_FILE_ATTRIBUTES) { int errorCode = GetLastError(); - if (errorCode != ERROR_INVALID_NAME - && errorCode != ERROR_FILE_NOT_FOUND && errorCode != ERROR_PATH_NOT_FOUND) { + if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) { // path for the FindFirstFile should not end with a trailing slash while (path.endsWith(QLatin1Char('\\'))) path.chop(1); @@ -1194,8 +1192,7 @@ bool QFSFileEnginePrivate::doStat() const fileAttrib = GetFileAttributes((wchar_t*)QFSFileEnginePrivate::longFileName(fname).utf16()); if (fileAttrib == INVALID_FILE_ATTRIBUTES) { int errorCode = GetLastError(); - if (errorCode != ERROR_INVALID_NAME - && errorCode != ERROR_FILE_NOT_FOUND && errorCode != ERROR_PATH_NOT_FOUND) { + if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) { QString path = QDir::toNativeSeparators(fname); // path for the FindFirstFile should not end with a trailing slash while (path.endsWith(QLatin1Char('\\'))) @@ -1810,8 +1807,7 @@ QDateTime QFSFileEngine::fileTime(FileTime time) const bool ok = ::GetFileAttributesEx((wchar_t*)QFSFileEnginePrivate::longFileName(d->filePath).utf16(), GetFileExInfoStandard, &attribData); if (!ok) { int errorCode = GetLastError(); - if (errorCode != ERROR_INVALID_NAME - && errorCode != ERROR_FILE_NOT_FOUND && errorCode != ERROR_PATH_NOT_FOUND) { + if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) { QString path = QDir::toNativeSeparators(d->filePath); // path for the FindFirstFile should not end with a trailing slash while (path.endsWith(QLatin1Char('\\'))) -- cgit v1.2.3 From 03b8a4cca5f4523f9fe50434193b938171f8f2f9 Mon Sep 17 00:00:00 2001 From: Ritt Konstantin Date: Fri, 24 Jul 2009 15:06:12 +0200 Subject: improve qfileinfo autotest a bit add a few more subtests; fix fileTimes_oldFile test for non-UTC time Merge-request: 966 Reviewed-by: Joerg Bornemann --- tests/auto/qfileinfo/tst_qfileinfo.cpp | 42 +++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index e5831fdde..512f2b640 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -153,9 +153,7 @@ private slots: void brokenShortcut(); #endif -#ifdef Q_OS_UNIX void isWritable(); -#endif void isExecutable(); void testDecomposedUnicodeNames_data(); void testDecomposedUnicodeNames(); @@ -249,6 +247,7 @@ void tst_QFileInfo::isFile_data() QTest::newRow("data1") << "tst_qfileinfo.cpp" << true; QTest::newRow("data2") << ":/tst_qfileinfo/resources/" << false; QTest::newRow("data3") << ":/tst_qfileinfo/resources/file1" << true; + QTest::newRow("data4") << ":/tst_qfileinfo/resources/afilethatshouldnotexist" << false; } void tst_QFileInfo::isFile() @@ -280,6 +279,7 @@ void tst_QFileInfo::isDir_data() QTest::newRow("data1") << "tst_qfileinfo.cpp" << false; QTest::newRow("data2") << ":/tst_qfileinfo/resources/" << true; QTest::newRow("data3") << ":/tst_qfileinfo/resources/file1" << false; + QTest::newRow("data4") << ":/tst_qfileinfo/resources/afilethatshouldnotexist" << false; QTest::newRow("simple dir") << "resources" << true; QTest::newRow("simple dir with slash") << "resources/" << true; @@ -316,8 +316,10 @@ void tst_QFileInfo::isRoot_data() QTest::newRow("data0") << QDir::currentPath() << false; QTest::newRow("data1") << "/" << true; - QTest::newRow("data2") << ":/tst_qfileinfo/resources/" << false; - QTest::newRow("data3") << ":/" << true; + QTest::newRow("data2") << "*" << false; + QTest::newRow("data3") << "/*" << false; + QTest::newRow("data4") << ":/tst_qfileinfo/resources/" << false; + QTest::newRow("data5") << ":/" << true; QTest::newRow("simple dir") << "resources" << false; QTest::newRow("simple dir with slash") << "resources/" << false; @@ -325,6 +327,7 @@ void tst_QFileInfo::isRoot_data() #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) QTest::newRow("drive 1") << "c:" << false; QTest::newRow("drive 2") << "c:/" << true; + QTest::newRow("drive 3") << "p:/" << false; QTest::newRow("unc 1") << "//" + QtNetworkSettings::winServerName() << true; QTest::newRow("unc 2") << "//" + QtNetworkSettings::winServerName() + "/" << true; QTest::newRow("unc 3") << "//" + QtNetworkSettings::winServerName() + "/testshare" << false; @@ -916,18 +919,27 @@ void tst_QFileInfo::fileTimes_oldFile() NULL); // Set file times back to 1601. + SYSTEMTIME stime; + stime.wYear = 1601; + stime.wMonth = 1; + stime.wDayOfWeek = 1; + stime.wDay = 1; + stime.wHour = 1; + stime.wMinute = 0; + stime.wSecond = 0; + stime.wMilliseconds = 0; + FILETIME ctime; - ctime.dwLowDateTime = 1; - ctime.dwHighDateTime = 0; + QVERIFY(SystemTimeToFileTime(&stime, &ctime)); FILETIME atime = ctime; FILETIME mtime = atime; QVERIFY(fileHandle); QVERIFY(SetFileTime(fileHandle, &ctime, &atime, &mtime) != 0); - QFileInfo info("oldfile.txt"); - QCOMPARE(info.lastModified(), QDateTime(QDate(1601, 1, 1), QTime(1, 0))); - CloseHandle(fileHandle); + + QFileInfo info("oldfile.txt"); + QCOMPARE(info.lastModified(), QDateTime(QDate(1601, 1, 1), QTime(1, 0), Qt::UTC).toLocalTime()); #endif } @@ -959,8 +971,8 @@ void tst_QFileInfo::isHidden_data() { QTest::addColumn("path"); QTest::addColumn("isHidden"); - foreach (QFileInfo info, QDir::drives()) { - QTest::newRow(qPrintable("drive." + info.path())) << info.path() << false; + foreach (const QFileInfo& info, QDir::drives()) { + QTest::newRow(qPrintable("drive." + info.path())) << info.path() << false; } #ifdef Q_OS_MAC QTest::newRow("mac_etc") << QString::fromLatin1("/etc") << true; @@ -1061,15 +1073,19 @@ void tst_QFileInfo::brokenShortcut() } #endif -#ifdef Q_OS_UNIX void tst_QFileInfo::isWritable() { + QVERIFY(QFileInfo("tst_qfileinfo.cpp").isWritable()); +#ifdef Q_OS_WIN + QVERIFY(!QFileInfo("c:\\pagefile.sys").isWritable()); +#endif +#ifdef Q_OS_UNIX if (::getuid() == 0) QVERIFY(QFileInfo("/etc/passwd").isWritable()); else QVERIFY(!QFileInfo("/etc/passwd").isWritable()); -} #endif +} void tst_QFileInfo::isExecutable() { -- cgit v1.2.3 From e8df0f74667f9b8c20630f10d1fa5d4c9d681355 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 24 Jul 2009 15:45:19 +0200 Subject: Make test more robust against the case-insensitive file system on Windows, and link against a regular Qt build. Reviewed-by: Trustme --- tests/auto/qfiledialog/tst_qfiledialog.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp index 50cab0e82..78a9d74be 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp @@ -402,7 +402,11 @@ void tst_QFiledialog::directory() // Check my way QList list = qFindChildren(&fd, "listView"); QVERIFY(list.count() > 0); +#ifdef Q_OS_WIN + QCOMPARE(list.at(0)->rootIndex().data().toString().toLower(), temp.dirName().toLower()); +#else QCOMPARE(list.at(0)->rootIndex().data().toString(), temp.dirName()); +#endif QNonNativeFileDialog *dlg = new QNonNativeFileDialog(0, "", tempPath); QCOMPARE(model->index(tempPath), model->index(dlg->directory().absolutePath())); QCOMPARE(model->index(tempPath).data(QFileSystemModel::FileNameRole).toString(), @@ -2029,6 +2033,7 @@ void tst_QFiledialog::task254490_selectFileMultipleTimes() void tst_QFiledialog::task257579_sideBarWithNonCleanUrls() { +#if defined QT_BUILD_INTERNAL QDir tempDir = QDir::temp(); QLatin1String dirname("autotest_task257579"); tempDir.rmdir(dirname); //makes sure it doesn't exist any more @@ -2044,6 +2049,7 @@ void tst_QFiledialog::task257579_sideBarWithNonCleanUrls() //all tests are finished, we can remove the temporary dir QVERIFY(tempDir.rmdir(dirname)); +#endif } -- cgit v1.2.3 From a588ca19acd2f0f6a55426a30d8ef029d8dbb99b Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 24 Jul 2009 15:59:44 +0200 Subject: Nested classes need to be exported as well. This makes the QPixmapCache autotest link and pass on Windows. Reviewed-by: Trustme --- src/gui/image/qpixmapcache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h index c86f3fa5a..de589fc2b 100644 --- a/src/gui/image/qpixmapcache.h +++ b/src/gui/image/qpixmapcache.h @@ -54,7 +54,7 @@ class Q_GUI_EXPORT QPixmapCache { public: class KeyData; - class Key + class Q_GUI_EXPORT Key { public: Key(); -- cgit v1.2.3 From 11985909ddb17283e392244ee72ed54baa9a7339 Mon Sep 17 00:00:00 2001 From: Thomas Sondergaard Date: Fri, 24 Jul 2009 15:56:05 +0200 Subject: Specify widget when calling QToolTip::showText() to make sure the tool tip ends up on the right X11 screen. Merge-request: 987 Reviewed-by: Olivier Goffart --- src/gui/graphicsview/qgraphicsscene.cpp | 5 ++--- src/gui/widgets/qworkspace.cpp | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 4796436c4..9b6414dbb 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -3457,7 +3457,7 @@ void QGraphicsScene::helpEvent(QGraphicsSceneHelpEvent *helpEvent) text = toolTipItem->toolTip(); point = helpEvent->screenPos(); } - QToolTip::showText(point, text); + QToolTip::showText(point, text, helpEvent->widget()); helpEvent->setAccepted(!text.isEmpty()); #endif } @@ -3556,8 +3556,7 @@ void QGraphicsScenePrivate::leaveScene() { Q_Q(QGraphicsScene); #ifndef QT_NO_TOOLTIP - // Remove any tooltips - QToolTip::showText(QPoint(), QString()); + QToolTip::hideText(); #endif // Send HoverLeave events to all existing hover items, topmost first. QGraphicsView *senderWidget = qobject_cast(q->sender()); diff --git a/src/gui/widgets/qworkspace.cpp b/src/gui/widgets/qworkspace.cpp index 2833c0833..31841409b 100644 --- a/src/gui/widgets/qworkspace.cpp +++ b/src/gui/widgets/qworkspace.cpp @@ -110,11 +110,11 @@ bool QMDIControl::event(QEvent *event) QStyle::SubControl ctrl = style()->hitTestComplexControl(QStyle::CC_MdiControls, &opt, helpEvent->pos(), this); if (ctrl == QStyle::SC_MdiCloseButton) - QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Close")); + QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Close"), this); else if (ctrl == QStyle::SC_MdiMinButton) - QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Minimize")); + QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Minimize"), this); else if (ctrl == QStyle::SC_MdiNormalButton) - QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Restore Down")); + QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Restore Down"), this); else QToolTip::hideText(); #endif // QT_NO_TOOLTIP -- cgit v1.2.3 From 4d99029334105f2df9f424fd0c4764cce3230ef0 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Fri, 24 Jul 2009 16:20:55 +0200 Subject: Fix missing mnemonics when triggering menus by shortcut When opening a menu by shortcut on Windows, we would loose the keyboard mnemonic when navigating around. This is incorrect compared to native applications and somewhat inconvenient. The fix is basically to enable the keyboard mode when shortcuts are triggered, not only when the alt-key is pressed. Task-number: 254496 Reviewed-by: denis --- src/gui/widgets/qmenubar.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index 6b9387925..1cfb9b31d 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -1758,6 +1758,9 @@ void QMenuBarPrivate::_q_internalShortcutActivated(int id) activateAction(act, QAction::Trigger); //100 is the same as the default value in QPushButton::animateClick autoReleaseTimer.start(100, q); + } else if (act && q->style()->styleHint(QStyle::SH_MenuBar_AltKeyNavigation, 0, q)) { + // When we open a menu using a shortcut, we should end up in keyboard state + setKeyboardMode(true); } } -- cgit v1.2.3 From 365cbdf74aa0f5933bf938922ebb48fa8e37d8ce Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 24 Jul 2009 16:31:47 +0200 Subject: Make the internal testcase more robust on Windows FS as well --- tests/auto/qfiledialog/tst_qfiledialog.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp index 78a9d74be..c31ecf240 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp @@ -2045,7 +2045,12 @@ void tst_QFiledialog::task257579_sideBarWithNonCleanUrls() QCOMPARE(sidebar->urls().count(), 1); QVERIFY(sidebar->urls().first().toLocalFile() != url); QCOMPARE(sidebar->urls().first().toLocalFile(), QDir::cleanPath(url)); + +#ifdef Q_OS_WIN + QCOMPARE(sidebar->model()->index(0,0).data().toString().toLower(), tempDir.dirName().toLower()); +#else QCOMPARE(sidebar->model()->index(0,0).data().toString(), tempDir.dirName()); +#endif //all tests are finished, we can remove the temporary dir QVERIFY(tempDir.rmdir(dirname)); -- cgit v1.2.3 From f74b368c08f9bd1f638f32bccdb4da6dbd89cfea Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Fri, 24 Jul 2009 16:54:55 +0200 Subject: Add an ARGB check for EGL-provided X visuals Don't just assume they're going to be ARGB just because the config has an alpha channel. This makes QGLWidgets with WA_TranslucentBackground set work again on the rx71 when running under xcompmgr. Reviewed-By: Trustme --- src/opengl/qgl_x11egl.cpp | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp index 99b026d85..c6904fe8d 100644 --- a/src/opengl/qgl_x11egl.cpp +++ b/src/opengl/qgl_x11egl.cpp @@ -258,7 +258,8 @@ void QGLWidget::setContext(QGLContext *context, const QGLContext* shareContext, // If the application has set WA_TranslucentBackground and not explicitly set // the alpha buffer size to zero, modify the format so it have an alpha channel QGLFormat& fmt = d->glcx->d_func()->glFormat; - if (testAttribute(Qt::WA_TranslucentBackground) && fmt.alphaBufferSize() == -1) + const bool useArgbVisual = testAttribute(Qt::WA_TranslucentBackground); + if (useArgbVisual && fmt.alphaBufferSize() == -1) fmt.setAlphaBufferSize(1); bool createFailed = false; @@ -297,8 +298,24 @@ void QGLWidget::setContext(QGLContext *context, const QGLContext* shareContext, int matchingCount = 0; chosenVisualInfo = XGetVisualInfo(x11Info().display(), VisualIDMask, &vi, &matchingCount); if (chosenVisualInfo) { - qDebug("Using X Visual ID (%d) provided by EGL", (int)vi.visualid); - vi = *chosenVisualInfo; + if (useArgbVisual) { + // Check to make sure the visual provided by EGL is ARGB + XRenderPictFormat *format; + format = XRenderFindVisualFormat(x11Info().display(), chosenVisualInfo->visual); + if (format->type == PictTypeDirect && format->direct.alphaMask) { + qDebug("Using opaque X Visual ID (%d) provided by EGL", (int)vi.visualid); + vi = *chosenVisualInfo; + } + else { + qWarning("Warning: EGL suggested using X visual ID %d for config %d, but this is not ARGB", + nativeVisualId, (int)qeglCtx->config()); + vi.visualid = 0; + } + } + else { + qDebug("Using opaque X Visual ID (%d) provided by EGL", (int)vi.visualid); + vi = *chosenVisualInfo; + } XFree(chosenVisualInfo); } else { -- cgit v1.2.3 From 960c0a8661e3df311a85075b0ff610c4031c6012 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Fri, 24 Jul 2009 17:41:56 +0200 Subject: Fix QSystemTrayIcon causing three activated signals on doubleclick The problem was that on Windows, we would activate on WM_LButtonUp, but a double click after activating will also generate a second WM_LButtonUp. Hence we get three activations. The fix was basically to filter out the second WM_LButtonUP, something we also do in qapplication_win.cpp. Task-number: 205499 Reviewed-by: denis --- src/gui/util/qsystemtrayicon_win.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp index 85eae2678..a0648a174 100644 --- a/src/gui/util/qsystemtrayicon_win.cpp +++ b/src/gui/util/qsystemtrayicon_win.cpp @@ -106,6 +106,7 @@ public: private: uint notifyIconSize; int maxTipLength; + bool ignoreNextMouseRelease; }; bool QSystemTrayIconSys::allowsMessages() @@ -128,7 +129,8 @@ bool QSystemTrayIconSys::supportsMessages() } QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *object) - : hIcon(0), q(object) + : hIcon(0), q(object), ignoreNextMouseRelease(false) + { #ifndef Q_OS_WINCE notifyIconSize = FIELD_OFFSET(NOTIFYICONDATA, guidItem); // NOTIFYICONDATAW_V2_SIZE; @@ -311,10 +313,15 @@ bool QSystemTrayIconSys::winEvent( MSG *m, long *result ) switch (m->lParam) { case WM_LBUTTONUP: - emit q->activated(QSystemTrayIcon::Trigger); + if (ignoreNextMouseRelease) + ignoreNextMouseRelease = false; + else + emit q->activated(QSystemTrayIcon::Trigger); break; case WM_LBUTTONDBLCLK: + ignoreNextMouseRelease = true; // Since DBLCLICK Generates a second mouse + // release we must ignore it emit q->activated(QSystemTrayIcon::DoubleClick); break; -- cgit v1.2.3 From dffbcfb0adcad91f959a47edfdb5dd623c803306 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 24 Jul 2009 21:00:28 +0200 Subject: Re-disable QtConcurrent build with Sun CC 5.9. QtCore compiled, but of course that means very little since most of QtConcurrent's problems are in the template code, which isn't instantiated inside QtCore. Examples and tests all failed to build... I'm almost done getting it to work with that compiler, but it will take me a little more time. I'm refactoring a bit of the QtConcurrent code, so that things compile more smoothly, using partial template specialisation. To be on the safe side, re-disable for xlC 7 too. --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 4b75a7555..5faa45194 100755 --- a/configure +++ b/configure @@ -6116,6 +6116,7 @@ case "$XPLATFORM" in ;; 5.9) canBuildWebKit="no" + canBuildQtConcurrent="no" ;; esac ;; @@ -6158,6 +6159,7 @@ EOF ;; *) canBuildWebKit="no" + canBuildQtConcurrent="no" ;; esac ;; -- cgit v1.2.3 From b7c29570b9f6fecb6f042532f81e100a1f9b99a9 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 24 Jul 2009 22:39:55 +0200 Subject: Implement a new custom deleter implementation for QSharedPointer Instead of using a template class derived from QtSharedPointer::ExternalRefCountData, use a non-template class that has a function pointer. This avoids generating a virtual table for each QSharedPointer type and custom deleter. The trick here is that we don't "new" the d pointer anymore, but we simply allocate memory (via ::operator new, so it may throw an exception), then we use the placement new to initialise the non-template d-pointer and the template deleter sub-objects. Then we store the pointer to a regular function which will execute the user's custom deleter. I also added operator delete() to the class to make sure no smarty compiler decides to delete the d-pointer with a fixed size (I don't think that happens, but just to be on the safe side). --- src/corelib/tools/qsharedpointer_impl.h | 55 ++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 739a949fd..706c6ab48 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -189,6 +189,59 @@ namespace QtSharedPointer { inline bool destroy() { executeDeleter(ptr, deleter); return true; } }; + template + struct CustomDeleter + { + Deleter deleter; + T *ptr; + + inline CustomDeleter(T *p, Deleter d) : deleter(d), ptr(p) {} + }; + + struct ExternalRefCountWithDestroyFn: public ExternalRefCountData + { + typedef void (*DestroyerFn)(ExternalRefCountData *); + DestroyerFn destroyer; + + inline ExternalRefCountWithDestroyFn(DestroyerFn d) + : destroyer(d) + { } + + inline bool destroy() { destroyer(this); return true; } + inline void operator delete(void *ptr) { ::operator delete(ptr); } + }; + + template + struct ExternalRefCountWithCustomDeleter: public ExternalRefCountWithDestroyFn + { + typedef ExternalRefCountWithCustomDeleter Self; + typedef ExternalRefCountWithDestroyFn Parent; + typedef CustomDeleter Next; + Next extra; + + static inline void deleter(ExternalRefCountData *self) + { + Self *realself = static_cast(self); + executeDeleter(realself->extra.ptr, realself->extra.deleter); + } + + static inline Self *create(T *ptr, Deleter userDeleter) + { + DestroyerFn destroy = &deleter; + Self *d = static_cast(::operator new(sizeof(Self))); + + // initialize the two sub-objects + new (&d->extra) Next(ptr, userDeleter); + new (d) Parent(destroy); // can't throw + + return d; + } + private: + // prevent construction and the emission of virtual symbols + ExternalRefCountWithCustomDeleter(); + ~ExternalRefCountWithCustomDeleter(); + }; + template class ExternalRefCount: public Basic { @@ -217,7 +270,7 @@ namespace QtSharedPointer { Basic::internalConstruct(ptr); Q_ASSERT(!d); if (ptr) - d = new ExternalRefCountWithSpecializedDeleter(ptr, deleter); + d = ExternalRefCountWithCustomDeleter::create(ptr, deleter); } inline ExternalRefCount() : d(0) { } -- cgit v1.2.3 From 3a8c8583545b4d5eb0b1fe8d17838bea2b819703 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 24 Jul 2009 22:49:46 +0200 Subject: Remove the old specialised deleter implementation from QSharedPointer. This should be binary- and source-compatible, since these QSharedPointer internal classes aren't exported. The compiler should generate the symbols in all libraries and applications that used it, which means removing it from Qt won't affect them. (In fact, these symbols shouldn't be in QtCore at all, since we don't use QSharedPointer in it) --- src/corelib/tools/qsharedpointer_impl.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 706c6ab48..2d48bdbd2 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -177,18 +177,6 @@ namespace QtSharedPointer { virtual inline bool destroy() { return false; } }; - template - struct ExternalRefCountWithSpecializedDeleter: public ExternalRefCountData - { - T *ptr; - Deleter deleter; - - inline ExternalRefCountWithSpecializedDeleter(T *p, Deleter d) - : ptr(p), deleter(d) - { } - inline bool destroy() { executeDeleter(ptr, deleter); return true; } - }; - template struct CustomDeleter { -- cgit v1.2.3 From 585d01e0c2833e16899a502d53bfd62a32573b35 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 24 Jul 2009 22:52:10 +0200 Subject: Revert "Revert "Add support for creating the object alongside the Data structure in QSharedPointer"" This restores the original implementation of the creating function. The next commit will make it suitable for use. --- src/corelib/tools/qsharedpointer_impl.h | 47 +++++++++++ tests/auto/qsharedpointer/tst_qsharedpointer.cpp | 102 ++++++++++++++++++++++- 2 files changed, 147 insertions(+), 2 deletions(-) diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 2d48bdbd2..98f225b32 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -48,6 +48,7 @@ #pragma qt_sync_stop_processing #endif +#include #include #include // for qobject_cast @@ -230,6 +231,34 @@ namespace QtSharedPointer { ~ExternalRefCountWithCustomDeleter(); }; + template + struct ExternalRefCountWithContiguousData: public ExternalRefCountData + { +#ifdef Q_DECL_ALIGN +# ifdef Q_ALIGNOF +# define QSP_ALIGNOF(T) Q_ALIGNOF(T) +# else +# define QSP_ALIGNOF(T) (sizeof(T) >= 16 ? 16 : sizeof(T) >= 8 ? 8 : sizeof(T) >= 4 ? 4 : sizeof(T) >= 2 ? 2 : 1) +# endif + + char data[sizeof(T)] Q_DECL_ALIGN(QSP_ALIGNOF(T)); + inline T *pointer() { return reinterpret_cast(data); } + +# undef QSP_ALIGNOF +#else + union { + char data[sizeof(T) + 16]; + double dummy1; +# ifndef Q_OS_DARWIN + long double dummy2; +# endif + }; + inline T *pointer() { return reinterpret_cast(data + 16 - (quintptr(data) & 0xf)); } +#endif + + inline bool destroy() { this->pointer()->~T(); return true; } + }; + template class ExternalRefCount: public Basic { @@ -261,6 +290,16 @@ namespace QtSharedPointer { d = ExternalRefCountWithCustomDeleter::create(ptr, deleter); } + inline void internalCreate() + { + ExternalRefCountWithContiguousData *dd = new ExternalRefCountWithContiguousData; + T *ptr = dd->pointer(); + new (ptr) T(); // create + + Basic::internalConstruct(ptr); + d = dd; + } + inline ExternalRefCount() : d(0) { } inline ~ExternalRefCount() { if (d && !deref()) delete d; } inline ExternalRefCount(const ExternalRefCount &other) : Basic(other), d(other.d) @@ -388,6 +427,14 @@ public: inline void clear() { *this = QSharedPointer(); } QWeakPointer toWeakRef() const; + +public: + static QSharedPointer create() + { + QSharedPointer result; + result.internalCreate(); + return result; + } }; template diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp index 5cb435a8f..dd53e3c81 100644 --- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp @@ -65,8 +65,9 @@ private slots: void dynamicCastVirtualBase(); void dynamicCastFailure(); #endif - void customDeleter(); void constCorrectness(); + void customDeleter(); + void creating(); void validConstructs(); void invalidConstructs_data(); void invalidConstructs(); @@ -104,6 +105,8 @@ public: { delete this; } + + virtual int classLevel() { return 1; } }; int Data::generationCounter = 0; int Data::destructorCounter = 0; @@ -332,6 +335,8 @@ public: { delete this; } + + virtual int classLevel() { return 2; } }; int DerivedData::derivedDestructorCounter = 0; @@ -339,15 +344,23 @@ class Stuffing { public: char buffer[16]; + Stuffing() { for (uint i = 0; i < sizeof buffer; ++i) buffer[i] = 16 - i; } virtual ~Stuffing() { } }; class DiffPtrDerivedData: public Stuffing, public Data { +public: + virtual int classLevel() { return 3; } }; class VirtualDerived: virtual public Data { +public: + int moreData; + + VirtualDerived() : moreData(0xc0ffee) { } + virtual int classLevel() { return 4; } }; void tst_QSharedPointer::downCast() @@ -993,6 +1006,82 @@ void tst_QSharedPointer::customDeleter() QCOMPARE(derivedDataDeleter.callCount, 1); } +void tst_QSharedPointer::creating() +{ + Data::generationCounter = Data::destructorCounter = 0; + { + QSharedPointer ptr = QSharedPointer::create(); + QVERIFY(ptr.data()); + QCOMPARE(Data::generationCounter, 1); + QCOMPARE(ptr->generation, 1); + QCOMPARE(Data::destructorCounter, 0); + + QCOMPARE(ptr->classLevel(), 1); + + ptr.clear(); + QCOMPARE(Data::destructorCounter, 1); + } + + Data::generationCounter = Data::destructorCounter = 0; + { + QSharedPointer ptr = QSharedPointer::create(); + QWeakPointer weakptr = ptr; + QtSharedPointer::ExternalRefCountData *d = ptr.d; + + ptr.clear(); + QVERIFY(ptr.isNull()); + QCOMPARE(Data::destructorCounter, 1); + + // valgrind will complain here if something happened to the pointer + QVERIFY(d->weakref == 1); + QVERIFY(d->strongref == 0); + } + + Data::generationCounter = Data::destructorCounter = 0; + DerivedData::derivedDestructorCounter = 0; + { + QSharedPointer ptr = QSharedPointer::create(); + QCOMPARE(ptr->classLevel(), 2); + QCOMPARE(ptr.staticCast()->moreData, 0); + ptr.clear(); + + QCOMPARE(Data::destructorCounter, 1); + QCOMPARE(DerivedData::derivedDestructorCounter, 1); + } + + { + QSharedPointer ptr = QSharedPointer::create(); + QCOMPARE(ptr->classLevel(), 3); + QCOMPARE(ptr.staticCast()->buffer[7]+0, 16-7); + QCOMPARE(ptr.staticCast()->buffer[3]+0, 16-3); + QCOMPARE(ptr.staticCast()->buffer[0]+0, 16); + } + + { + QSharedPointer ptr = QSharedPointer::create(); + QCOMPARE(ptr->classLevel(), 4); + QCOMPARE(ptr->moreData, 0xc0ffee); + + QSharedPointer baseptr = ptr; + QCOMPARE(baseptr->classLevel(), 4); + } + + { + QSharedPointer ptr = QSharedPointer::create(); + QCOMPARE(ptr->metaObject(), &QObject::staticMetaObject); + + QPointer qptr = ptr.data(); + ptr.clear(); + + QVERIFY(qptr.isNull()); + } + + { + QSharedPointer ptr = QSharedPointer::create(); + QCOMPARE(ptr->metaObject(), &OtherObject::staticMetaObject); + } +} + void tst_QSharedPointer::validConstructs() { { @@ -1044,6 +1133,9 @@ void tst_QSharedPointer::invalidConstructs_data() << "forwardDeclaredDestructorRunCount = 0;\n" "{ QSharedPointer ptr = QSharedPointer(forwardPointer()); }\n" "exit(forwardDeclaredDestructorRunCount);"; + QTest::newRow("creating-forward-declaration") + << &QTest::QExternalTest::tryCompileFail + << "QSharedPointer::create();"; // upcast without cast operator: QTest::newRow("upcast1") @@ -1076,10 +1168,16 @@ void tst_QSharedPointer::invalidConstructs_data() << "QSharedPointer baseptr = QSharedPointer(new Data);\n" "qSharedPointerDynamicCast(baseptr);"; #endif - QTest::newRow("const-dropping-object-cast") + QTest::newRow("const-dropping-object-cast1") << &QTest::QExternalTest::tryCompileFail << "QSharedPointer baseptr = QSharedPointer(new QObject);\n" "qSharedPointerObjectCast(baseptr);"; +#ifndef QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION + QTest::newRow("const-dropping-object-cast2") + << &QTest::QExternalTest::tryCompileFail + << "QSharedPointer baseptr = QSharedPointer(new QObject);\n" + "qobject_cast(baseptr);"; +#endif // arithmethics through automatic cast operators QTest::newRow("arithmethic1") -- cgit v1.2.3 From 25c5de7f168652ff5c3e6e49d09567d3ef4b41fd Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 24 Jul 2009 23:05:34 +0200 Subject: Adapt the contiguous-creator code to use the new custom deleter code. We use the same trick as the custom deleter: we allocate memory for an object of class ExternalRefCountWithContiguousData, but we do that only to be certain of the alignment requirements for T. We initialise the d-pointer via placement new and the T object is left for initialisation by the outermost function. The reason for that last trick is to support passing parameters in the future with the least amount of template functions necessary. I still plan on supporting arguments only with C++0x (maybe up to one without). --- src/corelib/tools/qsharedpointer_impl.h | 53 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 98f225b32..2c9cd95e6 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -232,31 +232,31 @@ namespace QtSharedPointer { }; template - struct ExternalRefCountWithContiguousData: public ExternalRefCountData + struct ExternalRefCountWithContiguousData: public ExternalRefCountWithDestroyFn { -#ifdef Q_DECL_ALIGN -# ifdef Q_ALIGNOF -# define QSP_ALIGNOF(T) Q_ALIGNOF(T) -# else -# define QSP_ALIGNOF(T) (sizeof(T) >= 16 ? 16 : sizeof(T) >= 8 ? 8 : sizeof(T) >= 4 ? 4 : sizeof(T) >= 2 ? 2 : 1) -# endif + typedef ExternalRefCountWithDestroyFn Parent; + typedef ExternalRefCountWithContiguousData Self; + T data; - char data[sizeof(T)] Q_DECL_ALIGN(QSP_ALIGNOF(T)); - inline T *pointer() { return reinterpret_cast(data); } + static void deleter(ExternalRefCountData *self) + { + ExternalRefCountWithContiguousData *that = + static_cast(self); + that->data.~T(); + } -# undef QSP_ALIGNOF -#else - union { - char data[sizeof(T) + 16]; - double dummy1; -# ifndef Q_OS_DARWIN - long double dummy2; -# endif - }; - inline T *pointer() { return reinterpret_cast(data + 16 - (quintptr(data) & 0xf)); } -#endif + static inline ExternalRefCountData *create(T **ptr) + { + DestroyerFn destroy = &deleter; + Self *d = static_cast(::operator new(sizeof(Self))); + + // initialize the d-pointer sub-object + // leave d->data uninitialized + new (d) Parent(destroy); // can't throw - inline bool destroy() { this->pointer()->~T(); return true; } + *ptr = &d->data; + return d; + } }; template @@ -292,12 +292,10 @@ namespace QtSharedPointer { inline void internalCreate() { - ExternalRefCountWithContiguousData *dd = new ExternalRefCountWithContiguousData; - T *ptr = dd->pointer(); - new (ptr) T(); // create + T *ptr; + d = ExternalRefCountWithContiguousData::create(&ptr); Basic::internalConstruct(ptr); - d = dd; } inline ExternalRefCount() : d(0) { } @@ -429,10 +427,13 @@ public: QWeakPointer toWeakRef() const; public: - static QSharedPointer create() + static inline QSharedPointer create() { QSharedPointer result; result.internalCreate(); + + // now initialize the data + new (result.data()) T(); return result; } }; -- cgit v1.2.3 From f035995584ec384c03465fb3a7f73818eb8da652 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 25 Jul 2009 10:32:56 +0200 Subject: Update the test to work with GCC 4.4 too --- tests/auto/bic/tst_bic.cpp | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp index 36c35ff08..b5b503ded 100644 --- a/tests/auto/bic/tst_bic.cpp +++ b/tests/auto/bic/tst_bic.cpp @@ -261,22 +261,18 @@ QBic::Info tst_Bic::getCurrentInfo(const QString &libName) return QBic::Info(); } - QString resultFileName = QFileInfo(tmpQFile).fileName(); - static const char *suffixes[] = { ".t01.class", ".class", ".002t.class", 0 }; - for (const char **p = suffixes; true; ++p) { - if (!p) { - // we didn't find the file - qFatal("GCC didn't produce the expected intermediary files. Please update this test!"); - return QBic::Info(); - } - - QString check = resultFileName + *p; - if (!QFile::exists(check)) - continue; - - resultFileName = check; - break; + // See if we find the gcc output file, which seems to change + // from release to release + QStringList files = QDir().entryList(QStringList() << "*.class"); + if (files.isEmpty()) { + qFatal("Could not locate the GCC output file, update this test"); + return QBic::Info(); + } else if (files.size() > 1) { + qFatal("Located more than one output file, please clean up before running this test"); + return QBic::Info(); } + + QString resultFileName = files.first(); QBic::Info inf = bic.parseFile(resultFileName); QFile::remove(resultFileName); -- cgit v1.2.3 From 4a0b770b84e251ed00c6b35ff9d11c7a0d7f0ee8 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 25 Jul 2009 10:34:00 +0200 Subject: Add Perl code to remove template classes from the listing. It is possible to export symbols in template classes, but I don't think we use any such cases now (template specialisation). It only works properly with C++0x anyway (extern template). --- tests/auto/bic/gen.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/auto/bic/gen.sh b/tests/auto/bic/gen.sh index 2479a33cf..31031aad6 100755 --- a/tests/auto/bic/gen.sh +++ b/tests/auto/bic/gen.sh @@ -18,5 +18,9 @@ for module in $modules; do echo "#include <$module/$module>" >test.cpp g++ -c -I$QTDIR/include -DQT_NO_STL -DQT3_SUPPORT -fdump-class-hierarchy test.cpp mv test.cpp*.class $module.$2.txt + # Remove template classes from the output + perl -pi -e '$skip = 0 if (/^\n/); + $skip = 1 if (/^(Class|Vtable).* Date: Sat, 25 Jul 2009 10:34:28 +0200 Subject: Apply the script I added to gen.sh to existing files: remove template classes --- .../bic/data/Qt3Support.4.0.0.aix-gcc-power32.txt | 1215 +------- .../bic/data/Qt3Support.4.0.0.linux-gcc-amd64.txt | 1411 +-------- .../bic/data/Qt3Support.4.0.0.linux-gcc-ia32.txt | 1411 +-------- .../bic/data/Qt3Support.4.0.0.linux-gcc-ppc32.txt | 1413 +-------- .../bic/data/Qt3Support.4.0.0.macx-gcc-ppc32.txt | 1391 +-------- .../bic/data/Qt3Support.4.1.0.linux-gcc-ia32.txt | 1503 +--------- .../bic/data/Qt3Support.4.1.0.linux-gcc-ppc32.txt | 1525 +--------- .../bic/data/Qt3Support.4.1.0.macx-gcc-ia32.txt | 1447 +-------- .../bic/data/Qt3Support.4.1.0.macx-gcc-ppc32.txt | 1447 +-------- .../bic/data/Qt3Support.4.1.0.win32-gcc-ia32.txt | 1429 +-------- .../bic/data/Qt3Support.4.2.0.linux-gcc-ia32.txt | 1811 +---------- .../bic/data/Qt3Support.4.2.0.linux-gcc-ppc32.txt | 1815 +---------- .../bic/data/Qt3Support.4.2.0.macx-gcc-ia32.txt | 1745 +---------- .../bic/data/Qt3Support.4.2.0.macx-gcc-ppc32.txt | 1751 +---------- .../bic/data/Qt3Support.4.2.0.win32-gcc-ia32.txt | 1715 +---------- .../bic/data/Qt3Support.4.3.0.linux-gcc-ia32.txt | 1897 +----------- .../bic/data/Qt3Support.4.3.1.linux-gcc-ia32.txt | 1895 +----------- .../bic/data/Qt3Support.4.3.2.linux-gcc-ia32.txt | 1897 +----------- .../bic/data/Qt3Support.4.4.0.linux-gcc-ia32.txt | 3158 +------------------- .../auto/bic/data/QtCore.4.0.0.aix-gcc-power32.txt | 399 --- .../auto/bic/data/QtCore.4.0.0.linux-gcc-amd64.txt | 432 --- .../auto/bic/data/QtCore.4.0.0.linux-gcc-ia32.txt | 432 --- .../auto/bic/data/QtCore.4.0.0.linux-gcc-ppc32.txt | 2256 +------------- .../auto/bic/data/QtCore.4.0.0.macx-gcc-ppc32.txt | 412 --- .../auto/bic/data/QtCore.4.1.0.linux-gcc-ia32.txt | 496 --- .../auto/bic/data/QtCore.4.1.0.linux-gcc-ppc32.txt | 516 ---- tests/auto/bic/data/QtCore.4.1.0.macx-gcc-ia32.txt | 440 --- .../auto/bic/data/QtCore.4.1.0.macx-gcc-ppc32.txt | 440 --- .../auto/bic/data/QtCore.4.1.0.win32-gcc-ia32.txt | 420 --- .../auto/bic/data/QtCore.4.2.0.linux-gcc-ia32.txt | 718 ----- .../auto/bic/data/QtCore.4.2.0.linux-gcc-ppc32.txt | 714 ----- tests/auto/bic/data/QtCore.4.2.0.macx-gcc-ia32.txt | 638 ---- .../auto/bic/data/QtCore.4.2.0.macx-gcc-ppc32.txt | 642 ---- .../auto/bic/data/QtCore.4.2.0.win32-gcc-ia32.txt | 618 ---- .../auto/bic/data/QtCore.4.3.0.linux-gcc-ia32.txt | 722 ----- .../auto/bic/data/QtCore.4.3.1.linux-gcc-ia32.txt | 722 ----- .../auto/bic/data/QtCore.4.3.2.linux-gcc-ia32.txt | 722 ----- .../auto/bic/data/QtCore.4.4.0.linux-gcc-ia32.txt | 1909 +----------- .../auto/bic/data/QtDBus.4.2.0.linux-gcc-ia32.txt | 490 --- .../auto/bic/data/QtDBus.4.2.0.linux-gcc-ppc32.txt | 490 --- tests/auto/bic/data/QtDBus.4.2.0.macx-gcc-ia32.txt | 490 --- .../auto/bic/data/QtDBus.4.2.0.macx-gcc-ppc32.txt | 490 --- .../auto/bic/data/QtDBus.4.2.0.win32-gcc-ia32.txt | 490 --- .../auto/bic/data/QtDBus.4.3.0.linux-gcc-ia32.txt | 534 ---- .../auto/bic/data/QtDBus.4.3.1.linux-gcc-ia32.txt | 534 ---- .../auto/bic/data/QtDBus.4.3.2.linux-gcc-ia32.txt | 534 ---- .../auto/bic/data/QtDBus.4.4.0.linux-gcc-ia32.txt | 2029 +------------ .../bic/data/QtDesigner.4.2.0.linux-gcc-ia32.txt | 802 ----- .../bic/data/QtDesigner.4.3.0.linux-gcc-ia32.txt | 838 ------ .../bic/data/QtDesigner.4.3.1.linux-gcc-ia32.txt | 838 ------ .../bic/data/QtDesigner.4.3.2.linux-gcc-ia32.txt | 838 ------ .../bic/data/QtDesigner.4.4.0.linux-gcc-ia32.txt | 2173 +------------- .../auto/bic/data/QtGui.4.0.0.aix-gcc-power32.txt | 720 ----- .../auto/bic/data/QtGui.4.0.0.linux-gcc-amd64.txt | 860 ------ tests/auto/bic/data/QtGui.4.0.0.linux-gcc-ia32.txt | 860 ------ .../auto/bic/data/QtGui.4.0.0.linux-gcc-ppc32.txt | 812 ----- tests/auto/bic/data/QtGui.4.0.0.macx-gcc-ppc32.txt | 840 ------ tests/auto/bic/data/QtGui.4.1.0.linux-gcc-ia32.txt | 952 ------ .../auto/bic/data/QtGui.4.1.0.linux-gcc-ppc32.txt | 972 ------ tests/auto/bic/data/QtGui.4.1.0.macx-gcc-ia32.txt | 896 ------ tests/auto/bic/data/QtGui.4.1.0.macx-gcc-ppc32.txt | 896 ------ tests/auto/bic/data/QtGui.4.1.0.win32-gcc-ia32.txt | 876 ------ tests/auto/bic/data/QtGui.4.2.0.linux-gcc-ia32.txt | 1242 -------- .../auto/bic/data/QtGui.4.2.0.linux-gcc-ppc32.txt | 1238 -------- tests/auto/bic/data/QtGui.4.2.0.macx-gcc-ia32.txt | 1178 -------- tests/auto/bic/data/QtGui.4.2.0.macx-gcc-ppc32.txt | 1184 +------- tests/auto/bic/data/QtGui.4.2.0.win32-gcc-ia32.txt | 1142 ------- tests/auto/bic/data/QtGui.4.3.0.linux-gcc-ia32.txt | 1314 -------- tests/auto/bic/data/QtGui.4.3.1.linux-gcc-ia32.txt | 1314 -------- tests/auto/bic/data/QtGui.4.3.2.linux-gcc-ia32.txt | 1314 -------- tests/auto/bic/data/QtGui.4.4.0.linux-gcc-ia32.txt | 2519 +--------------- .../bic/data/QtNetwork.4.0.0.aix-gcc-power32.txt | 399 --- .../bic/data/QtNetwork.4.0.0.linux-gcc-amd64.txt | 432 --- .../bic/data/QtNetwork.4.0.0.linux-gcc-ia32.txt | 432 --- .../bic/data/QtNetwork.4.0.0.linux-gcc-ppc32.txt | 396 --- .../bic/data/QtNetwork.4.0.0.macx-gcc-ppc32.txt | 412 --- .../bic/data/QtNetwork.4.1.0.linux-gcc-ia32.txt | 496 --- .../bic/data/QtNetwork.4.1.0.linux-gcc-ppc32.txt | 516 ---- .../bic/data/QtNetwork.4.1.0.macx-gcc-ia32.txt | 440 --- .../bic/data/QtNetwork.4.1.0.macx-gcc-ppc32.txt | 440 --- .../bic/data/QtNetwork.4.1.0.win32-gcc-ia32.txt | 420 --- .../bic/data/QtNetwork.4.2.0.linux-gcc-ia32.txt | 730 ----- .../bic/data/QtNetwork.4.2.0.linux-gcc-ppc32.txt | 726 ----- .../bic/data/QtNetwork.4.2.0.macx-gcc-ia32.txt | 650 ---- .../bic/data/QtNetwork.4.2.0.macx-gcc-ppc32.txt | 654 ---- .../bic/data/QtNetwork.4.2.0.win32-gcc-ia32.txt | 630 ---- .../bic/data/QtNetwork.4.3.0.linux-gcc-ia32.txt | 754 ----- .../bic/data/QtNetwork.4.3.1.linux-gcc-ia32.txt | 754 ----- .../bic/data/QtNetwork.4.3.2.linux-gcc-ia32.txt | 754 ----- .../bic/data/QtNetwork.4.4.0.linux-gcc-ia32.txt | 1979 +----------- .../bic/data/QtOpenGL.4.0.0.aix-gcc-power32.txt | 723 ----- .../bic/data/QtOpenGL.4.0.0.linux-gcc-amd64.txt | 864 ------ .../bic/data/QtOpenGL.4.0.0.linux-gcc-ia32.txt | 864 ------ .../bic/data/QtOpenGL.4.0.0.linux-gcc-ppc32.txt | 816 ----- .../bic/data/QtOpenGL.4.0.0.macx-gcc-ppc32.txt | 844 ------ .../bic/data/QtOpenGL.4.1.0.linux-gcc-ia32.txt | 956 ------ .../bic/data/QtOpenGL.4.1.0.linux-gcc-ppc32.txt | 976 ------ .../auto/bic/data/QtOpenGL.4.1.0.macx-gcc-ia32.txt | 900 ------ .../bic/data/QtOpenGL.4.1.0.macx-gcc-ppc32.txt | 900 ------ .../bic/data/QtOpenGL.4.1.0.win32-gcc-ia32.txt | 1372 --------- .../bic/data/QtOpenGL.4.2.0.linux-gcc-ia32.txt | 1250 -------- .../bic/data/QtOpenGL.4.2.0.linux-gcc-ppc32.txt | 1246 -------- .../auto/bic/data/QtOpenGL.4.2.0.macx-gcc-ia32.txt | 1186 -------- .../bic/data/QtOpenGL.4.2.0.macx-gcc-ppc32.txt | 1192 +------- .../bic/data/QtOpenGL.4.2.0.win32-gcc-ia32.txt | 1642 ---------- .../bic/data/QtOpenGL.4.3.0.linux-gcc-ia32.txt | 1326 -------- .../bic/data/QtOpenGL.4.3.1.linux-gcc-ia32.txt | 1326 -------- .../bic/data/QtOpenGL.4.3.2.linux-gcc-ia32.txt | 1326 -------- .../bic/data/QtOpenGL.4.4.0.linux-gcc-ia32.txt | 2531 +--------------- .../bic/data/QtScript.4.3.0.linux-gcc-ia32.txt | 726 ----- .../auto/bic/data/QtScript.4.3.0.macx-gcc-ia32.txt | 674 ----- .../bic/data/QtScript.4.4.0.linux-gcc-ia32.txt | 1941 +----------- .../auto/bic/data/QtSql.4.0.0.aix-gcc-power32.txt | 408 --- .../auto/bic/data/QtSql.4.0.0.linux-gcc-amd64.txt | 444 --- tests/auto/bic/data/QtSql.4.0.0.linux-gcc-ia32.txt | 444 --- .../auto/bic/data/QtSql.4.0.0.linux-gcc-ppc32.txt | 408 --- tests/auto/bic/data/QtSql.4.0.0.macx-gcc-ppc32.txt | 424 --- tests/auto/bic/data/QtSql.4.1.0.linux-gcc-ia32.txt | 508 ---- .../auto/bic/data/QtSql.4.1.0.linux-gcc-ppc32.txt | 528 ---- tests/auto/bic/data/QtSql.4.1.0.macx-gcc-ia32.txt | 452 --- tests/auto/bic/data/QtSql.4.1.0.macx-gcc-ppc32.txt | 452 --- tests/auto/bic/data/QtSql.4.1.0.win32-gcc-ia32.txt | 432 --- tests/auto/bic/data/QtSql.4.2.0.linux-gcc-ia32.txt | 730 ----- .../auto/bic/data/QtSql.4.2.0.linux-gcc-ppc32.txt | 726 ----- tests/auto/bic/data/QtSql.4.2.0.macx-gcc-ia32.txt | 650 ---- tests/auto/bic/data/QtSql.4.2.0.macx-gcc-ppc32.txt | 654 ---- tests/auto/bic/data/QtSql.4.2.0.win32-gcc-ia32.txt | 630 ---- tests/auto/bic/data/QtSql.4.3.0.linux-gcc-ia32.txt | 734 ----- tests/auto/bic/data/QtSql.4.3.1.linux-gcc-ia32.txt | 734 ----- tests/auto/bic/data/QtSql.4.3.2.linux-gcc-ia32.txt | 734 ----- tests/auto/bic/data/QtSql.4.4.0.linux-gcc-ia32.txt | 1921 +----------- tests/auto/bic/data/QtSvg.4.1.0.linux-gcc-ia32.txt | 976 ------ tests/auto/bic/data/QtSvg.4.1.0.win32-gcc-ia32.txt | 876 ------ tests/auto/bic/data/QtSvg.4.2.0.linux-gcc-ia32.txt | 1242 -------- .../auto/bic/data/QtSvg.4.2.0.linux-gcc-ppc32.txt | 1238 -------- tests/auto/bic/data/QtSvg.4.2.0.macx-gcc-ia32.txt | 1178 -------- tests/auto/bic/data/QtSvg.4.2.0.macx-gcc-ppc32.txt | 1184 +------- tests/auto/bic/data/QtSvg.4.2.0.win32-gcc-ia32.txt | 1142 ------- tests/auto/bic/data/QtSvg.4.3.0.linux-gcc-ia32.txt | 1314 -------- tests/auto/bic/data/QtSvg.4.3.1.linux-gcc-ia32.txt | 1314 -------- tests/auto/bic/data/QtSvg.4.3.2.linux-gcc-ia32.txt | 1314 -------- tests/auto/bic/data/QtSvg.4.4.0.linux-gcc-ia32.txt | 2519 +--------------- .../auto/bic/data/QtTest.4.1.0.linux-gcc-ia32.txt | 560 ---- .../auto/bic/data/QtTest.4.1.0.win32-gcc-ia32.txt | 460 --- .../auto/bic/data/QtTest.4.2.0.linux-gcc-ia32.txt | 754 ----- .../auto/bic/data/QtTest.4.2.0.linux-gcc-ppc32.txt | 750 ----- tests/auto/bic/data/QtTest.4.2.0.macx-gcc-ia32.txt | 674 ----- .../auto/bic/data/QtTest.4.2.0.macx-gcc-ppc32.txt | 678 ----- .../auto/bic/data/QtTest.4.2.0.win32-gcc-ia32.txt | 654 ---- .../auto/bic/data/QtTest.4.3.0.linux-gcc-ia32.txt | 758 ----- .../auto/bic/data/QtTest.4.3.1.linux-gcc-ia32.txt | 758 ----- .../auto/bic/data/QtTest.4.3.2.linux-gcc-ia32.txt | 758 ----- .../auto/bic/data/QtTest.4.4.0.linux-gcc-ia32.txt | 1945 +----------- .../auto/bic/data/QtXml.4.0.0.aix-gcc-power32.txt | 411 --- .../auto/bic/data/QtXml.4.0.0.linux-gcc-amd64.txt | 448 --- tests/auto/bic/data/QtXml.4.0.0.linux-gcc-ia32.txt | 448 --- .../auto/bic/data/QtXml.4.0.0.linux-gcc-ppc32.txt | 412 --- tests/auto/bic/data/QtXml.4.0.0.macx-gcc-ppc32.txt | 428 --- tests/auto/bic/data/QtXml.4.1.0.linux-gcc-ia32.txt | 512 ---- .../auto/bic/data/QtXml.4.1.0.linux-gcc-ppc32.txt | 532 ---- tests/auto/bic/data/QtXml.4.1.0.macx-gcc-ia32.txt | 456 --- tests/auto/bic/data/QtXml.4.1.0.macx-gcc-ppc32.txt | 456 --- tests/auto/bic/data/QtXml.4.1.0.win32-gcc-ia32.txt | 436 --- tests/auto/bic/data/QtXml.4.2.0.linux-gcc-ia32.txt | 734 ----- .../auto/bic/data/QtXml.4.2.0.linux-gcc-ppc32.txt | 730 ----- tests/auto/bic/data/QtXml.4.2.0.macx-gcc-ia32.txt | 654 ---- tests/auto/bic/data/QtXml.4.2.0.macx-gcc-ppc32.txt | 658 ---- tests/auto/bic/data/QtXml.4.2.0.win32-gcc-ia32.txt | 634 ---- tests/auto/bic/data/QtXml.4.3.0.linux-gcc-ia32.txt | 762 ----- tests/auto/bic/data/QtXml.4.3.1.linux-gcc-ia32.txt | 762 ----- tests/auto/bic/data/QtXml.4.3.2.linux-gcc-ia32.txt | 762 ----- tests/auto/bic/data/QtXml.4.4.0.linux-gcc-ia32.txt | 1925 +----------- .../data/QtXmlPatterns.4.4.0.linux-gcc-ia32.txt | 2021 +------------ .../data/QtXmlPatterns.4.4.1.linux-gcc-ia32.txt | 2806 +---------------- 174 files changed, 804 insertions(+), 167060 deletions(-) diff --git a/tests/auto/bic/data/Qt3Support.4.0.0.aix-gcc-power32.txt b/tests/auto/bic/data/Qt3Support.4.0.0.aix-gcc-power32.txt index 35b9859ea..2d54bbec5 100644 --- a/tests/auto/bic/data/Qt3Support.4.0.0.aix-gcc-power32.txt +++ b/tests/auto/bic/data/Qt3Support.4.0.0.aix-gcc-power32.txt @@ -53,65 +53,20 @@ Class QBool size=1 align=1 QBool (0x300b7280) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cd9c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cdf80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4540) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4b00) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e00c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0680) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0c40) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb200) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb7c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebd80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8340) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8900) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104480) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104a40) 0 empty Class QFlag size=4 align=4 @@ -125,9 +80,6 @@ Class QChar size=2 align=2 QChar (0x30148980) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30185980) 0 empty Class QBasicAtomic size=4 align=4 @@ -142,13 +94,7 @@ Class sigset_t size=8 align=4 sigset_t (0x3026ad80) 0 -Class - size=8 align=4 - (0x30271200) 0 -Class - size=32 align=8 - (0x30271540) 0 Class fsid_t size=8 align=4 @@ -158,21 +104,9 @@ Class fsid64_t size=16 align=8 fsid64_t (0x30271c40) 0 -Class - size=52 align=4 - (0x302780c0) 0 -Class - size=44 align=4 - (0x30278440) 0 -Class - size=112 align=4 - (0x302787c0) 0 -Class - size=208 align=4 - (0x30278b40) 0 Class _quad size=8 align=4 @@ -186,17 +120,11 @@ Class adspace_t size=68 align=4 adspace_t (0x30281e00) 0 -Class - size=24 align=8 - (0x302865c0) 0 Class label_t size=100 align=4 label_t (0x30286d00) 0 -Class - size=4 align=4 - (0x3028b780) 0 Class sigset size=8 align=4 @@ -238,57 +166,18 @@ Class QByteRef size=8 align=4 QByteRef (0x302b7540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30423740) 0 empty -Class QFlags - size=4 align=4 -QFlags (0x30431080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431340) 0 -Class QFlags - size=4 align=4 -QFlags (0x3042cc00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30442080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431a00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30448800) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046af00) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046e200) 0 -Class QFlags - size=4 align=4 -QFlags (0x304422c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30474f80) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479700) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479a40) 0 Class QInternal size=1 align=1 @@ -306,9 +195,6 @@ Class QString size=4 align=4 QString (0x300a1f40) 0 -Class QFlags - size=4 align=4 -QFlags (0x303cf2c0) 0 Class QLatin1String size=4 align=4 @@ -323,9 +209,6 @@ Class QConstString QConstString (0x300b7640) 0 QString (0x300b7680) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303901c0) 0 empty Class QListData::Data size=24 align=4 @@ -335,9 +218,6 @@ Class QListData size=4 align=4 QListData (0x300732c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x302fb500) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -360,13 +240,7 @@ Class QTextCodec QTextCodec (0x303bab80) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8) -Class QList:: - size=4 align=4 -QList:: (0x30120bc0) 0 -Class QList - size=4 align=4 -QList (0x302cc980) 0 Class QTextEncoder size=32 align=4 @@ -385,21 +259,12 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3036a6c0) 0 QGenericArgument (0x3036a700) 0 -Class QMetaObject:: - size=16 align=4 -QMetaObject:: (0x3009b300) 0 Class QMetaObject size=16 align=4 QMetaObject (0x3058c900) 0 -Class QList:: - size=4 align=4 -QList:: (0x30170600) 0 -Class QList - size=4 align=4 -QList (0x30166f00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4 entries @@ -487,9 +352,6 @@ QIODevice (0x30365880) 0 QObject (0x301e4440) 0 primary-for QIODevice (0x30365880) -Class QFlags - size=4 align=4 -QFlags (0x301ebec0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4 entries @@ -507,38 +369,20 @@ Class QRegExp size=4 align=4 QRegExp (0x303baa80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30148180) 0 empty Class QStringMatcher size=1036 align=4 QStringMatcher (0x3012d8c0) 0 -Class QList:: - size=4 align=4 -QList:: (0x30104900) 0 -Class QList - size=4 align=4 -QList (0x30104380) 0 Class QStringList size=4 align=4 QStringList (0x303bab00) 0 QList (0x300c3280) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x301046c0) 0 -Class QList::iterator - size=4 align=4 -QList::iterator (0x300eba00) 0 -Class QList::const_iterator - size=4 align=4 -QList::const_iterator (0x300eb980) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5 entries @@ -664,9 +508,6 @@ Class QMapData size=72 align=4 QMapData (0x304b4140) 0 -Class - size=32 align=4 - (0x3052cd00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4 entries @@ -680,9 +521,6 @@ Class QTextStream QTextStream (0x3050bbc0) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8) -Class QFlags - size=4 align=4 -QFlags (0x305082c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -767,41 +605,20 @@ QFile (0x3057c8c0) 0 QObject (0x3057c980) 0 primary-for QIODevice (0x3057c900) -Class QFlags - size=4 align=4 -QFlags (0x3058a380) 0 Class QFileInfo size=4 align=4 QFileInfo (0x304b0580) 0 -Class QFlags - size=4 align=4 -QFlags (0x304927c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30390480) 0 empty -Class QList:: - size=4 align=4 -QList:: (0x301dfa40) 0 -Class QList - size=4 align=4 -QList (0x301df900) 0 Class QDir size=4 align=4 QDir (0x304b03c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30365600) 0 -Class QFlags - size=4 align=4 -QFlags (0x303ac7c0) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35 entries @@ -846,9 +663,6 @@ Class QFileEngine QFileEngine (0x3057c7c0) 0 vptr=((&QFileEngine::_ZTV11QFileEngine) + 8) -Class QFlags - size=4 align=4 -QFlags (0x3031a080) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5 entries @@ -910,73 +724,22 @@ Class QMetaType size=1 align=1 QMetaType (0x30079000) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3011fb00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3013d480) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x30148440) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3015dfc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301937c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a18c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a5d00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301ad500) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301add00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b22c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b2b00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6640) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6fc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9600) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9c00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301c1740) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301d7f80) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -998,69 +761,24 @@ Class QVariant size=16 align=8 QVariant (0x30166c00) 0 -Class QList:: - size=4 align=4 -QList:: (0x3057e500) 0 -Class QList - size=4 align=4 -QList (0x302acd80) 0 -Class QMap:: - size=4 align=4 -QMap:: (0x302ed8c0) 0 -Class QMap - size=4 align=4 -QMap (0x302b7980) 0 Class QVariantComparisonHelper size=4 align=4 QVariantComparisonHelper (0x30225880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303e8900) 0 empty -Class - size=12 align=4 - (0x303dab00) 0 -Class - size=44 align=4 - (0x303f70c0) 0 -Class - size=76 align=4 - (0x303f7880) 0 -Class - size=36 align=4 - (0x303fc640) 0 -Class - size=56 align=4 - (0x303fcc40) 0 -Class - size=36 align=4 - (0x30414340) 0 -Class - size=28 align=4 - (0x30414f00) 0 -Class - size=24 align=4 - (0x30486a40) 0 -Class - size=28 align=4 - (0x30486d80) 0 -Class - size=28 align=4 - (0x30492400) 0 Class lconv size=56 align=4 @@ -1102,77 +820,41 @@ Class localeinfo_table size=36 align=4 localeinfo_table (0x303d9cc0) 0 -Class - size=108 align=4 - (0x304dc500) 0 Class _LC_charmap_objhdl size=12 align=4 _LC_charmap_objhdl (0x304dcc80) 0 -Class - size=92 align=4 - (0x30561040) 0 Class _LC_monetary_objhdl size=12 align=4 _LC_monetary_objhdl (0x305614c0) 0 -Class - size=48 align=4 - (0x30561800) 0 Class _LC_numeric_objhdl size=12 align=4 _LC_numeric_objhdl (0x30561d00) 0 -Class - size=56 align=4 - (0x30083180) 0 Class _LC_resp_objhdl size=12 align=4 _LC_resp_objhdl (0x300838c0) 0 -Class - size=248 align=4 - (0x30083c40) 0 Class _LC_time_objhdl size=12 align=4 _LC_time_objhdl (0x3012c400) 0 -Class - size=10 align=2 - (0x3012cc40) 0 -Class - size=16 align=4 - (0x301df180) 0 -Class - size=16 align=4 - (0x301df5c0) 0 -Class - size=20 align=4 - (0x303acac0) 0 -Class - size=104 align=4 - (0x30504a00) 0 Class _LC_collate_objhdl size=12 align=4 _LC_collate_objhdl (0x301bfb80) 0 -Class - size=8 align=4 - (0x301e8b00) 0 -Class - size=80 align=4 - (0x305a0100) 0 Class _LC_ctype_objhdl size=12 align=4 @@ -1186,17 +868,11 @@ Class _LC_locale_objhdl size=12 align=4 _LC_locale_objhdl (0x303da600) 0 -Class _LC_object_handle:: - size=12 align=4 -_LC_object_handle:: (0x305911c0) 0 Class _LC_object_handle size=20 align=4 _LC_object_handle (0x30591080) 0 -Class - size=24 align=4 - (0x3031ed80) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14 entries @@ -1271,13 +947,7 @@ Class QUrl size=4 align=4 QUrl (0x302256c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x306df180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307c8900) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14 entries @@ -1303,9 +973,6 @@ QEventLoop (0x30802000) 0 QObject (0x30802040) 0 primary-for QEventLoop (0x30802000) -Class QFlags - size=4 align=4 -QFlags (0x30803740) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27 entries @@ -1348,17 +1015,11 @@ Class QModelIndex size=16 align=4 QModelIndex (0x3049cc80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304eb5c0) 0 empty Class QPersistentModelIndex size=4 align=4 QPersistentModelIndex (0x3049cb80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3002e700) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42 entries @@ -1524,9 +1185,6 @@ Class QBasicTimer size=4 align=4 QBasicTimer (0x307fe180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30803300) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4 entries @@ -1612,17 +1270,11 @@ Class QMetaMethod size=8 align=4 QMetaMethod (0x30379340) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30880740) 0 empty Class QMetaEnum size=8 align=4 QMetaEnum (0x303793c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3088be80) 0 empty Class QMetaProperty size=20 align=4 @@ -1632,9 +1284,6 @@ Class QMetaClassInfo size=8 align=4 QMetaClassInfo (0x30379540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x308a3780) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17 entries @@ -1902,9 +1551,6 @@ Class QBitRef size=8 align=4 QBitRef (0x305a6140) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864700) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1922,65 +1568,41 @@ Class QHashDummyValue size=1 align=1 QHashDummyValue (0x30893ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30897f00) 0 empty Class QDate size=4 align=4 QDate (0x301eb4c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebe80) 0 empty Class QTime size=4 align=4 QTime (0x301f1e80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30368c00) 0 empty Class QDateTime size=4 align=4 QDateTime (0x304b0440) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304d4880) 0 empty Class QPoint size=8 align=4 QPoint (0x301f9d40) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307b9180) 0 empty Class QPointF size=16 align=8 QPointF (0x30200880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307efcc0) 0 empty Class QLine size=16 align=4 QLine (0x301eb540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3098afc0) 0 empty Class QLineF size=32 align=8 QLineF (0x301eb600) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a335c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1990,41 +1612,26 @@ Class QLocale size=4 align=4 QLocale (0x301eb800) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30822c80) 0 empty Class QSize size=8 align=4 QSize (0x30200a80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864400) 0 empty Class QSizeF size=16 align=8 QSizeF (0x30209200) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a33a80) 0 empty Class QRect size=16 align=4 QRect (0x30213780) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30aad700) 0 empty Class QRectF size=32 align=8 QRectF (0x302138c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a1fdc0) 0 empty Class QSharedData size=4 align=4 @@ -2046,9 +1653,6 @@ Class QKeySequence size=4 align=4 QKeySequence (0x305580c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30ad4d00) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7 entries @@ -2313,13 +1917,7 @@ Class QInputMethodEvent::Attribute size=32 align=8 QInputMethodEvent::Attribute (0x307e7800) 0 -Class QList:: - size=4 align=4 -QList:: (0x30a2d6c0) 0 -Class QList - size=4 align=4 -QList (0x307e7ec0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4 entries @@ -2577,13 +2175,7 @@ Class QAccessible size=1 align=1 QAccessible (0x30c2af00) 0 empty -Class QFlags - size=4 align=4 -QFlags (0x30c36000) 0 -Class QFlags - size=4 align=4 -QFlags (0x30c3b540) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19 entries @@ -2856,21 +2448,9 @@ Class QPaintDevice QPaintDevice (0x30bc8900) 0 vptr=((&QPaintDevice::_ZTV12QPaintDevice) + 8) -Class QColor:::: - size=10 align=2 -QColor:::: (0x30aadc40) 0 -Class QColor:::: - size=10 align=2 -QColor:::: (0x30ab3280) 0 -Class QColor:::: - size=10 align=2 -QColor:::: (0x30aba480) 0 -Class QColor:: - size=10 align=2 -QColor:: (0x30aadb80) 0 Class QColor size=16 align=4 @@ -2880,37 +2460,16 @@ Class QBrush size=4 align=4 QBrush (0x305317c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30b2f040) 0 empty Class QBrushData size=24 align=4 QBrushData (0x30a77a00) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x30a61380) 0 -Class QVector - size=4 align=4 -QVector (0x30bb0140) 0 -Class QGradient:::: - size=32 align=8 -QGradient:::: (0x309db5c0) 0 -Class QGradient:::: - size=40 align=8 -QGradient:::: (0x309dba40) 0 -Class QGradient:::: - size=24 align=8 -QGradient:::: (0x309dbec0) 0 -Class QGradient:: - size=40 align=8 -QGradient:: (0x309db500) 0 Class QGradient size=64 align=8 @@ -3535,9 +3094,6 @@ QFileDialog (0x30d9d000) 0 QPaintDevice (0x30d9d0c0) 8 vptr=((&QFileDialog::_ZTV11QFileDialog) + 244) -Class QFlags - size=4 align=4 -QFlags (0x30dcd640) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66 entries @@ -4220,9 +3776,6 @@ QImage (0x305472c0) 0 QPaintDevice (0x30c41b80) 0 primary-for QImage (0x305472c0) -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30e4a500) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7 entries @@ -4264,9 +3817,6 @@ Class QIcon size=4 align=4 QIcon (0x30536cc0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30eb0980) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9 entries @@ -4580,13 +4130,7 @@ QActionGroup (0x30fdb180) 0 QObject (0x31016480) 0 primary-for QActionGroup (0x30fdb180) -Class QList:: - size=4 align=4 -QList:: (0x30ec74c0) 0 -Class QList - size=4 align=4 -QList (0x30c8c300) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26 entries @@ -4883,9 +4427,6 @@ QAbstractSpinBox (0x30c2a3c0) 0 QPaintDevice (0x30c2a5c0) 8 vptr=((&QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252) -Class QFlags - size=4 align=4 -QFlags (0x309e1bc0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64 entries @@ -5090,13 +4631,7 @@ QStyle (0x30ccda80) 0 QObject (0x30ced6c0) 0 primary-for QStyle (0x30ccda80) -Class QFlags - size=4 align=4 -QFlags (0x30cf8a80) 0 -Class QFlags - size=4 align=4 -QFlags (0x30d2f2c0) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67 entries @@ -5364,18 +4899,12 @@ Class QStyleOptionHeader QStyleOptionHeader (0x310ccb00) 0 QStyleOption (0x310ccb40) 0 -Class QFlags - size=4 align=4 -QFlags (0x310e9400) 0 Class QStyleOptionButton size=64 align=4 QStyleOptionButton (0x310e8580) 0 QStyleOption (0x310e85c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x31149980) 0 Class QStyleOptionTab size=72 align=4 @@ -5392,9 +4921,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x30f8d740) 0 QStyleOption (0x30f8d780) 0 -Class QFlags - size=4 align=4 -QFlags (0x30f29880) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5443,13 +4969,7 @@ QStyleOptionSpinBox (0x307d5680) 0 QStyleOptionComplex (0x307d56c0) 0 QStyleOption (0x307d57c0) 0 -Class QList:: - size=4 align=4 -QList:: (0x307e76c0) 0 -Class QList - size=4 align=4 -QList (0x307e7580) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5457,9 +4977,6 @@ QStyleOptionQ3ListView (0x309d9180) 0 QStyleOptionComplex (0x309d91c0) 0 QStyleOption (0x309d9380) 0 -Class QFlags - size=4 align=4 -QFlags (0x30b6fec0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5604,9 +5121,6 @@ Class QItemSelectionRange size=8 align=4 QItemSelectionRange (0x310faec0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3116aa80) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18 entries @@ -5636,26 +5150,14 @@ QItemSelectionModel (0x311834c0) 0 QObject (0x31183500) 0 primary-for QItemSelectionModel (0x311834c0) -Class QFlags - size=4 align=4 -QFlags (0x31187d80) 0 -Class QList:: - size=4 align=4 -QList:: (0x3112d340) 0 -Class QList - size=4 align=4 -QList (0x3112d200) 0 Class QItemSelection size=4 align=4 QItemSelection (0x30d9ad80) 0 QList (0x31174fc0) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x3112d300) 0 Vtable for QAbstractItemView QAbstractItemView::_ZTV17QAbstractItemView: 103 entries @@ -5778,9 +5280,6 @@ QAbstractItemView (0x311e8dc0) 0 QPaintDevice (0x311e8ec0) 8 vptr=((&QAbstractItemView::_ZTV17QAbstractItemView) + 392) -Class QFlags - size=4 align=4 -QFlags (0x311f7440) 0 Vtable for QFileIconProvider QFileIconProvider::_ZTV17QFileIconProvider: 7 entries @@ -6027,13 +5526,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3115d940) 0 nearly-empty vptr=((&QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8) -Class QHash:: - size=4 align=4 -QHash:: (0x31149a40) 0 -Class QHash - size=4 align=4 -QHash (0x31149540) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6 entries @@ -6049,9 +5542,6 @@ Class QItemEditorFactory QItemEditorFactory (0x3116f1c0) 0 vptr=((&QItemEditorFactory::_ZTV18QItemEditorFactory) + 8) -Class QHashNode - size=16 align=4 -QHashNode (0x31149680) 0 Vtable for QListView QListView::_ZTV9QListView: 103 entries @@ -6176,13 +5666,7 @@ QListView (0x310cc3c0) 0 QPaintDevice (0x310cc500) 8 vptr=((&QListView::_ZTV9QListView) + 392) -Class QVector:: - size=4 align=4 -QVector:: (0x3107ee40) 0 -Class QVector - size=4 align=4 -QVector (0x3107ec40) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11 entries @@ -6896,21 +6380,9 @@ QTreeView (0x30ea3980) 0 QPaintDevice (0x30ea3ac0) 8 vptr=((&QTreeView::_ZTV9QTreeView) + 400) -Class QVector >:: - size=4 align=4 -QVector >:: (0x30f5cd00) 0 -Class QVector > - size=4 align=4 -QVector > (0x30f5c9c0) 0 -Class QList:: - size=4 align=4 -QList:: (0x30f7ab40) 0 -Class QList - size=4 align=4 -QList (0x30f7aa00) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10 entries @@ -6930,17 +6402,8 @@ Class QTreeWidgetItem QTreeWidgetItem (0x30f51340) 0 vptr=((&QTreeWidgetItem::_ZTV15QTreeWidgetItem) + 8) -Class QList::Node - size=4 align=4 -QList::Node (0x30f7ab00) 0 -Class QVectorTypedData > - size=20 align=4 -QVectorTypedData > (0x30f5cb00) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3124bd80) 0 empty Vtable for QTreeWidget QTreeWidget::_ZTV11QTreeWidget: 109 entries @@ -7749,135 +7212,60 @@ Class QColormap size=4 align=4 QColormap (0x30a74040) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x30eb0200) 0 -Class QVector - size=4 align=4 -QVector (0x30eb0000) 0 Class QPolygon size=4 align=4 QPolygon (0x30547bc0) 0 QVector (0x30e7f4c0) 0 -Class QVectorTypedData - size=24 align=4 -QVectorTypedData (0x30eb0140) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x304e6340) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3109d580) 0 -Class QVector - size=4 align=4 -QVector (0x3109d340) 0 Class QPolygonF size=4 align=4 QPolygonF (0x3109d300) 0 QVector (0x310a2880) 0 -Class QVectorTypedData - size=32 align=8 -QVectorTypedData (0x3109d4c0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x313a6040) 0 Class QMatrix size=48 align=8 QMatrix (0x307ef840) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x314635c0) 0 empty Class QTextOption size=24 align=4 QTextOption (0x3147a800) 0 -Class QFlags - size=4 align=4 -QFlags (0x31481040) 0 Class QPen size=4 align=4 QPen (0x30558c80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x314ae9c0) 0 empty Class QPainter size=4 align=4 QPainter (0x30bc8a00) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3156ea00) 0 -Class QVector - size=4 align=4 -QVector (0x314c5c40) 0 -Class QVectorTypedData - size=48 align=8 -QVectorTypedData (0x3156e940) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3159d480) 0 -Class QVector - size=4 align=4 -QVector (0x314c5e00) 0 -Class QVectorTypedData - size=32 align=4 -QVectorTypedData (0x3159d3c0) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x315e3080) 0 -Class QVector - size=4 align=4 -QVector (0x314cf100) 0 -Class QVectorTypedData - size=48 align=8 -QVectorTypedData (0x315dbfc0) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3160ba00) 0 -Class QVector - size=4 align=4 -QVector (0x30bd1b40) 0 -Class QVectorTypedData - size=32 align=4 -QVectorTypedData (0x3160b940) 0 Class QTextItem size=1 align=1 QTextItem (0x314b5840) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31124bc0) 0 empty -Class QFlags - size=4 align=4 -QFlags (0x3111c2c0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24 entries @@ -7911,9 +7299,6 @@ Class QPaintEngine QPaintEngine (0x3097e900) 0 vptr=((&QPaintEngine::_ZTV12QPaintEngine) + 8) -Class QFlags - size=4 align=4 -QFlags (0x3111c900) 0 Class QPaintEngineState size=4 align=4 @@ -7927,29 +7312,17 @@ Class QPainterPath size=4 align=4 QPainterPath (0x30d0fd40) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x30d74080) 0 -Class QVector - size=4 align=4 -QVector (0x30d71d80) 0 Class QPainterPathPrivate size=8 align=4 QPainterPathPrivate (0x3082d680) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30d7fe40) 0 empty Class QPainterPathStroker size=4 align=4 QPainterPathStroker (0x308cea40) 0 -Class QVectorTypedData - size=40 align=8 -QVectorTypedData (0x30d71ec0) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7 entries @@ -8038,9 +7411,6 @@ QCommonStyle (0x31225280) 0 QObject (0x31225480) 0 primary-for QStyle (0x31225440) -Class QPointer - size=4 align=4 -QPointer (0x31430ec0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35 entries @@ -8353,21 +7723,12 @@ Class QTextLength size=12 align=4 QTextLength (0x30225540) 0 -Class QSharedDataPointer - size=4 align=4 -QSharedDataPointer (0x315b50c0) 0 Class QTextFormat size=8 align=4 QTextFormat (0x30213a00) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3166cdc0) 0 -Class QVector - size=4 align=4 -QVector (0x315983c0) 0 Class QTextCharFormat size=8 align=4 @@ -8413,13 +7774,7 @@ Class QTextLayout size=4 align=4 QTextLayout (0x30d0fa40) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x317bab80) 0 -Class QVector - size=4 align=4 -QVector (0x317ba100) 0 Class QTextLine size=8 align=4 @@ -8466,13 +7821,7 @@ QTextDocument (0x315517c0) 0 QObject (0x3160b200) 0 primary-for QTextDocument (0x315517c0) -Class QFlags - size=4 align=4 -QFlags (0x31603940) 0 -Class QSharedDataPointer - size=4 align=4 -QSharedDataPointer (0x315c7340) 0 Class QTextCursor size=4 align=4 @@ -8482,13 +7831,7 @@ Class QAbstractTextDocumentLayout::Selection size=12 align=4 QAbstractTextDocumentLayout::Selection (0x315bccc0) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x315b8780) 0 -Class QVector - size=4 align=4 -QVector (0x315b8580) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -8645,9 +7988,6 @@ QTextFrame (0x3162a4c0) 0 QObject (0x314d8840) 0 primary-for QTextObject (0x314d8800) -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31391400) 0 empty Class QTextBlock::iterator size=16 align=4 @@ -8657,21 +7997,12 @@ Class QTextBlock size=8 align=4 QTextBlock (0x317add40) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x313e3cc0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x312bd340) 0 empty Class QTextFragment size=12 align=4 QTextFragment (0x315250c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31260200) 0 empty Vtable for QTextList QTextList::_ZTV9QTextList: 17 entries @@ -9263,9 +8594,6 @@ QDateEdit (0x310f8700) 0 QPaintDevice (0x310f8800) 8 vptr=((&QDateEdit::_ZTV9QDateEdit) + 260) -Class QFlags - size=4 align=4 -QFlags (0x3107e480) 0 Vtable for QDial QDial::_ZTV5QDial: 64 entries @@ -9424,9 +8752,6 @@ QDockWidget (0x316cac40) 0 QPaintDevice (0x316cacc0) 8 vptr=((&QDockWidget::_ZTV11QDockWidget) + 232) -Class QFlags - size=4 align=4 -QFlags (0x316ef780) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63 entries @@ -11833,9 +11158,6 @@ QUdpSocket (0x31add680) 0 QObject (0x31add740) 0 primary-for QIODevice (0x31add700) -Class QFlags - size=4 align=4 -QFlags (0x31afad00) 0 Class QSqlRecord size=4 align=4 @@ -11964,13 +11286,7 @@ Class QSqlField size=24 align=8 QSqlField (0x31b59380) 0 -Class QList:: - size=4 align=4 -QList:: (0x31609940) 0 -Class QList - size=4 align=4 -QList (0x316097c0) 0 Class QSqlIndex size=16 align=4 @@ -12473,28 +11789,7 @@ Class Q3GListStdIterator size=4 align=4 Q3GListStdIterator (0x311c2580) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11 entries -0 0 -4 &_ZTI9Q3PtrListIvE -8 Q3PtrList::count() const [with type = void] -12 Q3PtrList::clear() [with type = void] -16 Q3PtrList::~Q3PtrList() [with type = void] -20 Q3PtrList::~Q3PtrList() [with type = void] -24 Q3PtrCollection::newItem(void*) -28 Q3PtrList::deleteItem(void*) [with type = void] -32 Q3GList::compareItems(void*, void*) -36 Q3GList::read(QDataStream&, void*&) -40 Q3GList::write(QDataStream&, void*) const -Class Q3PtrList - size=32 align=4 -Q3PtrList (0x30f47000) 0 - vptr=((&Q3PtrList::_ZTV9Q3PtrListIvE) + 8) - Q3GList (0x30f47100) 0 - primary-for Q3PtrList (0x30f47000) - Q3PtrCollection (0x30f47140) 0 - primary-for Q3GList (0x30f47100) Class Q3PointArray size=4 align=4 @@ -12502,18 +11797,8 @@ Q3PointArray (0x30da8200) 0 QPolygon (0x30da8300) 0 QVector (0x30da8500) 0 -Class QLinkedList:: - size=4 align=4 -QLinkedList:: (0x30e19040) 0 -Class QLinkedList - size=4 align=4 -QLinkedList (0x30e12e80) 0 -Class Q3ValueList - size=4 align=4 -Q3ValueList (0x30e12cc0) 0 - QLinkedList (0x30e25940) 0 Class Q3CanvasItemList size=4 align=4 @@ -13129,27 +12414,7 @@ Class Q3GDictIterator size=12 align=4 Q3GDictIterator (0x3142e780) 0 -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10 entries -0 0 -4 &_ZTI6Q3DictIvE -8 Q3Dict::count() const [with type = void] -12 Q3Dict::clear() [with type = void] -16 Q3Dict::~Q3Dict() [with type = void] -20 Q3Dict::~Q3Dict() [with type = void] -24 Q3PtrCollection::newItem(void*) -28 Q3Dict::deleteItem(void*) [with type = void] -32 Q3GDict::read(QDataStream&, void*&) -36 Q3GDict::write(QDataStream&, void*) const -Class Q3Dict - size=28 align=4 -Q3Dict (0x316e8980) 0 - vptr=((&Q3Dict::_ZTV6Q3DictIvE) + 8) - Q3GDict (0x316e8a80) 0 - primary-for Q3Dict (0x316e8980) - Q3PtrCollection (0x316e8ac0) 0 - primary-for Q3GDict (0x316e8a80) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5 entries @@ -13674,28 +12939,7 @@ Q3Wizard (0x31b28740) 0 QPaintDevice (0x31b28800) 8 vptr=((&Q3Wizard::_ZTV8Q3Wizard) + 308) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11 entries -0 0 -4 &_ZTI9Q3PtrListIcE -8 Q3PtrList::count() const [with type = char] -12 Q3PtrList::clear() [with type = char] -16 Q3PtrList::~Q3PtrList() [with type = char] -20 Q3PtrList::~Q3PtrList() [with type = char] -24 Q3PtrCollection::newItem(void*) -28 Q3PtrList::deleteItem(void*) [with type = char] -32 Q3GList::compareItems(void*, void*) -36 Q3GList::read(QDataStream&, void*&) -40 Q3GList::write(QDataStream&, void*) const -Class Q3PtrList - size=32 align=4 -Q3PtrList (0x31ce9d00) 0 - vptr=((&Q3PtrList::_ZTV9Q3PtrListIcE) + 8) - Q3GList (0x31ce9e00) 0 - primary-for Q3PtrList (0x31ce9d00) - Q3PtrCollection (0x31ce9e40) 0 - primary-for Q3GList (0x31ce9e00) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11 entries @@ -13722,14 +12966,7 @@ Q3StrList (0x31ce9cc0) 0 Q3PtrCollection (0x31cff140) 0 primary-for Q3GList (0x31cff100) -Class QList::Node - size=4 align=4 -QList::Node (0x30120ac0) 0 -Class Q3PtrListStdIterator - size=4 align=4 -Q3PtrListStdIterator (0x31cf2ac0) 0 - Q3GListStdIterator (0x31d8e400) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11 entries @@ -14742,28 +13979,7 @@ Q3GVector (0x311e2840) 0 Q3PtrCollection (0x311b9c80) 0 primary-for Q3GVector (0x311e2840) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11 entries -0 0 -4 &_ZTI11Q3PtrVectorIvE -8 Q3PtrVector::count() const [with type = void] -12 Q3PtrVector::clear() [with type = void] -16 Q3PtrVector::~Q3PtrVector() [with type = void] -20 Q3PtrVector::~Q3PtrVector() [with type = void] -24 Q3PtrCollection::newItem(void*) -28 Q3PtrVector::deleteItem(void*) [with type = void] -32 Q3GVector::compareItems(void*, void*) -36 Q3GVector::read(QDataStream&, void*&) -40 Q3GVector::write(QDataStream&, void*) const -Class Q3PtrVector - size=20 align=4 -Q3PtrVector (0x31263140) 0 - vptr=((&Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8) - Q3GVector (0x31263400) 0 - primary-for Q3PtrVector (0x31263140) - Q3PtrCollection (0x31263480) 0 - primary-for Q3GVector (0x31263400) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76 entries @@ -14879,27 +14095,7 @@ Class Q3GArray Q3GArray (0x3146a980) 0 vptr=((&Q3GArray::_ZTV8Q3GArray) + 8) -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10 entries -0 0 -4 &_ZTI9Q3IntDictIvE -8 Q3IntDict::count() const [with type = void] -12 Q3IntDict::clear() [with type = void] -16 Q3IntDict::~Q3IntDict() [with type = void] -20 Q3IntDict::~Q3IntDict() [with type = void] -24 Q3PtrCollection::newItem(void*) -28 Q3IntDict::deleteItem(void*) [with type = void] -32 Q3GDict::read(QDataStream&, void*&) -36 Q3GDict::write(QDataStream&, void*) const -Class Q3IntDict - size=28 align=4 -Q3IntDict (0x31514140) 0 - vptr=((&Q3IntDict::_ZTV9Q3IntDictIvE) + 8) - Q3GDict (0x31514240) 0 - primary-for Q3IntDict (0x31514140) - Q3PtrCollection (0x31514280) 0 - primary-for Q3GDict (0x31514240) Class Q3TableSelection size=28 align=4 @@ -15005,96 +14201,13 @@ Class Q3Table::TableWidget size=12 align=4 Q3Table::TableWidget (0x31b70a80) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11 entries -0 0 -4 &_ZTI11Q3PtrVectorI11Q3TableItemE -8 Q3PtrVector::count() const [with type = Q3TableItem] -12 Q3PtrVector::clear() [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector() [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector() [with type = Q3TableItem] -24 Q3PtrCollection::newItem(void*) -28 Q3PtrVector::deleteItem(void*) [with type = Q3TableItem] -32 Q3GVector::compareItems(void*, void*) -36 Q3GVector::read(QDataStream&, void*&) -40 Q3GVector::write(QDataStream&, void*) const -Class Q3PtrVector - size=20 align=4 -Q3PtrVector (0x31b70f40) 0 - vptr=((&Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8) - Q3GVector (0x31ccc380) 0 - primary-for Q3PtrVector (0x31b70f40) - Q3PtrCollection (0x31ccc3c0) 0 - primary-for Q3GVector (0x31ccc380) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11 entries -0 0 -4 &_ZTI11Q3PtrVectorI7QWidgetE -8 Q3PtrVector::count() const [with type = QWidget] -12 Q3PtrVector::clear() [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector() [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector() [with type = QWidget] -24 Q3PtrCollection::newItem(void*) -28 Q3PtrVector::deleteItem(void*) [with type = QWidget] -32 Q3GVector::compareItems(void*, void*) -36 Q3GVector::read(QDataStream&, void*&) -40 Q3GVector::write(QDataStream&, void*) const -Class Q3PtrVector - size=20 align=4 -Q3PtrVector (0x31ce4f80) 0 - vptr=((&Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8) - Q3GVector (0x31ce9040) 0 - primary-for Q3PtrVector (0x31ce4f80) - Q3PtrCollection (0x31ce9080) 0 - primary-for Q3GVector (0x31ce9040) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11 entries -0 0 -4 &_ZTI9Q3PtrListI16Q3TableSelectionE -8 Q3PtrList::count() const [with type = Q3TableSelection] -12 Q3PtrList::clear() [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList() [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList() [with type = Q3TableSelection] -24 Q3PtrCollection::newItem(void*) -28 Q3PtrList::deleteItem(void*) [with type = Q3TableSelection] -32 Q3GList::compareItems(void*, void*) -36 Q3GList::read(QDataStream&, void*&) -40 Q3GList::write(QDataStream&, void*) const -Class Q3PtrList - size=32 align=4 -Q3PtrList (0x31cf0bc0) 0 - vptr=((&Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8) - Q3GList (0x31cf0c80) 0 - primary-for Q3PtrList (0x31cf0bc0) - Q3PtrCollection (0x31cf0cc0) 0 - primary-for Q3GList (0x31cf0c80) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10 entries -0 0 -4 &_ZTI9Q3IntDictIiE -8 Q3IntDict::count() const [with type = int] -12 Q3IntDict::clear() [with type = int] -16 Q3IntDict::~Q3IntDict() [with type = int] -20 Q3IntDict::~Q3IntDict() [with type = int] -24 Q3PtrCollection::newItem(void*) -28 Q3IntDict::deleteItem(void*) [with type = int] -32 Q3GDict::read(QDataStream&, void*&) -36 Q3GDict::write(QDataStream&, void*) const -Class Q3IntDict - size=28 align=4 -Q3IntDict (0x31d05c40) 0 - vptr=((&Q3IntDict::_ZTV9Q3IntDictIiE) + 8) - Q3GDict (0x31d05d00) 0 - primary-for Q3IntDict (0x31d05c40) - Q3PtrCollection (0x31d05d40) 0 - primary-for Q3GDict (0x31d05d00) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183 entries @@ -15402,13 +14515,7 @@ Q3Ftp (0x31e30d80) 0 QObject (0x31e30e00) 0 primary-for Q3NetworkProtocol (0x31e30dc0) -Class QMap:: - size=4 align=4 -QMap:: (0x31e57d00) 0 -Class QMap - size=4 align=4 -QMap (0x31e57b80) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8 entries @@ -16397,18 +15504,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x3201c580) 0 vptr=((&Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8) -Class QLinkedList:: - size=4 align=4 -QLinkedList:: (0x3186b540) 0 -Class QLinkedList - size=4 align=4 -QLinkedList (0x3186b380) 0 -Class Q3ValueList - size=4 align=4 -Q3ValueList (0x3186b200) 0 - QLinkedList (0x317e3e80) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -16416,34 +15513,12 @@ Q3SqlRecordInfo (0x3186b2c0) 0 Q3ValueList (0x3160b500) 0 QLinkedList (0x3160b640) 0 -Class QLinkedListNode - size=56 align=8 -QLinkedListNode (0x3186b480) 0 -Class QList:: - size=4 align=4 -QList:: (0x311acfc0) 0 -Class QList - size=4 align=4 -QList (0x31636780) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x30328e40) 0 -Class QLinkedList::const_iterator - size=4 align=4 -QLinkedList::const_iterator (0x3185c540) 0 -Class Q3ValueListConstIterator - size=4 align=4 -Q3ValueListConstIterator (0x31636340) 0 - QLinkedList::const_iterator (0x30e9f880) 0 -Class QLinkedList::iterator - size=4 align=4 -QLinkedList::iterator (0x3185c580) 0 Vtable for Q3SqlSelectCursor Q3SqlSelectCursor::_ZTV17Q3SqlSelectCursor: 40 entries @@ -16501,13 +15576,7 @@ Class Q3StyleSheetItem size=4 align=4 Q3StyleSheetItem (0x317331c0) 0 -Class QHash:: - size=4 align=4 -QHash:: (0x3175bf80) 0 -Class QHash - size=4 align=4 -QHash (0x3175bb80) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16 entries @@ -16543,21 +15612,9 @@ Class Q3TextEditOptimPrivate::Selection size=8 align=4 Q3TextEditOptimPrivate::Selection (0x31794140) 0 -Class QMap:: - size=4 align=4 -QMap:: (0x31799400) 0 -Class QMap - size=4 align=4 -QMap (0x31799280) 0 -Class QMap:: - size=4 align=4 -QMap:: (0x317ad4c0) 0 -Class QMap - size=4 align=4 -QMap (0x317ad300) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -16762,9 +15819,6 @@ Q3TextEdit (0x31789d80) 0 QPaintDevice (0x31b0a100) 8 vptr=((&Q3TextEdit::_ZTV10Q3TextEdit) + 680) -Class QFlags - size=4 align=4 -QFlags (0x31e0db80) 0 Vtable for Q3MultiLineEdit Q3MultiLineEdit::_ZTV15Q3MultiLineEdit: 192 entries @@ -17418,114 +16472,20 @@ Class Q3GCacheIterator size=4 align=4 Q3GCacheIterator (0x31cf6d40) 0 -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8 entries -0 0 -4 &_ZTI12Q3AsciiCacheIvE -8 Q3AsciiCache::count() const [with type = void] -12 Q3AsciiCache::clear() [with type = void] -16 Q3AsciiCache::~Q3AsciiCache() [with type = void] -20 Q3AsciiCache::~Q3AsciiCache() [with type = void] -24 Q3PtrCollection::newItem(void*) -28 Q3AsciiCache::deleteItem(void*) [with type = void] -Class Q3AsciiCache - size=32 align=4 -Q3AsciiCache (0x31fa1400) 0 - vptr=((&Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8) - Q3GCache (0x31fa1500) 0 - primary-for Q3AsciiCache (0x31fa1400) - Q3PtrCollection (0x31fa1540) 0 - primary-for Q3GCache (0x31fa1500) - -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10 entries -0 0 -4 &_ZTI11Q3AsciiDictIvE -8 Q3AsciiDict::count() const [with type = void] -12 Q3AsciiDict::clear() [with type = void] -16 Q3AsciiDict::~Q3AsciiDict() [with type = void] -20 Q3AsciiDict::~Q3AsciiDict() [with type = void] -24 Q3PtrCollection::newItem(void*) -28 Q3AsciiDict::deleteItem(void*) [with type = void] -32 Q3GDict::read(QDataStream&, void*&) -36 Q3GDict::write(QDataStream&, void*) const -Class Q3AsciiDict - size=28 align=4 -Q3AsciiDict (0x31fe6c80) 0 - vptr=((&Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8) - Q3GDict (0x31fe6d80) 0 - primary-for Q3AsciiDict (0x31fe6c80) - Q3PtrCollection (0x31fe6dc0) 0 - primary-for Q3GDict (0x31fe6d80) - -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8 entries -0 0 -4 &_ZTI7Q3CacheIvE -8 Q3Cache::count() const [with type = void] -12 Q3Cache::clear() [with type = void] -16 Q3Cache::~Q3Cache() [with type = void] -20 Q3Cache::~Q3Cache() [with type = void] -24 Q3PtrCollection::newItem(void*) -28 Q3Cache::deleteItem(void*) [with type = void] -Class Q3Cache - size=32 align=4 -Q3Cache (0x32090200) 0 - vptr=((&Q3Cache::_ZTV7Q3CacheIvE) + 8) - Q3GCache (0x32090300) 0 - primary-for Q3Cache (0x32090200) - Q3PtrCollection (0x32090340) 0 - primary-for Q3GCache (0x32090300) + + Class Q3CString size=4 align=4 Q3CString (0x320b9080) 0 QByteArray (0x320b90c0) 0 -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8 entries -0 0 -4 &_ZTI10Q3IntCacheIvE -8 Q3IntCache::count() const [with type = void] -12 Q3IntCache::clear() [with type = void] -16 Q3IntCache::~Q3IntCache() [with type = void] -20 Q3IntCache::~Q3IntCache() [with type = void] -24 Q3PtrCollection::newItem(void*) -28 Q3IntCache::deleteItem(void*) [with type = void] -Class Q3IntCache - size=32 align=4 -Q3IntCache (0x321e52c0) 0 - vptr=((&Q3IntCache::_ZTV10Q3IntCacheIvE) + 8) - Q3GCache (0x321e53c0) 0 - primary-for Q3IntCache (0x321e52c0) - Q3PtrCollection (0x321e5400) 0 - primary-for Q3GCache (0x321e53c0) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10 entries -0 0 -4 &_ZTI11Q3AsciiDictI11QMetaObjectE -8 Q3AsciiDict::count() const [with type = QMetaObject] -12 Q3AsciiDict::clear() [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict() [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict() [with type = QMetaObject] -24 Q3PtrCollection::newItem(void*) -28 Q3AsciiDict::deleteItem(void*) [with type = QMetaObject] -32 Q3GDict::read(QDataStream&, void*&) -36 Q3GDict::write(QDataStream&, void*) const -Class Q3AsciiDict - size=28 align=4 -Q3AsciiDict (0x32203d00) 0 - vptr=((&Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8) - Q3GDict (0x32203e00) 0 - primary-for Q3AsciiDict (0x32203d00) - Q3PtrCollection (0x32203e40) 0 - primary-for Q3GDict (0x32203e00) Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10 entries @@ -17551,73 +16511,11 @@ Q3ObjectDictionary (0x32203cc0) 0 Q3PtrCollection (0x322184c0) 0 primary-for Q3GDict (0x32218480) -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10 entries -0 0 -4 &_ZTI9Q3PtrDictIvE -8 Q3PtrDict::count() const [with type = void] -12 Q3PtrDict::clear() [with type = void] -16 Q3PtrDict::~Q3PtrDict() [with type = void] -20 Q3PtrDict::~Q3PtrDict() [with type = void] -24 Q3PtrCollection::newItem(void*) -28 Q3PtrDict::deleteItem(void*) [with type = void] -32 Q3GDict::read(QDataStream&, void*&) -36 Q3GDict::write(QDataStream&, void*) const -Class Q3PtrDict - size=28 align=4 -Q3PtrDict (0x32291080) 0 - vptr=((&Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8) - Q3GDict (0x32291180) 0 - primary-for Q3PtrDict (0x32291080) - Q3PtrCollection (0x322911c0) 0 - primary-for Q3GDict (0x32291180) - -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11 entries -0 0 -4 &_ZTI10Q3PtrQueueIvE -8 Q3PtrQueue::count() const [with type = void] -12 Q3PtrQueue::clear() [with type = void] -16 Q3PtrQueue::~Q3PtrQueue() [with type = void] -20 Q3PtrQueue::~Q3PtrQueue() [with type = void] -24 Q3PtrCollection::newItem(void*) -28 Q3PtrQueue::deleteItem(void*) [with type = void] -32 Q3GList::compareItems(void*, void*) -36 Q3GList::read(QDataStream&, void*&) -40 Q3GList::write(QDataStream&, void*) const -Class Q3PtrQueue - size=32 align=4 -Q3PtrQueue (0x322c6680) 0 - vptr=((&Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8) - Q3GList (0x322c6780) 0 - primary-for Q3PtrQueue (0x322c6680) - Q3PtrCollection (0x322c67c0) 0 - primary-for Q3GList (0x322c6780) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11 entries -0 0 -4 &_ZTI10Q3PtrStackIvE -8 Q3PtrStack::count() const [with type = void] -12 Q3PtrStack::clear() [with type = void] -16 Q3PtrStack::~Q3PtrStack() [with type = void] -20 Q3PtrStack::~Q3PtrStack() [with type = void] -24 Q3PtrCollection::newItem(void*) -28 Q3PtrStack::deleteItem(void*) [with type = void] -32 Q3GList::compareItems(void*, void*) -36 Q3GList::read(QDataStream&, void*&) -40 Q3GList::write(QDataStream&, void*) const -Class Q3PtrStack - size=32 align=4 -Q3PtrStack (0x322edac0) 0 - vptr=((&Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8) - Q3GList (0x322edbc0) 0 - primary-for Q3PtrStack (0x322edac0) - Q3PtrCollection (0x322edc00) 0 - primary-for Q3GList (0x322edbc0) + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4 entries @@ -17655,28 +16553,7 @@ Q3Signal (0x32307700) 0 QObject (0x32307740) 0 primary-for Q3Signal (0x32307700) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11 entries -0 0 -4 &_ZTI11Q3PtrVectorIcE -8 Q3PtrVector::count() const [with type = char] -12 Q3PtrVector::clear() [with type = char] -16 Q3PtrVector::~Q3PtrVector() [with type = char] -20 Q3PtrVector::~Q3PtrVector() [with type = char] -24 Q3PtrCollection::newItem(void*) -28 Q3PtrVector::deleteItem(void*) [with type = char] -32 Q3GVector::compareItems(void*, void*) -36 Q3GVector::read(QDataStream&, void*&) -40 Q3GVector::write(QDataStream&, void*) const -Class Q3PtrVector - size=20 align=4 -Q3PtrVector (0x32328200) 0 - vptr=((&Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8) - Q3GVector (0x32328300) 0 - primary-for Q3PtrVector (0x32328200) - Q3PtrCollection (0x32328340) 0 - primary-for Q3GVector (0x32328300) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11 entries @@ -17976,13 +16853,7 @@ Q3GroupBox (0x31f04640) 0 QPaintDevice (0x31f04700) 8 vptr=((&Q3GroupBox::_ZTV10Q3GroupBox) + 236) -Class QMap:: - size=4 align=4 -QMap:: (0x31e1eac0) 0 -Class QMap - size=4 align=4 -QMap (0x31e1e900) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64 entries @@ -18687,21 +17558,9 @@ Q3DockWindow (0x31ce9a40) 0 QPaintDevice (0x31ce9f00) 8 vptr=((&Q3DockWindow::_ZTV12Q3DockWindow) + 304) -Class QList:: - size=4 align=4 -QList:: (0x31d48f00) 0 -Class QList - size=4 align=4 -QList (0x31623100) 0 -Class QList:: - size=4 align=4 -QList:: (0x31d51cc0) 0 -Class QList - size=4 align=4 -QList (0x31d48180) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48 entries @@ -18765,9 +17624,6 @@ Q3DockAreaLayout (0x31ce9840) 0 QLayoutItem (0x31d3d400) 8 vptr=((&Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128) -Class QPointer - size=4 align=4 -QPointer (0x320eb740) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -19803,79 +18659,22 @@ Q3WidgetStack (0x320b2940) 0 QPaintDevice (0x320b2a40) 8 vptr=((&Q3WidgetStack::_ZTV13Q3WidgetStack) + 248) -Class QList::Node - size=4 align=4 -QList::Node (0x301dfa00) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x3057e4c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x323f7040) 0 empty -Class QList::Node - size=4 align=4 -QList::Node (0x30ec7480) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x32453000) 0 empty -Class QList::Node - size=4 align=4 -QList::Node (0x307e7680) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x324da680) 0 -Class QVectorTypedData - size=28 align=4 -QVectorTypedData (0x3166cd00) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x32520a80) 0 empty -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x32540600) 0 -Class QVectorTypedData - size=32 align=4 -QVectorTypedData (0x317baac0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x325977c0) 0 empty -Class QVectorTypedData - size=28 align=4 -QVectorTypedData (0x315b86c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x325f4040) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x326ee2c0) 0 empty -Class QList::Node - size=4 align=4 -QList::Node (0x31d48ec0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x32768980) 0 empty -Class QList::Node - size=4 align=4 -QList::Node (0x31d51c80) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x327d6dc0) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/Qt3Support.4.0.0.linux-gcc-amd64.txt index 13c1365dc..105bd7dc2 100644 --- a/tests/auto/bic/data/Qt3Support.4.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/Qt3Support.4.0.0.linux-gcc-amd64.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x2aaaad3351c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad34b0e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad34b380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad34b620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad34b8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad34bb60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad34be00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad35f0e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad35f380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad35f620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad35f8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad35fb60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad35fe00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad36f0e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad36f380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad36f620) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x2aaaad36f850) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad39c930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad39cd20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad428150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad428540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad428930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad428d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad46e150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad46e540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad46e930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad46ed20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad4b8150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad4b8540) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x2aaaad4b8f50) 0 QGenericArgument (0x2aaaad4e9000) 0 -Class QMetaObject:: - size=32 align=8 - base size=32 base align=8 -QMetaObject:: (0x2aaaad4e9850) 0 Class QMetaObject size=32 align=8 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x2aaaad5244d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad559540) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=12 base align=8 QByteRef (0x2aaaad679b60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad705bd0) 0 empty Class QString::Null size=1 align=1 @@ -291,10 +171,6 @@ Class QString base size=8 base align=8 QString (0x2aaaad705ee0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad77e770) 0 Class QLatin1String size=8 align=8 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x2aaaad9cfa10) 0 QString (0x2aaaad9cfa80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad9e3000) 0 empty Class QListData::Data size=32 align=8 @@ -327,15 +199,7 @@ Class QListData base size=8 base align=8 QListData (0x2aaaada07ee0) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaadb28e00) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaadb28cb0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x2aaaadbb32a0) 0 QObject (0x2aaaadbb3310) 0 primary-for QIODevice (0x2aaaadbb32a0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaadbb3e70) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=128 base align=8 QMapData (0x2aaaadc5aa10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaadd72930) 0 Class QTextCodec::ConverterState size=32 align=8 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x2aaaadd72690) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 16u) -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaaddaf230) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaaddaf0e0) 0 Class QTextEncoder size=40 align=8 @@ -503,30 +351,10 @@ Class QTextDecoder base size=40 base align=8 QTextDecoder (0x2aaaaddaff50) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaaddee3f0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x2aaaaddee5b0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaaddee4d0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaaddee690) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaaddee770) 0 Class __gconv_trans_data size=40 align=8 @@ -548,15 +376,7 @@ Class __gconv_info base size=16 base align=8 __gconv_info (0x2aaaaddeea80) 0 -Class :: - size=72 align=8 - base size=72 base align=8 -:: (0x2aaaaddeec40) 0 -Class - size=72 align=8 - base size=72 base align=8 - (0x2aaaaddeeb60) 0 Class _IO_marker size=24 align=8 @@ -568,10 +388,6 @@ Class _IO_FILE base size=216 base align=8 _IO_FILE (0x2aaaaddeed20) 0 -Class - size=32 align=8 - base size=32 base align=8 - (0x2aaaaddeee00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x2aaaaddeee70) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaade6d150) 0 Class QTextStreamManipulator size=40 align=8 @@ -680,10 +492,6 @@ QFile (0x2aaaadf37bd0) 0 QObject (0x2aaaadf37cb0) 0 primary-for QIODevice (0x2aaaadf37c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaadf6da80) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=8 base align=8 QRegExp (0x2aaaadf9b8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadfc3700) 0 empty Class QStringMatcher size=1048 align=8 base size=1044 base align=8 QStringMatcher (0x2aaaadfc3930) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaadfc3ee0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaadfc3d90) 0 Class QStringList size=8 align=8 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x2aaaadff9070) 0 QList (0x2aaaadff90e0) 0 -Class QList::iterator - size=8 align=8 - base size=8 base align=8 -QList::iterator (0x2aaaae020ee0) 0 -Class QList::const_iterator - size=8 align=8 - base size=8 base align=8 -QList::const_iterator (0x2aaaae0402a0) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=8 base align=8 QFileInfo (0x2aaaae093c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae0cf690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae0cfaf0) 0 empty -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaae0f82a0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaae0f8150) 0 Class QDir size=8 align=8 base size=8 base align=8 QDir (0x2aaaae0f83f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae0f8690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae0f88c0) 0 Class QUrl size=8 align=8 base size=8 base align=8 QUrl (0x2aaaae19c5b0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae19c8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae1faaf0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x2aaaae217150) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae217850) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae217a10) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae217bd0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae217d90) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae217f50) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae232150) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae232310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae2324d0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae232690) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae232850) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae232a10) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae232bd0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae232d90) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae232f50) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae23c150) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae23c310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae23c4d0) 0 empty Class QVariant::PrivateShared size=16 align=8 @@ -1029,35 +717,15 @@ Class QVariant base size=16 base align=8 QVariant (0x2aaaae23c620) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaae2cf7e0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaae2cf690) 0 -Class QMap:: - size=8 align=8 - base size=8 base align=8 -QMap:: (0x2aaaae2cfb60) 0 -Class QMap - size=8 align=8 - base size=8 base align=8 -QMap (0x2aaaae2cfa10) 0 Class QVariantComparisonHelper size=8 align=8 base size=8 base align=8 QVariantComparisonHelper (0x2aaaae33f4d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae33ff50) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1128,10 +796,6 @@ Class QFileEngine QFileEngine (0x2aaaae3c3380) 0 vptr=((& QFileEngine::_ZTV11QFileEngine) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae3c3770) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5u entries @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x2aaaae413070) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae413230) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x2aaaae53d540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae53dd20) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x2aaaae56a8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae56aaf0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x2aaaae5b70e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae5b72a0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x2aaaae5d2b60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae5f6150) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x2aaaae622230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae622930) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x2aaaae657b60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae657f50) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x2aaaae6a9a10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae6df7e0) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x2aaaae76b380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae79b310) 0 empty Class QLinkedListData size=32 align=8 @@ -1262,10 +890,6 @@ Class QBitRef base size=12 base align=8 QBitRef (0x2aaaae9124d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae9240e0) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=8 base align=8 QLocale (0x2aaaaea461c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaea46c40) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x2aaaaeaf0310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaeb104d0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x2aaaaeb10700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaeb2f230) 0 empty Class QDateTime size=8 align=8 base size=8 base align=8 QDateTime (0x2aaaaeb2f460) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaeb5d000) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x2aaaaebbcbd0) 0 QObject (0x2aaaaebbcc40) 0 primary-for QEventLoop (0x2aaaaebbcbd0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaebbce70) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=24 base align=8 QModelIndex (0x2aaaaec570e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaec71310) 0 empty Class QPersistentModelIndex size=8 align=8 base size=8 base align=8 QPersistentModelIndex (0x2aaaaec71850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaec71a80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2aaaaed1e0e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaed1e9a0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=12 base align=8 QMetaMethod (0x2aaaaed7a7e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaed7abd0) 0 empty Class QMetaEnum size=16 align=8 base size=12 base align=8 QMetaEnum (0x2aaaaed7ae00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaeda42a0) 0 empty Class QMetaProperty size=32 align=8 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=12 base align=8 QMetaClassInfo (0x2aaaaeda4620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaeda4a10) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2057,25 +1637,9 @@ Class QWriteLocker base size=8 base align=8 QWriteLocker (0x2aaaaee56380) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2aaaaee697e0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2aaaaee698c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2aaaaee699a0) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2aaaaee69700) 0 Class QColor size=16 align=4 @@ -2092,55 +1656,23 @@ Class QPen base size=8 base align=8 QPen (0x2aaaaeeb2f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaeefc070) 0 empty Class QBrush size=8 align=8 base size=8 base align=8 QBrush (0x2aaaaeefc380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaeefc7e0) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x2aaaaeefca10) 0 -Class QVector >:: - size=8 align=8 - base size=8 base align=8 -QVector >:: (0x2aaaaef23150) 0 -Class QVector > - size=8 align=8 - base size=8 base align=8 -QVector > (0x2aaaaeefcf50) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2aaaaef23380) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2aaaaef23460) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2aaaaef23540) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2aaaaef232a0) 0 Class QGradient size=64 align=8 @@ -2170,25 +1702,13 @@ Class QTextLength base size=16 base align=8 QTextLength (0x2aaaaef23b60) 0 -Class QSharedDataPointer - size=8 align=8 - base size=8 base align=8 -QSharedDataPointer (0x2aaaaef60af0) 0 Class QTextFormat size=16 align=8 base size=12 base align=8 QTextFormat (0x2aaaaef608c0) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaaef9e850) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaaef9e690) 0 Class QTextCharFormat size=16 align=8 @@ -2328,10 +1848,6 @@ QTextFrame (0x2aaaaf0ed3f0) 0 QObject (0x2aaaaf0ed4d0) 0 primary-for QTextObject (0x2aaaaf0ed460) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf125150) 0 empty Class QTextBlock::iterator size=24 align=8 @@ -2343,25 +1859,13 @@ Class QTextBlock base size=12 base align=8 QTextBlock (0x2aaaaf125460) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf1577e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf157a80) 0 empty Class QTextFragment size=16 align=8 base size=16 base align=8 QTextFragment (0x2aaaaf157cb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf16dcb0) 0 empty Class QFontMetrics size=8 align=8 @@ -2421,20 +1925,12 @@ QTextDocument (0x2aaaaf1c32a0) 0 QObject (0x2aaaaf1c3310) 0 primary-for QTextDocument (0x2aaaaf1c32a0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaf1c3700) 0 Class QTextOption size=32 align=8 base size=32 base align=8 QTextOption (0x2aaaaf1c3bd0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaf2022a0) 0 Class QTextTableCell size=16 align=8 @@ -2485,10 +1981,6 @@ Class QKeySequence base size=8 base align=8 QKeySequence (0x2aaaaf2624d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf262af0) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2771,15 +2263,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x2aaaaf350930) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaaf36c2a0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaaf36c150) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3063,15 +2547,7 @@ Class QTextLayout base size=8 base align=8 QTextLayout (0x2aaaaf40de00) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaaf4351c0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaaf435000) 0 Class QTextLine size=16 align=8 @@ -3120,10 +2596,6 @@ Class QTextDocumentFragment base size=8 base align=8 QTextDocumentFragment (0x2aaaaf486620) 0 -Class QSharedDataPointer - size=8 align=8 - base size=8 base align=8 -QSharedDataPointer (0x2aaaaf486850) 0 Class QTextCursor size=8 align=8 @@ -3146,15 +2618,7 @@ Class QAbstractTextDocumentLayout::Selection base size=24 base align=8 QAbstractTextDocumentLayout::Selection (0x2aaaaf552700) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaaf552af0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaaf552930) 0 Class QAbstractTextDocumentLayout::PaintContext size=64 align=8 @@ -3981,10 +3445,6 @@ QFileDialog (0x2aaaaf8403f0) 0 QPaintDevice (0x2aaaaf840540) 16 vptr=((& QFileDialog::_ZTV11QFileDialog) + 488u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaf840bd0) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4504,10 +3964,6 @@ QImage (0x2aaaaf95af50) 0 QPaintDevice (0x2aaaaf98b000) 0 primary-for QImage (0x2aaaaf95af50) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf9ee070) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4732,10 +4188,6 @@ Class QIcon base size=8 base align=8 QIcon (0x2aaaafae4850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaafb10380) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4887,15 +4339,7 @@ Class QPrintEngine QPrintEngine (0x2aaaafb61e00) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 16u) -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafba3690) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafba34d0) 0 Class QPolygon size=8 align=8 @@ -4903,15 +4347,7 @@ Class QPolygon QPolygon (0x2aaaafba3770) 0 QVector (0x2aaaafba37e0) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafbf4150) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafbe2f50) 0 Class QPolygonF size=8 align=8 @@ -4924,55 +4360,19 @@ Class QMatrix base size=48 base align=8 QMatrix (0x2aaaafc27770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaafc4f230) 0 empty Class QPainter size=8 align=8 base size=8 base align=8 QPainter (0x2aaaafc4fee0) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafcf3f50) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafcf3d90) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafd1f3f0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafd1f230) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafd5b2a0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafd5b0e0) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafd5b700) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafd5b540) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5020,15 +4420,7 @@ QStyle (0x2aaaafe0e8c0) 0 QObject (0x2aaaafe0e930) 0 primary-for QStyle (0x2aaaafe0e8c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaafe0ef50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaafe6e310) 0 Class QStylePainter size=24 align=8 @@ -5046,25 +4438,13 @@ Class QPainterPath base size=8 base align=8 QPainterPath (0x2aaaafe9eb60) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafed0bd0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafed0a10) 0 Class QPainterPathPrivate size=16 align=8 base size=16 base align=8 QPainterPathPrivate (0x2aaaafed0690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaafed0d20) 0 empty Class QPainterPathStroker size=8 align=8 @@ -5076,15 +4456,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x2aaaaff205b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaff20700) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaff20b60) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5119,10 +4491,6 @@ Class QPaintEngine QPaintEngine (0x2aaaaff20930) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaff5c700) 0 Class QPaintEngineState size=4 align=4 @@ -5134,10 +4502,6 @@ Class QItemSelectionRange base size=16 base align=8 QItemSelectionRange (0x2aaaaff8d5b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaffe72a0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5168,20 +4532,8 @@ QItemSelectionModel (0x2aaaaffe77e0) 0 QObject (0x2aaaaffe7850) 0 primary-for QItemSelectionModel (0x2aaaaffe77e0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaffe7a10) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab001c620) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab001c4d0) 0 Class QItemSelection size=8 align=8 @@ -5470,10 +4822,6 @@ QAbstractSpinBox (0x2aaab0094f50) 0 QPaintDevice (0x2aaab0094af0) 16 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 504u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab00c1850) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5910,10 +5258,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x2aaab0205a80) 0 QStyleOption (0x2aaab0205af0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab02293f0) 0 Class QStyleOptionButton size=88 align=8 @@ -5921,10 +5265,6 @@ Class QStyleOptionButton QStyleOptionButton (0x2aaab02290e0) 0 QStyleOption (0x2aaab0229150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab0229310) 0 Class QStyleOptionTab size=96 align=8 @@ -5944,10 +5284,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x2aaab026ce70) 0 QStyleOption (0x2aaab026cee0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab0299850) 0 Class QStyleOptionQ3ListViewItem size=80 align=8 @@ -6005,15 +5341,7 @@ QStyleOptionSpinBox (0x2aaab0329380) 0 QStyleOptionComplex (0x2aaab03293f0) 0 QStyleOption (0x2aaab0329460) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab0329e00) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab0329ee0) 0 Class QStyleOptionQ3ListView size=112 align=8 @@ -6022,10 +5350,6 @@ QStyleOptionQ3ListView (0x2aaab0329b60) 0 QStyleOptionComplex (0x2aaab0329bd0) 0 QStyleOption (0x2aaab0329c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab03579a0) 0 Class QStyleOptionToolButton size=128 align=8 @@ -6213,10 +5537,6 @@ QAbstractItemView (0x2aaab03beb60) 0 QPaintDevice (0x2aaab03bed20) 16 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 784u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab045c4d0) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6399,15 +5719,7 @@ QListView (0x2aaab045caf0) 0 QPaintDevice (0x2aaab04921c0) 16 vptr=((& QListView::_ZTV9QListView) + 784u) -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaab0492d20) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaab0492b60) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7324,15 +6636,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x2aaab06bfe70) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 16u) -Class QHash:: - size=8 align=8 - base size=8 base align=8 -QHash:: (0x2aaab06ffb60) 0 -Class QHash - size=8 align=8 - base size=8 base align=8 -QHash (0x2aaab06ff9a0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7349,25 +6653,9 @@ Class QItemEditorFactory QItemEditorFactory (0x2aaab06ff7e0) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 16u) -Class QVector >:: - size=8 align=8 - base size=8 base align=8 -QVector >:: (0x2aaab0730540) 0 -Class QVector > - size=8 align=8 - base size=8 base align=8 -QVector > (0x2aaab0730380) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab07308c0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab0730770) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -7594,15 +6882,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2aaab08161c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab0816380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab0816770) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8450,15 +7730,7 @@ QActionGroup (0x2aaab0a9a930) 0 QObject (0x2aaab0a9a9a0) 0 primary-for QActionGroup (0x2aaab0a9a930) -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab0ab8540) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab0ab83f0) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -8599,10 +7871,6 @@ QCommonStyle (0x2aaab0af5d90) 0 QObject (0x2aaab0af5e70) 0 primary-for QStyle (0x2aaab0af5e00) -Class QPointer - size=8 align=8 - base size=8 base align=8 -QPointer (0x2aaab0b265b0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10130,10 +9398,6 @@ QDateEdit (0x2aaab0ddc540) 0 QPaintDevice (0x2aaab0ddc700) 16 vptr=((& QDateEdit::_ZTV9QDateEdit) + 520u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab0ddcd20) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10293,10 +9557,6 @@ QDockWidget (0x2aaab0e14a10) 0 QPaintDevice (0x2aaab0e14af0) 16 vptr=((& QDockWidget::_ZTV11QDockWidget) + 464u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab0e56620) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12177,15 +11437,7 @@ Class QSqlRecord base size=8 base align=8 QSqlRecord (0x2aaab136d620) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab136dd20) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab136dbd0) 0 Class QSqlIndex size=32 align=8 @@ -12193,10 +11445,6 @@ Class QSqlIndex QSqlIndex (0x2aaab136d9a0) 0 QSqlRecord (0x2aaab136da10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab13c03f0) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -12873,29 +12121,7 @@ Q3GVector (0x2aaab1589000) 0 Q3PtrCollection (0x2aaab1589070) 0 primary-for Q3GVector (0x2aaab1589000) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -16 Q3PtrVector::count [with type = void] -24 Q3PtrVector::clear [with type = void] -32 Q3PtrVector::~Q3PtrVector [with type = void] -40 Q3PtrVector::~Q3PtrVector [with type = void] -48 Q3PtrCollection::newItem -56 Q3PtrVector::deleteItem [with type = void] -64 Q3GVector::compareItems -72 Q3GVector::read -80 Q3GVector::write -Class Q3PtrVector - size=32 align=8 - base size=32 base align=8 -Q3PtrVector (0x2aaab15b83f0) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 16u) - Q3GVector (0x2aaab15b8460) 0 - primary-for Q3PtrVector (0x2aaab15b83f0) - Q3PtrCollection (0x2aaab15b84d0) 0 - primary-for Q3GVector (0x2aaab15b8460) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -13052,29 +12278,7 @@ Class Q3GListStdIterator base size=8 base align=8 Q3GListStdIterator (0x2aaab1688620) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9Q3PtrListIvE) -16 Q3PtrList::count [with type = void] -24 Q3PtrList::clear [with type = void] -32 Q3PtrList::~Q3PtrList [with type = void] -40 Q3PtrList::~Q3PtrList [with type = void] -48 Q3PtrCollection::newItem -56 Q3PtrList::deleteItem [with type = void] -64 Q3GList::compareItems -72 Q3GList::read -80 Q3GList::write -Class Q3PtrList - size=56 align=8 - base size=56 base align=8 -Q3PtrList (0x2aaab16d0930) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 16u) - Q3GList (0x2aaab16d09a0) 0 - primary-for Q3PtrList (0x2aaab16d0930) - Q3PtrCollection (0x2aaab16d0a10) 0 - primary-for Q3GList (0x2aaab16d09a0) Class Q3BaseBucket size=16 align=8 @@ -13131,28 +12335,7 @@ Class Q3GDictIterator base size=20 base align=8 Q3GDictIterator (0x2aaab1726620) 0 -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9Q3IntDictIvE) -16 Q3IntDict::count [with type = void] -24 Q3IntDict::clear [with type = void] -32 Q3IntDict::~Q3IntDict [with type = void] -40 Q3IntDict::~Q3IntDict [with type = void] -48 Q3PtrCollection::newItem -56 Q3IntDict::deleteItem [with type = void] -64 Q3GDict::read -72 Q3GDict::write -Class Q3IntDict - size=48 align=8 - base size=48 base align=8 -Q3IntDict (0x2aaab175b770) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 16u) - Q3GDict (0x2aaab175b7e0) 0 - primary-for Q3IntDict (0x2aaab175b770) - Q3PtrCollection (0x2aaab175b850) 0 - primary-for Q3GDict (0x2aaab175b7e0) Class Q3TableSelection size=28 align=4 @@ -13263,100 +12446,13 @@ Class Q3Table::TableWidget base size=16 base align=8 Q3Table::TableWidget (0x2aaab17ad700) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -16 Q3PtrVector::count [with type = Q3TableItem] -24 Q3PtrVector::clear [with type = Q3TableItem] -32 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -40 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -48 Q3PtrCollection::newItem -56 Q3PtrVector::deleteItem [with type = Q3TableItem] -64 Q3GVector::compareItems -72 Q3GVector::read -80 Q3GVector::write -Class Q3PtrVector - size=32 align=8 - base size=32 base align=8 -Q3PtrVector (0x2aaab17ad930) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 16u) - Q3GVector (0x2aaab17ad9a0) 0 - primary-for Q3PtrVector (0x2aaab17ad930) - Q3PtrCollection (0x2aaab17ada10) 0 - primary-for Q3GVector (0x2aaab17ad9a0) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -16 Q3PtrVector::count [with type = QWidget] -24 Q3PtrVector::clear [with type = QWidget] -32 Q3PtrVector::~Q3PtrVector [with type = QWidget] -40 Q3PtrVector::~Q3PtrVector [with type = QWidget] -48 Q3PtrCollection::newItem -56 Q3PtrVector::deleteItem [with type = QWidget] -64 Q3GVector::compareItems -72 Q3GVector::read -80 Q3GVector::write -Class Q3PtrVector - size=32 align=8 - base size=32 base align=8 -Q3PtrVector (0x2aaab17add90) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 16u) - Q3GVector (0x2aaab17ade00) 0 - primary-for Q3PtrVector (0x2aaab17add90) - Q3PtrCollection (0x2aaab17ade70) 0 - primary-for Q3GVector (0x2aaab17ade00) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -16 Q3PtrList::count [with type = Q3TableSelection] -24 Q3PtrList::clear [with type = Q3TableSelection] -32 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -40 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -48 Q3PtrCollection::newItem -56 Q3PtrList::deleteItem [with type = Q3TableSelection] -64 Q3GList::compareItems -72 Q3GList::read -80 Q3GList::write -Class Q3PtrList - size=56 align=8 - base size=56 base align=8 -Q3PtrList (0x2aaab17adb60) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 16u) - Q3GList (0x2aaab17adcb0) 0 - primary-for Q3PtrList (0x2aaab17adb60) - Q3PtrCollection (0x2aaab181e000) 0 - primary-for Q3GList (0x2aaab17adcb0) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9Q3IntDictIiE) -16 Q3IntDict::count [with type = int] -24 Q3IntDict::clear [with type = int] -32 Q3IntDict::~Q3IntDict [with type = int] -40 Q3IntDict::~Q3IntDict [with type = int] -48 Q3PtrCollection::newItem -56 Q3IntDict::deleteItem [with type = int] -64 Q3GDict::read -72 Q3GDict::write -Class Q3IntDict - size=48 align=8 - base size=48 base align=8 -Q3IntDict (0x2aaab181e3f0) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 16u) - Q3GDict (0x2aaab181e460) 0 - primary-for Q3IntDict (0x2aaab181e3f0) - Q3PtrCollection (0x2aaab181e4d0) 0 - primary-for Q3GDict (0x2aaab181e460) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -14080,21 +13176,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x2aaab197f230) 0 vptr=((& Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 16u) -Class QLinkedList:: - size=8 align=8 - base size=8 base align=8 -QLinkedList:: (0x2aaab19be230) 0 -Class QLinkedList - size=8 align=8 - base size=8 base align=8 -QLinkedList (0x2aaab19be070) 0 -Class Q3ValueList - size=8 align=8 - base size=8 base align=8 -Q3ValueList (0x2aaab19be2a0) 0 - QLinkedList (0x2aaab19be310) 0 Class Q3SqlRecordInfo size=8 align=8 @@ -14103,31 +13186,10 @@ Q3SqlRecordInfo (0x2aaab19be540) 0 Q3ValueList (0x2aaab19be5b0) 0 QLinkedList (0x2aaab19be620) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab19bec40) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab19beaf0) 0 -Class QLinkedList::const_iterator - size=8 align=8 - base size=8 base align=8 -QLinkedList::const_iterator (0x2aaab1a19f50) 0 -Class Q3ValueListConstIterator - size=8 align=8 - base size=8 base align=8 -Q3ValueListConstIterator (0x2aaab1a19e00) 0 - QLinkedList::const_iterator (0x2aaab1a3d000) 0 -Class QLinkedList::iterator - size=8 align=8 - base size=8 base align=8 -QLinkedList::iterator (0x2aaab1a3d1c0) 0 Vtable for Q3DataView Q3DataView::_ZTV10Q3DataView: 69u entries @@ -14218,15 +13280,7 @@ Class Q3StyleSheetItem base size=8 base align=8 Q3StyleSheetItem (0x2aaab1a6da80) 0 -Class QHash:: - size=8 align=8 - base size=8 base align=8 -QHash:: (0x2aaab1a6dee0) 0 -Class QHash - size=8 align=8 - base size=8 base align=8 -QHash (0x2aaab1a6dd20) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -14287,25 +13341,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0x2aaab1ac29a0) 0 -Class QMap:: - size=8 align=8 - base size=8 base align=8 -QMap:: (0x2aaab1ac2cb0) 0 -Class QMap - size=8 align=8 - base size=8 base align=8 -QMap (0x2aaab1ac2b60) 0 -Class QMap:: - size=8 align=8 - base size=8 base align=8 -QMap:: (0x2aaab1ac2e70) 0 -Class QMap - size=8 align=8 - base size=8 base align=8 -QMap (0x2aaab1ac2620) 0 Class Q3TextEditOptimPrivate size=72 align=8 @@ -14513,10 +13551,6 @@ Q3TextEdit (0x2aaab1afae70) 0 QPaintDevice (0x2aaab1b2f000) 16 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 1360u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab1b2f230) 0 Vtable for Q3SyntaxHighlighter Q3SyntaxHighlighter::_ZTV19Q3SyntaxHighlighter: 5u entries @@ -15446,28 +14480,7 @@ Class Q3Url Q3Url (0x2aaab1cc1310) 0 vptr=((& Q3Url::_ZTV5Q3Url) + 16u) -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI6Q3DictIvE) -16 Q3Dict::count [with type = void] -24 Q3Dict::clear [with type = void] -32 Q3Dict::~Q3Dict [with type = void] -40 Q3Dict::~Q3Dict [with type = void] -48 Q3PtrCollection::newItem -56 Q3Dict::deleteItem [with type = void] -64 Q3GDict::read -72 Q3GDict::write -Class Q3Dict - size=48 align=8 - base size=48 base align=8 -Q3Dict (0x2aaab1cc1f50) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 16u) - Q3GDict (0x2aaab1cc14d0) 0 - primary-for Q3Dict (0x2aaab1cc1f50) - Q3PtrCollection (0x2aaab1cef000) 0 - primary-for Q3GDict (0x2aaab1cc14d0) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -15762,29 +14775,7 @@ Q3Accel (0x2aaab1d79d90) 0 QObject (0x2aaab1d79e00) 0 primary-for Q3Accel (0x2aaab1d79d90) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9Q3PtrListIcE) -16 Q3PtrList::count [with type = char] -24 Q3PtrList::clear [with type = char] -32 Q3PtrList::~Q3PtrList [with type = char] -40 Q3PtrList::~Q3PtrList [with type = char] -48 Q3PtrCollection::newItem -56 Q3PtrList::deleteItem [with type = char] -64 Q3GList::compareItems -72 Q3GList::read -80 Q3GList::write -Class Q3PtrList - size=56 align=8 - base size=56 base align=8 -Q3PtrList (0x2aaab1dc9460) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 16u) - Q3GList (0x2aaab1dc94d0) 0 - primary-for Q3PtrList (0x2aaab1dc9460) - Q3PtrCollection (0x2aaab1dc9540) 0 - primary-for Q3GList (0x2aaab1dc94d0) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -15812,11 +14803,6 @@ Q3StrList (0x2aaab1dc97e0) 0 Q3PtrCollection (0x2aaab1dc9930) 0 primary-for Q3GList (0x2aaab1dc98c0) -Class Q3PtrListStdIterator - size=8 align=8 - base size=8 base align=8 -Q3PtrListStdIterator (0x2aaab1df4e00) 0 - Q3GListStdIterator (0x2aaab1df4e70) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -16170,29 +15156,7 @@ Class Q3CString Q3CString (0x2aaab1eb1a10) 0 QByteArray (0x2aaab1eb1cb0) 0 -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -16 Q3PtrQueue::count [with type = void] -24 Q3PtrQueue::clear [with type = void] -32 Q3PtrQueue::~Q3PtrQueue [with type = void] -40 Q3PtrQueue::~Q3PtrQueue [with type = void] -48 Q3PtrCollection::newItem -56 Q3PtrQueue::deleteItem [with type = void] -64 Q3GList::compareItems -72 Q3GList::read -80 Q3GList::write -Class Q3PtrQueue - size=56 align=8 - base size=56 base align=8 -Q3PtrQueue (0x2aaab1fa8e70) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 16u) - Q3GList (0x2aaab1fa8ee0) 0 - primary-for Q3PtrQueue (0x2aaab1fa8e70) - Q3PtrCollection (0x2aaab1fa8f50) 0 - primary-for Q3GList (0x2aaab1fa8ee0) Vtable for Q3Signal Q3Signal::_ZTV8Q3Signal: 14u entries @@ -16219,75 +15183,11 @@ Q3Signal (0x2aaab1fc44d0) 0 QObject (0x2aaab1fc4540) 0 primary-for Q3Signal (0x2aaab1fc44d0) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -16 Q3AsciiDict::count [with type = void] -24 Q3AsciiDict::clear [with type = void] -32 Q3AsciiDict::~Q3AsciiDict [with type = void] -40 Q3AsciiDict::~Q3AsciiDict [with type = void] -48 Q3PtrCollection::newItem -56 Q3AsciiDict::deleteItem [with type = void] -64 Q3GDict::read -72 Q3GDict::write -Class Q3AsciiDict - size=48 align=8 - base size=48 base align=8 -Q3AsciiDict (0x2aaab1fe3850) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 16u) - Q3GDict (0x2aaab1fe38c0) 0 - primary-for Q3AsciiDict (0x2aaab1fe3850) - Q3PtrCollection (0x2aaab1fe3930) 0 - primary-for Q3GDict (0x2aaab1fe38c0) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -16 Q3PtrStack::count [with type = void] -24 Q3PtrStack::clear [with type = void] -32 Q3PtrStack::~Q3PtrStack [with type = void] -40 Q3PtrStack::~Q3PtrStack [with type = void] -48 Q3PtrCollection::newItem -56 Q3PtrStack::deleteItem [with type = void] -64 Q3GList::compareItems -72 Q3GList::read -80 Q3GList::write -Class Q3PtrStack - size=56 align=8 - base size=56 base align=8 -Q3PtrStack (0x2aaab200dcb0) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 16u) - Q3GList (0x2aaab200dd20) 0 - primary-for Q3PtrStack (0x2aaab200dcb0) - Q3PtrCollection (0x2aaab200dd90) 0 - primary-for Q3GList (0x2aaab200dd20) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -16 Q3AsciiDict::count [with type = QMetaObject] -24 Q3AsciiDict::clear [with type = QMetaObject] -32 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -40 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -48 Q3PtrCollection::newItem -56 Q3AsciiDict::deleteItem [with type = QMetaObject] -64 Q3GDict::read -72 Q3GDict::write -Class Q3AsciiDict - size=48 align=8 - base size=48 base align=8 -Q3AsciiDict (0x2aaab202a1c0) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 16u) - Q3GDict (0x2aaab202a230) 0 - primary-for Q3AsciiDict (0x2aaab202a1c0) - Q3PtrCollection (0x2aaab202a2a0) 0 - primary-for Q3GDict (0x2aaab202a230) + Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -16338,91 +15238,13 @@ Class Q3GCacheIterator base size=8 base align=8 Q3GCacheIterator (0x2aaab2047850) 0 -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI7Q3CacheIvE) -16 Q3Cache::count [with type = void] -24 Q3Cache::clear [with type = void] -32 Q3Cache::~Q3Cache [with type = void] -40 Q3Cache::~Q3Cache [with type = void] -48 Q3PtrCollection::newItem -56 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=48 align=8 - base size=41 base align=8 -Q3Cache (0x2aaab207a2a0) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 16u) - Q3GCache (0x2aaab207a310) 0 - primary-for Q3Cache (0x2aaab207a2a0) - Q3PtrCollection (0x2aaab207a380) 0 - primary-for Q3GCache (0x2aaab207a310) - -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -16 Q3IntCache::count [with type = void] -24 Q3IntCache::clear [with type = void] -32 Q3IntCache::~Q3IntCache [with type = void] -40 Q3IntCache::~Q3IntCache [with type = void] -48 Q3PtrCollection::newItem -56 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=48 align=8 - base size=41 base align=8 -Q3IntCache (0x2aaab20c92a0) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 16u) - Q3GCache (0x2aaab20c9310) 0 - primary-for Q3IntCache (0x2aaab20c92a0) - Q3PtrCollection (0x2aaab20c9380) 0 - primary-for Q3GCache (0x2aaab20c9310) - -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -16 Q3PtrDict::count [with type = void] -24 Q3PtrDict::clear [with type = void] -32 Q3PtrDict::~Q3PtrDict [with type = void] -40 Q3PtrDict::~Q3PtrDict [with type = void] -48 Q3PtrCollection::newItem -56 Q3PtrDict::deleteItem [with type = void] -64 Q3GDict::read -72 Q3GDict::write -Class Q3PtrDict - size=48 align=8 - base size=48 base align=8 -Q3PtrDict (0x2aaab20ec9a0) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 16u) - Q3GDict (0x2aaab20eca10) 0 - primary-for Q3PtrDict (0x2aaab20ec9a0) - Q3PtrCollection (0x2aaab20eca80) 0 - primary-for Q3GDict (0x2aaab20eca10) - -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -16 Q3AsciiCache::count [with type = void] -24 Q3AsciiCache::clear [with type = void] -32 Q3AsciiCache::~Q3AsciiCache [with type = void] -40 Q3AsciiCache::~Q3AsciiCache [with type = void] -48 Q3PtrCollection::newItem -56 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=48 align=8 - base size=41 base align=8 -Q3AsciiCache (0x2aaab212ae00) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 16u) - Q3GCache (0x2aaab212ae70) 0 - primary-for Q3AsciiCache (0x2aaab212ae00) - Q3PtrCollection (0x2aaab212aee0) 0 - primary-for Q3GCache (0x2aaab212ae70) + + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -16437,29 +15259,7 @@ Class Q3Semaphore Q3Semaphore (0x2aaab216b070) 0 vptr=((& Q3Semaphore::_ZTV11Q3Semaphore) + 16u) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -16 Q3PtrVector::count [with type = char] -24 Q3PtrVector::clear [with type = char] -32 Q3PtrVector::~Q3PtrVector [with type = char] -40 Q3PtrVector::~Q3PtrVector [with type = char] -48 Q3PtrCollection::newItem -56 Q3PtrVector::deleteItem [with type = char] -64 Q3GVector::compareItems -72 Q3GVector::read -80 Q3GVector::write -Class Q3PtrVector - size=32 align=8 - base size=32 base align=8 -Q3PtrVector (0x2aaab216b3f0) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 16u) - Q3GVector (0x2aaab216b460) 0 - primary-for Q3PtrVector (0x2aaab216b3f0) - Q3PtrCollection (0x2aaab216b4d0) 0 - primary-for Q3GVector (0x2aaab216b460) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -16554,21 +15354,8 @@ Class Q3PaintDeviceMetrics base size=8 base align=8 Q3PaintDeviceMetrics (0x2aaab21fe620) 0 -Class QLinkedList:: - size=8 align=8 - base size=8 base align=8 -QLinkedList:: (0x2aaab2211620) 0 -Class QLinkedList - size=8 align=8 - base size=8 base align=8 -QLinkedList (0x2aaab2211460) 0 -Class Q3ValueList - size=8 align=8 - base size=8 base align=8 -Q3ValueList (0x2aaab2211690) 0 - QLinkedList (0x2aaab2211700) 0 Class Q3CanvasItemList size=8 align=8 @@ -17905,15 +16692,7 @@ Q3SocketDevice (0x2aaab251c770) 0 QObject (0x2aaab251c850) 0 primary-for QIODevice (0x2aaab251c7e0) -Class QMap:: - size=8 align=8 - base size=8 base align=8 -QMap:: (0x2aaab251c9a0) 0 -Class QMap - size=8 align=8 - base size=8 base align=8 -QMap (0x2aaab251cf50) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -19238,15 +18017,7 @@ Q3VBox (0x2aaab2785230) 0 QPaintDevice (0x2aaab2785460) 16 vptr=((& Q3VBox::_ZTV6Q3VBox) + 488u) -Class QMap:: - size=8 align=8 - base size=8 base align=8 -QMap:: (0x2aaab2785ee0) 0 -Class QMap - size=8 align=8 - base size=8 base align=8 -QMap (0x2aaab2785d90) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -20173,25 +18944,9 @@ Q3MainWindow (0x2aaab28f1a80) 0 QPaintDevice (0x2aaab28f1b60) 16 vptr=((& Q3MainWindow::_ZTV12Q3MainWindow) + 656u) -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab2934e70) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab2934d20) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab297b0e0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab2934f50) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -20256,10 +19011,6 @@ Q3DockAreaLayout (0x2aaab2934af0) 0 QLayoutItem (0x2aaab2934bd0) 16 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 256u) -Class QPointer - size=8 align=8 - base size=8 base align=8 -QPointer (0x2aaab29beb60) 0 Class Q3DockArea::DockWindowData size=32 align=8 @@ -20344,188 +19095,40 @@ Q3DockArea (0x2aaab29be850) 0 QPaintDevice (0x2aaab29be930) 16 vptr=((& Q3DockArea::_ZTV10Q3DockArea) + 464u) -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab2a811c0) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab2abe2a0) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x2aaab2b42a10) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x2aaab2b5eb60) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x2aaab2b69620) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x2aaab2b902a0) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x2aaab2bb4700) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x2aaab2be3460) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x2aaab2be39a0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x2aaab2be3ee0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x2aaab2bf0460) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x2aaab2c063f0) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab2cbbe00) 0 -Class QVectorTypedData > - size=24 align=8 - base size=24 base align=8 -QVectorTypedData > (0x2aaab2cc9540) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab2d13f50) 0 -Class QLinkedListNode - size=80 align=8 - base size=80 base align=8 -QLinkedListNode (0x2aaab2d61e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab2e7b540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab2e871c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab2e951c0) 0 empty -Class QHashNode - size=24 align=8 - base size=24 base align=8 -QHashNode (0x2aaab2edb2a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab2edb7e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab2eeab60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab2f1e770) 0 empty -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab2f5e850) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=8 align=8 - base size=8 base align=8 -QVector::realloc(int, int) [with T = QTextLength]:: (0x2aaab2f6f150) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=8 align=8 - base size=8 base align=8 -QVector::realloc(int, int) [with T = QPoint]:: (0x2aaab2f9c380) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=8 align=8 - base size=8 base align=8 -QVector::realloc(int, int) [with T = QPointF]:: (0x2aaab2fc67e0) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab2ff3c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab300c540) 0 empty -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab300c690) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab301ab60) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=8 align=8 - base size=8 base align=8 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x2aaab304e000) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab304ec40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab3060540) 0 empty -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab3060690) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=8 align=8 - base size=8 base align=8 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x2aaab307b0e0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=8 align=8 - base size=8 base align=8 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x2aaab307ba10) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/Qt3Support.4.0.0.linux-gcc-ia32.txt index 8b221a0ac..564a2979b 100644 --- a/tests/auto/bic/data/Qt3Support.4.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/Qt3Support.4.0.0.linux-gcc-ia32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x40b1d000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b1d4c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40b1d500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b1d6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b1d740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b1d7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b1d840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b1d8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b1d940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b1d9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b1da40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b1dac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b1db40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b1dbc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b1dc40) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40b1dd80) 0 QGenericArgument (0x40b1ddc0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40b1dfc0) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x4142e0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4142e180) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x4142e880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4142e900) 0 empty Class QString::Null size=1 align=1 @@ -296,10 +176,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x4142eb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4142ec80) 0 Class QCharRef size=8 align=4 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x4142ee40) 0 QString (0x4142ee80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4142ef00) 0 empty Class QListData::Data size=24 align=4 @@ -327,15 +199,7 @@ Class QListData base size=4 base align=4 QListData (0x416e9000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x416e9440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x416e9380) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x416e9680) 0 QObject (0x416e96c0) 0 primary-for QIODevice (0x416e9680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x416e9800) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=72 base align=4 QMapData (0x416e9900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x416e9ec0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x416e9dc0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x416e9c00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x416e9540) 0 Class QTextEncoder size=32 align=4 @@ -503,30 +351,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x418e7000) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x418e7080) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x418e7100) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x418e70c0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x418e7140) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x418e7180) 0 Class __gconv_trans_data size=20 align=4 @@ -548,15 +376,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x418e7280) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x418e7300) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x418e72c0) 0 Class _IO_marker size=12 align=4 @@ -568,10 +388,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x418e7380) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x418e73c0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x418e7400) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x418e7540) 0 Class QTextStreamManipulator size=24 align=4 @@ -680,10 +492,6 @@ QFile (0x418e7c80) 0 QObject (0x418e7d00) 0 primary-for QIODevice (0x418e7cc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x418e7e00) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x418e7fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418e7740) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x418e7900) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x419ee080) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x418e7f40) 0 Class QStringList size=4 align=4 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x419ee0c0) 0 QList (0x419ee100) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x419ee340) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x419ee3c0) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x419ee840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x419ee8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x419ee900) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x419eea40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x419ee980) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x419eea80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x419eeb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x419eec00) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x419eec80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x419eed80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x419eedc0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x419eee00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419eee80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419eeec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419eef00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419eef40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419eef80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419eefc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419ee680) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419ee7c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b2a000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b2a040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b2a080) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b2a0c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b2a100) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b2a140) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b2a180) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b2a1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b2a200) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1029,35 +717,15 @@ Class QVariant base size=12 base align=4 QVariant (0x41b2a240) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41b2a800) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41b2a740) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x41b2a980) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x41b2a8c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x41b2abc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41b2acc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1142,10 +810,6 @@ Class QFileEngineHandler QFileEngineHandler (0x41b2af80) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41b2a480) 0 Class QHashData::Node size=8 align=4 @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x41b2ad80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41b2ae00) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x41c2f4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c2f900) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x41c2f9c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c2fe00) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x41c2ff00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c2ff40) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x41c2f500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c2f600) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x41c2f800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c2fd00) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x41d530c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d53480) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x41d53680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d53880) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x41d53980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d53b00) 0 empty Class QLinkedListData size=20 align=4 @@ -1262,10 +890,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x41d53380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d536c0) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=4 base align=4 QLocale (0x41f3e280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41f3e2c0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x41f3e440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41f3e5c0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x41f3e600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41f3e780) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x41f3e7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41f3e900) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x41f3e500) 0 QObject (0x41f3e640) 0 primary-for QEventLoop (0x41f3e500) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41f3e880) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x4207b300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4207b400) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x4207b480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4207b540) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x4207bb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4207bbc0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x4207bf00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4207bf80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x4207bfc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4207b180) 0 empty Class QMetaProperty size=20 align=4 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x4207b4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4207b740) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2057,25 +1637,9 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x4215b580) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x4215b6c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x4215b700) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x4215b740) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x4215b680) 0 Class QColor size=16 align=4 @@ -2092,55 +1656,23 @@ Class QPen base size=4 base align=4 QPen (0x4215bb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4215bbc0) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0x4215bc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4215bc40) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x4215bc80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4215bec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4215be00) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0x4215bf40) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0x4215bf80) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0x4215bfc0) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0x4215bf00) 0 Class QGradient size=56 align=4 @@ -2170,25 +1702,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x4215bd00) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x422321c0) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x42232100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42232440) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42232380) 0 Class QTextCharFormat size=8 align=4 @@ -2328,10 +1848,6 @@ QTextFrame (0x42232b00) 0 QObject (0x42232b80) 0 primary-for QTextObject (0x42232b40) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42232e00) 0 empty Class QTextBlock::iterator size=16 align=4 @@ -2343,25 +1859,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x42232e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42232140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42232200) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x42232280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42332000) 0 empty Class QFontMetrics size=4 align=4 @@ -2426,10 +1930,6 @@ Class QTextOption base size=24 base align=4 QTextOption (0x42332340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x423323c0) 0 Class QTextTableCell size=8 align=4 @@ -2480,10 +1980,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x42332a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42332b80) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2766,15 +2262,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0x423fbb00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x423fbc80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x423fbbc0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3058,15 +2546,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x4246c9c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4246cb80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4246cac0) 0 Class QTextLine size=8 align=4 @@ -3115,10 +2595,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x4246c080) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4246c380) 0 Class QTextCursor size=4 align=4 @@ -3141,15 +2617,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x42521200) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x425213c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42521300) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -3976,10 +3444,6 @@ QFileDialog (0x4268a440) 0 QPaintDevice (0x4268a540) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4268a6c0) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4499,10 +3963,6 @@ QImage (0x4268af80) 0 QPaintDevice (0x4276d000) 0 primary-for QImage (0x4268af80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4276d100) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4727,10 +4187,6 @@ Class QIcon base size=4 base align=4 QIcon (0x4276dc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4276dd00) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4882,15 +4338,7 @@ Class QPrintEngine QPrintEngine (0x42865200) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42865400) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42865340) 0 Class QPolygon size=4 align=4 @@ -4898,15 +4346,7 @@ Class QPolygon QPolygon (0x42865440) 0 QVector (0x42865480) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42865700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42865640) 0 Class QPolygonF size=4 align=4 @@ -4919,55 +4359,19 @@ Class QMatrix base size=48 base align=4 QMatrix (0x42865900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42865940) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x42865980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42865b80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42865ac0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42865d00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42865c40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42865e80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42865dc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42865180) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42865f40) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5015,15 +4419,7 @@ QStyle (0x42865240) 0 QObject (0x428659c0) 0 primary-for QStyle (0x42865240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x429de100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x429de180) 0 Class QStylePainter size=12 align=4 @@ -5041,25 +4437,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x429de340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x429de740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x429de680) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x429de4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x429de780) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5071,15 +4455,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x429de840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x429de880) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x429de980) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5114,10 +4490,6 @@ Class QPaintEngine QPaintEngine (0x429de8c0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x429deb00) 0 Class QPaintEngineState size=4 align=4 @@ -5129,10 +4501,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x429deb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x429dec40) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5163,20 +4531,8 @@ QItemSelectionModel (0x429decc0) 0 QObject (0x429ded00) 0 primary-for QItemSelectionModel (0x429decc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x429dee00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x429def40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x429dee80) 0 Class QItemSelection size=4 align=4 @@ -5465,10 +4821,6 @@ QAbstractSpinBox (0x42b0b4c0) 0 QPaintDevice (0x42b0b580) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42b0b680) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5905,10 +5257,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x42be0100) 0 QStyleOption (0x42be0140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42be0380) 0 Class QStyleOptionButton size=64 align=4 @@ -5916,10 +5264,6 @@ Class QStyleOptionButton QStyleOptionButton (0x42be0280) 0 QStyleOption (0x42be02c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42be05c0) 0 Class QStyleOptionTab size=72 align=4 @@ -5939,10 +5283,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x42be0840) 0 QStyleOption (0x42be0880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42be0a80) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6000,15 +5340,7 @@ QStyleOptionSpinBox (0x42c71100) 0 QStyleOptionComplex (0x42c71140) 0 QStyleOption (0x42c71180) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42c71480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42c713c0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6017,10 +5349,6 @@ QStyleOptionQ3ListView (0x42c71280) 0 QStyleOptionComplex (0x42c712c0) 0 QStyleOption (0x42c71300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42c71700) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6208,10 +5536,6 @@ QAbstractItemView (0x42c71d00) 0 QPaintDevice (0x42c71e40) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42c71f80) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6394,15 +5718,7 @@ QListView (0x42c71680) 0 QPaintDevice (0x42d31000) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42d31280) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42d311c0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7319,15 +6635,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x42e2b480) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x42e2b780) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x42e2b6c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7344,25 +6652,9 @@ Class QItemEditorFactory QItemEditorFactory (0x42e2b600) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x42e2ba00) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x42e2b940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42e2bb80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42e2bac0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -7589,15 +6881,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x42e2bc00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42f10000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42f10080) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8445,15 +7729,7 @@ QActionGroup (0x42faab40) 0 QObject (0x42faab80) 0 primary-for QActionGroup (0x42faab40) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42faad80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42faacc0) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -8594,10 +7870,6 @@ QCommonStyle (0x42faa300) 0 QObject (0x42faa680) 0 primary-for QStyle (0x42faa4c0) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x42faafc0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10125,10 +9397,6 @@ QDateEdit (0x4317c1c0) 0 QPaintDevice (0x4317ca80) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4317cfc0) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10288,10 +9556,6 @@ QDockWidget (0x432271c0) 0 QPaintDevice (0x43227280) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x432273c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -10538,10 +9802,6 @@ QTextEdit (0x43227700) 0 QPaintDevice (0x43227840) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43227980) 0 Vtable for QProgressBar QProgressBar::_ZTV12QProgressBar: 64u entries @@ -12177,15 +11437,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0x43428cc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x43428ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x43428e00) 0 Class QSqlIndex size=16 align=4 @@ -12193,10 +11445,6 @@ Class QSqlIndex QSqlIndex (0x43428d00) 0 QSqlRecord (0x43428d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43428f80) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -12873,29 +12121,7 @@ Q3GVector (0x4351af80) 0 Q3PtrCollection (0x4351afc0) 0 primary-for Q3GVector (0x4351af80) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x4351a980) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0x4351ab40) 0 - primary-for Q3PtrVector (0x4351a980) - Q3PtrCollection (0x4351ad80) 0 - primary-for Q3GVector (0x4351ab40) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -13052,29 +12278,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0x435f25c0) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x435f27c0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0x435f2800) 0 - primary-for Q3PtrList (0x435f27c0) - Q3PtrCollection (0x435f2840) 0 - primary-for Q3GList (0x435f2800) Class Q3BaseBucket size=8 align=4 @@ -13131,28 +12335,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0x435f2e40) 0 -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x435f2f80) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0x435f2fc0) 0 - primary-for Q3IntDict (0x435f2f80) - Q3PtrCollection (0x435f2100) 0 - primary-for Q3GDict (0x435f2fc0) Class Q3TableSelection size=28 align=4 @@ -13263,100 +12446,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0x436e9480) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x436e9540) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0x436e9580) 0 - primary-for Q3PtrVector (0x436e9540) - Q3PtrCollection (0x436e95c0) 0 - primary-for Q3GVector (0x436e9580) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x436e9700) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0x436e9740) 0 - primary-for Q3PtrVector (0x436e9700) - Q3PtrCollection (0x436e9780) 0 - primary-for Q3GVector (0x436e9740) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x436e98c0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0x436e9900) 0 - primary-for Q3PtrList (0x436e98c0) - Q3PtrCollection (0x436e9940) 0 - primary-for Q3GList (0x436e9900) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x436e9a80) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0x436e9ac0) 0 - primary-for Q3IntDict (0x436e9a80) - Q3PtrCollection (0x436e9b00) 0 - primary-for Q3GDict (0x436e9ac0) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -14080,21 +13176,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x437b1380) 0 vptr=((& Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x437b1700) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x437b1640) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x437b1740) 0 - QLinkedList (0x437b1780) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -14103,31 +13186,10 @@ Q3SqlRecordInfo (0x437b1800) 0 Q3ValueList (0x437b1840) 0 QLinkedList (0x437b1880) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x437b1a40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x437b1980) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0x437b1c80) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0x437b1cc0) 0 - QLinkedList::const_iterator (0x437b1d00) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0x437b1dc0) 0 Vtable for Q3DataView Q3DataView::_ZTV10Q3DataView: 69u entries @@ -14218,15 +13280,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0x437b1f80) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x437b1f00) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x437b13c0) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -14287,25 +13341,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0x4388f200) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x4388f380) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x4388f2c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x4388f6c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x4388f600) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -14513,10 +13551,6 @@ Q3TextEdit (0x4388fa00) 0 QPaintDevice (0x4388fb80) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4388fd00) 0 Vtable for Q3SyntaxHighlighter Q3SyntaxHighlighter::_ZTV19Q3SyntaxHighlighter: 5u entries @@ -15446,28 +14480,7 @@ Class Q3Url Q3Url (0x43944800) 0 vptr=((& Q3Url::_ZTV5Q3Url) + 8u) -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0x439449c0) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0x43944a00) 0 - primary-for Q3Dict (0x439449c0) - Q3PtrCollection (0x43944a40) 0 - primary-for Q3GDict (0x43944a00) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -15762,29 +14775,7 @@ Q3Accel (0x439f9100) 0 QObject (0x439f9140) 0 primary-for Q3Accel (0x439f9100) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x439f9240) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0x439f9280) 0 - primary-for Q3PtrList (0x439f9240) - Q3PtrCollection (0x439f92c0) 0 - primary-for Q3GList (0x439f9280) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -15812,11 +14803,6 @@ Q3StrList (0x439f9380) 0 Q3PtrCollection (0x439f9440) 0 primary-for Q3GList (0x439f9400) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0x439f9640) 0 - Q3GListStdIterator (0x439f9680) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -16170,29 +15156,7 @@ Class Q3CString Q3CString (0x43a9f280) 0 QByteArray (0x43a9f2c0) 0 -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0x43a9f6c0) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0x43a9f700) 0 - primary-for Q3PtrQueue (0x43a9f6c0) - Q3PtrCollection (0x43a9f740) 0 - primary-for Q3GList (0x43a9f700) Vtable for Q3Signal Q3Signal::_ZTV8Q3Signal: 14u entries @@ -16219,75 +15183,11 @@ Q3Signal (0x43a9f880) 0 QObject (0x43a9f8c0) 0 primary-for Q3Signal (0x43a9f880) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x43a9fac0) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0x43a9fb00) 0 - primary-for Q3AsciiDict (0x43a9fac0) - Q3PtrCollection (0x43a9fb40) 0 - primary-for Q3GDict (0x43a9fb00) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0x43a9fd80) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0x43a9fdc0) 0 - primary-for Q3PtrStack (0x43a9fd80) - Q3PtrCollection (0x43a9fe00) 0 - primary-for Q3GList (0x43a9fdc0) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x43a9ff00) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0x43a9ff40) 0 - primary-for Q3AsciiDict (0x43a9ff00) - Q3PtrCollection (0x43a9ff80) 0 - primary-for Q3GDict (0x43a9ff40) + Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -16338,91 +15238,13 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0x43b79140) 0 -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0x43b79280) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0x43b792c0) 0 - primary-for Q3Cache (0x43b79280) - Q3PtrCollection (0x43b79300) 0 - primary-for Q3GCache (0x43b792c0) - -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0x43b795c0) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0x43b79600) 0 - primary-for Q3IntCache (0x43b795c0) - Q3PtrCollection (0x43b79640) 0 - primary-for Q3GCache (0x43b79600) - -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0x43b79880) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0x43b798c0) 0 - primary-for Q3PtrDict (0x43b79880) - Q3PtrCollection (0x43b79900) 0 - primary-for Q3GDict (0x43b798c0) - -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0x43b79c40) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0x43b79c80) 0 - primary-for Q3AsciiCache (0x43b79c40) - Q3PtrCollection (0x43b79cc0) 0 - primary-for Q3GCache (0x43b79c80) + + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -16437,29 +15259,7 @@ Class Q3Semaphore Q3Semaphore (0x43b79e80) 0 vptr=((& Q3Semaphore::_ZTV11Q3Semaphore) + 8u) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x43b79f80) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0x43b79fc0) 0 - primary-for Q3PtrVector (0x43b79f80) - Q3PtrCollection (0x43b790c0) 0 - primary-for Q3GVector (0x43b79fc0) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -16554,21 +15354,8 @@ Class Q3PaintDeviceMetrics base size=4 base align=4 Q3PaintDeviceMetrics (0x43c22980) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x43c22b40) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x43c22a80) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x43c22b80) 0 - QLinkedList (0x43c22bc0) 0 Class Q3CanvasItemList size=4 align=4 @@ -17905,15 +16692,7 @@ Q3SocketDevice (0x43d87740) 0 QObject (0x43d877c0) 0 primary-for QIODevice (0x43d87780) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x43d87a00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x43d87940) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -19238,15 +18017,7 @@ Q3VBox (0x43f12380) 0 QPaintDevice (0x43f12500) 8 vptr=((& Q3VBox::_ZTV6Q3VBox) + 244u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x43f12880) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x43f127c0) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -20173,25 +18944,9 @@ Q3MainWindow (0x43f96ac0) 0 QPaintDevice (0x43f96b80) 8 vptr=((& Q3MainWindow::_ZTV12Q3MainWindow) + 328u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x43f96e80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x43f96dc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x43f96140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x43f96f40) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -20256,10 +19011,6 @@ Q3DockAreaLayout (0x43f96c40) 0 QLayoutItem (0x43f96d00) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x44071080) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -20344,188 +19095,40 @@ Q3DockArea (0x43f96880) 0 QPaintDevice (0x43f96d40) 8 vptr=((& Q3DockArea::_ZTV10Q3DockArea) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x440c15c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x440c1c80) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4410de40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4414a280) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4414a440) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x4414a940) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4414ac80) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x44196100) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x44196240) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x44196380) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x441964c0) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0x44196880) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4420c2c0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x4420c400) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4420ca00) 0 -Class QLinkedListNode - size=52 align=4 - base size=52 base align=4 -QLinkedListNode (0x44263380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x442f4600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x442f4800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x442f4a80) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x4432b440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4432b540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4432b800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4432bdc0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44374300) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x44374440) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x443745c0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x44374780) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44374940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x44374b00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44374bc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44374ec0) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x443f91c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x443f9300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x443f94c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x443f9580) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x443f99c0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x443f9b00) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.0.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/Qt3Support.4.0.0.linux-gcc-ppc32.txt index 328795829..ca31e2e58 100644 --- a/tests/auto/bic/data/Qt3Support.4.0.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/Qt3Support.4.0.0.linux-gcc-ppc32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x30b24ee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f0e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f188) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f230) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f2d8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f428) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f4d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f578) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f6c8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f818) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4f968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b4fa10) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x30b4fa80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b4ff88) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e4000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e4070) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e40e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e4150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e41c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e4230) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e42a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e4310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e4380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e43f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e4460) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187ac0) 0 QGenericArgument (0x313e45b0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x313e4770) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x313e4888) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313e4930) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x314fc5e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x314fc930) 0 empty Class QString::Null size=1 align=1 @@ -296,10 +176,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x314fcee0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31634230) 0 Class QCharRef size=8 align=4 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x30187cc0) 0 QString (0x31634cb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31634d90) 0 empty Class QListData::Data size=24 align=4 @@ -327,15 +199,7 @@ Class QListData base size=4 base align=4 QListData (0x31634f88) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x317234d0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31723428) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x30187d00) 0 QObject (0x317239a0) 0 primary-for QIODevice (0x30187d00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31723b98) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=72 base align=4 QMapData (0x31843070) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x318436c8) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x31843578) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x318439a0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x318438f8) 0 Class QTextEncoder size=32 align=4 @@ -503,30 +351,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x31843ab8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31843b60) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x31843c40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31843bd0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x31843cb0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x31843d20) 0 Class __gconv_trans_data size=20 align=4 @@ -548,15 +376,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x31843e70) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x31843f50) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x31843ee0) 0 Class _IO_marker size=12 align=4 @@ -568,10 +388,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x31843fc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x31843658) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x318437a8) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3194d1f8) 0 Class QTextStreamManipulator size=24 align=4 @@ -680,10 +492,6 @@ QFile (0x30187f00) 0 QObject (0x3194dc40) 0 primary-for QIODevice (0x30187f40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3194ddc8) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x3194df18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3194dea8) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x31a20038) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31a201f8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31a20150) 0 Class QStringList size=4 align=4 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x319ff040) 0 QList (0x31a202a0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x31a206c8) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x31a20738) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x31a20c78) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31a20d20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31a20d90) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31a20f18) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31a20e70) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x31a20fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31af1070) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31af1118) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x31af11c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31af1348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31af13b8) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x31af1428) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af1508) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af1578) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af15e8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af1658) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af16c8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af1738) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af17a8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af1818) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af1888) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af18f8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af1968) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af19d8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af1a48) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af1ab8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af1b28) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af1b98) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31af1c08) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1029,35 +717,15 @@ Class QVariant base size=16 base align=8 QVariant (0x31af1c40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31bd3118) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31bd3070) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x31bd32d8) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x31bd3230) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x31bd3498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31bd35b0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1142,10 +810,6 @@ Class QFileEngineHandler QFileEngineHandler (0x31bd3b98) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31bd3d20) 0 Class QHashData::Node size=8 align=4 @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x31bd3ea8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31bd3f18) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x31c7f498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31c7f888) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x31c7fa10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31c7fe00) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x31c7ffc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31c7f4d0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x31c7f770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31c7fab8) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x31d8f000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d8f380) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x31d8f5e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d8f968) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x31d8fc78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d8fe70) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x31d8f188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d8f690) 0 empty Class QLinkedListData size=20 align=4 @@ -1262,10 +890,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x31e8e850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e8e968) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=4 base align=4 QLocale (0x31e8ef18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e8ef88) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x31ff1150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ff1310) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x31ff1380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ff1508) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x31ff1578) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ff16c8) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x319ff580) 0 QObject (0x31ff15b0) 0 primary-for QEventLoop (0x319ff580) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x320a9000) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x320a9850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x320a99d8) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x320a9a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x320a9b98) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x32150000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321500e0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x32150508) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321505b0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x32150620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321506c8) 0 empty Class QMetaProperty size=20 align=4 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x32150770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32150818) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2057,25 +1637,9 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x32150e00) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x321fc1f8) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x321fc268) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x321fc2d8) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x321fc188) 0 Class QColor size=16 align=4 @@ -2092,55 +1656,23 @@ Class QPen base size=4 base align=4 QPen (0x321fc738) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321fc7a8) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0x321fc818) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321fc8c0) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x321fc930) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x321fcbd0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x321fcaf0) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x321fcce8) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x321fcd58) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x321fcdc8) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x321fcc78) 0 Class QGradient size=64 align=8 @@ -2170,25 +1702,13 @@ Class QTextLength base size=16 base align=8 QTextLength (0x321fcea8) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x321fcf50) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x321fc658) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x322a0310) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x322a0230) 0 Class QTextCharFormat size=8 align=4 @@ -2328,10 +1848,6 @@ QTextFrame (0x319ffdc0) 0 QObject (0x322a0930) 0 primary-for QTextObject (0x319ffe00) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322a0dc8) 0 empty Class QTextBlock::iterator size=16 align=4 @@ -2343,25 +1859,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x322a0e38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x323760a8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32376150) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x323761c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32376380) 0 empty Class QFontMetrics size=4 align=4 @@ -2426,10 +1930,6 @@ Class QTextOption base size=28 base align=8 QTextOption (0x323767e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x323768c0) 0 Class QTextTableCell size=8 align=4 @@ -2480,10 +1980,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x32376f18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32376af0) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2766,15 +2262,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x3241ace8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x324930a8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32493000) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3058,15 +2546,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x324ea230) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x324ea460) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x324ea380) 0 Class QTextLine size=8 align=4 @@ -3115,10 +2595,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x324ea888) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x324ea9a0) 0 Class QTextCursor size=4 align=4 @@ -3141,15 +2617,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x324eaf18) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x324eafc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x324ea118) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -3976,10 +3444,6 @@ QFileDialog (0x327250c0) 0 QPaintDevice (0x326cab28) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x326cad58) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4499,10 +3963,6 @@ QImage (0x32725680) 0 QPaintDevice (0x32778888) 0 primary-for QImage (0x32725680) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32778b28) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4727,10 +4187,6 @@ Class QIcon base size=4 base align=4 QIcon (0x328517e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32851850) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4882,15 +4338,7 @@ Class QPrintEngine QPrintEngine (0x328d6188) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x328d6460) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x328d6380) 0 Class QPolygon size=4 align=4 @@ -4898,15 +4346,7 @@ Class QPolygon QPolygon (0x32725b00) 0 QVector (0x328d64d0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x328d6888) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x328d67a8) 0 Class QPolygonF size=4 align=4 @@ -4919,55 +4359,19 @@ Class QMatrix base size=48 base align=8 QMatrix (0x328d6b98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x328d6c08) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x328d6cb0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x329b71f8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x329b7118) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x329b73b8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x329b72d8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x329b7578) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x329b7498) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x329b7738) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x329b7658) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5015,15 +4419,7 @@ QStyle (0x32725b80) 0 QObject (0x329b77a8) 0 primary-for QStyle (0x32725b80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x329b7968) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x329b79d8) 0 Class QStylePainter size=12 align=4 @@ -5041,25 +4437,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x329b7c40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32ac0038) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x329b78c0) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x329b7e38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32ac00e0) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5071,15 +4455,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x32ac0310) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32ac03b8) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ac0540) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5114,10 +4490,6 @@ Class QPaintEngine QPaintEngine (0x32ac0428) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ac0738) 0 Class QPaintEngineState size=4 align=4 @@ -5129,10 +4501,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x32ac0770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32ac0a10) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5163,20 +4531,8 @@ QItemSelectionModel (0x32725c40) 0 QObject (0x32ac0ab8) 0 primary-for QItemSelectionModel (0x32725c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ac0c40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32ac0d90) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32ac0ce8) 0 Class QItemSelection size=4 align=4 @@ -5465,10 +4821,6 @@ QAbstractSpinBox (0x32725f40) 0 QPaintDevice (0x32b9f428) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32b9f658) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5905,10 +5257,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x32be23c0) 0 QStyleOption (0x32c6e3b8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32c6e690) 0 Class QStyleOptionButton size=64 align=4 @@ -5916,10 +5264,6 @@ Class QStyleOptionButton QStyleOptionButton (0x32be2440) 0 QStyleOption (0x32c6e540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32c6e8f8) 0 Class QStyleOptionTab size=72 align=4 @@ -5939,10 +5283,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x32be2540) 0 QStyleOption (0x32c6ebd0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32c6eea8) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6000,15 +5340,7 @@ QStyleOptionSpinBox (0x32be27c0) 0 QStyleOptionComplex (0x32be2800) 0 QStyleOption (0x32cea888) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32ceac08) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32ceab60) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6017,10 +5349,6 @@ QStyleOptionQ3ListView (0x32be2840) 0 QStyleOptionComplex (0x32be2880) 0 QStyleOption (0x32ceaa10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ceaee0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6208,10 +5536,6 @@ QAbstractItemView (0x32be2b00) 0 QPaintDevice (0x32d5c310) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32d5c508) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6394,15 +5718,7 @@ QListView (0x32be2d00) 0 QPaintDevice (0x32d5c690) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32d5ca10) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32d5c930) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7319,15 +6635,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x32e5ecb0) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x32e5e2d8) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x32e5ef88) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7344,25 +6652,9 @@ Class QItemEditorFactory QItemEditorFactory (0x32e5eea8) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x32f371f8) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x32f37118) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32f373b8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32f37310) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -7589,15 +6881,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x32f37ce8) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32f37dc8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32f37e38) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8445,15 +7729,7 @@ QActionGroup (0x33092300) 0 QObject (0x331070e0) 0 primary-for QActionGroup (0x33092300) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x33107310) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x33107268) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -8594,10 +7870,6 @@ QCommonStyle (0x33092400) 0 QObject (0x33107770) 0 primary-for QStyle (0x33092440) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x33107968) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10125,10 +9397,6 @@ QDateEdit (0x3328a3c0) 0 QPaintDevice (0x33285a10) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33285bd0) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10288,11 +9556,7 @@ QDockWidget (0x3328a580) 0 QPaintDevice (0x33285e00) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33285380) 0 - + Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries 0 (int (*)(...))0 @@ -10538,10 +9802,6 @@ QTextEdit (0x3328a700) 0 QPaintDevice (0x33331230) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33331460) 0 Vtable for QProgressBar QProgressBar::_ZTV12QProgressBar: 64u entries @@ -12177,15 +11437,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0x334fbea8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x334fb380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x334fbfc0) 0 Class QSqlIndex size=16 align=4 @@ -12193,10 +11445,6 @@ Class QSqlIndex QSqlIndex (0x33497740) 0 QSqlRecord (0x334fbee0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x334fbd20) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -12873,29 +12121,7 @@ Q3GVector (0x33497e00) 0 Q3PtrCollection (0x336aa150) 0 primary-for Q3GVector (0x33497e00) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x33497ec0) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0x33497f00) 0 - primary-for Q3PtrVector (0x33497ec0) - Q3PtrCollection (0x336aa348) 0 - primary-for Q3GVector (0x33497f00) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -13052,29 +12278,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0x336aac40) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x3370e140) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0x3370e180) 0 - primary-for Q3PtrList (0x3370e140) - Q3PtrCollection (0x336aae38) 0 - primary-for Q3GList (0x3370e180) Class Q3BaseBucket size=8 align=4 @@ -13131,28 +12335,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0x3378e1f8) 0 -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x3370e400) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0x3370e440) 0 - primary-for Q3IntDict (0x3370e400) - Q3PtrCollection (0x3378e3f0) 0 - primary-for Q3GDict (0x3370e440) Class Q3TableSelection size=28 align=4 @@ -13263,100 +12446,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0x3378ea10) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x3370e680) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0x3370e6c0) 0 - primary-for Q3PtrVector (0x3370e680) - Q3PtrCollection (0x3378eb28) 0 - primary-for Q3GVector (0x3370e6c0) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x3370e700) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0x3370e740) 0 - primary-for Q3PtrVector (0x3370e700) - Q3PtrCollection (0x3378ece8) 0 - primary-for Q3GVector (0x3370e740) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x3370e780) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0x3370e7c0) 0 - primary-for Q3PtrList (0x3370e780) - Q3PtrCollection (0x3378eea8) 0 - primary-for Q3GList (0x3370e7c0) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x3370e800) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0x3370e840) 0 - primary-for Q3IntDict (0x3370e800) - Q3PtrCollection (0x3378e6c8) 0 - primary-for Q3GDict (0x3370e840) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -14080,21 +13176,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x33841d20) 0 vptr=((& Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x338f9000) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x338416c8) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x3370ecc0) 0 - QLinkedList (0x338f9038) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -14103,31 +13186,10 @@ Q3SqlRecordInfo (0x3370ed40) 0 Q3ValueList (0x3370ed80) 0 QLinkedList (0x338f9150) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x338f9310) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x338f9268) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0x338f9620) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0x3370edc0) 0 - QLinkedList::const_iterator (0x338f9658) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0x338f9700) 0 Vtable for Q3DataView Q3DataView::_ZTV10Q3DataView: 69u entries @@ -14218,15 +13280,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0x338f9ab8) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x338f9cb0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x338f9bd0) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -14287,25 +13341,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0x338f9690) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x33994038) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x338f9d90) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x339942d8) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x33994230) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -14513,10 +13551,6 @@ Q3TextEdit (0x339c0000) 0 QPaintDevice (0x339945e8) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33994818) 0 Vtable for Q3SyntaxHighlighter Q3SyntaxHighlighter::_ZTV19Q3SyntaxHighlighter: 5u entries @@ -15446,28 +14480,7 @@ Class Q3Url Q3Url (0x33a8b1c0) 0 vptr=((& Q3Url::_ZTV5Q3Url) + 8u) -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0x339c08c0) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0x339c0900) 0 - primary-for Q3Dict (0x339c08c0) - Q3PtrCollection (0x33a8b3f0) 0 - primary-for Q3GDict (0x339c0900) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -15762,29 +14775,7 @@ Q3Accel (0x339c0b80) 0 QObject (0x33a8bb60) 0 primary-for Q3Accel (0x339c0b80) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x339c0bc0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0x339c0c00) 0 - primary-for Q3PtrList (0x339c0bc0) - Q3PtrCollection (0x33b27118) 0 - primary-for Q3GList (0x339c0c00) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -15812,11 +14803,6 @@ Q3StrList (0x339c0c40) 0 Q3PtrCollection (0x33b27268) 0 primary-for Q3GList (0x339c0cc0) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0x339c0d00) 0 - Q3GListStdIterator (0x33b275e8) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -16170,29 +15156,7 @@ Class Q3CString Q3CString (0x33b931c0) 0 QByteArray (0x33b879a0) 0 -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0x33b93280) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0x33b932c0) 0 - primary-for Q3PtrQueue (0x33b93280) - Q3PtrCollection (0x33c17348) 0 - primary-for Q3GList (0x33b932c0) Vtable for Q3Signal Q3Signal::_ZTV8Q3Signal: 14u entries @@ -16219,75 +15183,11 @@ Q3Signal (0x33b93300) 0 QObject (0x33c17540) 0 primary-for Q3Signal (0x33b93300) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x33b933c0) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0x33b93400) 0 - primary-for Q3AsciiDict (0x33b933c0) - Q3PtrCollection (0x33c177e0) 0 - primary-for Q3GDict (0x33b93400) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0x33b93500) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0x33b93540) 0 - primary-for Q3PtrStack (0x33b93500) - Q3PtrCollection (0x33c17ab8) 0 - primary-for Q3GList (0x33b93540) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x33b93580) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0x33b935c0) 0 - primary-for Q3AsciiDict (0x33b93580) - Q3PtrCollection (0x33c17c40) 0 - primary-for Q3GDict (0x33b935c0) + Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -16338,91 +15238,13 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0x33c17888) 0 -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0x33b937c0) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0x33b93800) 0 - primary-for Q3Cache (0x33b937c0) - Q3PtrCollection (0x33c9a038) 0 - primary-for Q3GCache (0x33b93800) - -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0x33b93940) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0x33b93980) 0 - primary-for Q3IntCache (0x33b93940) - Q3PtrCollection (0x33c9a348) 0 - primary-for Q3GCache (0x33b93980) - -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0x33b93a80) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0x33b93ac0) 0 - primary-for Q3PtrDict (0x33b93a80) - Q3PtrCollection (0x33c9a5e8) 0 - primary-for Q3GDict (0x33b93ac0) - -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0x33b93c00) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0x33b93c40) 0 - primary-for Q3AsciiCache (0x33b93c00) - Q3PtrCollection (0x33c9a9d8) 0 - primary-for Q3GCache (0x33b93c40) + + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -16437,29 +15259,7 @@ Class Q3Semaphore Q3Semaphore (0x33c9ac08) 0 vptr=((& Q3Semaphore::_ZTV11Q3Semaphore) + 8u) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x33b93d00) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0x33b93d40) 0 - primary-for Q3PtrVector (0x33b93d00) - Q3PtrCollection (0x33c9adc8) 0 - primary-for Q3GVector (0x33b93d40) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -16554,21 +15354,8 @@ Class Q3PaintDeviceMetrics base size=4 base align=4 Q3PaintDeviceMetrics (0x33d33a80) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x33d33cb0) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x33d33bd0) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x33d5e080) 0 - QLinkedList (0x33d33ce8) 0 Class Q3CanvasItemList size=4 align=4 @@ -17905,15 +16692,7 @@ Q3SocketDevice (0x33d5ecc0) 0 QObject (0x33e45e70) 0 primary-for QIODevice (0x33d5ed00) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x33e45700) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x33e451c0) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -19238,15 +18017,7 @@ Q3VBox (0x33fac8c0) 0 QPaintDevice (0x33ff7cb0) 8 vptr=((& Q3VBox::_ZTV6Q3VBox) + 244u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x33ff7118) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x33ff7f50) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -20173,25 +18944,9 @@ Q3MainWindow (0x340e23c0) 0 QPaintDevice (0x34096f88) 8 vptr=((& Q3MainWindow::_ZTV12Q3MainWindow) + 328u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34140348) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x341402a0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x341404d0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x34140428) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -20256,10 +19011,6 @@ Q3DockAreaLayout (0x340e2440) 0 QLayoutItem (0x341401f8) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x34140a80) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -20344,188 +19095,40 @@ Q3DockArea (0x340e2500) 0 QPaintDevice (0x34140968) 8 vptr=((& Q3DockArea::_ZTV10Q3DockArea) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x341f4af0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x34211930) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x3425ebd0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x3427b380) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x3427b620) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x342980a8) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x342986c8) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x34298f18) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x342c80a8) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x342c8230) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x342c83b8) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x342c8b28) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3434b268) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x3434b460) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3436d118) 0 -Class QLinkedListNode - size=56 align=8 - base size=56 base align=8 -QLinkedListNode (0x3438b7a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34418968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34418c78) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34437070) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x3445d150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3445d2d8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3445d7a8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34484070) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x34484b60) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x34484d58) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x344c0230) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x344c0850) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x344c0e70) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x344fe038) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x344fe0e0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x344fe5b0) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x344feee0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x345270a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34527348) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x345273f0) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x34527a48) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x34527c78) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.0.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/Qt3Support.4.0.0.macx-gcc-ppc32.txt index fa74eec85..b8255a192 100644 --- a/tests/auto/bic/data/Qt3Support.4.0.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/Qt3Support.4.0.0.macx-gcc-ppc32.txt @@ -59,75 +59,19 @@ Class QBool base size=4 base align=4 QBool (0x83e7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x83eb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x83ebc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x83ec80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x83ed40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x83ee00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x83eec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x83ef80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x83e240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16c8040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16c8100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16c81c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16c8280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16c8340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16c8400) 0 empty Class QFlag size=4 align=4 @@ -144,10 +88,6 @@ Class QChar base size=2 base align=2 QChar (0x16c8700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16c8800) 0 empty Class QBasicAtomic size=4 align=4 @@ -160,10 +100,6 @@ Class QAtomic QAtomic (0x16c8bc0) 0 QBasicAtomic (0x16c8c00) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x16c8e80) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -245,70 +181,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0x1776b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1776ec0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x186d380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x186d400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x186d480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x186d500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x186d580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x186d600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x186d680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x186d700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x186d780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x186d800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x186d880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x186d900) 0 Class QInternal size=1 align=1 @@ -335,10 +219,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x1a26040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a26480) 0 Class QCharRef size=8 align=4 @@ -351,10 +231,6 @@ Class QConstString QConstString (0x1b47080) 0 QString (0x1b470c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b471c0) 0 empty Class QListData::Data size=24 align=4 @@ -366,10 +242,6 @@ Class QListData base size=4 base align=4 QListData (0x1b47400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b47a00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -394,15 +266,7 @@ Class QTextCodec QTextCodec (0x1b47880) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1b47d40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1b47c80) 0 Class QTextEncoder size=32 align=4 @@ -425,25 +289,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1b47f80) 0 QGenericArgument (0x1b47fc0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1c9f1c0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1c9f140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1c9f440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1c9f380) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -535,10 +387,6 @@ QIODevice (0x1c9fa80) 0 QObject (0x1c9fac0) 0 primary-for QIODevice (0x1c9fa80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1c9fd00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -558,25 +406,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1d842c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d844c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1d84540) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1d84740) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d84680) 0 Class QStringList size=4 align=4 @@ -584,15 +420,7 @@ Class QStringList QStringList (0x1d84800) 0 QList (0x1d84840) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1d84d00) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1d84d80) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -748,10 +576,6 @@ Class QTextStream QTextStream (0x1f1b5c0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f1b880) 0 Class QTextStreamManipulator size=24 align=4 @@ -842,50 +666,22 @@ QFile (0x1fae440) 0 QObject (0x1fae4c0) 0 primary-for QIODevice (0x1fae480) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1fae680) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1fae6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1fae780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fae800) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1fae9c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1fae900) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1faea80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1faebc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1faec80) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35u entries @@ -945,10 +741,6 @@ Class QFileEngineHandler QFileEngineHandler (0x1faeec0) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1faefc0) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -999,90 +791,22 @@ Class QMetaType base size=0 base align=1 QMetaType (0x210c1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c2c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c3c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c440) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c4c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c5c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c6c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c740) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c7c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c840) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c8c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c9c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210ca40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210cac0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1109,50 +833,18 @@ Class QVariant base size=16 base align=4 QVariant (0x210cb00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x21b7040) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x210cdc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x21b7240) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x21b7180) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x21b74c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21b7600) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x21b76c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x21b7740) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x21b77c0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1230,15 +922,7 @@ Class QUrl base size=4 base align=4 QUrl (0x21b7a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x228c140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x228c1c0) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1265,10 +949,6 @@ QEventLoop (0x228c240) 0 QObject (0x228c280) 0 primary-for QEventLoop (0x228c240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x228c480) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1313,20 +993,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x228c6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x228c880) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x228c940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x228ca80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1496,10 +1168,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x228cec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23860c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1591,20 +1259,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x2386c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2386cc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x2386d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2386e00) 0 empty Class QMetaProperty size=20 align=4 @@ -1616,10 +1276,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x2386ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2386f80) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1907,10 +1563,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x24b7740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24b7880) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1932,80 +1584,48 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x24b7ac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24b7b40) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x25c1300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25c1500) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x25c1580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25c1740) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x25c17c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25c1940) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x25c19c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25c1e40) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x25c1340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25c1c00) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x268e100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x268e180) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x268e300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x268e3c0) 0 empty Class QLinkedListData size=20 align=4 @@ -2017,50 +1637,30 @@ Class QLocale base size=4 base align=4 QLocale (0x268e980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x268ea00) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x268eb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x268ef40) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x27f2000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27f2400) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x27f2780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27f2940) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x27f2bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27f2d80) 0 empty Class QSharedData size=4 align=4 @@ -2087,10 +1687,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x2961800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2961980) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2394,15 +1990,7 @@ Class QInputMethodEvent::Attribute base size=28 base align=4 QInputMethodEvent::Attribute (0x2b00300) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2b004c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2b00400) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2676,15 +2264,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2b63cc0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b63e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b63e80) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -2968,25 +2548,9 @@ Class QPaintDevice QPaintDevice (0x2bd5340) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2c2e180) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2c2e200) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2c2e280) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2c2e100) 0 Class QColor size=16 align=4 @@ -2998,45 +2562,17 @@ Class QBrush base size=4 base align=4 QBrush (0x2c2e540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2c2e600) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x2c2e680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2c2e980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2c2e880) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2c2eac0) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2c2eb40) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2c2ebc0) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2c2ea40) 0 Class QGradient size=56 align=4 @@ -3681,10 +3217,6 @@ QFileDialog (0x2e6adc0) 0 QPaintDevice (0x2e6ae80) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e6acc0) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4379,10 +3911,6 @@ QImage (0x2ff55c0) 0 QPaintDevice (0x2ff5600) 0 primary-for QImage (0x2ff55c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2ff5900) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4427,10 +3955,6 @@ Class QIcon base size=4 base align=4 QIcon (0x2ff5c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ed040) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4760,15 +4284,7 @@ QActionGroup (0x3175600) 0 QObject (0x3175640) 0 primary-for QActionGroup (0x3175600) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31758c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3175800) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -5073,10 +4589,6 @@ QAbstractSpinBox (0x3218440) 0 QPaintDevice (0x32184c0) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3218740) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5284,15 +4796,7 @@ QStyle (0x3218c40) 0 QObject (0x3218c80) 0 primary-for QStyle (0x3218c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3218ec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3218f40) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -5569,10 +5073,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x331dd80) 0 QStyleOption (0x331ddc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x331dc80) 0 Class QStyleOptionButton size=64 align=4 @@ -5580,10 +5080,6 @@ Class QStyleOptionButton QStyleOptionButton (0x331dfc0) 0 QStyleOption (0x331d140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33bd280) 0 Class QStyleOptionTab size=72 align=4 @@ -5603,10 +5099,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x33bd600) 0 QStyleOption (0x33bd640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33bd9c0) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5664,15 +5156,7 @@ QStyleOptionSpinBox (0x344c7c0) 0 QStyleOptionComplex (0x344c800) 0 QStyleOption (0x344c840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x344ccc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x344cc00) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5681,10 +5165,6 @@ QStyleOptionQ3ListView (0x344ca00) 0 QStyleOptionComplex (0x344ca40) 0 QStyleOption (0x344ca80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x344c5c0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5837,10 +5317,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x34bda40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34bdd40) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5871,20 +5347,8 @@ QItemSelectionModel (0x34bde00) 0 QObject (0x34bde40) 0 primary-for QItemSelectionModel (0x34bde00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34bd140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3587040) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x34bd940) 0 Class QItemSelection size=4 align=4 @@ -6014,10 +5478,6 @@ QAbstractItemView (0x3587200) 0 QPaintDevice (0x3587300) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3587580) 0 Vtable for QFileIconProvider QFileIconProvider::_ZTV17QFileIconProvider: 7u entries @@ -6269,15 +5729,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3587e40) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x365c100) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x365c000) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -6418,15 +5870,7 @@ QListView (0x365c340) 0 QPaintDevice (0x365c480) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x365c8c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x365c7c0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7150,25 +6594,9 @@ QTreeView (0x3720cc0) 0 QPaintDevice (0x3720e00) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x3805040) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x3720840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3805240) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3805180) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8015,15 +7443,7 @@ Class QColormap base size=4 base align=4 QColormap (0x396df40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x396d9c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x396d280) 0 Class QPolygon size=4 align=4 @@ -8031,15 +7451,7 @@ Class QPolygon QPolygon (0x396dd00) 0 QVector (0x3a18000) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a18440) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3a18340) 0 Class QPolygonF size=4 align=4 @@ -8052,90 +7464,38 @@ Class QMatrix base size=48 base align=4 QMatrix (0x3a18800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3a18880) 0 empty Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0x3a18940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3a18a40) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0x3a18ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3a18b40) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x3a18bc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b35240) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b35140) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b35440) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b35340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b35640) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b35540) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b35840) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b35740) 0 Class QTextItem size=1 align=1 base size=0 base align=1 QTextItem (0x3b358c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3b35980) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3b35b40) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -8170,10 +7530,6 @@ Class QPaintEngine QPaintEngine (0x3b35a00) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3b35e00) 0 Class QPaintEngineState size=4 align=4 @@ -8190,25 +7546,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x3b35e40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3c85240) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3c85140) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x3b35d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3c85300) 0 empty Class QPainterPathStroker size=4 align=4 @@ -8306,10 +7650,6 @@ QCommonStyle (0x3c85c40) 0 QObject (0x3c85cc0) 0 primary-for QStyle (0x3c85c80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x3c85fc0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -8631,25 +7971,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x3d2ed40) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3d2e600) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x3d2ef80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3db81c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3db80c0) 0 Class QTextCharFormat size=8 align=4 @@ -8704,15 +8032,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x3db8740) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3db89c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3db88c0) 0 Class QTextLine size=8 align=4 @@ -8762,10 +8082,6 @@ QTextDocument (0x3db8cc0) 0 QObject (0x3db8d00) 0 primary-for QTextDocument (0x3db8cc0) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3db8c00) 0 Class QTextCursor size=4 align=4 @@ -8777,15 +8093,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x3ede080) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3ede2c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3ede1c0) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -8952,10 +8260,6 @@ QTextFrame (0x3edec80) 0 QObject (0x3eded00) 0 primary-for QTextObject (0x3edecc0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3f690c0) 0 empty Class QTextBlock::iterator size=16 align=4 @@ -8967,25 +8271,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x3f69180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3f69580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3f69640) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x3f69700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3f69900) 0 empty Vtable for QTextList QTextList::_ZTV9QTextList: 17u entries @@ -9587,10 +8879,6 @@ QDateEdit (0x40ae140) 0 QPaintDevice (0x40ae240) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ae440) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -9751,10 +9039,6 @@ QDockWidget (0x40ae700) 0 QPaintDevice (0x40ae780) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40aea40) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -11480,10 +10764,6 @@ QTextEdit (0x432f940) 0 QPaintDevice (0x432fa40) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x432fcc0) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -12206,10 +11486,6 @@ QUdpSocket (0x44f99c0) 0 QObject (0x44f9a80) 0 primary-for QIODevice (0x44f9a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44f9c80) 0 Class QSqlRecord size=4 align=4 @@ -12347,15 +11623,7 @@ Class QSqlField base size=20 base align=4 QSqlField (0x45cd3c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x45cd640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x45cd580) 0 Class QSqlIndex size=16 align=4 @@ -12871,29 +12139,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0x46889c0) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x4688cc0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0x4688d00) 0 - primary-for Q3PtrList (0x4688cc0) - Q3PtrCollection (0x4688d40) 0 - primary-for Q3GList (0x4688d00) Class Q3PointArray size=4 align=4 @@ -12902,21 +12148,8 @@ Q3PointArray (0x4752100) 0 QPolygon (0x4752140) 0 QVector (0x4752180) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x4752740) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x4752640) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x4752780) 0 - QLinkedList (0x47527c0) 0 Class Q3CanvasItemList size=4 align=4 @@ -13554,28 +12787,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0x4885680) 0 -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0x4885940) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0x4885980) 0 - primary-for Q3Dict (0x4885940) - Q3PtrCollection (0x48859c0) 0 - primary-for Q3GDict (0x4885980) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -14110,29 +13322,7 @@ Q3Wizard (0x4908ec0) 0 QPaintDevice (0x4908f80) 8 vptr=((& Q3Wizard::_ZTV8Q3Wizard) + 308u) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x49b3000) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0x49b3040) 0 - primary-for Q3PtrList (0x49b3000) - Q3PtrCollection (0x49b3080) 0 - primary-for Q3GList (0x49b3040) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -14160,11 +13350,6 @@ Q3StrList (0x49b3200) 0 Q3PtrCollection (0x49b32c0) 0 primary-for Q3GList (0x49b3280) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0x49b36c0) 0 - Q3GListStdIterator (0x49b3700) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -15197,29 +14382,7 @@ Q3GVector (0x4b99340) 0 Q3PtrCollection (0x4b99380) 0 primary-for Q3GVector (0x4b99340) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x4b99640) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0x4b99680) 0 - primary-for Q3PtrVector (0x4b99640) - Q3PtrCollection (0x4b996c0) 0 - primary-for Q3GVector (0x4b99680) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -15339,28 +14502,7 @@ Class Q3GArray Q3GArray (0x4b99ac0) 0 vptr=((& Q3GArray::_ZTV8Q3GArray) + 8u) -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x4b99040) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0x4b99280) 0 - primary-for Q3IntDict (0x4b99040) - Q3PtrCollection (0x4b99440) 0 - primary-for Q3GDict (0x4b99280) Class Q3TableSelection size=28 align=4 @@ -15471,100 +14613,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0x4c8e780) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x4c8e8c0) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0x4c8e900) 0 - primary-for Q3PtrVector (0x4c8e8c0) - Q3PtrCollection (0x4c8e940) 0 - primary-for Q3GVector (0x4c8e900) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x4c8eb40) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0x4c8eb80) 0 - primary-for Q3PtrVector (0x4c8eb40) - Q3PtrCollection (0x4c8ebc0) 0 - primary-for Q3GVector (0x4c8eb80) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x4c8edc0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0x4c8ee00) 0 - primary-for Q3PtrList (0x4c8edc0) - Q3PtrCollection (0x4c8ee40) 0 - primary-for Q3GList (0x4c8ee00) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x4c8e3c0) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0x4c8e540) 0 - primary-for Q3IntDict (0x4c8e3c0) - Q3PtrCollection (0x4c8e840) 0 - primary-for Q3GDict (0x4c8e540) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -15878,15 +14933,7 @@ Q3Ftp (0x4d34600) 0 QObject (0x4d34680) 0 primary-for Q3NetworkProtocol (0x4d34640) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x4d34980) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x4d348c0) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -16900,21 +15947,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x4f4d340) 0 vptr=((& Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x4f4d6c0) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x4f4d5c0) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x4f4d700) 0 - QLinkedList (0x4f4d740) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -16923,31 +15957,10 @@ Q3SqlRecordInfo (0x4f4d8c0) 0 Q3ValueList (0x4f4d900) 0 QLinkedList (0x4f4d940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4f4db40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4f4da80) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0x4f4dec0) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0x4f4df00) 0 - QLinkedList::const_iterator (0x4f4df40) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0x4f4d2c0) 0 Vtable for Q3SqlSelectCursor Q3SqlSelectCursor::_ZTV17Q3SqlSelectCursor: 40u entries @@ -17007,15 +16020,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0x4fe5300) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x4fe55c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x4fe54c0) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -17054,25 +16059,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0x4fe5800) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x4fe59c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x4fe5900) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x4fe5d40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x4fe5c80) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -17280,10 +16269,6 @@ Q3TextEdit (0x4fe5a00) 0 QPaintDevice (0x5086000) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x50862c0) 0 Vtable for Q3MultiLineEdit Q3MultiLineEdit::_ZTV15Q3MultiLineEdit: 192u entries @@ -17944,70 +16929,11 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0x5086540) 0 -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=32 base align=4 -Q3AsciiCache (0x518d080) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0x518d0c0) 0 - primary-for Q3AsciiCache (0x518d080) - Q3PtrCollection (0x518d100) 0 - primary-for Q3GCache (0x518d0c0) - -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x518d4c0) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0x518d500) 0 - primary-for Q3AsciiDict (0x518d4c0) - Q3PtrCollection (0x518d540) 0 - primary-for Q3GDict (0x518d500) - -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=32 base align=4 -Q3Cache (0x518d900) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0x518d940) 0 - primary-for Q3Cache (0x518d900) - Q3PtrCollection (0x518d980) 0 - primary-for Q3GCache (0x518d940) + + Class Q3CString size=4 align=4 @@ -18015,49 +16941,9 @@ Class Q3CString Q3CString (0x518dcc0) 0 QByteArray (0x518dd00) 0 -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=32 base align=4 -Q3IntCache (0x521c9c0) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0x521ca00) 0 - primary-for Q3IntCache (0x521c9c0) - Q3PtrCollection (0x521ca40) 0 - primary-for Q3GCache (0x521ca00) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x521cd00) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0x521cd40) 0 - primary-for Q3AsciiDict (0x521cd00) - Q3PtrCollection (0x521cd80) 0 - primary-for Q3GDict (0x521cd40) Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -18084,76 +16970,11 @@ Q3ObjectDictionary (0x521cec0) 0 Q3PtrCollection (0x521cf80) 0 primary-for Q3GDict (0x521cf40) -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0x52a5300) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0x52a5340) 0 - primary-for Q3PtrDict (0x52a5300) - Q3PtrCollection (0x52a5380) 0 - primary-for Q3GDict (0x52a5340) - -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0x52a5780) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0x52a57c0) 0 - primary-for Q3PtrQueue (0x52a5780) - Q3PtrCollection (0x52a5800) 0 - primary-for Q3GList (0x52a57c0) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0x52a5c00) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0x52a5c40) 0 - primary-for Q3PtrStack (0x52a5c00) - Q3PtrCollection (0x52a5c80) 0 - primary-for Q3GList (0x52a5c40) + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -18193,29 +17014,7 @@ Q3Signal (0x52a5f40) 0 QObject (0x52a5f80) 0 primary-for Q3Signal (0x52a5f40) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x5314080) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0x53140c0) 0 - primary-for Q3PtrVector (0x5314080) - Q3PtrCollection (0x5314100) 0 - primary-for Q3GVector (0x53140c0) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -18521,15 +17320,7 @@ Q3GroupBox (0x538c1c0) 0 QPaintDevice (0x538c280) 8 vptr=((& Q3GroupBox::_ZTV10Q3GroupBox) + 236u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x538c700) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x538c640) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -19242,25 +18033,9 @@ Q3DockWindow (0x5407a80) 0 QPaintDevice (0x5407b80) 8 vptr=((& Q3DockWindow::_ZTV12Q3DockWindow) + 304u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x5407f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x5407ec0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x5407c40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x54074c0) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -19325,10 +18100,6 @@ Q3DockAreaLayout (0x5407d40) 0 QLayoutItem (0x5407dc0) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x54d1680) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -20378,188 +19149,40 @@ Q3WidgetStack (0x57b5140) 0 QPaintDevice (0x57b5240) 8 vptr=((& Q3WidgetStack::_ZTV13Q3WidgetStack) + 248u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x582a580) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x584e400) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x596b0c0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x596b300) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x596b5c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x596bcc0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x599ca40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x599cc00) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x599cdc0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x599cf80) 0 -Class QVectorTypedData - size=40 align=4 - base size=40 base align=4 -QVectorTypedData (0x59c1c00) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x59c1ec0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x59df1c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x59df4c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x5a03100) 0 -Class QLinkedListNode - size=56 align=4 - base size=56 base align=4 -QLinkedListNode (0x5a23dc0) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x5aef6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5aef880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5b1c1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5b1c400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5b1c880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5b1cd80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5b38940) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x5b75200) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x5b75440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5b757c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x5b75880) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x5b75c40) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x5b75f80) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x5bab600) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x5babd00) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x5bf6a40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x5bf6bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5bf6d80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x5bf6e40) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x5c24540) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x5c247c0) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.1.0.linux-gcc-ia32.txt b/tests/auto/bic/data/Qt3Support.4.1.0.linux-gcc-ia32.txt index 8ac62de7e..7afe2b3e0 100644 --- a/tests/auto/bic/data/Qt3Support.4.1.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/Qt3Support.4.1.0.linux-gcc-ia32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x40b2c000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c0c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b2c440) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40b2c480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b2c640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b2c6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b2c740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b2c7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b2c840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b2c8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b2c940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b2c9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b2ca40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b2cac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b2cb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b2cbc0) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40b2cd00) 0 QGenericArgument (0x40b2cd40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40b2cf40) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x42447040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42447100) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x42447800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42447880) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x42447ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42447c00) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x42447dc0) 0 QString (0x42447e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42447e80) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x426fe340) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x426fe780) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x426fe6c0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x426fe9c0) 0 QObject (0x426fea00) 0 primary-for QIODevice (0x426fe9c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x426feb40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x426fed00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x426fed40) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x428612c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x428618c0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x428617c0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42861b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42861a80) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x42861c00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x42861c80) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x42861d00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x42861cc0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x42861d40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x42861d80) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x42861e80) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x42861f00) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x42861ec0) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x42861f80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x42861fc0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x42861140) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42a00000) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x42a00340) 0 QTextStream (0x42a00380) 0 primary-for QTextOStream (0x42a00340) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x42a00540) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x42a00580) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x42a00500) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x42a005c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x42a00600) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x42a00640) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x42a00680) 0 Class timespec size=8 align=4 @@ -701,10 +485,6 @@ Class timeval base size=8 base align=4 timeval (0x42a00700) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x42a00740) 0 Class __sched_param size=4 align=4 @@ -721,45 +501,17 @@ Class __pthread_attr_s base size=36 base align=4 __pthread_attr_s (0x42a00800) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0x42a00840) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x42a00880) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x42a008c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x42a00900) 0 Class _pthread_rwlock_t size=32 align=4 base size=32 base align=4 _pthread_rwlock_t (0x42a00940) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x42a00980) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x42a009c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x42a00a00) 0 Class random_data size=28 align=4 @@ -830,10 +582,6 @@ QFile (0x42a00f40) 0 QObject (0x42a00fc0) 0 primary-for QIODevice (0x42a00f80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42a00ec0) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -886,50 +634,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x42b31180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42b31200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42b31240) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42b31380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42b312c0) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x42b313c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42b31440) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x42b31480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42b315c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42b31500) 0 Class QStringList size=4 align=4 @@ -937,30 +657,14 @@ Class QStringList QStringList (0x42b31600) 0 QList (0x42b31640) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x42b31880) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x42b31900) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x42b31b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42b31bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42b31c40) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1017,10 +721,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x42b31c80) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42b31e40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1175,110 +875,30 @@ Class QUrl base size=4 base align=4 QUrl (0x42c4e200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42c4e2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42c4e300) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x42c4e340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e3c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e440) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e480) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e4c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e5c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e600) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e680) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e6c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e740) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e780) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e7c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x42c4e800) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1305,35 +925,15 @@ Class QVariant base size=12 base align=4 QVariant (0x42c4e840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42c4ee00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42c4ed40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x42c4ef80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x42c4eec0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x42c4efc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42d4f0c0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1365,80 +965,48 @@ Class QPoint base size=8 base align=4 QPoint (0x42d4f300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42d4f740) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x42d4f800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42d4fc40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x42d4fd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42d4fd80) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x42d4fe80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42d4ff00) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x42d4f180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42d4f640) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x42d4f9c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42e54180) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x42e54380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42e54580) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x42e54680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42e54800) 0 empty Class QLinkedListData size=20 align=4 @@ -1455,10 +1023,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x42e54e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42e54ec0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1475,40 +1039,24 @@ Class QLocale base size=4 base align=4 QLocale (0x42e54440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42e544c0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x4302e080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4302e200) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x4302e240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4302e3c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x4302e400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4302e540) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1668,10 +1216,6 @@ QEventLoop (0x4302ecc0) 0 QObject (0x4302ed00) 0 primary-for QEventLoop (0x4302ecc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4302ee40) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1763,20 +1307,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x4302ed80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43146040) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x43146080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43146140) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1996,10 +1532,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x43146740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43146800) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2094,20 +1626,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x43146b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43146bc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x43146c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43146c80) 0 empty Class QMetaProperty size=20 align=4 @@ -2119,10 +1643,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x43146d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43146d80) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2245,25 +1765,9 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x43245200) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x43245340) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x43245380) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x432453c0) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x43245300) 0 Class QColor size=16 align=4 @@ -2280,55 +1784,23 @@ Class QPen base size=4 base align=4 QPen (0x43245800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43245940) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0x43245980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x432459c0) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x43245a00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43245bc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43245b00) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0x43245c40) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0x43245c80) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0x43245cc0) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0x43245c00) 0 Class QGradient size=56 align=4 @@ -2358,25 +1830,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x43245e80) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x43245780) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x43245480) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4330b080) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43245f40) 0 Class QTextCharFormat size=8 align=4 @@ -2516,10 +1976,6 @@ QTextFrame (0x4330b740) 0 QObject (0x4330b7c0) 0 primary-for QTextObject (0x4330b780) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4330ba40) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -2544,25 +2000,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x4330bb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4330bd40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4330bd80) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x4330bdc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4330bec0) 0 empty Class QFontMetrics size=4 align=4 @@ -2622,20 +2066,12 @@ QTextDocument (0x4330b840) 0 QObject (0x4340e000) 0 primary-for QTextDocument (0x4330b840) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4340e140) 0 Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0x4340e180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4340e200) 0 Class QTextTableCell size=8 align=4 @@ -2686,10 +2122,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x4340e880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4340e9c0) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2987,15 +2419,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0x434dea40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x434debc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x434deb00) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3294,15 +2718,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x435409c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43540c00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43540b40) 0 Class QTextLine size=8 align=4 @@ -3351,10 +2767,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x43540280) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x43540580) 0 Class QTextCursor size=4 align=4 @@ -3377,15 +2789,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x435f4240) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x435f4400) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x435f4340) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4238,10 +3642,6 @@ QFileDialog (0x43761640) 0 QPaintDevice (0x43761740) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x437618c0) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4327,10 +3727,6 @@ QAbstractPrintDialog (0x43761900) 0 QPaintDevice (0x43761a00) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43761b40) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -4766,10 +4162,6 @@ QImage (0x43838240) 0 QPaintDevice (0x43838280) 0 primary-for QImage (0x43838240) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43838380) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4876,10 +4268,6 @@ QImageIOPlugin (0x43838740) 0 QFactoryInterface (0x43838800) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x438387c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43838900) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -4999,10 +4387,6 @@ Class QIcon base size=4 base align=4 QIcon (0x43838f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43838100) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -5154,15 +4538,7 @@ Class QPrintEngine QPrintEngine (0x43956540) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43956740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43956680) 0 Class QPolygon size=4 align=4 @@ -5170,15 +4546,7 @@ Class QPolygon QPolygon (0x43956780) 0 QVector (0x439567c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43956a40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43956980) 0 Class QPolygonF size=4 align=4 @@ -5191,60 +4559,20 @@ Class QMatrix base size=48 base align=4 QMatrix (0x43956c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43956c80) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x43956cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43956dc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43956f40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43956e80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43956580) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43956100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43a82100) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43a82040) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43a82280) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43a821c0) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5292,15 +4620,7 @@ QStyle (0x43a822c0) 0 QObject (0x43a82300) 0 primary-for QStyle (0x43a822c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43a82440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43a824c0) 0 Class QStylePainter size=12 align=4 @@ -5318,25 +4638,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x43a82680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43a82a80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43a829c0) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x43a82800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43a82ac0) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5348,15 +4656,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x43a82b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43a82bc0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43a82cc0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5391,30 +4691,18 @@ Class QPaintEngine QPaintEngine (0x43a82c00) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43a82e40) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x43a82d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43a82ec0) 0 Class QItemSelectionRange size=8 align=4 base size=8 base align=4 QItemSelectionRange (0x43a82f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43a82380) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5445,20 +4733,8 @@ QItemSelectionModel (0x43a82780) 0 QObject (0x43a82c40) 0 primary-for QItemSelectionModel (0x43a82780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43bfc000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x43bfc140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x43bfc080) 0 Class QItemSelection size=4 align=4 @@ -5466,10 +4742,6 @@ Class QItemSelection QItemSelection (0x43bfc180) 0 QList (0x43bfc1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43bfc300) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -5757,10 +5029,6 @@ QAbstractSpinBox (0x43bfc9c0) 0 QPaintDevice (0x43bfca80) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43bfcb80) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6179,10 +5447,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x43d1e280) 0 QStyleOption (0x43d1e2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43d1e500) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6209,10 +5473,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x43d1e980) 0 QStyleOption (0x43d1e9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43d1ec00) 0 Class QStyleOptionButton size=64 align=4 @@ -6220,10 +5480,6 @@ Class QStyleOptionButton QStyleOptionButton (0x43d1eb00) 0 QStyleOption (0x43d1eb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43d1ee40) 0 Class QStyleOptionTab size=72 align=4 @@ -6238,10 +5494,6 @@ QStyleOptionTabV2 (0x43d1ef40) 0 QStyleOptionTab (0x43d1ef80) 0 QStyleOption (0x43d1efc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43d1edc0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6268,10 +5520,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x43db2280) 0 QStyleOption (0x43db22c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43db24c0) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6329,15 +5577,7 @@ QStyleOptionSpinBox (0x43db2f80) 0 QStyleOptionComplex (0x43db2fc0) 0 QStyleOption (0x43db2100) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x43db2e00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x43db2a00) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6346,10 +5586,6 @@ QStyleOptionQ3ListView (0x43db2500) 0 QStyleOptionComplex (0x43db2640) 0 QStyleOption (0x43db2780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43e36200) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6544,10 +5780,6 @@ QAbstractItemView (0x43e369c0) 0 QPaintDevice (0x43e36b00) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43e36c40) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6730,15 +5962,7 @@ QListView (0x43e36e00) 0 QPaintDevice (0x43e36f80) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43e36940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43e36400) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7780,15 +7004,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x43fe7480) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x43fe7780) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x43fe76c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7805,25 +7021,9 @@ Class QItemEditorFactory QItemEditorFactory (0x43fe7600) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x43fe7a00) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x43fe7940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x43fe7b80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x43fe7ac0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8050,15 +7250,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x43fe7c00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x440d8000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x440d8080) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8906,15 +8098,7 @@ QActionGroup (0x44175b40) 0 QObject (0x44175b80) 0 primary-for QActionGroup (0x44175b40) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x44175d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x44175cc0) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9055,10 +8239,6 @@ QCommonStyle (0x44175300) 0 QObject (0x44175680) 0 primary-for QStyle (0x441754c0) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x44175fc0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10586,10 +9766,6 @@ QDateEdit (0x443531c0) 0 QPaintDevice (0x44353a80) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44353fc0) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10749,10 +9925,6 @@ QDockWidget (0x444051c0) 0 QPaintDevice (0x44405280) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x444053c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12638,15 +11810,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0x4461bc40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4461be40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4461bd80) 0 Class QSqlIndex size=16 align=4 @@ -12654,10 +11818,6 @@ Class QSqlIndex QSqlIndex (0x4461bc80) 0 QSqlRecord (0x4461bcc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4461bf00) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -13334,29 +12494,7 @@ Q3GVector (0x44710f40) 0 Q3PtrCollection (0x44710f80) 0 primary-for Q3GVector (0x44710f40) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x44710940) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0x44710b00) 0 - primary-for Q3PtrVector (0x44710940) - Q3PtrCollection (0x44710d40) 0 - primary-for Q3GVector (0x44710b00) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -13513,29 +12651,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0x447ea580) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x447ea780) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0x447ea7c0) 0 - primary-for Q3PtrList (0x447ea780) - Q3PtrCollection (0x447ea800) 0 - primary-for Q3GList (0x447ea7c0) Class Q3BaseBucket size=8 align=4 @@ -13592,28 +12708,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0x447eae00) 0 -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x447eaf40) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0x447eaf80) 0 - primary-for Q3IntDict (0x447eaf40) - Q3PtrCollection (0x447eafc0) 0 - primary-for Q3GDict (0x447eaf80) Class Q3TableSelection size=28 align=4 @@ -13724,100 +12819,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0x448e7440) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x448e7500) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0x448e7540) 0 - primary-for Q3PtrVector (0x448e7500) - Q3PtrCollection (0x448e7580) 0 - primary-for Q3GVector (0x448e7540) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x448e76c0) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0x448e7700) 0 - primary-for Q3PtrVector (0x448e76c0) - Q3PtrCollection (0x448e7740) 0 - primary-for Q3GVector (0x448e7700) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x448e7880) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0x448e78c0) 0 - primary-for Q3PtrList (0x448e7880) - Q3PtrCollection (0x448e7900) 0 - primary-for Q3GList (0x448e78c0) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x448e7a40) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0x448e7a80) 0 - primary-for Q3IntDict (0x448e7a40) - Q3PtrCollection (0x448e7ac0) 0 - primary-for Q3GDict (0x448e7a80) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -14541,21 +13549,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x449a7340) 0 vptr=((& Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x449a76c0) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x449a7600) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x449a7700) 0 - QLinkedList (0x449a7740) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -14564,31 +13559,10 @@ Q3SqlRecordInfo (0x449a77c0) 0 Q3ValueList (0x449a7800) 0 QLinkedList (0x449a7840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x449a7a00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x449a7940) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0x449a7c40) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0x449a7c80) 0 - QLinkedList::const_iterator (0x449a7cc0) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0x449a7d80) 0 Vtable for Q3DataView Q3DataView::_ZTV10Q3DataView: 69u entries @@ -14679,15 +13653,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0x449a7f40) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x449a7d00) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x449a72c0) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -14748,25 +13714,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0x44a99180) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x44a99300) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x44a99240) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x44a99640) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x44a99580) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -14974,10 +13924,6 @@ Q3TextEdit (0x44a99980) 0 QPaintDevice (0x44a99b00) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44a99c80) 0 Vtable for Q3SyntaxHighlighter Q3SyntaxHighlighter::_ZTV19Q3SyntaxHighlighter: 5u entries @@ -15907,28 +14853,7 @@ Class Q3Url Q3Url (0x44b4d7c0) 0 vptr=((& Q3Url::_ZTV5Q3Url) + 8u) -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0x44b4d980) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0x44b4d9c0) 0 - primary-for Q3Dict (0x44b4d980) - Q3PtrCollection (0x44b4da00) 0 - primary-for Q3GDict (0x44b4d9c0) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -16289,29 +15214,7 @@ Q3Accel (0x44c01380) 0 QObject (0x44c013c0) 0 primary-for Q3Accel (0x44c01380) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x44c014c0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0x44c01500) 0 - primary-for Q3PtrList (0x44c014c0) - Q3PtrCollection (0x44c01540) 0 - primary-for Q3GList (0x44c01500) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -16339,11 +15242,6 @@ Q3StrList (0x44c01600) 0 Q3PtrCollection (0x44c016c0) 0 primary-for Q3GList (0x44c01680) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0x44c018c0) 0 - Q3GListStdIterator (0x44c01900) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -16899,29 +15797,7 @@ Class Q3CString Q3CString (0x44ca5f40) 0 QByteArray (0x44ca5f80) 0 -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0x44d2b180) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0x44d2b1c0) 0 - primary-for Q3PtrQueue (0x44d2b180) - Q3PtrCollection (0x44d2b200) 0 - primary-for Q3GList (0x44d2b1c0) Vtable for Q3Signal Q3Signal::_ZTV8Q3Signal: 14u entries @@ -16948,75 +15824,11 @@ Q3Signal (0x44d2b340) 0 QObject (0x44d2b380) 0 primary-for Q3Signal (0x44d2b340) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x44d2b580) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0x44d2b5c0) 0 - primary-for Q3AsciiDict (0x44d2b580) - Q3PtrCollection (0x44d2b600) 0 - primary-for Q3GDict (0x44d2b5c0) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0x44d2b840) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0x44d2b880) 0 - primary-for Q3PtrStack (0x44d2b840) - Q3PtrCollection (0x44d2b8c0) 0 - primary-for Q3GList (0x44d2b880) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x44d2b9c0) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0x44d2ba00) 0 - primary-for Q3AsciiDict (0x44d2b9c0) - Q3PtrCollection (0x44d2ba40) 0 - primary-for Q3GDict (0x44d2ba00) + Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -17067,91 +15879,13 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0x44d2be80) 0 -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0x44d2bfc0) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0x44d2b240) 0 - primary-for Q3Cache (0x44d2bfc0) - Q3PtrCollection (0x44d2b2c0) 0 - primary-for Q3GCache (0x44d2b240) - -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0x44dfc0c0) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0x44dfc100) 0 - primary-for Q3IntCache (0x44dfc0c0) - Q3PtrCollection (0x44dfc140) 0 - primary-for Q3GCache (0x44dfc100) - -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0x44dfc380) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0x44dfc3c0) 0 - primary-for Q3PtrDict (0x44dfc380) - Q3PtrCollection (0x44dfc400) 0 - primary-for Q3GDict (0x44dfc3c0) - -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0x44dfc740) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0x44dfc780) 0 - primary-for Q3AsciiCache (0x44dfc740) - Q3PtrCollection (0x44dfc7c0) 0 - primary-for Q3GCache (0x44dfc780) + + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -17166,29 +15900,7 @@ Class Q3Semaphore Q3Semaphore (0x44dfc980) 0 vptr=((& Q3Semaphore::_ZTV11Q3Semaphore) + 8u) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x44dfca80) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0x44dfcac0) 0 - primary-for Q3PtrVector (0x44dfca80) - Q3PtrCollection (0x44dfcb00) 0 - primary-for Q3GVector (0x44dfcac0) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -17283,21 +15995,8 @@ Class Q3PaintDeviceMetrics base size=4 base align=4 Q3PaintDeviceMetrics (0x44e8e440) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x44e8e600) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x44e8e540) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x44e8e640) 0 - QLinkedList (0x44e8e680) 0 Class Q3CanvasItemList size=4 align=4 @@ -18634,15 +17333,7 @@ Q3SocketDevice (0x4504e1c0) 0 QObject (0x4504e240) 0 primary-for QIODevice (0x4504e200) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x4504e480) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x4504e3c0) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -19967,15 +18658,7 @@ Q3VBox (0x450fe500) 0 QPaintDevice (0x450feec0) 8 vptr=((& Q3VBox::_ZTV6Q3VBox) + 244u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x45197340) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x45197280) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -20992,25 +19675,9 @@ Q3MainWindow (0x45229740) 0 QPaintDevice (0x45229800) 8 vptr=((& Q3MainWindow::_ZTV12Q3MainWindow) + 328u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x45229b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x45229a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x45229c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x45229bc0) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -21075,10 +19742,6 @@ Q3DockAreaLayout (0x452298c0) 0 QLayoutItem (0x45229980) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x45229fc0) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -21163,193 +19826,41 @@ Q3DockArea (0x45229e00) 0 QPaintDevice (0x45229ec0) 8 vptr=((& Q3DockArea::_ZTV10Q3DockArea) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x45341400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x45341780) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x45341e40) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x45385d40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x453ce380) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x453ce540) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x453cecc0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x45414000) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x454145c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x45414700) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x45414840) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x45414980) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0x45414d40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x45493ec0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x454d4000) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x454d4600) 0 -Class QLinkedListNode - size=52 align=4 - base size=52 base align=4 -QLinkedListNode (0x454d4f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x455af180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x455af400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x455af680) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x455e12c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x455e13c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x455e1680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x455e1c40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x45635180) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x456352c0) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x45635440) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x45635600) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x456357c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x45635980) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x45635a40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x45635d40) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x456b1040) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x456b1180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x456b1340) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x456b1400) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x456b1840) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x456b1980) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.1.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/Qt3Support.4.1.0.linux-gcc-ppc32.txt index 58b4f2aa9..83bd8d320 100644 --- a/tests/auto/bic/data/Qt3Support.4.1.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/Qt3Support.4.1.0.linux-gcc-ppc32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x307394d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x307396c8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30739770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30739818) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x307398c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30739968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30739a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30739ab8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30739b60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30739c08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30739cb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30739d58) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30739e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30739ea8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30739f50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30771000) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x30771070) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30771578) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x307715e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30771658) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x307716c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30771738) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x307717a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30771818) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30771888) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x307718f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30771968) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x307719d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30771a48) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187bc0) 0 QGenericArgument (0x30771b60) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x30771d20) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x30771e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30771ea8) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x324a5b98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x324a5ee0) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x325d7498) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x325d77e0) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x30187e00) 0 QString (0x32704268) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32704348) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x32704a80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32704fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32704f18) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x30187ec0) 0 QObject (0x327ef3b8) 0 primary-for QIODevice (0x30187ec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x327ef5b0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x327efce8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x327efd58) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x32891460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32891b28) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x328919d8) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32891e00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32891d58) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x32891f18) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x32891fc0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x32891c08) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x32891738) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x329f5038) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x329f50a8) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x329f51f8) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x329f52d8) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x329f5268) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x329f5348) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x329f53b8) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x329f53f0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x329f5620) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x329870c0) 0 QTextStream (0x329f5b98) 0 primary-for QTextOStream (0x329870c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x329f5e70) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x329f5ee0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x329f5e00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x329f5f50) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x329f5fc0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x329f59d8) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x32a77000) 0 Class timespec size=8 align=4 @@ -701,70 +485,18 @@ Class timeval base size=8 base align=4 timeval (0x32a77070) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x32a770e0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x32a77150) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x32a77230) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x32a771c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x32a772a0) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x32a77380) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x32a77310) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x32a773f0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x32a774d0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x32a77460) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x32a77540) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x32a775b0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x32a77620) 0 Class random_data size=28 align=4 @@ -835,10 +567,6 @@ QFile (0x32987100) 0 QObject (0x32a77c40) 0 primary-for QIODevice (0x32987140) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32a77dc8) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -891,50 +619,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x32a77f18) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32a77fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32a77d20) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32ba7118) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32ba7070) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x32ba71c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32ba7380) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x32ba73f0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32ba75b0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32ba7508) 0 Class QStringList size=4 align=4 @@ -942,30 +642,14 @@ Class QStringList QStringList (0x32987240) 0 QList (0x32ba7658) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x32ba7a80) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x32ba7af0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x32ba7e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ba7f18) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ba7f88) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1022,10 +706,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x32ba7fc0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32c6a1f8) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1180,110 +860,30 @@ Class QUrl base size=4 base align=4 QUrl (0x32c6a6c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32c6a850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32c6a8c0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x32c6a930) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32c6aa48) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32c6aaf0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32c6ab98) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32c6ac40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32c6ace8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32c6ad90) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32c6ae38) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32c6aee0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32c6af88) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32c6a310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32c6a658) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32d03070) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32d03118) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32d031c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32d03268) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32d03310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32d033b8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32d03460) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1310,35 +910,15 @@ Class QVariant base size=16 base align=8 QVariant (0x32d034d0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32d03a80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32d039d8) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x32d03c40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x32d03b98) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x32d03e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32d03f18) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1370,80 +950,48 @@ Class QPoint base size=8 base align=4 QPoint (0x32ddd310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32ddd700) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x32ddd8f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32dddce8) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x32dddf18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32dddf88) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x32ddd498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32ddd5e8) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x32dddb60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e7a268) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x32e7a540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e7a8c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x32e7ac40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e7ae38) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x32e7a0e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e7a658) 0 empty Class QLinkedListData size=20 align=4 @@ -1460,10 +1008,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x32f77888) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32f779a0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1480,40 +1024,24 @@ Class QLocale base size=4 base align=4 QLocale (0x32f77cb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32f77d20) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x32f77f18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x330bb038) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x330bb0a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x330bb2a0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x330bb310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x330bb460) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1673,10 +1201,6 @@ QEventLoop (0x32987780) 0 QObject (0x330bbfc0) 0 primary-for QEventLoop (0x32987780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x330bb818) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1768,20 +1292,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x33166818) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x331669a0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x33166a10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33166b28) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2001,10 +1517,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x33166cb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33216038) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2099,20 +1611,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x33216460) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33216508) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x33216578) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33216620) 0 empty Class QMetaProperty size=20 align=4 @@ -2124,10 +1628,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x332166c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33216770) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2250,25 +1750,9 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x332163f0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x332bb150) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x332bb1c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x332bb230) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x332bb0e0) 0 Class QColor size=16 align=4 @@ -2285,55 +1769,23 @@ Class QPen base size=4 base align=4 QPen (0x332bb690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x332bb818) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0x332bb888) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x332bb930) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x332bb9a0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x332bbbd0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x332bbaf0) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x332bbce8) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x332bbd58) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x332bbdc8) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x332bbc78) 0 Class QGradient size=64 align=8 @@ -2363,25 +1815,13 @@ Class QTextLength base size=16 base align=8 QTextLength (0x332bbea8) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x332bbee0) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x332bb5b0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x333592d8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x333591f8) 0 Class QTextCharFormat size=8 align=4 @@ -2521,10 +1961,6 @@ QTextFrame (0x333f4000) 0 QObject (0x333598f8) 0 primary-for QTextObject (0x333f4040) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33359d90) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -2549,25 +1985,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x33359f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3342a1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3342a268) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x3342a2d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3342a498) 0 empty Class QFontMetrics size=4 align=4 @@ -2627,20 +2051,12 @@ QTextDocument (0x333f4080) 0 QObject (0x3342a770) 0 primary-for QTextDocument (0x333f4080) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3342a930) 0 Class QTextOption size=32 align=8 base size=28 base align=8 QTextOption (0x3342a968) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3342aa48) 0 Class QTextTableCell size=8 align=4 @@ -2691,10 +2107,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x3342ac78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x334e9038) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2992,15 +2404,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x3355c230) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3355c3b8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3355c310) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3299,15 +2703,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x335b8620) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x335b88c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x335b87e0) 0 Class QTextLine size=8 align=4 @@ -3356,10 +2752,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x335b8ce8) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x335b8e00) 0 Class QTextCursor size=4 align=4 @@ -3382,15 +2774,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x33667188) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33667380) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x336672a0) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -4243,10 +3627,6 @@ QFileDialog (0x337c43c0) 0 QPaintDevice (0x33746888) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x338350e0) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4332,10 +3712,6 @@ QAbstractPrintDialog (0x337c44c0) 0 QPaintDevice (0x33835268) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33835460) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -4771,10 +4147,6 @@ QImage (0x337c4980) 0 QPaintDevice (0x33835ea8) 0 primary-for QImage (0x337c4980) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33835cb0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4881,10 +4253,6 @@ QImageIOPlugin (0x337c4a40) 0 QFactoryInterface (0x3391d508) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x337c4a80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3391d700) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -5004,10 +4372,6 @@ Class QIcon base size=4 base align=4 QIcon (0x3391dee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3391df50) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -5159,15 +4523,7 @@ Class QPrintEngine QPrintEngine (0x339d17e0) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x339d1ab8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x339d19d8) 0 Class QPolygon size=4 align=4 @@ -5175,15 +4531,7 @@ Class QPolygon QPolygon (0x337c4e00) 0 QVector (0x339d1b28) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x339d1ee0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x339d1e00) 0 Class QPolygonF size=4 align=4 @@ -5196,60 +4544,20 @@ Class QMatrix base size=48 base align=8 QMatrix (0x33a55118) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33a55188) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x33a55230) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33a55700) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33a55888) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33a557a8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33a55a48) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33a55968) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33a55c08) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33a55b28) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33a55dc8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33a55ce8) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5297,15 +4605,7 @@ QStyle (0x337c4e80) 0 QObject (0x33a55e38) 0 primary-for QStyle (0x337c4e80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33a55348) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33baf000) 0 Class QStylePainter size=12 align=4 @@ -5323,25 +4623,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x33baf268) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33baf700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33baf620) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x33baf460) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33baf7a8) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5353,15 +4641,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x33baf9a0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33bafa48) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33bafbd0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5396,30 +4676,18 @@ Class QPaintEngine QPaintEngine (0x33bafab8) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33bafdc8) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x33bafd20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33bafe38) 0 Class QItemSelectionRange size=8 align=4 base size=8 base align=4 QItemSelectionRange (0x33bafe70) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33c7f000) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5450,20 +4718,8 @@ QItemSelectionModel (0x337c4f40) 0 QObject (0x33c7f0a8) 0 primary-for QItemSelectionModel (0x337c4f40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33c7f230) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x33c7f380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x33c7f2d8) 0 Class QItemSelection size=4 align=4 @@ -5471,10 +4727,6 @@ Class QItemSelection QItemSelection (0x337c4f80) 0 QList (0x33c7f428) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33c7f5b0) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -5762,10 +5014,6 @@ QAbstractSpinBox (0x33cd7240) 0 QPaintDevice (0x33c7fe00) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33c7f540) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6184,10 +5432,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x33cd7600) 0 QStyleOption (0x33d63968) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33d63c08) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6214,10 +5458,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x33cd7740) 0 QStyleOption (0x33d63a10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33e09230) 0 Class QStyleOptionButton size=64 align=4 @@ -6225,10 +5465,6 @@ Class QStyleOptionButton QStyleOptionButton (0x33cd77c0) 0 QStyleOption (0x33e090e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33e09498) 0 Class QStyleOptionTab size=72 align=4 @@ -6243,10 +5479,6 @@ QStyleOptionTabV2 (0x33cd7880) 0 QStyleOptionTab (0x33cd78c0) 0 QStyleOption (0x33e095b0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33e09930) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6273,10 +5505,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x33cd7a00) 0 QStyleOption (0x33e09cb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33e09f88) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6334,15 +5562,7 @@ QStyleOptionSpinBox (0x33cd7c80) 0 QStyleOptionComplex (0x33cd7cc0) 0 QStyleOption (0x33e919a0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x33e91d20) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x33e91c78) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6351,10 +5571,6 @@ QStyleOptionQ3ListView (0x33cd7d00) 0 QStyleOptionComplex (0x33cd7d40) 0 QStyleOption (0x33e91b28) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33e91038) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6549,10 +5765,6 @@ QAbstractItemView (0x33f23040) 0 QPaintDevice (0x33f065e8) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33f067e0) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6735,15 +5947,7 @@ QListView (0x33f23240) 0 QPaintDevice (0x33f06968) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33f06ce8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33f06c08) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7785,15 +6989,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x33fd6e38) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x340ee380) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x340ee268) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7810,25 +7006,9 @@ Class QItemEditorFactory QItemEditorFactory (0x340ee188) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x340ee7e0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x340ee700) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x340ee968) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x340ee8c0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8055,15 +7235,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x34189070) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34189150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x341891c0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8911,15 +8083,7 @@ QActionGroup (0x34184980) 0 QObject (0x342926c8) 0 primary-for QActionGroup (0x34184980) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x342928f8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x34292850) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9060,10 +8224,6 @@ QCommonStyle (0x34184a80) 0 QObject (0x34292d58) 0 primary-for QStyle (0x34184ac0) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x34292f50) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10591,10 +9751,6 @@ QDateEdit (0x3437fa40) 0 QPaintDevice (0x34434fc0) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34434af0) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10754,11 +9910,7 @@ QDockWidget (0x3437fc00) 0 QPaintDevice (0x344e7188) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x344e73f0) 0 - + Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries 0 (int (*)(...))0 @@ -12643,15 +11795,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0x34780268) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34780428) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x34780380) 0 Class QSqlIndex size=16 align=4 @@ -12659,10 +11803,6 @@ Class QSqlIndex QSqlIndex (0x34591dc0) 0 QSqlRecord (0x347802a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34780578) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -13339,29 +12479,7 @@ Q3GVector (0x34838480) 0 Q3PtrCollection (0x348657a8) 0 primary-for Q3GVector (0x34838480) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x34838540) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0x34838580) 0 - primary-for Q3PtrVector (0x34838540) - Q3PtrCollection (0x348659a0) 0 - primary-for Q3GVector (0x34838580) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -13518,29 +12636,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0x34946070) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x348387c0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0x34838800) 0 - primary-for Q3PtrList (0x348387c0) - Q3PtrCollection (0x34946268) 0 - primary-for Q3GList (0x34838800) Class Q3BaseBucket size=8 align=4 @@ -13597,28 +12693,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0x349467a8) 0 -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x34838a80) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0x34838ac0) 0 - primary-for Q3IntDict (0x34838a80) - Q3PtrCollection (0x349469a0) 0 - primary-for Q3GDict (0x34838ac0) Class Q3TableSelection size=28 align=4 @@ -13729,100 +12804,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0x34946fc0) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x34838d00) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0x34838d40) 0 - primary-for Q3PtrVector (0x34838d00) - Q3PtrCollection (0x34946c78) 0 - primary-for Q3GVector (0x34838d40) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x34838d80) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0x34838dc0) 0 - primary-for Q3PtrVector (0x34838d80) - Q3PtrCollection (0x34a18118) 0 - primary-for Q3GVector (0x34838dc0) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x34838e00) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0x34838e40) 0 - primary-for Q3PtrList (0x34838e00) - Q3PtrCollection (0x34a182d8) 0 - primary-for Q3GList (0x34838e40) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x34838e80) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0x34838ec0) 0 - primary-for Q3IntDict (0x34838e80) - Q3PtrCollection (0x34a184d0) 0 - primary-for Q3GDict (0x34838ec0) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -14546,21 +13534,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x34ad1150) 0 vptr=((& Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x34ad15e8) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x34ad1508) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x34a4f340) 0 - QLinkedList (0x34ad1620) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -14569,31 +13544,10 @@ Q3SqlRecordInfo (0x34a4f3c0) 0 Q3ValueList (0x34a4f400) 0 QLinkedList (0x34ad1738) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34ad18f8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x34ad1850) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0x34ad1c08) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0x34a4f440) 0 - QLinkedList::const_iterator (0x34ad1c40) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0x34ad1ce8) 0 Vtable for Q3DataView Q3DataView::_ZTV10Q3DataView: 69u entries @@ -14684,15 +13638,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0x34ad1c78) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x34b8d1c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x34b8d0a8) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -14753,25 +13699,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0x34b8d578) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x34b8d700) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x34b8d658) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x34b8d9a0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x34b8d8f8) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -14979,10 +13909,6 @@ Q3TextEdit (0x34a4f680) 0 QPaintDevice (0x34b8dcb0) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34b8dee0) 0 Vtable for Q3SyntaxHighlighter Q3SyntaxHighlighter::_ZTV19Q3SyntaxHighlighter: 5u entries @@ -15912,28 +14838,7 @@ Class Q3Url Q3Url (0x34c4e888) 0 vptr=((& Q3Url::_ZTV5Q3Url) + 8u) -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0x34a4ff40) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0x34a4ff80) 0 - primary-for Q3Dict (0x34a4ff40) - Q3PtrCollection (0x34c4eab8) 0 - primary-for Q3GDict (0x34a4ff80) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -16294,29 +15199,7 @@ Q3Accel (0x34ce02c0) 0 QObject (0x34d099a0) 0 primary-for Q3Accel (0x34ce02c0) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x34ce0300) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0x34ce0340) 0 - primary-for Q3PtrList (0x34ce0300) - Q3PtrCollection (0x34d09b60) 0 - primary-for Q3GList (0x34ce0340) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -16344,11 +15227,6 @@ Q3StrList (0x34ce0380) 0 Q3PtrCollection (0x34d09cb0) 0 primary-for Q3GList (0x34ce0400) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0x34ce0440) 0 - Q3GListStdIterator (0x34d09268) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -16904,29 +15782,7 @@ Class Q3CString Q3CString (0x34ce0bc0) 0 QByteArray (0x34ddce38) 0 -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0x34ce0c80) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0x34ce0cc0) 0 - primary-for Q3PtrQueue (0x34ce0c80) - Q3PtrCollection (0x34e43818) 0 - primary-for Q3GList (0x34ce0cc0) Vtable for Q3Signal Q3Signal::_ZTV8Q3Signal: 14u entries @@ -16953,75 +15809,11 @@ Q3Signal (0x34ce0d00) 0 QObject (0x34e43a10) 0 primary-for Q3Signal (0x34ce0d00) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x34ce0dc0) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0x34ce0e00) 0 - primary-for Q3AsciiDict (0x34ce0dc0) - Q3PtrCollection (0x34e43cb0) 0 - primary-for Q3GDict (0x34ce0e00) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0x34ce0f00) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0x34ce0f40) 0 - primary-for Q3PtrStack (0x34ce0f00) - Q3PtrCollection (0x34e43f88) 0 - primary-for Q3GList (0x34ce0f40) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x34ce0f80) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0x34ce0fc0) 0 - primary-for Q3AsciiDict (0x34ce0f80) - Q3PtrCollection (0x34ece000) 0 - primary-for Q3GDict (0x34ce0fc0) + Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -17072,91 +15864,13 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0x34ece498) 0 -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0x34ed41c0) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0x34ed4200) 0 - primary-for Q3Cache (0x34ed41c0) - Q3PtrCollection (0x34ece5b0) 0 - primary-for Q3GCache (0x34ed4200) - -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0x34ed4340) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0x34ed4380) 0 - primary-for Q3IntCache (0x34ed4340) - Q3PtrCollection (0x34ece8c0) 0 - primary-for Q3GCache (0x34ed4380) - -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0x34ed4480) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0x34ed44c0) 0 - primary-for Q3PtrDict (0x34ed4480) - Q3PtrCollection (0x34eceb60) 0 - primary-for Q3GDict (0x34ed44c0) - -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0x34ed4600) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0x34ed4640) 0 - primary-for Q3AsciiCache (0x34ed4600) - Q3PtrCollection (0x34ecef50) 0 - primary-for Q3GCache (0x34ed4640) + + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -17171,29 +15885,7 @@ Class Q3Semaphore Q3Semaphore (0x34f7a000) 0 vptr=((& Q3Semaphore::_ZTV11Q3Semaphore) + 8u) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x34ed4700) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0x34ed4740) 0 - primary-for Q3PtrVector (0x34ed4700) - Q3PtrCollection (0x34f7a1c0) 0 - primary-for Q3GVector (0x34ed4740) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -17288,21 +15980,8 @@ Class Q3PaintDeviceMetrics base size=4 base align=4 Q3PaintDeviceMetrics (0x34f7a0e0) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x34fd7118) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x34fd7038) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x34ed4a80) 0 - QLinkedList (0x34fd7150) 0 Class Q3CanvasItemList size=4 align=4 @@ -18639,15 +17318,7 @@ Q3SocketDevice (0x3506d6c0) 0 QObject (0x351811c0) 0 primary-for QIODevice (0x3506d700) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x35181428) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x35181380) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -19972,15 +18643,7 @@ Q3VBox (0x3527c2c0) 0 QPaintDevice (0x352cc000) 8 vptr=((& Q3VBox::_ZTV6Q3VBox) + 244u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x352cc348) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x352cc2a0) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -20997,25 +19660,9 @@ Q3MainWindow (0x3527ce40) 0 QPaintDevice (0x3536c738) 8 vptr=((& Q3MainWindow::_ZTV12Q3MainWindow) + 328u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3536cab8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3536ca10) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3536cc40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3536cb98) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -21080,10 +19727,6 @@ Q3DockAreaLayout (0x3527cec0) 0 QLayoutItem (0x3536c968) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x3536cd58) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -21168,193 +19811,41 @@ Q3DockArea (0x3527cf80) 0 QPaintDevice (0x3536c620) 8 vptr=((& Q3DockArea::_ZTV10Q3DockArea) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35480380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35480ab8) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3549c8c0) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x354eb4d0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x3550a188) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x3550a428) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x355274d0) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x35527af0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x35563658) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x355637e0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x35563968) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x35563af0) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x3557f268) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x355f39a0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x355f3b98) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35614850) 0 -Class QLinkedListNode - size=56 align=8 - base size=56 base align=8 -QLinkedListNode (0x35637e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x356bdfc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x356e53b8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x356e57a8) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x35701ce8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35701e70) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35724310) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35724c40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x357526c8) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x357528c0) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x35752e38) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x35797380) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x357979a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35797c40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35797ce8) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x357c8150) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x357c8a80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x357c8c78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x357c8f18) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x357c8fc0) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x357ef5e8) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x357ef818) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.1.0.macx-gcc-ia32.txt b/tests/auto/bic/data/Qt3Support.4.1.0.macx-gcc-ia32.txt index 937efcf2b..0f44ea7ea 100644 --- a/tests/auto/bic/data/Qt3Support.4.1.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/Qt3Support.4.1.0.macx-gcc-ia32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x6b5940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6b5b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6b5c40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6b5d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6b5dc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6b5e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6b5f40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x262c000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x262c0c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x262c180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x262c240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x262c300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x262c3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x262c480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x262c540) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x262c840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x262c940) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0x26b1040) 0 QBasicAtomic (0x26b1080) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x26b1300) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0x26b1fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2745380) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2745840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x27458c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2745940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x27459c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2745a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2745ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2745b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2745bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2745c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2745cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2745d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2745dc0) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x28c0500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x28c0940) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x2a27540) 0 QString (0x2a27580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a27680) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x2a27f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2a884c0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x2a88340) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2a88800) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2a88740) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x2a88a40) 0 QGenericArgument (0x2a88a80) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x2a88d40) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x2a88cc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2a88fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2a88f00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x2bbe540) 0 QObject (0x2bbe580) 0 primary-for QIODevice (0x2bbe540) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2bbe7c0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x2bbee80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2bbe680) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x2c8f000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2c8f200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2c8f140) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x2c8f2c0) 0 QList (0x2c8f300) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x2c8f7c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x2c8f840) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x2d06600) 0 QObject (0x2d06680) 0 primary-for QIODevice (0x2d06640) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2d06840) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x2d06880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2d06940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d069c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2d06b80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2d06ac0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x2d06c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2d06d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2d06e00) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x2d06e40) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e1c000) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x2e1c500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2e1c580) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x2eaf940) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2eafc00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1041,35 +829,15 @@ Class rlimit base size=16 base align=4 rlimit (0x300a680) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x300ae40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x300aec0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x300adc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x300af40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x300afc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x303c000) 0 Class QVectorData size=16 align=4 @@ -1182,95 +950,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x303ca80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x303cbc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x303cc80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x303cd40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x303ce00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x303cec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x303cf80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x303c800) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3158040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3158100) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31581c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3158280) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3158340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3158400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31584c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3158580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3158640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3158700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31587c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1297,50 +993,18 @@ Class QVariant base size=12 base align=4 QVariant (0x3158840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3158ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3158e00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x3158b80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x3158a00) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x31e4240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e4380) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x31e4440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31e44c0) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x31e4540) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1418,15 +1082,7 @@ Class QUrl base size=4 base align=4 QUrl (0x31e4d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31e4f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e4fc0) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1453,10 +1109,6 @@ QEventLoop (0x31e4100) 0 QObject (0x31e4800) 0 primary-for QEventLoop (0x31e4100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32c4140) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1501,20 +1153,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x32c4380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32c4540) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x32c45c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32c4700) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1684,10 +1328,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x32c4e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32c4f00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1779,20 +1419,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x3372900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33729c0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x3372a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3372b00) 0 empty Class QMetaProperty size=20 align=4 @@ -1804,10 +1436,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x3372bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3372c80) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2095,10 +1723,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x34a4400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34a4540) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2110,70 +1734,42 @@ Class QDate base size=4 base align=4 QDate (0x34a4740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34a4940) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x34a49c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34a4c00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x34a4c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34a4e00) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x34a4e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34a4f40) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x3538240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35386c0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x35389c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3538a40) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x3538bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3538c80) 0 empty Class QLinkedListData size=20 align=4 @@ -2185,50 +1781,30 @@ Class QLocale base size=4 base align=4 QLocale (0x3650000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3650080) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x36501c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36505c0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x3650980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3650d80) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x3650a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3650cc0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x3706240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3706400) 0 empty Class QSharedData size=4 align=4 @@ -2250,10 +1826,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x3706dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3706f40) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2572,15 +2144,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0x38d8a80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x38d8c40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x38d8b80) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2869,15 +2433,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x395d280) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x395d3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x395d440) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3161,25 +2717,9 @@ Class QPaintDevice QPaintDevice (0x39c4700) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x39c4a40) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x39c4ac0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x39c4b40) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x39c49c0) 0 Class QColor size=16 align=4 @@ -3191,45 +2731,17 @@ Class QBrush base size=4 base align=4 QBrush (0x39c4e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x39c4ec0) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x39c4f40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x39c4c00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39c4400) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0x3a4d100) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0x3a4d180) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0x3a4d200) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0x3a4d080) 0 Class QGradient size=56 align=4 @@ -3625,10 +3137,6 @@ QAbstractPrintDialog (0x3b1ff40) 0 QPaintDevice (0x3b1f1c0) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3c31040) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -3879,10 +3387,6 @@ QFileDialog (0x3c31580) 0 QPaintDevice (0x3c31640) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3c31900) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4577,10 +4081,6 @@ QImage (0x3cf6f00) 0 QPaintDevice (0x3cf6f40) 0 primary-for QImage (0x3cf6f00) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3db80c0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4625,10 +4125,6 @@ Class QIcon base size=4 base align=4 QIcon (0x3db89c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3db8a80) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4784,10 +4280,6 @@ QImageIOPlugin (0x3e41100) 0 QFactoryInterface (0x3e3b240) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x3e3b200) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3e3b480) 0 Class QImageReader size=4 align=4 @@ -4963,15 +4455,7 @@ QActionGroup (0x3e3b640) 0 QObject (0x3e3b740) 0 primary-for QActionGroup (0x3e3b640) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3ee4100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3ee4040) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -5276,10 +4760,6 @@ QAbstractSpinBox (0x3ee4e80) 0 QPaintDevice (0x3ee4f00) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3ee4c40) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5487,15 +4967,7 @@ QStyle (0x3f6e480) 0 QObject (0x3f6e4c0) 0 primary-for QStyle (0x3f6e480) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f6e700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f6e780) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -5754,10 +5226,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x3f6edc0) 0 QStyleOption (0x406d000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x406d380) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -5784,10 +5252,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x406da00) 0 QStyleOption (0x406da40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x406de00) 0 Class QStyleOptionButton size=64 align=4 @@ -5795,10 +5259,6 @@ Class QStyleOptionButton QStyleOptionButton (0x406dc40) 0 QStyleOption (0x406dc80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x406db40) 0 Class QStyleOptionTab size=72 align=4 @@ -5813,10 +5273,6 @@ QStyleOptionTabV2 (0x40db040) 0 QStyleOptionTab (0x40db080) 0 QStyleOption (0x40db0c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40db500) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5843,10 +5299,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x40db9c0) 0 QStyleOption (0x40dba00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40dbd80) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5904,15 +5356,7 @@ QStyleOptionSpinBox (0x414bc40) 0 QStyleOptionComplex (0x414bc80) 0 QStyleOption (0x414bcc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x414b800) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x414b200) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5921,10 +5365,6 @@ QStyleOptionQ3ListView (0x414be80) 0 QStyleOptionComplex (0x414bec0) 0 QStyleOption (0x414bf00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41a0300) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6084,10 +5524,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x41a0800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4226240) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6118,20 +5554,8 @@ QItemSelectionModel (0x4226300) 0 QObject (0x4226340) 0 primary-for QItemSelectionModel (0x4226300) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4226500) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4226680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42265c0) 0 Class QItemSelection size=4 align=4 @@ -6261,10 +5685,6 @@ QAbstractItemView (0x4226840) 0 QPaintDevice (0x4226940) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4226bc0) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -6576,15 +5996,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x42e9500) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x42e99c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x42e9880) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -6725,15 +6137,7 @@ QListView (0x42e9c40) 0 QPaintDevice (0x42e9d80) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x436e000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42e9600) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7522,35 +6926,15 @@ QTreeView (0x4431640) 0 QPaintDevice (0x4431780) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4431a40) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x4431940) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x4431f00) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x4431e00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x44319c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x44311c0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8397,15 +7781,7 @@ Class QColormap base size=4 base align=4 QColormap (0x4667c00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4667e00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4667d00) 0 Class QPolygon size=4 align=4 @@ -8413,15 +7789,7 @@ Class QPolygon QPolygon (0x4667e80) 0 QVector (0x4667ec0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4700180) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4700080) 0 Class QPolygonF size=4 align=4 @@ -8434,95 +7802,39 @@ Class QMatrix base size=48 base align=4 QMatrix (0x4700540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x47005c0) 0 empty Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0x4700680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4700780) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0x47007c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4700980) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x4700a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4700f80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x47f0080) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x47008c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x47f0280) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x47f0180) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x47f0480) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x47f0380) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x47f0680) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x47f0580) 0 Class QTextItem size=1 align=1 base size=0 base align=1 QTextItem (0x47f0700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x47f07c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x47f0980) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -8557,20 +7869,12 @@ Class QPaintEngine QPaintEngine (0x47f0840) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x47f0bc0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x47f0b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x47f0c40) 0 Class QPainterPath::Element size=20 align=4 @@ -8582,25 +7886,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x47f0c80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4923080) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x47f0d80) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x47f0ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4923140) 0 empty Class QPainterPathStroker size=4 align=4 @@ -8698,10 +7990,6 @@ QCommonStyle (0x4923a40) 0 QObject (0x4923ac0) 0 primary-for QStyle (0x4923a80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x4923dc0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -9023,25 +8311,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x49c4b00) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x49c4e80) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x49c4d40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x49c4fc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x49c4b40) 0 Class QTextCharFormat size=8 align=4 @@ -9096,15 +8372,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x4a49540) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4a49840) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4a49740) 0 Class QTextLine size=8 align=4 @@ -9154,15 +8422,7 @@ QTextDocument (0x4a49b40) 0 QObject (0x4a49b80) 0 primary-for QTextDocument (0x4a49b40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4a49dc0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4a49f00) 0 Class QTextCursor size=4 align=4 @@ -9174,15 +8434,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x4a49a80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4b4d180) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4b4d080) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -9344,10 +8596,6 @@ QTextFrame (0x4b4db00) 0 QObject (0x4b4db80) 0 primary-for QTextObject (0x4b4db40) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4b4d700) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -9372,25 +8620,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x4bc2180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4bc2580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4bc2640) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x4bc2700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4bc2900) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -10023,10 +9259,6 @@ QDateEdit (0x4ce1300) 0 QPaintDevice (0x4ce1400) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4ce1600) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -10187,10 +9419,6 @@ QDockWidget (0x4ce18c0) 0 QPaintDevice (0x4ce1940) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4ce1c00) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12642,10 +11870,6 @@ QUdpSocket (0x5081b80) 0 QObject (0x5081c40) 0 primary-for QIODevice (0x5081c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5081e80) 0 Class QSqlRecord size=4 align=4 @@ -12783,15 +12007,7 @@ Class QSqlField base size=16 base align=4 QSqlField (0x513c600) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x513c880) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x513c7c0) 0 Class QSqlIndex size=16 align=4 @@ -13307,29 +12523,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0x51e8c00) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x51e8f00) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0x51e8f40) 0 - primary-for Q3PtrList (0x51e8f00) - Q3PtrCollection (0x51e8f80) 0 - primary-for Q3GList (0x51e8f40) Class Q3PointArray size=4 align=4 @@ -13338,21 +12532,8 @@ Q3PointArray (0x5290300) 0 QPolygon (0x5290340) 0 QVector (0x5290380) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x5290940) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x5290840) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x5290980) 0 - QLinkedList (0x52909c0) 0 Class Q3CanvasItemList size=4 align=4 @@ -13990,28 +13171,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0x538f900) 0 -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0x538fbc0) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0x538fc00) 0 - primary-for Q3Dict (0x538fbc0) - Q3PtrCollection (0x538fc40) 0 - primary-for Q3GDict (0x538fc00) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -14546,29 +13706,7 @@ Q3Wizard (0x540c740) 0 QPaintDevice (0x540cd80) 8 vptr=((& Q3Wizard::_ZTV8Q3Wizard) + 308u) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x54aa240) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0x54aa280) 0 - primary-for Q3PtrList (0x54aa240) - Q3PtrCollection (0x54aa2c0) 0 - primary-for Q3GList (0x54aa280) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -14596,11 +13734,6 @@ Q3StrList (0x54aa440) 0 Q3PtrCollection (0x54aa500) 0 primary-for Q3GList (0x54aa4c0) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0x54aa900) 0 - Q3GListStdIterator (0x54aa940) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -15633,29 +14766,7 @@ Q3GVector (0x5626500) 0 Q3PtrCollection (0x5626540) 0 primary-for Q3GVector (0x5626500) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x5626800) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0x5626840) 0 - primary-for Q3PtrVector (0x5626800) - Q3PtrCollection (0x5626880) 0 - primary-for Q3GVector (0x5626840) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -15775,28 +14886,7 @@ Class Q3GArray Q3GArray (0x5626c80) 0 vptr=((& Q3GArray::_ZTV8Q3GArray) + 8u) -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x5708040) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0x5708080) 0 - primary-for Q3IntDict (0x5708040) - Q3PtrCollection (0x57080c0) 0 - primary-for Q3GDict (0x5708080) Class Q3TableSelection size=28 align=4 @@ -15907,100 +14997,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0x5708980) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x5708ac0) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0x5708b00) 0 - primary-for Q3PtrVector (0x5708ac0) - Q3PtrCollection (0x5708b40) 0 - primary-for Q3GVector (0x5708b00) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x5708d40) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0x5708d80) 0 - primary-for Q3PtrVector (0x5708d40) - Q3PtrCollection (0x5708dc0) 0 - primary-for Q3GVector (0x5708d80) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x5708fc0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0x5708180) 0 - primary-for Q3PtrList (0x5708fc0) - Q3PtrCollection (0x5708440) 0 - primary-for Q3GList (0x5708180) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x5708f40) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0x578d000) 0 - primary-for Q3IntDict (0x5708f40) - Q3PtrCollection (0x578d040) 0 - primary-for Q3GDict (0x578d000) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -16314,15 +15317,7 @@ Q3Ftp (0x578d800) 0 QObject (0x578d880) 0 primary-for Q3NetworkProtocol (0x578d840) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x578db80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x578dac0) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -17604,21 +16599,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x598d780) 0 vptr=((& Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x598db00) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x598da00) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x598db40) 0 - QLinkedList (0x598db80) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -17627,31 +16609,10 @@ Q3SqlRecordInfo (0x598dd00) 0 Q3ValueList (0x598dd40) 0 QLinkedList (0x598dd80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x598df80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x598dec0) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0x5a15200) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0x5a15240) 0 - QLinkedList::const_iterator (0x5a15280) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0x5a15340) 0 Vtable for Q3SqlSelectCursor Q3SqlSelectCursor::_ZTV17Q3SqlSelectCursor: 40u entries @@ -17711,15 +16672,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0x5a15740) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x5a15a40) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x5a15900) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -17758,25 +16711,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0x5a15cc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x5a15e80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x5a15dc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x5a15fc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x5a15b80) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -17984,10 +16921,6 @@ Q3TextEdit (0x5ab1380) 0 QPaintDevice (0x5ab14c0) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5ab1780) 0 Vtable for Q3MultiLineEdit Q3MultiLineEdit::_ZTV15Q3MultiLineEdit: 192u entries @@ -18648,70 +17581,11 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0x5b7c380) 0 -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0x5b7c540) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0x5b7c580) 0 - primary-for Q3AsciiCache (0x5b7c540) - Q3PtrCollection (0x5b7c5c0) 0 - primary-for Q3GCache (0x5b7c580) - -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x5b7c980) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0x5b7c9c0) 0 - primary-for Q3AsciiDict (0x5b7c980) - Q3PtrCollection (0x5b7ca00) 0 - primary-for Q3GDict (0x5b7c9c0) - -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0x5b7cdc0) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0x5b7ce00) 0 - primary-for Q3Cache (0x5b7cdc0) - Q3PtrCollection (0x5b7ce40) 0 - primary-for Q3GCache (0x5b7ce00) + + Class Q3CString size=4 align=4 @@ -18719,49 +17593,9 @@ Class Q3CString Q3CString (0x5d5d040) 0 QByteArray (0x5d5d080) 0 -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0x5d5de00) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0x5d5de40) 0 - primary-for Q3IntCache (0x5d5de00) - Q3PtrCollection (0x5d5de80) 0 - primary-for Q3GCache (0x5d5de40) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x5de9100) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0x5de9140) 0 - primary-for Q3AsciiDict (0x5de9100) - Q3PtrCollection (0x5de9180) 0 - primary-for Q3GDict (0x5de9140) Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -18788,76 +17622,11 @@ Q3ObjectDictionary (0x5de92c0) 0 Q3PtrCollection (0x5de9380) 0 primary-for Q3GDict (0x5de9340) -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0x5de97c0) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0x5de9800) 0 - primary-for Q3PtrDict (0x5de97c0) - Q3PtrCollection (0x5de9840) 0 - primary-for Q3GDict (0x5de9800) - -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0x5de9c40) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0x5de9c80) 0 - primary-for Q3PtrQueue (0x5de9c40) - Q3PtrCollection (0x5de9cc0) 0 - primary-for Q3GList (0x5de9c80) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0x5de9dc0) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0x5de9e80) 0 - primary-for Q3PtrStack (0x5de9dc0) - Q3PtrCollection (0x5e48000) 0 - primary-for Q3GList (0x5de9e80) + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -18897,29 +17666,7 @@ Q3Signal (0x5e482c0) 0 QObject (0x5e48300) 0 primary-for Q3Signal (0x5e482c0) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x5e48580) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0x5e485c0) 0 - primary-for Q3PtrVector (0x5e48580) - Q3PtrCollection (0x5e48600) 0 - primary-for Q3GVector (0x5e485c0) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -19225,15 +17972,7 @@ Q3GroupBox (0x5ea4680) 0 QPaintDevice (0x5ea4740) 8 vptr=((& Q3GroupBox::_ZTV10Q3GroupBox) + 236u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x5ea4bc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x5ea4b00) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -20036,25 +18775,9 @@ Q3DockWindow (0x5f1ee00) 0 QPaintDevice (0x5fa90c0) 8 vptr=((& Q3DockWindow::_ZTV12Q3DockWindow) + 304u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x5fa94c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x5fa9400) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x5fa9680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x5fa95c0) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -20119,10 +18842,6 @@ Q3DockAreaLayout (0x5fa9280) 0 QLayoutItem (0x5fa9300) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x5fa9d80) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -21172,193 +19891,41 @@ Q3WidgetStack (0x60cd840) 0 QPaintDevice (0x60cd940) 8 vptr=((& Q3WidgetStack::_ZTV13Q3WidgetStack) + 248u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6158e40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6178cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x61cfd40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x62d0000) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x62d0240) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x62d0500) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x62d0c00) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x6300f40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6326100) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x63262c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6326480) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0x6343440) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x6343700) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6343a00) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x6364080) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6364cc0) 0 -Class QLinkedListNode - size=52 align=4 - base size=52 base align=4 -QLinkedListNode (0x63a6880) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x6472380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6472640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6495500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6495880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6495d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x64b5200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x64b5dc0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x64e3680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x64e38c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x64e3c40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x64e3d00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x65120c0) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x6512540) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x6512c40) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x6558240) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x65588c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6599140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6599440) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6599500) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x6599c40) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x6599ec0) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.1.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/Qt3Support.4.1.0.macx-gcc-ppc32.txt index f8ad38468..d17a3296f 100644 --- a/tests/auto/bic/data/Qt3Support.4.1.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/Qt3Support.4.1.0.macx-gcc-ppc32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x85a3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85a600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85a6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85a780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85a840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85a900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85a9c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85aa80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85ab40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85ac00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85acc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85ad80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85ae40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85af00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x85afc0) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x26d82c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26d83c0) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0x26d87c0) 0 QBasicAtomic (0x26d8800) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x26d8a80) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0x27ce740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27ceb00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x27cefc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x28d2040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x28d20c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x28d2140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x28d21c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x28d2240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x28d22c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x28d2340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x28d23c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x28d2440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x28d24c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x28d2540) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x28d2c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2a630c0) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x2a63cc0) 0 QString (0x2a63d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a63e00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x2b916c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b91cc0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x2b91b40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2b91100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2b91f40) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x2cc40c0) 0 QGenericArgument (0x2cc4100) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x2cc43c0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x2cc4340) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2cc4640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2cc4580) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x2cc4c80) 0 QObject (0x2cc4cc0) 0 primary-for QIODevice (0x2cc4c80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2cc4f00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x2d9e500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d9e700) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x2d9e780) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2d9e980) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2d9e8c0) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x2d9ea40) 0 QList (0x2d9ea80) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x2d9ef40) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x2d9efc0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x2ecc140) 0 QObject (0x2ecc1c0) 0 primary-for QIODevice (0x2ecc180) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2ecc380) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x2ecc3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2ecc480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2ecc500) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2ecc6c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2ecc600) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x2ecc780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2ecc8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2ecc940) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x2ecc980) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2eccc40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x3002040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30020c0) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x317e080) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x317e340) 0 Class QTextStreamManipulator size=24 align=4 @@ -1051,35 +839,15 @@ Class rlimit base size=16 base align=8 rlimit (0x3206040) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x3206100) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x3206180) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x3206080) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x3206200) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x3206280) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x3206300) 0 Class QVectorData size=16 align=4 @@ -1192,95 +960,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x3206dc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3206f00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3206fc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3206d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334b080) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334b140) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334b200) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334b2c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334b380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334b440) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334b500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334b5c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334b680) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334b740) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334b800) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334b8c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334b980) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334ba40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x334bb00) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1307,50 +1003,18 @@ Class QVariant base size=16 base align=4 QVariant (0x334bb80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x33d3100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x33d3040) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x33d3300) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x33d3240) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x33d3580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33d36c0) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x33d3780) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x33d3800) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x33d3880) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1428,15 +1092,7 @@ Class QUrl base size=4 base align=4 QUrl (0x33d3b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34a0140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34a01c0) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1463,10 +1119,6 @@ QEventLoop (0x34a0240) 0 QObject (0x34a0280) 0 primary-for QEventLoop (0x34a0240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34a0480) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1511,20 +1163,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x34a06c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34a0880) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x34a0900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34a0a40) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1694,10 +1338,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x34a0e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35b70c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1789,20 +1429,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x35b7c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35b7d40) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x35b7dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35b7e80) 0 empty Class QMetaProperty size=20 align=4 @@ -1814,10 +1446,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x35b7f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35b7240) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2105,10 +1733,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x36e97c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36e9900) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2120,70 +1744,42 @@ Class QDate base size=4 base align=4 QDate (0x36e9b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36e9d00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x36e9d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36e9fc0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x36e9b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x37b5000) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x37b5080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x37b5500) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x37b57c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x37b5c40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x37b5f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x37b5fc0) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x37b5340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x37b5800) 0 empty Class QLinkedListData size=20 align=4 @@ -2195,50 +1791,30 @@ Class QLocale base size=4 base align=4 QLocale (0x38673c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3867440) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x3867580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3867980) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x3867d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x38676c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x39a3200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x39a33c0) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x39a3640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x39a3800) 0 empty Class QSharedData size=4 align=4 @@ -2260,10 +1836,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x3b3b000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3b3b180) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2582,15 +2154,7 @@ Class QInputMethodEvent::Attribute base size=28 base align=4 QInputMethodEvent::Attribute (0x3bccf00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3bcc4c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3bcc040) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2879,15 +2443,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x3c6a700) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3c6a840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3c6a8c0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3171,25 +2727,9 @@ Class QPaintDevice QPaintDevice (0x3cdab40) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3cdae80) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3cdaf00) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3cdaf80) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x3cdae00) 0 Class QColor size=16 align=4 @@ -3201,45 +2741,17 @@ Class QBrush base size=4 base align=4 QBrush (0x3d5c000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3d5c0c0) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x3d5c140) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3d5c3c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3d5c2c0) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x3d5c500) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x3d5c580) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x3d5c600) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x3d5c480) 0 Class QGradient size=56 align=4 @@ -3635,10 +3147,6 @@ QAbstractPrintDialog (0x3fab140) 0 QPaintDevice (0x3fab200) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3fab480) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -3889,10 +3397,6 @@ QFileDialog (0x3fab9c0) 0 QPaintDevice (0x3faba80) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3fabd40) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4587,10 +4091,6 @@ QImage (0x4134180) 0 QPaintDevice (0x41341c0) 0 primary-for QImage (0x4134180) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41344c0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4635,10 +4135,6 @@ Class QIcon base size=4 base align=4 QIcon (0x4134dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4134e80) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4794,10 +4290,6 @@ QImageIOPlugin (0x4230480) 0 QFactoryInterface (0x4215680) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x4215640) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42158c0) 0 Class QImageReader size=4 align=4 @@ -4973,15 +4465,7 @@ QActionGroup (0x42b2280) 0 QObject (0x42b22c0) 0 primary-for QActionGroup (0x42b2280) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42b2540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42b2480) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -5286,10 +4770,6 @@ QAbstractSpinBox (0x436a0c0) 0 QPaintDevice (0x436a140) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x436a3c0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5497,15 +4977,7 @@ QStyle (0x436a8c0) 0 QObject (0x436a900) 0 primary-for QStyle (0x436a8c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x436ab40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x436abc0) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -5764,10 +5236,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x44ab400) 0 QStyleOption (0x44ab440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44ab7c0) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -5794,10 +5262,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x44abe40) 0 QStyleOption (0x44abe80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4532080) 0 Class QStyleOptionButton size=64 align=4 @@ -5805,10 +5269,6 @@ Class QStyleOptionButton QStyleOptionButton (0x44ab500) 0 QStyleOption (0x44ab740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x45323c0) 0 Class QStyleOptionTab size=72 align=4 @@ -5823,10 +5283,6 @@ QStyleOptionTabV2 (0x4532500) 0 QStyleOptionTab (0x4532540) 0 QStyleOption (0x4532580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x45329c0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5853,10 +5309,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x4532e80) 0 QStyleOption (0x4532ec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x45b9000) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5914,15 +5366,7 @@ QStyleOptionSpinBox (0x45b9440) 0 QStyleOptionComplex (0x45b9640) 0 QStyleOption (0x45b9840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4620300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4620240) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5931,10 +5375,6 @@ QStyleOptionQ3ListView (0x4620040) 0 QStyleOptionComplex (0x4620080) 0 QStyleOption (0x46200c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4620700) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6094,10 +5534,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x46a8380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x46a8680) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6128,20 +5564,8 @@ QItemSelectionModel (0x46a8740) 0 QObject (0x46a8780) 0 primary-for QItemSelectionModel (0x46a8740) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x46a8940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x46a8ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x46a8a00) 0 Class QItemSelection size=4 align=4 @@ -6271,10 +5695,6 @@ QAbstractItemView (0x46a8c80) 0 QPaintDevice (0x46a8d80) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x46a8080) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -6586,15 +6006,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x478e980) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x478ee40) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x478ed00) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -6735,15 +6147,7 @@ QListView (0x478e400) 0 QPaintDevice (0x4826000) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4826440) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4826340) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7532,35 +6936,15 @@ QTreeView (0x4915a80) 0 QPaintDevice (0x4915bc0) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4915e80) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x4915d80) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x4a181c0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x4a180c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4a18380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4a182c0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8407,15 +7791,7 @@ Class QColormap base size=4 base align=4 QColormap (0x4b9f380) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4c41040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4b9fac0) 0 Class QPolygon size=4 align=4 @@ -8423,15 +7799,7 @@ Class QPolygon QPolygon (0x4c410c0) 0 QVector (0x4c41100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4c41540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4c41440) 0 Class QPolygonF size=4 align=4 @@ -8444,95 +7812,39 @@ Class QMatrix base size=48 base align=4 QMatrix (0x4c41900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4c41980) 0 empty Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0x4c41a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4c41b40) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0x4c41bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4c41d80) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x4c41e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4d602c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4d60480) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4d60380) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4d60680) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4d60580) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4d60880) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4d60780) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4d60a80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4d60980) 0 Class QTextItem size=1 align=1 base size=0 base align=1 QTextItem (0x4d60b00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4d60bc0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4d60d80) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -8567,20 +7879,12 @@ Class QPaintEngine QPaintEngine (0x4d60c40) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4d60e80) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x4d60f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4e95000) 0 Class QPainterPath::Element size=24 align=8 @@ -8592,25 +7896,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x4e95040) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4e95580) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4e95480) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x4e95280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e95640) 0 empty Class QPainterPathStroker size=4 align=4 @@ -8708,10 +8000,6 @@ QCommonStyle (0x4e95f40) 0 QObject (0x4e95fc0) 0 primary-for QStyle (0x4e95f80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x4f76180) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -9033,25 +8321,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x4f76280) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4ff9140) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x4ff9000) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4ff9500) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4ff9400) 0 Class QTextCharFormat size=8 align=4 @@ -9106,15 +8382,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x4ff9a80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4ff9d80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4ff9c80) 0 Class QTextLine size=8 align=4 @@ -9164,15 +8432,7 @@ QTextDocument (0x4ff9280) 0 QObject (0x4ff9b80) 0 primary-for QTextDocument (0x4ff9280) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x51211c0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x5121300) 0 Class QTextCursor size=4 align=4 @@ -9184,15 +8444,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x5121440) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x5121680) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x5121580) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -9354,10 +8606,6 @@ QTextFrame (0x5121100) 0 QObject (0x5121500) 0 primary-for QTextObject (0x5121280) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x51d9400) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -9382,25 +8630,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x51d9640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x51d9a40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x51d9b00) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x51d9bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x51d9dc0) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -10033,10 +9269,6 @@ QDateEdit (0x52ff800) 0 QPaintDevice (0x52ff900) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x52ffb00) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -10197,10 +9429,6 @@ QDockWidget (0x52ffdc0) 0 QPaintDevice (0x52ffe40) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x52ffcc0) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12652,10 +11880,6 @@ QUdpSocket (0x576d3c0) 0 QObject (0x576da80) 0 primary-for QIODevice (0x576d900) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5826180) 0 Class QSqlRecord size=4 align=4 @@ -12793,15 +12017,7 @@ Class QSqlField base size=20 base align=4 QSqlField (0x5826b00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x5826d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x5826cc0) 0 Class QSqlIndex size=16 align=4 @@ -13317,29 +12533,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0x590ba00) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x59cf240) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0x59cf280) 0 - primary-for Q3PtrList (0x59cf240) - Q3PtrCollection (0x59cf2c0) 0 - primary-for Q3GList (0x59cf280) Class Q3PointArray size=4 align=4 @@ -13348,21 +12542,8 @@ Q3PointArray (0x59cf7c0) 0 QPolygon (0x59cf800) 0 QVector (0x59cf840) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x59cfe00) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x59cfd00) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x59cfe40) 0 - QLinkedList (0x59cfe80) 0 Class Q3CanvasItemList size=4 align=4 @@ -14000,28 +13181,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0x5b1ee40) 0 -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0x5b1e700) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0x5b1e880) 0 - primary-for Q3Dict (0x5b1e700) - Q3PtrCollection (0x5b1edc0) 0 - primary-for Q3GDict (0x5b1e880) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -14556,29 +13716,7 @@ Q3Wizard (0x5c57400) 0 QPaintDevice (0x5c574c0) 8 vptr=((& Q3Wizard::_ZTV8Q3Wizard) + 308u) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x5c57740) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0x5c57780) 0 - primary-for Q3PtrList (0x5c57740) - Q3PtrCollection (0x5c577c0) 0 - primary-for Q3GList (0x5c57780) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -14606,11 +13744,6 @@ Q3StrList (0x5c57940) 0 Q3PtrCollection (0x5c57a00) 0 primary-for Q3GList (0x5c579c0) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0x5c57e00) 0 - Q3GListStdIterator (0x5c57e40) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -15643,29 +14776,7 @@ Q3GVector (0x5e10a80) 0 Q3PtrCollection (0x5e10ac0) 0 primary-for Q3GVector (0x5e10a80) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x5e10d80) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0x5e10dc0) 0 - primary-for Q3PtrVector (0x5e10d80) - Q3PtrCollection (0x5e10e00) 0 - primary-for Q3GVector (0x5e10dc0) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -15785,28 +14896,7 @@ Class Q3GArray Q3GArray (0x5f17000) 0 vptr=((& Q3GArray::_ZTV8Q3GArray) + 8u) -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x5f17540) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0x5f17580) 0 - primary-for Q3IntDict (0x5f17540) - Q3PtrCollection (0x5f175c0) 0 - primary-for Q3GDict (0x5f17580) Class Q3TableSelection size=28 align=4 @@ -15917,100 +15007,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0x5f17e80) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x5f17fc0) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0x5f17180) 0 - primary-for Q3PtrVector (0x5f17fc0) - Q3PtrCollection (0x5f17680) 0 - primary-for Q3GVector (0x5f17180) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x5fdc080) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0x5fdc0c0) 0 - primary-for Q3PtrVector (0x5fdc080) - Q3PtrCollection (0x5fdc100) 0 - primary-for Q3GVector (0x5fdc0c0) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x5fdc300) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0x5fdc340) 0 - primary-for Q3PtrList (0x5fdc300) - Q3PtrCollection (0x5fdc380) 0 - primary-for Q3GList (0x5fdc340) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x5fdc5c0) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0x5fdc600) 0 - primary-for Q3IntDict (0x5fdc5c0) - Q3PtrCollection (0x5fdc640) 0 - primary-for Q3GDict (0x5fdc600) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -16324,15 +15327,7 @@ Q3Ftp (0x5fdce00) 0 QObject (0x5fdce80) 0 primary-for Q3NetworkProtocol (0x5fdce40) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x5fdc700) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x5fdc280) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -17614,21 +16609,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x621ce40) 0 vptr=((& Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x62b7040) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x621c780) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x62b7080) 0 - QLinkedList (0x62b70c0) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -17637,31 +16619,10 @@ Q3SqlRecordInfo (0x62b7240) 0 Q3ValueList (0x62b7280) 0 QLinkedList (0x62b72c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x62b74c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x62b7400) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0x62b7840) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0x62b7880) 0 - QLinkedList::const_iterator (0x62b78c0) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0x62b7980) 0 Vtable for Q3SqlSelectCursor Q3SqlSelectCursor::_ZTV17Q3SqlSelectCursor: 40u entries @@ -17721,15 +16682,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0x62b7d80) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x62b7d00) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x62b7f40) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -17768,25 +16721,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0x638f200) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x638f3c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x638f300) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x638f740) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x638f680) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -17994,10 +16931,6 @@ Q3TextEdit (0x638fb00) 0 QPaintDevice (0x638fc40) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x638ff00) 0 Vtable for Q3MultiLineEdit Q3MultiLineEdit::_ZTV15Q3MultiLineEdit: 192u entries @@ -18658,70 +17591,11 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0x646ca40) 0 -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=32 base align=4 -Q3AsciiCache (0x646cc00) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0x646cc40) 0 - primary-for Q3AsciiCache (0x646cc00) - Q3PtrCollection (0x646cc80) 0 - primary-for Q3GCache (0x646cc40) - -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x646c440) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0x646c780) 0 - primary-for Q3AsciiDict (0x646c440) - Q3PtrCollection (0x646c9c0) 0 - primary-for Q3GDict (0x646c780) - -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=32 base align=4 -Q3Cache (0x650a340) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0x650a380) 0 - primary-for Q3Cache (0x650a340) - Q3PtrCollection (0x650a3c0) 0 - primary-for Q3GCache (0x650a380) + + Class Q3CString size=4 align=4 @@ -18729,49 +17603,9 @@ Class Q3CString Q3CString (0x650a700) 0 QByteArray (0x650a740) 0 -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=32 base align=4 -Q3IntCache (0x65fa440) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0x65fa480) 0 - primary-for Q3IntCache (0x65fa440) - Q3PtrCollection (0x65fa4c0) 0 - primary-for Q3GCache (0x65fa480) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x65fa780) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0x65fa7c0) 0 - primary-for Q3AsciiDict (0x65fa780) - Q3PtrCollection (0x65fa800) 0 - primary-for Q3GDict (0x65fa7c0) Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -18798,76 +17632,11 @@ Q3ObjectDictionary (0x65fa940) 0 Q3PtrCollection (0x65faa00) 0 primary-for Q3GDict (0x65fa9c0) -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0x65fae40) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0x65fae80) 0 - primary-for Q3PtrDict (0x65fae40) - Q3PtrCollection (0x65faec0) 0 - primary-for Q3GDict (0x65fae80) - -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0x66621c0) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0x6662200) 0 - primary-for Q3PtrQueue (0x66621c0) - Q3PtrCollection (0x6662240) 0 - primary-for Q3GList (0x6662200) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0x6662640) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0x6662680) 0 - primary-for Q3PtrStack (0x6662640) - Q3PtrCollection (0x66626c0) 0 - primary-for Q3GList (0x6662680) + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -18907,29 +17676,7 @@ Q3Signal (0x6662980) 0 QObject (0x66629c0) 0 primary-for Q3Signal (0x6662980) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x6662c40) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0x6662c80) 0 - primary-for Q3PtrVector (0x6662c40) - Q3PtrCollection (0x6662cc0) 0 - primary-for Q3GVector (0x6662c80) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -19235,15 +17982,7 @@ Q3GroupBox (0x6832d00) 0 QPaintDevice (0x6832dc0) 8 vptr=((& Q3GroupBox::_ZTV10Q3GroupBox) + 236u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x68c10c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x68c1000) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -20046,25 +18785,9 @@ Q3DockWindow (0x694a6c0) 0 QPaintDevice (0x694a7c0) 8 vptr=((& Q3DockWindow::_ZTV12Q3DockWindow) + 304u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x694abc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x694ab00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x694ad80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x694acc0) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -20129,10 +18852,6 @@ Q3DockAreaLayout (0x694a980) 0 QLayoutItem (0x694aa00) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x6a132c0) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -21182,193 +19901,41 @@ Q3WidgetStack (0x6ab4f40) 0 QPaintDevice (0x6ab4300) 8 vptr=((& Q3WidgetStack::_ZTV13Q3WidgetStack) + 248u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6ba8480) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6bd0300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c26380) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6d09640) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x6d09880) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x6d09b40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6d38240) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x6d64580) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6d64740) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x6d64900) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6d64ac0) 0 -Class QVectorTypedData - size=40 align=4 - base size=40 base align=4 -QVectorTypedData (0x6d7ea80) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x6d7ed40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6da1040) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x6da16c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6dc5300) 0 -Class QLinkedListNode - size=56 align=4 - base size=56 base align=4 -QLinkedListNode (0x6de5ec0) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x6eae9c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6eaec80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6edd8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6eddb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6eddf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6ef9480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6f24000) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6f24940) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6f24b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6f24f00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6f24fc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6f58340) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x6f58680) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x6f58d80) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x6fa0380) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x6fdf100) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6fdf280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6fdf440) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6fdf500) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x6fdfc40) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x6fdfec0) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.1.0.win32-gcc-ia32.txt b/tests/auto/bic/data/Qt3Support.4.1.0.win32-gcc-ia32.txt index 6cb74a42d..111154f39 100644 --- a/tests/auto/bic/data/Qt3Support.4.1.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/Qt3Support.4.1.0.win32-gcc-ia32.txt @@ -18,80 +18,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xad4e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaea680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaea800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaea980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeab00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeac80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeae00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeaf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb06100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb06280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb06400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb06580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb06700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb06880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb06a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb06b80) 0 empty Class QFlag size=4 align=4 @@ -108,10 +48,6 @@ Class QChar base size=2 base align=2 QChar (0xb4d840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb70cc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -139,70 +75,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc33f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd4bc40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd77100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd773c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd72c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd77a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd949c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8c80) 0 Class QInternal size=1 align=1 @@ -229,10 +113,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xead500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xead940) 0 Class QCharRef size=8 align=4 @@ -245,10 +125,6 @@ Class QConstString QConstString (0x11de880) 0 QString (0x11de8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11dec00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -311,10 +187,6 @@ Class QListData base size=4 base align=4 QListData (0x127af00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x137ae40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -339,15 +211,7 @@ Class QTextCodec QTextCodec (0xead480) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13be140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc3ca40) 0 Class QTextEncoder size=32 align=4 @@ -370,25 +234,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x13fcfc0) 0 QGenericArgument (0x1402000) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1419700) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1402580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1433f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1433b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -480,10 +332,6 @@ QIODevice (0x137a700) 0 QObject (0x14bc540) 0 primary-for QIODevice (0x137a700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14bc840) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -503,25 +351,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xead380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x158b4c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x158b840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x158bd80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x158bc40) 0 Class QStringList size=4 align=4 @@ -529,15 +365,7 @@ Class QStringList QStringList (0xead400) 0 QList (0x15b8000) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x158bec0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x158be80) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -666,50 +494,22 @@ QFile (0x169f840) 0 QObject (0x169f8c0) 0 primary-for QIODevice (0x169f880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16ae100) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x16d55c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16d5f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1703e40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x172d300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x172d200) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x16d5440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x175b040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x172dc00) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -766,10 +566,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x169f740) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17da340) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -843,10 +639,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x182fc40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x182fd40) 0 empty Class QMapData::Node size=8 align=4 @@ -871,10 +663,6 @@ Class QTextStream QTextStream (0x1a79240) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a79600) 0 Class QTextStreamManipulator size=24 align=4 @@ -911,20 +699,8 @@ QTextOStream (0x1b07440) 0 QTextStream (0x1b07480) 0 primary-for QTextOStream (0x1b07440) -Class - size=8 align=4 - base size=8 base align=4 - (0x1b34680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b34800) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1b535c0) 0 Class QVectorData size=16 align=4 @@ -1037,95 +813,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1ce8bc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d02d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d02ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1d040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1d1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1d340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1d4c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1d640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1d7c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1d940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1dac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1dc40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1ddc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1df40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d3b0c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d3b240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d3b3c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d3b540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d3b6c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1152,35 +856,15 @@ Class QVariant base size=16 base align=8 QVariant (0x14338c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1dd9540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d4edc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1dd9840) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1d4ee40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1d4e000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e3f280) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1258,15 +942,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1d3bf80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1eda440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f0af80) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1293,10 +969,6 @@ QEventLoop (0x1f38600) 0 QObject (0x1f38640) 0 primary-for QEventLoop (0x1f38600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f38940) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1341,20 +1013,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1f71f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fa1b40) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1f71ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fa1e80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1524,10 +1188,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2011d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20513c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1620,20 +1280,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x13fc8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20c1900) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x13fc940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20c1f00) 0 empty Class QMetaProperty size=20 align=4 @@ -1645,10 +1297,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x13fca40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20ee640) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1941,10 +1589,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2234640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2294040) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1956,70 +1600,42 @@ Class QDate base size=4 base align=4 QDate (0x1d3b900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22d6900) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1d3bb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22f9540) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x16d54c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2322300) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1d3bb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2322f40) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1d3bc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2370180) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1d3b980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2391600) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1d3ba00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23bbb00) 0 empty Class QLinkedListData size=20 align=4 @@ -2031,50 +1647,30 @@ Class QLocale base size=4 base align=4 QLocale (0x1d3ba80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x250a300) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1d3bc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2537480) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1d3bd00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x255d9c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1d3bd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25cc440) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1d3be00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x264a680) 0 empty Class QSharedData size=4 align=4 @@ -2096,10 +1692,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x1dc6c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x276ac00) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2416,15 +2008,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x28a73c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x28a78c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x28a74c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2713,15 +2297,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x294be00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2969e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x297a3c0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3007,25 +2583,9 @@ Class QPaintDevice QPaintDevice (0x271bdc0) 0 vptr=((&QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a78540) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a78680) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a78780) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2a784c0) 0 Class QColor size=16 align=4 @@ -3037,45 +2597,17 @@ Class QBrush base size=4 base align=4 QBrush (0x1da7d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2ad1300) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x2aa3b00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2ae6000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2ad18c0) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2ae6280) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2ae6380) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2ae65c0) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2ae6200) 0 Class QGradient size=64 align=8 @@ -3487,10 +3019,6 @@ QAbstractPrintDialog (0x2e12680) 0 QPaintDevice (0x2e12780) 8 vptr=((&QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e12a40) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 70u entries @@ -3753,10 +3281,6 @@ QFileDialog (0x2e82b40) 0 QPaintDevice (0x2e82c40) 8 vptr=((&QFileDialog::_ZTV11QFileDialog) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2ea7600) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 70u entries @@ -4485,10 +4009,6 @@ QImage (0x1dc6400) 0 QPaintDevice (0x3087900) 0 primary-for QImage (0x1dc6400) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3124b00) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 9u entries @@ -4537,10 +4057,6 @@ Class QIcon base size=4 base align=4 QIcon (0x1dc6200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31cfbc0) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4696,10 +4212,6 @@ QImageIOPlugin (0x320b600) 0 QFactoryInterface (0x320b6c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x320b680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x320b880) 0 Class QImageReader size=4 align=4 @@ -4877,15 +4389,7 @@ QActionGroup (0x32b8780) 0 QObject (0x32fb600) 0 primary-for QActionGroup (0x32b8780) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32fbfc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2c9d940) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -5194,10 +4698,6 @@ QAbstractSpinBox (0x338bac0) 0 QPaintDevice (0x338bb80) 8 vptr=((&QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x338bf00) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 68u entries @@ -5413,15 +4913,7 @@ QStyle (0x2c6a700) 0 QObject (0x3453700) 0 primary-for QStyle (0x2c6a700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3463040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3479100) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 71u entries @@ -5692,10 +5184,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x35ab500) 0 QStyleOption (0x35ab540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x35abac0) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -5722,10 +5210,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x35cdec0) 0 QStyleOption (0x35cdf00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3615ac0) 0 Class QStyleOptionButton size=64 align=4 @@ -5733,10 +5217,6 @@ Class QStyleOptionButton QStyleOptionButton (0x36158c0) 0 QStyleOption (0x3615900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3651480) 0 Class QStyleOptionTab size=72 align=4 @@ -5751,10 +5231,6 @@ QStyleOptionTabV2 (0x3651bc0) 0 QStyleOptionTab (0x3651c00) 0 QStyleOption (0x3651c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36a7440) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5781,10 +5257,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x36f32c0) 0 QStyleOption (0x36f3300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36f3e00) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5842,15 +5314,7 @@ QStyleOptionSpinBox (0x3787a00) 0 QStyleOptionComplex (0x3787a40) 0 QStyleOption (0x3787a80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x37a8200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x37a8100) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5859,10 +5323,6 @@ QStyleOptionQ3ListView (0x3787f80) 0 QStyleOptionComplex (0x3787fc0) 0 QStyleOption (0x37a8000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37a8d40) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6026,10 +5486,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x38a0d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x39030c0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6060,20 +5516,8 @@ QItemSelectionModel (0x39034c0) 0 QObject (0x3903500) 0 primary-for QItemSelectionModel (0x39034c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3903840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x392d3c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x392d2c0) 0 Class QItemSelection size=4 align=4 @@ -6207,10 +5651,6 @@ QAbstractItemView (0x392da40) 0 QPaintDevice (0x392db80) 8 vptr=((&QAbstractItemView::_ZTV17QAbstractItemView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x39865c0) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -6526,15 +5966,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3a72a80) 0 nearly-empty vptr=((&QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3a95580) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x3a95380) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -6679,15 +6111,7 @@ QListView (0x3a95d40) 0 QPaintDevice (0x3a95ec0) 8 vptr=((&QListView::_ZTV9QListView) + 400u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3aee300) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3aee180) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7492,35 +6916,15 @@ QTreeView (0x3cb5500) 0 QPaintDevice (0x3cb5680) 8 vptr=((&QTreeView::_ZTV9QTreeView) + 408u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3cf3680) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x3cf3240) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x3d44440) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x3d442c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3d44640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3d44100) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8375,15 +7779,7 @@ Class QColormap base size=4 base align=4 QColormap (0x2a5e3c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3feca00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3fec880) 0 Class QPolygon size=4 align=4 @@ -8391,15 +7787,7 @@ Class QPolygon QPolygon (0x1dc6500) 0 QVector (0x3fecb80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4020e00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4020cc0) 0 Class QPolygonF size=4 align=4 @@ -8412,95 +7800,39 @@ Class QMatrix base size=48 base align=8 QMatrix (0x2370140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x407bbc0) 0 empty Class QTextOption size=32 align=8 base size=28 base align=8 QTextOption (0x409fa40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x409fe40) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0x1dc6d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4105440) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x271bec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4105980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x41d2340) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4123580) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x41d26c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4123640) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4215380) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4123780) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4215700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x27463c0) 0 Class QTextItem size=1 align=1 base size=0 base align=1 QTextItem (0x41057c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42b39c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42b3f40) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 26u entries @@ -8537,20 +7869,12 @@ Class QPaintEngine QPaintEngine (0x2a38280) 0 vptr=((&QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42c9380) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x42b3700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42b38c0) 0 Class QPainterPath::Element size=24 align=8 @@ -8562,25 +7886,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x2bae100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43a69c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43a6840) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x4352340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43a6b80) 0 empty Class QPainterPathStroker size=4 align=4 @@ -8682,10 +7994,6 @@ QCommonStyle (0x446be40) 0 QObject (0x446bec0) 0 primary-for QStyle (0x446be80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x4498600) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -9007,25 +8315,13 @@ Class QTextLength base size=16 base align=8 QTextLength (0x1d3bf00) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4591100) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x1d3be80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4591a80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4585bc0) 0 Class QTextCharFormat size=8 align=4 @@ -9080,15 +8376,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x2b9be00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x46ec0c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x46d3d00) 0 Class QTextLine size=8 align=4 @@ -9138,15 +8426,7 @@ QTextDocument (0x4533ec0) 0 QObject (0x4717900) 0 primary-for QTextDocument (0x4533ec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4717dc0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4781dc0) 0 Class QTextCursor size=4 align=4 @@ -9158,15 +8438,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x47952c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4795580) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4795400) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -9328,10 +8600,6 @@ QTextFrame (0x4717100) 0 QObject (0x480e340) 0 primary-for QTextObject (0x480e300) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x48377c0) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -9356,25 +8624,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x46d3540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x488e040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x488e1c0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x47e4600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x488ec40) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -10031,10 +9287,6 @@ QDateEdit (0x4a4f080) 0 QPaintDevice (0x4a4f1c0) 8 vptr=((&QDateEdit::_ZTV9QDateEdit) + 268u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4a10580) 0 Vtable for QDial QDial::_ZTV5QDial: 68u entries @@ -10203,11 +9455,7 @@ QDockWidget (0x4abe200) 0 QPaintDevice (0x4abe2c0) 8 vptr=((&QDockWidget::_ZTV11QDockWidget) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4abe780) 0 - + Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 67u entries 0 0u @@ -12762,10 +12010,6 @@ QUdpSocket (0x5142d00) 0 QObject (0x5142dc0) 0 primary-for QIODevice (0x5142d80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x516ca80) 0 Class QSqlRecord size=4 align=4 @@ -12903,15 +12147,7 @@ Class QSqlField base size=20 base align=8 QSqlField (0x51b8100) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x5254140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x5254000) 0 Class QSqlIndex size=16 align=4 @@ -13435,29 +12671,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0x53698c0) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x53da380) 0 - vptr=((&Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0x53da480) 0 - primary-for Q3PtrList (0x53da380) - Q3PtrCollection (0x53da4c0) 0 - primary-for Q3GList (0x53da480) Class Q3PointArray size=4 align=4 @@ -13466,21 +12680,8 @@ Q3PointArray (0x542a5c0) 0 QPolygon (0x542a600) 0 QVector (0x542a640) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x5457c80) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x5457b00) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x5457a00) 0 - QLinkedList (0x5457e40) 0 Class Q3CanvasItemList size=4 align=4 @@ -14124,28 +13325,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0x5564b00) 0 -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 0u -4 (int (*)(...))(&_ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0x55e1400) 0 - vptr=((&Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0x55e1500) 0 - primary-for Q3Dict (0x55e1400) - Q3PtrCollection (0x55e1540) 0 - primary-for Q3GDict (0x55e1500) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -14696,29 +13876,7 @@ Q3Wizard (0x56fd180) 0 QPaintDevice (0x56fd280) 8 vptr=((&Q3Wizard::_ZTV8Q3Wizard) + 316u) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x56fdd80) 0 - vptr=((&Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0x56fde80) 0 - primary-for Q3PtrList (0x56fdd80) - Q3PtrCollection (0x56fdec0) 0 - primary-for Q3GList (0x56fde80) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -14746,11 +13904,6 @@ Q3StrList (0x56fdd40) 0 Q3PtrCollection (0x5739100) 0 primary-for Q3GList (0x57390c0) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0x56fdf40) 0 - Q3GListStdIterator (0x5739c80) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -15795,29 +14948,7 @@ Q3GVector (0x533ec00) 0 Q3PtrCollection (0x59df440) 0 primary-for Q3GVector (0x533ec00) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x5a1a2c0) 0 - vptr=((&Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0x5a1a3c0) 0 - primary-for Q3PtrVector (0x5a1a2c0) - Q3PtrCollection (0x5a1a400) 0 - primary-for Q3GVector (0x5a1a3c0) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 80u entries @@ -15941,28 +15072,7 @@ Class Q3GArray Q3GArray (0x5a6c700) 0 vptr=((&Q3GArray::_ZTV8Q3GArray) + 8u) -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 0u -4 (int (*)(...))(&_ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x5aba900) 0 - vptr=((&Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0x5abaa00) 0 - primary-for Q3IntDict (0x5aba900) - Q3PtrCollection (0x5abaa40) 0 - primary-for Q3GDict (0x5abaa00) Class Q3TableSelection size=28 align=4 @@ -16073,100 +15183,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0x5b52200) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x5b522c0) 0 - vptr=((&Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0x5b52600) 0 - primary-for Q3PtrVector (0x5b522c0) - Q3PtrCollection (0x5b52640) 0 - primary-for Q3GVector (0x5b52600) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x5b527c0) 0 - vptr=((&Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0x5b52880) 0 - primary-for Q3PtrVector (0x5b527c0) - Q3PtrCollection (0x5b528c0) 0 - primary-for Q3GVector (0x5b52880) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x5b52b40) 0 - vptr=((&Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0x5b52c00) 0 - primary-for Q3PtrList (0x5b52b40) - Q3PtrCollection (0x5b52c40) 0 - primary-for Q3GList (0x5b52c00) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 0u -4 (int (*)(...))(&_ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x5b87200) 0 - vptr=((&Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0x5b872c0) 0 - primary-for Q3IntDict (0x5b87200) - Q3PtrCollection (0x5b87300) 0 - primary-for Q3GDict (0x5b872c0) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 187u entries @@ -16484,15 +15507,7 @@ Q3Ftp (0x5c05680) 0 QObject (0x5c05700) 0 primary-for Q3NetworkProtocol (0x5c056c0) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x5c3d380) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x5c3d240) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -17788,21 +16803,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x5ee30c0) 0 vptr=((&Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x5fe5b80) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x5fe5a40) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x5fe58c0) 0 - QLinkedList (0x5fe5d00) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -17811,31 +16813,10 @@ Q3SqlRecordInfo (0x5fe5980) 0 Q3ValueList (0x5fe5f80) 0 QLinkedList (0x5fe5fc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x601b380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x5fe5e80) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0x5fe5c80) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0x5fe5dc0) 0 - QLinkedList::const_iterator (0x601bf00) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0x5fe5cc0) 0 Vtable for Q3SqlSelectCursor Q3SqlSelectCursor::_ZTV17Q3SqlSelectCursor: 40u entries @@ -17895,15 +16876,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0x60c6b40) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x60e5c40) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x60e5a40) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -17942,25 +16915,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0x610ea80) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x610ec40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x610eb00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x6130040) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x610ef40) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -18172,10 +17129,6 @@ Q3TextEdit (0x610e440) 0 QPaintDevice (0x6130d00) 8 vptr=((&Q3TextEdit::_ZTV10Q3TextEdit) + 688u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x615e1c0) 0 Vtable for Q3MultiLineEdit Q3MultiLineEdit::_ZTV15Q3MultiLineEdit: 196u entries @@ -18848,70 +17801,11 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0x6270dc0) 0 -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 0u -4 (int (*)(...))(&_ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0x62c5980) 0 - vptr=((&Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0x62c5a80) 0 - primary-for Q3AsciiCache (0x62c5980) - Q3PtrCollection (0x62c5ac0) 0 - primary-for Q3GCache (0x62c5a80) - -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 0u -4 (int (*)(...))(&_ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x62fba40) 0 - vptr=((&Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0x62fbb40) 0 - primary-for Q3AsciiDict (0x62fba40) - Q3PtrCollection (0x62fbb80) 0 - primary-for Q3GDict (0x62fbb40) - -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 0u -4 (int (*)(...))(&_ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0x6326900) 0 - vptr=((&Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0x6326a00) 0 - primary-for Q3Cache (0x6326900) - Q3PtrCollection (0x6326a40) 0 - primary-for Q3GCache (0x6326a00) + + Class Q3CString size=4 align=4 @@ -18919,49 +17813,9 @@ Class Q3CString Q3CString (0x6354840) 0 QByteArray (0x6354880) 0 -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 0u -4 (int (*)(...))(&_ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0x6435800) 0 - vptr=((&Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0x6435900) 0 - primary-for Q3IntCache (0x6435800) - Q3PtrCollection (0x6435940) 0 - primary-for Q3GCache (0x6435900) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 0u -4 (int (*)(...))(&_ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x64662c0) 0 - vptr=((&Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0x64663c0) 0 - primary-for Q3AsciiDict (0x64662c0) - Q3PtrCollection (0x6466400) 0 - primary-for Q3GDict (0x64663c0) Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -18988,76 +17842,11 @@ Q3ObjectDictionary (0x6466280) 0 Q3PtrCollection (0x64665c0) 0 primary-for Q3GDict (0x6466580) -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 0u -4 (int (*)(...))(&_ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0x648c6c0) 0 - vptr=((&Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0x648c7c0) 0 - primary-for Q3PtrDict (0x648c6c0) - Q3PtrCollection (0x648c800) 0 - primary-for Q3GDict (0x648c7c0) - -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0x64b5540) 0 - vptr=((&Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0x64b5640) 0 - primary-for Q3PtrQueue (0x64b5540) - Q3PtrCollection (0x64b5680) 0 - primary-for Q3GList (0x64b5640) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0x64df000) 0 - vptr=((&Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0x64df100) 0 - primary-for Q3PtrStack (0x64df000) - Q3PtrCollection (0x64df140) 0 - primary-for Q3GList (0x64df100) + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -19097,29 +17886,7 @@ Q3Signal (0x64df6c0) 0 QObject (0x64df700) 0 primary-for Q3Signal (0x64df6c0) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x65070c0) 0 - vptr=((&Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0x65071c0) 0 - primary-for Q3PtrVector (0x65070c0) - Q3PtrCollection (0x6507200) 0 - primary-for Q3GVector (0x65071c0) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -19433,15 +18200,7 @@ Q3GroupBox (0x6587e80) 0 QPaintDevice (0x6587f80) 8 vptr=((&Q3GroupBox::_ZTV10Q3GroupBox) + 244u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x65cac40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x65cab00) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 68u entries @@ -20280,25 +19039,9 @@ Q3DockWindow (0x6781b40) 0 QPaintDevice (0x6781c80) 8 vptr=((&Q3DockWindow::_ZTV12Q3DockWindow) + 312u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x67cadc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4215800) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x6801040) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x67ca9c0) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -20363,10 +19106,6 @@ Q3DockAreaLayout (0x67819c0) 0 QLayoutItem (0x67ca940) 8 vptr=((&Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x684a7c0) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -21460,193 +20199,41 @@ Q3WidgetStack (0x69fa140) 0 QPaintDevice (0x69fa280) 8 vptr=((&Q3WidgetStack::_ZTV13Q3WidgetStack) + 256u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13be100) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x158bd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c25c00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3d44600) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x3d443c0) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x3fec980) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x4020d80) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x41d22c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x41d2640) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x4215300) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4215680) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x43a6940) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x4591a00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x46ec040) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4795500) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x32fbf80) 0 -Class QLinkedListNode - size=56 align=8 - base size=56 base align=8 -QLinkedListNode (0x5fe5b00) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x3a95500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x71e0980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x721d780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x721d940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x721de80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x724b540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7281540) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x172d2c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1dd9500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72c73c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x37a81c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x392d380) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x72c7b40) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x72c7e00) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x735b040) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x735b880) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x67cad80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x735bb40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6801000) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x73d3080) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x73d32c0) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.2.0.linux-gcc-ia32.txt b/tests/auto/bic/data/Qt3Support.4.2.0.linux-gcc-ia32.txt index d7d9332bb..a1323fd1e 100644 --- a/tests/auto/bic/data/Qt3Support.4.2.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/Qt3Support.4.2.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f99d80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f99dc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f99e80) 0 empty - QUintForSize<4> (0xb7f99ec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f99f40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f99f80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb78d2040) 0 empty - QIntForSize<4> (0xb78d2080) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb78d2300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d23c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d2400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d2440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d2480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d24c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d2500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d2540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d2580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d25c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d2600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d2640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d2680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d26c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d2700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d2740) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb78d2780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78d2880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78d28c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78d2900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78d2940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78d2980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78d29c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78d2a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78d2a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78d2a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78d2ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78d2b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78d2b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78d2b80) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb78d2c40) 0 QGenericArgument (0xb78d2c80) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb78d2e40) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb78d2f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78d2f80) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb5bd3280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5bd32c0) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb5bd3300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5bd3480) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb5bd3580) 0 QString (0xb5bd35c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5bd3600) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0xb5bd3900) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5bd3c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5bd3c00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0xb5bd3e00) 0 QObject (0xb5bd3e40) 0 primary-for QIODevice (0xb5bd3e00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5bd3f00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb5bd37c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5bd3880) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0xb577a580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb577ab00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0xb577aa40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb577ac40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb577abc0) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb577acc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb577ad00) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb577ad80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb577ad40) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb577adc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb577ae00) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb577af00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb577af80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb577af40) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb577a440) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb577a880) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0xb577aac0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5503040) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0xb5503200) 0 QTextStream (0xb5503240) 0 primary-for QTextOStream (0xb5503200) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb5503300) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb5503340) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb55032c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5503380) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb55033c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5503400) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5503440) 0 Class timespec size=8 align=4 @@ -738,80 +492,24 @@ Class timeval base size=8 base align=4 timeval (0xb55034c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5503500) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb5503540) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb5503580) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb5503640) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb5503600) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb55035c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb5503680) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb5503700) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb55036c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb5503740) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb55037c0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb5503780) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5503800) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb5503840) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb5503880) 0 Class random_data size=28 align=4 @@ -882,10 +580,6 @@ QFile (0xb5503d40) 0 QObject (0xb5503dc0) 0 primary-for QIODevice (0xb5503d80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5503e40) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -938,50 +632,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb5503fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5503000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55031c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5503e00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5503280) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb5503f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52e3000) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb52e3040) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb52e3100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb52e3080) 0 Class QStringList size=4 align=4 @@ -989,30 +655,14 @@ Class QStringList QStringList (0xb52e3140) 0 QList (0xb52e3180) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb52e3200) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb52e3240) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb52e3300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb52e3380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb52e3400) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1069,10 +719,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb52e3440) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb52e35c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1184,15 +830,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb52e3880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52e38c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb52e3900) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1287,285 +925,65 @@ Class QUrl base size=4 base align=4 QUrl (0xb52e3c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb52e3c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52e3cc0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb52e3d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52e3bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52560c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52561c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52562c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52563c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52564c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52565c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52566c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52567c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb52568c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5256900) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1592,45 +1010,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb5256940) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5256b80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5256bc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5256cc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5256c40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb5256dc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb5256d40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb5256e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5256f00) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1662,80 +1052,48 @@ Class QPoint base size=8 base align=4 QPoint (0xb5256b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5256a80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb5256e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5256fc0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb516f000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb516f040) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb516f080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb516f0c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0xb516f100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb516f300) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb516f380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb516f580) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb516f640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb516f740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb516f780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb516f840) 0 empty Class QLinkedListData size=20 align=4 @@ -1752,10 +1110,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb516fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb516fc40) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1772,30 +1126,18 @@ Class QDate base size=4 base align=4 QDate (0xb516fec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb516ff80) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb516ffc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb516f1c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb516f200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb516f2c0) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1981,10 +1323,6 @@ QEventLoop (0xb4de5040) 0 QObject (0xb4de5080) 0 primary-for QEventLoop (0xb4de5040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4de5180) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1429,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb4de5680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4de56c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb4de5700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4de5780) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2324,10 +1654,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb4de5c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4de5c40) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2422,20 +1748,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb4de5ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4de5f00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb4de5f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4de5f80) 0 empty Class QMetaProperty size=20 align=4 @@ -2447,10 +1765,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb4de5000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4de5100) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2507,10 +1821,6 @@ QLibrary (0xb4de5440) 0 QObject (0xb4de5500) 0 primary-for QLibrary (0xb4de5440) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4de5600) 0 Class QSemaphore size=4 align=4 @@ -2558,10 +1868,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb4de5bc0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb4de5dc0) 0 Class QMutexLocker size=4 align=4 @@ -2573,45 +1879,21 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb4de5e80) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb4d56040) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb4d56000) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb4d560c0) 0 Class QWriteLocker size=4 align=4 base size=4 base align=4 QWriteLocker (0xb4d56080) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4d56180) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4d561c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4d56200) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4d56140) 0 Class QColor size=16 align=4 @@ -2628,20 +1910,8 @@ Class QPen base size=4 base align=4 QPen (0xb4d563c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d56480) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4d56540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4d564c0) 0 Class QPolygon size=4 align=4 @@ -2649,15 +1919,7 @@ Class QPolygon QPolygon (0xb4d56580) 0 QVector (0xb4d565c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4d56680) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4d56600) 0 Class QPolygonF size=4 align=4 @@ -2680,10 +1942,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb4d56880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d568c0) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2724,10 +1982,6 @@ QImage (0xb4d56a40) 0 QPaintDevice (0xb4d56a80) 0 primary-for QImage (0xb4d56a40) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d56bc0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -2752,45 +2006,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb4d56d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d56dc0) 0 empty Class QBrushData size=72 align=4 base size=72 base align=4 QBrushData (0xb4d56e00) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4d56f40) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4d56ec0) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb4d56fc0) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb4d56240) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb4d56280) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb4d56f80) 0 Class QGradient size=56 align=4 @@ -2820,30 +2046,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb4d56800) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4d56b00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb4d56980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4d56cc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4d56b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d56d00) 0 Class QTextCharFormat size=8 align=4 @@ -2983,10 +2193,6 @@ QTextFrame (0xb4b33580) 0 QObject (0xb4b33600) 0 primary-for QTextObject (0xb4b335c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b33740) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -3011,25 +2217,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb4b33800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b33880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b338c0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb4b33900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b33940) 0 empty Class QFontMetrics size=4 align=4 @@ -3089,20 +2283,12 @@ QTextDocument (0xb4b33b00) 0 QObject (0xb4b33b40) 0 primary-for QTextDocument (0xb4b33b00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4b33bc0) 0 Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0xb4b33c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4b33c40) 0 Class QTextTableCell size=8 align=4 @@ -3143,10 +2329,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb4b33e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b33f40) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3444,15 +2626,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb48b4c00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb48b4d00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb48b4c80) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3751,15 +2925,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb4948480) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4948600) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4948580) 0 Class QTextLine size=8 align=4 @@ -3808,10 +2974,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0xb4948880) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4948940) 0 Class QTextCursor size=4 align=4 @@ -3834,15 +2996,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb4948b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4948c80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4948c00) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4206,10 +3360,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb4948f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4753040) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -4240,20 +3390,8 @@ QItemSelectionModel (0xb4753080) 0 QObject (0xb47530c0) 0 primary-for QItemSelectionModel (0xb4753080) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4753140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4753200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4753180) 0 Class QItemSelection size=4 align=4 @@ -4460,20 +3598,12 @@ QAbstractSpinBox (0xb4753680) 0 QPaintDevice (0xb4753740) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4753800) 0 Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0xb4753840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4753900) 0 empty Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -4681,15 +3811,7 @@ QStyle (0xb4753c40) 0 QObject (0xb4753c80) 0 primary-for QStyle (0xb4753c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4753d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4753d80) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -4948,10 +4070,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb4753c00) 0 QStyleOption (0xb4753bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44cc080) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -4978,10 +4096,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb44cc300) 0 QStyleOption (0xb44cc340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44cc4c0) 0 Class QStyleOptionButton size=64 align=4 @@ -4989,10 +4103,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb44cc400) 0 QStyleOption (0xb44cc440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44cc640) 0 Class QStyleOptionTab size=72 align=4 @@ -5007,10 +4117,6 @@ QStyleOptionTabV2 (0xb44cc6c0) 0 QStyleOptionTab (0xb44cc700) 0 QStyleOption (0xb44cc740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44cc8c0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5037,10 +4143,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb44ccb00) 0 QStyleOption (0xb44ccb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44ccc80) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5066,10 +4168,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb44cce80) 0 QStyleOption (0xb44ccec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44cc040) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -5110,15 +4208,7 @@ QStyleOptionSpinBox (0xb44ccc40) 0 QStyleOptionComplex (0xb44cccc0) 0 QStyleOption (0xb44ccd80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb43d1100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb43d1080) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5127,10 +4217,6 @@ QStyleOptionQ3ListView (0xb44cce40) 0 QStyleOptionComplex (0xb44ccf00) 0 QStyleOption (0xb43d1000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43d12c0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5338,10 +4424,6 @@ QAbstractItemView (0xb43d1a00) 0 QPaintDevice (0xb43d1b40) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43d1c00) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -6106,10 +5188,6 @@ QMessageBox (0xb42d4580) 0 QPaintDevice (0xb42d4680) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42d4740) 0 Vtable for QProgressDialog QProgressDialog::_ZTV15QProgressDialog: 66u entries @@ -6360,10 +5438,6 @@ QFileDialog (0xb42d4a80) 0 QPaintDevice (0xb42d4b80) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42d4c40) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -6449,10 +5523,6 @@ QAbstractPrintDialog (0xb42d4c80) 0 QPaintDevice (0xb42d4d80) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42d4e40) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -6874,10 +5944,6 @@ QImageIOPlugin (0xb41b43c0) 0 QFactoryInterface (0xb41b4480) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb41b4440) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41b4500) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -7225,50 +6291,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb41b45c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41b47c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb41b4b80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb41b4a00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4126040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb41b4e40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4126140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb41260c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4126240) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb41261c0) 0 Class QStylePainter size=12 align=4 @@ -7286,25 +6316,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb4126340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb41265c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4126540) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb4126440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4126600) 0 empty Class QPainterPathStroker size=4 align=4 @@ -7316,15 +6334,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb4126700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4126740) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4126800) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -7359,25 +6369,13 @@ Class QPaintEngine QPaintEngine (0xb4126780) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4126900) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb4126880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4126940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4126a00) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -7467,15 +6465,7 @@ QStringListModel (0xb4126b00) 0 QObject (0xb4126bc0) 0 primary-for QAbstractItemModel (0xb4126b80) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4126d40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4126cc0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7718,15 +6708,7 @@ Class QStandardItem QStandardItem (0xb4126d80) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3f18180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3f18100) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -8547,15 +7529,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb3f18000) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3f18dc0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3f18ac0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8572,25 +7546,9 @@ Class QItemEditorFactory QItemEditorFactory (0xb3f18880) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb3c88100) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb3c88080) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3c88200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3c88180) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8817,15 +7775,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb3c88800) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3c88880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3c888c0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -9778,15 +8728,7 @@ QActionGroup (0xb3b79f80) 0 QObject (0xb3b79fc0) 0 primary-for QActionGroup (0xb3b79f80) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3b79380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3b79180) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9956,10 +8898,6 @@ QCommonStyle (0xb3b79f40) 0 QObject (0xb3ad0040) 0 primary-for QStyle (0xb3ad0000) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb3ad0200) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10481,15 +9419,7 @@ Class QGraphicsItem QGraphicsItem (0xb3ad0fc0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ad0080) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb3ad01c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -11262,20 +10192,8 @@ QGraphicsView (0xb39b9880) 0 QPaintDevice (0xb39b99c0) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb39b9a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb39b9b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb39b9a80) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -12527,10 +11445,6 @@ QDateEdit (0xb38c8080) 0 QPaintDevice (0xb38c86c0) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb38c8840) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -12690,10 +11604,6 @@ QDockWidget (0xb37f9040) 0 QPaintDevice (0xb37f9100) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37f91c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12851,10 +11761,6 @@ QDialogButtonBox (0xb37f9340) 0 QPaintDevice (0xb37f9400) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37f9480) 0 Vtable for QMainWindow QMainWindow::_ZTV11QMainWindow: 64u entries @@ -13028,10 +11934,6 @@ QTextEdit (0xb37f9600) 0 QPaintDevice (0xb37f9740) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37f9840) 0 Vtable for QProgressBar QProgressBar::_ZTV12QProgressBar: 64u entries @@ -14034,10 +12936,6 @@ QFontComboBox (0xb3773600) 0 QPaintDevice (0xb3773700) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3773780) 0 Vtable for QToolBar QToolBar::_ZTV8QToolBar: 63u entries @@ -14577,20 +13475,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0xb3773e80) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb3773fc0) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0xb3773f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34e3000) 0 Class QHostInfo size=4 align=4 @@ -14724,10 +13614,6 @@ QUdpSocket (0xb34e3340) 0 QObject (0xb34e3400) 0 primary-for QIODevice (0xb34e33c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34e3480) 0 Vtable for QTcpSocket QTcpSocket::_ZTV10QTcpSocket: 30u entries @@ -14779,15 +13665,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0xb34e3600) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb34e3780) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb34e3700) 0 Class QSqlIndex size=16 align=4 @@ -14795,10 +13673,6 @@ Class QSqlIndex QSqlIndex (0xb34e3640) 0 QSqlRecord (0xb34e3680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34e37c0) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -15472,32 +14346,10 @@ Class Q3GVector base size=20 base align=4 Q3GVector (0xb3445380) 0 vptr=((& Q3GVector::_ZTV9Q3GVector) + 8u) - Q3PtrCollection (0xb34453c0) 0 - primary-for Q3GVector (0xb3445380) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write + Q3PtrCollection (0xb34453c0) 0 + primary-for Q3GVector (0xb3445380) + -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb3445500) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0xb3445540) 0 - primary-for Q3PtrVector (0xb3445500) - Q3PtrCollection (0xb3445580) 0 - primary-for Q3GVector (0xb3445540) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -15654,29 +14506,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0xb3445a80) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb3445c00) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0xb3445c40) 0 - primary-for Q3PtrList (0xb3445c00) - Q3PtrCollection (0xb3445c80) 0 - primary-for Q3GList (0xb3445c40) Class Q3BaseBucket size=8 align=4 @@ -15733,28 +14563,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0xb3445340) 0 -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0xb3445840) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0xb3445a00) 0 - primary-for Q3IntDict (0xb3445840) - Q3PtrCollection (0xb3445cc0) 0 - primary-for Q3GDict (0xb3445a00) Class Q3TableSelection size=28 align=4 @@ -15865,100 +14674,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0xb33694c0) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb3369540) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0xb3369580) 0 - primary-for Q3PtrVector (0xb3369540) - Q3PtrCollection (0xb33695c0) 0 - primary-for Q3GVector (0xb3369580) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb3369680) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0xb33696c0) 0 - primary-for Q3PtrVector (0xb3369680) - Q3PtrCollection (0xb3369700) 0 - primary-for Q3GVector (0xb33696c0) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb33697c0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0xb3369800) 0 - primary-for Q3PtrList (0xb33697c0) - Q3PtrCollection (0xb3369840) 0 - primary-for Q3GList (0xb3369800) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0xb3369900) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0xb3369940) 0 - primary-for Q3IntDict (0xb3369900) - Q3PtrCollection (0xb3369980) 0 - primary-for Q3GDict (0xb3369940) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -16682,21 +15404,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0xb33698c0) 0 vptr=((& Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0xb308b040) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0xb3369f40) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0xb308b080) 0 - QLinkedList (0xb308b0c0) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -16705,31 +15414,10 @@ Q3SqlRecordInfo (0xb308b140) 0 Q3ValueList (0xb308b180) 0 QLinkedList (0xb308b1c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb308b2c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb308b240) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0xb308b380) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0xb308b3c0) 0 - QLinkedList::const_iterator (0xb308b400) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0xb308b480) 0 Vtable for Q3DataView Q3DataView::_ZTV10Q3DataView: 69u entries @@ -16820,15 +15508,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0xb308b600) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb308b7c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb308b740) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -16889,25 +15569,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0xb308b980) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb308ba80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb308ba00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb308bc00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb308bb80) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -17115,10 +15779,6 @@ Q3TextEdit (0xb308bd00) 0 QPaintDevice (0xb308be80) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb308bf80) 0 Vtable for Q3SyntaxHighlighter Q3SyntaxHighlighter::_ZTV19Q3SyntaxHighlighter: 5u entries @@ -18072,28 +16732,7 @@ Class Q3Url Q3Url (0xb2fc8a80) 0 vptr=((& Q3Url::_ZTV5Q3Url) + 8u) -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0xb2fc8bc0) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0xb2fc8c00) 0 - primary-for Q3Dict (0xb2fc8bc0) - Q3PtrCollection (0xb2fc8c40) 0 - primary-for Q3GDict (0xb2fc8c00) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -18454,29 +17093,7 @@ Q3Accel (0xb2f14140) 0 QObject (0xb2f14180) 0 primary-for Q3Accel (0xb2f14140) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb2f14200) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0xb2f14240) 0 - primary-for Q3PtrList (0xb2f14200) - Q3PtrCollection (0xb2f14280) 0 - primary-for Q3GList (0xb2f14240) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -18504,11 +17121,6 @@ Q3StrList (0xb2f14300) 0 Q3PtrCollection (0xb2f143c0) 0 primary-for Q3GList (0xb2f14380) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0xb2f14480) 0 - Q3GListStdIterator (0xb2f144c0) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -19058,29 +17670,7 @@ Q3Process (0xb2dda0c0) 0 QObject (0xb2dda100) 0 primary-for Q3Process (0xb2dda0c0) -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0xb2dda240) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0xb2dda280) 0 - primary-for Q3PtrQueue (0xb2dda240) - Q3PtrCollection (0xb2dda2c0) 0 - primary-for Q3GList (0xb2dda280) Vtable for Q3Signal Q3Signal::_ZTV8Q3Signal: 14u entries @@ -19107,75 +17697,11 @@ Q3Signal (0xb2dda380) 0 QObject (0xb2dda3c0) 0 primary-for Q3Signal (0xb2dda380) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0xb2dda540) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0xb2dda580) 0 - primary-for Q3AsciiDict (0xb2dda540) - Q3PtrCollection (0xb2dda5c0) 0 - primary-for Q3GDict (0xb2dda580) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0xb2dda780) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0xb2dda7c0) 0 - primary-for Q3PtrStack (0xb2dda780) - Q3PtrCollection (0xb2dda800) 0 - primary-for Q3GList (0xb2dda7c0) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0xb2dda880) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0xb2dda8c0) 0 - primary-for Q3AsciiDict (0xb2dda880) - Q3PtrCollection (0xb2dda900) 0 - primary-for Q3GDict (0xb2dda8c0) + Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -19226,91 +17752,13 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0xb2ddabc0) 0 -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0xb2ddacc0) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0xb2ddad00) 0 - primary-for Q3Cache (0xb2ddacc0) - Q3PtrCollection (0xb2ddad40) 0 - primary-for Q3GCache (0xb2ddad00) - -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0xb2ddaf80) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0xb2ddafc0) 0 - primary-for Q3IntCache (0xb2ddaf80) - Q3PtrCollection (0xb2dda080) 0 - primary-for Q3GCache (0xb2ddafc0) - -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0xb2dda840) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0xb2dda940) 0 - primary-for Q3PtrDict (0xb2dda840) - Q3PtrCollection (0xb2ddaa80) 0 - primary-for Q3GDict (0xb2dda940) - -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0xb2cb71c0) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0xb2cb7200) 0 - primary-for Q3AsciiCache (0xb2cb71c0) - Q3PtrCollection (0xb2cb7240) 0 - primary-for Q3GCache (0xb2cb7200) + + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -19325,29 +17773,7 @@ Class Q3Semaphore Q3Semaphore (0xb2cb73c0) 0 vptr=((& Q3Semaphore::_ZTV11Q3Semaphore) + 8u) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb2cb7440) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0xb2cb7480) 0 - primary-for Q3PtrVector (0xb2cb7440) - Q3PtrCollection (0xb2cb74c0) 0 - primary-for Q3GVector (0xb2cb7480) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -19442,21 +17868,8 @@ Class Q3PaintDeviceMetrics base size=4 base align=4 Q3PaintDeviceMetrics (0xb2cb7ac0) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0xb2cb7b80) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0xb2cb7b00) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0xb2cb7bc0) 0 - QLinkedList (0xb2cb7c00) 0 Class Q3CanvasItemList size=4 align=4 @@ -20793,15 +19206,7 @@ Q3SocketDevice (0xb2b9dbc0) 0 QObject (0xb2b9de80) 0 primary-for QIODevice (0xb2b9dc40) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb2ac30c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb2ac3040) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -22126,15 +20531,7 @@ Q3VBox (0xb29bb580) 0 QPaintDevice (0xb29bb700) 8 vptr=((& Q3VBox::_ZTV6Q3VBox) + 244u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb29bb9c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb29bb940) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -23317,25 +21714,9 @@ Q3MainWindow (0xb287db40) 0 QPaintDevice (0xb287dc00) 8 vptr=((& Q3MainWindow::_ZTV12Q3MainWindow) + 328u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb287de40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb287ddc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb287df40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb287dec0) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -23400,10 +21781,6 @@ Q3DockAreaLayout (0xb287dc80) 0 QLayoutItem (0xb287dd40) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb287d740) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -23488,213 +21865,45 @@ Q3DockArea (0xb287d000) 0 QPaintDevice (0xb287d480) 8 vptr=((& Q3DockArea::_ZTV10Q3DockArea) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb287db00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb287dd80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb287dfc0) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb2862040) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb28620c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2862140) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb28621c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2862240) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb28622c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2862340) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb28623c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2862440) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb28624c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2862700) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb2862780) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2862880) 0 -Class QLinkedListNode - size=52 align=4 - base size=52 base align=4 -QLinkedListNode (0xb2862900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2862a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2862ac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2862bc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2862c80) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb2862d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2862d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2862e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2862f00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2862800) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb2862cc0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb2862e40) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb2862f40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb23c5080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb23c5100) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb23c5180) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb23c5240) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb23c5300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb23c5380) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb23c5400) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0xb23c5540) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb23c55c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb23c5680) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb23c5700) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0xb23c5780) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb23c5800) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.2.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/Qt3Support.4.2.0.linux-gcc-ppc32.txt index 17e41f191..18e3343d2 100644 --- a/tests/auto/bic/data/Qt3Support.4.2.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/Qt3Support.4.2.0.linux-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x30615a48) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x30615ab8) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x3001bac0) 0 empty - QUintForSize<4> (0x30615c08) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x30615ce8) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x30615d58) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x3001bb40) 0 empty - QIntForSize<4> (0x30615ea8) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x30628230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30628428) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306284d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30628578) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30628620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306286c8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30628770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30628818) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306288c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30628968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30628a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30628ab8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30628b60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30628c08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30628cb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30628d58) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x30628dc8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322b62a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322b6310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322b6380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322b63f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322b6460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322b64d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322b6540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322b65b0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322b6620) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322b6690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322b6700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322b6770) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322b67e0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3001bc80) 0 QGenericArgument (0x322b68f8) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x322b6ab8) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0x322b6b98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322b6c40) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x323ee9a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x323eece8) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0x323eed90) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x323eefc0) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0x3001bec0) 0 QString (0x32632150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32632230) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0x32632930) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32632e70) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32632dc8) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0x3001bf80) 0 QObject (0x3273c230) 0 primary-for QIODevice (0x3001bf80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3273c428) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x3273cb60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3273cbd0) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0x327dd380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x327dda10) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0x327dd8c0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x327ddce8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x327ddc40) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x327dde00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x327ddea8) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x327ddf88) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x327ddf18) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x327dd188) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x327dd9a0) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x329430e0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x329431c0) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x32943150) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x32943230) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x329432a0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0x329432d8) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32943508) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0x3285f180) 0 QTextStream (0x32943a80) 0 primary-for QTextOStream (0x3285f180) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x32943d58) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x32943dc8) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x32943ce8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x32943e38) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x32943ea8) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x32943f18) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x32943f88) 0 Class timespec size=8 align=4 @@ -738,70 +492,18 @@ Class timeval base size=8 base align=4 timeval (0x32943460) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x32943b28) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x329d3038) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x329d3118) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x329d30a8) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x329d3188) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x329d3268) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x329d31f8) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x329d32d8) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x329d33b8) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x329d3348) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x329d3428) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x329d3498) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x329d3508) 0 Class random_data size=28 align=4 @@ -872,10 +574,6 @@ QFile (0x3285f1c0) 0 QObject (0x329d3dc8) 0 primary-for QIODevice (0x3285f200) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x329d3f50) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -928,50 +626,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x32b32000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32b320a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32b32118) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32b322a0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32b321f8) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x32b32348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32b32540) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x32b325b0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32b32770) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32b326c8) 0 Class QStringList size=4 align=4 @@ -979,30 +649,14 @@ Class QStringList QStringList (0x3285f300) 0 QList (0x32b32818) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x32b32c40) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x32b32cb0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x32b32fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32be30e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32be3188) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1059,10 +713,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x32be31c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32be3428) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1174,15 +824,7 @@ Class QLocale base size=4 base align=4 QLocale (0x32be37e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32be3888) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32be3930) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1277,285 +919,65 @@ Class QUrl base size=4 base align=4 QUrl (0x32be3d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32be3ea8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32be3f18) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x32be3f88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32be3cb0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b070) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b118) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b268) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b310) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b3b8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b460) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b508) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b5b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b658) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b7a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b850) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b8f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1b9a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1ba48) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1baf0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1bb98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1bc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1bce8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1bd90) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1be38) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1bee0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d1bf88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35038) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d350e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35188) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35230) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d352d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35428) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d354d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35578) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35620) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d356c8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35770) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35818) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d358c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35968) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35a10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35ab8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35b60) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35c08) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35cb0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35d58) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35ea8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d35f50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d4f000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d4f0a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d4f150) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d4f1f8) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1582,45 +1004,17 @@ Class QVariant base size=16 base align=8 QVariant (0x32d4f268) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x32d4f700) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x32d4f7a8) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32d4f968) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32d4f8c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x32d4fb28) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x32d4fa80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x32d4fc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32d4fd58) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1652,80 +1046,48 @@ Class QPoint base size=8 base align=4 QPoint (0x32e12118) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e12508) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x32e12700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e12af0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x32e12d20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e12d90) 0 empty - + Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x32e12ee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e12f88) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x32e12380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e129d8) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x32eb0268) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32eb05e8) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x32eb0968) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32eb0b60) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x32eb0d90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32eb0f18) 0 empty Class QLinkedListData size=20 align=4 @@ -1742,10 +1104,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x32fb66c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32fb67a8) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1762,30 +1120,18 @@ Class QDate base size=4 base align=4 QDate (0x32fb6b98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32fb6d58) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x32fb6dc8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32fb6f88) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x32fb60e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32fb6e70) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1971,10 +1317,6 @@ QEventLoop (0x3285f880) 0 QObject (0x330b9c40) 0 primary-for QEventLoop (0x3285f880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x330b9e00) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2081,20 +1423,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x331795e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33179770) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x331797e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x331798f8) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2314,10 +1648,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x33179150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33179850) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2412,20 +1742,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x332342a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33234348) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x332343b8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33234460) 0 empty Class QMetaProperty size=20 align=4 @@ -2437,10 +1759,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x33234508) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x332345b0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2497,10 +1815,6 @@ QLibrary (0x3285fd00) 0 QObject (0x33234888) 0 primary-for QLibrary (0x3285fd00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33234a10) 0 Class QSemaphore size=4 align=4 @@ -2548,10 +1862,6 @@ Class QMutex base size=4 base align=4 QMutex (0x33234cb0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x33234e38) 0 Class QMutexLocker size=4 align=4 @@ -2563,45 +1873,21 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x33234ee0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x33234f88) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x33234f18) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x33234968) 0 Class QWriteLocker size=4 align=4 base size=4 base align=4 QWriteLocker (0x33234230) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x332e81c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x332e8230) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x332e82a0) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x332e8150) 0 Class QColor size=16 align=4 @@ -2618,20 +1904,8 @@ Class QPen base size=4 base align=4 QPen (0x332e8738) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x332e88c0) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x332e8a80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x332e89a0) 0 Class QPolygon size=4 align=4 @@ -2639,15 +1913,7 @@ Class QPolygon QPolygon (0x3285fdc0) 0 QVector (0x332e8af0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x332e8ea8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x332e8dc8) 0 Class QPolygonF size=4 align=4 @@ -2670,10 +1936,6 @@ Class QMatrix base size=48 base align=8 QMatrix (0x33389268) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x333892d8) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2714,10 +1976,6 @@ QImage (0x3285fe80) 0 QPaintDevice (0x333895e8) 0 primary-for QImage (0x3285fe80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33389930) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -2742,45 +2000,17 @@ Class QBrush base size=4 base align=4 QBrush (0x33389bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33389c78) 0 empty Class QBrushData size=72 align=8 base size=72 base align=8 QBrushData (0x33389ce8) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x33389f18) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x33389e38) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x33389150) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x33389460) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x333896c8) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x33389fc0) 0 Class QGradient size=64 align=8 @@ -2810,30 +2040,14 @@ Class QTextLength base size=16 base align=8 QTextLength (0x33389b60) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3348e2a0) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x3348e150) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3348e5e8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3348e508) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3348e6c8) 0 Class QTextCharFormat size=8 align=4 @@ -2973,10 +2187,6 @@ QTextFrame (0x33508280) 0 QObject (0x3348ecb0) 0 primary-for QTextObject (0x335082c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3348edc8) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -3001,25 +2211,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x33582188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33582508) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x335825b0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x33582620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x335827e0) 0 empty Class QFontMetrics size=4 align=4 @@ -3079,20 +2277,12 @@ QTextDocument (0x33508300) 0 QObject (0x33582ab8) 0 primary-for QTextDocument (0x33508300) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33582c78) 0 Class QTextOption size=32 align=8 base size=28 base align=8 QTextOption (0x33582cb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33582d90) 0 Class QTextTableCell size=8 align=4 @@ -3133,10 +2323,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x33648150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x336482d8) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3434,15 +2620,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x336d5508) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x336d5690) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x336d55e8) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3741,15 +2919,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x3372f968) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3372fc08) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3372fb28) 0 Class QTextLine size=8 align=4 @@ -3798,10 +2968,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x3372f150) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3372f5b0) 0 Class QTextCursor size=4 align=4 @@ -3824,15 +2990,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x337d2428) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x337d2620) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x337d2540) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -4196,10 +3354,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x33870bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33870f88) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -4230,20 +3384,8 @@ QItemSelectionModel (0x33828240) 0 QObject (0x33870268) 0 primary-for QItemSelectionModel (0x33828240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x339ab000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x339ab150) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x339ab0a8) 0 Class QItemSelection size=4 align=4 @@ -4450,20 +3592,12 @@ QAbstractSpinBox (0x33828480) 0 QPaintDevice (0x339ab738) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x339ab930) 0 Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0x339ab968) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x339aba48) 0 empty Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -4671,15 +3805,7 @@ QStyle (0x338286c0) 0 QObject (0x339abea8) 0 primary-for QStyle (0x338286c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x339ab578) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x339ab818) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -4938,10 +4064,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x33828940) 0 QStyleOption (0x33acf540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33acf738) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -4968,10 +4090,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x33828a80) 0 QStyleOption (0x33acfb98) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33acfd90) 0 Class QStyleOptionButton size=64 align=4 @@ -4979,10 +4097,6 @@ Class QStyleOptionButton QStyleOptionButton (0x33828b00) 0 QStyleOption (0x33acfcb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33acff88) 0 Class QStyleOptionTab size=72 align=4 @@ -4997,10 +4111,6 @@ QStyleOptionTabV2 (0x33828bc0) 0 QStyleOptionTab (0x33828c00) 0 QStyleOption (0x33acf578) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33b910e0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5027,10 +4137,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x33828d40) 0 QStyleOption (0x33b91380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33b91578) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5056,10 +4162,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x33828e40) 0 QStyleOption (0x33b918c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33b91ab8) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -5100,15 +4202,7 @@ QStyleOptionSpinBox (0x33c15040) 0 QStyleOptionComplex (0x33c15080) 0 QStyleOption (0x33b917e0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x33c25118) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x33c25070) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5117,10 +4211,6 @@ QStyleOptionQ3ListView (0x33c150c0) 0 QStyleOptionComplex (0x33c15100) 0 QStyleOption (0x33b91e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33c25380) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5328,10 +4418,6 @@ QAbstractItemView (0x33c154c0) 0 QPaintDevice (0x33c25c40) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33c25e38) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -6096,10 +5182,6 @@ QMessageBox (0x33c15cc0) 0 QPaintDevice (0x33d0abd0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33d0ae00) 0 Vtable for QProgressDialog QProgressDialog::_ZTV15QProgressDialog: 66u entries @@ -6350,10 +5432,6 @@ QFileDialog (0x33c15f00) 0 QPaintDevice (0x33d0aab8) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33e1a150) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -6439,10 +5517,6 @@ QAbstractPrintDialog (0x33e40000) 0 QPaintDevice (0x33e1a2d8) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33e1a4d0) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -6864,10 +5938,6 @@ QImageIOPlugin (0x33e40480) 0 QFactoryInterface (0x33e1af50) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x33e404c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33e1ab28) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -7215,50 +6285,14 @@ Class QPainter base size=4 base align=4 QPainter (0x33f76310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33f767e0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33f76968) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33f76888) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33f76b28) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33f76a48) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33f76ce8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33f76c08) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33f76ea8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33f76dc8) 0 Class QStylePainter size=12 align=4 @@ -7276,25 +6310,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x340a60a8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x340a6540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x340a6460) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x340a62a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x340a65e8) 0 empty Class QPainterPathStroker size=4 align=4 @@ -7306,15 +6328,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x340a6888) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x340a6930) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x340a6ab8) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -7349,25 +6363,13 @@ Class QPaintEngine QPaintEngine (0x340a69a0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x340a6cb0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x340a6c08) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x340a6d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x340a6e38) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -7457,15 +6459,7 @@ QStringListModel (0x33e40900) 0 QObject (0x340a6dc8) 0 primary-for QAbstractItemModel (0x33e40980) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x341852a0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x341851c0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7708,15 +6702,7 @@ Class QStandardItem QStandardItem (0x34185b98) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34185f50) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x34185ea8) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -8537,15 +7523,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3429ddc8) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3429dea8) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x3429d578) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8562,25 +7540,9 @@ Class QItemEditorFactory QItemEditorFactory (0x3429d118) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x343b83b8) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x343b82d8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x343b8540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x343b8498) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8807,15 +7769,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x343b8f18) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x343b8118) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x343b8428) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -9768,15 +8722,7 @@ QActionGroup (0x34586240) 0 QObject (0x34590620) 0 primary-for QActionGroup (0x34586240) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34590850) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x345907a8) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9946,10 +8892,6 @@ QCommonStyle (0x345863c0) 0 QObject (0x34590dc8) 0 primary-for QStyle (0x34586400) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x34590fc0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10471,15 +9413,7 @@ Class QGraphicsItem QGraphicsItem (0x34697c08) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34697f18) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x34697f88) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -11252,20 +10186,8 @@ QGraphicsView (0x347d6100) 0 QPaintDevice (0x347ae428) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x347ae620) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x347ae738) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x347ae690) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -12517,10 +11439,6 @@ QDateEdit (0x347d6e00) 0 QPaintDevice (0x349a23f0) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x349a25b0) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -12680,10 +11598,6 @@ QDockWidget (0x347d6fc0) 0 QPaintDevice (0x349a27e0) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x349a2a48) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12841,10 +11755,6 @@ QDialogButtonBox (0x349ff0c0) 0 QPaintDevice (0x349a2c78) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x349a2e70) 0 Vtable for QMainWindow QMainWindow::_ZTV11QMainWindow: 64u entries @@ -13018,10 +11928,6 @@ QTextEdit (0x349ff1c0) 0 QPaintDevice (0x349a26c8) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34a9b188) 0 Vtable for QProgressBar QProgressBar::_ZTV12QProgressBar: 64u entries @@ -14024,10 +12930,6 @@ QFontComboBox (0x349ffac0) 0 QPaintDevice (0x34b9b818) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34b9ba10) 0 Vtable for QToolBar QToolBar::_ZTV8QToolBar: 63u entries @@ -14567,20 +13469,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0x34cab930) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x34cabb28) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0x34cab968) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34cabc08) 0 Class QHostInfo size=4 align=4 @@ -14714,10 +13608,6 @@ QUdpSocket (0x34cf1140) 0 QObject (0x34cab230) 0 primary-for QIODevice (0x34cf11c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34cabd90) 0 Vtable for QTcpSocket QTcpSocket::_ZTV10QTcpSocket: 30u entries @@ -14769,15 +13659,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0x34d970e0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34d972a0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x34d971f8) 0 Class QSqlIndex size=16 align=4 @@ -14785,10 +13667,6 @@ Class QSqlIndex QSqlIndex (0x34cf12c0) 0 QSqlRecord (0x34d97118) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34d973f0) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -15460,34 +14338,12 @@ Q3GVector::_ZTV9Q3GVector: 11u entries Class Q3GVector size=20 align=4 base size=20 base align=4 -Q3GVector (0x34cf1980) 0 - vptr=((& Q3GVector::_ZTV9Q3GVector) + 8u) - Q3PtrCollection (0x34e92620) 0 - primary-for Q3GVector (0x34cf1980) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write - -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x34cf1a40) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0x34cf1a80) 0 - primary-for Q3PtrVector (0x34cf1a40) - Q3PtrCollection (0x34e92818) 0 - primary-for Q3GVector (0x34cf1a80) +Q3GVector (0x34cf1980) 0 + vptr=((& Q3GVector::_ZTV9Q3GVector) + 8u) + Q3PtrCollection (0x34e92620) 0 + primary-for Q3GVector (0x34cf1980) + + Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -15644,29 +14500,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0x34e928c0) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x34cf1cc0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0x34cf1d00) 0 - primary-for Q3PtrList (0x34cf1cc0) - Q3PtrCollection (0x34f70118) 0 - primary-for Q3GList (0x34cf1d00) Class Q3BaseBucket size=8 align=4 @@ -15723,28 +14557,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0x34f70658) 0 -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x34cf1f80) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0x34cf1fc0) 0 - primary-for Q3IntDict (0x34cf1f80) - Q3PtrCollection (0x34f70850) 0 - primary-for Q3GDict (0x34cf1fc0) Class Q3TableSelection size=28 align=4 @@ -15855,100 +14668,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0x34f70e70) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x34fe3200) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0x34fe3240) 0 - primary-for Q3PtrVector (0x34fe3200) - Q3PtrCollection (0x34f70f88) 0 - primary-for Q3GVector (0x34fe3240) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x34fe3280) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0x34fe32c0) 0 - primary-for Q3PtrVector (0x34fe3280) - Q3PtrCollection (0x34f70c40) 0 - primary-for Q3GVector (0x34fe32c0) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x34fe3300) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0x34fe3340) 0 - primary-for Q3PtrList (0x34fe3300) - Q3PtrCollection (0x35042118) 0 - primary-for Q3GList (0x34fe3340) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x34fe3380) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0x34fe33c0) 0 - primary-for Q3IntDict (0x34fe3380) - Q3PtrCollection (0x35042310) 0 - primary-for Q3GDict (0x34fe33c0) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -16672,21 +15398,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x35042e38) 0 vptr=((& Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x35112460) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x35112380) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x34fe3840) 0 - QLinkedList (0x35112498) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -16695,31 +15408,10 @@ Q3SqlRecordInfo (0x34fe38c0) 0 Q3ValueList (0x34fe3900) 0 QLinkedList (0x351125b0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x35112770) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x351126c8) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0x35112a80) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0x34fe3940) 0 - QLinkedList::const_iterator (0x35112ab8) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0x35112b60) 0 Vtable for Q3DataView Q3DataView::_ZTV10Q3DataView: 69u entries @@ -16810,15 +15502,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0x35112f18) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x351be038) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x351129d8) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -16879,25 +15563,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0x351be3b8) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x351be540) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x351be498) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x351be738) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x351be690) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -17105,10 +15773,6 @@ Q3TextEdit (0x34fe3b00) 0 QPaintDevice (0x351be9a0) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x351bebd0) 0 Vtable for Q3SyntaxHighlighter Q3SyntaxHighlighter::_ZTV19Q3SyntaxHighlighter: 5u entries @@ -18062,28 +16726,7 @@ Class Q3Url Q3Url (0x3536e188) 0 vptr=((& Q3Url::_ZTV5Q3Url) + 8u) -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0x35319400) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0x35319440) 0 - primary-for Q3Dict (0x35319400) - Q3PtrCollection (0x3536e3b8) 0 - primary-for Q3GDict (0x35319440) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -18444,29 +17087,7 @@ Q3Accel (0x35319780) 0 QObject (0x354182a0) 0 primary-for Q3Accel (0x35319780) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x353197c0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0x35319800) 0 - primary-for Q3PtrList (0x353197c0) - Q3PtrCollection (0x35418460) 0 - primary-for Q3GList (0x35319800) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -18494,11 +17115,6 @@ Q3StrList (0x35319840) 0 Q3PtrCollection (0x354185b0) 0 primary-for Q3GList (0x353198c0) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0x35319900) 0 - Q3GListStdIterator (0x35418930) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -19048,29 +17664,7 @@ Q3Process (0x354f8040) 0 QObject (0x354e7658) 0 primary-for Q3Process (0x354f8040) -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0x354f8100) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0x354f8140) 0 - primary-for Q3PtrQueue (0x354f8100) - Q3PtrCollection (0x354e7888) 0 - primary-for Q3GList (0x354f8140) Vtable for Q3Signal Q3Signal::_ZTV8Q3Signal: 14u entries @@ -19097,75 +17691,11 @@ Q3Signal (0x354f8180) 0 QObject (0x354e7a80) 0 primary-for Q3Signal (0x354f8180) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x354f8240) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0x354f8280) 0 - primary-for Q3AsciiDict (0x354f8240) - Q3PtrCollection (0x354e7d20) 0 - primary-for Q3GDict (0x354f8280) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0x354f8380) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0x354f83c0) 0 - primary-for Q3PtrStack (0x354f8380) - Q3PtrCollection (0x354e7348) 0 - primary-for Q3GList (0x354f83c0) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x354f8400) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0x354f8440) 0 - primary-for Q3AsciiDict (0x354f8400) - Q3PtrCollection (0x35568000) 0 - primary-for Q3GDict (0x354f8440) + Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -19216,91 +17746,13 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0x35568498) 0 -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0x354f8640) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0x354f8680) 0 - primary-for Q3Cache (0x354f8640) - Q3PtrCollection (0x355685b0) 0 - primary-for Q3GCache (0x354f8680) - -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0x354f87c0) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0x354f8800) 0 - primary-for Q3IntCache (0x354f87c0) - Q3PtrCollection (0x355688c0) 0 - primary-for Q3GCache (0x354f8800) - -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0x354f8900) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0x354f8940) 0 - primary-for Q3PtrDict (0x354f8900) - Q3PtrCollection (0x35568b60) 0 - primary-for Q3GDict (0x354f8940) - -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0x354f8a80) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0x354f8ac0) 0 - primary-for Q3AsciiCache (0x354f8a80) - Q3PtrCollection (0x35568f50) 0 - primary-for Q3GCache (0x354f8ac0) + + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -19315,29 +17767,7 @@ Class Q3Semaphore Q3Semaphore (0x35614000) 0 vptr=((& Q3Semaphore::_ZTV11Q3Semaphore) + 8u) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x354f8b80) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0x354f8bc0) 0 - primary-for Q3PtrVector (0x354f8b80) - Q3PtrCollection (0x356141c0) 0 - primary-for Q3GVector (0x354f8bc0) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -19432,21 +17862,8 @@ Class Q3PaintDeviceMetrics base size=4 base align=4 Q3PaintDeviceMetrics (0x356140e0) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x3566f118) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x3566f038) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x354f8f00) 0 - QLinkedList (0x3566f150) 0 Class Q3CanvasItemList size=4 align=4 @@ -20783,15 +19200,7 @@ Q3SocketDevice (0x3569eb40) 0 QObject (0x3582a1c0) 0 primary-for QIODevice (0x3569eb80) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x3582a428) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x3582a380) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -22116,15 +20525,7 @@ Q3VBox (0x35903700) 0 QPaintDevice (0x35904d90) 8 vptr=((& Q3VBox::_ZTV6Q3VBox) + 244u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x359c32d8) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x359c3230) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -23307,25 +21708,9 @@ Q3MainWindow (0x35a74440) 0 QPaintDevice (0x35a7c9d8) 8 vptr=((& Q3MainWindow::_ZTV12Q3MainWindow) + 328u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x35a7cd58) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x35a7ccb0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x35a7cee0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x35a7ce38) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -23390,10 +21775,6 @@ Q3DockAreaLayout (0x35a744c0) 0 QLayoutItem (0x35a7cc08) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x35b48230) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -23478,213 +21859,45 @@ Q3DockArea (0x35a74580) 0 QPaintDevice (0x35b48118) 8 vptr=((& Q3DockArea::_ZTV10Q3DockArea) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35bb68c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35bd4000) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35bd4e00) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x35c28fc0) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x35c435e8) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x35c72230) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x35c72ee0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x35c93188) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x35d27150) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x35d272d8) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x35d27460) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x35d275e8) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x35d27770) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35d60c78) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x35d60e70) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35da25b0) 0 -Class QLinkedListNode - size=56 align=8 - base size=56 base align=8 -QLinkedListNode (0x35de0a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35e8f658) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35e8fa48) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35e8fe38) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35eca540) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x35eca658) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35eca7e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35eef118) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35eefea8) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35f11930) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x35f11b28) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x35f4d0e0) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x35f4d658) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35f4dbd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35f4dd58) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35f4de00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35f89118) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35f89578) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35f89888) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35f89930) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x35faf348) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35faf540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35faf7e0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35faf888) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x35faff50) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x35fd1188) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.2.0.macx-gcc-ia32.txt b/tests/auto/bic/data/Qt3Support.4.2.0.macx-gcc-ia32.txt index 180de6e83..8ae374f18 100644 --- a/tests/auto/bic/data/Qt3Support.4.2.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/Qt3Support.4.2.0.macx-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x732740) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x7327c0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x732980) 0 empty - QUintForSize<4> (0x7329c0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x732ac0) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x732b40) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x732d00) 0 empty - QIntForSize<4> (0x732d40) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x26c0240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c0480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c0540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c0600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c06c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c0780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c0840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c0900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c09c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c0a80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c0b40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c0c00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c0cc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c0d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c0e40) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0x2703140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2703240) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0x2703940) 0 QBasicAtomic (0x2703980) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x2703c00) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0x2794940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2794d00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x289c180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x289c200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x289c280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x289c300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x289c380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x289c400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x289c480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x289c500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x289c580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x289c600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x289c680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x289c700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x289c780) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x289cf80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2a1a380) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x2a1afc0) 0 QString (0x2b15000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2b15100) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x2b15980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b15fc0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x2b15e40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2c37180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2c370c0) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x2c373c0) 0 QGenericArgument (0x2c37400) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x2c376c0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x2c37640) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2c37940) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2c37880) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x2c37f80) 0 QObject (0x2c37fc0) 0 primary-for QIODevice (0x2c37f80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2d08180) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x2d08880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d08ac0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x2d08b40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2d08d40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2d08c80) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x2d08e00) 0 QList (0x2d08e40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x2db3280) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x2db3300) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x2e3f040) 0 QObject (0x2e3f0c0) 0 primary-for QIODevice (0x2e3f080) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e3f280) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x2e3f2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e3f380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2e3f400) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2e3f5c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2e3f500) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x2e3f680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e3f7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e3f840) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x2e3f880) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e3fb40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x2e3fa80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2e3fe40) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x3017400) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30176c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -1078,35 +836,15 @@ Class rlimit base size=16 base align=4 rlimit (0x312e140) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x312e8c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x312e940) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x312e840) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x312e9c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x312ea40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x312eac0) 0 Class QVectorData size=16 align=4 @@ -1244,15 +982,7 @@ Class QLocale base size=4 base align=4 QLocale (0x322c9c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ca80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322cb40) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1279,270 +1009,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x322cd40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x322cf40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x322c440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x322c940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x33431c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x33434c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x33437c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3343f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335e9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335ea80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335eb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335ec00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335ecc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335ed80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335ee40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335ef00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x335efc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3379080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3379140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3379200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x33792c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3379380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3379440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3379500) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1569,60 +1087,20 @@ Class QVariant base size=12 base align=4 QVariant (0x3379580) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3379ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3379b80) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3379d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3379cc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x3379f80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x3379ec0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x33798c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x340f100) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x340f1c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x340f240) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x340f2c0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1700,15 +1178,7 @@ Class QUrl base size=4 base align=4 QUrl (0x340fb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x340fcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x340fd40) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1735,10 +1205,6 @@ QEventLoop (0x340fdc0) 0 QObject (0x340fe00) 0 primary-for QEventLoop (0x340fdc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x340f580) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1783,20 +1249,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x34ef140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34ef300) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x34ef380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34ef4c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1966,10 +1424,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x34efc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34efd00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2076,20 +1530,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x35a5840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35a5900) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x35a5980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35a5a40) 0 empty Class QMetaProperty size=20 align=4 @@ -2101,10 +1547,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x35a5b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35a5bc0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2286,10 +1728,6 @@ QLibrary (0x361b380) 0 QObject (0x361b3c0) 0 primary-for QLibrary (0x361b380) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x361b580) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2326,10 +1764,6 @@ Class QMutex base size=4 base align=4 QMutex (0x361b8c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x361ba80) 0 Class QMutexLocker size=4 align=4 @@ -2341,20 +1775,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x361bb40) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x361bc00) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x361bb80) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x361bd40) 0 Class QWriteLocker size=4 align=4 @@ -2412,10 +1838,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x36ef5c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36ef6c0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2427,70 +1849,42 @@ Class QDate base size=4 base align=4 QDate (0x36ef940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36efb40) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x36efbc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36efdc0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x36efe40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36effc0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x36efa00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x379f240) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x379f500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x379f980) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x379fc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x379fd00) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x379fe80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x379ff40) 0 empty Class QLinkedListData size=20 align=4 @@ -2502,40 +1896,24 @@ Class QSize base size=8 base align=4 QSize (0x387b280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x387b680) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x387ba40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x387be40) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x387bc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x392d040) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x392d2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x392d480) 0 empty Class QSharedData size=4 align=4 @@ -2583,10 +1961,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x392dec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x392da40) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2625,15 +1999,7 @@ Class QMacMime QMacMime (0x3a73080) 0 vptr=((& QMacMime::_ZTV8QMacMime) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3a733c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3a73300) 0 Vtable for QMacPasteboardMime QMacPasteboardMime::_ZTV18QMacPasteboardMime: 10u entries @@ -2934,15 +2300,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0x3b04140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3b04a40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3b045c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3231,15 +2589,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x3b908c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3b90a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3b90a80) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3628,40 +2978,16 @@ Class QPaintDevice QPaintDevice (0x3c3f0c0) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3c3f400) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3c3f480) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3c3f500) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x3c3f380) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0x3c3f300) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3c3f940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3c3f840) 0 Class QPolygon size=4 align=4 @@ -3669,15 +2995,7 @@ Class QPolygon QPolygon (0x3c3f9c0) 0 QVector (0x3c3fa00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3c3fe40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3c3fd40) 0 Class QPolygonF size=4 align=4 @@ -3690,10 +3008,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0x3cd6100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3cd6180) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3718,10 +3032,6 @@ QImage (0x3cd6380) 0 QPaintDevice (0x3cd63c0) 0 primary-for QImage (0x3cd6380) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3cd6780) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -3746,45 +3056,17 @@ Class QBrush base size=4 base align=4 QBrush (0x3cd6cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3cd6d80) 0 empty Class QBrushData size=72 align=4 base size=72 base align=4 QBrushData (0x3cd6e00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3cd65c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3cd6f80) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0x3cd6ac0) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0x3cd6c40) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0x3dce000) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0x3cd69c0) 0 Class QGradient size=56 align=4 @@ -4180,10 +3462,6 @@ QAbstractPrintDialog (0x3eb9fc0) 0 QPaintDevice (0x3eb9240) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3eb9ec0) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -4434,10 +3712,6 @@ QFileDialog (0x3fed500) 0 QPaintDevice (0x3fed5c0) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3fed880) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4844,10 +4118,6 @@ QMessageBox (0x40bd1c0) 0 QPaintDevice (0x40bd280) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40bd500) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 67u entries @@ -5202,25 +4472,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x40bd380) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4191340) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4191240) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x4191040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4191400) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5275,15 +4533,7 @@ Class QGraphicsItem QGraphicsItem (0x4191780) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4191b00) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x4191b80) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -5872,10 +5122,6 @@ Class QPen base size=4 base align=4 QPen (0x4285640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42857c0) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -6044,60 +5290,20 @@ Class QTextOption base size=24 base align=4 QTextOption (0x4308380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4308480) 0 Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x43084c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4308a40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4308c00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4308b00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4308e00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4308d00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4308140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4308f00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43fb100) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43fb000) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 65u entries @@ -6352,20 +5558,8 @@ QGraphicsView (0x43fb6c0) 0 QPaintDevice (0x43fb7c0) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43fba00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x43fbb40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x43fba80) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 7u entries @@ -6392,10 +5586,6 @@ Class QIcon base size=4 base align=4 QIcon (0x43fbd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4536100) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -6551,10 +5741,6 @@ QImageIOPlugin (0x4567f00) 0 QFactoryInterface (0x4536b40) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x4536b00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4536d80) 0 Class QImageReader size=4 align=4 @@ -6730,15 +5916,7 @@ QActionGroup (0x45c7740) 0 QObject (0x45c7780) 0 primary-for QActionGroup (0x45c7740) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x45c7a00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x45c7940) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -7043,10 +6221,6 @@ QAbstractSpinBox (0x46865c0) 0 QPaintDevice (0x4686640) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x46868c0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -7254,15 +6428,7 @@ QStyle (0x4686e40) 0 QObject (0x4686e80) 0 primary-for QStyle (0x4686e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4686380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4686780) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -7521,10 +6687,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x4795800) 0 QStyleOption (0x4795840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4795b00) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -7551,10 +6713,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x4795540) 0 QStyleOption (0x4795700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4840140) 0 Class QStyleOptionButton size=64 align=4 @@ -7562,10 +6720,6 @@ Class QStyleOptionButton QStyleOptionButton (0x4840000) 0 QStyleOption (0x4840040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4840400) 0 Class QStyleOptionTab size=72 align=4 @@ -7580,10 +6734,6 @@ QStyleOptionTabV2 (0x4840540) 0 QStyleOptionTab (0x4840580) 0 QStyleOption (0x48405c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4840940) 0 Class QStyleOptionToolBar size=68 align=4 @@ -7610,10 +6760,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x4840d00) 0 QStyleOption (0x4840d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4840fc0) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -7639,10 +6785,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x48df140) 0 QStyleOption (0x48df180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x48df440) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -7683,15 +6825,7 @@ QStyleOptionSpinBox (0x48dfdc0) 0 QStyleOptionComplex (0x48dfe00) 0 QStyleOption (0x48dfe40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x48dfbc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x48df700) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -7700,10 +6834,6 @@ QStyleOptionQ3ListView (0x48dff80) 0 QStyleOptionComplex (0x48dffc0) 0 QStyleOption (0x48df040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x49542c0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7794,10 +6924,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x4954f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x49f7140) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -7828,20 +6954,8 @@ QItemSelectionModel (0x49f7200) 0 QObject (0x49f7240) 0 primary-for QItemSelectionModel (0x49f7200) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x49f7400) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x49f7580) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x49f74c0) 0 Class QItemSelection size=4 align=4 @@ -7971,10 +7085,6 @@ QAbstractItemView (0x49f7740) 0 QPaintDevice (0x49f7840) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x49f7ac0) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -8312,15 +7422,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x4ac8580) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x4ac8b00) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x4ac89c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8461,15 +7563,7 @@ QListView (0x4ac8d40) 0 QPaintDevice (0x4ac8e80) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4b68080) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4ac8c80) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -8762,15 +7856,7 @@ Class QStandardItem QStandardItem (0x4b68cc0) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4b68e00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4b68780) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -9288,35 +8374,15 @@ QTreeView (0x4c7ddc0) 0 QPaintDevice (0x4c7df00) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4d78000) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x4c7d880) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x4d78480) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x4d78380) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4d78640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4d78580) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -10197,15 +9263,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x4f8b400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4f8b4c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4f8b680) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -10240,20 +9298,12 @@ Class QPaintEngine QPaintEngine (0x4f8b540) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4f8b8c0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x4f8b800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4f8b940) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7u entries @@ -10346,10 +9396,6 @@ QCommonStyle (0x4f8b300) 0 QObject (0x4f8b780) 0 primary-for QStyle (0x4f8b600) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x506f1c0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10723,30 +9769,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0x50f30c0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x50f3480) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x50f3300) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x50f3840) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x50f3740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x50f3940) 0 Class QTextCharFormat size=8 align=4 @@ -10801,15 +9831,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x50f3e80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x50f3f80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x50f3180) 0 Class QTextLine size=8 align=4 @@ -10859,15 +9881,7 @@ QTextDocument (0x520c2c0) 0 QObject (0x520c300) 0 primary-for QTextDocument (0x520c2c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x520c500) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x520c640) 0 Class QTextCursor size=4 align=4 @@ -10879,15 +9893,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x520c780) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x520c9c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x520c8c0) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -11049,10 +10055,6 @@ QTextFrame (0x52ce140) 0 QObject (0x52ce1c0) 0 primary-for QTextObject (0x52ce180) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x52ce700) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -11077,25 +10079,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x52ce940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x52ced40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x52cee00) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x52ceec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x532d080) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -12057,10 +11047,6 @@ QDateEdit (0x548b800) 0 QPaintDevice (0x548b900) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x548bb00) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12221,10 +11207,6 @@ QDialogButtonBox (0x548bdc0) 0 QPaintDevice (0x548be40) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x548b700) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -12304,10 +11286,6 @@ QDockWidget (0x548b9c0) 0 QPaintDevice (0x548bf40) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x554c280) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12469,10 +11447,6 @@ QFontComboBox (0x554c500) 0 QPaintDevice (0x554c5c0) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x554c800) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -14041,10 +13015,6 @@ QTextEdit (0x57eb3c0) 0 QPaintDevice (0x57eb4c0) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x57eb800) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -14654,20 +13624,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0x59a7140) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x59a7340) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0x59a7180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x59a7440) 0 Class QNetworkProxy size=4 align=4 @@ -14792,15 +13754,7 @@ QUdpSocket (0x59a7840) 0 QObject (0x59a7900) 0 primary-for QIODevice (0x59a78c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x59a7ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x59a7bc0) 0 Class QSqlRecord size=4 align=4 @@ -14938,15 +13892,7 @@ Class QSqlField base size=16 base align=4 QSqlField (0x5c6d380) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x5c6d600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x5c6d540) 0 Class QSqlIndex size=16 align=4 @@ -15462,29 +14408,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0x5d21940) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write - -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x5d21c40) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0x5d21c80) 0 - primary-for Q3PtrList (0x5d21c40) - Q3PtrCollection (0x5d21cc0) 0 - primary-for Q3GList (0x5d21c80) + Class Q3PointArray size=4 align=4 @@ -15493,21 +14417,8 @@ Q3PointArray (0x5dcf0c0) 0 QPolygon (0x5dcf100) 0 QVector (0x5dcf140) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x5dcf700) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x5dcf600) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x5dcf740) 0 - QLinkedList (0x5dcf780) 0 Class Q3CanvasItemList size=4 align=4 @@ -16145,28 +15056,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0x5edc640) 0 -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0x5edc900) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0x5edc940) 0 - primary-for Q3Dict (0x5edc900) - Q3PtrCollection (0x5edc980) 0 - primary-for Q3GDict (0x5edc940) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -16701,29 +15591,7 @@ Q3Wizard (0x5f50e80) 0 QPaintDevice (0x5f50f40) 8 vptr=((& Q3Wizard::_ZTV8Q3Wizard) + 308u) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x5f50d80) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0x5ff5000) 0 - primary-for Q3PtrList (0x5f50d80) - Q3PtrCollection (0x5ff5040) 0 - primary-for Q3GList (0x5ff5000) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -16751,11 +15619,6 @@ Q3StrList (0x5ff51c0) 0 Q3PtrCollection (0x5ff5280) 0 primary-for Q3GList (0x5ff5240) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0x5ff5680) 0 - Q3GListStdIterator (0x5ff56c0) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -17788,29 +16651,7 @@ Q3GVector (0x61b1280) 0 Q3PtrCollection (0x61b12c0) 0 primary-for Q3GVector (0x61b1280) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x61b1580) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0x61b15c0) 0 - primary-for Q3PtrVector (0x61b1580) - Q3PtrCollection (0x61b1600) 0 - primary-for Q3GVector (0x61b15c0) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -17930,28 +16771,7 @@ Class Q3GArray Q3GArray (0x61b1a00) 0 vptr=((& Q3GArray::_ZTV8Q3GArray) + 8u) -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x61b1f40) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0x61b1f80) 0 - primary-for Q3IntDict (0x61b1f40) - Q3PtrCollection (0x61b1fc0) 0 - primary-for Q3GDict (0x61b1f80) Class Q3TableSelection size=28 align=4 @@ -18062,100 +16882,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0x6279700) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x6279840) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0x6279880) 0 - primary-for Q3PtrVector (0x6279840) - Q3PtrCollection (0x62798c0) 0 - primary-for Q3GVector (0x6279880) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x6279ac0) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0x6279b00) 0 - primary-for Q3PtrVector (0x6279ac0) - Q3PtrCollection (0x6279b40) 0 - primary-for Q3GVector (0x6279b00) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x6279d40) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0x6279d80) 0 - primary-for Q3PtrList (0x6279d40) - Q3PtrCollection (0x6279dc0) 0 - primary-for Q3GList (0x6279d80) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x62791c0) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0x6279340) 0 - primary-for Q3IntDict (0x62791c0) - Q3PtrCollection (0x62794c0) 0 - primary-for Q3GDict (0x6279340) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -18469,15 +17202,7 @@ Q3Ftp (0x630c540) 0 QObject (0x630c5c0) 0 primary-for Q3NetworkProtocol (0x630c580) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x630c8c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x630c800) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -19759,21 +18484,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x654b400) 0 vptr=((& Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x654b780) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x654b680) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x654b7c0) 0 - QLinkedList (0x654b800) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -19782,31 +18494,10 @@ Q3SqlRecordInfo (0x654b980) 0 Q3ValueList (0x654b9c0) 0 QLinkedList (0x654ba00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x654bc00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x654bb40) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0x654bf80) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0x654bfc0) 0 - QLinkedList::const_iterator (0x654b380) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0x654bec0) 0 Vtable for Q3SqlSelectCursor Q3SqlSelectCursor::_ZTV17Q3SqlSelectCursor: 40u entries @@ -19866,15 +18557,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0x65de3c0) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x65de6c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x65de580) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -19913,25 +18596,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0x65de900) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x65deac0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x65dea00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x65ded40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x65dec80) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -20139,10 +18806,6 @@ Q3TextEdit (0x65de340) 0 QPaintDevice (0x65dec00) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x667a240) 0 Vtable for Q3MultiLineEdit Q3MultiLineEdit::_ZTV15Q3MultiLineEdit: 192u entries @@ -20827,114 +19490,15 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0x6760d40) 0 -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0x6760f00) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0x6760f40) 0 - primary-for Q3AsciiCache (0x6760f00) - Q3PtrCollection (0x6760f80) 0 - primary-for Q3GCache (0x6760f40) - -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x680b240) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0x680b280) 0 - primary-for Q3AsciiDict (0x680b240) - Q3PtrCollection (0x680b2c0) 0 - primary-for Q3GDict (0x680b280) - -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0x680b680) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0x680b6c0) 0 - primary-for Q3Cache (0x680b680) - Q3PtrCollection (0x680b700) 0 - primary-for Q3GCache (0x680b6c0) - -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0x680bc80) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0x680bcc0) 0 - primary-for Q3IntCache (0x680bc80) - Q3PtrCollection (0x680bd00) 0 - primary-for Q3GCache (0x680bcc0) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x680bfc0) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0x680b380) 0 - primary-for Q3AsciiDict (0x680bfc0) - Q3PtrCollection (0x680b7c0) 0 - primary-for Q3GDict (0x680b380) + + + Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -20961,76 +19525,11 @@ Q3ObjectDictionary (0x688b0c0) 0 Q3PtrCollection (0x688b180) 0 primary-for Q3GDict (0x688b140) -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0x688b5c0) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0x688b600) 0 - primary-for Q3PtrDict (0x688b5c0) - Q3PtrCollection (0x688b640) 0 - primary-for Q3GDict (0x688b600) - -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0x688ba40) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0x688ba80) 0 - primary-for Q3PtrQueue (0x688ba40) - Q3PtrCollection (0x688bac0) 0 - primary-for Q3GList (0x688ba80) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0x688bec0) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0x688bf00) 0 - primary-for Q3PtrStack (0x688bec0) - Q3PtrCollection (0x688bf40) 0 - primary-for Q3GList (0x688bf00) + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -21070,29 +19569,7 @@ Q3Signal (0x68e3080) 0 QObject (0x68e30c0) 0 primary-for Q3Signal (0x68e3080) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x68e3340) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0x68e3380) 0 - primary-for Q3PtrVector (0x68e3340) - Q3PtrCollection (0x68e33c0) 0 - primary-for Q3GVector (0x68e3380) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -21398,15 +19875,7 @@ Q3GroupBox (0x6955440) 0 QPaintDevice (0x6955500) 8 vptr=((& Q3GroupBox::_ZTV10Q3GroupBox) + 236u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x6955980) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x69558c0) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -22209,25 +20678,9 @@ Q3DockWindow (0x69e3e80) 0 QPaintDevice (0x69e3f80) 8 vptr=((& Q3DockWindow::_ZTV12Q3DockWindow) + 304u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x6a981c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x6a98100) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x6a98380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x6a982c0) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -22292,10 +20745,6 @@ Q3DockAreaLayout (0x69e3b40) 0 QLayoutItem (0x6a98000) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x6a98a80) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -23511,223 +21960,47 @@ Q3WidgetStack (0x6be1ac0) 0 QPaintDevice (0x6be1bc0) 8 vptr=((& Q3WidgetStack::_ZTV13Q3WidgetStack) + 248u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6ca2400) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6cc8280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6d20300) 0 empty -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x6d5f780) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6d5fe80) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0x6db4580) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x6dd4a80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6dd4c40) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x6dd4e00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6dd4fc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6ebd540) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x6ebd780) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x6edddc0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6f000c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x6f00740) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6f23a80) 0 -Class QLinkedListNode - size=52 align=4 - base size=52 base align=4 -QLinkedListNode (0x6f88180) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x707b100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x707ba80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x707bd00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7097240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x70975c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7097a40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x70b4140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x70b4e00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x70df900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x70dfb80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x70dfc40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x70dfec0) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x70dffc0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x711f6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x711fe00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x711fec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7158280) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x7158340) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x7158700) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x7158a40) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x7158d80) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x718cd40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x718cec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x71b5180) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x71b5240) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x71b5a00) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x71b5c80) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.2.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/Qt3Support.4.2.0.macx-gcc-ppc32.txt index 306abd0bf..c32b0bef8 100644 --- a/tests/auto/bic/data/Qt3Support.4.2.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/Qt3Support.4.2.0.macx-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xa65340) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xa653c0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xa65580) 0 empty - QUintForSize<4> (0xa655c0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xa656c0) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xa65740) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xa65900) 0 empty - QIntForSize<4> (0xa65940) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xa65e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2700080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2700140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2700200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27002c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2700380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2700440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2700500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27005c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2700680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2700740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2700800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27008c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2700980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2700a40) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0x2700d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2700e40) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0x276d440) 0 QBasicAtomic (0x276d480) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x276d700) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0x2814440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2814800) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2814c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2814d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2814d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2814e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2814e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2814f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2814f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x292b000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x292b080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x292b100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x292b180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x292b200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x292b280) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x292ba80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x292bec0) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x2a9aac0) 0 QString (0x2a9ab00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a9ac00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x2b8c440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b8ca80) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x2b8c900) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2b8cdc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2b8cd00) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x2b8c080) 0 QGenericArgument (0x2b8c2c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x2ca51c0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x2ca5140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2ca5440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2ca5380) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x2ca5a80) 0 QObject (0x2ca5ac0) 0 primary-for QIODevice (0x2ca5a80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2ca5d00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x2d75340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d75580) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x2d75600) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2d75800) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2d75740) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x2d758c0) 0 QList (0x2d75900) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x2d75dc0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x2d75e40) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x2e18800) 0 QObject (0x2e72040) 0 primary-for QIODevice (0x2e72000) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e72200) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x2e72240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e72300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2e72380) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2e72540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2e72480) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x2e72600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e72740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e727c0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x2e72800) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e72ac0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x2e72fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2e72a00) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x2f89fc0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30ff200) 0 Class QTextStreamManipulator size=24 align=4 @@ -1088,40 +846,16 @@ Class rlimit base size=16 base align=8 rlimit (0x30fff80) 0 -Class OSReadSwapInt64(const volatile void*, uintptr_t):: - size=8 align=8 - base size=8 base align=8 -OSReadSwapInt64(const volatile void*, uintptr_t):: (0x31610c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x3161800) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x3161880) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x3161780) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x3161900) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x3161980) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x3161a00) 0 Class QVectorData size=16 align=4 @@ -1259,15 +993,7 @@ Class QLocale base size=4 base align=4 QLocale (0x3267940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3267a00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3267ac0) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1294,270 +1020,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x3267cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3267ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3267f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3267540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3267c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336f080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336f140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336f200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336f2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336f380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336f440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336f500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336f5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336f680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336f740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336f800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336f8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336f980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336fa40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336fb00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336fbc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336fc80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336fd40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336fe00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336fec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x336ff80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338a040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338a100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338a1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338a280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338a340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338a400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338a4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338a580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338a640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338a700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338a7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338a880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338a940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338aa00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338aac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338ab80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338ac40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338ad00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338adc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338ae80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x338af40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x33a6000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x33a60c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x33a6180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x33a6240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x33a6300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x33a63c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x33a6480) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1584,60 +1098,20 @@ Class QVariant base size=16 base align=4 QVariant (0x33a6500) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x33a6a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x33a6b00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x33a6d00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x33a6c40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x33a6f00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x33a6e40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x33a67c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x343a080) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x343a140) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x343a1c0) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x343a240) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1715,15 +1189,7 @@ Class QUrl base size=4 base align=4 QUrl (0x343aa80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x343ac40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x343acc0) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1750,11 +1216,7 @@ QEventLoop (0x343ad40) 0 QObject (0x343ad80) 0 primary-for QEventLoop (0x343ad40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x343af80) 0 - + Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries 0 (int (*)(...))0 @@ -1798,20 +1260,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x351f0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x351f280) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x351f300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x351f440) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1981,10 +1435,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x351fb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x351fc80) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1541,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x35d37c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35d3880) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x35d3900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35d39c0) 0 empty Class QMetaProperty size=20 align=4 @@ -2116,10 +1558,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x35d3a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35d3b40) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2301,10 +1739,6 @@ QLibrary (0x3651300) 0 QObject (0x3651340) 0 primary-for QLibrary (0x3651300) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3651500) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2341,10 +1775,6 @@ Class QMutex base size=4 base align=4 QMutex (0x3651840) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x3651a00) 0 Class QMutexLocker size=4 align=4 @@ -2356,20 +1786,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x3651ac0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x3651b80) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x3651b00) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x3651cc0) 0 Class QWriteLocker size=4 align=4 @@ -2427,10 +1849,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x371c580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x371c680) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2442,70 +1860,42 @@ Class QDate base size=4 base align=4 QDate (0x371c900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x371cb00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x371cb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x371cd80) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x371ce00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x371cf80) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x371c940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x37ca1c0) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x37ca480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x37ca900) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x37cac00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x37cac80) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x37cae00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x37caec0) 0 empty Class QLinkedListData size=20 align=4 @@ -2517,40 +1907,24 @@ Class QSize base size=8 base align=4 QSize (0x38a5240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x38a5640) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x38a5a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x38a5e00) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x38a5b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3956000) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x3956280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3956440) 0 empty Class QSharedData size=4 align=4 @@ -2598,10 +1972,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x3956e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3956340) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2640,15 +2010,7 @@ Class QMacMime QMacMime (0x3a9d000) 0 vptr=((& QMacMime::_ZTV8QMacMime) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3a9d340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3a9d280) 0 Vtable for QMacPasteboardMime QMacPasteboardMime::_ZTV18QMacPasteboardMime: 10u entries @@ -2949,15 +2311,7 @@ Class QInputMethodEvent::Attribute base size=28 base align=4 QInputMethodEvent::Attribute (0x3b2f140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3b2fa40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3b2f5c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3246,15 +2600,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x3bb98c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3bb9a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3bb9a80) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3643,40 +2989,16 @@ Class QPaintDevice QPaintDevice (0x3c690c0) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3c69400) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3c69480) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3c69500) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x3c69380) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0x3c69300) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3c69940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3c69840) 0 Class QPolygon size=4 align=4 @@ -3684,15 +3006,7 @@ Class QPolygon QPolygon (0x3c699c0) 0 QVector (0x3c69a00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3c69e40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3c69d40) 0 Class QPolygonF size=4 align=4 @@ -3705,10 +3019,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0x3cff100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3cff180) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3733,10 +3043,6 @@ QImage (0x3cff380) 0 QPaintDevice (0x3cff3c0) 0 primary-for QImage (0x3cff380) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3cff780) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -3761,45 +3067,17 @@ Class QBrush base size=4 base align=4 QBrush (0x3cffcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3cffd80) 0 empty Class QBrushData size=72 align=4 base size=72 base align=4 QBrushData (0x3cffe00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3cff5c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3cfff80) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x3cffac0) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x3cffc40) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x3def000) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x3cff9c0) 0 Class QGradient size=56 align=4 @@ -4195,10 +3473,6 @@ QAbstractPrintDialog (0x3edafc0) 0 QPaintDevice (0x3eda240) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3edaec0) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -4449,10 +3723,6 @@ QFileDialog (0x4014500) 0 QPaintDevice (0x40145c0) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4014880) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4859,10 +4129,6 @@ QMessageBox (0x40e41c0) 0 QPaintDevice (0x40e4280) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40e4500) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 67u entries @@ -5217,25 +4483,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x40e4380) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x41bb340) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x41bb240) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x41bb040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41bb400) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5290,15 +4544,7 @@ Class QGraphicsItem QGraphicsItem (0x41bb780) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41bbb00) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41bbb80) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -5887,10 +5133,6 @@ Class QPen base size=4 base align=4 QPen (0x42b0640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42b07c0) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -6059,60 +5301,20 @@ Class QTextOption base size=24 base align=4 QTextOption (0x4333380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4333480) 0 Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x4333500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4333a80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4333c40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4333b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4333e40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4333d40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4333300) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4333f40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4426140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4426040) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 65u entries @@ -6367,20 +5569,8 @@ QGraphicsView (0x4426700) 0 QPaintDevice (0x4426800) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4426a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4426b80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4426ac0) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 7u entries @@ -6407,10 +5597,6 @@ Class QIcon base size=4 base align=4 QIcon (0x4555000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4555140) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -6566,10 +5752,6 @@ QImageIOPlugin (0x4590e00) 0 QFactoryInterface (0x4555b80) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x4555b40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4555dc0) 0 Class QImageReader size=4 align=4 @@ -6745,15 +5927,7 @@ QActionGroup (0x45f1780) 0 QObject (0x45f17c0) 0 primary-for QActionGroup (0x45f1780) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x45f1a40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x45f1980) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -7058,10 +6232,6 @@ QAbstractSpinBox (0x46b1600) 0 QPaintDevice (0x46b1680) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x46b1900) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -7269,15 +6439,7 @@ QStyle (0x46b1e80) 0 QObject (0x46b1ec0) 0 primary-for QStyle (0x46b1e80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x46b1580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x46b1a80) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -7536,10 +6698,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x47af840) 0 QStyleOption (0x47af880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x47afb40) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -7566,10 +6724,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x47af740) 0 QStyleOption (0x47af8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4867180) 0 Class QStyleOptionButton size=64 align=4 @@ -7577,10 +6731,6 @@ Class QStyleOptionButton QStyleOptionButton (0x4867040) 0 QStyleOption (0x4867080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4867440) 0 Class QStyleOptionTab size=72 align=4 @@ -7595,10 +6745,6 @@ QStyleOptionTabV2 (0x4867580) 0 QStyleOptionTab (0x48675c0) 0 QStyleOption (0x4867600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4867980) 0 Class QStyleOptionToolBar size=68 align=4 @@ -7625,10 +6771,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x4867d40) 0 QStyleOption (0x4867d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4867100) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -7654,10 +6796,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x4909180) 0 QStyleOption (0x49091c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4909480) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -7698,15 +6836,7 @@ QStyleOptionSpinBox (0x4909e00) 0 QStyleOptionComplex (0x4909e40) 0 QStyleOption (0x4909e80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4909d00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x49098c0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -7715,10 +6845,6 @@ QStyleOptionQ3ListView (0x4909fc0) 0 QStyleOptionComplex (0x4909080) 0 QStyleOption (0x4909200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4978300) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7809,10 +6935,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x4978f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4a18180) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -7843,20 +6965,8 @@ QItemSelectionModel (0x4a18240) 0 QObject (0x4a18280) 0 primary-for QItemSelectionModel (0x4a18240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4a18440) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4a185c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4a18500) 0 Class QItemSelection size=4 align=4 @@ -7986,10 +7096,6 @@ QAbstractItemView (0x4a18780) 0 QPaintDevice (0x4a18880) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4a18b00) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -8327,15 +7433,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x4af15c0) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x4af1b40) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x4af1a00) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8476,15 +7574,7 @@ QListView (0x4af1d80) 0 QPaintDevice (0x4af1ec0) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4b910c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4af1fc0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -8777,15 +7867,7 @@ Class QStandardItem QStandardItem (0x4b91d00) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4c92000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4b91a80) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -9303,35 +8385,15 @@ QTreeView (0x4c92e00) 0 QPaintDevice (0x4c92f40) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4da0080) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x4c928c0) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x4da0500) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x4da0400) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4da06c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4da0600) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -10212,15 +9274,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x4fb3480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4fb3540) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4fb3700) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -10255,20 +9309,12 @@ Class QPaintEngine QPaintEngine (0x4fb35c0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4fb39c0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x4fb3900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4fb3a40) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7u entries @@ -10361,10 +9407,6 @@ QCommonStyle (0x4fb3940) 0 QObject (0x4fb3d40) 0 primary-for QStyle (0x4fb3bc0) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x508e2c0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10738,30 +9780,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0x5110180) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x5110540) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x51103c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x5110900) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x5110800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5110a00) 0 Class QTextCharFormat size=8 align=4 @@ -10816,15 +9842,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x5110f40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x521f080) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x5110600) 0 Class QTextLine size=8 align=4 @@ -10874,15 +9892,7 @@ QTextDocument (0x521f380) 0 QObject (0x521f3c0) 0 primary-for QTextDocument (0x521f380) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x521f5c0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x521f700) 0 Class QTextCursor size=4 align=4 @@ -10894,15 +9904,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x521f840) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x521fa80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x521f980) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -11064,10 +10066,6 @@ QTextFrame (0x52ec240) 0 QObject (0x52ec2c0) 0 primary-for QTextObject (0x52ec280) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x52ec800) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -11092,25 +10090,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x52eca40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x52ece40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x52ecf00) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x52ecfc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5351140) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -12072,10 +11058,6 @@ QDateEdit (0x54928c0) 0 QPaintDevice (0x54929c0) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5492bc0) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12236,10 +11218,6 @@ QDialogButtonBox (0x5492e80) 0 QPaintDevice (0x5492f00) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5492d80) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -12319,10 +11297,6 @@ QDockWidget (0x5571000) 0 QPaintDevice (0x5571080) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5571340) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12484,10 +11458,6 @@ QFontComboBox (0x55715c0) 0 QPaintDevice (0x5571680) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x55718c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -14056,10 +13026,6 @@ QTextEdit (0x580a480) 0 QPaintDevice (0x580a580) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x580a8c0) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -14669,20 +13635,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0x59bd240) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x59bd440) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0x59bd280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x59bd540) 0 Class QNetworkProxy size=4 align=4 @@ -14807,15 +13765,7 @@ QUdpSocket (0x59bd940) 0 QObject (0x59bda00) 0 primary-for QIODevice (0x59bd9c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x59bdbc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x59bdcc0) 0 Class QSqlRecord size=4 align=4 @@ -14953,15 +13903,7 @@ Class QSqlField base size=20 base align=4 QSqlField (0x5c49440) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x5c496c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x5c49600) 0 Class QSqlIndex size=16 align=4 @@ -15477,29 +14419,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0x5cf7a40) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write - -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x5cf7d40) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0x5cf7d80) 0 - primary-for Q3PtrList (0x5cf7d40) - Q3PtrCollection (0x5cf7dc0) 0 - primary-for Q3GList (0x5cf7d80) + Class Q3PointArray size=4 align=4 @@ -15508,21 +14428,8 @@ Q3PointArray (0x5da9180) 0 QPolygon (0x5da91c0) 0 QVector (0x5da9200) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x5da97c0) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x5da96c0) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x5da9800) 0 - QLinkedList (0x5da9840) 0 Class Q3CanvasItemList size=4 align=4 @@ -16160,28 +15067,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0x5eae740) 0 -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0x5eaea00) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0x5eaea40) 0 - primary-for Q3Dict (0x5eaea00) - Q3PtrCollection (0x5eaea80) 0 - primary-for Q3GDict (0x5eaea40) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -16716,29 +15602,7 @@ Q3Wizard (0x5f25f40) 0 QPaintDevice (0x5f250c0) 8 vptr=((& Q3Wizard::_ZTV8Q3Wizard) + 308u) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x5fd1080) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0x5fd10c0) 0 - primary-for Q3PtrList (0x5fd1080) - Q3PtrCollection (0x5fd1100) 0 - primary-for Q3GList (0x5fd10c0) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -16766,11 +15630,6 @@ Q3StrList (0x5fd1280) 0 Q3PtrCollection (0x5fd1340) 0 primary-for Q3GList (0x5fd1300) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0x5fd1740) 0 - Q3GListStdIterator (0x5fd1780) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -17803,29 +16662,7 @@ Q3GVector (0x61753c0) 0 Q3PtrCollection (0x6175400) 0 primary-for Q3GVector (0x61753c0) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x61756c0) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0x6175700) 0 - primary-for Q3PtrVector (0x61756c0) - Q3PtrCollection (0x6175740) 0 - primary-for Q3GVector (0x6175700) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -17945,28 +16782,7 @@ Class Q3GArray Q3GArray (0x6175b40) 0 vptr=((& Q3GArray::_ZTV8Q3GArray) + 8u) -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x61754c0) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0x6175800) 0 - primary-for Q3IntDict (0x61754c0) - Q3PtrCollection (0x61759c0) 0 - primary-for Q3GDict (0x6175800) Class Q3TableSelection size=28 align=4 @@ -18077,100 +16893,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0x6253840) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x6253980) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0x62539c0) 0 - primary-for Q3PtrVector (0x6253980) - Q3PtrCollection (0x6253a00) 0 - primary-for Q3GVector (0x62539c0) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x6253c00) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0x6253c40) 0 - primary-for Q3PtrVector (0x6253c00) - Q3PtrCollection (0x6253c80) 0 - primary-for Q3GVector (0x6253c40) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x6253e80) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0x6253ec0) 0 - primary-for Q3PtrList (0x6253e80) - Q3PtrCollection (0x6253f00) 0 - primary-for Q3GList (0x6253ec0) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x6253600) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0x6253900) 0 - primary-for Q3IntDict (0x6253600) - Q3PtrCollection (0x6253ac0) 0 - primary-for Q3GDict (0x6253900) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -18484,15 +17213,7 @@ Q3Ftp (0x62dc680) 0 QObject (0x62dc700) 0 primary-for Q3NetworkProtocol (0x62dc6c0) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x62dca00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x62dc940) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -19774,21 +18495,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x65156c0) 0 vptr=((& Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x6515a40) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x6515940) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x6515a80) 0 - QLinkedList (0x6515ac0) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -19797,31 +18505,10 @@ Q3SqlRecordInfo (0x6515c40) 0 Q3ValueList (0x6515c80) 0 QLinkedList (0x6515cc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x6515ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x6515e00) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0x659c180) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0x659c1c0) 0 - QLinkedList::const_iterator (0x659c200) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0x659c2c0) 0 Vtable for Q3SqlSelectCursor Q3SqlSelectCursor::_ZTV17Q3SqlSelectCursor: 40u entries @@ -19881,15 +18568,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0x659c6c0) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x659c9c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x659c880) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -19928,25 +18607,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0x659cc00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x659cdc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x659cd00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x659c240) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x659cf80) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -20154,10 +18817,6 @@ Q3TextEdit (0x664b0c0) 0 QPaintDevice (0x664b200) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x664b4c0) 0 Vtable for Q3MultiLineEdit Q3MultiLineEdit::_ZTV15Q3MultiLineEdit: 192u entries @@ -20842,114 +19501,15 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0x6727fc0) 0 -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=32 base align=4 -Q3AsciiCache (0x67d10c0) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0x67d1100) 0 - primary-for Q3AsciiCache (0x67d10c0) - Q3PtrCollection (0x67d1140) 0 - primary-for Q3GCache (0x67d1100) - -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x67d1500) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0x67d1540) 0 - primary-for Q3AsciiDict (0x67d1500) - Q3PtrCollection (0x67d1580) 0 - primary-for Q3GDict (0x67d1540) - -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=32 base align=4 -Q3Cache (0x67d1940) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0x67d1980) 0 - primary-for Q3Cache (0x67d1940) - Q3PtrCollection (0x67d19c0) 0 - primary-for Q3GCache (0x67d1980) - -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=32 base align=4 -Q3IntCache (0x67d1f40) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0x67d1f80) 0 - primary-for Q3IntCache (0x67d1f40) - Q3PtrCollection (0x67d1fc0) 0 - primary-for Q3GCache (0x67d1f80) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x6856180) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0x68561c0) 0 - primary-for Q3AsciiDict (0x6856180) - Q3PtrCollection (0x6856200) 0 - primary-for Q3GDict (0x68561c0) + + + Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -20976,76 +19536,11 @@ Q3ObjectDictionary (0x6856340) 0 Q3PtrCollection (0x6856400) 0 primary-for Q3GDict (0x68563c0) -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0x6856840) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0x6856880) 0 - primary-for Q3PtrDict (0x6856840) - Q3PtrCollection (0x68568c0) 0 - primary-for Q3GDict (0x6856880) - -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0x6856cc0) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0x6856d00) 0 - primary-for Q3PtrQueue (0x6856cc0) - Q3PtrCollection (0x6856d40) 0 - primary-for Q3GList (0x6856d00) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0x68b3000) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0x68b3040) 0 - primary-for Q3PtrStack (0x68b3000) - Q3PtrCollection (0x68b3080) 0 - primary-for Q3GList (0x68b3040) + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -21085,29 +19580,7 @@ Q3Signal (0x68b3340) 0 QObject (0x68b3380) 0 primary-for Q3Signal (0x68b3340) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x68b3600) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0x68b3640) 0 - primary-for Q3PtrVector (0x68b3600) - Q3PtrCollection (0x68b3680) 0 - primary-for Q3GVector (0x68b3640) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -21413,15 +19886,7 @@ Q3GroupBox (0x690d700) 0 QPaintDevice (0x690d7c0) 8 vptr=((& Q3GroupBox::_ZTV10Q3GroupBox) + 236u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x690dc40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x690db80) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -22224,25 +20689,9 @@ Q3DockWindow (0x69b0b40) 0 QPaintDevice (0x6a4c080) 8 vptr=((& Q3DockWindow::_ZTV12Q3DockWindow) + 304u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x6a4c480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x6a4c3c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x6a4c640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x6a4c580) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -22307,10 +20756,6 @@ Q3DockAreaLayout (0x6a4c240) 0 QLayoutItem (0x6a4c2c0) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x6a4cd40) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -23526,223 +21971,47 @@ Q3WidgetStack (0x6b99d80) 0 QPaintDevice (0x6b99e80) 8 vptr=((& Q3WidgetStack::_ZTV13Q3WidgetStack) + 248u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6c75680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6c95500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6cf3580) 0 empty -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x6d31a00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6d62100) 0 -Class QVectorTypedData - size=40 align=4 - base size=40 base align=4 -QVectorTypedData (0x6d8a800) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x6da9d00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6da9ec0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x6dc6080) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6dc6240) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6e8f7c0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x6e8fa00) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x6ed0040) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x6ed0340) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x6ed09c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x6ef7d00) 0 -Class QLinkedListNode - size=56 align=4 - base size=56 base align=4 -QLinkedListNode (0x6f5b400) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x704c380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x704cd00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x704cf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x706a4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x706a840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x706acc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x70893c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x70af280) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x70afbc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x70afe40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x70aff00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x70e4100) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x70e4280) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x70e4980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x70e49c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x712b080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x712b500) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x712b5c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x712b980) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x712bcc0) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x712bf80) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x7162000) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x718b100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x718b400) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x718b4c0) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x718bc80) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x718bf00) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.2.0.win32-gcc-ia32.txt b/tests/auto/bic/data/Qt3Support.4.2.0.win32-gcc-ia32.txt index b4d0e7660..81e0ec5d8 100644 --- a/tests/auto/bic/data/Qt3Support.4.2.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/Qt3Support.4.2.0.win32-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xa9db00) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xa9dc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xa9df00) 0 empty - QUintForSize<4> (0xac3000) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xac3180) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xac3240) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xac34c0) 0 empty - QIntForSize<4> (0xac3580) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xaf4380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0aa80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ac00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ad80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0af00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb36080) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb5ff00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb97380) 0 empty Class QBasicAtomic size=4 align=4 @@ -171,75 +81,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc4ab00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd71780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd83e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd940c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd83980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd9ae40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd94780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda58c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda0080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde94c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde9d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef480) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xee0240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee0780) 0 Class QCharRef size=8 align=4 @@ -282,10 +132,6 @@ Class QConstString QConstString (0x11efdc0) 0 QString (0x11efe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x125d140) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -348,10 +194,6 @@ Class QListData base size=4 base align=4 QListData (0x12d21c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13db180) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -376,15 +218,7 @@ Class QTextCodec QTextCodec (0xee01c0) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13ff480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc5c5c0) 0 Class QTextEncoder size=32 align=4 @@ -407,25 +241,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x144a300) 0 QGenericArgument (0x144a340) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x145fac0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x144a8c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x148f340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1475f40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -517,10 +339,6 @@ QIODevice (0x13b4a40) 0 QObject (0x1509b40) 0 primary-for QIODevice (0x13b4a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1509e40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -540,25 +358,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xee00c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15d9c00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x15d9f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x15f14c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x15f1380) 0 Class QStringList size=4 align=4 @@ -566,15 +372,7 @@ Class QStringList QStringList (0xee0140) 0 QList (0x15f1740) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x15f1600) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x15f15c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -703,50 +501,22 @@ QFile (0x170f080) 0 QObject (0x170f100) 0 primary-for QIODevice (0x170f0c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x170f940) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1767140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1767a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1780ac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1780f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1780e80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1725fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17bbc80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17bb880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -803,10 +573,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x16fff80) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x185b0c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -880,10 +646,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x18cbb80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x18cbc80) 0 empty Class QMapData::Node size=8 align=4 @@ -908,10 +670,6 @@ Class QTextStream QTextStream (0x1b10580) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b10940) 0 Class QTextStreamManipulator size=24 align=4 @@ -948,20 +706,8 @@ QTextOStream (0x1b9f740) 0 QTextStream (0x1b9f780) 0 primary-for QTextOStream (0x1b9f740) -Class - size=8 align=4 - base size=8 base align=4 - (0x1bd3980) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1bd3b00) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1bf18c0) 0 Class QVectorData size=16 align=4 @@ -1099,15 +845,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1e5bcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ea4980) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ea4040) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1134,270 +872,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1f06400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f29840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f299c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f29b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f29cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f29e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f29fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3d140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3d2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3d440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3d5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3d740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3d8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3da40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3dbc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3dd40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3dec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5d040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5d1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5d340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5d4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5d640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5d7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5d940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5dac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5dc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5ddc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5df40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7b0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7b240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7b3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7b540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7b6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7b840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7b9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7bb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7bcc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7be40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7bfc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f99140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f992c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f99440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f995c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f99740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f998c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f99a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f99bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f99d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f99ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fbc040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fbc1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fbc340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fbc4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fbc640) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1424,45 +950,17 @@ Class QVariant base size=16 base align=8 QVariant (0x1475c80) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2012e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2012fc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2042480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1fd0540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x2042780) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1fd05c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1fbc800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20aa100) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1540,15 +1038,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1f29180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2163440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21c1040) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1575,10 +1065,6 @@ QEventLoop (0x21c16c0) 0 QObject (0x21c1700) 0 primary-for QEventLoop (0x21c16c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21c1a00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1623,20 +1109,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x223a200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x223ae80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x223a180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22632c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1806,10 +1284,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x22e77c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22e7e00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1917,20 +1391,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x143fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x238abc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x143fc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23a01c0) 0 empty Class QMetaProperty size=20 align=4 @@ -1942,10 +1408,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x143fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23a0900) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2127,10 +1589,6 @@ QLibrary (0x245e040) 0 QObject (0x245e080) 0 primary-for QLibrary (0x245e040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x245e2c0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2172,10 +1630,6 @@ Class QMutex base size=4 base align=4 QMutex (0x24d07c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x24fd000) 0 Class QMutexLocker size=4 align=4 @@ -2187,20 +1641,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x24fde00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x250c140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x24fdfc0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x250c900) 0 Class QWriteLocker size=4 align=4 @@ -2258,10 +1704,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2550ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25ab480) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2273,70 +1715,42 @@ Class QDate base size=4 base align=4 QDate (0x1e5bb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2603640) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e5bbc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x262b280) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1767040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2659040) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1f29340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2659c80) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1f29380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2682e40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1f292c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c92c0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1f29300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26f5780) 0 empty Class QLinkedListData size=20 align=4 @@ -2348,40 +1762,24 @@ Class QSize base size=8 base align=4 QSize (0x1f29240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27e3fc0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1f29280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2835500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1f291c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x28b7000) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1f29200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x293b340) 0 empty Class QSharedData size=4 align=4 @@ -2429,10 +1827,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x1f29700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a52280) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2749,15 +2143,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x2b4ae80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2b72380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2b4af80) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3046,15 +2432,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2c1ebc0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c33c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c41180) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3445,40 +2823,16 @@ Class QPaintDevice QPaintDevice (0x29caf80) 0 vptr=((&QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2d77dc0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2d77f00) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2db9000) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2d77d40) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0x1f294c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2de7540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2de73c0) 0 Class QPolygon size=4 align=4 @@ -3486,15 +2840,7 @@ Class QPolygon QPolygon (0x1f295c0) 0 QVector (0x2de7700) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2e28980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2e28840) 0 Class QPolygonF size=4 align=4 @@ -3507,10 +2853,6 @@ Class QMatrix base size=48 base align=8 QMatrix (0x1f29800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2e85800) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3537,10 +2879,6 @@ QImage (0x1f29580) 0 QPaintDevice (0x2ea7cc0) 0 primary-for QImage (0x1f29580) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2f62000) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 9u entries @@ -3567,45 +2905,17 @@ Class QBrush base size=4 base align=4 QBrush (0x1f29480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2fb6a00) 0 empty Class QBrushData size=72 align=8 base size=72 base align=8 QBrushData (0x2fb61c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2fd5900) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2fd5080) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2fd5b40) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2fd5c40) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2fd5e80) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2fd5ac0) 0 Class QGradient size=64 align=8 @@ -4017,10 +3327,6 @@ QAbstractPrintDialog (0x335e080) 0 QPaintDevice (0x335e180) 8 vptr=((&QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x335e440) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 70u entries @@ -4283,10 +3589,6 @@ QFileDialog (0x33d59c0) 0 QPaintDevice (0x33d5ac0) 8 vptr=((&QFileDialog::_ZTV11QFileDialog) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3401480) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 70u entries @@ -4713,10 +4015,6 @@ QMessageBox (0x3572900) 0 QPaintDevice (0x3572a00) 8 vptr=((&QMessageBox::_ZTV11QMessageBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x358a680) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 71u entries @@ -5087,25 +4385,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x2e61a80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x36d4980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x36d4800) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x36b71c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36d4b40) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5160,15 +4446,7 @@ Class QGraphicsItem QGraphicsItem (0x373c540) 0 vptr=((&QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x373c680) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3774580) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -5757,10 +5035,6 @@ Class QPen base size=4 base align=4 QPen (0x1f29740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x38a3e00) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -5929,60 +5203,20 @@ Class QTextOption base size=28 base align=8 QTextOption (0x393ea00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x393ee40) 0 Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x29fa080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x399ca00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a5e3c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39b37c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a5e740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39b3880) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a9e400) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39b39c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a9e700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2a0d700) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 69u entries @@ -6249,20 +5483,8 @@ QGraphicsView (0x374da40) 0 QPaintDevice (0x3b6bc40) 8 vptr=((&QGraphicsView::_ZTV13QGraphicsView) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3ba31c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3c0b440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x373ca80) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 9u entries @@ -6291,10 +5513,6 @@ Class QIcon base size=4 base align=4 QIcon (0x1f29540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3c97400) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -6450,10 +5668,6 @@ QImageIOPlugin (0x3cb6fc0) 0 QFactoryInterface (0x3cd6080) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x3cd6040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3cd6240) 0 Class QImageReader size=4 align=4 @@ -6631,15 +5845,7 @@ QActionGroup (0x3da71c0) 0 QObject (0x3de6540) 0 primary-for QActionGroup (0x3da71c0) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3e10000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31e8d80) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -6948,10 +6154,6 @@ QAbstractSpinBox (0x3ed1100) 0 QPaintDevice (0x3ed11c0) 8 vptr=((&QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3ed16c0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 68u entries @@ -7167,15 +6369,7 @@ QStyle (0x31b69c0) 0 QObject (0x3f9a340) 0 primary-for QStyle (0x31b69c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f9ac80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3fbee40) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 71u entries @@ -7446,10 +6640,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x411cf40) 0 QStyleOption (0x411cf80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4132440) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -7476,10 +6666,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x417a740) 0 QStyleOption (0x417a780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41a0240) 0 Class QStyleOptionButton size=64 align=4 @@ -7487,10 +6673,6 @@ Class QStyleOptionButton QStyleOptionButton (0x41a00c0) 0 QStyleOption (0x41a0100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41a0b80) 0 Class QStyleOptionTab size=72 align=4 @@ -7505,10 +6687,6 @@ QStyleOptionTabV2 (0x41f82c0) 0 QStyleOptionTab (0x41f8300) 0 QStyleOption (0x41f8340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41f8a80) 0 Class QStyleOptionToolBar size=68 align=4 @@ -7535,10 +6713,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x4247800) 0 QStyleOption (0x4247840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4298240) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -7564,10 +6738,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x42e5240) 0 QStyleOption (0x42e5280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42e5940) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -7608,15 +6778,7 @@ QStyleOptionSpinBox (0x43675c0) 0 QStyleOptionComplex (0x4367600) 0 QStyleOption (0x4367640) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4367c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4367b80) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -7625,10 +6787,6 @@ QStyleOptionQ3ListView (0x4367ac0) 0 QStyleOptionComplex (0x4367b00) 0 QStyleOption (0x4367b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x439b740) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7719,10 +6877,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x4473380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x44a09c0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -7753,20 +6907,8 @@ QItemSelectionModel (0x44a0dc0) 0 QObject (0x44a0e00) 0 primary-for QItemSelectionModel (0x44a0dc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44dc140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x44dcfc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x44dcec0) 0 Class QItemSelection size=4 align=4 @@ -7900,10 +7042,6 @@ QAbstractItemView (0x452d640) 0 QPaintDevice (0x452d780) 8 vptr=((&QAbstractItemView::_ZTV17QAbstractItemView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4557480) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -8245,15 +7383,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x46b1200) 0 nearly-empty vptr=((&QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x46b1f00) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x46b1d00) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8398,15 +7528,7 @@ QListView (0x46d0680) 0 QPaintDevice (0x46d0800) 8 vptr=((&QListView::_ZTV9QListView) + 400u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x46eee40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x46eecc0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -8703,15 +7825,7 @@ Class QStandardItem QStandardItem (0x48283c0) 0 vptr=((&QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x48df880) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x48288c0) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -9241,35 +8355,15 @@ QTreeView (0x4a5d980) 0 QPaintDevice (0x4a5db00) 8 vptr=((&QTreeView::_ZTV9QTreeView) + 408u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4a87ec0) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x4a87a80) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x4ab8cc0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x4ab8b40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4ab8f00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4ab89c0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -10158,15 +9252,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x399c840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e24ec0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4e4e4c0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 26u entries @@ -10203,20 +9289,12 @@ Class QPaintEngine QPaintEngine (0x2d29b00) 0 vptr=((&QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4e4e940) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x4e24c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4e24dc0) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 9u entries @@ -10313,10 +9391,6 @@ QCommonStyle (0x4f8fc40) 0 QObject (0x4f8fcc0) 0 primary-for QStyle (0x4f8fc80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x4fc9500) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10690,30 +9764,14 @@ Class QTextLength base size=16 base align=8 QTextLength (0x1f29780) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x513ff80) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x1f297c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x5152900) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x513fa80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x513f600) 0 Class QTextCharFormat size=8 align=4 @@ -10768,15 +9826,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x30c1dc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x52e8780) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x52e8400) 0 Class QTextLine size=8 align=4 @@ -10826,15 +9876,7 @@ QTextDocument (0x382b300) 0 QObject (0x5315fc0) 0 primary-for QTextDocument (0x382b300) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x532a500) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x539a700) 0 Class QTextCursor size=4 align=4 @@ -10846,15 +9888,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x539ac00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x539aec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x539ad40) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -11016,10 +10050,6 @@ QTextFrame (0x53157c0) 0 QObject (0x5440180) 0 primary-for QTextObject (0x5440140) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5468700) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -11044,25 +10074,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x52c3c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5499f80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x54b5100) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x5409280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x54b5b80) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -12056,10 +11074,6 @@ QDateEdit (0x5772940) 0 QPaintDevice (0x5772a80) 8 vptr=((&QDateEdit::_ZTV9QDateEdit) + 268u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5749c40) 0 Vtable for QDial QDial::_ZTV5QDial: 68u entries @@ -12228,10 +11242,6 @@ QDialogButtonBox (0x57e4bc0) 0 QPaintDevice (0x57e4c80) 8 vptr=((&QDialogButtonBox::_ZTV16QDialogButtonBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x57e4d80) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 67u entries @@ -12315,10 +11325,6 @@ QDockWidget (0x583aa00) 0 QPaintDevice (0x583aac0) 8 vptr=((&QDockWidget::_ZTV11QDockWidget) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x583af40) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 67u entries @@ -12488,10 +11494,6 @@ QFontComboBox (0x59173c0) 0 QPaintDevice (0x59174c0) 8 vptr=((&QFontComboBox::_ZTV13QFontComboBox) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x59178c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 67u entries @@ -14136,10 +13138,6 @@ QTextEdit (0x54b5dc0) 0 QPaintDevice (0x5d72b00) 8 vptr=((&QTextEdit::_ZTV9QTextEdit) + 264u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5d9d2c0) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 78u entries @@ -14769,20 +13767,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0x605cc40) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x6074540) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0x605cfc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x6074200) 0 Class QNetworkProxy size=4 align=4 @@ -14907,15 +13897,7 @@ QUdpSocket (0x60ccfc0) 0 QObject (0x60ff080) 0 primary-for QIODevice (0x60ff040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x60ff280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x6163100) 0 Class QSqlRecord size=4 align=4 @@ -15053,15 +14035,7 @@ Class QSqlField base size=20 base align=8 QSqlField (0x6163740) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x623da80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x623d940) 0 Class QSqlIndex size=16 align=4 @@ -15581,33 +14555,11 @@ Class Q3GListIterator Q3GListIterator (0x638c700) 0 Class Q3GListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3GListStdIterator (0x638c780) 0 - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write + size=4 align=4 + base size=4 base align=4 +Q3GListStdIterator (0x638c780) 0 + -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x64011c0) 0 - vptr=((&Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0x64012c0) 0 - primary-for Q3PtrList (0x64011c0) - Q3PtrCollection (0x6401300) 0 - primary-for Q3GList (0x64012c0) Class Q3PointArray size=4 align=4 @@ -15616,21 +14568,8 @@ Q3PointArray (0x6454400) 0 QPolygon (0x6454440) 0 QVector (0x6454480) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x6481ac0) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x6481940) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x6481840) 0 - QLinkedList (0x6481c80) 0 Class Q3CanvasItemList size=4 align=4 @@ -16274,28 +15213,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0x65dc9c0) 0 -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 0u -4 (int (*)(...))(&_ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0x664f280) 0 - vptr=((&Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0x664f380) 0 - primary-for Q3Dict (0x664f280) - Q3PtrCollection (0x664f3c0) 0 - primary-for Q3GDict (0x664f380) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -16846,29 +15764,7 @@ Q3Wizard (0x6780740) 0 QPaintDevice (0x6780840) 8 vptr=((&Q3Wizard::_ZTV8Q3Wizard) + 316u) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x67bd440) 0 - vptr=((&Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0x67bd540) 0 - primary-for Q3PtrList (0x67bd440) - Q3PtrCollection (0x67bd580) 0 - primary-for Q3GList (0x67bd540) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -16896,11 +15792,6 @@ Q3StrList (0x67bd400) 0 Q3PtrCollection (0x67bd7c0) 0 primary-for Q3GList (0x67bd780) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0x67bd600) 0 - Q3GListStdIterator (0x67fd340) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -17945,29 +16836,7 @@ Q3GVector (0x6362ac0) 0 Q3PtrCollection (0x6afb1c0) 0 primary-for Q3GVector (0x6362ac0) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x6b30040) 0 - vptr=((&Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0x6b30140) 0 - primary-for Q3PtrVector (0x6b30040) - Q3PtrCollection (0x6b30180) 0 - primary-for Q3GVector (0x6b30140) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 80u entries @@ -18091,28 +16960,7 @@ Class Q3GArray Q3GArray (0x6b83580) 0 vptr=((&Q3GArray::_ZTV8Q3GArray) + 8u) -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 0u -4 (int (*)(...))(&_ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x6bd2780) 0 - vptr=((&Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0x6bd2880) 0 - primary-for Q3IntDict (0x6bd2780) - Q3PtrCollection (0x6bd28c0) 0 - primary-for Q3GDict (0x6bd2880) Class Q3TableSelection size=28 align=4 @@ -18223,100 +17071,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0x6c66040) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x6c66100) 0 - vptr=((&Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0x6c66440) 0 - primary-for Q3PtrVector (0x6c66100) - Q3PtrCollection (0x6c66480) 0 - primary-for Q3GVector (0x6c66440) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x6c66600) 0 - vptr=((&Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0x6c666c0) 0 - primary-for Q3PtrVector (0x6c66600) - Q3PtrCollection (0x6c66700) 0 - primary-for Q3GVector (0x6c666c0) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0x6c66980) 0 - vptr=((&Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0x6c66a40) 0 - primary-for Q3PtrList (0x6c66980) - Q3PtrCollection (0x6c66a80) 0 - primary-for Q3GList (0x6c66a40) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 0u -4 (int (*)(...))(&_ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0x6c9d040) 0 - vptr=((&Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0x6c9d100) 0 - primary-for Q3IntDict (0x6c9d040) - Q3PtrCollection (0x6c9d140) 0 - primary-for Q3GDict (0x6c9d100) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 187u entries @@ -18634,15 +17395,7 @@ Q3Ftp (0x6d377c0) 0 QObject (0x6d37840) 0 primary-for Q3NetworkProtocol (0x6d37800) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x6d69700) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x6d695c0) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -19938,21 +18691,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0x7021f40) 0 vptr=((&Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0x7122cc0) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0x7122b80) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0x7122a00) 0 - QLinkedList (0x7122e40) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -19961,31 +18701,10 @@ Q3SqlRecordInfo (0x7122ac0) 0 Q3ValueList (0x71560c0) 0 QLinkedList (0x7156100) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x71564c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x7122fc0) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0x7122dc0) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0x7122f00) 0 - QLinkedList::const_iterator (0x71a2040) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0x7122e00) 0 Vtable for Q3SqlSelectCursor Q3SqlSelectCursor::_ZTV17Q3SqlSelectCursor: 40u entries @@ -20045,15 +18764,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0x7207c80) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x7220d40) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x7220b40) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -20092,25 +18803,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0x724fc40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x724fe00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x724fcc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x7278140) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x7278040) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -20322,10 +19017,6 @@ Q3TextEdit (0x724f600) 0 QPaintDevice (0x7278d40) 8 vptr=((&Q3TextEdit::_ZTV10Q3TextEdit) + 688u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x72a6200) 0 Vtable for Q3MultiLineEdit Q3MultiLineEdit::_ZTV15Q3MultiLineEdit: 196u entries @@ -21022,114 +19713,15 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0x7540180) 0 -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 0u -4 (int (*)(...))(&_ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0x7540d40) 0 - vptr=((&Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0x7540e40) 0 - primary-for Q3AsciiCache (0x7540d40) - Q3PtrCollection (0x7540e80) 0 - primary-for Q3GCache (0x7540e40) - -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 0u -4 (int (*)(...))(&_ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x756ee00) 0 - vptr=((&Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0x756ef00) 0 - primary-for Q3AsciiDict (0x756ee00) - Q3PtrCollection (0x756ef40) 0 - primary-for Q3GDict (0x756ef00) - -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 0u -4 (int (*)(...))(&_ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0x7599cc0) 0 - vptr=((&Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0x7599dc0) 0 - primary-for Q3Cache (0x7599cc0) - Q3PtrCollection (0x7599e00) 0 - primary-for Q3GCache (0x7599dc0) - -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 0u -4 (int (*)(...))(&_ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0x75ea5c0) 0 - vptr=((&Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0x75ea6c0) 0 - primary-for Q3IntCache (0x75ea5c0) - Q3PtrCollection (0x75ea700) 0 - primary-for Q3GCache (0x75ea6c0) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 0u -4 (int (*)(...))(&_ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0x761c080) 0 - vptr=((&Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0x761c180) 0 - primary-for Q3AsciiDict (0x761c080) - Q3PtrCollection (0x761c1c0) 0 - primary-for Q3GDict (0x761c180) + + + Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -21156,76 +19748,11 @@ Q3ObjectDictionary (0x761c040) 0 Q3PtrCollection (0x761c380) 0 primary-for Q3GDict (0x761c340) -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 0u -4 (int (*)(...))(&_ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0x7649480) 0 - vptr=((&Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0x7649580) 0 - primary-for Q3PtrDict (0x7649480) - Q3PtrCollection (0x76495c0) 0 - primary-for Q3GDict (0x7649580) - -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0x7673300) 0 - vptr=((&Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0x7673400) 0 - primary-for Q3PtrQueue (0x7673300) - Q3PtrCollection (0x7673440) 0 - primary-for Q3GList (0x7673400) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0x7673dc0) 0 - vptr=((&Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0x7673ec0) 0 - primary-for Q3PtrStack (0x7673dc0) - Q3PtrCollection (0x7673f00) 0 - primary-for Q3GList (0x7673ec0) + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -21265,29 +19792,7 @@ Q3Signal (0x769d480) 0 QObject (0x769d4c0) 0 primary-for Q3Signal (0x769d480) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 0u -4 (int (*)(...))(&_ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0x769df80) 0 - vptr=((&Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0x76c4080) 0 - primary-for Q3PtrVector (0x769df80) - Q3PtrCollection (0x76c40c0) 0 - primary-for Q3GVector (0x76c4080) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -21601,15 +20106,7 @@ Q3GroupBox (0x779a040) 0 QPaintDevice (0x779a140) 8 vptr=((&Q3GroupBox::_ZTV10Q3GroupBox) + 244u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x77e9500) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x77e93c0) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 68u entries @@ -22448,25 +20945,9 @@ Q3DockWindow (0x79a2b40) 0 QPaintDevice (0x79a2c80) 8 vptr=((&Q3DockWindow::_ZTV12Q3DockWindow) + 312u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x79e7e80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3a9e800) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x7a23100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x79e7a80) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -22531,10 +21012,6 @@ Q3DockAreaLayout (0x79a29c0) 0 QLayoutItem (0x79e7a00) 8 vptr=((&Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x7a6f980) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -23802,213 +22279,45 @@ Q3WidgetStack (0x7ccb2c0) 0 QPaintDevice (0x7ccb400) 8 vptr=((&Q3WidgetStack::_ZTV13Q3WidgetStack) + 256u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13ff440) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x15f1480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x14d5580) 0 empty -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x2de74c0) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x2e28900) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x36d4900) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x3a5e340) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x3a5e6c0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x3a9e380) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x3a9e680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4ab8ec0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x4ab8c40) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x5152880) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x52e8700) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x539ae40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3de6fc0) 0 -Class QLinkedListNode - size=56 align=8 - base size=56 base align=8 -QLinkedListNode (0x7122c40) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x46b1e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4367740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x439b940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x44738c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x44a0c40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4595f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4742100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x491d840) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1780f40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x2042440) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x4b2f900) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x4ba34c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4c2f3c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3c0b400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4c2fb00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4367c40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44dcf80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x48df840) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x4cf2100) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0x4df7dc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x79e7e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e63e40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x7a230c0) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0x4f8f0c0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x4f8f840) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.3.0.linux-gcc-ia32.txt b/tests/auto/bic/data/Qt3Support.4.3.0.linux-gcc-ia32.txt index 2fb1f5309..9b73b5e16 100644 --- a/tests/auto/bic/data/Qt3Support.4.3.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/Qt3Support.4.3.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7efbd80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7efbdc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7efbe80) 0 empty - QUintForSize<4> (0xb7efbec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7efbf40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7efbf80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7822040) 0 empty - QIntForSize<4> (0xb7822080) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7822340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7822400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7822440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7822480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78224c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7822500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7822540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7822580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78225c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7822600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7822640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7822680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78226c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7822700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7822740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7822780) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb78227c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78228c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7822900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7822940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7822980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78229c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7822a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7822a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7822a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7822ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7822b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7822b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7822b80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7822bc0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb7822cc0) 0 QGenericArgument (0xb7822d00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb7822ec0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb7822f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb591c000) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb591c300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb591c340) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb591c380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb591c580) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb591c680) 0 QString (0xb591c6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb591c700) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb591ca40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb591cdc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb591cd40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb591c4c0) 0 QObject (0xb591c500) 0 primary-for QLibrary (0xb591c4c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb591c840) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb591cc00) 0 QObject (0xb591ce40) 0 primary-for QIODevice (0xb591cc00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb553c000) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb553c0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb553c100) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb553c140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb553c200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb553c180) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb553c240) 0 QList (0xb553c280) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb553c300) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb553c340) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb553c6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb553c700) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb553cc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb553cd00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb553cd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb553ce00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb553ce40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb553cf00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb553cf40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb553cfc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb553c080) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb553cf80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb553c440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb553c580) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb553cac0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb553cc80) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb553ccc0) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb553cdc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb553ce80) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb553cec0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb5508000) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb55080c0) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb5508080) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb5508040) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb5508100) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb5508180) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb5508140) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb55081c0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb5508240) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb5508200) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5508280) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb55082c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb5508300) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb5508580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5508780) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb5508800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5508a00) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb5508dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5508e00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5508e40) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb5138040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5138280) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb51382c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5138500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb5138640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5138740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb5138780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5138840) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb5138880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51388c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb5138900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5138940) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb5138cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5138d00) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb5138e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5138ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5138f00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb5138f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51380c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51381c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51383c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51384c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51386c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51387c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5138b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4faa7c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb4faa800) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb4faaa80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb4faaac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4faabc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4faab40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb4faacc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb4faac40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb4faad40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4faadc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb4faae00) 0 QObject (0xb4faae40) 0 primary-for QSettings (0xb4faae00) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb4faaf40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb4faaf00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb4faaf80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb4faafc0) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb4faaa00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb4faae80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb4faaa40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb4e88000) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb4e88040) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb4e88080) 0 QObject (0xb4e88100) 0 primary-for QIODevice (0xb4e880c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e88180) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb4e88300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e88340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4e88380) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4e88440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4e883c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb4e88480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e88500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e88580) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb4e887c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e88880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb4e888c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e88a40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb4e88b00) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e88c40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb4e88b80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4e88d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4e88d00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb4e88e40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e88f00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb4cc80c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb4cc8140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb4cc8100) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb4cc81c0) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb4cc8200) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb4cc8280) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb4cc8580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cc85c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb4cc86c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cc8700) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb4cc8740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cc87c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb4cc8c40) 0 QObject (0xb4cc8c80) 0 primary-for QEventLoop (0xb4cc8c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4cc8d80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb4cc8e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cc8ec0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb4cc8f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a45000) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb4a45080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a450c0) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2726,25 +2016,13 @@ QImageIOPlugin (0xb4a45500) 0 QFactoryInterface (0xb4a455c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb4a45580) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4a45640) 0 Class QImageReader size=4 align=4 base size=4 base align=4 QImageReader (0xb4a45680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a45740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a456c0) 0 Class QPolygon size=4 align=4 @@ -2752,15 +2030,7 @@ Class QPolygon QPolygon (0xb4a45780) 0 QVector (0xb4a457c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a45880) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a45800) 0 Class QPolygonF size=4 align=4 @@ -2783,10 +2053,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb4a45ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a45b00) 0 empty Class QPainterPath::Element size=20 align=4 @@ -2798,25 +2064,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb4a45b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a45dc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a45d40) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb4a45c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a45e00) 0 empty Class QPainterPathStroker size=4 align=4 @@ -2828,10 +2082,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb4a45f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a45f40) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2872,30 +2122,10 @@ QImage (0xb4a453c0) 0 QPaintDevice (0xb4a45480) 0 primary-for QImage (0xb4a453c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a45980) 0 empty -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4a45a40) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4a45bc0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4a45c00) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4a45a00) 0 Class QColor size=16 align=4 @@ -3083,10 +2313,6 @@ Class QIcon base size=4 base align=4 QIcon (0xb4823940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4823a00) 0 empty Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -3225,10 +2451,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb4823f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4823000) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3526,15 +2748,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb4768840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4768940) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb47688c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3823,20 +3037,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb47e5040) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47e50c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47e5100) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb47e5140) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3867,20 +3069,8 @@ QAccessibleInterface (0xb47e5200) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb47e5240) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb47e53c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb47e5340) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb47e52c0) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -4402,55 +3592,23 @@ Class QPen base size=4 base align=4 QPen (0xb469c500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb469c5c0) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0xb469c600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb469c640) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb469c680) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb469c7c0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb469c740) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb469c840) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb469c880) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb469c8c0) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb469c800) 0 Class QGradient size=56 align=4 @@ -4480,30 +3638,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb469ca80) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb469cbc0) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb469cb40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb469cd40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb469ccc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb469cd80) 0 Class QTextCharFormat size=8 align=4 @@ -4643,10 +3785,6 @@ QTextFrame (0xb469cc40) 0 QObject (0xb4417040) 0 primary-for QTextObject (0xb4417000) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4417180) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -4671,25 +3809,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb4417240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44172c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4417300) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb4417340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4417380) 0 empty Class QTextDocumentFragment size=4 align=4 @@ -4756,10 +3882,6 @@ QTextTable (0xb4417500) 0 QObject (0xb44175c0) 0 primary-for QTextObject (0xb4417580) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4417740) 0 Class QTextCursor size=4 align=4 @@ -4808,10 +3930,6 @@ Class QTextOption base size=24 base align=4 QTextOption (0xb4417980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44179c0) 0 Class QTextInlineObject size=8 align=4 @@ -4828,15 +3946,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb4417a40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4417bc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4417b40) 0 Class QTextLine size=8 align=4 @@ -4886,10 +3996,6 @@ QTextDocument (0xb4417d00) 0 QObject (0xb4417d40) 0 primary-for QTextDocument (0xb4417d00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4417dc0) 0 Class QPalette size=8 align=4 @@ -4907,15 +4013,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb4417fc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4417700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4417480) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4977,10 +4075,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb4417e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43bd0c0) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5028,15 +4122,7 @@ QStyle (0xb43bd100) 0 QObject (0xb43bd140) 0 primary-for QStyle (0xb43bd100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43bd200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43bd240) 0 Vtable for QCommonStyle QCommonStyle::_ZTV12QCommonStyle: 35u entries @@ -5242,10 +4328,6 @@ QWindowsXPStyle (0xb43bd780) 0 QObject (0xb43bd880) 0 primary-for QStyle (0xb43bd840) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb43bda40) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -5541,10 +4623,6 @@ QWidget (0xb43bd040) 0 QPaintDevice (0xb43bd1c0) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43bd480) 0 Vtable for QValidator QValidator::_ZTV10QValidator: 16u entries @@ -5745,10 +4823,6 @@ QAbstractSpinBox (0xb41a4140) 0 QPaintDevice (0xb41a4200) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41a4280) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6167,10 +5241,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb41a4ac0) 0 QStyleOption (0xb41a4b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41a4c80) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6197,10 +5267,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb41a4f00) 0 QStyleOption (0xb41a4f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41a4240) 0 Class QStyleOptionButton size=64 align=4 @@ -6208,10 +5274,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb41a4000) 0 QStyleOption (0xb41a4100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41a46c0) 0 Class QStyleOptionTab size=72 align=4 @@ -6226,10 +5288,6 @@ QStyleOptionTabV2 (0xb41a4840) 0 QStyleOptionTab (0xb41a4980) 0 QStyleOption (0xb41a4a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41a4fc0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6256,10 +5314,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb3ee4200) 0 QStyleOption (0xb3ee4240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ee4380) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6292,10 +5346,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb3ee46c0) 0 QStyleOption (0xb3ee4700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ee4880) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -6351,15 +5401,7 @@ QStyleOptionSpinBox (0xb3ee4f80) 0 QStyleOptionComplex (0xb3ee4fc0) 0 QStyleOption (0xb3ee4000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3ee4540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3ee43c0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6368,10 +5410,6 @@ QStyleOptionQ3ListView (0xb3ee4100) 0 QStyleOptionComplex (0xb3ee4280) 0 QStyleOption (0xb3ee4340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ee4e00) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6488,10 +5526,6 @@ Class QStyleFactory base size=0 base align=1 QStyleFactory (0xb3dcc780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3dcc840) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -6663,10 +5697,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb3dccb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3dccbc0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6697,20 +5727,8 @@ QItemSelectionModel (0xb3dccc00) 0 QObject (0xb3dccc40) 0 primary-for QItemSelectionModel (0xb3dccc00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3dcccc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3dccd80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3dccd00) 0 Class QItemSelection size=4 align=4 @@ -6872,10 +5890,6 @@ QAbstractItemView (0xb3dccf00) 0 QPaintDevice (0xb3dcc180) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3dcc3c0) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -7140,15 +6154,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb3d19280) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3d19540) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3d194c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7296,15 +6302,7 @@ Class QTableWidgetSelectionRange base size=16 base align=4 QTableWidgetSelectionRange (0xb3d19800) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3d19940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3d198c0) 0 Vtable for QTableWidgetItem QTableWidgetItem::_ZTV16QTableWidgetItem: 10u entries @@ -7790,15 +6788,7 @@ Class QStandardItem QStandardItem (0xb3d19dc0) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3c72100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3c72080) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -7926,25 +6916,9 @@ QDirModel (0xb3c72300) 0 QObject (0xb3c72380) 0 primary-for QAbstractItemModel (0xb3c72340) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb3c72500) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb3c72480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3c72600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3c72580) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8540,15 +7514,7 @@ QActionGroup (0xb3c72440) 0 QObject (0xb3c72540) 0 primary-for QActionGroup (0xb3c72440) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3c72b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3c72880) 0 Vtable for QLayoutItem QLayoutItem::_ZTV11QLayoutItem: 18u entries @@ -9687,10 +8653,6 @@ QMdiArea (0xb37f20c0) 0 QPaintDevice (0xb37f2200) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37f2280) 0 Vtable for QAbstractButton QAbstractButton::_ZTV15QAbstractButton: 66u entries @@ -10012,10 +8974,6 @@ QMdiSubWindow (0xb37f26c0) 0 QPaintDevice (0xb37f2780) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37f2800) 0 Vtable for QCalendarWidget QCalendarWidget::_ZTV15QCalendarWidget: 64u entries @@ -10493,10 +9451,6 @@ QDialogButtonBox (0xb37f2f80) 0 QPaintDevice (0xb37f2240) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37f23c0) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -10576,10 +9530,6 @@ QDockWidget (0xb37f2540) 0 QPaintDevice (0xb37f2980) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37f2c40) 0 Vtable for QScrollArea QScrollArea::_ZTV11QScrollArea: 65u entries @@ -10930,10 +9880,6 @@ QDateEdit (0xb35b3440) 0 QPaintDevice (0xb35b3580) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35b3600) 0 Vtable for QFontComboBox QFontComboBox::_ZTV13QFontComboBox: 65u entries @@ -11017,10 +9963,6 @@ QFontComboBox (0xb35b3640) 0 QPaintDevice (0xb35b3740) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35b37c0) 0 Vtable for QToolBox QToolBox::_ZTV8QToolBox: 65u entries @@ -11275,10 +10217,6 @@ QTextEdit (0xb35b3ac0) 0 QPaintDevice (0xb35b3c00) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35b3d00) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -12210,10 +11148,6 @@ QMainWindow (0xb34fb980) 0 QPaintDevice (0xb34fba40) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34fbac0) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12786,20 +11720,8 @@ Class QGraphicsItem QGraphicsItem (0xb34445c0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34446c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb3444700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb34447c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -13361,50 +12283,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb3444480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3444600) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3444a00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3444680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3444dc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3444c00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb31b8040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3444f80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb31b8140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb31b80c0) 0 Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -13451,20 +12337,8 @@ QGraphicsScene (0xb31b8180) 0 QObject (0xb31b81c0) 0 primary-for QGraphicsScene (0xb31b8180) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb31b82c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb31b8380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb31b8300) 0 Vtable for QGraphicsView QGraphicsView::_ZTV13QGraphicsView: 68u entries @@ -13553,15 +12427,7 @@ QGraphicsView (0xb31b83c0) 0 QPaintDevice (0xb31b8500) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb31b85c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb31b8600) 0 Vtable for QGraphicsItemAnimation QGraphicsItemAnimation::_ZTV22QGraphicsItemAnimation: 16u entries @@ -13921,10 +12787,6 @@ QAbstractPrintDialog (0xb31b8b40) 0 QPaintDevice (0xb31b8c40) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb31b8d00) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -14183,10 +13045,6 @@ QWizard (0xb31b8580) 0 QPaintDevice (0xb31b8b00) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb31b8cc0) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -14354,10 +13212,6 @@ QFileDialog (0xb318d100) 0 QPaintDevice (0xb318d200) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb318d2c0) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -14694,10 +13548,6 @@ QMessageBox (0xb318d7c0) 0 QPaintDevice (0xb318d8c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb318d980) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -15173,15 +14023,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb2ec8300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2ec8340) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2ec8400) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -15216,20 +14058,12 @@ Class QPaintEngine QPaintEngine (0xb2ec8380) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2ec8500) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb2ec8480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2ec8540) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26u entries @@ -15434,10 +14268,6 @@ QUdpSocket (0xb2ec8a40) 0 QObject (0xb2ec8b00) 0 primary-for QIODevice (0xb2ec8ac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2ec8b80) 0 Class QSslCertificate size=4 align=4 @@ -15494,10 +14324,6 @@ QTcpSocket (0xb2ec8c40) 0 QObject (0xb2ec8d00) 0 primary-for QIODevice (0xb2ec8cc0) -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb2ec8d80) 0 empty Vtable for QSslSocket QSslSocket::_ZTV10QSslSocket: 30u entries @@ -15556,20 +14382,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0xb2ec8000) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb2ec81c0) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0xb2ec8100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2ec83c0) 0 Class QSslKey size=4 align=4 @@ -15748,10 +14566,6 @@ QTcpServer (0xb2e8b280) 0 QObject (0xb2e8b2c0) 0 primary-for QTcpServer (0xb2e8b280) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2e8b340) 0 Class QSqlRecord size=4 align=4 @@ -16091,15 +14905,7 @@ QSqlDriver (0xb2e8bc40) 0 QObject (0xb2e8bc80) 0 primary-for QSqlDriver (0xb2e8bc40) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb2e8be40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb2e8bdc0) 0 Class QSqlIndex size=16 align=4 @@ -16288,71 +15094,11 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0xb2be6280) 0 -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0xb2be6380) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0xb2be63c0) 0 - primary-for Q3AsciiCache (0xb2be6380) - Q3PtrCollection (0xb2be6400) 0 - primary-for Q3GCache (0xb2be63c0) - -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0xb2be65c0) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0xb2be6600) 0 - primary-for Q3IntCache (0xb2be65c0) - Q3PtrCollection (0xb2be6640) 0 - primary-for Q3GCache (0xb2be6600) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0xb2be6800) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0xb2be6840) 0 - primary-for Q3PtrStack (0xb2be6800) - Q3PtrCollection (0xb2be6880) 0 - primary-for Q3GList (0xb2be6840) + + Class Q3CString size=4 align=4 @@ -16387,26 +15133,7 @@ Class Q3GArray Q3GArray (0xb2be6b00) 0 vptr=((& Q3GArray::_ZTV8Q3GArray) + 8u) -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0xb2be6d80) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0xb2be6dc0) 0 - primary-for Q3Cache (0xb2be6d80) - Q3PtrCollection (0xb2be6e00) 0 - primary-for Q3GCache (0xb2be6dc0) Vtable for Q3Signal Q3Signal::_ZTV8Q3Signal: 14u entries @@ -16433,29 +15160,7 @@ Q3Signal (0xb2be68c0) 0 QObject (0xb2be6900) 0 primary-for Q3Signal (0xb2be68c0) -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0xb2b300c0) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0xb2b30100) 0 - primary-for Q3PtrQueue (0xb2b300c0) - Q3PtrCollection (0xb2b30140) 0 - primary-for Q3GList (0xb2b30100) Vtable for Q3GVector Q3GVector::_ZTV9Q3GVector: 11u entries @@ -16479,76 +15184,11 @@ Q3GVector (0xb2b301c0) 0 Q3PtrCollection (0xb2b30200) 0 primary-for Q3GVector (0xb2b301c0) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb2b30340) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0xb2b30380) 0 - primary-for Q3PtrVector (0xb2b30340) - Q3PtrCollection (0xb2b303c0) 0 - primary-for Q3GVector (0xb2b30380) - -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0xb2b30500) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0xb2b30540) 0 - primary-for Q3Dict (0xb2b30500) - Q3PtrCollection (0xb2b30580) 0 - primary-for Q3GDict (0xb2b30540) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb2b30680) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0xb2b306c0) 0 - primary-for Q3PtrVector (0xb2b30680) - Q3PtrCollection (0xb2b30700) 0 - primary-for Q3GVector (0xb2b306c0) + Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -16604,75 +15244,11 @@ Q3StrIVec (0xb2b308c0) 0 Q3PtrCollection (0xb2b309c0) 0 primary-for Q3GVector (0xb2b30980) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb2b30b80) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0xb2b30bc0) 0 - primary-for Q3PtrList (0xb2b30b80) - Q3PtrCollection (0xb2b30c00) 0 - primary-for Q3GList (0xb2b30bc0) - -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0xb2b30e40) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0xb2b30e80) 0 - primary-for Q3AsciiDict (0xb2b30e40) - Q3PtrCollection (0xb2b30ec0) 0 - primary-for Q3GDict (0xb2b30e80) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0xb2b30fc0) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0xb2b30180) 0 - primary-for Q3AsciiDict (0xb2b30fc0) - Q3PtrCollection (0xb2b30240) 0 - primary-for Q3GDict (0xb2b30180) + Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -16699,29 +15275,7 @@ Q3ObjectDictionary (0xb2b30400) 0 Q3PtrCollection (0xb2b30880) 0 primary-for Q3GDict (0xb2b30740) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb2b30c40) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0xb2b30f00) 0 - primary-for Q3PtrList (0xb2b30c40) - Q3PtrCollection (0xb2a12000) 0 - primary-for Q3GList (0xb2b30f00) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -16749,11 +15303,6 @@ Q3StrList (0xb2a12080) 0 Q3PtrCollection (0xb2a12140) 0 primary-for Q3GList (0xb2a12100) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0xb2a12200) 0 - Q3GListStdIterator (0xb2a12240) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -16783,28 +15332,7 @@ Q3StrIList (0xb2a12280) 0 Q3PtrCollection (0xb2a12380) 0 primary-for Q3GList (0xb2a12340) -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0xb2a124c0) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0xb2a12500) 0 - primary-for Q3PtrDict (0xb2a124c0) - Q3PtrCollection (0xb2a12540) 0 - primary-for Q3GDict (0xb2a12500) Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -16819,28 +15347,7 @@ Class Q3Semaphore Q3Semaphore (0xb2a12640) 0 vptr=((& Q3Semaphore::_ZTV11Q3Semaphore) + 8u) -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0xb2a12780) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0xb2a127c0) 0 - primary-for Q3IntDict (0xb2a12780) - Q3PtrCollection (0xb2a12800) 0 - primary-for Q3GDict (0xb2a127c0) Vtable for Q3Frame Q3Frame::_ZTV7Q3Frame: 66u entries @@ -17051,15 +15558,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0xb2a12c80) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb2a12e40) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb2a12dc0) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -17120,25 +15619,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0xb2a12040) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb2a12580) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb2a12180) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb2a12c40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb2a12840) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -17346,10 +15829,6 @@ Q3TextEdit (0xb2a12f00) 0 QPaintDevice (0xb2906140) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2906240) 0 Vtable for Q3TextView Q3TextView::_ZTV10Q3TextView: 175u entries @@ -18131,15 +16610,7 @@ Q3NetworkOperation (0xb2906dc0) 0 QObject (0xb2906e00) 0 primary-for Q3NetworkOperation (0xb2906dc0) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb2906f80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb2906f00) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -20100,100 +18571,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0xb24ca000) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb24ca080) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0xb24ca0c0) 0 - primary-for Q3PtrVector (0xb24ca080) - Q3PtrCollection (0xb24ca100) 0 - primary-for Q3GVector (0xb24ca0c0) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb24ca1c0) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0xb24ca200) 0 - primary-for Q3PtrVector (0xb24ca1c0) - Q3PtrCollection (0xb24ca240) 0 - primary-for Q3GVector (0xb24ca200) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb24ca300) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0xb24ca340) 0 - primary-for Q3PtrList (0xb24ca300) - Q3PtrCollection (0xb24ca380) 0 - primary-for Q3GList (0xb24ca340) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0xb24ca440) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0xb24ca480) 0 - primary-for Q3IntDict (0xb24ca440) - Q3PtrCollection (0xb24ca4c0) 0 - primary-for Q3GDict (0xb24ca480) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -21616,15 +20000,7 @@ Q3ProgressBar (0xb259c680) 0 QPaintDevice (0xb259c780) 8 vptr=((& Q3ProgressBar::_ZTV13Q3ProgressBar) + 244u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb259ca40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb259c9c0) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -21879,25 +20255,9 @@ Q3HButtonGroup (0xb259cd00) 0 QPaintDevice (0xb259ce80) 8 vptr=((& Q3HButtonGroup::_ZTV14Q3HButtonGroup) + 236u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb259c3c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb259c080) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb259c7c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb259c580) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -21962,10 +20322,6 @@ Q3DockAreaLayout (0xb259cf00) 0 QLayoutItem (0xb259cfc0) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb248b0c0) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -23159,21 +21515,8 @@ Q3PointArray (0xb239e0c0) 0 QPolygon (0xb239e100) 0 QVector (0xb239e140) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0xb239e280) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0xb239e200) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0xb239e2c0) 0 - QLinkedList (0xb239e300) 0 Class Q3CanvasItemList size=4 align=4 @@ -24017,21 +22360,8 @@ Class Q3SqlFieldInfo Q3SqlFieldInfo (0xb228f280) 0 vptr=((& Q3SqlFieldInfo::_ZTV14Q3SqlFieldInfo) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0xb228f400) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0xb228f380) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0xb228f440) 0 - QLinkedList (0xb228f480) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -24040,31 +22370,10 @@ Q3SqlRecordInfo (0xb228f500) 0 Q3ValueList (0xb228f540) 0 QLinkedList (0xb228f580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb228f680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb228f600) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0xb228f740) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0xb228f780) 0 - QLinkedList::const_iterator (0xb228f7c0) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0xb228f840) 0 Vtable for Q3SqlForm Q3SqlForm::_ZTV9Q3SqlForm: 26u entries @@ -24462,243 +22771,51 @@ Q3SqlSelectCursor (0xb228fdc0) 0 QSqlRecord (0xb228fe40) 4 QSqlQuery (0xb228fe80) 8 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb228ff40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb228ffc0) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb228f240) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb228f700) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb228f900) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb228fec0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb1f19040) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb1f190c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1f192c0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb1f19340) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1f193c0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb1f19540) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb1f195c0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb1f19640) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb1f196c0) 0 -Class QLinkedListNode - size=52 align=4 - base size=52 base align=4 -QLinkedListNode (0xb1f197c0) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb1f19880) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb1f19900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1f19980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1f19a40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1f19b40) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb1f19c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1f19c80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1f19d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1f19d80) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb1f19e80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb1f19e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1f19f80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1f19740) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb1f198c0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb1f19bc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1f19fc0) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb1a9b080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1a9b140) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1a9b1c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1a9b280) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1a9b340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1a9b3c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1a9b440) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0xb1a9b540) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1a9b5c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1a9b680) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1a9b700) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb1a9b7c0) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0xb1a9b840) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb1a9b8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1a9ba00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1a9ba80) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.3.1.linux-gcc-ia32.txt b/tests/auto/bic/data/Qt3Support.4.3.1.linux-gcc-ia32.txt index 2b26b9be8..b6d0c9d87 100644 --- a/tests/auto/bic/data/Qt3Support.4.3.1.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/Qt3Support.4.3.1.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f7bd80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f7bdc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f7be80) 0 empty - QUintForSize<4> (0xb7f7bec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f7bf40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f7bf80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb74a4040) 0 empty - QIntForSize<4> (0xb74a4080) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb74a4340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a4400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a4440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a4480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a44c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a4500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a4540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a4580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a45c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a4600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a4640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a4680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a46c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a4700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a4740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a4780) 0 empty Class QFlag size=4 align=4 @@ -161,10 +75,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb74a4bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74a4c00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -227,70 +137,18 @@ Class QListData base size=4 base align=4 QListData (0xb74a4f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a400) 0 Class QInternal size=1 align=1 @@ -308,10 +166,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb5a0a500) 0 QGenericArgument (0xb5a0a540) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb5a0a700) 0 Class QMetaObject size=16 align=4 @@ -328,10 +182,6 @@ Class QChar base size=2 base align=2 QChar (0xb5a0a7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a0a840) 0 empty Class QString::Null size=1 align=1 @@ -348,10 +198,6 @@ Class QString base size=4 base align=4 QString (0xb5a0a880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0aa80) 0 Class QLatin1String size=4 align=4 @@ -369,25 +215,13 @@ Class QConstString QConstString (0xb5a0ab40) 0 QString (0xb5a0ab80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a0abc0) 0 empty Class QStringRef size=12 align=4 base size=12 base align=4 QStringRef (0xb5a0ac00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5a0ad40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5a0acc0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -479,10 +313,6 @@ QIODevice (0xb5a0af80) 0 QObject (0xb5a0afc0) 0 primary-for QIODevice (0xb5a0af80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0a000) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -502,275 +332,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb5a0aa00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ec9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55eca00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55eca40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55eca80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ecac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ecb00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ecb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ecb80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ecbc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ecc00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ecc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ecc80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55eccc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ecd00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ecd40) 0 empty Class QMapData::Node size=8 align=4 @@ -807,45 +421,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb562d200) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb562d480) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb562d4c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb562d5c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb562d540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb562d6c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb562d640) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb562d740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb562d7c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -972,10 +558,6 @@ QEventLoop (0xb562dc40) 0 QObject (0xb562dc80) 0 primary-for QEventLoop (0xb562dc40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb562dd80) 0 Vtable for QCoreApplication QCoreApplication::_ZTV16QCoreApplication: 16u entries @@ -1009,10 +591,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb562df40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb562df80) 0 empty Vtable for QTimer QTimer::_ZTV6QTimer: 14u entries @@ -1069,20 +647,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb562d440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb562d340) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb562d400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb562d840) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1277,20 +847,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb542a080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb542a0c0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb542a100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb542a140) 0 empty Class QMetaProperty size=20 align=4 @@ -1302,10 +864,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb542a1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb542a200) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1408,100 +966,48 @@ Class QSize base size=8 base align=4 QSize (0xb542a500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb542a700) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb542a780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb542a980) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb542aa40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb542ac80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb542acc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb542af00) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb542af40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb542a040) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb542a2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb542a380) 0 empty -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb542a540) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb542a580) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb542a440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb542a5c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb542a600) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb542a640) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb542a680) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb542a6c0) 0 Class timespec size=8 align=4 @@ -1513,80 +1019,24 @@ Class timeval base size=8 base align=4 timeval (0xb542a800) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb542a840) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb542a880) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb542a8c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb542aa80) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb542a940) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb542a900) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb542aac0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb542ab40) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb542ab00) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb542ab80) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb542ac00) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb542abc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb542ac40) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb542ad00) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb542ad40) 0 Class random_data size=28 align=4 @@ -1618,35 +1068,19 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb524a1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb524a200) 0 empty Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb524a980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb524a9c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb524aa00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb524aac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb524aa40) 0 Class QStringList size=4 align=4 @@ -1654,15 +1088,7 @@ Class QStringList QStringList (0xb524ab00) 0 QList (0xb524ab40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb524abc0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb524ac00) 0 Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1695,15 +1121,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb524ae00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb524ae40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb524ae80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1730,10 +1148,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb5027000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5027040) 0 empty Class QCryptographicHash size=4 align=4 @@ -1750,20 +1164,12 @@ Class QLine base size=16 base align=4 QLine (0xb5027480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50274c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb5027500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5027540) 0 empty Class QSharedData size=4 align=4 @@ -1775,30 +1181,18 @@ Class QDate base size=4 base align=4 QDate (0xb50276c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5027780) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb50277c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5027880) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb50278c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5027980) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1810,20 +1204,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb5027a00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb5027a80) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb5027a40) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb5027b00) 0 Class QWriteLocker size=4 align=4 @@ -1876,20 +1262,12 @@ Class QMutex base size=4 base align=4 QMutex (0xb5027d40) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb5027dc0) 0 Class QMutexLocker size=4 align=4 base size=4 base align=4 QMutexLocker (0xb5027d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5027ec0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1914,15 +1292,7 @@ Class QTextCodec QTextCodec (0xb5027e00) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb50273c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5027f80) 0 Class QTextEncoder size=32 align=4 @@ -1934,25 +1304,9 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb5027740) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb5027840) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5027800) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb5027900) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5027940) 0 Class __gconv_trans_data size=20 align=4 @@ -1974,15 +1328,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb4e16000) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb4e16080) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb4e16040) 0 Class _IO_marker size=12 align=4 @@ -1994,10 +1340,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb4e16100) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb4e16140) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -2012,10 +1354,6 @@ Class QTextStream QTextStream (0xb4e16180) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e16240) 0 Class QTextStreamManipulator size=24 align=4 @@ -2131,35 +1469,15 @@ QFile (0xb4e16680) 0 QObject (0xb4e16700) 0 primary-for QIODevice (0xb4e166c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e16780) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb4e167c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e16800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4e16840) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4e16900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4e16880) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -2212,15 +1530,7 @@ Class QDir base size=4 base align=4 QDir (0xb4e16a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e16b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e16b80) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2277,10 +1587,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb4e16bc0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e16d40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2409,15 +1715,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb4e16200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e16480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4e16580) 0 empty Vtable for QDirIterator QDirIterator::_ZTV12QDirIterator: 4u entries @@ -2432,10 +1730,6 @@ Class QDirIterator QDirIterator (0xb4e16640) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e16a40) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -2541,10 +1835,6 @@ QLibrary (0xb4a89140) 0 QObject (0xb4a89180) 0 primary-for QLibrary (0xb4a89140) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4a89200) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2674,10 +1964,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb4a89740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4a89840) 0 Vtable for QLayoutItem QLayoutItem::_ZTV11QLayoutItem: 18u entries @@ -3103,40 +2389,16 @@ Class QPaintDevice QPaintDevice (0xb4a89480) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4a89800) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4a898c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4a89980) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4a897c0) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0xb4a89700) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a89cc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a89a40) 0 Class QPolygon size=4 align=4 @@ -3144,15 +2406,7 @@ Class QPolygon QPolygon (0xb4a89e00) 0 QVector (0xb4a89f80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a4a080) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a4a000) 0 Class QPolygonF size=4 align=4 @@ -3175,10 +2429,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb4a4a2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a4a300) 0 empty Class QPainterPath::Element size=20 align=4 @@ -3190,25 +2440,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb4a4a340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a4a5c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a4a540) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb4a4a440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a4a600) 0 empty Class QPainterPathStroker size=4 align=4 @@ -3220,10 +2458,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb4a4a700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a4a740) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3248,10 +2482,6 @@ QImage (0xb4a4a800) 0 QPaintDevice (0xb4a4a840) 0 primary-for QImage (0xb4a4a800) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a4a980) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -3276,45 +2506,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb4a4ab40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a4abc0) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb4a4ac00) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4a4ad40) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4a4acc0) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb4a4adc0) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb4a4ae00) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb4a4ae40) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb4a4ad80) 0 Class QGradient size=56 align=4 @@ -3380,10 +2582,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb4a4aa80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a4aac0) 0 empty Class QWidgetData size=64 align=4 @@ -3466,10 +2664,6 @@ QWidget (0xb4a4ac80) 0 QPaintDevice (0xb4697040) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4697240) 0 Class QToolTip size=1 align=1 @@ -3558,10 +2752,6 @@ Class QIcon base size=4 base align=4 QIcon (0xb46974c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4697580) 0 empty Vtable for QAction QAction::_ZTV7QAction: 14u entries @@ -3613,15 +2803,7 @@ QActionGroup (0xb46976c0) 0 QObject (0xb4697700) 0 primary-for QActionGroup (0xb46976c0) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4697840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb46977c0) 0 Vtable for QShortcut QShortcut::_ZTV9QShortcut: 14u entries @@ -3961,15 +3143,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb46631c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb46632c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4663240) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -4663,10 +3837,6 @@ QAbstractPrintDialog (0xb4515100) 0 QPaintDevice (0xb4515200) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb45152c0) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -4837,10 +4007,6 @@ QMessageBox (0xb45154c0) 0 QPaintDevice (0xb45155c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4515680) 0 Vtable for QProgressDialog QProgressDialog::_ZTV15QProgressDialog: 66u entries @@ -5091,10 +4257,6 @@ QFileDialog (0xb45159c0) 0 QPaintDevice (0xb4515ac0) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4515b80) 0 Vtable for QErrorMessage QErrorMessage::_ZTV13QErrorMessage: 66u entries @@ -5505,10 +4667,6 @@ QWizard (0xb4515800) 0 QPaintDevice (0xb4515e40) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4515f80) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -5850,10 +5008,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb427e600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb427e680) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5884,20 +5038,8 @@ QItemSelectionModel (0xb427e6c0) 0 QObject (0xb427e700) 0 primary-for QItemSelectionModel (0xb427e6c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb427e780) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb427e840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb427e7c0) 0 Class QItemSelection size=4 align=4 @@ -6104,10 +5246,6 @@ QAbstractSpinBox (0xb427ecc0) 0 QPaintDevice (0xb427ed80) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb427ee00) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6315,15 +5453,7 @@ QStyle (0xb427e5c0) 0 QObject (0xb427e740) 0 primary-for QStyle (0xb427e5c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb427ea80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb427eb80) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -6582,10 +5712,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb420a440) 0 QStyleOption (0xb420a480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb420a600) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6612,10 +5738,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb420a880) 0 QStyleOption (0xb420a8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb420aa40) 0 Class QStyleOptionButton size=64 align=4 @@ -6623,10 +5745,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb420a980) 0 QStyleOption (0xb420a9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb420abc0) 0 Class QStyleOptionTab size=72 align=4 @@ -6641,10 +5759,6 @@ QStyleOptionTabV2 (0xb420ac40) 0 QStyleOptionTab (0xb420ac80) 0 QStyleOption (0xb420acc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb420ae40) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6671,10 +5785,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb420a300) 0 QStyleOption (0xb420a400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb420a780) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6707,10 +5817,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb411e000) 0 QStyleOption (0xb411e040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb411e1c0) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -6766,15 +5872,7 @@ QStyleOptionSpinBox (0xb411e8c0) 0 QStyleOptionComplex (0xb411e900) 0 QStyleOption (0xb411e940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb411eb40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb411eac0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6783,10 +5881,6 @@ QStyleOptionQ3ListView (0xb411e9c0) 0 QStyleOptionComplex (0xb411ea00) 0 QStyleOption (0xb411ea40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb411ed00) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7000,10 +6094,6 @@ QAbstractItemView (0xb3fd5080) 0 QPaintDevice (0xb3fd51c0) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3fd5280) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -7384,20 +6474,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb3fd5b80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3fd5c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3fd5c40) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb3fd5c80) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -7428,20 +6506,8 @@ QAccessibleInterface (0xb3fd5d40) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb3fd5d80) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3fd5f00) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3fd5e80) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb3fd5e00) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -8862,10 +7928,6 @@ QDateEdit (0xb3dcf980) 0 QPaintDevice (0xb3dcfac0) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3dcfb40) 0 Vtable for QButtonGroup QButtonGroup::_ZTV12QButtonGroup: 14u entries @@ -8970,10 +8032,6 @@ QDockWidget (0xb3dcfc40) 0 QPaintDevice (0xb3dcfd00) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3dcfdc0) 0 Vtable for QMainWindow QMainWindow::_ZTV11QMainWindow: 64u entries @@ -9054,10 +8112,6 @@ QMainWindow (0xb3dcfe00) 0 QPaintDevice (0xb3dcfec0) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3dcff40) 0 Vtable for QMenu QMenu::_ZTV5QMenu: 63u entries @@ -9867,10 +8921,6 @@ QFontComboBox (0xb3b3d900) 0 QPaintDevice (0xb3b3da00) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3b3da80) 0 Vtable for QToolBox QToolBox::_ZTV8QToolBox: 65u entries @@ -10277,10 +9327,6 @@ QMdiArea (0xb3b3d000) 0 QPaintDevice (0xb3b3d700) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3b3d880) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10597,10 +9643,6 @@ QMdiSubWindow (0xb3aaf300) 0 QPaintDevice (0xb3aaf3c0) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3aaf440) 0 Vtable for QMenuItem QMenuItem::_ZTV9QMenuItem: 14u entries @@ -10672,60 +9714,32 @@ QTextDocument (0xb3aaf640) 0 QObject (0xb3aaf680) 0 primary-for QTextDocument (0xb3aaf640) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3aaf700) 0 Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0xb3aaf740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3aaf780) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0xb3aaf7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3aaf880) 0 empty Class QTextLength size=12 align=4 base size=12 base align=4 QTextLength (0xb3aaf8c0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb3aafa00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb3aaf980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3aafb80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3aafb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3aafbc0) 0 Class QTextCharFormat size=8 align=4 @@ -10765,10 +9779,6 @@ QTextTableFormat (0xb3aafec0) 0 QTextFrameFormat (0xb3aaff00) 0 QTextFormat (0xb3aaff40) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb3aaf040) 0 Class QTextCursor size=4 align=4 @@ -10875,10 +9885,6 @@ QTextFrame (0xb3aaf840) 0 QObject (0xb3aaf940) 0 primary-for QTextObject (0xb3aaf900) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3aaffc0) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -10903,25 +9909,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb38ba080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb38ba100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb38ba140) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb38ba180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb38ba1c0) 0 empty Class QTextInlineObject size=8 align=4 @@ -10938,15 +9932,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb38ba240) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb38ba3c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb38ba340) 0 Class QTextLine size=8 align=4 @@ -11046,10 +10032,6 @@ QTextEdit (0xb38ba440) 0 QPaintDevice (0xb38ba580) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb38ba680) 0 Vtable for QLCDNumber QLCDNumber::_ZTV10QLCDNumber: 63u entries @@ -11289,10 +10271,6 @@ QDialogButtonBox (0xb38ba9c0) 0 QPaintDevice (0xb38baa80) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb38bab00) 0 Vtable for QCalendarWidget QCalendarWidget::_ZTV15QCalendarWidget: 64u entries @@ -11556,15 +10534,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb38ba980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb38bafc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb38bac80) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -11788,20 +10758,8 @@ Class QGraphicsItem QGraphicsItem (0xb38156c0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb38157c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb3815800) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb38158c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -12363,50 +11321,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb3815780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3815a00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3815e00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3815c00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb35af040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3815f80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb35af140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb35af0c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb35af240) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb35af1c0) 0 Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -12453,20 +11375,8 @@ QGraphicsScene (0xb35af280) 0 QObject (0xb35af2c0) 0 primary-for QGraphicsScene (0xb35af280) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35af3c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb35af480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb35af400) 0 Vtable for QGraphicsView QGraphicsView::_ZTV13QGraphicsView: 68u entries @@ -12555,15 +11465,7 @@ QGraphicsView (0xb35af4c0) 0 QPaintDevice (0xb35af600) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35af6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35af700) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -12957,10 +11859,6 @@ QImageIOPlugin (0xb333a140) 0 QFactoryInterface (0xb333a200) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb333a1c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb333a280) 0 Class QImageReader size=4 align=4 @@ -13412,10 +12310,6 @@ Class QStyleFactory base size=0 base align=1 QStyleFactory (0xb333aa40) 0 empty -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb333ae80) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -13876,15 +12770,7 @@ Class QStandardItem QStandardItem (0xb3430b00) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3430dc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3430d40) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -13998,15 +12884,7 @@ QStringListModel (0xb3430f00) 0 QObject (0xb3430fc0) 0 primary-for QAbstractItemModel (0xb3430f80) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3430540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3430240) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -14530,35 +13408,15 @@ QTreeView (0xb3185580) 0 QPaintDevice (0xb3185700) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3185800) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0xb3185780) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb3185940) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb31858c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3185a40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb31859c0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -14726,15 +13584,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb3185d00) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3185fc0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3185f40) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -15254,15 +14104,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb2f3b700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2f3b740) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f3b800) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -15297,20 +14139,12 @@ Class QPaintEngine QPaintEngine (0xb2f3b780) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f3b900) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb2f3b880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f3b940) 0 Class QColormap size=4 align=4 @@ -15588,10 +14422,6 @@ Class QSslCipher base size=4 base align=4 QSslCipher (0xb2f3bac0) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb2f3bc40) 0 empty Vtable for QSslSocket QSslSocket::_ZTV10QSslSocket: 30u entries @@ -15678,20 +14508,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0xb2ee4240) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb2ee4300) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0xb2ee4280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2ee4340) 0 Vtable for QUdpSocket QUdpSocket::_ZTV10QUdpSocket: 30u entries @@ -15738,10 +14560,6 @@ QUdpSocket (0xb2ee4380) 0 QObject (0xb2ee4440) 0 primary-for QIODevice (0xb2ee4400) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2ee44c0) 0 Class QSslKey size=4 align=4 @@ -15758,15 +14576,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0xb2ee4580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb2ee4700) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb2ee4680) 0 Class QSqlIndex size=16 align=4 @@ -15779,10 +14589,6 @@ Class QSqlError base size=16 base align=4 QSqlError (0xb2ee4740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2ee4780) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -16542,21 +15348,8 @@ Q3EditorFactory (0xb2c62580) 0 QObject (0xb2c625c0) 0 primary-for Q3EditorFactory (0xb2c62580) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0xb2c62840) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0xb2c627c0) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0xb2c62880) 0 - QLinkedList (0xb2c628c0) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -16565,31 +15358,10 @@ Q3SqlRecordInfo (0xb2c62940) 0 Q3ValueList (0xb2c62980) 0 QLinkedList (0xb2c629c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb2c62ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb2c62a40) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0xb2c62b80) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0xb2c62bc0) 0 - QLinkedList::const_iterator (0xb2c62c00) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0xb2c62c80) 0 Vtable for Q3Frame Q3Frame::_ZTV7Q3Frame: 66u entries @@ -16834,29 +15606,7 @@ Q3GVector (0xb2c621c0) 0 Q3PtrCollection (0xb2c62280) 0 primary-for Q3GVector (0xb2c621c0) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb2c62b40) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0xb2c62c40) 0 - primary-for Q3PtrVector (0xb2c62b40) - Q3PtrCollection (0xb2c62e00) 0 - primary-for Q3GVector (0xb2c62c40) Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -17013,29 +15763,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0xb2bb04c0) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb2bb0640) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0xb2bb0680) 0 - primary-for Q3PtrList (0xb2bb0640) - Q3PtrCollection (0xb2bb06c0) 0 - primary-for Q3GList (0xb2bb0680) Class Q3BaseBucket size=8 align=4 @@ -17092,28 +15820,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0xb2bb0b00) 0 -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0xb2bb0c00) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0xb2bb0c40) 0 - primary-for Q3IntDict (0xb2bb0c00) - Q3PtrCollection (0xb2bb0c80) 0 - primary-for Q3GDict (0xb2bb0c40) Class Q3TableSelection size=28 align=4 @@ -17224,100 +15931,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0xb2bb0cc0) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb2bb0e00) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0xb2bb0ec0) 0 - primary-for Q3PtrVector (0xb2bb0e00) - Q3PtrCollection (0xb2bb0f80) 0 - primary-for Q3GVector (0xb2bb0ec0) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb2ad8080) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0xb2ad80c0) 0 - primary-for Q3PtrVector (0xb2ad8080) - Q3PtrCollection (0xb2ad8100) 0 - primary-for Q3GVector (0xb2ad80c0) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb2ad81c0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0xb2ad8200) 0 - primary-for Q3PtrList (0xb2ad81c0) - Q3PtrCollection (0xb2ad8240) 0 - primary-for Q3GList (0xb2ad8200) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0xb2ad8300) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0xb2ad8340) 0 - primary-for Q3IntDict (0xb2ad8300) - Q3PtrCollection (0xb2ad8380) 0 - primary-for Q3GDict (0xb2ad8340) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -18082,28 +16702,7 @@ Class Q3Url Q3Url (0xb2ad8c00) 0 vptr=((& Q3Url::_ZTV5Q3Url) + 8u) -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0xb2ad8d40) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0xb2ad8d80) 0 - primary-for Q3Dict (0xb2ad8d40) - Q3PtrCollection (0xb2ad8dc0) 0 - primary-for Q3GDict (0xb2ad8d80) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -18379,51 +16978,9 @@ Class Q3CString Q3CString (0xb29ef0c0) 0 QByteArray (0xb29ef100) 0 -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0xb29ef280) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0xb29ef2c0) 0 - primary-for Q3AsciiDict (0xb29ef280) - Q3PtrCollection (0xb29ef300) 0 - primary-for Q3GDict (0xb29ef2c0) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0xb29ef400) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0xb29ef440) 0 - primary-for Q3AsciiDict (0xb29ef400) - Q3PtrCollection (0xb29ef480) 0 - primary-for Q3GDict (0xb29ef440) Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -18474,49 +17031,9 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0xb29ef740) 0 -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0xb29ef840) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0xb29ef880) 0 - primary-for Q3IntCache (0xb29ef840) - Q3PtrCollection (0xb29ef8c0) 0 - primary-for Q3GCache (0xb29ef880) - -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0xb29efb80) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0xb29efbc0) 0 - primary-for Q3PtrDict (0xb29efb80) - Q3PtrCollection (0xb29efc00) 0 - primary-for Q3GDict (0xb29efbc0) + Vtable for Q3Signal Q3Signal::_ZTV8Q3Signal: 14u entries @@ -18543,50 +17060,9 @@ Q3Signal (0xb29efd00) 0 QObject (0xb29efd40) 0 primary-for Q3Signal (0xb29efd00) -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0xb29efe80) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0xb29efec0) 0 - primary-for Q3Cache (0xb29efe80) - Q3PtrCollection (0xb29eff00) 0 - primary-for Q3GCache (0xb29efec0) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb29ef340) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0xb29ef4c0) 0 - primary-for Q3PtrList (0xb29ef340) - Q3PtrCollection (0xb29ef600) 0 - primary-for Q3GList (0xb29ef4c0) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -18614,11 +17090,6 @@ Q3StrList (0xb29ef700) 0 Q3PtrCollection (0xb29efd80) 0 primary-for Q3GList (0xb29efc40) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0xb291f000) 0 - Q3GListStdIterator (0xb291f040) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -18648,98 +17119,13 @@ Q3StrIList (0xb291f080) 0 Q3PtrCollection (0xb291f180) 0 primary-for Q3GList (0xb291f140) -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0xb291f2c0) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0xb291f300) 0 - primary-for Q3AsciiCache (0xb291f2c0) - Q3PtrCollection (0xb291f340) 0 - primary-for Q3GCache (0xb291f300) - -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0xb291f500) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0xb291f540) 0 - primary-for Q3PtrQueue (0xb291f500) - Q3PtrCollection (0xb291f580) 0 - primary-for Q3GList (0xb291f540) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0xb291f700) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0xb291f740) 0 - primary-for Q3PtrStack (0xb291f700) - Q3PtrCollection (0xb291f780) 0 - primary-for Q3GList (0xb291f740) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb291f800) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0xb291f840) 0 - primary-for Q3PtrVector (0xb291f800) - Q3PtrCollection (0xb291f880) 0 - primary-for Q3GVector (0xb291f840) + + Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -19777,25 +18163,9 @@ Q3SpinWidget (0xb27f6a00) 0 QPaintDevice (0xb27f6ac0) 8 vptr=((& Q3SpinWidget::_ZTV12Q3SpinWidget) + 236u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb27f6d00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb27f6c80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb27f6e00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb27f6d80) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -19860,10 +18230,6 @@ Q3DockAreaLayout (0xb27f6b40) 0 QLayoutItem (0xb27f6c00) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb27f60c0) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -20908,15 +19274,7 @@ Q3ActionGroup (0xb26ddd40) 0 QObject (0xb26dddc0) 0 primary-for Q3Action (0xb26ddd80) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb26dd380) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb26dd080) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -21176,15 +19534,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0xb25db1c0) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb25db380) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb25db300) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -21245,25 +19595,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0xb25db540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb25db640) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb25db5c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb25db780) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb25db700) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -21471,10 +19805,6 @@ Q3TextEdit (0xb25db840) 0 QPaintDevice (0xb25db9c0) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb25dbac0) 0 Vtable for Q3TextBrowser Q3TextBrowser::_ZTV13Q3TextBrowser: 180u entries @@ -22136,21 +20466,8 @@ Q3PointArray (0xb24f7100) 0 QPolygon (0xb24f7140) 0 QVector (0xb24f7180) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0xb24f72c0) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0xb24f7240) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0xb24f7300) 0 - QLinkedList (0xb24f7340) 0 Class Q3CanvasItemList size=4 align=4 @@ -23445,15 +21762,7 @@ Q3ServerSocket (0xb23ecf40) 0 QObject (0xb23ecf80) 0 primary-for Q3ServerSocket (0xb23ecf40) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb23ec500) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb23ec200) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -24462,243 +22771,51 @@ Class Q3Painter Q3Painter (0xb22df640) 0 QPainter (0xb22df700) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb22dfa00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb22dfb80) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb22dfd80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb1f4f000) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb1f4f080) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1f4f200) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb1f4f280) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb1f4f300) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb1f4f380) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb1f4f500) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb1f4f580) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb1f4f600) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb1f4f680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1f4f880) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb1f4f900) 0 -Class QLinkedListNode - size=52 align=4 - base size=52 base align=4 -QLinkedListNode (0xb1f4fa00) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb1f4fac0) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb1f4fb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1f4fbc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1f4fc40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1f4fd00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1f4fe00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1f4fec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1f4ff40) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb1f4ffc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb1f4f980) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb1f4f400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1ceb000) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1ceb100) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb1ceb180) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb1ceb240) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1ceb300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1ceb380) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1ceb400) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1ceb4c0) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb1ceb580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1ceb640) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1ceb6c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1ceb740) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1ceb840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1ceb900) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1ceb980) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0xb1ceba80) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb1cebb00) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0xb1cebb80) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb1cebc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1cebd40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1cebdc0) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.3.2.linux-gcc-ia32.txt b/tests/auto/bic/data/Qt3Support.4.3.2.linux-gcc-ia32.txt index 8609b1888..43b5a434f 100644 --- a/tests/auto/bic/data/Qt3Support.4.3.2.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/Qt3Support.4.3.2.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f85d80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f85dc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f85e80) 0 empty - QUintForSize<4> (0xb7f85ec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f85f40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f85f80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb78ac040) 0 empty - QIntForSize<4> (0xb78ac080) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb78ac340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78ac780) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb78ac7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78ac8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78ac900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78ac940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78ac980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78ac9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78aca00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78aca40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78aca80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78acac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78acb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78acb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78acb80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78acbc0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb78accc0) 0 QGenericArgument (0xb78acd00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb78acec0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb78acf80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb59a6000) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb59a6300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb59a6340) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb59a6380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb59a6580) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb59a6680) 0 QString (0xb59a66c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb59a6700) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb59a6a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb59a6dc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb59a6d40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb59a64c0) 0 QObject (0xb59a6500) 0 primary-for QLibrary (0xb59a64c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb59a6840) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb59a6c00) 0 QObject (0xb59a6e40) 0 primary-for QIODevice (0xb59a6c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55c6000) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb55c60c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55c6100) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb55c6140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb55c6200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb55c6180) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb55c6240) 0 QList (0xb55c6280) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb55c6300) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb55c6340) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb55c66c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55c6700) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb55c6c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55c6d00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb55c6d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55c6e00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb55c6e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55c6f00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb55c6f40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb55c6fc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb55c6080) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb55c6f80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb55c6440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb55c6580) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb55c6ac0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb55c6c80) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb55c6cc0) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb55c6dc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb55c6e80) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb55c6ec0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb5592000) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb55920c0) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb5592080) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb5592040) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb5592100) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb5592180) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb5592140) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb55921c0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb5592240) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb5592200) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5592280) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb55922c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb5592300) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb5592580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5592780) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb5592800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5592a00) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb5592dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5592e00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5592e40) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb51c2040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51c2280) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb51c22c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51c2500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb51c2640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51c2740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb51c2780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51c2840) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb51c2880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51c28c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb51c2900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51c2940) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb51c2cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51c2d00) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb51c2e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51c2ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51c2f00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb51c2f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c20c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c21c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c23c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c24c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c26c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c27c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51c2b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50340c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50341c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50342c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50343c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50344c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50345c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50346c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5034780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50347c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb5034800) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5034a80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5034ac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5034bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5034b40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb5034cc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb5034c40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb5034d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5034dc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb5034e00) 0 QObject (0xb5034e40) 0 primary-for QSettings (0xb5034e00) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb5034f40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5034f00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb5034f80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5034fc0) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb5034a00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb5034e80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb5034a40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb4f12000) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb4f12040) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb4f12080) 0 QObject (0xb4f12100) 0 primary-for QIODevice (0xb4f120c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f12180) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb4f12300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f12340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f12380) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4f12440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4f123c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb4f12480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f12500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f12580) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb4f127c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f12880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb4f128c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f12a40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb4f12b00) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f12c40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb4f12b80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4f12d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4f12d00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb4f12e40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f12f00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb4d520c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb4d52140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb4d52100) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb4d521c0) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb4d52200) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb4d52280) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb4d52580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d525c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb4d526c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d52700) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb4d52740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d527c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb4d52c40) 0 QObject (0xb4d52c80) 0 primary-for QEventLoop (0xb4d52c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d52d80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb4d52e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d52ec0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb4d52f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ad0000) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb4ad0080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ad00c0) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2726,25 +2016,13 @@ QImageIOPlugin (0xb4ad0500) 0 QFactoryInterface (0xb4ad05c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb4ad0580) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ad0640) 0 Class QImageReader size=4 align=4 base size=4 base align=4 QImageReader (0xb4ad0680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4ad0740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4ad06c0) 0 Class QPolygon size=4 align=4 @@ -2752,15 +2030,7 @@ Class QPolygon QPolygon (0xb4ad0780) 0 QVector (0xb4ad07c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4ad0880) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4ad0800) 0 Class QPolygonF size=4 align=4 @@ -2783,10 +2053,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb4ad0ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ad0b00) 0 empty Class QPainterPath::Element size=20 align=4 @@ -2798,25 +2064,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb4ad0b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4ad0dc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4ad0d40) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb4ad0c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ad0e00) 0 empty Class QPainterPathStroker size=4 align=4 @@ -2828,10 +2082,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb4ad0f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ad0f40) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2872,30 +2122,10 @@ QImage (0xb4ad03c0) 0 QPaintDevice (0xb4ad0480) 0 primary-for QImage (0xb4ad03c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ad0980) 0 empty -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4ad0a40) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4ad0bc0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4ad0c00) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4ad0a00) 0 Class QColor size=16 align=4 @@ -3083,10 +2313,6 @@ Class QIcon base size=4 base align=4 QIcon (0xb48ad940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb48ada00) 0 empty Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -3225,10 +2451,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb48adf40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb48ad000) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3526,15 +2748,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb47f2840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb47f2940) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb47f28c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3823,20 +3037,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb486f040) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb486f0c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb486f100) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb486f140) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3867,20 +3069,8 @@ QAccessibleInterface (0xb486f200) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb486f240) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb486f3c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb486f340) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb486f2c0) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -4402,55 +3592,23 @@ Class QPen base size=4 base align=4 QPen (0xb4726500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb47265c0) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0xb4726600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4726680) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb47266c0) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4726800) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4726780) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb4726880) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb47268c0) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb4726900) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb4726840) 0 Class QGradient size=56 align=4 @@ -4480,30 +3638,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb4726ac0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4726c00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb4726b80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4726d80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4726d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4726dc0) 0 Class QTextCharFormat size=8 align=4 @@ -4643,10 +3785,6 @@ QTextFrame (0xb4726c80) 0 QObject (0xb44a3040) 0 primary-for QTextObject (0xb44a3000) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44a3180) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -4671,25 +3809,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb44a3240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44a32c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44a3300) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb44a3340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44a3380) 0 empty Class QTextDocumentFragment size=4 align=4 @@ -4756,10 +3882,6 @@ QTextTable (0xb44a3500) 0 QObject (0xb44a35c0) 0 primary-for QTextObject (0xb44a3580) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb44a3740) 0 Class QTextCursor size=4 align=4 @@ -4808,10 +3930,6 @@ Class QTextOption base size=24 base align=4 QTextOption (0xb44a3980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44a39c0) 0 Class QTextInlineObject size=8 align=4 @@ -4828,15 +3946,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb44a3a40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb44a3bc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb44a3b40) 0 Class QTextLine size=8 align=4 @@ -4886,10 +3996,6 @@ QTextDocument (0xb44a3d00) 0 QObject (0xb44a3d40) 0 primary-for QTextDocument (0xb44a3d00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44a3dc0) 0 Class QPalette size=8 align=4 @@ -4907,15 +4013,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb44a3fc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb44a3700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb44a3480) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4977,10 +4075,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb44a3e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44480c0) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5028,15 +4122,7 @@ QStyle (0xb4448100) 0 QObject (0xb4448140) 0 primary-for QStyle (0xb4448100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4448200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4448240) 0 Vtable for QCommonStyle QCommonStyle::_ZTV12QCommonStyle: 35u entries @@ -5242,10 +4328,6 @@ QWindowsXPStyle (0xb4448780) 0 QObject (0xb4448880) 0 primary-for QStyle (0xb4448840) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb4448a40) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -5541,10 +4623,6 @@ QWidget (0xb4448040) 0 QPaintDevice (0xb44481c0) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4448480) 0 Vtable for QValidator QValidator::_ZTV10QValidator: 16u entries @@ -5745,10 +4823,6 @@ QAbstractSpinBox (0xb422f140) 0 QPaintDevice (0xb422f200) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb422f280) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6167,10 +5241,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb422fac0) 0 QStyleOption (0xb422fb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb422fc80) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6197,10 +5267,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb422ff00) 0 QStyleOption (0xb422ff40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb422f240) 0 Class QStyleOptionButton size=64 align=4 @@ -6208,10 +5274,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb422f000) 0 QStyleOption (0xb422f100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb422f6c0) 0 Class QStyleOptionTab size=72 align=4 @@ -6226,10 +5288,6 @@ QStyleOptionTabV2 (0xb422f840) 0 QStyleOptionTab (0xb422f980) 0 QStyleOption (0xb422fa80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb422ffc0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6256,10 +5314,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb3f70200) 0 QStyleOption (0xb3f70240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f70380) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6292,10 +5346,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb3f706c0) 0 QStyleOption (0xb3f70700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f70880) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -6351,15 +5401,7 @@ QStyleOptionSpinBox (0xb3f70f80) 0 QStyleOptionComplex (0xb3f70fc0) 0 QStyleOption (0xb3f70000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3f70540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3f703c0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6368,10 +5410,6 @@ QStyleOptionQ3ListView (0xb3f70100) 0 QStyleOptionComplex (0xb3f70280) 0 QStyleOption (0xb3f70340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f70e00) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6488,10 +5526,6 @@ Class QStyleFactory base size=0 base align=1 QStyleFactory (0xb3e56780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3e56840) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -6663,10 +5697,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb3e56b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3e56bc0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6697,20 +5727,8 @@ QItemSelectionModel (0xb3e56c00) 0 QObject (0xb3e56c40) 0 primary-for QItemSelectionModel (0xb3e56c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3e56cc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3e56d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3e56d00) 0 Class QItemSelection size=4 align=4 @@ -6872,10 +5890,6 @@ QAbstractItemView (0xb3e56f00) 0 QPaintDevice (0xb3e56180) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3e563c0) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -7140,15 +6154,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb3da4280) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3da4540) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3da44c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7296,15 +6302,7 @@ Class QTableWidgetSelectionRange base size=16 base align=4 QTableWidgetSelectionRange (0xb3da4800) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3da4940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3da48c0) 0 Vtable for QTableWidgetItem QTableWidgetItem::_ZTV16QTableWidgetItem: 10u entries @@ -7790,15 +6788,7 @@ Class QStandardItem QStandardItem (0xb3da4dc0) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3cfe100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3cfe080) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -7926,25 +6916,9 @@ QDirModel (0xb3cfe300) 0 QObject (0xb3cfe380) 0 primary-for QAbstractItemModel (0xb3cfe340) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb3cfe500) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb3cfe480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3cfe600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3cfe580) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8540,15 +7514,7 @@ QActionGroup (0xb3cfe440) 0 QObject (0xb3cfe540) 0 primary-for QActionGroup (0xb3cfe440) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3cfeb40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3cfe880) 0 Vtable for QLayoutItem QLayoutItem::_ZTV11QLayoutItem: 18u entries @@ -9687,10 +8653,6 @@ QMdiArea (0xb387c0c0) 0 QPaintDevice (0xb387c200) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb387c280) 0 Vtable for QAbstractButton QAbstractButton::_ZTV15QAbstractButton: 66u entries @@ -10012,10 +8974,6 @@ QMdiSubWindow (0xb387c6c0) 0 QPaintDevice (0xb387c780) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb387c800) 0 Vtable for QCalendarWidget QCalendarWidget::_ZTV15QCalendarWidget: 64u entries @@ -10493,10 +9451,6 @@ QDialogButtonBox (0xb387cf80) 0 QPaintDevice (0xb387c240) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb387c3c0) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -10576,10 +9530,6 @@ QDockWidget (0xb387c540) 0 QPaintDevice (0xb387c980) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb387cc40) 0 Vtable for QScrollArea QScrollArea::_ZTV11QScrollArea: 65u entries @@ -10930,10 +9880,6 @@ QDateEdit (0xb363e440) 0 QPaintDevice (0xb363e580) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb363e600) 0 Vtable for QFontComboBox QFontComboBox::_ZTV13QFontComboBox: 65u entries @@ -11017,10 +9963,6 @@ QFontComboBox (0xb363e640) 0 QPaintDevice (0xb363e740) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb363e7c0) 0 Vtable for QToolBox QToolBox::_ZTV8QToolBox: 65u entries @@ -11275,10 +10217,6 @@ QTextEdit (0xb363eac0) 0 QPaintDevice (0xb363ec00) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb363ed00) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -12210,10 +11148,6 @@ QMainWindow (0xb3586980) 0 QPaintDevice (0xb3586a40) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3586ac0) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12786,20 +11720,8 @@ Class QGraphicsItem QGraphicsItem (0xb34d05c0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34d06c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb34d0700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb34d07c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -13361,50 +12283,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb34d0480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34d0600) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb34d0a00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb34d0680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb34d0dc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb34d0c00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3244040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb34d0f80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3244140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb32440c0) 0 Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -13451,20 +12337,8 @@ QGraphicsScene (0xb3244180) 0 QObject (0xb32441c0) 0 primary-for QGraphicsScene (0xb3244180) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb32442c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3244380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3244300) 0 Vtable for QGraphicsView QGraphicsView::_ZTV13QGraphicsView: 68u entries @@ -13553,15 +12427,7 @@ QGraphicsView (0xb32443c0) 0 QPaintDevice (0xb3244500) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb32445c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3244600) 0 Vtable for QGraphicsItemAnimation QGraphicsItemAnimation::_ZTV22QGraphicsItemAnimation: 16u entries @@ -13921,10 +12787,6 @@ QAbstractPrintDialog (0xb3244b40) 0 QPaintDevice (0xb3244c40) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3244d00) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -14183,10 +13045,6 @@ QWizard (0xb3244580) 0 QPaintDevice (0xb3244b00) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3244cc0) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -14354,10 +13212,6 @@ QFileDialog (0xb321a100) 0 QPaintDevice (0xb321a200) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb321a2c0) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -14694,10 +13548,6 @@ QMessageBox (0xb321a7c0) 0 QPaintDevice (0xb321a8c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb321a980) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -15173,15 +14023,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb2f53300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2f53340) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f53400) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -15216,20 +14058,12 @@ Class QPaintEngine QPaintEngine (0xb2f53380) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f53500) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb2f53480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f53540) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26u entries @@ -15434,10 +14268,6 @@ QUdpSocket (0xb2f53a40) 0 QObject (0xb2f53b00) 0 primary-for QIODevice (0xb2f53ac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f53b80) 0 Class QSslCertificate size=4 align=4 @@ -15494,10 +14324,6 @@ QTcpSocket (0xb2f53c40) 0 QObject (0xb2f53d00) 0 primary-for QIODevice (0xb2f53cc0) -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb2f53d80) 0 empty Vtable for QSslSocket QSslSocket::_ZTV10QSslSocket: 30u entries @@ -15556,20 +14382,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0xb2f53000) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb2f531c0) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0xb2f53100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f533c0) 0 Class QSslKey size=4 align=4 @@ -15748,10 +14566,6 @@ QTcpServer (0xb2f15280) 0 QObject (0xb2f152c0) 0 primary-for QTcpServer (0xb2f15280) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f15340) 0 Class QSqlRecord size=4 align=4 @@ -16091,15 +14905,7 @@ QSqlDriver (0xb2f15c40) 0 QObject (0xb2f15c80) 0 primary-for QSqlDriver (0xb2f15c40) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb2f15e40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb2f15dc0) 0 Class QSqlIndex size=16 align=4 @@ -16288,71 +15094,11 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0xb2c71280) 0 -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0xb2c71380) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0xb2c713c0) 0 - primary-for Q3AsciiCache (0xb2c71380) - Q3PtrCollection (0xb2c71400) 0 - primary-for Q3GCache (0xb2c713c0) - -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0xb2c715c0) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0xb2c71600) 0 - primary-for Q3IntCache (0xb2c715c0) - Q3PtrCollection (0xb2c71640) 0 - primary-for Q3GCache (0xb2c71600) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0xb2c71800) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0xb2c71840) 0 - primary-for Q3PtrStack (0xb2c71800) - Q3PtrCollection (0xb2c71880) 0 - primary-for Q3GList (0xb2c71840) + + Class Q3CString size=4 align=4 @@ -16387,26 +15133,7 @@ Class Q3GArray Q3GArray (0xb2c71b00) 0 vptr=((& Q3GArray::_ZTV8Q3GArray) + 8u) -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0xb2c71d80) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0xb2c71dc0) 0 - primary-for Q3Cache (0xb2c71d80) - Q3PtrCollection (0xb2c71e00) 0 - primary-for Q3GCache (0xb2c71dc0) Vtable for Q3Signal Q3Signal::_ZTV8Q3Signal: 14u entries @@ -16433,29 +15160,7 @@ Q3Signal (0xb2c718c0) 0 QObject (0xb2c71900) 0 primary-for Q3Signal (0xb2c718c0) -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0xb2bbc0c0) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0xb2bbc100) 0 - primary-for Q3PtrQueue (0xb2bbc0c0) - Q3PtrCollection (0xb2bbc140) 0 - primary-for Q3GList (0xb2bbc100) Vtable for Q3GVector Q3GVector::_ZTV9Q3GVector: 11u entries @@ -16479,76 +15184,11 @@ Q3GVector (0xb2bbc1c0) 0 Q3PtrCollection (0xb2bbc200) 0 primary-for Q3GVector (0xb2bbc1c0) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb2bbc340) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0xb2bbc380) 0 - primary-for Q3PtrVector (0xb2bbc340) - Q3PtrCollection (0xb2bbc3c0) 0 - primary-for Q3GVector (0xb2bbc380) - -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0xb2bbc500) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0xb2bbc540) 0 - primary-for Q3Dict (0xb2bbc500) - Q3PtrCollection (0xb2bbc580) 0 - primary-for Q3GDict (0xb2bbc540) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb2bbc680) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0xb2bbc6c0) 0 - primary-for Q3PtrVector (0xb2bbc680) - Q3PtrCollection (0xb2bbc700) 0 - primary-for Q3GVector (0xb2bbc6c0) + Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -16604,75 +15244,11 @@ Q3StrIVec (0xb2bbc8c0) 0 Q3PtrCollection (0xb2bbc9c0) 0 primary-for Q3GVector (0xb2bbc980) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb2bbcb80) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0xb2bbcbc0) 0 - primary-for Q3PtrList (0xb2bbcb80) - Q3PtrCollection (0xb2bbcc00) 0 - primary-for Q3GList (0xb2bbcbc0) - -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0xb2bbce40) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0xb2bbce80) 0 - primary-for Q3AsciiDict (0xb2bbce40) - Q3PtrCollection (0xb2bbcec0) 0 - primary-for Q3GDict (0xb2bbce80) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0xb2bbcfc0) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0xb2bbc180) 0 - primary-for Q3AsciiDict (0xb2bbcfc0) - Q3PtrCollection (0xb2bbc240) 0 - primary-for Q3GDict (0xb2bbc180) + Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -16699,29 +15275,7 @@ Q3ObjectDictionary (0xb2bbc400) 0 Q3PtrCollection (0xb2bbc880) 0 primary-for Q3GDict (0xb2bbc740) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb2bbcc40) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0xb2bbcf00) 0 - primary-for Q3PtrList (0xb2bbcc40) - Q3PtrCollection (0xb2a9d000) 0 - primary-for Q3GList (0xb2bbcf00) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -16749,11 +15303,6 @@ Q3StrList (0xb2a9d080) 0 Q3PtrCollection (0xb2a9d140) 0 primary-for Q3GList (0xb2a9d100) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0xb2a9d200) 0 - Q3GListStdIterator (0xb2a9d240) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -16783,28 +15332,7 @@ Q3StrIList (0xb2a9d280) 0 Q3PtrCollection (0xb2a9d380) 0 primary-for Q3GList (0xb2a9d340) -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0xb2a9d4c0) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0xb2a9d500) 0 - primary-for Q3PtrDict (0xb2a9d4c0) - Q3PtrCollection (0xb2a9d540) 0 - primary-for Q3GDict (0xb2a9d500) Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -16819,28 +15347,7 @@ Class Q3Semaphore Q3Semaphore (0xb2a9d640) 0 vptr=((& Q3Semaphore::_ZTV11Q3Semaphore) + 8u) -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0xb2a9d780) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0xb2a9d7c0) 0 - primary-for Q3IntDict (0xb2a9d780) - Q3PtrCollection (0xb2a9d800) 0 - primary-for Q3GDict (0xb2a9d7c0) Vtable for Q3Frame Q3Frame::_ZTV7Q3Frame: 66u entries @@ -17051,15 +15558,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0xb2a9dc80) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb2a9de40) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb2a9ddc0) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -17120,25 +15619,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0xb2a9d040) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb2a9d580) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb2a9d180) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb2a9dc40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb2a9d840) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -17346,10 +15829,6 @@ Q3TextEdit (0xb2a9df00) 0 QPaintDevice (0xb2991140) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2991240) 0 Vtable for Q3TextView Q3TextView::_ZTV10Q3TextView: 175u entries @@ -18131,15 +16610,7 @@ Q3NetworkOperation (0xb2991dc0) 0 QObject (0xb2991e00) 0 primary-for Q3NetworkOperation (0xb2991dc0) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb2991f80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb2991f00) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -20100,100 +18571,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0xb2554000) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb2554080) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0xb25540c0) 0 - primary-for Q3PtrVector (0xb2554080) - Q3PtrCollection (0xb2554100) 0 - primary-for Q3GVector (0xb25540c0) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb25541c0) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0xb2554200) 0 - primary-for Q3PtrVector (0xb25541c0) - Q3PtrCollection (0xb2554240) 0 - primary-for Q3GVector (0xb2554200) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb2554300) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0xb2554340) 0 - primary-for Q3PtrList (0xb2554300) - Q3PtrCollection (0xb2554380) 0 - primary-for Q3GList (0xb2554340) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0xb2554440) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0xb2554480) 0 - primary-for Q3IntDict (0xb2554440) - Q3PtrCollection (0xb25544c0) 0 - primary-for Q3GDict (0xb2554480) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -21616,15 +20000,7 @@ Q3ProgressBar (0xb2628680) 0 QPaintDevice (0xb2628780) 8 vptr=((& Q3ProgressBar::_ZTV13Q3ProgressBar) + 244u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb2628a40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb26289c0) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -21879,25 +20255,9 @@ Q3HButtonGroup (0xb2628d00) 0 QPaintDevice (0xb2628e80) 8 vptr=((& Q3HButtonGroup::_ZTV14Q3HButtonGroup) + 236u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb26283c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb2628080) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb26287c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb2628580) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -21962,10 +20322,6 @@ Q3DockAreaLayout (0xb2628f00) 0 QLayoutItem (0xb2628fc0) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb25160c0) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -23159,21 +21515,8 @@ Q3PointArray (0xb24290c0) 0 QPolygon (0xb2429100) 0 QVector (0xb2429140) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0xb2429280) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0xb2429200) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0xb24292c0) 0 - QLinkedList (0xb2429300) 0 Class Q3CanvasItemList size=4 align=4 @@ -24017,21 +22360,8 @@ Class Q3SqlFieldInfo Q3SqlFieldInfo (0xb231b280) 0 vptr=((& Q3SqlFieldInfo::_ZTV14Q3SqlFieldInfo) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0xb231b400) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0xb231b380) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0xb231b440) 0 - QLinkedList (0xb231b480) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -24040,31 +22370,10 @@ Q3SqlRecordInfo (0xb231b500) 0 Q3ValueList (0xb231b540) 0 QLinkedList (0xb231b580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb231b680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb231b600) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0xb231b740) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0xb231b780) 0 - QLinkedList::const_iterator (0xb231b7c0) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0xb231b840) 0 Vtable for Q3SqlForm Q3SqlForm::_ZTV9Q3SqlForm: 26u entries @@ -24462,243 +22771,51 @@ Q3SqlSelectCursor (0xb231bdc0) 0 QSqlRecord (0xb231be40) 4 QSqlQuery (0xb231be80) 8 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb231bf40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb231bfc0) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb231b240) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb231b700) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb231b900) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb231bec0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb1fa3040) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb1fa30c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1fa32c0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb1fa3340) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1fa33c0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb1fa3540) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb1fa35c0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb1fa3640) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb1fa36c0) 0 -Class QLinkedListNode - size=52 align=4 - base size=52 base align=4 -QLinkedListNode (0xb1fa37c0) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb1fa3880) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb1fa3900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1fa3980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1fa3a40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1fa3b40) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb1fa3c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1fa3c80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1fa3d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1fa3d80) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb1fa3e80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb1fa3e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1fa3f80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1fa3740) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb1fa38c0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb1fa3bc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1fa3fc0) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb1b47080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1b47140) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1b471c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1b47280) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1b47340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1b473c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1b47440) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0xb1b47540) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1b475c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1b47680) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1b47700) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb1b477c0) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0xb1b47840) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb1b478c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb1b47a00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1b47a80) 0 diff --git a/tests/auto/bic/data/Qt3Support.4.4.0.linux-gcc-ia32.txt b/tests/auto/bic/data/Qt3Support.4.4.0.linux-gcc-ia32.txt index 56ccd8e0c..d10a0569e 100644 --- a/tests/auto/bic/data/Qt3Support.4.4.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/Qt3Support.4.4.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb6b6c000) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb6b6c03c) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7d77c40) 0 empty - QUintForSize<4> (0xb6b6c0b4) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb6b6c1e0) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb6b6c21c) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7d77e00) 0 empty - QIntForSize<4> (0xb6b6c294) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb6b7f690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7f870) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7f960) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7fa50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7fb40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7fc30) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7fd20) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7fe10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7ff00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9b000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9b0f0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9b1e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9b2d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9b3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9b4b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9b5a0) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb6bb65a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bde258) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb5a8ae10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acbf00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5ae41a4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5ae4ac8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5b293fc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5b29d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5b3c654) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5b3cf78) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb594e8ac) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb595d1e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb595db04) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5972438) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5972d5c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5986690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5986fb4) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb599ea50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb59e9ce4) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb590dc00) 0 QString (0xb57630b4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb57633c0) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QListData base size=4 base align=4 QListData (0xb57cba8c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5674d20) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -386,15 +228,7 @@ Class QTextCodec QTextCodec (0xb5674078) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb568e384) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb568e30c) 0 Class QTextEncoder size=32 align=4 @@ -417,25 +251,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb56ba100) 0 QGenericArgument (0xb56b55a0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb56b5a8c) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb56b58ac) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb56c9bf4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb56c9b7c) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -527,10 +349,6 @@ QIODevice (0xb5708f80) 0 QObject (0xb570cbf4) 0 primary-for QIODevice (0xb5708f80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5727f00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -550,25 +368,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb556de10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55a3618) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb55a3708) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb55a3c6c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb55a3bf4) 0 Class QStringList size=4 align=4 @@ -576,15 +382,7 @@ Class QStringList QStringList (0xb55ae080) 0 QList (0xb55a3ca8) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb55d0a14) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb55d0c30) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -664,10 +462,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb5601f00) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb5614a50) 0 Class QMutexLocker size=4 align=4 @@ -747,35 +541,11 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb54e0384) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54e0438) 0 empty -Class - size=8 align=4 - base size=8 base align=4 - (0xb53763c0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb53764b0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5376438) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb5376528) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb53765a0) 0 Class _IO_marker size=12 align=4 @@ -787,10 +557,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb5376618) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5376690) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -805,10 +571,6 @@ Class QTextStream QTextStream (0xb53766cc) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53b4e4c) 0 Class QTextStreamManipulator size=24 align=4 @@ -845,40 +607,16 @@ QTextOStream (0xb53e21c0) 0 QTextStream (0xb53e15a0) 0 primary-for QTextOStream (0xb53e21c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb53f203c) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb53f20b4) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb53e1960) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb53f212c) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb53f21a4) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb53f221c) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb53f2294) 0 Class timespec size=8 align=4 @@ -890,80 +628,24 @@ Class timeval base size=8 base align=4 timeval (0xb53f230c) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb53f2384) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb53f23fc) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb53f2438) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb53f2564) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb53f24ec) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb53f24b0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb53f25dc) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb53f26cc) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb53f2654) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb53f2744) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb53f2834) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb53f27bc) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb53f28e8) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb53f2960) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb53f29d8) 0 Class random_data size=28 align=4 @@ -995,20 +677,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb5310780) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb53273c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb5327348) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb5327708) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -1028,10 +698,6 @@ Class QtConcurrent::ResultStoreBase QtConcurrent::ResultStoreBase (0xb5327834) 0 vptr=((& QtConcurrent::ResultStoreBase::_ZTVN12QtConcurrent15ResultStoreBaseE) + 8u) -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb5327f3c) 0 Vtable for QFutureInterfaceBase QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries @@ -1046,25 +712,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb5327fb4) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb516b880) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb515ba8c) 0 - primary-for QFutureInterface (0xb516b880) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb51a821c) 0 Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1093,34 +742,7 @@ QFutureWatcherBase (0xb51c17c0) 0 QObject (0xb51c38ac) 0 primary-for QFutureWatcherBase (0xb51c17c0) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb51c1ec0) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb51c1f00) 0 - primary-for QFutureWatcher (0xb51c1ec0) - QObject (0xb51db3c0) 0 - primary-for QFutureWatcherBase (0xb51c1f00) Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1219,60 +841,14 @@ QtConcurrent::ThreadEngineBase (0xb52193c0) 0 QRunnable (0xb52243c0) 0 primary-for QtConcurrent::ThreadEngineBase (0xb52193c0) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb5224bb8) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb5219d40) 0 - QtConcurrent::ThreadEngineStarterBase (0xb5224c30) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 -4u -32 0u -36 0u -40 0u -44 0u -48 0u -52 -4u -56 0u -60 (int (*)(...))-0x000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb5219f00) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb5219f40) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb50390b4) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb5219f40) Class std::input_iterator_tag size=1 align=1 @@ -1315,225 +891,49 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb5039b04) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb5039b7c) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb5039d98) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5039e88) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5039f00) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5039f78) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb50391a4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb505a000) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb505a078) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb505a0f0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb505a168) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb505a1e0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb505a258) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb505a2d0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb505a348) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb505a3c0) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb505a4b0) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb505a528) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb505a5a0) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb505a924) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb505a99c) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb505aa8c) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb505ab04) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb505ab7c) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb505ad98) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb505add4) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb505ae10) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb505ae4c) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb505ae88) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb505aec4) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb505af3c) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb505af78) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb505afb4) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb506e000) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb506e03c) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb506e078) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb506ea50) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb50e903c) 0 empty -Class std::__copy_move - size=1 align=1 - base size=0 base align=1 -std::__copy_move (0xb50e9474) 0 empty -Class std::__copy_move_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_move_backward (0xb50e9690) 0 empty -Class std::__equal - size=1 align=1 - base size=0 base align=1 -std::__equal (0xb50e9a8c) 0 empty -Class std::__lc_rai - size=1 align=1 - base size=0 base align=1 -std::__lc_rai (0xb50e9bf4) 0 empty -Class std::__lexicographical_compare - size=1 align=1 - base size=0 base align=1 -std::__lexicographical_compare (0xb50e9d5c) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb512a438) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb4f3ce88) 0 empty Class lconv size=56 align=4 @@ -1550,10 +950,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb4f49a50) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb4f49ac8) 0 Class tm size=44 align=4 @@ -1570,15 +966,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb4f49d98) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb4f49f00) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb4f49e88) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1590,32 +978,10 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb4f49f78) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb4fd14b0) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb4fd1780) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb4fda8c0) 0 empty - __gnu_cxx::new_allocator (0xb4fd17bc) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb4fd17f8) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb4fda980) 0 empty - __gnu_cxx::new_allocator (0xb4fd1834) 0 empty Vtable for __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries @@ -1631,82 +997,19 @@ Class __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind (0xb4fd1a50) 0 nearly-empty vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 8u) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb4e43348) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb4e43384) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb4e40c40) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb4e433c0) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb4eda03c) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb4ed8200) 0 - std::allocator (0xb4ed8240) 0 empty - __gnu_cxx::new_allocator (0xb4eda0b4) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb4e75fb4) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb4eda0f0) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb4ed83c0) 0 - std::basic_string, std::allocator >::_Rep_base (0xb4eda12c) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb4eda1e0) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb4ed85c0) 0 - std::allocator (0xb4ed8600) 0 empty - __gnu_cxx::new_allocator (0xb4eda258) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb4eda168) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb4eda294) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb4eda348) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb4ed8780) 0 - std::basic_string, std::allocator >::_Rep_base (0xb4eda2d0) 0 Class std::locale size=4 align=4 @@ -1736,97 +1039,16 @@ Class std::locale::_Impl base size=20 base align=4 std::locale::_Impl (0xb4d7d4ec) 0 -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb4d88740) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb4d84e88) 0 - primary-for std::collate (0xb4d88740) - -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb4d88840) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb4d84f78) 0 - primary-for std::collate (0xb4d88840) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb4da03c0) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb4da03fc) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb4dab7c0) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb4da0438) 0 empty -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb4dab900) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb4dab940) 0 - primary-for std::collate_byname (0xb4dab900) - std::locale::facet (0xb4da04b0) 0 - primary-for std::collate (0xb4dab940) - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb4dab9c0) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb4daba00) 0 - primary-for std::collate_byname (0xb4dab9c0) - std::locale::facet (0xb4da05a0) 0 - primary-for std::collate (0xb4daba00) + + + + Vtable for std::ios_base::failure std::ios_base::failure::_ZTVNSt8ios_base7failureE: 5u entries @@ -1872,583 +1094,85 @@ Class std::ios_base std::ios_base (0xb4dc3384) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb4c04a14) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) - -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb4c04ca8) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb4c04f3c) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb4c77550) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb4c47e88) 0 - primary-for std::ctype (0xb4c77550) - std::ctype_base (0xb4c47ec4) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb4c80e10) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb4c90a50) 0 - primary-for std::__ctype_abstract_base (0xb4c80e10) - std::ctype_base (0xb4c90a8c) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb4c81900) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb4c9ac80) 0 - primary-for std::ctype (0xb4c81900) - std::locale::facet (0xb4c90b7c) 0 - primary-for std::__ctype_abstract_base (0xb4c9ac80) - std::ctype_base (0xb4c90bb8) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb4c81ac0) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb4ca3410) 0 - primary-for std::ctype_byname (0xb4c81ac0) - std::locale::facet (0xb4ca0ec4) 0 - primary-for std::ctype (0xb4ca3410) - std::ctype_base (0xb4ca0f00) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb4c81b40) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb4c81b80) 0 - primary-for std::ctype_byname (0xb4c81b40) - std::__ctype_abstract_base (0xb4ca3aa0) 0 - primary-for std::ctype (0xb4c81b80) - std::locale::facet (0xb4ca903c) 0 - primary-for std::__ctype_abstract_base (0xb4ca3aa0) - std::ctype_base (0xb4ca9078) 0 empty + + + + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb4ca9a8c) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb4cb6580) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb4cbb294) 0 - primary-for std::numpunct (0xb4cb6580) - -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb4cb6640) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb4cbb384) 0 - primary-for std::numpunct (0xb4cb6640) -Class __gnu_cxx::__conditional_type - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type (0xb4cf19d8) 0 empty -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb4b3ab80) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb4b3abc0) 0 - primary-for std::numpunct_byname (0xb4b3ab80) - std::locale::facet (0xb4b51000) 0 - primary-for std::numpunct (0xb4b3abc0) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb4b3ac00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb4b510f0) 0 - primary-for std::num_get > > (0xb4b3ac00) - -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb4b3ac80) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb4b511e0) 0 - primary-for std::num_put > > (0xb4b3ac80) - -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb4b3ad00) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb4b3ad40) 0 - primary-for std::numpunct_byname (0xb4b3ad00) - std::locale::facet (0xb4b512d0) 0 - primary-for std::numpunct (0xb4b3ad40) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb4b3adc0) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb4b513c0) 0 - primary-for std::num_get > > (0xb4b3adc0) - -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb4b3ae40) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb4b514b0) 0 - primary-for std::num_put > > (0xb4b3ae40) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb4b85e80) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb4b51ca8) 0 - primary-for std::basic_ios > (0xb4b85e80) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb4b85ec0) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb4b51d98) 0 - primary-for std::basic_ios > (0xb4b85ec0) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb4bd7b40) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb4bd7b80) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb4bb98ac) 4 - primary-for std::basic_ios > (0xb4bd7b80) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb4bb9a8c) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb4bd7cc0) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb4bd7d00) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb4bb9ac8) 4 - primary-for std::basic_ios > (0xb4bd7d00) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb4bb9c6c) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb4a16580) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb4a165c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb4a18168) 8 - primary-for std::basic_ios > (0xb4a165c0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb4a16680) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb4a166c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb4a184ec) 8 - primary-for std::basic_ios > (0xb4a166c0) - -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb4a18bf4) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb4a18c30) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb4a43580) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb4a18c6c) 0 empty -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb4a7512c) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb4a7d480 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2486,44 +1210,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb4a8e0f0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb4a7d480) 0 - primary-for std::basic_iostream > (0xb4a8e0f0) - subvttidx=4u - std::basic_ios > (0xb4a7d4c0) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb4a75168) 12 - primary-for std::basic_ios > (0xb4a7d4c0) - std::basic_ostream > (0xb4a7d500) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb4a7d4c0) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb4a753fc) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb4a7d800 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2561,110 +1249,21 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb4a9b190) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb4a7d800) 0 - primary-for std::basic_iostream > (0xb4a9b190) - subvttidx=4u - std::basic_ios > (0xb4a7d840) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb4a75438) 12 - primary-for std::basic_ios > (0xb4a7d840) - std::basic_ostream > (0xb4a7d880) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb4a7d840) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a75d20) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a75ca8) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb4a75c30) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb4a75b7c) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb4ac6000) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ac6870) 0 -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb49aace4) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb49c6910) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb49b8b00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb49c6910) - QFutureInterfaceBase (0xb49aaec4) 0 - primary-for QFutureInterface (0xb49b8b00) - QRunnable (0xb49aaf00) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb49b8b80) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb49c6d20) 0 - primary-for QtConcurrent::RunFunctionTask (0xb49b8b80) - QFutureInterface (0xb49b8bc0) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb49c6d20) - QFutureInterfaceBase (0xb49cf078) 0 - primary-for QFutureInterface (0xb49b8bc0) - QRunnable (0xb49cf0b4) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + Class QLibraryInfo size=1 align=1 @@ -2715,50 +1314,22 @@ QFile (0xb471af00) 0 QObject (0xb4737438) 0 primary-for QIODevice (0xb471af40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb474fdd4) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb4762960) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4781000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb478130c) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4792078) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4792000) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb4792168) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47b16cc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47b17bc) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2833,10 +1404,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb47e1a8c) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb45f2b7c) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2926,10 +1493,6 @@ Class QDirIterator QDirIterator (0xb4610d98) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4621528) 0 Vtable for QFileSystemWatcher QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries @@ -3067,25 +1630,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb46864ec) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb4686564) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb46632d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4686d5c) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4686ec4) 0 Class QResource size=4 align=4 @@ -3097,275 +1648,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb46a67bc) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46a6bf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46a6dd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46a6fb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46c41a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46c4384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46c4564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46c4744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46c4924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46c4b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46c4ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46c4ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46ce0b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46ce294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46ce474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46ce654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46ce834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46cea14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46cebf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46cedd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46cefb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46d41a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46d4384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46d4564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46d4744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46d4924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46d4b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46d4ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46d4ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e00b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e0294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e0474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e0654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e0834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e0a14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e0bf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e0dd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e0fb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e51a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e5384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e5564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e5744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e5924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e5b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e5ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46e5ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46ec0b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46ec294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46ec474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46ec654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46ec834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46eca14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46ecbf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46ecdd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb46ecfb4) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3392,45 +1727,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb44ed1a4) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb451fc30) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb451fbb8) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb451fd20) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb451fca8) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb455e0b4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb455e6cc) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb455e8ac) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb455ea8c) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3508,15 +1815,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb45aeb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb45b9a50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb45e54ec) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -3543,10 +1842,6 @@ QEventLoop (0xb45aabc0) 0 QObject (0xb43ef348) 0 primary-for QEventLoop (0xb45aabc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43ef960) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -3591,20 +1886,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb4415bf4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb442cfb4) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb44340b4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44347f8) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -3774,10 +2061,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb4480960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb448e0f0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3889,20 +2172,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb44c7d20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb42fb1e0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb42fb2d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb42fb708) 0 empty Class QMetaProperty size=20 align=4 @@ -3914,10 +2189,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb42fbb04) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb42fbe4c) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -4129,10 +2400,6 @@ QLibrary (0xb434d8c0) 0 QObject (0xb436d780) 0 primary-for QLibrary (0xb434d8c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb437b6cc) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4169,20 +2436,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb43a8ca8) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb43b4348) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb43b403c) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb43bd834) 0 Class QWriteLocker size=4 align=4 @@ -4209,10 +2468,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb41f1e10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4200b04) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -4229,70 +2484,42 @@ Class QDate base size=4 base align=4 QDate (0xb4211b04) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb423e4b0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb423e5a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb424ab04) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb424abf4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb425e294) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb425e474) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb426e294) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb42814ec) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb428d348) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb42a44b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb42a4870) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb42c19d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb42cf3fc) 0 empty Class QLinkedListData size=20 align=4 @@ -4304,40 +2531,24 @@ Class QSize base size=8 base align=4 QSize (0xb4161348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb416b348) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb417dfb4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb418cd20) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb41a7e10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb41c5ce4) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb400a8e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4023e10) 0 empty Class QSharedData size=4 align=4 @@ -4385,20 +2596,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb40c95dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb40d3b40) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb40d3ca8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb40d3c30) 0 Class QXmlStreamAttributes size=4 align=4 @@ -4411,30 +2610,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb40d3d20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3ef6744) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb3ef6870) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3f05438) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb3f05564) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3f1a4ec) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -4461,25 +2648,9 @@ Class QXmlStreamWriter base size=4 base align=4 QXmlStreamWriter (0xb3f35d98) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb3f65ce4) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb3f65d5c) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb3f65dd4) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb3f65c6c) 0 Class QColor size=16 align=4 @@ -4501,10 +2672,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb3f91bb8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3fa2e10) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -4802,15 +2969,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb3e2ce88) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3e396cc) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3e39654) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -5099,20 +3258,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb3e8c708) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3e8c30c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ea6bf4) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb3eb87bc) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -5143,20 +3290,8 @@ QAccessibleInterface (0xb3e819c0) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb3eb8bb8) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3eca708) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3eca690) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb3eca618) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -5669,15 +3804,7 @@ Class QPaintDevice QPaintDevice (0xb3d50e10) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3d6f30c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3d6f294) 0 Class QPolygon size=4 align=4 @@ -5685,15 +3812,7 @@ Class QPolygon QPolygon (0xb3d2ed80) 0 QVector (0xb3d6f348) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3d903fc) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3d90384) 0 Class QPolygonF size=4 align=4 @@ -5706,10 +3825,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb3daf348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3dc099c) 0 empty Class QPainterPath::Element size=20 align=4 @@ -5721,25 +3836,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb3dcd168) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3bf221c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3bf21a4) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb3de1e88) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3bf2258) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5751,10 +3854,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb3c1cac8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3c2fbb8) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -5779,10 +3878,6 @@ QImage (0xb3c4c900) 0 QPaintDevice (0xb3c7e3c0) 0 primary-for QImage (0xb3c4c900) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3cc98ac) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -5807,45 +3902,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb3afa2d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3afadd4) 0 empty Class QBrushData size=124 align=4 base size=121 base align=4 QBrushData (0xb3b0d03c) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb3b0dce4) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb3b0dc6c) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb3b0ddd4) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb3b0de4c) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb3b0dec4) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb3b0dd5c) 0 Class QGradient size=56 align=4 @@ -5906,10 +3973,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb3bafb7c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3a02bf4) 0 Class QCursor size=4 align=4 @@ -5997,10 +4060,6 @@ QWidget (0xb3a22c30) 0 QPaintDevice (0xb3a1d474) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3a6f3c0) 0 Vtable for QDialog QDialog::_ZTV7QDialog: 66u entries @@ -6251,10 +4310,6 @@ QAbstractPrintDialog (0xb38f7400) 0 QPaintDevice (0xb3906528) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb39156cc) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -6505,20 +4560,12 @@ QFileDialog (0xb38f7e80) 0 QPaintDevice (0xb393ff78) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb396403c) 0 Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0xb3984438) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb399a7f8) 0 empty Vtable for QFileSystemModel QFileSystemModel::_ZTV16QFileSystemModel: 42u entries @@ -6980,10 +5027,6 @@ QMessageBox (0xb3812280) 0 QPaintDevice (0xb38156cc) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb382f528) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 67u entries @@ -7488,10 +5531,6 @@ QWizard (0xb3885680) 0 QPaintDevice (0xb3896d20) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb38bf03c) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -7624,10 +5663,6 @@ Class QGraphicsItem QGraphicsItem (0xb36d0960) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3709078) 0 Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -8184,15 +6219,7 @@ QGraphicsItemGroup (0xb378a040) 0 QGraphicsItem (0xb3783780) 0 primary-for QGraphicsItemGroup (0xb378a040) -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb3783564) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb379512c) 0 empty Vtable for QGraphicsLayoutItem QGraphicsLayoutItem::_ZTV19QGraphicsLayoutItem: 8u entries @@ -8544,10 +6571,6 @@ Class QPen base size=4 base align=4 QPen (0xb360d2d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb360db40) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -8594,20 +6617,8 @@ QGraphicsScene (0xb35f56c0) 0 QObject (0xb360ddd4) 0 primary-for QGraphicsScene (0xb35f56c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3620b04) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3645528) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb36454b0) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -8770,65 +6781,21 @@ Class QTextOption base size=24 base align=4 QTextOption (0xb369d0f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb36a88ac) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb36b7e88) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0xb36cb1a4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb36cbc6c) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb352d6cc) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb352d654) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb352d834) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb352d7bc) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb352df78) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb352df00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb35750f0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3575078) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 65u entries @@ -9083,15 +7050,7 @@ QGraphicsView (0xb33d5480) 0 QPaintDevice (0xb33e0a14) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb340a258) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb340ae88) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 7u entries @@ -9346,10 +7305,6 @@ QImageIOPlugin (0xb3484b90) 0 QFactoryInterface (0xb3489258) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb3453f00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3489d20) 0 Class QImageReader size=4 align=4 @@ -9525,15 +7480,7 @@ QActionGroup (0xb3310580) 0 QObject (0xb3316e4c) 0 primary-for QActionGroup (0xb3310580) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3322ca8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3322c30) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26u entries @@ -9839,10 +7786,6 @@ QAbstractSpinBox (0xb335ad00) 0 QPaintDevice (0xb338f3fc) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb33a65a0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -10050,15 +7993,7 @@ QStyle (0xb33aea00) 0 QObject (0xb31eaac8) 0 primary-for QStyle (0xb33aea00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3219438) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3233078) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -10317,10 +8252,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb32a7040) 0 QStyleOption (0xb329cec4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb32a8654) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -10347,10 +8278,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb32a7ac0) 0 QStyleOption (0xb30d55dc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb30d53fc) 0 Class QStyleOptionButton size=64 align=4 @@ -10358,10 +8285,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb32a7d80) 0 QStyleOption (0xb30d5d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3106528) 0 Class QStyleOptionTab size=72 align=4 @@ -10376,10 +8299,6 @@ QStyleOptionTabV2 (0xb30f23c0) 0 QStyleOptionTab (0xb30f2400) 0 QStyleOption (0xb3121564) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb313121c) 0 Class QStyleOptionToolBar size=68 align=4 @@ -10406,10 +8325,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb30f2d00) 0 QStyleOption (0xb3149bf4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb315d564) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -10442,10 +8357,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb316c9c0) 0 QStyleOption (0xb3192780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3192b7c) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -10510,15 +8421,7 @@ QStyleOptionSpinBox (0xb2feb600) 0 QStyleOptionComplex (0xb2feb640) 0 QStyleOption (0xb2ff0834) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb2ff0654) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb2ff0fb4) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -10527,10 +8430,6 @@ QStyleOptionQ3ListView (0xb2feb880) 0 QStyleOptionComplex (0xb2feb8c0) 0 QStyleOption (0xb2ff0ec4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3014870) 0 Class QStyleOptionToolButton size=96 align=4 @@ -10627,10 +8526,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb3083384) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb309ef3c) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -10661,20 +8556,8 @@ QItemSelectionModel (0xb307abc0) 0 QObject (0xb30b93c0) 0 primary-for QItemSelectionModel (0xb307abc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb30c8654) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb2edd30c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb2edd294) 0 Class QItemSelection size=4 align=4 @@ -10804,10 +8687,6 @@ QAbstractItemView (0xb2efa180) 0 QPaintDevice (0xb2edd690) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f1f474) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -11270,15 +9149,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb2fbb000) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb2fbbb04) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb2fbba8c) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -11419,15 +9290,7 @@ QListView (0xb2fc5140) 0 QPaintDevice (0xb2fbbe10) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb2df24ec) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb2df2474) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -11720,15 +9583,7 @@ Class QStandardItem QStandardItem (0xb2e764b0) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb2cd1ec4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb2cd1e4c) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -12007,15 +9862,7 @@ Class QTableWidgetSelectionRange base size=16 base align=4 QTableWidgetSelectionRange (0xb2d4a294) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb2d4af3c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb2d4af78) 0 Vtable for QTableWidgetItem QTableWidgetItem::_ZTV16QTableWidgetItem: 10u entries @@ -12292,35 +10139,15 @@ QTreeView (0xb2da4380) 0 QPaintDevice (0xb2da8fb4) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2bd0780) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0xb2db0d98) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb2c031e0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb2c03168) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb2c03618) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb2c035a0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -13296,15 +11123,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb2bbb7f8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2bbba50) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb29cd2d0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -13339,20 +11158,12 @@ Class QPaintEngine QPaintEngine (0xb2bbbb40) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb29e14b0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb29e1168) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb29f81a4) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7u entries @@ -13450,10 +11261,6 @@ QCommonStyle (0xb29e3f00) 0 QObject (0xb2a73834) 0 primary-for QStyle (0xb29e3f40) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb2a83b40) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -13985,30 +11792,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb28e8528) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb28f2fb4) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb28f2834) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb2927474) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb29273fc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb29431a4) 0 Class QTextCharFormat size=8 align=4 @@ -14070,15 +11861,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb27ec000) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb27ecd20) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb27ecca8) 0 Class QTextLine size=8 align=4 @@ -14128,15 +11911,7 @@ QTextDocument (0xb27d4d40) 0 QObject (0xb2808ce4) 0 primary-for QTextDocument (0xb27d4d40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2819654) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb285a384) 0 Class QTextCursor size=4 align=4 @@ -14148,15 +11923,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb285a618) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb285aa14) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb285a99c) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -14318,10 +12085,6 @@ QTextFrame (0xb2834f40) 0 QObject (0xb26a3b04) 0 primary-for QTextObject (0xb2834f80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb26c54b0) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -14346,25 +12109,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb26c599c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb26e64b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb26e65a0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb26e6744) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb26f3b04) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -15494,10 +13245,6 @@ QDateEdit (0xb2642580) 0 QPaintDevice (0xb2663564) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2663e10) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -15658,10 +13405,6 @@ QDialogButtonBox (0xb2642c00) 0 QPaintDevice (0xb249a780) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb24a7bf4) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -15741,10 +13484,6 @@ QDockWidget (0xb2642f80) 0 QPaintDevice (0xb24bb7bc) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb24dae88) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -15906,10 +13645,6 @@ QFontComboBox (0xb24d3640) 0 QPaintDevice (0xb250f7bc) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2522780) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -16228,10 +13963,6 @@ QMainWindow (0xb256f380) 0 QPaintDevice (0xb257e690) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb23927f8) 0 Vtable for QMdiArea QMdiArea::_ZTV8QMdiArea: 65u entries @@ -16317,10 +14048,6 @@ QMdiArea (0xb256f700) 0 QPaintDevice (0xb23ac3fc) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb23c6834) 0 Vtable for QMdiSubWindow QMdiSubWindow::_ZTV13QMdiSubWindow: 63u entries @@ -16400,10 +14127,6 @@ QMdiSubWindow (0xb256fb00) 0 QPaintDevice (0xb23dd438) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb23f9528) 0 Vtable for QMenu QMenu::_ZTV5QMenu: 63u entries @@ -16681,10 +14404,6 @@ QTextEdit (0xb22ba7c0) 0 QPaintDevice (0xb22ca168) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb23080f0) 0 Vtable for QPlainTextEdit QPlainTextEdit::_ZTV14QPlainTextEdit: 69u entries @@ -18351,20 +16070,12 @@ QNetworkAccessManager (0xb20db400) 0 QObject (0xb20ebca8) 0 primary-for QNetworkAccessManager (0xb20db400) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb2105c6c) 0 Class QNetworkCookie size=4 align=4 base size=4 base align=4 QNetworkCookie (0xb2105618) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2105e88) 0 empty Vtable for QNetworkCookieJar QNetworkCookieJar::_ZTV17QNetworkCookieJar: 16u entries @@ -18393,30 +16104,14 @@ QNetworkCookieJar (0xb20db840) 0 QObject (0xb2105f78) 0 primary-for QNetworkCookieJar (0xb20db840) -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb2119b04) 0 empty -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb2119ca8) 0 empty -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb212830c) 0 Class QNetworkRequest size=4 align=4 base size=4 base align=4 QNetworkRequest (0xb2119e4c) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb21284ec) 0 empty Vtable for QNetworkReply QNetworkReply::_ZTV13QNetworkReply: 33u entries @@ -18532,20 +16227,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0xb21801a4) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb2180d20) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0xb2180474) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2180e4c) 0 Class QNetworkProxy size=4 align=4 @@ -18741,10 +16428,6 @@ QUdpSocket (0xb1fc3900) 0 QObject (0xb1fed2d0) 0 primary-for QIODevice (0xb1fc3980) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb1ffe1a4) 0 Class QSslCertificate size=4 align=4 @@ -18808,10 +16491,6 @@ QSslSocket (0xb1fc3f00) 0 QObject (0xb202d708) 0 primary-for QIODevice (0xb1fc3fc0) -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb2044b40) 0 empty Class QSslConfiguration size=4 align=4 @@ -18823,10 +16502,6 @@ Class QSslKey base size=4 base align=4 QSslKey (0xb2050348) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2050924) 0 Class QSqlRecord size=4 align=4 @@ -18964,15 +16639,7 @@ Class QSqlField base size=16 base align=4 QSqlField (0xb1ebef00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb1ecbec4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb1ecbe4c) 0 Class QSqlIndex size=16 align=4 @@ -19488,29 +17155,7 @@ Class Q3GListStdIterator base size=4 base align=4 Q3GListStdIterator (0xb1d9203c) 0 -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIvE) -8 Q3PtrList::count [with type = void] -12 Q3PtrList::clear [with type = void] -16 Q3PtrList::~Q3PtrList [with type = void] -20 Q3PtrList::~Q3PtrList [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb1db12c0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIvE) + 8u) - Q3GList (0xb1db1300) 0 - primary-for Q3PtrList (0xb1db12c0) - Q3PtrCollection (0xb1db21e0) 0 - primary-for Q3GList (0xb1db1300) Class Q3PointArray size=4 align=4 @@ -19519,21 +17164,8 @@ Q3PointArray (0xb1dcfc00) 0 QPolygon (0xb1dcfc40) 0 QVector (0xb1dde294) 0 -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0xb1ddef78) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0xb1ddef00) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0xb1ded2c0) 0 - QLinkedList (0xb1ddefb4) 0 Class Q3CanvasItemList size=4 align=4 @@ -20171,28 +17803,7 @@ Class Q3GDictIterator base size=12 base align=4 Q3GDictIterator (0xb1cbb12c) 0 -Vtable for Q3Dict -Q3Dict::_ZTV6Q3DictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI6Q3DictIvE) -8 Q3Dict::count [with type = void] -12 Q3Dict::clear [with type = void] -16 Q3Dict::~Q3Dict [with type = void] -20 Q3Dict::~Q3Dict [with type = void] -24 Q3PtrCollection::newItem -28 Q3Dict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3Dict - size=28 align=4 - base size=28 base align=4 -Q3Dict (0xb1ca1e80) 0 - vptr=((& Q3Dict::_ZTV6Q3DictIvE) + 8u) - Q3GDict (0xb1ca1ec0) 0 - primary-for Q3Dict (0xb1ca1e80) - Q3PtrCollection (0xb1cc6618) 0 - primary-for Q3GDict (0xb1ca1ec0) Vtable for Q3NetworkProtocolFactoryBase Q3NetworkProtocolFactoryBase::_ZTV28Q3NetworkProtocolFactoryBase: 5u entries @@ -20727,29 +18338,7 @@ Q3Wizard (0xb1d1b8c0) 0 QPaintDevice (0xb1d52dd4) 8 vptr=((& Q3Wizard::_ZTV8Q3Wizard) + 308u) -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListIcE) -8 Q3PtrList::count [with type = char] -12 Q3PtrList::clear [with type = char] -16 Q3PtrList::~Q3PtrList [with type = char] -20 Q3PtrList::~Q3PtrList [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = char] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb1d1bb80) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListIcE) + 8u) - Q3GList (0xb1d1bbc0) 0 - primary-for Q3PtrList (0xb1d1bb80) - Q3PtrCollection (0xb1d68d98) 0 - primary-for Q3GList (0xb1d1bbc0) Vtable for Q3StrList Q3StrList::_ZTV9Q3StrList: 11u entries @@ -20777,11 +18366,6 @@ Q3StrList (0xb1d1bc00) 0 Q3PtrCollection (0xb1d68e88) 0 primary-for Q3GList (0xb1d1bc80) -Class Q3PtrListStdIterator - size=4 align=4 - base size=4 base align=4 -Q3PtrListStdIterator (0xb1b94140) 0 - Q3GListStdIterator (0xb1b8f5a0) 0 Vtable for Q3StrIList Q3StrIList::_ZTV10Q3StrIList: 11u entries @@ -21814,29 +19398,7 @@ Q3GVector (0xb1aec280) 0 Q3PtrCollection (0xb1b05000) 0 primary-for Q3GVector (0xb1aec280) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIvE) -8 Q3PtrVector::count [with type = void] -12 Q3PtrVector::clear [with type = void] -16 Q3PtrVector::~Q3PtrVector [with type = void] -20 Q3PtrVector::~Q3PtrVector [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = void] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write - -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb1aeccc0) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIvE) + 8u) - Q3GVector (0xb1aecd00) 0 - primary-for Q3PtrVector (0xb1aeccc0) - Q3PtrCollection (0xb1b18474) 0 - primary-for Q3GVector (0xb1aecd00) + Vtable for Q3Header Q3Header::_ZTV8Q3Header: 76u entries @@ -21956,28 +19518,7 @@ Class Q3GArray Q3GArray (0xb1b43f3c) 0 vptr=((& Q3GArray::_ZTV8Q3GArray) + 8u) -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIvE) -8 Q3IntDict::count [with type = void] -12 Q3IntDict::clear [with type = void] -16 Q3IntDict::~Q3IntDict [with type = void] -20 Q3IntDict::~Q3IntDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0xb1b6dd00) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIvE) + 8u) - Q3GDict (0xb1b6dd40) 0 - primary-for Q3IntDict (0xb1b6dd00) - Q3PtrCollection (0xb1b7a3fc) 0 - primary-for Q3GDict (0xb1b6dd40) Class Q3TableSelection size=28 align=4 @@ -22088,100 +19629,13 @@ Class Q3Table::TableWidget base size=12 base align=4 Q3Table::TableWidget (0xb19b430c) 0 -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI11Q3TableItemE) -8 Q3PtrVector::count [with type = Q3TableItem] -12 Q3PtrVector::clear [with type = Q3TableItem] -16 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -20 Q3PtrVector::~Q3PtrVector [with type = Q3TableItem] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = Q3TableItem] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb1b84980) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI11Q3TableItemE) + 8u) - Q3GVector (0xb1b849c0) 0 - primary-for Q3PtrVector (0xb1b84980) - Q3PtrCollection (0xb19b4744) 0 - primary-for Q3GVector (0xb1b849c0) - -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorI7QWidgetE) -8 Q3PtrVector::count [with type = QWidget] -12 Q3PtrVector::clear [with type = QWidget] -16 Q3PtrVector::~Q3PtrVector [with type = QWidget] -20 Q3PtrVector::~Q3PtrVector [with type = QWidget] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = QWidget] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb1b84a00) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorI7QWidgetE) + 8u) - Q3GVector (0xb1b84a40) 0 - primary-for Q3PtrVector (0xb1b84a00) - Q3PtrCollection (0xb19b4b04) 0 - primary-for Q3GVector (0xb1b84a40) - -Vtable for Q3PtrList -Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrListI16Q3TableSelectionE) -8 Q3PtrList::count [with type = Q3TableSelection] -12 Q3PtrList::clear [with type = Q3TableSelection] -16 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -20 Q3PtrList::~Q3PtrList [with type = Q3TableSelection] -24 Q3PtrCollection::newItem -28 Q3PtrList::deleteItem [with type = Q3TableSelection] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrList - size=32 align=4 - base size=32 base align=4 -Q3PtrList (0xb1b84ac0) 0 - vptr=((& Q3PtrList::_ZTV9Q3PtrListI16Q3TableSelectionE) + 8u) - Q3GList (0xb1b84b00) 0 - primary-for Q3PtrList (0xb1b84ac0) - Q3PtrCollection (0xb19b4ce4) 0 - primary-for Q3GList (0xb1b84b00) - -Vtable for Q3IntDict -Q3IntDict::_ZTV9Q3IntDictIiE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3IntDictIiE) -8 Q3IntDict::count [with type = int] -12 Q3IntDict::clear [with type = int] -16 Q3IntDict::~Q3IntDict [with type = int] -20 Q3IntDict::~Q3IntDict [with type = int] -24 Q3PtrCollection::newItem -28 Q3IntDict::deleteItem [with type = int] -32 Q3GDict::read -36 Q3GDict::write -Class Q3IntDict - size=28 align=4 - base size=28 base align=4 -Q3IntDict (0xb1b84b80) 0 - vptr=((& Q3IntDict::_ZTV9Q3IntDictIiE) + 8u) - Q3GDict (0xb1b84bc0) 0 - primary-for Q3IntDict (0xb1b84b80) - Q3PtrCollection (0xb19b4ec4) 0 - primary-for Q3GDict (0xb1b84bc0) + + + Vtable for Q3Table Q3Table::_ZTV7Q3Table: 183u entries @@ -22495,15 +19949,7 @@ Q3Ftp (0xb19fe940) 0 QObject (0xb1a13b40) 0 primary-for Q3NetworkProtocol (0xb19fe980) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb1a30924) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb1a308ac) 0 Vtable for Q3HttpHeader Q3HttpHeader::_ZTV12Q3HttpHeader: 8u entries @@ -23785,21 +21231,8 @@ Class Q3SqlPropertyMap Q3SqlPropertyMap (0xb17c8a50) 0 vptr=((& Q3SqlPropertyMap::_ZTV16Q3SqlPropertyMap) + 8u) -Class QLinkedList:: - size=4 align=4 - base size=4 base align=4 -QLinkedList:: (0xb17d54ec) 0 -Class QLinkedList - size=4 align=4 - base size=4 base align=4 -QLinkedList (0xb17d5474) 0 -Class Q3ValueList - size=4 align=4 - base size=4 base align=4 -Q3ValueList (0xb17c64c0) 0 - QLinkedList (0xb17d5528) 0 Class Q3SqlRecordInfo size=4 align=4 @@ -23808,31 +21241,10 @@ Q3SqlRecordInfo (0xb17c6540) 0 Q3ValueList (0xb17c6580) 0 QLinkedList (0xb17d55dc) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb17d59d8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb17d5960) 0 -Class QLinkedList::const_iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::const_iterator (0xb18100b4) 0 -Class Q3ValueListConstIterator - size=4 align=4 - base size=4 base align=4 -Q3ValueListConstIterator (0xb17c6ac0) 0 - QLinkedList::const_iterator (0xb18100f0) 0 -Class QLinkedList::iterator - size=4 align=4 - base size=4 base align=4 -QLinkedList::iterator (0xb1810168) 0 Vtable for Q3SqlSelectCursor Q3SqlSelectCursor::_ZTV17Q3SqlSelectCursor: 40u entries @@ -23892,15 +21304,7 @@ Class Q3StyleSheetItem base size=4 base align=4 Q3StyleSheetItem (0xb184fd20) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb185fa50) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb185f9d8) 0 Vtable for Q3StyleSheet Q3StyleSheet::_ZTV12Q3StyleSheet: 16u entries @@ -23939,25 +21343,9 @@ Class Q3TextEditOptimPrivate::Selection base size=8 base align=4 Q3TextEditOptimPrivate::Selection (0xb187e564) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb187e7bc) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb187e744) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb187eb40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb187eac8) 0 Class Q3TextEditOptimPrivate size=52 align=4 @@ -24165,10 +21553,6 @@ Q3TextEdit (0xb16961c0) 0 QPaintDevice (0xb1690f3c) 8 vptr=((& Q3TextEdit::_ZTV10Q3TextEdit) + 680u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb16d63fc) 0 Vtable for Q3MultiLineEdit Q3MultiLineEdit::_ZTV15Q3MultiLineEdit: 192u entries @@ -24853,114 +22237,15 @@ Class Q3GCacheIterator base size=4 base align=4 Q3GCacheIterator (0xb15e003c) 0 -Vtable for Q3AsciiCache -Q3AsciiCache::_ZTV12Q3AsciiCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI12Q3AsciiCacheIvE) -8 Q3AsciiCache::count [with type = void] -12 Q3AsciiCache::clear [with type = void] -16 Q3AsciiCache::~Q3AsciiCache [with type = void] -20 Q3AsciiCache::~Q3AsciiCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiCache::deleteItem [with type = void] -Class Q3AsciiCache - size=32 align=4 - base size=29 base align=4 -Q3AsciiCache (0xb15d4800) 0 - vptr=((& Q3AsciiCache::_ZTV12Q3AsciiCacheIvE) + 8u) - Q3GCache (0xb15d4840) 0 - primary-for Q3AsciiCache (0xb15d4800) - Q3PtrCollection (0xb15e0d20) 0 - primary-for Q3GCache (0xb15d4840) - -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictIvE) -8 Q3AsciiDict::count [with type = void] -12 Q3AsciiDict::clear [with type = void] -16 Q3AsciiDict::~Q3AsciiDict [with type = void] -20 Q3AsciiDict::~Q3AsciiDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0xb15fe600) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictIvE) + 8u) - Q3GDict (0xb15fe640) 0 - primary-for Q3AsciiDict (0xb15fe600) - Q3PtrCollection (0xb15f68e8) 0 - primary-for Q3GDict (0xb15fe640) - -Vtable for Q3Cache -Q3Cache::_ZTV7Q3CacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI7Q3CacheIvE) -8 Q3Cache::count [with type = void] -12 Q3Cache::clear [with type = void] -16 Q3Cache::~Q3Cache [with type = void] -20 Q3Cache::~Q3Cache [with type = void] -24 Q3PtrCollection::newItem -28 Q3Cache::deleteItem [with type = void] -Class Q3Cache - size=32 align=4 - base size=29 base align=4 -Q3Cache (0xb161c2c0) 0 - vptr=((& Q3Cache::_ZTV7Q3CacheIvE) + 8u) - Q3GCache (0xb161c300) 0 - primary-for Q3Cache (0xb161c2c0) - Q3PtrCollection (0xb161a348) 0 - primary-for Q3GCache (0xb161c300) - -Vtable for Q3IntCache -Q3IntCache::_ZTV10Q3IntCacheIvE: 8u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3IntCacheIvE) -8 Q3IntCache::count [with type = void] -12 Q3IntCache::clear [with type = void] -16 Q3IntCache::~Q3IntCache [with type = void] -20 Q3IntCache::~Q3IntCache [with type = void] -24 Q3PtrCollection::newItem -28 Q3IntCache::deleteItem [with type = void] -Class Q3IntCache - size=32 align=4 - base size=29 base align=4 -Q3IntCache (0xb1637a80) 0 - vptr=((& Q3IntCache::_ZTV10Q3IntCacheIvE) + 8u) - Q3GCache (0xb1637ac0) 0 - primary-for Q3IntCache (0xb1637a80) - Q3PtrCollection (0xb16412d0) 0 - primary-for Q3GCache (0xb1637ac0) -Vtable for Q3AsciiDict -Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3AsciiDictI11QMetaObjectE) -8 Q3AsciiDict::count [with type = QMetaObject] -12 Q3AsciiDict::clear [with type = QMetaObject] -16 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -20 Q3AsciiDict::~Q3AsciiDict [with type = QMetaObject] -24 Q3PtrCollection::newItem -28 Q3AsciiDict::deleteItem [with type = QMetaObject] -32 Q3GDict::read -36 Q3GDict::write -Class Q3AsciiDict - size=28 align=4 - base size=28 base align=4 -Q3AsciiDict (0xb16522c0) 0 - vptr=((& Q3AsciiDict::_ZTV11Q3AsciiDictI11QMetaObjectE) + 8u) - Q3GDict (0xb1652300) 0 - primary-for Q3AsciiDict (0xb16522c0) - Q3PtrCollection (0xb1641a50) 0 - primary-for Q3GDict (0xb1652300) + + + Vtable for Q3ObjectDictionary Q3ObjectDictionary::_ZTV18Q3ObjectDictionary: 10u entries @@ -24987,76 +22272,11 @@ Q3ObjectDictionary (0xb1652340) 0 Q3PtrCollection (0xb1641b40) 0 primary-for Q3GDict (0xb16523c0) -Vtable for Q3PtrDict -Q3PtrDict::_ZTV9Q3PtrDictIvE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI9Q3PtrDictIvE) -8 Q3PtrDict::count [with type = void] -12 Q3PtrDict::clear [with type = void] -16 Q3PtrDict::~Q3PtrDict [with type = void] -20 Q3PtrDict::~Q3PtrDict [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrDict::deleteItem [with type = void] -32 Q3GDict::read -36 Q3GDict::write -Class Q3PtrDict - size=28 align=4 - base size=28 base align=4 -Q3PtrDict (0xb1652cc0) 0 - vptr=((& Q3PtrDict::_ZTV9Q3PtrDictIvE) + 8u) - Q3GDict (0xb1652d00) 0 - primary-for Q3PtrDict (0xb1652cc0) - Q3PtrCollection (0xb165fa50) 0 - primary-for Q3GDict (0xb1652d00) - -Vtable for Q3PtrQueue -Q3PtrQueue::_ZTV10Q3PtrQueueIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrQueueIvE) -8 Q3PtrQueue::count [with type = void] -12 Q3PtrQueue::clear [with type = void] -16 Q3PtrQueue::~Q3PtrQueue [with type = void] -20 Q3PtrQueue::~Q3PtrQueue [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrQueue::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrQueue - size=32 align=4 - base size=32 base align=4 -Q3PtrQueue (0xb1478900) 0 - vptr=((& Q3PtrQueue::_ZTV10Q3PtrQueueIvE) + 8u) - Q3GList (0xb1478940) 0 - primary-for Q3PtrQueue (0xb1478900) - Q3PtrCollection (0xb147d438) 0 - primary-for Q3GList (0xb1478940) - -Vtable for Q3PtrStack -Q3PtrStack::_ZTV10Q3PtrStackIvE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI10Q3PtrStackIvE) -8 Q3PtrStack::count [with type = void] -12 Q3PtrStack::clear [with type = void] -16 Q3PtrStack::~Q3PtrStack [with type = void] -20 Q3PtrStack::~Q3PtrStack [with type = void] -24 Q3PtrCollection::newItem -28 Q3PtrStack::deleteItem [with type = void] -32 Q3GList::compareItems -36 Q3GList::read -40 Q3GList::write -Class Q3PtrStack - size=32 align=4 - base size=32 base align=4 -Q3PtrStack (0xb1492140) 0 - vptr=((& Q3PtrStack::_ZTV10Q3PtrStackIvE) + 8u) - Q3GList (0xb1492180) 0 - primary-for Q3PtrStack (0xb1492140) - Q3PtrCollection (0xb147db40) 0 - primary-for Q3GList (0xb1492180) + + Vtable for Q3Semaphore Q3Semaphore::_ZTV11Q3Semaphore: 4u entries @@ -25096,29 +22316,7 @@ Q3Signal (0xb1492400) 0 QObject (0xb149c1a4) 0 primary-for Q3Signal (0xb1492400) -Vtable for Q3PtrVector -Q3PtrVector::_ZTV11Q3PtrVectorIcE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11Q3PtrVectorIcE) -8 Q3PtrVector::count [with type = char] -12 Q3PtrVector::clear [with type = char] -16 Q3PtrVector::~Q3PtrVector [with type = char] -20 Q3PtrVector::~Q3PtrVector [with type = char] -24 Q3PtrCollection::newItem -28 Q3PtrVector::deleteItem [with type = char] -32 Q3GVector::compareItems -36 Q3GVector::read -40 Q3GVector::write -Class Q3PtrVector - size=20 align=4 - base size=20 base align=4 -Q3PtrVector (0xb1492a40) 0 - vptr=((& Q3PtrVector::_ZTV11Q3PtrVectorIcE) + 8u) - Q3GVector (0xb1492a80) 0 - primary-for Q3PtrVector (0xb1492a40) - Q3PtrCollection (0xb14aa0b4) 0 - primary-for Q3GVector (0xb1492a80) Vtable for Q3StrVec Q3StrVec::_ZTV8Q3StrVec: 11u entries @@ -25424,15 +22622,7 @@ Q3GroupBox (0xb1517000) 0 QPaintDevice (0xb1515384) 8 vptr=((& Q3GroupBox::_ZTV10Q3GroupBox) + 236u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb153430c) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb1534294) 0 Vtable for Q3ButtonGroup Q3ButtonGroup::_ZTV13Q3ButtonGroup: 64u entries @@ -26235,25 +23425,9 @@ Q3DockWindow (0xb156cf80) 0 QPaintDevice (0xb13bfe4c) 8 vptr=((& Q3DockWindow::_ZTV12Q3DockWindow) + 304u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb13e8f3c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb13e8f78) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb140a0b4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb140a03c) 0 Vtable for Q3DockAreaLayout Q3DockAreaLayout::_ZTV16Q3DockAreaLayout: 48u entries @@ -26318,10 +23492,6 @@ Q3DockAreaLayout (0xb13cf440) 0 QLayoutItem (0xb13e8a50) 8 vptr=((& Q3DockAreaLayout::_ZTV16Q3DockAreaLayout) + 128u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb142fac8) 0 Class Q3DockArea::DockWindowData size=24 align=4 @@ -27537,293 +24707,61 @@ Q3WidgetStack (0xb12e6dc0) 0 QPaintDevice (0xb1319528) 8 vptr=((& Q3WidgetStack::_ZTV13Q3WidgetStack) + 248u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb1177ce4) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb11a7294) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb12615a0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb107e0b4) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb107eb7c) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb110a384) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb110a564) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb110a744) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb110a924) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb0fe30f0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb0fe32d0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb1013474) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb10138e8) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb102a2d0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb0e6e000) 0 -Class QLinkedListNode - size=52 align=4 - base size=52 base align=4 -QLinkedListNode (0xb0eaefb4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0f2e7bc) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb0f2e834) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb0f52744) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb0f52a50) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb0da9654) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0da9c30) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0da9f78) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0dc67f8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0dc6c30) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0dd51e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0de4294) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb0de47bc) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb0de4744) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb0de4fb4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb0de4f3c) 0 -Class QMap::Node - size=16 align=4 - base size=16 base align=4 -QMap::Node (0xb0e303c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0e30528) 0 empty -Class QMap::Node - size=16 align=4 - base size=16 base align=4 -QMap::Node (0xb0e305a0) 0 -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb0e53168) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb0e53294) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb0e534ec) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb0e53ca8) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb0c873fc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0c87b7c) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb0c87bf4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0cc8078) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb0cc80f0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb0cc8564) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb0cc899c) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb0cc8d20) 0 -Class QMap::PayloadNode - size=12 align=4 - base size=12 base align=4 -QMap::PayloadNode (0xb0d1e690) 0 -Class QMap::PayloadNode - size=12 align=4 - base size=12 base align=4 -QMap::PayloadNode (0xb0d1e870) 0 -Class QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: - size=4 align=4 - base size=4 base align=4 -QMap::detach_helper() [with Key = int, T = Q3TextEditOptimPrivate::Tag*]:: (0xb0d1e99c) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb0d1eb7c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0d1ef00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb0d1ef78) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb0d3530c) 0 -Class QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: - size=4 align=4 - base size=4 base align=4 -QLinkedList::detach_helper() [with T = Q3SqlFieldInfo]:: (0xb0d35ce4) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb0d62168) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb0d629d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0d62c30) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb0d62ca8) 0 diff --git a/tests/auto/bic/data/QtCore.4.0.0.aix-gcc-power32.txt b/tests/auto/bic/data/QtCore.4.0.0.aix-gcc-power32.txt index 3937776fc..160fcc1cd 100644 --- a/tests/auto/bic/data/QtCore.4.0.0.aix-gcc-power32.txt +++ b/tests/auto/bic/data/QtCore.4.0.0.aix-gcc-power32.txt @@ -53,65 +53,20 @@ Class QBool size=1 align=1 QBool (0x300b7280) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cd9c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cdf80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4540) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4b00) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e00c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0680) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0c40) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb200) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb7c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebd80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8340) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8900) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104480) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104a40) 0 empty Class QFlag size=4 align=4 @@ -125,9 +80,6 @@ Class QChar size=2 align=2 QChar (0x30148980) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30185980) 0 empty Class QBasicAtomic size=4 align=4 @@ -142,13 +94,7 @@ Class sigset_t size=8 align=4 sigset_t (0x3026ad80) 0 -Class - size=8 align=4 - (0x30271200) 0 -Class - size=32 align=8 - (0x30271540) 0 Class fsid_t size=8 align=4 @@ -158,21 +104,9 @@ Class fsid64_t size=16 align=8 fsid64_t (0x30271c40) 0 -Class - size=52 align=4 - (0x302780c0) 0 -Class - size=44 align=4 - (0x30278440) 0 -Class - size=112 align=4 - (0x302787c0) 0 -Class - size=208 align=4 - (0x30278b40) 0 Class _quad size=8 align=4 @@ -186,17 +120,11 @@ Class adspace_t size=68 align=4 adspace_t (0x30281e00) 0 -Class - size=24 align=8 - (0x302865c0) 0 Class label_t size=100 align=4 label_t (0x30286d00) 0 -Class - size=4 align=4 - (0x3028b780) 0 Class sigset size=8 align=4 @@ -238,57 +166,18 @@ Class QByteRef size=8 align=4 QByteRef (0x302b7540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30423740) 0 empty -Class QFlags - size=4 align=4 -QFlags (0x30431080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431340) 0 -Class QFlags - size=4 align=4 -QFlags (0x3042cc00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30442080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431a00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30448800) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046af00) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046e200) 0 -Class QFlags - size=4 align=4 -QFlags (0x304422c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30474f80) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479700) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479a40) 0 Class QInternal size=1 align=1 @@ -306,9 +195,6 @@ Class QString size=4 align=4 QString (0x300a1f40) 0 -Class QFlags - size=4 align=4 -QFlags (0x303cf2c0) 0 Class QLatin1String size=4 align=4 @@ -323,9 +209,6 @@ Class QConstString QConstString (0x300b7640) 0 QString (0x300b7680) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303901c0) 0 empty Class QListData::Data size=24 align=4 @@ -335,9 +218,6 @@ Class QListData size=4 align=4 QListData (0x300732c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x302fb500) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -360,13 +240,7 @@ Class QTextCodec QTextCodec (0x303bab80) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8) -Class QList:: - size=4 align=4 -QList:: (0x30120bc0) 0 -Class QList - size=4 align=4 -QList (0x302cc980) 0 Class QTextEncoder size=32 align=4 @@ -385,21 +259,12 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3036a6c0) 0 QGenericArgument (0x3036a700) 0 -Class QMetaObject:: - size=16 align=4 -QMetaObject:: (0x3009b300) 0 Class QMetaObject size=16 align=4 QMetaObject (0x3058c900) 0 -Class QList:: - size=4 align=4 -QList:: (0x30170600) 0 -Class QList - size=4 align=4 -QList (0x30166f00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4 entries @@ -487,9 +352,6 @@ QIODevice (0x30365880) 0 QObject (0x301e4440) 0 primary-for QIODevice (0x30365880) -Class QFlags - size=4 align=4 -QFlags (0x301ebec0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4 entries @@ -507,38 +369,20 @@ Class QRegExp size=4 align=4 QRegExp (0x303baa80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30148180) 0 empty Class QStringMatcher size=1036 align=4 QStringMatcher (0x3012d8c0) 0 -Class QList:: - size=4 align=4 -QList:: (0x30104900) 0 -Class QList - size=4 align=4 -QList (0x30104380) 0 Class QStringList size=4 align=4 QStringList (0x303bab00) 0 QList (0x300c3280) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x301046c0) 0 -Class QList::iterator - size=4 align=4 -QList::iterator (0x300eba00) 0 -Class QList::const_iterator - size=4 align=4 -QList::const_iterator (0x300eb980) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5 entries @@ -664,9 +508,6 @@ Class QMapData size=72 align=4 QMapData (0x304b4140) 0 -Class - size=32 align=4 - (0x3052cd00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4 entries @@ -680,9 +521,6 @@ Class QTextStream QTextStream (0x3050bbc0) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8) -Class QFlags - size=4 align=4 -QFlags (0x305082c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -767,41 +605,20 @@ QFile (0x3057c8c0) 0 QObject (0x3057c980) 0 primary-for QIODevice (0x3057c900) -Class QFlags - size=4 align=4 -QFlags (0x3058a380) 0 Class QFileInfo size=4 align=4 QFileInfo (0x304b0580) 0 -Class QFlags - size=4 align=4 -QFlags (0x304927c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30390480) 0 empty -Class QList:: - size=4 align=4 -QList:: (0x301dfa40) 0 -Class QList - size=4 align=4 -QList (0x301df900) 0 Class QDir size=4 align=4 QDir (0x304b03c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30365600) 0 -Class QFlags - size=4 align=4 -QFlags (0x303ac7c0) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35 entries @@ -846,9 +663,6 @@ Class QFileEngine QFileEngine (0x3057c7c0) 0 vptr=((&QFileEngine::_ZTV11QFileEngine) + 8) -Class QFlags - size=4 align=4 -QFlags (0x3031a080) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5 entries @@ -910,73 +724,22 @@ Class QMetaType size=1 align=1 QMetaType (0x30079000) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3011fb00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3013d480) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x30148440) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3015dfc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301937c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a18c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a5d00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301ad500) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301add00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b22c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b2b00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6640) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6fc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9600) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9c00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301c1740) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301d7f80) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -998,69 +761,24 @@ Class QVariant size=16 align=8 QVariant (0x30166c00) 0 -Class QList:: - size=4 align=4 -QList:: (0x3057e500) 0 -Class QList - size=4 align=4 -QList (0x302acd80) 0 -Class QMap:: - size=4 align=4 -QMap:: (0x302ed8c0) 0 -Class QMap - size=4 align=4 -QMap (0x302b7980) 0 Class QVariantComparisonHelper size=4 align=4 QVariantComparisonHelper (0x30225880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303e8900) 0 empty -Class - size=12 align=4 - (0x303dab00) 0 -Class - size=44 align=4 - (0x303f70c0) 0 -Class - size=76 align=4 - (0x303f7880) 0 -Class - size=36 align=4 - (0x303fc640) 0 -Class - size=56 align=4 - (0x303fcc40) 0 -Class - size=36 align=4 - (0x30414340) 0 -Class - size=28 align=4 - (0x30414f00) 0 -Class - size=24 align=4 - (0x30486a40) 0 -Class - size=28 align=4 - (0x30486d80) 0 -Class - size=28 align=4 - (0x30492400) 0 Class lconv size=56 align=4 @@ -1102,77 +820,41 @@ Class localeinfo_table size=36 align=4 localeinfo_table (0x303d9cc0) 0 -Class - size=108 align=4 - (0x304dc500) 0 Class _LC_charmap_objhdl size=12 align=4 _LC_charmap_objhdl (0x304dcc80) 0 -Class - size=92 align=4 - (0x30561040) 0 Class _LC_monetary_objhdl size=12 align=4 _LC_monetary_objhdl (0x305614c0) 0 -Class - size=48 align=4 - (0x30561800) 0 Class _LC_numeric_objhdl size=12 align=4 _LC_numeric_objhdl (0x30561d00) 0 -Class - size=56 align=4 - (0x30083180) 0 Class _LC_resp_objhdl size=12 align=4 _LC_resp_objhdl (0x300838c0) 0 -Class - size=248 align=4 - (0x30083c40) 0 Class _LC_time_objhdl size=12 align=4 _LC_time_objhdl (0x3012c400) 0 -Class - size=10 align=2 - (0x3012cc40) 0 -Class - size=16 align=4 - (0x301df180) 0 -Class - size=16 align=4 - (0x301df5c0) 0 -Class - size=20 align=4 - (0x303acac0) 0 -Class - size=104 align=4 - (0x30504a00) 0 Class _LC_collate_objhdl size=12 align=4 _LC_collate_objhdl (0x301bfb80) 0 -Class - size=8 align=4 - (0x301e8b00) 0 -Class - size=80 align=4 - (0x305a0100) 0 Class _LC_ctype_objhdl size=12 align=4 @@ -1186,17 +868,11 @@ Class _LC_locale_objhdl size=12 align=4 _LC_locale_objhdl (0x303da600) 0 -Class _LC_object_handle:: - size=12 align=4 -_LC_object_handle:: (0x305911c0) 0 Class _LC_object_handle size=20 align=4 _LC_object_handle (0x30591080) 0 -Class - size=24 align=4 - (0x3031ed80) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14 entries @@ -1271,13 +947,7 @@ Class QUrl size=4 align=4 QUrl (0x302256c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x306df180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307c8900) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14 entries @@ -1303,9 +973,6 @@ QEventLoop (0x30802000) 0 QObject (0x30802040) 0 primary-for QEventLoop (0x30802000) -Class QFlags - size=4 align=4 -QFlags (0x30803740) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27 entries @@ -1348,17 +1015,11 @@ Class QModelIndex size=16 align=4 QModelIndex (0x3049cc80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304eb5c0) 0 empty Class QPersistentModelIndex size=4 align=4 QPersistentModelIndex (0x3049cb80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3002e700) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42 entries @@ -1524,9 +1185,6 @@ Class QBasicTimer size=4 align=4 QBasicTimer (0x307fe180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30803300) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4 entries @@ -1612,17 +1270,11 @@ Class QMetaMethod size=8 align=4 QMetaMethod (0x30379340) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30880740) 0 empty Class QMetaEnum size=8 align=4 QMetaEnum (0x303793c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3088be80) 0 empty Class QMetaProperty size=20 align=4 @@ -1632,9 +1284,6 @@ Class QMetaClassInfo size=8 align=4 QMetaClassInfo (0x30379540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x308a3780) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17 entries @@ -1902,9 +1551,6 @@ Class QBitRef size=8 align=4 QBitRef (0x305a6140) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864700) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1922,65 +1568,41 @@ Class QHashDummyValue size=1 align=1 QHashDummyValue (0x30893ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30897f00) 0 empty Class QDate size=4 align=4 QDate (0x301eb4c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebe80) 0 empty Class QTime size=4 align=4 QTime (0x301f1e80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30368c00) 0 empty Class QDateTime size=4 align=4 QDateTime (0x304b0440) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304d4880) 0 empty Class QPoint size=8 align=4 QPoint (0x301f9d40) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307b9180) 0 empty Class QPointF size=16 align=8 QPointF (0x30200880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307efcc0) 0 empty Class QLine size=16 align=4 QLine (0x301eb540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3098afc0) 0 empty Class QLineF size=32 align=8 QLineF (0x301eb600) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a335c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1990,41 +1612,26 @@ Class QLocale size=4 align=4 QLocale (0x301eb800) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30822c80) 0 empty Class QSize size=8 align=4 QSize (0x30200a80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864400) 0 empty Class QSizeF size=16 align=8 QSizeF (0x30209200) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a33a80) 0 empty Class QRect size=16 align=4 QRect (0x30213780) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30aad700) 0 empty Class QRectF size=32 align=8 QRectF (0x302138c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a1fdc0) 0 empty Class QSharedData size=4 align=4 @@ -2034,11 +1641,5 @@ Class QVectorData size=16 align=4 QVectorData (0x30ad4ec0) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x30120ac0) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x301dfa00) 0 diff --git a/tests/auto/bic/data/QtCore.4.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtCore.4.0.0.linux-gcc-amd64.txt index 9f5b34915..10d487080 100644 --- a/tests/auto/bic/data/QtCore.4.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtCore.4.0.0.linux-gcc-amd64.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x2aaaac1f7930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac211850) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac211af0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac211d90) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac227070) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac227310) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac2275b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac227850) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac227af0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac227d90) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac23a070) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac23a310) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac23a5b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac23a850) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac23aaf0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac23ad90) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x2aaaac24d000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac2d90e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac2d94d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac2d98c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac2d9cb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac31d0e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac31d4d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac31d8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac31dcb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac3630e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac3634d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac3638c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac363cb0) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x2aaaac3b0700) 0 QGenericArgument (0x2aaaac3b0770) 0 -Class QMetaObject:: - size=32 align=8 - base size=32 base align=8 -QMetaObject:: (0x2aaaac3d6000) 0 Class QMetaObject size=32 align=8 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x2aaaac3ebc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac41dcb0) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=12 base align=8 QByteRef (0x2aaaac556310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac5ea380) 0 empty Class QString::Null size=1 align=1 @@ -291,10 +171,6 @@ Class QString base size=8 base align=8 QString (0x2aaaac5ea690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac5eaee0) 0 Class QLatin1String size=8 align=8 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x2aaaac8aa1c0) 0 QString (0x2aaaac8aa230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac8aa770) 0 empty Class QListData::Data size=32 align=8 @@ -327,15 +199,7 @@ Class QListData base size=8 base align=8 QListData (0x2aaaac8eb690) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaaca0d5b0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaaca0d460) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x2aaaaca7ca10) 0 QObject (0x2aaaaca7ca80) 0 primary-for QIODevice (0x2aaaaca7ca10) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacaaf5b0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=128 base align=8 QMapData (0x2aaaacb3a1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacc560e0) 0 Class QTextCodec::ConverterState size=32 align=8 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x2aaaacc2fe00) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 16u) -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaacc759a0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaacc75850) 0 Class QTextEncoder size=40 align=8 @@ -503,30 +351,10 @@ Class QTextDecoder base size=40 base align=8 QTextDecoder (0x2aaaaccb1700) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaaccb1b60) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x2aaaaccb1d20) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaaccb1c40) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaaccb1e00) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaaccb1ee0) 0 Class __gconv_trans_data size=40 align=8 @@ -548,15 +376,7 @@ Class __gconv_info base size=16 base align=8 __gconv_info (0x2aaaacccc230) 0 -Class :: - size=72 align=8 - base size=72 base align=8 -:: (0x2aaaacccc3f0) 0 -Class - size=72 align=8 - base size=72 base align=8 - (0x2aaaacccc310) 0 Class _IO_marker size=24 align=8 @@ -568,10 +388,6 @@ Class _IO_FILE base size=216 base align=8 _IO_FILE (0x2aaaacccc4d0) 0 -Class - size=32 align=8 - base size=32 base align=8 - (0x2aaaacccc5b0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x2aaaacccc620) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacd358c0) 0 Class QTextStreamManipulator size=40 align=8 @@ -680,10 +492,6 @@ QFile (0x2aaaace19380) 0 QObject (0x2aaaace19460) 0 primary-for QIODevice (0x2aaaace193f0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaace4a230) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=8 base align=8 QRegExp (0x2aaaace7c000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaace7ce70) 0 empty Class QStringMatcher size=1048 align=8 base size=1044 base align=8 QStringMatcher (0x2aaaacea10e0) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaacea1690) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaacea1540) 0 Class QStringList size=8 align=8 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x2aaaacea17e0) 0 QList (0x2aaaacea1850) 0 -Class QList::iterator - size=8 align=8 - base size=8 base align=8 -QList::iterator (0x2aaaacef9690) 0 -Class QList::const_iterator - size=8 align=8 - base size=8 base align=8 -QList::const_iterator (0x2aaaacef9a10) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=8 base align=8 QFileInfo (0x2aaaacf7f380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacf7fe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaacfbc2a0) 0 empty -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaacfbca10) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaacfbc8c0) 0 Class QDir size=8 align=8 base size=8 base align=8 QDir (0x2aaaacfbcb60) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacfbce00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad01d070) 0 Class QUrl size=8 align=8 base size=8 base align=8 QUrl (0x2aaaad058d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad0a1070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad0d92a0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x2aaaad0d98c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0fd000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0fd1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0fd380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0fd540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0fd700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0fd8c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0fda80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0fdc40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0fde00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad109000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad1091c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad109380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad109540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad109700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad1098c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad109a80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad109c40) 0 empty Class QVariant::PrivateShared size=16 align=8 @@ -1029,35 +717,15 @@ Class QVariant base size=16 base align=8 QVariant (0x2aaaad109d90) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaad198f50) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaad198e00) 0 -Class QMap:: - size=8 align=8 - base size=8 base align=8 -QMap:: (0x2aaaad1c8310) 0 -Class QMap - size=8 align=8 - base size=8 base align=8 -QMap (0x2aaaad1c81c0) 0 Class QVariantComparisonHelper size=8 align=8 base size=8 base align=8 QVariantComparisonHelper (0x2aaaad208c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad220700) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1128,10 +796,6 @@ Class QFileEngine QFileEngine (0x2aaaad28cb60) 0 vptr=((& QFileEngine::_ZTV11QFileEngine) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad28cf50) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5u entries @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x2aaaad2d47e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad2d49a0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x2aaaad3ffcb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad41d230) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x2aaaad44b070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad44b850) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x2aaaad47c850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad47ca10) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x2aaaad4b0310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad4b08c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x2aaaad4e89a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad4e8bd0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x2aaaad539310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad539a10) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x2aaaad5881c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad5883f0) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x2aaaad633af0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad663a80) 0 empty Class QLinkedListData size=32 align=8 @@ -1262,10 +890,6 @@ Class QBitRef base size=12 base align=8 QBitRef (0x2aaaad7d5c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad7ed850) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=8 base align=8 QLocale (0x2aaaad90f930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad95a3f0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x2aaaad9b4a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad9dbc40) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x2aaaad9dbe70) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaada039a0) 0 empty Class QDateTime size=8 align=8 base size=8 base align=8 QDateTime (0x2aaaada03bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaada23770) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x2aaaadaa9310) 0 QObject (0x2aaaadaa9380) 0 primary-for QEventLoop (0x2aaaadaa9310) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaadaa9770) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=24 base align=8 QModelIndex (0x2aaaadb22850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadb3da80) 0 empty Class QPersistentModelIndex size=8 align=8 base size=8 base align=8 QPersistentModelIndex (0x2aaaadb50000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadb50230) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2aaaadbe18c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadbf9150) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=12 base align=8 QMetaMethod (0x2aaaadc45f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc6b310) 0 empty Class QMetaEnum size=16 align=8 base size=12 base align=8 QMetaEnum (0x2aaaadc6b540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc6ba10) 0 empty Class QMetaProperty size=32 align=8 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=12 base align=8 QMetaClassInfo (0x2aaaadc6bd90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc871c0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2057,18 +1637,6 @@ Class QWriteLocker base size=8 base align=8 QWriteLocker (0x2aaaadd1aaf0) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaaaddc43f0) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaaaddfd4d0) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaaadef3000) 0 diff --git a/tests/auto/bic/data/QtCore.4.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtCore.4.0.0.linux-gcc-ia32.txt index 133d5610d..9e19b0f95 100644 --- a/tests/auto/bic/data/QtCore.4.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtCore.4.0.0.linux-gcc-ia32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x4001ef40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001ed80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab9000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab9040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab9080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab90c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab9100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab9140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab9180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab91c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab9200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab9240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab9280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab92c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab9300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ab9340) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40ab9380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ab9540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ab95c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ab9640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ab96c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ab9740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ab97c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ab9840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ab98c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ab9940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ab99c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ab9a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ab9ac0) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40ab9c00) 0 QGenericArgument (0x40ab9c40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40ab9e40) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x40ab9f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bce000) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x40bce700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bce780) 0 empty Class QString::Null size=1 align=1 @@ -296,10 +176,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x40bce9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40bceb00) 0 Class QCharRef size=8 align=4 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x40bcecc0) 0 QString (0x40bced00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bced80) 0 empty Class QListData::Data size=24 align=4 @@ -327,15 +199,7 @@ Class QListData base size=4 base align=4 QListData (0x40bcee80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x40e732c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x40e73200) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x40e73500) 0 QObject (0x40e73540) 0 primary-for QIODevice (0x40e73500) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40e73680) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=72 base align=4 QMapData (0x40e73780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40e73d40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x40e73c40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x40e73fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x40e73f00) 0 Class QTextEncoder size=32 align=4 @@ -503,30 +351,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x40e733c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x40e73700) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x40e73cc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x40e73a80) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x40e73d80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41062000) 0 Class __gconv_trans_data size=20 align=4 @@ -548,15 +376,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x41062100) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x41062180) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x41062140) 0 Class _IO_marker size=12 align=4 @@ -568,10 +388,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x41062200) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41062240) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x41062280) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x410623c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -680,10 +492,6 @@ QFile (0x41062b00) 0 QObject (0x41062b80) 0 primary-for QIODevice (0x41062b40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41062c80) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x41062e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41062ec0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x41062f00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x410625c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41062f80) 0 Class QStringList size=4 align=4 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x41062780) 0 QList (0x41062bc0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x411731c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x41173240) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x411736c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41173740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41173780) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x411738c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41173800) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x41173900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x411739c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41173a80) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x41173b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41173c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41173c40) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x41173c80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173d00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173d80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173dc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173e00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173e40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173e80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173f00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173f80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173fc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41173640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x4129d000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x4129d040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x4129d080) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1029,35 +717,15 @@ Class QVariant base size=12 base align=4 QVariant (0x4129d0c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4129d680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4129d5c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x4129d800) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x4129d740) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x4129da40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4129db40) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1142,10 +810,6 @@ Class QFileEngineHandler QFileEngineHandler (0x4129de00) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4129df00) 0 Class QHashData::Node size=8 align=4 @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x4129d200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4129d280) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x413aa340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413aa780) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x413aa840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413aac80) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x413aad80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413aadc0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x413aaec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413aaf40) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x413aa380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413aa880) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x413aab00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414de280) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x414de480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414de680) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x414de780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414de900) 0 empty Class QLinkedListData size=20 align=4 @@ -1262,10 +890,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x414def40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414defc0) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=4 base align=4 QLocale (0x416e0100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e0140) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x416e02c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e0440) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x416e0480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e0600) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x416e0640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e0780) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x416e0f00) 0 QObject (0x416e0f40) 0 primary-for QEventLoop (0x416e0f00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x416e0380) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x417f6100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417f6200) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x417f6280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417f6340) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x417f6900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417f69c0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x417f6d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417f6d80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x417f6dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417f6e40) 0 empty Class QMetaProperty size=20 align=4 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x417f6ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417f6f40) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2057,18 +1637,6 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x418f33c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41950900) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41950fc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41a161c0) 0 diff --git a/tests/auto/bic/data/QtCore.4.0.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtCore.4.0.0.linux-gcc-ppc32.txt index 7adc13af8..51bdaf03e 100644 --- a/tests/auto/bic/data/QtCore.4.0.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtCore.4.0.0.linux-gcc-ppc32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x304f6620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x304f68c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x304f6968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x304f6a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x304f6ab8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x304f6b60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x304f6c08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x304f6cb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x304f6d58) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x304f6e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x304f6ea8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x304f6f50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x304f6070) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30530000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305300a8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30530150) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x305301c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305306c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30530738) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305307a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30530818) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30530888) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305308f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30530968) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305309d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30530a48) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30530ab8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30530b28) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30530b98) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187b80) 0 QGenericArgument (0x30530cb0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x30530e70) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x30530f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31457000) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,50 +155,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0x31457b98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31457ee0) 0 empty -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x31538268) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x315382d8) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x315381f8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31538348) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x315383b8) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x31538428) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31538498) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x31538508) 0 Class timespec size=8 align=4 @@ -326,70 +178,18 @@ Class timeval base size=8 base align=4 timeval (0x31538578) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x315385e8) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x31538658) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x31538738) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x315386c8) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x315387a8) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x31538888) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x31538818) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x315388f8) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x315389d8) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x31538968) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31538a48) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x31538ab8) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x31538b28) 0 Class random_data size=28 align=4 @@ -401,25 +201,9 @@ Class drand48_data base size=24 base align=8 drand48_data (0x31538b98) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x31538c78) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31538c08) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x31538ce8) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x31538d58) 0 Class __gconv_trans_data size=20 align=4 @@ -441,15 +225,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x31538ea8) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x31538f88) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x31538f18) 0 Class _IO_marker size=12 align=4 @@ -461,10 +237,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x3157f000) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x3157f070) 0 Class lconv size=56 align=4 @@ -481,10 +253,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0x3157f188) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x3157f1f8) 0 Class tm size=44 align=4 @@ -501,15 +269,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0x3157f428) 0 -Class :: - size=464 align=16 - base size=464 base align=16 -:: (0x3157f578) 0 -Class - size=480 align=16 - base size=480 base align=16 - (0x3157f508) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -536,95 +296,23 @@ Class __false_type base size=0 base align=1 __false_type (0x316453f0) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0x316454d0) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0x316458f8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0x31645a48) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0x31645af0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0x31645b98) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0x31645c40) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0x31645ce8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0x31645d90) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0x31645e38) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0x31645ee0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0x31645f88) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0x3165d038) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0x3165d0e0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0x3165d188) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0x3165d230) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0x3165d380) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0x3165d428) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0x3165d4d0) 0 empty Class std::input_iterator_tag size=1 align=1 @@ -657,75 +345,19 @@ std::random_access_iterator_tag (0x30187ec0) 0 empty std::forward_iterator_tag (0x30187f40) 0 empty std::input_iterator_tag (0x3165db60) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0x3165df18) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0x3168f268) 0 empty -Class std::__copy - size=1 align=1 - base size=0 base align=1 -std::__copy (0x3168f4d0) 0 empty -Class std::__copy_normal - size=1 align=1 - base size=0 base align=1 -std::__copy_normal (0x3168f658) 0 empty -Class std::__copy_normal - size=1 align=1 - base size=0 base align=1 -std::__copy_normal (0x3168f6c8) 0 empty -Class std::__copy_normal - size=1 align=1 - base size=0 base align=1 -std::__copy_normal (0x3168f738) 0 empty -Class std::__copy_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_backward (0x3168f8f8) 0 empty -Class std::__copy_backward_normal - size=1 align=1 - base size=0 base align=1 -std::__copy_backward_normal (0x3168fa10) 0 empty -Class std::__copy_backward_normal - size=1 align=1 - base size=0 base align=1 -std::__copy_backward_normal (0x3168fa80) 0 empty -Class std::__copy_backward_normal - size=1 align=1 - base size=0 base align=1 -std::__copy_backward_normal (0x3168faf0) 0 empty -Class std::__fill - size=1 align=1 - base size=0 base align=1 -std::__fill (0x3168fc08) 0 empty -Class std::__fill_n - size=1 align=1 - base size=0 base align=1 -std::__fill_n (0x3168fea8) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0x316f7310) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0x316f7380) 0 empty Class __gnu_cxx::__pool_base::_Tune size=28 align=4 @@ -742,231 +374,51 @@ Class __gnu_cxx::__pool_base base size=33 base align=4 __gnu_cxx::__pool_base (0x316f73f0) 0 -Class __gnu_cxx::__pool::_Block_record - size=4 align=4 - base size=4 base align=4 -__gnu_cxx::__pool::_Block_record (0x316f77e0) 0 -Class __gnu_cxx::__pool::_Bin_record - size=8 align=4 - base size=8 base align=4 -__gnu_cxx::__pool::_Bin_record (0x316f7818) 0 -Class __gnu_cxx::__pool - size=44 align=4 - base size=44 base align=4 -__gnu_cxx::__pool (0x31689100) 0 - __gnu_cxx::__pool_base (0x316f77a8) 0 -Class __gnu_cxx::__pool::_Thread_record - size=8 align=4 - base size=8 base align=4 -__gnu_cxx::__pool::_Thread_record (0x316f78f8) 0 -Class __gnu_cxx::__pool::_Block_record - size=4 align=4 - base size=4 base align=4 -__gnu_cxx::__pool::_Block_record (0x316f7930) 0 -Class __gnu_cxx::__pool::_Bin_record - size=20 align=4 - base size=20 base align=4 -__gnu_cxx::__pool::_Bin_record (0x316f7968) 0 -Class __gnu_cxx::__pool - size=56 align=4 - base size=56 base align=4 -__gnu_cxx::__pool (0x31689140) 0 - __gnu_cxx::__pool_base (0x316f78c0) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0x3175f070) 0 empty -Class __gnu_cxx::__mt_alloc_base - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__mt_alloc_base (0x3175f348) 0 empty -Class __gnu_cxx::__common_pool_policy<__gnu_cxx::__pool, true> - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__common_pool_policy<__gnu_cxx::__pool, true> (0x3175f428) 0 empty -Class __gnu_cxx::__mt_alloc > - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__mt_alloc > (0x31689200) 0 empty - __gnu_cxx::__mt_alloc_base (0x3175f380) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0x31689240) 0 empty - __gnu_cxx::__mt_alloc > (0x31689280) 0 empty - __gnu_cxx::__mt_alloc_base (0x3175f498) 0 empty -Class __gnu_cxx::__mt_alloc_base - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__mt_alloc_base (0x3175f5e8) 0 empty -Class __gnu_cxx::__mt_alloc > - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__mt_alloc > (0x316892c0) 0 empty - __gnu_cxx::__mt_alloc_base (0x3175f620) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0x31689300) 0 empty - __gnu_cxx::__mt_alloc > (0x31689340) 0 empty - __gnu_cxx::__mt_alloc_base (0x3175f690) 0 empty Class std::__numeric_limits_base size=1 align=1 base size=0 base align=1 std::__numeric_limits_base (0x3175f9a0) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x3175fa80) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x3175faf0) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x3175fb60) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x3175fbd0) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x3175fc40) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x3175fcb0) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x3175fd20) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x3175fd90) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x3175fe00) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x3175fe70) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x3175fee0) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x3175ff50) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x3175ffc0) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x31807000) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x31807070) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0x318070e0) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0x31689ec0) 0 - std::allocator (0x31689f00) 0 empty - __gnu_cxx::__mt_alloc > (0x31689f40) 0 empty - __gnu_cxx::__mt_alloc_base (0x31881968) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0x318817e0) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0x31881a10) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0x31881b28) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0x31689f80) 0 - std::basic_string, std::allocator >::_Rep_base (0x31881a48) 0 -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0x31689fc0) 0 - std::allocator (0x31a89000) 0 empty - __gnu_cxx::__mt_alloc > (0x31a89040) 0 empty - __gnu_cxx::__mt_alloc_base (0x31881dc8) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0x31881c40) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0x31881e70) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0x31881f50) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0x31a89080) 0 - std::basic_string, std::allocator >::_Rep_base (0x31881ea8) 0 Class QString::Null size=1 align=1 @@ -988,30 +440,14 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x31ad31c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31ad3508) 0 Class QCharRef size=8 align=4 base size=8 base align=4 QCharRef (0x31ad3540) 0 -Class std::iterator_traits - size=1 align=1 - base size=0 base align=1 -std::iterator_traits (0x31ad3f88) 0 empty -Class __gnu_cxx::__normal_iterator, std::allocator > > - size=4 align=4 - base size=4 base align=4 -__gnu_cxx::__normal_iterator, std::allocator > > (0x31ad3ea8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31bf0150) 0 empty Class std::locale size=4 align=4 @@ -1085,447 +521,63 @@ Class std::ios_base std::ios_base (0x31c57188) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0x31c576c8) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0x31c579a0) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0x31c57d58) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0x31a89300) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0x31c57e70) 0 - primary-for std::ctype (0x31a89300) - std::ctype_base (0x31c57ea8) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0x31a89380) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0x31d15150) 0 - primary-for std::__ctype_abstract_base (0x31a89380) - std::ctype_base (0x31d15188) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0x31a893c0) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0x31a89400) 0 - primary-for std::ctype (0x31a893c0) - std::locale::facet (0x31d152a0) 0 - primary-for std::__ctype_abstract_base (0x31a89400) - std::ctype_base (0x31d152d8) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname<_CharT>::~ctype_byname [with _CharT = char] -12 std::ctype_byname<_CharT>::~ctype_byname [with _CharT = char] -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0x31a89480) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0x31a894c0) 0 - primary-for std::ctype_byname (0x31a89480) - std::locale::facet (0x31d154d0) 0 - primary-for std::ctype (0x31a894c0) - std::ctype_base (0x31d15508) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname<_CharT>::~ctype_byname [with _CharT = wchar_t] -12 std::ctype_byname<_CharT>::~ctype_byname [with _CharT = wchar_t] -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0x31a89500) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0x31a89540) 0 - primary-for std::ctype_byname (0x31a89500) - std::__ctype_abstract_base (0x31a89580) 0 - primary-for std::ctype (0x31a89540) - std::locale::facet (0x31d15690) 0 - primary-for std::__ctype_abstract_base (0x31a89580) - std::ctype_base (0x31d156c8) 0 empty + + + + + + + + Class std::codecvt_base size=1 align=1 base size=0 base align=1 std::codecvt_base (0x31d157e0) 0 empty -Vtable for std::__codecvt_abstract_base -std::__codecvt_abstract_base::_ZTVSt23__codecvt_abstract_baseIcc11__mbstate_tE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt23__codecvt_abstract_baseIcc11__mbstate_tE) -8 std::__codecvt_abstract_base<_InternT, _ExternT, _StateT>::~__codecvt_abstract_base [with _InternT = char, _ExternT = char, _StateT = mbstate_t] -12 std::__codecvt_abstract_base<_InternT, _ExternT, _StateT>::~__codecvt_abstract_base [with _InternT = char, _ExternT = char, _StateT = mbstate_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -Class std::__codecvt_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__codecvt_abstract_base (0x31a89640) 0 - vptr=((& std::__codecvt_abstract_base::_ZTVSt23__codecvt_abstract_baseIcc11__mbstate_tE) + 8u) - std::locale::facet (0x31d15968) 0 - primary-for std::__codecvt_abstract_base (0x31a89640) - std::codecvt_base (0x31d159a0) 0 empty - -Vtable for std::codecvt -std::codecvt::_ZTVSt7codecvtIcc11__mbstate_tE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7codecvtIcc11__mbstate_tE) -8 std::codecvt::~codecvt -12 std::codecvt::~codecvt -16 std::codecvt::do_out -20 std::codecvt::do_unshift -24 std::codecvt::do_in -28 std::codecvt::do_encoding -32 std::codecvt::do_always_noconv -36 std::codecvt::do_length -40 std::codecvt::do_max_length - -Class std::codecvt - size=12 align=4 - base size=12 base align=4 -std::codecvt (0x31a89680) 0 - vptr=((& std::codecvt::_ZTVSt7codecvtIcc11__mbstate_tE) + 8u) - std::__codecvt_abstract_base (0x31a896c0) 0 - primary-for std::codecvt (0x31a89680) - std::locale::facet (0x31d15ab8) 0 - primary-for std::__codecvt_abstract_base (0x31a896c0) - std::codecvt_base (0x31d15af0) 0 empty - -Vtable for std::__codecvt_abstract_base -std::__codecvt_abstract_base::_ZTVSt23__codecvt_abstract_baseIwc11__mbstate_tE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt23__codecvt_abstract_baseIwc11__mbstate_tE) -8 std::__codecvt_abstract_base<_InternT, _ExternT, _StateT>::~__codecvt_abstract_base [with _InternT = wchar_t, _ExternT = char, _StateT = mbstate_t] -12 std::__codecvt_abstract_base<_InternT, _ExternT, _StateT>::~__codecvt_abstract_base [with _InternT = wchar_t, _ExternT = char, _StateT = mbstate_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -Class std::__codecvt_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__codecvt_abstract_base (0x31a89700) 0 - vptr=((& std::__codecvt_abstract_base::_ZTVSt23__codecvt_abstract_baseIwc11__mbstate_tE) + 8u) - std::locale::facet (0x31d15c78) 0 - primary-for std::__codecvt_abstract_base (0x31a89700) - std::codecvt_base (0x31d15cb0) 0 empty - -Vtable for std::codecvt -std::codecvt::_ZTVSt7codecvtIwc11__mbstate_tE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7codecvtIwc11__mbstate_tE) -8 std::codecvt::~codecvt -12 std::codecvt::~codecvt -16 std::codecvt::do_out -20 std::codecvt::do_unshift -24 std::codecvt::do_in -28 std::codecvt::do_encoding -32 std::codecvt::do_always_noconv -36 std::codecvt::do_length -40 std::codecvt::do_max_length - -Class std::codecvt - size=12 align=4 - base size=12 base align=4 -std::codecvt (0x31a89740) 0 - vptr=((& std::codecvt::_ZTVSt7codecvtIwc11__mbstate_tE) + 8u) - std::__codecvt_abstract_base (0x31a89780) 0 - primary-for std::codecvt (0x31a89740) - std::locale::facet (0x31d15dc8) 0 - primary-for std::__codecvt_abstract_base (0x31a89780) - std::codecvt_base (0x31d15e00) 0 empty + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0x31d15f50) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0x31a89880) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0x31d15d58) 0 - primary-for std::numpunct (0x31a89880) -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0x31a898c0) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0x31d7f150) 0 - primary-for std::numpunct (0x31a898c0) -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0x31a89a00) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0x31d7f3f0) 0 - primary-for std::collate (0x31a89a00) -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0x31a89a40) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0x31d7f578) 0 - primary-for std::collate (0x31a89a40) + + + + Class std::time_base size=1 align=1 base size=0 base align=1 std::time_base (0x31d7f6c8) 0 empty -Vtable for std::__timepunct_cache -std::__timepunct_cache::_ZTVSt17__timepunct_cacheIcE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt17__timepunct_cacheIcE) -8 std::__timepunct_cache<_CharT>::~__timepunct_cache [with _CharT = char] -12 std::__timepunct_cache<_CharT>::~__timepunct_cache [with _CharT = char] - -Class std::__timepunct_cache - size=200 align=4 - base size=197 base align=4 -std::__timepunct_cache (0x31a89b00) 0 - vptr=((& std::__timepunct_cache::_ZTVSt17__timepunct_cacheIcE) + 8u) - std::locale::facet (0x31d7f7e0) 0 - primary-for std::__timepunct_cache (0x31a89b00) - -Vtable for std::__timepunct_cache -std::__timepunct_cache::_ZTVSt17__timepunct_cacheIwE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt17__timepunct_cacheIwE) -8 std::__timepunct_cache<_CharT>::~__timepunct_cache [with _CharT = wchar_t] -12 std::__timepunct_cache<_CharT>::~__timepunct_cache [with _CharT = wchar_t] - -Class std::__timepunct_cache - size=200 align=4 - base size=197 base align=4 -std::__timepunct_cache (0x31a89b40) 0 - vptr=((& std::__timepunct_cache::_ZTVSt17__timepunct_cacheIwE) + 8u) - std::locale::facet (0x31d7f968) 0 - primary-for std::__timepunct_cache (0x31a89b40) - -Vtable for std::__timepunct -std::__timepunct::_ZTVSt11__timepunctIcE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt11__timepunctIcE) -8 std::__timepunct<_CharT>::~__timepunct [with _CharT = char] -12 std::__timepunct<_CharT>::~__timepunct [with _CharT = char] -Class std::__timepunct - size=20 align=4 - base size=20 base align=4 -std::__timepunct (0x31a89bc0) 0 - vptr=((& std::__timepunct::_ZTVSt11__timepunctIcE) + 8u) - std::locale::facet (0x31d7fb60) 0 - primary-for std::__timepunct (0x31a89bc0) -Vtable for std::__timepunct -std::__timepunct::_ZTVSt11__timepunctIwE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt11__timepunctIwE) -8 std::__timepunct<_CharT>::~__timepunct [with _CharT = wchar_t] -12 std::__timepunct<_CharT>::~__timepunct [with _CharT = wchar_t] -Class std::__timepunct - size=20 align=4 - base size=20 base align=4 -std::__timepunct (0x31a89c00) 0 - vptr=((& std::__timepunct::_ZTVSt11__timepunctIwE) + 8u) - std::locale::facet (0x31d7fce8) 0 - primary-for std::__timepunct (0x31a89c00) + + + + Class std::money_base::pattern size=4 align=1 @@ -1537,178 +589,26 @@ Class std::money_base base size=0 base align=1 std::money_base (0x31d7ff18) 0 empty -Vtable for std::moneypunct -std::moneypunct::_ZTVSt10moneypunctIcLb1EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt10moneypunctIcLb1EE) -8 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = char, bool _Intl = true] -12 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = char, bool _Intl = true] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = char, bool _Intl = true] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = char, bool _Intl = true] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = char, bool _Intl = true] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = char, bool _Intl = true] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = char, bool _Intl = true] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = char, bool _Intl = true] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = char, bool _Intl = true] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = char, bool _Intl = true] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = char, bool _Intl = true] - -Class std::moneypunct - size=12 align=4 - base size=12 base align=4 -std::moneypunct (0x31a89e00) 0 - vptr=((& std::moneypunct::_ZTVSt10moneypunctIcLb1EE) + 8u) - std::locale::facet (0x31d7fa10) 0 - primary-for std::moneypunct (0x31a89e00) - std::money_base (0x31d7fc08) 0 empty - -Vtable for std::moneypunct -std::moneypunct::_ZTVSt10moneypunctIcLb0EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt10moneypunctIcLb0EE) -8 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = char, bool _Intl = false] -12 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = char, bool _Intl = false] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = char, bool _Intl = false] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = char, bool _Intl = false] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = char, bool _Intl = false] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = char, bool _Intl = false] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = char, bool _Intl = false] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = char, bool _Intl = false] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = char, bool _Intl = false] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = char, bool _Intl = false] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = char, bool _Intl = false] - -Class std::moneypunct - size=12 align=4 - base size=12 base align=4 -std::moneypunct (0x31a89e40) 0 - vptr=((& std::moneypunct::_ZTVSt10moneypunctIcLb0EE) + 8u) - std::locale::facet (0x31e1d150) 0 - primary-for std::moneypunct (0x31a89e40) - std::money_base (0x31e1d188) 0 empty - -Vtable for std::moneypunct -std::moneypunct::_ZTVSt10moneypunctIwLb1EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt10moneypunctIwLb1EE) -8 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = wchar_t, bool _Intl = true] -12 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = wchar_t, bool _Intl = true] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = wchar_t, bool _Intl = true] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = wchar_t, bool _Intl = true] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = wchar_t, bool _Intl = true] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = wchar_t, bool _Intl = true] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = wchar_t, bool _Intl = true] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = wchar_t, bool _Intl = true] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = wchar_t, bool _Intl = true] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = wchar_t, bool _Intl = true] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = wchar_t, bool _Intl = true] - -Class std::moneypunct - size=12 align=4 - base size=12 base align=4 -std::moneypunct (0x31a89e80) 0 - vptr=((& std::moneypunct::_ZTVSt10moneypunctIwLb1EE) + 8u) - std::locale::facet (0x31e1d348) 0 - primary-for std::moneypunct (0x31a89e80) - std::money_base (0x31e1d380) 0 empty - -Vtable for std::moneypunct -std::moneypunct::_ZTVSt10moneypunctIwLb0EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt10moneypunctIwLb0EE) -8 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = wchar_t, bool _Intl = false] -12 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = wchar_t, bool _Intl = false] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = wchar_t, bool _Intl = false] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = wchar_t, bool _Intl = false] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = wchar_t, bool _Intl = false] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = wchar_t, bool _Intl = false] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = wchar_t, bool _Intl = false] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = wchar_t, bool _Intl = false] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = wchar_t, bool _Intl = false] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = wchar_t, bool _Intl = false] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = wchar_t, bool _Intl = false] - -Class std::moneypunct - size=12 align=4 - base size=12 base align=4 -std::moneypunct (0x31a89ec0) 0 - vptr=((& std::moneypunct::_ZTVSt10moneypunctIwLb0EE) + 8u) - std::locale::facet (0x31e1d540) 0 - primary-for std::moneypunct (0x31a89ec0) - std::money_base (0x31e1d578) 0 empty + + + + + + + Class std::messages_base size=1 align=1 base size=0 base align=1 std::messages_base (0x31e1d770) 0 empty -Vtable for std::messages -std::messages::_ZTVSt8messagesIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8messagesIcE) -8 std::messages<_CharT>::~messages [with _CharT = char] -12 std::messages<_CharT>::~messages [with _CharT = char] -16 std::messages<_CharT>::do_open [with _CharT = char] -20 std::messages<_CharT>::do_get [with _CharT = char] -24 std::messages<_CharT>::do_close [with _CharT = char] - -Class std::messages - size=16 align=4 - base size=16 base align=4 -std::messages (0x31e50000) 0 - vptr=((& std::messages::_ZTVSt8messagesIcE) + 8u) - std::locale::facet (0x31e1d888) 0 - primary-for std::messages (0x31e50000) - std::messages_base (0x31e1d8c0) 0 empty - -Vtable for std::messages -std::messages::_ZTVSt8messagesIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8messagesIwE) -8 std::messages<_CharT>::~messages [with _CharT = wchar_t] -12 std::messages<_CharT>::~messages [with _CharT = wchar_t] -16 std::messages<_CharT>::do_open [with _CharT = wchar_t] -20 std::messages<_CharT>::do_get [with _CharT = wchar_t] -24 std::messages<_CharT>::do_close [with _CharT = wchar_t] - -Class std::messages - size=16 align=4 - base size=16 base align=4 -std::messages (0x31e50040) 0 - vptr=((& std::messages::_ZTVSt8messagesIwE) + 8u) - std::locale::facet (0x31e1da48) 0 - primary-for std::messages (0x31e50040) - std::messages_base (0x31e1da80) 0 empty - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0x31e50100) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0x31e1dce8) 0 - primary-for std::basic_ios > (0x31e50100) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0x31e50140) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0x31e1dea8) 0 - primary-for std::basic_ios > (0x31e50140) + + + + + + + Vtable for std::type_info std::type_info::_ZTVSt9type_info: 8u entries @@ -1759,774 +659,95 @@ std::bad_typeid (0x31e50200) 0 nearly-empty std::exception (0x31eb82d8) 0 nearly-empty primary-for std::bad_typeid (0x31e50200) -Class std::__to_unsigned_type - size=1 align=1 - base size=0 base align=1 -std::__to_unsigned_type (0x31eb8620) 0 empty -Class std::__to_unsigned_type - size=1 align=1 - base size=0 base align=1 -std::__to_unsigned_type (0x31eb8690) 0 empty -Vtable for std::moneypunct_byname -std::moneypunct_byname::_ZTVSt17moneypunct_bynameIcLb0EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt17moneypunct_bynameIcLb0EE) -8 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = char, bool _Intl = false] -12 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = char, bool _Intl = false] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = char, bool _Intl = false] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = char, bool _Intl = false] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = char, bool _Intl = false] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = char, bool _Intl = false] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = char, bool _Intl = false] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = char, bool _Intl = false] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = char, bool _Intl = false] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = char, bool _Intl = false] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = char, bool _Intl = false] - -Class std::moneypunct_byname - size=12 align=4 - base size=12 base align=4 -std::moneypunct_byname (0x31e50240) 0 - vptr=((& std::moneypunct_byname::_ZTVSt17moneypunct_bynameIcLb0EE) + 8u) - std::moneypunct (0x31e50280) 0 - primary-for std::moneypunct_byname (0x31e50240) - std::locale::facet (0x31eb8850) 0 - primary-for std::moneypunct (0x31e50280) - std::money_base (0x31eb8888) 0 empty - -Vtable for std::moneypunct_byname -std::moneypunct_byname::_ZTVSt17moneypunct_bynameIcLb1EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt17moneypunct_bynameIcLb1EE) -8 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = char, bool _Intl = true] -12 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = char, bool _Intl = true] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = char, bool _Intl = true] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = char, bool _Intl = true] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = char, bool _Intl = true] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = char, bool _Intl = true] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = char, bool _Intl = true] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = char, bool _Intl = true] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = char, bool _Intl = true] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = char, bool _Intl = true] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = char, bool _Intl = true] - -Class std::moneypunct_byname - size=12 align=4 - base size=12 base align=4 -std::moneypunct_byname (0x31e502c0) 0 - vptr=((& std::moneypunct_byname::_ZTVSt17moneypunct_bynameIcLb1EE) + 8u) - std::moneypunct (0x31e50300) 0 - primary-for std::moneypunct_byname (0x31e502c0) - std::locale::facet (0x31eb8a10) 0 - primary-for std::moneypunct (0x31e50300) - std::money_base (0x31eb8a48) 0 empty - -Vtable for std::money_get > > -std::money_get > >::_ZTVSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 6u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::money_get<_CharT, _InIter>::~money_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::money_get<_CharT, _InIter>::~money_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::money_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::money_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -Class std::money_get > > - size=8 align=4 - base size=8 base align=4 -std::money_get > > (0x31e50340) 0 - vptr=((& std::money_get > >::_ZTVSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0x31eb8bd0) 0 - primary-for std::money_get > > (0x31e50340) -Vtable for std::money_put > > -std::money_put > >::_ZTVSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 6u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::money_put<_CharT, _OutIter>::~money_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::money_put<_CharT, _OutIter>::~money_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::money_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::money_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -Class std::money_put > > - size=8 align=4 - base size=8 base align=4 -std::money_put > > (0x31e50380) 0 - vptr=((& std::money_put > >::_ZTVSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0x31eb8d58) 0 - primary-for std::money_put > > (0x31e50380) -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0x31e503c0) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0x31e50400) 0 - primary-for std::numpunct_byname (0x31e503c0) - std::locale::facet (0x31eb8ee0) 0 - primary-for std::numpunct (0x31e50400) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0x31e50440) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0x31eb81f8) 0 - primary-for std::num_get > > (0x31e50440) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0x31e50480) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0x31eb8e00) 0 - primary-for std::num_put > > (0x31e50480) -Vtable for std::time_put > > -std::time_put > >::_ZTVSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 5u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::time_put<_CharT, _OutIter>::~time_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::time_put<_CharT, _OutIter>::~time_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::time_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -Class std::time_put > > - size=8 align=4 - base size=8 base align=4 -std::time_put > > (0x31e504c0) 0 - vptr=((& std::time_put > >::_ZTVSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0x31f97118) 0 - primary-for std::time_put > > (0x31e504c0) -Vtable for std::time_put_byname > > -std::time_put_byname > >::_ZTVSt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 5u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::time_put_byname<_CharT, _OutIter>::~time_put_byname [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::time_put_byname<_CharT, _OutIter>::~time_put_byname [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::time_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -Class std::time_put_byname > > - size=8 align=4 - base size=8 base align=4 -std::time_put_byname > > (0x31e50500) 0 - vptr=((& std::time_put_byname > >::_ZTVSt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::time_put > > (0x31e50540) 0 - primary-for std::time_put_byname > > (0x31e50500) - std::locale::facet (0x31f972a0) 0 - primary-for std::time_put > > (0x31e50540) - -Vtable for std::time_get > > -std::time_get > >::_ZTVSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::time_get<_CharT, _InIter>::~time_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::time_get<_CharT, _InIter>::~time_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::time_get<_CharT, _InIter>::do_date_order [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::time_get<_CharT, _InIter>::do_get_time [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::time_get<_CharT, _InIter>::do_get_date [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::time_get<_CharT, _InIter>::do_get_weekday [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::time_get<_CharT, _InIter>::do_get_monthname [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::time_get<_CharT, _InIter>::do_get_year [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::time_get > > - size=8 align=4 - base size=8 base align=4 -std::time_get > > (0x31e50580) 0 - vptr=((& std::time_get > >::_ZTVSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0x31f97428) 0 - primary-for std::time_get > > (0x31e50580) - std::time_base (0x31f97460) 0 empty - -Vtable for std::time_get_byname > > -std::time_get_byname > >::_ZTVSt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::time_get_byname<_CharT, _InIter>::~time_get_byname [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::time_get_byname<_CharT, _InIter>::~time_get_byname [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::time_get<_CharT, _InIter>::do_date_order [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::time_get<_CharT, _InIter>::do_get_time [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::time_get<_CharT, _InIter>::do_get_date [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::time_get<_CharT, _InIter>::do_get_weekday [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::time_get<_CharT, _InIter>::do_get_monthname [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::time_get<_CharT, _InIter>::do_get_year [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::time_get_byname > > - size=8 align=4 - base size=8 base align=4 -std::time_get_byname > > (0x31e505c0) 0 - vptr=((& std::time_get_byname > >::_ZTVSt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::time_get > > (0x31e50600) 0 - primary-for std::time_get_byname > > (0x31e505c0) - std::locale::facet (0x31f975e8) 0 - primary-for std::time_get > > (0x31e50600) - std::time_base (0x31f97620) 0 empty - -Vtable for std::messages_byname -std::messages_byname::_ZTVSt15messages_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15messages_bynameIcE) -8 std::messages_byname<_CharT>::~messages_byname [with _CharT = char] -12 std::messages_byname<_CharT>::~messages_byname [with _CharT = char] -16 std::messages<_CharT>::do_open [with _CharT = char] -20 std::messages<_CharT>::do_get [with _CharT = char] -24 std::messages<_CharT>::do_close [with _CharT = char] - -Class std::messages_byname - size=16 align=4 - base size=16 base align=4 -std::messages_byname (0x31e50640) 0 - vptr=((& std::messages_byname::_ZTVSt15messages_bynameIcE) + 8u) - std::messages (0x31e50680) 0 - primary-for std::messages_byname (0x31e50640) - std::locale::facet (0x31f977a8) 0 - primary-for std::messages (0x31e50680) - std::messages_base (0x31f977e0) 0 empty - -Vtable for std::codecvt_byname -std::codecvt_byname::_ZTVSt14codecvt_bynameIcc11__mbstate_tE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14codecvt_bynameIcc11__mbstate_tE) -8 std::codecvt_byname<_InternT, _ExternT, _StateT>::~codecvt_byname [with _InternT = char, _ExternT = char, _StateT = mbstate_t] -12 std::codecvt_byname<_InternT, _ExternT, _StateT>::~codecvt_byname [with _InternT = char, _ExternT = char, _StateT = mbstate_t] -16 std::codecvt::do_out -20 std::codecvt::do_unshift -24 std::codecvt::do_in -28 std::codecvt::do_encoding -32 std::codecvt::do_always_noconv -36 std::codecvt::do_length -40 std::codecvt::do_max_length - -Class std::codecvt_byname - size=12 align=4 - base size=12 base align=4 -std::codecvt_byname (0x31e506c0) 0 - vptr=((& std::codecvt_byname::_ZTVSt14codecvt_bynameIcc11__mbstate_tE) + 8u) - std::codecvt (0x31e50700) 0 - primary-for std::codecvt_byname (0x31e506c0) - std::__codecvt_abstract_base (0x31e50740) 0 - primary-for std::codecvt (0x31e50700) - std::locale::facet (0x31f97968) 0 - primary-for std::__codecvt_abstract_base (0x31e50740) - std::codecvt_base (0x31f979a0) 0 empty - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0x31e50780) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0x31e507c0) 0 - primary-for std::collate_byname (0x31e50780) - std::locale::facet (0x31f97b28) 0 - primary-for std::collate (0x31e507c0) - -Vtable for std::moneypunct_byname -std::moneypunct_byname::_ZTVSt17moneypunct_bynameIwLb0EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt17moneypunct_bynameIwLb0EE) -8 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = wchar_t, bool _Intl = false] -12 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = wchar_t, bool _Intl = false] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = wchar_t, bool _Intl = false] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = wchar_t, bool _Intl = false] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = wchar_t, bool _Intl = false] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = wchar_t, bool _Intl = false] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = wchar_t, bool _Intl = false] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = wchar_t, bool _Intl = false] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = wchar_t, bool _Intl = false] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = wchar_t, bool _Intl = false] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = wchar_t, bool _Intl = false] - -Class std::moneypunct_byname - size=12 align=4 - base size=12 base align=4 -std::moneypunct_byname (0x31e50800) 0 - vptr=((& std::moneypunct_byname::_ZTVSt17moneypunct_bynameIwLb0EE) + 8u) - std::moneypunct (0x31e50840) 0 - primary-for std::moneypunct_byname (0x31e50800) - std::locale::facet (0x31fbc0a8) 0 - primary-for std::moneypunct (0x31e50840) - std::money_base (0x31fbc0e0) 0 empty - -Vtable for std::moneypunct_byname -std::moneypunct_byname::_ZTVSt17moneypunct_bynameIwLb1EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt17moneypunct_bynameIwLb1EE) -8 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = wchar_t, bool _Intl = true] -12 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = wchar_t, bool _Intl = true] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = wchar_t, bool _Intl = true] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = wchar_t, bool _Intl = true] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = wchar_t, bool _Intl = true] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = wchar_t, bool _Intl = true] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = wchar_t, bool _Intl = true] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = wchar_t, bool _Intl = true] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = wchar_t, bool _Intl = true] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = wchar_t, bool _Intl = true] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = wchar_t, bool _Intl = true] - -Class std::moneypunct_byname - size=12 align=4 - base size=12 base align=4 -std::moneypunct_byname (0x31e50880) 0 - vptr=((& std::moneypunct_byname::_ZTVSt17moneypunct_bynameIwLb1EE) + 8u) - std::moneypunct (0x31e508c0) 0 - primary-for std::moneypunct_byname (0x31e50880) - std::locale::facet (0x31fbc268) 0 - primary-for std::moneypunct (0x31e508c0) - std::money_base (0x31fbc2a0) 0 empty - -Vtable for std::money_get > > -std::money_get > >::_ZTVSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 6u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::money_get<_CharT, _InIter>::~money_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::money_get<_CharT, _InIter>::~money_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::money_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::money_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -Class std::money_get > > - size=8 align=4 - base size=8 base align=4 -std::money_get > > (0x31e50900) 0 - vptr=((& std::money_get > >::_ZTVSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0x31fbc428) 0 - primary-for std::money_get > > (0x31e50900) -Vtable for std::money_put > > -std::money_put > >::_ZTVSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 6u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::money_put<_CharT, _OutIter>::~money_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::money_put<_CharT, _OutIter>::~money_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::money_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::money_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -Class std::money_put > > - size=8 align=4 - base size=8 base align=4 -std::money_put > > (0x31e50940) 0 - vptr=((& std::money_put > >::_ZTVSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0x31fbc5b0) 0 - primary-for std::money_put > > (0x31e50940) -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0x31e50980) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0x31e509c0) 0 - primary-for std::numpunct_byname (0x31e50980) - std::locale::facet (0x31fbc738) 0 - primary-for std::numpunct (0x31e509c0) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0x31e50a00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0x31fbc888) 0 - primary-for std::num_get > > (0x31e50a00) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0x31e50a40) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0x31fbc9d8) 0 - primary-for std::num_put > > (0x31e50a40) -Vtable for std::time_put > > -std::time_put > >::_ZTVSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 5u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::time_put<_CharT, _OutIter>::~time_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::time_put<_CharT, _OutIter>::~time_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::time_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -Class std::time_put > > - size=8 align=4 - base size=8 base align=4 -std::time_put > > (0x31e50a80) 0 - vptr=((& std::time_put > >::_ZTVSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0x31fbcb60) 0 - primary-for std::time_put > > (0x31e50a80) -Vtable for std::time_put_byname > > -std::time_put_byname > >::_ZTVSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 5u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::time_put_byname<_CharT, _OutIter>::~time_put_byname [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::time_put_byname<_CharT, _OutIter>::~time_put_byname [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::time_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -Class std::time_put_byname > > - size=8 align=4 - base size=8 base align=4 -std::time_put_byname > > (0x31e50ac0) 0 - vptr=((& std::time_put_byname > >::_ZTVSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::time_put > > (0x31e50b00) 0 - primary-for std::time_put_byname > > (0x31e50ac0) - std::locale::facet (0x31fbcce8) 0 - primary-for std::time_put > > (0x31e50b00) - -Vtable for std::time_get > > -std::time_get > >::_ZTVSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::time_get<_CharT, _InIter>::~time_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::time_get<_CharT, _InIter>::~time_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::time_get<_CharT, _InIter>::do_date_order [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::time_get<_CharT, _InIter>::do_get_time [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::time_get<_CharT, _InIter>::do_get_date [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::time_get<_CharT, _InIter>::do_get_weekday [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::time_get<_CharT, _InIter>::do_get_monthname [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::time_get<_CharT, _InIter>::do_get_year [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::time_get > > - size=8 align=4 - base size=8 base align=4 -std::time_get > > (0x31e50b40) 0 - vptr=((& std::time_get > >::_ZTVSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0x31fbce70) 0 - primary-for std::time_get > > (0x31e50b40) - std::time_base (0x31fbcea8) 0 empty - -Vtable for std::time_get_byname > > -std::time_get_byname > >::_ZTVSt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::time_get_byname<_CharT, _InIter>::~time_get_byname [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::time_get_byname<_CharT, _InIter>::~time_get_byname [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::time_get<_CharT, _InIter>::do_date_order [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::time_get<_CharT, _InIter>::do_get_time [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::time_get<_CharT, _InIter>::do_get_date [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::time_get<_CharT, _InIter>::do_get_weekday [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::time_get<_CharT, _InIter>::do_get_monthname [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::time_get<_CharT, _InIter>::do_get_year [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::time_get_byname > > - size=8 align=4 - base size=8 base align=4 -std::time_get_byname > > (0x31e50b80) 0 - vptr=((& std::time_get_byname > >::_ZTVSt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::time_get > > (0x31e50bc0) 0 - primary-for std::time_get_byname > > (0x31e50b80) - std::locale::facet (0x31fbc348) 0 - primary-for std::time_get > > (0x31e50bc0) - std::time_base (0x31fbc4d0) 0 empty - -Vtable for std::messages_byname -std::messages_byname::_ZTVSt15messages_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15messages_bynameIwE) -8 std::messages_byname<_CharT>::~messages_byname [with _CharT = wchar_t] -12 std::messages_byname<_CharT>::~messages_byname [with _CharT = wchar_t] -16 std::messages<_CharT>::do_open [with _CharT = wchar_t] -20 std::messages<_CharT>::do_get [with _CharT = wchar_t] -24 std::messages<_CharT>::do_close [with _CharT = wchar_t] - -Class std::messages_byname - size=16 align=4 - base size=16 base align=4 -std::messages_byname (0x31e50c00) 0 - vptr=((& std::messages_byname::_ZTVSt15messages_bynameIwE) + 8u) - std::messages (0x31e50c40) 0 - primary-for std::messages_byname (0x31e50c00) - std::locale::facet (0x31fbcd90) 0 - primary-for std::messages (0x31e50c40) - std::messages_base (0x31fbcf50) 0 empty - -Vtable for std::codecvt_byname -std::codecvt_byname::_ZTVSt14codecvt_bynameIwc11__mbstate_tE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14codecvt_bynameIwc11__mbstate_tE) -8 std::codecvt_byname<_InternT, _ExternT, _StateT>::~codecvt_byname [with _InternT = wchar_t, _ExternT = char, _StateT = mbstate_t] -12 std::codecvt_byname<_InternT, _ExternT, _StateT>::~codecvt_byname [with _InternT = wchar_t, _ExternT = char, _StateT = mbstate_t] -16 std::codecvt::do_out -20 std::codecvt::do_unshift -24 std::codecvt::do_in -28 std::codecvt::do_encoding -32 std::codecvt::do_always_noconv -36 std::codecvt::do_length -40 std::codecvt::do_max_length - -Class std::codecvt_byname - size=12 align=4 - base size=12 base align=4 -std::codecvt_byname (0x31e50c80) 0 - vptr=((& std::codecvt_byname::_ZTVSt14codecvt_bynameIwc11__mbstate_tE) + 8u) - std::codecvt (0x31e50cc0) 0 - primary-for std::codecvt_byname (0x31e50c80) - std::__codecvt_abstract_base (0x31e50d00) 0 - primary-for std::codecvt (0x31e50cc0) - std::locale::facet (0x31ff7150) 0 - primary-for std::__codecvt_abstract_base (0x31e50d00) - std::codecvt_base (0x31ff7188) 0 empty - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0x31e50d40) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0x31e50d80) 0 - primary-for std::collate_byname (0x31e50d40) - std::locale::facet (0x31ff7310) 0 - primary-for std::collate (0x31e50d80) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 4294967292u -24 (int (*)(...))-0x00000000000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0x31e50dc0) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0x31e50e00) 4 virtual - vptridx=4u vbaseoffset=-0x0000000000000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0x31ff7a48) 4 - primary-for std::basic_ios > (0x31e50e00) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0x31ff7f50) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4294967292u -24 (int (*)(...))-0x00000000000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0x31e50e80) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0x31e50ec0) 4 virtual - vptridx=4u vbaseoffset=-0x0000000000000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0x31ff7d58) 4 - primary-for std::basic_ios > (0x31e50ec0) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0x32050380) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 4294967288u -24 (int (*)(...))-0x00000000000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0x31e50f80) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0x31e50fc0) 8 virtual - vptridx=4u vbaseoffset=-0x0000000000000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0x320505b0) 8 - primary-for std::basic_ios > (0x31e50fc0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4294967288u -24 (int (*)(...))-0x00000000000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0x32084000) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0x32084040) 8 virtual - vptridx=4u vbaseoffset=-0x0000000000000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0x320508c0) 8 - primary-for std::basic_ios > (0x32084040) - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0x32050ce8) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x00000000000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 4294967284u -44 (int (*)(...))-0x0000000000000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0x32084100 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2564,44 +785,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0x320840c0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0x32084100) 0 - primary-for std::basic_iostream > (0x320840c0) - subvttidx=4u - std::basic_ios > (0x32084140) 12 virtual - vptridx=20u vbaseoffset=-0x0000000000000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0x32050ee0) 12 - primary-for std::basic_ios > (0x32084140) - std::basic_ostream > (0x32084180) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0x32084140) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0x32050968) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x00000000000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 4294967284u -44 (int (*)(...))-0x0000000000000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0x32084200 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2639,21 +824,6 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0x320841c0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0x32084200) 0 - primary-for std::basic_iostream > (0x320841c0) - subvttidx=4u - std::basic_ios > (0x32084240) 12 virtual - vptridx=20u vbaseoffset=-0x0000000000000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0x32109038) 12 - primary-for std::basic_ios > (0x32084240) - std::basic_ostream > (0x32084280) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0x32084240) alternative-path Class std::_List_node_base size=8 align=4 @@ -2670,15 +840,7 @@ Class QListData base size=4 base align=4 QListData (0x321097e0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32109d58) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32109cb0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -2770,10 +932,6 @@ QIODevice (0x32084400) 0 QObject (0x32238188) 0 primary-for QIODevice (0x32084400) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32238348) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -2816,10 +974,6 @@ Class QTextStream QTextStream (0x323325e8) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x323327a8) 0 Class QTextStreamManipulator size=24 align=4 @@ -2880,10 +1034,6 @@ QFile (0x320846c0) 0 QObject (0x32332ce8) 0 primary-for QIODevice (0x32084700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32332e70) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -2936,25 +1086,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x32332fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32332700) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x32332f50) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32489188) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x324890e0) 0 Class QStringList size=4 align=4 @@ -3054,130 +1192,42 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x324899d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32489a48) 0 empty Class QDir size=4 align=4 base size=4 base align=4 QDir (0x32489af0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32489c08) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32489c78) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x32489d20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32489e38) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32489ee0) 0 Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x32489f18) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32489850) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32547000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32547070) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x325470e0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32547150) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x325471c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32547230) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x325472a0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32547310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32547380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x325473f0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32547460) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x325474d0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32547540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x325475b0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32547620) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x32547690) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3204,35 +1254,15 @@ Class QVariant base size=16 base align=8 QVariant (0x325476c8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32547c40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32547b98) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x32547e70) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x32547dc8) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x32547ea8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x325ca0e0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3317,10 +1347,6 @@ Class QFileEngineHandler QFileEngineHandler (0x325ca3f0) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x325ca578) 0 Class QHashData::Node size=8 align=4 @@ -3337,90 +1363,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x325ca770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x325ca7e0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x325caea8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x325cafc0) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x326ae150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x326ae540) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x326ae700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x326ae770) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x326ae8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x326ae968) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x326aeaf0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x326aee70) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x326ae348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x326aed58) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x327542a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32754498) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x327546c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32754850) 0 empty Class QLinkedListData size=20 align=4 @@ -3437,20 +1427,12 @@ Class QBitRef base size=8 base align=4 QBitRef (0x328a2150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x328a2230) 0 empty Class std::_Bit_reference size=8 align=4 base size=8 base align=4 std::_Bit_reference (0x328a24d0) 0 -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0x328a2620) 0 empty Class std::_Bit_iterator_base size=8 align=4 @@ -3472,37 +1454,11 @@ std::_Bit_const_iterator (0x32084c40) 0 std::_Bit_iterator_base (0x32084c80) 0 std::iterator (0x328a29a0) 0 empty -Class std::iterator_traits - size=1 align=1 - base size=0 base align=1 -std::iterator_traits (0x328a2ce8) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0x328a2d90) 0 empty -Class std::reverse_iterator - size=8 align=4 - base size=8 base align=4 -std::reverse_iterator (0x32084d40) 0 - std::iterator (0x328a2dc8) 0 empty -Class std::iterator_traits - size=1 align=1 - base size=0 base align=1 -std::iterator_traits (0x328a2ee0) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0x328a2f88) 0 empty -Class std::reverse_iterator - size=8 align=4 - base size=8 base align=4 -std::reverse_iterator (0x32084d80) 0 - std::iterator (0x328a2fc0) 0 empty Class QVectorData size=16 align=4 @@ -3524,40 +1480,24 @@ Class QLocale base size=4 base align=4 QLocale (0x3296c818) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3296c888) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x3296ca80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3296cc40) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x3296ccb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3296ce38) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x3296cea8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3296c000) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -3632,10 +1572,6 @@ QTextCodecPlugin (0x32084f00) 0 QFactoryInterface (0x32acc1f8) 8 nearly-empty primary-for QTextCodecFactoryInterface (0x32084f40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32acc540) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -3755,10 +1691,6 @@ QEventLoop (0x32b09040) 0 QObject (0x32acca80) 0 primary-for QEventLoop (0x32b09040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32accc08) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3835,20 +1767,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x32b540a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32b54230) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x32b542d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32b543f0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -4068,10 +1992,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x32b54ab8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32b54b98) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -4166,20 +2086,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x32b54fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32b546c8) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x32b54930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32b54dc8) 0 empty Class QMetaProperty size=20 align=4 @@ -4191,10 +2103,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x32bf0038) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32bf00e0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4317,8 +2225,4 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x32bf0930) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x32d155e8) 0 diff --git a/tests/auto/bic/data/QtCore.4.0.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtCore.4.0.0.macx-gcc-ppc32.txt index 3f0492daa..cee4bd8bb 100644 --- a/tests/auto/bic/data/QtCore.4.0.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtCore.4.0.0.macx-gcc-ppc32.txt @@ -59,75 +59,19 @@ Class QBool base size=4 base align=4 QBool (0x7dc080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dc3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dc480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dc540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dc600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dc6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dc780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dc840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dc900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dc9c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dca80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dcb40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dcc00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dccc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7dcd80) 0 empty Class QFlag size=4 align=4 @@ -144,10 +88,6 @@ Class QChar base size=2 base align=2 QChar (0x824080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x824180) 0 empty Class QBasicAtomic size=4 align=4 @@ -160,10 +100,6 @@ Class QAtomic QAtomic (0x824540) 0 QBasicAtomic (0x824580) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x824800) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -245,70 +181,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xf1c480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xf1c840) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1cd00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1cd80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1ce00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1ce80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1cf00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1cf80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x103b000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x103b080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x103b100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x103b180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x103b200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x103b280) 0 Class QInternal size=1 align=1 @@ -335,10 +219,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x103b9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x103be00) 0 Class QCharRef size=8 align=4 @@ -351,10 +231,6 @@ Class QConstString QConstString (0x120da00) 0 QString (0x120da40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x120db40) 0 empty Class QListData::Data size=24 align=4 @@ -366,10 +242,6 @@ Class QListData base size=4 base align=4 QListData (0x120dd80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x132b380) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -394,15 +266,7 @@ Class QTextCodec QTextCodec (0x132b200) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x132b6c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x132b600) 0 Class QTextEncoder size=32 align=4 @@ -425,25 +289,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x132b900) 0 QGenericArgument (0x132b940) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x132bc00) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x132bb80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x132be80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x132bdc0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -535,10 +387,6 @@ QIODevice (0x14343c0) 0 QObject (0x1434400) 0 primary-for QIODevice (0x14343c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1434640) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -558,25 +406,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1434d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1434f00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1434f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x15100c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1510000) 0 Class QStringList size=4 align=4 @@ -584,15 +420,7 @@ Class QStringList QStringList (0x1510180) 0 QList (0x15101c0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1510680) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1510700) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -748,10 +576,6 @@ Class QTextStream QTextStream (0x1594040) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16a2200) 0 Class QTextStreamManipulator size=24 align=4 @@ -842,50 +666,22 @@ QFile (0x16a2e80) 0 QObject (0x16a2f00) 0 primary-for QIODevice (0x16a2ec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16a29c0) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x177a000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x177a0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x177a140) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x177a300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x177a240) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x177a3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x177a500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x177a5c0) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35u entries @@ -945,10 +741,6 @@ Class QFileEngineHandler QFileEngineHandler (0x177a800) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x177a9c0) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -999,90 +791,22 @@ Class QMetaType base size=0 base align=1 QMetaType (0x177abc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x177acc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x177ad40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x177adc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x177ae40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x177aec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x177af40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x177afc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x177a900) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187f000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187f080) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187f100) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187f180) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187f200) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187f280) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187f300) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187f380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187f400) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1109,50 +833,18 @@ Class QVariant base size=16 base align=4 QVariant (0x187f440) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x187fac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x187fa00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x187fcc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x187fc00) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x187ff40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x187f700) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x187fe00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x194f040) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x194f0c0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1230,15 +922,7 @@ Class QUrl base size=4 base align=4 QUrl (0x194f980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x194fb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x194fc00) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1265,10 +949,6 @@ QEventLoop (0x194fc80) 0 QObject (0x194fcc0) 0 primary-for QEventLoop (0x194fc80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x194fec0) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1313,20 +993,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x194fe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a4f180) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1a4f240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a4f380) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1496,10 +1168,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1a4fa40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a4fb40) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1591,20 +1259,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1af4480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1af4540) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1af45c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1af4680) 0 empty Class QMetaProperty size=20 align=4 @@ -1616,10 +1276,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1af4740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1af4800) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1907,10 +1563,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1c420c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c42200) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1932,80 +1584,48 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1c42440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c424c0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x1c42cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c42ec0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1c42f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c42f80) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1d77040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d771c0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1d77240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d776c0) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x1d77880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d77d00) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1d77f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d77f80) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x1d77380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d77500) 0 empty Class QLinkedListData size=20 align=4 @@ -2017,50 +1637,30 @@ Class QLocale base size=4 base align=4 QLocale (0x1e43300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e43380) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1e434c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e438c0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x1e43b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e43f80) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1e43dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f86080) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x1f86300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f864c0) 0 empty Class QSharedData size=4 align=4 @@ -2072,18 +1672,6 @@ Class QVectorData base size=16 base align=4 QVectorData (0x1f86a40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x21d2000) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x21d2e80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x2286fc0) 0 diff --git a/tests/auto/bic/data/QtCore.4.1.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtCore.4.1.0.linux-gcc-ia32.txt index a60166679..a86532620 100644 --- a/tests/auto/bic/data/QtCore.4.1.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtCore.4.1.0.linux-gcc-ia32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x4001ee80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001ef40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001ef80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001efc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac2000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac2040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac2080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac20c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac2100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac2140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac2180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac21c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac2200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac2240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac2280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac22c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40ac2300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac24c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac2540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac25c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac2640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac26c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac2740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac27c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac2840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac28c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac2940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac29c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac2a40) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40ac2b80) 0 QGenericArgument (0x40ac2bc0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40ac2dc0) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x40ac2ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac2f80) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x40bda680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bda700) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x40bda940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40bdaa80) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x40bdac40) 0 QString (0x40bdac80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bdad00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x40e6e180) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x40e6e5c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x40e6e500) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x40e6e800) 0 QObject (0x40e6e840) 0 primary-for QIODevice (0x40e6e800) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40e6e980) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x40e6eb40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40e6eb80) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x4102c100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4102c700) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x4102c600) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4102c980) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4102c8c0) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x4102ca40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x4102cac0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x4102cb40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x4102cb00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x4102cb80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x4102cbc0) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x4102ccc0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x4102cd40) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x4102cd00) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x4102cdc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x4102ce00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x4102ce40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4102cf80) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x411871c0) 0 QTextStream (0x41187200) 0 primary-for QTextOStream (0x411871c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x411873c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x41187400) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x41187380) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41187440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41187480) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x411874c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x41187500) 0 Class timespec size=8 align=4 @@ -701,10 +485,6 @@ Class timeval base size=8 base align=4 timeval (0x41187580) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x411875c0) 0 Class __sched_param size=4 align=4 @@ -721,45 +501,17 @@ Class __pthread_attr_s base size=36 base align=4 __pthread_attr_s (0x41187680) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0x411876c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x41187700) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x41187740) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x41187780) 0 Class _pthread_rwlock_t size=32 align=4 base size=32 base align=4 _pthread_rwlock_t (0x411877c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41187800) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x41187840) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x41187880) 0 Class random_data size=28 align=4 @@ -830,10 +582,6 @@ QFile (0x41187dc0) 0 QObject (0x41187e40) 0 primary-for QIODevice (0x41187e00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41187f40) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -886,50 +634,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x41187e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412c5040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412c5080) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x412c51c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x412c5100) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x412c5200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412c5280) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x412c52c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x412c5400) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x412c5340) 0 Class QStringList size=4 align=4 @@ -937,30 +657,14 @@ Class QStringList QStringList (0x412c5440) 0 QList (0x412c5480) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x412c56c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x412c5740) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x412c5940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412c5a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412c5a80) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1017,10 +721,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x412c5ac0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412c5c80) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1175,110 +875,30 @@ Class QUrl base size=4 base align=4 QUrl (0x413d6000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x413d60c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413d6100) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x413d6140) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d61c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d6200) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d6240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d6280) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d62c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d6300) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d6340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d6380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d63c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d6400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d6440) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d6480) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d64c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d6500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d6540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d6580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d65c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413d6600) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1305,35 +925,15 @@ Class QVariant base size=12 base align=4 QVariant (0x413d6640) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x413d6c00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x413d6b40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x413d6d80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x413d6cc0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x413d6fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413d6900) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1365,80 +965,48 @@ Class QPoint base size=8 base align=4 QPoint (0x414df180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414df5c0) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x414df680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414dfac0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x414dfbc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414dfc00) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x414dfd00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414dfd80) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x414dfe80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414df340) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x414df6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414dfec0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x415cb140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cb340) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x415cb440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cb5c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1455,10 +1023,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x415cbc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cbc80) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1475,40 +1039,24 @@ Class QLocale base size=4 base align=4 QLocale (0x415cbec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cbf00) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x415cb280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417dd000) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x417dd040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417dd1c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x417dd200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417dd340) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1668,10 +1216,6 @@ QEventLoop (0x417ddac0) 0 QObject (0x417ddb00) 0 primary-for QEventLoop (0x417ddac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x417ddc40) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1763,20 +1307,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x417dd740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417ddb80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x417ddcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417ddec0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1996,10 +1532,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x418d4580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d4640) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2094,20 +1626,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x418d4980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d4a00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x418d4a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d4ac0) 0 empty Class QMetaProperty size=20 align=4 @@ -2119,10 +1643,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x418d4b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d4bc0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2245,23 +1765,7 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x419bd080) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41a00780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41a00b00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41a3f1c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41ac2100) 0 diff --git a/tests/auto/bic/data/QtCore.4.1.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtCore.4.1.0.linux-gcc-ppc32.txt index 2bd50595a..d3c21f837 100644 --- a/tests/auto/bic/data/QtCore.4.1.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtCore.4.1.0.linux-gcc-ppc32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x306bf4d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bf6c8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bf770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bf818) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bf8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bf968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bfa10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bfab8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bfb60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bfc08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bfcb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bfd58) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bfe00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bfea8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306bff50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306f6000) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x306f6070) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f6578) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f65e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f6658) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f66c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f6738) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f67a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f6818) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f6888) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f68f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f6968) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f69d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f6a48) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187ac0) 0 QGenericArgument (0x306f6b60) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x306f6d20) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x306f6e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306f6ea8) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x30c0bb98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30c0bee0) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x30d3c498) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30d3c7e0) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x30187d00) 0 QString (0x30e64268) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30e64348) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x30e64a80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30e64fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30e64f18) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x30187dc0) 0 QObject (0x30f543b8) 0 primary-for QIODevice (0x30187dc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30f545b0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x30f54ce8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30f54d58) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x30ff7460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30ff7b28) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x30ff79d8) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30ff7e00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30ff7d58) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x30ff7f18) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30ff7fc0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x30ff7c08) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30ff7738) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x31159038) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x311590a8) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x311591f8) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x311592d8) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x31159268) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x31159348) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x311593b8) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x311593f0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31159620) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x30187fc0) 0 QTextStream (0x31159b98) 0 primary-for QTextOStream (0x30187fc0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x31159e70) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x31159ee0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x31159e00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31159f50) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31159fc0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x311599d8) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x311e2000) 0 Class timespec size=8 align=4 @@ -701,70 +485,18 @@ Class timeval base size=8 base align=4 timeval (0x311e2070) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x311e20e0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x311e2150) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x311e2230) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x311e21c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x311e22a0) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x311e2380) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x311e2310) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x311e23f0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x311e24d0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x311e2460) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x311e2540) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x311e25b0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x311e2620) 0 Class random_data size=28 align=4 @@ -835,10 +567,6 @@ QFile (0x312af000) 0 QObject (0x311e2c40) 0 primary-for QIODevice (0x312af040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311e2dc8) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -891,50 +619,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x311e2f18) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311e2fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311e2d20) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3130a118) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3130a070) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x3130a1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3130a380) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x3130a3f0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3130a5b0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3130a508) 0 Class QStringList size=4 align=4 @@ -942,30 +642,14 @@ Class QStringList QStringList (0x312af140) 0 QList (0x3130a658) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x3130aa80) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x3130aaf0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x3130ae00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3130af18) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3130af88) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1022,10 +706,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x3130afc0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313cd1f8) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1180,110 +860,30 @@ Class QUrl base size=4 base align=4 QUrl (0x313cd6c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313cd850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313cd8c0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x313cd930) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313cda48) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313cdaf0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313cdb98) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313cdc40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313cdce8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313cdd90) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313cde38) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313cdee0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313cdf88) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313cd310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313cd658) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31467070) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31467118) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x314671c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31467268) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31467310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x314673b8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31467460) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1310,35 +910,15 @@ Class QVariant base size=16 base align=8 QVariant (0x314674d0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31467a80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x314679d8) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x31467c40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x31467b98) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x31467e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31467f18) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1370,80 +950,48 @@ Class QPoint base size=8 base align=4 QPoint (0x3153e310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3153e700) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x3153e8f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3153ece8) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x3153ef18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3153ef88) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x3153e498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3153e5e8) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x3153eb60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315e0268) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x315e0540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315e08c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x315e0c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315e0e38) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x315e00e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315e0658) 0 empty Class QLinkedListData size=20 align=4 @@ -1460,10 +1008,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x316d9888) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316d99a0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1480,40 +1024,24 @@ Class QLocale base size=4 base align=4 QLocale (0x316d9cb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316d9d20) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x316d9f18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31824038) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x318240a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318242a0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x31824310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31824460) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1673,10 +1201,6 @@ QEventLoop (0x312af680) 0 QObject (0x31824fc0) 0 primary-for QEventLoop (0x312af680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31824818) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1768,20 +1292,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x318da818) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318da9a0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x318daa10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318dab28) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2001,10 +1517,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x318dacb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3197b038) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2099,20 +1611,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x3197b460) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3197b508) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x3197b578) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3197b620) 0 empty Class QMetaProperty size=20 align=4 @@ -2124,10 +1628,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x3197b6c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3197b770) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2250,23 +1750,7 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x3197b3f0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31a621f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31a62930) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31a7c738) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b051c0) 0 diff --git a/tests/auto/bic/data/QtCore.4.1.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtCore.4.1.0.macx-gcc-ia32.txt index 50e79611b..b85886756 100644 --- a/tests/auto/bic/data/QtCore.4.1.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtCore.4.1.0.macx-gcc-ia32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x646140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x646380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x646440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x646500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6465c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x646680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x646740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x646800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6468c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x646980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x646a40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x646b00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x646bc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x646c80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x646d40) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x687040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x687140) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0x687840) 0 QBasicAtomic (0x687880) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x687b00) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xe207c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xe20b80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf29040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf290c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf29140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf291c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf29240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf292c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf29340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf293c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf29440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf294c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf29540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf295c0) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xf29d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x108c140) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x108cd40) 0 QString (0x108cd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x108ce80) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x118b740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x118bd80) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x118bc00) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x118ba00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x118b180) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x12a9180) 0 QGenericArgument (0x12a91c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x12a9480) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x12a9400) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x12a9700) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x12a9640) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x12a9d40) 0 QObject (0x12a9d80) 0 primary-for QIODevice (0x12a9d40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x12a9fc0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x136a5c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x136a7c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x136a840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x136aa40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x136a980) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x136ab00) 0 QList (0x136ab40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x136a280) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1414040) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x1414e80) 0 QObject (0x1414f00) 0 primary-for QIODevice (0x1414ec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1414940) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1414a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14c0080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x14c0100) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x14c02c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x14c0200) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x14c0380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14c04c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14c0540) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x14c0580) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14c0840) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x14c0d40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x14c0dc0) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x16d50c0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16d5380) 0 Class QTextStreamManipulator size=24 align=4 @@ -1041,35 +829,15 @@ Class rlimit base size=16 base align=4 rlimit (0x16d5f00) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1767600) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1767680) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x1767580) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1767700) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1767780) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x1767800) 0 Class QVectorData size=16 align=4 @@ -1182,95 +950,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1867200) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x18674c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x18677c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867880) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867a00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867ac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867b80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867d00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867dc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867e80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1867180) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1297,50 +993,18 @@ Class QVariant base size=12 base align=4 QVariant (0x189e040) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x189e6c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x189e600) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x189e8c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x189e800) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x189eb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x189ec80) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x189ed40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x189edc0) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x189ee40) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1418,15 +1082,7 @@ Class QUrl base size=4 base align=4 QUrl (0x19944c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1994680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1994700) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1453,10 +1109,6 @@ QEventLoop (0x1994780) 0 QObject (0x19947c0) 0 primary-for QEventLoop (0x1994780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19949c0) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1501,20 +1153,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1994c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1994dc0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1994e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1994f80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1684,10 +1328,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1a58540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a58640) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1779,20 +1419,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1a58e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ada040) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1ada0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ada180) 0 empty Class QMetaProperty size=20 align=4 @@ -1804,10 +1436,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1ada240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ada300) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2095,10 +1723,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1b72c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b72d80) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2110,70 +1734,42 @@ Class QDate base size=4 base align=4 QDate (0x1b72f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c2a0c0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1c2a140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c2a380) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1c2a400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c2a580) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1c2a600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c2aa80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x1c2ad40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c2a640) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1c2af80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cbb040) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x1cbb1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cbb280) 0 empty Class QLinkedListData size=20 align=4 @@ -2185,73 +1781,37 @@ Class QLocale base size=4 base align=4 QLocale (0x1cbb840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cbb8c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1cbba00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cbbe00) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x1cbbd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1df93c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1df9840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1df9a00) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x1df9c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1df9e40) 0 empty Class QSharedData size=4 align=4 base size=4 base align=4 QSharedData (0x1df9cc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1fb7640) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1fd74c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2026540) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x2089680) 0 diff --git a/tests/auto/bic/data/QtCore.4.1.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtCore.4.1.0.macx-gcc-ppc32.txt index 61c0216a8..b6c7d0160 100644 --- a/tests/auto/bic/data/QtCore.4.1.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtCore.4.1.0.macx-gcc-ppc32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x7c3b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c3dc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c3e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c3f40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7f2000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7f20c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7f2180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7f2240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7f2300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7f23c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7f2480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7f2540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7f2600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7f26c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7f2780) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x7f2a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7f2b80) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0x7f2f80) 0 QBasicAtomic (0x7f2fc0) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0xea4240) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xea4f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xf4a2c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf4a780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf4a800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf4a880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf4a900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf4a980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf4aa00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf4aa80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf4ab00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf4ab80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf4ac00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf4ac80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf4ad00) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x1137440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1137880) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x1285480) 0 QString (0x12854c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x12855c0) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x1285e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13003c0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x1300240) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1300700) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1300640) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1300940) 0 QGenericArgument (0x1300980) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1300c40) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1300bc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1300ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1300e00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x145f400) 0 QObject (0x145f440) 0 primary-for QIODevice (0x145f400) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x145f680) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x145fd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x145ff40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x145ffc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1541100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1541040) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x15411c0) 0 QList (0x1541200) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x15416c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1541740) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x15c5940) 0 QObject (0x15c59c0) 0 primary-for QIODevice (0x15c5980) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15c5b80) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x15c5bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15c5c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15c5d00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x15c5ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x15c5e00) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x15c5f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16b3040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16b30c0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x16b3100) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16b33c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x16b38c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16b3940) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x17cd880) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17cdb40) 0 Class QTextStreamManipulator size=24 align=4 @@ -1051,35 +839,15 @@ Class rlimit base size=16 base align=8 rlimit (0x1923840) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1923900) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1923980) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x1923880) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1923a00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1923a80) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1923b00) 0 Class QVectorData size=16 align=4 @@ -1192,95 +960,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1a05580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a056c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a05780) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a05840) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a05900) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a059c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a05a80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a05b40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a05c00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a05cc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a05d80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a05e40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a05f00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a05fc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a05500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a93080) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a93140) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a93200) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a932c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1307,50 +1003,18 @@ Class QVariant base size=16 base align=4 QVariant (0x1a93340) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1a939c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1a93900) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1a93bc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1a93b00) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1a93e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a93f80) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1a93580) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1a93680) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1a93d00) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1428,15 +1092,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1b65800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b659c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b65a40) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1463,10 +1119,6 @@ QEventLoop (0x1b65ac0) 0 QObject (0x1b65b00) 0 primary-for QEventLoop (0x1b65ac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b65d00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1511,20 +1163,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1b65f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b65ec0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1c71040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c71180) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1694,10 +1338,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1c71880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c71980) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1789,20 +1429,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1d35280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d35340) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1d353c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d35480) 0 empty Class QMetaProperty size=20 align=4 @@ -1814,10 +1446,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1d35540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d35600) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2105,10 +1733,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1dcafc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e7d080) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2120,70 +1744,42 @@ Class QDate base size=4 base align=4 QDate (0x1e7d280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e7d480) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e7d500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e7d740) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1e7d7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e7d940) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1e7d9c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e7de40) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x1e7d800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f29000) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1f29300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f29380) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x1f29500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f295c0) 0 empty Class QLinkedListData size=20 align=4 @@ -2195,73 +1791,37 @@ Class QLocale base size=4 base align=4 QLocale (0x1f29b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f29c00) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1f29d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f29e80) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x208c300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x208c700) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x208cb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x208cd40) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x208cfc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x208c540) 0 empty Class QSharedData size=4 align=4 base size=4 base align=4 QSharedData (0x219c2c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22a1980) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22c1800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2314880) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23799c0) 0 diff --git a/tests/auto/bic/data/QtCore.4.1.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtCore.4.1.0.win32-gcc-ia32.txt index f76159975..3d181edb7 100644 --- a/tests/auto/bic/data/QtCore.4.1.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtCore.4.1.0.win32-gcc-ia32.txt @@ -18,80 +18,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xad5e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebc80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebe00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07b80) 0 empty Class QFlag size=4 align=4 @@ -108,10 +48,6 @@ Class QChar base size=2 base align=2 QChar (0xb4d840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6fcc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -139,70 +75,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc33f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd4ac40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd77100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd773c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd72c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd77a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd949c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8c80) 0 Class QInternal size=1 align=1 @@ -229,10 +113,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xeac500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeac940) 0 Class QCharRef size=8 align=4 @@ -245,10 +125,6 @@ Class QConstString QConstString (0x11ce880) 0 QString (0x11ce8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11cec00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -311,10 +187,6 @@ Class QListData base size=4 base align=4 QListData (0x1268f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1369e40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -339,15 +211,7 @@ Class QTextCodec QTextCodec (0xeac480) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13ab140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc3ca40) 0 Class QTextEncoder size=32 align=4 @@ -370,25 +234,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x13eafc0) 0 QGenericArgument (0x13f0000) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1405700) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x13f0580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x141ff80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x141fb80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -480,10 +332,6 @@ QIODevice (0x1369700) 0 QObject (0x14a9540) 0 primary-for QIODevice (0x1369700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14a9840) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -503,25 +351,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xeac380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15774c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1577840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1577d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1577c40) 0 Class QStringList size=4 align=4 @@ -529,15 +365,7 @@ Class QStringList QStringList (0xeac400) 0 QList (0x15a4000) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1577ec0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1577e80) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -666,50 +494,22 @@ QFile (0x1694840) 0 QObject (0x16948c0) 0 primary-for QIODevice (0x1694880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16a3100) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x16ca5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16caf00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16f8e40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1722300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1722200) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x16ca440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1750040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1722c00) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -766,10 +566,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1694740) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17cf340) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -843,10 +639,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1824c40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1824d40) 0 empty Class QMapData::Node size=8 align=4 @@ -871,10 +663,6 @@ Class QTextStream QTextStream (0x1a69240) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a69600) 0 Class QTextStreamManipulator size=24 align=4 @@ -911,20 +699,8 @@ QTextOStream (0x1af7440) 0 QTextStream (0x1af7480) 0 primary-for QTextOStream (0x1af7440) -Class - size=8 align=4 - base size=8 base align=4 - (0x1b25680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b25800) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1b445c0) 0 Class QVectorData size=16 align=4 @@ -1037,95 +813,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1cd1bc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1cebd40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1cebec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d05040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d051c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d05340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d054c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d05640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d057c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d05940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d05ac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d05c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d05dc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d05f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d230c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d23240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d233c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d23540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d236c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1152,35 +856,15 @@ Class QVariant base size=16 base align=8 QVariant (0x141f8c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1dc0540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d35dc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1dc0840) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1d35e40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1d35000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e26280) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1258,15 +942,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1d23f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ec1440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ef3f80) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1293,10 +969,6 @@ QEventLoop (0x1f20600) 0 QObject (0x1f20640) 0 primary-for QEventLoop (0x1f20600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f20940) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1341,20 +1013,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1f59f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f89b40) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1f59ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f89e80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1524,10 +1188,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1ff5d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20393c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1620,20 +1280,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x13ea8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20a9900) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x13ea940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20a9f00) 0 empty Class QMetaProperty size=20 align=4 @@ -1645,10 +1297,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x13eaa40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20d6640) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1941,10 +1589,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2222640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2282040) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1956,70 +1600,42 @@ Class QDate base size=4 base align=4 QDate (0x1d23900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22c3900) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1d23b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22e7540) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x16ca4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2310300) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1d23b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2310f40) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1d23c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2361180) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1d23980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2382600) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1d23a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23acb00) 0 empty Class QLinkedListData size=20 align=4 @@ -2031,73 +1647,37 @@ Class QLocale base size=4 base align=4 QLocale (0x1d23a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24f8300) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1d23c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2525480) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1d23d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x254b9c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1d23d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25ba440) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1d23e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2639680) 0 empty Class QSharedData size=4 align=4 base size=4 base align=4 QSharedData (0x26e1500) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13ab100) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1577d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x28e51c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x17222c0) 0 diff --git a/tests/auto/bic/data/QtCore.4.2.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtCore.4.2.0.linux-gcc-ia32.txt index 4be1d76b4..e69c115ac 100644 --- a/tests/auto/bic/data/QtCore.4.2.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtCore.4.2.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7fcebc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7fcec00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7fcecc0) 0 empty - QUintForSize<4> (0xb7fced00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7fced80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7fcedc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7fcee80) 0 empty - QIntForSize<4> (0xb7fceec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7893140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7893200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7893240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7893280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78932c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7893300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7893340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7893380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78933c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7893400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7893440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7893480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78934c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7893500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7893540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7893580) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb78935c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78936c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7893700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7893740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7893780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78937c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7893800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7893840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7893880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78938c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7893900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7893940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7893980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78939c0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb7893a80) 0 QGenericArgument (0xb7893ac0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb7893c80) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb7893d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7893dc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb73f10c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f1100) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb73f1140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73f12c0) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb73f13c0) 0 QString (0xb73f1400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f1440) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0xb73f1740) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb73f1ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb73f1a40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0xb73f1c40) 0 QObject (0xb73f1c80) 0 primary-for QIODevice (0xb73f1c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73f1d40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb73f1ec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f1f00) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0xb6f7d3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6f7d940) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0xb6f7d880) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6f7da80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6f7da00) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb6f7db00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6f7db40) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6f7dbc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6f7db80) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6f7dc00) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6f7dc40) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6f7dd40) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6f7ddc0) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6f7dd80) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6f7de40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6f7de80) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0xb6f7dec0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6f7df80) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0xb6f7df40) 0 QTextStream (0xb6f39000) 0 primary-for QTextOStream (0xb6f7df40) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6f390c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6f39100) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6f39080) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6f39140) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6f39180) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6f391c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6f39200) 0 Class timespec size=8 align=4 @@ -738,80 +492,24 @@ Class timeval base size=8 base align=4 timeval (0xb6f39280) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6f392c0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6f39300) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6f39340) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6f39400) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6f393c0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6f39380) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6f39440) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6f394c0) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6f39480) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6f39500) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6f39580) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6f39540) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6f395c0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6f39600) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6f39640) 0 Class random_data size=28 align=4 @@ -882,10 +580,6 @@ QFile (0xb6f39b00) 0 QObject (0xb6f39b80) 0 primary-for QIODevice (0xb6f39b40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6f39c00) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -938,50 +632,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb6f39d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6f39dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6f39e00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6f39ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6f39e40) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb6f39f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6f39f40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6f39f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6f39ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6f39fc0) 0 Class QStringList size=4 align=4 @@ -989,30 +655,14 @@ Class QStringList QStringList (0xb6f39bc0) 0 QList (0xb6f39d40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6d05040) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6d05080) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb6d05140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6d051c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6d05240) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1069,10 +719,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb6d05280) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6d05400) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1184,15 +830,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6d056c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d05700) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6d05740) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1287,285 +925,65 @@ Class QUrl base size=4 base align=4 QUrl (0xb6d05a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6d05ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d05b00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6d05b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d057c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6d05a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a570c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a571c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a572c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a573c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a574c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a575c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a576c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6a57740) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1592,45 +1010,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6a57780) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6a579c0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6a57a00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6a57b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6a57a80) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6a57c00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6a57b80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6a57cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a57d40) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1662,80 +1052,48 @@ Class QPoint base size=8 base align=4 QPoint (0xb6a57f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a57900) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6a57940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a578c0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6a57980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a57c80) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6a57e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a57e40) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0xb6a57f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a57fc0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb69c7000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69c7200) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb69c72c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69c73c0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb69c7400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69c74c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1752,10 +1110,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb69c7880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69c78c0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1772,30 +1126,18 @@ Class QDate base size=4 base align=4 QDate (0xb69c7b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69c7c00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb69c7c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69c7d00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb69c7d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69c7e00) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1981,10 +1323,6 @@ QEventLoop (0xb69c7bc0) 0 QObject (0xb69c7c80) 0 primary-for QEventLoop (0xb69c7bc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69c7d80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1429,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb6823400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6823440) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb6823480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6823500) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2324,10 +1654,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb6823980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68239c0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2422,20 +1748,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb6823c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6823c80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb6823cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6823d00) 0 empty Class QMetaProperty size=20 align=4 @@ -2447,10 +1765,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb6823d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6823dc0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2507,10 +1821,6 @@ QLibrary (0xb6823f00) 0 QObject (0xb6823f40) 0 primary-for QLibrary (0xb6823f00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6823fc0) 0 Class QSemaphore size=4 align=4 @@ -2558,10 +1868,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb68234c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb68236c0) 0 Class QMutexLocker size=4 align=4 @@ -2573,43 +1879,19 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb68237c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb6823940) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb6823880) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb6823b40) 0 Class QWriteLocker size=4 align=4 base size=4 base align=4 QWriteLocker (0xb6823a80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6823e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65c3000) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb65c3080) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb65c3100) 0 diff --git a/tests/auto/bic/data/QtCore.4.2.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtCore.4.2.0.linux-gcc-ppc32.txt index eb8c0516c..909b00c28 100644 --- a/tests/auto/bic/data/QtCore.4.2.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtCore.4.2.0.linux-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x3058e508) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x3058e578) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x3001b9c0) 0 empty - QUintForSize<4> (0x3058e6c8) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x3058e7a8) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x3058e818) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x3001ba40) 0 empty - QIntForSize<4> (0x3058e968) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x3058ece8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3058eee0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3058ef88) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b3038) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b30e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b3188) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b3230) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b32d8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b3380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b3428) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b34d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b3578) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b3620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b36c8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b3770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b3818) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x305b3888) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305b3d58) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305b3dc8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305b3e38) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305b3ea8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305b3f18) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305b3f88) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30659000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30659070) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306590e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30659150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306591c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30659230) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306592a0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3001bb80) 0 QGenericArgument (0x306593b8) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x30659578) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0x30659658) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30659700) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x30b7b460) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b7b7a8) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0x30b7b850) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b7ba80) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0x3001bdc0) 0 QString (0x30ca4c08) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ca4ce8) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0x30d9c3b8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30d9c8f8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30d9c850) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0x3001be80) 0 QObject (0x30d9cdc8) 0 primary-for QIODevice (0x3001be80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30d9cfc0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x30ebc5b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ebc620) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0x30ebce70) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30f9a498) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0x30f9a348) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30f9a770) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30f9a6c8) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x30f9a888) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30f9a930) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x30f9aa10) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30f9a9a0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x30f9aa80) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x30f9aaf0) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x30f9ac40) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x30f9ad20) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x30f9acb0) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x30f9ad90) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x30f9ae00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0x30f9ae38) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30f9a578) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0x310aa080) 0 QTextStream (0x310c7508) 0 primary-for QTextOStream (0x310aa080) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x310c77e0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x310c7850) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x310c7770) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310c78c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310c7930) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x310c79a0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x310c7a10) 0 Class timespec size=8 align=4 @@ -738,70 +492,18 @@ Class timeval base size=8 base align=4 timeval (0x310c7a80) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x310c7af0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x310c7b60) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x310c7c40) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x310c7bd0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310c7cb0) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x310c7d90) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x310c7d20) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310c7e00) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x310c7ee0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x310c7e70) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310c7f50) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x310c7fc0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310c75b0) 0 Class random_data size=28 align=4 @@ -872,10 +574,6 @@ QFile (0x310aa0c0) 0 QObject (0x31108888) 0 primary-for QIODevice (0x310aa100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31108a10) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -928,50 +626,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x31108b60) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31108c08) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31108c78) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31108e00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31108d58) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x31108ea8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312b4000) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x312b4070) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x312b4230) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x312b4188) 0 Class QStringList size=4 align=4 @@ -979,30 +649,14 @@ Class QStringList QStringList (0x310aa200) 0 QList (0x312b42d8) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x312b4700) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x312b4770) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x312b4a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312b4b98) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312b4c40) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1059,10 +713,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x312b4c78) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312b4ee0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1174,15 +824,7 @@ Class QLocale base size=4 base align=4 QLocale (0x3136e230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3136e2d8) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3136e380) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1277,285 +919,65 @@ Class QUrl base size=4 base align=4 QUrl (0x3136e770) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3136e8f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3136e968) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x3136e9d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3136eb98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3136ec40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3136ece8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3136ed90) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3136ee38) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3136eee0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3136ef88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3136e1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3136e700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d070) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d118) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d268) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d310) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d3b8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d460) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d508) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d5b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d658) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d7a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d850) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d8f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144d9a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144da48) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144daf0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144db98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144dc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144dce8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144dd90) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144de38) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144dee0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3144df88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468038) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314680e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468188) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468230) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314682d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468428) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314684d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468578) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468620) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314686c8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468770) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468818) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314688c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468968) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468a10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468ab8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468b60) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468c08) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31468cb0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1582,45 +1004,17 @@ Class QVariant base size=16 base align=8 QVariant (0x31468d20) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x314b80e0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x314b8188) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x314b8348) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x314b82a0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x314b8508) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x314b8460) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x314b8620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x314b8738) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1652,80 +1046,48 @@ Class QPoint base size=8 base align=4 QPoint (0x314b8c78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x314b89d8) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x31577000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315773f0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x31577620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31577690) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x315777e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31577888) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x31577a10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31577d90) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x31577118) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31577b98) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x3160a2a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3160a498) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x3160a6c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3160a850) 0 empty Class QLinkedListData size=20 align=4 @@ -1742,10 +1104,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x31767150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31767230) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1762,30 +1120,18 @@ Class QDate base size=4 base align=4 QDate (0x31767620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317677e0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x31767850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31767a10) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x31767a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31767bd0) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1971,10 +1317,6 @@ QEventLoop (0x310aa780) 0 QObject (0x3181f658) 0 primary-for QEventLoop (0x310aa780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3181f818) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2081,20 +1423,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x3181fee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318d0118) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x318d0188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318d02a0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2314,10 +1648,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x318d09d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318d0ab8) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2412,20 +1742,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x318d0ee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318d0f88) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x318d01f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318d06c8) 0 empty Class QMetaProperty size=20 align=4 @@ -2437,10 +1759,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x318d0bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31998000) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2497,10 +1815,6 @@ QLibrary (0x310aac00) 0 QObject (0x319982d8) 0 primary-for QLibrary (0x310aac00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31998460) 0 Class QSemaphore size=4 align=4 @@ -2548,10 +1862,6 @@ Class QMutex base size=4 base align=4 QMutex (0x31998700) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x31998888) 0 Class QMutexLocker size=4 align=4 @@ -2563,43 +1873,19 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x31998930) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x319989d8) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x31998968) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x31998af0) 0 Class QWriteLocker size=4 align=4 base size=4 base align=4 QWriteLocker (0x31998a80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31a6e038) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31a6e770) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31a86578) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b0f8c0) 0 diff --git a/tests/auto/bic/data/QtCore.4.2.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtCore.4.2.0.macx-gcc-ia32.txt index f6b3abe1a..58d6e9e29 100644 --- a/tests/auto/bic/data/QtCore.4.2.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtCore.4.2.0.macx-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x692c00) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x692c80) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x692e40) 0 empty - QUintForSize<4> (0x692e80) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x692f80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x697000) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x6971c0) 0 empty - QIntForSize<4> (0x697200) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x697700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x697940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x697a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x697ac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x697b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x697c40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x697d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x697dc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x697e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x697f40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6d0000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6d00c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6d0180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6d0240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6d0300) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0x6d0600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6d0700) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0x6d0e00) 0 QBasicAtomic (0x6d0e40) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xe730c0) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xe73e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xf0e1c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf0e640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf0e6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf0e740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf0e7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf0e840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf0e8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf0e940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf0e9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf0ea40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf0eac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf0eb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf0ebc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf0ec40) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x10df400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x10df840) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x11ff480) 0 QString (0x11ff4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11ff5c0) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x11ffe40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x12853c0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1285240) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1285700) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1285640) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1285940) 0 QGenericArgument (0x1285980) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1285c40) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1285bc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1285ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1285e00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x13bd400) 0 QObject (0x13bd440) 0 primary-for QIODevice (0x13bd400) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13bd680) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x13bdd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x13bdfc0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x13bd540) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x148e180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x148e0c0) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x148e240) 0 QList (0x148e280) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x148e740) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x148e7c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x1504580) 0 QObject (0x1504600) 0 primary-for QIODevice (0x15045c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15047c0) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1504800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15048c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1504940) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1504b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1504a40) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1504bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1504d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1504d80) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1504dc0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1504700) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1633480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1633500) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x16e38c0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16e3b80) 0 Class QTextStreamManipulator size=24 align=4 @@ -1078,35 +836,15 @@ Class rlimit base size=16 base align=4 rlimit (0x1823640) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1823dc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1823e40) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x1823d40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1823ec0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1823f40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x1823fc0) 0 Class QVectorData size=16 align=4 @@ -1244,15 +982,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1860e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1860f40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1860900) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1279,270 +1009,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1a28100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a283c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a286c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a289c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a28fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5ea00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5eac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5eb80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5ec40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5ed00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5edc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5ee80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5ef40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a790c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a793c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a796c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a799c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1569,60 +1087,20 @@ Class QVariant base size=12 base align=4 QVariant (0x1a79a40) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79c80) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1ad4140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1ad4080) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1ad4340) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1ad4280) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1ad44c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ad4600) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1ad46c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1ad4740) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1ad47c0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1700,15 +1178,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1ad43c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b970c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b97140) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1735,10 +1205,6 @@ QEventLoop (0x1b971c0) 0 QObject (0x1b97200) 0 primary-for QEventLoop (0x1b971c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b97400) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1783,20 +1249,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1b97640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b97800) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1b97880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b979c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1966,10 +1424,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1b97c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c98080) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2076,20 +1530,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1c98dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c98e80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1c98f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c98fc0) 0 empty Class QMetaProperty size=20 align=4 @@ -2101,10 +1547,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1c98500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c98940) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2286,10 +1728,6 @@ QLibrary (0x1cf8900) 0 QObject (0x1cf8940) 0 primary-for QLibrary (0x1cf8900) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1cf8b00) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2326,10 +1764,6 @@ Class QMutex base size=4 base align=4 QMutex (0x1cf8e40) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x1cf8100) 0 Class QMutexLocker size=4 align=4 @@ -2341,20 +1775,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x1cf8580) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x1cf8a40) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x1cf8700) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x1dc30c0) 0 Class QWriteLocker size=4 align=4 @@ -2412,10 +1838,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1dc3ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dc3bc0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2427,70 +1849,42 @@ Class QDate base size=4 base align=4 QDate (0x1dc3e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dc3e80) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e81000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e81200) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1e81280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e81400) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1e81480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e81900) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x1e81bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e810c0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1e81c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e81d80) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x1f19040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f19100) 0 empty Class QLinkedListData size=20 align=4 @@ -2502,40 +1896,24 @@ Class QSize base size=8 base align=4 QSize (0x1f19740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f19b40) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x1f19f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f19a80) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x20033c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2003580) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x2003800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20039c0) 0 empty Class QSharedData size=4 align=4 @@ -2568,23 +1946,7 @@ QTimeLine (0x2003e80) 0 QObject (0x2003ec0) 0 primary-for QTimeLine (0x2003e80) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x219e700) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x21bc580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x220d600) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x228d140) 0 diff --git a/tests/auto/bic/data/QtCore.4.2.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtCore.4.2.0.macx-gcc-ppc32.txt index 54b1f1c77..5f29b8dae 100644 --- a/tests/auto/bic/data/QtCore.4.2.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtCore.4.2.0.macx-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x9c4800) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x9c4880) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x9c4a40) 0 empty - QUintForSize<4> (0x9c4a80) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x9c4b80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x9c4c00) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x9c4dc0) 0 empty - QIntForSize<4> (0x9c4e00) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x9dd300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9dd540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9dd600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9dd6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9dd780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9dd840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9dd900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9dd9c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9dda80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ddb40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ddc00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ddcc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ddd80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9dde40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ddf00) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0xa12200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa12300) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0xa12900) 0 QBasicAtomic (0xa12940) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0xa12bc0) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xec6900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xec6cc0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfd6140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfd61c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfd6240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfd62c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfd6340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfd63c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfd6440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfd64c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfd6540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfd65c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfd6640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfd66c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfd6740) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xfd6f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x114b340) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x114bf80) 0 QString (0x114bfc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x12440c0) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x1244940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1244f80) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1244e00) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x136d140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x136d080) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x136d380) 0 QGenericArgument (0x136d3c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x136d680) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x136d600) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x136d900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x136d840) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x136df40) 0 QObject (0x136df80) 0 primary-for QIODevice (0x136df40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1434140) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1434840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1434a80) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1434b00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1434d00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1434c40) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x1434dc0) 0 QList (0x1434e00) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x14eb240) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x14eb2c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x156c480) 0 QObject (0x156c500) 0 primary-for QIODevice (0x156c4c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x156c6c0) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x156c700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x156c7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x156c840) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x156ca00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x156c940) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x156cac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x156cc00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x156cc80) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x156ccc0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x156cf80) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1667400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1667480) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x1746440) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1746700) 0 Class QTextStreamManipulator size=24 align=4 @@ -1088,40 +846,16 @@ Class rlimit base size=16 base align=8 rlimit (0x185a380) 0 -Class OSReadSwapInt64(const volatile void*, uintptr_t):: - size=8 align=8 - base size=8 base align=8 -OSReadSwapInt64(const volatile void*, uintptr_t):: (0x185a580) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x185acc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x185ad40) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x185ac40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x185adc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x185ae40) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x185aec0) 0 Class QVectorData size=16 align=4 @@ -1259,15 +993,7 @@ Class QLocale base size=4 base align=4 QLocale (0x188fe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x188fec0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x188ff80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1294,270 +1020,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1a56040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a563c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a566c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a569c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a56fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8aa40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8ab00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8abc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8ac80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8ad40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8ae00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8aec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8af80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aab040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aab100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aab1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aab280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aab340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aab400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aab4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aab580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aab640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aab700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aab7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aab880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aab940) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1584,60 +1098,20 @@ Class QVariant base size=16 base align=4 QVariant (0x1aab9c0) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aabf00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aabfc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1b040c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1b04000) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1b042c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1b04200) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1b04440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b04580) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1b04640) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b046c0) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1b04740) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1715,15 +1189,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1b04f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1be4040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1be40c0) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1750,10 +1216,6 @@ QEventLoop (0x1be4140) 0 QObject (0x1be4180) 0 primary-for QEventLoop (0x1be4140) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1be4380) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1798,20 +1260,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1be45c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1be4780) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1be4800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1be4940) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1981,10 +1435,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1be4880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ccb000) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1541,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1ccbd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ccbe00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1ccbe80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ccbf40) 0 empty Class QMetaProperty size=20 align=4 @@ -2116,10 +1558,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1ccb180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ccb600) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2301,10 +1739,6 @@ QLibrary (0x1d318c0) 0 QObject (0x1d31900) 0 primary-for QLibrary (0x1d318c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d31ac0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2341,10 +1775,6 @@ Class QMutex base size=4 base align=4 QMutex (0x1d31e00) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x1d31fc0) 0 Class QMutexLocker size=4 align=4 @@ -2356,20 +1786,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x1d31380) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x1d31840) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x1d31500) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x1df3080) 0 Class QWriteLocker size=4 align=4 @@ -2427,10 +1849,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1df3a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1df3b80) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2442,70 +1860,42 @@ Class QDate base size=4 base align=4 QDate (0x1df3e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1df32c0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1df3ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ea61c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1ea6240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ea63c0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1ea6440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ea68c0) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x1ea6b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ea6000) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1ea6bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ea6cc0) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x1f49000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f490c0) 0 empty Class QLinkedListData size=20 align=4 @@ -2517,40 +1907,24 @@ Class QSize base size=8 base align=4 QSize (0x1f49700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f49b00) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x1f49ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f499c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x2033380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2033540) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x20337c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2033980) 0 empty Class QSharedData size=4 align=4 @@ -2583,23 +1957,7 @@ QTimeLine (0x2033e40) 0 QObject (0x2033e80) 0 primary-for QTimeLine (0x2033e40) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x21cb6c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x21e9540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x223b5c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22bb100) 0 diff --git a/tests/auto/bic/data/QtCore.4.2.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtCore.4.2.0.win32-gcc-ia32.txt index 4b9c47bbd..9fdd21035 100644 --- a/tests/auto/bic/data/QtCore.4.2.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtCore.4.2.0.win32-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xa9db00) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xa9dc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xa9df00) 0 empty - QUintForSize<4> (0xac2000) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xac2180) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xac2240) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xac24c0) 0 empty - QIntForSize<4> (0xac2580) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xaf3380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf3b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf3d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf3e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ba80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0bc00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0bd80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0bf00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb36080) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb5ff00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb97380) 0 empty Class QBasicAtomic size=4 align=4 @@ -171,75 +81,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc4ab00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd71780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd83e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd940c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd83980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd9ae40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd94780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda58c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda0080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde94c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde9d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef480) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xedf240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xedf780) 0 Class QCharRef size=8 align=4 @@ -282,10 +132,6 @@ Class QConstString QConstString (0x11efdc0) 0 QString (0x11efe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x125c140) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -348,10 +194,6 @@ Class QListData base size=4 base align=4 QListData (0x12d21c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13db180) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -376,15 +218,7 @@ Class QTextCodec QTextCodec (0xedf1c0) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13ff480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc5c5c0) 0 Class QTextEncoder size=32 align=4 @@ -407,25 +241,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x144a300) 0 QGenericArgument (0x144a340) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x145fac0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x144a8c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1490340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1475f40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -517,10 +339,6 @@ QIODevice (0x13b4a40) 0 QObject (0x150ab40) 0 primary-for QIODevice (0x13b4a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x150ae40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -540,25 +358,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xedf0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15d8c00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x15d8f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x15f04c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x15f0380) 0 Class QStringList size=4 align=4 @@ -566,15 +372,7 @@ Class QStringList QStringList (0xedf140) 0 QList (0x15f0740) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x15f0600) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x15f05c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -703,50 +501,22 @@ QFile (0x1710080) 0 QObject (0x1710100) 0 primary-for QIODevice (0x17100c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1710940) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1768140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1768a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1781ac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1781f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1781e80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1726fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17bcc80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17bc880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -803,10 +573,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1700f80) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18590c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -880,10 +646,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x18dbb80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x18dbc80) 0 empty Class QMapData::Node size=8 align=4 @@ -908,10 +670,6 @@ Class QTextStream QTextStream (0x1b11580) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b11940) 0 Class QTextStreamManipulator size=24 align=4 @@ -948,20 +706,8 @@ QTextOStream (0x1ba0740) 0 QTextStream (0x1ba0780) 0 primary-for QTextOStream (0x1ba0740) -Class - size=8 align=4 - base size=8 base align=4 - (0x1bd4980) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1bd4b00) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1bf88c0) 0 Class QVectorData size=16 align=4 @@ -1099,15 +845,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1e61cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ea9980) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ea9040) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1134,270 +872,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1f0b400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2e840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2e9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2eb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2ecc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2ee40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2efc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f42140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f422c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f42440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f425c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f42740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f428c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f42a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f42bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f42d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f42ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f62040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f621c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f62340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f624c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f62640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f627c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f62940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f62ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f62c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f62dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f62f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f800c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f80240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f803c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f80540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f806c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f80840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f809c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f80b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f80cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f80e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f80fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9e140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9e2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9e440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9e5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9e740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9e8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9ea40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9ebc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9ed40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9eec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fc0040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fc01c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fc0340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fc04c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fc0640) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1424,45 +950,17 @@ Class QVariant base size=16 base align=8 QVariant (0x1475c80) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2017e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2017fc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2047480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1fd5540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x2047780) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1fd55c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1fc0800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20af100) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1540,15 +1038,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1f2e180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x216a440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21c8040) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1575,10 +1065,6 @@ QEventLoop (0x21c86c0) 0 QObject (0x21c8700) 0 primary-for QEventLoop (0x21c86c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21c8a00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1623,20 +1109,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x2240200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2240e80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x2240180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x226c2c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1806,10 +1284,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x22ef7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22efe00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1917,20 +1391,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x143ec00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x238bbc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x143ec80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23a01c0) 0 empty Class QMetaProperty size=20 align=4 @@ -1942,10 +1408,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x143ed80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23a0900) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2127,10 +1589,6 @@ QLibrary (0x2460040) 0 QObject (0x2460080) 0 primary-for QLibrary (0x2460040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x24602c0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2172,10 +1630,6 @@ Class QMutex base size=4 base align=4 QMutex (0x24d07c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x24fd000) 0 Class QMutexLocker size=4 align=4 @@ -2187,20 +1641,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x24fde00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x250f140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x24fdfc0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x250f900) 0 Class QWriteLocker size=4 align=4 @@ -2258,10 +1704,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2553ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25ad480) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2273,70 +1715,42 @@ Class QDate base size=4 base align=4 QDate (0x1e61b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2602640) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e61bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x262a280) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1768040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2658040) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1f2e340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2658c80) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1f2e380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2680e40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1f2e2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c62c0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1f2e300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26f2780) 0 empty Class QLinkedListData size=20 align=4 @@ -2348,40 +1762,24 @@ Class QSize base size=8 base align=4 QSize (0x1f2e240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27e3fc0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1f2e280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2836500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1f2e1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x28b7000) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1f2e200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x293d340) 0 empty Class QSharedData size=4 align=4 @@ -2414,23 +1812,7 @@ QTimeLine (0x29b1700) 0 QObject (0x29b1740) 0 primary-for QTimeLine (0x29b1700) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13ff440) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x15f0480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2b9d700) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1781f40) 0 diff --git a/tests/auto/bic/data/QtCore.4.3.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtCore.4.3.0.linux-gcc-ia32.txt index dc11723f3..cb9091da1 100644 --- a/tests/auto/bic/data/QtCore.4.3.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtCore.4.3.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7ee3bc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7ee3c00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7ee3cc0) 0 empty - QUintForSize<4> (0xb7ee3d00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7ee3d80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7ee3dc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7ee3e80) 0 empty - QIntForSize<4> (0xb7ee3ec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb778c180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778c5c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb778c600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb778c700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb778c740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb778c780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb778c7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb778c800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb778c840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb778c880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb778c8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb778c900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb778c940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb778c980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb778c9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb778ca00) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb778cb00) 0 QGenericArgument (0xb778cb40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb778cd00) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb778cdc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778ce40) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb72f1140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72f1180) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb72f11c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72f13c0) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb72f14c0) 0 QString (0xb72f1500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72f1540) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb72f1880) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb72f1c00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb72f1b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb72f1e40) 0 QObject (0xb72f1e80) 0 primary-for QLibrary (0xb72f1e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72f1f00) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb72f1fc0) 0 QObject (0xb72f1300) 0 primary-for QIODevice (0xb72f1fc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72f1680) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb72f1800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72f1a40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb72f1c80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6d4b000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb72f1d00) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb6d4b040) 0 QList (0xb6d4b080) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6d4b100) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6d4b140) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6d4b4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d4b500) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb6d4ba40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d4bb00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6d4bb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d4bc00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6d4bc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d4bd00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb6d4bd40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6d4bdc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6d4be00) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6d4bd80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d4be40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d4be80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6d4bec0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d4bf00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6d4bf40) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb6d4bfc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6d4b240) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6d4b380) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6d4b8c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6d4bb80) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6d4bac0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6d4ba80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d4bbc0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6d4bcc0) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6d4bc80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6cab000) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6cab080) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6cab040) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6cab0c0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6cab100) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6cab140) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb6cab3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cab5c0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6cab640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cab840) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6cabc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cabc40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6cabc80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb6cab740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cab800) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6cab780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cab7c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6b2c080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b2c180) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6b2c1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b2c280) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6b2c2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b2c300) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6b2c340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b2c380) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6b2c700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b2c740) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb6b2c880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b2c900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b2c940) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6b2c980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2ca40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2ca80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cb00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cb80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cbc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cc00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cc80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2ccc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cd00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cd40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cd80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cdc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2ce00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2ce40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2ce80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cf00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cf40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cf80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2cfc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2c0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2c100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2c140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2c200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2c240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b2c580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67550c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67551c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67552c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67553c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67554c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67555c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6755600) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6755640) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb67558c0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6755900) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6755a00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6755980) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6755b00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6755a80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6755b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6755c00) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb6755c40) 0 QObject (0xb6755c80) 0 primary-for QSettings (0xb6755c40) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6755d80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6755d40) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6755dc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6755e00) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6755f00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6755f80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6755f40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6755780) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb67557c0) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb6755800) 0 QObject (0xb6755880) 0 primary-for QIODevice (0xb6755840) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6755d00) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb666d100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666d140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb666d180) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb666d240) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb666d1c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb666d280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666d300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666d380) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb666d5c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666d680) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb666d6c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666d840) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb666d900) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666da40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb666d980) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb666db80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb666db00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb666dc40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666dd00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb666da00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb666dcc0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb666da80) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb666df40) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb648a000) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb648a080) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb648a380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb648a3c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb648a4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb648a500) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb648a540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb648a5c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb648aa40) 0 QObject (0xb648aa80) 0 primary-for QEventLoop (0xb648aa40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb648ab80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb648a880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb648a940) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb648aa00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb648ab00) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb648acc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb648ad80) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2644,18 +1934,6 @@ QTextCodecPlugin (0xb63f7000) 0 QFactoryInterface (0xb63f70c0) 8 nearly-empty primary-for QTextCodecFactoryInterface (0xb63f7080) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb63f71c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb63f7240) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb63f72c0) 0 diff --git a/tests/auto/bic/data/QtCore.4.3.1.linux-gcc-ia32.txt b/tests/auto/bic/data/QtCore.4.3.1.linux-gcc-ia32.txt index 93ba99471..c3671e1af 100644 --- a/tests/auto/bic/data/QtCore.4.3.1.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtCore.4.3.1.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f0ebc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f0ec00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f0ecc0) 0 empty - QUintForSize<4> (0xb7f0ed00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f0ed80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f0edc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7f0ee80) 0 empty - QIntForSize<4> (0xb7f0eec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb73b7180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b72c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b73c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b74c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b75c0) 0 empty Class QFlag size=4 align=4 @@ -161,10 +75,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb73b7a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7a40) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -227,70 +137,18 @@ Class QListData base size=4 base align=4 QListData (0xb73b7d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73b7b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73b7c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73b7cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73b7f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73b7f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71f5000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71f5040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71f5080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71f50c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71f5100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71f5140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71f5180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71f51c0) 0 Class QInternal size=1 align=1 @@ -308,10 +166,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb71f52c0) 0 QGenericArgument (0xb71f5300) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb71f54c0) 0 Class QMetaObject size=16 align=4 @@ -328,10 +182,6 @@ Class QChar base size=2 base align=2 QChar (0xb71f5580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb71f5600) 0 empty Class QString::Null size=1 align=1 @@ -348,10 +198,6 @@ Class QString base size=4 base align=4 QString (0xb71f5640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71f5840) 0 Class QLatin1String size=4 align=4 @@ -369,25 +215,13 @@ Class QConstString QConstString (0xb71f5900) 0 QString (0xb71f5940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb71f5980) 0 empty Class QStringRef size=12 align=4 base size=12 base align=4 QStringRef (0xb71f59c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb71f5b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb71f5a80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -479,10 +313,6 @@ QIODevice (0xb71f5d40) 0 QObject (0xb71f5d80) 0 primary-for QIODevice (0xb71f5d40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71f5e40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -502,275 +332,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb71f5f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb71f5fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb71f5780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb71f57c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb71f5b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb71f5c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb71f5dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb71f5ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f430c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f431c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f432c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f433c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f434c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f435c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f436c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f437c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f438c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f439c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f43b80) 0 empty Class QMapData::Node size=8 align=4 @@ -807,45 +421,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6e15000) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6e15280) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6e152c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6e153c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6e15340) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6e154c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6e15440) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6e15540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e155c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -972,10 +558,6 @@ QEventLoop (0xb6e15a40) 0 QObject (0xb6e15a80) 0 primary-for QEventLoop (0xb6e15a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6e15b80) 0 Vtable for QCoreApplication QCoreApplication::_ZTV16QCoreApplication: 16u entries @@ -1009,10 +591,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb6e15d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e15d80) 0 empty Vtable for QTimer QTimer::_ZTV6QTimer: 14u entries @@ -1069,20 +647,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb6e15f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e15f80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb6e15fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e15180) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1277,20 +847,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb6e15b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e15c40) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb6e15c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e15cc0) 0 empty Class QMetaProperty size=20 align=4 @@ -1302,10 +864,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb6e15f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9a000) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1408,100 +966,48 @@ Class QSize base size=8 base align=4 QSize (0xb6b9a300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9a500) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6b9a580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9a780) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb6b9a840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9aa80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6b9aac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9ad00) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6b9ad40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9ae40) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6b9ae80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b9af40) 0 empty -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6b9afc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6b9a0c0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6b9af80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6b9a180) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6b9a240) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6b9a340) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6b9a380) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6b9a3c0) 0 Class timespec size=8 align=4 @@ -1513,80 +1019,24 @@ Class timeval base size=8 base align=4 timeval (0xb6b9a440) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6b9a480) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6b9a4c0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6b9a5c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6b9a680) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6b9a640) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6b9a600) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6b9a6c0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6b9a740) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6b9a700) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6b9a880) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6b9a900) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6b9a8c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6b9a940) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6b9a980) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6b9a9c0) 0 Class random_data size=28 align=4 @@ -1618,35 +1068,19 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb69c9000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69c9040) 0 empty Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb69c97c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69c9800) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb69c9840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb69c9900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb69c9880) 0 Class QStringList size=4 align=4 @@ -1654,15 +1088,7 @@ Class QStringList QStringList (0xb69c9940) 0 QList (0xb69c9980) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb69c9a00) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb69c9a40) 0 Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1695,15 +1121,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb69c9c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69c9c80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69c9cc0) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1730,10 +1148,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb69c9f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69c9f40) 0 empty Class QCryptographicHash size=4 align=4 @@ -1750,20 +1164,12 @@ Class QLine base size=16 base align=4 QLine (0xb67d12c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67d1300) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb67d1340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67d1380) 0 empty Class QSharedData size=4 align=4 @@ -1775,30 +1181,18 @@ Class QDate base size=4 base align=4 QDate (0xb67d1500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67d15c0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb67d1600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67d16c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb67d1700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67d17c0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1810,20 +1204,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb67d1840) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb67d18c0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb67d1880) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb67d1940) 0 Class QWriteLocker size=4 align=4 @@ -1876,20 +1262,12 @@ Class QMutex base size=4 base align=4 QMutex (0xb67d1b80) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb67d1c00) 0 Class QMutexLocker size=4 align=4 base size=4 base align=4 QMutexLocker (0xb67d1bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb67d1d00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1914,15 +1292,7 @@ Class QTextCodec QTextCodec (0xb67d1c40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb67d1e40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb67d1dc0) 0 Class QTextEncoder size=32 align=4 @@ -1934,25 +1304,9 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb67d1ec0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb67d1f40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb67d1f00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb67d1f80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb67d1fc0) 0 Class __gconv_trans_data size=20 align=4 @@ -1974,15 +1328,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb67d1640) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb67d1740) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb67d1680) 0 Class _IO_marker size=12 align=4 @@ -1994,10 +1340,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb67d1a40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb67d1cc0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -2012,10 +1354,6 @@ Class QTextStream QTextStream (0xb67d1d40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb657d080) 0 Class QTextStreamManipulator size=24 align=4 @@ -2131,35 +1469,15 @@ QFile (0xb657d4c0) 0 QObject (0xb657d540) 0 primary-for QIODevice (0xb657d500) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb657d5c0) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb657d600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb657d640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb657d680) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb657d740) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb657d6c0) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -2212,15 +1530,7 @@ Class QDir base size=4 base align=4 QDir (0xb657d8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb657d940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb657d9c0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2277,10 +1587,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb657da00) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb657db80) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2409,15 +1715,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb657de80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb657df00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb657df40) 0 empty Vtable for QDirIterator QDirIterator::_ZTV12QDirIterator: 4u entries @@ -2432,10 +1730,6 @@ Class QDirIterator QDirIterator (0xb657df80) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb657d200) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -2541,10 +1835,6 @@ QLibrary (0xb657dd40) 0 QObject (0xb657de40) 0 primary-for QLibrary (0xb657dd40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb657dfc0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2644,18 +1934,6 @@ QTextCodecPlugin (0xb64212c0) 0 QFactoryInterface (0xb6421380) 8 nearly-empty primary-for QTextCodecFactoryInterface (0xb6421340) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6421480) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6421500) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6421580) 0 diff --git a/tests/auto/bic/data/QtCore.4.3.2.linux-gcc-ia32.txt b/tests/auto/bic/data/QtCore.4.3.2.linux-gcc-ia32.txt index 47a55b856..8d4df6e59 100644 --- a/tests/auto/bic/data/QtCore.4.3.2.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtCore.4.3.2.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7fb8bc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7fb8c00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7fb8cc0) 0 empty - QUintForSize<4> (0xb7fb8d00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7fb8d80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7fb8dc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7fb8e80) 0 empty - QIntForSize<4> (0xb7fb8ec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7861180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7861240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7861280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78612c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7861300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7861340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7861380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78613c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7861400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7861440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7861480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78614c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7861500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7861540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7861580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78615c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb7861600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7861700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7861740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7861780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78617c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7861800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7861840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7861880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78618c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7861900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7861940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7861980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78619c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7861a00) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb7861b00) 0 QGenericArgument (0xb7861b40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb7861d00) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb7861dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7861e40) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb73c6140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73c6180) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb73c61c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73c63c0) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb73c64c0) 0 QString (0xb73c6500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73c6540) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb73c6880) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb73c6c00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb73c6b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb73c6e40) 0 QObject (0xb73c6e80) 0 primary-for QLibrary (0xb73c6e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73c6f00) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb73c6fc0) 0 QObject (0xb73c6300) 0 primary-for QIODevice (0xb73c6fc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73c6680) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb73c6800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73c6a40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb73c6c80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6e20000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb73c6d00) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb6e20040) 0 QList (0xb6e20080) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6e20100) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6e20140) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6e204c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e20500) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb6e20a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e20b00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6e20b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e20c00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6e20c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e20d00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb6e20d40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e20dc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e20e00) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6e20d80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e20e40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e20e80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6e20ec0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e20f00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e20f40) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb6e20fc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e20240) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6e20380) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6e208c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6e20b80) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6e20ac0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6e20a80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e20bc0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6e20cc0) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6e20c80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d80000) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6d80080) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6d80040) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d800c0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6d80100) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d80140) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb6d803c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d805c0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6d80640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d80840) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6d80c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d80c40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6d80c80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb6d80740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d80800) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6d80780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d807c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6c01080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c01180) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6c011c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c01280) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6c012c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c01300) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6c01340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c01380) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6c01700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c01740) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb6c01880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c01900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c01940) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6c01980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c010c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c01580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb682a600) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb682a640) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb682a8c0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb682a900) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb682aa00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb682a980) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb682ab00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb682aa80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb682ab80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb682ac00) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb682ac40) 0 QObject (0xb682ac80) 0 primary-for QSettings (0xb682ac40) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb682ad80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb682ad40) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb682adc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb682ae00) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb682af00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb682af80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb682af40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb682a780) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb682a7c0) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb682a800) 0 QObject (0xb682a880) 0 primary-for QIODevice (0xb682a840) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb682ad00) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb6742100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6742140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6742180) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6742240) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb67421c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb6742280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6742300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6742380) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb67425c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6742680) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb67426c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6742840) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb6742900) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6742a40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb6742980) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6742b80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6742b00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb6742c40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6742d00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb6742a00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb6742cc0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb6742a80) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb6742f40) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb655f000) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb655f080) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb655f380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb655f3c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb655f4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb655f500) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb655f540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb655f5c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb655fa40) 0 QObject (0xb655fa80) 0 primary-for QEventLoop (0xb655fa40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb655fb80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb655f880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb655f940) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb655fa00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb655fb00) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb655fcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb655fd80) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2644,18 +1934,6 @@ QTextCodecPlugin (0xb64cc000) 0 QFactoryInterface (0xb64cc0c0) 8 nearly-empty primary-for QTextCodecFactoryInterface (0xb64cc080) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64cc1c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64cc240) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64cc2c0) 0 diff --git a/tests/auto/bic/data/QtCore.4.4.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtCore.4.4.0.linux-gcc-ia32.txt index 6338075d9..9d46f68c7 100644 --- a/tests/auto/bic/data/QtCore.4.4.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtCore.4.4.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb796d960) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb796d99c) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7dd1b40) 0 empty - QUintForSize<4> (0xb796da14) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb796db40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb796db7c) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7dd1d00) 0 empty - QIntForSize<4> (0xb796dbf4) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb798e000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798e1e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798e2d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798e3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798e4b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798e5a0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798e690) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798e780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798e870) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798e960) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798ea50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798eb40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798ec30) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798ed20) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798ee10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb798ef00) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb79a9f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb79dcbb8) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6c82780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cc5870) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6cc5b04) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b14438) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b14d5c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b26690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b26fb4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b388e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b4321c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b43b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b5b474) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b5bd98) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b6c6cc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b7f000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b7f924) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb6b923c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69e0654) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb6908b00) 0 QString (0xb6945a14) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6945d20) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QListData base size=4 base align=4 QListData (0xb69cb348) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb686b690) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -386,15 +228,7 @@ Class QTextCodec QTextCodec (0xb68479d8) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb687bce4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb687bc6c) 0 Class QTextEncoder size=32 align=4 @@ -417,25 +251,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb68ac000) 0 QGenericArgument (0xb68a0f00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb68af3fc) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb68af21c) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb68c4564) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb68c44ec) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -527,10 +349,6 @@ QIODevice (0xb66ffe80) 0 QObject (0xb6709564) 0 primary-for QIODevice (0xb66ffe80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6729834) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -550,25 +368,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb6767780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6790f78) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb679b078) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb679b5dc) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb679b564) 0 Class QStringList size=4 align=4 @@ -576,15 +382,7 @@ Class QStringList QStringList (0xb6771f80) 0 QList (0xb679b618) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb67c7384) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb67c75a0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -664,10 +462,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb65f2834) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb66013c0) 0 Class QMutexLocker size=4 align=4 @@ -747,35 +541,11 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb66d0ce4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb66d0d98) 0 empty -Class - size=8 align=4 - base size=8 base align=4 - (0xb6547d20) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6547e10) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6547d98) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6547e88) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6547f00) 0 Class _IO_marker size=12 align=4 @@ -787,10 +557,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6547f78) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6579000) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -805,10 +571,6 @@ Class QTextStream QTextStream (0xb657903c) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65ad7bc) 0 Class QTextStreamManipulator size=24 align=4 @@ -845,40 +607,16 @@ QTextOStream (0xb63d70c0) 0 QTextStream (0xb65c6f3c) 0 primary-for QTextOStream (0xb63d70c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb63db9d8) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb63dba50) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb63db960) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb63dbac8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb63dbb40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb63dbbb8) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb63dbc30) 0 Class timespec size=8 align=4 @@ -890,80 +628,24 @@ Class timeval base size=8 base align=4 timeval (0xb63dbca8) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb63dbd20) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb63dbd98) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb63dbdd4) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb63dbf00) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb63dbe88) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb63dbe4c) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb63dbf78) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb63f503c) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb63db2d0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb63f50b4) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb63f51a4) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb63f512c) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb63f5258) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb63f52d0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb63f5348) 0 Class random_data size=28 align=4 @@ -995,20 +677,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb63130b4) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6313d20) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6313ca8) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb632b078) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -1028,10 +698,6 @@ Class QtConcurrent::ResultStoreBase QtConcurrent::ResultStoreBase (0xb632b1a4) 0 vptr=((& QtConcurrent::ResultStoreBase::_ZTVN12QtConcurrent15ResultStoreBaseE) + 8u) -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb632b8ac) 0 Vtable for QFutureInterfaceBase QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries @@ -1046,25 +712,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb632b924) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb635e780) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb63573c0) 0 - primary-for QFutureInterface (0xb635e780) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb638bb7c) 0 Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1093,34 +742,7 @@ QFutureWatcherBase (0xb63b66c0) 0 QObject (0xb63c021c) 0 primary-for QFutureWatcherBase (0xb63b66c0) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb63b6dc0) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb63b6e00) 0 - primary-for QFutureWatcher (0xb63b6dc0) - QObject (0xb63c0d5c) 0 - primary-for QFutureWatcherBase (0xb63b6e00) Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1219,60 +841,14 @@ QtConcurrent::ThreadEngineBase (0xb62122c0) 0 QRunnable (0xb620dd20) 0 primary-for QtConcurrent::ThreadEngineBase (0xb62122c0) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb621e4ec) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb6212c40) 0 - QtConcurrent::ThreadEngineStarterBase (0xb621e564) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 -4u -32 0u -36 0u -40 0u -44 0u -48 0u -52 -4u -56 0u -60 (int (*)(...))-0x000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb6212e00) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb6212e40) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb621ea14) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb6212e40) Class std::input_iterator_tag size=1 align=1 @@ -1315,225 +891,49 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb623b3fc) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb623b474) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb623b690) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb623b780) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb623b7f8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb623b870) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb623b8e8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb623b960) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb623b9d8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb623ba50) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb623bac8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb623bb40) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb623bbb8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb623bc30) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb623bca8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb623bd20) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb623be10) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb623be88) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb623bf00) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb6254294) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb625430c) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb62543fc) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb6254474) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb62544ec) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6254708) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6254744) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6254780) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb62547bc) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb62547f8) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6254834) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb62548ac) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb62548e8) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6254924) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6254960) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb625499c) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb62549d8) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb62723c0) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb629e99c) 0 empty -Class std::__copy_move - size=1 align=1 - base size=0 base align=1 -std::__copy_move (0xb629edd4) 0 empty -Class std::__copy_move_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_move_backward (0xb60f7000) 0 empty -Class std::__equal - size=1 align=1 - base size=0 base align=1 -std::__equal (0xb60f73fc) 0 empty -Class std::__lc_rai - size=1 align=1 - base size=0 base align=1 -std::__lc_rai (0xb60f7564) 0 empty -Class std::__lexicographical_compare - size=1 align=1 - base size=0 base align=1 -std::__lexicographical_compare (0xb60f76cc) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb60f7dd4) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb61327f8) 0 empty Class lconv size=56 align=4 @@ -1550,10 +950,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb613f3c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb613f438) 0 Class tm size=44 align=4 @@ -1570,15 +966,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb613f708) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb613f870) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb613f7f8) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1590,32 +978,10 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb613f8e8) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb61bae10) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5fc50f0) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb61ce7c0) 0 empty - __gnu_cxx::new_allocator (0xb5fc512c) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5fc5168) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb61ce880) 0 empty - __gnu_cxx::new_allocator (0xb5fc51a4) 0 empty Vtable for __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries @@ -1631,82 +997,19 @@ Class __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind (0xb5fc53c0) 0 nearly-empty vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 8u) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb6025ca8) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb6025ce4) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb6064b40) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb6025d20) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb60c099c) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5efd100) 0 - std::allocator (0xb5efd140) 0 empty - __gnu_cxx::new_allocator (0xb60c0a14) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb60c0924) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb60c0a50) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5efd2c0) 0 - std::basic_string, std::allocator >::_Rep_base (0xb60c0a8c) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb60c0b40) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5efd4c0) 0 - std::allocator (0xb5efd500) 0 empty - __gnu_cxx::new_allocator (0xb60c0bb8) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb60c0ac8) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb60c0bf4) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb60c0ca8) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5efd680) 0 - std::basic_string, std::allocator >::_Rep_base (0xb60c0c30) 0 Class std::locale size=4 align=4 @@ -1736,97 +1039,16 @@ Class std::locale::_Impl base size=20 base align=4 std::locale::_Impl (0xb5f97e88) 0 -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5fac640) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb5faa7f8) 0 - primary-for std::collate (0xb5fac640) -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5fac740) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb5faa8e8) 0 - primary-for std::collate (0xb5fac740) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5faad5c) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5faad98) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5dcb6c0) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5faadd4) 0 empty -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5dcb800) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb5dcb840) 0 - primary-for std::collate_byname (0xb5dcb800) - std::locale::facet (0xb5faae4c) 0 - primary-for std::collate (0xb5dcb840) - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5dcb8c0) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb5dcb900) 0 - primary-for std::collate_byname (0xb5dcb8c0) - std::locale::facet (0xb5faaf3c) 0 - primary-for std::collate (0xb5dcb900) + + + + + Vtable for std::ios_base::failure std::ios_base::failure::_ZTVNSt8ios_base7failureE: 5u entries @@ -1872,583 +1094,85 @@ Class std::ios_base std::ios_base (0xb5ddece4) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5e31384) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5e31618) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb5e318ac) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb5e98fa0) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb5e807f8) 0 - primary-for std::ctype (0xb5e98fa0) - std::ctype_base (0xb5e80834) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb5ea5870) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb5eb73c0) 0 - primary-for std::__ctype_abstract_base (0xb5ea5870) - std::ctype_base (0xb5eb73fc) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb5eaa800) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb5cc26e0) 0 - primary-for std::ctype (0xb5eaa800) - std::locale::facet (0xb5eb74ec) 0 - primary-for std::__ctype_abstract_base (0xb5cc26e0) - std::ctype_base (0xb5eb7528) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb5eaa9c0) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb5cc9e60) 0 - primary-for std::ctype_byname (0xb5eaa9c0) - std::locale::facet (0xb5cc8834) 0 - primary-for std::ctype (0xb5cc9e60) - std::ctype_base (0xb5cc8870) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb5eaaa40) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb5eaaa80) 0 - primary-for std::ctype_byname (0xb5eaaa40) - std::__ctype_abstract_base (0xb5ccd4b0) 0 - primary-for std::ctype (0xb5eaaa80) - std::locale::facet (0xb5cc89d8) 0 - primary-for std::__ctype_abstract_base (0xb5ccd4b0) - std::ctype_base (0xb5cc8a14) 0 empty + + + + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb5cd2384) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5cdb480) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb5cd2bf4) 0 - primary-for std::numpunct (0xb5cdb480) -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5cdb540) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb5cd2ce4) 0 - primary-for std::numpunct (0xb5cdb540) -Class __gnu_cxx::__conditional_type - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type (0xb5d42348) 0 empty -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5d5fa80) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb5d5fac0) 0 - primary-for std::numpunct_byname (0xb5d5fa80) - std::locale::facet (0xb5d4299c) 0 - primary-for std::numpunct (0xb5d5fac0) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5d5fb00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5d42a8c) 0 - primary-for std::num_get > > (0xb5d5fb00) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5d5fb80) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5d42b7c) 0 - primary-for std::num_put > > (0xb5d5fb80) -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5d5fc00) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb5d5fc40) 0 - primary-for std::numpunct_byname (0xb5d5fc00) - std::locale::facet (0xb5d42c6c) 0 - primary-for std::numpunct (0xb5d5fc40) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5d5fcc0) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5d42d5c) 0 - primary-for std::num_get > > (0xb5d5fcc0) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5d5fd40) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5d42e4c) 0 - primary-for std::num_put > > (0xb5d5fd40) -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb5db3d80) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb5db44b0) 0 - primary-for std::basic_ios > (0xb5db3d80) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb5db3dc0) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb5db45a0) 0 - primary-for std::basic_ios > (0xb5db3dc0) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5bfca40) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb5bfca80) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb5bf621c) 4 - primary-for std::basic_ios > (0xb5bfca80) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5bf63fc) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5bfcbc0) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5bfcc00) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5bf6438) 4 - primary-for std::basic_ios > (0xb5bfcc00) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5bf65dc) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5c3d480) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb5c3d4c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb5bf6b40) 8 - primary-for std::basic_ios > (0xb5c3d4c0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5c3d580) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5c3d5c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5bf6ec4) 8 - primary-for std::basic_ios > (0xb5c3d5c0) - -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5c5b4ec) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5c5b528) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5c69480) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5c5b564) 0 empty -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5c5bb40) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb5ca4380 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2486,44 +1210,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5cadb40) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb5ca4380) 0 - primary-for std::basic_iostream > (0xb5cadb40) - subvttidx=4u - std::basic_ios > (0xb5ca43c0) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb5c5bb7c) 12 - primary-for std::basic_ios > (0xb5ca43c0) - std::basic_ostream > (0xb5ca4400) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb5ca43c0) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5c5be10) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb5ca4700 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2561,110 +1249,21 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5cbbbe0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb5ca4700) 0 - primary-for std::basic_iostream > (0xb5cbbbe0) - subvttidx=4u - std::basic_ios > (0xb5ca4740) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb5c5be4c) 12 - primary-for std::basic_ios > (0xb5ca4740) - std::basic_ostream > (0xb5ca4780) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb5ca4740) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5ac5618) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5ac55a0) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb5ac5528) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb5ac5474) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb5ac59d8) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5af51e0) 0 -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb59e0654) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb59ef370) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb59dfa00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb59ef370) - QFutureInterfaceBase (0xb59e0834) 0 - primary-for QFutureInterface (0xb59dfa00) - QRunnable (0xb59e0870) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb59dfa80) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb59ef780) 0 - primary-for QtConcurrent::RunFunctionTask (0xb59dfa80) - QFutureInterface (0xb59dfac0) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb59ef780) - QFutureInterfaceBase (0xb59e0a14) 0 - primary-for QFutureInterface (0xb59dfac0) - QRunnable (0xb59e0a50) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + Class QLibraryInfo size=1 align=1 @@ -2715,50 +1314,22 @@ QFile (0xb5943e00) 0 QObject (0xb593ed98) 0 primary-for QIODevice (0xb5943e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb597a708) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb598a2d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5998960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5998c6c) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb59ad9d8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb59ad960) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb59adac8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57dd03c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57dd12c) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2833,10 +1404,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb580c3fc) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb581c4ec) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2926,10 +1493,6 @@ Class QDirIterator QDirIterator (0xb5840690) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5840e88) 0 Vtable for QFileSystemWatcher QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries @@ -3067,25 +1630,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb58a1e4c) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb58a1ec4) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb5881c6c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb58af6cc) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb58af834) 0 Class QResource size=4 align=4 @@ -3097,275 +1648,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb56d112c) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56d1564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56d1744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56d1924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56d1b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56d1ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56d1ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56e70b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56e7294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56e7474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56e7654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56e7834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56e7a14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56e7bf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56e7dd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56e7fb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56ef1a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56ef384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56ef564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56ef744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56ef924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56efb04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56efce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56efec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56f70b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56f7294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56f7474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56f7654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56f7834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56f7a14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56f7bf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56f7dd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56f7fb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb57001a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5700384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5700564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5700744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5700924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5700b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5700ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5700ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb57070b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5707294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5707474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5707654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5707834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5707a14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5707bf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5707dd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5707fb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb570e1a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb570e384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb570e564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb570e744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb570e924) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3392,45 +1727,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb570eb04) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb574a5a0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb574a528) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb574a690) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb574a618) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb577fa14) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb579203c) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb579221c) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb57923fc) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3508,15 +1815,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb55da474) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55e73c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55fce4c) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -3543,10 +1842,6 @@ QEventLoop (0xb55d6ac0) 0 QObject (0xb5610ca8) 0 primary-for QEventLoop (0xb55d6ac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56222d0) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -3591,20 +1886,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb5644528) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb565a924) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb565aa14) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5661168) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -3774,10 +2061,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb56b12d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb56b1a50) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3889,20 +2172,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb54ee690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54eeb40) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb54eec30) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5528078) 0 empty Class QMetaProperty size=20 align=4 @@ -3914,10 +2189,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb5528474) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55287bc) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -4129,10 +2400,6 @@ QLibrary (0xb55717c0) 0 QObject (0xb55950f0) 0 primary-for QLibrary (0xb55717c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55a403c) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4169,20 +2436,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb53ce618) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb53ceca8) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb53ce99c) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb53e51a4) 0 Class QWriteLocker size=4 align=4 @@ -4209,10 +2468,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb541f780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb542c474) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -4229,70 +2484,42 @@ Class QDate base size=4 base align=4 QDate (0xb544d474) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5461e10) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb5461f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5477474) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb5477564) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb547fc6c) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb547fe4c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5496d20) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb54a3e4c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5294dd4) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb52a3e10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52b31e0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb52ce348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52ced5c) 0 empty Class QLinkedListData size=20 align=4 @@ -4304,40 +2531,24 @@ Class QSize base size=8 base align=4 QSize (0xb5348ca8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5372d98) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb538e924) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5198a50) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb51b8780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51d0654) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb5216258) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5230780) 0 empty Class QSharedData size=4 align=4 @@ -4385,20 +2596,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb50c7f3c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50e04b0) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb50e0618) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb50e05a0) 0 Class QXmlStreamAttributes size=4 align=4 @@ -4411,30 +2610,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb50e0690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51050b4) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb51051e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5105d98) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb5105ec4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5117e4c) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -4461,33 +2648,9 @@ Class QXmlStreamWriter base size=4 base align=4 QXmlStreamWriter (0xb5147708) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4f9d168) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4fb0708) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50568ac) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb5056924) 0 -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb5075564) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb5075690) 0 diff --git a/tests/auto/bic/data/QtDBus.4.2.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtDBus.4.2.0.linux-gcc-ia32.txt index 697235e85..d5748a564 100644 --- a/tests/auto/bic/data/QtDBus.4.2.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDBus.4.2.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f6b880) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f6b8c0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f6b980) 0 empty - QUintForSize<4> (0xb7f6b9c0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f6ba40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f6ba80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7f6bb40) 0 empty - QIntForSize<4> (0xb7f6bb80) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7f6be00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f6bec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f6bf00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f6bf40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f6bf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f6bfc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7805000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7805040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7805080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78050c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7805100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7805140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7805180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78051c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7805200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7805240) 0 empty Class QFlag size=4 align=4 @@ -161,10 +75,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb7805640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7805680) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -247,75 +157,19 @@ Class QChar base size=2 base align=2 QChar (0xb7805b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb765d000) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d0c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d340) 0 Class QInternal size=1 align=1 @@ -337,10 +191,6 @@ Class QString base size=4 base align=4 QString (0xb765d3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765d540) 0 Class QLatin1String size=4 align=4 @@ -358,10 +208,6 @@ Class QConstString QConstString (0xb765d600) 0 QString (0xb765d640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb765d680) 0 empty Class QGenericArgument size=8 align=4 @@ -374,25 +220,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb765d700) 0 QGenericArgument (0xb765d740) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb765d900) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb765d8c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb765da80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb765da00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -484,10 +318,6 @@ QIODevice (0xb765dc00) 0 QObject (0xb765dc40) 0 primary-for QIODevice (0xb765dc00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb765dd00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,25 +337,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb765ddc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb765de00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb765de40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb765df00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb765de80) 0 Class QStringList size=4 align=4 @@ -533,285 +351,65 @@ Class QStringList QStringList (0xb765df40) 0 QList (0xb765df80) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb765d4c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb765dac0) 0 Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb765dd80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b10c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b11c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b12c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b13c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b14c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b15c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b16c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b17c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b18c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b19c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73b1d80) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -838,45 +436,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb73b1dc0) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb73b1f00) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb73b1f40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb721e040) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb73b1fc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb721e140) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb721e0c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb721e200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb721e280) 0 empty Class QDBusObjectPath size=4 align=4 @@ -884,10 +454,6 @@ Class QDBusObjectPath QDBusObjectPath (0xb721e2c0) 0 QString (0xb721e300) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb721e340) 0 empty Class QDBusSignature size=4 align=4 @@ -895,10 +461,6 @@ Class QDBusSignature QDBusSignature (0xb721e400) 0 QString (0xb721e440) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb721e480) 0 empty Class QDBusVariant size=12 align=4 @@ -906,40 +468,16 @@ Class QDBusVariant QDBusVariant (0xb721e540) 0 QVariant (0xb721e580) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb721e5c0) 0 empty Class QDBusArgument size=4 align=4 base size=4 base align=4 QDBusArgument (0xb721e680) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb721e6c0) 0 empty -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb721e8c0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb721e940) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb721ea80) 0 -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb721eb00) 0 Vtable for QDBusAbstractAdaptor QDBusAbstractAdaptor::_ZTV20QDBusAbstractAdaptor: 14u entries @@ -981,10 +519,6 @@ Class QDBusConnection base size=4 base align=4 QDBusConnection (0xb721ec80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb721ed00) 0 Vtable for QDBusAbstractInterface QDBusAbstractInterface::_ZTV22QDBusAbstractInterface: 14u entries @@ -1011,15 +545,7 @@ QDBusAbstractInterface (0xb721ed40) 0 QObject (0xb721ed80) 0 primary-for QDBusAbstractInterface (0xb721ed40) -Class QDBusReply - size=28 align=4 - base size=28 base align=4 -QDBusReply (0xb721ee40) 0 -Class QDBusReply - size=16 align=4 - base size=16 base align=4 -QDBusReply (0xb721ef00) 0 Vtable for QDBusConnectionInterface QDBusConnectionInterface::_ZTV24QDBusConnectionInterface: 14u entries @@ -1048,10 +574,6 @@ QDBusConnectionInterface (0xb721ef80) 0 QObject (0xb721e1c0) 0 primary-for QDBusAbstractInterface (0xb721efc0) -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb721e9c0) 0 empty Vtable for QDBusServer QDBusServer::_ZTV11QDBusServer: 14u entries @@ -1110,18 +632,6 @@ Class QDBusMetaType base size=0 base align=1 QDBusMetaType (0xb71260c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb7126140) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7126380) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb7126400) 0 diff --git a/tests/auto/bic/data/QtDBus.4.2.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtDBus.4.2.0.linux-gcc-ppc32.txt index 855254f52..04cd88dfb 100644 --- a/tests/auto/bic/data/QtDBus.4.2.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtDBus.4.2.0.linux-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x30144738) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x301447a8) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x3001b6c0) 0 empty - QUintForSize<4> (0x301448f8) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x301449d8) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x30144a48) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x3001b740) 0 empty - QIntForSize<4> (0x30144b98) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x30144f18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30570118) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305701c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30570268) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30570310) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305703b8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30570460) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30570508) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305705b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30570658) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30570700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305707a8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30570850) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305708f8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305709a0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30570a48) 0 empty Class QFlag size=4 align=4 @@ -161,10 +75,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x305e0738) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305e0a80) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -247,75 +157,19 @@ Class QChar base size=2 base align=2 QChar (0x306c0b28) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c0bd0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x308640e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30864150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x308641c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30864230) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x308642a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30864310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30864380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x308643f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30864460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x308644d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30864540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x308645b0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30864620) 0 Class QInternal size=1 align=1 @@ -337,10 +191,6 @@ Class QString base size=4 base align=4 QString (0x308646c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x308648f8) 0 Class QLatin1String size=4 align=4 @@ -358,10 +208,6 @@ Class QConstString QConstString (0x3001bb00) 0 QString (0x309b7a10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x309b7af0) 0 empty Class QGenericArgument size=8 align=4 @@ -374,25 +220,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3001bb40) 0 QGenericArgument (0x309b7bd0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x309b7d90) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x309b7d20) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x309b7f88) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x309b7ee0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -484,10 +318,6 @@ QIODevice (0x3001bc80) 0 QObject (0x30aa8460) 0 primary-for QIODevice (0x3001bc80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30aa8658) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,25 +337,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x30aa8bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30aa8dc8) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x30aa8e38) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30aa80e0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30aa8f50) 0 Class QStringList size=4 align=4 @@ -533,285 +351,65 @@ Class QStringList QStringList (0x3001bcc0) 0 QList (0x30aa8930) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x30b783f0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x30b78460) 0 Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x30b78700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30b788c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30b78968) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30b78a10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30b78ab8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30b78b60) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30b78c08) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30b78cb0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30b78d58) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30b78e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30b78ea8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30b78f50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb0a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb150) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb1f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb2a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb3f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb498) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb5e8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb738) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb7e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb888) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb930) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcb9d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcba80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcbb28) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcbbd0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcbc78) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcbd20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcbdc8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcbe70) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcbf18) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30bcbfc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be3070) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be3118) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be31c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be3268) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be3310) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be33b8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be3460) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be3508) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be35b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be3658) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be3700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be37a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be3850) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be38f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be39a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be3a48) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30be3af0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -838,45 +436,17 @@ Class QVariant base size=16 base align=8 QVariant (0x30be3b60) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x30be3ce8) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x30be3e38) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30c34188) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30c340e0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x30c34348) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x30c342a0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x30c34460) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30c34578) 0 empty Class QDBusObjectPath size=4 align=4 @@ -884,10 +454,6 @@ Class QDBusObjectPath QDBusObjectPath (0x3001bd40) 0 QString (0x30c345e8) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x30c346c8) 0 empty Class QDBusSignature size=4 align=4 @@ -895,10 +461,6 @@ Class QDBusSignature QDBusSignature (0x3001bd80) 0 QString (0x30c34a10) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x30c34af0) 0 empty Class QDBusVariant size=16 align=8 @@ -906,40 +468,16 @@ Class QDBusVariant QDBusVariant (0x3001bdc0) 0 QVariant (0x30c34e38) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x30c34f18) 0 empty Class QDBusArgument size=4 align=4 base size=4 base align=4 QDBusArgument (0x30ca9150) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x30ca91c0) 0 empty -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x30ca95e8) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x30ca9690) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0x30ca99a0) 0 -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0x30ca9a48) 0 Vtable for QDBusAbstractAdaptor QDBusAbstractAdaptor::_ZTV20QDBusAbstractAdaptor: 14u entries @@ -981,10 +519,6 @@ Class QDBusConnection base size=4 base align=4 QDBusConnection (0x30ca9c78) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30ca9d58) 0 Vtable for QDBusAbstractInterface QDBusAbstractInterface::_ZTV22QDBusAbstractInterface: 14u entries @@ -1011,15 +545,7 @@ QDBusAbstractInterface (0x3001be40) 0 QObject (0x30ca9d90) 0 primary-for QDBusAbstractInterface (0x3001be40) -Class QDBusReply - size=32 align=8 - base size=32 base align=8 -QDBusReply (0x30ca9fc0) 0 -Class QDBusReply - size=16 align=4 - base size=16 base align=4 -QDBusReply (0x30d4c038) 0 Vtable for QDBusConnectionInterface QDBusConnectionInterface::_ZTV24QDBusConnectionInterface: 14u entries @@ -1048,10 +574,6 @@ QDBusConnectionInterface (0x3001be80) 0 QObject (0x30d4c188) 0 primary-for QDBusAbstractInterface (0x3001bec0) -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30d4c3f0) 0 empty Vtable for QDBusServer QDBusServer::_ZTV11QDBusServer: 14u entries @@ -1110,18 +632,6 @@ Class QDBusMetaType base size=0 base align=1 QDBusMetaType (0x30d4c690) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x30db8e00) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x30dd8d58) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x30dd8b28) 0 diff --git a/tests/auto/bic/data/QtDBus.4.2.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtDBus.4.2.0.macx-gcc-ia32.txt index 38b0b2bc8..62c20d313 100644 --- a/tests/auto/bic/data/QtDBus.4.2.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDBus.4.2.0.macx-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x651880) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x651900) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x651ac0) 0 empty - QUintForSize<4> (0x651b00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x651c00) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x651c80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x651e40) 0 empty - QIntForSize<4> (0x651e80) 0 empty Class QSysInfo size=1 align=1 @@ -50,145 +24,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x663380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6635c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x663680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x663740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x663800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6638c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x663980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x663a40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x663b00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x663bc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x663c80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x663d40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x663e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x663ec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x663f80) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x699000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x699600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x699680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x699700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x699780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x699800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x699880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x699900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x699980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x699a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x699a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x699b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x699b80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x699c00) 0 Class QInternal size=1 align=1 @@ -206,10 +72,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x699d40) 0 QGenericArgument (0x699d80) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xabd040) 0 Class QMetaObject size=16 align=4 @@ -226,10 +88,6 @@ Class QChar base size=2 base align=2 QChar (0xabd180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xabd280) 0 empty Class QBasicAtomic size=4 align=4 @@ -242,10 +100,6 @@ Class QAtomic QAtomic (0xabd980) 0 QBasicAtomic (0xabd9c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xabdc40) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -327,10 +181,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb58980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb58d40) 0 empty Class QString::Null size=1 align=1 @@ -352,10 +202,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xc8d4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xc8d900) 0 Class QCharRef size=8 align=4 @@ -368,10 +214,6 @@ Class QConstString QConstString (0xdd7540) 0 QString (0xdd7580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xdd7680) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -434,15 +276,7 @@ Class QListData base size=4 base align=4 QListData (0xdd7f00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xe4d4c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xe4d400) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -534,10 +368,6 @@ QIODevice (0xe4da40) 0 QObject (0xe4da80) 0 primary-for QIODevice (0xe4da40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe4dcc0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -557,270 +387,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0xf98280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf986c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf989c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf98fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe22c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe25c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe28c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xfe2f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffc040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffc100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffc1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffc280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffc340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffc400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffc4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffc580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffc640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffc700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffc7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffc880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffc940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffca00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffcac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xffcb80) 0 empty Class QMapData::Node size=8 align=4 @@ -857,45 +475,17 @@ Class QVariant base size=12 base align=4 QVariant (0x1093240) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1093780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1093840) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1093a40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1093980) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1093c40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1093b80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1093e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1093f40) 0 empty Vtable for QDBusAbstractAdaptor QDBusAbstractAdaptor::_ZTV20QDBusAbstractAdaptor: 14u entries @@ -938,10 +528,6 @@ Class QDBusObjectPath QDBusObjectPath (0x117e040) 0 QString (0x117e080) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x117e180) 0 empty Class QDBusSignature size=4 align=4 @@ -949,10 +535,6 @@ Class QDBusSignature QDBusSignature (0x117e4c0) 0 QString (0x117e500) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x117e600) 0 empty Class QDBusVariant size=12 align=4 @@ -960,20 +542,12 @@ Class QDBusVariant QDBusVariant (0x117e940) 0 QVariant (0x117e980) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x117ea80) 0 empty Class QDBusConnection size=4 align=4 base size=4 base align=4 QDBusConnection (0x117ed00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x117edc0) 0 Vtable for QDBusAbstractInterface QDBusAbstractInterface::_ZTV22QDBusAbstractInterface: 14u entries @@ -1005,25 +579,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x117ef80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11fe180) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x11fe200) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x11fe3c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x11fe300) 0 Class QStringList size=4 align=4 @@ -1031,55 +593,19 @@ Class QStringList QStringList (0x11fe480) 0 QList (0x11fe4c0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x11fe980) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x11fea00) 0 Class QDBusArgument size=4 align=4 base size=4 base align=4 QDBusArgument (0x11fed00) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x11fed80) 0 empty -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x12851c0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1285280) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0x1285600) 0 -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0x12856c0) 0 -Class QDBusReply - size=28 align=4 - base size=28 base align=4 -QDBusReply (0x1285880) 0 -Class QDBusReply - size=16 align=4 - base size=16 base align=4 -QDBusReply (0x1285a40) 0 Vtable for QDBusConnectionInterface QDBusConnectionInterface::_ZTV24QDBusConnectionInterface: 14u entries @@ -1108,10 +634,6 @@ QDBusConnectionInterface (0x1285bc0) 0 QObject (0x1285c40) 0 primary-for QDBusAbstractInterface (0x1285c00) -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1285f40) 0 empty Vtable for QDBusInterface QDBusInterface::_ZTV14QDBusInterface: 14u entries @@ -1170,18 +692,6 @@ QDBusServer (0x12fa0c0) 0 QObject (0x12fa100) 0 primary-for QDBusServer (0x12fa0c0) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1376f00) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1398880) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1398c40) 0 diff --git a/tests/auto/bic/data/QtDBus.4.2.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtDBus.4.2.0.macx-gcc-ppc32.txt index f70102476..301c5e17b 100644 --- a/tests/auto/bic/data/QtDBus.4.2.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtDBus.4.2.0.macx-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x9834c0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x983540) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x983700) 0 empty - QUintForSize<4> (0x983740) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x983840) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x9838c0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x983a80) 0 empty - QIntForSize<4> (0x983ac0) 0 empty Class QSysInfo size=1 align=1 @@ -50,145 +24,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x983fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ae200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ae2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ae380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ae440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ae500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ae5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ae680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ae740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ae800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ae8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9ae980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9aea40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9aeb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9aebc0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x9aec40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x9fe240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x9fe2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x9fe340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x9fe3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x9fe440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x9fe4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x9fe540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x9fe5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x9fe640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x9fe6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x9fe740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x9fe7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x9fe840) 0 Class QInternal size=1 align=1 @@ -206,10 +72,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x9fe980) 0 QGenericArgument (0x9fe9c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x9fec80) 0 Class QMetaObject size=16 align=4 @@ -226,10 +88,6 @@ Class QChar base size=2 base align=2 QChar (0x9fedc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9feec0) 0 empty Class QBasicAtomic size=4 align=4 @@ -242,10 +100,6 @@ Class QAtomic QAtomic (0xb2b4c0) 0 QBasicAtomic (0xb2b500) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0xb2b780) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -327,10 +181,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xbd34c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xbd3880) 0 empty Class QString::Null size=1 align=1 @@ -352,10 +202,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xd12000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd12440) 0 Class QCharRef size=8 align=4 @@ -368,10 +214,6 @@ Class QConstString QConstString (0xe1a080) 0 QString (0xe1a0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xe1a1c0) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -434,15 +276,7 @@ Class QListData base size=4 base align=4 QListData (0xe1aa40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xe1ad00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xe1a4c0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -534,10 +368,6 @@ QIODevice (0xf3e540) 0 QObject (0xf3e580) 0 primary-for QIODevice (0xf3e540) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf3e7c0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -557,270 +387,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0xf3eec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xf3eb80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x10032c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x10035c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x10038c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1003f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101e040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101e100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101e1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101e280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101e340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101e400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101e4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101e580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101e640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101e700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101e7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101e880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101e940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101ea00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101eac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101eb80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101ec40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101ed00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101edc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101ee80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x101ef40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1039000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x10390c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1039180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1039240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1039300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x10393c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1039480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1039540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1039600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x10396c0) 0 empty Class QMapData::Node size=8 align=4 @@ -857,45 +475,17 @@ Class QVariant base size=16 base align=4 QVariant (0x1039dc0) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x112d200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x112d2c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x112d4c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x112d400) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x112d6c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x112d600) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x112d880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x112d9c0) 0 empty Vtable for QDBusAbstractAdaptor QDBusAbstractAdaptor::_ZTV20QDBusAbstractAdaptor: 14u entries @@ -938,10 +528,6 @@ Class QDBusObjectPath QDBusObjectPath (0x112dc40) 0 QString (0x112dc80) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x112dd80) 0 empty Class QDBusSignature size=4 align=4 @@ -949,10 +535,6 @@ Class QDBusSignature QDBusSignature (0x11d4000) 0 QString (0x11d4040) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x11d4140) 0 empty Class QDBusVariant size=16 align=4 @@ -960,20 +542,12 @@ Class QDBusVariant QDBusVariant (0x11d4480) 0 QVariant (0x11d44c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x11d45c0) 0 empty Class QDBusConnection size=4 align=4 base size=4 base align=4 QDBusConnection (0x11d4840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x11d4900) 0 Vtable for QDBusAbstractInterface QDBusAbstractInterface::_ZTV22QDBusAbstractInterface: 14u entries @@ -1005,25 +579,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x11d4ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11d4d00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x11d4d80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x11d4f40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x11d4e80) 0 Class QStringList size=4 align=4 @@ -1031,55 +593,19 @@ Class QStringList QStringList (0x11d4a40) 0 QList (0x1259000) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x12594c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1259540) 0 Class QDBusArgument size=4 align=4 base size=4 base align=4 QDBusArgument (0x1259840) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x12598c0) 0 empty -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1259d00) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1259dc0) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0x12e20c0) 0 -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0x12e2180) 0 -Class QDBusReply - size=32 align=4 - base size=32 base align=4 -QDBusReply (0x12e2340) 0 -Class QDBusReply - size=16 align=4 - base size=16 base align=4 -QDBusReply (0x12e2500) 0 Vtable for QDBusConnectionInterface QDBusConnectionInterface::_ZTV24QDBusConnectionInterface: 14u entries @@ -1108,10 +634,6 @@ QDBusConnectionInterface (0x12e2680) 0 QObject (0x12e2700) 0 primary-for QDBusAbstractInterface (0x12e26c0) -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x12e2a00) 0 empty Vtable for QDBusInterface QDBusInterface::_ZTV14QDBusInterface: 14u entries @@ -1170,18 +692,6 @@ QDBusServer (0x12e2c80) 0 QObject (0x12e2cc0) 0 primary-for QDBusServer (0x12e2c80) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13ad9c0) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x13d83c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13d8780) 0 diff --git a/tests/auto/bic/data/QtDBus.4.2.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtDBus.4.2.0.win32-gcc-ia32.txt index 3af9455bb..9cc788051 100644 --- a/tests/auto/bic/data/QtDBus.4.2.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDBus.4.2.0.win32-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xa9db80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xa9dc80) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xa9df80) 0 empty - QUintForSize<4> (0xac2080) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xac2200) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xac22c0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xac2540) 0 empty - QIntForSize<4> (0xac2600) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xaf7400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf7c00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf7d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf7f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0f080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0f200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0f380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0f500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0f680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0f800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0f980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0fb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0fc80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0fe00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ff80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb36100) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb36980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6d240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb74fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6d900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7fa40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xbb5480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xbb5780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7b200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xbc2680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xbc2ec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xbc9240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xbc9640) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xccd340) 0 QGenericArgument (0xccd380) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xcdfb40) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xd1c040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd4a440) 0 empty Class QBasicAtomic size=4 align=4 @@ -262,10 +116,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xdf7b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xf137c0) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xf13d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf3c280) 0 Class QCharRef size=8 align=4 @@ -303,10 +149,6 @@ Class QConstString QConstString (0x1260840) 0 QString (0x1260880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1260bc0) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -369,15 +211,7 @@ Class QListData base size=4 base align=4 QListData (0x130fc00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1416c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1416880) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -469,10 +303,6 @@ QIODevice (0x1483580) 0 QObject (0x14835c0) 0 primary-for QIODevice (0x1483580) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14838c0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -492,270 +322,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x151ffc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15616c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1561840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15619c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1561b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1561cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1561e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1561fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1575140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15752c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1575440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15755c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1575740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15758c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1575a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1575bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1575d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1575ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1594040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15941c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1594340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15944c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1594640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15947c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1594940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1594ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1594c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1594dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1594f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15af0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15af240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15af3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15af540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15af6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15af840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15af9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15afb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15afcc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15afe40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15affc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15cf140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15cf2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15cf440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15cf5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15cf740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15cf8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15cfa40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15cfbc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15cfd40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15cfec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15ee040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15ee1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15ee340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x15ee4c0) 0 empty Class QMapData::Node size=8 align=4 @@ -792,45 +410,17 @@ Class QVariant base size=16 base align=8 QVariant (0x14165c0) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x178c600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x178c7c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x178cc80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1733bc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x178cf80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1733c40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1705d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17fa980) 0 empty Vtable for QDBusAbstractAdaptor QDBusAbstractAdaptor::_ZTV20QDBusAbstractAdaptor: 14u entries @@ -873,10 +463,6 @@ Class QDBusObjectPath QDBusObjectPath (0x1832c00) 0 QString (0x1832c40) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1832f80) 0 empty Class QDBusSignature size=4 align=4 @@ -884,10 +470,6 @@ Class QDBusSignature QDBusSignature (0x185f9c0) 0 QString (0x185fa00) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x185fd00) 0 empty Class QDBusVariant size=16 align=8 @@ -895,20 +477,12 @@ Class QDBusVariant QDBusVariant (0x18b6700) 0 QVariant (0x18b6740) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x18b6ac0) 0 empty Class QDBusConnection size=4 align=4 base size=4 base align=4 QDBusConnection (0x18f7540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18f7b40) 0 Vtable for QDBusAbstractInterface QDBusAbstractInterface::_ZTV22QDBusAbstractInterface: 14u entries @@ -940,25 +514,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xf13bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x19669c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1966d00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x19821c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x17c2100) 0 Class QStringList size=4 align=4 @@ -966,55 +528,19 @@ Class QStringList QStringList (0xf13c40) 0 QList (0x1982440) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1982300) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x19822c0) 0 Class QDBusArgument size=4 align=4 base size=4 base align=4 QDBusArgument (0x1a12280) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a12600) 0 empty -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x178cd80) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x178cdc0) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0x17c2180) 0 -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0x17c21c0) 0 -Class QDBusReply - size=32 align=8 - base size=32 base align=8 -QDBusReply (0x1a8c5c0) 0 -Class QDBusReply - size=16 align=4 - base size=16 base align=4 -QDBusReply (0x1a8c9c0) 0 Vtable for QDBusConnectionInterface QDBusConnectionInterface::_ZTV24QDBusConnectionInterface: 14u entries @@ -1043,10 +569,6 @@ QDBusConnectionInterface (0x18f74c0) 0 QObject (0x1aae3c0) 0 primary-for QDBusAbstractInterface (0x1aae380) -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ac41c0) 0 empty Vtable for QDBusInterface QDBusInterface::_ZTV14QDBusInterface: 14u entries @@ -1105,18 +627,6 @@ QDBusServer (0x1ac4e00) 0 QObject (0x1ac4e40) 0 primary-for QDBusServer (0x1ac4e00) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1982180) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1c215c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x178cc40) 0 diff --git a/tests/auto/bic/data/QtDBus.4.3.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtDBus.4.3.0.linux-gcc-ia32.txt index 105c2eea0..d79f85420 100644 --- a/tests/auto/bic/data/QtDBus.4.3.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDBus.4.3.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f33880) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f338c0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f33980) 0 empty - QUintForSize<4> (0xb7f339c0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f33a40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f33a80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7f33b40) 0 empty - QIntForSize<4> (0xb7f33b80) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7f33e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f33f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f33f40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f33f80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f33fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b2000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b2040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b2080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b20c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b2100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b2140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b2180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b21c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b2200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b2240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b2280) 0 empty Class QFlag size=4 align=4 @@ -141,70 +55,18 @@ Class QAtomic QAtomic (0xb77b2440) 0 QBasicAtomic (0xb77b2480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b2580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b25c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b2600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b2640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b2680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b26c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b2700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b2740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b2780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b27c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b2800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b2840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b2880) 0 Class QInternal size=1 align=1 @@ -222,10 +84,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb77b2980) 0 QGenericArgument (0xb77b29c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb77b2b80) 0 Class QMetaObject size=16 align=4 @@ -242,10 +100,6 @@ Class QChar base size=2 base align=2 QChar (0xb77b2c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b2cc0) 0 empty Class __locale_struct size=116 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb77b2e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b2e40) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb77b2e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb75f6000) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb75f6100) 0 QString (0xb75f6140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb75f6180) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb75f64c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb75f6840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb75f67c0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -479,10 +313,6 @@ QIODevice (0xb75f6a80) 0 QObject (0xb75f6ac0) 0 primary-for QIODevice (0xb75f6a80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb75f6b80) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -502,275 +332,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb75f6c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f62c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f68c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb75f6c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb732c840) 0 empty Class QMapData::Node size=8 align=4 @@ -807,55 +421,23 @@ Class QVariant base size=12 base align=4 QVariant (0xb732cd00) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb732cf80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb732cfc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb732cec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb732ce40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb723e040) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb732cf40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb723e0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb723e140) 0 empty Class QDBusConnection size=4 align=4 base size=4 base align=4 QDBusConnection (0xb723e180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb723e200) 0 Class QDBusError size=16 align=4 @@ -873,15 +455,7 @@ Class QDBusObjectPath QDBusObjectPath (0xb723e2c0) 0 QString (0xb723e300) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb723e340) 0 empty -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb723e400) 0 empty Class QDBusSignature size=4 align=4 @@ -889,15 +463,7 @@ Class QDBusSignature QDBusSignature (0xb723e4c0) 0 QString (0xb723e500) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb723e540) 0 empty -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb723e600) 0 empty Class QDBusVariant size=12 align=4 @@ -905,20 +471,8 @@ Class QDBusVariant QDBusVariant (0xb723e6c0) 0 QVariant (0xb723e700) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb723e740) 0 empty -Class QDBusReply - size=28 align=4 - base size=28 base align=4 -QDBusReply (0xb723e840) 0 -Class QDBusReply - size=16 align=4 - base size=16 base align=4 -QDBusReply (0xb723e980) 0 Vtable for QDBusServer QDBusServer::_ZTV11QDBusServer: 14u entries @@ -975,25 +529,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb723eb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb723ebc0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb723ec00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb723ecc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb723ec40) 0 Class QStringList size=4 align=4 @@ -1001,15 +543,7 @@ Class QStringList QStringList (0xb723ed00) 0 QList (0xb723ed40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb723edc0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb723ee00) 0 Vtable for QDBusConnectionInterface QDBusConnectionInterface::_ZTV24QDBusConnectionInterface: 14u entries @@ -1038,10 +572,6 @@ QDBusConnectionInterface (0xb723eec0) 0 QObject (0xb723ef40) 0 primary-for QDBusAbstractInterface (0xb723ef00) -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb723e900) 0 empty Vtable for QDBusInterface QDBusInterface::_ZTV14QDBusInterface: 14u entries @@ -1075,30 +605,10 @@ Class QDBusArgument base size=4 base align=4 QDBusArgument (0xb723efc0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb716d000) 0 empty -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb716d1c0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb716d240) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb716d340) 0 -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb716d3c0) 0 Vtable for QDBusAbstractAdaptor QDBusAbstractAdaptor::_ZTV20QDBusAbstractAdaptor: 14u entries @@ -1135,58 +645,14 @@ Class QDBusMetaType base size=0 base align=1 QDBusMetaType (0xb716d500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb716d7c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb716d840) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb716d940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb716db40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb716dac0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb716dcc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb716dc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb716dd80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb716de00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb716de80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb716df00) 0 diff --git a/tests/auto/bic/data/QtDBus.4.3.1.linux-gcc-ia32.txt b/tests/auto/bic/data/QtDBus.4.3.1.linux-gcc-ia32.txt index f9c6689aa..9b9082658 100644 --- a/tests/auto/bic/data/QtDBus.4.3.1.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDBus.4.3.1.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7fd9880) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7fd98c0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7fd9980) 0 empty - QUintForSize<4> (0xb7fd99c0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7fd9a40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7fd9a80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7fd9b40) 0 empty - QIntForSize<4> (0xb7fd9b80) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7fd9e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7fd9f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7fd9f40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7fd9f80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7fd9fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a0c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a280) 0 empty Class QFlag size=4 align=4 @@ -141,70 +55,18 @@ Class QAtomic QAtomic (0xb785a480) 0 QBasicAtomic (0xb785a4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb785a5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb785a600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb785a640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb785a680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb785a6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb785a700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb785a740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb785a780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb785a7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb785a800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb785a840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb785a880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb785a8c0) 0 Class QInternal size=1 align=1 @@ -222,10 +84,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb785a9c0) 0 QGenericArgument (0xb785aa00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb785abc0) 0 Class QMetaObject size=16 align=4 @@ -242,10 +100,6 @@ Class QChar base size=2 base align=2 QChar (0xb785ac80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785ad00) 0 empty Class __locale_struct size=116 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb785ae40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785ae80) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb785aec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb76a20c0) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb76a21c0) 0 QString (0xb76a2200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb76a2240) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb76a2580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb76a2900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb76a2880) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -479,10 +313,6 @@ QIODevice (0xb76a2b40) 0 QObject (0xb76a2b80) 0 primary-for QIODevice (0xb76a2b40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb76a2c40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -502,275 +332,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb76a2d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76a2cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e00c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e01c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e02c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e03c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e04c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e05c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e06c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e07c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb73e0880) 0 empty Class QMapData::Node size=8 align=4 @@ -807,45 +421,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb73e0d40) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb73e0fc0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb73e0bc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb73e0f40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb73e0ec0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb72f3080) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb72f3000) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb72f3100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72f3180) 0 empty Class QDBusError size=16 align=4 @@ -882,25 +468,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb72f32c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72f3300) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb72f3340) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb72f3400) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb72f3380) 0 Class QStringList size=4 align=4 @@ -908,15 +482,7 @@ Class QStringList QStringList (0xb72f3440) 0 QList (0xb72f3480) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb72f3500) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb72f3540) 0 Class QDBusObjectPath size=4 align=4 @@ -924,15 +490,7 @@ Class QDBusObjectPath QDBusObjectPath (0xb72f3600) 0 QString (0xb72f3640) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb72f3680) 0 empty -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb72f3740) 0 empty Class QDBusSignature size=4 align=4 @@ -940,15 +498,7 @@ Class QDBusSignature QDBusSignature (0xb72f3800) 0 QString (0xb72f3840) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb72f3880) 0 empty -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb72f3940) 0 empty Class QDBusVariant size=12 align=4 @@ -956,40 +506,16 @@ Class QDBusVariant QDBusVariant (0xb72f3a00) 0 QVariant (0xb72f3a40) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb72f3a80) 0 empty Class QDBusArgument size=4 align=4 base size=4 base align=4 QDBusArgument (0xb72f3b40) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb72f3b80) 0 empty -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb72f3d80) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb72f3e00) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb72f3f40) 0 -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb72f3fc0) 0 Class QDBusMetaType size=1 align=1 @@ -1001,10 +527,6 @@ Class QDBusConnection base size=4 base align=4 QDBusConnection (0xb72f3e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7213000) 0 Class QDBusMessage size=4 align=4 @@ -1036,15 +558,7 @@ QDBusAbstractInterface (0xb7213080) 0 QObject (0xb72130c0) 0 primary-for QDBusAbstractInterface (0xb7213080) -Class QDBusReply - size=28 align=4 - base size=28 base align=4 -QDBusReply (0xb7213180) 0 -Class QDBusReply - size=16 align=4 - base size=16 base align=4 -QDBusReply (0xb7213240) 0 Vtable for QDBusConnectionInterface QDBusConnectionInterface::_ZTV24QDBusConnectionInterface: 14u entries @@ -1073,10 +587,6 @@ QDBusConnectionInterface (0xb72132c0) 0 QObject (0xb7213340) 0 primary-for QDBusAbstractInterface (0xb7213300) -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7213400) 0 empty Class QDBusContext size=4 align=4 @@ -1135,58 +645,14 @@ QDBusServer (0xb7213580) 0 QObject (0xb72135c0) 0 primary-for QDBusServer (0xb7213580) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb7213680) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb72139c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb7213a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb7213c40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb7213bc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb7213dc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb7213d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7213e80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb7213f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7213f80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb7213100) 0 diff --git a/tests/auto/bic/data/QtDBus.4.3.2.linux-gcc-ia32.txt b/tests/auto/bic/data/QtDBus.4.3.2.linux-gcc-ia32.txt index 44e38a4df..2eaf5624a 100644 --- a/tests/auto/bic/data/QtDBus.4.3.2.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDBus.4.3.2.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f55880) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f558c0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f55980) 0 empty - QUintForSize<4> (0xb7f559c0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f55a40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f55a80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7f55b40) 0 empty - QIntForSize<4> (0xb7f55b80) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7f55e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f55f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f55f40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f55f80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f55fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d4000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d4040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d4080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d40c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d4100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d4140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d4180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d41c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d4200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d4240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d4280) 0 empty Class QFlag size=4 align=4 @@ -141,70 +55,18 @@ Class QAtomic QAtomic (0xb77d4440) 0 QBasicAtomic (0xb77d4480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d4580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d45c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d4600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d4640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d4680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d46c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d4700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d4740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d4780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d47c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d4800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d4840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d4880) 0 Class QInternal size=1 align=1 @@ -222,10 +84,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb77d4980) 0 QGenericArgument (0xb77d49c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb77d4b80) 0 Class QMetaObject size=16 align=4 @@ -242,10 +100,6 @@ Class QChar base size=2 base align=2 QChar (0xb77d4c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d4cc0) 0 empty Class __locale_struct size=116 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb77d4e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d4e40) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb77d4e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7618000) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb7618100) 0 QString (0xb7618140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7618180) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb76184c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb7618840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb76187c0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -479,10 +313,6 @@ QIODevice (0xb7618a80) 0 QObject (0xb7618ac0) 0 primary-for QIODevice (0xb7618a80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7618b80) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -502,275 +332,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb7618c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76182c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb76188c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7618c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb734e840) 0 empty Class QMapData::Node size=8 align=4 @@ -807,55 +421,23 @@ Class QVariant base size=12 base align=4 QVariant (0xb734ed00) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb734ef80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb734efc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb734eec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb734ee40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb7260040) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb734ef40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb72600c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7260140) 0 empty Class QDBusConnection size=4 align=4 base size=4 base align=4 QDBusConnection (0xb7260180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7260200) 0 Class QDBusError size=16 align=4 @@ -873,15 +455,7 @@ Class QDBusObjectPath QDBusObjectPath (0xb72602c0) 0 QString (0xb7260300) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb7260340) 0 empty -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb7260400) 0 empty Class QDBusSignature size=4 align=4 @@ -889,15 +463,7 @@ Class QDBusSignature QDBusSignature (0xb72604c0) 0 QString (0xb7260500) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb7260540) 0 empty -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb7260600) 0 empty Class QDBusVariant size=12 align=4 @@ -905,20 +471,8 @@ Class QDBusVariant QDBusVariant (0xb72606c0) 0 QVariant (0xb7260700) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb7260740) 0 empty -Class QDBusReply - size=28 align=4 - base size=28 base align=4 -QDBusReply (0xb7260840) 0 -Class QDBusReply - size=16 align=4 - base size=16 base align=4 -QDBusReply (0xb7260980) 0 Vtable for QDBusServer QDBusServer::_ZTV11QDBusServer: 14u entries @@ -975,25 +529,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb7260b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7260bc0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb7260c00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb7260cc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb7260c40) 0 Class QStringList size=4 align=4 @@ -1001,15 +543,7 @@ Class QStringList QStringList (0xb7260d00) 0 QList (0xb7260d40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb7260dc0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb7260e00) 0 Vtable for QDBusConnectionInterface QDBusConnectionInterface::_ZTV24QDBusConnectionInterface: 14u entries @@ -1038,10 +572,6 @@ QDBusConnectionInterface (0xb7260ec0) 0 QObject (0xb7260f40) 0 primary-for QDBusAbstractInterface (0xb7260f00) -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7260900) 0 empty Vtable for QDBusInterface QDBusInterface::_ZTV14QDBusInterface: 14u entries @@ -1075,30 +605,10 @@ Class QDBusArgument base size=4 base align=4 QDBusArgument (0xb7260fc0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb718f000) 0 empty -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb718f1c0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb718f240) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb718f340) 0 -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb718f3c0) 0 Vtable for QDBusAbstractAdaptor QDBusAbstractAdaptor::_ZTV20QDBusAbstractAdaptor: 14u entries @@ -1135,58 +645,14 @@ Class QDBusMetaType base size=0 base align=1 QDBusMetaType (0xb718f500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb718f7c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb718f840) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb718f940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb718fb40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb718fac0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb718fcc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb718fc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb718fd80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb718fe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb718fe80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb718ff00) 0 diff --git a/tests/auto/bic/data/QtDBus.4.4.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtDBus.4.4.0.linux-gcc-ia32.txt index 64b942564..cc08d5aee 100644 --- a/tests/auto/bic/data/QtDBus.4.4.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDBus.4.4.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb77b9c30) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb77b9c6c) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7c16b40) 0 empty - QUintForSize<4> (0xb77b9ce4) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb77b9e10) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb77b9e4c) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7c16d00) 0 empty - QIntForSize<4> (0xb77b9ec4) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77d52d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d54b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d55a0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d5690) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d5780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d5870) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d5960) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d5a50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d5b40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d5c30) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d5d20) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d5e10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d5f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f00f0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f01e0) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb780c1e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7828e88) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6aaba50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6af2b40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6af2dd4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb693f708) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb694a03c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb694a960) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb695c294) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb695cbb8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb696e4ec) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb696ee10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6983744) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6991078) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb699199c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69a92d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69a9bf4) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb69bd690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb680b924) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb6734b00) 0 QString (0xb6769ce4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6784000) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QListData base size=4 base align=4 QListData (0xb67f0690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6697960) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -386,15 +228,7 @@ Class QTextCodec QTextCodec (0xb6665ca8) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb66a50b4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb66a5f78) 0 Class QTextEncoder size=32 align=4 @@ -417,25 +251,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb66da000) 0 QGenericArgument (0xb66d81e0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb66d86cc) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb66d84ec) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb66ec834) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb66ec7bc) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -527,10 +349,6 @@ QIODevice (0xb652be80) 0 QObject (0xb6530834) 0 primary-for QIODevice (0xb652be80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb654fb40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -550,25 +368,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb6591a50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65c3258) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb65c3348) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb65c38ac) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb65c3834) 0 Class QStringList size=4 align=4 @@ -576,15 +382,7 @@ Class QStringList QStringList (0xb659df80) 0 QList (0xb65c38e8) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb65f2654) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb65f2870) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -664,10 +462,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb641cb04) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb642b690) 0 Class QMutexLocker size=4 align=4 @@ -747,35 +541,11 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb62fcfb4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6301078) 0 empty -Class - size=8 align=4 - base size=8 base align=4 - (0xb639f000) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb639f0f0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb639f078) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb639f168) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb639f1e0) 0 Class _IO_marker size=12 align=4 @@ -787,10 +557,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb639f258) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb639f2d0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -805,10 +571,6 @@ Class QTextStream QTextStream (0xb639f30c) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb63d8a8c) 0 Class QTextStreamManipulator size=24 align=4 @@ -845,40 +607,16 @@ QTextOStream (0xb62030c0) 0 QTextStream (0xb62041e0) 0 primary-for QTextOStream (0xb62030c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6204ca8) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6204d20) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6204c30) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6204d98) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6204e10) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6204e88) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6204f00) 0 Class timespec size=8 align=4 @@ -890,80 +628,24 @@ Class timeval base size=8 base align=4 timeval (0xb6204f78) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb62045a0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb621f03c) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb621f078) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb621f1a4) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb621f12c) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb621f0f0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb621f21c) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb621f30c) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb621f294) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb621f384) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb621f474) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb621f3fc) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb621f528) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb621f5a0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb621f618) 0 Class random_data size=28 align=4 @@ -995,20 +677,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb612f3c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6148000) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb612ffb4) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb6148348) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -1028,10 +698,6 @@ Class QtConcurrent::ResultStoreBase QtConcurrent::ResultStoreBase (0xb6148474) 0 vptr=((& QtConcurrent::ResultStoreBase::_ZTVN12QtConcurrent15ResultStoreBaseE) + 8u) -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb6148b7c) 0 Vtable for QFutureInterfaceBase QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries @@ -1046,25 +712,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb6148bf4) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb618a780) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb61836cc) 0 - primary-for QFutureInterface (0xb618a780) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb61b4e4c) 0 Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1093,34 +742,7 @@ QFutureWatcherBase (0xb61e26c0) 0 QObject (0xb61e54ec) 0 primary-for QFutureWatcherBase (0xb61e26c0) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb61e2dc0) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb61e2e00) 0 - primary-for QFutureWatcher (0xb61e2dc0) - QObject (0xb6001000) 0 - primary-for QFutureWatcherBase (0xb61e2e00) Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1219,60 +841,14 @@ QtConcurrent::ThreadEngineBase (0xb603f2c0) 0 QRunnable (0xb6044000) 0 primary-for QtConcurrent::ThreadEngineBase (0xb603f2c0) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb60447f8) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb603fc40) 0 - QtConcurrent::ThreadEngineStarterBase (0xb6044870) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 -4u -32 0u -36 0u -40 0u -44 0u -48 0u -52 -4u -56 0u -60 (int (*)(...))-0x000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb603fe00) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb603fe40) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb6044d20) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb603fe40) Class std::input_iterator_tag size=1 align=1 @@ -1315,225 +891,49 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb605d6cc) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb605d744) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb605d960) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605da50) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605dac8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605db40) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605dbb8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605dc30) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605dca8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605dd20) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605dd98) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605de10) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605de88) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605df00) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605df78) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb607c000) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb607c0f0) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb607c168) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb607c1e0) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb607c564) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb607c5dc) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb607c6cc) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb607c744) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb607c7bc) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb607c9d8) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb607ca14) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb607ca50) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb607ca8c) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb607cac8) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb607cb04) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb607cb7c) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb607cbb8) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb607cbf4) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb607cc30) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb607cc6c) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb607cca8) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb609d690) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb60c2c6c) 0 empty -Class std::__copy_move - size=1 align=1 - base size=0 base align=1 -std::__copy_move (0xb5f150b4) 0 empty -Class std::__copy_move_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_move_backward (0xb5f152d0) 0 empty -Class std::__equal - size=1 align=1 - base size=0 base align=1 -std::__equal (0xb5f156cc) 0 empty -Class std::__lc_rai - size=1 align=1 - base size=0 base align=1 -std::__lc_rai (0xb5f15834) 0 empty -Class std::__lexicographical_compare - size=1 align=1 - base size=0 base align=1 -std::__lexicographical_compare (0xb5f1599c) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5f59078) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5f5cac8) 0 empty Class lconv size=56 align=4 @@ -1550,10 +950,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb5f6b690) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5f6b708) 0 Class tm size=44 align=4 @@ -1570,15 +966,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb5f6b9d8) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb5f6bb40) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb5f6bac8) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1590,32 +978,10 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb5f6bbb8) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb5dfa0f0) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5dfa3c0) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5dfb7c0) 0 empty - __gnu_cxx::new_allocator (0xb5dfa3fc) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5dfa438) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5dfb880) 0 empty - __gnu_cxx::new_allocator (0xb5dfa474) 0 empty Vtable for __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries @@ -1631,82 +997,19 @@ Class __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind (0xb5dfa690) 0 nearly-empty vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 8u) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5e5bf78) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5e5bfb4) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5ea0b40) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5e5bf3c) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5eedc6c) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5d3a100) 0 - std::allocator (0xb5d3a140) 0 empty - __gnu_cxx::new_allocator (0xb5eedce4) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5eedbf4) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5eedd20) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5d3a2c0) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5eedd5c) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5eede10) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5d3a4c0) 0 - std::allocator (0xb5d3a500) 0 empty - __gnu_cxx::new_allocator (0xb5eede88) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5eedd98) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5eedec4) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5eedf78) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5d3a680) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5eedf00) 0 Class std::locale size=4 align=4 @@ -1736,97 +1039,16 @@ Class std::locale::_Impl base size=20 base align=4 std::locale::_Impl (0xb5de012c) 0 -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5de8640) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb5de6ac8) 0 - primary-for std::collate (0xb5de8640) -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5de8740) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb5de6bb8) 0 - primary-for std::collate (0xb5de8740) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5de6b7c) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5de6c6c) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5c096c0) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5c0f000) 0 empty -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5c09800) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb5c09840) 0 - primary-for std::collate_byname (0xb5c09800) - std::locale::facet (0xb5c0f078) 0 - primary-for std::collate (0xb5c09840) - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5c098c0) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb5c09900) 0 - primary-for std::collate_byname (0xb5c098c0) - std::locale::facet (0xb5c0f168) 0 - primary-for std::collate (0xb5c09900) + + + + + Vtable for std::ios_base::failure std::ios_base::failure::_ZTVNSt8ios_base7failureE: 5u entries @@ -1872,583 +1094,85 @@ Class std::ios_base std::ios_base (0xb5c0f21c) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5c69654) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5c698e8) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb5c69b7c) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb5cd4fa0) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb5cb1ac8) 0 - primary-for std::ctype (0xb5cd4fa0) - std::ctype_base (0xb5cb1b04) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb5ce3870) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb5cf3690) 0 - primary-for std::__ctype_abstract_base (0xb5ce3870) - std::ctype_base (0xb5cf36cc) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb5ce7800) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb5afe6e0) 0 - primary-for std::ctype (0xb5ce7800) - std::locale::facet (0xb5cf37bc) 0 - primary-for std::__ctype_abstract_base (0xb5afe6e0) - std::ctype_base (0xb5cf37f8) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb5ce79c0) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb5b05e60) 0 - primary-for std::ctype_byname (0xb5ce79c0) - std::locale::facet (0xb5b04b04) 0 - primary-for std::ctype (0xb5b05e60) - std::ctype_base (0xb5b04b40) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb5ce7a40) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb5ce7a80) 0 - primary-for std::ctype_byname (0xb5ce7a40) - std::__ctype_abstract_base (0xb5b094b0) 0 - primary-for std::ctype (0xb5ce7a80) - std::locale::facet (0xb5b04ca8) 0 - primary-for std::__ctype_abstract_base (0xb5b094b0) - std::ctype_base (0xb5b04ce4) 0 empty + + + + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb5b0d654) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5b17480) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb5b0dec4) 0 - primary-for std::numpunct (0xb5b17480) -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5b17540) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb5b0dfb4) 0 - primary-for std::numpunct (0xb5b17540) -Class __gnu_cxx::__conditional_type - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type (0xb5b69618) 0 empty -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5b9ba80) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb5b9bac0) 0 - primary-for std::numpunct_byname (0xb5b9ba80) - std::locale::facet (0xb5b69c6c) 0 - primary-for std::numpunct (0xb5b9bac0) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5b9bb00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5b69d5c) 0 - primary-for std::num_get > > (0xb5b9bb00) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5b9bb80) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5b69e4c) 0 - primary-for std::num_put > > (0xb5b9bb80) -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5b9bc00) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb5b9bc40) 0 - primary-for std::numpunct_byname (0xb5b9bc00) - std::locale::facet (0xb5b69f3c) 0 - primary-for std::numpunct (0xb5b9bc40) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5b9bcc0) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5b695dc) 0 - primary-for std::num_get > > (0xb5b9bcc0) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5b9bd40) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5b69f00) 0 - primary-for std::num_put > > (0xb5b9bd40) -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb5bf0d80) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb5be27bc) 0 - primary-for std::basic_ios > (0xb5bf0d80) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb5bf0dc0) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb5be28ac) 0 - primary-for std::basic_ios > (0xb5bf0dc0) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5a3aa40) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb5a3aa80) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb5a224ec) 4 - primary-for std::basic_ios > (0xb5a3aa80) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5a226cc) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5a3abc0) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5a3ac00) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5a22708) 4 - primary-for std::basic_ios > (0xb5a3ac00) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5a228ac) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5a79480) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb5a794c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb5a22e10) 8 - primary-for std::basic_ios > (0xb5a794c0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5a79580) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5a795c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5a880f0) 8 - primary-for std::basic_ios > (0xb5a795c0) - -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5a887f8) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5a88834) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5aa6480) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5a88870) 0 empty -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5a88e4c) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb5ae0380 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2486,44 +1210,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5aeab40) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb5ae0380) 0 - primary-for std::basic_iostream > (0xb5aeab40) - subvttidx=4u - std::basic_ios > (0xb5ae03c0) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb5a88e88) 12 - primary-for std::basic_ios > (0xb5ae03c0) - std::basic_ostream > (0xb5ae0400) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb5ae03c0) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5af3000) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb5ae0700 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2561,110 +1249,21 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb58f4be0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb5ae0700) 0 - primary-for std::basic_iostream > (0xb58f4be0) - subvttidx=4u - std::basic_ios > (0xb5ae0740) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb5af303c) 12 - primary-for std::basic_ios > (0xb5ae0740) - std::basic_ostream > (0xb5ae0780) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb5ae0740) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5af3924) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5af38ac) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb5af3834) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb5af3780) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb5af3ce4) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb59264b0) 0 -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb5817924) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb582c370) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb581ca00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb582c370) - QFutureInterfaceBase (0xb5817b04) 0 - primary-for QFutureInterface (0xb581ca00) - QRunnable (0xb5817b40) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb581ca80) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb582c780) 0 - primary-for QtConcurrent::RunFunctionTask (0xb581ca80) - QFutureInterface (0xb581cac0) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb582c780) - QFutureInterfaceBase (0xb5817ce4) 0 - primary-for QFutureInterface (0xb581cac0) - QRunnable (0xb5817d20) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + Class QLibraryInfo size=1 align=1 @@ -2715,50 +1314,22 @@ QFile (0xb577fe00) 0 QObject (0xb579e078) 0 primary-for QIODevice (0xb577fe40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57b59d8) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb57c65a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57d4c30) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb57d4f3c) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb57eaca8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb57eac30) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb57ead98) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb561630c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56163fc) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2833,10 +1404,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb56446cc) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56577bc) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2926,10 +1493,6 @@ Class QDirIterator QDirIterator (0xb567799c) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5686168) 0 Vtable for QFileSystemWatcher QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries @@ -3067,25 +1630,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb56e712c) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb56e71a4) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb56bcf3c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb56e799c) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56e7b04) 0 Class QResource size=4 align=4 @@ -3097,275 +1648,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb550c3fc) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550c834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550ca14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550cbf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550cdd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550cfb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55211a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5521384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5521564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5521744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5521924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5521b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5521ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5521ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552b0b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552b294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552b474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552b654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552b834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552ba14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552bbf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552bdd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552bfb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55321a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5532384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5532564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5532744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5532924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5532b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5532ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5532ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553a0b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553a294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553a474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553a654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553a834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553aa14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553abf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553add4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553afb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55431a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5543384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5543564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5543744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5543924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5543b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5543ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5543ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55480b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5548294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5548474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5548654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5548834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5548a14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5548bf4) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3392,45 +1727,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb5548dd4) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5582870) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb55827f8) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb5582960) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb55828e8) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb55bace4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55c530c) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb55c54ec) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb55c56cc) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3508,15 +1815,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb5415744) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5423690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb544a0f0) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -3543,10 +1842,6 @@ QEventLoop (0xb5412ac0) 0 QObject (0xb544af78) 0 primary-for QEventLoop (0xb5412ac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb545c5a0) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -3591,20 +1886,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb547e834) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5493bf4) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb5493ce4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb549c438) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -3774,10 +2061,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb54e95a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54e9d20) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3889,20 +2172,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb532a960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb532ae10) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb532af00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5362348) 0 empty Class QMetaProperty size=20 align=4 @@ -3914,10 +2189,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb5362744) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5362a8c) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -4129,10 +2400,6 @@ QLibrary (0xb53ad7c0) 0 QObject (0xb53d03c0) 0 primary-for QLibrary (0xb53ad7c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53de30c) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4169,20 +2436,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb52098e8) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb5209f78) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb5209c6c) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb5220474) 0 Class QWriteLocker size=4 align=4 @@ -4209,10 +2468,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb5259a50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5268744) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -4229,70 +2484,42 @@ Class QDate base size=4 base align=4 QDate (0xb5284744) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52a40f0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb52a41e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52b2744) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb52b2834) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52baf3c) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb52cc0b4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52cc690) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb50ca12c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50caa14) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb50ec0f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50ec4b0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb510a618) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb511b03c) 0 empty Class QLinkedListData size=20 align=4 @@ -4304,40 +2531,24 @@ Class QSize base size=8 base align=4 QSize (0xb5178f78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51ac960) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb51c6bf4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fd4d20) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb4ff2a50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb500b924) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb5052528) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb506ca50) 0 empty Class QSharedData size=4 align=4 @@ -4385,20 +2596,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb4f101e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f1a780) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4f1a8e8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4f1a870) 0 Class QXmlStreamAttributes size=4 align=4 @@ -4411,30 +2610,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb4f1a960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f3d384) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb4f3d4b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f4e078) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb4f4e1a4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f6312c) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -4573,15 +2760,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0xb4dde744) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4ddea50) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4dde9d8) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -4964,40 +3143,16 @@ Class QDBusVariant QDBusVariant (0xb4e4df40) 0 QVariant (0xb4e946cc) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4e9e0b4) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4e9e258) 0 empty -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4e9e3fc) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4e9e5a0) 0 empty -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4e9e744) 0 empty Class QDBusConnection size=4 align=4 base size=4 base align=4 QDBusConnection (0xb4e9e8e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4eac690) 0 Vtable for QDBusAbstractInterface QDBusAbstractInterface::_ZTV22QDBusAbstractInterface: 14u entries @@ -5029,40 +3184,12 @@ Class QDBusArgument base size=4 base align=4 QDBusArgument (0xb4cd712c) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb4cdf9d8) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb4cdfa50) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb4d0c000) 0 -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb4d0c078) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4d0c21c) 0 empty -Class QDBusReply - size=28 align=4 - base size=28 base align=4 -QDBusReply (0xb4d0c654) 0 -Class QDBusReply - size=16 align=4 - base size=16 base align=4 -QDBusReply (0xb4d0c924) 0 Vtable for QDBusConnectionInterface QDBusConnectionInterface::_ZTV24QDBusConnectionInterface: 14u entries @@ -5091,10 +3218,6 @@ QDBusConnectionInterface (0xb4d3f100) 0 QObject (0xb4d42078) 0 primary-for QDBusAbstractInterface (0xb4d3f140) -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4d42c6c) 0 empty Class QDBusContext size=4 align=4 @@ -5158,103 +3281,23 @@ QDBusServer (0xb4d3f840) 0 QObject (0xb4d4f708) 0 primary-for QDBusServer (0xb4d3f840) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4daa474) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4dbda14) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4c545dc) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4c54b04) 0 -Class QMap::Node - size=24 align=4 - base size=24 base align=4 -QMap::Node (0xb4c54fb4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ca621c) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb4ca6294) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4ad5690) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4ad5618) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4ad5f00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4ad5e88) 0 -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb4b08e10) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4b08f3c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b191a4) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4b1921c) 0 -Class QMap::PayloadNode - size=20 align=4 - base size=20 base align=4 -QMap::PayloadNode (0xb4b374b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b37ce4) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4b37d5c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b37fb4) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4b5d03c) 0 diff --git a/tests/auto/bic/data/QtDesigner.4.2.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtDesigner.4.2.0.linux-gcc-ia32.txt index 095cc1e9e..6a0e8e6d5 100644 --- a/tests/auto/bic/data/QtDesigner.4.2.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDesigner.4.2.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7866000) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7866040) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7866100) 0 empty - QUintForSize<4> (0xb7866140) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb78661c0) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7866200) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb78662c0) 0 empty - QIntForSize<4> (0xb7866300) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7866580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7866640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7866680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78666c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7866700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7866740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7866780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78667c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7866800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7866840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7866880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78668c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7866900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7866940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7866980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78669c0) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb7866b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7866bc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb7866ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7866f00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7866f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7866f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7866fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fb000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fb040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fb080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fb0c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fb100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fb140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fb180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fb1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fb200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fb240) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb73fb2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fb440) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb73fb540) 0 QString (0xb73fb580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fb5c0) 0 empty Class QGenericArgument size=8 align=4 @@ -303,10 +149,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb73fb640) 0 QGenericArgument (0xb73fb680) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb73fb840) 0 Class QMetaObject size=16 align=4 @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0xb73fbb80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb73fbf00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb73fbe80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -478,30 +312,10 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb7119040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7119080) 0 empty -Class QHash >:: - size=4 align=4 - base size=4 base align=4 -QHash >:: (0xb7119900) 0 -Class QHash > - size=4 align=4 - base size=4 base align=4 -QHash > (0xb7119880) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb7119a00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb7119980) 0 Vtable for QExtensionManager QExtensionManager::_ZTV17QExtensionManager: 24u entries @@ -545,60 +359,36 @@ Class QSize base size=8 base align=4 QSize (0xb7119ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7119cc0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb7119d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7119f40) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb7119640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7119840) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb7119940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7119a40) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb7119a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7119bc0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb7119c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7119b00) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -657,10 +447,6 @@ QIODevice (0xb7119c40) 0 QObject (0xb7119d80) 0 primary-for QIODevice (0xb7119c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7119e40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -680,25 +466,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb7119f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7119dc0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb7119ec0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6da2080) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6da2000) 0 Class QStringList size=4 align=4 @@ -706,80 +480,28 @@ Class QStringList QStringList (0xb6da20c0) 0 QList (0xb6da2100) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6da2180) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6da21c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb6da2300) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb6da2340) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb6da2380) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb6da22c0) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0xb6da2280) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6da24c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6da2500) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6da2480) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6da2540) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6da2580) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6da25c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6da2600) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6da2640) 0 Class timespec size=8 align=4 @@ -791,80 +513,24 @@ Class timeval base size=8 base align=4 timeval (0xb6da26c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6da2700) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6da2740) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6da2780) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6da2840) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6da2800) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6da27c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6da2880) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6da2900) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6da28c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6da2940) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6da29c0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6da2980) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6da2a00) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6da2a40) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6da2a80) 0 Class random_data size=28 align=4 @@ -881,15 +547,7 @@ Class QVectorData base size=16 base align=4 QVectorData (0xb6da2b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb6da2d80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb6da2d00) 0 Class QPolygon size=4 align=4 @@ -897,15 +555,7 @@ Class QPolygon QPolygon (0xb6da2dc0) 0 QVector (0xb6da2e00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb6da2ec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb6da2e40) 0 Class QPolygonF size=4 align=4 @@ -928,30 +578,18 @@ Class QLine base size=16 base align=4 QLine (0xb6da2400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6da2fc0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6d12000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d12040) 0 empty Class QMatrix size=48 align=4 base size=48 base align=4 QMatrix (0xb6d12080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d120c0) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -976,10 +614,6 @@ QImage (0xb6d12140) 0 QPaintDevice (0xb6d12180) 0 primary-for QImage (0xb6d12140) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d122c0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -1004,45 +638,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb6d12480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d124c0) 0 empty Class QBrushData size=72 align=4 base size=72 base align=4 QBrushData (0xb6d12500) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb6d12640) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb6d125c0) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb6d126c0) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb6d12700) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb6d12740) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb6d12680) 0 Class QGradient size=56 align=4 @@ -1113,10 +719,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb6d12d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d12dc0) 0 empty Class QWidgetData size=64 align=4 @@ -1342,65 +944,17 @@ Class QDesignerDnDItemInterface QDesignerDnDItemInterface (0xb69f4180) 0 nearly-empty vptr=((& QDesignerDnDItemInterface::_ZTV25QDesignerDnDItemInterface) + 8u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb69f4300) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb69f4380) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb69f4400) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb69f4480) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb69f4500) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb69f4580) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb69f4600) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb69f4680) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb69f4700) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb69f4780) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb69f4800) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb69f4880) 0 Vtable for QDesignerFormEditorInterface QDesignerFormEditorInterface::_ZTV28QDesignerFormEditorInterface: 14u entries @@ -1953,295 +1507,71 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb69f45c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f4740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f47c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f4840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f48c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f4940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f4a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f4b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f4bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f4c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f4d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f4dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f4f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f4fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f80c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f81c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f82c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f83c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f84c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f85c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f86c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f87c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f88c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f8980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68f89c0) 0 empty Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0xb68f8a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68f8ac0) 0 empty Class QDesignerWidgetBoxInterface::Widget size=16 align=4 base size=16 base align=4 QDesignerWidgetBoxInterface::Widget (0xb68f8c00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb68f8d40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb68f8cc0) 0 Class QDesignerWidgetBoxInterface::Category size=12 align=4 @@ -2339,10 +1669,6 @@ QDesignerWidgetBoxInterface (0xb68f8b00) 0 QPaintDevice (0xb68f8bc0) 8 vptr=((& QDesignerWidgetBoxInterface::_ZTV27QDesignerWidgetBoxInterface) + 284u) -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb68f8e40) 0 empty Vtable for QDesignerWidgetDataBaseItemInterface QDesignerWidgetDataBaseItemInterface::_ZTV36QDesignerWidgetDataBaseItemInterface: 30u entries @@ -2383,15 +1709,7 @@ Class QDesignerWidgetDataBaseItemInterface QDesignerWidgetDataBaseItemInterface (0xb68f8f40) 0 nearly-empty vptr=((& QDesignerWidgetDataBaseItemInterface::_ZTV36QDesignerWidgetDataBaseItemInterface) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb68f8f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb68f8c80) 0 Vtable for QDesignerWidgetDataBaseInterface QDesignerWidgetDataBaseInterface::_ZTV32QDesignerWidgetDataBaseInterface: 22u entries @@ -2575,25 +1893,9 @@ Class QDesignerTaskMenuExtension QDesignerTaskMenuExtension (0xb6786540) 0 nearly-empty vptr=((& QDesignerTaskMenuExtension::_ZTV26QDesignerTaskMenuExtension) + 8u) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6786700) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb67866c0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6786740) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6786780) 0 Class __gconv_trans_data size=20 align=4 @@ -2615,15 +1917,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6786880) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6786900) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb67868c0) 0 Class _IO_marker size=12 align=4 @@ -2635,10 +1929,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6786980) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb67869c0) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -2684,80 +1974,28 @@ QFile (0xb6786a00) 0 QObject (0xb6786a80) 0 primary-for QIODevice (0xb6786a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6786b00) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb6786b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6786b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6786bc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6786c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6786c00) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb6786cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6786d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6786dc0) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb6786f00) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb6786e80) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb6786000) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb6786f80) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb6786280) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb67860c0) 0 Vtable for QAbstractFormBuilder QAbstractFormBuilder::_ZTV20QAbstractFormBuilder: 48u entries @@ -2875,15 +2113,7 @@ Class QDesignerCustomWidgetCollectionInterface QDesignerCustomWidgetCollectionInterface (0xb66d9080) 0 nearly-empty vptr=((& QDesignerCustomWidgetCollectionInterface::_ZTV40QDesignerCustomWidgetCollectionInterface) + 8u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb66d9240) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb66d91c0) 0 Vtable for QFormBuilder QFormBuilder::_ZTV12QFormBuilder: 49u entries @@ -2945,43 +2175,11 @@ QFormBuilder (0xb66d9100) 0 QAbstractFormBuilder (0xb66d9140) 0 primary-for QFormBuilder (0xb66d9100) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb66d9380) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb66d9400) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb66d9480) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb66d9500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb66d9580) 0 empty -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb66d9740) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb66d9800) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb66d98c0) 0 diff --git a/tests/auto/bic/data/QtDesigner.4.3.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtDesigner.4.3.0.linux-gcc-ia32.txt index 8af045992..ec449b9ee 100644 --- a/tests/auto/bic/data/QtDesigner.4.3.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDesigner.4.3.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7793080) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb77930c0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7793180) 0 empty - QUintForSize<4> (0xb77931c0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7793240) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7793280) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7793340) 0 empty - QIntForSize<4> (0xb7793380) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7793640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7793700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7793740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7793780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77937c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7793800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7793840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7793880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77938c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7793900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7793940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7793980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77939c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7793a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7793a40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7793a80) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb7793ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7793bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7793c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7793c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7793c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7793cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7793d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7793d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7793d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7793dc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7793e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7793e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7793e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7793ec0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb7793fc0) 0 QGenericArgument (0xb7299000) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb72991c0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb7299280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7299300) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb7299600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7299640) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb7299680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7299880) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb7299980) 0 QString (0xb72999c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7299a00) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb7299d40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb7299c00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb7299800) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -443,60 +277,36 @@ Class QSize base size=8 base align=4 QSize (0xb6e93140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e93340) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6e933c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e935c0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb6e93680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e938c0) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6e93900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e93b40) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6e93b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e93c80) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6e93cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e93d80) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -555,10 +365,6 @@ QIODevice (0xb6e93ec0) 0 QObject (0xb6e93f00) 0 primary-for QIODevice (0xb6e93ec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6e93fc0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -578,25 +384,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb6e931c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e93200) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6e93240) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6e93300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6e93280) 0 Class QStringList size=4 align=4 @@ -604,80 +398,28 @@ Class QStringList QStringList (0xb6e93180) 0 QList (0xb6e93400) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6e93480) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6e934c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb6e93700) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb6e93740) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb6e93780) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb6e936c0) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0xb6e93580) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e937c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e93800) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6e93880) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e93940) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e93980) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6e939c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e93a00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e93a40) 0 Class timespec size=8 align=4 @@ -689,80 +431,24 @@ Class timeval base size=8 base align=4 timeval (0xb6e93ac0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e93b00) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6e93bc0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6e93c00) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6e93d40) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6e93d00) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6e93c40) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e93e40) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6d0e000) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6e93f40) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d0e040) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6d0e0c0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6d0e080) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d0e100) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6d0e140) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d0e180) 0 Class random_data size=28 align=4 @@ -779,15 +465,7 @@ Class QVectorData base size=16 base align=4 QVectorData (0xb6d0e240) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb6d0e480) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb6d0e400) 0 Class QPolygon size=4 align=4 @@ -795,15 +473,7 @@ Class QPolygon QPolygon (0xb6d0e4c0) 0 QVector (0xb6d0e500) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb6d0e5c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb6d0e540) 0 Class QPolygonF size=4 align=4 @@ -826,30 +496,18 @@ Class QLine base size=16 base align=4 QLine (0xb6d0e800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d0e840) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6d0e880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d0e8c0) 0 empty Class QMatrix size=48 align=4 base size=48 base align=4 QMatrix (0xb6d0e900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d0e940) 0 empty Class QPainterPath::Element size=20 align=4 @@ -861,25 +519,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb6d0e980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb6d0ec00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb6d0eb80) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb6d0ea80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d0ec40) 0 empty Class QPainterPathStroker size=4 align=4 @@ -891,10 +537,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb6d0ed40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d0ed80) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -919,10 +561,6 @@ QImage (0xb6d0ee40) 0 QPaintDevice (0xb6d0ee80) 0 primary-for QImage (0xb6d0ee40) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d0efc0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -947,45 +585,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb6d0e740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d0ea00) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb6d0ea40) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb6965000) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb6d0ef40) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb6965080) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb69650c0) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb6965100) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb6965040) 0 Class QGradient size=56 align=4 @@ -1046,10 +656,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb69655c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69656c0) 0 Class QCursor size=4 align=4 @@ -1061,10 +667,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb6965740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6965800) 0 empty Class QWidgetData size=64 align=4 @@ -1147,10 +749,6 @@ QWidget (0xb6965880) 0 QPaintDevice (0xb6965900) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6965b40) 0 Vtable for QDesignerPropertyEditorInterface QDesignerPropertyEditorInterface::_ZTV32QDesignerPropertyEditorInterface: 70u entries @@ -1324,300 +922,72 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb6965e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69654c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69657c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69659c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6965dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb675b800) 0 empty Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0xb675b840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb675b900) 0 empty Class QDesignerWidgetBoxInterface::Widget size=16 align=4 base size=16 base align=4 QDesignerWidgetBoxInterface::Widget (0xb675ba40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb675bb80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb675bb00) 0 Class QDesignerWidgetBoxInterface::Category size=12 align=4 @@ -1715,10 +1085,6 @@ QDesignerWidgetBoxInterface (0xb675b940) 0 QPaintDevice (0xb675ba00) 8 vptr=((& QDesignerWidgetBoxInterface::_ZTV27QDesignerWidgetBoxInterface) + 284u) -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb675bc80) 0 empty Vtable for QDesignerFormWindowInterface QDesignerFormWindowInterface::_ZTV28QDesignerFormWindowInterface: 114u entries @@ -1909,10 +1275,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb680f040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb680f080) 0 empty Class QDesignerPromotionInterface::PromotedClass size=8 align=4 @@ -2512,15 +1874,7 @@ Class QDesignerWidgetDataBaseItemInterface QDesignerWidgetDataBaseItemInterface (0xb65e4600) 0 nearly-empty vptr=((& QDesignerWidgetDataBaseItemInterface::_ZTV36QDesignerWidgetDataBaseItemInterface) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb65e47c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb65e4740) 0 Vtable for QDesignerWidgetDataBaseInterface QDesignerWidgetDataBaseInterface::_ZTV32QDesignerWidgetDataBaseInterface: 22u entries @@ -2581,65 +1935,17 @@ Class QDesignerFormWindowCursorInterface QDesignerFormWindowCursorInterface (0xb65e4840) 0 nearly-empty vptr=((& QDesignerFormWindowCursorInterface::_ZTV34QDesignerFormWindowCursorInterface) + 8u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb65e49c0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb65e4a40) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb65e4ac0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb65e4b40) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb65e4bc0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb65e4c40) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb65e4cc0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb65e4d40) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb65e4dc0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb65e4e40) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb65e4ec0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb65e4f40) 0 Vtable for QDesignerFormEditorInterface QDesignerFormEditorInterface::_ZTV28QDesignerFormEditorInterface: 14u entries @@ -2776,25 +2082,9 @@ Class QDesignerCustomWidgetCollectionInterface QDesignerCustomWidgetCollectionInterface (0xb65e4880) 0 nearly-empty vptr=((& QDesignerCustomWidgetCollectionInterface::_ZTV40QDesignerCustomWidgetCollectionInterface) + 8u) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb65e4a00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb65e4980) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb65e4a80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb65e4b00) 0 Class __gconv_trans_data size=20 align=4 @@ -2816,15 +2106,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb65e4d00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb65e4e00) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb65e4d80) 0 Class _IO_marker size=12 align=4 @@ -2836,10 +2118,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb65e4f00) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb65e4f80) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -2885,80 +2163,28 @@ QFile (0xb64f2000) 0 QObject (0xb64f2080) 0 primary-for QIODevice (0xb64f2040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64f2100) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb64f2140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64f2180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64f21c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64f2280) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb64f2200) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb64f22c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64f2340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64f23c0) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb64f2500) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb64f2480) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb64f2600) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb64f2580) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb64f2700) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb64f2680) 0 Vtable for QAbstractFormBuilder QAbstractFormBuilder::_ZTV20QAbstractFormBuilder: 48u entries @@ -3037,15 +2263,7 @@ Class QDesignerContainerExtension QDesignerContainerExtension (0xb64f2800) 0 nearly-empty vptr=((& QDesignerContainerExtension::_ZTV27QDesignerContainerExtension) + 8u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb64f2a80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb64f2a00) 0 Vtable for QFormBuilder QFormBuilder::_ZTV12QFormBuilder: 49u entries @@ -3107,25 +2325,9 @@ QFormBuilder (0xb64f2940) 0 QAbstractFormBuilder (0xb64f2980) 0 primary-for QFormBuilder (0xb64f2940) -Class QHash >:: - size=4 align=4 - base size=4 base align=4 -QHash >:: (0xb64f2cc0) 0 -Class QHash > - size=4 align=4 - base size=4 base align=4 -QHash > (0xb64f2c40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64f2dc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb64f2d40) 0 Vtable for QExtensionManager QExtensionManager::_ZTV17QExtensionManager: 24u entries @@ -3164,53 +2366,13 @@ QExtensionManager (0xb64f2b40) 0 QAbstractExtensionManager (0xb64f2bc0) 8 nearly-empty vptr=((& QExtensionManager::_ZTV17QExtensionManager) + 76u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64f2e80) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb64f2f00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb64f2f80) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb64f20c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64f2540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64f2740) 0 empty -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb64f2b00) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb64f2c00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64f2e00) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb61c1040) 0 diff --git a/tests/auto/bic/data/QtDesigner.4.3.1.linux-gcc-ia32.txt b/tests/auto/bic/data/QtDesigner.4.3.1.linux-gcc-ia32.txt index 8e21c1446..bebd0d7c0 100644 --- a/tests/auto/bic/data/QtDesigner.4.3.1.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDesigner.4.3.1.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb778f080) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb778f0c0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb778f180) 0 empty - QUintForSize<4> (0xb778f1c0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb778f240) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb778f280) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb778f340) 0 empty - QIntForSize<4> (0xb778f380) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb778f640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778f700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778f740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778f780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778f7c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778f800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778f840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778f880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778f8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778f900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778f940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778f980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778f9c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778fa00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778fa40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778fa80) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb778fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb778fc80) 0 empty Class QBasicAtomic size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb778ffc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72ec000) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec0c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec340) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb72ec400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72ec600) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb72ec700) 0 QString (0xb72ec740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72ec780) 0 empty Class QStringRef size=12 align=4 @@ -308,10 +154,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb72ec840) 0 QGenericArgument (0xb72ec880) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb72eca40) 0 Class QMetaObject size=16 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb72ecd80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb72ecd00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb72ecb80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -525,15 +359,7 @@ Class QDesignerWidgetDataBaseItemInterface QDesignerWidgetDataBaseItemInterface (0xb6e88380) 0 nearly-empty vptr=((& QDesignerWidgetDataBaseItemInterface::_ZTV36QDesignerWidgetDataBaseItemInterface) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6e88540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6e884c0) 0 Vtable for QDesignerWidgetDataBaseInterface QDesignerWidgetDataBaseInterface::_ZTV32QDesignerWidgetDataBaseInterface: 22u entries @@ -638,10 +464,6 @@ QIODevice (0xb6e88ac0) 0 QObject (0xb6e88b00) 0 primary-for QIODevice (0xb6e88ac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6e88bc0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -661,60 +483,24 @@ Class QPoint base size=8 base align=4 QPoint (0xb6e88cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e88f00) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6e88f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e88000) 0 empty -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e88200) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e88280) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6e88080) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e88340) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e883c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6e88480) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e88580) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e88600) 0 Class timespec size=8 align=4 @@ -726,80 +512,24 @@ Class timeval base size=8 base align=4 timeval (0xb6e88b40) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e88c40) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6e88d00) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6e88d40) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6e88e00) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6e88dc0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6e88d80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e88e40) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6e88ec0) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6e88e80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e88f80) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6c55000) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6e88fc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6c55040) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6c55080) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6c550c0) 0 Class random_data size=28 align=4 @@ -821,25 +551,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb6c55340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c55380) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6c553c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6c55480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6c55400) 0 Class QStringList size=4 align=4 @@ -847,35 +565,11 @@ Class QStringList QStringList (0xb6c554c0) 0 QList (0xb6c55500) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6c55580) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6c555c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb6c55700) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb6c55740) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb6c55780) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb6c556c0) 0 Class QColor size=16 align=4 @@ -887,50 +581,26 @@ Class QSize base size=8 base align=4 QSize (0xb6c55840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c55a40) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6c55ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c55cc0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6c55d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c55e80) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6c55ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c55f80) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb6c55800) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb6c55fc0) 0 Class QPolygon size=4 align=4 @@ -938,15 +608,7 @@ Class QPolygon QPolygon (0xb6c55880) 0 QVector (0xb6c558c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb6c55980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb6c55900) 0 Class QPolygonF size=4 align=4 @@ -969,30 +631,18 @@ Class QLine base size=16 base align=4 QLine (0xb6c55c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c55b40) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6c55b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c55bc0) 0 empty Class QMatrix size=48 align=4 base size=48 base align=4 QMatrix (0xb6c55c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c55dc0) 0 empty Class QPainterPath::Element size=20 align=4 @@ -1004,25 +654,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb6c55e00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb6b2c100) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb6b2c080) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb6c55f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b2c140) 0 empty Class QPainterPathStroker size=4 align=4 @@ -1034,10 +672,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb6b2c240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b2c280) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -1078,10 +712,6 @@ QImage (0xb6b2c440) 0 QPaintDevice (0xb6b2c480) 0 primary-for QImage (0xb6b2c440) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b2c5c0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -1106,45 +736,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb6b2c780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b2c800) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb6b2c840) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb6b2c980) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb6b2c900) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb6b2ca00) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb6b2ca40) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb6b2ca80) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb6b2c9c0) 0 Class QGradient size=56 align=4 @@ -1201,65 +803,17 @@ QDesignerBrushManagerInterface (0xb6b2cc40) 0 QObject (0xb6b2cc80) 0 primary-for QDesignerBrushManagerInterface (0xb6b2cc40) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6b2ce00) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6b2ce80) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6b2cf00) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6b2cf80) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6b2c380) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6b2c500) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6b2c4c0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6b2c540) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6b2c6c0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6b2c680) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6b2c700) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6b2c7c0) 0 Vtable for QDesignerFormEditorInterface QDesignerFormEditorInterface::_ZTV28QDesignerFormEditorInterface: 14u entries @@ -1348,10 +902,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb6915180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6915280) 0 Class QCursor size=4 align=4 @@ -1363,10 +913,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb6915300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69153c0) 0 empty Class QWidgetData size=64 align=4 @@ -1449,10 +995,6 @@ QWidget (0xb6915440) 0 QPaintDevice (0xb69154c0) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6915700) 0 Vtable for QDesignerResourceBrowserInterface QDesignerResourceBrowserInterface::_ZTV33QDesignerResourceBrowserInterface: 65u entries @@ -1696,300 +1238,72 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb6915b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69155c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6915a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c00c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c01c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c02c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c03c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c04c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb66c0500) 0 empty Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0xb66c0540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb66c0600) 0 empty Class QDesignerWidgetBoxInterface::Widget size=16 align=4 base size=16 base align=4 QDesignerWidgetBoxInterface::Widget (0xb66c0740) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb66c0880) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb66c0800) 0 Class QDesignerWidgetBoxInterface::Category size=12 align=4 @@ -2087,10 +1401,6 @@ QDesignerWidgetBoxInterface (0xb66c0640) 0 QPaintDevice (0xb66c0700) 8 vptr=((& QDesignerWidgetBoxInterface::_ZTV27QDesignerWidgetBoxInterface) + 284u) -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb66c0980) 0 empty Vtable for QDesignerTaskMenuExtension QDesignerTaskMenuExtension::_ZTV26QDesignerTaskMenuExtension: 6u entries @@ -2238,10 +1548,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb66c0ec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb66c0f00) 0 empty Vtable for QDesignerMetaDataBaseItemInterface QDesignerMetaDataBaseItemInterface::_ZTV34QDesignerMetaDataBaseItemInterface: 10u entries @@ -2776,25 +2082,9 @@ Class QDesignerCustomWidgetCollectionInterface QDesignerCustomWidgetCollectionInterface (0xb655ed00) 0 nearly-empty vptr=((& QDesignerCustomWidgetCollectionInterface::_ZTV40QDesignerCustomWidgetCollectionInterface) + 8u) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb655ee00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb655ed80) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb655eec0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb655ef80) 0 Class __gconv_trans_data size=20 align=4 @@ -2816,15 +2106,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb64dc0c0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb64dc140) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb64dc100) 0 Class _IO_marker size=12 align=4 @@ -2836,10 +2118,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb64dc1c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb64dc200) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -2885,80 +2163,28 @@ QFile (0xb64dc240) 0 QObject (0xb64dc2c0) 0 primary-for QIODevice (0xb64dc280) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64dc340) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb64dc380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64dc3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64dc400) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64dc4c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb64dc440) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb64dc500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64dc580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64dc600) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb64dc740) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb64dc6c0) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb64dc840) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb64dc7c0) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb64dc940) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb64dc8c0) 0 Vtable for QAbstractFormBuilder QAbstractFormBuilder::_ZTV20QAbstractFormBuilder: 48u entries @@ -3017,15 +2243,7 @@ Class QAbstractFormBuilder QAbstractFormBuilder (0xb64dc640) 0 vptr=((& QAbstractFormBuilder::_ZTV20QAbstractFormBuilder) + 8u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb64dcb80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb64dcb00) 0 Vtable for QFormBuilder QFormBuilder::_ZTV12QFormBuilder: 49u entries @@ -3107,25 +2325,9 @@ Class QDesignerContainerExtension QDesignerContainerExtension (0xb64dcc40) 0 nearly-empty vptr=((& QDesignerContainerExtension::_ZTV27QDesignerContainerExtension) + 8u) -Class QHash >:: - size=4 align=4 - base size=4 base align=4 -QHash >:: (0xb64dcf00) 0 -Class QHash > - size=4 align=4 - base size=4 base align=4 -QHash > (0xb64dce80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64dc300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb64dcf80) 0 Vtable for QExtensionManager QExtensionManager::_ZTV17QExtensionManager: 24u entries @@ -3164,53 +2366,13 @@ QExtensionManager (0xb64dcd80) 0 QAbstractExtensionManager (0xb64dce00) 8 nearly-empty vptr=((& QExtensionManager::_ZTV17QExtensionManager) + 76u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64dc780) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb64dc980) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb64dca00) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb64dcc00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64dce40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb62e7000) 0 empty -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb62e71c0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb62e7280) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb62e7340) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb62e73c0) 0 diff --git a/tests/auto/bic/data/QtDesigner.4.3.2.linux-gcc-ia32.txt b/tests/auto/bic/data/QtDesigner.4.3.2.linux-gcc-ia32.txt index 5f94e31fa..a45f55b5a 100644 --- a/tests/auto/bic/data/QtDesigner.4.3.2.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDesigner.4.3.2.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb77c7080) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb77c70c0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb77c7180) 0 empty - QUintForSize<4> (0xb77c71c0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb77c7240) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb77c7280) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb77c7340) 0 empty - QIntForSize<4> (0xb77c7380) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77c7640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c7700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c7740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c7780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c77c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c7800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c7840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c7880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c78c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c7900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c7940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c7980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c79c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c7a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c7a40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77c7a80) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb77c7ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77c7bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77c7c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77c7c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77c7c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77c7cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77c7d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77c7d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77c7d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77c7dc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77c7e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77c7e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77c7e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77c7ec0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb77c7fc0) 0 QGenericArgument (0xb72cd000) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb72cd1c0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb72cd280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72cd300) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb72cd600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72cd640) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb72cd680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72cd880) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb72cd980) 0 QString (0xb72cd9c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72cda00) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb72cdd40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb72cdc00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb72cd800) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -443,60 +277,36 @@ Class QSize base size=8 base align=4 QSize (0xb6ec7140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ec7340) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6ec73c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ec75c0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb6ec7680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ec78c0) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6ec7900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ec7b40) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6ec7b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ec7c80) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6ec7cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ec7d80) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -555,10 +365,6 @@ QIODevice (0xb6ec7ec0) 0 QObject (0xb6ec7f00) 0 primary-for QIODevice (0xb6ec7ec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6ec7fc0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -578,25 +384,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb6ec71c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ec7200) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6ec7240) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6ec7300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6ec7280) 0 Class QStringList size=4 align=4 @@ -604,80 +398,28 @@ Class QStringList QStringList (0xb6ec7180) 0 QList (0xb6ec7400) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6ec7480) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6ec74c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb6ec7700) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb6ec7740) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb6ec7780) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb6ec76c0) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0xb6ec7580) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6ec77c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6ec7800) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6ec7880) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6ec7940) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6ec7980) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6ec79c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6ec7a00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6ec7a40) 0 Class timespec size=8 align=4 @@ -689,80 +431,24 @@ Class timeval base size=8 base align=4 timeval (0xb6ec7ac0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6ec7b00) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6ec7bc0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6ec7c00) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6ec7d40) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6ec7d00) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6ec7c40) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6ec7e40) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6d42000) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6ec7f40) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d42040) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6d420c0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6d42080) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d42100) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6d42140) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d42180) 0 Class random_data size=28 align=4 @@ -779,15 +465,7 @@ Class QVectorData base size=16 base align=4 QVectorData (0xb6d42240) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb6d42480) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb6d42400) 0 Class QPolygon size=4 align=4 @@ -795,15 +473,7 @@ Class QPolygon QPolygon (0xb6d424c0) 0 QVector (0xb6d42500) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb6d425c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb6d42540) 0 Class QPolygonF size=4 align=4 @@ -826,30 +496,18 @@ Class QLine base size=16 base align=4 QLine (0xb6d42800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d42840) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6d42880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d428c0) 0 empty Class QMatrix size=48 align=4 base size=48 base align=4 QMatrix (0xb6d42900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d42940) 0 empty Class QPainterPath::Element size=20 align=4 @@ -861,25 +519,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb6d42980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb6d42c00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb6d42b80) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb6d42a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d42c40) 0 empty Class QPainterPathStroker size=4 align=4 @@ -891,10 +537,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb6d42d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d42d80) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -919,10 +561,6 @@ QImage (0xb6d42e40) 0 QPaintDevice (0xb6d42e80) 0 primary-for QImage (0xb6d42e40) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d42fc0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -947,45 +585,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb6d42740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d42a40) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb6d42a00) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb6999000) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb6d42f40) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb6999080) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb69990c0) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb6999100) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb6999040) 0 Class QGradient size=56 align=4 @@ -1046,10 +656,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb69995c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69996c0) 0 Class QCursor size=4 align=4 @@ -1061,10 +667,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb6999740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6999800) 0 empty Class QWidgetData size=64 align=4 @@ -1147,10 +749,6 @@ QWidget (0xb6999880) 0 QPaintDevice (0xb6999900) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6999b40) 0 Vtable for QDesignerPropertyEditorInterface QDesignerPropertyEditorInterface::_ZTV32QDesignerPropertyEditorInterface: 70u entries @@ -1324,300 +922,72 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb6999e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69994c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69997c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69999c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6999dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67900c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67901c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67902c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67903c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67904c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67905c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67906c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67907c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6790800) 0 empty Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0xb6790840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6790900) 0 empty Class QDesignerWidgetBoxInterface::Widget size=16 align=4 base size=16 base align=4 QDesignerWidgetBoxInterface::Widget (0xb6790a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6790b80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6790b00) 0 Class QDesignerWidgetBoxInterface::Category size=12 align=4 @@ -1715,10 +1085,6 @@ QDesignerWidgetBoxInterface (0xb6790940) 0 QPaintDevice (0xb6790a00) 8 vptr=((& QDesignerWidgetBoxInterface::_ZTV27QDesignerWidgetBoxInterface) + 284u) -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6790c80) 0 empty Vtable for QDesignerFormWindowInterface QDesignerFormWindowInterface::_ZTV28QDesignerFormWindowInterface: 114u entries @@ -1909,10 +1275,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6844040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6844080) 0 empty Class QDesignerPromotionInterface::PromotedClass size=8 align=4 @@ -2512,15 +1874,7 @@ Class QDesignerWidgetDataBaseItemInterface QDesignerWidgetDataBaseItemInterface (0xb6618600) 0 nearly-empty vptr=((& QDesignerWidgetDataBaseItemInterface::_ZTV36QDesignerWidgetDataBaseItemInterface) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb66187c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6618740) 0 Vtable for QDesignerWidgetDataBaseInterface QDesignerWidgetDataBaseInterface::_ZTV32QDesignerWidgetDataBaseInterface: 22u entries @@ -2581,65 +1935,17 @@ Class QDesignerFormWindowCursorInterface QDesignerFormWindowCursorInterface (0xb6618840) 0 nearly-empty vptr=((& QDesignerFormWindowCursorInterface::_ZTV34QDesignerFormWindowCursorInterface) + 8u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb66189c0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6618a40) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6618ac0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6618b40) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6618bc0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6618c40) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6618cc0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6618d40) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6618dc0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6618e40) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6618ec0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6618f40) 0 Vtable for QDesignerFormEditorInterface QDesignerFormEditorInterface::_ZTV28QDesignerFormEditorInterface: 14u entries @@ -2776,25 +2082,9 @@ Class QDesignerCustomWidgetCollectionInterface QDesignerCustomWidgetCollectionInterface (0xb6618880) 0 nearly-empty vptr=((& QDesignerCustomWidgetCollectionInterface::_ZTV40QDesignerCustomWidgetCollectionInterface) + 8u) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6618a00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6618980) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6618a80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6618b00) 0 Class __gconv_trans_data size=20 align=4 @@ -2816,15 +2106,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6618d00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6618e00) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6618d80) 0 Class _IO_marker size=12 align=4 @@ -2836,10 +2118,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6618f00) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6618f80) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -2885,80 +2163,28 @@ QFile (0xb6527000) 0 QObject (0xb6527080) 0 primary-for QIODevice (0xb6527040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6527100) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb6527140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6527180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65271c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6527280) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6527200) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb65272c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6527340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65273c0) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb6527500) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb6527480) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb6527600) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb6527580) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb6527700) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb6527680) 0 Vtable for QAbstractFormBuilder QAbstractFormBuilder::_ZTV20QAbstractFormBuilder: 48u entries @@ -3037,15 +2263,7 @@ Class QDesignerContainerExtension QDesignerContainerExtension (0xb6527800) 0 nearly-empty vptr=((& QDesignerContainerExtension::_ZTV27QDesignerContainerExtension) + 8u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6527a80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6527a00) 0 Vtable for QFormBuilder QFormBuilder::_ZTV12QFormBuilder: 49u entries @@ -3107,25 +2325,9 @@ QFormBuilder (0xb6527940) 0 QAbstractFormBuilder (0xb6527980) 0 primary-for QFormBuilder (0xb6527940) -Class QHash >:: - size=4 align=4 - base size=4 base align=4 -QHash >:: (0xb6527cc0) 0 -Class QHash > - size=4 align=4 - base size=4 base align=4 -QHash > (0xb6527c40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6527dc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6527d40) 0 Vtable for QExtensionManager QExtensionManager::_ZTV17QExtensionManager: 24u entries @@ -3164,53 +2366,13 @@ QExtensionManager (0xb6527b40) 0 QAbstractExtensionManager (0xb6527bc0) 8 nearly-empty vptr=((& QExtensionManager::_ZTV17QExtensionManager) + 76u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6527e80) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb6527f00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb6527f80) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb65270c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6527540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6527740) 0 empty -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb6527b00) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb6527c00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6527e00) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb61f5040) 0 diff --git a/tests/auto/bic/data/QtDesigner.4.4.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtDesigner.4.4.0.linux-gcc-ia32.txt index 2ed7da0c5..ab115b9c4 100644 --- a/tests/auto/bic/data/QtDesigner.4.4.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtDesigner.4.4.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb77a5654) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb77a5690) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7be5f40) 0 empty - QUintForSize<4> (0xb77a5708) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb77a5834) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb77a5870) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb77ab100) 0 empty - QIntForSize<4> (0xb77a58e8) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77b3ce4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3ec4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3fb4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca0b4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca1a4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca294) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca384) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca474) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca564) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca654) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca744) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca834) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca924) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77caa14) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cab04) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cabf4) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb77e3bf4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69e88ac) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6a9e474) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68e6564) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68e67f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb692c12c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb692ca50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb693f384) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb693fca8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69515dc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6951f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6964834) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6972168) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6972a8c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69873c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6987ce4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb699d618) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb69b20b4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68032d0) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb6706f00) 0 QString (0xb6761708) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6761a14) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QListData base size=4 base align=4 QListData (0xb65e703c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6684384) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -386,15 +228,7 @@ Class QTextCodec QTextCodec (0xb66716cc) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb66989d8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6698960) 0 Class QTextEncoder size=32 align=4 @@ -417,25 +251,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb66bd400) 0 QGenericArgument (0xb66bcbf4) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb64d10f0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb66bcf00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64e0258) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb64e01e0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -527,10 +349,6 @@ QIODevice (0xb652e280) 0 QObject (0xb652c258) 0 primary-for QIODevice (0xb652e280) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6547528) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -550,25 +368,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb6583474) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65aac6c) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb65aad5c) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb65b72d0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb65b7258) 0 Class QStringList size=4 align=4 @@ -576,15 +382,7 @@ Class QStringList QStringList (0xb65ad380) 0 QList (0xb65b730c) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb63da078) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb63da294) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -664,10 +462,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb64124b0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb641d0b4) 0 Class QMutexLocker size=4 align=4 @@ -747,35 +541,11 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb62ed9d8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb62eda8c) 0 empty -Class - size=8 align=4 - base size=8 base align=4 - (0xb636ea14) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb636eb04) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb636ea8c) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb636eb7c) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb636ebf4) 0 Class _IO_marker size=12 align=4 @@ -787,10 +557,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb636ec6c) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb636ece4) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -805,10 +571,6 @@ Class QTextStream QTextStream (0xb636ed20) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb63c74b0) 0 Class QTextStreamManipulator size=24 align=4 @@ -845,40 +607,16 @@ QTextOStream (0xb61dd4c0) 0 QTextStream (0xb61e8c30) 0 primary-for QTextOStream (0xb61dd4c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb61f5690) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb61f5708) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb61f5618) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb61f5780) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb61f57f8) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb61f5870) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb61f58e8) 0 Class timespec size=8 align=4 @@ -890,80 +628,24 @@ Class timeval base size=8 base align=4 timeval (0xb61f5960) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb61f59d8) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb61f5a50) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb61f5a8c) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb61f5bb8) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb61f5b40) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb61f5b04) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb61f5c30) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb61f5d20) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb61f5ca8) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb61f5d98) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb61f5e88) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb61f5e10) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb61f5f3c) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb61f5fb4) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb620e03c) 0 Class random_data size=28 align=4 @@ -995,20 +677,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb6117dd4) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6133a14) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb613399c) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb6133d5c) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -1028,10 +698,6 @@ Class QtConcurrent::ResultStoreBase QtConcurrent::ResultStoreBase (0xb6133e88) 0 vptr=((& QtConcurrent::ResultStoreBase::_ZTVN12QtConcurrent15ResultStoreBaseE) + 8u) -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb6156528) 0 Vtable for QFutureInterfaceBase QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries @@ -1046,25 +712,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb61565a0) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb616bb80) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb61840b4) 0 - primary-for QFutureInterface (0xb616bb80) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb61aa870) 0 Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1093,34 +742,7 @@ QFutureWatcherBase (0xb5fc9ac0) 0 QObject (0xb5fcff00) 0 primary-for QFutureWatcherBase (0xb5fc9ac0) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb5fed1c0) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb5fed200) 0 - primary-for QFutureWatcher (0xb5fed1c0) - QObject (0xb5fdea50) 0 - primary-for QFutureWatcherBase (0xb5fed200) Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1219,60 +841,14 @@ QtConcurrent::ThreadEngineBase (0xb601b6c0) 0 QRunnable (0xb602ea14) 0 primary-for QtConcurrent::ThreadEngineBase (0xb601b6c0) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb60411e0) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb6044040) 0 - QtConcurrent::ThreadEngineStarterBase (0xb6041258) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 -4u -32 0u -36 0u -40 0u -44 0u -48 0u -52 -4u -56 0u -60 (int (*)(...))-0x000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb6044200) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb6044240) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb6041708) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb6044240) Class std::input_iterator_tag size=1 align=1 @@ -1315,225 +891,49 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb605e0f0) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb605e168) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb605e384) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605e474) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605e4ec) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605e564) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605e5dc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605e654) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605e6cc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605e744) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605e7bc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605e834) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605e8ac) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605e924) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605e99c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb605ea14) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb605eb04) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb605eb7c) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb605ebf4) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb605ef78) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb6072000) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb60720f0) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb6072168) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb60721e0) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb60723fc) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6072438) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6072474) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb60724b0) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb60724ec) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6072528) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60725a0) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60725dc) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6072618) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6072654) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6072690) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60726cc) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb60970b4) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb5ed8690) 0 empty -Class std::__copy_move - size=1 align=1 - base size=0 base align=1 -std::__copy_move (0xb5ed8ac8) 0 empty -Class std::__copy_move_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_move_backward (0xb5ed8ce4) 0 empty -Class std::__equal - size=1 align=1 - base size=0 base align=1 -std::__equal (0xb5f1e0f0) 0 empty -Class std::__lc_rai - size=1 align=1 - base size=0 base align=1 -std::__lc_rai (0xb5f1e258) 0 empty -Class std::__lexicographical_compare - size=1 align=1 - base size=0 base align=1 -std::__lexicographical_compare (0xb5f1e3c0) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5f1eac8) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5f4e4ec) 0 empty Class lconv size=56 align=4 @@ -1550,10 +950,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb5f5f0b4) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5f5f12c) 0 Class tm size=44 align=4 @@ -1570,15 +966,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb5f5f3fc) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb5f5f564) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb5f5f4ec) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1590,32 +978,10 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb5f5f5dc) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb5dd5b04) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5dd5dd4) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5de5bc0) 0 empty - __gnu_cxx::new_allocator (0xb5dd5e10) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5dd5e4c) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5de5c80) 0 empty - __gnu_cxx::new_allocator (0xb5dd5e88) 0 empty Vtable for __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries @@ -1631,82 +997,19 @@ Class __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind (0xb5e050b4) 0 nearly-empty vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 8u) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5e5a99c) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5e5a9d8) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5e89f40) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5e5aa14) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5cfd690) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5d20500) 0 - std::allocator (0xb5d20540) 0 empty - __gnu_cxx::new_allocator (0xb5cfd708) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5cfd618) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5cfd744) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5d206c0) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5cfd780) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5cfd834) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5d208c0) 0 - std::allocator (0xb5d20900) 0 empty - __gnu_cxx::new_allocator (0xb5cfd8ac) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5cfd7bc) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5cfd8e8) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5cfd99c) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5d20a80) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5cfd924) 0 Class std::locale size=4 align=4 @@ -1736,97 +1039,16 @@ Class std::locale::_Impl base size=20 base align=4 std::locale::_Impl (0xb5dc4b7c) 0 -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5bc7a40) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb5bd44ec) 0 - primary-for std::collate (0xb5bc7a40) -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5bc7b40) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb5bd45dc) 0 - primary-for std::collate (0xb5bc7b40) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5bd4a50) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5bd4a8c) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5bf1ac0) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5bd4ac8) 0 empty -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5bf1c00) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb5bf1c40) 0 - primary-for std::collate_byname (0xb5bf1c00) - std::locale::facet (0xb5bd4b40) 0 - primary-for std::collate (0xb5bf1c40) - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5bf1cc0) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb5bf1d00) 0 - primary-for std::collate_byname (0xb5bf1cc0) - std::locale::facet (0xb5bd4c30) 0 - primary-for std::collate (0xb5bf1d00) + + + + + Vtable for std::ios_base::failure std::ios_base::failure::_ZTVNSt8ios_base7failureE: 5u entries @@ -1872,583 +1094,85 @@ Class std::ios_base std::ios_base (0xb5c099d8) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5c6603c) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5c662d0) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb5c66564) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb5ac7550) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb5cb44ec) 0 - primary-for std::ctype (0xb5ac7550) - std::ctype_base (0xb5cb4528) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb5ad0e10) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb5ae30b4) 0 - primary-for std::__ctype_abstract_base (0xb5ad0e10) - std::ctype_base (0xb5ae30f0) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb5cc3c00) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb5aeac80) 0 - primary-for std::ctype (0xb5cc3c00) - std::locale::facet (0xb5ae31e0) 0 - primary-for std::__ctype_abstract_base (0xb5aeac80) - std::ctype_base (0xb5ae321c) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb5cc3dc0) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb5af4410) 0 - primary-for std::ctype_byname (0xb5cc3dc0) - std::locale::facet (0xb5af1528) 0 - primary-for std::ctype (0xb5af4410) - std::ctype_base (0xb5af1564) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb5cc3e40) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb5cc3e80) 0 - primary-for std::ctype_byname (0xb5cc3e40) - std::__ctype_abstract_base (0xb5af4aa0) 0 - primary-for std::ctype (0xb5cc3e80) - std::locale::facet (0xb5af16cc) 0 - primary-for std::__ctype_abstract_base (0xb5af4aa0) - std::ctype_base (0xb5af1708) 0 empty + + + + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb5afe078) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5afc880) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb5afe8e8) 0 - primary-for std::numpunct (0xb5afc880) -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5afc940) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb5afe9d8) 0 - primary-for std::numpunct (0xb5afc940) -Class __gnu_cxx::__conditional_type - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type (0xb5b7303c) 0 empty -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5b83e80) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb5b83ec0) 0 - primary-for std::numpunct_byname (0xb5b83e80) - std::locale::facet (0xb5b73690) 0 - primary-for std::numpunct (0xb5b83ec0) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5b83f00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5b73780) 0 - primary-for std::num_get > > (0xb5b83f00) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5b83f80) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5b73870) 0 - primary-for std::num_put > > (0xb5b83f80) -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5bb8000) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb5bb8040) 0 - primary-for std::numpunct_byname (0xb5bb8000) - std::locale::facet (0xb5b73960) 0 - primary-for std::numpunct (0xb5bb8040) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5bb80c0) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5b73a50) 0 - primary-for std::num_get > > (0xb5bb80c0) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5bb8140) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5b73b40) 0 - primary-for std::num_put > > (0xb5bb8140) -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb59e9180) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb59e21a4) 0 - primary-for std::basic_ios > (0xb59e9180) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb59e91c0) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb59e2294) 0 - primary-for std::basic_ios > (0xb59e91c0) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5a1fe40) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb5a1fe80) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb59e2f78) 4 - primary-for std::basic_ios > (0xb5a1fe80) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5a340f0) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5a1ffc0) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5a41000) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5a3412c) 4 - primary-for std::basic_ios > (0xb5a41000) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5a342d0) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5a41880) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb5a418c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb5a34834) 8 - primary-for std::basic_ios > (0xb5a418c0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5a41980) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5a419c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5a34bb8) 8 - primary-for std::basic_ios > (0xb5a419c0) - -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5a8c1e0) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5a8c21c) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5a8f880) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5a8c258) 0 empty -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5a8c834) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb58c2780 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2486,44 +1210,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb58d50f0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb58c2780) 0 - primary-for std::basic_iostream > (0xb58d50f0) - subvttidx=4u - std::basic_ios > (0xb58c27c0) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb5a8c870) 12 - primary-for std::basic_ios > (0xb58c27c0) - std::basic_ostream > (0xb58c2800) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb58c27c0) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5a8cb04) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb58c2b00 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2561,110 +1249,21 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb58e5190) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb58c2b00) 0 - primary-for std::basic_iostream > (0xb58e5190) - subvttidx=4u - std::basic_ios > (0xb58c2b40) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb5a8cb40) 12 - primary-for std::basic_ios > (0xb58c2b40) - std::basic_ostream > (0xb58c2b80) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb58c2b40) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb58f630c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb58f6294) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb58f621c) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb58f6168) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb58f66cc) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb58f6f3c) 0 -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb580f348) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb5812910) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb57f9e00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb5812910) - QFutureInterfaceBase (0xb580f528) 0 - primary-for QFutureInterface (0xb57f9e00) - QRunnable (0xb580f564) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb57f9e80) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb5812d20) 0 - primary-for QtConcurrent::RunFunctionTask (0xb57f9e80) - QFutureInterface (0xb57f9ec0) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb5812d20) - QFutureInterfaceBase (0xb580f708) 0 - primary-for QFutureInterface (0xb57f9ec0) - QRunnable (0xb580f744) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + Class QLibraryInfo size=1 align=1 @@ -2715,50 +1314,22 @@ QFile (0xb5789200) 0 QObject (0xb5773a8c) 0 primary-for QIODevice (0xb5789240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57a73fc) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb57a7fb4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55c5654) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55c5960) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb55d76cc) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb55d7654) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb55d77bc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55f9d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55f9e10) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2833,10 +1404,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb56380f0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56461e0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2926,10 +1493,6 @@ Class QDirIterator QDirIterator (0xb5669384) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5669b7c) 0 Vtable for QFileSystemWatcher QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries @@ -3067,25 +1630,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb54c7b40) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb54c7bb8) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb56ad924) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54d43c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54d4528) 0 Class QResource size=4 align=4 @@ -3097,275 +1648,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb54e1e10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5505258) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5505438) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5505618) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55057f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55059d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5505bb8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5505d98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5505f78) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5518168) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5518348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5518528) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5518708) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55188e8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5518ac8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5518ca8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5518e88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb551e078) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb551e258) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb551e438) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb551e618) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb551e7f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb551e9d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb551ebb8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb551ed98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb551ef78) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5526168) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5526348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5526528) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5526708) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55268e8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5526ac8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5526ca8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5526e88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5530078) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5530258) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5530438) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5530618) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55307f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55309d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5530bb8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5530d98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5530f78) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5535168) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5535348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5535528) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5535708) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55358e8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5535ac8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5535ca8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5535e88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553d078) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553d258) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553d438) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553d618) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3392,45 +1727,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb553d7f8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5578294) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb557821c) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb5578384) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb557830c) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb55ad708) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55add20) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb55adf00) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb53bd0f0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3508,15 +1815,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb5403168) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54170b4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5428b40) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -3543,10 +1842,6 @@ QEventLoop (0xb53eaec0) 0 QObject (0xb543b99c) 0 primary-for QEventLoop (0xb53eaec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb543bfb4) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -3591,20 +1886,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb547321c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5484618) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb5484708) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5484e4c) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -3774,10 +2061,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb52cbfb4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52d9744) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3889,20 +2172,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb5340384) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5340834) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb5340924) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5340d5c) 0 empty Class QMetaProperty size=20 align=4 @@ -3914,10 +2189,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb5357168) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53574b0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -4129,10 +2400,6 @@ QLibrary (0xb538dbc0) 0 QObject (0xb53b4e10) 0 primary-for QLibrary (0xb538dbc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51c3d5c) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4169,20 +2436,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb51f730c) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb51f799c) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb51f7690) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb5206e88) 0 Class QWriteLocker size=4 align=4 @@ -4209,10 +2468,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb524e474) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5259168) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -4229,70 +2484,42 @@ Class QDate base size=4 base align=4 QDate (0xb527f168) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb528ab04) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb528abf4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52a1168) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb52a1258) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52a8960) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb52a8b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb509fa14) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb50acb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50bdac8) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb50ceb04) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50ceec4) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb50fb03c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50fba50) 0 empty Class QLinkedListData size=20 align=4 @@ -4304,40 +2531,24 @@ Class QSize base size=8 base align=4 QSize (0xb518399c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f9ba8c) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb4fb9618) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fc2708) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb4fe4474) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ffb348) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb5037f3c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb505a438) 0 empty Class QSharedData size=4 align=4 @@ -4385,20 +2596,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb4ef6c30) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f0f1a4) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4f0f30c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4f0f294) 0 Class QXmlStreamAttributes size=4 align=4 @@ -4411,30 +2610,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb4f0f384) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f0fd98) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb4f0fec4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f32a8c) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb4f32bb8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f45b40) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -4573,15 +2760,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0xb4dd3168) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4dd3474) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4dd33fc) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -4941,25 +3120,9 @@ Class QAbstractExtensionManager QAbstractExtensionManager (0xb4e3f834) 0 nearly-empty vptr=((& QAbstractExtensionManager::_ZTV25QAbstractExtensionManager) + 8u) -Class QHash >:: - size=4 align=4 - base size=4 base align=4 -QHash >:: (0xb4e5930c) 0 -Class QHash > - size=4 align=4 - base size=4 base align=4 -QHash > (0xb4e59294) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4e594b0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4e59438) 0 Vtable for QExtensionManager QExtensionManager::_ZTV17QExtensionManager: 24u entries @@ -5014,40 +3177,16 @@ Class QPaintDevice QPaintDevice (0xb4e59ca8) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4caea50) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4caeac8) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4caeb40) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4cae9d8) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0xb4c965a0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4cbe960) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4cbe8e8) 0 Class QPolygon size=4 align=4 @@ -5055,15 +3194,7 @@ Class QPolygon QPolygon (0xb4e8fd40) 0 QVector (0xb4cbe99c) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4cdea50) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4cde9d8) 0 Class QPolygonF size=4 align=4 @@ -5086,10 +3217,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb4d18960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d29fb4) 0 empty Class QPainterPath::Element size=20 align=4 @@ -5101,25 +3228,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb4d33780) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4d5e834) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4d5e7bc) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb4d5e438) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d5e870) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5131,10 +3246,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb4b980f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ba61e0) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -5159,10 +3270,6 @@ QImage (0xb4baac80) 0 QPaintDevice (0xb4bde9d8) 0 primary-for QImage (0xb4baac80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4c34ec4) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -5187,45 +3294,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb4c668e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4c773c0) 0 empty Class QBrushData size=124 align=4 base size=121 base align=4 QBrushData (0xb4c77654) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4c8a30c) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4c8a294) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb4c8a3fc) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb4c8a474) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb4c8a4ec) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb4c8a384) 0 Class QGradient size=56 align=4 @@ -5286,10 +3365,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb4b281a4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4b7221c) 0 Class QCursor size=4 align=4 @@ -5301,10 +3376,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb4b89a14) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4995ce4) 0 empty Class QWidgetData size=64 align=4 @@ -5387,10 +3458,6 @@ QWidget (0xb49aeb90) 0 QPaintDevice (0xb4995780) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb49e1348) 0 Vtable for QDesignerActionEditorInterface QDesignerActionEditorInterface::_ZTV30QDesignerActionEditorInterface: 67u entries @@ -5525,65 +3592,17 @@ Class QDesignerDnDItemInterface QDesignerDnDItemInterface (0xb4a8c834) 0 nearly-empty vptr=((& QDesignerDnDItemInterface::_ZTV25QDesignerDnDItemInterface) + 8u) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb4a8cf78) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb4a8c0f0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb4a8cf3c) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb48a9078) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb48a912c) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb48a91e0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb48a9294) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb48a9348) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb48a93fc) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb48a94b0) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb48a9564) 0 -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb48a9618) 0 Vtable for QDesignerFormEditorInterface QDesignerFormEditorInterface::_ZTV28QDesignerFormEditorInterface: 14u entries @@ -6272,25 +4291,13 @@ Class QIcon base size=4 base align=4 QIcon (0xb4958bf4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4971f78) 0 empty Class QDesignerWidgetBoxInterface::Widget size=16 align=4 base size=16 base align=4 QDesignerWidgetBoxInterface::Widget (0xb497c12c) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb497cbb8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb497cb40) 0 Class QDesignerWidgetBoxInterface::Category size=12 align=4 @@ -6388,10 +4395,6 @@ QDesignerWidgetBoxInterface (0xb49752c0) 0 QPaintDevice (0xb497c0b4) 8 vptr=((& QDesignerWidgetBoxInterface::_ZTV27QDesignerWidgetBoxInterface) + 284u) -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb47c04ec) 0 empty Vtable for QDesignerWidgetDataBaseItemInterface QDesignerWidgetDataBaseItemInterface::_ZTV36QDesignerWidgetDataBaseItemInterface: 30u entries @@ -6432,15 +4435,7 @@ Class QDesignerWidgetDataBaseItemInterface QDesignerWidgetDataBaseItemInterface (0xb47c07f8) 0 nearly-empty vptr=((& QDesignerWidgetDataBaseItemInterface::_ZTV36QDesignerWidgetDataBaseItemInterface) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb47c0e10) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb47c0d98) 0 Vtable for QDesignerWidgetDataBaseInterface QDesignerWidgetDataBaseInterface::_ZTV32QDesignerWidgetDataBaseInterface: 22u entries @@ -6642,35 +4637,11 @@ Class QDesignerTaskMenuExtension QDesignerTaskMenuExtension (0xb4818c30) 0 nearly-empty vptr=((& QDesignerTaskMenuExtension::_ZTV26QDesignerTaskMenuExtension) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb4830834) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb48307bc) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb4830924) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb48308ac) 0 -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb4830a14) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb483099c) 0 Vtable for QAbstractFormBuilder QAbstractFormBuilder::_ZTV20QAbstractFormBuilder: 48u entries @@ -6788,15 +4759,7 @@ Class QDesignerCustomWidgetCollectionInterface QDesignerCustomWidgetCollectionInterface (0xb4876e88) 0 nearly-empty vptr=((& QDesignerCustomWidgetCollectionInterface::_ZTV40QDesignerCustomWidgetCollectionInterface) + 8u) -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb488c4ec) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb488c474) 0 Vtable for QFormBuilder QFormBuilder::_ZTV12QFormBuilder: 49u entries @@ -6858,83 +4821,19 @@ QFormBuilder (0xb4853b40) 0 QAbstractFormBuilder (0xb488c384) 0 primary-for QFormBuilder (0xb4853b40) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb46e39d8) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb46f6f78) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb477aa14) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb458d528) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb45af000) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb45bfc30) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb45bfe88) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb45ffb04) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb45ffb7c) 0 -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb465812c) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4658258) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb46584b0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4658528) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb46588ac) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb4658870) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb4497b40) 0 diff --git a/tests/auto/bic/data/QtGui.4.0.0.aix-gcc-power32.txt b/tests/auto/bic/data/QtGui.4.0.0.aix-gcc-power32.txt index cf1ee1697..9f86ee01e 100644 --- a/tests/auto/bic/data/QtGui.4.0.0.aix-gcc-power32.txt +++ b/tests/auto/bic/data/QtGui.4.0.0.aix-gcc-power32.txt @@ -53,65 +53,20 @@ Class QBool size=1 align=1 QBool (0x300b7280) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cd9c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cdf80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4540) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4b00) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e00c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0680) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0c40) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb200) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb7c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebd80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8340) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8900) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104480) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104a40) 0 empty Class QFlag size=4 align=4 @@ -125,9 +80,6 @@ Class QChar size=2 align=2 QChar (0x30148980) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30185980) 0 empty Class QBasicAtomic size=4 align=4 @@ -142,13 +94,7 @@ Class sigset_t size=8 align=4 sigset_t (0x3026ad80) 0 -Class - size=8 align=4 - (0x30271200) 0 -Class - size=32 align=8 - (0x30271540) 0 Class fsid_t size=8 align=4 @@ -158,21 +104,9 @@ Class fsid64_t size=16 align=8 fsid64_t (0x30271c40) 0 -Class - size=52 align=4 - (0x302780c0) 0 -Class - size=44 align=4 - (0x30278440) 0 -Class - size=112 align=4 - (0x302787c0) 0 -Class - size=208 align=4 - (0x30278b40) 0 Class _quad size=8 align=4 @@ -186,17 +120,11 @@ Class adspace_t size=68 align=4 adspace_t (0x30281e00) 0 -Class - size=24 align=8 - (0x302865c0) 0 Class label_t size=100 align=4 label_t (0x30286d00) 0 -Class - size=4 align=4 - (0x3028b780) 0 Class sigset size=8 align=4 @@ -238,57 +166,18 @@ Class QByteRef size=8 align=4 QByteRef (0x302b7540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30423740) 0 empty -Class QFlags - size=4 align=4 -QFlags (0x30431080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431340) 0 -Class QFlags - size=4 align=4 -QFlags (0x3042cc00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30442080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431a00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30448800) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046af00) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046e200) 0 -Class QFlags - size=4 align=4 -QFlags (0x304422c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30474f80) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479700) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479a40) 0 Class QInternal size=1 align=1 @@ -306,9 +195,6 @@ Class QString size=4 align=4 QString (0x300a1f40) 0 -Class QFlags - size=4 align=4 -QFlags (0x303cf2c0) 0 Class QLatin1String size=4 align=4 @@ -323,9 +209,6 @@ Class QConstString QConstString (0x300b7640) 0 QString (0x300b7680) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303901c0) 0 empty Class QListData::Data size=24 align=4 @@ -335,9 +218,6 @@ Class QListData size=4 align=4 QListData (0x300732c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x302fb500) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -360,13 +240,7 @@ Class QTextCodec QTextCodec (0x303bab80) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8) -Class QList:: - size=4 align=4 -QList:: (0x30120bc0) 0 -Class QList - size=4 align=4 -QList (0x302cc980) 0 Class QTextEncoder size=32 align=4 @@ -385,21 +259,12 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3036a6c0) 0 QGenericArgument (0x3036a700) 0 -Class QMetaObject:: - size=16 align=4 -QMetaObject:: (0x3009b300) 0 Class QMetaObject size=16 align=4 QMetaObject (0x3058c900) 0 -Class QList:: - size=4 align=4 -QList:: (0x30170600) 0 -Class QList - size=4 align=4 -QList (0x30166f00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4 entries @@ -487,9 +352,6 @@ QIODevice (0x30365880) 0 QObject (0x301e4440) 0 primary-for QIODevice (0x30365880) -Class QFlags - size=4 align=4 -QFlags (0x301ebec0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4 entries @@ -507,38 +369,20 @@ Class QRegExp size=4 align=4 QRegExp (0x303baa80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30148180) 0 empty Class QStringMatcher size=1036 align=4 QStringMatcher (0x3012d8c0) 0 -Class QList:: - size=4 align=4 -QList:: (0x30104900) 0 -Class QList - size=4 align=4 -QList (0x30104380) 0 Class QStringList size=4 align=4 QStringList (0x303bab00) 0 QList (0x300c3280) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x301046c0) 0 -Class QList::iterator - size=4 align=4 -QList::iterator (0x300eba00) 0 -Class QList::const_iterator - size=4 align=4 -QList::const_iterator (0x300eb980) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5 entries @@ -664,9 +508,6 @@ Class QMapData size=72 align=4 QMapData (0x304b4140) 0 -Class - size=32 align=4 - (0x3052cd00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4 entries @@ -680,9 +521,6 @@ Class QTextStream QTextStream (0x3050bbc0) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8) -Class QFlags - size=4 align=4 -QFlags (0x305082c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -767,41 +605,20 @@ QFile (0x3057c8c0) 0 QObject (0x3057c980) 0 primary-for QIODevice (0x3057c900) -Class QFlags - size=4 align=4 -QFlags (0x3058a380) 0 Class QFileInfo size=4 align=4 QFileInfo (0x304b0580) 0 -Class QFlags - size=4 align=4 -QFlags (0x304927c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30390480) 0 empty -Class QList:: - size=4 align=4 -QList:: (0x301dfa40) 0 -Class QList - size=4 align=4 -QList (0x301df900) 0 Class QDir size=4 align=4 QDir (0x304b03c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30365600) 0 -Class QFlags - size=4 align=4 -QFlags (0x303ac7c0) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35 entries @@ -846,9 +663,6 @@ Class QFileEngine QFileEngine (0x3057c7c0) 0 vptr=((&QFileEngine::_ZTV11QFileEngine) + 8) -Class QFlags - size=4 align=4 -QFlags (0x3031a080) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5 entries @@ -910,73 +724,22 @@ Class QMetaType size=1 align=1 QMetaType (0x30079000) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3011fb00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3013d480) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x30148440) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3015dfc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301937c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a18c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a5d00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301ad500) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301add00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b22c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b2b00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6640) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6fc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9600) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9c00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301c1740) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301d7f80) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -998,69 +761,24 @@ Class QVariant size=16 align=8 QVariant (0x30166c00) 0 -Class QList:: - size=4 align=4 -QList:: (0x3057e500) 0 -Class QList - size=4 align=4 -QList (0x302acd80) 0 -Class QMap:: - size=4 align=4 -QMap:: (0x302ed8c0) 0 -Class QMap - size=4 align=4 -QMap (0x302b7980) 0 Class QVariantComparisonHelper size=4 align=4 QVariantComparisonHelper (0x30225880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303e8900) 0 empty -Class - size=12 align=4 - (0x303dab00) 0 -Class - size=44 align=4 - (0x303f70c0) 0 -Class - size=76 align=4 - (0x303f7880) 0 -Class - size=36 align=4 - (0x303fc640) 0 -Class - size=56 align=4 - (0x303fcc40) 0 -Class - size=36 align=4 - (0x30414340) 0 -Class - size=28 align=4 - (0x30414f00) 0 -Class - size=24 align=4 - (0x30486a40) 0 -Class - size=28 align=4 - (0x30486d80) 0 -Class - size=28 align=4 - (0x30492400) 0 Class lconv size=56 align=4 @@ -1102,77 +820,41 @@ Class localeinfo_table size=36 align=4 localeinfo_table (0x303d9cc0) 0 -Class - size=108 align=4 - (0x304dc500) 0 Class _LC_charmap_objhdl size=12 align=4 _LC_charmap_objhdl (0x304dcc80) 0 -Class - size=92 align=4 - (0x30561040) 0 Class _LC_monetary_objhdl size=12 align=4 _LC_monetary_objhdl (0x305614c0) 0 -Class - size=48 align=4 - (0x30561800) 0 Class _LC_numeric_objhdl size=12 align=4 _LC_numeric_objhdl (0x30561d00) 0 -Class - size=56 align=4 - (0x30083180) 0 Class _LC_resp_objhdl size=12 align=4 _LC_resp_objhdl (0x300838c0) 0 -Class - size=248 align=4 - (0x30083c40) 0 Class _LC_time_objhdl size=12 align=4 _LC_time_objhdl (0x3012c400) 0 -Class - size=10 align=2 - (0x3012cc40) 0 -Class - size=16 align=4 - (0x301df180) 0 -Class - size=16 align=4 - (0x301df5c0) 0 -Class - size=20 align=4 - (0x303acac0) 0 -Class - size=104 align=4 - (0x30504a00) 0 Class _LC_collate_objhdl size=12 align=4 _LC_collate_objhdl (0x301bfb80) 0 -Class - size=8 align=4 - (0x301e8b00) 0 -Class - size=80 align=4 - (0x305a0100) 0 Class _LC_ctype_objhdl size=12 align=4 @@ -1186,17 +868,11 @@ Class _LC_locale_objhdl size=12 align=4 _LC_locale_objhdl (0x303da600) 0 -Class _LC_object_handle:: - size=12 align=4 -_LC_object_handle:: (0x305911c0) 0 Class _LC_object_handle size=20 align=4 _LC_object_handle (0x30591080) 0 -Class - size=24 align=4 - (0x3031ed80) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14 entries @@ -1271,13 +947,7 @@ Class QUrl size=4 align=4 QUrl (0x302256c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x306df180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307c8900) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14 entries @@ -1303,9 +973,6 @@ QEventLoop (0x30802000) 0 QObject (0x30802040) 0 primary-for QEventLoop (0x30802000) -Class QFlags - size=4 align=4 -QFlags (0x30803740) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27 entries @@ -1348,17 +1015,11 @@ Class QModelIndex size=16 align=4 QModelIndex (0x3049cc80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304eb5c0) 0 empty Class QPersistentModelIndex size=4 align=4 QPersistentModelIndex (0x3049cb80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3002e700) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42 entries @@ -1524,9 +1185,6 @@ Class QBasicTimer size=4 align=4 QBasicTimer (0x307fe180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30803300) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4 entries @@ -1612,17 +1270,11 @@ Class QMetaMethod size=8 align=4 QMetaMethod (0x30379340) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30880740) 0 empty Class QMetaEnum size=8 align=4 QMetaEnum (0x303793c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3088be80) 0 empty Class QMetaProperty size=20 align=4 @@ -1632,9 +1284,6 @@ Class QMetaClassInfo size=8 align=4 QMetaClassInfo (0x30379540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x308a3780) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17 entries @@ -1902,9 +1551,6 @@ Class QBitRef size=8 align=4 QBitRef (0x305a6140) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864700) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1922,65 +1568,41 @@ Class QHashDummyValue size=1 align=1 QHashDummyValue (0x30893ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30897f00) 0 empty Class QDate size=4 align=4 QDate (0x301eb4c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebe80) 0 empty Class QTime size=4 align=4 QTime (0x301f1e80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30368c00) 0 empty Class QDateTime size=4 align=4 QDateTime (0x304b0440) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304d4880) 0 empty Class QPoint size=8 align=4 QPoint (0x301f9d40) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307b9180) 0 empty Class QPointF size=16 align=8 QPointF (0x30200880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307efcc0) 0 empty Class QLine size=16 align=4 QLine (0x301eb540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3098afc0) 0 empty Class QLineF size=32 align=8 QLineF (0x301eb600) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a335c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1990,41 +1612,26 @@ Class QLocale size=4 align=4 QLocale (0x301eb800) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30822c80) 0 empty Class QSize size=8 align=4 QSize (0x30200a80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864400) 0 empty Class QSizeF size=16 align=8 QSizeF (0x30209200) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a33a80) 0 empty Class QRect size=16 align=4 QRect (0x30213780) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30aad700) 0 empty Class QRectF size=32 align=8 QRectF (0x302138c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a1fdc0) 0 empty Class QSharedData size=4 align=4 @@ -2046,9 +1653,6 @@ Class QKeySequence size=4 align=4 QKeySequence (0x305580c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30ad4d00) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7 entries @@ -2313,13 +1917,7 @@ Class QInputMethodEvent::Attribute size=32 align=8 QInputMethodEvent::Attribute (0x307e7800) 0 -Class QList:: - size=4 align=4 -QList:: (0x30a2d6c0) 0 -Class QList - size=4 align=4 -QList (0x307e7ec0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4 entries @@ -2577,13 +2175,7 @@ Class QAccessible size=1 align=1 QAccessible (0x30c2af00) 0 empty -Class QFlags - size=4 align=4 -QFlags (0x30c36000) 0 -Class QFlags - size=4 align=4 -QFlags (0x30c3b540) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19 entries @@ -2856,21 +2448,9 @@ Class QPaintDevice QPaintDevice (0x30bc8900) 0 vptr=((&QPaintDevice::_ZTV12QPaintDevice) + 8) -Class QColor:::: - size=10 align=2 -QColor:::: (0x30aadc40) 0 -Class QColor:::: - size=10 align=2 -QColor:::: (0x30ab3280) 0 -Class QColor:::: - size=10 align=2 -QColor:::: (0x30aba480) 0 -Class QColor:: - size=10 align=2 -QColor:: (0x30aadb80) 0 Class QColor size=16 align=4 @@ -2880,37 +2460,16 @@ Class QBrush size=4 align=4 QBrush (0x305317c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30b2f040) 0 empty Class QBrushData size=24 align=4 QBrushData (0x30a77a00) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x30a61380) 0 -Class QVector - size=4 align=4 -QVector (0x30bb0140) 0 -Class QGradient:::: - size=32 align=8 -QGradient:::: (0x309db5c0) 0 -Class QGradient:::: - size=40 align=8 -QGradient:::: (0x309dba40) 0 -Class QGradient:::: - size=24 align=8 -QGradient:::: (0x309dbec0) 0 -Class QGradient:: - size=40 align=8 -QGradient:: (0x309db500) 0 Class QGradient size=64 align=8 @@ -3535,9 +3094,6 @@ QFileDialog (0x30d9d000) 0 QPaintDevice (0x30d9d0c0) 8 vptr=((&QFileDialog::_ZTV11QFileDialog) + 244) -Class QFlags - size=4 align=4 -QFlags (0x30dcd640) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66 entries @@ -4220,9 +3776,6 @@ QImage (0x305472c0) 0 QPaintDevice (0x30c41b80) 0 primary-for QImage (0x305472c0) -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30e4a500) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7 entries @@ -4264,9 +3817,6 @@ Class QIcon size=4 align=4 QIcon (0x30536cc0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30eb0980) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9 entries @@ -4580,13 +4130,7 @@ QActionGroup (0x30fdb180) 0 QObject (0x31016480) 0 primary-for QActionGroup (0x30fdb180) -Class QList:: - size=4 align=4 -QList:: (0x30ec74c0) 0 -Class QList - size=4 align=4 -QList (0x30c8c300) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26 entries @@ -4883,9 +4427,6 @@ QAbstractSpinBox (0x30c2a3c0) 0 QPaintDevice (0x30c2a5c0) 8 vptr=((&QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252) -Class QFlags - size=4 align=4 -QFlags (0x309e1bc0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64 entries @@ -5090,13 +4631,7 @@ QStyle (0x30ccda80) 0 QObject (0x30ced6c0) 0 primary-for QStyle (0x30ccda80) -Class QFlags - size=4 align=4 -QFlags (0x30cf8a80) 0 -Class QFlags - size=4 align=4 -QFlags (0x30d2f2c0) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67 entries @@ -5364,18 +4899,12 @@ Class QStyleOptionHeader QStyleOptionHeader (0x310ccb00) 0 QStyleOption (0x310ccb40) 0 -Class QFlags - size=4 align=4 -QFlags (0x310e9400) 0 Class QStyleOptionButton size=64 align=4 QStyleOptionButton (0x310e8580) 0 QStyleOption (0x310e85c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x31149980) 0 Class QStyleOptionTab size=72 align=4 @@ -5392,9 +4921,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x30f8d740) 0 QStyleOption (0x30f8d780) 0 -Class QFlags - size=4 align=4 -QFlags (0x30f29880) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5443,13 +4969,7 @@ QStyleOptionSpinBox (0x307d5680) 0 QStyleOptionComplex (0x307d56c0) 0 QStyleOption (0x307d57c0) 0 -Class QList:: - size=4 align=4 -QList:: (0x307e76c0) 0 -Class QList - size=4 align=4 -QList (0x307e7580) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5457,9 +4977,6 @@ QStyleOptionQ3ListView (0x309d9180) 0 QStyleOptionComplex (0x309d91c0) 0 QStyleOption (0x309d9380) 0 -Class QFlags - size=4 align=4 -QFlags (0x30b6fec0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5604,9 +5121,6 @@ Class QItemSelectionRange size=8 align=4 QItemSelectionRange (0x310faec0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3116aa80) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18 entries @@ -5636,26 +5150,14 @@ QItemSelectionModel (0x311834c0) 0 QObject (0x31183500) 0 primary-for QItemSelectionModel (0x311834c0) -Class QFlags - size=4 align=4 -QFlags (0x31187d80) 0 -Class QList:: - size=4 align=4 -QList:: (0x3112d340) 0 -Class QList - size=4 align=4 -QList (0x3112d200) 0 Class QItemSelection size=4 align=4 QItemSelection (0x30d9ad80) 0 QList (0x31174fc0) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x3112d300) 0 Vtable for QAbstractItemView QAbstractItemView::_ZTV17QAbstractItemView: 103 entries @@ -5778,9 +5280,6 @@ QAbstractItemView (0x311e8dc0) 0 QPaintDevice (0x311e8ec0) 8 vptr=((&QAbstractItemView::_ZTV17QAbstractItemView) + 392) -Class QFlags - size=4 align=4 -QFlags (0x311f7440) 0 Vtable for QFileIconProvider QFileIconProvider::_ZTV17QFileIconProvider: 7 entries @@ -6027,13 +5526,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3115d940) 0 nearly-empty vptr=((&QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8) -Class QHash:: - size=4 align=4 -QHash:: (0x31149a40) 0 -Class QHash - size=4 align=4 -QHash (0x31149540) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6 entries @@ -6049,9 +5542,6 @@ Class QItemEditorFactory QItemEditorFactory (0x3116f1c0) 0 vptr=((&QItemEditorFactory::_ZTV18QItemEditorFactory) + 8) -Class QHashNode - size=16 align=4 -QHashNode (0x31149680) 0 Vtable for QListView QListView::_ZTV9QListView: 103 entries @@ -6176,13 +5666,7 @@ QListView (0x310cc3c0) 0 QPaintDevice (0x310cc500) 8 vptr=((&QListView::_ZTV9QListView) + 392) -Class QVector:: - size=4 align=4 -QVector:: (0x3107ee40) 0 -Class QVector - size=4 align=4 -QVector (0x3107ec40) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11 entries @@ -6896,21 +6380,9 @@ QTreeView (0x30ea3980) 0 QPaintDevice (0x30ea3ac0) 8 vptr=((&QTreeView::_ZTV9QTreeView) + 400) -Class QVector >:: - size=4 align=4 -QVector >:: (0x30f5cd00) 0 -Class QVector > - size=4 align=4 -QVector > (0x30f5c9c0) 0 -Class QList:: - size=4 align=4 -QList:: (0x30f7ab40) 0 -Class QList - size=4 align=4 -QList (0x30f7aa00) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10 entries @@ -6930,17 +6402,8 @@ Class QTreeWidgetItem QTreeWidgetItem (0x30f51340) 0 vptr=((&QTreeWidgetItem::_ZTV15QTreeWidgetItem) + 8) -Class QList::Node - size=4 align=4 -QList::Node (0x30f7ab00) 0 -Class QVectorTypedData > - size=20 align=4 -QVectorTypedData > (0x30f5cb00) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3124bd80) 0 empty Vtable for QTreeWidget QTreeWidget::_ZTV11QTreeWidget: 109 entries @@ -7749,135 +7212,60 @@ Class QColormap size=4 align=4 QColormap (0x30a74040) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x30eb0200) 0 -Class QVector - size=4 align=4 -QVector (0x30eb0000) 0 Class QPolygon size=4 align=4 QPolygon (0x30547bc0) 0 QVector (0x30e7f4c0) 0 -Class QVectorTypedData - size=24 align=4 -QVectorTypedData (0x30eb0140) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x304e6340) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3109d580) 0 -Class QVector - size=4 align=4 -QVector (0x3109d340) 0 Class QPolygonF size=4 align=4 QPolygonF (0x3109d300) 0 QVector (0x310a2880) 0 -Class QVectorTypedData - size=32 align=8 -QVectorTypedData (0x3109d4c0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x313a6040) 0 Class QMatrix size=48 align=8 QMatrix (0x307ef840) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x314635c0) 0 empty Class QTextOption size=24 align=4 QTextOption (0x3147a800) 0 -Class QFlags - size=4 align=4 -QFlags (0x31481040) 0 Class QPen size=4 align=4 QPen (0x30558c80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x314ae9c0) 0 empty Class QPainter size=4 align=4 QPainter (0x30bc8a00) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3156ea00) 0 -Class QVector - size=4 align=4 -QVector (0x314c5c40) 0 -Class QVectorTypedData - size=48 align=8 -QVectorTypedData (0x3156e940) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3159d480) 0 -Class QVector - size=4 align=4 -QVector (0x314c5e00) 0 -Class QVectorTypedData - size=32 align=4 -QVectorTypedData (0x3159d3c0) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x315e3080) 0 -Class QVector - size=4 align=4 -QVector (0x314cf100) 0 -Class QVectorTypedData - size=48 align=8 -QVectorTypedData (0x315dbfc0) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3160ba00) 0 -Class QVector - size=4 align=4 -QVector (0x30bd1b40) 0 -Class QVectorTypedData - size=32 align=4 -QVectorTypedData (0x3160b940) 0 Class QTextItem size=1 align=1 QTextItem (0x314b5840) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31124bc0) 0 empty -Class QFlags - size=4 align=4 -QFlags (0x3111c2c0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24 entries @@ -7911,9 +7299,6 @@ Class QPaintEngine QPaintEngine (0x3097e900) 0 vptr=((&QPaintEngine::_ZTV12QPaintEngine) + 8) -Class QFlags - size=4 align=4 -QFlags (0x3111c900) 0 Class QPaintEngineState size=4 align=4 @@ -7927,29 +7312,17 @@ Class QPainterPath size=4 align=4 QPainterPath (0x30d0fd40) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x30d74080) 0 -Class QVector - size=4 align=4 -QVector (0x30d71d80) 0 Class QPainterPathPrivate size=8 align=4 QPainterPathPrivate (0x3082d680) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30d7fe40) 0 empty Class QPainterPathStroker size=4 align=4 QPainterPathStroker (0x308cea40) 0 -Class QVectorTypedData - size=40 align=8 -QVectorTypedData (0x30d71ec0) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7 entries @@ -8038,9 +7411,6 @@ QCommonStyle (0x31225280) 0 QObject (0x31225480) 0 primary-for QStyle (0x31225440) -Class QPointer - size=4 align=4 -QPointer (0x31430ec0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35 entries @@ -8353,21 +7723,12 @@ Class QTextLength size=12 align=4 QTextLength (0x30225540) 0 -Class QSharedDataPointer - size=4 align=4 -QSharedDataPointer (0x315b50c0) 0 Class QTextFormat size=8 align=4 QTextFormat (0x30213a00) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3166cdc0) 0 -Class QVector - size=4 align=4 -QVector (0x315983c0) 0 Class QTextCharFormat size=8 align=4 @@ -8413,13 +7774,7 @@ Class QTextLayout size=4 align=4 QTextLayout (0x30d0fa40) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x317bab80) 0 -Class QVector - size=4 align=4 -QVector (0x317ba100) 0 Class QTextLine size=8 align=4 @@ -8466,13 +7821,7 @@ QTextDocument (0x315517c0) 0 QObject (0x3160b200) 0 primary-for QTextDocument (0x315517c0) -Class QFlags - size=4 align=4 -QFlags (0x31603940) 0 -Class QSharedDataPointer - size=4 align=4 -QSharedDataPointer (0x315c7340) 0 Class QTextCursor size=4 align=4 @@ -8482,13 +7831,7 @@ Class QAbstractTextDocumentLayout::Selection size=12 align=4 QAbstractTextDocumentLayout::Selection (0x315bccc0) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x315b8780) 0 -Class QVector - size=4 align=4 -QVector (0x315b8580) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -8645,9 +7988,6 @@ QTextFrame (0x3162a4c0) 0 QObject (0x314d8840) 0 primary-for QTextObject (0x314d8800) -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31391400) 0 empty Class QTextBlock::iterator size=16 align=4 @@ -8657,21 +7997,12 @@ Class QTextBlock size=8 align=4 QTextBlock (0x317add40) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x313e3cc0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x312bd340) 0 empty Class QTextFragment size=12 align=4 QTextFragment (0x315250c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31260200) 0 empty Vtable for QTextList QTextList::_ZTV9QTextList: 17 entries @@ -9263,9 +8594,6 @@ QDateEdit (0x310f8700) 0 QPaintDevice (0x310f8800) 8 vptr=((&QDateEdit::_ZTV9QDateEdit) + 260) -Class QFlags - size=4 align=4 -QFlags (0x3107e480) 0 Vtable for QDial QDial::_ZTV5QDial: 64 entries @@ -9424,9 +8752,6 @@ QDockWidget (0x316cac40) 0 QPaintDevice (0x316cacc0) 8 vptr=((&QDockWidget::_ZTV11QDockWidget) + 232) -Class QFlags - size=4 align=4 -QFlags (0x316ef780) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63 entries @@ -11541,63 +10866,18 @@ QWorkspace (0x319218c0) 0 QPaintDevice (0x3192f2c0) 8 vptr=((&QWorkspace::_ZTV10QWorkspace) + 232) -Class QList::Node - size=4 align=4 -QList::Node (0x30120ac0) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x301dfa00) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x3057e4c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31ae9700) 0 empty -Class QList::Node - size=4 align=4 -QList::Node (0x30ec7480) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31b48f40) 0 empty -Class QList::Node - size=4 align=4 -QList::Node (0x307e7680) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x31bd1f40) 0 -Class QVectorTypedData - size=28 align=4 -QVectorTypedData (0x3166cd00) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31c13cc0) 0 empty -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x31c36840) 0 -Class QVectorTypedData - size=32 align=4 -QVectorTypedData (0x317baac0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31c8b380) 0 empty -Class QVectorTypedData - size=28 align=4 -QVectorTypedData (0x315b86c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31cc9c00) 0 empty diff --git a/tests/auto/bic/data/QtGui.4.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtGui.4.0.0.linux-gcc-amd64.txt index b5a046074..9f17bd726 100644 --- a/tests/auto/bic/data/QtGui.4.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtGui.4.0.0.linux-gcc-amd64.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x2aaaac2975b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad2f34d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad2f3770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad2f3a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad2f3cb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad2f3f50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad304230) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad3044d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad304770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad304a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad304cb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad304f50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad318230) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad3184d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad318770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad318a10) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x2aaaad318c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad345d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad3c4150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad3c4540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad3c4930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad3c4d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad408150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad408540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad408930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad408d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad452150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad452540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad452930) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x2aaaad494380) 0 QGenericArgument (0x2aaaad4943f0) 0 -Class QMetaObject:: - size=32 align=8 - base size=32 base align=8 -QMetaObject:: (0x2aaaad494c40) 0 Class QMetaObject size=32 align=8 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x2aaaad4c78c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad502930) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=12 base align=8 QByteRef (0x2aaaad621f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad6cb000) 0 empty Class QString::Null size=1 align=1 @@ -291,10 +171,6 @@ Class QString base size=8 base align=8 QString (0x2aaaad6cb310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad6cbb60) 0 Class QLatin1String size=8 align=8 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x2aaaad973e00) 0 QString (0x2aaaad973e70) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad98d3f0) 0 empty Class QListData::Data size=32 align=8 @@ -327,15 +199,7 @@ Class QListData base size=8 base align=8 QListData (0x2aaaad9d1310) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaadaf2230) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaadaf20e0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x2aaaadb5b690) 0 QObject (0x2aaaadb5b700) 0 primary-for QIODevice (0x2aaaadb5b690) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaadb8f230) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=128 base align=8 QMapData (0x2aaaadc00e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaadd0ed20) 0 Class QTextCodec::ConverterState size=32 align=8 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x2aaaadd0ea80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 16u) -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaadd55620) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaadd554d0) 0 Class QTextEncoder size=40 align=8 @@ -503,30 +351,10 @@ Class QTextDecoder base size=40 base align=8 QTextDecoder (0x2aaaadd93380) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaadd937e0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x2aaaadd939a0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaadd938c0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaadd93a80) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaadd93b60) 0 Class __gconv_trans_data size=40 align=8 @@ -548,15 +376,7 @@ Class __gconv_info base size=16 base align=8 __gconv_info (0x2aaaadd93e70) 0 -Class :: - size=72 align=8 - base size=72 base align=8 -:: (0x2aaaaddb0070) 0 -Class - size=72 align=8 - base size=72 base align=8 - (0x2aaaadd93f50) 0 Class _IO_marker size=24 align=8 @@ -568,10 +388,6 @@ Class _IO_FILE base size=216 base align=8 _IO_FILE (0x2aaaaddb0150) 0 -Class - size=32 align=8 - base size=32 base align=8 - (0x2aaaaddb0230) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x2aaaaddb02a0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaade14540) 0 Class QTextStreamManipulator size=40 align=8 @@ -680,10 +492,6 @@ QFile (0x2aaaadee7000) 0 QObject (0x2aaaadee70e0) 0 primary-for QIODevice (0x2aaaadee7070) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaadee7ee0) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=8 base align=8 QRegExp (0x2aaaadf38cb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadf6baf0) 0 empty Class QStringMatcher size=1048 align=8 base size=1044 base align=8 QStringMatcher (0x2aaaadf6bd20) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaadf86310) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaadf861c0) 0 Class QStringList size=8 align=8 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x2aaaadf86460) 0 QList (0x2aaaadf864d0) 0 -Class QList::iterator - size=8 align=8 - base size=8 base align=8 -QList::iterator (0x2aaaadfd4310) 0 -Class QList::const_iterator - size=8 align=8 - base size=8 base align=8 -QList::const_iterator (0x2aaaadfd4690) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=8 base align=8 QFileInfo (0x2aaaae05d000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae05da80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae05dee0) 0 empty -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaae09c690) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaae09c540) 0 Class QDir size=8 align=8 base size=8 base align=8 QDir (0x2aaaae09c7e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae09ca80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae09ccb0) 0 Class QUrl size=8 align=8 base size=8 base align=8 QUrl (0x2aaaae13d9a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae13dcb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae19dee0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x2aaaae1b9540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1b9c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1b9e00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1da000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1da1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1da380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1da540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1da700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1da8c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1daa80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1dac40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1dae00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1e5000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1e51c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1e5380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1e5540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1e5700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae1e58c0) 0 empty Class QVariant::PrivateShared size=16 align=8 @@ -1029,35 +717,15 @@ Class QVariant base size=16 base align=8 QVariant (0x2aaaae1e5a10) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaae278bd0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaae278a80) 0 -Class QMap:: - size=8 align=8 - base size=8 base align=8 -QMap:: (0x2aaaae278f50) 0 -Class QMap - size=8 align=8 - base size=8 base align=8 -QMap (0x2aaaae278e00) 0 Class QVariantComparisonHelper size=8 align=8 base size=8 base align=8 QVariantComparisonHelper (0x2aaaae2dd8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae2f5380) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1128,10 +796,6 @@ Class QFileEngine QFileEngine (0x2aaaae36c770) 0 vptr=((& QFileEngine::_ZTV11QFileEngine) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae36cb60) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5u entries @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x2aaaae3b9460) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae3b9620) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x2aaaae4dd930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae4ddb60) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x2aaaae511cb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae52f230) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x2aaaae55e4d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae55e690) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x2aaaae57af50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae59d540) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x2aaaae5c6620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae5c6d20) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x2aaaae5fff50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae623690) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x2aaaae657e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae692bd0) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x2aaaae713770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae743700) 0 empty Class QLinkedListData size=32 align=8 @@ -1262,10 +890,6 @@ Class QBitRef base size=12 base align=8 QBitRef (0x2aaaae8b58c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae8cd4d0) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=8 base align=8 QLocale (0x2aaaae9ed5b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaea42070) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x2aaaaea9c700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaeac18c0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x2aaaaeac1af0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaeade620) 0 empty Class QDateTime size=8 align=8 base size=8 base align=8 QDateTime (0x2aaaaeade850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaeb063f0) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x2aaaaeb64af0) 0 QObject (0x2aaaaeb85000) 0 primary-for QEventLoop (0x2aaaaeb64af0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaeb853f0) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=24 base align=8 QModelIndex (0x2aaaaec014d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaec17700) 0 empty Class QPersistentModelIndex size=8 align=8 base size=8 base align=8 QPersistentModelIndex (0x2aaaaec17c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaec17e70) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2aaaaecc0540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaecc0e00) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=12 base align=8 QMetaMethod (0x2aaaaed04bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaed04690) 0 empty Class QMetaEnum size=16 align=8 base size=12 base align=8 QMetaEnum (0x2aaaaed251c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaed25690) 0 empty Class QMetaProperty size=32 align=8 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=12 base align=8 QMetaClassInfo (0x2aaaaed25a10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaed25e00) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2057,25 +1637,9 @@ Class QWriteLocker base size=8 base align=8 QWriteLocker (0x2aaaaedfe770) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2aaaaee11bd0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2aaaaee11cb0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2aaaaee11d90) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2aaaaee11af0) 0 Class QColor size=16 align=4 @@ -2092,55 +1656,23 @@ Class QPen base size=8 base align=8 QPen (0x2aaaaee952a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaee95460) 0 empty Class QBrush size=8 align=8 base size=8 base align=8 QBrush (0x2aaaaee95770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaee95bd0) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x2aaaaee95e00) 0 -Class QVector >:: - size=8 align=8 - base size=8 base align=8 -QVector >:: (0x2aaaaeec9620) 0 -Class QVector > - size=8 align=8 - base size=8 base align=8 -QVector > (0x2aaaaeec9460) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2aaaaeec9850) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2aaaaeec9930) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2aaaaeec9a10) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2aaaaeec9770) 0 Class QGradient size=64 align=8 @@ -2170,25 +1702,13 @@ Class QTextLength base size=16 base align=8 QTextLength (0x2aaaaeec9380) 0 -Class QSharedDataPointer - size=8 align=8 - base size=8 base align=8 -QSharedDataPointer (0x2aaaaef08000) 0 Class QTextFormat size=16 align=8 base size=12 base align=8 QTextFormat (0x2aaaaef08d90) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaaef3fd20) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaaef3fb60) 0 Class QTextCharFormat size=16 align=8 @@ -2328,10 +1848,6 @@ QTextFrame (0x2aaaaf052850) 0 QObject (0x2aaaaf052930) 0 primary-for QTextObject (0x2aaaaf0528c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf0ce540) 0 empty Class QTextBlock::iterator size=24 align=8 @@ -2343,25 +1859,13 @@ Class QTextBlock base size=12 base align=8 QTextBlock (0x2aaaaf0ce850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf0ffbd0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf0ffe70) 0 empty Class QTextFragment size=16 align=8 base size=16 base align=8 QTextFragment (0x2aaaaf1100e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf1290e0) 0 empty Class QFontMetrics size=8 align=8 @@ -2421,20 +1925,12 @@ QTextDocument (0x2aaaaf167700) 0 QObject (0x2aaaaf167770) 0 primary-for QTextDocument (0x2aaaaf167700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaf167b60) 0 Class QTextOption size=32 align=8 base size=32 base align=8 QTextOption (0x2aaaaf1679a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaf1a6690) 0 Class QTextTableCell size=16 align=8 @@ -2485,10 +1981,6 @@ Class QKeySequence base size=8 base align=8 QKeySequence (0x2aaaaf1f99a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf1f9310) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2771,15 +2263,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x2aaaaf313380) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaaf313690) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaaf313540) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3063,15 +2547,7 @@ Class QTextLayout base size=8 base align=8 QTextLayout (0x2aaaaf3cc150) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaaf3cc5b0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaaf3cc3f0) 0 Class QTextLine size=16 align=8 @@ -3120,10 +2596,6 @@ Class QTextDocumentFragment base size=8 base align=8 QTextDocumentFragment (0x2aaaaf42fa10) 0 -Class QSharedDataPointer - size=8 align=8 - base size=8 base align=8 -QSharedDataPointer (0x2aaaaf42fc40) 0 Class QTextCursor size=8 align=8 @@ -3146,15 +2618,7 @@ Class QAbstractTextDocumentLayout::Selection base size=24 base align=8 QAbstractTextDocumentLayout::Selection (0x2aaaaf4f8af0) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaaf4f8ee0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaaf4f8d20) 0 Class QAbstractTextDocumentLayout::PaintContext size=64 align=8 @@ -3981,10 +3445,6 @@ QFileDialog (0x2aaaaf7da850) 0 QPaintDevice (0x2aaaaf7da9a0) 16 vptr=((& QFileDialog::_ZTV11QFileDialog) + 488u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaf7dab60) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4504,10 +3964,6 @@ QImage (0x2aaaaf91a380) 0 QPaintDevice (0x2aaaaf91a3f0) 0 primary-for QImage (0x2aaaaf91a380) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf996460) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4732,10 +4188,6 @@ Class QIcon base size=8 base align=8 QIcon (0x2aaaafa8ecb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaafab8770) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4887,15 +4339,7 @@ Class QPrintEngine QPrintEngine (0x2aaaafb441c0) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 16u) -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafb44af0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafb44930) 0 Class QPolygon size=8 align=8 @@ -4903,15 +4347,7 @@ Class QPolygon QPolygon (0x2aaaafb44bd0) 0 QVector (0x2aaaafb44c40) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafb96540) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafb96380) 0 Class QPolygonF size=8 align=8 @@ -4924,55 +4360,19 @@ Class QMatrix base size=48 base align=8 QMatrix (0x2aaaafbd0b60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaafbf4620) 0 empty Class QPainter size=8 align=8 base size=8 base align=8 QPainter (0x2aaaafc0d310) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafcae380) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafcae1c0) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafcae7e0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafcae620) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafd00690) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafd004d0) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafd00af0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafd00930) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5020,15 +4420,7 @@ QStyle (0x2aaaafdb5cb0) 0 QObject (0x2aaaafdb5d20) 0 primary-for QStyle (0x2aaaafdb5cb0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaafe09310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaafe09700) 0 Class QStylePainter size=24 align=8 @@ -5046,25 +4438,13 @@ Class QPainterPath base size=8 base align=8 QPainterPath (0x2aaaafe49f50) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafe8a000) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafe63ee0) 0 Class QPainterPathPrivate size=16 align=8 base size=16 base align=8 QPainterPathPrivate (0x2aaaafe63b60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaafe8a150) 0 empty Class QPainterPathStroker size=8 align=8 @@ -5076,15 +4456,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x2aaaafec79a0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaafec7af0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaafec7f50) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5119,10 +4491,6 @@ Class QPaintEngine QPaintEngine (0x2aaaafec7d20) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaff03b60) 0 Class QPaintEngineState size=4 align=4 @@ -5134,10 +4502,6 @@ Class QItemSelectionRange base size=16 base align=8 QItemSelectionRange (0x2aaaaff319a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaff86690) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5168,20 +4532,8 @@ QItemSelectionModel (0x2aaaaff86bd0) 0 QObject (0x2aaaaff86c40) 0 primary-for QItemSelectionModel (0x2aaaaff86bd0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaffb9380) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaaffb9a10) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaaffb98c0) 0 Class QItemSelection size=8 align=8 @@ -5470,10 +4822,6 @@ QAbstractSpinBox (0x2aaab00672a0) 0 QPaintDevice (0x2aaab0067380) 16 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 504u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab0067c40) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5910,10 +5258,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x2aaab01a9ee0) 0 QStyleOption (0x2aaab01a9f50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab01cc850) 0 Class QStyleOptionButton size=88 align=8 @@ -5921,10 +5265,6 @@ Class QStyleOptionButton QStyleOptionButton (0x2aaab01cc540) 0 QStyleOption (0x2aaab01cc5b0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab0203310) 0 Class QStyleOptionTab size=96 align=8 @@ -5944,10 +5284,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x2aaab023b230) 0 QStyleOption (0x2aaab023b2a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab023bc40) 0 Class QStyleOptionQ3ListViewItem size=80 align=8 @@ -6005,15 +5341,7 @@ QStyleOptionSpinBox (0x2aaab02cf7e0) 0 QStyleOptionComplex (0x2aaab02cf850) 0 QStyleOption (0x2aaab02cf8c0) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab02e43f0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab02e42a0) 0 Class QStyleOptionQ3ListView size=112 align=8 @@ -6022,10 +5350,6 @@ QStyleOptionQ3ListView (0x2aaab02cf2a0) 0 QStyleOptionComplex (0x2aaab02cfa80) 0 QStyleOption (0x2aaab02e4000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab02e4e00) 0 Class QStyleOptionToolButton size=128 align=8 @@ -6213,10 +5537,6 @@ QAbstractItemView (0x2aaab0366f50) 0 QPaintDevice (0x2aaab03910e0) 16 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 784u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab0391930) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6399,15 +5719,7 @@ QListView (0x2aaab043d380) 0 QPaintDevice (0x2aaab043d5b0) 16 vptr=((& QListView::_ZTV9QListView) + 784u) -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaab0482070) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaab043df50) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7324,15 +6636,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x2aaab06a8230) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 16u) -Class QHash:: - size=8 align=8 - base size=8 base align=8 -QHash:: (0x2aaab06a8f50) 0 -Class QHash - size=8 align=8 - base size=8 base align=8 -QHash (0x2aaab06a8d90) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7349,25 +6653,9 @@ Class QItemEditorFactory QItemEditorFactory (0x2aaab06a8bd0) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 16u) -Class QVector >:: - size=8 align=8 - base size=8 base align=8 -QVector >:: (0x2aaab06d69a0) 0 -Class QVector > - size=8 align=8 - base size=8 base align=8 -QVector > (0x2aaab06d67e0) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab06d6d20) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab06d6bd0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -7594,15 +6882,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2aaab07b8620) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab07b87e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab07b8bd0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8450,15 +7730,7 @@ QActionGroup (0x2aaab0a40d20) 0 QObject (0x2aaab0a40d90) 0 primary-for QActionGroup (0x2aaab0a40d20) -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab0a5f930) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab0a5f7e0) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -8599,10 +7871,6 @@ QCommonStyle (0x2aaab0ac0150) 0 QObject (0x2aaab0ac0230) 0 primary-for QStyle (0x2aaab0ac01c0) -Class QPointer - size=8 align=8 - base size=8 base align=8 -QPointer (0x2aaab0ac0a10) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10130,10 +9398,6 @@ QDateEdit (0x2aaab0d82930) 0 QPaintDevice (0x2aaab0d82af0) 16 vptr=((& QDateEdit::_ZTV9QDateEdit) + 520u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab0da5070) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10293,10 +9557,6 @@ QDockWidget (0x2aaab0da5e00) 0 QPaintDevice (0x2aaab0da5ee0) 16 vptr=((& QDockWidget::_ZTV11QDockWidget) + 464u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab0dfda80) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -11867,153 +11127,33 @@ QDial (0x2aaab11f4230) 0 QPaintDevice (0x2aaab11f4380) 16 vptr=((& QDial::_ZTV5QDial) + 472u) -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab12a09a0) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab12d7a80) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x2aaab136c230) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x2aaab1387380) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x2aaab1387e00) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x2aaab13aba80) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x2aaab13d0ee0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x2aaab1403c40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x2aaab140d1c0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x2aaab140d700) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x2aaab140dc40) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x2aaab1424bd0) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab14e4620) 0 -Class QVectorTypedData > - size=24 align=8 - base size=24 base align=8 -QVectorTypedData > (0x2aaab14e4d20) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab1521770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab15bdee0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab15c5b60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab15d5b60) 0 empty -Class QHashNode - size=24 align=8 - base size=24 base align=8 -QHashNode (0x2aaab1612c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab1629150) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab163b540) 0 empty -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab1649770) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=8 align=8 - base size=8 base align=8 -QVector::realloc(int, int) [with T = QTextLength]:: (0x2aaab165b000) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=8 align=8 - base size=8 base align=8 -QVector::realloc(int, int) [with T = QPoint]:: (0x2aaab16862a0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=8 align=8 - base size=8 base align=8 -QVector::realloc(int, int) [with T = QPointF]:: (0x2aaab16af700) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab16dbb60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab16f0460) 0 empty -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab16f05b0) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab16ffa80) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=8 align=8 - base size=8 base align=8 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x2aaab17191c0) 0 diff --git a/tests/auto/bic/data/QtGui.4.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtGui.4.0.0.linux-gcc-ia32.txt index a0538d7ba..b5987480a 100644 --- a/tests/auto/bic/data/QtGui.4.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtGui.4.0.0.linux-gcc-ia32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x40af7000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af7140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af7180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af71c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af7200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af7240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af7280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af72c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af7300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af7340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af7380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af73c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af7400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af7440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af7480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40af74c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40af7500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40af76c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40af7740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40af77c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40af7840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40af78c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40af7940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40af79c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40af7a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40af7ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40af7b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40af7bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40af7c40) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40af7d80) 0 QGenericArgument (0x40af7dc0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40af7fc0) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x414060c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41406180) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x41406880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41406900) 0 empty Class QString::Null size=1 align=1 @@ -296,10 +176,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x41406b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41406c80) 0 Class QCharRef size=8 align=4 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x41406e40) 0 QString (0x41406e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41406f00) 0 empty Class QListData::Data size=24 align=4 @@ -327,15 +199,7 @@ Class QListData base size=4 base align=4 QListData (0x416c4000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x416c4440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x416c4380) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x416c4680) 0 QObject (0x416c46c0) 0 primary-for QIODevice (0x416c4680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x416c4800) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=72 base align=4 QMapData (0x416c4900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x416c4ec0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x416c4dc0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x416c4c00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x416c4540) 0 Class QTextEncoder size=32 align=4 @@ -503,30 +351,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x418c1000) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x418c1080) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x418c1100) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x418c10c0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x418c1140) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x418c1180) 0 Class __gconv_trans_data size=20 align=4 @@ -548,15 +376,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x418c1280) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x418c1300) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x418c12c0) 0 Class _IO_marker size=12 align=4 @@ -568,10 +388,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x418c1380) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x418c13c0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x418c1400) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x418c1540) 0 Class QTextStreamManipulator size=24 align=4 @@ -680,10 +492,6 @@ QFile (0x418c1c80) 0 QObject (0x418c1d00) 0 primary-for QIODevice (0x418c1cc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x418c1e00) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x418c1fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418c1740) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x418c1900) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x419c8080) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x418c1f40) 0 Class QStringList size=4 align=4 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x419c80c0) 0 QList (0x419c8100) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x419c8340) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x419c83c0) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x419c8840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x419c88c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x419c8900) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x419c8a40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x419c8980) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x419c8a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x419c8b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x419c8c00) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x419c8c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x419c8d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x419c8dc0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x419c8e00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419c8e80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419c8ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419c8f00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419c8f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419c8f80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419c8fc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419c8680) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x419c87c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b03000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b03040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b03080) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b030c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b03100) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b03140) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b03180) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b031c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b03200) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1029,35 +717,15 @@ Class QVariant base size=12 base align=4 QVariant (0x41b03240) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41b03800) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41b03740) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x41b03980) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x41b038c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x41b03bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41b03cc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1142,10 +810,6 @@ Class QFileEngineHandler QFileEngineHandler (0x41b03f80) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41b03480) 0 Class QHashData::Node size=8 align=4 @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x41b03d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41b03e00) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x41c0a4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c0a900) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x41c0a9c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c0ae00) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x41c0af00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c0af40) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x41c0a500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c0a600) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x41c0a800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c0ad00) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x41d2c0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d2c480) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x41d2c680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d2c880) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x41d2c980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d2cb00) 0 empty Class QLinkedListData size=20 align=4 @@ -1262,10 +890,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x41d2c380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d2c6c0) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=4 base align=4 QLocale (0x41f15280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41f152c0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x41f15440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41f155c0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x41f15600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41f15780) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x41f157c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41f15900) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x41f15500) 0 QObject (0x41f15640) 0 primary-for QEventLoop (0x41f15500) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41f15880) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x42054300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42054400) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x42054480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42054540) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x42054b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42054bc0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x42054f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42054f80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x42054fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42054180) 0 empty Class QMetaProperty size=20 align=4 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x420544c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42054740) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2057,25 +1637,9 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x42135580) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x421356c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x42135700) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x42135740) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x42135680) 0 Class QColor size=16 align=4 @@ -2092,55 +1656,23 @@ Class QPen base size=4 base align=4 QPen (0x42135b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42135bc0) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0x42135c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42135c40) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x42135c80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42135ec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42135e00) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0x42135f40) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0x42135f80) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0x42135fc0) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0x42135f00) 0 Class QGradient size=56 align=4 @@ -2170,25 +1702,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x42135d00) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4220c1c0) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x4220c100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4220c440) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4220c380) 0 Class QTextCharFormat size=8 align=4 @@ -2328,10 +1848,6 @@ QTextFrame (0x4220cb00) 0 QObject (0x4220cb80) 0 primary-for QTextObject (0x4220cb40) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4220ce00) 0 empty Class QTextBlock::iterator size=16 align=4 @@ -2343,25 +1859,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x4220ce40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4220c140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4220c200) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x4220c280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4230b000) 0 empty Class QFontMetrics size=4 align=4 @@ -2426,10 +1930,6 @@ Class QTextOption base size=24 base align=4 QTextOption (0x4230b340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4230b3c0) 0 Class QTextTableCell size=8 align=4 @@ -2480,10 +1980,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x4230ba40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4230bb80) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2766,15 +2262,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0x423d5b00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x423d5c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x423d5bc0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3058,15 +2546,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x424469c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42446b80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42446ac0) 0 Class QTextLine size=8 align=4 @@ -3115,10 +2595,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x42446080) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x42446380) 0 Class QTextCursor size=4 align=4 @@ -3141,15 +2617,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x424fa200) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x424fa3c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x424fa300) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -3976,10 +3444,6 @@ QFileDialog (0x42663440) 0 QPaintDevice (0x42663540) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x426636c0) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4499,10 +3963,6 @@ QImage (0x42663f80) 0 QPaintDevice (0x42747000) 0 primary-for QImage (0x42663f80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42747100) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4727,10 +4187,6 @@ Class QIcon base size=4 base align=4 QIcon (0x42747c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42747d00) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4882,15 +4338,7 @@ Class QPrintEngine QPrintEngine (0x4283d200) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4283d400) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4283d340) 0 Class QPolygon size=4 align=4 @@ -4898,15 +4346,7 @@ Class QPolygon QPolygon (0x4283d440) 0 QVector (0x4283d480) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4283d700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4283d640) 0 Class QPolygonF size=4 align=4 @@ -4919,55 +4359,19 @@ Class QMatrix base size=48 base align=4 QMatrix (0x4283d900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4283d940) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x4283d980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4283db80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4283dac0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4283dd00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4283dc40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4283de80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4283ddc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4283d180) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4283df40) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5015,15 +4419,7 @@ QStyle (0x4283d240) 0 QObject (0x4283d9c0) 0 primary-for QStyle (0x4283d240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x429b8100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x429b8180) 0 Class QStylePainter size=12 align=4 @@ -5041,25 +4437,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x429b8340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x429b8740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x429b8680) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x429b84c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x429b8780) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5071,15 +4455,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x429b8840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x429b8880) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x429b8980) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5114,10 +4490,6 @@ Class QPaintEngine QPaintEngine (0x429b88c0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x429b8b00) 0 Class QPaintEngineState size=4 align=4 @@ -5129,10 +4501,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x429b8b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x429b8c40) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5163,20 +4531,8 @@ QItemSelectionModel (0x429b8cc0) 0 QObject (0x429b8d00) 0 primary-for QItemSelectionModel (0x429b8cc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x429b8e00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x429b8f40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x429b8e80) 0 Class QItemSelection size=4 align=4 @@ -5465,10 +4821,6 @@ QAbstractSpinBox (0x42ae34c0) 0 QPaintDevice (0x42ae3580) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42ae3680) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5905,10 +5257,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x42bb9100) 0 QStyleOption (0x42bb9140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42bb9380) 0 Class QStyleOptionButton size=64 align=4 @@ -5916,10 +5264,6 @@ Class QStyleOptionButton QStyleOptionButton (0x42bb9280) 0 QStyleOption (0x42bb92c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42bb95c0) 0 Class QStyleOptionTab size=72 align=4 @@ -5939,10 +5283,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x42bb9840) 0 QStyleOption (0x42bb9880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42bb9a80) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6000,15 +5340,7 @@ QStyleOptionSpinBox (0x42c4a100) 0 QStyleOptionComplex (0x42c4a140) 0 QStyleOption (0x42c4a180) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42c4a480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42c4a3c0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6017,10 +5349,6 @@ QStyleOptionQ3ListView (0x42c4a280) 0 QStyleOptionComplex (0x42c4a2c0) 0 QStyleOption (0x42c4a300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42c4a700) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6208,10 +5536,6 @@ QAbstractItemView (0x42c4ad00) 0 QPaintDevice (0x42c4ae40) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42c4af80) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6394,15 +5718,7 @@ QListView (0x42c4a680) 0 QPaintDevice (0x42ce8000) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42ce8280) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42ce81c0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7319,15 +6635,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x42e04480) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x42e04780) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x42e046c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7344,25 +6652,9 @@ Class QItemEditorFactory QItemEditorFactory (0x42e04600) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x42e04a00) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x42e04940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42e04b80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42e04ac0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -7589,15 +6881,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x42e04c00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42ee9000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42ee9080) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8445,15 +7729,7 @@ QActionGroup (0x42f84b40) 0 QObject (0x42f84b80) 0 primary-for QActionGroup (0x42f84b40) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42f84d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42f84cc0) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -8594,10 +7870,6 @@ QCommonStyle (0x42f84300) 0 QObject (0x42f84680) 0 primary-for QStyle (0x42f844c0) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x42f84fc0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10125,10 +9397,6 @@ QDateEdit (0x431571c0) 0 QPaintDevice (0x43157a80) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43157fc0) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10288,10 +9556,6 @@ QDockWidget (0x432021c0) 0 QPaintDevice (0x43202280) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x432023c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -10538,10 +9802,6 @@ QTextEdit (0x43202700) 0 QPaintDevice (0x43202840) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43202980) 0 Vtable for QProgressBar QProgressBar::_ZTV12QProgressBar: 64u entries @@ -11867,153 +11127,33 @@ QDial (0x432dc900) 0 QPaintDevice (0x432dcf80) 8 vptr=((& QDial::_ZTV5QDial) + 236u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43447500) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43447bc0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x43494d80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x434d41c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x434d4380) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x434d4880) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x434d4bc0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4351d040) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4351d180) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4351d2c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4351d400) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0x4351d7c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43595200) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x43595340) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43595940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x435dae80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4361b080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4361b300) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x4361bcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4361bdc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4365b040) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4365b300) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x4365b440) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x4365b5c0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x4365b780) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4365b940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4365bb00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4365bbc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4365bec0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x436c8180) 0 diff --git a/tests/auto/bic/data/QtGui.4.0.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtGui.4.0.0.linux-gcc-ppc32.txt index d4588a5ad..6ff4c2c42 100644 --- a/tests/auto/bic/data/QtGui.4.0.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtGui.4.0.0.linux-gcc-ppc32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x30b0b188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0b428) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0b4d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0b578) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0b620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0b6c8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0b770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0b818) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0b8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0b968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0ba10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0bab8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0bb60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0bc08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0bcb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0bd58) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x30b0bdc8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b572d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b57348) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b573b8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b57428) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b57498) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b57508) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b57578) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b575e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b57658) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b576c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b57738) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b577a8) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187a80) 0 QGenericArgument (0x30b578c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x30b57a80) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x30b57b60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b57c08) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x314857a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31485af0) 0 empty Class QString::Null size=1 align=1 @@ -296,20 +176,12 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x31485d58) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x315b90a8) 0 Class QCharRef size=8 align=4 base size=8 base align=4 QCharRef (0x315b90e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315b9a10) 0 empty Class QListData::Data size=24 align=4 @@ -321,15 +193,7 @@ Class QListData base size=4 base align=4 QListData (0x315b9c08) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31706118) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31706070) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -421,10 +285,6 @@ QIODevice (0x30187c80) 0 QObject (0x317065b0) 0 primary-for QIODevice (0x30187c80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31706770) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -449,30 +309,10 @@ Class QMapData base size=72 base align=4 QMapData (0x31706b98) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31706e70) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x318130a8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31813038) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x31813118) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x31813188) 0 Class __gconv_trans_data size=20 align=4 @@ -494,15 +334,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x318132d8) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x318133b8) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x31813348) 0 Class _IO_marker size=12 align=4 @@ -514,10 +346,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x31813428) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x31813498) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -532,10 +360,6 @@ Class QTextStream QTextStream (0x318134d0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31813690) 0 Class QTextStreamManipulator size=24 align=4 @@ -596,10 +420,6 @@ QFile (0x30187e00) 0 QObject (0x31813c08) 0 primary-for QIODevice (0x30187e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31813d90) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -652,25 +472,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x31813ee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31813f50) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x31813fc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x318d70e0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x318d7038) 0 Class QStringList size=4 align=4 @@ -770,130 +578,42 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x318d78c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318d7930) 0 empty Class QDir size=4 align=4 base size=4 base align=4 QDir (0x318d79d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x318d7af0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x318d7b60) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x318d7c08) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318d7d20) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x318d7dc8) 0 Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x318d7e00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x318d7ee0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x318d7f50) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x318d7fc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x318d7850) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31998038) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319980a8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31998118) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31998188) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319981f8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31998268) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319982d8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31998348) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319983b8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31998428) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31998498) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31998508) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31998578) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -920,35 +640,15 @@ Class QVariant base size=16 base align=8 QVariant (0x319985b0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31998b28) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31998a80) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x31998ce8) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x31998c40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x31998ea8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31998fc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1033,10 +733,6 @@ Class QFileEngineHandler QFileEngineHandler (0x31a3e188) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31a3e310) 0 Class QHashData::Node size=8 align=4 @@ -1053,90 +749,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x31a3e508) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31a3e578) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x31a3ec40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31a3e268) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x31a3ee38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31b23268) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x31b23428) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31b23498) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x31b235e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31b23690) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x31b23818) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31b23b98) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x31b23e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31b231c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x31bc7070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31bc7268) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x31bc7498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31bc7620) 0 empty Class QLinkedListData size=20 align=4 @@ -1153,10 +813,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x31bc7188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d0b038) 0 empty Class QVectorData size=16 align=4 @@ -1178,40 +834,24 @@ Class QLocale base size=4 base align=4 QLocale (0x31d0b5e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d0b658) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x31d0b850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d0ba10) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x31d0ba80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d0bc08) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x31d0bc78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d0bdc8) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1286,10 +926,6 @@ QTextCodecPlugin (0x3191a380) 0 QFactoryInterface (0x31e4e118) 8 nearly-empty primary-for QTextCodecFactoryInterface (0x3191a3c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31e4e540) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1409,10 +1045,6 @@ QEventLoop (0x3191a4c0) 0 QObject (0x31e4ea80) 0 primary-for QEventLoop (0x3191a4c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31e4ec08) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1489,20 +1121,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x31ed1070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ed11f8) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x31ed12a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ed13b8) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1722,10 +1346,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x31ed1a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ed1b60) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1820,20 +1440,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x31ed1f88) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ed1540) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x31ed17a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ed1c78) 0 empty Class QMetaProperty size=20 align=4 @@ -1845,10 +1457,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x31f72000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31f720a8) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -1971,25 +1579,9 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x31f728f8) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x31f72b28) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x31f72b98) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x31f72c08) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x31f72ab8) 0 Class QColor size=16 align=4 @@ -2006,55 +1598,23 @@ Class QPen base size=4 base align=4 QPen (0x31f72460) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31f72c40) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0x31f72ee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32023000) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x32023070) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32023310) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32023230) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x32023428) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x32023498) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x32023508) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x320233b8) 0 Class QGradient size=64 align=8 @@ -2084,25 +1644,13 @@ Class QTextLength base size=16 base align=8 QTextLength (0x320235e8) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x320238f8) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x320237e0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32023c40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32023b60) 0 Class QTextCharFormat size=8 align=4 @@ -2242,10 +1790,6 @@ QTextFrame (0x3191acc0) 0 QObject (0x3210b070) 0 primary-for QTextObject (0x3191ad00) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3210b508) 0 empty Class QTextBlock::iterator size=16 align=4 @@ -2257,25 +1801,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x3210b578) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3210b8f8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3210b9a0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x3210ba10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3210bbd0) 0 empty Class QFontMetrics size=4 align=4 @@ -2340,10 +1872,6 @@ Class QTextOption base size=28 base align=8 QTextOption (0x3210be00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32190070) 0 Class QTextTableCell size=8 align=4 @@ -2394,10 +1922,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x321906c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32190818) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2680,15 +2204,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x32225850) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x322259d8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32225930) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2705,15 +2221,7 @@ QInputMethodEvent (0x321fc3c0) 0 QEvent (0x32225818) 0 primary-for QInputMethodEvent (0x321fc3c0) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32225d20) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32225c78) 0 Vtable for QDropEvent QDropEvent::_ZTV10QDropEvent: 14u entries @@ -2982,15 +2490,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x32284d20) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32284f50) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32284e70) 0 Class QTextLine size=8 align=4 @@ -3039,10 +2539,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x322e30e0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x322e31f8) 0 Class QTextCursor size=4 align=4 @@ -3059,15 +2555,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x322e3380) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x322e3578) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x322e3498) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -3894,10 +3382,6 @@ QFileDialog (0x321fcf80) 0 QPaintDevice (0x323c7d20) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x323c7f18) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4417,10 +3901,6 @@ QImage (0x3244c540) 0 QPaintDevice (0x32484968) 0 primary-for QImage (0x3244c540) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32484b28) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4645,10 +4125,6 @@ Class QIcon base size=4 base align=4 QIcon (0x3252b6c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3252b738) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4800,15 +4276,7 @@ Class QPrintEngine QPrintEngine (0x3252b000) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x325a1038) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3252bab8) 0 Class QPolygon size=4 align=4 @@ -4816,15 +4284,7 @@ Class QPolygon QPolygon (0x3244c9c0) 0 QVector (0x325a10a8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x325a1460) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x325a1380) 0 Class QPolygonF size=4 align=4 @@ -4837,55 +4297,19 @@ Class QMatrix base size=48 base align=8 QMatrix (0x325a1770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x325a17e0) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x325a1888) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x325a1b60) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x325a1a80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x325a1d20) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x325a1c40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x325a1ee0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x325a1e00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3267a070) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x325a1fc0) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -4933,15 +4357,7 @@ QStyle (0x3244ca40) 0 QObject (0x3267a0e0) 0 primary-for QStyle (0x3244ca40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3267a2a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3267a310) 0 Class QStylePainter size=12 align=4 @@ -4959,25 +4375,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x3267a578) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3267aa10) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3267a930) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x3267a770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3267aab8) 0 empty Class QPainterPathStroker size=4 align=4 @@ -4989,15 +4393,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x3267ace8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3267ad90) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3267af18) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5032,10 +4428,6 @@ Class QPaintEngine QPaintEngine (0x3267ae00) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3267aea8) 0 Class QPaintEngineState size=4 align=4 @@ -5047,10 +4439,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x327aa000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x327aa2a0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5081,20 +4469,8 @@ QItemSelectionModel (0x3244cb00) 0 QObject (0x327aa348) 0 primary-for QItemSelectionModel (0x3244cb00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x327aa4d0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x327aa620) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x327aa578) 0 Class QItemSelection size=4 align=4 @@ -5383,10 +4759,6 @@ QAbstractSpinBox (0x3244ce00) 0 QPaintDevice (0x327aadc8) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x327aa428) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5823,10 +5195,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x32874240) 0 QStyleOption (0x32862ea8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32862c40) 0 Class QStyleOptionButton size=64 align=4 @@ -5834,10 +5202,6 @@ Class QStyleOptionButton QStyleOptionButton (0x328742c0) 0 QStyleOption (0x32862310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x328e2188) 0 Class QStyleOptionTab size=72 align=4 @@ -5857,10 +5221,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x328743c0) 0 QStyleOption (0x328e2460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x328e2738) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5918,15 +5278,7 @@ QStyleOptionSpinBox (0x32874640) 0 QStyleOptionComplex (0x32874680) 0 QStyleOption (0x32954118) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32954498) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x329543f0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5935,10 +5287,6 @@ QStyleOptionQ3ListView (0x328746c0) 0 QStyleOptionComplex (0x32874700) 0 QStyleOption (0x329542a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32954770) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6126,10 +5474,6 @@ QAbstractItemView (0x32874980) 0 QPaintDevice (0x32954e70) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32954380) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6312,15 +5656,7 @@ QListView (0x32874b80) 0 QPaintDevice (0x32954dc8) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32a07310) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32a07230) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7237,15 +6573,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x32ae8540) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x32ae88f8) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x32ae8818) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7262,25 +6590,9 @@ Class QItemEditorFactory QItemEditorFactory (0x32ae8738) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x32ae8ce8) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x32ae8c08) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32ae8ea8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32ae8e00) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -7507,15 +6819,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x32bd45e8) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32bd46c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32bd4738) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8497,10 +7801,6 @@ QCommonStyle (0x32cbc280) 0 QObject (0x32cb1d58) 0 primary-for QStyle (0x32cbc2c0) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x32cb1f50) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10028,10 +9328,6 @@ QDateEdit (0x32e19240) 0 QPaintDevice (0x32dd4e70) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32dd4268) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10191,10 +9487,6 @@ QDockWidget (0x32e19400) 0 QPaintDevice (0x32e6b038) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32e6b2a0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -11738,133 +11030,29 @@ QDial (0x32f930c0) 0 QPaintDevice (0x32f15700) 8 vptr=((& QDial::_ZTV5QDial) + 236u) -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x33038f18) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x330523f0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x33052690) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x33052f50) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x3306f578) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x3306fc08) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x3306fd90) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x330a20e0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x330a2268) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x330a29d8) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33114118) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x33114310) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3314b428) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3314be00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3316c118) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3316c508) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x3318b5e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3318b770) 0 empty -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x3318be70) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x331be348) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x331be968) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x331bef88) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x331fa150) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x331fa1f8) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x331fa6c8) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x331fab98) 0 diff --git a/tests/auto/bic/data/QtGui.4.0.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtGui.4.0.0.macx-gcc-ppc32.txt index 807503ee0..a729c8602 100644 --- a/tests/auto/bic/data/QtGui.4.0.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtGui.4.0.0.macx-gcc-ppc32.txt @@ -59,75 +59,19 @@ Class QBool base size=4 base align=4 QBool (0x82e100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82e440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82e500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82e5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82e680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82e740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82e800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82e8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82e980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82ea40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82eb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82ebc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82ec80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82ed40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x82ee00) 0 empty Class QFlag size=4 align=4 @@ -144,10 +88,6 @@ Class QChar base size=2 base align=2 QChar (0x87a100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x87a200) 0 empty Class QBasicAtomic size=4 align=4 @@ -160,10 +100,6 @@ Class QAtomic QAtomic (0x87a5c0) 0 QBasicAtomic (0x87a600) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x87a880) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -245,70 +181,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0x17ad500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17ad8c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17add80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17ade00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17ade80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17adf00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17adf80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18c2000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18c2080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18c2100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18c2180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18c2200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18c2280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18c2300) 0 Class QInternal size=1 align=1 @@ -335,10 +219,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x18c2a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18c2e80) 0 Class QCharRef size=8 align=4 @@ -351,10 +231,6 @@ Class QConstString QConstString (0x1a6aa80) 0 QString (0x1a6aac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a6abc0) 0 empty Class QListData::Data size=24 align=4 @@ -366,10 +242,6 @@ Class QListData base size=4 base align=4 QListData (0x1a6ae00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b65400) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -394,15 +266,7 @@ Class QTextCodec QTextCodec (0x1b65280) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1b65740) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1b65680) 0 Class QTextEncoder size=32 align=4 @@ -425,25 +289,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1b65980) 0 QGenericArgument (0x1b659c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1b65c80) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1b65c00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1b65f00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1b65e40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -535,10 +387,6 @@ QIODevice (0x1cb2440) 0 QObject (0x1cb2480) 0 primary-for QIODevice (0x1cb2440) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1cb26c0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -558,25 +406,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1cb2d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cb2f80) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1cb2100) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1d9d140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d9d080) 0 Class QStringList size=4 align=4 @@ -584,15 +420,7 @@ Class QStringList QStringList (0x1d9d200) 0 QList (0x1d9d240) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1d9d700) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1d9d780) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -748,10 +576,6 @@ Class QTextStream QTextStream (0x1e21880) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f16280) 0 Class QTextStreamManipulator size=24 align=4 @@ -842,50 +666,22 @@ QFile (0x1f16f00) 0 QObject (0x1f16f80) 0 primary-for QIODevice (0x1f16f40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ff9040) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1ff9080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ff9140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ff91c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1ff9380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1ff92c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1ff9440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ff9580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ff9640) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35u entries @@ -945,10 +741,6 @@ Class QFileEngineHandler QFileEngineHandler (0x1ff9880) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ff9a40) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -999,90 +791,22 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1ff9c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1ff9d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1ff9dc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1ff9e40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1ff9ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1ff9f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1ff9fc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1ff9980) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c080) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c100) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c180) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c200) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c280) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c300) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210c480) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1109,50 +833,18 @@ Class QVariant base size=16 base align=4 QVariant (0x210c4c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x210cb40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x210ca80) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x210cd40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x210cc80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x210cfc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x210cd80) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x21df040) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x21df0c0) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x21df140) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1230,15 +922,7 @@ Class QUrl base size=4 base align=4 QUrl (0x21dfa00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21dfc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21dfc80) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1265,10 +949,6 @@ QEventLoop (0x21dfd00) 0 QObject (0x21dfd40) 0 primary-for QEventLoop (0x21dfd00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21dff40) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1313,20 +993,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x22d0080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22d0240) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x22d0300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22d0440) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1496,10 +1168,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x22d0b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22d0c00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1591,20 +1259,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x237e540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x237e600) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x237e680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x237e740) 0 empty Class QMetaProperty size=20 align=4 @@ -1616,10 +1276,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x237e800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x237e8c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1907,10 +1563,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x24db140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24db280) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1932,80 +1584,48 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x24db4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24db540) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x24dbd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24dbf40) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x24dbfc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2604040) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x26040c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2604240) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x26042c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2604740) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x2604900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2604d80) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x2604f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2604100) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x2604500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2604680) 0 empty Class QLinkedListData size=20 align=4 @@ -2017,50 +1637,30 @@ Class QLocale base size=4 base align=4 QLocale (0x26ce380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26ce400) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x26ce540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26ce940) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x26cec00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26ce200) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x26cef40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2810180) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x2810400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x28105c0) 0 empty Class QSharedData size=4 align=4 @@ -2087,10 +1687,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x2a17200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a17380) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2394,15 +1990,7 @@ Class QInputMethodEvent::Attribute base size=28 base align=4 QInputMethodEvent::Attribute (0x2aacec0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2aac480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2aacfc0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2676,15 +2264,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2b4b580) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b4b6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b4b740) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -2968,25 +2548,9 @@ Class QPaintDevice QPaintDevice (0x2bbd9c0) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2bbdd00) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2bbdd80) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2bbde00) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2bbdc80) 0 Class QColor size=16 align=4 @@ -2998,45 +2562,17 @@ Class QBrush base size=4 base align=4 QBrush (0x2bbd6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2bbde40) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x2c4a000) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2c4a300) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2c4a200) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2c4a440) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2c4a4c0) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2c4a540) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2c4a3c0) 0 Class QGradient size=56 align=4 @@ -3681,10 +3217,6 @@ QFileDialog (0x2e82740) 0 QPaintDevice (0x2e82800) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e82ac0) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4379,10 +3911,6 @@ QImage (0x2f37880) 0 QPaintDevice (0x2f37b40) 0 primary-for QImage (0x2f37880) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3020280) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4427,10 +3955,6 @@ Class QIcon base size=4 base align=4 QIcon (0x3020b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3020bc0) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4760,15 +4284,7 @@ QActionGroup (0x30de9c0) 0 QObject (0x30dec40) 0 primary-for QActionGroup (0x30de9c0) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x318c200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x318c140) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -5073,10 +4589,6 @@ QAbstractSpinBox (0x318cf80) 0 QPaintDevice (0x318c040) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322a040) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5284,15 +4796,7 @@ QStyle (0x322a540) 0 QObject (0x322a580) 0 primary-for QStyle (0x322a540) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322a7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322a840) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -5569,10 +5073,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x334f6c0) 0 QStyleOption (0x334f700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x334fac0) 0 Class QStyleOptionButton size=64 align=4 @@ -5580,10 +5080,6 @@ Class QStyleOptionButton QStyleOptionButton (0x334f900) 0 QStyleOption (0x334f940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x334fe00) 0 Class QStyleOptionTab size=72 align=4 @@ -5603,10 +5099,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x334fb00) 0 QStyleOption (0x334fd80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33c3300) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5664,15 +5156,7 @@ QStyleOptionSpinBox (0x3437100) 0 QStyleOptionComplex (0x3437140) 0 QStyleOption (0x3437180) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3437600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3437540) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5681,10 +5165,6 @@ QStyleOptionQ3ListView (0x3437340) 0 QStyleOptionComplex (0x3437380) 0 QStyleOption (0x34373c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3437a00) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5837,10 +5317,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x34b63c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34b66c0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5871,20 +5347,8 @@ QItemSelectionModel (0x34b6780) 0 QObject (0x34b67c0) 0 primary-for QItemSelectionModel (0x34b6780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34b6980) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34b6b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x34b6a40) 0 Class QItemSelection size=4 align=4 @@ -6014,10 +5478,6 @@ QAbstractItemView (0x34b6cc0) 0 QPaintDevice (0x34b6dc0) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34b62c0) 0 Vtable for QFileIconProvider QFileIconProvider::_ZTV17QFileIconProvider: 7u entries @@ -6269,15 +5729,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x35bc800) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x35bcc80) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x35bcb80) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -6418,15 +5870,7 @@ QListView (0x35bcec0) 0 QPaintDevice (0x35bc0c0) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3664240) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3664140) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7150,25 +6594,9 @@ QTreeView (0x373b600) 0 QPaintDevice (0x373b740) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x373bb40) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x373ba40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x373bd40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x373bc80) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8015,15 +7443,7 @@ Class QColormap base size=4 base align=4 QColormap (0x3973840) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3973a40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3973940) 0 Class QPolygon size=4 align=4 @@ -8031,15 +7451,7 @@ Class QPolygon QPolygon (0x3973ac0) 0 QVector (0x3973b00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3973f40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3973e40) 0 Class QPolygonF size=4 align=4 @@ -8052,90 +7464,38 @@ Class QMatrix base size=48 base align=4 QMatrix (0x3a44200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3a44280) 0 empty Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0x3a44340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3a44440) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0x3a444c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3a44540) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x3a445c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a44c80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3a44b80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a44e80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3a44d80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b54040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3a44f80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b54240) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b54140) 0 Class QTextItem size=1 align=1 base size=0 base align=1 QTextItem (0x3b542c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3b54380) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3b54540) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -8170,10 +7530,6 @@ Class QPaintEngine QPaintEngine (0x3b54400) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3b54800) 0 Class QPaintEngineState size=4 align=4 @@ -8190,25 +7546,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x3b54840) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b54d80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b54c80) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x3b54a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3b54e40) 0 empty Class QPainterPathStroker size=4 align=4 @@ -8306,10 +7650,6 @@ QCommonStyle (0x3c8e640) 0 QObject (0x3c8e6c0) 0 primary-for QStyle (0x3c8e680) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x3c8e9c0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -8631,25 +7971,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x3d2c680) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3d2ca00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x3d2c8c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3d2cdc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3d2ccc0) 0 Class QTextCharFormat size=8 align=4 @@ -8704,15 +8032,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x3e1b140) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3e1b3c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3e1b2c0) 0 Class QTextLine size=8 align=4 @@ -8762,10 +8082,6 @@ QTextDocument (0x3e1b6c0) 0 QObject (0x3e1b700) 0 primary-for QTextDocument (0x3e1b6c0) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3e1ba00) 0 Class QTextCursor size=4 align=4 @@ -8777,15 +8093,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x3e1bb40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3e1bd80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3e1bc80) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -8952,10 +8260,6 @@ QTextFrame (0x3eeb5c0) 0 QObject (0x3eeb640) 0 primary-for QTextObject (0x3eeb600) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3eebb80) 0 empty Class QTextBlock::iterator size=16 align=4 @@ -8967,25 +8271,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x3eebc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3eeb3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3f67040) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x3f67100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3f67300) 0 empty Vtable for QTextList QTextList::_ZTV9QTextList: 17u entries @@ -9587,10 +8879,6 @@ QDateEdit (0x3ff1c00) 0 QPaintDevice (0x3ff1d00) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3ff1f00) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -9751,10 +9039,6 @@ QDockWidget (0x40b7040) 0 QPaintDevice (0x40b70c0) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b7380) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -11480,10 +10764,6 @@ QTextEdit (0x4341280) 0 QPaintDevice (0x4341380) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4341600) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -11901,153 +11181,33 @@ QWorkspace (0x444b040) 0 QPaintDevice (0x444b0c0) 8 vptr=((& QWorkspace::_ZTV10QWorkspace) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44b73c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44de240) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x45d0f00) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x45f7140) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x45f7400) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x45f7b00) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4629880) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4629a40) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4629c00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4629dc0) 0 -Class QVectorTypedData - size=40 align=4 - base size=40 base align=4 -QVectorTypedData (0x464ba40) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x464bd00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x466d000) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x466d300) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x466df40) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x47081c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4708380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4708d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4708f40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4729380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4729880) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4729bc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4729e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x474e180) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x474e240) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x474e600) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x474e940) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x474e980) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x4793640) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x4793680) 0 diff --git a/tests/auto/bic/data/QtGui.4.1.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtGui.4.1.0.linux-gcc-ia32.txt index 00a725ec0..d020f63e1 100644 --- a/tests/auto/bic/data/QtGui.4.1.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtGui.4.1.0.linux-gcc-ia32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x40b04000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b040c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b04100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b04140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b04180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b041c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b04200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b04240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b04280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b042c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b04300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b04340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b04380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b043c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b04400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b04440) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40b04480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b04640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b046c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b04740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b047c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b04840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b048c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b04940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b049c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b04a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b04ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b04b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b04bc0) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40b04d00) 0 QGenericArgument (0x40b04d40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40b04f40) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x41421040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41421100) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x41421800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41421880) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x41421ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41421c00) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x41421dc0) 0 QString (0x41421e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41421e80) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x416d5340) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x416d5780) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x416d56c0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x416d59c0) 0 QObject (0x416d5a00) 0 primary-for QIODevice (0x416d59c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x416d5b40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x416d5d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416d5d40) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x418392c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x418398c0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x418397c0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41839b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41839a80) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x41839c00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41839c80) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x41839d00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41839cc0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x41839d40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41839d80) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x41839e80) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x41839f00) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x41839ec0) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x41839f80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41839fc0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x41839140) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x419e1000) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x419e1340) 0 QTextStream (0x419e1380) 0 primary-for QTextOStream (0x419e1340) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x419e1540) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x419e1580) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x419e1500) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x419e15c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x419e1600) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x419e1640) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x419e1680) 0 Class timespec size=8 align=4 @@ -701,10 +485,6 @@ Class timeval base size=8 base align=4 timeval (0x419e1700) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x419e1740) 0 Class __sched_param size=4 align=4 @@ -721,45 +501,17 @@ Class __pthread_attr_s base size=36 base align=4 __pthread_attr_s (0x419e1800) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0x419e1840) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x419e1880) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x419e18c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x419e1900) 0 Class _pthread_rwlock_t size=32 align=4 base size=32 base align=4 _pthread_rwlock_t (0x419e1940) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x419e1980) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x419e19c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x419e1a00) 0 Class random_data size=28 align=4 @@ -830,10 +582,6 @@ QFile (0x419e1f40) 0 QObject (0x419e1fc0) 0 primary-for QIODevice (0x419e1f80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x419e1ec0) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -886,50 +634,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x41b0b180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41b0b200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41b0b240) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41b0b380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41b0b2c0) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x41b0b3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41b0b440) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x41b0b480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41b0b5c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41b0b500) 0 Class QStringList size=4 align=4 @@ -937,30 +657,14 @@ Class QStringList QStringList (0x41b0b600) 0 QList (0x41b0b640) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x41b0b880) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x41b0b900) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x41b0bb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41b0bbc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41b0bc40) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1017,10 +721,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x41b0bc80) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41b0be40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1175,110 +875,30 @@ Class QUrl base size=4 base align=4 QUrl (0x41c26200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41c262c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c26300) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x41c26340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c263c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c26400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c26440) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c26480) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c264c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c26500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c26540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c26580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c265c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c26600) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c26640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c26680) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c266c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c26700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c26740) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c26780) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c267c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c26800) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1305,35 +925,15 @@ Class QVariant base size=12 base align=4 QVariant (0x41c26840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41c26e00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41c26d40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x41c26f80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x41c26ec0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x41c26fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d2a0c0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1365,80 +965,48 @@ Class QPoint base size=8 base align=4 QPoint (0x41d2a300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d2a740) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x41d2a800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d2ac40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x41d2ad40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d2ad80) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x41d2ae80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d2af00) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x41d2a180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d2a640) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x41d2a9c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41e2d180) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x41e2d380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41e2d580) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x41e2d680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41e2d800) 0 empty Class QLinkedListData size=20 align=4 @@ -1455,10 +1023,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x41e2de40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41e2dec0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1475,40 +1039,24 @@ Class QLocale base size=4 base align=4 QLocale (0x41e2d440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41e2d4c0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x42007080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42007200) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x42007240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x420073c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x42007400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42007540) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1668,10 +1216,6 @@ QEventLoop (0x42007cc0) 0 QObject (0x42007d00) 0 primary-for QEventLoop (0x42007cc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42007e40) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1763,20 +1307,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x42007d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4212e040) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x4212e080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4212e140) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1996,10 +1532,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x4212e740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4212e800) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2094,20 +1626,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x4212eb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4212ebc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x4212ec00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4212ec80) 0 empty Class QMetaProperty size=20 align=4 @@ -2119,10 +1643,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x4212ed00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4212ed80) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2245,25 +1765,9 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x4221c200) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x4221c340) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x4221c380) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x4221c3c0) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x4221c300) 0 Class QColor size=16 align=4 @@ -2280,55 +1784,23 @@ Class QPen base size=4 base align=4 QPen (0x4221c800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4221c940) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0x4221c980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4221c9c0) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x4221ca00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4221cbc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4221cb00) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0x4221cc40) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0x4221cc80) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0x4221ccc0) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0x4221cc00) 0 Class QGradient size=56 align=4 @@ -2358,25 +1830,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x4221ce80) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4221c780) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x4221c480) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x422e3080) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4221cf40) 0 Class QTextCharFormat size=8 align=4 @@ -2516,10 +1976,6 @@ QTextFrame (0x422e3740) 0 QObject (0x422e37c0) 0 primary-for QTextObject (0x422e3780) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x422e3a40) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -2544,25 +2000,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x422e3b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x422e3d40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x422e3d80) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x422e3dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x422e3ec0) 0 empty Class QFontMetrics size=4 align=4 @@ -2622,20 +2066,12 @@ QTextDocument (0x422e3840) 0 QObject (0x423e7000) 0 primary-for QTextDocument (0x422e3840) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x423e7140) 0 Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0x423e7180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x423e7200) 0 Class QTextTableCell size=8 align=4 @@ -2686,10 +2122,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x423e7880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x423e79c0) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2987,15 +2419,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0x424b6a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x424b6bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x424b6b00) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3294,15 +2718,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x425209c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42520c00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42520b40) 0 Class QTextLine size=8 align=4 @@ -3351,10 +2767,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x42520280) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x42520580) 0 Class QTextCursor size=4 align=4 @@ -3377,15 +2789,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x425cc240) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x425cc400) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x425cc340) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4238,10 +3642,6 @@ QFileDialog (0x42738640) 0 QPaintDevice (0x42738740) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x427388c0) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4327,10 +3727,6 @@ QAbstractPrintDialog (0x42738900) 0 QPaintDevice (0x42738a00) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42738b40) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -4766,10 +4162,6 @@ QImage (0x42818240) 0 QPaintDevice (0x42818280) 0 primary-for QImage (0x42818240) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42818380) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4876,10 +4268,6 @@ QImageIOPlugin (0x42818740) 0 QFactoryInterface (0x42818800) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x428187c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42818900) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -4999,10 +4387,6 @@ Class QIcon base size=4 base align=4 QIcon (0x42818f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42818100) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -5154,15 +4538,7 @@ Class QPrintEngine QPrintEngine (0x4292f540) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4292f740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4292f680) 0 Class QPolygon size=4 align=4 @@ -5170,15 +4546,7 @@ Class QPolygon QPolygon (0x4292f780) 0 QVector (0x4292f7c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4292fa40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4292f980) 0 Class QPolygonF size=4 align=4 @@ -5191,60 +4559,20 @@ Class QMatrix base size=48 base align=4 QMatrix (0x4292fc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4292fc80) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x4292fcc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4292fdc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4292ff40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4292fe80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4292f580) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4292f100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42a5b100) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42a5b040) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42a5b280) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42a5b1c0) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5292,15 +4620,7 @@ QStyle (0x42a5b2c0) 0 QObject (0x42a5b300) 0 primary-for QStyle (0x42a5b2c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42a5b440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42a5b4c0) 0 Class QStylePainter size=12 align=4 @@ -5318,25 +4638,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x42a5b680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42a5ba80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42a5b9c0) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x42a5b800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42a5bac0) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5348,15 +4656,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x42a5bb80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42a5bbc0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42a5bcc0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5391,30 +4691,18 @@ Class QPaintEngine QPaintEngine (0x42a5bc00) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42a5be40) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x42a5bd80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42a5bec0) 0 Class QItemSelectionRange size=8 align=4 base size=8 base align=4 QItemSelectionRange (0x42a5bf00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42a5b380) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5445,20 +4733,8 @@ QItemSelectionModel (0x42a5b780) 0 QObject (0x42a5bc40) 0 primary-for QItemSelectionModel (0x42a5b780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42bd4000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42bd4140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42bd4080) 0 Class QItemSelection size=4 align=4 @@ -5466,10 +4742,6 @@ Class QItemSelection QItemSelection (0x42bd4180) 0 QList (0x42bd41c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42bd4300) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -5757,10 +5029,6 @@ QAbstractSpinBox (0x42bd49c0) 0 QPaintDevice (0x42bd4a80) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42bd4b80) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6179,10 +5447,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x42cd7280) 0 QStyleOption (0x42cd72c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42cd7500) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6209,10 +5473,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x42cd7980) 0 QStyleOption (0x42cd79c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42cd7c00) 0 Class QStyleOptionButton size=64 align=4 @@ -6220,10 +5480,6 @@ Class QStyleOptionButton QStyleOptionButton (0x42cd7b00) 0 QStyleOption (0x42cd7b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42cd7e40) 0 Class QStyleOptionTab size=72 align=4 @@ -6238,10 +5494,6 @@ QStyleOptionTabV2 (0x42cd7f40) 0 QStyleOptionTab (0x42cd7f80) 0 QStyleOption (0x42cd7fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42cd7dc0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6268,10 +5520,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x42d8b280) 0 QStyleOption (0x42d8b2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42d8b4c0) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6329,15 +5577,7 @@ QStyleOptionSpinBox (0x42d8bf80) 0 QStyleOptionComplex (0x42d8bfc0) 0 QStyleOption (0x42d8b100) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42d8be00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42d8ba00) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6346,10 +5586,6 @@ QStyleOptionQ3ListView (0x42d8b500) 0 QStyleOptionComplex (0x42d8b640) 0 QStyleOption (0x42d8b780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42e0e200) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6544,10 +5780,6 @@ QAbstractItemView (0x42e0e9c0) 0 QPaintDevice (0x42e0eb00) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42e0ec40) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6730,15 +5962,7 @@ QListView (0x42e0ee00) 0 QPaintDevice (0x42e0ef80) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42e0e940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42e0e400) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7780,15 +7004,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x42fbe480) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x42fbe780) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x42fbe6c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7805,25 +7021,9 @@ Class QItemEditorFactory QItemEditorFactory (0x42fbe600) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x42fbea00) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x42fbe940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42fbeb80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42fbeac0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8050,15 +7250,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x42fbec00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x430b0000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x430b0080) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8906,15 +8098,7 @@ QActionGroup (0x4314db40) 0 QObject (0x4314db80) 0 primary-for QActionGroup (0x4314db40) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4314dd80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4314dcc0) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9055,10 +8239,6 @@ QCommonStyle (0x4314d300) 0 QObject (0x4314d680) 0 primary-for QStyle (0x4314d4c0) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x4314dfc0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10586,10 +9766,6 @@ QDateEdit (0x4332b1c0) 0 QPaintDevice (0x4332ba80) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4332bfc0) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10749,10 +9925,6 @@ QDockWidget (0x433dc1c0) 0 QPaintDevice (0x433dc280) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x433dc3c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12323,158 +11495,34 @@ QDial (0x434bb540) 0 QPaintDevice (0x434bbb80) 8 vptr=((& QDial::_ZTV5QDial) + 236u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4362c600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4362c980) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4366f040) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4366ff40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x436b5580) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x436b5740) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x436b5ec0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x436f4200) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x436f47c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x436f4900) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x436f4a40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x436f4b80) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0x436f4f40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x437bb0c0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x437bb200) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x437bb800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x437ffcc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x437fff40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4383d1c0) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x4383de00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4383df00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43879180) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43879440) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x43879580) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x43879700) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x438798c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43879a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43879c40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43879d00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43879500) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x438f02c0) 0 diff --git a/tests/auto/bic/data/QtGui.4.1.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtGui.4.1.0.linux-gcc-ppc32.txt index 850aab8c5..461c639b1 100644 --- a/tests/auto/bic/data/QtGui.4.1.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtGui.4.1.0.linux-gcc-ppc32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x3070f968) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3070fb60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3070fc08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3070fcb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3070fd58) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3070fe00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3070fea8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3070ff50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3073a000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3073a0a8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3073a150) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3073a1f8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3073a2a0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3073a348) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3073a3f0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3073a498) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x3073a508) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3073aa10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3073aa80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3073aaf0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3073ab60) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3073abd0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3073ac40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3073acb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3073ad20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3073ad90) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3073ae00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3073ae70) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3073aee0) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187bc0) 0 QGenericArgument (0x31432000) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x314321c0) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x314322a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31432348) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x3151c038) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3151c380) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x3151c930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3151cc78) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x30187e00) 0 QString (0x316c8700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316c87e0) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x316c8f18) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x317223b8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31722310) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x30187ec0) 0 QObject (0x31722888) 0 primary-for QIODevice (0x30187ec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31722a80) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x318540a8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31854118) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x318548f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31854fc0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x31854e70) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x319971f8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31997150) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x31997310) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x319973b8) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x31997498) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31997428) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x31997508) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x31997578) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x319976c8) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x319977a8) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x31997738) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x31997818) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x31997888) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x319978c0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31997af0) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x3195c0c0) 0 QTextStream (0x31997ea8) 0 primary-for QTextOStream (0x3195c0c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x31a382a0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x31a38310) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x31a38230) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31a38380) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31a383f0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x31a38460) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x31a384d0) 0 Class timespec size=8 align=4 @@ -701,70 +485,18 @@ Class timeval base size=8 base align=4 timeval (0x31a38540) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x31a385b0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x31a38620) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x31a38700) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x31a38690) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x31a38770) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x31a38850) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x31a387e0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x31a388c0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x31a389a0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x31a38930) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31a38a10) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x31a38a80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x31a38af0) 0 Class random_data size=28 align=4 @@ -835,10 +567,6 @@ QFile (0x3195c100) 0 QObject (0x31af20e0) 0 primary-for QIODevice (0x3195c140) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31af2268) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -891,50 +619,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x31af23b8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31af2460) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31af24d0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31af2658) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31af25b0) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x31af2700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31af28c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x31af2930) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31af2af0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31af2a48) 0 Class QStringList size=4 align=4 @@ -942,30 +642,14 @@ Class QStringList QStringList (0x3195c240) 0 QList (0x31af2b98) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x31af2fc0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x31af21c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x31bf52a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31bf53b8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31bf5428) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1022,10 +706,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x31bf5460) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31bf5690) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1180,110 +860,30 @@ Class QUrl base size=4 base align=4 QUrl (0x31bf5b60) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31bf5ce8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31bf5d58) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x31bf5dc8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31bf5ee0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31bf5f88) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31bf57a8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31bf5af0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd3070) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd3118) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd31c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd3268) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd3310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd33b8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd3460) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd3508) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd35b0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd3658) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd3700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd37a8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd3850) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cd38f8) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1310,35 +910,15 @@ Class QVariant base size=16 base align=8 QVariant (0x31cd3968) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31cd3f18) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31cd3e70) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x31d50000) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x31cd3b60) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x31d501c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d502d8) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1370,80 +950,48 @@ Class QPoint base size=8 base align=4 QPoint (0x31d50850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d50c40) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x31d50e38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d50968) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x31e10000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e10070) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x31e101c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e10268) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x31e103f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e10770) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x31e10a48) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e10dc8) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x31e106c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e10cb0) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x31eb91c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31eb9348) 0 empty Class QLinkedListData size=20 align=4 @@ -1460,10 +1008,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x31eb9d90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31eb9ea8) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1480,40 +1024,24 @@ Class QLocale base size=4 base align=4 QLocale (0x3200a118) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3200a188) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x3200a380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3200a540) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x3200a5b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3200a7a8) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x3200a818) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3200a968) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1673,10 +1201,6 @@ QEventLoop (0x3195c780) 0 QObject (0x321012a0) 0 primary-for QEventLoop (0x3195c780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32101428) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1768,20 +1292,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x32101d58) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32101ee0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x32101f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32101380) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2001,10 +1517,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x321a44d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321a45b0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2099,20 +1611,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x321a49d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321a4a80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x321a4af0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321a4b98) 0 empty Class QMetaProperty size=20 align=4 @@ -2124,10 +1628,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x321a4c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321a4ce8) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2250,25 +1750,9 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x3225f3f0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3225f620) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3225f690) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3225f700) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x3225f5b0) 0 Class QColor size=16 align=4 @@ -2285,55 +1769,23 @@ Class QPen base size=4 base align=4 QPen (0x3225fb60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3225fce8) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0x3225fd58) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3225fe00) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x3225fe70) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3225fa10) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3225ffc0) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x32305000) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x32305070) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x323050e0) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x3225fc40) 0 Class QGradient size=64 align=8 @@ -2363,25 +1815,13 @@ Class QTextLength base size=16 base align=8 QTextLength (0x323051c0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x323054d0) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x323053b8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32305818) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32305738) 0 Class QTextCharFormat size=8 align=4 @@ -2521,10 +1961,6 @@ QTextFrame (0x323cb000) 0 QObject (0x32305e38) 0 primary-for QTextObject (0x323cb040) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x323e3118) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -2549,25 +1985,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x323e32d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x323e3658) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x323e3700) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x323e3770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x323e3930) 0 empty Class QFontMetrics size=4 align=4 @@ -2627,20 +2051,12 @@ QTextDocument (0x323cb080) 0 QObject (0x323e3c08) 0 primary-for QTextDocument (0x323cb080) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x323e3dc8) 0 Class QTextOption size=32 align=8 base size=28 base align=8 QTextOption (0x323e3e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x323e3ee0) 0 Class QTextTableCell size=8 align=4 @@ -2691,10 +2107,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x324894d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32489620) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2992,15 +2404,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x325227e0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32522968) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x325228c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3299,15 +2703,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x32579c08) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32579ea8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32579dc8) 0 Class QTextLine size=8 align=4 @@ -3356,10 +2752,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x325e2000) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x325e2118) 0 Class QTextCursor size=4 align=4 @@ -3382,15 +2774,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x325e2690) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x325e2888) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x325e27a8) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -4243,10 +3627,6 @@ QFileDialog (0x3279a3c0) 0 QPaintDevice (0x327ca3f0) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x327ca620) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4332,10 +3712,6 @@ QAbstractPrintDialog (0x3279a4c0) 0 QPaintDevice (0x327ca7a8) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x327ca9a0) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -4771,10 +4147,6 @@ QImage (0x3279a980) 0 QPaintDevice (0x328911f8) 0 primary-for QImage (0x3279a980) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32891498) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4881,10 +4253,6 @@ QImageIOPlugin (0x3279aa40) 0 QFactoryInterface (0x32891a10) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x3279aa80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32891c08) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -5004,10 +4372,6 @@ Class QIcon base size=4 base align=4 QIcon (0x32981150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x329811c0) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -5159,15 +4523,7 @@ Class QPrintEngine QPrintEngine (0x32981d20) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32981070) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32981f18) 0 Class QPolygon size=4 align=4 @@ -5175,15 +4531,7 @@ Class QPolygon QPolygon (0x3279ae00) 0 QVector (0x32981428) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32a072a0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32a071c0) 0 Class QPolygonF size=4 align=4 @@ -5196,60 +4544,20 @@ Class QMatrix base size=48 base align=8 QMatrix (0x32a075b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32a07620) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x32a076c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32a07b98) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32a07d20) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32a07c40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32a07ee0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32a07e00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32ae7070) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32a07fc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32ae7230) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32ae7150) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5297,15 +4605,7 @@ QStyle (0x3279ae80) 0 QObject (0x32ae72a0) 0 primary-for QStyle (0x3279ae80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ae7460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ae74d0) 0 Class QStylePainter size=12 align=4 @@ -5323,25 +4623,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x32ae7738) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32ae7bd0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32ae7af0) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x32ae7930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32ae7c78) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5353,15 +4641,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x32ae7e70) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32ae7f18) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ae7888) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5396,30 +4676,18 @@ Class QPaintEngine QPaintEngine (0x32ae7f88) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32bfc1c0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x32bfc118) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32bfc230) 0 Class QItemSelectionRange size=8 align=4 base size=8 base align=4 QItemSelectionRange (0x32bfc268) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32bfc508) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5450,20 +4718,8 @@ QItemSelectionModel (0x3279af40) 0 QObject (0x32bfc5b0) 0 primary-for QItemSelectionModel (0x3279af40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32bfc738) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32bfc888) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32bfc7e0) 0 Class QItemSelection size=4 align=4 @@ -5471,10 +4727,6 @@ Class QItemSelection QItemSelection (0x3279af80) 0 QList (0x32bfc930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32bfcab8) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -5762,10 +5014,6 @@ QAbstractSpinBox (0x32cac240) 0 QPaintDevice (0x32cda150) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32cda380) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6184,10 +5432,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x32cac600) 0 QStyleOption (0x32cdaea8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32cda9d8) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6214,10 +5458,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x32cac740) 0 QStyleOption (0x32dbf460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32dbf738) 0 Class QStyleOptionButton size=64 align=4 @@ -6225,10 +5465,6 @@ Class QStyleOptionButton QStyleOptionButton (0x32cac7c0) 0 QStyleOption (0x32dbf5e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32dbf9a0) 0 Class QStyleOptionTab size=72 align=4 @@ -6243,10 +5479,6 @@ QStyleOptionTabV2 (0x32cac880) 0 QStyleOptionTab (0x32cac8c0) 0 QStyleOption (0x32dbfab8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32dbfe38) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6273,10 +5505,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x32caca00) 0 QStyleOption (0x32dbfdc8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32e40268) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6334,15 +5562,7 @@ QStyleOptionSpinBox (0x32cacc80) 0 QStyleOptionComplex (0x32caccc0) 0 QStyleOption (0x32e40f18) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32e40fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32e40bd0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6351,10 +5571,6 @@ QStyleOptionQ3ListView (0x32cacd00) 0 QStyleOptionComplex (0x32cacd40) 0 QStyleOption (0x32e40428) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32eab2a0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6549,10 +5765,6 @@ QAbstractItemView (0x32ef8040) 0 QPaintDevice (0x32eabb60) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32eabd58) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6735,15 +5947,7 @@ QListView (0x32ef8240) 0 QPaintDevice (0x32eabee0) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32f67000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32eabab8) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7785,15 +6989,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x330744d0) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x330748c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x330747a8) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7810,25 +7006,9 @@ Class QItemEditorFactory QItemEditorFactory (0x330746c8) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x33074d20) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x33074c40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x33074ea8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x33074e00) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8055,15 +7235,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x3314a5e8) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3314a6c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3314a738) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8911,15 +8083,7 @@ QActionGroup (0x3315b980) 0 QObject (0x33251b98) 0 primary-for QActionGroup (0x3315b980) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x33251dc8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x33251d20) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9060,10 +8224,6 @@ QCommonStyle (0x3315ba80) 0 QObject (0x332ff038) 0 primary-for QStyle (0x3315bac0) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x332ff230) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10591,10 +9751,6 @@ QDateEdit (0x33354a40) 0 QPaintDevice (0x334892d8) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33489498) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10754,10 +9910,6 @@ QDockWidget (0x33354c00) 0 QPaintDevice (0x334896c8) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33489930) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12328,158 +11480,34 @@ QDial (0x33569900) 0 QPaintDevice (0x3364c9d8) 8 vptr=((& QDial::_ZTV5QDial) + 236u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33708c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33724380) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33744188) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x33772d90) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x3378ca48) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x3378cce8) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x337acd90) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x337ca3b8) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x337caf18) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x337f70a8) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x337f7230) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x337f73b8) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x337f7b28) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33888268) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x33888460) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x338ac118) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x338e7b98) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x338e7f88) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33908380) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x339278c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33927a48) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33927f18) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3394e380) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x3394e578) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x3394eaf0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x3398b000) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3398b620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3398b8c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3398b968) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3398be38) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x339ba460) 0 diff --git a/tests/auto/bic/data/QtGui.4.1.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtGui.4.1.0.macx-gcc-ia32.txt index a7b7870f6..e85b020e8 100644 --- a/tests/auto/bic/data/QtGui.4.1.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtGui.4.1.0.macx-gcc-ia32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x6952c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x695500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6955c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x695680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x695740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x695800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6958c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x695980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x695a40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x695b00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x695bc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x695c80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x695d40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x695e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x695ec0) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x6ca1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6ca2c0) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0x6ca9c0) 0 QBasicAtomic (0x6caa00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x6cac80) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0x16af940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16afd00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b21c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b2240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b22c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b2340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b23c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b2440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b24c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b2540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b25c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b2640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b26c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b2740) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x17b2e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19182c0) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x1918ec0) 0 QString (0x1918f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a0f000) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x1a0f8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a0ff00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x1a0fd80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1b210c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1b21000) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1b21300) 0 QGenericArgument (0x1b21340) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1b21600) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1b21580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1b21880) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1b217c0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x1b21ec0) 0 QObject (0x1b21f00) 0 primary-for QIODevice (0x1b21ec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1bee080) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1bee740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bee940) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1bee9c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1beebc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1beeb00) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x1beec80) 0 QList (0x1beecc0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1c8f140) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1c8f1c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x1c8f5c0) 0 QObject (0x1c8fac0) 0 primary-for QIODevice (0x1c8f880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d28140) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1d28180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d28240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d282c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1d28480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d283c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1d28540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d28680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d28700) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1d28740) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d28a00) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1d28f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d28f80) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x1f4f240) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f4f500) 0 Class QTextStreamManipulator size=24 align=4 @@ -1041,35 +829,15 @@ Class rlimit base size=16 base align=4 rlimit (0x1f4fb40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1fef780) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1fef800) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x1fef700) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1fef880) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1fef900) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x1fef980) 0 Class QVectorData size=16 align=4 @@ -1182,95 +950,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x20dc400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dc540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dc600) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dc6c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dc780) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dc840) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dc900) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dc9c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dca80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dcb40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dcc00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dccc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dcd80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dce40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dcf00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dcfc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x20dc380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x212d080) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x212d140) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1297,50 +993,18 @@ Class QVariant base size=12 base align=4 QVariant (0x212d1c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x212d840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x212d780) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x212da40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x212d980) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x212dcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x212de00) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x212dec0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x212df40) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x212dfc0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1418,15 +1082,7 @@ Class QUrl base size=4 base align=4 QUrl (0x21ee680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21ee840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21ee8c0) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1453,10 +1109,6 @@ QEventLoop (0x21ee940) 0 QObject (0x21ee980) 0 primary-for QEventLoop (0x21ee940) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21eeb80) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1501,20 +1153,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x21eedc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21eef80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x21ee100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21eed40) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1684,10 +1328,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x22d06c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22d07c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1779,20 +1419,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x2365100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23651c0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x2365240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2365300) 0 empty Class QMetaProperty size=20 align=4 @@ -1804,10 +1436,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x23653c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2365480) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2095,10 +1723,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x23efdc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23eff00) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2110,70 +1734,42 @@ Class QDate base size=4 base align=4 QDate (0x24950c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24952c0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x2495340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2495580) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x2495600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2495780) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x2495800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2495c80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x2495f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2495940) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x2549140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25491c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x2549340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2549400) 0 empty Class QLinkedListData size=20 align=4 @@ -2185,50 +1781,30 @@ Class QLocale base size=4 base align=4 QLocale (0x25499c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2549a40) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x2549b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2549f80) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x267a140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x267a540) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x267a9c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x267ab80) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x267ae00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x267afc0) 0 empty Class QSharedData size=4 align=4 @@ -2250,10 +1826,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x278e6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x278e840) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2572,15 +2144,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0x28b22c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x28b2480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x28b23c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2869,15 +2433,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2909e00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2909f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2909fc0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3161,25 +2717,9 @@ Class QPaintDevice QPaintDevice (0x296bc80) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x29af2c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x29af340) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x29af3c0) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x29af240) 0 Class QColor size=16 align=4 @@ -3191,45 +2731,17 @@ Class QBrush base size=4 base align=4 QBrush (0x29af680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x29af740) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x29af7c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x29afa40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x29af940) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0x29afb80) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0x29afc00) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0x29afc80) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0x29afb00) 0 Class QGradient size=56 align=4 @@ -3625,10 +3137,6 @@ QAbstractPrintDialog (0x2b7b740) 0 QPaintDevice (0x2b7b800) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b7ba80) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -3879,10 +3387,6 @@ QFileDialog (0x2b7bfc0) 0 QPaintDevice (0x2b7b940) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c3f200) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4577,10 +4081,6 @@ QImage (0x2d097c0) 0 QPaintDevice (0x2d09800) 0 primary-for QImage (0x2d097c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d09b00) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4625,10 +4125,6 @@ Class QIcon base size=4 base align=4 QIcon (0x2dc71c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2dc7280) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4784,10 +4280,6 @@ QImageIOPlugin (0x2e09e80) 0 QFactoryInterface (0x2dc7cc0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x2dc7c80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2dc7f00) 0 Class QImageReader size=4 align=4 @@ -4963,15 +4455,7 @@ QActionGroup (0x2e5a980) 0 QObject (0x2e5a9c0) 0 primary-for QActionGroup (0x2e5a980) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2e5ac40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2e5ab80) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -5276,10 +4760,6 @@ QAbstractSpinBox (0x2ee4740) 0 QPaintDevice (0x2ee47c0) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2ee4a40) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5487,15 +4967,7 @@ QStyle (0x2ee4f40) 0 QObject (0x2ee4f80) 0 primary-for QStyle (0x2ee4f40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2ee4e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2fb9040) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -5754,10 +5226,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x2fb9a40) 0 QStyleOption (0x2fb9a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2fb9e00) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -5784,10 +5252,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x3062300) 0 QStyleOption (0x3062340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3062700) 0 Class QStyleOptionButton size=64 align=4 @@ -5795,10 +5259,6 @@ Class QStyleOptionButton QStyleOptionButton (0x3062540) 0 QStyleOption (0x3062580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3062a40) 0 Class QStyleOptionTab size=72 align=4 @@ -5813,10 +5273,6 @@ QStyleOptionTabV2 (0x3062b80) 0 QStyleOptionTab (0x3062bc0) 0 QStyleOption (0x3062c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3062200) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5843,10 +5299,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x30db2c0) 0 QStyleOption (0x30db300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30db680) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5904,15 +5356,7 @@ QStyleOptionSpinBox (0x31394c0) 0 QStyleOptionComplex (0x3139500) 0 QStyleOption (0x3139540) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31399c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3139900) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5921,10 +5365,6 @@ QStyleOptionQ3ListView (0x3139700) 0 QStyleOptionComplex (0x3139740) 0 QStyleOption (0x3139780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3139dc0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6084,10 +5524,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x31a09c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31a0cc0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6118,20 +5554,8 @@ QItemSelectionModel (0x31a0d80) 0 QObject (0x31a0dc0) 0 primary-for QItemSelectionModel (0x31a0d80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31a0f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31a0ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31a0300) 0 Class QItemSelection size=4 align=4 @@ -6261,10 +5685,6 @@ QAbstractItemView (0x3249180) 0 QPaintDevice (0x3249280) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3249500) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -6576,15 +5996,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3249f80) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x32f7280) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x32f7140) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -6725,15 +6137,7 @@ QListView (0x32f7500) 0 QPaintDevice (0x32f7640) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32f7a80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32f7980) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7522,35 +6926,15 @@ QTreeView (0x338e780) 0 QPaintDevice (0x349a080) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x349a340) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x349a240) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x349a800) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x349a700) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x349a9c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x349a900) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8397,15 +7781,7 @@ Class QColormap base size=4 base align=4 QColormap (0x3679480) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3679680) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3679580) 0 Class QPolygon size=4 align=4 @@ -8413,15 +7789,7 @@ Class QPolygon QPolygon (0x3679700) 0 QVector (0x3679740) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3679b80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3679a80) 0 Class QPolygonF size=4 align=4 @@ -8434,95 +7802,39 @@ Class QMatrix base size=48 base align=4 QMatrix (0x3679f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3679fc0) 0 empty Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0x3718000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3718100) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0x3718140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3718300) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x3718380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3718900) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3718ac0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x37189c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3718cc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3718bc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3718ec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3718dc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3809000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3718fc0) 0 Class QTextItem size=1 align=1 base size=0 base align=1 QTextItem (0x3809080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3809140) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3809300) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -8557,20 +7869,12 @@ Class QPaintEngine QPaintEngine (0x38091c0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3809540) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x3809480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x38095c0) 0 Class QPainterPath::Element size=20 align=4 @@ -8582,25 +7886,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x3809600) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3809b40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3809a40) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x3809840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3809c00) 0 empty Class QPainterPathStroker size=4 align=4 @@ -8698,10 +7990,6 @@ QCommonStyle (0x3945340) 0 QObject (0x39453c0) 0 primary-for QStyle (0x3945380) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x39456c0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -9023,25 +8311,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x39b63c0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x39b6740) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x39b6600) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x39b6b00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39b6a00) 0 Class QTextCharFormat size=8 align=4 @@ -9096,15 +8372,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x39b6400) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3aa8180) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3aa8080) 0 Class QTextLine size=8 align=4 @@ -9154,15 +8422,7 @@ QTextDocument (0x3aa8480) 0 QObject (0x3aa84c0) 0 primary-for QTextDocument (0x3aa8480) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3aa8700) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3aa8840) 0 Class QTextCursor size=4 align=4 @@ -9174,15 +8434,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x3aa8980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3aa8bc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3aa8ac0) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -9344,10 +8596,6 @@ QTextFrame (0x3b5c380) 0 QObject (0x3b5c400) 0 primary-for QTextObject (0x3b5c3c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3b5c940) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -9372,25 +8620,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x3b5cb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3b5cf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3b5c540) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x3bb5080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3bb5280) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -10023,10 +9259,6 @@ QDateEdit (0x3c36d80) 0 QPaintDevice (0x3c36e80) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3c36580) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -10187,10 +9419,6 @@ QDockWidget (0x3cda1c0) 0 QPaintDevice (0x3cda240) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3cda500) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12332,158 +11560,34 @@ QWorkspace (0x3fe2140) 0 QPaintDevice (0x3fe21c0) 8 vptr=((& QWorkspace::_ZTV10QWorkspace) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x405a740) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x407b5c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40d3640) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41b3900) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x41b3b40) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x41b3e00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x41d5500) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4209840) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4209a00) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4209bc0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4209d80) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0x4224d40) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4242000) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4242300) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4242980) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x42665c0) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x42d1940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42d1c00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42fdac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42fde40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x431c2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x431c7c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x431cb00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x431cd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x433e0c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x433e180) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x433e540) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x433e9c0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x4373000) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x4373700) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x43b3080) 0 diff --git a/tests/auto/bic/data/QtGui.4.1.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtGui.4.1.0.macx-gcc-ppc32.txt index 309680e7f..ef64846a9 100644 --- a/tests/auto/bic/data/QtGui.4.1.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtGui.4.1.0.macx-gcc-ppc32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x820d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x820f80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84b040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84b100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84b1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84b280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84b340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84b400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84b4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84b580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84b640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84b700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84b7c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84b880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84b940) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x84bc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84bd40) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0x1707140) 0 QBasicAtomic (0x1707180) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x1707400) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0x17d50c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17d5480) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d5940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d59c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d5a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d5ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d5b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d5bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d5c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d5cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d5d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d5dc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d5e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d5ec0) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x1947600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1947a40) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x1b15640) 0 QString (0x1b15680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b15780) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x1b15c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b77580) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x1b77400) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1b778c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1b77800) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1b77b00) 0 QGenericArgument (0x1b77b40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1b77e00) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1b77d80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1b77680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1b77fc0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x1cda600) 0 QObject (0x1cda640) 0 primary-for QIODevice (0x1cda600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1cda880) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1cdaf40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dc5040) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1dc50c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1dc52c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1dc5200) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x1dc5380) 0 QList (0x1dc53c0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1dc5880) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1dc5900) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x1e4cb40) 0 QObject (0x1e4cbc0) 0 primary-for QIODevice (0x1e4cb80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e4cd80) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1e4cdc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e4ce80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e4cf00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1f0f000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1e4c180) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1f0f0c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f0f200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f0f280) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1f0f2c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f0f580) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1f0fa80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f0fb00) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x1fe2a80) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1fe2d40) 0 Class QTextStreamManipulator size=24 align=4 @@ -1051,35 +839,15 @@ Class rlimit base size=16 base align=8 rlimit (0x21afa40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x21afb00) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x21afb80) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x21afa80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x21afc00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x21afc80) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x21afd00) 0 Class QVectorData size=16 align=4 @@ -1192,95 +960,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x2270740) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2270880) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2270940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2270a00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2270ac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2270b80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2270c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2270d00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2270dc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2270e80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2270f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2270340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2323000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x23230c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2323180) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2323240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2323300) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x23233c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2323480) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1307,50 +1003,18 @@ Class QVariant base size=16 base align=4 QVariant (0x2323500) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2323b80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2323ac0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x2323d80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x2323cc0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x23236c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2323ec0) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x23f3080) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x23f3100) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x23f3180) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1428,15 +1092,7 @@ Class QUrl base size=4 base align=4 QUrl (0x23f39c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x23f3b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23f3c00) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1463,10 +1119,6 @@ QEventLoop (0x23f3c80) 0 QObject (0x23f3cc0) 0 primary-for QEventLoop (0x23f3c80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x23f3ec0) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1511,20 +1163,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x23f3e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2501180) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x2501200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2501340) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1694,10 +1338,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2501a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2501b40) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1789,20 +1429,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x25ad500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25ad5c0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x25ad640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25ad700) 0 empty Class QMetaProperty size=20 align=4 @@ -1814,10 +1446,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x25ad7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25ad880) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2105,10 +1733,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x26fe100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26fe240) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2120,70 +1744,42 @@ Class QDate base size=4 base align=4 QDate (0x26fe440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26fe640) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x26fe6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26fe900) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x26fe980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26feb00) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x26feb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26fe480) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x26fee40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27b8340) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x27b8640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27b86c0) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x27b8840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27b8900) 0 empty Class QLinkedListData size=20 align=4 @@ -2195,50 +1791,30 @@ Class QLocale base size=4 base align=4 QLocale (0x27b8ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27b8f40) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x27b8100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x29151c0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x2915580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2915980) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x2915e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2915fc0) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x29158c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a10080) 0 empty Class QSharedData size=4 align=4 @@ -2260,10 +1836,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x2a10a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a10bc0) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2582,15 +2154,7 @@ Class QInputMethodEvent::Attribute base size=28 base align=4 QInputMethodEvent::Attribute (0x2bb1740) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2bb1900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2bb1840) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2879,15 +2443,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2c12bc0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c55080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c55100) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3171,25 +2727,9 @@ Class QPaintDevice QPaintDevice (0x2cc03c0) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2cc0700) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2cc0780) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2cc0800) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2cc0680) 0 Class QColor size=16 align=4 @@ -3201,45 +2741,17 @@ Class QBrush base size=4 base align=4 QBrush (0x2cc0ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2cc0b80) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x2cc0c00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2cc0e80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2cc0d80) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2cc0fc0) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2cc0340) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2cc0840) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2cc0f40) 0 Class QGradient size=56 align=4 @@ -3635,10 +3147,6 @@ QAbstractPrintDialog (0x2e97c40) 0 QPaintDevice (0x2e97d00) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e97f80) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -3889,10 +3397,6 @@ QFileDialog (0x2fbb280) 0 QPaintDevice (0x2fbb340) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2fbb600) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4587,10 +4091,6 @@ QImage (0x3093c00) 0 QPaintDevice (0x3093c40) 0 primary-for QImage (0x3093c00) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3093f40) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4635,10 +4135,6 @@ Class QIcon base size=4 base align=4 QIcon (0x3180640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3180700) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4794,10 +4290,6 @@ QImageIOPlugin (0x31fc200) 0 QFactoryInterface (0x3180c40) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x3180a00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3205180) 0 Class QImageReader size=4 align=4 @@ -4973,15 +4465,7 @@ QActionGroup (0x3205dc0) 0 QObject (0x3205e00) 0 primary-for QActionGroup (0x3205dc0) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3205440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3205fc0) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -5286,10 +4770,6 @@ QAbstractSpinBox (0x32e9bc0) 0 QPaintDevice (0x32e9c40) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32e9ec0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5497,15 +4977,7 @@ QStyle (0x339e180) 0 QObject (0x339e1c0) 0 primary-for QStyle (0x339e180) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x339e400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x339e480) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -5764,10 +5236,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x339ee80) 0 QStyleOption (0x339eec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x349c080) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -5794,10 +5262,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x349c700) 0 QStyleOption (0x349c740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x349cb00) 0 Class QStyleOptionButton size=64 align=4 @@ -5805,10 +5269,6 @@ Class QStyleOptionButton QStyleOptionButton (0x349c940) 0 QStyleOption (0x349c980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x349ce40) 0 Class QStyleOptionTab size=72 align=4 @@ -5823,10 +5283,6 @@ QStyleOptionTabV2 (0x349cf80) 0 QStyleOptionTab (0x349cfc0) 0 QStyleOption (0x349c000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3545240) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5853,10 +5309,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x3545700) 0 QStyleOption (0x3545740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3545ac0) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5914,15 +5366,7 @@ QStyleOptionSpinBox (0x35bc900) 0 QStyleOptionComplex (0x35bc940) 0 QStyleOption (0x35bc980) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x35bce00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x35bcd40) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5931,10 +5375,6 @@ QStyleOptionQ3ListView (0x35bcb40) 0 QStyleOptionComplex (0x35bcb80) 0 QStyleOption (0x35bcbc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x35bcf00) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6094,10 +5534,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x3621e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3621b00) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6128,20 +5564,8 @@ QItemSelectionModel (0x36c1040) 0 QObject (0x36c1080) 0 primary-for QItemSelectionModel (0x36c1040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36c1240) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x36c13c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x36c1300) 0 Class QItemSelection size=4 align=4 @@ -6271,10 +5695,6 @@ QAbstractItemView (0x36c1580) 0 QPaintDevice (0x36c1680) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36c1900) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -6586,15 +6006,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x37b8200) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x37b86c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x37b8580) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -6735,15 +6147,7 @@ QListView (0x37b8940) 0 QPaintDevice (0x37b8a80) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x37b8ec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x37b8dc0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7532,35 +6936,15 @@ QTreeView (0x395a340) 0 QPaintDevice (0x395a480) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x395a740) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x395a640) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x395ac00) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x395ab00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x395adc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x395ad00) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8407,15 +7791,7 @@ Class QColormap base size=4 base align=4 QColormap (0x3ba9900) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3ba9b00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3ba9a00) 0 Class QPolygon size=4 align=4 @@ -8423,15 +7799,7 @@ Class QPolygon QPolygon (0x3ba9b80) 0 QVector (0x3ba9bc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3ba9000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3ba9f00) 0 Class QPolygonF size=4 align=4 @@ -8444,95 +7812,39 @@ Class QMatrix base size=48 base align=4 QMatrix (0x3c5a280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3c5a300) 0 empty Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0x3c5a3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3c5a4c0) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0x3c5a540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3c5a700) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x3c5a780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3c5ad00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3c5aec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3c5adc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3d69000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3c5afc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3d69200) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3d69100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3d69400) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3d69300) 0 Class QTextItem size=1 align=1 base size=0 base align=1 QTextItem (0x3d69480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3d69540) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3d69700) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -8567,20 +7879,12 @@ Class QPaintEngine QPaintEngine (0x3d695c0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3d699c0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x3d69900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3d69a40) 0 Class QPainterPath::Element size=24 align=8 @@ -8592,25 +7896,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x3d69a80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3d69fc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3d69ec0) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x3d69cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3d69940) 0 empty Class QPainterPathStroker size=4 align=4 @@ -8708,10 +8000,6 @@ QCommonStyle (0x3ec7840) 0 QObject (0x3ec78c0) 0 primary-for QStyle (0x3ec7880) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x3ec7bc0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -9033,25 +8321,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x3f7d8c0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3f7dc40) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x3f7db00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3f7d180) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3f7df00) 0 Class QTextCharFormat size=8 align=4 @@ -9106,15 +8382,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x405a340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x405a640) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x405a540) 0 Class QTextLine size=8 align=4 @@ -9164,15 +8432,7 @@ QTextDocument (0x405a940) 0 QObject (0x405a980) 0 primary-for QTextDocument (0x405a940) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x405abc0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x405ad00) 0 Class QTextCursor size=4 align=4 @@ -9184,15 +8444,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x405ae40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x405ab00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x405af80) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -9354,10 +8606,6 @@ QTextFrame (0x41578c0) 0 QObject (0x4157940) 0 primary-for QTextObject (0x4157900) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4157e80) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -9382,25 +8630,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x41576c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41cd380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41cd440) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x41cd500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41cd700) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -10033,10 +9269,6 @@ QDateEdit (0x431c100) 0 QPaintDevice (0x431c200) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x431c400) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -10197,10 +9429,6 @@ QDockWidget (0x431c6c0) 0 QPaintDevice (0x431c740) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x431ca00) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12342,158 +11570,34 @@ QWorkspace (0x469c640) 0 QPaintDevice (0x469c6c0) 8 vptr=((& QWorkspace::_ZTV10QWorkspace) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x475fbc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4780a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x47daac0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x48bbd80) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x48bbfc0) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x48df280) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x48df980) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4919cc0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4919e80) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4933040) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4933200) 0 -Class QVectorTypedData - size=40 align=4 - base size=40 base align=4 -QVectorTypedData (0x49541c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4954480) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4954780) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4954e00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4978a40) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x49e2dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4a11040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4a11cc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4a11f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4a30380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4a30880) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4a30bc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4a30e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4a55180) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4a55240) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4a55600) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x4a55940) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x4a55980) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x4a98640) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x4a98680) 0 diff --git a/tests/auto/bic/data/QtGui.4.1.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtGui.4.1.0.win32-gcc-ia32.txt index 134744865..2d1529875 100644 --- a/tests/auto/bic/data/QtGui.4.1.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtGui.4.1.0.win32-gcc-ia32.txt @@ -18,80 +18,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xad5e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebc80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebe00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07b80) 0 empty Class QFlag size=4 align=4 @@ -108,10 +48,6 @@ Class QChar base size=2 base align=2 QChar (0xb4d840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb70cc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -139,70 +75,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc34f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd4bc40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd78100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd783c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd73c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd78a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd949c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8c80) 0 Class QInternal size=1 align=1 @@ -229,10 +113,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xeac500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeac940) 0 Class QCharRef size=8 align=4 @@ -245,10 +125,6 @@ Class QConstString QConstString (0x11e1880) 0 QString (0x11e18c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11e1c00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -311,10 +187,6 @@ Class QListData base size=4 base align=4 QListData (0x1279f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x137ce40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -339,15 +211,7 @@ Class QTextCodec QTextCodec (0xeac480) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13c0140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc3da40) 0 Class QTextEncoder size=32 align=4 @@ -370,25 +234,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x13fefc0) 0 QGenericArgument (0x1404000) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1418700) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1404580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1432f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1432b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -480,10 +332,6 @@ QIODevice (0x137c700) 0 QObject (0x14bb540) 0 primary-for QIODevice (0x137c700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14bb840) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -503,25 +351,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xeac380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15884c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1588840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1588d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1588c40) 0 Class QStringList size=4 align=4 @@ -529,15 +365,7 @@ Class QStringList QStringList (0xeac400) 0 QList (0x15b6000) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1588ec0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1588e80) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -666,50 +494,22 @@ QFile (0x169c840) 0 QObject (0x169c8c0) 0 primary-for QIODevice (0x169c880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16ab100) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x16d25c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16d2f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1700e40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x172a300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x172a200) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x16d2440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1758040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x172ac00) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -766,10 +566,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x169c740) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d7340) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -843,10 +639,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x182cc40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x182cd40) 0 empty Class QMapData::Node size=8 align=4 @@ -871,10 +663,6 @@ Class QTextStream QTextStream (0x1a78240) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a78600) 0 Class QTextStreamManipulator size=24 align=4 @@ -911,20 +699,8 @@ QTextOStream (0x1b06440) 0 QTextStream (0x1b06480) 0 primary-for QTextOStream (0x1b06440) -Class - size=8 align=4 - base size=8 base align=4 - (0x1b33680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b33800) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1b525c0) 0 Class QVectorData size=16 align=4 @@ -1037,95 +813,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1ce0bc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1cfad40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1cfaec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d13040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d131c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d13340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d134c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d13640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d137c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d13940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d13ac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d13c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d13dc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d13f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d310c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d31240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d313c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d31540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d316c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1152,35 +856,15 @@ Class QVariant base size=16 base align=8 QVariant (0x14328c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1dce540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d43dc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1dce840) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1d43e40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1d43000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e35280) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1258,15 +942,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1d31f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ed0440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1efff80) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1293,10 +969,6 @@ QEventLoop (0x1f2c600) 0 QObject (0x1f2c640) 0 primary-for QEventLoop (0x1f2c600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f2c940) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1341,20 +1013,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1f64f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f97b40) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1f64ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f97e80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1524,10 +1188,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2003d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20463c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1620,20 +1280,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x13fe8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20b7900) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x13fe940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20b7f00) 0 empty Class QMetaProperty size=20 align=4 @@ -1645,10 +1297,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x13fea40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20e4640) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1941,10 +1589,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2231640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2290040) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1956,70 +1600,42 @@ Class QDate base size=4 base align=4 QDate (0x1d31900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22d1900) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1d31b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22f4540) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x16d24c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x231d300) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1d31b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x231df40) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1d31c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x236d180) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1d31980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x238e600) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1d31a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23b8b00) 0 empty Class QLinkedListData size=20 align=4 @@ -2031,50 +1647,30 @@ Class QLocale base size=4 base align=4 QLocale (0x1d31a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x250b300) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1d31c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2539480) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1d31d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x255e9c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1d31d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25cc440) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1d31e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x264b680) 0 empty Class QSharedData size=4 align=4 @@ -2096,10 +1692,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x1dbbc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x276cc00) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2416,15 +2008,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x28a73c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x28a78c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x28a74c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2713,15 +2297,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x294ae00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2958e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x29673c0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3007,25 +2583,9 @@ Class QPaintDevice QPaintDevice (0x271edc0) 0 vptr=((&QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a7d540) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a7d680) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a7d780) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2a7d4c0) 0 Class QColor size=16 align=4 @@ -3037,45 +2597,17 @@ Class QBrush base size=4 base align=4 QBrush (0x1d9cd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2ad6300) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x2aa9b00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2aeb000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2ad68c0) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2aeb280) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2aeb380) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2aeb5c0) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2aeb200) 0 Class QGradient size=64 align=8 @@ -3487,10 +3019,6 @@ QAbstractPrintDialog (0x2e1a680) 0 QPaintDevice (0x2e1a780) 8 vptr=((&QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e1aa40) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 70u entries @@ -3753,10 +3281,6 @@ QFileDialog (0x2e8ab40) 0 QPaintDevice (0x2e8ac40) 8 vptr=((&QFileDialog::_ZTV11QFileDialog) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2eaf600) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 70u entries @@ -4485,10 +4009,6 @@ QImage (0x1dbb400) 0 QPaintDevice (0x309a900) 0 primary-for QImage (0x1dbb400) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3137b00) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 9u entries @@ -4537,10 +4057,6 @@ Class QIcon base size=4 base align=4 QIcon (0x1dbb200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e3bc0) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4696,10 +4212,6 @@ QImageIOPlugin (0x321e600) 0 QFactoryInterface (0x321e6c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x321e680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x321e880) 0 Class QImageReader size=4 align=4 @@ -4877,15 +4389,7 @@ QActionGroup (0x32c7780) 0 QObject (0x3308600) 0 primary-for QActionGroup (0x32c7780) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3308fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2ca7940) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -5194,10 +4698,6 @@ QAbstractSpinBox (0x3392ac0) 0 QPaintDevice (0x3392b80) 8 vptr=((&QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3392f00) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 68u entries @@ -5413,15 +4913,7 @@ QStyle (0x2c72700) 0 QObject (0x345b700) 0 primary-for QStyle (0x2c72700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x346f040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3485100) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 71u entries @@ -5692,10 +5184,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x35b7500) 0 QStyleOption (0x35b7540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x35b7ac0) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -5722,10 +5210,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x35d9ec0) 0 QStyleOption (0x35d9f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3621ac0) 0 Class QStyleOptionButton size=64 align=4 @@ -5733,10 +5217,6 @@ Class QStyleOptionButton QStyleOptionButton (0x36218c0) 0 QStyleOption (0x3621900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x365d480) 0 Class QStyleOptionTab size=72 align=4 @@ -5751,10 +5231,6 @@ QStyleOptionTabV2 (0x365dbc0) 0 QStyleOptionTab (0x365dc00) 0 QStyleOption (0x365dc40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36b3440) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5781,10 +5257,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x37002c0) 0 QStyleOption (0x3700300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3700e00) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5842,15 +5314,7 @@ QStyleOptionSpinBox (0x3795a00) 0 QStyleOptionComplex (0x3795a40) 0 QStyleOption (0x3795a80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x37b6200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x37b6100) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5859,10 +5323,6 @@ QStyleOptionQ3ListView (0x3795f80) 0 QStyleOptionComplex (0x3795fc0) 0 QStyleOption (0x37b6000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37b6d40) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6026,10 +5486,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x38abd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x39120c0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6060,20 +5516,8 @@ QItemSelectionModel (0x39124c0) 0 QObject (0x3912500) 0 primary-for QItemSelectionModel (0x39124c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3912840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x393c3c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x393c2c0) 0 Class QItemSelection size=4 align=4 @@ -6207,10 +5651,6 @@ QAbstractItemView (0x393ca40) 0 QPaintDevice (0x393cb80) 8 vptr=((&QAbstractItemView::_ZTV17QAbstractItemView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x39955c0) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -6526,15 +5966,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3a82a80) 0 nearly-empty vptr=((&QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3aa5580) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x3aa5380) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -6679,15 +6111,7 @@ QListView (0x3aa5d40) 0 QPaintDevice (0x3aa5ec0) 8 vptr=((&QListView::_ZTV9QListView) + 400u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3afa300) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3afa180) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7492,35 +6916,15 @@ QTreeView (0x3cbf500) 0 QPaintDevice (0x3cbf680) 8 vptr=((&QTreeView::_ZTV9QTreeView) + 408u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3cfc680) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x3cfc240) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x3d49440) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x3d492c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3d49640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3d49100) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8375,15 +7779,7 @@ Class QColormap base size=4 base align=4 QColormap (0x2a653c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3ff2a00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3ff2880) 0 Class QPolygon size=4 align=4 @@ -8391,15 +7787,7 @@ Class QPolygon QPolygon (0x1dbb500) 0 QVector (0x3ff2b80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4027e00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4027cc0) 0 Class QPolygonF size=4 align=4 @@ -8412,95 +7800,39 @@ Class QMatrix base size=48 base align=8 QMatrix (0x236d140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4082bc0) 0 empty Class QTextOption size=32 align=8 base size=28 base align=8 QTextOption (0x40a5a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40a5e40) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0x1dbbd00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x410e440) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x271eec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x410e980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x41db340) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x412c580) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x41db6c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x412c640) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x421e380) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x412c780) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x421e700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x274a3c0) 0 Class QTextItem size=1 align=1 base size=0 base align=1 QTextItem (0x410e7c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42bc9c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42bcf40) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 26u entries @@ -8537,20 +7869,12 @@ Class QPaintEngine QPaintEngine (0x2a35280) 0 vptr=((&QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42d1380) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x42bc700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42bc8c0) 0 Class QPainterPath::Element size=24 align=8 @@ -8562,25 +7886,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x2bb4100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43ae9c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43ae840) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x435b340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43aeb80) 0 empty Class QPainterPathStroker size=4 align=4 @@ -8682,10 +7994,6 @@ QCommonStyle (0x4463e40) 0 QObject (0x4463ec0) 0 primary-for QStyle (0x4463e80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x4492600) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -9007,25 +8315,13 @@ Class QTextLength base size=16 base align=8 QTextLength (0x1d31f00) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x458d100) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x1d31e80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x458da80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4581bc0) 0 Class QTextCharFormat size=8 align=4 @@ -9080,15 +8376,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x2ba1e00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x46e90c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x46d0d00) 0 Class QTextLine size=8 align=4 @@ -9138,15 +8426,7 @@ QTextDocument (0x452fec0) 0 QObject (0x4714900) 0 primary-for QTextDocument (0x452fec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4714dc0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x477cdc0) 0 Class QTextCursor size=4 align=4 @@ -9158,15 +8438,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x47902c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4790580) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4790400) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -9328,10 +8600,6 @@ QTextFrame (0x4714100) 0 QObject (0x481b340) 0 primary-for QTextObject (0x481b300) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x48437c0) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -9356,25 +8624,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x46d0540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x489e040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x489e1c0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x47f1600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x489ec40) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -10031,10 +9287,6 @@ QDateEdit (0x4a5d080) 0 QPaintDevice (0x4a5d1c0) 8 vptr=((&QDateEdit::_ZTV9QDateEdit) + 268u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4a20580) 0 Vtable for QDial QDial::_ZTV5QDial: 68u entries @@ -10203,10 +9455,6 @@ QDockWidget (0x4acc200) 0 QPaintDevice (0x4acc2c0) 8 vptr=((&QDockWidget::_ZTV11QDockWidget) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4acc780) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 67u entries @@ -12452,158 +11700,34 @@ QWorkspace (0x50023c0) 0 QPaintDevice (0x5002480) 8 vptr=((&QWorkspace::_ZTV10QWorkspace) + 240u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13c0100) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1588d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x52a4200) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3d49600) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x3d493c0) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x3ff2980) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x4027d80) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x41db2c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x41db640) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x421e300) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x421e680) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x43ae940) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x458da00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x46e9040) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4790500) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3308f80) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x3aa5500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x56ff5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x572c3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x572c580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x572cac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x575d180) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x172a2c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1dce500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x575d6c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x37b61c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x393c380) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x575de40) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x57ba100) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x57ba340) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x57ba840) 0 diff --git a/tests/auto/bic/data/QtGui.4.2.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtGui.4.2.0.linux-gcc-ia32.txt index fc285d1d5..efcd7b0f7 100644 --- a/tests/auto/bic/data/QtGui.4.2.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtGui.4.2.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7fb7d80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7fb7dc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7fb7e80) 0 empty - QUintForSize<4> (0xb7fb7ec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7fb7f40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7fb7f80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb78c7040) 0 empty - QIntForSize<4> (0xb78c7080) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb78c7300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c73c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c7400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c7440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c7480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c74c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c7500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c7540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c7580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c75c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c7600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c7640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c7680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c76c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c7700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c7740) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb78c7780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78c7880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78c78c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78c7900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78c7940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78c7980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78c79c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78c7a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78c7a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78c7a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78c7ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78c7b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78c7b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78c7b80) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb78c7c40) 0 QGenericArgument (0xb78c7c80) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb78c7e40) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb78c7f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78c7f80) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6bf0280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bf02c0) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb6bf0300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6bf0480) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb6bf0580) 0 QString (0xb6bf05c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bf0600) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0xb6bf0900) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6bf0c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6bf0c00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0xb6bf0e00) 0 QObject (0xb6bf0e40) 0 primary-for QIODevice (0xb6bf0e00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6bf0f00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6bf07c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bf0880) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0xb6796580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6796b00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0xb6796a40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6796c40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6796bc0) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb6796cc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6796d00) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6796d80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6796d40) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6796dc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6796e00) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6796f00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6796f80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6796f40) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6796440) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6796880) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0xb6796ac0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb651f040) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0xb651f200) 0 QTextStream (0xb651f240) 0 primary-for QTextOStream (0xb651f200) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb651f300) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb651f340) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb651f2c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb651f380) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb651f3c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb651f400) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb651f440) 0 Class timespec size=8 align=4 @@ -738,80 +492,24 @@ Class timeval base size=8 base align=4 timeval (0xb651f4c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb651f500) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb651f540) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb651f580) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb651f640) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb651f600) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb651f5c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb651f680) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb651f700) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb651f6c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb651f740) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb651f7c0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb651f780) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb651f800) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb651f840) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb651f880) 0 Class random_data size=28 align=4 @@ -882,10 +580,6 @@ QFile (0xb651fd40) 0 QObject (0xb651fdc0) 0 primary-for QIODevice (0xb651fd80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb651fe40) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -938,50 +632,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb651ffc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb651f000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb651f1c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb651fe00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb651f280) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb651ff80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6500000) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6500040) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6500100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6500080) 0 Class QStringList size=4 align=4 @@ -989,30 +655,14 @@ Class QStringList QStringList (0xb6500140) 0 QList (0xb6500180) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6500200) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6500240) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb6500300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6500380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6500400) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1069,10 +719,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb6500440) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65005c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1184,15 +830,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6500880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65008c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6500900) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1287,285 +925,65 @@ Class QUrl base size=4 base align=4 QUrl (0xb6500c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6500c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6500cc0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6500d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6500bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62720c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62721c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62722c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62723c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62724c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62725c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62726c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62727c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62728c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6272900) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1592,45 +1010,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6272940) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6272b80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6272bc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6272cc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6272c40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6272dc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6272d40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6272e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6272f00) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1662,80 +1052,48 @@ Class QPoint base size=8 base align=4 QPoint (0xb6272b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6272a80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6272e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6272fc0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb618b000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb618b040) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb618b080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb618b0c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0xb618b100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb618b300) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb618b380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb618b580) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb618b640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb618b740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb618b780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb618b840) 0 empty Class QLinkedListData size=20 align=4 @@ -1752,10 +1110,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb618bc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb618bc40) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1772,30 +1126,18 @@ Class QDate base size=4 base align=4 QDate (0xb618bec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb618bf80) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb618bfc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb618b1c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb618b200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb618b2c0) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1981,10 +1323,6 @@ QEventLoop (0xb5e01040) 0 QObject (0xb5e01080) 0 primary-for QEventLoop (0xb5e01040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5e01180) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1429,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb5e01680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e016c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb5e01700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e01780) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2324,10 +1654,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb5e01c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e01c40) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2422,20 +1748,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb5e01ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e01f00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb5e01f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e01f80) 0 empty Class QMetaProperty size=20 align=4 @@ -2447,10 +1765,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb5e01000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e01100) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2507,10 +1821,6 @@ QLibrary (0xb5e01440) 0 QObject (0xb5e01500) 0 primary-for QLibrary (0xb5e01440) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5e01600) 0 Class QSemaphore size=4 align=4 @@ -2558,10 +1868,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb5e01bc0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb5e01dc0) 0 Class QMutexLocker size=4 align=4 @@ -2573,45 +1879,21 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb5e01e80) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb5d72040) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb5d72000) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb5d720c0) 0 Class QWriteLocker size=4 align=4 base size=4 base align=4 QWriteLocker (0xb5d72080) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5d72180) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5d721c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5d72200) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb5d72140) 0 Class QColor size=16 align=4 @@ -2628,20 +1910,8 @@ Class QPen base size=4 base align=4 QPen (0xb5d723c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d72480) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5d72540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5d724c0) 0 Class QPolygon size=4 align=4 @@ -2649,15 +1919,7 @@ Class QPolygon QPolygon (0xb5d72580) 0 QVector (0xb5d725c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5d72680) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5d72600) 0 Class QPolygonF size=4 align=4 @@ -2680,10 +1942,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb5d72880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d728c0) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2724,10 +1982,6 @@ QImage (0xb5d72a40) 0 QPaintDevice (0xb5d72a80) 0 primary-for QImage (0xb5d72a40) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d72bc0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -2752,45 +2006,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb5d72d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d72dc0) 0 empty Class QBrushData size=72 align=4 base size=72 base align=4 QBrushData (0xb5d72e00) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb5d72f40) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb5d72ec0) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb5d72fc0) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb5d72240) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb5d72280) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb5d72f80) 0 Class QGradient size=56 align=4 @@ -2820,30 +2046,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb5d72800) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb5d72b00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb5d72980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5d72cc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5d72b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5d72d00) 0 Class QTextCharFormat size=8 align=4 @@ -2983,10 +2193,6 @@ QTextFrame (0xb5b4f580) 0 QObject (0xb5b4f600) 0 primary-for QTextObject (0xb5b4f5c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5b4f740) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -3011,25 +2217,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb5b4f800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5b4f880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5b4f8c0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb5b4f900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5b4f940) 0 empty Class QFontMetrics size=4 align=4 @@ -3089,20 +2283,12 @@ QTextDocument (0xb5b4fb00) 0 QObject (0xb5b4fb40) 0 primary-for QTextDocument (0xb5b4fb00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5b4fbc0) 0 Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0xb5b4fc00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5b4fc40) 0 Class QTextTableCell size=8 align=4 @@ -3143,10 +2329,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb5b4fe80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5b4ff40) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3444,15 +2626,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb5ad0c00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5ad0d00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5ad0c80) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3751,15 +2925,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb5965480) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5965600) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5965580) 0 Class QTextLine size=8 align=4 @@ -3808,10 +2974,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0xb5965880) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb5965940) 0 Class QTextCursor size=4 align=4 @@ -3834,15 +2996,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb5965b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5965c80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5965c00) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4206,10 +3360,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb5965f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5770040) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -4240,20 +3390,8 @@ QItemSelectionModel (0xb5770080) 0 QObject (0xb57700c0) 0 primary-for QItemSelectionModel (0xb5770080) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5770140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5770200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5770180) 0 Class QItemSelection size=4 align=4 @@ -4460,20 +3598,12 @@ QAbstractSpinBox (0xb5770680) 0 QPaintDevice (0xb5770740) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5770800) 0 Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0xb5770840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5770900) 0 empty Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -4681,15 +3811,7 @@ QStyle (0xb5770c40) 0 QObject (0xb5770c80) 0 primary-for QStyle (0xb5770c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5770d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5770d80) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -4948,10 +4070,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb5770c00) 0 QStyleOption (0xb5770bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56ea080) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -4978,10 +4096,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb56ea300) 0 QStyleOption (0xb56ea340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56ea4c0) 0 Class QStyleOptionButton size=64 align=4 @@ -4989,10 +4103,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb56ea400) 0 QStyleOption (0xb56ea440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56ea640) 0 Class QStyleOptionTab size=72 align=4 @@ -5007,10 +4117,6 @@ QStyleOptionTabV2 (0xb56ea6c0) 0 QStyleOptionTab (0xb56ea700) 0 QStyleOption (0xb56ea740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56ea8c0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5037,10 +4143,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb56eab00) 0 QStyleOption (0xb56eab40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56eac80) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5066,10 +4168,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb56eae80) 0 QStyleOption (0xb56eaec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56ea040) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -5110,15 +4208,7 @@ QStyleOptionSpinBox (0xb56eac40) 0 QStyleOptionComplex (0xb56eacc0) 0 QStyleOption (0xb56ead80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb53ed100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb53ed080) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5127,10 +4217,6 @@ QStyleOptionQ3ListView (0xb56eae40) 0 QStyleOptionComplex (0xb56eaf00) 0 QStyleOption (0xb53ed000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53ed2c0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5338,10 +4424,6 @@ QAbstractItemView (0xb53eda00) 0 QPaintDevice (0xb53edb40) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53edc00) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -6106,10 +5188,6 @@ QMessageBox (0xb52d0580) 0 QPaintDevice (0xb52d0680) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb52d0740) 0 Vtable for QProgressDialog QProgressDialog::_ZTV15QProgressDialog: 66u entries @@ -6360,10 +5438,6 @@ QFileDialog (0xb52d0a80) 0 QPaintDevice (0xb52d0b80) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb52d0c40) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -6449,10 +5523,6 @@ QAbstractPrintDialog (0xb52d0c80) 0 QPaintDevice (0xb52d0d80) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb52d0e40) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -6874,10 +5944,6 @@ QImageIOPlugin (0xb51cf3c0) 0 QFactoryInterface (0xb51cf480) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb51cf440) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51cf500) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -7225,50 +6291,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb51cf5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51cf7c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb51cfb80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb51cfa00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5143040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb51cfe40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5143140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb51430c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5143240) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb51431c0) 0 Class QStylePainter size=12 align=4 @@ -7286,25 +6316,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb5143340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb51435c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5143540) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb5143440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5143600) 0 empty Class QPainterPathStroker size=4 align=4 @@ -7316,15 +6334,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb5143700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5143740) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5143800) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -7359,25 +6369,13 @@ Class QPaintEngine QPaintEngine (0xb5143780) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5143900) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb5143880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5143940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5143a00) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -7467,15 +6465,7 @@ QStringListModel (0xb5143b00) 0 QObject (0xb5143bc0) 0 primary-for QAbstractItemModel (0xb5143b80) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5143d40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5143cc0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7718,15 +6708,7 @@ Class QStandardItem QStandardItem (0xb5143d80) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4f33180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4f33100) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -8547,15 +7529,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb4f33000) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb4f33dc0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb4f33ac0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8572,25 +7546,9 @@ Class QItemEditorFactory QItemEditorFactory (0xb4f33880) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4ea7100) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4ea7080) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4ea7200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4ea7180) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8817,15 +7775,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb4ea7800) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ea7880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ea78c0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -9778,15 +8728,7 @@ QActionGroup (0xb4d95f80) 0 QObject (0xb4d95fc0) 0 primary-for QActionGroup (0xb4d95f80) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4d95380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4d95180) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9956,10 +8898,6 @@ QCommonStyle (0xb4d95f40) 0 QObject (0xb4aec040) 0 primary-for QStyle (0xb4aec000) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb4aec200) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10481,15 +9419,7 @@ Class QGraphicsItem QGraphicsItem (0xb4aecfc0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4aec080) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4aec1c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -11262,20 +10192,8 @@ QGraphicsView (0xb49d6880) 0 QPaintDevice (0xb49d69c0) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb49d6a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb49d6b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb49d6a80) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -12527,10 +11445,6 @@ QDateEdit (0xb48e3080) 0 QPaintDevice (0xb48e36c0) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb48e3840) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -12690,10 +11604,6 @@ QDockWidget (0xb4815040) 0 QPaintDevice (0xb4815100) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb48151c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12851,10 +11761,6 @@ QDialogButtonBox (0xb4815340) 0 QPaintDevice (0xb4815400) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4815480) 0 Vtable for QMainWindow QMainWindow::_ZTV11QMainWindow: 64u entries @@ -13028,10 +11934,6 @@ QTextEdit (0xb4815600) 0 QPaintDevice (0xb4815740) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4815840) 0 Vtable for QProgressBar QProgressBar::_ZTV12QProgressBar: 64u entries @@ -14034,10 +12936,6 @@ QFontComboBox (0xb478f600) 0 QPaintDevice (0xb478f700) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb478f780) 0 Vtable for QToolBar QToolBar::_ZTV8QToolBar: 63u entries @@ -14439,178 +13337,38 @@ QDial (0xb478fd40) 0 QPaintDevice (0xb478fe40) 8 vptr=((& QDial::_ZTV5QDial) + 236u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb478ff00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb478ff80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb478f040) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb478f340) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb478f5c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb478f8c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb478fbc0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb478fe80) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb4490040) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb44900c0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb4490140) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb44901c0) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb4490240) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4490480) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb4490500) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4490600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4490700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44907c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44908c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4490980) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb4490a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4490a80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4490b00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4490b80) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb4490c00) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb4490cc0) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb4490d80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4490e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4490ec0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4490f40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4490580) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4490c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4490d00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4490dc0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb427c040) 0 diff --git a/tests/auto/bic/data/QtGui.4.2.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtGui.4.2.0.linux-gcc-ppc32.txt index 5643ae0e2..f753f6439 100644 --- a/tests/auto/bic/data/QtGui.4.2.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtGui.4.2.0.linux-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x305e92d8) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x305e9348) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x3001bac0) 0 empty - QUintForSize<4> (0x305e9498) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x305e9578) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x305e95e8) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x3001bb40) 0 empty - QIntForSize<4> (0x305e9738) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x305e9ab8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305e9cb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305e9d58) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305e9e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305e9ea8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305e9f50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30617000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306170a8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30617150) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306171f8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306172a0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30617348) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306173f0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30617498) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30617540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306175e8) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x30617658) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30617b28) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30617b98) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30617c08) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30617c78) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30617ce8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30617d58) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30617dc8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30617e38) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30617ea8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30617f18) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30617f88) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31307000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31307070) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3001bc80) 0 QGenericArgument (0x31307188) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x31307348) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0x31307428) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313074d0) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x31403230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31403578) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0x31403620) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31403850) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0x3001bec0) 0 QString (0x3154f9d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3154fab8) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0x31622150) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31622690) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x316225e8) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0x3001bf80) 0 QObject (0x31622b60) 0 primary-for QIODevice (0x3001bf80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31622d58) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x31750348) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317503b8) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0x31750c08) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31893230) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0x318930e0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31893508) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31893460) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x31893620) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x318936c8) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x318937a8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31893738) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x31893818) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x31893888) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x318939d8) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x31893ab8) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x31893a48) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x31893b28) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x31893b98) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0x31893bd0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31893e00) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0x3180c180) 0 QTextStream (0x3194f2d8) 0 primary-for QTextOStream (0x3180c180) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x3194f5b0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x3194f620) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x3194f540) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x3194f690) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x3194f700) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x3194f770) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x3194f7e0) 0 Class timespec size=8 align=4 @@ -738,70 +492,18 @@ Class timeval base size=8 base align=4 timeval (0x3194f850) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x3194f8c0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x3194f930) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x3194fa10) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x3194f9a0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x3194fa80) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x3194fb60) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x3194faf0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x3194fbd0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x3194fcb0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x3194fc40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x3194fd20) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x3194fd90) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x3194fe00) 0 Class random_data size=28 align=4 @@ -872,10 +574,6 @@ QFile (0x3180c1c0) 0 QObject (0x319f0658) 0 primary-for QIODevice (0x3180c200) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x319f07e0) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -928,50 +626,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x319f0930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x319f09d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x319f0a48) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x319f0bd0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x319f0b28) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x319f0c78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x319f0e70) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x319f0ee0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31b3b000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x319f05e8) 0 Class QStringList size=4 align=4 @@ -979,30 +649,14 @@ Class QStringList QStringList (0x3180c300) 0 QList (0x31b3b0a8) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x31b3b4d0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x31b3b540) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x31b3b850) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31b3b968) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31b3ba10) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1059,10 +713,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x31b3ba48) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31b3bcb0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1174,15 +824,7 @@ Class QLocale base size=4 base align=4 QLocale (0x31b3bdc8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31c38038) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31c380e0) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1277,285 +919,65 @@ Class QUrl base size=4 base align=4 QUrl (0x31c384d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31c38658) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31c386c8) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x31c38738) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c388f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c389a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c38a48) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c38af0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c38b98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c38c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c38ce8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c38d90) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c38e38) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c38ee0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c38f88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c38348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7038) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd70e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7188) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7230) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd72d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7428) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd74d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7578) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7620) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd76c8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7770) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7818) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd78c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7968) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7a10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7ab8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7b60) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7c08) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7cb0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7d58) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7ea8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd7f50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef0a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef150) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef1f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef2a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef3f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef498) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef5e8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef738) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef7e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef888) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef930) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cef9d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cefa80) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1582,45 +1004,17 @@ Class QVariant base size=16 base align=8 QVariant (0x31cefaf0) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x31ceff88) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x31cefce8) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31d40118) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31d40070) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x31d402d8) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x31d40230) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x31d403f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d40508) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1652,80 +1046,48 @@ Class QPoint base size=8 base align=4 QPoint (0x31d40a48) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d40e38) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x31d40658) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31dfa000) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x31dfa230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31dfa2a0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x31dfa3f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31dfa498) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x31dfa620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31dfa9a0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x31dfac78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31dfa658) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x31ea2070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ea2268) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x31ea2498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ea2620) 0 empty Class QLinkedListData size=20 align=4 @@ -1742,10 +1104,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x31ea2188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ff6000) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1762,30 +1120,18 @@ Class QDate base size=4 base align=4 QDate (0x31ff63f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ff65b0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x31ff6620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ff67e0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x31ff6850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ff69a0) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1971,10 +1317,6 @@ QEventLoop (0x3180c880) 0 QObject (0x320b53b8) 0 primary-for QEventLoop (0x3180c880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x320b5578) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2081,20 +1423,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x320b5fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x320b59d8) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x320b5bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32162038) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2314,10 +1648,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x32162770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32162850) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2412,20 +1742,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x32162c78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32162d20) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x32162d90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32162e38) 0 empty Class QMetaProperty size=20 align=4 @@ -2437,10 +1759,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x32162ee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32162f88) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2497,10 +1815,6 @@ QLibrary (0x3180cd00) 0 QObject (0x32233070) 0 primary-for QLibrary (0x3180cd00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322331f8) 0 Class QSemaphore size=4 align=4 @@ -2548,10 +1862,6 @@ Class QMutex base size=4 base align=4 QMutex (0x32233498) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x32233620) 0 Class QMutexLocker size=4 align=4 @@ -2563,45 +1873,21 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x322336c8) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x32233770) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x32233700) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x32233888) 0 Class QWriteLocker size=4 align=4 base size=4 base align=4 QWriteLocker (0x32233818) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x32233ab8) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x32233b28) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x32233b98) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x32233a48) 0 Class QColor size=16 align=4 @@ -2618,20 +1904,8 @@ Class QPen base size=4 base align=4 QPen (0x32233428) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ec000) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x322ec1c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x322ec0e0) 0 Class QPolygon size=4 align=4 @@ -2639,15 +1913,7 @@ Class QPolygon QPolygon (0x3180cdc0) 0 QVector (0x322ec230) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x322ec5e8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x322ec508) 0 Class QPolygonF size=4 align=4 @@ -2670,10 +1936,6 @@ Class QMatrix base size=48 base align=8 QMatrix (0x322ecaf0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ecb60) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2714,10 +1976,6 @@ QImage (0x3180ce80) 0 QPaintDevice (0x322ece70) 0 primary-for QImage (0x3180ce80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x323d0038) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -2742,45 +2000,17 @@ Class QBrush base size=4 base align=4 QBrush (0x323d02d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x323d0380) 0 empty Class QBrushData size=72 align=8 base size=72 base align=8 QBrushData (0x323d03f0) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x323d0620) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x323d0540) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x323d0738) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x323d07a8) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x323d0818) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x323d06c8) 0 Class QGradient size=64 align=8 @@ -2810,30 +2040,14 @@ Class QTextLength base size=16 base align=8 QTextLength (0x323d08f8) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x323d0c40) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x323d0af0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x323d0f88) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x323d0ea8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x323d0268) 0 Class QTextCharFormat size=8 align=4 @@ -2973,10 +2187,6 @@ QTextFrame (0x324b5280) 0 QObject (0x324d6460) 0 primary-for QTextObject (0x324b52c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x324d68f8) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -3001,25 +2211,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x324d6ab8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x324d6e38) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x324d6ee0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x324d6f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32561070) 0 empty Class QFontMetrics size=4 align=4 @@ -3079,20 +2277,12 @@ QTextDocument (0x324b5300) 0 QObject (0x32561348) 0 primary-for QTextDocument (0x324b5300) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32561508) 0 Class QTextOption size=32 align=8 base size=28 base align=8 QTextOption (0x32561540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32561620) 0 Class QTextTableCell size=8 align=4 @@ -3133,10 +2323,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x32561a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32561c08) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3434,15 +2620,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x32639f50) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x326395e8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x326391c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3741,15 +2919,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x326fd038) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x326fd2d8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x326fd1f8) 0 Class QTextLine size=8 align=4 @@ -3798,10 +2968,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x326fd700) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x326fd818) 0 Class QTextCursor size=4 align=4 @@ -3824,15 +2990,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x326fdd90) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x326fdf88) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x326fdea8) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -4196,10 +3354,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x328f0348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x328f0700) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -4230,20 +3384,8 @@ QItemSelectionModel (0x327de240) 0 QObject (0x328f07a8) 0 primary-for QItemSelectionModel (0x327de240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x328f0930) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x328f0a80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x328f09d8) 0 Class QItemSelection size=4 align=4 @@ -4450,20 +3592,12 @@ QAbstractSpinBox (0x327de480) 0 QPaintDevice (0x328f0888) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x329c40a8) 0 Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0x329c40e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x329c41c0) 0 empty Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -4671,15 +3805,7 @@ QStyle (0x327de6c0) 0 QObject (0x329c4620) 0 primary-for QStyle (0x327de6c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x329c47e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x329c4850) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -4938,10 +4064,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x327de940) 0 QStyleOption (0x329c4f18) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x329c4738) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -4968,10 +4090,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x327dea80) 0 QStyleOption (0x32ae3310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ae3508) 0 Class QStyleOptionButton size=64 align=4 @@ -4979,10 +4097,6 @@ Class QStyleOptionButton QStyleOptionButton (0x327deb00) 0 QStyleOption (0x32ae3428) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ae3700) 0 Class QStyleOptionTab size=72 align=4 @@ -4997,10 +4111,6 @@ QStyleOptionTabV2 (0x327debc0) 0 QStyleOptionTab (0x327dec00) 0 QStyleOption (0x32ae3818) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ae3af0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5027,10 +4137,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x327ded40) 0 QStyleOption (0x32ae3d90) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ae3f88) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5056,10 +4162,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x327dee40) 0 QStyleOption (0x32ae3f18) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32b93150) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -5100,15 +4202,7 @@ QStyleOptionSpinBox (0x32bc2040) 0 QStyleOptionComplex (0x32bc2080) 0 QStyleOption (0x32b93888) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32b93b28) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32b93a80) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5117,10 +4211,6 @@ QStyleOptionQ3ListView (0x32bc20c0) 0 QStyleOptionComplex (0x32bc2100) 0 QStyleOption (0x32b939a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32b93d90) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5328,10 +4418,6 @@ QAbstractItemView (0x32bc24c0) 0 QPaintDevice (0x32c26310) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32c26508) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -6096,10 +5182,6 @@ QMessageBox (0x32bc2cc0) 0 QPaintDevice (0x32d162d8) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32d16508) 0 Vtable for QProgressDialog QProgressDialog::_ZTV15QProgressDialog: 66u entries @@ -6350,10 +5432,6 @@ QFileDialog (0x32bc2f00) 0 QPaintDevice (0x32d168f8) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32d16af0) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -6439,10 +5517,6 @@ QAbstractPrintDialog (0x32ded000) 0 QPaintDevice (0x32d16c78) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32d16e70) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -6864,10 +5938,6 @@ QImageIOPlugin (0x32ded480) 0 QFactoryInterface (0x32e24700) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x32ded4c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32e248f8) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -7215,50 +6285,14 @@ Class QPainter base size=4 base align=4 QPainter (0x32ef4c78) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ef4d90) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32fb6150) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32fb6070) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32fb6310) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32fb6230) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32fb64d0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32fb63f0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32fb6690) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32fb65b0) 0 Class QStylePainter size=12 align=4 @@ -7276,25 +6310,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x32fb6930) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32fb6dc8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32fb6ce8) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x32fb6b28) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32fb6e70) 0 empty Class QPainterPathStroker size=4 align=4 @@ -7306,15 +6328,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x330a30a8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x330a3150) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x330a32d8) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -7349,25 +6363,13 @@ Class QPaintEngine QPaintEngine (0x330a31c0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x330a34d0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x330a3428) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x330a3540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x330a3658) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -7457,15 +6459,7 @@ QStringListModel (0x32ded900) 0 QObject (0x330a3968) 0 primary-for QAbstractItemModel (0x32ded980) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x330a3c40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x330a3b60) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7708,15 +6702,7 @@ Class QStandardItem QStandardItem (0x33192348) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x33192700) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x33192658) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -8537,15 +7523,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x332f8508) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x332f8968) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x332f8850) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8562,25 +7540,9 @@ Class QItemEditorFactory QItemEditorFactory (0x332f8770) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x332f8d58) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x332f8c78) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x332f8ee0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x332f8e38) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8807,15 +7769,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x333e56c8) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x333e57a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x333e5818) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -9768,15 +8722,7 @@ QActionGroup (0x33534240) 0 QObject (0x334fff50) 0 primary-for QActionGroup (0x33534240) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x334ffee0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x334ffa48) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9946,10 +8892,6 @@ QCommonStyle (0x335343c0) 0 QObject (0x335cd540) 0 primary-for QStyle (0x33534400) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x335cd738) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10471,15 +9413,7 @@ Class QGraphicsItem QGraphicsItem (0x3368e310) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3368e620) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3368e690) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -11252,20 +10186,8 @@ QGraphicsView (0x33783100) 0 QPaintDevice (0x33745d20) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33745f18) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x33745818) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x33745f88) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -12517,10 +11439,6 @@ QDateEdit (0x33783e00) 0 QPaintDevice (0x338e7dc8) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x338e7f88) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -12680,10 +11598,6 @@ QDockWidget (0x33783fc0) 0 QPaintDevice (0x338e7cb0) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x339b61f8) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12841,10 +11755,6 @@ QDialogButtonBox (0x339ac0c0) 0 QPaintDevice (0x339b6428) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x339b6620) 0 Vtable for QMainWindow QMainWindow::_ZTV11QMainWindow: 64u entries @@ -13018,10 +11928,6 @@ QTextEdit (0x339ac1c0) 0 QPaintDevice (0x339b6850) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x339b6af0) 0 Vtable for QProgressBar QProgressBar::_ZTV12QProgressBar: 64u entries @@ -14024,10 +12930,6 @@ QFontComboBox (0x339acac0) 0 QPaintDevice (0x33abcd90) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33bcd1c0) 0 Vtable for QToolBar QToolBar::_ZTV8QToolBar: 63u entries @@ -14429,178 +13331,38 @@ QDial (0x339ace00) 0 QPaintDevice (0x33bcd968) 8 vptr=((& QDial::_ZTV5QDial) + 236u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33ca4ee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33cc3620) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33ce0428) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x33d2f5e8) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x33d2fc08) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x33d58850) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x33d7c508) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x33d7c7a8) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x33e10770) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x33e108f8) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x33e10a80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x33e10c08) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x33e10d90) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33e692a0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x33e69498) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33e8dc08) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33f19888) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33f19c78) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33f38070) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33f56770) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x33f56888) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33f56a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33f77348) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33f77a80) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x33f77c78) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x33fa6230) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x33fa67a8) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33fa6d20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33fa6ea8) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33fa6f50) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33fdf268) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33fdf6c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33fdf9d8) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33fdfa80) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x340010a8) 0 diff --git a/tests/auto/bic/data/QtGui.4.2.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtGui.4.2.0.macx-gcc-ia32.txt index 5234b8486..56819c1b8 100644 --- a/tests/auto/bic/data/QtGui.4.2.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtGui.4.2.0.macx-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x6fe2c0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x6fe340) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x6fe500) 0 empty - QUintForSize<4> (0x6fe540) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x6fe640) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x6fe6c0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x6fe880) 0 empty - QIntForSize<4> (0x6fe8c0) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x6fedc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b0c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72b9c0) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0x72bcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x72bdc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0x16e74c0) 0 QBasicAtomic (0x16e7500) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x16e7780) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0x17854c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1785880) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1785d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1785d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1785e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1785e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1785f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1785f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1893000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1893080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1893100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1893180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1893200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1893280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1893300) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x1893b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1893f40) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x1a0db40) 0 QString (0x1a0db80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a0dc80) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x1aff4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1affb00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1aff980) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1affe40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1affd80) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1aff780) 0 QGenericArgument (0x1affa80) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1c17240) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1c171c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1c174c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1c17400) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x1c17b00) 0 QObject (0x1c17b40) 0 primary-for QIODevice (0x1c17b00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1c17d80) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1ceb3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ceb600) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1ceb680) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1ceb880) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1ceb7c0) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x1ceb940) 0 QList (0x1ceb980) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1cebe40) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1cebec0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x1d8dcc0) 0 QObject (0x1d8dd40) 0 primary-for QIODevice (0x1d8dd00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d8df00) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1d8df40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d8d280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d8d780) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1e4e100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1e4e040) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1e4e1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e4e300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e4e380) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1e4e3c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e4e680) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1e4eb80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e4ec00) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x1f07fc0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x207d200) 0 Class QTextStreamManipulator size=24 align=4 @@ -1078,35 +836,15 @@ Class rlimit base size=16 base align=4 rlimit (0x207dd80) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x20e4440) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x20e44c0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x20e43c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x20e4540) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x20e45c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x20e4640) 0 Class QVectorData size=16 align=4 @@ -1244,15 +982,7 @@ Class QLocale base size=4 base align=4 QLocale (0x2243500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22435c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2243680) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1279,270 +1009,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x2243880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2243a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2243b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2243c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2243cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2243d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2243e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2243f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2243fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2243480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f11c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f14c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f17c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22f1f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230b9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230ba80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230bb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230bc00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230bcc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230bd80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230be40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230bf00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x230bfc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2326080) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1569,60 +1087,20 @@ Class QVariant base size=12 base align=4 QVariant (0x2326100) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2326640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2326700) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2326900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2326840) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x2326b00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x2326a40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x2326c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2326dc0) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x2326e80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2326f00) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x2326f80) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1700,15 +1178,7 @@ Class QUrl base size=4 base align=4 QUrl (0x23c9680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x23c9840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23c98c0) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1735,10 +1205,6 @@ QEventLoop (0x23c9940) 0 QObject (0x23c9980) 0 primary-for QEventLoop (0x23c9940) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x23c9b80) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1783,20 +1249,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x23c9dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23c9f80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x23c9100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23c9d40) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1966,10 +1424,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x24ce700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24ce800) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2076,20 +1530,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x257a280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x257a340) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x257a3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x257a480) 0 empty Class QMetaProperty size=20 align=4 @@ -2101,10 +1547,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x257a540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x257a600) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2286,10 +1728,6 @@ QLibrary (0x257afc0) 0 QObject (0x257a7c0) 0 primary-for QLibrary (0x257afc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x260e000) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2326,10 +1764,6 @@ Class QMutex base size=4 base align=4 QMutex (0x260e340) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x260e500) 0 Class QMutexLocker size=4 align=4 @@ -2341,20 +1775,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x260e5c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x260e680) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x260e600) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x260e7c0) 0 Class QWriteLocker size=4 align=4 @@ -2412,10 +1838,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x26cb140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26cb240) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2427,70 +1849,42 @@ Class QDate base size=4 base align=4 QDate (0x26cb4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26cb6c0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x26cb740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26cb940) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x26cb9c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26cbb40) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x26cbbc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26cb580) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x26cbf00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27753c0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x27756c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2775740) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x27758c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2775980) 0 empty Class QLinkedListData size=20 align=4 @@ -2502,40 +1896,24 @@ Class QSize base size=8 base align=4 QSize (0x2775fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x286e000) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x286e3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x286e7c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x286ec40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x286ee00) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x286e500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x286ec80) 0 empty Class QSharedData size=4 align=4 @@ -2583,10 +1961,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x29579c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2957b80) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2625,15 +1999,7 @@ Class QMacMime QMacMime (0x2957d80) 0 vptr=((& QMacMime::_ZTV8QMacMime) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2957900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2957540) 0 Vtable for QMacPasteboardMime QMacPasteboardMime::_ZTV18QMacPasteboardMime: 10u entries @@ -2934,15 +2300,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0x2accac0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2accc80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2accbc0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3231,15 +2589,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2b51340) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b51480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b51500) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3628,40 +2978,16 @@ Class QPaintDevice QPaintDevice (0x2bbcdc0) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2bbc880) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2bbcd40) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2c24000) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2bbc4c0) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0x2bbc0c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2c24440) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2c24340) 0 Class QPolygon size=4 align=4 @@ -3669,15 +2995,7 @@ Class QPolygon QPolygon (0x2c244c0) 0 QVector (0x2c24500) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2c24940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2c24840) 0 Class QPolygonF size=4 align=4 @@ -3690,10 +3008,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0x2c24d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2c24d80) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3718,10 +3032,6 @@ QImage (0x2c24f80) 0 QPaintDevice (0x2c24fc0) 0 primary-for QImage (0x2c24f80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2cef2c0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -3746,45 +3056,17 @@ Class QBrush base size=4 base align=4 QBrush (0x2cef800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2cef8c0) 0 empty Class QBrushData size=72 align=4 base size=72 base align=4 QBrushData (0x2cef940) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2cefbc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2cefac0) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0x2cefd00) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0x2cefd80) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0x2cefe00) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0x2cefc80) 0 Class QGradient size=56 align=4 @@ -4180,10 +3462,6 @@ QAbstractPrintDialog (0x2ec68c0) 0 QPaintDevice (0x2ec6980) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2ec6c00) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -4434,10 +3712,6 @@ QFileDialog (0x2fc1000) 0 QPaintDevice (0x2fc10c0) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2fc1380) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4844,10 +4118,6 @@ QMessageBox (0x2fc1e80) 0 QPaintDevice (0x2fc1f40) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2fc1d80) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 67u entries @@ -5202,25 +4472,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x30dbb00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x30db480) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x30dbf40) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x30dbd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30dbc00) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5275,15 +4533,7 @@ Class QGraphicsItem QGraphicsItem (0x315b300) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x315b680) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x315b700) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -5872,10 +5122,6 @@ Class QPen base size=4 base align=4 QPen (0x3252140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32522c0) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -6044,60 +5290,20 @@ Class QTextOption base size=24 base align=4 QTextOption (0x3252640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3252d40) 0 Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x3252f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ed540) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32ed700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32ed600) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32ed900) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32ed800) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32edb00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32eda00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32edcc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32edbc0) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 65u entries @@ -6352,20 +5558,8 @@ QGraphicsView (0x3427200) 0 QPaintDevice (0x3427300) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3427540) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3427680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x34275c0) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 7u entries @@ -6392,10 +5586,6 @@ Class QIcon base size=4 base align=4 QIcon (0x3427c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3427d40) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -6551,10 +5741,6 @@ QImageIOPlugin (0x3516c80) 0 QFactoryInterface (0x34f9600) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x34f95c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34f9840) 0 Class QImageReader size=4 align=4 @@ -6730,15 +5916,7 @@ QActionGroup (0x358c240) 0 QObject (0x358c280) 0 primary-for QActionGroup (0x358c240) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x358c500) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x358c440) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -7043,10 +6221,6 @@ QAbstractSpinBox (0x3664080) 0 QPaintDevice (0x3664100) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3664380) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -7254,15 +6428,7 @@ QStyle (0x3664900) 0 QObject (0x3664940) 0 primary-for QStyle (0x3664900) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3664b80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3664c00) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -7521,10 +6687,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x378f300) 0 QStyleOption (0x378f340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x378f600) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -7551,10 +6713,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x378fb80) 0 QStyleOption (0x378fbc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x378fe80) 0 Class QStyleOptionButton size=64 align=4 @@ -7562,10 +6720,6 @@ Class QStyleOptionButton QStyleOptionButton (0x378fd40) 0 QStyleOption (0x378fd80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x378f900) 0 Class QStyleOptionTab size=72 align=4 @@ -7580,10 +6734,6 @@ QStyleOptionTabV2 (0x378fec0) 0 QStyleOptionTab (0x382c000) 0 QStyleOption (0x382c040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x382c3c0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -7610,10 +6760,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x382c780) 0 QStyleOption (0x382c7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x382ca40) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -7639,10 +6785,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x382ce80) 0 QStyleOption (0x382cec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x382ca80) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -7683,15 +6825,7 @@ QStyleOptionSpinBox (0x38ae880) 0 QStyleOptionComplex (0x38ae8c0) 0 QStyleOption (0x38ae900) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x38aec80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x38aebc0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -7700,10 +6834,6 @@ QStyleOptionQ3ListView (0x38aea40) 0 QStyleOptionComplex (0x38aea80) 0 QStyleOption (0x38aeac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x38ae1c0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7794,10 +6924,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x39369c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3936e00) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -7828,20 +6954,8 @@ QItemSelectionModel (0x3936ec0) 0 QObject (0x3936f00) 0 primary-for QItemSelectionModel (0x3936ec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3936500) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x39d90c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x39d9000) 0 Class QItemSelection size=4 align=4 @@ -7971,10 +7085,6 @@ QAbstractItemView (0x39d9280) 0 QPaintDevice (0x39d9380) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x39d9600) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -8312,15 +7422,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3abf080) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3abf600) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x3abf4c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8461,15 +7563,7 @@ QListView (0x3abf840) 0 QPaintDevice (0x3abf980) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3abfd80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3abfc80) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -8762,15 +7856,7 @@ Class QStandardItem QStandardItem (0x3b50800) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3b50c40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3b50b80) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -9288,35 +8374,15 @@ QTreeView (0x3c6d8c0) 0 QPaintDevice (0x3c6da00) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3c6dcc0) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x3c6dbc0) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x3c6dfc0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x3c6d380) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3d6a180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3d6a0c0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -10197,15 +9263,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x3eb99c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3f5f000) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f5f1c0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -10240,20 +9298,12 @@ Class QPaintEngine QPaintEngine (0x3f5f080) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f5f400) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x3f5f340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f5f480) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7u entries @@ -10346,10 +9396,6 @@ QCommonStyle (0x3f5fb40) 0 QObject (0x3f5fbc0) 0 primary-for QStyle (0x3f5fb80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x3f5fec0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10723,30 +9769,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0x403fdc0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x403fa80) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x403f000) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x40d2280) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x40d2180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40d2380) 0 Class QTextCharFormat size=8 align=4 @@ -10801,15 +9831,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x40d28c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x40d2bc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x40d2ac0) 0 Class QTextLine size=8 align=4 @@ -10859,15 +9881,7 @@ QTextDocument (0x40d2ec0) 0 QObject (0x40d2f00) 0 primary-for QTextDocument (0x40d2ec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41eb000) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x41eb140) 0 Class QTextCursor size=4 align=4 @@ -10879,15 +9893,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x41eb280) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x41eb4c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x41eb3c0) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -11049,10 +10055,6 @@ QTextFrame (0x41ebe40) 0 QObject (0x41ebec0) 0 primary-for QTextObject (0x41ebe80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4294240) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -11077,25 +10079,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x4294480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4294880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4294940) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x4294a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4294c00) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -12057,10 +11047,6 @@ QDateEdit (0x4476300) 0 QPaintDevice (0x4476400) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4476600) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12221,10 +11207,6 @@ QDialogButtonBox (0x44768c0) 0 QPaintDevice (0x4476940) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4476b80) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -12304,10 +11286,6 @@ QDockWidget (0x4476bc0) 0 QPaintDevice (0x4476c40) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4476f00) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12469,10 +11447,6 @@ QFontComboBox (0x4539000) 0 QPaintDevice (0x45390c0) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4539300) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -14041,10 +13015,6 @@ QTextEdit (0x4718600) 0 QPaintDevice (0x4718f80) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x47c0300) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -14462,188 +13432,40 @@ QWorkspace (0x47c0ec0) 0 QPaintDevice (0x47c0f40) 8 vptr=((& QWorkspace::_ZTV10QWorkspace) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4921700) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4941580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x499d600) 0 empty -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x49dba80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4a09180) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0x4a32880) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4a52dc0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4a52f80) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4a6d100) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4a6d2c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4b47840) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x4b47a80) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4b870c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4b873c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4b87a40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4badd80) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x4c5d8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4c83200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4c83480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4c83a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4c83d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4ca5200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4ca5900) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4ca5d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4ca5fc0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4cc3080) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4cc3300) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x4cc3480) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x4cc3b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4d091c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4d09280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4d09700) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4d097c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4d09b80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4d09ec0) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x4d2e200) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x4d2ecc0) 0 diff --git a/tests/auto/bic/data/QtGui.4.2.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtGui.4.2.0.macx-gcc-ppc32.txt index a8fb4ae4b..e3dde2356 100644 --- a/tests/auto/bic/data/QtGui.4.2.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtGui.4.2.0.macx-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xa32ec0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xa32f40) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xa36100) 0 empty - QUintForSize<4> (0xa36140) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xa36240) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xa362c0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xa36480) 0 empty - QIntForSize<4> (0xa364c0) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xa369c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa36c00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa36cc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa36d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa36e40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa36f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa36fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa69080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa69140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa69200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa692c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa69380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa69440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa69500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa695c0) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0xa698c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa699c0) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0xa69fc0) 0 QBasicAtomic (0x1743000) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x1743280) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0x1743fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17d2380) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d2800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d2880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d2900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d2980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d2a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d2a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d2b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d2b80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d2c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d2c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d2d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d2d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d2e00) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x1966600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1966a40) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x1ad0640) 0 QString (0x1ad0680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ad0780) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x1ad0a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b47580) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1b47400) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1b478c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1b47800) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1b47b00) 0 QGenericArgument (0x1b47b40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1b47e00) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1b47d80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1b47680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1b47fc0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x1c7f600) 0 QObject (0x1c7f640) 0 primary-for QIODevice (0x1c7f600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1c7f880) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1c7ff80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d540c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1d54140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1d54340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d54280) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x1d54400) 0 QList (0x1d54440) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1d54900) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1d54980) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x1dcbc00) 0 QObject (0x1dcbc80) 0 primary-for QIODevice (0x1dcbc40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1dcbe40) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1dcbe80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1dcbf40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dcbfc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1e80080) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1dcbd80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1e80140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e80280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e80300) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1e80340) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e80600) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1e80b00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e80b80) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x1f3ab40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f3ae00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1088,40 +846,16 @@ Class rlimit base size=16 base align=8 rlimit (0x20dcac0) 0 -Class OSReadSwapInt64(const volatile void*, uintptr_t):: - size=8 align=8 - base size=8 base align=8 -OSReadSwapInt64(const volatile void*, uintptr_t):: (0x20dccc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x2112380) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x2112400) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x2112300) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2112480) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2112500) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2112580) 0 Class QVectorData size=16 align=4 @@ -1259,15 +993,7 @@ Class QLocale base size=4 base align=4 QLocale (0x2276480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2276540) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2276600) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1294,270 +1020,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x2276800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2276a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2276ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2276b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2276c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2276d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2276dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2276e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2276f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2276080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2276740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23212c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23215c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23218c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2321f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233c040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233c100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233c1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233c280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233c340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233c400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233c4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233c580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233c640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233c700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233c7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233c880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233c940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233ca00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233cac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233cb80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233cc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233cd00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233cdc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233ce80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x233cf40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2356000) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1584,60 +1098,20 @@ Class QVariant base size=16 base align=4 QVariant (0x2356080) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23565c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2356680) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2356880) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x23567c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x2356a80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x23569c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x2356c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2356d40) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x2356e00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2356e80) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x2356f00) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1715,15 +1189,7 @@ Class QUrl base size=4 base align=4 QUrl (0x240e600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x240e7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x240e840) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1750,10 +1216,6 @@ QEventLoop (0x240e8c0) 0 QObject (0x240e900) 0 primary-for QEventLoop (0x240e8c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x240eb00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1798,20 +1260,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x240ed40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x240ef00) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x240ef80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x240e580) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1981,10 +1435,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2500680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2500780) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1541,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x25aa200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25aa2c0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x25aa340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25aa400) 0 empty Class QMetaProperty size=20 align=4 @@ -2116,10 +1558,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x25aa4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25aa580) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2301,10 +1739,6 @@ QLibrary (0x25aaf80) 0 QObject (0x25aafc0) 0 primary-for QLibrary (0x25aaf80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x25aaf00) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2341,10 +1775,6 @@ Class QMutex base size=4 base align=4 QMutex (0x264f300) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x264f4c0) 0 Class QMutexLocker size=4 align=4 @@ -2356,20 +1786,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x264f580) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x264f640) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x264f5c0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x264f780) 0 Class QWriteLocker size=4 align=4 @@ -2427,10 +1849,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x26fc100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26fc200) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2442,70 +1860,42 @@ Class QDate base size=4 base align=4 QDate (0x26fc480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26fc680) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x26fc700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26fc900) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x26fc980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26fcb00) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x26fcb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26fc4c0) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x26fce40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27a5340) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x27a5640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27a56c0) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x27a5840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27a5900) 0 empty Class QLinkedListData size=20 align=4 @@ -2517,40 +1907,24 @@ Class QSize base size=8 base align=4 QSize (0x27a5f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27a5f80) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x289c380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x289c780) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x289cc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x289cdc0) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x289c440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x289c6c0) 0 empty Class QSharedData size=4 align=4 @@ -2598,10 +1972,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x2988980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2988b40) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2640,15 +2010,7 @@ Class QMacMime QMacMime (0x2988d40) 0 vptr=((& QMacMime::_ZTV8QMacMime) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2988840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2988fc0) 0 Vtable for QMacPasteboardMime QMacPasteboardMime::_ZTV18QMacPasteboardMime: 10u entries @@ -2949,15 +2311,7 @@ Class QInputMethodEvent::Attribute base size=28 base align=4 QInputMethodEvent::Attribute (0x2af9ac0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2af9c80) 0 - -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2af9bc0) 0 + Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3246,15 +2600,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2b7e340) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b7e480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b7e500) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3643,40 +2989,16 @@ Class QPaintDevice QPaintDevice (0x2be9dc0) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2be9880) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2be9d40) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2c51000) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2be94c0) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0x2be90c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2c51440) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2c51340) 0 Class QPolygon size=4 align=4 @@ -3684,15 +3006,7 @@ Class QPolygon QPolygon (0x2c514c0) 0 QVector (0x2c51500) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2c51940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2c51840) 0 Class QPolygonF size=4 align=4 @@ -3705,10 +3019,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0x2c51d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2c51d80) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3733,10 +3043,6 @@ QImage (0x2c51f80) 0 QPaintDevice (0x2c51fc0) 0 primary-for QImage (0x2c51f80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d1d2c0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -3761,45 +3067,17 @@ Class QBrush base size=4 base align=4 QBrush (0x2d1d800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d1d8c0) 0 empty Class QBrushData size=72 align=4 base size=72 base align=4 QBrushData (0x2d1d940) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2d1dbc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2d1dac0) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2d1dd00) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2d1dd80) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2d1de00) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2d1dc80) 0 Class QGradient size=56 align=4 @@ -4195,10 +3473,6 @@ QAbstractPrintDialog (0x2ef78c0) 0 QPaintDevice (0x2ef7980) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2ef7c00) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -4449,10 +3723,6 @@ QFileDialog (0x2ff0000) 0 QPaintDevice (0x2ff00c0) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2ff0380) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4859,10 +4129,6 @@ QMessageBox (0x2ff0e80) 0 QPaintDevice (0x2ff0f40) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2ff0d80) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 67u entries @@ -5217,25 +4483,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x310ab00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x310a480) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x310af40) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x310ad40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x310ac00) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5290,15 +4544,7 @@ Class QGraphicsItem QGraphicsItem (0x318a300) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x318a680) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x318a700) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -5887,10 +5133,6 @@ Class QPen base size=4 base align=4 QPen (0x3284140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32842c0) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -6059,60 +5301,20 @@ Class QTextOption base size=24 base align=4 QTextOption (0x3284640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3284d40) 0 Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x331c000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x331c580) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x331c740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x331c640) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x331c940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x331c840) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x331cb40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x331ca40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x331cd00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x331cc00) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 65u entries @@ -6367,20 +5569,8 @@ QGraphicsView (0x3457240) 0 QPaintDevice (0x3457340) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3457580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34576c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3457600) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 7u entries @@ -6407,10 +5597,6 @@ Class QIcon base size=4 base align=4 QIcon (0x3457c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3457d80) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -6566,10 +5752,6 @@ QImageIOPlugin (0x3544b80) 0 QFactoryInterface (0x352a640) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x352a600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x352a880) 0 Class QImageReader size=4 align=4 @@ -6745,15 +5927,7 @@ QActionGroup (0x35bb280) 0 QObject (0x35bb2c0) 0 primary-for QActionGroup (0x35bb280) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x35bb540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x35bb480) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -7058,10 +6232,6 @@ QAbstractSpinBox (0x36930c0) 0 QPaintDevice (0x3693140) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36933c0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -7269,15 +6439,7 @@ QStyle (0x3693940) 0 QObject (0x3693980) 0 primary-for QStyle (0x3693940) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3693bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3693c40) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -7536,10 +6698,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x37bd340) 0 QStyleOption (0x37bd380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37bd640) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -7566,10 +6724,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x37bdbc0) 0 QStyleOption (0x37bdc00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37bdec0) 0 Class QStyleOptionButton size=64 align=4 @@ -7577,10 +6731,6 @@ Class QStyleOptionButton QStyleOptionButton (0x37bdd80) 0 QStyleOption (0x37bddc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37bdac0) 0 Class QStyleOptionTab size=72 align=4 @@ -7595,10 +6745,6 @@ QStyleOptionTabV2 (0x385a000) 0 QStyleOptionTab (0x385a040) 0 QStyleOption (0x385a080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x385a400) 0 Class QStyleOptionToolBar size=68 align=4 @@ -7625,10 +6771,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x385a7c0) 0 QStyleOption (0x385a800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x385aa80) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -7654,10 +6796,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x385aec0) 0 QStyleOption (0x385af00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x385ac40) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -7698,15 +6836,7 @@ QStyleOptionSpinBox (0x38dd8c0) 0 QStyleOptionComplex (0x38dd900) 0 QStyleOption (0x38dd940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x38ddcc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x38ddc00) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -7715,10 +6845,6 @@ QStyleOptionQ3ListView (0x38dda80) 0 QStyleOptionComplex (0x38ddac0) 0 QStyleOption (0x38ddb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x38dd380) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7809,10 +6935,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x3961a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3961e80) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -7843,20 +6965,8 @@ QItemSelectionModel (0x3961f40) 0 QObject (0x3961f80) 0 primary-for QItemSelectionModel (0x3961f40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3961700) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3a07100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3a07040) 0 Class QItemSelection size=4 align=4 @@ -7986,10 +7096,6 @@ QAbstractItemView (0x3a072c0) 0 QPaintDevice (0x3a073c0) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3a07640) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -8327,15 +7433,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3aee0c0) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3aee640) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x3aee500) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8476,15 +7574,7 @@ QListView (0x3aee880) 0 QPaintDevice (0x3aee9c0) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3aeedc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3aeecc0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -8777,15 +7867,7 @@ Class QStandardItem QStandardItem (0x3b7f840) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3b7fc80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3b7fbc0) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -9303,35 +8385,15 @@ QTreeView (0x3c9c900) 0 QPaintDevice (0x3c9ca40) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3c9cd00) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x3c9cc00) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x3d86000) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x3c9c3c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3d861c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3d86100) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -10212,15 +9274,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x3ee8b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3f8d040) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f8d200) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -10255,20 +9309,12 @@ Class QPaintEngine QPaintEngine (0x3f8d0c0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f8d4c0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x3f8d400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f8d540) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7u entries @@ -10361,10 +9407,6 @@ QCommonStyle (0x3f8dc00) 0 QObject (0x3f8dc80) 0 primary-for QStyle (0x3f8dc40) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x3f8df80) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10738,30 +9780,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0x4066e80) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4066f40) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x4066740) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x40fc380) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x40fc280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40fc480) 0 Class QTextCharFormat size=8 align=4 @@ -10816,15 +9842,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x40fc9c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x40fccc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x40fcbc0) 0 Class QTextLine size=8 align=4 @@ -10874,15 +9892,7 @@ QTextDocument (0x40fcfc0) 0 QObject (0x40fc080) 0 primary-for QTextDocument (0x40fcfc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4211100) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4211240) 0 Class QTextCursor size=4 align=4 @@ -10894,15 +9904,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x4211380) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42115c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42114c0) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -11064,10 +10066,6 @@ QTextFrame (0x4211f40) 0 QObject (0x4211fc0) 0 primary-for QTextObject (0x4211f80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42c0300) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -11092,25 +10090,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x42c0540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42c0940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42c0a00) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x42c0ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42c0cc0) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -12072,10 +11058,6 @@ QDateEdit (0x44a5400) 0 QPaintDevice (0x44a5500) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44a5700) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12236,10 +11218,6 @@ QDialogButtonBox (0x44a59c0) 0 QPaintDevice (0x44a5a40) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44a5c80) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -12319,10 +11297,6 @@ QDockWidget (0x44a5cc0) 0 QPaintDevice (0x44a5d40) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44a5040) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12484,10 +11458,6 @@ QFontComboBox (0x455d100) 0 QPaintDevice (0x455d1c0) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x455d400) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -14056,10 +13026,6 @@ QTextEdit (0x473fb80) 0 QPaintDevice (0x47e9080) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x47e93c0) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -14477,188 +13443,40 @@ QWorkspace (0x47e9f80) 0 QPaintDevice (0x47e9240) 8 vptr=((& QWorkspace::_ZTV10QWorkspace) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x494c7c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x496e640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x49ca6c0) 0 empty -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x4a08b40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4a36240) 0 -Class QVectorTypedData - size=40 align=4 - base size=40 base align=4 -QVectorTypedData (0x4a5e940) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4a7de80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4a9a000) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4a9a1c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4a9a380) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4b73900) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x4b73b40) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4bb5180) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4bb5480) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4bb5b00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4bdae40) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x4c86980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4caf2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4caf540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4cafac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4cafe40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4ccf2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4ccf9c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4ccfe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4cf1080) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4cf1140) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4cf13c0) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x4cf1540) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x4cf1c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4d34280) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4d34340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4d347c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4d34880) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4d34c40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4d34f80) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x4d582c0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x4d58d80) 0 diff --git a/tests/auto/bic/data/QtGui.4.2.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtGui.4.2.0.win32-gcc-ia32.txt index c443616db..d8c3bc272 100644 --- a/tests/auto/bic/data/QtGui.4.2.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtGui.4.2.0.win32-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xa9db00) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xa9dc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xa9df00) 0 empty - QUintForSize<4> (0xac2000) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xac2180) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xac2240) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xac24c0) 0 empty - QIntForSize<4> (0xac2580) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xaf4380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0aa80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ac00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ad80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0af00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb37080) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb60f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb97380) 0 empty Class QBasicAtomic size=4 align=4 @@ -171,75 +81,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc4bb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd72780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd84e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd950c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd84980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd9be40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd95780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda68c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdda300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdda600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda1080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde94c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde9d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef480) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xee0240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee0780) 0 Class QCharRef size=8 align=4 @@ -282,10 +132,6 @@ Class QConstString QConstString (0x11f2dc0) 0 QString (0x11f2e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1260140) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -348,10 +194,6 @@ Class QListData base size=4 base align=4 QListData (0x12d71c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13dc180) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -376,15 +218,7 @@ Class QTextCodec QTextCodec (0xee01c0) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1400480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc5d5c0) 0 Class QTextEncoder size=32 align=4 @@ -407,25 +241,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x144d300) 0 QGenericArgument (0x144d340) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1462ac0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x144d8c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1493340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1479f40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -517,10 +339,6 @@ QIODevice (0x13b5a40) 0 QObject (0x150ab40) 0 primary-for QIODevice (0x13b5a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x150ae40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -540,25 +358,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xee00c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15d8c00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x15d8f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x15f04c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x15f0380) 0 Class QStringList size=4 align=4 @@ -566,15 +372,7 @@ Class QStringList QStringList (0xee0140) 0 QList (0x15f0740) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x15f0600) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x15f05c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -703,50 +501,22 @@ QFile (0x170b080) 0 QObject (0x170b100) 0 primary-for QIODevice (0x170b0c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x170b940) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1763140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1763a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x177cac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x177cf80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x177ce80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1721fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b7c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b7880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -803,10 +573,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x16f7f80) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18560c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -880,10 +646,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x18cbb80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x18cbc80) 0 empty Class QMapData::Node size=8 align=4 @@ -908,10 +670,6 @@ Class QTextStream QTextStream (0x1aff580) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1aff940) 0 Class QTextStreamManipulator size=24 align=4 @@ -948,20 +706,8 @@ QTextOStream (0x1b8e740) 0 QTextStream (0x1b8e780) 0 primary-for QTextOStream (0x1b8e740) -Class - size=8 align=4 - base size=8 base align=4 - (0x1bc2980) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1bc2b00) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1be88c0) 0 Class QVectorData size=16 align=4 @@ -1099,15 +845,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1e4ccc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e96980) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e96040) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1134,270 +872,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1ef9400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f13840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f139c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f13b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f13cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f13e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f13fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f27140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f272c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f27440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f275c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f27740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f278c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f27a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f27bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f27d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f27ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f47040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f471c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f47340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f474c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f47640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f477c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f47940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f47ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f47c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f47dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f47f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f640c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f64240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f643c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f64540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f646c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f64840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f649c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f64b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f64cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f64e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f64fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f82140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f822c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f82440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f825c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f82740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f828c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f82a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f82bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f82d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f82ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fa4040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fa41c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fa4340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fa44c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fa4640) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1424,45 +950,17 @@ Class QVariant base size=16 base align=8 QVariant (0x1479c80) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ff6e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ff6fc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x202a480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1fb8540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x202a780) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1fb85c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1fa4800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2092100) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1540,15 +1038,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1f13180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x214e440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21ac040) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1575,10 +1065,6 @@ QEventLoop (0x21ac6c0) 0 QObject (0x21ac700) 0 primary-for QEventLoop (0x21ac6c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21aca00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1623,20 +1109,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x2223200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2223e80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x2223180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22502c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1806,10 +1284,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x22d37c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22d3e00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1917,20 +1391,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x143fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2371bc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x143fc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23861c0) 0 empty Class QMetaProperty size=20 align=4 @@ -1942,10 +1408,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x143fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2386900) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2127,10 +1589,6 @@ QLibrary (0x2445040) 0 QObject (0x2445080) 0 primary-for QLibrary (0x2445040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x24452c0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2172,10 +1630,6 @@ Class QMutex base size=4 base align=4 QMutex (0x24b77c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x24e5000) 0 Class QMutexLocker size=4 align=4 @@ -2187,20 +1641,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x24e5e00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x24f7140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x24e5fc0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x24f7900) 0 Class QWriteLocker size=4 align=4 @@ -2258,10 +1704,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x253aac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2595480) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2273,70 +1715,42 @@ Class QDate base size=4 base align=4 QDate (0x1e4cb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25ed640) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e4cbc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2615280) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1763040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2644040) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1f13340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2644c80) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1f13380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x266ce40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1f132c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26b32c0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1f13300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26de780) 0 empty Class QLinkedListData size=20 align=4 @@ -2348,40 +1762,24 @@ Class QSize base size=8 base align=4 QSize (0x1f13240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27d0fc0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1f13280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2822500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1f131c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x28a7000) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1f13200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x292b340) 0 empty Class QSharedData size=4 align=4 @@ -2429,10 +1827,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x1f13700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a3d280) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2749,15 +2143,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x2b3de80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2b65380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2b3df80) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3046,15 +2432,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2c10bc0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c25c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c34180) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3445,40 +2823,16 @@ Class QPaintDevice QPaintDevice (0x29bcf80) 0 vptr=((&QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2d6fdc0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2d6ff00) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2db1000) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2d6fd40) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0x1f134c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2de0540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2de03c0) 0 Class QPolygon size=4 align=4 @@ -3486,15 +2840,7 @@ Class QPolygon QPolygon (0x1f135c0) 0 QVector (0x2de0700) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2e22980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2e22840) 0 Class QPolygonF size=4 align=4 @@ -3507,10 +2853,6 @@ Class QMatrix base size=48 base align=8 QMatrix (0x1f13800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2e7f800) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3537,10 +2879,6 @@ QImage (0x1f13580) 0 QPaintDevice (0x2ea1cc0) 0 primary-for QImage (0x1f13580) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2f59000) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 9u entries @@ -3567,45 +2905,17 @@ Class QBrush base size=4 base align=4 QBrush (0x1f13480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2faea00) 0 empty Class QBrushData size=72 align=8 base size=72 base align=8 QBrushData (0x2fae1c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2fcd900) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2fcd080) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2fcdb40) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2fcdc40) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2fcde80) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2fcdac0) 0 Class QGradient size=64 align=8 @@ -4017,10 +3327,6 @@ QAbstractPrintDialog (0x3358080) 0 QPaintDevice (0x3358180) 8 vptr=((&QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3358440) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 70u entries @@ -4283,10 +3589,6 @@ QFileDialog (0x33d09c0) 0 QPaintDevice (0x33d0ac0) 8 vptr=((&QFileDialog::_ZTV11QFileDialog) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3400480) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 70u entries @@ -4713,10 +4015,6 @@ QMessageBox (0x3573900) 0 QPaintDevice (0x3573a00) 8 vptr=((&QMessageBox::_ZTV11QMessageBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x358b680) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 71u entries @@ -5087,25 +4385,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x2e5ba80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x36cb980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x36cb800) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x36b41c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36cbb40) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5160,15 +4446,7 @@ Class QGraphicsItem QGraphicsItem (0x3734540) 0 vptr=((&QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3734680) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x376c580) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -5757,10 +5035,6 @@ Class QPen base size=4 base align=4 QPen (0x1f13740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x389fe00) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -5929,60 +5203,20 @@ Class QTextOption base size=28 base align=8 QTextOption (0x3940a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3940e40) 0 Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x29ee080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x399aa00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a5c3c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39b27c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a5c740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39b2880) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a9b400) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39b29c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a9b700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x29f7700) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 69u entries @@ -6249,20 +5483,8 @@ QGraphicsView (0x3745a40) 0 QPaintDevice (0x3b65c40) 8 vptr=((&QGraphicsView::_ZTV13QGraphicsView) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3b9d1c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3c05440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3734a80) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 9u entries @@ -6291,10 +5513,6 @@ Class QIcon base size=4 base align=4 QIcon (0x1f13540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3c91400) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -6450,10 +5668,6 @@ QImageIOPlugin (0x3caffc0) 0 QFactoryInterface (0x3cce080) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x3cce040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3cce240) 0 Class QImageReader size=4 align=4 @@ -6631,15 +5845,7 @@ QActionGroup (0x3d9f1c0) 0 QObject (0x3dde540) 0 primary-for QActionGroup (0x3d9f1c0) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3e07000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31e2d80) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -6948,10 +6154,6 @@ QAbstractSpinBox (0x3ec8100) 0 QPaintDevice (0x3ec81c0) 8 vptr=((&QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3ec86c0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 68u entries @@ -7167,15 +6369,7 @@ QStyle (0x31b09c0) 0 QObject (0x3f91340) 0 primary-for QStyle (0x31b09c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f91c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3fb5e40) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 71u entries @@ -7446,10 +6640,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x4115f40) 0 QStyleOption (0x4115f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412b440) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -7476,10 +6666,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x4173740) 0 QStyleOption (0x4173780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4198240) 0 Class QStyleOptionButton size=64 align=4 @@ -7487,10 +6673,6 @@ Class QStyleOptionButton QStyleOptionButton (0x41980c0) 0 QStyleOption (0x4198100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4198b80) 0 Class QStyleOptionTab size=72 align=4 @@ -7505,10 +6687,6 @@ QStyleOptionTabV2 (0x41f02c0) 0 QStyleOptionTab (0x41f0300) 0 QStyleOption (0x41f0340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41f0a80) 0 Class QStyleOptionToolBar size=68 align=4 @@ -7535,10 +6713,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x4240800) 0 QStyleOption (0x4240840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4290240) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -7564,10 +6738,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x42dd240) 0 QStyleOption (0x42dd280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42dd940) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -7608,15 +6778,7 @@ QStyleOptionSpinBox (0x435c5c0) 0 QStyleOptionComplex (0x435c600) 0 QStyleOption (0x435c640) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x435cc80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x435cb80) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -7625,10 +6787,6 @@ QStyleOptionQ3ListView (0x435cac0) 0 QStyleOptionComplex (0x435cb00) 0 QStyleOption (0x435cb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x438f740) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7719,10 +6877,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x4467380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x44959c0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -7753,20 +6907,8 @@ QItemSelectionModel (0x4495dc0) 0 QObject (0x4495e00) 0 primary-for QItemSelectionModel (0x4495dc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44d2140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x44d2fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x44d2ec0) 0 Class QItemSelection size=4 align=4 @@ -7900,10 +7042,6 @@ QAbstractItemView (0x4525640) 0 QPaintDevice (0x4525780) 8 vptr=((&QAbstractItemView::_ZTV17QAbstractItemView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x454e480) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -8245,15 +7383,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x46a4200) 0 nearly-empty vptr=((&QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x46a4f00) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x46a4d00) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8398,15 +7528,7 @@ QListView (0x46c3680) 0 QPaintDevice (0x46c3800) 8 vptr=((&QListView::_ZTV9QListView) + 400u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x46e2e40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x46e2cc0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -8703,15 +7825,7 @@ Class QStandardItem QStandardItem (0x481b3c0) 0 vptr=((&QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x48cf880) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x481b8c0) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -9241,35 +8355,15 @@ QTreeView (0x4a4e980) 0 QPaintDevice (0x4a4eb00) 8 vptr=((&QTreeView::_ZTV9QTreeView) + 408u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4a7aec0) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x4a7aa80) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x4aafcc0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x4aafb40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4aaff00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4aaf9c0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -10158,15 +9252,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x399a840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e12ec0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4e3a4c0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 26u entries @@ -10203,20 +9289,12 @@ Class QPaintEngine QPaintEngine (0x2d1eb00) 0 vptr=((&QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4e3a940) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x4e12c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4e12dc0) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 9u entries @@ -10313,10 +9391,6 @@ QCommonStyle (0x4f8bc40) 0 QObject (0x4f8bcc0) 0 primary-for QStyle (0x4f8bc80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x4fc5500) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10690,30 +9764,14 @@ Class QTextLength base size=16 base align=8 QTextLength (0x1f13780) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x5135f80) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x1f137c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x5149900) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x5135a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5135600) 0 Class QTextCharFormat size=8 align=4 @@ -10768,15 +9826,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x30bcdc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x52e1780) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x52e1400) 0 Class QTextLine size=8 align=4 @@ -10826,15 +9876,7 @@ QTextDocument (0x3827300) 0 QObject (0x530efc0) 0 primary-for QTextDocument (0x3827300) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5323500) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x5394700) 0 Class QTextCursor size=4 align=4 @@ -10846,15 +9888,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x5394c00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x5394ec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x5394d40) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -11016,10 +10050,6 @@ QTextFrame (0x530e7c0) 0 QObject (0x543b180) 0 primary-for QTextObject (0x543b140) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5463700) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -11044,25 +10074,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x52bbc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5494f80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x54af100) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x5402280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x54afb80) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -12056,10 +11074,6 @@ QDateEdit (0x576e940) 0 QPaintDevice (0x576ea80) 8 vptr=((&QDateEdit::_ZTV9QDateEdit) + 268u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5743c40) 0 Vtable for QDial QDial::_ZTV5QDial: 68u entries @@ -12228,10 +11242,6 @@ QDialogButtonBox (0x57dfbc0) 0 QPaintDevice (0x57dfc80) 8 vptr=((&QDialogButtonBox::_ZTV16QDialogButtonBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x57dfd80) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 67u entries @@ -12315,10 +11325,6 @@ QDockWidget (0x5835a00) 0 QPaintDevice (0x5835ac0) 8 vptr=((&QDockWidget::_ZTV11QDockWidget) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5835f40) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 67u entries @@ -12488,10 +11494,6 @@ QFontComboBox (0x59123c0) 0 QPaintDevice (0x59124c0) 8 vptr=((&QFontComboBox::_ZTV13QFontComboBox) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x59128c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 67u entries @@ -14136,10 +13138,6 @@ QTextEdit (0x54afdc0) 0 QPaintDevice (0x5d6cb00) 8 vptr=((&QTextEdit::_ZTV9QTextEdit) + 264u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5d972c0) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 78u entries @@ -14577,178 +13575,38 @@ QWorkspace (0x5f2ae40) 0 QPaintDevice (0x5f2af00) 8 vptr=((&QWorkspace::_ZTV10QWorkspace) + 240u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1400440) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x15f0480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x621e100) 0 empty -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x2de04c0) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x2e22900) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x36cb900) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x3a5c340) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x3a5c6c0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x3a9b380) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x3a9b680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4aafec0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x4aafc40) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x5149880) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x52e1700) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x5394e40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3ddefc0) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x46a4e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6839c40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6839fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x686e800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x686e9c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x686ef00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6896940) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x177cf40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x202a440) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x6896fc0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x68cb280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x68cb4c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3c05400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x68cb740) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x435cc40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44d2f80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x48cf840) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x68cbe40) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x697e400) 0 diff --git a/tests/auto/bic/data/QtGui.4.3.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtGui.4.3.0.linux-gcc-ia32.txt index 9eac0b099..1d72f2aeb 100644 --- a/tests/auto/bic/data/QtGui.4.3.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtGui.4.3.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f02d80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f02dc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f02e80) 0 empty - QUintForSize<4> (0xb7f02ec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f02f40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f02f80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb77fd040) 0 empty - QIntForSize<4> (0xb77fd080) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77fd340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77fd780) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb77fd7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77fd8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77fd900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77fd940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77fd980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77fd9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77fda00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77fda40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77fda80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77fdac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77fdb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77fdb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77fdb80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77fdbc0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb77fdcc0) 0 QGenericArgument (0xb77fdd00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb77fdec0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb77fdf80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b21000) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6b21300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b21340) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb6b21380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b21580) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb6b21680) 0 QString (0xb6b216c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b21700) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb6b21a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6b21dc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6b21d40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb6b214c0) 0 QObject (0xb6b21500) 0 primary-for QLibrary (0xb6b214c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b21840) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb6b21c00) 0 QObject (0xb6b21e40) 0 primary-for QIODevice (0xb6b21c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6541000) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb65410c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6541100) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6541140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6541200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6541180) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb6541240) 0 QList (0xb6541280) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6541300) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6541340) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb65416c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6541700) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb6541c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6541d00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6541d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6541e00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6541e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6541f00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb6541f40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6541fc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6541080) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6541f80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6541440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6541580) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6541ac0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6541c80) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6541cc0) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb6541dc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6541e80) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6541ec0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb650a000) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb650a0c0) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb650a080) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb650a040) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb650a100) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb650a180) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb650a140) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb650a1c0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb650a240) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb650a200) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb650a280) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb650a2c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb650a300) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb650a580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb650a780) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb650a800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb650aa00) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb650adc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb650ae00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb650ae40) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb613d040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb613d280) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb613d2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb613d500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb613d640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb613d740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb613d780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb613d840) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb613d880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb613d8c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb613d900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb613d940) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb613dcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb613dd00) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb613de40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb613dec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb613df00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb613df40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613d800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb613db40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5fae7c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb5fae800) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5faea80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5faeac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5faebc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5faeb40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb5faecc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb5faec40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb5faed40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5faedc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb5faee00) 0 QObject (0xb5faee40) 0 primary-for QSettings (0xb5faee00) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb5faef40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5faef00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb5faef80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5faefc0) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb5faea00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb5faee80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb5faea40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb5e8d000) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5e8d040) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb5e8d080) 0 QObject (0xb5e8d100) 0 primary-for QIODevice (0xb5e8d0c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5e8d180) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb5e8d300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5e8d340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e8d380) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5e8d440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5e8d3c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb5e8d480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5e8d500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5e8d580) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb5e8d7c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5e8d880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb5e8d8c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5e8da40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb5e8db00) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5e8dc40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb5e8db80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5e8dd80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5e8dd00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb5e8de40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5e8df00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb5ccc0c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb5ccc140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb5ccc100) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb5ccc1c0) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb5ccc200) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb5ccc280) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb5ccc580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5ccc5c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb5ccc6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5ccc700) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb5ccc740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5ccc7c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb5cccc40) 0 QObject (0xb5cccc80) 0 primary-for QEventLoop (0xb5cccc40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5cccd80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb5ccce00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5cccec0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb5cccf80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a48000) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb5a48080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a480c0) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2726,25 +2016,13 @@ QImageIOPlugin (0xb5a48500) 0 QFactoryInterface (0xb5a485c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb5a48580) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a48640) 0 Class QImageReader size=4 align=4 base size=4 base align=4 QImageReader (0xb5a48680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5a48740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5a486c0) 0 Class QPolygon size=4 align=4 @@ -2752,15 +2030,7 @@ Class QPolygon QPolygon (0xb5a48780) 0 QVector (0xb5a487c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5a48880) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5a48800) 0 Class QPolygonF size=4 align=4 @@ -2783,10 +2053,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb5a48ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a48b00) 0 empty Class QPainterPath::Element size=20 align=4 @@ -2798,25 +2064,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb5a48b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5a48dc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5a48d40) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb5a48c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a48e00) 0 empty Class QPainterPathStroker size=4 align=4 @@ -2828,10 +2082,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb5a48f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a48f40) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2872,30 +2122,10 @@ QImage (0xb5a483c0) 0 QPaintDevice (0xb5a48480) 0 primary-for QImage (0xb5a483c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a48980) 0 empty -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5a48a40) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5a48bc0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5a48c00) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb5a48a00) 0 Class QColor size=16 align=4 @@ -3083,10 +2313,6 @@ Class QIcon base size=4 base align=4 QIcon (0xb5827940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5827a00) 0 empty Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -3225,10 +2451,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb5827f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5827000) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3526,15 +2748,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb576c840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb576c940) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb576c8c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3823,20 +3037,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb57e9040) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57e90c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57e9100) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb57e9140) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3867,20 +3069,8 @@ QAccessibleInterface (0xb57e9200) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb57e9240) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb57e93c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb57e9340) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb57e92c0) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -4402,55 +3592,23 @@ Class QPen base size=4 base align=4 QPen (0xb569f500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb569f5c0) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0xb569f600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb569f640) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb569f680) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb569f7c0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb569f740) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb569f840) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb569f880) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb569f8c0) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb569f800) 0 Class QGradient size=56 align=4 @@ -4480,30 +3638,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb569fa80) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb569fbc0) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb569fb40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb569fd40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb569fcc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb569fd80) 0 Class QTextCharFormat size=8 align=4 @@ -4643,10 +3785,6 @@ QTextFrame (0xb569fc40) 0 QObject (0xb541c040) 0 primary-for QTextObject (0xb541c000) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb541c180) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -4671,25 +3809,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb541c240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb541c2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb541c300) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb541c340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb541c380) 0 empty Class QTextDocumentFragment size=4 align=4 @@ -4756,10 +3882,6 @@ QTextTable (0xb541c500) 0 QObject (0xb541c5c0) 0 primary-for QTextObject (0xb541c580) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb541c740) 0 Class QTextCursor size=4 align=4 @@ -4808,10 +3930,6 @@ Class QTextOption base size=24 base align=4 QTextOption (0xb541c980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb541c9c0) 0 Class QTextInlineObject size=8 align=4 @@ -4828,15 +3946,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb541ca40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb541cbc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb541cb40) 0 Class QTextLine size=8 align=4 @@ -4886,10 +3996,6 @@ QTextDocument (0xb541cd00) 0 QObject (0xb541cd40) 0 primary-for QTextDocument (0xb541cd00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb541cdc0) 0 Class QPalette size=8 align=4 @@ -4907,15 +4013,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb541cfc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb541c700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb541c480) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4977,10 +4075,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb541ce40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53c00c0) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5028,15 +4122,7 @@ QStyle (0xb53c0100) 0 QObject (0xb53c0140) 0 primary-for QStyle (0xb53c0100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53c0200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53c0240) 0 Vtable for QCommonStyle QCommonStyle::_ZTV12QCommonStyle: 35u entries @@ -5242,10 +4328,6 @@ QWindowsXPStyle (0xb53c0780) 0 QObject (0xb53c0880) 0 primary-for QStyle (0xb53c0840) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb53c0a40) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -5541,10 +4623,6 @@ QWidget (0xb53c0040) 0 QPaintDevice (0xb53c01c0) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53c0480) 0 Vtable for QValidator QValidator::_ZTV10QValidator: 16u entries @@ -5745,10 +4823,6 @@ QAbstractSpinBox (0xb51a4140) 0 QPaintDevice (0xb51a4200) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51a4280) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6167,10 +5241,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb51a4ac0) 0 QStyleOption (0xb51a4b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51a4c80) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6197,10 +5267,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb51a4f00) 0 QStyleOption (0xb51a4f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51a4240) 0 Class QStyleOptionButton size=64 align=4 @@ -6208,10 +5274,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb51a4000) 0 QStyleOption (0xb51a4100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51a46c0) 0 Class QStyleOptionTab size=72 align=4 @@ -6226,10 +5288,6 @@ QStyleOptionTabV2 (0xb51a4840) 0 QStyleOptionTab (0xb51a4980) 0 QStyleOption (0xb51a4a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51a4fc0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6256,10 +5314,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb4ee8200) 0 QStyleOption (0xb4ee8240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ee8380) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6292,10 +5346,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb4ee86c0) 0 QStyleOption (0xb4ee8700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ee8880) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -6351,15 +5401,7 @@ QStyleOptionSpinBox (0xb4ee8f80) 0 QStyleOptionComplex (0xb4ee8fc0) 0 QStyleOption (0xb4ee8000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4ee8540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4ee83c0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6368,10 +5410,6 @@ QStyleOptionQ3ListView (0xb4ee8100) 0 QStyleOptionComplex (0xb4ee8280) 0 QStyleOption (0xb4ee8340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ee8e00) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6488,10 +5526,6 @@ Class QStyleFactory base size=0 base align=1 QStyleFactory (0xb4fd0780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4fd0840) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -6663,10 +5697,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb4fd0b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fd0bc0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6697,20 +5727,8 @@ QItemSelectionModel (0xb4fd0c00) 0 QObject (0xb4fd0c40) 0 primary-for QItemSelectionModel (0xb4fd0c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4fd0cc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4fd0d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4fd0d00) 0 Class QItemSelection size=4 align=4 @@ -6872,10 +5890,6 @@ QAbstractItemView (0xb4fd0f00) 0 QPaintDevice (0xb4fd0180) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4fd03c0) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -7140,15 +6154,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb4d1e280) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb4d1e540) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb4d1e4c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7296,15 +6302,7 @@ Class QTableWidgetSelectionRange base size=16 base align=4 QTableWidgetSelectionRange (0xb4d1e800) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4d1e940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4d1e8c0) 0 Vtable for QTableWidgetItem QTableWidgetItem::_ZTV16QTableWidgetItem: 10u entries @@ -7790,15 +6788,7 @@ Class QStandardItem QStandardItem (0xb4d1edc0) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4c75100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4c75080) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -7926,25 +6916,9 @@ QDirModel (0xb4c75300) 0 QObject (0xb4c75380) 0 primary-for QAbstractItemModel (0xb4c75340) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4c75500) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4c75480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4c75600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4c75580) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8540,15 +7514,7 @@ QActionGroup (0xb4c75440) 0 QObject (0xb4c75540) 0 primary-for QActionGroup (0xb4c75440) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4c75b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4c75880) 0 Vtable for QLayoutItem QLayoutItem::_ZTV11QLayoutItem: 18u entries @@ -9687,10 +8653,6 @@ QMdiArea (0xb47f60c0) 0 QPaintDevice (0xb47f6200) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47f6280) 0 Vtable for QAbstractButton QAbstractButton::_ZTV15QAbstractButton: 66u entries @@ -10012,10 +8974,6 @@ QMdiSubWindow (0xb47f66c0) 0 QPaintDevice (0xb47f6780) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47f6800) 0 Vtable for QCalendarWidget QCalendarWidget::_ZTV15QCalendarWidget: 64u entries @@ -10493,10 +9451,6 @@ QDialogButtonBox (0xb47f6f80) 0 QPaintDevice (0xb47f6240) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47f63c0) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -10576,10 +9530,6 @@ QDockWidget (0xb47f6540) 0 QPaintDevice (0xb47f6980) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47f6c40) 0 Vtable for QScrollArea QScrollArea::_ZTV11QScrollArea: 65u entries @@ -10930,10 +9880,6 @@ QDateEdit (0xb47b6440) 0 QPaintDevice (0xb47b6580) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47b6600) 0 Vtable for QFontComboBox QFontComboBox::_ZTV13QFontComboBox: 65u entries @@ -11017,10 +9963,6 @@ QFontComboBox (0xb47b6640) 0 QPaintDevice (0xb47b6740) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47b67c0) 0 Vtable for QToolBox QToolBox::_ZTV8QToolBox: 65u entries @@ -11275,10 +10217,6 @@ QTextEdit (0xb47b6ac0) 0 QPaintDevice (0xb47b6c00) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47b6d00) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -12210,10 +11148,6 @@ QMainWindow (0xb44ff980) 0 QPaintDevice (0xb44ffa40) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44ffac0) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12786,20 +11720,8 @@ Class QGraphicsItem QGraphicsItem (0xb44485c0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44486c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4448700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb44487c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -13361,50 +12283,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb4448480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4448600) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4448a00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4448680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4448dc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4448c00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb43bc040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4448f80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb43bc140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb43bc0c0) 0 Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -13451,20 +12337,8 @@ QGraphicsScene (0xb43bc180) 0 QObject (0xb43bc1c0) 0 primary-for QGraphicsScene (0xb43bc180) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43bc2c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb43bc380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb43bc300) 0 Vtable for QGraphicsView QGraphicsView::_ZTV13QGraphicsView: 68u entries @@ -13553,15 +12427,7 @@ QGraphicsView (0xb43bc3c0) 0 QPaintDevice (0xb43bc500) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43bc5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43bc600) 0 Vtable for QGraphicsItemAnimation QGraphicsItemAnimation::_ZTV22QGraphicsItemAnimation: 16u entries @@ -13921,10 +12787,6 @@ QAbstractPrintDialog (0xb43bcb40) 0 QPaintDevice (0xb43bcc40) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43bcd00) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -14183,10 +13045,6 @@ QWizard (0xb43bc580) 0 QPaintDevice (0xb43bcb00) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43bccc0) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -14354,10 +13212,6 @@ QFileDialog (0xb4192100) 0 QPaintDevice (0xb4192200) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41922c0) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -14694,10 +13548,6 @@ QMessageBox (0xb41927c0) 0 QPaintDevice (0xb41928c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4192980) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -15173,15 +14023,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb40cb300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb40cb340) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40cb400) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -15216,20 +14058,12 @@ Class QPaintEngine QPaintEngine (0xb40cb380) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40cb500) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb40cb480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40cb540) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26u entries @@ -15336,188 +14170,40 @@ QInputContextPlugin (0xb40cb740) 0 QFactoryInterface (0xb40cb800) 8 nearly-empty primary-for QInputContextFactoryInterface (0xb40cb7c0) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb40cb8c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb40cb940) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb40cb9c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb40cba40) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb40cbac0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb40cbc40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb40cbcc0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb40cbd40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb40cbf40) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb40cbfc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb40cb100) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb40cb4c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb40cb700) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb40cbb40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb3c80040) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb3c80100) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb3c80180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3c80200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3c802c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3c803c0) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb3c80480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3c80500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3c80580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3c80600) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3c80680) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb3c80700) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb3c807c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3c80880) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb3c80940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3c80a00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3c80a80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3c80b40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3c80c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3c80c80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3c80d00) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb3c80d80) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb3c80e00) 0 diff --git a/tests/auto/bic/data/QtGui.4.3.1.linux-gcc-ia32.txt b/tests/auto/bic/data/QtGui.4.3.1.linux-gcc-ia32.txt index 74254cbb6..a9d6878dd 100644 --- a/tests/auto/bic/data/QtGui.4.3.1.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtGui.4.3.1.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f34d80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f34dc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f34e80) 0 empty - QUintForSize<4> (0xb7f34ec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f34f40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f34f80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7430040) 0 empty - QIntForSize<4> (0xb7430080) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7430340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7430400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7430440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7430480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74304c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7430500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7430540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7430580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74305c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7430600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7430640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7430680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74306c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7430700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7430740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7430780) 0 empty Class QFlag size=4 align=4 @@ -161,10 +75,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb7430bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7430c00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -227,70 +137,18 @@ Class QListData base size=4 base align=4 QListData (0xb7430f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf400) 0 Class QInternal size=1 align=1 @@ -308,10 +166,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb69bf500) 0 QGenericArgument (0xb69bf540) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb69bf700) 0 Class QMetaObject size=16 align=4 @@ -328,10 +182,6 @@ Class QChar base size=2 base align=2 QChar (0xb69bf7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69bf840) 0 empty Class QString::Null size=1 align=1 @@ -348,10 +198,6 @@ Class QString base size=4 base align=4 QString (0xb69bf880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bfa80) 0 Class QLatin1String size=4 align=4 @@ -369,25 +215,13 @@ Class QConstString QConstString (0xb69bfb40) 0 QString (0xb69bfb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69bfbc0) 0 empty Class QStringRef size=12 align=4 base size=12 base align=4 QStringRef (0xb69bfc00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb69bfd40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb69bfcc0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -479,10 +313,6 @@ QIODevice (0xb69bff80) 0 QObject (0xb69bffc0) 0 primary-for QIODevice (0xb69bff80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bf000) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -502,275 +332,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb69bfa00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a20c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a21c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a22c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a23c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a24c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a25c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a26c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a27c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a28c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a29c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb65a2d40) 0 empty Class QMapData::Node size=8 align=4 @@ -807,45 +421,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb65e3200) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb65e3480) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb65e34c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb65e35c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb65e3540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb65e36c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb65e3640) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb65e3740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65e37c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -972,10 +558,6 @@ QEventLoop (0xb65e3c40) 0 QObject (0xb65e3c80) 0 primary-for QEventLoop (0xb65e3c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65e3d80) 0 Vtable for QCoreApplication QCoreApplication::_ZTV16QCoreApplication: 16u entries @@ -1009,10 +591,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb65e3f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65e3f80) 0 empty Vtable for QTimer QTimer::_ZTV6QTimer: 14u entries @@ -1069,20 +647,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb65e3440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65e3340) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb65e3400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65e3840) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1277,20 +847,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb63df080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63df0c0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb63df100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63df140) 0 empty Class QMetaProperty size=20 align=4 @@ -1302,10 +864,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb63df1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63df200) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1408,100 +966,48 @@ Class QSize base size=8 base align=4 QSize (0xb63df500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63df700) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb63df780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63df980) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb63dfa40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63dfc80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb63dfcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63dff00) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb63dff40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63df040) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb63df2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63df380) 0 empty -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb63df540) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb63df580) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb63df440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb63df5c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb63df600) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb63df640) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb63df680) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb63df6c0) 0 Class timespec size=8 align=4 @@ -1513,80 +1019,24 @@ Class timeval base size=8 base align=4 timeval (0xb63df800) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb63df840) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb63df880) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb63df8c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb63dfa80) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb63df940) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb63df900) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb63dfac0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb63dfb40) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb63dfb00) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb63dfb80) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb63dfc00) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb63dfbc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb63dfc40) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb63dfd00) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb63dfd40) 0 Class random_data size=28 align=4 @@ -1618,35 +1068,19 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb62001c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6200200) 0 empty Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb6200980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb62009c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6200a00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6200ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6200a40) 0 Class QStringList size=4 align=4 @@ -1654,15 +1088,7 @@ Class QStringList QStringList (0xb6200b00) 0 QList (0xb6200b40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6200bc0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6200c00) 0 Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1695,15 +1121,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6200e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6200e40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6200e80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1730,10 +1148,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb5fdc000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5fdc040) 0 empty Class QCryptographicHash size=4 align=4 @@ -1750,20 +1164,12 @@ Class QLine base size=16 base align=4 QLine (0xb5fdc480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5fdc4c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb5fdc500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5fdc540) 0 empty Class QSharedData size=4 align=4 @@ -1775,30 +1181,18 @@ Class QDate base size=4 base align=4 QDate (0xb5fdc6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5fdc780) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb5fdc7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5fdc880) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb5fdc8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5fdc980) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1810,20 +1204,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb5fdca00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb5fdca80) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb5fdca40) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb5fdcb00) 0 Class QWriteLocker size=4 align=4 @@ -1876,20 +1262,12 @@ Class QMutex base size=4 base align=4 QMutex (0xb5fdcd40) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb5fdcdc0) 0 Class QMutexLocker size=4 align=4 base size=4 base align=4 QMutexLocker (0xb5fdcd80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5fdcec0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1914,15 +1292,7 @@ Class QTextCodec QTextCodec (0xb5fdce00) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5fdc3c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5fdcf80) 0 Class QTextEncoder size=32 align=4 @@ -1934,25 +1304,9 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb5fdc740) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb5fdc840) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5fdc800) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb5fdc900) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5fdc940) 0 Class __gconv_trans_data size=20 align=4 @@ -1974,15 +1328,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb5dcd000) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb5dcd080) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb5dcd040) 0 Class _IO_marker size=12 align=4 @@ -1994,10 +1340,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb5dcd100) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5dcd140) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -2012,10 +1354,6 @@ Class QTextStream QTextStream (0xb5dcd180) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5dcd240) 0 Class QTextStreamManipulator size=24 align=4 @@ -2131,35 +1469,15 @@ QFile (0xb5dcd680) 0 QObject (0xb5dcd700) 0 primary-for QIODevice (0xb5dcd6c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5dcd780) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb5dcd7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5dcd800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5dcd840) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5dcd900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5dcd880) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -2212,15 +1530,7 @@ Class QDir base size=4 base align=4 QDir (0xb5dcda80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5dcdb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5dcdb80) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2277,10 +1587,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb5dcdbc0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5dcdd40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2409,15 +1715,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb5dcd200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5dcd480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5dcd580) 0 empty Vtable for QDirIterator QDirIterator::_ZTV12QDirIterator: 4u entries @@ -2432,10 +1730,6 @@ Class QDirIterator QDirIterator (0xb5dcd640) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5dcda40) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -2541,10 +1835,6 @@ QLibrary (0xb5c3d140) 0 QObject (0xb5c3d180) 0 primary-for QLibrary (0xb5c3d140) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5c3d200) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2674,10 +1964,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb5c3d740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5c3d840) 0 Vtable for QLayoutItem QLayoutItem::_ZTV11QLayoutItem: 18u entries @@ -3103,40 +2389,16 @@ Class QPaintDevice QPaintDevice (0xb5c3d480) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5c3d800) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5c3d8c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5c3d980) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb5c3d7c0) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0xb5c3d700) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5c3dcc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5c3da40) 0 Class QPolygon size=4 align=4 @@ -3144,15 +2406,7 @@ Class QPolygon QPolygon (0xb5c3de00) 0 QVector (0xb5c3df80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb59ff080) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb59ff000) 0 Class QPolygonF size=4 align=4 @@ -3175,10 +2429,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb59ff2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb59ff300) 0 empty Class QPainterPath::Element size=20 align=4 @@ -3190,25 +2440,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb59ff340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb59ff5c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb59ff540) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb59ff440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb59ff600) 0 empty Class QPainterPathStroker size=4 align=4 @@ -3220,10 +2458,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb59ff700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb59ff740) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3248,10 +2482,6 @@ QImage (0xb59ff800) 0 QPaintDevice (0xb59ff840) 0 primary-for QImage (0xb59ff800) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb59ff980) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -3276,45 +2506,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb59ffb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb59ffbc0) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb59ffc00) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb59ffd40) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb59ffcc0) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb59ffdc0) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb59ffe00) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb59ffe40) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb59ffd80) 0 Class QGradient size=56 align=4 @@ -3380,10 +2582,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb59ffa80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb59ffac0) 0 empty Class QWidgetData size=64 align=4 @@ -3466,10 +2664,6 @@ QWidget (0xb59ffc80) 0 QPaintDevice (0xb584c040) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb584c240) 0 Class QToolTip size=1 align=1 @@ -3558,10 +2752,6 @@ Class QIcon base size=4 base align=4 QIcon (0xb584c4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb584c580) 0 empty Vtable for QAction QAction::_ZTV7QAction: 14u entries @@ -3613,15 +2803,7 @@ QActionGroup (0xb584c6c0) 0 QObject (0xb584c700) 0 primary-for QActionGroup (0xb584c6c0) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb584c840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb584c7c0) 0 Vtable for QShortcut QShortcut::_ZTV9QShortcut: 14u entries @@ -3961,15 +3143,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb56181c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb56182c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5618240) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -4663,10 +3837,6 @@ QAbstractPrintDialog (0xb54cb100) 0 QPaintDevice (0xb54cb200) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54cb2c0) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -4837,10 +4007,6 @@ QMessageBox (0xb54cb4c0) 0 QPaintDevice (0xb54cb5c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54cb680) 0 Vtable for QProgressDialog QProgressDialog::_ZTV15QProgressDialog: 66u entries @@ -5091,10 +4257,6 @@ QFileDialog (0xb54cb9c0) 0 QPaintDevice (0xb54cbac0) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54cbb80) 0 Vtable for QErrorMessage QErrorMessage::_ZTV13QErrorMessage: 66u entries @@ -5505,10 +4667,6 @@ QWizard (0xb54cb800) 0 QPaintDevice (0xb54cbe40) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54cbf80) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -5850,10 +5008,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb5434600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5434680) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5884,20 +5038,8 @@ QItemSelectionModel (0xb54346c0) 0 QObject (0xb5434700) 0 primary-for QItemSelectionModel (0xb54346c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5434780) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5434840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb54347c0) 0 Class QItemSelection size=4 align=4 @@ -6104,10 +5246,6 @@ QAbstractSpinBox (0xb5434cc0) 0 QPaintDevice (0xb5434d80) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5434e00) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6315,15 +5453,7 @@ QStyle (0xb54345c0) 0 QObject (0xb5434740) 0 primary-for QStyle (0xb54345c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5434a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5434b80) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -6582,10 +5712,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb51c0440) 0 QStyleOption (0xb51c0480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51c0600) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6612,10 +5738,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb51c0880) 0 QStyleOption (0xb51c08c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51c0a40) 0 Class QStyleOptionButton size=64 align=4 @@ -6623,10 +5745,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb51c0980) 0 QStyleOption (0xb51c09c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51c0bc0) 0 Class QStyleOptionTab size=72 align=4 @@ -6641,10 +5759,6 @@ QStyleOptionTabV2 (0xb51c0c40) 0 QStyleOptionTab (0xb51c0c80) 0 QStyleOption (0xb51c0cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51c0e40) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6671,10 +5785,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb51c0300) 0 QStyleOption (0xb51c0400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51c0780) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6707,10 +5817,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb50cc000) 0 QStyleOption (0xb50cc040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb50cc1c0) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -6766,15 +5872,7 @@ QStyleOptionSpinBox (0xb50cc8c0) 0 QStyleOptionComplex (0xb50cc900) 0 QStyleOption (0xb50cc940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb50ccb40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb50ccac0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6783,10 +5881,6 @@ QStyleOptionQ3ListView (0xb50cc9c0) 0 QStyleOptionComplex (0xb50cca00) 0 QStyleOption (0xb50cca40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb50ccd00) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7000,10 +6094,6 @@ QAbstractItemView (0xb4f8b080) 0 QPaintDevice (0xb4f8b1c0) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f8b280) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -7384,20 +6474,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb4f8bb80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f8bc00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f8bc40) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4f8bc80) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -7428,20 +6506,8 @@ QAccessibleInterface (0xb4f8bd40) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb4f8bd80) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb4f8bf00) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb4f8be80) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb4f8be00) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -8862,10 +7928,6 @@ QDateEdit (0xb4d85980) 0 QPaintDevice (0xb4d85ac0) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d85b40) 0 Vtable for QButtonGroup QButtonGroup::_ZTV12QButtonGroup: 14u entries @@ -8970,10 +8032,6 @@ QDockWidget (0xb4d85c40) 0 QPaintDevice (0xb4d85d00) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d85dc0) 0 Vtable for QMainWindow QMainWindow::_ZTV11QMainWindow: 64u entries @@ -9054,10 +8112,6 @@ QMainWindow (0xb4d85e00) 0 QPaintDevice (0xb4d85ec0) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d85f40) 0 Vtable for QMenu QMenu::_ZTV5QMenu: 63u entries @@ -9867,10 +8921,6 @@ QFontComboBox (0xb4cf4900) 0 QPaintDevice (0xb4cf4a00) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4cf4a80) 0 Vtable for QToolBox QToolBox::_ZTV8QToolBox: 65u entries @@ -10277,10 +9327,6 @@ QMdiArea (0xb4cf4000) 0 QPaintDevice (0xb4cf4700) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4cf4880) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10597,10 +9643,6 @@ QMdiSubWindow (0xb4a65300) 0 QPaintDevice (0xb4a653c0) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4a65440) 0 Vtable for QMenuItem QMenuItem::_ZTV9QMenuItem: 14u entries @@ -10672,60 +9714,32 @@ QTextDocument (0xb4a65640) 0 QObject (0xb4a65680) 0 primary-for QTextDocument (0xb4a65640) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4a65700) 0 Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0xb4a65740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4a65780) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0xb4a657c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a65880) 0 empty Class QTextLength size=12 align=4 base size=12 base align=4 QTextLength (0xb4a658c0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4a65a00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb4a65980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a65b80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a65b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4a65bc0) 0 Class QTextCharFormat size=8 align=4 @@ -10765,10 +9779,6 @@ QTextTableFormat (0xb4a65ec0) 0 QTextFrameFormat (0xb4a65f00) 0 QTextFormat (0xb4a65f40) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4a65040) 0 Class QTextCursor size=4 align=4 @@ -10875,10 +9885,6 @@ QTextFrame (0xb4a65840) 0 QObject (0xb4a65940) 0 primary-for QTextObject (0xb4a65900) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a65fc0) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -10903,25 +9909,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb4870080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4870100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4870140) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb4870180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb48701c0) 0 empty Class QTextInlineObject size=8 align=4 @@ -10938,15 +9932,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb4870240) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb48703c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4870340) 0 Class QTextLine size=8 align=4 @@ -11046,10 +10032,6 @@ QTextEdit (0xb4870440) 0 QPaintDevice (0xb4870580) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4870680) 0 Vtable for QLCDNumber QLCDNumber::_ZTV10QLCDNumber: 63u entries @@ -11289,10 +10271,6 @@ QDialogButtonBox (0xb48709c0) 0 QPaintDevice (0xb4870a80) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4870b00) 0 Vtable for QCalendarWidget QCalendarWidget::_ZTV15QCalendarWidget: 64u entries @@ -11556,15 +10534,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb4870980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4870fc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4870c80) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -11788,20 +10758,8 @@ Class QGraphicsItem QGraphicsItem (0xb47ca6c0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47ca7c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb47ca800) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb47ca8c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -12363,50 +11321,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb47ca780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47caa00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb47cae00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb47cac00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4564040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb47caf80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4564140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb45640c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4564240) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb45641c0) 0 Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -12453,20 +11375,8 @@ QGraphicsScene (0xb4564280) 0 QObject (0xb45642c0) 0 primary-for QGraphicsScene (0xb4564280) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb45643c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4564480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4564400) 0 Vtable for QGraphicsView QGraphicsView::_ZTV13QGraphicsView: 68u entries @@ -12555,15 +11465,7 @@ QGraphicsView (0xb45644c0) 0 QPaintDevice (0xb4564600) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb45646c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4564700) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -12957,10 +11859,6 @@ QImageIOPlugin (0xb44ee140) 0 QFactoryInterface (0xb44ee200) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb44ee1c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44ee280) 0 Class QImageReader size=4 align=4 @@ -13412,10 +12310,6 @@ Class QStyleFactory base size=0 base align=1 QStyleFactory (0xb44eea40) 0 empty -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb44eee80) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -13876,15 +12770,7 @@ Class QStandardItem QStandardItem (0xb43e6b00) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb43e6dc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb43e6d40) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -13998,15 +12884,7 @@ QStringListModel (0xb43e6f00) 0 QObject (0xb43e6fc0) 0 primary-for QAbstractItemModel (0xb43e6f80) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb43e6540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb43e6240) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -14530,35 +13408,15 @@ QTreeView (0xb413c580) 0 QPaintDevice (0xb413c700) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb413c800) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0xb413c780) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb413c940) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb413c8c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb413ca40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb413c9c0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -14726,15 +13584,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb413cd00) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb413cfc0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb413cf40) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -15254,15 +14104,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb40f0700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb40f0740) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40f0800) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -15297,20 +14139,12 @@ Class QPaintEngine QPaintEngine (0xb40f0780) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40f0900) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb40f0880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40f0940) 0 Class QColormap size=4 align=4 @@ -15336,188 +14170,40 @@ Class QPrintEngine QPrintEngine (0xb40f09c0) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb40f0a80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb40f0b00) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb40f0b80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb40f0c00) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb40f0c80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb40f0e00) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb40f0e80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb40f0f00) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb40f0f80) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb40f04c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb40f07c0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb40f08c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb40f0d00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3cd81c0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb3cd8240) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb3cd8300) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb3cd8380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3cd8400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3cd8480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3cd8540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3cd8640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3cd8700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3cd8780) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb3cd8800) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3cd8880) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb3cd8900) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb3cd89c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3cd8a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3cd8b00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3cd8b80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3cd8c40) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb3cd8d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3cd8dc0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3cd8e40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3cd8ec0) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb3cd8f80) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb3cd8340) 0 diff --git a/tests/auto/bic/data/QtGui.4.3.2.linux-gcc-ia32.txt b/tests/auto/bic/data/QtGui.4.3.2.linux-gcc-ia32.txt index 7fffbeaae..bdcd1823e 100644 --- a/tests/auto/bic/data/QtGui.4.3.2.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtGui.4.3.2.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7facd80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7facdc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7face80) 0 empty - QUintForSize<4> (0xb7facec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7facf40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7facf80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb78a7040) 0 empty - QIntForSize<4> (0xb78a7080) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb78a7340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a7400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a7440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a7480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a74c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a7500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a7540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a7580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a75c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a7600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a7640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a7680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a76c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a7700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a7740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78a7780) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb78a77c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78a78c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78a7900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78a7940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78a7980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78a79c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78a7a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78a7a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78a7a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78a7ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78a7b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78a7b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78a7b80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78a7bc0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb78a7cc0) 0 QGenericArgument (0xb78a7d00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb78a7ec0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb78a7f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bcb000) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6bcb300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bcb340) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb6bcb380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6bcb580) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb6bcb680) 0 QString (0xb6bcb6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bcb700) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb6bcba40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6bcbdc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6bcbd40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb6bcb4c0) 0 QObject (0xb6bcb500) 0 primary-for QLibrary (0xb6bcb4c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6bcb840) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb6bcbc00) 0 QObject (0xb6bcbe40) 0 primary-for QIODevice (0xb6bcbc00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65ec000) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb65ec0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65ec100) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb65ec140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb65ec200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb65ec180) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb65ec240) 0 QList (0xb65ec280) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb65ec300) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb65ec340) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb65ec6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65ec700) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb65ecc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65ecd00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb65ecd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65ece00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb65ece40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65ecf00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb65ecf40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb65ecfc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb65ec080) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb65ecf80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb65ec440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb65ec580) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb65ecac0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb65ecc80) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb65eccc0) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb65ecdc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb65ece80) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb65ecec0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb65b4000) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb65b40c0) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb65b4080) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb65b4040) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb65b4100) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb65b4180) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb65b4140) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb65b41c0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb65b4240) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb65b4200) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb65b4280) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb65b42c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb65b4300) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb65b4580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65b4780) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb65b4800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65b4a00) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb65b4dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65b4e00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65b4e40) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb61e7040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61e7280) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb61e72c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61e7500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb61e7640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61e7740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb61e7780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61e7840) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb61e7880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61e78c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb61e7900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61e7940) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb61e7cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61e7d00) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb61e7e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb61e7ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61e7f00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb61e7f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e70c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e71c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e73c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e74c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e76c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e77c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61e7b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb60580c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb60581c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb60582c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb60583c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb60584c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb60585c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb60586c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6058780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb60587c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6058800) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6058a80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6058ac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6058bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6058b40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6058cc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6058c40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6058d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6058dc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb6058e00) 0 QObject (0xb6058e40) 0 primary-for QSettings (0xb6058e00) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6058f40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6058f00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6058f80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6058fc0) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6058a00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6058e80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6058a40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb5f37000) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5f37040) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb5f37080) 0 QObject (0xb5f37100) 0 primary-for QIODevice (0xb5f370c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5f37180) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb5f37300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5f37340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5f37380) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5f37440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5f373c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb5f37480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5f37500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5f37580) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb5f377c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5f37880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb5f378c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5f37a40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb5f37b00) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5f37c40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb5f37b80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5f37d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5f37d00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb5f37e40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5f37f00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb5d760c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb5d76140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb5d76100) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb5d761c0) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb5d76200) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb5d76280) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb5d76580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d765c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb5d766c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d76700) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb5d76740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d767c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb5d76c40) 0 QObject (0xb5d76c80) 0 primary-for QEventLoop (0xb5d76c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5d76d80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb5d76e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d76ec0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb5d76f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5af3000) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb5af3080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5af30c0) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2726,25 +2016,13 @@ QImageIOPlugin (0xb5af3500) 0 QFactoryInterface (0xb5af35c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb5af3580) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5af3640) 0 Class QImageReader size=4 align=4 base size=4 base align=4 QImageReader (0xb5af3680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5af3740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5af36c0) 0 Class QPolygon size=4 align=4 @@ -2752,15 +2030,7 @@ Class QPolygon QPolygon (0xb5af3780) 0 QVector (0xb5af37c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5af3880) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5af3800) 0 Class QPolygonF size=4 align=4 @@ -2783,10 +2053,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb5af3ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5af3b00) 0 empty Class QPainterPath::Element size=20 align=4 @@ -2798,25 +2064,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb5af3b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5af3dc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5af3d40) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb5af3c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5af3e00) 0 empty Class QPainterPathStroker size=4 align=4 @@ -2828,10 +2082,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb5af3f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5af3f40) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2872,30 +2122,10 @@ QImage (0xb5af33c0) 0 QPaintDevice (0xb5af3480) 0 primary-for QImage (0xb5af33c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5af3980) 0 empty -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5af3a40) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5af3bc0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5af3c00) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb5af3a00) 0 Class QColor size=16 align=4 @@ -3083,10 +2313,6 @@ Class QIcon base size=4 base align=4 QIcon (0xb58d1940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb58d1a00) 0 empty Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -3225,10 +2451,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb58d1f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb58d1000) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3526,15 +2748,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb5816840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5816940) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb58168c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3823,20 +3037,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb5893040) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb58930c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5893100) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb5893140) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3867,20 +3069,8 @@ QAccessibleInterface (0xb5893200) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb5893240) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb58933c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb5893340) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb58932c0) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -4402,55 +3592,23 @@ Class QPen base size=4 base align=4 QPen (0xb5749500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb57495c0) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0xb5749600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5749680) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb57496c0) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb5749800) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb5749780) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb5749880) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb57498c0) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb5749900) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb5749840) 0 Class QGradient size=56 align=4 @@ -4480,30 +3638,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb5749ac0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb5749c00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb5749b80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5749d80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5749d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5749dc0) 0 Class QTextCharFormat size=8 align=4 @@ -4643,10 +3785,6 @@ QTextFrame (0xb5749c80) 0 QObject (0xb54c7040) 0 primary-for QTextObject (0xb54c7000) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54c7180) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -4671,25 +3809,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb54c7240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54c72c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54c7300) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb54c7340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54c7380) 0 empty Class QTextDocumentFragment size=4 align=4 @@ -4756,10 +3882,6 @@ QTextTable (0xb54c7500) 0 QObject (0xb54c75c0) 0 primary-for QTextObject (0xb54c7580) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb54c7740) 0 Class QTextCursor size=4 align=4 @@ -4808,10 +3930,6 @@ Class QTextOption base size=24 base align=4 QTextOption (0xb54c7980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54c79c0) 0 Class QTextInlineObject size=8 align=4 @@ -4828,15 +3946,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb54c7a40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb54c7bc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb54c7b40) 0 Class QTextLine size=8 align=4 @@ -4886,10 +3996,6 @@ QTextDocument (0xb54c7d00) 0 QObject (0xb54c7d40) 0 primary-for QTextDocument (0xb54c7d00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54c7dc0) 0 Class QPalette size=8 align=4 @@ -4907,15 +4013,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb54c7fc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb54c7700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb54c7480) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4977,10 +4075,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb54c7e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb546b0c0) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5028,15 +4122,7 @@ QStyle (0xb546b100) 0 QObject (0xb546b140) 0 primary-for QStyle (0xb546b100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb546b200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb546b240) 0 Vtable for QCommonStyle QCommonStyle::_ZTV12QCommonStyle: 35u entries @@ -5242,10 +4328,6 @@ QWindowsXPStyle (0xb546b780) 0 QObject (0xb546b880) 0 primary-for QStyle (0xb546b840) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb546ba40) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -5541,10 +4623,6 @@ QWidget (0xb546b040) 0 QPaintDevice (0xb546b1c0) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb546b480) 0 Vtable for QValidator QValidator::_ZTV10QValidator: 16u entries @@ -5745,10 +4823,6 @@ QAbstractSpinBox (0xb5250140) 0 QPaintDevice (0xb5250200) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5250280) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6167,10 +5241,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb5250ac0) 0 QStyleOption (0xb5250b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5250c80) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6197,10 +5267,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb5250f00) 0 QStyleOption (0xb5250f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5250240) 0 Class QStyleOptionButton size=64 align=4 @@ -6208,10 +5274,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb5250000) 0 QStyleOption (0xb5250100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb52506c0) 0 Class QStyleOptionTab size=72 align=4 @@ -6226,10 +5288,6 @@ QStyleOptionTabV2 (0xb5250840) 0 QStyleOptionTab (0xb5250980) 0 QStyleOption (0xb5250a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5250fc0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6256,10 +5314,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb4f93200) 0 QStyleOption (0xb4f93240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f93380) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6292,10 +5346,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb4f936c0) 0 QStyleOption (0xb4f93700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f93880) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -6351,15 +5401,7 @@ QStyleOptionSpinBox (0xb4f93f80) 0 QStyleOptionComplex (0xb4f93fc0) 0 QStyleOption (0xb4f93000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4f93540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4f933c0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6368,10 +5410,6 @@ QStyleOptionQ3ListView (0xb4f93100) 0 QStyleOptionComplex (0xb4f93280) 0 QStyleOption (0xb4f93340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f93e00) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6488,10 +5526,6 @@ Class QStyleFactory base size=0 base align=1 QStyleFactory (0xb507a780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb507a840) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -6663,10 +5697,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb507ab40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb507abc0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6697,20 +5727,8 @@ QItemSelectionModel (0xb507ac00) 0 QObject (0xb507ac40) 0 primary-for QItemSelectionModel (0xb507ac00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb507acc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb507ad80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb507ad00) 0 Class QItemSelection size=4 align=4 @@ -6872,10 +5890,6 @@ QAbstractItemView (0xb507af00) 0 QPaintDevice (0xb507a180) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb507a3c0) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -7140,15 +6154,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb4dc8280) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb4dc8540) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb4dc84c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7296,15 +6302,7 @@ Class QTableWidgetSelectionRange base size=16 base align=4 QTableWidgetSelectionRange (0xb4dc8800) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4dc8940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4dc88c0) 0 Vtable for QTableWidgetItem QTableWidgetItem::_ZTV16QTableWidgetItem: 10u entries @@ -7790,15 +6788,7 @@ Class QStandardItem QStandardItem (0xb4dc8dc0) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4d21100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4d21080) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -7926,25 +6916,9 @@ QDirModel (0xb4d21300) 0 QObject (0xb4d21380) 0 primary-for QAbstractItemModel (0xb4d21340) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4d21500) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4d21480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4d21600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4d21580) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8540,15 +7514,7 @@ QActionGroup (0xb4d21440) 0 QObject (0xb4d21540) 0 primary-for QActionGroup (0xb4d21440) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4d21b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4d21880) 0 Vtable for QLayoutItem QLayoutItem::_ZTV11QLayoutItem: 18u entries @@ -9687,10 +8653,6 @@ QMdiArea (0xb48a00c0) 0 QPaintDevice (0xb48a0200) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb48a0280) 0 Vtable for QAbstractButton QAbstractButton::_ZTV15QAbstractButton: 66u entries @@ -10012,10 +8974,6 @@ QMdiSubWindow (0xb48a06c0) 0 QPaintDevice (0xb48a0780) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb48a0800) 0 Vtable for QCalendarWidget QCalendarWidget::_ZTV15QCalendarWidget: 64u entries @@ -10493,10 +9451,6 @@ QDialogButtonBox (0xb48a0f80) 0 QPaintDevice (0xb48a0240) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb48a03c0) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -10576,10 +9530,6 @@ QDockWidget (0xb48a0540) 0 QPaintDevice (0xb48a0980) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb48a0c40) 0 Vtable for QScrollArea QScrollArea::_ZTV11QScrollArea: 65u entries @@ -10930,10 +9880,6 @@ QDateEdit (0xb4862440) 0 QPaintDevice (0xb4862580) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4862600) 0 Vtable for QFontComboBox QFontComboBox::_ZTV13QFontComboBox: 65u entries @@ -11017,10 +9963,6 @@ QFontComboBox (0xb4862640) 0 QPaintDevice (0xb4862740) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb48627c0) 0 Vtable for QToolBox QToolBox::_ZTV8QToolBox: 65u entries @@ -11275,10 +10217,6 @@ QTextEdit (0xb4862ac0) 0 QPaintDevice (0xb4862c00) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4862d00) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -12210,10 +11148,6 @@ QMainWindow (0xb45aa980) 0 QPaintDevice (0xb45aaa40) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb45aaac0) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12786,20 +11720,8 @@ Class QGraphicsItem QGraphicsItem (0xb44f35c0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44f36c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb44f3700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb44f37c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -13361,50 +12283,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb44f3480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44f3600) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb44f3a00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb44f3680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb44f3dc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb44f3c00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4468040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb44f3f80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4468140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb44680c0) 0 Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -13451,20 +12337,8 @@ QGraphicsScene (0xb4468180) 0 QObject (0xb44681c0) 0 primary-for QGraphicsScene (0xb4468180) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44682c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4468380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4468300) 0 Vtable for QGraphicsView QGraphicsView::_ZTV13QGraphicsView: 68u entries @@ -13553,15 +12427,7 @@ QGraphicsView (0xb44683c0) 0 QPaintDevice (0xb4468500) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44685c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4468600) 0 Vtable for QGraphicsItemAnimation QGraphicsItemAnimation::_ZTV22QGraphicsItemAnimation: 16u entries @@ -13921,10 +12787,6 @@ QAbstractPrintDialog (0xb4468b40) 0 QPaintDevice (0xb4468c40) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4468d00) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -14183,10 +13045,6 @@ QWizard (0xb4468580) 0 QPaintDevice (0xb4468b00) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4468cc0) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -14354,10 +13212,6 @@ QFileDialog (0xb423d100) 0 QPaintDevice (0xb423d200) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb423d2c0) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -14694,10 +13548,6 @@ QMessageBox (0xb423d7c0) 0 QPaintDevice (0xb423d8c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb423d980) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -15173,15 +14023,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb4178300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4178340) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4178400) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -15216,20 +14058,12 @@ Class QPaintEngine QPaintEngine (0xb4178380) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4178500) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb4178480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4178540) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26u entries @@ -15336,188 +14170,40 @@ QInputContextPlugin (0xb4178740) 0 QFactoryInterface (0xb4178800) 8 nearly-empty primary-for QInputContextFactoryInterface (0xb41787c0) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb41788c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4178940) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb41789c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb4178a40) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb4178ac0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb4178c40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb4178cc0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb4178d40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4178f40) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb4178fc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4178100) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb41784c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb4178700) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb4178b40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb3d2c040) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb3d2c100) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb3d2c180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3d2c200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3d2c2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3d2c3c0) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb3d2c480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3d2c500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3d2c580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3d2c600) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3d2c680) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb3d2c700) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb3d2c7c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3d2c880) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb3d2c940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3d2ca00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3d2ca80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3d2cb40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3d2cc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3d2cc80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3d2cd00) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb3d2cd80) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb3d2ce00) 0 diff --git a/tests/auto/bic/data/QtGui.4.4.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtGui.4.4.0.linux-gcc-ia32.txt index 255a42e92..e03d6c797 100644 --- a/tests/auto/bic/data/QtGui.4.4.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtGui.4.4.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb78b3294) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb78b32d0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7ca2c40) 0 empty - QUintForSize<4> (0xb78b3348) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb78b3474) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb78b34b0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7ca2e00) 0 empty - QIntForSize<4> (0xb78b3528) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb6a76924) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a76b04) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a76bf4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a76ce4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a76dd4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a76ec4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a76fb4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a8e0b4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a8e1a4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a8e294) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a8e384) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a8e474) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a8e564) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a8e654) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a8e744) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a8e834) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb6aab834) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ad44ec) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb698a0b4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69d81a4) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69d8438) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69d8d5c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a1f690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a1ffb4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a348e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a3e21c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a3eb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a54474) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a54d98) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a666cc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6877000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6877924) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb688c258) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb688cce4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68e0f78) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb6805c00) 0 QString (0xb6859348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6859654) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QListData base size=4 base align=4 QListData (0xb66bdd20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6766fb4) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -386,15 +228,7 @@ Class QTextCodec QTextCodec (0xb676630c) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6585618) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb65855a0) 0 Class QTextEncoder size=32 align=4 @@ -417,25 +251,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb65b3100) 0 QGenericArgument (0xb65aa834) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb65aad20) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb65aab40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb65c1e88) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb65c1e10) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -527,10 +349,6 @@ QIODevice (0xb6600f80) 0 QObject (0xb6602e88) 0 primary-for QIODevice (0xb6600f80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6637168) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -550,25 +368,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb64820b4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64978ac) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb649799c) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6497f00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6497e88) 0 Class QStringList size=4 align=4 @@ -576,15 +382,7 @@ Class QStringList QStringList (0xb64a6080) 0 QList (0xb6497f3c) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb64c3ca8) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb64c3ec4) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -664,10 +462,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb65090f0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb6509ce4) 0 Class QMutexLocker size=4 align=4 @@ -747,35 +541,11 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb63d7618) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63d76cc) 0 empty -Class - size=8 align=4 - base size=8 base align=4 - (0xb6265654) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6265744) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb62656cc) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb62657bc) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6265834) 0 Class _IO_marker size=12 align=4 @@ -787,10 +557,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb62658ac) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6265924) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -805,10 +571,6 @@ Class QTextStream QTextStream (0xb6265960) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb62b40f0) 0 Class QTextStreamManipulator size=24 align=4 @@ -845,40 +607,16 @@ QTextOStream (0xb62d91c0) 0 QTextStream (0xb62d5870) 0 primary-for QTextOStream (0xb62d91c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb62e42d0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb62e4348) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb62e4258) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb62e43c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb62e4438) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb62e44b0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb62e4528) 0 Class timespec size=8 align=4 @@ -890,80 +628,24 @@ Class timeval base size=8 base align=4 timeval (0xb62e45a0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb62e4618) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb62e4690) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb62e46cc) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb62e47f8) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb62e4780) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb62e4744) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb62e4870) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb62e4960) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb62e48e8) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb62e49d8) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb62e4ac8) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb62e4a50) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb62e4b7c) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb62e4bf4) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb62e4c6c) 0 Class random_data size=28 align=4 @@ -995,20 +677,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb6207a14) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6220654) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb62205dc) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb622099c) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -1028,10 +698,6 @@ Class QtConcurrent::ResultStoreBase QtConcurrent::ResultStoreBase (0xb6220ac8) 0 vptr=((& QtConcurrent::ResultStoreBase::_ZTVN12QtConcurrent15ResultStoreBaseE) + 8u) -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb624a168) 0 Vtable for QFutureInterfaceBase QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries @@ -1046,25 +712,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb624a1e0) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb6063880) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb624ad20) 0 - primary-for QFutureInterface (0xb6063880) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb60984b0) 0 Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1093,34 +742,7 @@ QFutureWatcherBase (0xb60ba7c0) 0 QObject (0xb60bbb40) 0 primary-for QFutureWatcherBase (0xb60ba7c0) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb60baec0) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb60baf00) 0 - primary-for QFutureWatcher (0xb60baec0) - QObject (0xb60cf654) 0 - primary-for QFutureWatcherBase (0xb60baf00) Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1219,60 +841,14 @@ QtConcurrent::ThreadEngineBase (0xb61113c0) 0 QRunnable (0xb611c654) 0 primary-for QtConcurrent::ThreadEngineBase (0xb61113c0) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb611ce4c) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb6111d40) 0 - QtConcurrent::ThreadEngineStarterBase (0xb611cec4) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 -4u -32 0u -36 0u -40 0u -44 0u -48 0u -52 -4u -56 0u -60 (int (*)(...))-0x000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb6111f00) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb6111f40) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb612f348) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb6111f40) Class std::input_iterator_tag size=1 align=1 @@ -1315,225 +891,49 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb612fd98) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb612fe10) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb612f4b0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614e0b4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614e12c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614e1a4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614e21c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614e294) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614e30c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614e384) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614e3fc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614e474) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614e4ec) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614e564) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614e5dc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614e654) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb614e744) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb614e7bc) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb614e834) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb614ebb8) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb614ec30) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb614ed20) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb614ed98) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb614ee10) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb5f6303c) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb5f63078) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb5f630b4) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb5f630f0) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb5f6312c) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb5f63168) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb5f631e0) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb5f6321c) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb5f63258) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb5f63294) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb5f632d0) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb5f6330c) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb5f63ce4) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb5fdb2d0) 0 empty -Class std::__copy_move - size=1 align=1 - base size=0 base align=1 -std::__copy_move (0xb5fdb708) 0 empty -Class std::__copy_move_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_move_backward (0xb5fdb924) 0 empty -Class std::__equal - size=1 align=1 - base size=0 base align=1 -std::__equal (0xb5fdbd20) 0 empty -Class std::__lc_rai - size=1 align=1 - base size=0 base align=1 -std::__lc_rai (0xb5fdbe88) 0 empty -Class std::__lexicographical_compare - size=1 align=1 - base size=0 base align=1 -std::__lexicographical_compare (0xb6018000) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb6018708) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb603b12c) 0 empty Class lconv size=56 align=4 @@ -1550,10 +950,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb603dce4) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb603dd5c) 0 Class tm size=44 align=4 @@ -1570,15 +966,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb5e6a03c) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb5e6a1a4) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb5e6a12c) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1590,32 +978,10 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb5e6a21c) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb5ec6744) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5ec6a14) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5ed38c0) 0 empty - __gnu_cxx::new_allocator (0xb5ec6a50) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5ec6a8c) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5ed3980) 0 empty - __gnu_cxx::new_allocator (0xb5ec6ac8) 0 empty Vtable for __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries @@ -1631,82 +997,19 @@ Class __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind (0xb5ec6ce4) 0 nearly-empty vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 8u) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5d785dc) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5d78618) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5d7ac40) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5d78654) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5dfe2d0) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5e13200) 0 - std::allocator (0xb5e13240) 0 empty - __gnu_cxx::new_allocator (0xb5dfe348) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5dfe258) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5dfe384) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5e133c0) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5dfe3c0) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5dfe474) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5e135c0) 0 - std::allocator (0xb5e13600) 0 empty - __gnu_cxx::new_allocator (0xb5dfe4ec) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5dfe3fc) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5dfe528) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5dfe5dc) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5e13780) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5dfe564) 0 Class std::locale size=4 align=4 @@ -1736,97 +1039,16 @@ Class std::locale::_Impl base size=20 base align=4 std::locale::_Impl (0xb5cb5780) 0 -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5cc1740) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb5ccd12c) 0 - primary-for std::collate (0xb5cc1740) - -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5cc1840) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb5ccd21c) 0 - primary-for std::collate (0xb5cc1840) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5ccd690) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5ccd6cc) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5ce57c0) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5ccd708) 0 empty -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5ce5900) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb5ce5940) 0 - primary-for std::collate_byname (0xb5ce5900) - std::locale::facet (0xb5ccd780) 0 - primary-for std::collate (0xb5ce5940) - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5ce59c0) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb5ce5a00) 0 - primary-for std::collate_byname (0xb5ce59c0) - std::locale::facet (0xb5ccd870) 0 - primary-for std::collate (0xb5ce5a00) + + + + Vtable for std::ios_base::failure std::ios_base::failure::_ZTVNSt8ios_base7failureE: 5u entries @@ -1872,583 +1094,85 @@ Class std::ios_base std::ios_base (0xb5cfb618) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5d2bca8) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) - -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5d2bf3c) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb5d2bd98) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb5bb24b0) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb5bae12c) 0 - primary-for std::ctype (0xb5bb24b0) - std::ctype_base (0xb5bae168) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb5bbad70) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb5bcace4) 0 - primary-for std::__ctype_abstract_base (0xb5bbad70) - std::ctype_base (0xb5bcad20) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb5bbb900) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb5bd4be0) 0 - primary-for std::ctype (0xb5bbb900) - std::locale::facet (0xb5bcae10) 0 - primary-for std::__ctype_abstract_base (0xb5bd4be0) - std::ctype_base (0xb5bcae4c) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb5bbbac0) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb5bde370) 0 - primary-for std::ctype_byname (0xb5bbbac0) - std::locale::facet (0xb5bdc168) 0 - primary-for std::ctype (0xb5bde370) - std::ctype_base (0xb5bdc1a4) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb5bbbb40) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb5bbbb80) 0 - primary-for std::ctype_byname (0xb5bbbb40) - std::__ctype_abstract_base (0xb5bdea00) 0 - primary-for std::ctype (0xb5bbbb80) - std::locale::facet (0xb5bdc30c) 0 - primary-for std::__ctype_abstract_base (0xb5bdea00) - std::ctype_base (0xb5bdc348) 0 empty + + + + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb5bdcd5c) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5bf0580) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb5bec528) 0 - primary-for std::numpunct (0xb5bf0580) - -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5bf0640) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb5bec618) 0 - primary-for std::numpunct (0xb5bf0640) -Class __gnu_cxx::__conditional_type - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type (0xb5c28c6c) 0 empty -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5a74b80) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb5a74bc0) 0 - primary-for std::numpunct_byname (0xb5a74b80) - std::locale::facet (0xb5a7d294) 0 - primary-for std::numpunct (0xb5a74bc0) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5a74c00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5a7d384) 0 - primary-for std::num_get > > (0xb5a74c00) - -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5a74c80) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5a7d474) 0 - primary-for std::num_put > > (0xb5a74c80) - -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5a74d00) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb5a74d40) 0 - primary-for std::numpunct_byname (0xb5a74d00) - std::locale::facet (0xb5a7d564) 0 - primary-for std::numpunct (0xb5a74d40) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5a74dc0) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5a7d654) 0 - primary-for std::num_get > > (0xb5a74dc0) - -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5a74e40) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5a7d744) 0 - primary-for std::num_put > > (0xb5a74e40) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb5abfe80) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb5a7df3c) 0 - primary-for std::basic_ios > (0xb5abfe80) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb5abfec0) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb5a7d348) 0 - primary-for std::basic_ios > (0xb5abfec0) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5b10b40) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb5b10b80) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb5aefb40) 4 - primary-for std::basic_ios > (0xb5b10b80) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5aefd20) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5b10cc0) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5b10d00) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5aefd5c) 4 - primary-for std::basic_ios > (0xb5b10d00) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5aeff00) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5b4f580) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb5b4f5c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb5b513fc) 8 - primary-for std::basic_ios > (0xb5b4f5c0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5b4f680) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5b4f6c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5b51780) 8 - primary-for std::basic_ios > (0xb5b4f6c0) - -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5b51e88) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5b51ec4) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb597d580) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5b51f00) 0 empty -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb59953c0) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb59b7480 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2486,44 +1210,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb59c7050) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb59b7480) 0 - primary-for std::basic_iostream > (0xb59c7050) - subvttidx=4u - std::basic_ios > (0xb59b74c0) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb59953fc) 12 - primary-for std::basic_ios > (0xb59b74c0) - std::basic_ostream > (0xb59b7500) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb59b74c0) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5995690) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb59b7800 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2561,110 +1249,21 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb59d50f0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb59b7800) 0 - primary-for std::basic_iostream > (0xb59d50f0) - subvttidx=4u - std::basic_ios > (0xb59b7840) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb59956cc) 12 - primary-for std::basic_ios > (0xb59b7840) - std::basic_ostream > (0xb59b7880) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb59b7840) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5995fb4) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5995f3c) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb5995ec4) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb5995e10) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb59fa294) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb59fab04) 0 -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb58dff78) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb58ff870) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb58f2b00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb58ff870) - QFutureInterfaceBase (0xb5906168) 0 - primary-for QFutureInterface (0xb58f2b00) - QRunnable (0xb59061a4) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb58f2b80) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb58ffc80) 0 - primary-for QtConcurrent::RunFunctionTask (0xb58f2b80) - QFutureInterface (0xb58f2bc0) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb58ffc80) - QFutureInterfaceBase (0xb5906348) 0 - primary-for QFutureInterface (0xb58f2bc0) - QRunnable (0xb5906384) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + Class QLibraryInfo size=1 align=1 @@ -2715,50 +1314,22 @@ QFile (0xb5853f00) 0 QObject (0xb56696cc) 0 primary-for QIODevice (0xb5853f40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb569503c) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb5695bf4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56b8294) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb56b85a0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb56c730c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb56c7294) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb56c73fc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56e7960) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56e7a50) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2833,10 +1404,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb5717d20) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5727e10) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2926,10 +1493,6 @@ Class QDirIterator QDirIterator (0xb57467f8) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb575a7bc) 0 Vtable for QFileSystemWatcher QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries @@ -3067,25 +1630,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb55bd780) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb55bd7f8) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb559c564) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55c2000) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55c2168) 0 Class QResource size=4 align=4 @@ -3097,275 +1648,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb55daa50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55dae88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fc078) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fc258) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fc438) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fc618) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fc7f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fc9d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fcbb8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fcd98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fcf78) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5605168) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5605348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5605528) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5605708) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56058e8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5605ac8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5605ca8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5605e88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560b078) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560b258) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560b438) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560b618) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560b7f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560b9d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560bbb8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560bd98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560bf78) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5615168) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5615348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5615528) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5615708) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56158e8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5615ac8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5615ca8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5615e88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb561e078) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb561e258) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb561e438) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb561e618) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb561e7f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb561e9d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb561ebb8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb561ed98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb561ef78) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5625168) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5625348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5625528) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5625708) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56258e8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5625ac8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5625ca8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5625e88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb562c078) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb562c258) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3392,45 +1727,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb562c438) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5457ec4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5457e4c) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb5457fb4) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb5457f3c) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb5497348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5497960) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5497b40) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5497d20) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3508,15 +1815,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb54e8dd4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54f2ce4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb551c780) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -3543,10 +1842,6 @@ QEventLoop (0xb54e4bc0) 0 QObject (0xb552d5dc) 0 primary-for QEventLoop (0xb54e4bc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb552dbf4) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -3591,20 +1886,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb5550e88) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb536b258) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb536b348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb536ba8c) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -3774,10 +2061,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb53b9bf4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53c8384) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3889,20 +2172,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb53fffb4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5433474) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb5433564) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb543399c) 0 empty Class QMetaProperty size=20 align=4 @@ -3914,10 +2189,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb5433d98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54480f0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -4129,10 +2400,6 @@ QLibrary (0xb52838c0) 0 QObject (0xb52a0a50) 0 primary-for QLibrary (0xb52838c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb52af99c) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4169,20 +2436,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb52ddf3c) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb52e75dc) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb52e72d0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb52f0ac8) 0 Class QWriteLocker size=4 align=4 @@ -4209,10 +2468,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb53390b4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5339d98) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -4229,70 +2484,42 @@ Class QDate base size=4 base align=4 QDate (0xb5347d98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5157744) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb5157834) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5161e10) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb5161f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5172564) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb5172744) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51885a0) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb5197780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51a4690) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb51ba744) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51bab04) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb51dac6c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51e8690) 0 empty Class QLinkedListData size=20 align=4 @@ -4304,40 +2531,24 @@ Class QSize base size=8 base align=4 QSize (0xb50795dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5084654) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb50a2258) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50aa294) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb50cb0b4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50d9258) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb5120b7c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f42078) 0 empty Class QSharedData size=4 align=4 @@ -4385,20 +2596,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb4fe3870) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fece10) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4fecf78) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4fecf00) 0 Class QXmlStreamAttributes size=4 align=4 @@ -4411,30 +2610,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb4fec000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb500f9d8) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb500fb04) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb501d6cc) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb501d7f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4e2f780) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -4461,25 +2648,9 @@ Class QXmlStreamWriter base size=4 base align=4 QXmlStreamWriter (0xb4e6003c) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4e7df78) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4e85000) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4e85078) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4e7df00) 0 Class QColor size=16 align=4 @@ -4501,10 +2672,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb4ea7ec4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ed203c) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -4802,15 +2969,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb4d4f078) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4d4f960) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4d4f8e8) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -5099,20 +3258,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb4da49d8) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4db7258) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4db7e88) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4dd1a50) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -5143,20 +3290,8 @@ QAccessibleInterface (0xb4d9b9c0) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb4dd1e4c) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb4de299c) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb4de2924) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb4de28ac) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -5669,15 +3804,7 @@ Class QPaintDevice QPaintDevice (0xb4c7603c) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4c835a0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4c83528) 0 Class QPolygon size=4 align=4 @@ -5685,15 +3812,7 @@ Class QPolygon QPolygon (0xb4c46d80) 0 QVector (0xb4c835dc) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4ca7690) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4ca7618) 0 Class QPolygonF size=4 align=4 @@ -5706,10 +3825,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb4cc55dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cd6c30) 0 empty Class QPainterPath::Element size=20 align=4 @@ -5721,25 +3836,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb4ce53fc) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4d0a4b0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4d0a438) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb4d0a0b4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d0a4ec) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5751,10 +3854,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb4b34d5c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b47e4c) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -5779,10 +3878,6 @@ QImage (0xb4b66900) 0 QPaintDevice (0xb4b8c654) 0 primary-for QImage (0xb4b66900) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4be1b40) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -5807,45 +3902,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb4c13564) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4c2203c) 0 empty Class QBrushData size=124 align=4 base size=121 base align=4 QBrushData (0xb4c222d0) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4c22f78) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4c22f00) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb4a4903c) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb4a490b4) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb4a4912c) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb4c22ec4) 0 Class QGradient size=56 align=4 @@ -5906,10 +3973,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb4ac6e10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4b1ce88) 0 Class QCursor size=4 align=4 @@ -5997,10 +4060,6 @@ QWidget (0xb493cb90) 0 QPaintDevice (0xb4936708) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4982654) 0 Vtable for QDialog QDialog::_ZTV7QDialog: 66u entries @@ -6251,10 +4310,6 @@ QAbstractPrintDialog (0xb4a15400) 0 QPaintDevice (0xb4a207bc) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4a2d99c) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -6505,20 +4560,12 @@ QFileDialog (0xb4a15e80) 0 QPaintDevice (0xb48671e0) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb487830c) 0 Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0xb48986cc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb48b1a8c) 0 empty Vtable for QFileSystemModel QFileSystemModel::_ZTV16QFileSystemModel: 42u entries @@ -6980,10 +5027,6 @@ QMessageBox (0xb472d280) 0 QPaintDevice (0xb472b960) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47467bc) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 67u entries @@ -7488,10 +5531,6 @@ QWizard (0xb479d680) 0 QPaintDevice (0xb47adfb4) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47d62d0) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -7624,10 +5663,6 @@ Class QGraphicsItem QGraphicsItem (0xb47f1bf4) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb462030c) 0 Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -8184,15 +6219,7 @@ QGraphicsItemGroup (0xb46a4040) 0 QGraphicsItem (0xb469ca14) 0 primary-for QGraphicsItemGroup (0xb46a4040) -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb46ab21c) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb46ab3c0) 0 empty Vtable for QGraphicsLayoutItem QGraphicsLayoutItem::_ZTV19QGraphicsLayoutItem: 8u entries @@ -8544,10 +6571,6 @@ Class QPen base size=4 base align=4 QPen (0xb4527564) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4527dd4) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -8594,20 +6617,8 @@ QGraphicsScene (0xb470f6c0) 0 QObject (0xb4537000) 0 primary-for QGraphicsScene (0xb470f6c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4537d98) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb455c7bc) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb455c744) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -8770,65 +6781,21 @@ Class QTextOption base size=24 base align=4 QTextOption (0xb45b33c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb45c0b40) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb45e112c) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0xb45e1438) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb45e1f00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4446960) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb44468e8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4446ac8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4446a50) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb447921c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb44791a4) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4479384) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb447930c) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 65u entries @@ -9083,15 +7050,7 @@ QGraphicsView (0xb44ee480) 0 QPaintDevice (0xb44f5ca8) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43214ec) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb433412c) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 7u entries @@ -9346,10 +7305,6 @@ QImageIOPlugin (0xb439eaf0) 0 QFactoryInterface (0xb43a1528) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb436df00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43a121c) 0 Class QImageReader size=4 align=4 @@ -9525,15 +7480,7 @@ QActionGroup (0xb422a580) 0 QObject (0xb42360f0) 0 primary-for QActionGroup (0xb422a580) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4236f3c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4236ec4) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26u entries @@ -9839,10 +7786,6 @@ QAbstractSpinBox (0xb4274d00) 0 QPaintDevice (0xb42a66cc) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42b9870) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -10050,15 +7993,7 @@ QStyle (0xb42c7a00) 0 QObject (0xb4301d5c) 0 primary-for QStyle (0xb42c7a00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb412f6cc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb414530c) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -10317,10 +8252,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb41c1040) 0 QStyleOption (0xb41c012c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41c08e8) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -10347,10 +8278,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb41c1ac0) 0 QStyleOption (0xb41e98ac) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41fe258) 0 Class QStyleOptionButton size=64 align=4 @@ -10358,10 +8285,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb41c1d80) 0 QStyleOption (0xb41e90f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42167bc) 0 Class QStyleOptionTab size=72 align=4 @@ -10376,10 +8299,6 @@ QStyleOptionTabV2 (0xb420c3c0) 0 QStyleOptionTab (0xb420c400) 0 QStyleOption (0xb40307f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40494b0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -10406,10 +8325,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb420cd00) 0 QStyleOption (0xb4063e88) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40767f8) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -10442,10 +8357,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb40869c0) 0 QStyleOption (0xb40a8a50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40bc258) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -10510,15 +8421,7 @@ QStyleOptionSpinBox (0xb4104600) 0 QStyleOptionComplex (0xb4104640) 0 QStyleOption (0xb4107b04) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb411a21c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb411a1a4) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -10527,10 +8430,6 @@ QStyleOptionQ3ListView (0xb4104880) 0 QStyleOptionComplex (0xb41048c0) 0 QStyleOption (0xb411a0b4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb411ab40) 0 Class QStyleOptionToolButton size=96 align=4 @@ -10627,10 +8526,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb3f9b654) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3fce1e0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -10661,20 +8556,8 @@ QItemSelectionModel (0xb3f94bc0) 0 QObject (0xb3fce654) 0 primary-for QItemSelectionModel (0xb3f94bc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3fde924) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3ff75a0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3ff7528) 0 Class QItemSelection size=4 align=4 @@ -10804,10 +8687,6 @@ QAbstractItemView (0xb4014180) 0 QPaintDevice (0xb3ff7924) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3e34708) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -11270,15 +9149,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb3ed4294) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3ed4d98) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3ed4d20) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -11419,15 +9290,7 @@ QListView (0xb3edd140) 0 QPaintDevice (0xb3ef1000) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3f0c780) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3f0c708) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -11720,15 +9583,7 @@ Class QStandardItem QStandardItem (0xb3d8c744) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3df3168) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3df30f0) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -12007,15 +9862,7 @@ Class QTableWidgetSelectionRange base size=16 base align=4 QTableWidgetSelectionRange (0xb3c62528) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3c71294) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3c7121c) 0 Vtable for QTableWidgetItem QTableWidgetItem::_ZTV16QTableWidgetItem: 10u entries @@ -12292,35 +10139,15 @@ QTreeView (0xb3cbe380) 0 QPaintDevice (0xb3cc6258) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ce8a14) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0xb3ce8000) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb3b1c474) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb3b1c3fc) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3b1c8ac) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3b1c834) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -13296,15 +11123,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb3ad2a8c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3ad2ce4) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ae1564) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -13339,20 +11158,12 @@ Class QPaintEngine QPaintEngine (0xb3ad2dd4) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3afb744) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb3afb3fc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3b10438) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7u entries @@ -13450,10 +11261,6 @@ QCommonStyle (0xb3afdf00) 0 QObject (0xb398bac8) 0 primary-for QStyle (0xb3afdf40) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb399add4) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -13985,30 +11792,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb383e7f8) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb3858258) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb384aac8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb387b708) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb387b690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb389b438) 0 Class QTextCharFormat size=8 align=4 @@ -14070,15 +11861,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb3744294) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3744fb4) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3744f3c) 0 Class QTextLine size=8 align=4 @@ -14128,15 +11911,7 @@ QTextDocument (0xb372dd40) 0 QObject (0xb3761f78) 0 primary-for QTextDocument (0xb372dd40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37728e8) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb37a8618) 0 Class QTextCursor size=4 align=4 @@ -14148,15 +11923,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb37a88ac) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb37a8ca8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb37a8c30) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -14318,10 +12085,6 @@ QTextFrame (0xb378ef40) 0 QObject (0xb37f8d98) 0 primary-for QTextObject (0xb378ef80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb361f744) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -14346,25 +12109,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb361fc30) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb363f744) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb363f834) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb363f9d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb364cd98) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -15494,10 +13245,6 @@ QDateEdit (0xb359b580) 0 QPaintDevice (0xb35b6834) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35cd078) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -15658,10 +13405,6 @@ QDialogButtonBox (0xb359bc00) 0 QPaintDevice (0xb35f1a50) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3601e88) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -15741,10 +13484,6 @@ QDockWidget (0xb359bf80) 0 QPaintDevice (0xb3415a50) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34430f0) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -15906,10 +13645,6 @@ QFontComboBox (0xb342d640) 0 QPaintDevice (0xb3465a8c) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3475a50) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -16228,10 +13963,6 @@ QMainWindow (0xb34c8380) 0 QPaintDevice (0xb34d5924) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34eaac8) 0 Vtable for QMdiArea QMdiArea::_ZTV8QMdiArea: 65u entries @@ -16317,10 +14048,6 @@ QMdiArea (0xb34c8700) 0 QPaintDevice (0xb34fa690) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb331cb04) 0 Vtable for QMdiSubWindow QMdiSubWindow::_ZTV13QMdiSubWindow: 63u entries @@ -16400,10 +14127,6 @@ QMdiSubWindow (0xb34c8b00) 0 QPaintDevice (0xb332c6cc) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb33517bc) 0 Vtable for QMenu QMenu::_ZTV5QMenu: 63u entries @@ -16681,10 +14404,6 @@ QTextEdit (0xb32147c0) 0 QPaintDevice (0xb32223fc) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb325f384) 0 Vtable for QPlainTextEdit QPlainTextEdit::_ZTV14QPlainTextEdit: 69u entries @@ -18196,203 +15915,43 @@ QWorkspace (0xb31cf7c0) 0 QPaintDevice (0xb31f20f0) 8 vptr=((& QWorkspace::_ZTV10QWorkspace) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb305b564) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3070b04) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb2f24e4c) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2f3c924) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb2f593fc) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2fcec30) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2fcee10) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2fce03c) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2fe31a4) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2ea3960) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb2ea3b40) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2ed1ce4) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2ee9168) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2ee9b40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2cec870) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2d29d20) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb2d29d98) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb2d55ca8) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb2d55fb4) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb2d9cbb8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2dc0168) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2dc04b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2dc0d5c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2bc61a4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2bc6744) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2bd57f8) 0 empty -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb2bd5e4c) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2bd5f78) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2be51e0) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb2be599c) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb2c1a0f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c1a870) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c1a8e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c1ad98) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c1ae10) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c52258) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c52690) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb2c52a14) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb2c529d8) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb2c88654) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.0.0.aix-gcc-power32.txt b/tests/auto/bic/data/QtNetwork.4.0.0.aix-gcc-power32.txt index 2072f0a71..a7b79258f 100644 --- a/tests/auto/bic/data/QtNetwork.4.0.0.aix-gcc-power32.txt +++ b/tests/auto/bic/data/QtNetwork.4.0.0.aix-gcc-power32.txt @@ -53,65 +53,20 @@ Class QBool size=1 align=1 QBool (0x300b7280) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cd9c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cdf80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4540) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4b00) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e00c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0680) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0c40) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb200) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb7c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebd80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8340) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8900) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104480) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104a40) 0 empty Class QFlag size=4 align=4 @@ -125,9 +80,6 @@ Class QChar size=2 align=2 QChar (0x30148980) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30185980) 0 empty Class QBasicAtomic size=4 align=4 @@ -142,13 +94,7 @@ Class sigset_t size=8 align=4 sigset_t (0x3026ad80) 0 -Class - size=8 align=4 - (0x30271200) 0 -Class - size=32 align=8 - (0x30271540) 0 Class fsid_t size=8 align=4 @@ -158,21 +104,9 @@ Class fsid64_t size=16 align=8 fsid64_t (0x30271c40) 0 -Class - size=52 align=4 - (0x302780c0) 0 -Class - size=44 align=4 - (0x30278440) 0 -Class - size=112 align=4 - (0x302787c0) 0 -Class - size=208 align=4 - (0x30278b40) 0 Class _quad size=8 align=4 @@ -186,17 +120,11 @@ Class adspace_t size=68 align=4 adspace_t (0x30281e00) 0 -Class - size=24 align=8 - (0x302865c0) 0 Class label_t size=100 align=4 label_t (0x30286d00) 0 -Class - size=4 align=4 - (0x3028b780) 0 Class sigset size=8 align=4 @@ -238,57 +166,18 @@ Class QByteRef size=8 align=4 QByteRef (0x302b7540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30423740) 0 empty -Class QFlags - size=4 align=4 -QFlags (0x30431080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431340) 0 -Class QFlags - size=4 align=4 -QFlags (0x3042cc00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30442080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431a00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30448800) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046af00) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046e200) 0 -Class QFlags - size=4 align=4 -QFlags (0x304422c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30474f80) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479700) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479a40) 0 Class QInternal size=1 align=1 @@ -306,9 +195,6 @@ Class QString size=4 align=4 QString (0x300a1f40) 0 -Class QFlags - size=4 align=4 -QFlags (0x303cf2c0) 0 Class QLatin1String size=4 align=4 @@ -323,9 +209,6 @@ Class QConstString QConstString (0x300b7640) 0 QString (0x300b7680) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303901c0) 0 empty Class QListData::Data size=24 align=4 @@ -335,9 +218,6 @@ Class QListData size=4 align=4 QListData (0x300732c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x302fb500) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -360,13 +240,7 @@ Class QTextCodec QTextCodec (0x303bab80) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8) -Class QList:: - size=4 align=4 -QList:: (0x30120bc0) 0 -Class QList - size=4 align=4 -QList (0x302cc980) 0 Class QTextEncoder size=32 align=4 @@ -385,21 +259,12 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3036a6c0) 0 QGenericArgument (0x3036a700) 0 -Class QMetaObject:: - size=16 align=4 -QMetaObject:: (0x3009b300) 0 Class QMetaObject size=16 align=4 QMetaObject (0x3058c900) 0 -Class QList:: - size=4 align=4 -QList:: (0x30170600) 0 -Class QList - size=4 align=4 -QList (0x30166f00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4 entries @@ -487,9 +352,6 @@ QIODevice (0x30365880) 0 QObject (0x301e4440) 0 primary-for QIODevice (0x30365880) -Class QFlags - size=4 align=4 -QFlags (0x301ebec0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4 entries @@ -507,38 +369,20 @@ Class QRegExp size=4 align=4 QRegExp (0x303baa80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30148180) 0 empty Class QStringMatcher size=1036 align=4 QStringMatcher (0x3012d8c0) 0 -Class QList:: - size=4 align=4 -QList:: (0x30104900) 0 -Class QList - size=4 align=4 -QList (0x30104380) 0 Class QStringList size=4 align=4 QStringList (0x303bab00) 0 QList (0x300c3280) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x301046c0) 0 -Class QList::iterator - size=4 align=4 -QList::iterator (0x300eba00) 0 -Class QList::const_iterator - size=4 align=4 -QList::const_iterator (0x300eb980) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5 entries @@ -664,9 +508,6 @@ Class QMapData size=72 align=4 QMapData (0x304b4140) 0 -Class - size=32 align=4 - (0x3052cd00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4 entries @@ -680,9 +521,6 @@ Class QTextStream QTextStream (0x3050bbc0) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8) -Class QFlags - size=4 align=4 -QFlags (0x305082c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -767,41 +605,20 @@ QFile (0x3057c8c0) 0 QObject (0x3057c980) 0 primary-for QIODevice (0x3057c900) -Class QFlags - size=4 align=4 -QFlags (0x3058a380) 0 Class QFileInfo size=4 align=4 QFileInfo (0x304b0580) 0 -Class QFlags - size=4 align=4 -QFlags (0x304927c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30390480) 0 empty -Class QList:: - size=4 align=4 -QList:: (0x301dfa40) 0 -Class QList - size=4 align=4 -QList (0x301df900) 0 Class QDir size=4 align=4 QDir (0x304b03c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30365600) 0 -Class QFlags - size=4 align=4 -QFlags (0x303ac7c0) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35 entries @@ -846,9 +663,6 @@ Class QFileEngine QFileEngine (0x3057c7c0) 0 vptr=((&QFileEngine::_ZTV11QFileEngine) + 8) -Class QFlags - size=4 align=4 -QFlags (0x3031a080) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5 entries @@ -910,73 +724,22 @@ Class QMetaType size=1 align=1 QMetaType (0x30079000) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3011fb00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3013d480) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x30148440) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3015dfc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301937c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a18c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a5d00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301ad500) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301add00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b22c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b2b00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6640) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6fc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9600) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9c00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301c1740) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301d7f80) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -998,69 +761,24 @@ Class QVariant size=16 align=8 QVariant (0x30166c00) 0 -Class QList:: - size=4 align=4 -QList:: (0x3057e500) 0 -Class QList - size=4 align=4 -QList (0x302acd80) 0 -Class QMap:: - size=4 align=4 -QMap:: (0x302ed8c0) 0 -Class QMap - size=4 align=4 -QMap (0x302b7980) 0 Class QVariantComparisonHelper size=4 align=4 QVariantComparisonHelper (0x30225880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303e8900) 0 empty -Class - size=12 align=4 - (0x303dab00) 0 -Class - size=44 align=4 - (0x303f70c0) 0 -Class - size=76 align=4 - (0x303f7880) 0 -Class - size=36 align=4 - (0x303fc640) 0 -Class - size=56 align=4 - (0x303fcc40) 0 -Class - size=36 align=4 - (0x30414340) 0 -Class - size=28 align=4 - (0x30414f00) 0 -Class - size=24 align=4 - (0x30486a40) 0 -Class - size=28 align=4 - (0x30486d80) 0 -Class - size=28 align=4 - (0x30492400) 0 Class lconv size=56 align=4 @@ -1102,77 +820,41 @@ Class localeinfo_table size=36 align=4 localeinfo_table (0x303d9cc0) 0 -Class - size=108 align=4 - (0x304dc500) 0 Class _LC_charmap_objhdl size=12 align=4 _LC_charmap_objhdl (0x304dcc80) 0 -Class - size=92 align=4 - (0x30561040) 0 Class _LC_monetary_objhdl size=12 align=4 _LC_monetary_objhdl (0x305614c0) 0 -Class - size=48 align=4 - (0x30561800) 0 Class _LC_numeric_objhdl size=12 align=4 _LC_numeric_objhdl (0x30561d00) 0 -Class - size=56 align=4 - (0x30083180) 0 Class _LC_resp_objhdl size=12 align=4 _LC_resp_objhdl (0x300838c0) 0 -Class - size=248 align=4 - (0x30083c40) 0 Class _LC_time_objhdl size=12 align=4 _LC_time_objhdl (0x3012c400) 0 -Class - size=10 align=2 - (0x3012cc40) 0 -Class - size=16 align=4 - (0x301df180) 0 -Class - size=16 align=4 - (0x301df5c0) 0 -Class - size=20 align=4 - (0x303acac0) 0 -Class - size=104 align=4 - (0x30504a00) 0 Class _LC_collate_objhdl size=12 align=4 _LC_collate_objhdl (0x301bfb80) 0 -Class - size=8 align=4 - (0x301e8b00) 0 -Class - size=80 align=4 - (0x305a0100) 0 Class _LC_ctype_objhdl size=12 align=4 @@ -1186,17 +868,11 @@ Class _LC_locale_objhdl size=12 align=4 _LC_locale_objhdl (0x303da600) 0 -Class _LC_object_handle:: - size=12 align=4 -_LC_object_handle:: (0x305911c0) 0 Class _LC_object_handle size=20 align=4 _LC_object_handle (0x30591080) 0 -Class - size=24 align=4 - (0x3031ed80) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14 entries @@ -1271,13 +947,7 @@ Class QUrl size=4 align=4 QUrl (0x302256c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x306df180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307c8900) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14 entries @@ -1303,9 +973,6 @@ QEventLoop (0x30802000) 0 QObject (0x30802040) 0 primary-for QEventLoop (0x30802000) -Class QFlags - size=4 align=4 -QFlags (0x30803740) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27 entries @@ -1348,17 +1015,11 @@ Class QModelIndex size=16 align=4 QModelIndex (0x3049cc80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304eb5c0) 0 empty Class QPersistentModelIndex size=4 align=4 QPersistentModelIndex (0x3049cb80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3002e700) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42 entries @@ -1524,9 +1185,6 @@ Class QBasicTimer size=4 align=4 QBasicTimer (0x307fe180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30803300) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4 entries @@ -1612,17 +1270,11 @@ Class QMetaMethod size=8 align=4 QMetaMethod (0x30379340) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30880740) 0 empty Class QMetaEnum size=8 align=4 QMetaEnum (0x303793c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3088be80) 0 empty Class QMetaProperty size=20 align=4 @@ -1632,9 +1284,6 @@ Class QMetaClassInfo size=8 align=4 QMetaClassInfo (0x30379540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x308a3780) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17 entries @@ -1902,9 +1551,6 @@ Class QBitRef size=8 align=4 QBitRef (0x305a6140) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864700) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1922,65 +1568,41 @@ Class QHashDummyValue size=1 align=1 QHashDummyValue (0x30893ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30897f00) 0 empty Class QDate size=4 align=4 QDate (0x301eb4c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebe80) 0 empty Class QTime size=4 align=4 QTime (0x301f1e80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30368c00) 0 empty Class QDateTime size=4 align=4 QDateTime (0x304b0440) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304d4880) 0 empty Class QPoint size=8 align=4 QPoint (0x301f9d40) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307b9180) 0 empty Class QPointF size=16 align=8 QPointF (0x30200880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307efcc0) 0 empty Class QLine size=16 align=4 QLine (0x301eb540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3098afc0) 0 empty Class QLineF size=32 align=8 QLineF (0x301eb600) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a335c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1990,41 +1612,26 @@ Class QLocale size=4 align=4 QLocale (0x301eb800) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30822c80) 0 empty Class QSize size=8 align=4 QSize (0x30200a80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864400) 0 empty Class QSizeF size=16 align=8 QSizeF (0x30209200) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a33a80) 0 empty Class QRect size=16 align=4 QRect (0x30213780) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30aad700) 0 empty Class QRectF size=32 align=8 QRectF (0x302138c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a1fdc0) 0 empty Class QSharedData size=4 align=4 @@ -2326,11 +1933,5 @@ QUdpSocket (0x308c1040) 0 QObject (0x308c16c0) 0 primary-for QIODevice (0x308c1340) -Class QList::Node - size=4 align=4 -QList::Node (0x30120ac0) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x301dfa00) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtNetwork.4.0.0.linux-gcc-amd64.txt index 0942e9ce1..1d0c56c47 100644 --- a/tests/auto/bic/data/QtNetwork.4.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtNetwork.4.0.0.linux-gcc-amd64.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x2aaaac20f1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac2260e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac226380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac226620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac2268c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac226b60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac226e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac2370e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac237380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac237620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac2378c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac237b60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac237e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac2490e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac249380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac249620) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x2aaaac249850) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac275930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac275d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac301150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac301540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac301930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac301d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac346150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac346540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac346930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac346d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac393150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac393540) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x2aaaac393f50) 0 QGenericArgument (0x2aaaac3c3000) 0 -Class QMetaObject:: - size=32 align=8 - base size=32 base align=8 -QMetaObject:: (0x2aaaac3c3850) 0 Class QMetaObject size=32 align=8 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x2aaaac3fb4d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac431540) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=12 base align=8 QByteRef (0x2aaaac552b60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac5dfbd0) 0 empty Class QString::Null size=1 align=1 @@ -291,10 +171,6 @@ Class QString base size=8 base align=8 QString (0x2aaaac5dfee0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac659770) 0 Class QLatin1String size=8 align=8 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x2aaaac8a9a10) 0 QString (0x2aaaac8a9a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac8bd000) 0 empty Class QListData::Data size=32 align=8 @@ -327,15 +199,7 @@ Class QListData base size=8 base align=8 QListData (0x2aaaac8e0ee0) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaaca00e00) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaaca00cb0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x2aaaaca8d2a0) 0 QObject (0x2aaaaca8d310) 0 primary-for QIODevice (0x2aaaaca8d2a0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaca8de70) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=128 base align=8 QMapData (0x2aaaacb2fa10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacc4b930) 0 Class QTextCodec::ConverterState size=32 align=8 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x2aaaacc4b690) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 16u) -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaacc89230) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaacc890e0) 0 Class QTextEncoder size=40 align=8 @@ -503,30 +351,10 @@ Class QTextDecoder base size=40 base align=8 QTextDecoder (0x2aaaacc89f50) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaaccc53f0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x2aaaaccc55b0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaaccc54d0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaaccc5690) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaaccc5770) 0 Class __gconv_trans_data size=40 align=8 @@ -548,15 +376,7 @@ Class __gconv_info base size=16 base align=8 __gconv_info (0x2aaaaccc5a80) 0 -Class :: - size=72 align=8 - base size=72 base align=8 -:: (0x2aaaaccc5c40) 0 -Class - size=72 align=8 - base size=72 base align=8 - (0x2aaaaccc5b60) 0 Class _IO_marker size=24 align=8 @@ -568,10 +388,6 @@ Class _IO_FILE base size=216 base align=8 _IO_FILE (0x2aaaaccc5d20) 0 -Class - size=32 align=8 - base size=32 base align=8 - (0x2aaaaccc5e00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x2aaaaccc5e70) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacd47150) 0 Class QTextStreamManipulator size=40 align=8 @@ -680,10 +492,6 @@ QFile (0x2aaaace11bd0) 0 QObject (0x2aaaace11cb0) 0 primary-for QIODevice (0x2aaaace11c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaace47a80) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=8 base align=8 QRegExp (0x2aaaace768c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaace9e700) 0 empty Class QStringMatcher size=1048 align=8 base size=1044 base align=8 QStringMatcher (0x2aaaace9e930) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaace9eee0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaace9ed90) 0 Class QStringList size=8 align=8 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x2aaaaced5070) 0 QList (0x2aaaaced50e0) 0 -Class QList::iterator - size=8 align=8 - base size=8 base align=8 -QList::iterator (0x2aaaacef8ee0) 0 -Class QList::const_iterator - size=8 align=8 - base size=8 base align=8 -QList::const_iterator (0x2aaaacf172a0) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=8 base align=8 QFileInfo (0x2aaaacf6ac40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacfa8690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaacfa8af0) 0 empty -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaacfd12a0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaacfd1150) 0 Class QDir size=8 align=8 base size=8 base align=8 QDir (0x2aaaacfd13f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacfd1690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacfd18c0) 0 Class QUrl size=8 align=8 base size=8 base align=8 QUrl (0x2aaaad0765b0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad0768c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad0d5af0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x2aaaad0f1150) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0f1850) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0f1a10) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0f1bd0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0f1d90) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0f1f50) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10a150) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10a310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10a4d0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10a690) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10a850) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10aa10) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10abd0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10ad90) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10af50) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad117150) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad117310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad1174d0) 0 empty Class QVariant::PrivateShared size=16 align=8 @@ -1029,35 +717,15 @@ Class QVariant base size=16 base align=8 QVariant (0x2aaaad117620) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaad1aa7e0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaad1aa690) 0 -Class QMap:: - size=8 align=8 - base size=8 base align=8 -QMap:: (0x2aaaad1aab60) 0 -Class QMap - size=8 align=8 - base size=8 base align=8 -QMap (0x2aaaad1aaa10) 0 Class QVariantComparisonHelper size=8 align=8 base size=8 base align=8 QVariantComparisonHelper (0x2aaaad2184d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad218f50) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1128,10 +796,6 @@ Class QFileEngine QFileEngine (0x2aaaad29b380) 0 vptr=((& QFileEngine::_ZTV11QFileEngine) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad29b770) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5u entries @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x2aaaad2f5070) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad2f5230) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x2aaaad417540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad417d20) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x2aaaad4458c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad445af0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x2aaaad4900e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad4902a0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x2aaaad4adb60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad4d1150) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x2aaaad4fc230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad4fc930) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x2aaaad533b60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad533f50) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x2aaaad583a10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad5ba7e0) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x2aaaad646380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad676310) 0 empty Class QLinkedListData size=32 align=8 @@ -1262,10 +890,6 @@ Class QBitRef base size=12 base align=8 QBitRef (0x2aaaad7ea4d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad8000e0) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=8 base align=8 QLocale (0x2aaaad9201c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad920c40) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x2aaaad9cc310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad9eb4d0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x2aaaad9eb700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaada11230) 0 empty Class QDateTime size=8 align=8 base size=8 base align=8 QDateTime (0x2aaaada11460) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaada38000) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x2aaaada98bd0) 0 QObject (0x2aaaada98c40) 0 primary-for QEventLoop (0x2aaaada98bd0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaada98e70) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=24 base align=8 QModelIndex (0x2aaaadb310e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadb4b310) 0 empty Class QPersistentModelIndex size=8 align=8 base size=8 base align=8 QPersistentModelIndex (0x2aaaadb4b850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadb4ba80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2aaaadbf80e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadbf89a0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=12 base align=8 QMetaMethod (0x2aaaadc547e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc54bd0) 0 empty Class QMetaEnum size=16 align=8 base size=12 base align=8 QMetaEnum (0x2aaaadc54e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc7e2a0) 0 empty Class QMetaProperty size=32 align=8 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=12 base align=8 QMetaClassInfo (0x2aaaadc7e620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc7ea10) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2362,18 +1942,6 @@ QTcpSocket (0x2aaaade3c460) 0 QObject (0x2aaaade3c5b0) 0 primary-for QIODevice (0x2aaaade3c540) -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaaaded5b60) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaaadf0dc40) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaaae004770) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtNetwork.4.0.0.linux-gcc-ia32.txt index cd6c35ee7..ee8934317 100644 --- a/tests/auto/bic/data/QtNetwork.4.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtNetwork.4.0.0.linux-gcc-ia32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x4001ef40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001ed80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd0c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abd340) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40abd380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abd540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abd5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abd640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abd6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abd740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abd7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abd840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abd8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abd940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abd9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abda40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abdac0) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40abdc00) 0 QGenericArgument (0x40abdc40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40abde40) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x40abdf40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bd1000) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x40bd1700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bd1780) 0 empty Class QString::Null size=1 align=1 @@ -296,10 +176,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x40bd19c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40bd1b00) 0 Class QCharRef size=8 align=4 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x40bd1cc0) 0 QString (0x40bd1d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bd1d80) 0 empty Class QListData::Data size=24 align=4 @@ -327,15 +199,7 @@ Class QListData base size=4 base align=4 QListData (0x40bd1e80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x40e772c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x40e77200) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x40e77500) 0 QObject (0x40e77540) 0 primary-for QIODevice (0x40e77500) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40e77680) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=72 base align=4 QMapData (0x40e77780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40e77d40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x40e77c40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x40e77fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x40e77f00) 0 Class QTextEncoder size=32 align=4 @@ -503,30 +351,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x40e773c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x40e77700) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x40e77cc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x40e77a80) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x40e77d80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41066000) 0 Class __gconv_trans_data size=20 align=4 @@ -548,15 +376,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x41066100) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x41066180) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x41066140) 0 Class _IO_marker size=12 align=4 @@ -568,10 +388,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x41066200) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41066240) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x41066280) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x410663c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -680,10 +492,6 @@ QFile (0x41066b00) 0 QObject (0x41066b80) 0 primary-for QIODevice (0x41066b40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41066c80) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x41066e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41066ec0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x41066f00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x410665c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41066f80) 0 Class QStringList size=4 align=4 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x41066780) 0 QList (0x41066bc0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x411761c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x41176240) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x411766c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41176740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41176780) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x411768c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41176800) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x41176900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x411769c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41176a80) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x41176b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41176c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41176c40) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x41176c80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176d00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176d80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176dc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176e00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176e40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176e80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176f00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176f80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176fc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x412a2000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x412a2040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x412a2080) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1029,35 +717,15 @@ Class QVariant base size=12 base align=4 QVariant (0x412a20c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x412a2680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x412a25c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x412a2800) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x412a2740) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x412a2a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412a2b40) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1142,10 +810,6 @@ Class QFileEngineHandler QFileEngineHandler (0x412a2e00) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412a2f00) 0 Class QHashData::Node size=8 align=4 @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x412a2200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412a2280) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x413ad340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413ad780) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x413ad840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413adc80) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x413add80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413addc0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x413adec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413adf40) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x413ad380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413ad880) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x413adb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e2280) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x414e2480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e2680) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x414e2780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e2900) 0 empty Class QLinkedListData size=20 align=4 @@ -1262,10 +890,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x414e2f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e2fc0) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=4 base align=4 QLocale (0x416e3100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e3140) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x416e32c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e3440) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x416e3480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e3600) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x416e3640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e3780) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x416e3f00) 0 QObject (0x416e3f40) 0 primary-for QEventLoop (0x416e3f00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x416e3380) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x417fa100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fa200) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x417fa280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fa340) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x417fa900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fa9c0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x417fad00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fad80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x417fadc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fae40) 0 empty Class QMetaProperty size=20 align=4 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x417faec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417faf40) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2362,18 +1942,6 @@ QTcpSocket (0x418f6f40) 0 QObject (0x418f6100) 0 primary-for QIODevice (0x418f6fc0) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x419f72c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x419f7980) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41a7ab80) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.0.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtNetwork.4.0.0.linux-gcc-ppc32.txt index f08e98371..f8bb41ea2 100644 --- a/tests/auto/bic/data/QtNetwork.4.0.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtNetwork.4.0.0.linux-gcc-ppc32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x30ac3188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac3428) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac34d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac3578) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac3620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac36c8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac3770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac3818) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac38c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac3968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac3a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac3ab8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac3b60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac3c08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac3cb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ac3d58) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x30ac3dc8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b0c2d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b0c348) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b0c3b8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b0c428) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b0c498) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b0c508) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b0c578) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b0c5e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b0c658) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b0c6c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b0c738) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b0c7a8) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187980) 0 QGenericArgument (0x30b0c8c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x30b0ca80) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x30b0cb60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b0cc08) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x30c1a7a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30c1aaf0) 0 empty Class QString::Null size=1 align=1 @@ -296,20 +176,12 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x30c1ad58) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30d4f0a8) 0 Class QCharRef size=8 align=4 base size=8 base align=4 QCharRef (0x30d4f0e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30d4fa10) 0 empty Class QListData::Data size=24 align=4 @@ -321,15 +193,7 @@ Class QListData base size=4 base align=4 QListData (0x30d4fc08) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30e98118) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30e98070) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -421,10 +285,6 @@ QIODevice (0x30187b80) 0 QObject (0x30e985b0) 0 primary-for QIODevice (0x30187b80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30e98770) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -449,30 +309,10 @@ Class QMapData base size=72 base align=4 QMapData (0x30e98b98) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30e98e70) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x30fa60a8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30fa6038) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x30fa6118) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x30fa6188) 0 Class __gconv_trans_data size=20 align=4 @@ -494,15 +334,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x30fa62d8) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x30fa63b8) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x30fa6348) 0 Class _IO_marker size=12 align=4 @@ -514,10 +346,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x30fa6428) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x30fa6498) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -532,10 +360,6 @@ Class QTextStream QTextStream (0x30fa64d0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30fa6690) 0 Class QTextStreamManipulator size=24 align=4 @@ -596,10 +420,6 @@ QFile (0x30187d00) 0 QObject (0x30fa6c08) 0 primary-for QIODevice (0x30187d40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30fa6d90) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -652,25 +472,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x30fa6ee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30fa6f50) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x30fa6fc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3106c0e0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3106c038) 0 Class QStringList size=4 align=4 @@ -770,130 +578,42 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x3106c8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3106c930) 0 empty Class QDir size=4 align=4 base size=4 base align=4 QDir (0x3106c9d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3106caf0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3106cb60) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x3106cc08) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3106cd20) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3106cdc8) 0 Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x3106ce00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3106cee0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3106cf50) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3106cfc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3106c850) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3112e038) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3112e0a8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3112e118) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3112e188) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3112e1f8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3112e268) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3112e2d8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3112e348) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3112e3b8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3112e428) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3112e498) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3112e508) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3112e578) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -920,35 +640,15 @@ Class QVariant base size=16 base align=8 QVariant (0x3112e5b0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3112eb28) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3112ea80) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x3112ece8) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x3112ec40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x3112eea8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3112efc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1033,10 +733,6 @@ Class QFileEngineHandler QFileEngineHandler (0x311d4188) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311d4310) 0 Class QHashData::Node size=8 align=4 @@ -1053,90 +749,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x311d4508) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311d4578) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x311d4c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311d4268) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x311d4e38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312ba268) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x312ba428) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312ba498) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x312ba5e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312ba690) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x312ba818) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312bab98) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x312bae00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312ba1c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x3135c070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3135c268) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x3135c498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3135c620) 0 empty Class QLinkedListData size=20 align=4 @@ -1153,10 +813,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x3135c188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3149f038) 0 empty Class QVectorData size=16 align=4 @@ -1178,40 +834,24 @@ Class QLocale base size=4 base align=4 QLocale (0x3149f5e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3149f658) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x3149f850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3149fa10) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x3149fa80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3149fc08) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x3149fc78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3149fdc8) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1286,10 +926,6 @@ QTextCodecPlugin (0x311a3280) 0 QFactoryInterface (0x315e3118) 8 nearly-empty primary-for QTextCodecFactoryInterface (0x311a32c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x315e3540) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1409,10 +1045,6 @@ QEventLoop (0x311a33c0) 0 QObject (0x315e3a80) 0 primary-for QEventLoop (0x311a33c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x315e3c08) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1489,20 +1121,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x31667070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316671f8) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x316672a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316673b8) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1722,10 +1346,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x31667a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31667b60) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1820,20 +1440,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x31667f88) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31667540) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x316677a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31667c78) 0 empty Class QMetaProperty size=20 align=4 @@ -1845,10 +1457,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x31709000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317090a8) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2276,8 +1884,4 @@ QTcpSocket (0x311a3b00) 0 QObject (0x317c6348) 0 primary-for QIODevice (0x311a3b80) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31892150) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.0.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtNetwork.4.0.0.macx-gcc-ppc32.txt index 4556f1d80..949efd06e 100644 --- a/tests/auto/bic/data/QtNetwork.4.0.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtNetwork.4.0.0.macx-gcc-ppc32.txt @@ -59,75 +59,19 @@ Class QBool base size=4 base align=4 QBool (0x7c2480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c27c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c2880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c2940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c2a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c2ac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c2b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c2c40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c2d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c2dc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c2e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c2f40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c2140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x807080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x807140) 0 empty Class QFlag size=4 align=4 @@ -144,10 +88,6 @@ Class QChar base size=2 base align=2 QChar (0x807440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x807540) 0 empty Class QBasicAtomic size=4 align=4 @@ -160,10 +100,6 @@ Class QAtomic QAtomic (0x807900) 0 QBasicAtomic (0x807940) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x807bc0) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -245,70 +181,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xec9840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xec9c00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff60c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff61c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff62c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff63c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff64c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff65c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6640) 0 Class QInternal size=1 align=1 @@ -335,10 +219,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xff6d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x11811c0) 0 Class QCharRef size=8 align=4 @@ -351,10 +231,6 @@ Class QConstString QConstString (0x1181dc0) 0 QString (0x1181e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1181f00) 0 empty Class QListData::Data size=24 align=4 @@ -366,10 +242,6 @@ Class QListData base size=4 base align=4 QListData (0x12a1140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x12a1740) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -394,15 +266,7 @@ Class QTextCodec QTextCodec (0x12a15c0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x12a1a80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x12a19c0) 0 Class QTextEncoder size=32 align=4 @@ -425,25 +289,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x12a1cc0) 0 QGenericArgument (0x12a1d00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x12a1fc0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x12a1f40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1405180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x14050c0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -535,10 +387,6 @@ QIODevice (0x14057c0) 0 QObject (0x1405800) 0 primary-for QIODevice (0x14057c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1405a40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -558,25 +406,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x14f1000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x14f1200) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x14f1280) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x14f1480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x14f13c0) 0 Class QStringList size=4 align=4 @@ -584,15 +420,7 @@ Class QStringList QStringList (0x14f1540) 0 QList (0x14f1580) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x14f1a40) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x14f1ac0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -748,10 +576,6 @@ Class QTextStream QTextStream (0x1680300) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16805c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -842,50 +666,22 @@ QFile (0x1713180) 0 QObject (0x1713200) 0 primary-for QIODevice (0x17131c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17133c0) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1713400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17134c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1713540) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1713700) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1713640) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x17137c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1713900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17139c0) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35u entries @@ -945,10 +741,6 @@ Class QFileEngineHandler QFileEngineHandler (0x1713c00) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1713dc0) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -999,90 +791,22 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1713fc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1713f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b0c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b140) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b2c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b3c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b440) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b4c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b5c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b6c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b740) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187b7c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1109,50 +833,18 @@ Class QVariant base size=16 base align=4 QVariant (0x187b800) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x187be80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x187bdc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x187bac0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x187bfc0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x191a1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x191a300) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x191a3c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x191a440) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x191a4c0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1230,15 +922,7 @@ Class QUrl base size=4 base align=4 QUrl (0x191ad80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x191af80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x191a080) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1265,10 +949,6 @@ QEventLoop (0x191a900) 0 QObject (0x191ac80) 0 primary-for QEventLoop (0x191a900) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a201c0) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1313,20 +993,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1a20400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a205c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1a20680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a207c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1496,10 +1168,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1a20e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a20f80) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1591,20 +1259,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1ae6900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ae69c0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1ae6a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ae6b00) 0 empty Class QMetaProperty size=20 align=4 @@ -1616,10 +1276,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1ae6bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ae6c80) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1907,10 +1563,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1c33480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c335c0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1932,80 +1584,48 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1c33800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c33880) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x1d32040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d32240) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1d322c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d32480) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1d32500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d32680) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1d32700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d32b80) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x1d32d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d32540) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1d32a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d32d80) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x1e13040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e13100) 0 empty Class QLinkedListData size=20 align=4 @@ -2017,50 +1637,30 @@ Class QLocale base size=4 base align=4 QLocale (0x1e136c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e13740) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1e13880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e13c80) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x1e13f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e13bc0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1f47300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f474c0) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x1f47740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f47900) 0 empty Class QSharedData size=4 align=4 @@ -2377,18 +1977,6 @@ QUdpSocket (0x22272c0) 0 QObject (0x2227380) 0 primary-for QIODevice (0x2227340) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x2298580) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22bb400) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x2370540) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.1.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtNetwork.4.1.0.linux-gcc-ia32.txt index dea6c4951..b4ba11b9a 100644 --- a/tests/auto/bic/data/QtNetwork.4.1.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtNetwork.4.1.0.linux-gcc-ia32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x4001ee80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001ef40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001ef80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001efc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac60c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac61c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac62c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40ac6300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac64c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac65c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac66c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac67c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac68c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac69c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6a40) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40ac6b80) 0 QGenericArgument (0x40ac6bc0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40ac6dc0) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x40ac6ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6f80) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x40bde680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bde700) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x40bde940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40bdea80) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x40bdec40) 0 QString (0x40bdec80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bded00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x40e6e180) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x40e6e5c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x40e6e500) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x40e6e800) 0 QObject (0x40e6e840) 0 primary-for QIODevice (0x40e6e800) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40e6e980) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x40e6eb40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40e6eb80) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x41030100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41030700) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x41030600) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41030980) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x410308c0) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x41030a40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41030ac0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x41030b40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41030b00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x41030b80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41030bc0) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x41030cc0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x41030d40) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x41030d00) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x41030dc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41030e00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x41030e40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41030f80) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x4118b1c0) 0 QTextStream (0x4118b200) 0 primary-for QTextOStream (0x4118b1c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x4118b3c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x4118b400) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x4118b380) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x4118b440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x4118b480) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x4118b4c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x4118b500) 0 Class timespec size=8 align=4 @@ -701,10 +485,6 @@ Class timeval base size=8 base align=4 timeval (0x4118b580) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x4118b5c0) 0 Class __sched_param size=4 align=4 @@ -721,45 +501,17 @@ Class __pthread_attr_s base size=36 base align=4 __pthread_attr_s (0x4118b680) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0x4118b6c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x4118b700) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x4118b740) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x4118b780) 0 Class _pthread_rwlock_t size=32 align=4 base size=32 base align=4 _pthread_rwlock_t (0x4118b7c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x4118b800) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x4118b840) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x4118b880) 0 Class random_data size=28 align=4 @@ -830,10 +582,6 @@ QFile (0x4118bdc0) 0 QObject (0x4118be40) 0 primary-for QIODevice (0x4118be00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4118bf40) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -886,50 +634,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x4118be80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412c9040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412c9080) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x412c91c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x412c9100) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x412c9200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412c9280) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x412c92c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x412c9400) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x412c9340) 0 Class QStringList size=4 align=4 @@ -937,30 +657,14 @@ Class QStringList QStringList (0x412c9440) 0 QList (0x412c9480) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x412c96c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x412c9740) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x412c9940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412c9a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412c9a80) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1017,10 +721,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x412c9ac0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412c9c80) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1175,110 +875,30 @@ Class QUrl base size=4 base align=4 QUrl (0x413da000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x413da0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413da100) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x413da140) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da200) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da280) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da2c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da300) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da3c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da440) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da480) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da4c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da5c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da600) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1305,35 +925,15 @@ Class QVariant base size=12 base align=4 QVariant (0x413da640) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x413dac00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x413dab40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x413dad80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x413dacc0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x413dafc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413da900) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1365,80 +965,48 @@ Class QPoint base size=8 base align=4 QPoint (0x414e3180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e35c0) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x414e3680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3ac0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x414e3bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3c00) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x414e3d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3d80) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x414e3e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3340) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x414e36c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3ec0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x415cf140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cf340) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x415cf440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cf5c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1455,10 +1023,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x415cfc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cfc80) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1475,40 +1039,24 @@ Class QLocale base size=4 base align=4 QLocale (0x415cfec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cff00) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x415cf280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e1000) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x417e1040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e11c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x417e1200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e1340) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1668,10 +1216,6 @@ QEventLoop (0x417e1ac0) 0 QObject (0x417e1b00) 0 primary-for QEventLoop (0x417e1ac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x417e1c40) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1763,20 +1307,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x417e1740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e1b80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x417e1cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e1ec0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1996,10 +1532,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x418d8580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d8640) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2094,20 +1626,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x418d8980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d8a00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x418d8a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d8ac0) 0 empty Class QMetaProperty size=20 align=4 @@ -2119,10 +1643,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x418d8b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d8bc0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2555,23 +2075,7 @@ QTcpSocket (0x419c1c40) 0 QObject (0x419c1d00) 0 primary-for QIODevice (0x419c1cc0) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41ab8180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41ab8500) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41ab8bc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41b32b00) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.1.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtNetwork.4.1.0.linux-gcc-ppc32.txt index 5b1bbdc86..3253146ae 100644 --- a/tests/auto/bic/data/QtNetwork.4.1.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtNetwork.4.1.0.linux-gcc-ppc32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x306c4818) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c4a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c4ab8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c4b60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c4c08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c4cb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c4d58) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c4e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c4ea8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c4f50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306f2000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306f20a8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306f2150) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306f21f8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306f22a0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306f2348) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x306f23b8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f28c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f2930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f29a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f2a10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f2a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f2af0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f2b60) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f2bd0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f2c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f2cb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f2d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306f2d90) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187ac0) 0 QGenericArgument (0x306f2ea8) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x30bcc070) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x30bcc150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30bcc1f8) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x30bccee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30cb6230) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x30cb67e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30cb6b28) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x30187d00) 0 QString (0x30e5b5b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30e5b690) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x30e5bdc8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30f2a230) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30f2a188) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x30187dc0) 0 QObject (0x30f2a700) 0 primary-for QIODevice (0x30187dc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30f2a8f8) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x30f2a4d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30f2ac08) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x30ff27a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30ff2e70) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x30ff2d20) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31133070) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30ff2f50) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x31133188) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31133230) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x31133310) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x311332a0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x31133380) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x311333f0) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x31133540) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x31133620) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x311335b0) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x31133690) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x31133700) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x31133738) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31133968) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x30187fc0) 0 QTextStream (0x31133ee0) 0 primary-for QTextOStream (0x30187fc0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x311d5118) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x311d5188) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x311d50a8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x311d51f8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x311d5268) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x311d52d8) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x311d5348) 0 Class timespec size=8 align=4 @@ -701,70 +485,18 @@ Class timeval base size=8 base align=4 timeval (0x311d53b8) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x311d5428) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x311d5498) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x311d5578) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x311d5508) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x311d55e8) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x311d56c8) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x311d5658) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x311d5738) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x311d5818) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x311d57a8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x311d5888) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x311d58f8) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x311d5968) 0 Class random_data size=28 align=4 @@ -835,10 +567,6 @@ QFile (0x312b3000) 0 QObject (0x311d5f88) 0 primary-for QIODevice (0x312b3040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312c30e0) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -891,50 +619,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x312c3230) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312c32d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312c3348) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x312c34d0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x312c3428) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x312c3578) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312c3738) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x312c37a8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x312c3968) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x312c38c0) 0 Class QStringList size=4 align=4 @@ -942,30 +642,14 @@ Class QStringList QStringList (0x312b3140) 0 QList (0x312c3a10) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x312c3e38) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x312c3ea8) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x31390150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31390268) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313902d8) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1022,10 +706,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x31390310) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31390540) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1180,110 +860,30 @@ Class QUrl base size=4 base align=4 QUrl (0x31390a10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31390b98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31390c08) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x31390c78) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31390d90) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31390e38) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31390ee0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31390f88) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31390658) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313909a0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31467070) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31467118) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x314671c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31467268) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31467310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x314673b8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31467460) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31467508) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x314675b0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31467658) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31467700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x314677a8) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1310,35 +910,15 @@ Class QVariant base size=16 base align=8 QVariant (0x31467818) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31467dc8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31467d20) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x31467f88) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x31467ee0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x31504000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31504118) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1370,80 +950,48 @@ Class QPoint base size=8 base align=4 QPoint (0x31504690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31504a80) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x31504c78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315046c8) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x31504d90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31504e70) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x315aa070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315aa118) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x315aa2a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315aa620) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x315aa8f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315aac78) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x315aa2d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315aa578) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x3168a070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3168a1f8) 0 empty Class QLinkedListData size=20 align=4 @@ -1460,10 +1008,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x3168ac40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3168ad58) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1480,40 +1024,24 @@ Class QLocale base size=4 base align=4 QLocale (0x3168a658) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317d4038) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x317d4230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317d43f0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x317d4460) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317d4658) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x317d46c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317d4818) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1673,10 +1201,6 @@ QEventLoop (0x312b3680) 0 QObject (0x318a4118) 0 primary-for QEventLoop (0x312b3680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x318a42a0) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1768,20 +1292,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x318a4bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318a4d58) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x318a4dc8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318a4ee0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2001,10 +1517,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x31957348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31957428) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2099,20 +1611,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x31957850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x319578f8) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x31957968) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31957a10) 0 empty Class QMetaProperty size=20 align=4 @@ -2124,10 +1628,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x31957ab8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31957b60) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2560,23 +2060,7 @@ QTcpSocket (0x312b3e80) 0 QObject (0x31a02620) 0 primary-for QIODevice (0x312b3f00) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b0a1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31b0a8f8) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b25700) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31bb0188) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.1.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtNetwork.4.1.0.macx-gcc-ia32.txt index e4e3b8093..cf3fa19f4 100644 --- a/tests/auto/bic/data/QtNetwork.4.1.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtNetwork.4.1.0.macx-gcc-ia32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x62ee00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x652040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x652100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6521c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x652280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x652340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x652400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6524c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x652580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x652640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x652700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6527c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x652880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x652940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x652a00) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x652d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x652e00) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0x6be500) 0 QBasicAtomic (0x6be540) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x6be7c0) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xe70480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xe70840) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe70d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe70d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe70e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe70e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe70f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe70f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf79000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf79080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf79100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf79180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf79200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf79280) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xf799c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf79e00) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x1113a00) 0 QString (0x1113a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1113b40) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x11b5380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x11b59c0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x11b5840) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x11b5d00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x11b5c40) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x11b5f40) 0 QGenericArgument (0x11b5f80) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x12cc140) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x12cc0c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x12cc3c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x12cc300) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x12cca00) 0 QObject (0x12cca40) 0 primary-for QIODevice (0x12cca00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x12ccc80) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x139b240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x139b440) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x139b4c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x139b6c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x139b600) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x139b780) 0 QList (0x139b7c0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x139bc80) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x139bd00) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x1442b40) 0 QObject (0x1442bc0) 0 primary-for QIODevice (0x1442b80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1442d80) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1442dc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1442e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1442f00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1442700) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1442100) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1502040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1502180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1502200) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1502240) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1502500) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1502a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1502a80) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x15a9e00) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1723000) 0 Class QTextStreamManipulator size=24 align=4 @@ -1041,35 +829,15 @@ Class rlimit base size=16 base align=4 rlimit (0x1723b80) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x17792c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1779340) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x1779240) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x17793c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1779440) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x17794c0) 0 Class QVectorData size=16 align=4 @@ -1182,95 +950,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1779f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1779ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895080) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895140) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895200) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x18952c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895440) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x18955c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895680) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895740) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895800) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x18958c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895980) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895a40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895b00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895bc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1895c80) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1297,50 +993,18 @@ Class QVariant base size=12 base align=4 QVariant (0x1895d00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x18e6280) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x18e61c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x18e6480) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x18e63c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x18e6700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x18e6840) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x18e6900) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x18e6980) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x18e6a00) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1418,15 +1082,7 @@ Class QUrl base size=4 base align=4 QUrl (0x19a5140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19a5300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x19a5380) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1453,10 +1109,6 @@ QEventLoop (0x19a5400) 0 QObject (0x19a5440) 0 primary-for QEventLoop (0x19a5400) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19a5640) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1501,20 +1153,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x19a5880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x19a5a40) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x19a5ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x19a5c00) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1684,10 +1328,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1a87180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a87280) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1779,20 +1419,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1a87e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a87f00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1a87f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a87400) 0 empty Class QMetaProperty size=20 align=4 @@ -1804,10 +1436,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1a87880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a87b40) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2095,10 +1723,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1b9e900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b9ea40) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2110,70 +1734,42 @@ Class QDate base size=4 base align=4 QDate (0x1b9ec40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b9ee40) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1b9eec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b9efc0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1c52040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c521c0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1c52240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c526c0) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x1c52980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c52e00) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1c52380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c52480) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x1c52ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c52c40) 0 empty Class QLinkedListData size=20 align=4 @@ -2185,50 +1781,30 @@ Class QLocale base size=4 base align=4 QLocale (0x1cee500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cee580) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1cee6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ceeac0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x1ceee80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cee980) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1e0f340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e0f500) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x1e0f780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e0f940) 0 empty Class QSharedData size=4 align=4 @@ -2545,23 +2121,7 @@ QUdpSocket (0x1f87b80) 0 QObject (0x2020000) 0 primary-for QIODevice (0x1f87f00) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x207b540) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x209e3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20ec440) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x214f580) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.1.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtNetwork.4.1.0.macx-gcc-ppc32.txt index e22209c20..4ebdf9216 100644 --- a/tests/auto/bic/data/QtNetwork.4.1.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtNetwork.4.1.0.macx-gcc-ppc32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x7c8840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c8a80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c8b40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c8c00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c8cc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c8d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c8e40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c8f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c8fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7ff080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7ff140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7ff200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7ff2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7ff380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7ff440) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x7ff740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7ff840) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0x7ffc40) 0 QBasicAtomic (0x7ffc80) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x7fff00) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xec7bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xec7f80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfbd440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfbd4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfbd540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfbd5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfbd640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfbd6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfbd740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfbd7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfbd840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfbd8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfbd940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfbd9c0) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x1163100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1163540) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x129e140) 0 QString (0x129e180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x129e280) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x129eb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13b9000) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x129efc0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13b9340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x13b9280) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x13b9580) 0 QGenericArgument (0x13b95c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x13b9880) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x13b9800) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13b9b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x13b9a40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x1494080) 0 QObject (0x14940c0) 0 primary-for QIODevice (0x1494080) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1494300) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x14949c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1494bc0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1494c40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1494e40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1494d80) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x1494f00) 0 QList (0x1494f40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1575380) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1575400) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x16005c0) 0 QObject (0x1600640) 0 primary-for QIODevice (0x1600600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1600800) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1600840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1600900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1600980) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1600b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1600a80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1600c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1600d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1600dc0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1600e00) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x170f040) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x170f540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x170f5c0) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x1809540) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1809800) 0 Class QTextStreamManipulator size=24 align=4 @@ -1051,35 +839,15 @@ Class rlimit base size=16 base align=8 rlimit (0x193d4c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x193d580) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x193d600) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x193d500) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x193d680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x193d700) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x193d780) 0 Class QVectorData size=16 align=4 @@ -1192,95 +960,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1a641c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64300) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a643c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64480) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64600) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a646c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64780) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64840) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64900) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a649c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64a80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64b40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64c00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64cc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64d80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64e40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64f00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a64fc0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1307,50 +1003,18 @@ Class QVariant base size=16 base align=4 QVariant (0x1aa6000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1aa6680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1aa65c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1aa6880) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1aa67c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1aa6b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1aa6c40) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1aa6d00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1aa6d80) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1aa6e00) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1428,15 +1092,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1bc0480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1bc0640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bc06c0) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1463,10 +1119,6 @@ QEventLoop (0x1bc0740) 0 QObject (0x1bc0780) 0 primary-for QEventLoop (0x1bc0740) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1bc0980) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1511,20 +1163,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1bc0bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bc0d80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1bc0e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bc0f40) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1694,10 +1338,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1cb3500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cb3600) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1789,20 +1429,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1cb3d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d49000) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1d49080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d49140) 0 empty Class QMetaProperty size=20 align=4 @@ -1814,10 +1446,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1d49200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d492c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2105,10 +1733,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1dfbc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dfbd80) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2120,70 +1744,42 @@ Class QDate base size=4 base align=4 QDate (0x1dfbf80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ebe0c0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1ebe140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ebe380) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1ebe400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ebe580) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1ebe600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ebea80) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x1ebed40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ebe640) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1ebef80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f60040) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x1f601c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f60280) 0 empty Class QLinkedListData size=20 align=4 @@ -2195,50 +1791,30 @@ Class QLocale base size=4 base align=4 QLocale (0x1f60840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f608c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1f60a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f60e00) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x1f60d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20c33c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x20c3840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20c3a00) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x20c3c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20c3e40) 0 empty Class QSharedData size=4 align=4 @@ -2555,23 +2131,7 @@ QUdpSocket (0x231e300) 0 QObject (0x231e3c0) 0 primary-for QIODevice (0x231e380) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x2390880) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23af700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2402780) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x24678c0) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.1.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtNetwork.4.1.0.win32-gcc-ia32.txt index e841de662..a55e5f059 100644 --- a/tests/auto/bic/data/QtNetwork.4.1.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtNetwork.4.1.0.win32-gcc-ia32.txt @@ -18,80 +18,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xad5e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebc80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebe00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07b80) 0 empty Class QFlag size=4 align=4 @@ -108,10 +48,6 @@ Class QChar base size=2 base align=2 QChar (0xb4d840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb70cc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -139,70 +75,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc34f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd4bc40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd78100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd783c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd73c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd78a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd949c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8c80) 0 Class QInternal size=1 align=1 @@ -229,10 +113,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xeac500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeac940) 0 Class QCharRef size=8 align=4 @@ -245,10 +125,6 @@ Class QConstString QConstString (0x11e1880) 0 QString (0x11e18c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11e1c00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -311,10 +187,6 @@ Class QListData base size=4 base align=4 QListData (0x1279f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x137ae40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -339,15 +211,7 @@ Class QTextCodec QTextCodec (0xeac480) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13be140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc3da40) 0 Class QTextEncoder size=32 align=4 @@ -370,25 +234,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x13fcfc0) 0 QGenericArgument (0x1402000) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1419700) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1402580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1433f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1433b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -480,10 +332,6 @@ QIODevice (0x137a700) 0 QObject (0x14bd540) 0 primary-for QIODevice (0x137a700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14bd840) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -503,25 +351,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xeac380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x158c4c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x158c840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x158cd80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x158cc40) 0 Class QStringList size=4 align=4 @@ -529,15 +365,7 @@ Class QStringList QStringList (0xeac400) 0 QList (0x15b9000) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x158cec0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x158ce80) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -666,50 +494,22 @@ QFile (0x16a0840) 0 QObject (0x16a08c0) 0 primary-for QIODevice (0x16a0880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16af100) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x16d65c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16d6f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1704e40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x172e300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x172e200) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x16d6440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x175c040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x172ec00) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -766,10 +566,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x16a0740) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17db340) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -843,10 +639,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1830c40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1830d40) 0 empty Class QMapData::Node size=8 align=4 @@ -871,10 +663,6 @@ Class QTextStream QTextStream (0x1a78240) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a78600) 0 Class QTextStreamManipulator size=24 align=4 @@ -911,20 +699,8 @@ QTextOStream (0x1b06440) 0 QTextStream (0x1b06480) 0 primary-for QTextOStream (0x1b06440) -Class - size=8 align=4 - base size=8 base align=4 - (0x1b33680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b33800) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1b525c0) 0 Class QVectorData size=16 align=4 @@ -1037,95 +813,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1ce8bc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d02d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d02ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1a040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1a1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1a340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1a4c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1a640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1a7c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1a940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1aac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1ac40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1adc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1af40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d380c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d38240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d383c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d38540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d386c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1152,35 +856,15 @@ Class QVariant base size=16 base align=8 QVariant (0x14338c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1dd5540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d4adc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1dd5840) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1d4ae40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1d4a000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e3b280) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1258,15 +942,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1d38f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ed6440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f08f80) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1293,10 +969,6 @@ QEventLoop (0x1f35600) 0 QObject (0x1f35640) 0 primary-for QEventLoop (0x1f35600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f35940) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1341,20 +1013,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1f6df40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fa0b40) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1f6dec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fa0e80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1524,10 +1188,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2011d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20503c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1620,20 +1280,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x13fc8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20be900) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x13fc940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20bef00) 0 empty Class QMetaProperty size=20 align=4 @@ -1645,10 +1297,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x13fca40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20eb640) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1941,10 +1589,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2237640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2296040) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1956,70 +1600,42 @@ Class QDate base size=4 base align=4 QDate (0x1d38900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22d4900) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1d38b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22f7540) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x16d64c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2320300) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1d38b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2320f40) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1d38c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x236e180) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1d38980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x238f600) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1d38a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23b9b00) 0 empty Class QLinkedListData size=20 align=4 @@ -2031,50 +1647,30 @@ Class QLocale base size=4 base align=4 QLocale (0x1d38a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2509300) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1d38c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2537480) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1d38d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x255d9c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1d38d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25cc440) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1d38e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x264a680) 0 empty Class QSharedData size=4 align=4 @@ -2391,23 +1987,7 @@ QUdpSocket (0x2826e00) 0 QObject (0x2826ec0) 0 primary-for QIODevice (0x2826e80) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13be100) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x158cd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x29f0d40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x172e2c0) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.2.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtNetwork.4.2.0.linux-gcc-ia32.txt index 448bbadcd..0992a30b9 100644 --- a/tests/auto/bic/data/QtNetwork.4.2.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtNetwork.4.2.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f07bc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f07c00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f07cc0) 0 empty - QUintForSize<4> (0xb7f07d00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f07d80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f07dc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7f07e80) 0 empty - QIntForSize<4> (0xb7f07ec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77d0140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d0200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d0240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d0280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d02c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d0300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d0340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d0380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d03c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d0400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d0440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d0480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d04c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d0500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d0540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d0580) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb77d05c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d06c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d0700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d0740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d0780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d07c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d0800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d0840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d0880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d08c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d0900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d0940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d0980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77d09c0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb77d0a80) 0 QGenericArgument (0xb77d0ac0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb77d0c80) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb77d0d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77d0dc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb732e0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb732e100) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb732e140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb732e2c0) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb732e3c0) 0 QString (0xb732e400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb732e440) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0xb732e740) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb732eac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb732ea40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0xb732ec40) 0 QObject (0xb732ec80) 0 primary-for QIODevice (0xb732ec40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb732ed40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb732eec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb732ef00) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0xb6eba3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6eba940) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0xb6eba880) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6ebaa80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6ebaa00) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb6ebab00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6ebab40) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6ebabc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6ebab80) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6ebac00) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6ebac40) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6ebad40) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6ebadc0) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6ebad80) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6ebae40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6ebae80) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0xb6ebaec0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6ebaf80) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0xb6ebaf40) 0 QTextStream (0xb6e77000) 0 primary-for QTextOStream (0xb6ebaf40) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e770c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e77100) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6e77080) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e77140) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e77180) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6e771c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e77200) 0 Class timespec size=8 align=4 @@ -738,80 +492,24 @@ Class timeval base size=8 base align=4 timeval (0xb6e77280) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e772c0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6e77300) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6e77340) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6e77400) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6e773c0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6e77380) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e77440) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6e774c0) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6e77480) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e77500) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6e77580) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6e77540) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e775c0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6e77600) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e77640) 0 Class random_data size=28 align=4 @@ -882,10 +580,6 @@ QFile (0xb6e77b00) 0 QObject (0xb6e77b80) 0 primary-for QIODevice (0xb6e77b40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6e77c00) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -938,50 +632,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb6e77d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6e77dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e77e00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6e77ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6e77e40) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb6e77f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e77f40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6e77f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6e77ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6e77fc0) 0 Class QStringList size=4 align=4 @@ -989,30 +655,14 @@ Class QStringList QStringList (0xb6e77bc0) 0 QList (0xb6e77d40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6c42040) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6c42080) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb6c42140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c421c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c42240) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1069,10 +719,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb6c42280) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c42400) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1184,15 +830,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6c426c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c42700) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c42740) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1287,285 +925,65 @@ Class QUrl base size=4 base align=4 QUrl (0xb6c42a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c42ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c42b00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6c42b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c427c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c42a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69950c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69951c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69952c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69953c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69954c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69955c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69956c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6995740) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1592,45 +1010,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6995780) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb69959c0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6995a00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6995b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6995a80) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6995c00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6995b80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6995cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6995d40) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1662,80 +1052,48 @@ Class QPoint base size=8 base align=4 QPoint (0xb6995f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6995900) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6995940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69958c0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6995980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6995c80) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6995e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6995e40) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0xb6995f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6995fc0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6905000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6905200) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb69052c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69053c0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6905400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69054c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1752,10 +1110,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6905880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69058c0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1772,30 +1126,18 @@ Class QDate base size=4 base align=4 QDate (0xb6905b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6905c00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6905c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6905d00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6905d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6905e00) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1981,10 +1323,6 @@ QEventLoop (0xb6905bc0) 0 QObject (0xb6905c80) 0 primary-for QEventLoop (0xb6905bc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6905d80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1429,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb6760400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6760440) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb6760480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6760500) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2324,10 +1654,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb6760980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67609c0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2422,20 +1748,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb6760c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6760c80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb6760cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6760d00) 0 empty Class QMetaProperty size=20 align=4 @@ -2447,10 +1765,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb6760d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6760dc0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2507,10 +1821,6 @@ QLibrary (0xb6760f00) 0 QObject (0xb6760f40) 0 primary-for QLibrary (0xb6760f00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6760fc0) 0 Class QSemaphore size=4 align=4 @@ -2558,10 +1868,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb67604c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb67606c0) 0 Class QMutexLocker size=4 align=4 @@ -2573,20 +1879,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb67607c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb6760940) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb6760880) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb6760b40) 0 Class QWriteLocker size=4 align=4 @@ -2731,20 +2029,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0xb64ad380) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb64ad440) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0xb64ad3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64ad480) 0 Class QHostInfo size=4 align=4 @@ -2878,10 +2168,6 @@ QUdpSocket (0xb64ad7c0) 0 QObject (0xb64ad880) 0 primary-for QIODevice (0xb64ad840) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64ad900) 0 Vtable for QTcpSocket QTcpSocket::_ZTV10QTcpSocket: 30u entries @@ -2928,23 +2214,7 @@ QTcpSocket (0xb64ad940) 0 QObject (0xb64ada00) 0 primary-for QIODevice (0xb64ad9c0) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64adac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64adb40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64adbc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64adc40) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.2.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtNetwork.4.2.0.linux-gcc-ppc32.txt index 9190183db..b09d8ce65 100644 --- a/tests/auto/bic/data/QtNetwork.4.2.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtNetwork.4.2.0.linux-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x30592e38) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x30592ea8) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x3001b9c0) 0 empty - QUintForSize<4> (0x30596000) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x305960e0) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x30596150) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x3001ba40) 0 empty - QIntForSize<4> (0x305962a0) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x30596620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30596818) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305968c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30596968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30596a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30596ab8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30596b60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30596c08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30596cb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30596d58) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30596e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30596ea8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30596f50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305ca000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305ca0a8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305ca150) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x305ca1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305ca690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305ca700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305ca770) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305ca7e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305ca850) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305ca8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305ca930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305ca9a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305caa10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305caa80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305caaf0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305cab60) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305cabd0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3001bb80) 0 QGenericArgument (0x305cace8) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x305caea8) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0x305caf88) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30aee038) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x30aeed90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30bbc0e0) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0x30bbc188) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30bbc3b8) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0x3001bdc0) 0 QString (0x30d54540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30d54620) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0x30d54d20) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30e48188) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30e480e0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0x3001be80) 0 QObject (0x30e48658) 0 primary-for QIODevice (0x3001be80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30e48850) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x30e48f88) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30e482d8) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0x30f05770) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30f05e00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0x30f05cb0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3104e000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30f05a10) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x3104e118) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x3104e1c0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x3104e2a0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x3104e230) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x3104e310) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x3104e380) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x3104e4d0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x3104e5b0) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x3104e540) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x3104e620) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x3104e690) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0x3104e6c8) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3104e8f8) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0x310b0080) 0 QTextStream (0x3104ee70) 0 primary-for QTextOStream (0x310b0080) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x310f40a8) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x310f4118) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x310f4038) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310f4188) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310f41f8) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x310f4268) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x310f42d8) 0 Class timespec size=8 align=4 @@ -738,70 +492,18 @@ Class timeval base size=8 base align=4 timeval (0x310f4348) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x310f43b8) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x310f4428) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x310f4508) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x310f4498) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310f4578) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x310f4658) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x310f45e8) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310f46c8) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x310f47a8) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x310f4738) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310f4818) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x310f4888) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310f48f8) 0 Class random_data size=28 align=4 @@ -872,10 +574,6 @@ QFile (0x310b00c0) 0 QObject (0x311f61c0) 0 primary-for QIODevice (0x310b0100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311f6348) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -928,50 +626,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x311f6498) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311f6540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311f65b0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x311f6738) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x311f6690) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x311f67e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311f69d8) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x311f6a48) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x311f6c08) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x311f6b60) 0 Class QStringList size=4 align=4 @@ -979,30 +649,14 @@ Class QStringList QStringList (0x310b0200) 0 QList (0x311f6cb0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x312ed038) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x312ed0a8) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x312ed3b8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312ed4d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312ed578) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1059,10 +713,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x312ed5b0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312ed818) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1174,15 +824,7 @@ Class QLocale base size=4 base align=4 QLocale (0x312edbd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312edc78) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312edd20) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1277,285 +919,65 @@ Class QUrl base size=4 base align=4 QUrl (0x312ede38) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31404118) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31404188) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x314041f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314043b8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404460) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404508) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314045b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404658) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314047a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404850) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314048f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314049a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404a48) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404af0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404b98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404ce8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404d90) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404e38) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404ee0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31404f88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d038) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d0e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d188) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d230) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d2d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d428) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d4d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d578) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d620) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d6c8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d770) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d818) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145d968) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145da10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145dab8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145db60) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145dc08) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145dcb0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145dd58) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145de00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145dea8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145df50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31475000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314750a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31475150) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314751f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314752a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31475348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314753f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31475498) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31475540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314755e8) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1582,45 +1004,17 @@ Class QVariant base size=16 base align=8 QVariant (0x31475658) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x31475af0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x31475b98) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31475d58) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31475cb0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x31475f18) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x31475e70) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x31475850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31508038) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1652,80 +1046,48 @@ Class QPoint base size=8 base align=4 QPoint (0x31508578) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31508968) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x31508b60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31508f50) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x315087e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315088c0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x31508dc8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315bf000) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x315bf188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315bf508) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x315bf7e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315bfb60) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x315bfee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315bf310) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x315bfab8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3169e070) 0 empty Class QLinkedListData size=20 align=4 @@ -1742,10 +1104,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x3169eab8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3169eb98) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1762,30 +1120,18 @@ Class QDate base size=4 base align=4 QDate (0x3169ef88) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317bf0a8) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x317bf118) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317bf2d8) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x317bf348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317bf498) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1971,10 +1317,6 @@ QEventLoop (0x310b0780) 0 QObject (0x317bf5b0) 0 primary-for QEventLoop (0x310b0780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31871038) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2081,20 +1423,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x31871a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31871c08) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x31871c78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31871d90) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2314,10 +1648,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x3193b230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3193b310) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2412,20 +1742,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x3193b738) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3193b7e0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x3193b850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3193b8f8) 0 empty Class QMetaProperty size=20 align=4 @@ -2437,10 +1759,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x3193b9a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3193ba48) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2497,10 +1815,6 @@ QLibrary (0x310b0c00) 0 QObject (0x3193bd20) 0 primary-for QLibrary (0x310b0c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3193bea8) 0 Class QSemaphore size=4 align=4 @@ -2548,10 +1862,6 @@ Class QMutex base size=4 base align=4 QMutex (0x3193bb60) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x319fe118) 0 Class QMutexLocker size=4 align=4 @@ -2563,20 +1873,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x319fe1c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x319fe268) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x319fe1f8) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x319fe380) 0 Class QWriteLocker size=4 align=4 @@ -2721,20 +2023,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0x319fec08) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x319fee00) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0x319fec40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x319feee0) 0 Class QHostInfo size=4 align=4 @@ -2868,10 +2162,6 @@ QUdpSocket (0x310b0f00) 0 QObject (0x31abf1c0) 0 primary-for QIODevice (0x310b0f80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31abf348) 0 Vtable for QTcpSocket QTcpSocket::_ZTV10QTcpSocket: 30u entries @@ -2918,23 +2208,7 @@ QTcpSocket (0x310b0fc0) 0 QObject (0x31abf380) 0 primary-for QIODevice (0x31af1040) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b428f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31b5d038) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b5de38) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31c00968) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.2.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtNetwork.4.2.0.macx-gcc-ia32.txt index dd66da6dd..885d3cef1 100644 --- a/tests/auto/bic/data/QtNetwork.4.2.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtNetwork.4.2.0.macx-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x697f80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x699000) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x6991c0) 0 empty - QUintForSize<4> (0x699200) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x699300) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x699380) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x699540) 0 empty - QIntForSize<4> (0x699580) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x699a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x699cc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x699d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x699e40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x699f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x699fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6cc080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6cc140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6cc200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6cc2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6cc380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6cc440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6cc500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6cc5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6cc680) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0x6cc980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6cca80) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0xe5a180) 0 QBasicAtomic (0xe5a1c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xe5a440) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xef1180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xef1540) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xef19c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xef1a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xef1ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xef1b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xef1bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xef1c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xef1cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xef1d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xef1dc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xef1e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xef1ec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xef1f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xef1fc0) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x10467c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1046c00) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x11f6800) 0 QString (0x11f6840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11f6940) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x1266100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1266740) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x12665c0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1266a80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x12669c0) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1266cc0) 0 QGenericArgument (0x1266d00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1266fc0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1266f40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1397180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x13970c0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x13977c0) 0 QObject (0x1397800) 0 primary-for QIODevice (0x13977c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1397a40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1470040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1470280) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1470300) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1470500) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1470440) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x14705c0) 0 QList (0x1470600) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1470ac0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1470b40) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x14fd940) 0 QObject (0x14fd9c0) 0 primary-for QIODevice (0x14fd980) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14fdb80) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x14fdbc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14fdc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x14fdd00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x14fdec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x14fde00) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x14fdf80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14fdac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15f3040) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x15f3080) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15f3340) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x15f3840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15f38c0) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x1673c80) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1673f40) 0 Class QTextStreamManipulator size=24 align=4 @@ -1078,35 +836,15 @@ Class rlimit base size=16 base align=4 rlimit (0x180ca00) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1850100) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1850180) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x1850080) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1850200) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1850280) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x1850300) 0 Class QVectorData size=16 align=4 @@ -1244,15 +982,7 @@ Class QLocale base size=4 base align=4 QLocale (0x19ca140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x19ca200) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19ca2c0) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1279,270 +1009,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x19ca4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19ca6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19ca780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19ca840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19ca900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19ca9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19caa80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19cab40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19cac00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19cacc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19cad80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19cae40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19caf00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19cafc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5e9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5ea80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5eb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5ec00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5ecc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5ed80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5ee40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5ef00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5efc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a792c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a795c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a798c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a79d40) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1569,60 +1087,20 @@ Class QVariant base size=12 base align=4 QVariant (0x1a79dc0) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab6280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab6340) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1ab6540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1ab6480) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1ab6740) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1ab6680) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1ab68c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ab6a00) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1ab6ac0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1ab6b40) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1ab6bc0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1700,15 +1178,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1b742c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b74480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b74500) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1735,10 +1205,6 @@ QEventLoop (0x1b74580) 0 QObject (0x1b745c0) 0 primary-for QEventLoop (0x1b74580) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b747c0) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1783,20 +1249,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1b74a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b74bc0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1b74c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b74d80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1966,10 +1424,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1c69380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c69480) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2076,20 +1530,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1c69d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ceb000) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1ceb080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ceb140) 0 empty Class QMetaProperty size=20 align=4 @@ -2101,10 +1547,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1ceb200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ceb2c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2286,10 +1728,6 @@ QLibrary (0x1cebc80) 0 QObject (0x1cebcc0) 0 primary-for QLibrary (0x1cebc80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1cebe80) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2326,10 +1764,6 @@ Class QMutex base size=4 base align=4 QMutex (0x1cebfc0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x1dad180) 0 Class QMutexLocker size=4 align=4 @@ -2341,20 +1775,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x1dad240) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x1dad300) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x1dad280) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x1dad440) 0 Class QWriteLocker size=4 align=4 @@ -2412,10 +1838,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1dade40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dadf40) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2427,70 +1849,42 @@ Class QDate base size=4 base align=4 QDate (0x1e3e180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e3e380) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e3e400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e3e600) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1e3e680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e3e800) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1e3e880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e3ed00) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x1e3efc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e3ea40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1eeb1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eeb240) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x1eeb3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eeb480) 0 empty Class QLinkedListData size=20 align=4 @@ -2502,40 +1896,24 @@ Class QSize base size=8 base align=4 QSize (0x1eebac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eebec0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x1ffa080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ffa480) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1ffa900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ffaac0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x1ffad40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ffaf00) 0 empty Class QSharedData size=4 align=4 @@ -2760,20 +2138,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0x21eb000) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x21eb200) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0x21eb040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21eb300) 0 Class QNetworkProxy size=4 align=4 @@ -2898,28 +2268,8 @@ QUdpSocket (0x21eb700) 0 QObject (0x21eb7c0) 0 primary-for QIODevice (0x21eb780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21eb980) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22b5040) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22b5ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2301f40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23a3380) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.2.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtNetwork.4.2.0.macx-gcc-ppc32.txt index 73d592209..65d9c0f7a 100644 --- a/tests/auto/bic/data/QtNetwork.4.2.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtNetwork.4.2.0.macx-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x9cab80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x9cac00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x9cadc0) 0 empty - QUintForSize<4> (0x9cae00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x9caf00) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x9caf80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x9d1140) 0 empty - QIntForSize<4> (0x9d1180) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x9d1680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9d18c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9d1980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9d1a40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9d1b00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9d1bc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9d1c80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9d1d40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9d1e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9d1ec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9d1f80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa0d040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa0d100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa0d1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa0d280) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0xa0d580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa0d680) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0xa0dc80) 0 QBasicAtomic (0xa0dcc0) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0xa0df40) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xeb9c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xf91040) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf914c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf91540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf915c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf91640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf916c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf91740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf917c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf91840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf918c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf91940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf919c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf91a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf91ac0) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x111f280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x111f6c0) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x123e300) 0 QString (0x123e340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x123e440) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x123ecc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1340200) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1340080) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1340540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1340480) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1340780) 0 QGenericArgument (0x13407c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1340a80) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1340a00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1340d00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1340c40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x1410240) 0 QObject (0x1410280) 0 primary-for QIODevice (0x1410240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14104c0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1410bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1410e00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1410e80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x14c7000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1410fc0) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x14c70c0) 0 QList (0x14c7100) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x14c75c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x14c7640) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x153d800) 0 QObject (0x153d880) 0 primary-for QIODevice (0x153d840) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x153da40) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x153da80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x153db40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x153dbc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x153dd80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x153dcc0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x153de40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x153df80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x153d980) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x164b000) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x164b2c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x164b7c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x164b840) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x171c7c0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x171ca80) 0 Class QTextStreamManipulator size=24 align=4 @@ -1088,40 +846,16 @@ Class rlimit base size=16 base align=8 rlimit (0x1851740) 0 -Class OSReadSwapInt64(const volatile void*, uintptr_t):: - size=8 align=8 - base size=8 base align=8 -OSReadSwapInt64(const volatile void*, uintptr_t):: (0x1851940) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x187f040) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x187f0c0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x1851140) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x187f140) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x187f1c0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x187f240) 0 Class QVectorData size=16 align=4 @@ -1259,15 +993,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1a070c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a07180) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a07240) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1294,270 +1020,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1a07440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a07640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a07700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a077c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a07880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a07940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a07a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a07ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a07b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a07c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a07d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a07dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a07e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a07f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a07040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8a940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8aa00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8aac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8ab80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8ac40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8ad00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8adc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8ae80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a8af40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa90c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa93c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa96c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa99c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa9cc0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1584,60 +1098,20 @@ Class QVariant base size=16 base align=4 QVariant (0x1aa9d40) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1af5180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1af5240) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1af5440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1af5380) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1af5640) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1af5580) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1af57c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1af5900) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1af59c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1af5a40) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1af5ac0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1715,15 +1189,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1ba5240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ba5400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ba5480) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1750,10 +1216,6 @@ QEventLoop (0x1ba5500) 0 QObject (0x1ba5540) 0 primary-for QEventLoop (0x1ba5500) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ba5740) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1798,20 +1260,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1ba5980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ba5b40) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1ba5bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ba5d00) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1981,10 +1435,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1c8e300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c8e400) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1541,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1c8ea00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c8ed40) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1d1c000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d1c0c0) 0 empty Class QMetaProperty size=20 align=4 @@ -2116,10 +1558,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1d1c180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d1c240) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2301,10 +1739,6 @@ QLibrary (0x1d1cc40) 0 QObject (0x1d1cc80) 0 primary-for QLibrary (0x1d1cc40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d1ce40) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2341,10 +1775,6 @@ Class QMutex base size=4 base align=4 QMutex (0x1d1cd80) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x1ddf140) 0 Class QMutexLocker size=4 align=4 @@ -2356,20 +1786,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x1ddf200) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x1ddf2c0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x1ddf240) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x1ddf400) 0 Class QWriteLocker size=4 align=4 @@ -2427,10 +1849,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1ddfe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ddff00) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2442,70 +1860,42 @@ Class QDate base size=4 base align=4 QDate (0x1e6e140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e6e340) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e6e3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e6e5c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1e6e640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e6e7c0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1e6e840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e6ecc0) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x1e6ef80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e6ea00) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1f23180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f23200) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x1f23380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f23440) 0 empty Class QLinkedListData size=20 align=4 @@ -2517,40 +1907,24 @@ Class QSize base size=8 base align=4 QSize (0x1f23a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f23e80) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x2027040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2027440) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x20278c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2027a80) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x2027d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2027ec0) 0 empty Class QSharedData size=4 align=4 @@ -2775,20 +2149,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0x213af80) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x221d1c0) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0x221d000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x221d2c0) 0 Class QNetworkProxy size=4 align=4 @@ -2913,28 +2279,8 @@ QUdpSocket (0x221d6c0) 0 QObject (0x221d780) 0 primary-for QIODevice (0x221d740) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x221d940) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22e3000) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22e3e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x232ff00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23cf340) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.2.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtNetwork.4.2.0.win32-gcc-ia32.txt index 9b2f4ca49..00c2a1c75 100644 --- a/tests/auto/bic/data/QtNetwork.4.2.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtNetwork.4.2.0.win32-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xa9db00) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xa9dc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xa9df00) 0 empty - QUintForSize<4> (0xac3000) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xac3180) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xac3240) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xac34c0) 0 empty - QIntForSize<4> (0xac3580) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xaf3380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf3b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf3d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf3e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ba80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0bc00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0bd80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0bf00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb37080) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb60f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb97380) 0 empty Class QBasicAtomic size=4 align=4 @@ -171,75 +81,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc4bb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd72780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd84e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd940c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd84980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd9ae40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd94780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda58c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda0080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde94c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde9d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef480) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xee0240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee0780) 0 Class QCharRef size=8 align=4 @@ -282,10 +132,6 @@ Class QConstString QConstString (0x11f3dc0) 0 QString (0x11f3e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1260140) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -348,10 +194,6 @@ Class QListData base size=4 base align=4 QListData (0x12d61c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13dc180) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -376,15 +218,7 @@ Class QTextCodec QTextCodec (0xee01c0) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1400480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc5d5c0) 0 Class QTextEncoder size=32 align=4 @@ -407,25 +241,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x144b300) 0 QGenericArgument (0x144b340) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1460ac0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x144b8c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1490340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1476f40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -517,10 +339,6 @@ QIODevice (0x13b5a40) 0 QObject (0x150ab40) 0 primary-for QIODevice (0x13b5a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x150ae40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -540,25 +358,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xee00c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15d9c00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x15d9f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x15f14c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x15f1380) 0 Class QStringList size=4 align=4 @@ -566,15 +372,7 @@ Class QStringList QStringList (0xee0140) 0 QList (0x15f1740) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x15f1600) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x15f15c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -703,50 +501,22 @@ QFile (0x1708080) 0 QObject (0x1708100) 0 primary-for QIODevice (0x17080c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1708940) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1760140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1760a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1779ac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1779f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1779e80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x171efc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b4c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b4880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -803,10 +573,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x16f5f80) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18540c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -880,10 +646,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x18bbb80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x18bbc80) 0 empty Class QMapData::Node size=8 align=4 @@ -908,10 +670,6 @@ Class QTextStream QTextStream (0x1afb580) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1afb940) 0 Class QTextStreamManipulator size=24 align=4 @@ -948,20 +706,8 @@ QTextOStream (0x1b89740) 0 QTextStream (0x1b89780) 0 primary-for QTextOStream (0x1b89740) -Class - size=8 align=4 - base size=8 base align=4 - (0x1bbd980) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1bbdb00) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1be98c0) 0 Class QVectorData size=16 align=4 @@ -1099,15 +845,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1e50cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e99980) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e99040) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1134,270 +872,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1efb400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1c840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1c9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1cb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1ccc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1ce40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1cfc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f30140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f302c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f30440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f305c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f30740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f308c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f30a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f30bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f30d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f30ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f50040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f501c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f50340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f504c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f50640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f507c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f50940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f50ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f50c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f50dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f50f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6d0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6d240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6d3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6d540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6d6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6d840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6d9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6db40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6dcc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6de40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6dfc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f8c140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f8c2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f8c440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f8c5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f8c740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f8c8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f8ca40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f8cbc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f8cd40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f8cec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fae040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fae1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fae340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fae4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fae640) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1424,45 +950,17 @@ Class QVariant base size=16 base align=8 QVariant (0x1476c80) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2000e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2000fc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2034480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1fc2540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x2034780) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1fc25c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1fae800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x209c100) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1540,15 +1038,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1f1c180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2158440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21b6040) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1575,10 +1065,6 @@ QEventLoop (0x21b66c0) 0 QObject (0x21b6700) 0 primary-for QEventLoop (0x21b66c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21b6a00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1623,20 +1109,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x222d200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x222de80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x222d180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x225a2c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1806,10 +1284,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x22dd7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22dde00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1917,20 +1391,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x143fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x237bbc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x143fc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23901c0) 0 empty Class QMetaProperty size=20 align=4 @@ -1942,10 +1408,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x143fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2390900) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2127,10 +1589,6 @@ QLibrary (0x2451040) 0 QObject (0x2451080) 0 primary-for QLibrary (0x2451040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x24512c0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2172,10 +1630,6 @@ Class QMutex base size=4 base align=4 QMutex (0x24c17c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x24ee000) 0 Class QMutexLocker size=4 align=4 @@ -2187,20 +1641,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x24eee00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x2500140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x24eefc0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x2500900) 0 Class QWriteLocker size=4 align=4 @@ -2258,10 +1704,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2543ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x259e480) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2273,70 +1715,42 @@ Class QDate base size=4 base align=4 QDate (0x1e50b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25f3640) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e50bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x261b280) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1760040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2648040) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1f1c340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2648c80) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1f1c380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x266ee40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1f1c2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26b42c0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1f1c300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26df780) 0 empty Class QLinkedListData size=20 align=4 @@ -2348,40 +1762,24 @@ Class QSize base size=8 base align=4 QSize (0x1f1c240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27d0fc0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1f1c280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2823500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1f1c1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x28b7000) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1f1c200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x292b340) 0 empty Class QSharedData size=4 align=4 @@ -2606,20 +2004,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0x2add380) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x2addc80) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0x2add700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2add940) 0 Class QNetworkProxy size=4 align=4 @@ -2744,28 +2134,8 @@ QUdpSocket (0x2b42700) 0 QObject (0x2b427c0) 0 primary-for QIODevice (0x2b42780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b429c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1400440) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x15f1480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d46d80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1779f40) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.3.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtNetwork.4.3.0.linux-gcc-ia32.txt index c567de727..45d9480bf 100644 --- a/tests/auto/bic/data/QtNetwork.4.3.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtNetwork.4.3.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f8fbc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f8fc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f8fcc0) 0 empty - QUintForSize<4> (0xb7f8fd00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f8fd80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f8fdc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7f8fe80) 0 empty - QIntForSize<4> (0xb7f8fec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb783e180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783e5c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb783e600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783e700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783e740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783e780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783e7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783e800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783e840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783e880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783e8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783e900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783e940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783e980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783e9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783ea00) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb783eb00) 0 QGenericArgument (0xb783eb40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb783ed00) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb783edc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783ee40) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb73a5140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73a5180) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb73a51c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73a53c0) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb73a54c0) 0 QString (0xb73a5500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73a5540) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb73a5880) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb73a5c00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb73a5b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb73a5e40) 0 QObject (0xb73a5e80) 0 primary-for QLibrary (0xb73a5e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73a5f00) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb73a5fc0) 0 QObject (0xb73a5300) 0 primary-for QIODevice (0xb73a5fc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73a5680) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb73a5800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73a5a40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb73a5c80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6dfe000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb73a5d00) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb6dfe040) 0 QList (0xb6dfe080) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6dfe100) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6dfe140) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6dfe4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6dfe500) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb6dfea40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6dfeb00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6dfeb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6dfec00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6dfec40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6dfed00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb6dfed40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6dfedc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6dfee00) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6dfed80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6dfee40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6dfee80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6dfeec0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6dfef00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6dfef40) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb6dfefc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6dfe240) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6dfe380) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6dfe8c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6dfeb80) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6dfeac0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6dfea80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6dfebc0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6dfecc0) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6dfec80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d5d000) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6d5d080) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6d5d040) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d5d0c0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6d5d100) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d5d140) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb6d5d3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d5d5c0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6d5d640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d5d840) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6d5dc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d5dc40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6d5dc80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb6d5d740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d5d800) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6d5d780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d5d7c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb69de080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69de180) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb69de1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69de280) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb69de2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69de300) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb69de340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69de380) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb69de700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69de740) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb69de880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69de900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69de940) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb69de980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69dea40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69dea80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69deac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69deb00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69deb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69deb80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69debc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69dec00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69dec40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69dec80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69decc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69ded00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69ded40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69ded80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69dedc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69dee00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69dee40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69dee80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69deec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69def00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69def40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69def80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69defc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69de0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69de100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69de140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69de200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69de240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69de580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68080c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68081c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68082c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68083c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68084c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68085c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6808600) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6808640) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb68088c0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6808900) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6808a00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6808980) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6808b00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6808a80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6808b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6808c00) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb6808c40) 0 QObject (0xb6808c80) 0 primary-for QSettings (0xb6808c40) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6808d80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6808d40) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6808dc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6808e00) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6808f00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6808f80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6808f40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6808780) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb68087c0) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb6808800) 0 QObject (0xb6808880) 0 primary-for QIODevice (0xb6808840) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6808d00) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb671f100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671f140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb671f180) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb671f240) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb671f1c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb671f280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671f300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671f380) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb671f5c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671f680) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb671f6c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671f840) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb671f900) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671fa40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb671f980) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb671fb80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb671fb00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb671fc40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671fd00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb671fa00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb671fcc0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb671fa80) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb671ff40) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb653d000) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb653d080) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb653d380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb653d3c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb653d4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb653d500) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb653d540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb653d5c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb653da40) 0 QObject (0xb653da80) 0 primary-for QEventLoop (0xb653da40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb653db80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb653d880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb653d940) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb653da00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb653db00) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb653dcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb653dd80) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2742,10 +2032,6 @@ QUdpSocket (0xb64a9340) 0 QObject (0xb64a9400) 0 primary-for QIODevice (0xb64a93c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64a9480) 0 Class QSslCertificate size=4 align=4 @@ -2802,10 +2088,6 @@ QTcpSocket (0xb64a9540) 0 QObject (0xb64a9600) 0 primary-for QIODevice (0xb64a95c0) -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb64a9680) 0 empty Vtable for QSslSocket QSslSocket::_ZTV10QSslSocket: 30u entries @@ -2864,20 +2146,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0xb64a9900) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb64a99c0) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0xb64a9940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64a9a00) 0 Class QSslKey size=4 align=4 @@ -3056,38 +2330,10 @@ QTcpServer (0xb64a9fc0) 0 QObject (0xb64a9100) 0 primary-for QTcpServer (0xb64a9fc0) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64a9280) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64a9640) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64a9cc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb64a9b40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64a9e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb612c000) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb612c080) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.3.1.linux-gcc-ia32.txt b/tests/auto/bic/data/QtNetwork.4.3.1.linux-gcc-ia32.txt index 2b8d36d17..c326a4863 100644 --- a/tests/auto/bic/data/QtNetwork.4.3.1.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtNetwork.4.3.1.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f4dbc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f4dc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f4dcc0) 0 empty - QUintForSize<4> (0xb7f4dd00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f4dd80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f4ddc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7f4de80) 0 empty - QIntForSize<4> (0xb7f4dec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb73fc180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fc5c0) 0 empty Class QFlag size=4 align=4 @@ -161,10 +75,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb73fca00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73fca40) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -227,70 +137,18 @@ Class QListData base size=4 base align=4 QListData (0xb73fcd40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fcb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fcc00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fccc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fcf00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73fcf40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb723a000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb723a040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb723a080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb723a0c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb723a100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb723a140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb723a180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb723a1c0) 0 Class QInternal size=1 align=1 @@ -308,10 +166,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb723a2c0) 0 QGenericArgument (0xb723a300) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb723a4c0) 0 Class QMetaObject size=16 align=4 @@ -328,10 +182,6 @@ Class QChar base size=2 base align=2 QChar (0xb723a580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb723a600) 0 empty Class QString::Null size=1 align=1 @@ -348,10 +198,6 @@ Class QString base size=4 base align=4 QString (0xb723a640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb723a840) 0 Class QLatin1String size=4 align=4 @@ -369,25 +215,13 @@ Class QConstString QConstString (0xb723a900) 0 QString (0xb723a940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb723a980) 0 empty Class QStringRef size=12 align=4 base size=12 base align=4 QStringRef (0xb723a9c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb723ab00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb723aa80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -479,10 +313,6 @@ QIODevice (0xb723ad40) 0 QObject (0xb723ad80) 0 primary-for QIODevice (0xb723ad40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb723ae40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -502,275 +332,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb723af00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb723afc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb723a780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb723a7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb723ab80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb723ac00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb723adc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb723aec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f880c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f881c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f882c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f883c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f884c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f885c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f886c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f887c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f888c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f889c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f88b80) 0 empty Class QMapData::Node size=8 align=4 @@ -807,45 +421,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6e5b000) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6e5b280) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6e5b2c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6e5b3c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6e5b340) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6e5b4c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6e5b440) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6e5b540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e5b5c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -972,10 +558,6 @@ QEventLoop (0xb6e5ba40) 0 QObject (0xb6e5ba80) 0 primary-for QEventLoop (0xb6e5ba40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6e5bb80) 0 Vtable for QCoreApplication QCoreApplication::_ZTV16QCoreApplication: 16u entries @@ -1009,10 +591,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb6e5bd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e5bd80) 0 empty Vtable for QTimer QTimer::_ZTV6QTimer: 14u entries @@ -1069,20 +647,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb6e5bf40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e5bf80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb6e5bfc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e5b180) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1277,20 +847,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb6e5bb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e5bc40) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb6e5bc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e5bcc0) 0 empty Class QMetaProperty size=20 align=4 @@ -1302,10 +864,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb6e5bf00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdf000) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1408,100 +966,48 @@ Class QSize base size=8 base align=4 QSize (0xb6bdf300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdf500) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6bdf580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdf780) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb6bdf840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdfa80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6bdfac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdfd00) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6bdfd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdfe40) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6bdfe80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdff40) 0 empty -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6bdffc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6bdf0c0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6bdff80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6bdf180) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6bdf240) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6bdf340) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6bdf380) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6bdf3c0) 0 Class timespec size=8 align=4 @@ -1513,80 +1019,24 @@ Class timeval base size=8 base align=4 timeval (0xb6bdf440) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6bdf480) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6bdf4c0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6bdf5c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6bdf680) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6bdf640) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6bdf600) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6bdf6c0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6bdf740) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6bdf700) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6bdf880) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6bdf900) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6bdf8c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6bdf940) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6bdf980) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6bdf9c0) 0 Class random_data size=28 align=4 @@ -1618,35 +1068,19 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6a0e000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0e040) 0 empty Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb6a0e7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0e800) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6a0e840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6a0e900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6a0e880) 0 Class QStringList size=4 align=4 @@ -1654,15 +1088,7 @@ Class QStringList QStringList (0xb6a0e940) 0 QList (0xb6a0e980) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6a0ea00) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6a0ea40) 0 Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1695,15 +1121,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6a0ec40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0ec80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a0ecc0) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1730,10 +1148,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6a0ef00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0ef40) 0 empty Class QCryptographicHash size=4 align=4 @@ -1750,20 +1164,12 @@ Class QLine base size=16 base align=4 QLine (0xb68162c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6816300) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6816340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6816380) 0 empty Class QSharedData size=4 align=4 @@ -1775,30 +1181,18 @@ Class QDate base size=4 base align=4 QDate (0xb6816500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68165c0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6816600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68166c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6816700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68167c0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1810,20 +1204,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb6816840) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb68168c0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb6816880) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb6816940) 0 Class QWriteLocker size=4 align=4 @@ -1876,20 +1262,12 @@ Class QMutex base size=4 base align=4 QMutex (0xb6816b80) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb6816c00) 0 Class QMutexLocker size=4 align=4 base size=4 base align=4 QMutexLocker (0xb6816bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6816d00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1914,15 +1292,7 @@ Class QTextCodec QTextCodec (0xb6816c40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6816e40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6816dc0) 0 Class QTextEncoder size=32 align=4 @@ -1934,25 +1304,9 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb6816ec0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6816f40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6816f00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6816f80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6816fc0) 0 Class __gconv_trans_data size=20 align=4 @@ -1974,15 +1328,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6816640) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6816740) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6816680) 0 Class _IO_marker size=12 align=4 @@ -1994,10 +1340,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6816a40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6816cc0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -2012,10 +1354,6 @@ Class QTextStream QTextStream (0xb6816d40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65c2080) 0 Class QTextStreamManipulator size=24 align=4 @@ -2131,35 +1469,15 @@ QFile (0xb65c24c0) 0 QObject (0xb65c2540) 0 primary-for QIODevice (0xb65c2500) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65c25c0) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb65c2600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65c2640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65c2680) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb65c2740) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb65c26c0) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -2212,15 +1530,7 @@ Class QDir base size=4 base align=4 QDir (0xb65c28c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65c2940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65c29c0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2277,10 +1587,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb65c2a00) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65c2b80) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2409,15 +1715,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb65c2e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65c2f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65c2f40) 0 empty Vtable for QDirIterator QDirIterator::_ZTV12QDirIterator: 4u entries @@ -2432,10 +1730,6 @@ Class QDirIterator QDirIterator (0xb65c2f80) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65c2200) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -2541,10 +1835,6 @@ QLibrary (0xb65c2d40) 0 QObject (0xb65c2e40) 0 primary-for QLibrary (0xb65c2d40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65c2fc0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2896,10 +2186,6 @@ Class QSslCipher base size=4 base align=4 QSslCipher (0xb6468cc0) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb6468d00) 0 empty Vtable for QSslSocket QSslSocket::_ZTV10QSslSocket: 30u entries @@ -2986,20 +2272,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0xb6468100) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb6468400) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0xb6468240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64683c0) 0 Vtable for QUdpSocket QUdpSocket::_ZTV10QUdpSocket: 30u entries @@ -3046,48 +2324,16 @@ QUdpSocket (0xb64684c0) 0 QObject (0xb6468900) 0 primary-for QIODevice (0xb6468840) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64689c0) 0 Class QSslKey size=4 align=4 base size=4 base align=4 QSslKey (0xb6468a80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6468c40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6468fc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6273140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb62730c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb62731c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6273240) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb62732c0) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.3.2.linux-gcc-ia32.txt b/tests/auto/bic/data/QtNetwork.4.3.2.linux-gcc-ia32.txt index 6d3b14852..9ea28aee6 100644 --- a/tests/auto/bic/data/QtNetwork.4.3.2.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtNetwork.4.3.2.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7fa1bc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7fa1c00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7fa1cc0) 0 empty - QUintForSize<4> (0xb7fa1d00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7fa1d80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7fa1dc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7fa1e80) 0 empty - QIntForSize<4> (0xb7fa1ec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7850180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7850240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7850280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78502c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7850300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7850340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7850380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78503c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7850400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7850440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7850480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78504c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7850500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7850540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7850580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78505c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb7850600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7850700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7850740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7850780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78507c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7850800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7850840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7850880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78508c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7850900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7850940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7850980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78509c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7850a00) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb7850b00) 0 QGenericArgument (0xb7850b40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb7850d00) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb7850dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7850e40) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb73b7140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7180) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb73b71c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73b73c0) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb73b74c0) 0 QString (0xb73b7500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7540) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb73b7880) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb73b7c00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb73b7b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb73b7e40) 0 QObject (0xb73b7e80) 0 primary-for QLibrary (0xb73b7e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73b7f00) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb73b7fc0) 0 QObject (0xb73b7300) 0 primary-for QIODevice (0xb73b7fc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73b7680) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb73b7800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73b7a40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb73b7c80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6e10000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb73b7d00) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb6e10040) 0 QList (0xb6e10080) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6e10100) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6e10140) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6e104c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e10500) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb6e10a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e10b00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6e10b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e10c00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6e10c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e10d00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb6e10d40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e10dc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e10e00) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6e10d80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e10e40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e10e80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6e10ec0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e10f00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e10f40) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb6e10fc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e10240) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6e10380) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6e108c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6e10b80) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6e10ac0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6e10a80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e10bc0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6e10cc0) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6e10c80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d6f000) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6d6f080) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6d6f040) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d6f0c0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6d6f100) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d6f140) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb6d6f3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d6f5c0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6d6f640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d6f840) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6d6fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d6fc40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6d6fc80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb6d6f740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d6f800) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6d6f780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d6f7c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb69f0080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69f0180) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb69f01c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69f0280) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb69f02c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69f0300) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb69f0340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69f0380) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb69f0700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69f0740) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb69f0880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69f0900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69f0940) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb69f0980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f00c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69f0580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb681a600) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb681a640) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb681a8c0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb681a900) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb681aa00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb681a980) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb681ab00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb681aa80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb681ab80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb681ac00) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb681ac40) 0 QObject (0xb681ac80) 0 primary-for QSettings (0xb681ac40) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb681ad80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb681ad40) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb681adc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb681ae00) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb681af00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb681af80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb681af40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb681a780) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb681a7c0) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb681a800) 0 QObject (0xb681a880) 0 primary-for QIODevice (0xb681a840) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb681ad00) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb6731100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6731140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6731180) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6731240) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb67311c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb6731280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6731300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6731380) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb67315c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6731680) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb67316c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6731840) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb6731900) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6731a40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb6731980) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6731b80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6731b00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb6731c40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6731d00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb6731a00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb6731cc0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb6731a80) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb6731f40) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb654f000) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb654f080) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb654f380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb654f3c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb654f4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb654f500) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb654f540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb654f5c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb654fa40) 0 QObject (0xb654fa80) 0 primary-for QEventLoop (0xb654fa40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb654fb80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb654f880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb654f940) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb654fa00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb654fb00) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb654fcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb654fd80) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2742,10 +2032,6 @@ QUdpSocket (0xb64bb340) 0 QObject (0xb64bb400) 0 primary-for QIODevice (0xb64bb3c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64bb480) 0 Class QSslCertificate size=4 align=4 @@ -2802,10 +2088,6 @@ QTcpSocket (0xb64bb540) 0 QObject (0xb64bb600) 0 primary-for QIODevice (0xb64bb5c0) -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb64bb680) 0 empty Vtable for QSslSocket QSslSocket::_ZTV10QSslSocket: 30u entries @@ -2864,20 +2146,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0xb64bb900) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb64bb9c0) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0xb64bb940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64bba00) 0 Class QSslKey size=4 align=4 @@ -3056,38 +2330,10 @@ QTcpServer (0xb64bbfc0) 0 QObject (0xb64bb100) 0 primary-for QTcpServer (0xb64bbfc0) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64bb280) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64bb640) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64bbcc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb64bbb40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64bbe40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb613f000) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb613f080) 0 diff --git a/tests/auto/bic/data/QtNetwork.4.4.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtNetwork.4.4.0.linux-gcc-ia32.txt index 0c22422b5..c13de6659 100644 --- a/tests/auto/bic/data/QtNetwork.4.4.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtNetwork.4.4.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb77b7f3c) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb77b7f78) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7c12b40) 0 empty - QUintForSize<4> (0xb77bc000) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb77bc12c) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb77bc168) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7c12d00) 0 empty - QIntForSize<4> (0xb77bc1e0) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77cf5dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cf7bc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cf8ac) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cf99c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cfa8c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cfb7c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cfc6c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cfd5c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cfe4c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cff3c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e903c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e912c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e921c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e930c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e93fc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e94ec) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb78064ec) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb782c1a4) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6ac8d5c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b0be4c) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69240f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6924a14) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6967348) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6967c6c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69795a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6979ec4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb698c7f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb699b12c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb699ba50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69af384) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69afca8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69c35dc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69c3f00) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb69db99c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6826c30) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb6752b00) 0 QString (0xb67a0000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67a030c) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QListData base size=4 base align=4 QListData (0xb680a9d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb66b4c6c) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -386,15 +228,7 @@ Class QTextCodec QTextCodec (0xb6675fb4) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb66cd2d0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb66cd258) 0 Class QTextEncoder size=32 align=4 @@ -417,25 +251,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb66f8000) 0 QGenericArgument (0xb66f54ec) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb66f59d8) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb66f57f8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6709b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6709ac8) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -527,10 +349,6 @@ QIODevice (0xb654ae80) 0 QObject (0xb654cb40) 0 primary-for QIODevice (0xb654ae80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6567e4c) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -550,25 +368,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb65aed5c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65df564) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb65df654) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb65dfbb8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb65dfb40) 0 Class QStringList size=4 align=4 @@ -576,15 +382,7 @@ Class QStringList QStringList (0xb65bcf80) 0 QList (0xb65dfbf4) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb660e960) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb660eb7c) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -664,10 +462,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb6436e4c) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb644999c) 0 Class QMutexLocker size=4 align=4 @@ -747,35 +541,11 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb631f2d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb631f384) 0 empty -Class - size=8 align=4 - base size=8 base align=4 - (0xb63b730c) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb63b73fc) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb63b7384) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb63b7474) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb63b74ec) 0 Class _IO_marker size=12 align=4 @@ -787,10 +557,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb63b7564) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb63b75dc) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -805,10 +571,6 @@ Class QTextStream QTextStream (0xb63b7618) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb63f4d98) 0 Class QTextStreamManipulator size=24 align=4 @@ -845,40 +607,16 @@ QTextOStream (0xb62220c0) 0 QTextStream (0xb62204ec) 0 primary-for QTextOStream (0xb62220c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6220fb4) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6231000) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6220f3c) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6231078) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb62310f0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6231168) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb62311e0) 0 Class timespec size=8 align=4 @@ -890,80 +628,24 @@ Class timeval base size=8 base align=4 timeval (0xb6231258) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb62312d0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6231348) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6231384) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb62314b0) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6231438) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb62313fc) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6231528) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6231618) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb62315a0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6231690) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6231780) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6231708) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6231834) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb62318ac) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6231924) 0 Class random_data size=28 align=4 @@ -995,20 +677,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb614d6cc) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb616530c) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6165294) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb6165654) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -1028,10 +698,6 @@ Class QtConcurrent::ResultStoreBase QtConcurrent::ResultStoreBase (0xb6165780) 0 vptr=((& QtConcurrent::ResultStoreBase::_ZTVN12QtConcurrent15ResultStoreBaseE) + 8u) -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb6165e88) 0 Vtable for QFutureInterfaceBase QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries @@ -1046,25 +712,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb6165f00) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb61a8780) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb619a9d8) 0 - primary-for QFutureInterface (0xb61a8780) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb61e7168) 0 Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1093,34 +742,7 @@ QFutureWatcherBase (0xb62006c0) 0 QObject (0xb62017f8) 0 primary-for QFutureWatcherBase (0xb62006c0) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb6200dc0) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb6200e00) 0 - primary-for QFutureWatcher (0xb6200dc0) - QObject (0xb601a30c) 0 - primary-for QFutureWatcherBase (0xb6200e00) Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1219,60 +841,14 @@ QtConcurrent::ThreadEngineBase (0xb605d2c0) 0 QRunnable (0xb606230c) 0 primary-for QtConcurrent::ThreadEngineBase (0xb605d2c0) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb6062b04) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb605dc40) 0 - QtConcurrent::ThreadEngineStarterBase (0xb6062b7c) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 -4u -32 0u -36 0u -40 0u -44 0u -48 0u -52 -4u -56 0u -60 (int (*)(...))-0x000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb605de00) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb605de40) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb6078000) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb605de40) Class std::input_iterator_tag size=1 align=1 @@ -1315,225 +891,49 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb6078a50) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb6078ac8) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb6078ce4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6078dd4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6078e4c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6078ec4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6078f3c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6078fb4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6078168) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb609903c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60990b4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb609912c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60991a4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb609921c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6099294) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb609930c) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb60993fc) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb6099474) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb60994ec) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb6099870) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb60998e8) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb60999d8) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb6099a50) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb6099ac8) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6099ce4) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6099d20) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6099d5c) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6099d98) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6099dd4) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6099e10) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6099e88) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6099ec4) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6099f00) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6099f3c) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6099f78) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6099fb4) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb60ae99c) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb60ddf78) 0 empty -Class std::__copy_move - size=1 align=1 - base size=0 base align=1 -std::__copy_move (0xb5f2d3c0) 0 empty -Class std::__copy_move_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_move_backward (0xb5f2d5dc) 0 empty -Class std::__equal - size=1 align=1 - base size=0 base align=1 -std::__equal (0xb5f2d9d8) 0 empty -Class std::__lc_rai - size=1 align=1 - base size=0 base align=1 -std::__lc_rai (0xb5f2db40) 0 empty -Class std::__lexicographical_compare - size=1 align=1 - base size=0 base align=1 -std::__lexicographical_compare (0xb5f2dca8) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5f72384) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5f7add4) 0 empty Class lconv size=56 align=4 @@ -1550,10 +950,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb5f8899c) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5f88a14) 0 Class tm size=44 align=4 @@ -1570,15 +966,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb5f88ce4) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb5f88e4c) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb5f88dd4) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1590,32 +978,10 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb5f88ec4) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb60113fc) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb60116cc) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5e097c0) 0 empty - __gnu_cxx::new_allocator (0xb6011708) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb6011744) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5e09880) 0 empty - __gnu_cxx::new_allocator (0xb6011780) 0 empty Vtable for __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries @@ -1631,82 +997,19 @@ Class __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind (0xb601199c) 0 nearly-empty vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 8u) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5eb2294) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5eb22d0) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5eaeb40) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5eb230c) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5ee5f78) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5d48100) 0 - std::allocator (0xb5d48140) 0 empty - __gnu_cxx::new_allocator (0xb5ee5fb4) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5ee5f00) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5d8a000) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5d482c0) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5d8a03c) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5d8a0f0) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5d484c0) 0 - std::allocator (0xb5d48500) 0 empty - __gnu_cxx::new_allocator (0xb5d8a168) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5d8a078) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5d8a1a4) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5d8a258) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5d48680) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5d8a1e0) 0 Class std::locale size=4 align=4 @@ -1736,97 +1039,16 @@ Class std::locale::_Impl base size=20 base align=4 std::locale::_Impl (0xb5dec438) 0 -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5df6640) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb5df2dd4) 0 - primary-for std::collate (0xb5df6640) -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5df6740) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb5df2ec4) 0 - primary-for std::collate (0xb5df6740) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5c112d0) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5c1130c) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5c186c0) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5c11348) 0 empty -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5c18800) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb5c18840) 0 - primary-for std::collate_byname (0xb5c18800) - std::locale::facet (0xb5c113c0) 0 - primary-for std::collate (0xb5c18840) - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5c188c0) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb5c18900) 0 - primary-for std::collate_byname (0xb5c188c0) - std::locale::facet (0xb5c114b0) 0 - primary-for std::collate (0xb5c18900) + + + + + Vtable for std::ios_base::failure std::ios_base::failure::_ZTVNSt8ios_base7failureE: 5u entries @@ -1872,583 +1094,85 @@ Class std::ios_base std::ios_base (0xb5c312d0) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5c71960) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5c71bf4) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb5c71e88) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb5ce2fa0) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb5cb6dd4) 0 - primary-for std::ctype (0xb5ce2fa0) - std::ctype_base (0xb5cb6e10) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb5cf1870) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb5b0299c) 0 - primary-for std::__ctype_abstract_base (0xb5cf1870) - std::ctype_base (0xb5b029d8) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb5cf5800) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb5b0c6e0) 0 - primary-for std::ctype (0xb5cf5800) - std::locale::facet (0xb5b02ac8) 0 - primary-for std::__ctype_abstract_base (0xb5b0c6e0) - std::ctype_base (0xb5b02b04) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb5cf59c0) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb5b13e60) 0 - primary-for std::ctype_byname (0xb5cf59c0) - std::locale::facet (0xb5b12e10) 0 - primary-for std::ctype (0xb5b13e60) - std::ctype_base (0xb5b12e4c) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb5cf5a40) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb5cf5a80) 0 - primary-for std::ctype_byname (0xb5cf5a40) - std::__ctype_abstract_base (0xb5b174b0) 0 - primary-for std::ctype (0xb5cf5a80) - std::locale::facet (0xb5b12fb4) 0 - primary-for std::__ctype_abstract_base (0xb5b174b0) - std::ctype_base (0xb5b12d5c) 0 empty + + + + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb5b1a99c) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5b25480) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb5b2c1e0) 0 - primary-for std::numpunct (0xb5b25480) -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5b25540) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb5b2c2d0) 0 - primary-for std::numpunct (0xb5b25540) -Class __gnu_cxx::__conditional_type - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type (0xb5b63924) 0 empty -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5ba9a80) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb5ba9ac0) 0 - primary-for std::numpunct_byname (0xb5ba9a80) - std::locale::facet (0xb5b63f78) 0 - primary-for std::numpunct (0xb5ba9ac0) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5ba9b00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5bc103c) 0 - primary-for std::num_get > > (0xb5ba9b00) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5ba9b80) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5bc112c) 0 - primary-for std::num_put > > (0xb5ba9b80) -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5ba9c00) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb5ba9c40) 0 - primary-for std::numpunct_byname (0xb5ba9c00) - std::locale::facet (0xb5bc121c) 0 - primary-for std::numpunct (0xb5ba9c40) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5ba9cc0) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5bc130c) 0 - primary-for std::num_get > > (0xb5ba9cc0) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5ba9d40) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5bc13fc) 0 - primary-for std::num_put > > (0xb5ba9d40) -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb5bfed80) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb5bc1bf4) 0 - primary-for std::basic_ios > (0xb5bfed80) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb5bfedc0) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb5bc1ce4) 0 - primary-for std::basic_ios > (0xb5bfedc0) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5a48a40) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb5a48a80) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb5a2a7f8) 4 - primary-for std::basic_ios > (0xb5a48a80) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5a2a9d8) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5a48bc0) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5a48c00) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5a2aa14) 4 - primary-for std::basic_ios > (0xb5a48c00) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5a2abb8) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5a87480) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb5a874c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb5a890b4) 8 - primary-for std::basic_ios > (0xb5a874c0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5a87580) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5a875c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5a89438) 8 - primary-for std::basic_ios > (0xb5a875c0) - -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5a89b40) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5a89b7c) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5ab4480) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5a89bb8) 0 empty -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5aea078) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb5aef380 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2486,44 +1210,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5afab40) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb5aef380) 0 - primary-for std::basic_iostream > (0xb5afab40) - subvttidx=4u - std::basic_ios > (0xb5aef3c0) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb5aea0b4) 12 - primary-for std::basic_ios > (0xb5aef3c0) - std::basic_ostream > (0xb5aef400) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb5aef3c0) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5aea348) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb5aef700 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2561,110 +1249,21 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5902be0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb5aef700) 0 - primary-for std::basic_iostream > (0xb5902be0) - subvttidx=4u - std::basic_ios > (0xb5aef740) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb5aea384) 12 - primary-for std::basic_ios > (0xb5aef740) - std::basic_ostream > (0xb5aef780) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb5aef740) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5aeac6c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5aeabf4) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb5aeab7c) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb5aeaac8) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb5aea438) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb59347bc) 0 -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb581cc30) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev - -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb583a370) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb582aa00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb583a370) - QFutureInterfaceBase (0xb581ce10) 0 - primary-for QFutureInterface (0xb582aa00) - QRunnable (0xb581ce4c) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb582aa80) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb583a780) 0 - primary-for QtConcurrent::RunFunctionTask (0xb582aa80) - QFutureInterface (0xb582aac0) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb583a780) - QFutureInterfaceBase (0xb581cf00) 0 - primary-for QFutureInterface (0xb582aac0) - QRunnable (0xb583f000) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + + Class QLibraryInfo size=1 align=1 @@ -2715,50 +1314,22 @@ QFile (0xb578de00) 0 QObject (0xb57a7384) 0 primary-for QIODevice (0xb578de40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57bece4) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb57d18ac) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57e2f3c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb57f4258) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb57f4fb4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb57f4f3c) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb56160b4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5622618) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5622708) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2833,10 +1404,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb56529d8) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5663ac8) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2926,10 +1493,6 @@ Class QDirIterator QDirIterator (0xb5683ca8) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5691474) 0 Vtable for QFileSystemWatcher QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries @@ -3067,25 +1630,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb56f5438) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb56f54b0) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb56d521c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb56f5ca8) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56f5e10) 0 Class QResource size=4 align=4 @@ -3097,275 +1648,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb5510708) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5510b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5510d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5510f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552e0f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552e2d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552e4b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552e690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552e870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552ea50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552ec30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb552ee10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5538000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55381e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55383c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55385a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5538780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5538960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5538b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5538d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5538f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553e0f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553e2d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553e4b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553e690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553e870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553ea50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553ec30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb553ee10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5548000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55481e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55483c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55485a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5548780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5548960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5548b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5548d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5548f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb554f0f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb554f2d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb554f4b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb554f690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb554f870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb554fa50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb554fc30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb554fe10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5556000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55561e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55563c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55565a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5556780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5556960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5556b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5556d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5556f00) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3392,45 +1727,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb555e0f0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb558fb7c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb558fb04) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb558fc6c) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb558fbf4) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb55d2000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55d2618) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb55d27f8) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb55d29d8) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3508,15 +1815,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb541fa8c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb542899c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5454438) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -3543,10 +1842,6 @@ QEventLoop (0xb5421ac0) 0 QObject (0xb5464294) 0 primary-for QEventLoop (0xb5421ac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54648ac) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -3591,20 +1886,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb5488b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54a0f00) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb54a9000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54a9744) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -3774,10 +2061,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb54f58ac) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52ff03c) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3889,20 +2172,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb5337c6c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb536c12c) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb536c21c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb536c654) 0 empty Class QMetaProperty size=20 align=4 @@ -3914,10 +2189,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb536ca50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb536cd98) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -4129,10 +2400,6 @@ QLibrary (0xb53bc7c0) 0 QObject (0xb53dd6cc) 0 primary-for QLibrary (0xb53bc7c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53ec618) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4169,20 +2436,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb5217bf4) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb5224294) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb5217f78) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb522c780) 0 Class QWriteLocker size=4 align=4 @@ -4209,10 +2468,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb5264d5c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5273a50) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -4229,70 +2484,42 @@ Class QDate base size=4 base align=4 QDate (0xb5285a50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52b23fc) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb52b24ec) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52bca50) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb52bcb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52d21e0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb52d23c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52e31a4) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb50d8438) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50e0294) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb50f83fc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50f87bc) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb5116924) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5123348) 0 empty Class QLinkedListData size=20 align=4 @@ -4304,40 +2531,24 @@ Class QSize base size=8 base align=4 QSize (0xb51b7294) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51bf294) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb51d1f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fe17f8) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb4ffdd5c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5019c30) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb505d834) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5078d5c) 0 empty Class QSharedData size=4 align=4 @@ -4385,20 +2596,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb4f1d528) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f26a8c) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4f26bf4) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4f26b7c) 0 Class QXmlStreamAttributes size=4 align=4 @@ -4411,30 +2610,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb4f26c6c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f49690) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb4f497bc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f59384) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb4f594b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f6e438) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -4616,20 +2803,12 @@ QNetworkAccessManager (0xb4fbd7c0) 0 QObject (0xb4dec0f0) 0 primary-for QNetworkAccessManager (0xb4fbd7c0) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4dff0f0) 0 Class QNetworkCookie size=4 align=4 base size=4 base align=4 QNetworkCookie (0xb4decac8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4dff30c) 0 empty Vtable for QNetworkCookieJar QNetworkCookieJar::_ZTV17QNetworkCookieJar: 16u entries @@ -4658,30 +2837,14 @@ QNetworkCookieJar (0xb4fbdc00) 0 QObject (0xb4dff3fc) 0 primary-for QNetworkCookieJar (0xb4fbdc00) -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4dfffb4) 0 empty -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4e140f0) 0 empty -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4e14780) 0 Class QNetworkRequest size=4 align=4 base size=4 base align=4 QNetworkRequest (0xb4e14294) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4e14960) 0 empty Vtable for QNetworkReply QNetworkReply::_ZTV13QNetworkReply: 33u entries @@ -4797,20 +2960,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0xb4e68618) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4e751a4) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0xb4e688e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e752d0) 0 Class QNetworkProxy size=4 align=4 @@ -5006,10 +3161,6 @@ QUdpSocket (0xb4e8ecc0) 0 QObject (0xb4ece780) 0 primary-for QIODevice (0xb4e8ed40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4cdf618) 0 Class QSslCertificate size=4 align=4 @@ -5073,10 +3224,6 @@ QSslSocket (0xb4ce22c0) 0 QObject (0xb4d00b7c) 0 primary-for QIODevice (0xb4ce2380) -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4d0efb4) 0 empty Class QSslConfiguration size=4 align=4 @@ -5088,68 +3235,16 @@ Class QSslKey base size=4 base align=4 QSslKey (0xb4d237bc) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4d7d21c) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4d8f7bc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4c4b9d8) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb4c4ba50) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4c6d564) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4c6d4ec) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4c6dd5c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4c6dce4) 0 -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb4ca52d0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4ca53fc) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4cbc744) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cbc99c) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4cbca14) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.0.0.aix-gcc-power32.txt b/tests/auto/bic/data/QtOpenGL.4.0.0.aix-gcc-power32.txt index 2639cec12..2aedf188e 100644 --- a/tests/auto/bic/data/QtOpenGL.4.0.0.aix-gcc-power32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.0.0.aix-gcc-power32.txt @@ -53,65 +53,20 @@ Class QBool size=1 align=1 QBool (0x300b7280) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cd9c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cdf80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4540) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4b00) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e00c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0680) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0c40) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb200) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb7c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebd80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8340) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8900) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104480) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104a40) 0 empty Class QFlag size=4 align=4 @@ -125,9 +80,6 @@ Class QChar size=2 align=2 QChar (0x30148980) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30185980) 0 empty Class QBasicAtomic size=4 align=4 @@ -142,13 +94,7 @@ Class sigset_t size=8 align=4 sigset_t (0x3026ad80) 0 -Class - size=8 align=4 - (0x30271200) 0 -Class - size=32 align=8 - (0x30271540) 0 Class fsid_t size=8 align=4 @@ -158,21 +104,9 @@ Class fsid64_t size=16 align=8 fsid64_t (0x30271c40) 0 -Class - size=52 align=4 - (0x302780c0) 0 -Class - size=44 align=4 - (0x30278440) 0 -Class - size=112 align=4 - (0x302787c0) 0 -Class - size=208 align=4 - (0x30278b40) 0 Class _quad size=8 align=4 @@ -186,17 +120,11 @@ Class adspace_t size=68 align=4 adspace_t (0x30281e00) 0 -Class - size=24 align=8 - (0x302865c0) 0 Class label_t size=100 align=4 label_t (0x30286d00) 0 -Class - size=4 align=4 - (0x3028b780) 0 Class sigset size=8 align=4 @@ -238,57 +166,18 @@ Class QByteRef size=8 align=4 QByteRef (0x302b7540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30423740) 0 empty -Class QFlags - size=4 align=4 -QFlags (0x30431080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431340) 0 -Class QFlags - size=4 align=4 -QFlags (0x3042cc00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30442080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431a00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30448800) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046af00) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046e200) 0 -Class QFlags - size=4 align=4 -QFlags (0x304422c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30474f80) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479700) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479a40) 0 Class QInternal size=1 align=1 @@ -306,9 +195,6 @@ Class QString size=4 align=4 QString (0x300a1f40) 0 -Class QFlags - size=4 align=4 -QFlags (0x303cf2c0) 0 Class QLatin1String size=4 align=4 @@ -323,9 +209,6 @@ Class QConstString QConstString (0x300b7640) 0 QString (0x300b7680) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303901c0) 0 empty Class QListData::Data size=24 align=4 @@ -335,9 +218,6 @@ Class QListData size=4 align=4 QListData (0x300732c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x302fb500) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -360,13 +240,7 @@ Class QTextCodec QTextCodec (0x303bab80) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8) -Class QList:: - size=4 align=4 -QList:: (0x30120bc0) 0 -Class QList - size=4 align=4 -QList (0x302cc980) 0 Class QTextEncoder size=32 align=4 @@ -385,21 +259,12 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3036a6c0) 0 QGenericArgument (0x3036a700) 0 -Class QMetaObject:: - size=16 align=4 -QMetaObject:: (0x3009b300) 0 Class QMetaObject size=16 align=4 QMetaObject (0x3058c900) 0 -Class QList:: - size=4 align=4 -QList:: (0x30170600) 0 -Class QList - size=4 align=4 -QList (0x30166f00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4 entries @@ -487,9 +352,6 @@ QIODevice (0x30365880) 0 QObject (0x301e4440) 0 primary-for QIODevice (0x30365880) -Class QFlags - size=4 align=4 -QFlags (0x301ebec0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4 entries @@ -507,38 +369,20 @@ Class QRegExp size=4 align=4 QRegExp (0x303baa80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30148180) 0 empty Class QStringMatcher size=1036 align=4 QStringMatcher (0x3012d8c0) 0 -Class QList:: - size=4 align=4 -QList:: (0x30104900) 0 -Class QList - size=4 align=4 -QList (0x30104380) 0 Class QStringList size=4 align=4 QStringList (0x303bab00) 0 QList (0x300c3280) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x301046c0) 0 -Class QList::iterator - size=4 align=4 -QList::iterator (0x300eba00) 0 -Class QList::const_iterator - size=4 align=4 -QList::const_iterator (0x300eb980) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5 entries @@ -664,9 +508,6 @@ Class QMapData size=72 align=4 QMapData (0x304b4140) 0 -Class - size=32 align=4 - (0x3052cd00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4 entries @@ -680,9 +521,6 @@ Class QTextStream QTextStream (0x3050bbc0) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8) -Class QFlags - size=4 align=4 -QFlags (0x305082c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -767,41 +605,20 @@ QFile (0x3057c8c0) 0 QObject (0x3057c980) 0 primary-for QIODevice (0x3057c900) -Class QFlags - size=4 align=4 -QFlags (0x3058a380) 0 Class QFileInfo size=4 align=4 QFileInfo (0x304b0580) 0 -Class QFlags - size=4 align=4 -QFlags (0x304927c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30390480) 0 empty -Class QList:: - size=4 align=4 -QList:: (0x301dfa40) 0 -Class QList - size=4 align=4 -QList (0x301df900) 0 Class QDir size=4 align=4 QDir (0x304b03c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30365600) 0 -Class QFlags - size=4 align=4 -QFlags (0x303ac7c0) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35 entries @@ -846,9 +663,6 @@ Class QFileEngine QFileEngine (0x3057c7c0) 0 vptr=((&QFileEngine::_ZTV11QFileEngine) + 8) -Class QFlags - size=4 align=4 -QFlags (0x3031a080) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5 entries @@ -910,73 +724,22 @@ Class QMetaType size=1 align=1 QMetaType (0x30079000) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3011fb00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3013d480) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x30148440) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3015dfc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301937c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a18c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a5d00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301ad500) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301add00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b22c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b2b00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6640) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6fc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9600) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9c00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301c1740) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301d7f80) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -998,69 +761,24 @@ Class QVariant size=16 align=8 QVariant (0x30166c00) 0 -Class QList:: - size=4 align=4 -QList:: (0x3057e500) 0 -Class QList - size=4 align=4 -QList (0x302acd80) 0 -Class QMap:: - size=4 align=4 -QMap:: (0x302ed8c0) 0 -Class QMap - size=4 align=4 -QMap (0x302b7980) 0 Class QVariantComparisonHelper size=4 align=4 QVariantComparisonHelper (0x30225880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303e8900) 0 empty -Class - size=12 align=4 - (0x303dab00) 0 -Class - size=44 align=4 - (0x303f70c0) 0 -Class - size=76 align=4 - (0x303f7880) 0 -Class - size=36 align=4 - (0x303fc640) 0 -Class - size=56 align=4 - (0x303fcc40) 0 -Class - size=36 align=4 - (0x30414340) 0 -Class - size=28 align=4 - (0x30414f00) 0 -Class - size=24 align=4 - (0x30486a40) 0 -Class - size=28 align=4 - (0x30486d80) 0 -Class - size=28 align=4 - (0x30492400) 0 Class lconv size=56 align=4 @@ -1102,77 +820,41 @@ Class localeinfo_table size=36 align=4 localeinfo_table (0x303d9cc0) 0 -Class - size=108 align=4 - (0x304dc500) 0 Class _LC_charmap_objhdl size=12 align=4 _LC_charmap_objhdl (0x304dcc80) 0 -Class - size=92 align=4 - (0x30561040) 0 Class _LC_monetary_objhdl size=12 align=4 _LC_monetary_objhdl (0x305614c0) 0 -Class - size=48 align=4 - (0x30561800) 0 Class _LC_numeric_objhdl size=12 align=4 _LC_numeric_objhdl (0x30561d00) 0 -Class - size=56 align=4 - (0x30083180) 0 Class _LC_resp_objhdl size=12 align=4 _LC_resp_objhdl (0x300838c0) 0 -Class - size=248 align=4 - (0x30083c40) 0 Class _LC_time_objhdl size=12 align=4 _LC_time_objhdl (0x3012c400) 0 -Class - size=10 align=2 - (0x3012cc40) 0 -Class - size=16 align=4 - (0x301df180) 0 -Class - size=16 align=4 - (0x301df5c0) 0 -Class - size=20 align=4 - (0x303acac0) 0 -Class - size=104 align=4 - (0x30504a00) 0 Class _LC_collate_objhdl size=12 align=4 _LC_collate_objhdl (0x301bfb80) 0 -Class - size=8 align=4 - (0x301e8b00) 0 -Class - size=80 align=4 - (0x305a0100) 0 Class _LC_ctype_objhdl size=12 align=4 @@ -1186,17 +868,11 @@ Class _LC_locale_objhdl size=12 align=4 _LC_locale_objhdl (0x303da600) 0 -Class _LC_object_handle:: - size=12 align=4 -_LC_object_handle:: (0x305911c0) 0 Class _LC_object_handle size=20 align=4 _LC_object_handle (0x30591080) 0 -Class - size=24 align=4 - (0x3031ed80) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14 entries @@ -1271,13 +947,7 @@ Class QUrl size=4 align=4 QUrl (0x302256c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x306df180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307c8900) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14 entries @@ -1303,9 +973,6 @@ QEventLoop (0x30802000) 0 QObject (0x30802040) 0 primary-for QEventLoop (0x30802000) -Class QFlags - size=4 align=4 -QFlags (0x30803740) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27 entries @@ -1348,17 +1015,11 @@ Class QModelIndex size=16 align=4 QModelIndex (0x3049cc80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304eb5c0) 0 empty Class QPersistentModelIndex size=4 align=4 QPersistentModelIndex (0x3049cb80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3002e700) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42 entries @@ -1524,9 +1185,6 @@ Class QBasicTimer size=4 align=4 QBasicTimer (0x307fe180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30803300) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4 entries @@ -1612,17 +1270,11 @@ Class QMetaMethod size=8 align=4 QMetaMethod (0x30379340) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30880740) 0 empty Class QMetaEnum size=8 align=4 QMetaEnum (0x303793c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3088be80) 0 empty Class QMetaProperty size=20 align=4 @@ -1632,9 +1284,6 @@ Class QMetaClassInfo size=8 align=4 QMetaClassInfo (0x30379540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x308a3780) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17 entries @@ -1902,9 +1551,6 @@ Class QBitRef size=8 align=4 QBitRef (0x305a6140) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864700) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1922,65 +1568,41 @@ Class QHashDummyValue size=1 align=1 QHashDummyValue (0x30893ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30897f00) 0 empty Class QDate size=4 align=4 QDate (0x301eb4c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebe80) 0 empty Class QTime size=4 align=4 QTime (0x301f1e80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30368c00) 0 empty Class QDateTime size=4 align=4 QDateTime (0x304b0440) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304d4880) 0 empty Class QPoint size=8 align=4 QPoint (0x301f9d40) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307b9180) 0 empty Class QPointF size=16 align=8 QPointF (0x30200880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307efcc0) 0 empty Class QLine size=16 align=4 QLine (0x301eb540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3098afc0) 0 empty Class QLineF size=32 align=8 QLineF (0x301eb600) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a335c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1990,41 +1612,26 @@ Class QLocale size=4 align=4 QLocale (0x301eb800) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30822c80) 0 empty Class QSize size=8 align=4 QSize (0x30200a80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864400) 0 empty Class QSizeF size=16 align=8 QSizeF (0x30209200) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a33a80) 0 empty Class QRect size=16 align=4 QRect (0x30213780) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30aad700) 0 empty Class QRectF size=32 align=8 QRectF (0x302138c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a1fdc0) 0 empty Class QSharedData size=4 align=4 @@ -2046,9 +1653,6 @@ Class QKeySequence size=4 align=4 QKeySequence (0x305580c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30ad4d00) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7 entries @@ -2313,13 +1917,7 @@ Class QInputMethodEvent::Attribute size=32 align=8 QInputMethodEvent::Attribute (0x307e7800) 0 -Class QList:: - size=4 align=4 -QList:: (0x30a2d6c0) 0 -Class QList - size=4 align=4 -QList (0x307e7ec0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4 entries @@ -2577,13 +2175,7 @@ Class QAccessible size=1 align=1 QAccessible (0x30c2af00) 0 empty -Class QFlags - size=4 align=4 -QFlags (0x30c36000) 0 -Class QFlags - size=4 align=4 -QFlags (0x30c3b540) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19 entries @@ -2856,21 +2448,9 @@ Class QPaintDevice QPaintDevice (0x30bc8900) 0 vptr=((&QPaintDevice::_ZTV12QPaintDevice) + 8) -Class QColor:::: - size=10 align=2 -QColor:::: (0x30aadc40) 0 -Class QColor:::: - size=10 align=2 -QColor:::: (0x30ab3280) 0 -Class QColor:::: - size=10 align=2 -QColor:::: (0x30aba480) 0 -Class QColor:: - size=10 align=2 -QColor:: (0x30aadb80) 0 Class QColor size=16 align=4 @@ -2880,37 +2460,16 @@ Class QBrush size=4 align=4 QBrush (0x305317c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30b2f040) 0 empty Class QBrushData size=24 align=4 QBrushData (0x30a77a00) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x30a61380) 0 -Class QVector - size=4 align=4 -QVector (0x30bb0140) 0 -Class QGradient:::: - size=32 align=8 -QGradient:::: (0x309db5c0) 0 -Class QGradient:::: - size=40 align=8 -QGradient:::: (0x309dba40) 0 -Class QGradient:::: - size=24 align=8 -QGradient:::: (0x309dbec0) 0 -Class QGradient:: - size=40 align=8 -QGradient:: (0x309db500) 0 Class QGradient size=64 align=8 @@ -3535,9 +3094,6 @@ QFileDialog (0x30d9d000) 0 QPaintDevice (0x30d9d0c0) 8 vptr=((&QFileDialog::_ZTV11QFileDialog) + 244) -Class QFlags - size=4 align=4 -QFlags (0x30dcd640) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66 entries @@ -4220,9 +3776,6 @@ QImage (0x305472c0) 0 QPaintDevice (0x30c41b80) 0 primary-for QImage (0x305472c0) -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30e4a500) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7 entries @@ -4264,9 +3817,6 @@ Class QIcon size=4 align=4 QIcon (0x30536cc0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30eb0980) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9 entries @@ -4580,13 +4130,7 @@ QActionGroup (0x30fdb180) 0 QObject (0x31016480) 0 primary-for QActionGroup (0x30fdb180) -Class QList:: - size=4 align=4 -QList:: (0x30ec74c0) 0 -Class QList - size=4 align=4 -QList (0x30c8c300) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26 entries @@ -4883,9 +4427,6 @@ QAbstractSpinBox (0x30c2a3c0) 0 QPaintDevice (0x30c2a5c0) 8 vptr=((&QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252) -Class QFlags - size=4 align=4 -QFlags (0x309e1bc0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64 entries @@ -5090,13 +4631,7 @@ QStyle (0x30ccda80) 0 QObject (0x30ced6c0) 0 primary-for QStyle (0x30ccda80) -Class QFlags - size=4 align=4 -QFlags (0x30cf8a80) 0 -Class QFlags - size=4 align=4 -QFlags (0x30d2f2c0) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67 entries @@ -5364,18 +4899,12 @@ Class QStyleOptionHeader QStyleOptionHeader (0x310ccb00) 0 QStyleOption (0x310ccb40) 0 -Class QFlags - size=4 align=4 -QFlags (0x310e9400) 0 Class QStyleOptionButton size=64 align=4 QStyleOptionButton (0x310e8580) 0 QStyleOption (0x310e85c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x31149980) 0 Class QStyleOptionTab size=72 align=4 @@ -5392,9 +4921,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x30f8d740) 0 QStyleOption (0x30f8d780) 0 -Class QFlags - size=4 align=4 -QFlags (0x30f29880) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5443,13 +4969,7 @@ QStyleOptionSpinBox (0x307d5680) 0 QStyleOptionComplex (0x307d56c0) 0 QStyleOption (0x307d57c0) 0 -Class QList:: - size=4 align=4 -QList:: (0x307e76c0) 0 -Class QList - size=4 align=4 -QList (0x307e7580) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5457,9 +4977,6 @@ QStyleOptionQ3ListView (0x309d9180) 0 QStyleOptionComplex (0x309d91c0) 0 QStyleOption (0x309d9380) 0 -Class QFlags - size=4 align=4 -QFlags (0x30b6fec0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5604,9 +5121,6 @@ Class QItemSelectionRange size=8 align=4 QItemSelectionRange (0x310faec0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3116aa80) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18 entries @@ -5636,26 +5150,14 @@ QItemSelectionModel (0x311834c0) 0 QObject (0x31183500) 0 primary-for QItemSelectionModel (0x311834c0) -Class QFlags - size=4 align=4 -QFlags (0x31187d80) 0 -Class QList:: - size=4 align=4 -QList:: (0x3112d340) 0 -Class QList - size=4 align=4 -QList (0x3112d200) 0 Class QItemSelection size=4 align=4 QItemSelection (0x30d9ad80) 0 QList (0x31174fc0) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x3112d300) 0 Vtable for QAbstractItemView QAbstractItemView::_ZTV17QAbstractItemView: 103 entries @@ -5778,9 +5280,6 @@ QAbstractItemView (0x311e8dc0) 0 QPaintDevice (0x311e8ec0) 8 vptr=((&QAbstractItemView::_ZTV17QAbstractItemView) + 392) -Class QFlags - size=4 align=4 -QFlags (0x311f7440) 0 Vtable for QFileIconProvider QFileIconProvider::_ZTV17QFileIconProvider: 7 entries @@ -6027,13 +5526,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3115d940) 0 nearly-empty vptr=((&QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8) -Class QHash:: - size=4 align=4 -QHash:: (0x31149a40) 0 -Class QHash - size=4 align=4 -QHash (0x31149540) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6 entries @@ -6049,9 +5542,6 @@ Class QItemEditorFactory QItemEditorFactory (0x3116f1c0) 0 vptr=((&QItemEditorFactory::_ZTV18QItemEditorFactory) + 8) -Class QHashNode - size=16 align=4 -QHashNode (0x31149680) 0 Vtable for QListView QListView::_ZTV9QListView: 103 entries @@ -6176,13 +5666,7 @@ QListView (0x310cc3c0) 0 QPaintDevice (0x310cc500) 8 vptr=((&QListView::_ZTV9QListView) + 392) -Class QVector:: - size=4 align=4 -QVector:: (0x3107ee40) 0 -Class QVector - size=4 align=4 -QVector (0x3107ec40) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11 entries @@ -6896,21 +6380,9 @@ QTreeView (0x30ea3980) 0 QPaintDevice (0x30ea3ac0) 8 vptr=((&QTreeView::_ZTV9QTreeView) + 400) -Class QVector >:: - size=4 align=4 -QVector >:: (0x30f5cd00) 0 -Class QVector > - size=4 align=4 -QVector > (0x30f5c9c0) 0 -Class QList:: - size=4 align=4 -QList:: (0x30f7ab40) 0 -Class QList - size=4 align=4 -QList (0x30f7aa00) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10 entries @@ -6930,17 +6402,8 @@ Class QTreeWidgetItem QTreeWidgetItem (0x30f51340) 0 vptr=((&QTreeWidgetItem::_ZTV15QTreeWidgetItem) + 8) -Class QList::Node - size=4 align=4 -QList::Node (0x30f7ab00) 0 -Class QVectorTypedData > - size=20 align=4 -QVectorTypedData > (0x30f5cb00) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3124bd80) 0 empty Vtable for QTreeWidget QTreeWidget::_ZTV11QTreeWidget: 109 entries @@ -7749,135 +7212,60 @@ Class QColormap size=4 align=4 QColormap (0x30a74040) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x30eb0200) 0 -Class QVector - size=4 align=4 -QVector (0x30eb0000) 0 Class QPolygon size=4 align=4 QPolygon (0x30547bc0) 0 QVector (0x30e7f4c0) 0 -Class QVectorTypedData - size=24 align=4 -QVectorTypedData (0x30eb0140) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x304e6340) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3109d580) 0 -Class QVector - size=4 align=4 -QVector (0x3109d340) 0 Class QPolygonF size=4 align=4 QPolygonF (0x3109d300) 0 QVector (0x310a2880) 0 -Class QVectorTypedData - size=32 align=8 -QVectorTypedData (0x3109d4c0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x313a6040) 0 Class QMatrix size=48 align=8 QMatrix (0x307ef840) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x314635c0) 0 empty Class QTextOption size=24 align=4 QTextOption (0x3147a800) 0 -Class QFlags - size=4 align=4 -QFlags (0x31481040) 0 Class QPen size=4 align=4 QPen (0x30558c80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x314ae9c0) 0 empty Class QPainter size=4 align=4 QPainter (0x30bc8a00) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3156ea00) 0 -Class QVector - size=4 align=4 -QVector (0x314c5c40) 0 -Class QVectorTypedData - size=48 align=8 -QVectorTypedData (0x3156e940) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3159d480) 0 -Class QVector - size=4 align=4 -QVector (0x314c5e00) 0 -Class QVectorTypedData - size=32 align=4 -QVectorTypedData (0x3159d3c0) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x315e3080) 0 -Class QVector - size=4 align=4 -QVector (0x314cf100) 0 -Class QVectorTypedData - size=48 align=8 -QVectorTypedData (0x315dbfc0) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3160ba00) 0 -Class QVector - size=4 align=4 -QVector (0x30bd1b40) 0 -Class QVectorTypedData - size=32 align=4 -QVectorTypedData (0x3160b940) 0 Class QTextItem size=1 align=1 QTextItem (0x314b5840) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31124bc0) 0 empty -Class QFlags - size=4 align=4 -QFlags (0x3111c2c0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24 entries @@ -7911,9 +7299,6 @@ Class QPaintEngine QPaintEngine (0x3097e900) 0 vptr=((&QPaintEngine::_ZTV12QPaintEngine) + 8) -Class QFlags - size=4 align=4 -QFlags (0x3111c900) 0 Class QPaintEngineState size=4 align=4 @@ -7927,29 +7312,17 @@ Class QPainterPath size=4 align=4 QPainterPath (0x30d0fd40) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x30d74080) 0 -Class QVector - size=4 align=4 -QVector (0x30d71d80) 0 Class QPainterPathPrivate size=8 align=4 QPainterPathPrivate (0x3082d680) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30d7fe40) 0 empty Class QPainterPathStroker size=4 align=4 QPainterPathStroker (0x308cea40) 0 -Class QVectorTypedData - size=40 align=8 -QVectorTypedData (0x30d71ec0) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7 entries @@ -8038,9 +7411,6 @@ QCommonStyle (0x31225280) 0 QObject (0x31225480) 0 primary-for QStyle (0x31225440) -Class QPointer - size=4 align=4 -QPointer (0x31430ec0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35 entries @@ -8353,21 +7723,12 @@ Class QTextLength size=12 align=4 QTextLength (0x30225540) 0 -Class QSharedDataPointer - size=4 align=4 -QSharedDataPointer (0x315b50c0) 0 Class QTextFormat size=8 align=4 QTextFormat (0x30213a00) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x3166cdc0) 0 -Class QVector - size=4 align=4 -QVector (0x315983c0) 0 Class QTextCharFormat size=8 align=4 @@ -8413,13 +7774,7 @@ Class QTextLayout size=4 align=4 QTextLayout (0x30d0fa40) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x317bab80) 0 -Class QVector - size=4 align=4 -QVector (0x317ba100) 0 Class QTextLine size=8 align=4 @@ -8466,13 +7821,7 @@ QTextDocument (0x315517c0) 0 QObject (0x3160b200) 0 primary-for QTextDocument (0x315517c0) -Class QFlags - size=4 align=4 -QFlags (0x31603940) 0 -Class QSharedDataPointer - size=4 align=4 -QSharedDataPointer (0x315c7340) 0 Class QTextCursor size=4 align=4 @@ -8482,13 +7831,7 @@ Class QAbstractTextDocumentLayout::Selection size=12 align=4 QAbstractTextDocumentLayout::Selection (0x315bccc0) 0 -Class QVector:: - size=4 align=4 -QVector:: (0x315b8780) 0 -Class QVector - size=4 align=4 -QVector (0x315b8580) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -8645,9 +7988,6 @@ QTextFrame (0x3162a4c0) 0 QObject (0x314d8840) 0 primary-for QTextObject (0x314d8800) -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31391400) 0 empty Class QTextBlock::iterator size=16 align=4 @@ -8657,21 +7997,12 @@ Class QTextBlock size=8 align=4 QTextBlock (0x317add40) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x313e3cc0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x312bd340) 0 empty Class QTextFragment size=12 align=4 QTextFragment (0x315250c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31260200) 0 empty Vtable for QTextList QTextList::_ZTV9QTextList: 17 entries @@ -9263,9 +8594,6 @@ QDateEdit (0x310f8700) 0 QPaintDevice (0x310f8800) 8 vptr=((&QDateEdit::_ZTV9QDateEdit) + 260) -Class QFlags - size=4 align=4 -QFlags (0x3107e480) 0 Vtable for QDial QDial::_ZTV5QDial: 64 entries @@ -9424,9 +8752,6 @@ QDockWidget (0x316cac40) 0 QPaintDevice (0x316cacc0) 8 vptr=((&QDockWidget::_ZTV11QDockWidget) + 232) -Class QFlags - size=4 align=4 -QFlags (0x316ef780) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63 entries @@ -11549,9 +10874,6 @@ Class QGLColormap size=4 align=4 QGLColormap (0x319d2a40) 0 -Class QFlags - size=4 align=4 -QFlags (0x319f5a80) 0 Class QGLFormat size=4 align=4 @@ -11663,63 +10985,18 @@ QGLWidget (0x30e6bac0) 0 QPaintDevice (0x31b25200) 8 vptr=((&QGLWidget::_ZTV9QGLWidget) + 272) -Class QList::Node - size=4 align=4 -QList::Node (0x30120ac0) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x301dfa00) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x3057e4c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31c8b440) 0 empty -Class QList::Node - size=4 align=4 -QList::Node (0x30ec7480) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31ce8ec0) 0 empty -Class QList::Node - size=4 align=4 -QList::Node (0x307e7680) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x31d72580) 0 -Class QVectorTypedData - size=28 align=4 -QVectorTypedData (0x3166cd00) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31db89c0) 0 empty -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x31dd9540) 0 -Class QVectorTypedData - size=32 align=4 -QVectorTypedData (0x317baac0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31e2e740) 0 empty -Class QVectorTypedData - size=28 align=4 -QVectorTypedData (0x315b86c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x31e6cfc0) 0 empty diff --git a/tests/auto/bic/data/QtOpenGL.4.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtOpenGL.4.0.0.linux-gcc-amd64.txt index ee892ceda..5693e9396 100644 --- a/tests/auto/bic/data/QtOpenGL.4.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtOpenGL.4.0.0.linux-gcc-amd64.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x2aaaad406a10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad421930) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad421bd0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad421e70) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad438150) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad4383f0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad438690) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad438930) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad438bd0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad438e70) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad449150) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad4493f0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad449690) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad449930) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad449bd0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad449e70) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x2aaaad45c0e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad4e61c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad4e65b0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad4e69a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad4e6d90) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad52d1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad52d5b0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad52d9a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad52dd90) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad5741c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad5745b0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad5749a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad574d90) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x2aaaad5c07e0) 0 QGenericArgument (0x2aaaad5c0850) 0 -Class QMetaObject:: - size=32 align=8 - base size=32 base align=8 -QMetaObject:: (0x2aaaad5d40e0) 0 Class QMetaObject size=32 align=8 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x2aaaad5fcd20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad62dd90) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=12 base align=8 QByteRef (0x2aaaad7683f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad7fa460) 0 empty Class QString::Null size=1 align=1 @@ -291,10 +171,6 @@ Class QString base size=8 base align=8 QString (0x2aaaad7fa770) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad885000) 0 Class QLatin1String size=8 align=8 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x2aaaadabe2a0) 0 QString (0x2aaaadabe310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadabe850) 0 empty Class QListData::Data size=32 align=8 @@ -327,15 +199,7 @@ Class QListData base size=8 base align=8 QListData (0x2aaaadafa770) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaadc1e690) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaadc1e540) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x2aaaadc8daf0) 0 QObject (0x2aaaadc8db60) 0 primary-for QIODevice (0x2aaaadc8daf0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaadcbf690) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=128 base align=8 QMapData (0x2aaaadd4b2a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaade661c0) 0 Class QTextCodec::ConverterState size=32 align=8 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x2aaaade40ee0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 16u) -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaade86a80) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaade86930) 0 Class QTextEncoder size=40 align=8 @@ -503,30 +351,10 @@ Class QTextDecoder base size=40 base align=8 QTextDecoder (0x2aaaadec17e0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaadec1c40) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x2aaaadec1e00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaadec1d20) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaadec1ee0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaadedd000) 0 Class __gconv_trans_data size=40 align=8 @@ -548,15 +376,7 @@ Class __gconv_info base size=16 base align=8 __gconv_info (0x2aaaadedd310) 0 -Class :: - size=72 align=8 - base size=72 base align=8 -:: (0x2aaaadedd4d0) 0 -Class - size=72 align=8 - base size=72 base align=8 - (0x2aaaadedd3f0) 0 Class _IO_marker size=24 align=8 @@ -568,10 +388,6 @@ Class _IO_FILE base size=216 base align=8 _IO_FILE (0x2aaaadedd5b0) 0 -Class - size=32 align=8 - base size=32 base align=8 - (0x2aaaadedd690) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x2aaaadedd700) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaadf449a0) 0 Class QTextStreamManipulator size=40 align=8 @@ -680,10 +492,6 @@ QFile (0x2aaaae01a460) 0 QObject (0x2aaaae01a540) 0 primary-for QIODevice (0x2aaaae01a4d0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae04d310) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=8 base align=8 QRegExp (0x2aaaae08d0e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae08df50) 0 empty Class QStringMatcher size=1048 align=8 base size=1044 base align=8 QStringMatcher (0x2aaaae0b11c0) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaae0b1770) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaae0b1620) 0 Class QStringList size=8 align=8 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x2aaaae0b18c0) 0 QList (0x2aaaae0b1930) 0 -Class QList::iterator - size=8 align=8 - base size=8 base align=8 -QList::iterator (0x2aaaae108770) 0 -Class QList::const_iterator - size=8 align=8 - base size=8 base align=8 -QList::const_iterator (0x2aaaae108af0) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=8 base align=8 QFileInfo (0x2aaaae190460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae190ee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae1ce380) 0 empty -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaae1ceaf0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaae1ce9a0) 0 Class QDir size=8 align=8 base size=8 base align=8 QDir (0x2aaaae1cec40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae1ceee0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae231150) 0 Class QUrl size=8 align=8 base size=8 base align=8 QUrl (0x2aaaae26ae00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae2af150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae2eb380) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x2aaaae2eb9a0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae30f0e0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae30f2a0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae30f460) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae30f620) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae30f7e0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae30f9a0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae30fb60) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae30fd20) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae30fee0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae31c0e0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae31c2a0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae31c460) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae31c620) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae31c7e0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae31c9a0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae31cb60) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaae31cd20) 0 empty Class QVariant::PrivateShared size=16 align=8 @@ -1029,35 +717,15 @@ Class QVariant base size=16 base align=8 QVariant (0x2aaaae31ce70) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaae3c8070) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaae3b3ee0) 0 -Class QMap:: - size=8 align=8 - base size=8 base align=8 -QMap:: (0x2aaaae3c83f0) 0 -Class QMap - size=8 align=8 - base size=8 base align=8 -QMap (0x2aaaae3c82a0) 0 Class QVariantComparisonHelper size=8 align=8 base size=8 base align=8 QVariantComparisonHelper (0x2aaaae416d20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae42f7e0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1128,10 +796,6 @@ Class QFileEngine QFileEngine (0x2aaaae4a5c40) 0 vptr=((& QFileEngine::_ZTV11QFileEngine) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaae4a5e70) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5u entries @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x2aaaae4ec8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae4eca80) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x2aaaae610d90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae62d3f0) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x2aaaae65b150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae65b930) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x2aaaae68d930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae68daf0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x2aaaae6bf3f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae6bf9a0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x2aaaae6f7a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae6f7d90) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x2aaaae7493f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae749af0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x2aaaae7a02a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae7d3070) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x2aaaae844bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae875b60) 0 empty Class QLinkedListData size=32 align=8 @@ -1262,10 +890,6 @@ Class QBitRef base size=12 base align=8 QBitRef (0x2aaaae9e2d20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae9ff930) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=8 base align=8 QLocale (0x2aaaaeb20a10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaeb6a4d0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x2aaaaebcdb60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaebf3d20) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x2aaaaebf3f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaec11b60) 0 empty Class QDateTime size=8 align=8 base size=8 base align=8 QDateTime (0x2aaaaec11d90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaec35850) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x2aaaaecba3f0) 0 QObject (0x2aaaaecba460) 0 primary-for QEventLoop (0x2aaaaecba3f0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaecba850) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=24 base align=8 QModelIndex (0x2aaaaed32930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaed4db60) 0 empty Class QPersistentModelIndex size=8 align=8 base size=8 base align=8 QPersistentModelIndex (0x2aaaaed5f0e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaed5f310) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2aaaaedf49a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaee0c230) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=12 base align=8 QMetaMethod (0x2aaaaee57000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaee573f0) 0 empty Class QMetaEnum size=16 align=8 base size=12 base align=8 QMetaEnum (0x2aaaaee57620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaee57af0) 0 empty Class QMetaProperty size=32 align=8 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=12 base align=8 QMetaClassInfo (0x2aaaaee57e70) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaee772a0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2057,25 +1637,9 @@ Class QWriteLocker base size=8 base align=8 QWriteLocker (0x2aaaaef2abd0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2aaaaef7b070) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2aaaaef7b150) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2aaaaef7b230) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2aaaaef45f50) 0 Class QColor size=16 align=4 @@ -2092,55 +1656,23 @@ Class QPen base size=8 base align=8 QPen (0x2aaaaefc8700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaefc88c0) 0 empty Class QBrush size=8 align=8 base size=8 base align=8 QBrush (0x2aaaaefc8bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaeff9070) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x2aaaaeff92a0) 0 -Class QVector >:: - size=8 align=8 - base size=8 base align=8 -QVector >:: (0x2aaaaeff9a80) 0 -Class QVector > - size=8 align=8 - base size=8 base align=8 -QVector > (0x2aaaaeff98c0) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2aaaaeff9cb0) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2aaaaeff9d90) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2aaaaeff9e70) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2aaaaeff9bd0) 0 Class QGradient size=64 align=8 @@ -2170,25 +1702,13 @@ Class QTextLength base size=16 base align=8 QTextLength (0x2aaaaf0303f0) 0 -Class QSharedDataPointer - size=8 align=8 - base size=8 base align=8 -QSharedDataPointer (0x2aaaaf052380) 0 Class QTextFormat size=16 align=8 base size=12 base align=8 QTextFormat (0x2aaaaf052150) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaaf0900e0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaaf0524d0) 0 Class QTextCharFormat size=16 align=8 @@ -2328,10 +1848,6 @@ QTextFrame (0x2aaaaf1becb0) 0 QObject (0x2aaaaf1bed90) 0 primary-for QTextObject (0x2aaaaf1bed20) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf1ff9a0) 0 empty Class QTextBlock::iterator size=24 align=8 @@ -2343,25 +1859,13 @@ Class QTextBlock base size=12 base align=8 QTextBlock (0x2aaaaf1ffcb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf243070) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf243310) 0 empty Class QTextFragment size=16 align=8 base size=16 base align=8 QTextFragment (0x2aaaaf243540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf259540) 0 empty Class QFontMetrics size=8 align=8 @@ -2421,20 +1925,12 @@ QTextDocument (0x2aaaaf27eb60) 0 QObject (0x2aaaaf27ebd0) 0 primary-for QTextDocument (0x2aaaaf27eb60) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaf27e690) 0 Class QTextOption size=32 align=8 base size=32 base align=8 QTextOption (0x2aaaaf2d03f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaf2d0af0) 0 Class QTextTableCell size=16 align=8 @@ -2485,10 +1981,6 @@ Class QKeySequence base size=8 base align=8 QKeySequence (0x2aaaaf32ee00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaf36a230) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2771,15 +2263,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x2aaaaf446850) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaaf446b60) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaaf446a10) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3063,15 +2547,7 @@ Class QTextLayout base size=8 base align=8 QTextLayout (0x2aaaaf5025b0) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaaf502a10) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaaf502850) 0 Class QTextLine size=16 align=8 @@ -3120,10 +2596,6 @@ Class QTextDocumentFragment base size=8 base align=8 QTextDocumentFragment (0x2aaaaf563e70) 0 -Class QSharedDataPointer - size=8 align=8 - base size=8 base align=8 -QSharedDataPointer (0x2aaaaf59a0e0) 0 Class QTextCursor size=8 align=8 @@ -3146,15 +2618,7 @@ Class QAbstractTextDocumentLayout::Selection base size=24 base align=8 QAbstractTextDocumentLayout::Selection (0x2aaaaf62bf50) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaaf642380) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaaf6421c0) 0 Class QAbstractTextDocumentLayout::PaintContext size=64 align=8 @@ -3981,10 +3445,6 @@ QFileDialog (0x2aaaaf90ecb0) 0 QPaintDevice (0x2aaaaf90ee00) 16 vptr=((& QFileDialog::_ZTV11QFileDialog) + 488u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaf94d3f0) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4504,10 +3964,6 @@ QImage (0x2aaaafa4c7e0) 0 QPaintDevice (0x2aaaafa4c850) 0 primary-for QImage (0x2aaaafa4c7e0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaafac88c0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4732,10 +4188,6 @@ Class QIcon base size=8 base align=8 QIcon (0x2aaaafbd5070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaafbd5bd0) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4887,15 +4339,7 @@ Class QPrintEngine QPrintEngine (0x2aaaafc75620) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 16u) -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafc75f50) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafc75d90) 0 Class QPolygon size=8 align=8 @@ -4903,15 +4347,7 @@ Class QPolygon QPolygon (0x2aaaafcad000) 0 QVector (0x2aaaafcad070) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafcc79a0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafcc77e0) 0 Class QPolygonF size=8 align=8 @@ -4924,55 +4360,19 @@ Class QMatrix base size=48 base align=8 QMatrix (0x2aaaafd0f000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaafd0fa80) 0 empty Class QPainter size=8 align=8 base size=8 base align=8 QPainter (0x2aaaafd3d770) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafde07e0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafde0620) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafde0c40) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafde0a80) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafe30af0) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafe30930) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaafe30f50) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaafe30d90) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5020,15 +4420,7 @@ QStyle (0x2aaaafefe150) 0 QObject (0x2aaaafefe1c0) 0 primary-for QStyle (0x2aaaafefe150) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaafefe7e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaafefebd0) 0 Class QStylePainter size=24 align=8 @@ -5046,25 +4438,13 @@ Class QPainterPath base size=8 base align=8 QPainterPath (0x2aaaaff8c3f0) 0 -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaaaffbf460) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaaaffbf2a0) 0 Class QPainterPathPrivate size=16 align=8 base size=16 base align=8 QPainterPathPrivate (0x2aaaaff8c5b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaaffbf5b0) 0 empty Class QPainterPathStroker size=8 align=8 @@ -5076,15 +4456,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x2aaaafff6e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaafff6f50) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab00143f0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5119,10 +4491,6 @@ Class QPaintEngine QPaintEngine (0x2aaab00141c0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab00145b0) 0 Class QPaintEngineState size=4 align=4 @@ -5134,10 +4502,6 @@ Class QItemSelectionRange base size=16 base align=8 QItemSelectionRange (0x2aaab005ce00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab00b8af0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5168,20 +4532,8 @@ QItemSelectionModel (0x2aaab00da070) 0 QObject (0x2aaab00da0e0) 0 primary-for QItemSelectionModel (0x2aaab00da070) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab00da850) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab00daee0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab00dad90) 0 Class QItemSelection size=8 align=8 @@ -5470,10 +4822,6 @@ QAbstractSpinBox (0x2aaab0190770) 0 QPaintDevice (0x2aaab0190850) 16 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 504u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab01c4070) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5910,10 +5258,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x2aaab02f72a0) 0 QStyleOption (0x2aaab02f7310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab02f7cb0) 0 Class QStyleOptionButton size=88 align=8 @@ -5921,10 +5265,6 @@ Class QStyleOptionButton QStyleOptionButton (0x2aaab02f79a0) 0 QStyleOption (0x2aaab02f7a10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab032b770) 0 Class QStyleOptionTab size=96 align=8 @@ -5944,10 +5284,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x2aaab0367700) 0 QStyleOption (0x2aaab0367770) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab038c000) 0 Class QStyleOptionQ3ListViewItem size=80 align=8 @@ -6005,15 +5341,7 @@ QStyleOptionSpinBox (0x2aaab03fdcb0) 0 QStyleOptionComplex (0x2aaab03fdd20) 0 QStyleOption (0x2aaab03fdd90) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab0419850) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab0419700) 0 Class QStyleOptionQ3ListView size=112 align=8 @@ -6022,10 +5350,6 @@ QStyleOptionQ3ListView (0x2aaab0419380) 0 QStyleOptionComplex (0x2aaab04193f0) 0 QStyleOption (0x2aaab0419460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab04511c0) 0 Class QStyleOptionToolButton size=128 align=8 @@ -6213,10 +5537,6 @@ QAbstractItemView (0x2aaab04c33f0) 0 QPaintDevice (0x2aaab04c35b0) 16 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 784u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab04c3e00) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6399,15 +5719,7 @@ QListView (0x2aaab0563850) 0 QPaintDevice (0x2aaab0563a80) 16 vptr=((& QListView::_ZTV9QListView) + 784u) -Class QVector:: - size=8 align=8 - base size=8 base align=8 -QVector:: (0x2aaab05a6540) 0 -Class QVector - size=8 align=8 - base size=8 base align=8 -QVector (0x2aaab05a6380) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7324,15 +6636,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x2aaab07d9690) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 16u) -Class QHash:: - size=8 align=8 - base size=8 base align=8 -QHash:: (0x2aaab07ee380) 0 -Class QHash - size=8 align=8 - base size=8 base align=8 -QHash (0x2aaab07ee1c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7349,25 +6653,9 @@ Class QItemEditorFactory QItemEditorFactory (0x2aaab07ee000) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 16u) -Class QVector >:: - size=8 align=8 - base size=8 base align=8 -QVector >:: (0x2aaab07eee70) 0 -Class QVector > - size=8 align=8 - base size=8 base align=8 -QVector > (0x2aaab07eecb0) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab084c070) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab07ee690) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -7594,15 +6882,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2aaab08eca80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab08ecc40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab092e000) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8450,15 +7730,7 @@ QActionGroup (0x2aaab0b861c0) 0 QObject (0x2aaab0b86230) 0 primary-for QActionGroup (0x2aaab0b861c0) -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaab0b86e00) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaab0b86cb0) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -8599,10 +7871,6 @@ QCommonStyle (0x2aaab0bf25b0) 0 QObject (0x2aaab0bf2690) 0 primary-for QStyle (0x2aaab0bf2620) -Class QPointer - size=8 align=8 - base size=8 base align=8 -QPointer (0x2aaab0bf2e70) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10130,10 +9398,6 @@ QDateEdit (0x2aaab0eb2e00) 0 QPaintDevice (0x2aaab0eb2070) 16 vptr=((& QDateEdit::_ZTV9QDateEdit) + 520u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab0ed6540) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10293,10 +9557,6 @@ QDockWidget (0x2aaab0f1e230) 0 QPaintDevice (0x2aaab0f1e310) 16 vptr=((& QDockWidget::_ZTV11QDockWidget) + 464u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab0f1eee0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -11877,10 +11137,6 @@ Class QGLColormap base size=8 base align=8 QGLColormap (0x2aaab13210e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaab1354620) 0 Class QGLFormat size=8 align=8 @@ -11995,153 +11251,33 @@ QGLWidget (0x2aaab1354af0) 0 QPaintDevice (0x2aaab163e000) 16 vptr=((& QGLWidget::_ZTV9QGLWidget) + 544u) -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab170e4d0) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab174b5b0) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x2aaab17d1d20) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x2aaab17ebe70) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x2aaab17f7930) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x2aaab181b5b0) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x2aaab1841a10) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x2aaab1871770) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x2aaab1871cb0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x2aaab187d230) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x2aaab187d770) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x2aaab1895700) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab1955150) 0 -Class QVectorTypedData > - size=24 align=8 - base size=24 base align=8 -QVectorTypedData > (0x2aaab1955850) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab19912a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab1a36770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab1a403f0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab1a503f0) 0 empty -Class QHashNode - size=24 align=8 - base size=24 base align=8 -QHashNode (0x2aaab1a964d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab1a96a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab1aa3d90) 0 empty -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab1ac8460) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=8 align=8 - base size=8 base align=8 -QVector::realloc(int, int) [with T = QTextLength]:: (0x2aaab1ac8d20) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=8 align=8 - base size=8 base align=8 -QVector::realloc(int, int) [with T = QPoint]:: (0x2aaab1aec150) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=8 align=8 - base size=8 base align=8 -QVector::realloc(int, int) [with T = QPointF]:: (0x2aaab1b2e3f0) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab1b59850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaab1b6f150) 0 empty -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab1b6f2a0) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaab1b7e770) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=8 align=8 - base size=8 base align=8 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x2aaab1b8ee70) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.4.0.0.linux-gcc-ia32.txt index 50caea39c..155c41e24 100644 --- a/tests/auto/bic/data/QtOpenGL.4.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.0.0.linux-gcc-ia32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x40b66000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b66140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b66180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b661c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b66200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b66240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b66280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b662c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b66300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b66340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b66380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b663c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b66400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b66440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b66480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b664c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40b66500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b666c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b66740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b667c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b66840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b668c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b66940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b669c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b66a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b66ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b66b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b66bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b66c40) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40b66d80) 0 QGenericArgument (0x40b66dc0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40b66fc0) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x414760c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41476180) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x41476880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41476900) 0 empty Class QString::Null size=1 align=1 @@ -296,10 +176,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x41476b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41476c80) 0 Class QCharRef size=8 align=4 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x41476e40) 0 QString (0x41476e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41476f00) 0 empty Class QListData::Data size=24 align=4 @@ -327,15 +199,7 @@ Class QListData base size=4 base align=4 QListData (0x41735000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41735440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41735380) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x41735680) 0 QObject (0x417356c0) 0 primary-for QIODevice (0x41735680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41735800) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=72 base align=4 QMapData (0x41735900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41735ec0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x41735dc0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41735c00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41735540) 0 Class QTextEncoder size=32 align=4 @@ -503,30 +351,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x41931000) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41931080) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x41931100) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x419310c0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x41931140) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41931180) 0 Class __gconv_trans_data size=20 align=4 @@ -548,15 +376,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x41931280) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x41931300) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x419312c0) 0 Class _IO_marker size=12 align=4 @@ -568,10 +388,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x41931380) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x419313c0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x41931400) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41931540) 0 Class QTextStreamManipulator size=24 align=4 @@ -680,10 +492,6 @@ QFile (0x41931c80) 0 QObject (0x41931d00) 0 primary-for QIODevice (0x41931cc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41931e00) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x41931fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41931740) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x41931900) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41a2f080) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41931f40) 0 Class QStringList size=4 align=4 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x41a2f0c0) 0 QList (0x41a2f100) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x41a2f340) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x41a2f3c0) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x41a2f840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41a2f8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41a2f900) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41a2fa40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41a2f980) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x41a2fa80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41a2fb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41a2fc00) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x41a2fc80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41a2fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41a2fdc0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x41a2fe00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41a2fe80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41a2fec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41a2ff00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41a2ff40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41a2ff80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41a2ffc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41a2f680) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41a2f7c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b73000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b73040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b73080) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b730c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b73100) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b73140) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b73180) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b731c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41b73200) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1029,35 +717,15 @@ Class QVariant base size=12 base align=4 QVariant (0x41b73240) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41b73800) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41b73740) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x41b73980) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x41b738c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x41b73bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41b73cc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1142,10 +810,6 @@ Class QFileEngineHandler QFileEngineHandler (0x41b73f80) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41b73480) 0 Class QHashData::Node size=8 align=4 @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x41b73d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41b73e00) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x41c774c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c77900) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x41c779c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c77e00) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x41c77f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c77f40) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x41c77500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c77600) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x41c77800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c77d00) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x41d9c0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d9c480) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x41d9c680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d9c880) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x41d9c980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d9cb00) 0 empty Class QLinkedListData size=20 align=4 @@ -1262,10 +890,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x41d9c380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d9c6c0) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=4 base align=4 QLocale (0x41f85280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41f852c0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x41f85440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41f855c0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x41f85600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41f85780) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x41f857c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41f85900) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x41f85500) 0 QObject (0x41f85640) 0 primary-for QEventLoop (0x41f85500) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41f85880) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x420c1300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x420c1400) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x420c1480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x420c1540) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x420c1b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x420c1bc0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x420c1f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x420c1f80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x420c1fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x420c1180) 0 empty Class QMetaProperty size=20 align=4 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x420c14c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x420c1740) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2057,25 +1637,9 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x421a6580) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x421a66c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x421a6700) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x421a6740) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x421a6680) 0 Class QColor size=16 align=4 @@ -2092,55 +1656,23 @@ Class QPen base size=4 base align=4 QPen (0x421a6b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x421a6bc0) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0x421a6c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x421a6c40) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x421a6c80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x421a6ec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x421a6e00) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0x421a6f40) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0x421a6f80) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0x421a6fc0) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0x421a6f00) 0 Class QGradient size=56 align=4 @@ -2170,25 +1702,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x421a6d00) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4227b1c0) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x4227b100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4227b440) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4227b380) 0 Class QTextCharFormat size=8 align=4 @@ -2328,10 +1848,6 @@ QTextFrame (0x4227bb00) 0 QObject (0x4227bb80) 0 primary-for QTextObject (0x4227bb40) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4227be00) 0 empty Class QTextBlock::iterator size=16 align=4 @@ -2343,25 +1859,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x4227be40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4227b140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4227b200) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x4227b280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4237b000) 0 empty Class QFontMetrics size=4 align=4 @@ -2426,10 +1930,6 @@ Class QTextOption base size=24 base align=4 QTextOption (0x4237b340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4237b3c0) 0 Class QTextTableCell size=8 align=4 @@ -2480,10 +1980,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x4237ba40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4237bb80) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2766,15 +2262,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0x42445b00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42445c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42445bc0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3058,15 +2546,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x424b69c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x424b6b80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x424b6ac0) 0 Class QTextLine size=8 align=4 @@ -3115,10 +2595,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x424b6080) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x424b6380) 0 Class QTextCursor size=4 align=4 @@ -3141,15 +2617,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x4256b200) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4256b3c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4256b300) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -3976,10 +3444,6 @@ QFileDialog (0x426d2440) 0 QPaintDevice (0x426d2540) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x426d26c0) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4499,10 +3963,6 @@ QImage (0x426d2f80) 0 QPaintDevice (0x427b7000) 0 primary-for QImage (0x426d2f80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x427b7100) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4727,10 +4187,6 @@ Class QIcon base size=4 base align=4 QIcon (0x427b7c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x427b7d00) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4882,15 +4338,7 @@ Class QPrintEngine QPrintEngine (0x428ae200) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x428ae400) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x428ae340) 0 Class QPolygon size=4 align=4 @@ -4898,15 +4346,7 @@ Class QPolygon QPolygon (0x428ae440) 0 QVector (0x428ae480) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x428ae700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x428ae640) 0 Class QPolygonF size=4 align=4 @@ -4919,55 +4359,19 @@ Class QMatrix base size=48 base align=4 QMatrix (0x428ae900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x428ae940) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x428ae980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x428aeb80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x428aeac0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x428aed00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x428aec40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x428aee80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x428aedc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x428ae180) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x428aef40) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5015,15 +4419,7 @@ QStyle (0x428ae240) 0 QObject (0x428ae9c0) 0 primary-for QStyle (0x428ae240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42a28100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42a28180) 0 Class QStylePainter size=12 align=4 @@ -5041,25 +4437,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x42a28340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42a28740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42a28680) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x42a284c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42a28780) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5071,15 +4455,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x42a28840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42a28880) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42a28980) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5114,10 +4490,6 @@ Class QPaintEngine QPaintEngine (0x42a288c0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42a28b00) 0 Class QPaintEngineState size=4 align=4 @@ -5129,10 +4501,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x42a28b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42a28c40) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5163,20 +4531,8 @@ QItemSelectionModel (0x42a28cc0) 0 QObject (0x42a28d00) 0 primary-for QItemSelectionModel (0x42a28cc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42a28e00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42a28f40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42a28e80) 0 Class QItemSelection size=4 align=4 @@ -5465,10 +4821,6 @@ QAbstractSpinBox (0x42b534c0) 0 QPaintDevice (0x42b53580) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42b53680) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5905,10 +5257,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x42c29100) 0 QStyleOption (0x42c29140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42c29380) 0 Class QStyleOptionButton size=64 align=4 @@ -5916,10 +5264,6 @@ Class QStyleOptionButton QStyleOptionButton (0x42c29280) 0 QStyleOption (0x42c292c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42c295c0) 0 Class QStyleOptionTab size=72 align=4 @@ -5939,10 +5283,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x42c29840) 0 QStyleOption (0x42c29880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42c29a80) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6000,15 +5340,7 @@ QStyleOptionSpinBox (0x42cba100) 0 QStyleOptionComplex (0x42cba140) 0 QStyleOption (0x42cba180) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42cba480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42cba3c0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6017,10 +5349,6 @@ QStyleOptionQ3ListView (0x42cba280) 0 QStyleOptionComplex (0x42cba2c0) 0 QStyleOption (0x42cba300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42cba700) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6208,10 +5536,6 @@ QAbstractItemView (0x42cbad00) 0 QPaintDevice (0x42cbae40) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42cbaf80) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6394,15 +5718,7 @@ QListView (0x42cba680) 0 QPaintDevice (0x42d57000) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42d57280) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42d571c0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7319,15 +6635,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x42e73480) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x42e73780) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x42e736c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7344,25 +6652,9 @@ Class QItemEditorFactory QItemEditorFactory (0x42e73600) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x42e73a00) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x42e73940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42e73b80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42e73ac0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -7589,15 +6881,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x42e73c00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42f5a000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42f5a080) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8445,15 +7729,7 @@ QActionGroup (0x42ff4b40) 0 QObject (0x42ff4b80) 0 primary-for QActionGroup (0x42ff4b40) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42ff4d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42ff4cc0) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -8594,10 +7870,6 @@ QCommonStyle (0x42ff4300) 0 QObject (0x42ff4680) 0 primary-for QStyle (0x42ff44c0) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x42ff4fc0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10125,10 +9397,6 @@ QDateEdit (0x431c61c0) 0 QPaintDevice (0x431c6a80) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x431c6fc0) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10288,10 +9556,6 @@ QDockWidget (0x432721c0) 0 QPaintDevice (0x43272280) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x432723c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -10538,10 +9802,6 @@ QTextEdit (0x43272700) 0 QPaintDevice (0x43272840) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43272980) 0 Vtable for QProgressBar QProgressBar::_ZTV12QProgressBar: 64u entries @@ -11877,10 +11137,6 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0x4346f080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4346f180) 0 Class QGLFormat size=4 align=4 @@ -11995,153 +11251,33 @@ QGLWidget (0x4346f3c0) 0 QPaintDevice (0x4346f480) 8 vptr=((& QGLWidget::_ZTV9QGLWidget) + 272u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x436078c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43607f80) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x43695140) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x43695580) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x43695740) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x43695c40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x43695f80) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x436d5400) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x436d5540) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x436d5680) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x436d57c0) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0x436d5b80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x437555c0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x43755700) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43755d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x437dd380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x437dd580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x437dd800) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x438171c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x438172c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43817580) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x438178c0) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x43817a00) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x43817b80) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x43817d40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43817f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43817b00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43817d80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x438902c0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x43890700) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.0.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtOpenGL.4.0.0.linux-gcc-ppc32.txt index 57dbbaa3f..b25928c1a 100644 --- a/tests/auto/bic/data/QtOpenGL.4.0.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.0.0.linux-gcc-ppc32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x30b739a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b73c40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b73ce8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b73d90) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b73e38) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b73ee0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b73f88) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b73578) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313ca038) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313ca0e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313ca188) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313ca230) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313ca2d8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313ca380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313ca428) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313ca4d0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x313ca540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313caa48) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313caab8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313cab28) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313cab98) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313cac08) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313cac78) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313cace8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313cad58) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313cadc8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313cae38) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313caea8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313caf18) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187a80) 0 QGenericArgument (0x31492038) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x314921f8) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x314922d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31492380) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x31492f18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31561268) 0 empty Class QString::Null size=1 align=1 @@ -296,20 +176,12 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x315614d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31561818) 0 Class QCharRef size=8 align=4 base size=8 base align=4 QCharRef (0x31561850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316c1188) 0 empty Class QListData::Data size=24 align=4 @@ -321,15 +193,7 @@ Class QListData base size=4 base align=4 QListData (0x316c1380) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x316c18c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x316c1818) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -421,10 +285,6 @@ QIODevice (0x30187c80) 0 QObject (0x316c1d58) 0 primary-for QIODevice (0x30187c80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x316c1f18) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -449,30 +309,10 @@ Class QMapData base size=72 base align=4 QMapData (0x317dd268) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x317dd7a8) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x317dd888) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x317dd818) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x317dd8f8) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x317dd968) 0 Class __gconv_trans_data size=20 align=4 @@ -494,15 +334,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x317ddab8) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x317ddb98) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x317ddb28) 0 Class _IO_marker size=12 align=4 @@ -514,10 +346,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x317ddc08) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x317ddc78) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -532,10 +360,6 @@ Class QTextStream QTextStream (0x317ddcb0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x317dde70) 0 Class QTextStreamManipulator size=24 align=4 @@ -596,10 +420,6 @@ QFile (0x30187e00) 0 QObject (0x318d0348) 0 primary-for QIODevice (0x30187e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x318d04d0) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -652,25 +472,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x318d0620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318d0690) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x318d0700) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x318d08c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x318d0818) 0 Class QStringList size=4 align=4 @@ -770,130 +578,42 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x318d0f18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x319ac038) 0 empty Class QDir size=4 align=4 base size=4 base align=4 QDir (0x319ac0e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x319ac1f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x319ac268) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x319ac310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x319ac428) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x319ac4d0) 0 Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x319ac508) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319ac5e8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319ac658) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319ac6c8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319ac738) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319ac7a8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319ac818) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319ac888) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319ac8f8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319ac968) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319ac9d8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319aca48) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319acab8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319acb28) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319acb98) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319acc08) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319acc78) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x319acce8) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -920,35 +640,15 @@ Class QVariant base size=16 base align=8 QVariant (0x319acd20) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31a501c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31a50118) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x31a50380) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x31a502d8) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x31a50540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31a50658) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1033,10 +733,6 @@ Class QFileEngineHandler QFileEngineHandler (0x31a509a0) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31a50b28) 0 Class QHashData::Node size=8 align=4 @@ -1053,90 +749,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x31a50d20) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31a50d90) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x31afb310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31afb700) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x31afb888) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31afbc78) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x31afbe38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31afbea8) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x31afb038) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31afb428) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x31afb930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31bfc0a8) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x31bfc310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31bfc690) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x31bfc9a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31bfcb98) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x31bfcdc8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31bfcf50) 0 empty Class QLinkedListData size=20 align=4 @@ -1153,10 +813,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x31cf86c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31cf87e0) 0 empty Class QVectorData size=16 align=4 @@ -1178,40 +834,24 @@ Class QLocale base size=4 base align=4 QLocale (0x31cf8d90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31cf8e00) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x31cf80e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e85188) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x31e851f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e85380) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x31e853f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e85540) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1286,10 +926,6 @@ QTextCodecPlugin (0x31993380) 0 QFactoryInterface (0x31e85a10) 8 nearly-empty primary-for QTextCodecFactoryInterface (0x319933c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31e85e38) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1409,10 +1045,6 @@ QEventLoop (0x319934c0) 0 QObject (0x31f0d0a8) 0 primary-for QEventLoop (0x319934c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31f0d230) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1489,20 +1121,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x31f0d930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31f0dab8) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x31f0db60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31f0dc78) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1722,10 +1346,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x31faf0e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31faf1c0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1820,20 +1440,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x31faf5e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31faf690) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x31faf700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31faf7a8) 0 empty Class QMetaProperty size=20 align=4 @@ -1845,10 +1457,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x31faf850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31faf8f8) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -1971,25 +1579,9 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x31faff18) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x320411f8) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x32041268) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x320412d8) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x32041188) 0 Class QColor size=16 align=4 @@ -2006,55 +1598,23 @@ Class QPen base size=4 base align=4 QPen (0x32041700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32041770) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0x320417e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32041850) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x320418c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32041b60) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32041a80) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x32041c78) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x32041ce8) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x32041d58) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x32041c08) 0 Class QGradient size=64 align=8 @@ -2084,25 +1644,13 @@ Class QTextLength base size=16 base align=8 QTextLength (0x32041e38) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x32041a10) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x32041380) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x320f12a0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x320f11c0) 0 Class QTextCharFormat size=8 align=4 @@ -2242,10 +1790,6 @@ QTextFrame (0x31993cc0) 0 QObject (0x320f18c0) 0 primary-for QTextObject (0x31993d00) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x320f1d58) 0 empty Class QTextBlock::iterator size=16 align=4 @@ -2257,25 +1801,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x320f1dc8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321bf038) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321bf0e0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x321bf150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321bf310) 0 empty Class QFontMetrics size=4 align=4 @@ -2340,10 +1872,6 @@ Class QTextOption base size=28 base align=8 QTextOption (0x321bf770) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x321bf850) 0 Class QTextTableCell size=8 align=4 @@ -2394,10 +1922,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x321bfea8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321bf540) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2680,15 +2204,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x32261700) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32261d90) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32261a48) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2705,15 +2221,7 @@ QInputMethodEvent (0x322763c0) 0 QEvent (0x322615e8) 0 primary-for QInputMethodEvent (0x322763c0) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x322cd2a0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x322cd1f8) 0 Vtable for QDropEvent QDropEvent::_ZTV10QDropEvent: 14u entries @@ -2982,15 +2490,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x3231b2a0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3231b4d0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3231b3f0) 0 Class QTextLine size=8 align=4 @@ -3039,10 +2539,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x3231b8f8) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3231ba10) 0 Class QTextCursor size=4 align=4 @@ -3059,15 +2555,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x3231bb98) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3231bd90) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3231bcb0) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -3894,10 +3382,6 @@ QFileDialog (0x32276f80) 0 QPaintDevice (0x324a6380) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x324a6578) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4417,10 +3901,6 @@ QImage (0x324c3540) 0 QPaintDevice (0x324a6fc0) 0 primary-for QImage (0x324c3540) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32555188) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4645,10 +4125,6 @@ Class QIcon base size=4 base align=4 QIcon (0x32555f88) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x325550e0) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4800,15 +4276,7 @@ Class QPrintEngine QPrintEngine (0x325f25b0) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x325f2888) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x325f27a8) 0 Class QPolygon size=4 align=4 @@ -4816,15 +4284,7 @@ Class QPolygon QPolygon (0x324c39c0) 0 QVector (0x325f28f8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x325f2cb0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x325f2bd0) 0 Class QPolygonF size=4 align=4 @@ -4837,55 +4297,19 @@ Class QMatrix base size=48 base align=8 QMatrix (0x325f2fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x325f2230) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x3267e000) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3267e2d8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3267e1f8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3267e498) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3267e3b8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3267e658) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3267e578) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3267e818) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3267e738) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -4933,15 +4357,7 @@ QStyle (0x324c3a40) 0 QObject (0x3267e888) 0 primary-for QStyle (0x324c3a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3267ea48) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3267eab8) 0 Class QStylePainter size=12 align=4 @@ -4959,25 +4375,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x3267ed20) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x327b50e0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x327b5000) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x3267ef18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x327b5188) 0 empty Class QPainterPathStroker size=4 align=4 @@ -4989,15 +4393,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x327b53b8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x327b5460) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x327b55e8) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5032,10 +4428,6 @@ Class QPaintEngine QPaintEngine (0x327b54d0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x327b57e0) 0 Class QPaintEngineState size=4 align=4 @@ -5047,10 +4439,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x327b5818) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x327b5ab8) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5081,20 +4469,8 @@ QItemSelectionModel (0x324c3b00) 0 QObject (0x327b5b60) 0 primary-for QItemSelectionModel (0x324c3b00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x327b5ce8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x327b5e38) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x327b5d90) 0 Class QItemSelection size=4 align=4 @@ -5383,10 +4759,6 @@ QAbstractSpinBox (0x324c3e00) 0 QPaintDevice (0x328884d0) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32888700) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5823,10 +5195,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x328ec240) 0 QStyleOption (0x3292d508) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3292d7e0) 0 Class QStyleOptionButton size=64 align=4 @@ -5834,10 +5202,6 @@ Class QStyleOptionButton QStyleOptionButton (0x328ec2c0) 0 QStyleOption (0x3292d690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3292da48) 0 Class QStyleOptionTab size=72 align=4 @@ -5857,10 +5221,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x328ec3c0) 0 QStyleOption (0x3292dd20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3292d0e0) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5918,15 +5278,7 @@ QStyleOptionSpinBox (0x328ec640) 0 QStyleOptionComplex (0x328ec680) 0 QStyleOption (0x329a89d8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x329a8d58) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x329a8cb0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5935,10 +5287,6 @@ QStyleOptionQ3ListView (0x328ec6c0) 0 QStyleOptionComplex (0x328ec700) 0 QStyleOption (0x329a8b60) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x329a81f8) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6126,10 +5474,6 @@ QAbstractItemView (0x328ec980) 0 QPaintDevice (0x32a13460) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32a13658) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6312,15 +5656,7 @@ QListView (0x328ecb80) 0 QPaintDevice (0x32a137e0) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32a13b60) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32a13a80) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7237,15 +6573,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x32ad8e00) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x32ad8b98) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x32ad8428) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7262,25 +6590,9 @@ Class QItemEditorFactory QItemEditorFactory (0x32ad80a8) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x32bc9348) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x32bc9268) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32bc9508) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32bc9460) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -7507,15 +6819,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x32bc9e38) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32bc9f18) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32bc9f88) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8497,10 +7801,6 @@ QCommonStyle (0x32d35280) 0 QObject (0x32d8e348) 0 primary-for QStyle (0x32d352c0) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x32d8e540) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10028,10 +9328,6 @@ QDateEdit (0x32e92240) 0 QPaintDevice (0x32e9b4d0) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32e9b690) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10191,10 +9487,6 @@ QDockWidget (0x32e92400) 0 QPaintDevice (0x32e9b8c0) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32e9bb28) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -11748,10 +11040,6 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0x32fe68c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32fe6a48) 0 Class QGLFormat size=4 align=4 @@ -11866,133 +11154,29 @@ QGLWidget (0x3300e180) 0 QPaintDevice (0x32fe6d20) 8 vptr=((& QGLWidget::_ZTV9QGLWidget) + 272u) -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x33276bd0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x332900a8) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x33290348) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x33290c08) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x332ba230) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x332ba8c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x332baa48) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x332bad90) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x332baf18) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x332dd690) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33333dc8) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x33333fc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3338b3f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3338bdc8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x333aa0e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x333aa4d0) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x333c95b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x333c9738) 0 empty -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x333c9f18) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x333fd3f0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x333fda10) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x333fd428) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3343b1f8) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3343b2a0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3343b770) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x3343bc40) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.0.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtOpenGL.4.0.0.macx-gcc-ppc32.txt index 2f5d4dc61..23530d108 100644 --- a/tests/auto/bic/data/QtOpenGL.4.0.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.0.0.macx-gcc-ppc32.txt @@ -59,75 +59,19 @@ Class QBool base size=4 base align=4 QBool (0x87ccc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x87c500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1720000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17200c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1720180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1720240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1720300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17203c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1720480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1720540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1720600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17206c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1720780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1720840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1720900) 0 empty Class QFlag size=4 align=4 @@ -144,10 +88,6 @@ Class QChar base size=2 base align=2 QChar (0x1720c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1720d00) 0 empty Class QBasicAtomic size=4 align=4 @@ -160,10 +100,6 @@ Class QAtomic QAtomic (0x17b90c0) 0 QBasicAtomic (0x17b9100) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x17b9380) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -245,70 +181,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0x1863000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x18633c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1863880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1863900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1863980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1863a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1863a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1863b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1863b80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1863c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1863c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1863d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1863d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1863e00) 0 Class QInternal size=1 align=1 @@ -335,10 +219,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x1a0d540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a0d980) 0 Class QCharRef size=8 align=4 @@ -351,10 +231,6 @@ Class QConstString QConstString (0x1b9a580) 0 QString (0x1b9a5c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b9a6c0) 0 empty Class QListData::Data size=24 align=4 @@ -366,10 +242,6 @@ Class QListData base size=4 base align=4 QListData (0x1b9a900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b9af00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -394,15 +266,7 @@ Class QTextCodec QTextCodec (0x1b9ad80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1cc5180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1cc50c0) 0 Class QTextEncoder size=32 align=4 @@ -425,25 +289,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1cc53c0) 0 QGenericArgument (0x1cc5400) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1cc56c0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1cc5640) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1cc5940) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1cc5880) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -535,10 +387,6 @@ QIODevice (0x1cc5f80) 0 QObject (0x1cc5fc0) 0 primary-for QIODevice (0x1cc5f80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1dab180) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -558,25 +406,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1dab840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1daba40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1dabac0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1dabcc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1dabc00) 0 Class QStringList size=4 align=4 @@ -584,15 +420,7 @@ Class QStringList QStringList (0x1dabd80) 0 QList (0x1dabdc0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1e65200) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1e65280) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -748,10 +576,6 @@ Class QTextStream QTextStream (0x1ed8b00) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ed8dc0) 0 Class QTextStreamManipulator size=24 align=4 @@ -842,50 +666,22 @@ QFile (0x1ff49c0) 0 QObject (0x1ff4a40) 0 primary-for QIODevice (0x1ff4a00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ff4c00) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1ff4c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ff4d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ff4d80) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1ff4f40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1ff4e80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1ff4200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x210a080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x210a140) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35u entries @@ -945,10 +741,6 @@ Class QFileEngineHandler QFileEngineHandler (0x210a380) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x210a540) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -999,90 +791,22 @@ Class QMetaType base size=0 base align=1 QMetaType (0x210a740) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210a840) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210a8c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210a940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210a9c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210aa40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210aac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210ab40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210abc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210ac40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210acc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210ad40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210adc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210ae40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210aec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210af40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210afc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x210a480) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1109,50 +833,18 @@ Class QVariant base size=16 base align=4 QVariant (0x210a6c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x21b8640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x21b8580) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x21b8840) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x21b8780) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x21b8ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21b8c00) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x21b8cc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x21b8d40) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x21b8dc0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1230,15 +922,7 @@ Class QUrl base size=4 base align=4 QUrl (0x22be4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x22be6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22be740) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1265,10 +949,6 @@ QEventLoop (0x22be7c0) 0 QObject (0x22be800) 0 primary-for QEventLoop (0x22be7c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x22bea00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1313,20 +993,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x22bec40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22bee00) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x22beec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22be040) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1496,10 +1168,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x238d580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x238d680) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1591,20 +1259,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x238ddc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2437040) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x24370c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2437180) 0 empty Class QMetaProperty size=20 align=4 @@ -1616,10 +1276,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x2437240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2437300) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1907,10 +1563,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x24e2c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24e2dc0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1932,80 +1584,48 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x24e24c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2589040) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x2589840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2589a40) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x2589ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2589c80) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x2589d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2589e80) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x2589f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2589fc0) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x26ac180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26ac600) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x26ac800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26ac880) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x26aca00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26acac0) 0 empty Class QLinkedListData size=20 align=4 @@ -2017,50 +1637,30 @@ Class QLocale base size=4 base align=4 QLocale (0x26ac2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26ac3c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x280d000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x280d400) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x280d6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x280dac0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x280de40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x280d040) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x280d880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x280df00) 0 empty Class QSharedData size=4 align=4 @@ -2087,10 +1687,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x2917d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2917e80) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2394,15 +1990,7 @@ Class QInputMethodEvent::Attribute base size=28 base align=4 QInputMethodEvent::Attribute (0x2b42900) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2b42ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2b42a00) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2676,15 +2264,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2ba2d80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2be10c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2be1140) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -2968,25 +2548,9 @@ Class QPaintDevice QPaintDevice (0x2c4d400) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2c4d740) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2c4d7c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2c4d840) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2c4d6c0) 0 Class QColor size=16 align=4 @@ -2998,45 +2562,17 @@ Class QBrush base size=4 base align=4 QBrush (0x2c4db00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2c4dbc0) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x2c4dc40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2c4df40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2c4de40) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2c4d540) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2c4d900) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2c4ddc0) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2c4d100) 0 Class QGradient size=56 align=4 @@ -3681,10 +3217,6 @@ QFileDialog (0x2f241c0) 0 QPaintDevice (0x2f24280) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2f24540) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4379,10 +3911,6 @@ QImage (0x3010b40) 0 QPaintDevice (0x3010b80) 0 primary-for QImage (0x3010b40) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3010e80) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4427,10 +3955,6 @@ Class QIcon base size=4 base align=4 QIcon (0x30fa4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30fa580) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4760,15 +4284,7 @@ QActionGroup (0x3167c00) 0 QObject (0x3167c40) 0 primary-for QActionGroup (0x3167c00) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3167ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3167e00) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -5073,10 +4589,6 @@ QAbstractSpinBox (0x3239a00) 0 QPaintDevice (0x3239a80) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3239d00) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5284,15 +4796,7 @@ QStyle (0x3239e80) 0 QObject (0x32f0000) 0 primary-for QStyle (0x3239e80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32f0240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32f02c0) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -5569,10 +5073,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x33d4140) 0 QStyleOption (0x33d4180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33d4540) 0 Class QStyleOptionButton size=64 align=4 @@ -5580,10 +5080,6 @@ Class QStyleOptionButton QStyleOptionButton (0x33d4380) 0 QStyleOption (0x33d43c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33d4880) 0 Class QStyleOptionTab size=72 align=4 @@ -5603,10 +5099,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x33d4c00) 0 QStyleOption (0x33d4c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33d4fc0) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5664,15 +5156,7 @@ QStyleOptionSpinBox (0x346fd80) 0 QStyleOptionComplex (0x346fdc0) 0 QStyleOption (0x346fe00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34b9040) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x346fc80) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5681,10 +5165,6 @@ QStyleOptionQ3ListView (0x346ffc0) 0 QStyleOptionComplex (0x346f140) 0 QStyleOption (0x346f340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34b9440) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5837,10 +5317,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x34b9140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3594140) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5871,20 +5347,8 @@ QItemSelectionModel (0x3594200) 0 QObject (0x3594240) 0 primary-for QItemSelectionModel (0x3594200) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3594400) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3594580) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x35944c0) 0 Class QItemSelection size=4 align=4 @@ -6014,10 +5478,6 @@ QAbstractItemView (0x3594740) 0 QPaintDevice (0x3594840) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3594ac0) 0 Vtable for QFileIconProvider QFileIconProvider::_ZTV17QFileIconProvider: 7u entries @@ -6269,15 +5729,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3674240) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x36746c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x36745c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -6418,15 +5870,7 @@ QListView (0x3674900) 0 QPaintDevice (0x3674a40) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3674e80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3674d80) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7150,25 +6594,9 @@ QTreeView (0x380a080) 0 QPaintDevice (0x380a1c0) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x380a5c0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x380a4c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x380a7c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x380a700) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8015,15 +7443,7 @@ Class QColormap base size=4 base align=4 QColormap (0x3a49280) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a49480) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3a49380) 0 Class QPolygon size=4 align=4 @@ -8031,15 +7451,7 @@ Class QPolygon QPolygon (0x3a49500) 0 QVector (0x3a49540) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a49980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3a49880) 0 Class QPolygonF size=4 align=4 @@ -8052,90 +7464,38 @@ Class QMatrix base size=48 base align=4 QMatrix (0x3a49d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3a49dc0) 0 empty Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0x3a49e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3a49f80) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0x3a49040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3b0f040) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x3b0f0c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b0f780) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b0f680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b0f980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b0f880) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b0fb80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b0fa80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b0fd80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b0fc80) 0 Class QTextItem size=1 align=1 base size=0 base align=1 QTextItem (0x3b0fe00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3b0fec0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3c67000) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -8170,10 +7530,6 @@ Class QPaintEngine QPaintEngine (0x3b0ff40) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3c672c0) 0 Class QPaintEngineState size=4 align=4 @@ -8190,25 +7546,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x3c67300) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3c67840) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3c67740) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x3c67540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3c67900) 0 empty Class QPainterPathStroker size=4 align=4 @@ -8306,10 +7650,6 @@ QCommonStyle (0x3d3f0c0) 0 QObject (0x3d3f140) 0 primary-for QStyle (0x3d3f100) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x3d3f440) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -8631,25 +7971,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x3dba100) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3dba480) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x3dba340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3dba840) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3dba740) 0 Class QTextCharFormat size=8 align=4 @@ -8704,15 +8032,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x3dbadc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3dba140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3dbaf40) 0 Class QTextLine size=8 align=4 @@ -8762,10 +8082,6 @@ QTextDocument (0x3ee11c0) 0 QObject (0x3ee1200) 0 primary-for QTextDocument (0x3ee11c0) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3ee1500) 0 Class QTextCursor size=4 align=4 @@ -8777,15 +8093,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x3ee1640) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3ee1880) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3ee1780) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -8952,10 +8260,6 @@ QTextFrame (0x3f89040) 0 QObject (0x3f890c0) 0 primary-for QTextObject (0x3f89080) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3f89600) 0 empty Class QTextBlock::iterator size=16 align=4 @@ -8967,25 +8271,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x3f896c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3f89ac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3f89b80) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x3f89c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3f89e40) 0 empty Vtable for QTextList QTextList::_ZTV9QTextList: 17u entries @@ -9587,10 +8879,6 @@ QDateEdit (0x40b7680) 0 QPaintDevice (0x40b7780) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b7980) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -9751,10 +9039,6 @@ QDockWidget (0x40b7c40) 0 QPaintDevice (0x40b7cc0) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b7f80) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -11480,10 +10764,6 @@ QTextEdit (0x433fec0) 0 QPaintDevice (0x433ffc0) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x440d080) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -11911,10 +11191,6 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0x440dec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x440d540) 0 Class QGLFormat size=4 align=4 @@ -12028,153 +11304,33 @@ QGLWidget (0x45e5180) 0 QPaintDevice (0x45e5200) 8 vptr=((& QGLWidget::_ZTV9QGLWidget) + 272u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4678500) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x469d380) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x47b9040) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x47b9280) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x47b9540) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x47b9c40) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x47ea9c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x47eab80) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x47ead40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x47eaf00) 0 -Class QVectorTypedData - size=40 align=4 - base size=40 base align=4 -QVectorTypedData (0x480cb80) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x480ce40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x482d140) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x482d440) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4852080) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x48c1680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x48c1840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x48ec180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x48ec3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x48ec840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x48ecd40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x490b180) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x490b3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x490b740) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x490b800) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x490bbc0) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x490bf00) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x4942580) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x4942c80) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x49895c0) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.1.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.4.1.0.linux-gcc-ia32.txt index 0a07c75e7..c455fe707 100644 --- a/tests/auto/bic/data/QtOpenGL.4.1.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.1.0.linux-gcc-ia32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x40b74000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b740c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b74100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b74140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b74180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b741c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b74200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b74240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b74280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b742c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b74300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b74340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b74380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b743c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b74400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40b74440) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40b74480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b74640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b746c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b74740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b747c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b74840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b748c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b74940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b749c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b74a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b74ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b74b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40b74bc0) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40b74d00) 0 QGenericArgument (0x40b74d40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40b74f40) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x41491040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41491100) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x41491800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41491880) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x41491ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41491c00) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x41491dc0) 0 QString (0x41491e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41491e80) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x41746340) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41746780) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x417466c0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x417469c0) 0 QObject (0x41746a00) 0 primary-for QIODevice (0x417469c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41746b40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x41746d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41746d40) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x418a92c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x418a98c0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x418a97c0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x418a9b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x418a9a80) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x418a9c00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x418a9c80) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x418a9d00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x418a9cc0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x418a9d40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x418a9d80) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x418a9e80) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x418a9f00) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x418a9ec0) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x418a9f80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x418a9fc0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x418a9140) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41a48000) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x41a48340) 0 QTextStream (0x41a48380) 0 primary-for QTextOStream (0x41a48340) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x41a48540) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x41a48580) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x41a48500) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41a485c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41a48600) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41a48640) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x41a48680) 0 Class timespec size=8 align=4 @@ -701,10 +485,6 @@ Class timeval base size=8 base align=4 timeval (0x41a48700) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x41a48740) 0 Class __sched_param size=4 align=4 @@ -721,45 +501,17 @@ Class __pthread_attr_s base size=36 base align=4 __pthread_attr_s (0x41a48800) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0x41a48840) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x41a48880) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x41a488c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x41a48900) 0 Class _pthread_rwlock_t size=32 align=4 base size=32 base align=4 _pthread_rwlock_t (0x41a48940) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41a48980) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x41a489c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x41a48a00) 0 Class random_data size=28 align=4 @@ -830,10 +582,6 @@ QFile (0x41a48f40) 0 QObject (0x41a48fc0) 0 primary-for QIODevice (0x41a48f80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41a48ec0) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -886,50 +634,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x41b7b180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41b7b200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41b7b240) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41b7b380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41b7b2c0) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x41b7b3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41b7b440) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x41b7b480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41b7b5c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41b7b500) 0 Class QStringList size=4 align=4 @@ -937,30 +657,14 @@ Class QStringList QStringList (0x41b7b600) 0 QList (0x41b7b640) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x41b7b880) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x41b7b900) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x41b7bb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41b7bbc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41b7bc40) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1017,10 +721,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x41b7bc80) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41b7be40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1175,110 +875,30 @@ Class QUrl base size=4 base align=4 QUrl (0x41c97200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41c972c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41c97300) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x41c97340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c973c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c97400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c97440) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c97480) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c974c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c97500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c97540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c97580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c975c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c97600) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c97640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c97680) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c976c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c97700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c97740) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c97780) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c977c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41c97800) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1305,35 +925,15 @@ Class QVariant base size=12 base align=4 QVariant (0x41c97840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41c97e00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41c97d40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x41c97f80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x41c97ec0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x41c97fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d980c0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1365,80 +965,48 @@ Class QPoint base size=8 base align=4 QPoint (0x41d98300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d98740) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x41d98800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d98c40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x41d98d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d98d80) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x41d98e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d98f00) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x41d98180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d98640) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x41d989c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41e9d180) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x41e9d380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41e9d580) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x41e9d680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41e9d800) 0 empty Class QLinkedListData size=20 align=4 @@ -1455,10 +1023,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x41e9de40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41e9dec0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1475,40 +1039,24 @@ Class QLocale base size=4 base align=4 QLocale (0x41e9d440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41e9d4c0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x42078080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42078200) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x42078240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x420783c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x42078400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42078540) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1668,10 +1216,6 @@ QEventLoop (0x42078cc0) 0 QObject (0x42078d00) 0 primary-for QEventLoop (0x42078cc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42078e40) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1763,20 +1307,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x42078d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4218f040) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x4218f080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4218f140) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1996,10 +1532,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x4218f740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4218f800) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2094,20 +1626,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x4218fb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4218fbc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x4218fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4218fc80) 0 empty Class QMetaProperty size=20 align=4 @@ -2119,10 +1643,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x4218fd00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4218fd80) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2245,25 +1765,9 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x4228c200) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x4228c340) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x4228c380) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x4228c3c0) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x4228c300) 0 Class QColor size=16 align=4 @@ -2280,55 +1784,23 @@ Class QPen base size=4 base align=4 QPen (0x4228c800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4228c940) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0x4228c980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4228c9c0) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x4228ca00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4228cbc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4228cb00) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0x4228cc40) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0x4228cc80) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0x4228ccc0) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0x4228cc00) 0 Class QGradient size=56 align=4 @@ -2358,25 +1830,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x4228ce80) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4228c780) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x4228c480) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42353080) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4228cf40) 0 Class QTextCharFormat size=8 align=4 @@ -2516,10 +1976,6 @@ QTextFrame (0x42353740) 0 QObject (0x423537c0) 0 primary-for QTextObject (0x42353780) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42353a40) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -2544,25 +2000,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x42353b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42353d40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42353d80) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x42353dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42353ec0) 0 empty Class QFontMetrics size=4 align=4 @@ -2622,20 +2066,12 @@ QTextDocument (0x42353840) 0 QObject (0x42458000) 0 primary-for QTextDocument (0x42353840) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42458140) 0 Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0x42458180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42458200) 0 Class QTextTableCell size=8 align=4 @@ -2686,10 +2122,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x42458880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x424589c0) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2987,15 +2419,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0x42526a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42526bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42526b00) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3294,15 +2718,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x425889c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42588c00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42588b40) 0 Class QTextLine size=8 align=4 @@ -3351,10 +2767,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x42588280) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x42588580) 0 Class QTextCursor size=4 align=4 @@ -3377,15 +2789,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x4263b240) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4263b400) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4263b340) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4238,10 +3642,6 @@ QFileDialog (0x427a9640) 0 QPaintDevice (0x427a9740) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x427a98c0) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4327,10 +3727,6 @@ QAbstractPrintDialog (0x427a9900) 0 QPaintDevice (0x427a9a00) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x427a9b40) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -4766,10 +4162,6 @@ QImage (0x4287f240) 0 QPaintDevice (0x4287f280) 0 primary-for QImage (0x4287f240) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4287f380) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4876,10 +4268,6 @@ QImageIOPlugin (0x4287f740) 0 QFactoryInterface (0x4287f800) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x4287f7c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4287f900) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -4999,10 +4387,6 @@ Class QIcon base size=4 base align=4 QIcon (0x4287ff80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4287f100) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -5154,15 +4538,7 @@ Class QPrintEngine QPrintEngine (0x4299f540) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4299f740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4299f680) 0 Class QPolygon size=4 align=4 @@ -5170,15 +4546,7 @@ Class QPolygon QPolygon (0x4299f780) 0 QVector (0x4299f7c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4299fa40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4299f980) 0 Class QPolygonF size=4 align=4 @@ -5191,60 +4559,20 @@ Class QMatrix base size=48 base align=4 QMatrix (0x4299fc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4299fc80) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x4299fcc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4299fdc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4299ff40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4299fe80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4299f580) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4299f100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42acc100) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42acc040) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42acc280) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42acc1c0) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5292,15 +4620,7 @@ QStyle (0x42acc2c0) 0 QObject (0x42acc300) 0 primary-for QStyle (0x42acc2c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42acc440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42acc4c0) 0 Class QStylePainter size=12 align=4 @@ -5318,25 +4638,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x42acc680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42acca80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42acc9c0) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x42acc800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42accac0) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5348,15 +4656,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x42accb80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42accbc0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42acccc0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5391,30 +4691,18 @@ Class QPaintEngine QPaintEngine (0x42accc00) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42acce40) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x42accd80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42accec0) 0 Class QItemSelectionRange size=8 align=4 base size=8 base align=4 QItemSelectionRange (0x42accf00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42acc380) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5445,20 +4733,8 @@ QItemSelectionModel (0x42acc780) 0 QObject (0x42accc40) 0 primary-for QItemSelectionModel (0x42acc780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42c44000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42c44140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42c44080) 0 Class QItemSelection size=4 align=4 @@ -5466,10 +4742,6 @@ Class QItemSelection QItemSelection (0x42c44180) 0 QList (0x42c441c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42c44300) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -5757,10 +5029,6 @@ QAbstractSpinBox (0x42c449c0) 0 QPaintDevice (0x42c44a80) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42c44b80) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6179,10 +5447,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x42d66280) 0 QStyleOption (0x42d662c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42d66500) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6209,10 +5473,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x42d66980) 0 QStyleOption (0x42d669c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42d66c00) 0 Class QStyleOptionButton size=64 align=4 @@ -6220,10 +5480,6 @@ Class QStyleOptionButton QStyleOptionButton (0x42d66b00) 0 QStyleOption (0x42d66b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42d66e40) 0 Class QStyleOptionTab size=72 align=4 @@ -6238,10 +5494,6 @@ QStyleOptionTabV2 (0x42d66f40) 0 QStyleOptionTab (0x42d66f80) 0 QStyleOption (0x42d66fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42d66dc0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6268,10 +5520,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x42dfc280) 0 QStyleOption (0x42dfc2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42dfc4c0) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6329,15 +5577,7 @@ QStyleOptionSpinBox (0x42dfcf80) 0 QStyleOptionComplex (0x42dfcfc0) 0 QStyleOption (0x42dfc100) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x42dfce00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x42dfca00) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6346,10 +5586,6 @@ QStyleOptionQ3ListView (0x42dfc500) 0 QStyleOptionComplex (0x42dfc640) 0 QStyleOption (0x42dfc780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42e7e200) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6544,10 +5780,6 @@ QAbstractItemView (0x42e7e9c0) 0 QPaintDevice (0x42e7eb00) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42e7ec40) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6730,15 +5962,7 @@ QListView (0x42e7ee00) 0 QPaintDevice (0x42e7ef80) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x42e7e940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x42e7e400) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7780,15 +7004,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x4302e480) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x4302e780) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x4302e6c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7805,25 +7021,9 @@ Class QItemEditorFactory QItemEditorFactory (0x4302e600) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x4302ea00) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x4302e940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4302eb80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4302eac0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8050,15 +7250,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x4302ec00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43121000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43121080) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8906,15 +8098,7 @@ QActionGroup (0x431beb40) 0 QObject (0x431beb80) 0 primary-for QActionGroup (0x431beb40) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x431bed80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x431becc0) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9055,10 +8239,6 @@ QCommonStyle (0x431be300) 0 QObject (0x431be680) 0 primary-for QStyle (0x431be4c0) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x431befc0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10586,10 +9766,6 @@ QDateEdit (0x4339b1c0) 0 QPaintDevice (0x4339ba80) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4339bfc0) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10749,10 +9925,6 @@ QDockWidget (0x4344b1c0) 0 QPaintDevice (0x4344b280) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4344b3c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12333,10 +11505,6 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0x4352af00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4365c0c0) 0 Class QGLFormat size=4 align=4 @@ -12469,158 +11637,34 @@ QGLPixelBuffer (0x4365c480) 0 QPaintDevice (0x4365c4c0) 0 primary-for QGLPixelBuffer (0x4365c480) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x437f1a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x437f1e00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x438314c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x438803c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x43880a00) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x43880bc0) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x438ba340) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x438ba680) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x438bac40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x438bad80) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x438baec0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x43900000) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0x439003c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43982540) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x43982680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43982c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43a0f280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43a0f500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43a0f780) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x43a423c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43a424c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43a42780) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43a42ac0) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x43a42c00) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x43a42d80) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x43a42f40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43a42dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43abe100) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43abe1c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43abe4c0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x43abe900) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.1.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtOpenGL.4.1.0.linux-gcc-ppc32.txt index 74bf8e8fc..cc8e74cbb 100644 --- a/tests/auto/bic/data/QtOpenGL.4.1.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.1.0.linux-gcc-ppc32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x3078b380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078b578) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078b620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078b6c8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078b770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078b818) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078b8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078b968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078ba10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078bab8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078bb60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078bc08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078bcb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078bd58) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078be00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3078bea8) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x3078bf18) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e3428) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e3498) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e3508) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e3578) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e35e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e3658) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e36c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e3738) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e37a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e3818) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e3888) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e38f8) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187bc0) 0 QGenericArgument (0x313e3a10) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x313e3bd0) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x313e3cb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313e3d58) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x31519a48) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31519d90) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x31666348) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31666690) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x30187e00) 0 QString (0x31756118) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317561f8) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x31756930) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31756e70) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31756dc8) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x30187ec0) 0 QObject (0x3184f230) 0 primary-for QIODevice (0x30187ec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3184f428) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x3184fb60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3184fbd0) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x318e5310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x318e59d8) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x318e5888) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x318e5cb0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x318e5c08) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x318e5dc8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x318e5e70) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x318e5f50) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x318e5ee0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x318e5fc0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x318e55e8) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x31a480a8) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x31a48188) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x31a48118) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x31a481f8) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x31a48268) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x31a482a0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31a484d0) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x319d50c0) 0 QTextStream (0x31a48a48) 0 primary-for QTextOStream (0x319d50c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x31a48d20) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x31a48d90) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x31a48cb0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31a48e00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31a48e70) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x31a48ee0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x31a48f50) 0 Class timespec size=8 align=4 @@ -701,70 +485,18 @@ Class timeval base size=8 base align=4 timeval (0x31a48fc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x31a48888) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x31ad4000) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x31ad40e0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x31ad4070) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x31ad4150) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x31ad4230) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x31ad41c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x31ad42a0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x31ad4380) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x31ad4310) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31ad43f0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x31ad4460) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x31ad44d0) 0 Class random_data size=28 align=4 @@ -835,10 +567,6 @@ QFile (0x319d5100) 0 QObject (0x31ad4af0) 0 primary-for QIODevice (0x319d5140) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31ad4c78) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -891,50 +619,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x31ad4dc8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31ad4e70) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ad4ee0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31ad4d58) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31ad4fc0) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x31c07070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31c07230) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x31c072a0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31c07460) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31c073b8) 0 Class QStringList size=4 align=4 @@ -942,30 +642,14 @@ Class QStringList QStringList (0x319d5240) 0 QList (0x31c07508) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x31c07930) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x31c079a0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x31c07cb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31c07dc8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31c07e38) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1022,10 +706,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x31c07e70) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31cc40a8) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1180,110 +860,30 @@ Class QUrl base size=4 base align=4 QUrl (0x31cc4578) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31cc4700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31cc4770) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x31cc47e0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cc48f8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cc49a0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cc4a48) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cc4af0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cc4b98) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cc4c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cc4ce8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cc4d90) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cc4e38) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cc4ee0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cc4f88) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cc41c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31cc4508) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31d54070) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31d54118) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31d541c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31d54268) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31d54310) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1310,35 +910,15 @@ Class QVariant base size=16 base align=8 QVariant (0x31d54380) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31d54930) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31d54888) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x31d54af0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x31d54a48) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x31d54cb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d54dc8) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1370,80 +950,48 @@ Class QPoint base size=8 base align=4 QPoint (0x31e31188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e31578) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x31e31770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e31b60) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x31e31d90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e31e00) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x31e31f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e311c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x31e314d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ecb000) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x31ecb2d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ecb658) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x31ecb9d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ecbbd0) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x31ecbe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31ecbf88) 0 empty Class QLinkedListData size=20 align=4 @@ -1460,10 +1008,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x31fcb738) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31fcb850) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1480,40 +1024,24 @@ Class QLocale base size=4 base align=4 QLocale (0x31fcbb60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31fcbbd0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x31fcbdc8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31fcbf88) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x31fcb150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32116118) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x32116188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321162d8) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1673,10 +1201,6 @@ QEventLoop (0x319d5780) 0 QObject (0x32116e38) 0 primary-for QEventLoop (0x319d5780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32116fc0) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1768,20 +1292,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x321bd658) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321bd7e0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x321bd850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321bd968) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2001,10 +1517,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x321bd188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x321bd8c0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2099,20 +1611,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x3226e310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3226e3b8) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x3226e428) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3226e4d0) 0 empty Class QMetaProperty size=20 align=4 @@ -2124,10 +1628,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x3226e578) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3226e620) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2250,25 +1750,9 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0x3226ef18) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3231d000) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3231d070) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3231d0e0) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x3226e9a0) 0 Class QColor size=16 align=4 @@ -2285,55 +1769,23 @@ Class QPen base size=4 base align=4 QPen (0x3231d540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3231d6c8) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0x3231d738) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3231d7e0) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x3231d850) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3231da80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3231d9a0) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x3231db98) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x3231dc08) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x3231dc78) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x3231db28) 0 Class QGradient size=64 align=8 @@ -2363,25 +1815,13 @@ Class QTextLength base size=16 base align=8 QTextLength (0x3231dd58) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3231d188) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x3231df50) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x323b5118) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x323b5038) 0 Class QTextCharFormat size=8 align=4 @@ -2521,10 +1961,6 @@ QTextFrame (0x32445000) 0 QObject (0x323b5738) 0 primary-for QTextObject (0x32445040) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x323b5bd0) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -2549,25 +1985,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x323b5d90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32482070) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32482118) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x32482188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32482348) 0 empty Class QFontMetrics size=4 align=4 @@ -2627,20 +2051,12 @@ QTextDocument (0x32445080) 0 QObject (0x32482620) 0 primary-for QTextDocument (0x32445080) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x324827e0) 0 Class QTextOption size=32 align=8 base size=28 base align=8 QTextOption (0x32482818) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x324828f8) 0 Class QTextTableCell size=8 align=4 @@ -2691,10 +2107,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x32482f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32482b28) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2992,15 +2404,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x325b00a8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x325b0230) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x325b0188) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3299,15 +2703,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x32613498) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32613738) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32613658) 0 Class QTextLine size=8 align=4 @@ -3356,10 +2752,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x32613b60) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x32613c78) 0 Class QTextCursor size=4 align=4 @@ -3382,15 +2774,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x326c8038) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x326c8230) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x326c8150) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -4243,10 +3627,6 @@ QFileDialog (0x328143c0) 0 QPaintDevice (0x327b4f18) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x327b4a80) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4332,10 +3712,6 @@ QAbstractPrintDialog (0x328144c0) 0 QPaintDevice (0x328980e0) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x328982d8) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -4771,10 +4147,6 @@ QImage (0x32814980) 0 QPaintDevice (0x32898d20) 0 primary-for QImage (0x32814980) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32898fc0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4881,10 +4253,6 @@ QImageIOPlugin (0x32814a40) 0 QFactoryInterface (0x32990348) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x32814a80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32990540) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -5004,10 +4372,6 @@ Class QIcon base size=4 base align=4 QIcon (0x32990d20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32990d90) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -5159,15 +4523,7 @@ Class QPrintEngine QPrintEngine (0x32a29690) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32a29968) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32a29888) 0 Class QPolygon size=4 align=4 @@ -5175,15 +4531,7 @@ Class QPolygon QPolygon (0x32814e00) 0 QVector (0x32a299d8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32a29d90) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32a29cb0) 0 Class QPolygonF size=4 align=4 @@ -5196,60 +4544,20 @@ Class QMatrix base size=48 base align=8 QMatrix (0x32a29770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32abb038) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x32abb0e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32abb5b0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32abb738) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32abb658) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32abb8f8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32abb818) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32abbab8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32abb9d8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32abbc78) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32abbb98) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5297,15 +4605,7 @@ QStyle (0x32814e80) 0 QObject (0x32abbce8) 0 primary-for QStyle (0x32814e80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32abbea8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32abbf18) 0 Class QStylePainter size=12 align=4 @@ -5323,25 +4623,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x32c11118) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32c115b0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32c114d0) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x32c11310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32c11658) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5353,15 +4641,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x32c11850) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32c118f8) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32c11a80) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5396,30 +4676,18 @@ Class QPaintEngine QPaintEngine (0x32c11968) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32c11c78) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x32c11bd0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32c11ce8) 0 Class QItemSelectionRange size=8 align=4 base size=8 base align=4 QItemSelectionRange (0x32c11d20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32c11fc0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5450,20 +4718,8 @@ QItemSelectionModel (0x32814f40) 0 QObject (0x32c11a10) 0 primary-for QItemSelectionModel (0x32814f40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32cdf0e0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32cdf230) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32cdf188) 0 Class QItemSelection size=4 align=4 @@ -5471,10 +4727,6 @@ Class QItemSelection QItemSelection (0x32814f80) 0 QList (0x32cdf2d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32cdf460) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -5762,10 +5014,6 @@ QAbstractSpinBox (0x32d25240) 0 QPaintDevice (0x32cdfcb0) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32cdfee0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6184,10 +5432,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x32d25600) 0 QStyleOption (0x32da97e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32da9a80) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6214,10 +5458,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x32d25740) 0 QStyleOption (0x32da9fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32e5f0a8) 0 Class QStyleOptionButton size=64 align=4 @@ -6225,10 +5465,6 @@ Class QStyleOptionButton QStyleOptionButton (0x32d257c0) 0 QStyleOption (0x32da9a10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32e5f310) 0 Class QStyleOptionTab size=72 align=4 @@ -6243,10 +5479,6 @@ QStyleOptionTabV2 (0x32d25880) 0 QStyleOptionTab (0x32d258c0) 0 QStyleOption (0x32e5f428) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32e5f7a8) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6273,10 +5505,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x32d25a00) 0 QStyleOption (0x32e5fb28) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32e5fe00) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6334,15 +5562,7 @@ QStyleOptionSpinBox (0x32d25c80) 0 QStyleOptionComplex (0x32d25cc0) 0 QStyleOption (0x32ee7818) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32ee7b98) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32ee7af0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6351,10 +5571,6 @@ QStyleOptionQ3ListView (0x32d25d00) 0 QStyleOptionComplex (0x32d25d40) 0 QStyleOption (0x32ee79a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ee7e70) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6549,10 +5765,6 @@ QAbstractItemView (0x32f71040) 0 QPaintDevice (0x32f5d460) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32f5d658) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6735,15 +5947,7 @@ QListView (0x32f71240) 0 QPaintDevice (0x32f5d7e0) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32f5db60) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32f5da80) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7785,15 +6989,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x33031498) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3313f1f8) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x3313f0e0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7810,25 +7006,9 @@ Class QItemEditorFactory QItemEditorFactory (0x3313f000) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x3313f658) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x3313f578) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3313f7e0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3313f738) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8055,15 +7235,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x3313f968) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x331e8000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x331e8070) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8911,15 +8083,7 @@ QActionGroup (0x331d3980) 0 QObject (0x332ea540) 0 primary-for QActionGroup (0x331d3980) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x332ea770) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x332ea6c8) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9060,10 +8224,6 @@ QCommonStyle (0x331d3a80) 0 QObject (0x332eabd0) 0 primary-for QStyle (0x331d3ac0) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x332eadc8) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10591,10 +9751,6 @@ QDateEdit (0x333cca40) 0 QPaintDevice (0x3348de38) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3348d0a8) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10754,10 +9910,6 @@ QDockWidget (0x333ccc00) 0 QPaintDevice (0x3353d000) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3353d268) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12338,10 +11490,6 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0x3371b4d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3371b658) 0 Class QGLFormat size=4 align=4 @@ -12474,158 +11622,34 @@ QGLPixelBuffer (0x335e2a40) 0 QPaintDevice (0x3371baf0) 0 primary-for QGLPixelBuffer (0x335e2a40) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3394ec78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3396a3b8) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3398c1c0) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x339b7dc8) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x339d6a80) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x339d6d20) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x339f4dc8) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x33a103f0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x33a10f50) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x33a3d0e0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x33a3d268) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x33a3d3f0) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x33a3db60) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33acd2a0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x33acd498) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33af1150) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33b29ee0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33b512d8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33b516c8) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x33b70c08) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33b70d90) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33b93230) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33b937a8) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x33b939a0) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x33b93f18) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x33bd0460) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33bd0a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33bd0d20) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33bd0dc8) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33c00230) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x33c00888) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.1.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.4.1.0.macx-gcc-ia32.txt index e8197c433..fe400d496 100644 --- a/tests/auto/bic/data/QtOpenGL.4.1.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.1.0.macx-gcc-ia32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x1678240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1678480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1678540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1678600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16786c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1678780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1678840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1678900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16789c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1678a80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1678b40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1678c00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1678cc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1678d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1678e40) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x16bb140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16bb240) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0x16bb940) 0 QBasicAtomic (0x16bb980) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x16bbc00) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0x174a8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x174ac80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x184e140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x184e1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x184e240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x184e2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x184e340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x184e3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x184e440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x184e4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x184e540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x184e5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x184e640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x184e6c0) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x184ee00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19b4240) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x19b4e40) 0 QString (0x19b4e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x19b4f80) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x1ab2840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ab2e80) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x1ab2d00) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1bbc040) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1ab2e00) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1bbc280) 0 QGenericArgument (0x1bbc2c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1bbc580) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1bbc500) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1bbc800) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1bbc740) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x1bbce40) 0 QObject (0x1bbce80) 0 primary-for QIODevice (0x1bbce40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1c88000) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1c886c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c888c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1c88940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1c88b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1c88a80) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x1c88c00) 0 QList (0x1c88c40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1d2c0c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1d2c140) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x1d2cf80) 0 QObject (0x1d2c540) 0 primary-for QIODevice (0x1d2cfc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1dc20c0) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1dc2100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1dc21c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dc2240) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1dc2400) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1dc2340) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1dc24c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1dc2600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1dc2680) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1dc26c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1dc2980) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1dc2e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dc2f00) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x1fea1c0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1fea480) 0 Class QTextStreamManipulator size=24 align=4 @@ -1041,35 +829,15 @@ Class rlimit base size=16 base align=4 rlimit (0x1fea3c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x208b700) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x208b780) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x208b680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x208b800) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x208b880) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x208b900) 0 Class QVectorData size=16 align=4 @@ -1182,95 +950,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x2181340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181480) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181600) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x21816c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181780) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181840) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181900) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x21819c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181a80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181b40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181c00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181cc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181d80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181e40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181f00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2181fc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x21c6000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x21c60c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1297,50 +993,18 @@ Class QVariant base size=12 base align=4 QVariant (0x21c6140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x21c67c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x21c6700) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x21c69c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x21c6900) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x21c6c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21c6d80) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x21c6e40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x21c6ec0) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x21c6f40) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1418,15 +1082,7 @@ Class QUrl base size=4 base align=4 QUrl (0x2298600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x22987c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2298840) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1453,10 +1109,6 @@ QEventLoop (0x22988c0) 0 QObject (0x2298900) 0 primary-for QEventLoop (0x22988c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2298b00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1501,20 +1153,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x2298d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2298f00) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x2298f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2298580) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1684,10 +1328,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2364640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2364740) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1779,20 +1419,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x23f7080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23f7140) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x23f71c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23f7280) 0 empty Class QMetaProperty size=20 align=4 @@ -1804,10 +1436,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x23f7340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23f7400) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2095,10 +1723,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2488d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2488e80) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2110,70 +1734,42 @@ Class QDate base size=4 base align=4 QDate (0x2515040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2515240) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x25152c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2515500) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x2515580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2515700) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x2515780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2515c00) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x2515ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2515840) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x25c00c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25c0140) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x25c02c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25c0380) 0 empty Class QLinkedListData size=20 align=4 @@ -2185,50 +1781,30 @@ Class QLocale base size=4 base align=4 QLocale (0x25c0940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25c09c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x25c0b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25c0f00) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x26fc0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26fc4c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x26fc940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26fcb00) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x26fcd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26fcf40) 0 empty Class QSharedData size=4 align=4 @@ -2250,10 +1826,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x283b640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x283b7c0) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2572,15 +2144,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0x2930200) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x29303c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2930300) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2869,15 +2433,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x298cd40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x298ce80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x298cf00) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3161,25 +2717,9 @@ Class QPaintDevice QPaintDevice (0x29ec880) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a2d240) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a2d2c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a2d340) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2a2d1c0) 0 Class QColor size=16 align=4 @@ -3191,45 +2731,17 @@ Class QBrush base size=4 base align=4 QBrush (0x2a2d600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a2d6c0) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x2a2d740) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2a2d9c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2a2d8c0) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0x2a2db00) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0x2a2db80) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0x2a2dc00) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0x2a2da80) 0 Class QGradient size=56 align=4 @@ -3625,10 +3137,6 @@ QAbstractPrintDialog (0x2c066c0) 0 QPaintDevice (0x2c06780) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c06a00) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -3879,10 +3387,6 @@ QFileDialog (0x2c06f40) 0 QPaintDevice (0x2c06340) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2cc1180) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4577,10 +4081,6 @@ QImage (0x2d82740) 0 QPaintDevice (0x2d82780) 0 primary-for QImage (0x2d82740) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d82a80) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4625,10 +4125,6 @@ Class QIcon base size=4 base align=4 QIcon (0x2e3f140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2e3f200) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4784,10 +4280,6 @@ QImageIOPlugin (0x2e80e80) 0 QFactoryInterface (0x2e3fc40) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x2e3fc00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e3fe80) 0 Class QImageReader size=4 align=4 @@ -4963,15 +4455,7 @@ QActionGroup (0x2ed5880) 0 QObject (0x2ed58c0) 0 primary-for QActionGroup (0x2ed5880) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2ed5b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2ed5a80) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -5276,10 +4760,6 @@ QAbstractSpinBox (0x2f5d6c0) 0 QPaintDevice (0x2f5d740) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2f5d9c0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5487,15 +4967,7 @@ QStyle (0x2f5dec0) 0 QObject (0x2f5df00) 0 primary-for QStyle (0x2f5dec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2f5d880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2f5ddc0) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -5754,10 +5226,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x303b9c0) 0 QStyleOption (0x303ba00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x303bd80) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -5784,10 +5252,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x30d8240) 0 QStyleOption (0x30d8280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30d8640) 0 Class QStyleOptionButton size=64 align=4 @@ -5795,10 +5259,6 @@ Class QStyleOptionButton QStyleOptionButton (0x30d8480) 0 QStyleOption (0x30d84c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30d8980) 0 Class QStyleOptionTab size=72 align=4 @@ -5813,10 +5273,6 @@ QStyleOptionTabV2 (0x30d8ac0) 0 QStyleOptionTab (0x30d8b00) 0 QStyleOption (0x30d8b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30d8f80) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5843,10 +5299,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x3152240) 0 QStyleOption (0x3152280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3152600) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5904,15 +5356,7 @@ QStyleOptionSpinBox (0x31af440) 0 QStyleOptionComplex (0x31af480) 0 QStyleOption (0x31af4c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31af940) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31af880) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5921,10 +5365,6 @@ QStyleOptionQ3ListView (0x31af680) 0 QStyleOptionComplex (0x31af6c0) 0 QStyleOption (0x31af700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31afd40) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6084,10 +5524,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x3217940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3217c40) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6118,20 +5554,8 @@ QItemSelectionModel (0x3217d00) 0 QObject (0x3217d40) 0 primary-for QItemSelectionModel (0x3217d00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3217f00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3217640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3217fc0) 0 Class QItemSelection size=4 align=4 @@ -6261,10 +5685,6 @@ QAbstractItemView (0x32bf100) 0 QPaintDevice (0x32bf200) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32bf480) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -6576,15 +5996,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x32bff00) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3370200) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x33700c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -6725,15 +6137,7 @@ QListView (0x3370480) 0 QPaintDevice (0x33705c0) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3370a00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3370900) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7522,35 +6926,15 @@ QTreeView (0x340b500) 0 QPaintDevice (0x34ef000) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34ef2c0) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x34ef1c0) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x34ef780) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x34ef680) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34ef940) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x34ef880) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8397,15 +7781,7 @@ Class QColormap base size=4 base align=4 QColormap (0x36ee400) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x36ee600) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x36ee500) 0 Class QPolygon size=4 align=4 @@ -8413,15 +7789,7 @@ Class QPolygon QPolygon (0x36ee680) 0 QVector (0x36ee6c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x36eeb00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x36eea00) 0 Class QPolygonF size=4 align=4 @@ -8434,95 +7802,39 @@ Class QMatrix base size=48 base align=4 QMatrix (0x36eeec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36eef40) 0 empty Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0x36ee000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3792080) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0x37920c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3792280) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x3792300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3792880) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3792a40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3792940) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3792c40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3792b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3792e40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3792d40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x37921c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3792f40) 0 Class QTextItem size=1 align=1 base size=0 base align=1 QTextItem (0x38e4000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x38e40c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x38e4280) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -8557,20 +7869,12 @@ Class QPaintEngine QPaintEngine (0x38e4140) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x38e44c0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x38e4400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x38e4540) 0 Class QPainterPath::Element size=20 align=4 @@ -8582,25 +7886,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x38e4580) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x38e4ac0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x38e49c0) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x38e47c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x38e4b80) 0 empty Class QPainterPathStroker size=4 align=4 @@ -8698,10 +7990,6 @@ QCommonStyle (0x39bc2c0) 0 QObject (0x39bc340) 0 primary-for QStyle (0x39bc300) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x39bc640) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -9023,25 +8311,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x3a2c340) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3a2c6c0) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x3a2c580) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a2ca80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3a2c980) 0 Class QTextCharFormat size=8 align=4 @@ -9096,15 +8372,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x3a2c000) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b1d100) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b1d000) 0 Class QTextLine size=8 align=4 @@ -9154,15 +8422,7 @@ QTextDocument (0x3b1d400) 0 QObject (0x3b1d440) 0 primary-for QTextDocument (0x3b1d400) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3b1d680) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3b1d7c0) 0 Class QTextCursor size=4 align=4 @@ -9174,15 +8434,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x3b1d900) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b1db40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b1da40) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -9344,10 +8596,6 @@ QTextFrame (0x3bd1300) 0 QObject (0x3bd1380) 0 primary-for QTextObject (0x3bd1340) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3bd18c0) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -9372,25 +8620,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x3bd1b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3bd1f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3bd1fc0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x3c2b000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3c2b200) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -10023,10 +9259,6 @@ QDateEdit (0x3caed00) 0 QPaintDevice (0x3caee00) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3cae040) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -10187,10 +9419,6 @@ QDockWidget (0x3d5c140) 0 QPaintDevice (0x3d5c1c0) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3d5c480) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12342,10 +11570,6 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0x4066300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40664c0) 0 Class QGLFormat size=4 align=4 @@ -12477,158 +11701,34 @@ QGLPixelBuffer (0x4066a40) 0 QPaintDevice (0x4066a80) 0 primary-for QGLPixelBuffer (0x4066a40) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41e1e40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4203cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4258d40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x435a000) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x435a240) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x435a500) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x435ac00) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x438bf40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x43b0100) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x43b02c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x43b0480) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0x43cb440) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x43cb700) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x43cba00) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x43ee080) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x43eecc0) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x44823c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4482680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x44a7540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x44a78c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x44a7d40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x44c6240) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44c6680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44c68c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x44c6c40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44c6d00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44e80c0) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x44e8540) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x44e8c40) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x452c240) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x452cc80) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.1.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtOpenGL.4.1.0.macx-gcc-ppc32.txt index b75730c3c..405f769bc 100644 --- a/tests/auto/bic/data/QtOpenGL.4.1.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.1.0.macx-gcc-ppc32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x16f8b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16f8d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16f8e40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16f8f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16f8fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1727080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1727140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1727200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17272c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1727380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1727440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1727500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17275c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1727680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1727740) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x1727a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1727b40) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0x1727f40) 0 QBasicAtomic (0x1727f80) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x17d3200) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0x17d3ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1879280) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1879740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18797c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1879840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18798c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1879940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18799c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1879a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1879ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1879b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1879bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1879c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1879cc0) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x1a75400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a75840) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x1bb5440) 0 QString (0x1bb5480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bb5580) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x1bb5e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1c81380) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x1c81200) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1c816c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1c81600) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1c81900) 0 QGenericArgument (0x1c81940) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1c81c00) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1c81b80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1c81e80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1c81dc0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x1d8e3c0) 0 QObject (0x1d8e400) 0 primary-for QIODevice (0x1d8e3c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d8e640) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1d8ed00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d8ef00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1d8ef80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1e660c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1e66000) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x1e66180) 0 QList (0x1e661c0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1e66680) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1e66700) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x1eea900) 0 QObject (0x1eea980) 0 primary-for QIODevice (0x1eea940) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1eeab40) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1eeab80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1eeac40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eeacc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1eeae80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1eeadc0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1eeaf40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1fd8000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1fd8080) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1fd80c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1fd8380) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1fd8880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fd8900) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x20f3840) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x20f3b00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1051,35 +839,15 @@ Class rlimit base size=16 base align=8 rlimit (0x2249800) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x22498c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x2249940) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x2249840) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x22499c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2249a40) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2249ac0) 0 Class QVectorData size=16 align=4 @@ -1192,95 +960,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x232b540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232b680) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232b740) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232b800) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232b8c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232b980) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232ba40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232bb00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232bbc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232bc80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232bd40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232be00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232bec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232bf80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x232b2c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x23b9040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x23b9100) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x23b91c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x23b9280) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1307,50 +1003,18 @@ Class QVariant base size=16 base align=4 QVariant (0x23b9300) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x23b9980) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x23b98c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x23b9b80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x23b9ac0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x23b9e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23b9f40) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x23b94c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x23b95c0) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x23b9bc0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1428,15 +1092,7 @@ Class QUrl base size=4 base align=4 QUrl (0x24917c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2491980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2491a00) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1463,10 +1119,6 @@ QEventLoop (0x2491a80) 0 QObject (0x2491ac0) 0 primary-for QEventLoop (0x2491a80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2491cc0) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1511,20 +1163,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x2491f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2491c00) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x2591000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2591140) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1694,10 +1338,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2591840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2591940) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1789,20 +1429,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x2645240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2645300) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x2645380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2645440) 0 empty Class QMetaProperty size=20 align=4 @@ -1814,10 +1446,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x2645500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26455c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2105,10 +1733,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x26def80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x278f040) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2120,70 +1744,42 @@ Class QDate base size=4 base align=4 QDate (0x278f240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x278f440) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x278f4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x278f700) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x278f780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x278f900) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x278f980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x278fe00) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x278f5c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x278fd40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x283b2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x283b340) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x283b4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x283b580) 0 empty Class QLinkedListData size=20 align=4 @@ -2195,50 +1791,30 @@ Class QLocale base size=4 base align=4 QLocale (0x283bb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x283bbc0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x283bd00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x283be40) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x299f2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x299f6c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x299fb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x299fd00) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x299ff80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x299f500) 0 empty Class QSharedData size=4 align=4 @@ -2260,10 +1836,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x2aaa840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaa9c0) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2582,15 +2154,7 @@ Class QInputMethodEvent::Attribute base size=28 base align=4 QInputMethodEvent::Attribute (0x2c354c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2c35680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2c355c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2879,15 +2443,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2c98080) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c98800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c98b00) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3171,25 +2727,9 @@ Class QPaintDevice QPaintDevice (0x2d4a180) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2d4a4c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2d4a540) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2d4a5c0) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2d4a440) 0 Class QColor size=16 align=4 @@ -3201,45 +2741,17 @@ Class QBrush base size=4 base align=4 QBrush (0x2d4a880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d4a940) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x2d4a9c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2d4ac40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2d4ab40) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2d4ad80) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2d4ae00) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2d4ae80) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2d4ad00) 0 Class QGradient size=56 align=4 @@ -3635,10 +3147,6 @@ QAbstractPrintDialog (0x2f4a900) 0 QPaintDevice (0x2f4a9c0) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2f4ac40) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -3889,10 +3397,6 @@ QFileDialog (0x303d040) 0 QPaintDevice (0x303d100) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x303d3c0) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4587,10 +4091,6 @@ QImage (0x313b9c0) 0 QPaintDevice (0x313ba00) 0 primary-for QImage (0x313b9c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313bd00) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4635,10 +4135,6 @@ Class QIcon base size=4 base align=4 QIcon (0x32173c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3217480) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4794,10 +4290,6 @@ QImageIOPlugin (0x326f200) 0 QFactoryInterface (0x3217ec0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x3217e80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3217bc0) 0 Class QImageReader size=4 align=4 @@ -4973,15 +4465,7 @@ QActionGroup (0x32a3b80) 0 QObject (0x32a3bc0) 0 primary-for QActionGroup (0x32a3b80) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32a3e40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32a3d80) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -5286,10 +4770,6 @@ QAbstractSpinBox (0x3369940) 0 QPaintDevice (0x33699c0) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3369c40) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -5497,15 +4977,7 @@ QStyle (0x33698c0) 0 QObject (0x3369b00) 0 primary-for QStyle (0x33698c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34331c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3433240) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -5764,10 +5236,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x3433c40) 0 QStyleOption (0x3433c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3433100) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -5794,10 +5262,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x35414c0) 0 QStyleOption (0x3541500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x35418c0) 0 Class QStyleOptionButton size=64 align=4 @@ -5805,10 +5269,6 @@ Class QStyleOptionButton QStyleOptionButton (0x3541700) 0 QStyleOption (0x3541740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3541c00) 0 Class QStyleOptionTab size=72 align=4 @@ -5823,10 +5283,6 @@ QStyleOptionTabV2 (0x3541d40) 0 QStyleOptionTab (0x3541d80) 0 QStyleOption (0x3541dc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x35bb000) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5853,10 +5309,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x35bb4c0) 0 QStyleOption (0x35bb500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x35bb880) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5914,15 +5366,7 @@ QStyleOptionSpinBox (0x363b6c0) 0 QStyleOptionComplex (0x363b700) 0 QStyleOption (0x363b740) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x363bbc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x363bb00) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5931,10 +5375,6 @@ QStyleOptionQ3ListView (0x363b900) 0 QStyleOptionComplex (0x363b940) 0 QStyleOption (0x363b980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x363bfc0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6094,10 +5534,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x36acbc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36acec0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6128,20 +5564,8 @@ QItemSelectionModel (0x36acf80) 0 QObject (0x36acfc0) 0 primary-for QItemSelectionModel (0x36acf80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x374a000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x374a180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x374a0c0) 0 Class QItemSelection size=4 align=4 @@ -6271,10 +5695,6 @@ QAbstractItemView (0x374a340) 0 QPaintDevice (0x374a440) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x374a6c0) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -6586,15 +6006,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x374ae40) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3845480) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x3845340) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -6735,15 +6147,7 @@ QListView (0x3845700) 0 QPaintDevice (0x3845840) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3845c80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3845b80) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7532,35 +6936,15 @@ QTreeView (0x39ed140) 0 QPaintDevice (0x39ed280) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x39ed540) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x39ed440) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x39eda00) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x39ed900) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x39edbc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x39edb00) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8407,15 +7791,7 @@ Class QColormap base size=4 base align=4 QColormap (0x3c38680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3c38880) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3c38780) 0 Class QPolygon size=4 align=4 @@ -8423,15 +7799,7 @@ Class QPolygon QPolygon (0x3c38900) 0 QVector (0x3c38940) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3c38d80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3c38c80) 0 Class QPolygonF size=4 align=4 @@ -8444,95 +7812,39 @@ Class QMatrix base size=48 base align=4 QMatrix (0x3cd9080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3cd9100) 0 empty Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0x3cd91c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3cd92c0) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0x3cd9340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3cd9500) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x3cd9580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3cd9b00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3cd9cc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3cd9bc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3cd9ec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3cd9dc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3e03000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3cd9fc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3e03200) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3e03100) 0 Class QTextItem size=1 align=1 base size=0 base align=1 QTextItem (0x3e03280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3e03340) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3e03500) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -8567,20 +7879,12 @@ Class QPaintEngine QPaintEngine (0x3e033c0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3e037c0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x3e03700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3e03840) 0 Class QPainterPath::Element size=24 align=8 @@ -8592,25 +7896,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x3e03880) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3e03dc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3e03cc0) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x3e03ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3e03e80) 0 empty Class QPainterPathStroker size=4 align=4 @@ -8708,10 +8000,6 @@ QCommonStyle (0x3f57640) 0 QObject (0x3f576c0) 0 primary-for QStyle (0x3f57680) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x3f579c0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -9033,25 +8321,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0x4001680) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4001a00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x40018c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4001dc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4001cc0) 0 Class QTextCharFormat size=8 align=4 @@ -9106,15 +8382,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x40f8140) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x40f8440) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x40f8340) 0 Class QTextLine size=8 align=4 @@ -9164,15 +8432,7 @@ QTextDocument (0x40f8740) 0 QObject (0x40f8780) 0 primary-for QTextDocument (0x40f8740) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40f89c0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x40f8b00) 0 Class QTextCursor size=4 align=4 @@ -9184,15 +8444,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x40f8c40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x40f8e80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x40f8d80) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -9354,10 +8606,6 @@ QTextFrame (0x41d8640) 0 QObject (0x41d86c0) 0 primary-for QTextObject (0x41d8680) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41d8c00) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -9382,25 +8630,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x41d8e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4250180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4250240) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x4250300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4250500) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -10033,10 +9269,6 @@ QDateEdit (0x42c7380) 0 QPaintDevice (0x42c7f40) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x439a1c0) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -10197,10 +9429,6 @@ QDockWidget (0x439a480) 0 QPaintDevice (0x439a500) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x439a7c0) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12352,10 +11580,6 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0x472b640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x472b800) 0 Class QGLFormat size=4 align=4 @@ -12487,158 +11711,34 @@ QGLPixelBuffer (0x472bd80) 0 QPaintDevice (0x472bdc0) 0 primary-for QGLPixelBuffer (0x472bd80) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4945140) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4945fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x49be040) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4aa6300) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x4aa6540) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x4aa6800) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4aa6f00) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4afd240) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4afd400) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4afd5c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4afd780) 0 -Class QVectorTypedData - size=40 align=4 - base size=40 base align=4 -QVectorTypedData (0x4b18740) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4b18a00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4b18d00) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4b3d380) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4b3dfc0) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x4bd16c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4bd1980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4bfa5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4bfa800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4bfac80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4c16180) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4c165c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4c16800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4c16b80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4c16c40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4c3c000) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x4c3c340) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x4c3ca40) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x4c84000) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x4c84a40) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.1.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.4.1.0.win32-gcc-ia32.txt index 01a355e0a..54d9e393e 100644 --- a/tests/auto/bic/data/QtOpenGL.4.1.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.1.0.win32-gcc-ia32.txt @@ -18,80 +18,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xad5e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebc80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebe00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07b80) 0 empty Class QFlag size=4 align=4 @@ -108,10 +48,6 @@ Class QChar base size=2 base align=2 QChar (0xb4d840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb70cc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -139,70 +75,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc34f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd4bc40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd78100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd783c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd73c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd78a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd949c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8c80) 0 Class QInternal size=1 align=1 @@ -229,10 +113,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xeac500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeac940) 0 Class QCharRef size=8 align=4 @@ -245,10 +125,6 @@ Class QConstString QConstString (0x11e1880) 0 QString (0x11e18c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11e1c00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -311,10 +187,6 @@ Class QListData base size=4 base align=4 QListData (0x1279f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x137ce40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -339,15 +211,7 @@ Class QTextCodec QTextCodec (0xeac480) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13c0140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc3da40) 0 Class QTextEncoder size=32 align=4 @@ -370,25 +234,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x13fefc0) 0 QGenericArgument (0x1404000) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1417700) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1404580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1431f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1431b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -480,10 +332,6 @@ QIODevice (0x137c700) 0 QObject (0x14ba540) 0 primary-for QIODevice (0x137c700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14ba840) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -503,25 +351,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xeac380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15884c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1588840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1588d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1588c40) 0 Class QStringList size=4 align=4 @@ -529,15 +365,7 @@ Class QStringList QStringList (0xeac400) 0 QList (0x15b5000) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1588ec0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1588e80) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -666,50 +494,22 @@ QFile (0x169c840) 0 QObject (0x169c8c0) 0 primary-for QIODevice (0x169c880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16ab100) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x16d25c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16d2f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1700e40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x172a300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x172a200) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x16d2440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1758040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x172ac00) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -766,10 +566,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x169c740) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d7340) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -843,10 +639,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x182cc40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x182cd40) 0 empty Class QMapData::Node size=8 align=4 @@ -871,10 +663,6 @@ Class QTextStream QTextStream (0x1a69240) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a69600) 0 Class QTextStreamManipulator size=24 align=4 @@ -911,20 +699,8 @@ QTextOStream (0x1af7440) 0 QTextStream (0x1af7480) 0 primary-for QTextOStream (0x1af7440) -Class - size=8 align=4 - base size=8 base align=4 - (0x1b24680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b24800) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1b435c0) 0 Class QVectorData size=16 align=4 @@ -1037,95 +813,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1cdebc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1cf8d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1cf8ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d0a040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d0a1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d0a340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d0a4c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d0a640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d0a7c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d0a940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d0aac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d0ac40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d0adc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d0af40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d280c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d28240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d283c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d28540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d286c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1152,35 +856,15 @@ Class QVariant base size=16 base align=8 QVariant (0x14318c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1dc5540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d3adc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1dc5840) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1d3ae40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1d3a000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e2c280) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1258,15 +942,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1d28f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ec7440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ef6f80) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1293,10 +969,6 @@ QEventLoop (0x1f23600) 0 QObject (0x1f23640) 0 primary-for QEventLoop (0x1f23600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f23940) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1341,20 +1013,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1f5bf40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f8eb40) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1f5bec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f8ee80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1524,10 +1188,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1ffad80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x203e3c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1620,20 +1280,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x13fe8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20ad900) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x13fe940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20adf00) 0 empty Class QMetaProperty size=20 align=4 @@ -1645,10 +1297,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x13fea40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20db640) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1941,10 +1589,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2223640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2283040) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1956,70 +1600,42 @@ Class QDate base size=4 base align=4 QDate (0x1d28900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22c3900) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1d28b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22e6540) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x16d24c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x230f300) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1d28b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x230ff40) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1d28c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x235d180) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1d28980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x237e600) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1d28a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23a9b00) 0 empty Class QLinkedListData size=20 align=4 @@ -2031,50 +1647,30 @@ Class QLocale base size=4 base align=4 QLocale (0x1d28a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24f7300) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1d28c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2524480) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1d28d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25499c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1d28d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25b8440) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1d28e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2637680) 0 empty Class QSharedData size=4 align=4 @@ -2096,10 +1692,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x1db2c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x275bc00) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2416,15 +2008,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x28973c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x28978c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x28974c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2713,15 +2297,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x293be00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2959e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x29673c0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3007,25 +2583,9 @@ Class QPaintDevice QPaintDevice (0x2707dc0) 0 vptr=((&QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a77540) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a77680) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a77780) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2a774c0) 0 Class QColor size=16 align=4 @@ -3037,45 +2597,17 @@ Class QBrush base size=4 base align=4 QBrush (0x1d93d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2acf300) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x2aa2b00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2ae4000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2acf8c0) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2ae4280) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2ae4380) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2ae45c0) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2ae4200) 0 Class QGradient size=64 align=8 @@ -3487,10 +3019,6 @@ QAbstractPrintDialog (0x2e10680) 0 QPaintDevice (0x2e10780) 8 vptr=((&QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e10a40) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 70u entries @@ -3753,10 +3281,6 @@ QFileDialog (0x2e80b40) 0 QPaintDevice (0x2e80c40) 8 vptr=((&QFileDialog::_ZTV11QFileDialog) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2ea5600) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 70u entries @@ -4485,10 +4009,6 @@ QImage (0x1db2400) 0 QPaintDevice (0x308b900) 0 primary-for QImage (0x1db2400) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3122b00) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 9u entries @@ -4537,10 +4057,6 @@ Class QIcon base size=4 base align=4 QIcon (0x1db2200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31cebc0) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4696,10 +4212,6 @@ QImageIOPlugin (0x3209600) 0 QFactoryInterface (0x32096c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x3209680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3209880) 0 Class QImageReader size=4 align=4 @@ -4877,15 +4389,7 @@ QActionGroup (0x32b2780) 0 QObject (0x32f7600) 0 primary-for QActionGroup (0x32b2780) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32f7fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2c9c940) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -5194,10 +4698,6 @@ QAbstractSpinBox (0x3384ac0) 0 QPaintDevice (0x3384b80) 8 vptr=((&QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3384f00) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 68u entries @@ -5413,15 +4913,7 @@ QStyle (0x2c68700) 0 QObject (0x3448700) 0 primary-for QStyle (0x2c68700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3457040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x346d100) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 71u entries @@ -5692,10 +5184,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x359d500) 0 QStyleOption (0x359d540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x359dac0) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -5722,10 +5210,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x35bfec0) 0 QStyleOption (0x35bff00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3607ac0) 0 Class QStyleOptionButton size=64 align=4 @@ -5733,10 +5217,6 @@ Class QStyleOptionButton QStyleOptionButton (0x36078c0) 0 QStyleOption (0x3607900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3643480) 0 Class QStyleOptionTab size=72 align=4 @@ -5751,10 +5231,6 @@ QStyleOptionTabV2 (0x3643bc0) 0 QStyleOptionTab (0x3643c00) 0 QStyleOption (0x3643c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3699440) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5781,10 +5257,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x36e62c0) 0 QStyleOption (0x36e6300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36e6e00) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5842,15 +5314,7 @@ QStyleOptionSpinBox (0x377ba00) 0 QStyleOptionComplex (0x377ba40) 0 QStyleOption (0x377ba80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x379d200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x379d100) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5859,10 +5323,6 @@ QStyleOptionQ3ListView (0x377bf80) 0 QStyleOptionComplex (0x377bfc0) 0 QStyleOption (0x379d000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x379dd40) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6026,10 +5486,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x3896d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x38fb0c0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6060,20 +5516,8 @@ QItemSelectionModel (0x38fb4c0) 0 QObject (0x38fb500) 0 primary-for QItemSelectionModel (0x38fb4c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x38fb840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x39253c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x39252c0) 0 Class QItemSelection size=4 align=4 @@ -6207,10 +5651,6 @@ QAbstractItemView (0x3925a40) 0 QPaintDevice (0x3925b80) 8 vptr=((&QAbstractItemView::_ZTV17QAbstractItemView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x397e5c0) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -6526,15 +5966,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3a6ba80) 0 nearly-empty vptr=((&QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3a8f580) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x3a8f380) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -6679,15 +6111,7 @@ QListView (0x3a8fd40) 0 QPaintDevice (0x3a8fec0) 8 vptr=((&QListView::_ZTV9QListView) + 400u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3ae7300) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3ae7180) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7492,35 +6916,15 @@ QTreeView (0x3cb3500) 0 QPaintDevice (0x3cb3680) 8 vptr=((&QTreeView::_ZTV9QTreeView) + 408u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3cf0680) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x3cf0240) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x3d41440) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x3d412c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3d41640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3d41100) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8375,15 +7779,7 @@ Class QColormap base size=4 base align=4 QColormap (0x2a5f3c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3fe5a00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3fe5880) 0 Class QPolygon size=4 align=4 @@ -8391,15 +7787,7 @@ Class QPolygon QPolygon (0x1db2500) 0 QVector (0x3fe5b80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x401be00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x401bcc0) 0 Class QPolygonF size=4 align=4 @@ -8412,95 +7800,39 @@ Class QMatrix base size=48 base align=8 QMatrix (0x235d140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4076bc0) 0 empty Class QTextOption size=32 align=8 base size=28 base align=8 QTextOption (0x4099a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4099e40) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0x1db2d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4101440) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x2707ec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4101980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x41ce340) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x411f580) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x41ce6c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x411f640) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4211380) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x411f780) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4211700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x27323c0) 0 Class QTextItem size=1 align=1 base size=0 base align=1 QTextItem (0x41017c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42af9c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42aff40) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 26u entries @@ -8537,20 +7869,12 @@ Class QPaintEngine QPaintEngine (0x2a37280) 0 vptr=((&QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42c4380) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x42af700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42af8c0) 0 Class QPainterPath::Element size=24 align=8 @@ -8562,25 +7886,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x2bac100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43a09c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43a0840) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x434e340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43a0b80) 0 empty Class QPainterPathStroker size=4 align=4 @@ -8682,10 +7994,6 @@ QCommonStyle (0x4467e40) 0 QObject (0x4467ec0) 0 primary-for QStyle (0x4467e80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x4494600) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -9007,25 +8315,13 @@ Class QTextLength base size=16 base align=8 QTextLength (0x1d28f00) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4591100) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x1d28e80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4591a80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4585bc0) 0 Class QTextCharFormat size=8 align=4 @@ -9080,15 +8376,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x2b99e00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x46e90c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x46d0d00) 0 Class QTextLine size=8 align=4 @@ -9138,15 +8426,7 @@ QTextDocument (0x4532ec0) 0 QObject (0x4714900) 0 primary-for QTextDocument (0x4532ec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4714dc0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x477edc0) 0 Class QTextCursor size=4 align=4 @@ -9158,15 +8438,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x47922c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4792580) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4792400) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -9328,10 +8600,6 @@ QTextFrame (0x4714100) 0 QObject (0x480d340) 0 primary-for QTextObject (0x480d300) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x48357c0) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -9356,25 +8624,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x46d0540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x488e040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x488e1c0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x47e2600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x488ec40) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -10031,10 +9287,6 @@ QDateEdit (0x4a50080) 0 QPaintDevice (0x4a501c0) 8 vptr=((&QDateEdit::_ZTV9QDateEdit) + 268u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4a13580) 0 Vtable for QDial QDial::_ZTV5QDial: 68u entries @@ -10203,10 +9455,6 @@ QDockWidget (0x4ac0200) 0 QPaintDevice (0x4ac02c0) 8 vptr=((&QDockWidget::_ZTV11QDockWidget) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4ac0780) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 67u entries @@ -12547,30 +11795,14 @@ Class _EXCEPTION_POINTERS base size=8 base align=4 _EXCEPTION_POINTERS (0x50efd40) 0 -Class _LARGE_INTEGER:: - size=8 align=4 - base size=8 base align=4 -_LARGE_INTEGER:: (0x50eff80) 0 -Class _LARGE_INTEGER:: - size=8 align=4 - base size=8 base align=4 -_LARGE_INTEGER:: (0x50f50c0) 0 Class _LARGE_INTEGER size=8 align=8 base size=8 base align=8 _LARGE_INTEGER (0x50eff00) 0 -Class _ULARGE_INTEGER:: - size=8 align=4 - base size=8 base align=4 -_ULARGE_INTEGER:: (0x50f5300) 0 -Class _ULARGE_INTEGER:: - size=8 align=4 - base size=8 base align=4 -_ULARGE_INTEGER:: (0x50f53c0) 0 Class _ULARGE_INTEGER size=8 align=8 @@ -12767,10 +11999,6 @@ Class _SINGLE_LIST_ENTRY base size=4 base align=4 _SINGLE_LIST_ENTRY (0x5172780) 0 -Class _SLIST_HEADER:: - size=8 align=4 - base size=8 base align=4 -_SLIST_HEADER:: (0x5172a80) 0 Class _SLIST_HEADER size=8 align=8 @@ -12857,70 +12085,26 @@ Class _IMAGE_ROM_HEADERS base size=76 base align=4 _IMAGE_ROM_HEADERS (0x51a2d00) 0 -Class _IMAGE_SECTION_HEADER:: - size=4 align=4 - base size=4 base align=4 -_IMAGE_SECTION_HEADER:: (0x51a2ec0) 0 Class _IMAGE_SECTION_HEADER size=40 align=4 base size=40 base align=4 _IMAGE_SECTION_HEADER (0x51a2e40) 0 -Class _IMAGE_SYMBOL:::: - size=8 align=2 - base size=8 base align=2 -_IMAGE_SYMBOL:::: (0x2df13c0) 0 -Class _IMAGE_SYMBOL:: - size=8 align=2 - base size=8 base align=2 -_IMAGE_SYMBOL:: (0x2df1300) 0 Class _IMAGE_SYMBOL size=18 align=2 base size=18 base align=2 _IMAGE_SYMBOL (0x2df1280) 0 -Class _IMAGE_AUX_SYMBOL:::::: - size=4 align=2 - base size=4 base align=2 -_IMAGE_AUX_SYMBOL:::::: (0x2df1880) 0 -Class _IMAGE_AUX_SYMBOL:::: - size=4 align=2 - base size=4 base align=2 -_IMAGE_AUX_SYMBOL:::: (0x2df1800) 0 -Class _IMAGE_AUX_SYMBOL:::::: - size=8 align=2 - base size=8 base align=2 -_IMAGE_AUX_SYMBOL:::::: (0x2df1ac0) 0 -Class _IMAGE_AUX_SYMBOL:::::: - size=8 align=2 - base size=8 base align=2 -_IMAGE_AUX_SYMBOL:::::: (0x2df1c40) 0 -Class _IMAGE_AUX_SYMBOL:::: - size=8 align=2 - base size=8 base align=2 -_IMAGE_AUX_SYMBOL:::: (0x2df1a40) 0 -Class _IMAGE_AUX_SYMBOL:: - size=18 align=2 - base size=18 base align=2 -_IMAGE_AUX_SYMBOL:: (0x2df1740) 0 -Class _IMAGE_AUX_SYMBOL:: - size=18 align=1 - base size=18 base align=1 -_IMAGE_AUX_SYMBOL:: (0x2df1ec0) 0 -Class _IMAGE_AUX_SYMBOL:: - size=16 align=2 - base size=16 base align=2 -_IMAGE_AUX_SYMBOL:: (0x2df1f80) 0 Class _IMAGE_AUX_SYMBOL size=18 align=2 @@ -12932,10 +12116,6 @@ Class _IMAGE_COFF_SYMBOLS_HEADER base size=32 base align=2 _IMAGE_COFF_SYMBOLS_HEADER (0x51f1140) 0 -Class _IMAGE_RELOCATION:: - size=4 align=2 - base size=4 base align=2 -_IMAGE_RELOCATION:: (0x51f14c0) 0 Class _IMAGE_RELOCATION size=10 align=2 @@ -12947,10 +12127,6 @@ Class _IMAGE_BASE_RELOCATION base size=8 base align=4 _IMAGE_BASE_RELOCATION (0x51f16c0) 0 -Class _IMAGE_LINENUMBER:: - size=4 align=2 - base size=4 base align=2 -_IMAGE_LINENUMBER:: (0x51f18c0) 0 Class _IMAGE_LINENUMBER size=6 align=2 @@ -12972,30 +12148,18 @@ Class _IMAGE_IMPORT_BY_NAME base size=4 base align=2 _IMAGE_IMPORT_BY_NAME (0x51f1f80) 0 -Class _IMAGE_THUNK_DATA32:: - size=4 align=4 - base size=4 base align=4 -_IMAGE_THUNK_DATA32:: (0x5205180) 0 Class _IMAGE_THUNK_DATA32 size=4 align=4 base size=4 base align=4 _IMAGE_THUNK_DATA32 (0x5205100) 0 -Class _IMAGE_THUNK_DATA64:: - size=8 align=4 - base size=8 base align=4 -_IMAGE_THUNK_DATA64:: (0x5205480) 0 Class _IMAGE_THUNK_DATA64 size=8 align=4 base size=8 base align=4 _IMAGE_THUNK_DATA64 (0x5205400) 0 -Class _IMAGE_IMPORT_DESCRIPTOR:: - size=4 align=4 - base size=4 base align=4 -_IMAGE_IMPORT_DESCRIPTOR:: (0x5205740) 0 Class _IMAGE_IMPORT_DESCRIPTOR size=20 align=4 @@ -13027,25 +12191,9 @@ Class _IMAGE_RESOURCE_DIRECTORY base size=16 base align=4 _IMAGE_RESOURCE_DIRECTORY (0x5219140) 0 -Class _IMAGE_RESOURCE_DIRECTORY_ENTRY:::: - size=4 align=4 - base size=4 base align=4 -_IMAGE_RESOURCE_DIRECTORY_ENTRY:::: (0x5219400) 0 -Class _IMAGE_RESOURCE_DIRECTORY_ENTRY:: - size=4 align=4 - base size=4 base align=4 -_IMAGE_RESOURCE_DIRECTORY_ENTRY:: (0x5219380) 0 -Class _IMAGE_RESOURCE_DIRECTORY_ENTRY:::: - size=4 align=4 - base size=4 base align=4 -_IMAGE_RESOURCE_DIRECTORY_ENTRY:::: (0x5219680) 0 -Class _IMAGE_RESOURCE_DIRECTORY_ENTRY:: - size=4 align=4 - base size=4 base align=4 -_IMAGE_RESOURCE_DIRECTORY_ENTRY:: (0x52195c0) 0 Class _IMAGE_RESOURCE_DIRECTORY_ENTRY size=8 align=4 @@ -13102,45 +12250,21 @@ Class _IMAGE_SEPARATE_DEBUG_HEADER base size=48 base align=4 _IMAGE_SEPARATE_DEBUG_HEADER (0x522cc40) 0 -Class _NT_TIB:: - size=4 align=4 - base size=4 base align=4 -_NT_TIB:: (0x523b580) 0 Class _NT_TIB size=28 align=4 base size=28 base align=4 _NT_TIB (0x523b380) 0 -Class _REPARSE_DATA_BUFFER:::: - size=10 align=2 - base size=10 base align=2 -_REPARSE_DATA_BUFFER:::: (0x523b940) 0 -Class _REPARSE_DATA_BUFFER:::: - size=10 align=2 - base size=10 base align=2 -_REPARSE_DATA_BUFFER:::: (0x523bb80) 0 -Class _REPARSE_DATA_BUFFER:::: - size=1 align=1 - base size=1 base align=1 -_REPARSE_DATA_BUFFER:::: (0x523bc80) 0 -Class _REPARSE_DATA_BUFFER:: - size=10 align=2 - base size=10 base align=2 -_REPARSE_DATA_BUFFER:: (0x523b8c0) 0 Class _REPARSE_DATA_BUFFER size=20 align=4 base size=20 base align=4 _REPARSE_DATA_BUFFER (0x523b7c0) 0 -Class _REPARSE_GUID_DATA_BUFFER:: - size=1 align=1 - base size=1 base align=1 -_REPARSE_GUID_DATA_BUFFER:: (0x523bf40) 0 Class _REPARSE_GUID_DATA_BUFFER size=28 align=4 @@ -13207,10 +12331,6 @@ Class _JOBOBJECT_JOBSET_INFORMATION base size=4 base align=4 _JOBOBJECT_JOBSET_INFORMATION (0x5260400) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x5260fc0) 0 Class _POWER_ACTION_POLICY size=12 align=4 @@ -13412,10 +12532,6 @@ Class tagPOINTS base size=4 base align=2 tagPOINTS (0x52b0140) 0 -Class _CHAR_INFO:: - size=2 align=2 - base size=2 base align=2 -_CHAR_INFO:: (0x52b0f80) 0 Class _CHAR_INFO size=4 align=2 @@ -13447,10 +12563,6 @@ Class _CONSOLE_SCREEN_BUFFER_INFO base size=22 base align=2 _CONSOLE_SCREEN_BUFFER_INFO (0x52b3800) 0 -Class _KEY_EVENT_RECORD:: - size=2 align=2 - base size=2 base align=2 -_KEY_EVENT_RECORD:: (0x52b3c00) 0 Class _KEY_EVENT_RECORD size=16 align=1 @@ -13477,10 +12589,6 @@ Class _FOCUS_EVENT_RECORD base size=4 base align=4 _FOCUS_EVENT_RECORD (0x52c5200) 0 -Class _INPUT_RECORD:: - size=16 align=4 - base size=16 base align=4 -_INPUT_RECORD:: (0x52c53c0) 0 Class _INPUT_RECORD size=20 align=4 @@ -13567,10 +12675,6 @@ Class _RIP_INFO base size=8 base align=4 _RIP_INFO (0x53316c0) 0 -Class _DEBUG_EVENT:: - size=84 align=4 - base size=84 base align=4 -_DEBUG_EVENT:: (0x53319c0) 0 Class _DEBUG_EVENT size=96 align=4 @@ -13642,15 +12746,7 @@ Class tagHW_PROFILE_INFOW base size=244 base align=4 tagHW_PROFILE_INFOW (0x5352b00) 0 -Class _SYSTEM_INFO:::: - size=4 align=2 - base size=4 base align=2 -_SYSTEM_INFO:::: (0x5352e80) 0 -Class _SYSTEM_INFO:: - size=4 align=4 - base size=4 base align=4 -_SYSTEM_INFO:: (0x5352dc0) 0 Class _SYSTEM_INFO size=36 align=4 @@ -13672,40 +12768,16 @@ Class _MEMORYSTATUS base size=32 base align=4 _MEMORYSTATUS (0x5362840) 0 -Class _LDT_ENTRY:::: - size=4 align=1 - base size=4 base align=1 -_LDT_ENTRY:::: (0x5362fc0) 0 -Class _LDT_ENTRY:::: - size=4 align=4 - base size=4 base align=4 -_LDT_ENTRY:::: (0x536c1c0) 0 -Class _LDT_ENTRY:: - size=4 align=4 - base size=4 base align=4 -_LDT_ENTRY:: (0x5362f40) 0 Class _LDT_ENTRY size=8 align=4 base size=8 base align=4 _LDT_ENTRY (0x5362e40) 0 -Class _PROCESS_HEAP_ENTRY:::: - size=16 align=4 - base size=16 base align=4 -_PROCESS_HEAP_ENTRY:::: (0x536c840) 0 -Class _PROCESS_HEAP_ENTRY:::: - size=16 align=4 - base size=16 base align=4 -_PROCESS_HEAP_ENTRY:::: (0x536c9c0) 0 -Class _PROCESS_HEAP_ENTRY:: - size=16 align=4 - base size=16 base align=4 -_PROCESS_HEAP_ENTRY:: (0x536c7c0) 0 Class _PROCESS_HEAP_ENTRY size=28 align=4 @@ -13782,60 +12854,28 @@ Class tagCIEXYZTRIPLE base size=36 base align=4 tagCIEXYZTRIPLE (0x5481980) 0 -Class - size=108 align=4 - base size=108 base align=4 - (0x5481b80) 0 Class tagFONTSIGNATURE size=24 align=4 base size=24 base align=4 tagFONTSIGNATURE (0x548c200) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x548c3c0) 0 Class tagCOLORADJUSTMENT size=24 align=2 base size=24 base align=2 tagCOLORADJUSTMENT (0x548c5c0) 0 -Class _devicemodeA:::: - size=16 align=2 - base size=16 base align=2 -_devicemodeA:::: (0x548ccc0) 0 -Class _devicemodeA:: - size=16 align=4 - base size=16 base align=4 -_devicemodeA:: (0x548cc40) 0 -Class _devicemodeA:: - size=4 align=4 - base size=4 base align=4 -_devicemodeA:: (0x5497380) 0 Class _devicemodeA size=156 align=4 base size=156 base align=4 _devicemodeA (0x548ca40) 0 -Class _devicemodeW:::: - size=16 align=2 - base size=16 base align=2 -_devicemodeW:::: (0x5497900) 0 -Class _devicemodeW:: - size=16 align=4 - base size=16 base align=4 -_devicemodeW:: (0x5497880) 0 -Class _devicemodeW:: - size=4 align=4 - base size=4 base align=4 -_devicemodeW:: (0x5497a80) 0 Class _devicemodeW size=220 align=4 @@ -14537,25 +13577,13 @@ Class tagDELETEITEMSTRUCT base size=20 base align=4 tagDELETEITEMSTRUCT (0x56a5180) 0 -Class - size=18 align=2 - base size=18 base align=2 - (0x56a5340) 0 -Class - size=18 align=2 - base size=18 base align=2 - (0x56a54c0) 0 Class tagDRAWITEMSTRUCT size=48 align=4 base size=48 base align=4 tagDRAWITEMSTRUCT (0x56a5700) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x56a59c0) 0 Class tagPAINTSTRUCT size=64 align=4 @@ -14617,30 +13645,14 @@ Class _WINDOWPLACEMENT base size=44 base align=4 _WINDOWPLACEMENT (0x56c7580) 0 -Class - size=4 align=2 - base size=4 base align=2 - (0x56c7800) 0 -Class - size=6 align=2 - base size=6 base align=2 - (0x56c7940) 0 Class tagHELPINFO size=28 align=4 base size=28 base align=4 tagHELPINFO (0x56c7c80) 0 -Class - size=40 align=4 - base size=40 base align=4 - (0x56c7f40) 0 -Class - size=40 align=4 - base size=40 base align=4 - (0x56d5300) 0 Class tagUSEROBJECTFLAGS size=12 align=4 @@ -14874,10 +13886,6 @@ Class tagKBDLLHOOKSTRUCT base size=20 base align=4 tagKBDLLHOOKSTRUCT (0x5734180) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x573bb00) 0 Class _cpinfo size=20 align=4 @@ -15084,35 +14092,11 @@ Class _SERVICE_FAILURE_ACTIONSW base size=20 base align=4 _SERVICE_FAILURE_ACTIONSW (0x58de900) 0 -Class - size=2 align=2 - base size=2 base align=2 - (0x58ffb00) 0 -Class - size=4 align=2 - base size=4 base align=2 - (0x58ffcc0) 0 -Class - size=6 align=2 - base size=6 base align=2 - (0x58ffe80) 0 -Class - size=6 align=2 - base size=6 base align=2 - (0x5906000) 0 -Class - size=4 align=2 - base size=4 base align=2 - (0x5906100) 0 -Class - size=6 align=2 - base size=6 base align=2 - (0x5906200) 0 Class HCONVLIST__ size=4 align=4 @@ -15244,20 +14228,8 @@ Class tagIMEMENUITEMINFOW base size=192 base align=4 tagIMEMENUITEMINFOW (0x5955480) 0 -Class mmtime_tag:::: - size=8 align=1 - base size=8 base align=1 -mmtime_tag:::: (0x599c200) 0 -Class mmtime_tag:::: - size=4 align=1 - base size=4 base align=1 -mmtime_tag:::: (0x599c380) 0 -Class mmtime_tag:: - size=8 align=1 - base size=8 base align=1 -mmtime_tag:: (0x599c100) 0 Class mmtime_tag size=12 align=1 @@ -15429,100 +14401,48 @@ Class tagMIXERCAPSW base size=80 base align=1 tagMIXERCAPSW (0x59e7040) 0 -Class tagMIXERLINEA:: - size=48 align=1 - base size=48 base align=1 -tagMIXERLINEA:: (0x59e74c0) 0 Class tagMIXERLINEA size=168 align=1 base size=168 base align=1 tagMIXERLINEA (0x59e71c0) 0 -Class tagMIXERLINEW:: - size=80 align=1 - base size=80 base align=1 -tagMIXERLINEW:: (0x59e7780) 0 Class tagMIXERLINEW size=280 align=1 base size=280 base align=1 tagMIXERLINEW (0x59e7700) 0 -Class tagMIXERCONTROLA:::: - size=8 align=1 - base size=8 base align=1 -tagMIXERCONTROLA:::: (0x59e7b40) 0 -Class tagMIXERCONTROLA:::: - size=8 align=1 - base size=8 base align=1 -tagMIXERCONTROLA:::: (0x59e7c80) 0 -Class tagMIXERCONTROLA:: - size=24 align=1 - base size=24 base align=1 -tagMIXERCONTROLA:: (0x59e7ac0) 0 -Class tagMIXERCONTROLA:: - size=24 align=1 - base size=24 base align=1 -tagMIXERCONTROLA:: (0x59e7e80) 0 Class tagMIXERCONTROLA size=148 align=1 base size=148 base align=1 tagMIXERCONTROLA (0x59e7940) 0 -Class tagMIXERCONTROLW:::: - size=8 align=1 - base size=8 base align=1 -tagMIXERCONTROLW:::: (0x59fb240) 0 -Class tagMIXERCONTROLW:::: - size=8 align=1 - base size=8 base align=1 -tagMIXERCONTROLW:::: (0x59fb300) 0 -Class tagMIXERCONTROLW:: - size=24 align=1 - base size=24 base align=1 -tagMIXERCONTROLW:: (0x59fb1c0) 0 -Class tagMIXERCONTROLW:: - size=24 align=1 - base size=24 base align=1 -tagMIXERCONTROLW:: (0x59fb440) 0 Class tagMIXERCONTROLW size=228 align=1 base size=228 base align=1 tagMIXERCONTROLW (0x59fb140) 0 -Class tagMIXERLINECONTROLSA:: - size=4 align=1 - base size=4 base align=1 -tagMIXERLINECONTROLSA:: (0x59fb6c0) 0 Class tagMIXERLINECONTROLSA size=24 align=1 base size=24 base align=1 tagMIXERLINECONTROLSA (0x59fb640) 0 -Class tagMIXERLINECONTROLSW:: - size=4 align=1 - base size=4 base align=1 -tagMIXERLINECONTROLSW:: (0x59fb9c0) 0 Class tagMIXERLINECONTROLSW size=24 align=1 base size=24 base align=1 tagMIXERLINECONTROLSW (0x59fb940) 0 -Class tMIXERCONTROLDETAILS:: - size=4 align=1 - base size=4 base align=1 -tMIXERCONTROLDETAILS:: (0x59fbc40) 0 Class tMIXERCONTROLDETAILS size=24 align=1 @@ -15879,15 +14799,7 @@ Class _RPC_POLICY base size=12 base align=4 _RPC_POLICY (0x5aeab00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x5aead40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x5aeae80) 0 Class _RPC_SECURITY_QOS size=16 align=4 @@ -15904,10 +14816,6 @@ Class _SEC_WINNT_AUTH_IDENTITY_A base size=28 base align=4 _SEC_WINNT_AUTH_IDENTITY_A (0x5af6440) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x5af6580) 0 Class _RPC_PROTSEQ_VECTORA size=8 align=4 @@ -15934,10 +14842,6 @@ Class _RPC_MESSAGE base size=44 base align=4 _RPC_MESSAGE (0x5b2e5c0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x5b2ea00) 0 Class _RPC_PROTSEQ_ENDPOINT size=8 align=4 @@ -16064,15 +14968,7 @@ Class tagDEVNAMES base size=8 base align=1 tagDEVNAMES (0x5b9d640) 0 -Class - size=40 align=1 - base size=40 base align=1 - (0x5b9d880) 0 -Class - size=40 align=1 - base size=40 base align=1 - (0x5b9db00) 0 Class tagOFNA size=76 align=1 @@ -16319,15 +15215,7 @@ Class _PRINTPROCESSOR_INFO_1W base size=4 base align=4 _PRINTPROCESSOR_INFO_1W (0x5c1e3c0) 0 -Class _PRINTER_NOTIFY_INFO_DATA:::: - size=8 align=4 - base size=8 base align=4 -_PRINTER_NOTIFY_INFO_DATA:::: (0x5c1e6c0) 0 -Class _PRINTER_NOTIFY_INFO_DATA:: - size=8 align=4 - base size=8 base align=4 -_PRINTER_NOTIFY_INFO_DATA:: (0x5c1e600) 0 Class _PRINTER_NOTIFY_INFO_DATA size=20 align=4 @@ -16414,20 +15302,8 @@ Class protoent base size=12 base align=4 protoent (0x5c91a80) 0 -Class in_addr:::: - size=4 align=1 - base size=4 base align=1 -in_addr:::: (0x5ca7900) 0 -Class in_addr:::: - size=4 align=2 - base size=4 base align=2 -in_addr:::: (0x5ca7b00) 0 -Class in_addr:: - size=4 align=4 - base size=4 base align=4 -in_addr:: (0x5ca7880) 0 Class in_addr size=4 align=4 @@ -16564,55 +15440,23 @@ Class _WSAPROTOCOL_INFOW base size=628 base align=4 _WSAPROTOCOL_INFOW (0x5cfff40) 0 -Class _WSACOMPLETION:::: - size=12 align=4 - base size=12 base align=4 -_WSACOMPLETION:::: (0x5d0f4c0) 0 -Class _WSACOMPLETION:::: - size=4 align=4 - base size=4 base align=4 -_WSACOMPLETION:::: (0x5d0f5c0) 0 -Class _WSACOMPLETION:::: - size=8 align=4 - base size=8 base align=4 -_WSACOMPLETION:::: (0x5d0f680) 0 -Class _WSACOMPLETION:::: - size=12 align=4 - base size=12 base align=4 -_WSACOMPLETION:::: (0x5d0f7c0) 0 -Class _WSACOMPLETION:: - size=12 align=4 - base size=12 base align=4 -_WSACOMPLETION:: (0x5d0f440) 0 Class _WSACOMPLETION size=16 align=4 base size=16 base align=4 _WSACOMPLETION (0x5d0f3c0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x5d40ac0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x5d5d180) 0 Class _SCONTEXT_QUEUE size=8 align=4 base size=8 base align=4 _SCONTEXT_QUEUE (0x5d5d240) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x5d5d640) 0 Class _MIDL_STUB_MESSAGE size=180 align=4 @@ -16659,10 +15503,6 @@ Class _NDR_CS_ROUTINES base size=8 base align=4 _NDR_CS_ROUTINES (0x5d7abc0) 0 -Class _MIDL_STUB_DESC:: - size=4 align=4 - base size=4 base align=4 -_MIDL_STUB_DESC:: (0x5d7ad40) 0 Class _MIDL_STUB_DESC size=80 align=4 @@ -16694,15 +15534,7 @@ Class _FULL_PTR_TO_REFID_ELEMENT base size=16 base align=4 _FULL_PTR_TO_REFID_ELEMENT (0x5d8dbc0) 0 -Class _FULL_PTR_XLAT_TABLES:: - size=12 align=4 - base size=12 base align=4 -_FULL_PTR_XLAT_TABLES:: (0x5d8dd40) 0 -Class _FULL_PTR_XLAT_TABLES:: - size=12 align=4 - base size=12 base align=4 -_FULL_PTR_XLAT_TABLES:: (0x5d8df00) 0 Class _FULL_PTR_XLAT_TABLES size=32 align=4 @@ -16719,10 +15551,6 @@ Class _FLAGGED_WORD_BLOB base size=12 base align=4 _FLAGGED_WORD_BLOB (0x5ddda80) 0 -Class tagCY:: - size=8 align=4 - base size=8 base align=4 -tagCY:: (0x5de8000) 0 Class tagCY size=8 align=8 @@ -16759,25 +15587,9 @@ Class _HYPER_SIZEDARR base size=8 base align=4 _HYPER_SIZEDARR (0x5df1780) 0 -Class tagDEC:::: - size=2 align=1 - base size=2 base align=1 -tagDEC:::: (0x5df19c0) 0 -Class tagDEC:: - size=2 align=2 - base size=2 base align=2 -tagDEC:: (0x5df1940) 0 -Class tagDEC:::: - size=8 align=4 - base size=8 base align=4 -tagDEC:::: (0x5df1b80) 0 -Class tagDEC:: - size=8 align=8 - base size=8 base align=8 -tagDEC:: (0x5df1b00) 0 Class tagDEC size=16 align=8 @@ -16886,10 +15698,6 @@ Class tagBIND_OPTS2 base size=32 base align=4 tagBIND_OPTS2 (0x5e46400) 0 -Class tagSTGMEDIUM:: - size=4 align=4 - base size=4 base align=4 -tagSTGMEDIUM:: (0x5e46740) 0 Class tagSTGMEDIUM size=12 align=4 @@ -17011,20 +15819,12 @@ Class tagCAPROPVARIANT base size=8 base align=4 tagCAPROPVARIANT (0x5e64f00) 0 -Class tagPROPVARIANT:: - size=8 align=8 - base size=8 base align=8 -tagPROPVARIANT:: (0x5e7d040) 0 Class tagPROPVARIANT size=16 align=8 base size=16 base align=8 tagPROPVARIANT (0x5e64e40) 0 -Class tagPROPSPEC:: - size=4 align=4 - base size=4 base align=4 -tagPROPSPEC:: (0x5e7dd40) 0 Class tagPROPSPEC size=8 align=4 @@ -18116,10 +16916,6 @@ Class _wireSAFEARR_HAVEIID base size=24 base align=4 _wireSAFEARR_HAVEIID (0x609dd40) 0 -Class _wireSAFEARRAY_UNION:: - size=24 align=4 - base size=24 base align=4 -_wireSAFEARRAY_UNION:: (0x609df00) 0 Class _wireSAFEARRAY_UNION size=28 align=4 @@ -18136,45 +16932,21 @@ Class tagSAFEARRAY base size=24 base align=4 tagSAFEARRAY (0x60ad5c0) 0 -Class tagVARIANT:::::::: - size=8 align=4 - base size=8 base align=4 -tagVARIANT:::::::: (0x60adb00) 0 -Class tagVARIANT:::::: - size=8 align=8 - base size=8 base align=8 -tagVARIANT:::::: (0x60ad8c0) 0 -Class tagVARIANT:::: - size=16 align=8 - base size=16 base align=8 -tagVARIANT:::: (0x60ad840) 0 -Class tagVARIANT:: - size=16 align=8 - base size=16 base align=8 -tagVARIANT:: (0x60ad7c0) 0 Class tagVARIANT size=16 align=8 base size=16 base align=8 tagVARIANT (0x60ad740) 0 -Class _wireVARIANT:: - size=16 align=8 - base size=16 base align=8 -_wireVARIANT:: (0x60ade40) 0 Class _wireVARIANT size=32 align=8 base size=32 base align=8 _wireVARIANT (0x609d680) 0 -Class tagTYPEDESC:: - size=4 align=4 - base size=4 base align=4 -tagTYPEDESC:: (0x60d33c0) 0 Class tagTYPEDESC size=8 align=4 @@ -18201,10 +16973,6 @@ Class tagIDLDESC base size=8 base align=4 tagIDLDESC (0x60d3a80) 0 -Class tagELEMDESC:: - size=8 align=4 - base size=8 base align=4 -tagELEMDESC:: (0x60d3cc0) 0 Class tagELEMDESC size=16 align=4 @@ -18231,10 +16999,6 @@ Class tagFUNCDESC base size=52 base align=4 tagFUNCDESC (0x60e2ec0) 0 -Class tagVARDESC:: - size=4 align=4 - base size=4 base align=4 -tagVARDESC:: (0x60eb540) 0 Class tagVARDESC size=36 align=4 @@ -18590,15 +17354,7 @@ Class tagINTERFACEDATA base size=8 base align=4 tagINTERFACEDATA (0x61650c0) 0 -Class - size=18 align=2 - base size=18 base align=2 - (0x6165280) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x6165400) 0 Class tagOleMenuGroupWidths size=24 align=4 @@ -19092,10 +17848,6 @@ Class _OLESTREAMVTBL base size=8 base align=4 _OLESTREAMVTBL (0x62accc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x62fa8c0) 0 Class QGLFormat size=4 align=4 @@ -19233,158 +17985,34 @@ QGLPixelBuffer (0x63a9fc0) 0 QPaintDevice (0x63f8640) 0 primary-for QGLPixelBuffer (0x63a9fc0) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13c0100) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1588d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6605f40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3d41600) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x3d413c0) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x3fe5980) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x401bd80) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x41ce2c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x41ce640) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x4211300) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4211680) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x43a0940) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x4591a00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x46e9040) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4792500) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x32f7f80) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x3a8f500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6ac6700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6af5500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6af56c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6af5c00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6b232c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x172a2c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1dc5500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6b239c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x379d1c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3925380) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x6b63140) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x6b63400) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x6b63640) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x6b63b40) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.2.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.4.2.0.linux-gcc-ia32.txt index 62150edbd..01586e6fb 100644 --- a/tests/auto/bic/data/QtOpenGL.4.2.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.2.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7fbed80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7fbedc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7fbee80) 0 empty - QUintForSize<4> (0xb7fbeec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7fbef40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7fbef80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb793e040) 0 empty - QIntForSize<4> (0xb793e080) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb793e300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793e740) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb793e780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb793e880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb793e8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb793e900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb793e940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb793e980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb793e9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb793ea00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb793ea40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb793ea80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb793eac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb793eb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb793eb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb793eb80) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb793ec40) 0 QGenericArgument (0xb793ec80) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb793ee40) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb793ef00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb793ef80) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6a68280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a682c0) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb6a68300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a68480) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb6a68580) 0 QString (0xb6a685c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a68600) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0xb6a68900) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6a68c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6a68c00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0xb6a68e00) 0 QObject (0xb6a68e40) 0 primary-for QIODevice (0xb6a68e00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a68f00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6a687c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a68880) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0xb680f580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb680fb00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0xb680fa40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb680fc40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb680fbc0) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb680fcc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb680fd00) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb680fd80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb680fd40) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb680fdc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb680fe00) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb680ff00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb680ff80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb680ff40) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb680f440) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb680f880) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0xb680fac0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb659f040) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0xb659f200) 0 QTextStream (0xb659f240) 0 primary-for QTextOStream (0xb659f200) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb659f300) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb659f340) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb659f2c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb659f380) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb659f3c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb659f400) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb659f440) 0 Class timespec size=8 align=4 @@ -738,80 +492,24 @@ Class timeval base size=8 base align=4 timeval (0xb659f4c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb659f500) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb659f540) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb659f580) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb659f640) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb659f600) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb659f5c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb659f680) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb659f700) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb659f6c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb659f740) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb659f7c0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb659f780) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb659f800) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb659f840) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb659f880) 0 Class random_data size=28 align=4 @@ -882,10 +580,6 @@ QFile (0xb659fd40) 0 QObject (0xb659fdc0) 0 primary-for QIODevice (0xb659fd80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb659fe40) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -938,50 +632,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb659ffc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb659f000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb659f1c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb659fe00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb659f280) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb659ff80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6378000) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6378040) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6378100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6378080) 0 Class QStringList size=4 align=4 @@ -989,30 +655,14 @@ Class QStringList QStringList (0xb6378140) 0 QList (0xb6378180) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6378200) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6378240) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb6378300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6378380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6378400) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1069,10 +719,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb6378440) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb63785c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1184,15 +830,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6378880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63788c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6378900) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1287,285 +925,65 @@ Class QUrl base size=4 base align=4 QUrl (0xb6378c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6378c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6378cc0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6378d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6378bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f00c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f01c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f02c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f03c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f04c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f05c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f06c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f07c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f08c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb62f0900) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1592,45 +1010,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb62f0940) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb62f0b80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb62f0bc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb62f0cc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb62f0c40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb62f0dc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb62f0d40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb62f0e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb62f0f00) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1662,80 +1052,48 @@ Class QPoint base size=8 base align=4 QPoint (0xb62f0b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb62f0a80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb62f0e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb62f0fc0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6203000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6203040) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6203080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb62030c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0xb6203100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6203300) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6203380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6203580) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6203640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6203740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6203780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6203840) 0 empty Class QLinkedListData size=20 align=4 @@ -1752,10 +1110,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6203c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6203c40) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1772,30 +1126,18 @@ Class QDate base size=4 base align=4 QDate (0xb6203ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6203f80) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6203fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb62031c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6203200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb62032c0) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1981,10 +1323,6 @@ QEventLoop (0xb5e7e040) 0 QObject (0xb5e7e080) 0 primary-for QEventLoop (0xb5e7e040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5e7e180) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1429,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb5e7e680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e7e6c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb5e7e700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e7e780) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2324,10 +1654,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb5e7ec00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e7ec40) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2422,20 +1748,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb5e7eec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e7ef00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb5e7ef40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e7ef80) 0 empty Class QMetaProperty size=20 align=4 @@ -2447,10 +1765,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb5e7e000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e7e100) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2507,10 +1821,6 @@ QLibrary (0xb5e7e440) 0 QObject (0xb5e7e500) 0 primary-for QLibrary (0xb5e7e440) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5e7e600) 0 Class QSemaphore size=4 align=4 @@ -2558,10 +1868,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb5e7ebc0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb5e7edc0) 0 Class QMutexLocker size=4 align=4 @@ -2573,45 +1879,21 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb5e7ee80) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb5dea040) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb5dea000) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb5dea0c0) 0 Class QWriteLocker size=4 align=4 base size=4 base align=4 QWriteLocker (0xb5dea080) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5dea180) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5dea1c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5dea200) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb5dea140) 0 Class QColor size=16 align=4 @@ -2628,20 +1910,8 @@ Class QPen base size=4 base align=4 QPen (0xb5dea3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5dea480) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5dea540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5dea4c0) 0 Class QPolygon size=4 align=4 @@ -2649,15 +1919,7 @@ Class QPolygon QPolygon (0xb5dea580) 0 QVector (0xb5dea5c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5dea680) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5dea600) 0 Class QPolygonF size=4 align=4 @@ -2680,10 +1942,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb5dea880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5dea8c0) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2724,10 +1982,6 @@ QImage (0xb5deaa40) 0 QPaintDevice (0xb5deaa80) 0 primary-for QImage (0xb5deaa40) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5deabc0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -2752,45 +2006,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb5dead80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5deadc0) 0 empty Class QBrushData size=72 align=4 base size=72 base align=4 QBrushData (0xb5deae00) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb5deaf40) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb5deaec0) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb5deafc0) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb5dea240) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb5dea280) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb5deaf80) 0 Class QGradient size=56 align=4 @@ -2820,30 +2046,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb5dea800) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb5deab00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb5dea980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5deacc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5deab40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5dead00) 0 Class QTextCharFormat size=8 align=4 @@ -2983,10 +2193,6 @@ QTextFrame (0xb5bc6580) 0 QObject (0xb5bc6600) 0 primary-for QTextObject (0xb5bc65c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5bc6740) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -3011,25 +2217,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb5bc6800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5bc6880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5bc68c0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb5bc6900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5bc6940) 0 empty Class QFontMetrics size=4 align=4 @@ -3089,20 +2283,12 @@ QTextDocument (0xb5bc6b00) 0 QObject (0xb5bc6b40) 0 primary-for QTextDocument (0xb5bc6b00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5bc6bc0) 0 Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0xb5bc6c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5bc6c40) 0 Class QTextTableCell size=8 align=4 @@ -3143,10 +2329,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb5bc6e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5bc6f40) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3444,15 +2626,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb5948c00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5948d00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5948c80) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3751,15 +2925,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb59dd480) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb59dd600) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb59dd580) 0 Class QTextLine size=8 align=4 @@ -3808,10 +2974,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0xb59dd880) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb59dd940) 0 Class QTextCursor size=4 align=4 @@ -3834,15 +2996,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb59ddb40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb59ddc80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb59ddc00) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4206,10 +3360,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb59ddf80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb57ee040) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -4240,20 +3390,8 @@ QItemSelectionModel (0xb57ee080) 0 QObject (0xb57ee0c0) 0 primary-for QItemSelectionModel (0xb57ee080) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57ee140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb57ee200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb57ee180) 0 Class QItemSelection size=4 align=4 @@ -4460,20 +3598,12 @@ QAbstractSpinBox (0xb57ee680) 0 QPaintDevice (0xb57ee740) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57ee800) 0 Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0xb57ee840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb57ee900) 0 empty Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -4681,15 +3811,7 @@ QStyle (0xb57eec40) 0 QObject (0xb57eec80) 0 primary-for QStyle (0xb57eec40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57eed40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57eed80) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -4948,10 +4070,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb57eec00) 0 QStyleOption (0xb57eebc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5560080) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -4978,10 +4096,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb5560300) 0 QStyleOption (0xb5560340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55604c0) 0 Class QStyleOptionButton size=64 align=4 @@ -4989,10 +4103,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb5560400) 0 QStyleOption (0xb5560440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5560640) 0 Class QStyleOptionTab size=72 align=4 @@ -5007,10 +4117,6 @@ QStyleOptionTabV2 (0xb55606c0) 0 QStyleOptionTab (0xb5560700) 0 QStyleOption (0xb5560740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55608c0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5037,10 +4143,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb5560b00) 0 QStyleOption (0xb5560b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5560c80) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5066,10 +4168,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb5560e80) 0 QStyleOption (0xb5560ec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5560040) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -5110,15 +4208,7 @@ QStyleOptionSpinBox (0xb5560c40) 0 QStyleOptionComplex (0xb5560cc0) 0 QStyleOption (0xb5560d80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5466100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5466080) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5127,10 +4217,6 @@ QStyleOptionQ3ListView (0xb5560e40) 0 QStyleOptionComplex (0xb5560f00) 0 QStyleOption (0xb5466000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54662c0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5338,10 +4424,6 @@ QAbstractItemView (0xb5466a00) 0 QPaintDevice (0xb5466b40) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5466c00) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -6106,10 +5188,6 @@ QMessageBox (0xb5368580) 0 QPaintDevice (0xb5368680) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5368740) 0 Vtable for QProgressDialog QProgressDialog::_ZTV15QProgressDialog: 66u entries @@ -6360,10 +5438,6 @@ QFileDialog (0xb5368a80) 0 QPaintDevice (0xb5368b80) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5368c40) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -6449,10 +5523,6 @@ QAbstractPrintDialog (0xb5368c80) 0 QPaintDevice (0xb5368d80) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5368e40) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -6874,10 +5944,6 @@ QImageIOPlugin (0xb524e3c0) 0 QFactoryInterface (0xb524e480) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb524e440) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb524e500) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -7225,50 +6291,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb524e5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb524e7c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb524eb80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb524ea00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb51ba040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb524ee40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb51ba140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb51ba0c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb51ba240) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb51ba1c0) 0 Class QStylePainter size=12 align=4 @@ -7286,25 +6316,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb51ba340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb51ba5c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb51ba540) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb51ba440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51ba600) 0 empty Class QPainterPathStroker size=4 align=4 @@ -7316,15 +6334,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb51ba700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51ba740) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51ba800) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -7359,25 +6369,13 @@ Class QPaintEngine QPaintEngine (0xb51ba780) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51ba900) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb51ba880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51ba940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51baa00) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -7467,15 +6465,7 @@ QStringListModel (0xb51bab00) 0 QObject (0xb51babc0) 0 primary-for QAbstractItemModel (0xb51bab80) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb51bad40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb51bacc0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7718,15 +6708,7 @@ Class QStandardItem QStandardItem (0xb51bad80) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4fab180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4fab100) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -8547,15 +7529,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb4fab000) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb4fabdc0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb4fabac0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8572,25 +7546,9 @@ Class QItemEditorFactory QItemEditorFactory (0xb4fab880) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4d1e100) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4d1e080) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4d1e200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4d1e180) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8817,15 +7775,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb4d1e800) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d1e880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d1e8c0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -9778,15 +8728,7 @@ QActionGroup (0xb4c0df80) 0 QObject (0xb4c0dfc0) 0 primary-for QActionGroup (0xb4c0df80) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4c0d380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4c0d180) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9956,10 +8898,6 @@ QCommonStyle (0xb4c0df40) 0 QObject (0xb4b63040) 0 primary-for QStyle (0xb4b63000) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb4b63200) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10481,15 +9419,7 @@ Class QGraphicsItem QGraphicsItem (0xb4b63fc0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4b63080) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4b631c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -11262,20 +10192,8 @@ QGraphicsView (0xb4a4d880) 0 QPaintDevice (0xb4a4d9c0) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4a4da40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4a4db00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4a4da80) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -12527,10 +11445,6 @@ QDateEdit (0xb495b080) 0 QPaintDevice (0xb495b6c0) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb495b840) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -12690,10 +11604,6 @@ QDockWidget (0xb488d040) 0 QPaintDevice (0xb488d100) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb488d1c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12851,10 +11761,6 @@ QDialogButtonBox (0xb488d340) 0 QPaintDevice (0xb488d400) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb488d480) 0 Vtable for QMainWindow QMainWindow::_ZTV11QMainWindow: 64u entries @@ -13028,10 +11934,6 @@ QTextEdit (0xb488d600) 0 QPaintDevice (0xb488d740) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb488d840) 0 Vtable for QProgressBar QProgressBar::_ZTV12QProgressBar: 64u entries @@ -14034,10 +12936,6 @@ QFontComboBox (0xb4606600) 0 QPaintDevice (0xb4606700) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4606780) 0 Vtable for QToolBar QToolBar::_ZTV8QToolBar: 63u entries @@ -14449,20 +13347,12 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0xb4606ec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4606f40) 0 Class QGLFormat size=4 align=4 base size=4 base align=4 QGLFormat (0xb4606f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4606040) 0 Vtable for QGLContext QGLContext::_ZTV10QGLContext: 11u entries @@ -14608,178 +13498,38 @@ QGLPixelBuffer (0xb4606d00) 0 QPaintDevice (0xb4606e80) 0 primary-for QGLPixelBuffer (0xb4606d00) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb42df040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb42df0c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb42df140) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb42df1c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb42df240) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb42df2c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb42df340) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb42df3c0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb42df440) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb42df4c0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb42df540) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb42df5c0) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb42df640) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb42df880) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb42df900) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb42dfa00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb42dfb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb42dfbc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb42dfcc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb42dfd80) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb42dfe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb42dfe80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb42dff00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb42dff80) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb42df980) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb42dfdc0) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb42dffc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4047080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4047100) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4047180) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4047240) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4047300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4047380) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4047400) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb4047480) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.2.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtOpenGL.4.2.0.linux-gcc-ppc32.txt index 47e21c987..b2e504192 100644 --- a/tests/auto/bic/data/QtOpenGL.4.2.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.2.0.linux-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x32285460) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x322854d0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x3001bac0) 0 empty - QUintForSize<4> (0x32285620) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x32285700) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x32285770) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x3001bb40) 0 empty - QIntForSize<4> (0x322858c0) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x32285c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32285e38) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32285ee0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32285f88) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ad038) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ad0e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ad188) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ad230) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ad2d8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ad380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ad428) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ad4d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ad578) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ad620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ad6c8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322ad770) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x322ad7e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322adcb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322add20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322add90) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322ade00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322ade70) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322adee0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322adf50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x322adfc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32363038) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x323630a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32363118) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32363188) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x323631f8) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3001bc80) 0 QGenericArgument (0x32363310) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x323634d0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0x323635b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32363658) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x324743b8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32474700) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0x324747a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x324749d8) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0x3001bec0) 0 QString (0x3259fb60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3259fc40) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0x32697310) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32697850) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x326977a8) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0x3001bf80) 0 QObject (0x32697d20) 0 primary-for QIODevice (0x3001bf80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32697f18) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x327b6508) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x327b6578) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0x327b6dc8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x328c33f0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0x328c32a0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x328c36c8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x328c3620) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x328c37e0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x328c3888) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x328c3968) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x328c38f8) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x328c39d8) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x328c3a48) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x328c3b98) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x328c3c78) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x328c3c08) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x328c3ce8) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x328c3d58) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0x328c3d90) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x328c3fc0) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0x32884180) 0 QTextStream (0x329c2460) 0 primary-for QTextOStream (0x32884180) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x329c2738) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x329c27a8) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x329c26c8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x329c2818) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x329c2888) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x329c28f8) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x329c2968) 0 Class timespec size=8 align=4 @@ -738,70 +492,18 @@ Class timeval base size=8 base align=4 timeval (0x329c29d8) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x329c2a48) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x329c2ab8) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x329c2b98) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x329c2b28) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x329c2c08) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x329c2ce8) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x329c2c78) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x329c2d58) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x329c2e38) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x329c2dc8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x329c2ea8) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x329c2f18) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x329c2f88) 0 Class random_data size=28 align=4 @@ -872,10 +574,6 @@ QFile (0x328841c0) 0 QObject (0x32a157e0) 0 primary-for QIODevice (0x32884200) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32a15968) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -928,50 +626,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x32a15ab8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32a15b60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32a15bd0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32a15d58) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32a15cb0) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x32a15e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32a15770) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x32a15a48) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32bb5188) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32bb50e0) 0 Class QStringList size=4 align=4 @@ -979,30 +649,14 @@ Class QStringList QStringList (0x32884300) 0 QList (0x32bb5230) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x32bb5658) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x32bb56c8) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x32bb59d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32bb5af0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32bb5b98) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1059,10 +713,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x32bb5bd0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32bb5e38) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1174,15 +824,7 @@ Class QLocale base size=4 base align=4 QLocale (0x32c70188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32c70230) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32c702d8) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1277,285 +919,65 @@ Class QUrl base size=4 base align=4 QUrl (0x32c706c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32c70850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32c708c0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x32c70930) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32c70af0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32c70b98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32c70c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32c70ce8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32c70d90) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32c70e38) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32c70ee0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32c70f88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32c70118) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32c70658) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49070) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49118) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d491c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49268) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49310) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d493b8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49460) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49508) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d495b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49658) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d497a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49850) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d498f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d499a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49a48) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49af0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49b98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49ce8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49d90) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49e38) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49ee0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d49f88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63038) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d630e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63188) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63230) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d632d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63428) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d634d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63578) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63620) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d636c8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63770) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63818) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d638c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63968) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63a10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63ab8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63b60) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x32d63c08) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1582,45 +1004,17 @@ Class QVariant base size=16 base align=8 QVariant (0x32d63c78) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x32db5038) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x32db50e0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32db52a0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32db51f8) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x32db5460) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x32db53b8) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x32db5578) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32db5690) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1652,80 +1046,48 @@ Class QPoint base size=8 base align=4 QPoint (0x32db5bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32db5fc0) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x32db5e38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e722d8) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x32e72508) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e72578) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x32e726c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e72770) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x32e728f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e72c78) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x32e72f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e729a0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x32f081f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32f083f0) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x32f08620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32f087a8) 0 empty Class QLinkedListData size=20 align=4 @@ -1742,10 +1104,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x330630a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33063188) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1762,30 +1120,18 @@ Class QDate base size=4 base align=4 QDate (0x33063578) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33063738) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x330637a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33063968) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x330639d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33063b28) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1971,10 +1317,6 @@ QEventLoop (0x32884880) 0 QObject (0x33117578) 0 primary-for QEventLoop (0x32884880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33117738) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2081,20 +1423,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x33117b98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x331cf070) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x331cf0e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x331cf1f8) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2314,10 +1648,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x331cf930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x331cfa10) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2412,20 +1742,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x331cfe38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x331cfee0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x331cff50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x331cf150) 0 empty Class QMetaProperty size=20 align=4 @@ -2437,10 +1759,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x331cf620) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x331cfb28) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2497,10 +1815,6 @@ QLibrary (0x32884d00) 0 QObject (0x3329a230) 0 primary-for QLibrary (0x32884d00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3329a3b8) 0 Class QSemaphore size=4 align=4 @@ -2548,10 +1862,6 @@ Class QMutex base size=4 base align=4 QMutex (0x3329a658) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x3329a7e0) 0 Class QMutexLocker size=4 align=4 @@ -2563,45 +1873,21 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x3329a888) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x3329a930) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x3329a8c0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x3329aa48) 0 Class QWriteLocker size=4 align=4 base size=4 base align=4 QWriteLocker (0x3329a9d8) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3329ac78) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3329ace8) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x3329ad58) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x3329ac08) 0 Class QColor size=16 align=4 @@ -2618,20 +1904,8 @@ Class QPen base size=4 base align=4 QPen (0x3335a070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3335a1f8) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3335a3b8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3335a2d8) 0 Class QPolygon size=4 align=4 @@ -2639,15 +1913,7 @@ Class QPolygon QPolygon (0x32884dc0) 0 QVector (0x3335a428) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3335a7e0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3335a700) 0 Class QPolygonF size=4 align=4 @@ -2670,10 +1936,6 @@ Class QMatrix base size=48 base align=8 QMatrix (0x3335ace8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3335ad58) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2714,10 +1976,6 @@ QImage (0x32884e80) 0 QPaintDevice (0x3335ab60) 0 primary-for QImage (0x32884e80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x334331f8) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -2742,45 +2000,17 @@ Class QBrush base size=4 base align=4 QBrush (0x33433498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33433540) 0 empty Class QBrushData size=72 align=8 base size=72 base align=8 QBrushData (0x334335b0) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x334337e0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x33433700) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x334338f8) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x33433968) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x334339d8) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x33433888) 0 Class QGradient size=64 align=8 @@ -2810,30 +2040,14 @@ Class QTextLength base size=16 base align=8 QTextLength (0x33433ab8) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x33433e00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x33433cb0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33433b60) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33433348) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x334fe000) 0 Class QTextCharFormat size=8 align=4 @@ -2973,10 +2187,6 @@ QTextFrame (0x3352f280) 0 QObject (0x334fe5e8) 0 primary-for QTextObject (0x3352f2c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x334fea80) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -3001,25 +2211,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x334fec40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x334fefc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x334fe700) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x335d5038) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x335d51f8) 0 empty Class QFontMetrics size=4 align=4 @@ -3079,20 +2277,12 @@ QTextDocument (0x3352f300) 0 QObject (0x335d54d0) 0 primary-for QTextDocument (0x3352f300) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x335d5690) 0 Class QTextOption size=32 align=8 base size=28 base align=8 QTextOption (0x335d56c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x335d57a8) 0 Class QTextTableCell size=8 align=4 @@ -3133,10 +2323,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x335d5c08) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x335d5d90) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3434,15 +2620,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x336a66c8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x336a6d58) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x336a6a10) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3741,15 +2919,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x3376c1f8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3376c498) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3376c3b8) 0 Class QTextLine size=8 align=4 @@ -3798,10 +2968,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x3376c8c0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x3376c9d8) 0 Class QTextCursor size=4 align=4 @@ -3824,15 +2990,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x3376cf50) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33827000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3376c2d8) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -4196,10 +3354,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x3392c4d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3392c888) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -4230,20 +3384,8 @@ QItemSelectionModel (0x3384e240) 0 QObject (0x3392c930) 0 primary-for QItemSelectionModel (0x3384e240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3392cab8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3392cc08) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3392cb60) 0 Class QItemSelection size=4 align=4 @@ -4450,20 +3592,12 @@ QAbstractSpinBox (0x3384e480) 0 QPaintDevice (0x33a260a8) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33a262a0) 0 Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0x33a262d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33a263b8) 0 empty Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -4671,15 +3805,7 @@ QStyle (0x3384e6c0) 0 QObject (0x33a26818) 0 primary-for QStyle (0x3384e6c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33a269d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33a26a48) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -4938,10 +4064,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x3384e940) 0 QStyleOption (0x33a26658) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33b51070) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -4968,10 +4090,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x3384ea80) 0 QStyleOption (0x33b514d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33b516c8) 0 Class QStyleOptionButton size=64 align=4 @@ -4979,10 +4097,6 @@ Class QStyleOptionButton QStyleOptionButton (0x3384eb00) 0 QStyleOption (0x33b515e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33b518c0) 0 Class QStyleOptionTab size=72 align=4 @@ -4997,10 +4111,6 @@ QStyleOptionTabV2 (0x3384ebc0) 0 QStyleOptionTab (0x3384ec00) 0 QStyleOption (0x33b519d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33b51cb0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5027,10 +4137,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x3384ed40) 0 QStyleOption (0x33b51f50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33b51700) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5056,10 +4162,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x3384ee40) 0 QStyleOption (0x33c00150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33c00348) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -5100,15 +4202,7 @@ QStyleOptionSpinBox (0x33c3d040) 0 QStyleOptionComplex (0x33c3d080) 0 QStyleOption (0x33c00a80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x33c00d20) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x33c00c78) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5117,10 +4211,6 @@ QStyleOptionQ3ListView (0x33c3d0c0) 0 QStyleOptionComplex (0x33c3d100) 0 QStyleOption (0x33c00b98) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33c00f88) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5328,10 +4418,6 @@ QAbstractItemView (0x33c3d4c0) 0 QPaintDevice (0x33c96508) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33c96700) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -6096,10 +5182,6 @@ QMessageBox (0x33c3dcc0) 0 QPaintDevice (0x33d7e498) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33d7e6c8) 0 Vtable for QProgressDialog QProgressDialog::_ZTV15QProgressDialog: 66u entries @@ -6350,10 +5432,6 @@ QFileDialog (0x33c3df00) 0 QPaintDevice (0x33d7eab8) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33d7ecb0) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -6439,10 +5517,6 @@ QAbstractPrintDialog (0x33e67000) 0 QPaintDevice (0x33d7ee38) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33d7e1c0) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -6864,10 +5938,6 @@ QImageIOPlugin (0x33e67480) 0 QFactoryInterface (0x33e928c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x33e674c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33e92ab8) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -7215,50 +6285,14 @@ Class QPainter base size=4 base align=4 QPainter (0x33f63e38) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34015150) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x340152d8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x340151f8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x34015498) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x340153b8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x34015658) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x34015578) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x34015818) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x34015738) 0 Class QStylePainter size=12 align=4 @@ -7276,25 +6310,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x34015ab8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x34015f50) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x34015e70) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x34015cb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34015b98) 0 empty Class QPainterPathStroker size=4 align=4 @@ -7306,15 +6328,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x34104230) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x341042d8) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34104460) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -7349,25 +6363,13 @@ Class QPaintEngine QPaintEngine (0x34104348) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34104658) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x341045b0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x341046c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x341047e0) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -7457,15 +6459,7 @@ QStringListModel (0x33e67900) 0 QObject (0x34104af0) 0 primary-for QAbstractItemModel (0x33e67980) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x34104dc8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x34104ce8) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7708,15 +6702,7 @@ Class QStandardItem QStandardItem (0x341f7508) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x341f78c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x341f7818) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -8537,15 +7523,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x343616c8) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x34361b28) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x34361a10) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8562,25 +7540,9 @@ Class QItemEditorFactory QItemEditorFactory (0x34361930) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x34361f18) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x34361e38) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x343615b0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x34361070) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8807,15 +7769,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x34424888) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34424968) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x344249d8) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -9768,15 +8722,7 @@ QActionGroup (0x345ae240) 0 QObject (0x34577c08) 0 primary-for QActionGroup (0x345ae240) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3462d188) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3462d0e0) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9946,10 +8892,6 @@ QCommonStyle (0x345ae3c0) 0 QObject (0x3462d700) 0 primary-for QStyle (0x345ae400) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x3462d8f8) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10471,15 +9413,7 @@ Class QGraphicsItem QGraphicsItem (0x347014d0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x347017e0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x34701850) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -11252,20 +10186,8 @@ QGraphicsView (0x347fc100) 0 QPaintDevice (0x347abee0) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x347abc78) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34845070) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x347abfc0) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -12517,10 +11439,6 @@ QDateEdit (0x347fce00) 0 QPaintDevice (0x3494af88) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3494a8f8) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -12680,10 +11598,6 @@ QDockWidget (0x347fcfc0) 0 QPaintDevice (0x34a1d150) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34a1d3b8) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12841,10 +11755,6 @@ QDialogButtonBox (0x34a270c0) 0 QPaintDevice (0x34a1d5e8) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34a1d7e0) 0 Vtable for QMainWindow QMainWindow::_ZTV11QMainWindow: 64u entries @@ -13018,10 +11928,6 @@ QTextEdit (0x34a271c0) 0 QPaintDevice (0x34a1da10) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34a1dcb0) 0 Vtable for QProgressBar QProgressBar::_ZTV12QProgressBar: 64u entries @@ -14024,10 +12930,6 @@ QFontComboBox (0x34a27ac0) 0 QPaintDevice (0x34c3a188) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34c3a380) 0 Vtable for QToolBar QToolBar::_ZTV8QToolBar: 63u entries @@ -14439,20 +13341,12 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0x34c3acb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34c3ae38) 0 Class QGLFormat size=4 align=4 base size=4 base align=4 QGLFormat (0x34c3ae70) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34c3a070) 0 Vtable for QGLContext QGLContext::_ZTV10QGLContext: 11u entries @@ -14598,178 +13492,38 @@ QGLPixelBuffer (0x34a27f80) 0 QPaintDevice (0x34ea8268) 0 primary-for QGLPixelBuffer (0x34a27f80) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x34f1b818) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34f1bf50) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x34f38d58) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x34f88f18) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x34fa3540) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x34fd6188) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x34fd6e38) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x34ff50e0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x350880a8) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x35088230) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x350883b8) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x35088540) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x350886c8) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x350bfbd0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x350bfdc8) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35112508) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x351937e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35193bd0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35193fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x351cf6c8) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x351cf7e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x351cf968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x351f02a0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x351f0b98) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x351f0d90) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x3521c348) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x3521c8c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3521ce38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3521cfc0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3521c850) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35258380) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x352587e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x35258af0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x35258b98) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x352781c0) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.2.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.4.2.0.macx-gcc-ia32.txt index bf1d004fd..96a46d3af 100644 --- a/tests/auto/bic/data/QtOpenGL.4.2.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.2.0.macx-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x1721500) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x1721580) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x1721740) 0 empty - QUintForSize<4> (0x1721780) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x1721880) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x1721900) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x1721ac0) 0 empty - QIntForSize<4> (0x1721b00) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x1749000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1749240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1749300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17493c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1749480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1749540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1749600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17496c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1749780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1749840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1749900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17499c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1749a80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1749b40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1749c00) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0x1749f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17ad000) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0x17ad700) 0 QBasicAtomic (0x17ad740) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x17ad9c0) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0x183d700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x183dac0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x183df40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x183dfc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x193b040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x193b0c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x193b140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x193b1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x193b240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x193b2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x193b340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x193b3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x193b440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x193b4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x193b540) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x193bd40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1aa1140) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x1aa1d80) 0 QString (0x1aa1dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1aa1ec0) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x1bac740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1bacd80) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1bacc00) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1baca00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1bac1c0) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1cda180) 0 QGenericArgument (0x1cda1c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1cda480) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1cda400) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1cda700) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1cda640) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x1cdad40) 0 QObject (0x1cdad80) 0 primary-for QIODevice (0x1cdad40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1cdafc0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1da2600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1da2840) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1da28c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1da2ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1da2a00) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x1da2b80) 0 QList (0x1da2bc0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1e37040) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1e370c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x1e37f00) 0 QObject (0x1e37f80) 0 primary-for QIODevice (0x1e37f40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ee1000) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1ee1040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ee1100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ee1180) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1ee1340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1ee1280) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1ee1400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ee1540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ee15c0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1ee1600) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ee18c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1ee1dc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ee1e40) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x2115180) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2115440) 0 Class QTextStreamManipulator size=24 align=4 @@ -1078,35 +836,15 @@ Class rlimit base size=16 base align=4 rlimit (0x2115fc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x21b2680) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x21b2700) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x21b2600) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x21b2780) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x21b2800) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x21b2880) 0 Class QVectorData size=16 align=4 @@ -1244,15 +982,7 @@ Class QLocale base size=4 base align=4 QLocale (0x22d1780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22d1840) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x22d1900) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1279,270 +1009,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x22d1b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22d1d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22d1dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22d1e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22d1f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22d1200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22d1700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c21c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c24c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c27c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23c2f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23db9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23dba80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23dbb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23dbc00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23dbcc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23dbd80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23dbe40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23dbf00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23dbfc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23f6080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23f6140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23f6200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23f62c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1569,60 +1087,20 @@ Class QVariant base size=12 base align=4 QVariant (0x23f6340) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23f6880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23f6940) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x23f6b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x23f6a80) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x23f6d40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x23f6c80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x23f6ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23f6500) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x23f6680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2493000) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x2493080) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1700,15 +1178,7 @@ Class QUrl base size=4 base align=4 QUrl (0x24938c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2493a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2493b00) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1735,10 +1205,6 @@ QEventLoop (0x2493b80) 0 QObject (0x2493bc0) 0 primary-for QEventLoop (0x2493b80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2493dc0) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1783,20 +1249,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x2493340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x257e080) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x257e100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x257e240) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1966,10 +1424,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x257e980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x257ea80) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2076,20 +1530,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x261b5c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x261b680) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x261b700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x261b7c0) 0 empty Class QMetaProperty size=20 align=4 @@ -2101,10 +1547,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x261b880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x261b940) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2286,10 +1728,6 @@ QLibrary (0x26b30c0) 0 QObject (0x26b3100) 0 primary-for QLibrary (0x26b30c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x26b32c0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2326,10 +1764,6 @@ Class QMutex base size=4 base align=4 QMutex (0x26b3600) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x26b37c0) 0 Class QMutexLocker size=4 align=4 @@ -2341,20 +1775,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x26b3880) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x26b3940) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x26b38c0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x26b3a80) 0 Class QWriteLocker size=4 align=4 @@ -2412,10 +1838,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2772380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2772480) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2427,70 +1849,42 @@ Class QDate base size=4 base align=4 QDate (0x2772700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2772900) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x2772980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2772b80) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x2772c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2772d80) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x2772e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2772e40) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x280a1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x280a640) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x280a940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x280a9c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x280ab40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x280ac00) 0 empty Class QLinkedListData size=20 align=4 @@ -2502,40 +1896,24 @@ Class QSize base size=8 base align=4 QSize (0x2917000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2917400) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x29177c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2917bc0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x29170c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2917340) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x29e3080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x29e3240) 0 empty Class QSharedData size=4 align=4 @@ -2583,10 +1961,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x29e3c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x29e3e40) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2625,15 +1999,7 @@ Class QMacMime QMacMime (0x29e3140) 0 vptr=((& QMacMime::_ZTV8QMacMime) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2ae1100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2ae1040) 0 Vtable for QMacPasteboardMime QMacPasteboardMime::_ZTV18QMacPasteboardMime: 10u entries @@ -2934,15 +2300,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0x2b74d80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2b74f40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2b74e80) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3231,15 +2589,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2bfc600) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2bfc740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2bfc7c0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3628,40 +2978,16 @@ Class QPaintDevice QPaintDevice (0x2c60340) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2cbd140) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2cbd1c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2cbd240) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2cbd0c0) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0x2cbd040) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2cbd680) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2cbd580) 0 Class QPolygon size=4 align=4 @@ -3669,15 +2995,7 @@ Class QPolygon QPolygon (0x2cbd700) 0 QVector (0x2cbd740) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2cbdb80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2cbda80) 0 Class QPolygonF size=4 align=4 @@ -3690,10 +3008,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0x2cbdf40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2cbdfc0) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3718,10 +3032,6 @@ QImage (0x2d65140) 0 QPaintDevice (0x2d65180) 0 primary-for QImage (0x2d65140) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d65540) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -3746,45 +3056,17 @@ Class QBrush base size=4 base align=4 QBrush (0x2d65a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d65b40) 0 empty Class QBrushData size=72 align=4 base size=72 base align=4 QBrushData (0x2d65bc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2d65e40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2d65d40) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0x2d65f80) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0x2d65200) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0x2d65380) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0x2d65f00) 0 Class QGradient size=56 align=4 @@ -4180,10 +3462,6 @@ QAbstractPrintDialog (0x2f59c80) 0 QPaintDevice (0x2f59d40) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2f59fc0) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -4434,10 +3712,6 @@ QFileDialog (0x305c280) 0 QPaintDevice (0x305c340) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c600) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4844,10 +4118,6 @@ QMessageBox (0x305c900) 0 QPaintDevice (0x3134000) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3134280) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 67u entries @@ -5202,25 +4472,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x3134dc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x31e8100) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x31e8000) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x3134100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e81c0) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5275,15 +4533,7 @@ Class QGraphicsItem QGraphicsItem (0x31e8540) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31e88c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31e8940) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -5872,10 +5122,6 @@ Class QPen base size=4 base align=4 QPen (0x32e9400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32e9580) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -6044,60 +5290,20 @@ Class QTextOption base size=24 base align=4 QTextOption (0x3366100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3366200) 0 Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x3366240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33667c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3366980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3366880) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3366b80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3366a80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3366d80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3366c80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3366f40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3366e40) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 65u entries @@ -6352,20 +5558,8 @@ QGraphicsView (0x34b3480) 0 QPaintDevice (0x34b3580) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34b37c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34b3900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x34b3840) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 7u entries @@ -6392,10 +5586,6 @@ Class QIcon base size=4 base align=4 QIcon (0x34b3e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34b3fc0) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -6551,10 +5741,6 @@ QImageIOPlugin (0x359ac80) 0 QFactoryInterface (0x35798c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x3579880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3579b00) 0 Class QImageReader size=4 align=4 @@ -6730,15 +5916,7 @@ QActionGroup (0x36294c0) 0 QObject (0x3629500) 0 primary-for QActionGroup (0x36294c0) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3629780) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x36296c0) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -7043,10 +6221,6 @@ QAbstractSpinBox (0x36d0300) 0 QPaintDevice (0x36d0380) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36d0600) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -7254,15 +6428,7 @@ QStyle (0x36d0b80) 0 QObject (0x36d0bc0) 0 primary-for QStyle (0x36d0b80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36d0e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36d0e80) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -7521,10 +6687,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x37ed580) 0 QStyleOption (0x37ed5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37ed880) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -7551,10 +6713,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x37ede00) 0 QStyleOption (0x37ede40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37ed600) 0 Class QStyleOptionButton size=64 align=4 @@ -7562,10 +6720,6 @@ Class QStyleOptionButton QStyleOptionButton (0x37edfc0) 0 QStyleOption (0x37ed080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3891140) 0 Class QStyleOptionTab size=72 align=4 @@ -7580,10 +6734,6 @@ QStyleOptionTabV2 (0x3891280) 0 QStyleOptionTab (0x38912c0) 0 QStyleOption (0x3891300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3891680) 0 Class QStyleOptionToolBar size=68 align=4 @@ -7610,10 +6760,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x3891a40) 0 QStyleOption (0x3891a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3891d00) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -7639,10 +6785,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x3891880) 0 QStyleOption (0x3891ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3926180) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -7683,15 +6825,7 @@ QStyleOptionSpinBox (0x3926b00) 0 QStyleOptionComplex (0x3926b40) 0 QStyleOption (0x3926b80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3926f00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3926e40) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -7700,10 +6834,6 @@ QStyleOptionQ3ListView (0x3926cc0) 0 QStyleOptionComplex (0x3926d00) 0 QStyleOption (0x3926d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3990000) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7794,10 +6924,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x3990c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3990600) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -7828,20 +6954,8 @@ QItemSelectionModel (0x3990c00) 0 QObject (0x3a35000) 0 primary-for QItemSelectionModel (0x3990c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3a351c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3a35340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3a35280) 0 Class QItemSelection size=4 align=4 @@ -7971,10 +7085,6 @@ QAbstractItemView (0x3a35500) 0 QPaintDevice (0x3a35600) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3a35880) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -8312,15 +7422,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3b25300) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3b25880) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x3b25740) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8461,15 +7563,7 @@ QListView (0x3b25ac0) 0 QPaintDevice (0x3b25c00) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b25000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b25f00) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -8762,15 +7856,7 @@ Class QStandardItem QStandardItem (0x3bb7a40) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3bb7e80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3bb7dc0) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -9288,35 +8374,15 @@ QTreeView (0x3ce0b40) 0 QPaintDevice (0x3ce0c80) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3ce0f40) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x3ce0e40) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x3dca240) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x3dca140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3dca400) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3dca340) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -10197,15 +9263,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x3fce1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3fce280) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3fce440) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -10240,20 +9298,12 @@ Class QPaintEngine QPaintEngine (0x3fce300) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3fce680) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x3fce5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3fce700) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7u entries @@ -10346,10 +9396,6 @@ QCommonStyle (0x3fcedc0) 0 QObject (0x3fcee40) 0 primary-for QStyle (0x3fcee00) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x3fce880) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10723,30 +9769,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0x40b4280) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x413e180) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x413e000) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x413e540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x413e440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x413e640) 0 Class QTextCharFormat size=8 align=4 @@ -10801,15 +9831,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x413eb80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x413ee80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x413ed80) 0 Class QTextLine size=8 align=4 @@ -10859,15 +9881,7 @@ QTextDocument (0x4250040) 0 QObject (0x4250080) 0 primary-for QTextDocument (0x4250040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4250280) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x42503c0) 0 Class QTextCursor size=4 align=4 @@ -10879,15 +9893,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x4250500) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4250740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4250640) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -11049,10 +10055,6 @@ QTextFrame (0x4250840) 0 QObject (0x4250cc0) 0 primary-for QTextObject (0x4250a00) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43064c0) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -11077,25 +10079,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x4306700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4306b00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4306bc0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x4306c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4306e80) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -12057,10 +11047,6 @@ QDateEdit (0x44e5580) 0 QPaintDevice (0x44e5680) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44e5880) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12221,10 +11207,6 @@ QDialogButtonBox (0x44e5b40) 0 QPaintDevice (0x44e5bc0) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44e5e00) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -12304,10 +11286,6 @@ QDockWidget (0x44e5e40) 0 QPaintDevice (0x44e5ec0) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4597000) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12469,10 +11447,6 @@ QFontComboBox (0x4597280) 0 QPaintDevice (0x4597340) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4597580) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -14041,10 +13015,6 @@ QTextEdit (0x4835140) 0 QPaintDevice (0x4835240) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4835580) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -14472,20 +13442,12 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0x4931200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x49313c0) 0 Class QGLFormat size=4 align=4 base size=4 base align=4 QGLFormat (0x4931400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x49315c0) 0 Vtable for QGLContext QGLContext::_ZTV10QGLContext: 10u entries @@ -14630,188 +13592,40 @@ QGLPixelBuffer (0x4931b80) 0 QPaintDevice (0x4931bc0) 0 primary-for QGLPixelBuffer (0x4931b80) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4af82c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4b20140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4b761c0) 0 empty -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x4bb3640) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4bb3d40) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0x4c0d440) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4c2c940) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4c2cb00) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4c2ccc0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4c2ce80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4d22400) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x4d22640) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4d42c80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4d42f80) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4d64600) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4d87940) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x4e35b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e614c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e61740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e61cc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e7e040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e7e4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e7ebc0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e9c200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e9c480) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e9c540) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e9c7c0) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x4e9c940) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x4e9c980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4ee4680) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4ee4740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4ee4bc0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4ee4c80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4f08040) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4f08380) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x4f086c0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x4f3b100) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.2.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtOpenGL.4.2.0.macx-gcc-ppc32.txt index 6008f751c..d2c8ab319 100644 --- a/tests/auto/bic/data/QtOpenGL.4.2.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.2.0.macx-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x17190c0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x1719140) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x1719300) 0 empty - QUintForSize<4> (0x1719340) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x1719440) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x17194c0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x1719680) 0 empty - QIntForSize<4> (0x17196c0) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x1719bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1719e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1719ec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1719f80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x174a040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x174a100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x174a1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x174a280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x174a340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x174a400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x174a4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x174a580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x174a640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x174a700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x174a7c0) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0x174aac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x174abc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0x17ca1c0) 0 QBasicAtomic (0x17ca200) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x17ca480) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0x185d1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x185d580) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x185da00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x185da80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x185db00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x185db80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x185dc00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x185dc80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x185dd00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x185dd80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x185de00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x185de80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x185df00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x185df80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19ab000) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x19ab800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19abc40) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x1b66840) 0 QString (0x1b66880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b66980) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x1bd4180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1bd47c0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1bd4640) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1bd4b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1bd4a40) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1bd4d40) 0 QGenericArgument (0x1bd4d80) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1bd4440) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1bd4fc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1d071c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d07100) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x1d07800) 0 QObject (0x1d07840) 0 primary-for QIODevice (0x1d07800) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d07a80) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1dc6080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dc62c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1dc6340) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1dc6540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1dc6480) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x1dc6600) 0 QList (0x1dc6640) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1dc6b00) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1dc6b80) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x1e62e00) 0 QObject (0x1e62e80) 0 primary-for QIODevice (0x1e62e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e62440) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1e62540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f09040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f090c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1f09280) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1f091c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1f09340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f09480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f09500) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1f09540) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f09800) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1f09d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f09d80) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x1fd1d40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1fd1400) 0 Class QTextStreamManipulator size=24 align=4 @@ -1088,40 +846,16 @@ Class rlimit base size=16 base align=8 rlimit (0x2164cc0) 0 -Class OSReadSwapInt64(const volatile void*, uintptr_t):: - size=8 align=8 - base size=8 base align=8 -OSReadSwapInt64(const volatile void*, uintptr_t):: (0x2164ec0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x21a8580) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x21a8600) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x21a8500) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x21a8680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x21a8700) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x21a8780) 0 Class QVectorData size=16 align=4 @@ -1259,15 +993,7 @@ Class QLocale base size=4 base align=4 QLocale (0x22ce6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22ce780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x22ce840) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1294,270 +1020,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x22cea40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22cec40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ced00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22cedc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22cee80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22cef40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ce140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ce640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b51c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b54c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b57c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23b5f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d00c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d03c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d06c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d09c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23d0fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23eb080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23eb140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23eb200) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1584,60 +1098,20 @@ Class QVariant base size=16 base align=4 QVariant (0x23eb280) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23eb7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x23eb880) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x23eba80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x23eb9c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x23ebc80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x23ebbc0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x23ebe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23ebf40) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x23eb440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x23eb540) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x23ebd00) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1715,15 +1189,7 @@ Class QUrl base size=4 base align=4 QUrl (0x2489800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x24899c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2489a40) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1750,10 +1216,6 @@ QEventLoop (0x2489ac0) 0 QObject (0x2489b00) 0 primary-for QEventLoop (0x2489ac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2489d00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1798,20 +1260,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x2489f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2489ec0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x2578040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2578180) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1981,10 +1435,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x25788c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25789c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1541,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x26134c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2613580) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x2613600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26136c0) 0 empty Class QMetaProperty size=20 align=4 @@ -2116,10 +1558,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x2613780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2613840) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2301,10 +1739,6 @@ QLibrary (0x26b1000) 0 QObject (0x26b1040) 0 primary-for QLibrary (0x26b1000) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x26b1200) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2341,10 +1775,6 @@ Class QMutex base size=4 base align=4 QMutex (0x26b1540) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x26b1700) 0 Class QMutexLocker size=4 align=4 @@ -2356,20 +1786,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x26b17c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x26b1880) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x26b1800) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x26b19c0) 0 Class QWriteLocker size=4 align=4 @@ -2427,10 +1849,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2768300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2768400) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2442,70 +1860,42 @@ Class QDate base size=4 base align=4 QDate (0x2768680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2768880) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x2768900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2768b00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x2768b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2768d00) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x2768d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2768c40) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x280a140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x280a5c0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x280a8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x280a940) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x280aac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x280ab80) 0 empty Class QLinkedListData size=20 align=4 @@ -2517,40 +1907,24 @@ Class QSize base size=8 base align=4 QSize (0x280a500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x290c340) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x290c700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x290cb00) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x290cf80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x290c200) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x29d8000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x29d81c0) 0 empty Class QSharedData size=4 align=4 @@ -2598,10 +1972,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x29d8c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x29d8dc0) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2640,15 +2010,7 @@ Class QMacMime QMacMime (0x29d8fc0) 0 vptr=((& QMacMime::_ZTV8QMacMime) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2ad4080) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x29d8f40) 0 Vtable for QMacPasteboardMime QMacPasteboardMime::_ZTV18QMacPasteboardMime: 10u entries @@ -2949,15 +2311,7 @@ Class QInputMethodEvent::Attribute base size=28 base align=4 QInputMethodEvent::Attribute (0x2b64d40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2b64f00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2b64e40) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3246,15 +2600,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2bea5c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2bea700) 0 - -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2bea780) 0 + Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3643,40 +2989,16 @@ Class QPaintDevice QPaintDevice (0x2c520c0) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2cb0100) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2cb0180) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2cb0200) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2cb0080) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0x2cb0000) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2cb0640) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2cb0540) 0 Class QPolygon size=4 align=4 @@ -3684,15 +3006,7 @@ Class QPolygon QPolygon (0x2cb06c0) 0 QVector (0x2cb0700) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2cb0b40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2cb0a40) 0 Class QPolygonF size=4 align=4 @@ -3705,10 +3019,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0x2cb0f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2cb0f80) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3733,10 +3043,6 @@ QImage (0x2d58100) 0 QPaintDevice (0x2d58140) 0 primary-for QImage (0x2d58100) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d58500) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -3761,45 +3067,17 @@ Class QBrush base size=4 base align=4 QBrush (0x2d58a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d58b00) 0 empty Class QBrushData size=72 align=4 base size=72 base align=4 QBrushData (0x2d58b80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2d58e00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2d58d00) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2d58f40) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2d58fc0) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2d58240) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2d58ec0) 0 Class QGradient size=56 align=4 @@ -4195,10 +3473,6 @@ QAbstractPrintDialog (0x2f54c00) 0 QPaintDevice (0x2f54cc0) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2f54f40) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -4449,10 +3723,6 @@ QFileDialog (0x3056240) 0 QPaintDevice (0x3056300) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30565c0) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4859,10 +4129,6 @@ QMessageBox (0x30568c0) 0 QPaintDevice (0x3056fc0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313e240) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 67u entries @@ -5217,25 +4483,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x313ed80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x31eb0c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x313ef00) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x313efc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31eb180) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5290,15 +4544,7 @@ Class QGraphicsItem QGraphicsItem (0x31eb500) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31eb880) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31eb900) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -5887,10 +5133,6 @@ Class QPen base size=4 base align=4 QPen (0x32ec3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32ec540) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -6059,60 +5301,20 @@ Class QTextOption base size=24 base align=4 QTextOption (0x33690c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33691c0) 0 Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x3369240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33697c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3369980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3369880) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3369b80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3369a80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3369d80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3369c80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3369f40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3369e40) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 65u entries @@ -6367,20 +5569,8 @@ QGraphicsView (0x34b7480) 0 QPaintDevice (0x34b7580) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x34b77c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34b7900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x34b7840) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 7u entries @@ -6407,10 +5597,6 @@ Class QIcon base size=4 base align=4 QIcon (0x34b7e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34b7fc0) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -6566,10 +5752,6 @@ QImageIOPlugin (0x35bdb80) 0 QFactoryInterface (0x359e8c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x359e880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x359eb00) 0 Class QImageReader size=4 align=4 @@ -6745,15 +5927,7 @@ QActionGroup (0x364d4c0) 0 QObject (0x364d500) 0 primary-for QActionGroup (0x364d4c0) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x364d780) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x364d6c0) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -7058,10 +6232,6 @@ QAbstractSpinBox (0x36f3300) 0 QPaintDevice (0x36f3380) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36f3600) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -7269,15 +6439,7 @@ QStyle (0x36f3b80) 0 QObject (0x36f3bc0) 0 primary-for QStyle (0x36f3b80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36f3e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36f3e80) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -7536,10 +6698,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x3812580) 0 QStyleOption (0x38125c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3812880) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -7566,10 +6724,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x3812e00) 0 QStyleOption (0x3812e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3812600) 0 Class QStyleOptionButton size=64 align=4 @@ -7577,10 +6731,6 @@ Class QStyleOptionButton QStyleOptionButton (0x3812fc0) 0 QStyleOption (0x3812080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x38b3140) 0 Class QStyleOptionTab size=72 align=4 @@ -7595,10 +6745,6 @@ QStyleOptionTabV2 (0x38b3280) 0 QStyleOptionTab (0x38b32c0) 0 QStyleOption (0x38b3300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x38b3680) 0 Class QStyleOptionToolBar size=68 align=4 @@ -7625,10 +6771,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x38b3a40) 0 QStyleOption (0x38b3a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x38b3d00) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -7654,10 +6796,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x38b3880) 0 QStyleOption (0x38b3ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3949180) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -7698,15 +6836,7 @@ QStyleOptionSpinBox (0x3949b00) 0 QStyleOptionComplex (0x3949b40) 0 QStyleOption (0x3949b80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3949f00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3949e40) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -7715,10 +6845,6 @@ QStyleOptionQ3ListView (0x3949cc0) 0 QStyleOptionComplex (0x3949d00) 0 QStyleOption (0x3949d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x39b3000) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7809,10 +6935,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x39b3c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x39b3600) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -7843,20 +6965,8 @@ QItemSelectionModel (0x39b3c00) 0 QObject (0x3a58000) 0 primary-for QItemSelectionModel (0x39b3c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3a581c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3a58340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3a58280) 0 Class QItemSelection size=4 align=4 @@ -7986,10 +7096,6 @@ QAbstractItemView (0x3a58500) 0 QPaintDevice (0x3a58600) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3a58880) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -8327,15 +7433,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3b47300) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3b47880) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x3b47740) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8476,15 +7574,7 @@ QListView (0x3b47ac0) 0 QPaintDevice (0x3b47c00) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b47000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b47f00) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -8777,15 +7867,7 @@ Class QStandardItem QStandardItem (0x3bdaa40) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3bdae80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3bdadc0) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -9303,35 +8385,15 @@ QTreeView (0x3d01b40) 0 QPaintDevice (0x3d01c80) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3d01f40) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x3d01e40) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x3ded240) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x3ded140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3ded400) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3ded340) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -10212,15 +9274,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x3fef1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3fef280) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3fef440) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -10255,20 +9309,12 @@ Class QPaintEngine QPaintEngine (0x3fef300) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3fef700) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x3fef640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3fef780) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7u entries @@ -10361,10 +9407,6 @@ QCommonStyle (0x3fefe40) 0 QObject (0x3fefec0) 0 primary-for QStyle (0x3fefe80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x3feff80) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10738,30 +9780,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0x40d0500) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x415e200) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x415e080) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x415e5c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x415e4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x415e6c0) 0 Class QTextCharFormat size=8 align=4 @@ -10816,15 +9842,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x415ec00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x415ef00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x415ee00) 0 Class QTextLine size=8 align=4 @@ -10874,15 +9892,7 @@ QTextDocument (0x4270100) 0 QObject (0x4270140) 0 primary-for QTextDocument (0x4270100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4270340) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4270480) 0 Class QTextCursor size=4 align=4 @@ -10894,15 +9904,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x42705c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4270800) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4270700) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -11064,10 +10066,6 @@ QTextFrame (0x4270d80) 0 QObject (0x4321000) 0 primary-for QTextObject (0x4270f80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4321540) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -11092,25 +10090,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x4321780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4321b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4321c40) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x4321d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4321f00) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -12072,10 +11058,6 @@ QDateEdit (0x44fb600) 0 QPaintDevice (0x44fb700) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44fb900) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12236,10 +11218,6 @@ QDialogButtonBox (0x44fbbc0) 0 QPaintDevice (0x44fbc40) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44fbe80) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -12319,10 +11297,6 @@ QDockWidget (0x44fbec0) 0 QPaintDevice (0x44fbf40) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x45b7080) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12484,10 +11458,6 @@ QFontComboBox (0x45b7300) 0 QPaintDevice (0x45b73c0) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x45b7600) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -14056,10 +13026,6 @@ QTextEdit (0x484a1c0) 0 QPaintDevice (0x484a2c0) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x484a600) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -14487,20 +13453,12 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0x4951280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4951440) 0 Class QGLFormat size=4 align=4 base size=4 base align=4 QGLFormat (0x4951480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4951640) 0 Vtable for QGLContext QGLContext::_ZTV10QGLContext: 10u entries @@ -14645,188 +13603,40 @@ QGLPixelBuffer (0x4951c00) 0 QPaintDevice (0x4951c40) 0 primary-for QGLPixelBuffer (0x4951c00) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4b18340) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4b411c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4b95240) 0 empty -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x4bd36c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4bd3dc0) 0 -Class QVectorTypedData - size=40 align=4 - base size=40 base align=4 -QVectorTypedData (0x4c2c4c0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4c4a9c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4c4ab80) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4c4ad40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4c4af00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4d33480) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x4d336c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4d52d00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4d83000) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4d83680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4da79c0) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x4e54c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e83540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e837c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e83d40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4ea00c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4ea0540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4ea0c40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4ebe280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4ebe500) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4ebe5c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4ebe840) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x4ebe9c0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x4ef1000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4ef1740) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4ef1800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4ef1c80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4ef1d40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4f280c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4f28400) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x4f28740) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x4f5a180) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.2.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.4.2.0.win32-gcc-ia32.txt index dcbaefb4c..b312b0ae6 100644 --- a/tests/auto/bic/data/QtOpenGL.4.2.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.2.0.win32-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xa9db00) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xa9dc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xa9df00) 0 empty - QUintForSize<4> (0xac3000) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xac3180) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xac3240) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xac34c0) 0 empty - QIntForSize<4> (0xac3580) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xaf4380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0aa80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ac00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ad80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0af00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb36080) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb60f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb97380) 0 empty Class QBasicAtomic size=4 align=4 @@ -171,75 +81,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc4ab00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd72780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd84e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd940c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd84980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd9ae40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd94780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda58c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda0080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde94c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde9d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef480) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xee1240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee1780) 0 Class QCharRef size=8 align=4 @@ -282,10 +132,6 @@ Class QConstString QConstString (0x11f2dc0) 0 QString (0x11f2e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1260140) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -348,10 +194,6 @@ Class QListData base size=4 base align=4 QListData (0x12d61c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13db180) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -376,15 +218,7 @@ Class QTextCodec QTextCodec (0xee11c0) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13ff480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc5c5c0) 0 Class QTextEncoder size=32 align=4 @@ -407,25 +241,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x144a300) 0 QGenericArgument (0x144a340) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1460ac0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x144a8c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1490340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1476f40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -517,10 +339,6 @@ QIODevice (0x13b4a40) 0 QObject (0x150ab40) 0 primary-for QIODevice (0x13b4a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x150ae40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -540,25 +358,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xee10c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15d8c00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x15d8f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x15f04c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x15f0380) 0 Class QStringList size=4 align=4 @@ -566,15 +372,7 @@ Class QStringList QStringList (0xee1140) 0 QList (0x15f0740) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x15f0600) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x15f05c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -703,50 +501,22 @@ QFile (0x1709080) 0 QObject (0x1709100) 0 primary-for QIODevice (0x17090c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1709940) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1762140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1762a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x177bac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x177bf80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x177be80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x171ffc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b6c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b6880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -803,10 +573,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x16f8f80) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18550c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -880,10 +646,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x18bbb80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x18bbc80) 0 empty Class QMapData::Node size=8 align=4 @@ -908,10 +670,6 @@ Class QTextStream QTextStream (0x1aff580) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1aff940) 0 Class QTextStreamManipulator size=24 align=4 @@ -948,20 +706,8 @@ QTextOStream (0x1b90740) 0 QTextStream (0x1b90780) 0 primary-for QTextOStream (0x1b90740) -Class - size=8 align=4 - base size=8 base align=4 - (0x1bc4980) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1bc4b00) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1be28c0) 0 Class QVectorData size=16 align=4 @@ -1099,15 +845,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1e4acc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e91980) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e91040) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1134,270 +872,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1ef3400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f16840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f169c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f16b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f16cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f16e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f16fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2a140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2a2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2a440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2a5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2a740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2a8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2aa40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2abc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2ad40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2aec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4a040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4a1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4a340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4a4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4a640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4a7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4a940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4aac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4ac40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4adc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4af40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f670c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f67240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f673c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f67540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f676c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f67840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f679c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f67b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f67cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f67e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f67fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f86140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f862c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f86440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f865c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f86740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f868c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f86a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f86bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f86d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f86ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fa8040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fa81c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fa8340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fa84c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fa8640) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1424,45 +950,17 @@ Class QVariant base size=16 base align=8 QVariant (0x1476c80) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ffae00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ffafc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x202e480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1fbc540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x202e780) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1fbc5c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1fa8800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2096100) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1540,15 +1038,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1f16180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2152440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21b0040) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1575,10 +1065,6 @@ QEventLoop (0x21b06c0) 0 QObject (0x21b0700) 0 primary-for QEventLoop (0x21b06c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21b0a00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1623,20 +1109,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x2228200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2228e80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x2228180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22542c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1806,10 +1284,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x22d77c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22d7e00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1917,20 +1391,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x143fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2376bc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x143fc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x238b1c0) 0 empty Class QMetaProperty size=20 align=4 @@ -1942,10 +1408,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x143fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x238b900) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2127,10 +1589,6 @@ QLibrary (0x2449040) 0 QObject (0x2449080) 0 primary-for QLibrary (0x2449040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x24492c0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2172,10 +1630,6 @@ Class QMutex base size=4 base align=4 QMutex (0x24b97c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x24e7000) 0 Class QMutexLocker size=4 align=4 @@ -2187,20 +1641,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x24e7e00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x24f8140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x24e7fc0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x24f8900) 0 Class QWriteLocker size=4 align=4 @@ -2258,10 +1704,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x253cac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2597480) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2273,70 +1715,42 @@ Class QDate base size=4 base align=4 QDate (0x1e4ab40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25ee640) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e4abc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2616280) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1762040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2644040) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1f16340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2644c80) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1f16380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x266be40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1f162c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26b22c0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1f16300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26dd780) 0 empty Class QLinkedListData size=20 align=4 @@ -2348,40 +1762,24 @@ Class QSize base size=8 base align=4 QSize (0x1f16240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27cefc0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1f16280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2821500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1f161c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x28a7000) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1f16200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x292c340) 0 empty Class QSharedData size=4 align=4 @@ -2429,10 +1827,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x1f16700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a45280) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2749,15 +2143,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x2b3de80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2b65380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2b3df80) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3046,15 +2432,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2c10bc0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c25c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c34180) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3445,40 +2823,16 @@ Class QPaintDevice QPaintDevice (0x29bef80) 0 vptr=((&QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2d6adc0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2d6af00) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2dad000) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2d6ad40) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0x1f164c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2ddc540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2ddc3c0) 0 Class QPolygon size=4 align=4 @@ -3486,15 +2840,7 @@ Class QPolygon QPolygon (0x1f165c0) 0 QVector (0x2ddc700) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2e1d980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2e1d840) 0 Class QPolygonF size=4 align=4 @@ -3507,10 +2853,6 @@ Class QMatrix base size=48 base align=8 QMatrix (0x1f16800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2e79800) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3537,10 +2879,6 @@ QImage (0x1f16580) 0 QPaintDevice (0x2e9bcc0) 0 primary-for QImage (0x1f16580) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2f56000) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 9u entries @@ -3567,45 +2905,17 @@ Class QBrush base size=4 base align=4 QBrush (0x1f16480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2faaa00) 0 empty Class QBrushData size=72 align=8 base size=72 base align=8 QBrushData (0x2faa1c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2fc9900) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2fc9080) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2fc9b40) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2fc9c40) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2fc9e80) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2fc9ac0) 0 Class QGradient size=64 align=8 @@ -4017,10 +3327,6 @@ QAbstractPrintDialog (0x3353080) 0 QPaintDevice (0x3353180) 8 vptr=((&QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3353440) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 70u entries @@ -4283,10 +3589,6 @@ QFileDialog (0x33ca9c0) 0 QPaintDevice (0x33caac0) 8 vptr=((&QFileDialog::_ZTV11QFileDialog) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33f6480) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 70u entries @@ -4713,10 +4015,6 @@ QMessageBox (0x3567900) 0 QPaintDevice (0x3567a00) 8 vptr=((&QMessageBox::_ZTV11QMessageBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x357f680) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 71u entries @@ -5087,25 +4385,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x2e55a80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x36c4980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x36c4800) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x36ad1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36c4b40) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5160,15 +4446,7 @@ Class QGraphicsItem QGraphicsItem (0x372c540) 0 vptr=((&QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x372c680) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3764580) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -5757,10 +5035,6 @@ Class QPen base size=4 base align=4 QPen (0x1f16740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3895e00) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -5929,60 +5203,20 @@ Class QTextOption base size=28 base align=8 QTextOption (0x3930a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3930e40) 0 Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x29f0080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x398ea00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a4f3c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39a57c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a4f740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39a5880) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a8f400) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39a59c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a8f700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2a00700) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 69u entries @@ -6249,20 +5483,8 @@ QGraphicsView (0x373da40) 0 QPaintDevice (0x3b59c40) 8 vptr=((&QGraphicsView::_ZTV13QGraphicsView) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3b921c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3bfa440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x372ca80) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 9u entries @@ -6291,10 +5513,6 @@ Class QIcon base size=4 base align=4 QIcon (0x1f16540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3c86400) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -6450,10 +5668,6 @@ QImageIOPlugin (0x3ca5fc0) 0 QFactoryInterface (0x3cc4080) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x3cc4040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3cc4240) 0 Class QImageReader size=4 align=4 @@ -6631,15 +5845,7 @@ QActionGroup (0x3d951c0) 0 QObject (0x3dd4540) 0 primary-for QActionGroup (0x3d951c0) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3dfd000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31dbd80) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -6948,10 +6154,6 @@ QAbstractSpinBox (0x3ebe100) 0 QPaintDevice (0x3ebe1c0) 8 vptr=((&QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3ebe6c0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 68u entries @@ -7167,15 +6369,7 @@ QStyle (0x31a99c0) 0 QObject (0x3f87340) 0 primary-for QStyle (0x31a99c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f87c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3face40) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 71u entries @@ -7446,10 +6640,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x410ef40) 0 QStyleOption (0x410ef80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4124440) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -7476,10 +6666,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x416d740) 0 QStyleOption (0x416d780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4192240) 0 Class QStyleOptionButton size=64 align=4 @@ -7487,10 +6673,6 @@ Class QStyleOptionButton QStyleOptionButton (0x41920c0) 0 QStyleOption (0x4192100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4192b80) 0 Class QStyleOptionTab size=72 align=4 @@ -7505,10 +6687,6 @@ QStyleOptionTabV2 (0x41ea2c0) 0 QStyleOptionTab (0x41ea300) 0 QStyleOption (0x41ea340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41eaa80) 0 Class QStyleOptionToolBar size=68 align=4 @@ -7535,10 +6713,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x423a800) 0 QStyleOption (0x423a840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x428a240) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -7564,10 +6738,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x42d6240) 0 QStyleOption (0x42d6280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42d6940) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -7608,15 +6778,7 @@ QStyleOptionSpinBox (0x43585c0) 0 QStyleOptionComplex (0x4358600) 0 QStyleOption (0x4358640) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4358c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4358b80) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -7625,10 +6787,6 @@ QStyleOptionQ3ListView (0x4358ac0) 0 QStyleOptionComplex (0x4358b00) 0 QStyleOption (0x4358b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x438c740) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7719,10 +6877,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x4462380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x448c9c0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -7753,20 +6907,8 @@ QItemSelectionModel (0x448cdc0) 0 QObject (0x448ce00) 0 primary-for QItemSelectionModel (0x448cdc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44c8140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x44c8fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x44c8ec0) 0 Class QItemSelection size=4 align=4 @@ -7900,10 +7042,6 @@ QAbstractItemView (0x451a640) 0 QPaintDevice (0x451a780) 8 vptr=((&QAbstractItemView::_ZTV17QAbstractItemView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4543480) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -8245,15 +7383,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x469e200) 0 nearly-empty vptr=((&QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x469ef00) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x469ed00) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8398,15 +7528,7 @@ QListView (0x46bd680) 0 QPaintDevice (0x46bd800) 8 vptr=((&QListView::_ZTV9QListView) + 400u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x46dbe40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x46dbcc0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -8703,15 +7825,7 @@ Class QStandardItem QStandardItem (0x48153c0) 0 vptr=((&QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x48cf880) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x48158c0) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -9241,35 +8355,15 @@ QTreeView (0x4a3b980) 0 QPaintDevice (0x4a3bb00) 8 vptr=((&QTreeView::_ZTV9QTreeView) + 408u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4a67ec0) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x4a67a80) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x4a9ccc0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x4a9cb40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4a9cf00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4a9c9c0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -10158,15 +9252,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x398e840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e0fec0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4e3a4c0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 26u entries @@ -10203,20 +9289,12 @@ Class QPaintEngine QPaintEngine (0x2d1cb00) 0 vptr=((&QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4e3a940) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x4e0fc40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4e0fdc0) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 9u entries @@ -10313,10 +9391,6 @@ QCommonStyle (0x4f7dc40) 0 QObject (0x4f7dcc0) 0 primary-for QStyle (0x4f7dc80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x4fb6500) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10690,30 +9764,14 @@ Class QTextLength base size=16 base align=8 QTextLength (0x1f16780) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x512bf80) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x1f167c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x513e900) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x512ba80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x512b600) 0 Class QTextCharFormat size=8 align=4 @@ -10768,15 +9826,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x30b4dc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x52d3780) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x52d3400) 0 Class QTextLine size=8 align=4 @@ -10826,15 +9876,7 @@ QTextDocument (0x381d300) 0 QObject (0x5300fc0) 0 primary-for QTextDocument (0x381d300) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5315500) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x5385700) 0 Class QTextCursor size=4 align=4 @@ -10846,15 +9888,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x5385c00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x5385ec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x5385d40) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -11016,10 +10050,6 @@ QTextFrame (0x53007c0) 0 QObject (0x542c180) 0 primary-for QTextObject (0x542c140) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5455700) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -11044,25 +10074,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x52aec40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5486f80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x54a1100) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x53f5280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x54a1b80) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -12056,10 +11074,6 @@ QDateEdit (0x5765940) 0 QPaintDevice (0x5765a80) 8 vptr=((&QDateEdit::_ZTV9QDateEdit) + 268u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x573bc40) 0 Vtable for QDial QDial::_ZTV5QDial: 68u entries @@ -12228,10 +11242,6 @@ QDialogButtonBox (0x57d6bc0) 0 QPaintDevice (0x57d6c80) 8 vptr=((&QDialogButtonBox::_ZTV16QDialogButtonBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x57d6d80) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 67u entries @@ -12315,10 +11325,6 @@ QDockWidget (0x582ca00) 0 QPaintDevice (0x582cac0) 8 vptr=((&QDockWidget::_ZTV11QDockWidget) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x582cf40) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 67u entries @@ -12488,10 +11494,6 @@ QFontComboBox (0x590a3c0) 0 QPaintDevice (0x590a4c0) 8 vptr=((&QFontComboBox::_ZTV13QFontComboBox) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x590a8c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 67u entries @@ -14136,10 +13138,6 @@ QTextEdit (0x54a1dc0) 0 QPaintDevice (0x5d66b00) 8 vptr=((&QTextEdit::_ZTV9QTextEdit) + 264u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5d912c0) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 78u entries @@ -14672,30 +13670,14 @@ Class _EXCEPTION_POINTERS base size=8 base align=4 _EXCEPTION_POINTERS (0x60688c0) 0 -Class _LARGE_INTEGER:: - size=8 align=4 - base size=8 base align=4 -_LARGE_INTEGER:: (0x6068b00) 0 -Class _LARGE_INTEGER:: - size=8 align=4 - base size=8 base align=4 -_LARGE_INTEGER:: (0x6068c40) 0 Class _LARGE_INTEGER size=8 align=8 base size=8 base align=8 _LARGE_INTEGER (0x6068a80) 0 -Class _ULARGE_INTEGER:: - size=8 align=4 - base size=8 base align=4 -_ULARGE_INTEGER:: (0x6068e80) 0 -Class _ULARGE_INTEGER:: - size=8 align=4 - base size=8 base align=4 -_ULARGE_INTEGER:: (0x6068f40) 0 Class _ULARGE_INTEGER size=8 align=8 @@ -14892,10 +13874,6 @@ Class _SINGLE_LIST_ENTRY base size=4 base align=4 _SINGLE_LIST_ENTRY (0x60be300) 0 -Class _SLIST_HEADER:: - size=8 align=4 - base size=8 base align=4 -_SLIST_HEADER:: (0x60be600) 0 Class _SLIST_HEADER size=8 align=8 @@ -14982,70 +13960,26 @@ Class _IMAGE_ROM_HEADERS base size=76 base align=4 _IMAGE_ROM_HEADERS (0x60ef880) 0 -Class _IMAGE_SECTION_HEADER:: - size=4 align=4 - base size=4 base align=4 -_IMAGE_SECTION_HEADER:: (0x60efa40) 0 Class _IMAGE_SECTION_HEADER size=40 align=4 base size=40 base align=4 _IMAGE_SECTION_HEADER (0x60ef9c0) 0 -Class _IMAGE_SYMBOL:::: - size=8 align=2 - base size=8 base align=2 -_IMAGE_SYMBOL:::: (0x60eff40) 0 -Class _IMAGE_SYMBOL:: - size=8 align=2 - base size=8 base align=2 -_IMAGE_SYMBOL:: (0x60efe80) 0 Class _IMAGE_SYMBOL size=18 align=2 base size=18 base align=2 _IMAGE_SYMBOL (0x60efe00) 0 -Class _IMAGE_AUX_SYMBOL:::::: - size=4 align=2 - base size=4 base align=2 -_IMAGE_AUX_SYMBOL:::::: (0x60fc400) 0 -Class _IMAGE_AUX_SYMBOL:::: - size=4 align=2 - base size=4 base align=2 -_IMAGE_AUX_SYMBOL:::: (0x60fc380) 0 -Class _IMAGE_AUX_SYMBOL:::::: - size=8 align=2 - base size=8 base align=2 -_IMAGE_AUX_SYMBOL:::::: (0x60fc640) 0 -Class _IMAGE_AUX_SYMBOL:::::: - size=8 align=2 - base size=8 base align=2 -_IMAGE_AUX_SYMBOL:::::: (0x60fc7c0) 0 -Class _IMAGE_AUX_SYMBOL:::: - size=8 align=2 - base size=8 base align=2 -_IMAGE_AUX_SYMBOL:::: (0x60fc5c0) 0 -Class _IMAGE_AUX_SYMBOL:: - size=18 align=2 - base size=18 base align=2 -_IMAGE_AUX_SYMBOL:: (0x60fc2c0) 0 -Class _IMAGE_AUX_SYMBOL:: - size=18 align=1 - base size=18 base align=1 -_IMAGE_AUX_SYMBOL:: (0x60fca40) 0 -Class _IMAGE_AUX_SYMBOL:: - size=16 align=2 - base size=16 base align=2 -_IMAGE_AUX_SYMBOL:: (0x60fcb00) 0 Class _IMAGE_AUX_SYMBOL size=18 align=2 @@ -15057,10 +13991,6 @@ Class _IMAGE_COFF_SYMBOLS_HEADER base size=32 base align=2 _IMAGE_COFF_SYMBOLS_HEADER (0x60fccc0) 0 -Class _IMAGE_RELOCATION:: - size=4 align=2 - base size=4 base align=2 -_IMAGE_RELOCATION:: (0x610f040) 0 Class _IMAGE_RELOCATION size=10 align=2 @@ -15072,10 +14002,6 @@ Class _IMAGE_BASE_RELOCATION base size=8 base align=4 _IMAGE_BASE_RELOCATION (0x610f240) 0 -Class _IMAGE_LINENUMBER:: - size=4 align=2 - base size=4 base align=2 -_IMAGE_LINENUMBER:: (0x610f440) 0 Class _IMAGE_LINENUMBER size=6 align=2 @@ -15097,30 +14023,18 @@ Class _IMAGE_IMPORT_BY_NAME base size=4 base align=2 _IMAGE_IMPORT_BY_NAME (0x610fb00) 0 -Class _IMAGE_THUNK_DATA32:: - size=4 align=4 - base size=4 base align=4 -_IMAGE_THUNK_DATA32:: (0x610fd00) 0 Class _IMAGE_THUNK_DATA32 size=4 align=4 base size=4 base align=4 _IMAGE_THUNK_DATA32 (0x610fc80) 0 -Class _IMAGE_THUNK_DATA64:: - size=8 align=4 - base size=8 base align=4 -_IMAGE_THUNK_DATA64:: (0x6125000) 0 Class _IMAGE_THUNK_DATA64 size=8 align=4 base size=8 base align=4 _IMAGE_THUNK_DATA64 (0x610ff80) 0 -Class _IMAGE_IMPORT_DESCRIPTOR:: - size=4 align=4 - base size=4 base align=4 -_IMAGE_IMPORT_DESCRIPTOR:: (0x61252c0) 0 Class _IMAGE_IMPORT_DESCRIPTOR size=20 align=4 @@ -15152,25 +14066,9 @@ Class _IMAGE_RESOURCE_DIRECTORY base size=16 base align=4 _IMAGE_RESOURCE_DIRECTORY (0x6125cc0) 0 -Class _IMAGE_RESOURCE_DIRECTORY_ENTRY:::: - size=4 align=4 - base size=4 base align=4 -_IMAGE_RESOURCE_DIRECTORY_ENTRY:::: (0x6125f80) 0 -Class _IMAGE_RESOURCE_DIRECTORY_ENTRY:: - size=4 align=4 - base size=4 base align=4 -_IMAGE_RESOURCE_DIRECTORY_ENTRY:: (0x6125f00) 0 -Class _IMAGE_RESOURCE_DIRECTORY_ENTRY:::: - size=4 align=4 - base size=4 base align=4 -_IMAGE_RESOURCE_DIRECTORY_ENTRY:::: (0x6136200) 0 -Class _IMAGE_RESOURCE_DIRECTORY_ENTRY:: - size=4 align=4 - base size=4 base align=4 -_IMAGE_RESOURCE_DIRECTORY_ENTRY:: (0x6136140) 0 Class _IMAGE_RESOURCE_DIRECTORY_ENTRY size=8 align=4 @@ -15227,45 +14125,21 @@ Class _IMAGE_SEPARATE_DEBUG_HEADER base size=48 base align=4 _IMAGE_SEPARATE_DEBUG_HEADER (0x614a7c0) 0 -Class _NT_TIB:: - size=4 align=4 - base size=4 base align=4 -_NT_TIB:: (0x6155100) 0 Class _NT_TIB size=28 align=4 base size=28 base align=4 _NT_TIB (0x614af00) 0 -Class _REPARSE_DATA_BUFFER:::: - size=10 align=2 - base size=10 base align=2 -_REPARSE_DATA_BUFFER:::: (0x61554c0) 0 -Class _REPARSE_DATA_BUFFER:::: - size=10 align=2 - base size=10 base align=2 -_REPARSE_DATA_BUFFER:::: (0x6155700) 0 -Class _REPARSE_DATA_BUFFER:::: - size=1 align=1 - base size=1 base align=1 -_REPARSE_DATA_BUFFER:::: (0x6155800) 0 -Class _REPARSE_DATA_BUFFER:: - size=10 align=2 - base size=10 base align=2 -_REPARSE_DATA_BUFFER:: (0x6155440) 0 Class _REPARSE_DATA_BUFFER size=20 align=4 base size=20 base align=4 _REPARSE_DATA_BUFFER (0x6155340) 0 -Class _REPARSE_GUID_DATA_BUFFER:: - size=1 align=1 - base size=1 base align=1 -_REPARSE_GUID_DATA_BUFFER:: (0x6155ac0) 0 Class _REPARSE_GUID_DATA_BUFFER size=28 align=4 @@ -15332,10 +14206,6 @@ Class _JOBOBJECT_JOBSET_INFORMATION base size=4 base align=4 _JOBOBJECT_JOBSET_INFORMATION (0x6181f80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x6191b40) 0 Class _POWER_ACTION_POLICY size=12 align=4 @@ -15537,10 +14407,6 @@ Class tagPOINTS base size=4 base align=2 tagPOINTS (0x61cecc0) 0 -Class _CHAR_INFO:: - size=2 align=2 - base size=2 base align=2 -_CHAR_INFO:: (0x61dfb00) 0 Class _CHAR_INFO size=4 align=2 @@ -15572,10 +14438,6 @@ Class _CONSOLE_SCREEN_BUFFER_INFO base size=22 base align=2 _CONSOLE_SCREEN_BUFFER_INFO (0x61e7380) 0 -Class _KEY_EVENT_RECORD:: - size=2 align=2 - base size=2 base align=2 -_KEY_EVENT_RECORD:: (0x61e7780) 0 Class _KEY_EVENT_RECORD size=16 align=1 @@ -15602,10 +14464,6 @@ Class _FOCUS_EVENT_RECORD base size=4 base align=4 _FOCUS_EVENT_RECORD (0x61e7d80) 0 -Class _INPUT_RECORD:: - size=16 align=4 - base size=16 base align=4 -_INPUT_RECORD:: (0x61e7f40) 0 Class _INPUT_RECORD size=20 align=4 @@ -15692,10 +14550,6 @@ Class _RIP_INFO base size=8 base align=4 _RIP_INFO (0x6254240) 0 -Class _DEBUG_EVENT:: - size=84 align=4 - base size=84 base align=4 -_DEBUG_EVENT:: (0x6254540) 0 Class _DEBUG_EVENT size=96 align=4 @@ -15767,15 +14621,7 @@ Class tagHW_PROFILE_INFOW base size=244 base align=4 tagHW_PROFILE_INFOW (0x6274680) 0 -Class _SYSTEM_INFO:::: - size=4 align=2 - base size=4 base align=2 -_SYSTEM_INFO:::: (0x6274a00) 0 -Class _SYSTEM_INFO:: - size=4 align=4 - base size=4 base align=4 -_SYSTEM_INFO:: (0x6274940) 0 Class _SYSTEM_INFO size=36 align=4 @@ -15797,40 +14643,16 @@ Class _MEMORYSTATUS base size=32 base align=4 _MEMORYSTATUS (0x62823c0) 0 -Class _LDT_ENTRY:::: - size=4 align=1 - base size=4 base align=1 -_LDT_ENTRY:::: (0x6282b40) 0 -Class _LDT_ENTRY:::: - size=4 align=4 - base size=4 base align=4 -_LDT_ENTRY:::: (0x6282d40) 0 -Class _LDT_ENTRY:: - size=4 align=4 - base size=4 base align=4 -_LDT_ENTRY:: (0x6282ac0) 0 Class _LDT_ENTRY size=8 align=4 base size=8 base align=4 _LDT_ENTRY (0x62829c0) 0 -Class _PROCESS_HEAP_ENTRY:::: - size=16 align=4 - base size=16 base align=4 -_PROCESS_HEAP_ENTRY:::: (0x628d3c0) 0 -Class _PROCESS_HEAP_ENTRY:::: - size=16 align=4 - base size=16 base align=4 -_PROCESS_HEAP_ENTRY:::: (0x628d540) 0 -Class _PROCESS_HEAP_ENTRY:: - size=16 align=4 - base size=16 base align=4 -_PROCESS_HEAP_ENTRY:: (0x628d340) 0 Class _PROCESS_HEAP_ENTRY size=28 align=4 @@ -15907,60 +14729,28 @@ Class tagCIEXYZTRIPLE base size=36 base align=4 tagCIEXYZTRIPLE (0x63e4500) 0 -Class - size=108 align=4 - base size=108 base align=4 - (0x63e4700) 0 Class tagFONTSIGNATURE size=24 align=4 base size=24 base align=4 tagFONTSIGNATURE (0x63e4d80) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x63e4f40) 0 Class tagCOLORADJUSTMENT size=24 align=2 base size=24 base align=2 tagCOLORADJUSTMENT (0x63f1140) 0 -Class _devicemodeA:::: - size=16 align=2 - base size=16 base align=2 -_devicemodeA:::: (0x63f1840) 0 -Class _devicemodeA:: - size=16 align=4 - base size=16 base align=4 -_devicemodeA:: (0x63f17c0) 0 -Class _devicemodeA:: - size=4 align=4 - base size=4 base align=4 -_devicemodeA:: (0x63f1f00) 0 Class _devicemodeA size=156 align=4 base size=156 base align=4 _devicemodeA (0x63f15c0) 0 -Class _devicemodeW:::: - size=16 align=2 - base size=16 base align=2 -_devicemodeW:::: (0x63fd480) 0 -Class _devicemodeW:: - size=16 align=4 - base size=16 base align=4 -_devicemodeW:: (0x63fd400) 0 -Class _devicemodeW:: - size=4 align=4 - base size=4 base align=4 -_devicemodeW:: (0x63fd600) 0 Class _devicemodeW size=220 align=4 @@ -16662,25 +15452,13 @@ Class tagDELETEITEMSTRUCT base size=20 base align=4 tagDELETEITEMSTRUCT (0x6603cc0) 0 -Class - size=18 align=2 - base size=18 base align=2 - (0x6603e80) 0 -Class - size=18 align=2 - base size=18 base align=2 - (0x6613000) 0 Class tagDRAWITEMSTRUCT size=48 align=4 base size=48 base align=4 tagDRAWITEMSTRUCT (0x6613240) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x6613500) 0 Class tagPAINTSTRUCT size=64 align=4 @@ -16742,30 +15520,14 @@ Class _WINDOWPLACEMENT base size=44 base align=4 _WINDOWPLACEMENT (0x66340c0) 0 -Class - size=4 align=2 - base size=4 base align=2 - (0x6634340) 0 -Class - size=6 align=2 - base size=6 base align=2 - (0x6634480) 0 Class tagHELPINFO size=28 align=4 base size=28 base align=4 tagHELPINFO (0x66347c0) 0 -Class - size=40 align=4 - base size=40 base align=4 - (0x6634a80) 0 -Class - size=40 align=4 - base size=40 base align=4 - (0x6634e40) 0 Class tagUSEROBJECTFLAGS size=12 align=4 @@ -16999,10 +15761,6 @@ Class tagKBDLLHOOKSTRUCT base size=20 base align=4 tagKBDLLHOOKSTRUCT (0x6695cc0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x66a4640) 0 Class _cpinfo size=20 align=4 @@ -17209,35 +15967,11 @@ Class _SERVICE_FAILURE_ACTIONSW base size=20 base align=4 _SERVICE_FAILURE_ACTIONSW (0x6806440) 0 -Class - size=2 align=2 - base size=2 base align=2 - (0x6823640) 0 -Class - size=4 align=2 - base size=4 base align=2 - (0x6823800) 0 -Class - size=6 align=2 - base size=6 base align=2 - (0x68239c0) 0 -Class - size=6 align=2 - base size=6 base align=2 - (0x6823b40) 0 -Class - size=4 align=2 - base size=4 base align=2 - (0x6823c40) 0 -Class - size=6 align=2 - base size=6 base align=2 - (0x6823d40) 0 Class HCONVLIST__ size=4 align=4 @@ -17369,20 +16103,8 @@ Class tagIMEMENUITEMINFOW base size=192 base align=4 tagIMEMENUITEMINFOW (0x686dfc0) 0 -Class mmtime_tag:::: - size=8 align=1 - base size=8 base align=1 -mmtime_tag:::: (0x68bbd40) 0 -Class mmtime_tag:::: - size=4 align=1 - base size=4 base align=1 -mmtime_tag:::: (0x68bbec0) 0 -Class mmtime_tag:: - size=8 align=1 - base size=8 base align=1 -mmtime_tag:: (0x68bbc40) 0 Class mmtime_tag size=12 align=1 @@ -17554,100 +16276,48 @@ Class tagMIXERCAPSW base size=80 base align=1 tagMIXERCAPSW (0x6902b80) 0 -Class tagMIXERLINEA:: - size=48 align=1 - base size=48 base align=1 -tagMIXERLINEA:: (0x6915000) 0 Class tagMIXERLINEA size=168 align=1 base size=168 base align=1 tagMIXERLINEA (0x6902d00) 0 -Class tagMIXERLINEW:: - size=80 align=1 - base size=80 base align=1 -tagMIXERLINEW:: (0x69152c0) 0 Class tagMIXERLINEW size=280 align=1 base size=280 base align=1 tagMIXERLINEW (0x6915240) 0 -Class tagMIXERCONTROLA:::: - size=8 align=1 - base size=8 base align=1 -tagMIXERCONTROLA:::: (0x6915680) 0 -Class tagMIXERCONTROLA:::: - size=8 align=1 - base size=8 base align=1 -tagMIXERCONTROLA:::: (0x69157c0) 0 -Class tagMIXERCONTROLA:: - size=24 align=1 - base size=24 base align=1 -tagMIXERCONTROLA:: (0x6915600) 0 -Class tagMIXERCONTROLA:: - size=24 align=1 - base size=24 base align=1 -tagMIXERCONTROLA:: (0x69159c0) 0 Class tagMIXERCONTROLA size=148 align=1 base size=148 base align=1 tagMIXERCONTROLA (0x6915480) 0 -Class tagMIXERCONTROLW:::: - size=8 align=1 - base size=8 base align=1 -tagMIXERCONTROLW:::: (0x6915d80) 0 -Class tagMIXERCONTROLW:::: - size=8 align=1 - base size=8 base align=1 -tagMIXERCONTROLW:::: (0x6915e40) 0 -Class tagMIXERCONTROLW:: - size=24 align=1 - base size=24 base align=1 -tagMIXERCONTROLW:: (0x6915d00) 0 -Class tagMIXERCONTROLW:: - size=24 align=1 - base size=24 base align=1 -tagMIXERCONTROLW:: (0x6915f80) 0 Class tagMIXERCONTROLW size=228 align=1 base size=228 base align=1 tagMIXERCONTROLW (0x6915c80) 0 -Class tagMIXERLINECONTROLSA:: - size=4 align=1 - base size=4 base align=1 -tagMIXERLINECONTROLSA:: (0x6930200) 0 Class tagMIXERLINECONTROLSA size=24 align=1 base size=24 base align=1 tagMIXERLINECONTROLSA (0x6930180) 0 -Class tagMIXERLINECONTROLSW:: - size=4 align=1 - base size=4 base align=1 -tagMIXERLINECONTROLSW:: (0x6930500) 0 Class tagMIXERLINECONTROLSW size=24 align=1 base size=24 base align=1 tagMIXERLINECONTROLSW (0x6930480) 0 -Class tMIXERCONTROLDETAILS:: - size=4 align=1 - base size=4 base align=1 -tMIXERCONTROLDETAILS:: (0x6930780) 0 Class tMIXERCONTROLDETAILS size=24 align=1 @@ -18004,15 +16674,7 @@ Class _RPC_POLICY base size=12 base align=4 _RPC_POLICY (0x6a095c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x6a09800) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x6a09940) 0 Class _RPC_SECURITY_QOS size=16 align=4 @@ -18029,10 +16691,6 @@ Class _SEC_WINNT_AUTH_IDENTITY_A base size=28 base align=4 _SEC_WINNT_AUTH_IDENTITY_A (0x6a09f00) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x6a21040) 0 Class _RPC_PROTSEQ_VECTORA size=8 align=4 @@ -18059,10 +16717,6 @@ Class _RPC_MESSAGE base size=44 base align=4 _RPC_MESSAGE (0x6a58080) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x6a584c0) 0 Class _RPC_PROTSEQ_ENDPOINT size=8 align=4 @@ -18189,15 +16843,7 @@ Class tagDEVNAMES base size=8 base align=1 tagDEVNAMES (0x6ad0100) 0 -Class - size=40 align=1 - base size=40 base align=1 - (0x6ad0340) 0 -Class - size=40 align=1 - base size=40 base align=1 - (0x6ad05c0) 0 Class tagOFNA size=76 align=1 @@ -18444,15 +17090,7 @@ Class _PRINTPROCESSOR_INFO_1W base size=4 base align=4 _PRINTPROCESSOR_INFO_1W (0x6b69e80) 0 -Class _PRINTER_NOTIFY_INFO_DATA:::: - size=8 align=4 - base size=8 base align=4 -_PRINTER_NOTIFY_INFO_DATA:::: (0x6b76180) 0 -Class _PRINTER_NOTIFY_INFO_DATA:: - size=8 align=4 - base size=8 base align=4 -_PRINTER_NOTIFY_INFO_DATA:: (0x6b760c0) 0 Class _PRINTER_NOTIFY_INFO_DATA size=20 align=4 @@ -18539,20 +17177,8 @@ Class protoent base size=12 base align=4 protoent (0x6bd2540) 0 -Class in_addr:::: - size=4 align=1 - base size=4 base align=1 -in_addr:::: (0x6bd83c0) 0 -Class in_addr:::: - size=4 align=2 - base size=4 base align=2 -in_addr:::: (0x6bd85c0) 0 -Class in_addr:: - size=4 align=4 - base size=4 base align=4 -in_addr:: (0x6bd8340) 0 Class in_addr size=4 align=4 @@ -18689,55 +17315,23 @@ Class _WSAPROTOCOL_INFOW base size=628 base align=4 _WSAPROTOCOL_INFOW (0x6c34a00) 0 -Class _WSACOMPLETION:::: - size=12 align=4 - base size=12 base align=4 -_WSACOMPLETION:::: (0x6c34f80) 0 -Class _WSACOMPLETION:::: - size=4 align=4 - base size=4 base align=4 -_WSACOMPLETION:::: (0x6c45080) 0 -Class _WSACOMPLETION:::: - size=8 align=4 - base size=8 base align=4 -_WSACOMPLETION:::: (0x6c45140) 0 -Class _WSACOMPLETION:::: - size=12 align=4 - base size=12 base align=4 -_WSACOMPLETION:::: (0x6c45280) 0 -Class _WSACOMPLETION:: - size=12 align=4 - base size=12 base align=4 -_WSACOMPLETION:: (0x6c34f00) 0 Class _WSACOMPLETION size=16 align=4 base size=16 base align=4 _WSACOMPLETION (0x6c34e80) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x6c79580) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x6c8dc40) 0 Class _SCONTEXT_QUEUE size=8 align=4 base size=8 base align=4 _SCONTEXT_QUEUE (0x6c8dd00) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x6c92100) 0 Class _MIDL_STUB_MESSAGE size=180 align=4 @@ -18784,10 +17378,6 @@ Class _NDR_CS_ROUTINES base size=8 base align=4 _NDR_CS_ROUTINES (0x6cb3680) 0 -Class _MIDL_STUB_DESC:: - size=4 align=4 - base size=4 base align=4 -_MIDL_STUB_DESC:: (0x6cb3800) 0 Class _MIDL_STUB_DESC size=80 align=4 @@ -18819,15 +17409,7 @@ Class _FULL_PTR_TO_REFID_ELEMENT base size=16 base align=4 _FULL_PTR_TO_REFID_ELEMENT (0x6cc4680) 0 -Class _FULL_PTR_XLAT_TABLES:: - size=12 align=4 - base size=12 base align=4 -_FULL_PTR_XLAT_TABLES:: (0x6cc4800) 0 -Class _FULL_PTR_XLAT_TABLES:: - size=12 align=4 - base size=12 base align=4 -_FULL_PTR_XLAT_TABLES:: (0x6cc49c0) 0 Class _FULL_PTR_XLAT_TABLES size=32 align=4 @@ -18844,10 +17426,6 @@ Class _FLAGGED_WORD_BLOB base size=12 base align=4 _FLAGGED_WORD_BLOB (0x6d11540) 0 -Class tagCY:: - size=8 align=4 - base size=8 base align=4 -tagCY:: (0x6d11ac0) 0 Class tagCY size=8 align=8 @@ -18884,25 +17462,9 @@ Class _HYPER_SIZEDARR base size=8 base align=4 _HYPER_SIZEDARR (0x6d2a240) 0 -Class tagDEC:::: - size=2 align=1 - base size=2 base align=1 -tagDEC:::: (0x6d2a480) 0 -Class tagDEC:: - size=2 align=2 - base size=2 base align=2 -tagDEC:: (0x6d2a400) 0 -Class tagDEC:::: - size=8 align=4 - base size=8 base align=4 -tagDEC:::: (0x6d2a640) 0 -Class tagDEC:: - size=8 align=8 - base size=8 base align=8 -tagDEC:: (0x6d2a5c0) 0 Class tagDEC size=16 align=8 @@ -19011,10 +17573,6 @@ Class tagBIND_OPTS2 base size=32 base align=4 tagBIND_OPTS2 (0x6d6bec0) 0 -Class tagSTGMEDIUM:: - size=4 align=4 - base size=4 base align=4 -tagSTGMEDIUM:: (0x6d7e200) 0 Class tagSTGMEDIUM size=12 align=4 @@ -19136,20 +17694,12 @@ Class tagCAPROPVARIANT base size=8 base align=4 tagCAPROPVARIANT (0x6d9b9c0) 0 -Class tagPROPVARIANT:: - size=8 align=8 - base size=8 base align=8 -tagPROPVARIANT:: (0x6d9bb00) 0 Class tagPROPVARIANT size=16 align=8 base size=16 base align=8 tagPROPVARIANT (0x6d9b900) 0 -Class tagPROPSPEC:: - size=4 align=4 - base size=4 base align=4 -tagPROPSPEC:: (0x6daf800) 0 Class tagPROPSPEC size=8 align=4 @@ -20241,10 +18791,6 @@ Class _wireSAFEARR_HAVEIID base size=24 base align=4 _wireSAFEARR_HAVEIID (0x6fdf740) 0 -Class _wireSAFEARRAY_UNION:: - size=24 align=4 - base size=24 base align=4 -_wireSAFEARRAY_UNION:: (0x6fdf900) 0 Class _wireSAFEARRAY_UNION size=28 align=4 @@ -20261,45 +18807,21 @@ Class tagSAFEARRAY base size=24 base align=4 tagSAFEARRAY (0x6fdffc0) 0 -Class tagVARIANT:::::::: - size=8 align=4 - base size=8 base align=4 -tagVARIANT:::::::: (0x6fed500) 0 -Class tagVARIANT:::::: - size=8 align=8 - base size=8 base align=8 -tagVARIANT:::::: (0x6fed2c0) 0 -Class tagVARIANT:::: - size=16 align=8 - base size=16 base align=8 -tagVARIANT:::: (0x6fed240) 0 -Class tagVARIANT:: - size=16 align=8 - base size=16 base align=8 -tagVARIANT:: (0x6fed1c0) 0 Class tagVARIANT size=16 align=8 base size=16 base align=8 tagVARIANT (0x6fed140) 0 -Class _wireVARIANT:: - size=16 align=8 - base size=16 base align=8 -_wireVARIANT:: (0x6fed840) 0 Class _wireVARIANT size=32 align=8 base size=32 base align=8 _wireVARIANT (0x6fdf080) 0 -Class tagTYPEDESC:: - size=4 align=4 - base size=4 base align=4 -tagTYPEDESC:: (0x6feddc0) 0 Class tagTYPEDESC size=8 align=4 @@ -20326,10 +18848,6 @@ Class tagIDLDESC base size=8 base align=4 tagIDLDESC (0x7006480) 0 -Class tagELEMDESC:: - size=8 align=4 - base size=8 base align=4 -tagELEMDESC:: (0x70066c0) 0 Class tagELEMDESC size=16 align=4 @@ -20356,10 +18874,6 @@ Class tagFUNCDESC base size=52 base align=4 tagFUNCDESC (0x701a8c0) 0 -Class tagVARDESC:: - size=4 align=4 - base size=4 base align=4 -tagVARDESC:: (0x701af40) 0 Class tagVARDESC size=36 align=4 @@ -20715,15 +19229,7 @@ Class tagINTERFACEDATA base size=8 base align=4 tagINTERFACEDATA (0x7089ac0) 0 -Class - size=18 align=2 - base size=18 base align=2 - (0x7089c80) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x7089e00) 0 Class tagOleMenuGroupWidths size=24 align=4 @@ -21217,20 +19723,12 @@ Class _OLESTREAMVTBL base size=8 base align=4 _OLESTREAMVTBL (0x71e16c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x600e300) 0 Class QGLFormat size=4 align=4 base size=4 base align=4 QGLFormat (0x600e700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x72b95c0) 0 Vtable for QGLContext QGLContext::_ZTV10QGLContext: 10u entries @@ -21383,178 +19881,38 @@ QGLPixelBuffer (0x7306300) 0 QPaintDevice (0x7366280) 0 primary-for QGLPixelBuffer (0x7306300) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13ff440) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x15f0480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x75c2f00) 0 empty -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x2ddc4c0) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x2e1d900) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x36c4900) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x3a4f340) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x3a4f6c0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x3a8f380) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x3a8f680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4a9cec0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x4a9cc40) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x513e880) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x52d3700) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x5385e40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3dd4fc0) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x469ee80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c93240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c935c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c93e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c93fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cc0500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cc0f40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x177bf40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x202e440) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x7ceb940) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x7cebc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cebe40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3bfa400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7d740c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4358c40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44c8f80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x48cf840) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x7d747c0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x7d74d80) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.3.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.4.3.0.linux-gcc-ia32.txt index 369f40eaa..32cf29ff4 100644 --- a/tests/auto/bic/data/QtOpenGL.4.3.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.3.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7fcdd80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7fcddc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7fcde80) 0 empty - QUintForSize<4> (0xb7fcdec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7fcdf40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7fcdf80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb5acb040) 0 empty - QIntForSize<4> (0xb5acb080) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb5acb340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acb780) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb5acb7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5acb8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5acb900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5acb940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5acb980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5acb9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5acba00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5acba40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5acba80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5acbac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5acbb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5acbb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5acbb80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5acbbc0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb5acbcc0) 0 QGenericArgument (0xb5acbd00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb5acbec0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb5acbf80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a0f000) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb5a0f300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a0f340) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb5a0f380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0f580) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb5a0f680) 0 QString (0xb5a0f6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a0f700) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb5a0fa40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5a0fdc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5a0fd40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb5a0f4c0) 0 QObject (0xb5a0f500) 0 primary-for QLibrary (0xb5a0f4c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a0f840) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb5a0fc00) 0 QObject (0xb5a0fe40) 0 primary-for QIODevice (0xb5a0fc00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5631000) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb56310c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5631100) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb5631140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5631200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5631180) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb5631240) 0 QList (0xb5631280) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb5631300) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb5631340) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb56316c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5631700) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb5631c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5631d00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb5631d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5631e00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb5631e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5631f00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb5631f40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb5631fc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb5631080) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb5631f80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5631440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5631580) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5631ac0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5631c80) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5631cc0) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb5631dc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5631e80) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb5631ec0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb53f2000) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb53f20c0) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb53f2080) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb53f2040) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb53f2100) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb53f2180) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb53f2140) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb53f21c0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb53f2240) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb53f2200) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb53f2280) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb53f22c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb53f2300) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb53f2580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53f2780) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb53f2800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53f2a00) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb53f2dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53f2e00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53f2e40) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb522c040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb522c280) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb522c2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb522c500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb522c640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb522c740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb522c780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb522c840) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb522c880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb522c8c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb522c900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb522c940) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb522ccc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb522cd00) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb522ce40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb522cec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb522cf00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb522cf40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522c800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb522cb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb509e7c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb509e800) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb509ea80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb509eac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb509ebc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb509eb40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb509ecc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb509ec40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb509ed40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb509edc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb509ee00) 0 QObject (0xb509ee40) 0 primary-for QSettings (0xb509ee00) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb509ef40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb509ef00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb509ef80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb509efc0) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb509ea00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb509ee80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb509ea40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb4f7d000) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb4f7d040) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb4f7d080) 0 QObject (0xb4f7d100) 0 primary-for QIODevice (0xb4f7d0c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f7d180) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb4f7d300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f7d340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f7d380) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4f7d440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4f7d3c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb4f7d480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f7d500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f7d580) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb4f7d7c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f7d880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb4f7d8c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f7da40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb4f7db00) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f7dc40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb4f7db80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4f7dd80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4f7dd00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb4f7de40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f7df00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb4bbc0c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb4bbc140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb4bbc100) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb4bbc1c0) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb4bbc200) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb4bbc280) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb4bbc580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4bbc5c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb4bbc6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4bbc700) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb4bbc740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4bbc7c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb4bbcc40) 0 QObject (0xb4bbcc80) 0 primary-for QEventLoop (0xb4bbcc40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4bbcd80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb4bbce00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4bbcec0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb4bbcf80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b38000) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb4b38080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b380c0) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2726,25 +2016,13 @@ QImageIOPlugin (0xb4b38500) 0 QFactoryInterface (0xb4b385c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb4b38580) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4b38640) 0 Class QImageReader size=4 align=4 base size=4 base align=4 QImageReader (0xb4b38680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4b38740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4b386c0) 0 Class QPolygon size=4 align=4 @@ -2752,15 +2030,7 @@ Class QPolygon QPolygon (0xb4b38780) 0 QVector (0xb4b387c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4b38880) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4b38800) 0 Class QPolygonF size=4 align=4 @@ -2783,10 +2053,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb4b38ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b38b00) 0 empty Class QPainterPath::Element size=20 align=4 @@ -2798,25 +2064,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb4b38b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4b38dc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4b38d40) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb4b38c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b38e00) 0 empty Class QPainterPathStroker size=4 align=4 @@ -2828,10 +2082,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb4b38f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b38f40) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2872,30 +2122,10 @@ QImage (0xb4b383c0) 0 QPaintDevice (0xb4b38480) 0 primary-for QImage (0xb4b383c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b38980) 0 empty -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4b38a40) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4b38bc0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4b38c00) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4b38a00) 0 Class QColor size=16 align=4 @@ -3083,10 +2313,6 @@ Class QIcon base size=4 base align=4 QIcon (0xb4915940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4915a00) 0 empty Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -3225,10 +2451,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb4915f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4915000) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3526,15 +2748,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb485c840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb485c940) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb485c8c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3823,20 +3037,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb46d7040) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb46d70c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb46d7100) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb46d7140) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3867,20 +3069,8 @@ QAccessibleInterface (0xb46d7200) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb46d7240) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb46d73c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb46d7340) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb46d72c0) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -4402,55 +3592,23 @@ Class QPen base size=4 base align=4 QPen (0xb478f500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb478f5c0) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0xb478f600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb478f640) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb478f680) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb478f7c0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb478f740) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb478f840) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb478f880) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb478f8c0) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb478f800) 0 Class QGradient size=56 align=4 @@ -4480,30 +3638,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb478fa80) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb478fbc0) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb478fb40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb478fd40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb478fcc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb478fd80) 0 Class QTextCharFormat size=8 align=4 @@ -4643,10 +3785,6 @@ QTextFrame (0xb478fc40) 0 QObject (0xb450b040) 0 primary-for QTextObject (0xb450b000) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb450b180) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -4671,25 +3809,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb450b240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb450b2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb450b300) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb450b340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb450b380) 0 empty Class QTextDocumentFragment size=4 align=4 @@ -4756,10 +3882,6 @@ QTextTable (0xb450b500) 0 QObject (0xb450b5c0) 0 primary-for QTextObject (0xb450b580) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb450b740) 0 Class QTextCursor size=4 align=4 @@ -4808,10 +3930,6 @@ Class QTextOption base size=24 base align=4 QTextOption (0xb450b980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb450b9c0) 0 Class QTextInlineObject size=8 align=4 @@ -4828,15 +3946,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb450ba40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb450bbc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb450bb40) 0 Class QTextLine size=8 align=4 @@ -4886,10 +3996,6 @@ QTextDocument (0xb450bd00) 0 QObject (0xb450bd40) 0 primary-for QTextDocument (0xb450bd00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb450bdc0) 0 Class QPalette size=8 align=4 @@ -4907,15 +4013,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb450bfc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb450b700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb450b480) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4977,10 +4075,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb450be40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42b00c0) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5028,15 +4122,7 @@ QStyle (0xb42b0100) 0 QObject (0xb42b0140) 0 primary-for QStyle (0xb42b0100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42b0200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42b0240) 0 Vtable for QCommonStyle QCommonStyle::_ZTV12QCommonStyle: 35u entries @@ -5242,10 +4328,6 @@ QWindowsXPStyle (0xb42b0780) 0 QObject (0xb42b0880) 0 primary-for QStyle (0xb42b0840) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb42b0a40) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -5541,10 +4623,6 @@ QWidget (0xb42b0040) 0 QPaintDevice (0xb42b01c0) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42b0480) 0 Vtable for QValidator QValidator::_ZTV10QValidator: 16u entries @@ -5745,10 +4823,6 @@ QAbstractSpinBox (0xb4094140) 0 QPaintDevice (0xb4094200) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4094280) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6167,10 +5241,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb4094ac0) 0 QStyleOption (0xb4094b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4094c80) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6197,10 +5267,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb4094f00) 0 QStyleOption (0xb4094f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4094240) 0 Class QStyleOptionButton size=64 align=4 @@ -6208,10 +5274,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb4094000) 0 QStyleOption (0xb4094100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40946c0) 0 Class QStyleOptionTab size=72 align=4 @@ -6226,10 +5288,6 @@ QStyleOptionTabV2 (0xb4094840) 0 QStyleOptionTab (0xb4094980) 0 QStyleOption (0xb4094a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4094fc0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6256,10 +5314,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb3fd9200) 0 QStyleOption (0xb3fd9240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3fd9380) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6292,10 +5346,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb3fd96c0) 0 QStyleOption (0xb3fd9700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3fd9880) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -6351,15 +5401,7 @@ QStyleOptionSpinBox (0xb3fd9f80) 0 QStyleOptionComplex (0xb3fd9fc0) 0 QStyleOption (0xb3fd9000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3fd9540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3fd93c0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6368,10 +5410,6 @@ QStyleOptionQ3ListView (0xb3fd9100) 0 QStyleOptionComplex (0xb3fd9280) 0 QStyleOption (0xb3fd9340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3fd9e00) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6488,10 +5526,6 @@ Class QStyleFactory base size=0 base align=1 QStyleFactory (0xb3ec0780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ec0840) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -6663,10 +5697,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb3ec0b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3ec0bc0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6697,20 +5727,8 @@ QItemSelectionModel (0xb3ec0c00) 0 QObject (0xb3ec0c40) 0 primary-for QItemSelectionModel (0xb3ec0c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ec0cc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3ec0d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3ec0d00) 0 Class QItemSelection size=4 align=4 @@ -6872,10 +5890,6 @@ QAbstractItemView (0xb3ec0f00) 0 QPaintDevice (0xb3ec0180) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ec03c0) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -7140,15 +6154,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb3e0e280) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3e0e540) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3e0e4c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7296,15 +6302,7 @@ Class QTableWidgetSelectionRange base size=16 base align=4 QTableWidgetSelectionRange (0xb3e0e800) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3e0e940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3e0e8c0) 0 Vtable for QTableWidgetItem QTableWidgetItem::_ZTV16QTableWidgetItem: 10u entries @@ -7790,15 +6788,7 @@ Class QStandardItem QStandardItem (0xb3e0edc0) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3b65100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3b65080) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -7926,25 +6916,9 @@ QDirModel (0xb3b65300) 0 QObject (0xb3b65380) 0 primary-for QAbstractItemModel (0xb3b65340) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb3b65500) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb3b65480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3b65600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3b65580) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8540,15 +7514,7 @@ QActionGroup (0xb3b65440) 0 QObject (0xb3b65540) 0 primary-for QActionGroup (0xb3b65440) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3b65b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3b65880) 0 Vtable for QLayoutItem QLayoutItem::_ZTV11QLayoutItem: 18u entries @@ -9687,10 +8653,6 @@ QMdiArea (0xb38e50c0) 0 QPaintDevice (0xb38e5200) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb38e5280) 0 Vtable for QAbstractButton QAbstractButton::_ZTV15QAbstractButton: 66u entries @@ -10012,10 +8974,6 @@ QMdiSubWindow (0xb38e56c0) 0 QPaintDevice (0xb38e5780) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb38e5800) 0 Vtable for QCalendarWidget QCalendarWidget::_ZTV15QCalendarWidget: 64u entries @@ -10493,10 +9451,6 @@ QDialogButtonBox (0xb38e5f80) 0 QPaintDevice (0xb38e5240) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb38e53c0) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -10576,10 +9530,6 @@ QDockWidget (0xb38e5540) 0 QPaintDevice (0xb38e5980) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb38e5c40) 0 Vtable for QScrollArea QScrollArea::_ZTV11QScrollArea: 65u entries @@ -10930,10 +9880,6 @@ QDateEdit (0xb36a7440) 0 QPaintDevice (0xb36a7580) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb36a7600) 0 Vtable for QFontComboBox QFontComboBox::_ZTV13QFontComboBox: 65u entries @@ -11017,10 +9963,6 @@ QFontComboBox (0xb36a7640) 0 QPaintDevice (0xb36a7740) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb36a77c0) 0 Vtable for QToolBox QToolBox::_ZTV8QToolBox: 65u entries @@ -11275,10 +10217,6 @@ QTextEdit (0xb36a7ac0) 0 QPaintDevice (0xb36a7c00) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb36a7d00) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -12210,10 +11148,6 @@ QMainWindow (0xb35ee980) 0 QPaintDevice (0xb35eea40) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35eeac0) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12786,20 +11720,8 @@ Class QGraphicsItem QGraphicsItem (0xb35385c0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35386c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb3538700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb35387c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -13361,50 +12283,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb3538480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3538600) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3538a00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3538680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3538dc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3538c00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb32ab040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3538f80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb32ab140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb32ab0c0) 0 Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -13451,20 +12337,8 @@ QGraphicsScene (0xb32ab180) 0 QObject (0xb32ab1c0) 0 primary-for QGraphicsScene (0xb32ab180) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb32ab2c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb32ab380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb32ab300) 0 Vtable for QGraphicsView QGraphicsView::_ZTV13QGraphicsView: 68u entries @@ -13553,15 +12427,7 @@ QGraphicsView (0xb32ab3c0) 0 QPaintDevice (0xb32ab500) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb32ab5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb32ab600) 0 Vtable for QGraphicsItemAnimation QGraphicsItemAnimation::_ZTV22QGraphicsItemAnimation: 16u entries @@ -13921,10 +12787,6 @@ QAbstractPrintDialog (0xb32abb40) 0 QPaintDevice (0xb32abc40) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb32abd00) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -14183,10 +13045,6 @@ QWizard (0xb32ab580) 0 QPaintDevice (0xb32abb00) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb32abcc0) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -14354,10 +13212,6 @@ QFileDialog (0xb3082100) 0 QPaintDevice (0xb3082200) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb30822c0) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -14694,10 +13548,6 @@ QMessageBox (0xb30827c0) 0 QPaintDevice (0xb30828c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3082980) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -15173,15 +14023,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb2fbb300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2fbb340) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2fbb400) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -15216,20 +14058,12 @@ Class QPaintEngine QPaintEngine (0xb2fbb380) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2fbb500) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb2fbb480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2fbb540) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26u entries @@ -15346,25 +14180,13 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0xb2fbb880) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb2fbb900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2fbb940) 0 Class QGLFormat size=4 align=4 base size=4 base align=4 QGLFormat (0xb2fbb980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2fbba40) 0 Vtable for QGLContext QGLContext::_ZTV10QGLContext: 11u entries @@ -15510,188 +14332,40 @@ QGLFramebufferObject (0xb2fbbd40) 0 QPaintDevice (0xb2fbbd80) 0 primary-for QGLFramebufferObject (0xb2fbbd40) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2fbbe80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2fbbf00) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb2fbbf80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2fbb000) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb2fbb1c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2fbb700) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2fbb9c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2fbbac0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2aa9100) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb2aa9180) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2aa9200) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2aa9380) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2aa9400) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2aa9480) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2aa9500) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb2aa95c0) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb2aa9640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2aa96c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2aa9780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2aa9880) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb2aa9940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2aa99c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2aa9a40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2aa9ac0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2aa9b40) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb2aa9bc0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb2aa9c80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2aa9d40) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb2aa9e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2aa9ec0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2aa9f40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2aa9280) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2aa9900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2aa9c00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2aa9cc0) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb2aa9e40) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb2931040) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.3.1.linux-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.4.3.1.linux-gcc-ia32.txt index 45ee92846..282b429a2 100644 --- a/tests/auto/bic/data/QtOpenGL.4.3.1.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.3.1.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7fa1d80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7fa1dc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7fa1e80) 0 empty - QUintForSize<4> (0xb7fa1ec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7fa1f40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7fa1f80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb5aa1040) 0 empty - QIntForSize<4> (0xb5aa1080) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb5aa1340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa1400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa1440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa1480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa14c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa1500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa1540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa1580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa15c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa1600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa1640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa1680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa16c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa1700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa1740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa1780) 0 empty Class QFlag size=4 align=4 @@ -161,10 +75,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb5aa1bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5aa1c00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -227,70 +137,18 @@ Class QListData base size=4 base align=4 QListData (0xb5aa1f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a53100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a53140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a53180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a531c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a53200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a53240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a53280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a532c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a53300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a53340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a53380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a533c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a53400) 0 Class QInternal size=1 align=1 @@ -308,10 +166,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb5a53500) 0 QGenericArgument (0xb5a53540) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb5a53700) 0 Class QMetaObject size=16 align=4 @@ -328,10 +182,6 @@ Class QChar base size=2 base align=2 QChar (0xb5a537c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a53840) 0 empty Class QString::Null size=1 align=1 @@ -348,10 +198,6 @@ Class QString base size=4 base align=4 QString (0xb5a53880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a53a80) 0 Class QLatin1String size=4 align=4 @@ -369,25 +215,13 @@ Class QConstString QConstString (0xb5a53b40) 0 QString (0xb5a53b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a53bc0) 0 empty Class QStringRef size=12 align=4 base size=12 base align=4 QStringRef (0xb5a53c00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5a53d40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5a53cc0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -479,10 +313,6 @@ QIODevice (0xb5a53f80) 0 QObject (0xb5a53fc0) 0 primary-for QIODevice (0xb5a53f80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a53000) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -502,275 +332,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb5a53a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56350c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56351c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56352c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56353c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56354c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56355c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56356c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56357c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56358c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56359c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5635d40) 0 empty Class QMapData::Node size=8 align=4 @@ -807,45 +421,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb5678200) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5678480) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb56784c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb56785c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5678540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb56786c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb5678640) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb5678740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb56787c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -972,10 +558,6 @@ QEventLoop (0xb5678c40) 0 QObject (0xb5678c80) 0 primary-for QEventLoop (0xb5678c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5678d80) 0 Vtable for QCoreApplication QCoreApplication::_ZTV16QCoreApplication: 16u entries @@ -1009,10 +591,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb5678f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5678f80) 0 empty Vtable for QTimer QTimer::_ZTV6QTimer: 14u entries @@ -1069,20 +647,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb5678440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5678340) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb5678400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5678840) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1277,20 +847,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb5472080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54720c0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb5472100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5472140) 0 empty Class QMetaProperty size=20 align=4 @@ -1302,10 +864,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb54721c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5472200) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1408,100 +966,48 @@ Class QSize base size=8 base align=4 QSize (0xb5472500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5472700) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb5472780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5472980) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb5472a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5472c80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb5472cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5472f00) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb5472f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5472040) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb54722c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5472380) 0 empty -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb5472540) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb5472580) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb5472440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb54725c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5472600) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5472640) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5472680) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb54726c0) 0 Class timespec size=8 align=4 @@ -1513,80 +1019,24 @@ Class timeval base size=8 base align=4 timeval (0xb5472800) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5472840) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb5472880) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb54728c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb5472a80) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb5472940) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb5472900) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb5472ac0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb5472b40) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb5472b00) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb5472b80) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb5472c00) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb5472bc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5472c40) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb5472d00) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb5472d40) 0 Class random_data size=28 align=4 @@ -1618,35 +1068,19 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb50941c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5094200) 0 empty Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb5094980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50949c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb5094a00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5094ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5094a40) 0 Class QStringList size=4 align=4 @@ -1654,15 +1088,7 @@ Class QStringList QStringList (0xb5094b00) 0 QList (0xb5094b40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb5094bc0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb5094c00) 0 Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1695,15 +1121,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb5094e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5094e40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5094e80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1730,10 +1148,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb5074000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5074040) 0 empty Class QCryptographicHash size=4 align=4 @@ -1750,20 +1164,12 @@ Class QLine base size=16 base align=4 QLine (0xb5074480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50744c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb5074500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5074540) 0 empty Class QSharedData size=4 align=4 @@ -1775,30 +1181,18 @@ Class QDate base size=4 base align=4 QDate (0xb50746c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5074780) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb50747c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5074880) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb50748c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5074980) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1810,20 +1204,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb5074a00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb5074a80) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb5074a40) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb5074b00) 0 Class QWriteLocker size=4 align=4 @@ -1876,20 +1262,12 @@ Class QMutex base size=4 base align=4 QMutex (0xb5074d40) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb5074dc0) 0 Class QMutexLocker size=4 align=4 base size=4 base align=4 QMutexLocker (0xb5074d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5074ec0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1914,15 +1292,7 @@ Class QTextCodec QTextCodec (0xb5074e00) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb50743c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5074f80) 0 Class QTextEncoder size=32 align=4 @@ -1934,25 +1304,9 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb5074740) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb5074840) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5074800) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb5074900) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5074940) 0 Class __gconv_trans_data size=20 align=4 @@ -1974,15 +1328,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb4e5f000) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb4e5f080) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb4e5f040) 0 Class _IO_marker size=12 align=4 @@ -1994,10 +1340,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb4e5f100) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb4e5f140) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -2012,10 +1354,6 @@ Class QTextStream QTextStream (0xb4e5f180) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e5f240) 0 Class QTextStreamManipulator size=24 align=4 @@ -2131,35 +1469,15 @@ QFile (0xb4e5f680) 0 QObject (0xb4e5f700) 0 primary-for QIODevice (0xb4e5f6c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e5f780) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb4e5f7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e5f800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4e5f840) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4e5f900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4e5f880) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -2212,15 +1530,7 @@ Class QDir base size=4 base align=4 QDir (0xb4e5fa80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e5fb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e5fb80) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2277,10 +1587,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb4e5fbc0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e5fd40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2409,15 +1715,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb4e5f200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e5f480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4e5f580) 0 empty Vtable for QDirIterator QDirIterator::_ZTV12QDirIterator: 4u entries @@ -2432,10 +1730,6 @@ Class QDirIterator QDirIterator (0xb4e5f640) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e5fa40) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -2541,10 +1835,6 @@ QLibrary (0xb4ad1140) 0 QObject (0xb4ad1180) 0 primary-for QLibrary (0xb4ad1140) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ad1200) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2674,10 +1964,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb4ad1740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ad1840) 0 Vtable for QLayoutItem QLayoutItem::_ZTV11QLayoutItem: 18u entries @@ -3103,40 +2389,16 @@ Class QPaintDevice QPaintDevice (0xb4ad1480) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4ad1800) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4ad18c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4ad1980) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4ad17c0) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0xb4ad1700) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4ad1cc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4ad1a40) 0 Class QPolygon size=4 align=4 @@ -3144,15 +2406,7 @@ Class QPolygon QPolygon (0xb4ad1e00) 0 QVector (0xb4ad1f80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4893080) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4893000) 0 Class QPolygonF size=4 align=4 @@ -3175,10 +2429,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb48932c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4893300) 0 empty Class QPainterPath::Element size=20 align=4 @@ -3190,25 +2440,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb4893340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb48935c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4893540) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb4893440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4893600) 0 empty Class QPainterPathStroker size=4 align=4 @@ -3220,10 +2458,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb4893700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4893740) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3248,10 +2482,6 @@ QImage (0xb4893800) 0 QPaintDevice (0xb4893840) 0 primary-for QImage (0xb4893800) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4893980) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -3276,45 +2506,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb4893b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4893bc0) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb4893c00) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4893d40) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4893cc0) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb4893dc0) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb4893e00) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb4893e40) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb4893d80) 0 Class QGradient size=56 align=4 @@ -3380,10 +2582,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb4893a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4893ac0) 0 empty Class QWidgetData size=64 align=4 @@ -3466,10 +2664,6 @@ QWidget (0xb4893c80) 0 QPaintDevice (0xb46e2040) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb46e2240) 0 Class QToolTip size=1 align=1 @@ -3558,10 +2752,6 @@ Class QIcon base size=4 base align=4 QIcon (0xb46e24c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb46e2580) 0 empty Vtable for QAction QAction::_ZTV7QAction: 14u entries @@ -3613,15 +2803,7 @@ QActionGroup (0xb46e26c0) 0 QObject (0xb46e2700) 0 primary-for QActionGroup (0xb46e26c0) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb46e2840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb46e27c0) 0 Vtable for QShortcut QShortcut::_ZTV9QShortcut: 14u entries @@ -3961,15 +3143,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb44ad1c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb44ad2c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb44ad240) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -4663,10 +3837,6 @@ QAbstractPrintDialog (0xb455d100) 0 QPaintDevice (0xb455d200) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb455d2c0) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -4837,10 +4007,6 @@ QMessageBox (0xb455d4c0) 0 QPaintDevice (0xb455d5c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb455d680) 0 Vtable for QProgressDialog QProgressDialog::_ZTV15QProgressDialog: 66u entries @@ -5091,10 +4257,6 @@ QFileDialog (0xb455d9c0) 0 QPaintDevice (0xb455dac0) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb455db80) 0 Vtable for QErrorMessage QErrorMessage::_ZTV13QErrorMessage: 66u entries @@ -5505,10 +4667,6 @@ QWizard (0xb455d800) 0 QPaintDevice (0xb455de40) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb455df80) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -5850,10 +5008,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb42ca600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb42ca680) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5884,20 +5038,8 @@ QItemSelectionModel (0xb42ca6c0) 0 QObject (0xb42ca700) 0 primary-for QItemSelectionModel (0xb42ca6c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42ca780) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb42ca840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb42ca7c0) 0 Class QItemSelection size=4 align=4 @@ -6104,10 +5246,6 @@ QAbstractSpinBox (0xb42cacc0) 0 QPaintDevice (0xb42cad80) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42cae00) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6315,15 +5453,7 @@ QStyle (0xb42ca5c0) 0 QObject (0xb42ca740) 0 primary-for QStyle (0xb42ca5c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42caa80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42cab80) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -6582,10 +5712,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb4254440) 0 QStyleOption (0xb4254480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4254600) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6612,10 +5738,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb4254880) 0 QStyleOption (0xb42548c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4254a40) 0 Class QStyleOptionButton size=64 align=4 @@ -6623,10 +5745,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb4254980) 0 QStyleOption (0xb42549c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4254bc0) 0 Class QStyleOptionTab size=72 align=4 @@ -6641,10 +5759,6 @@ QStyleOptionTabV2 (0xb4254c40) 0 QStyleOptionTab (0xb4254c80) 0 QStyleOption (0xb4254cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4254e40) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6671,10 +5785,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb4254300) 0 QStyleOption (0xb4254400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4254780) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6707,10 +5817,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb3f58000) 0 QStyleOption (0xb3f58040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f581c0) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -6766,15 +5872,7 @@ QStyleOptionSpinBox (0xb3f588c0) 0 QStyleOptionComplex (0xb3f58900) 0 QStyleOption (0xb3f58940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3f58b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3f58ac0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6783,10 +5881,6 @@ QStyleOptionQ3ListView (0xb3f589c0) 0 QStyleOptionComplex (0xb3f58a00) 0 QStyleOption (0xb3f58a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f58d00) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7000,10 +6094,6 @@ QAbstractItemView (0xb4020080) 0 QPaintDevice (0xb40201c0) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4020280) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -7384,20 +6474,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb4020b80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4020c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4020c40) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4020c80) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -7428,20 +6506,8 @@ QAccessibleInterface (0xb4020d40) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb4020d80) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb4020f00) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb4020e80) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb4020e00) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -8862,10 +7928,6 @@ QDateEdit (0xb3e19980) 0 QPaintDevice (0xb3e19ac0) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3e19b40) 0 Vtable for QButtonGroup QButtonGroup::_ZTV12QButtonGroup: 14u entries @@ -8970,10 +8032,6 @@ QDockWidget (0xb3e19c40) 0 QPaintDevice (0xb3e19d00) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3e19dc0) 0 Vtable for QMainWindow QMainWindow::_ZTV11QMainWindow: 64u entries @@ -9054,10 +8112,6 @@ QMainWindow (0xb3e19e00) 0 QPaintDevice (0xb3e19ec0) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3e19f40) 0 Vtable for QMenu QMenu::_ZTV5QMenu: 63u entries @@ -9867,10 +8921,6 @@ QFontComboBox (0xb3b88900) 0 QPaintDevice (0xb3b88a00) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3b88a80) 0 Vtable for QToolBox QToolBox::_ZTV8QToolBox: 65u entries @@ -10277,10 +9327,6 @@ QMdiArea (0xb3b88000) 0 QPaintDevice (0xb3b88700) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3b88880) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10597,10 +9643,6 @@ QMdiSubWindow (0xb3af8300) 0 QPaintDevice (0xb3af83c0) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3af8440) 0 Vtable for QMenuItem QMenuItem::_ZTV9QMenuItem: 14u entries @@ -10672,60 +9714,32 @@ QTextDocument (0xb3af8640) 0 QObject (0xb3af8680) 0 primary-for QTextDocument (0xb3af8640) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3af8700) 0 Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0xb3af8740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3af8780) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0xb3af87c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3af8880) 0 empty Class QTextLength size=12 align=4 base size=12 base align=4 QTextLength (0xb3af88c0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb3af8a00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb3af8980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3af8b80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3af8b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3af8bc0) 0 Class QTextCharFormat size=8 align=4 @@ -10765,10 +9779,6 @@ QTextTableFormat (0xb3af8ec0) 0 QTextFrameFormat (0xb3af8f00) 0 QTextFormat (0xb3af8f40) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb3af8040) 0 Class QTextCursor size=4 align=4 @@ -10875,10 +9885,6 @@ QTextFrame (0xb3af8840) 0 QObject (0xb3af8940) 0 primary-for QTextObject (0xb3af8900) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3af8fc0) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -10903,25 +9909,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb3904080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3904100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3904140) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb3904180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb39041c0) 0 empty Class QTextInlineObject size=8 align=4 @@ -10938,15 +9932,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb3904240) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb39043c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3904340) 0 Class QTextLine size=8 align=4 @@ -11046,10 +10032,6 @@ QTextEdit (0xb3904440) 0 QPaintDevice (0xb3904580) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3904680) 0 Vtable for QLCDNumber QLCDNumber::_ZTV10QLCDNumber: 63u entries @@ -11289,10 +10271,6 @@ QDialogButtonBox (0xb39049c0) 0 QPaintDevice (0xb3904a80) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3904b00) 0 Vtable for QCalendarWidget QCalendarWidget::_ZTV15QCalendarWidget: 64u entries @@ -11556,15 +10534,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb3904980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3904fc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3904c80) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -11788,20 +10758,8 @@ Class QGraphicsItem QGraphicsItem (0xb365f6c0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb365f7c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb365f800) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb365f8c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -12363,50 +11321,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb365f780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb365fa00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb365fe00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb365fc00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb35f9040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb365ff80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb35f9140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb35f90c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb35f9240) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb35f91c0) 0 Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -12453,20 +11375,8 @@ QGraphicsScene (0xb35f9280) 0 QObject (0xb35f92c0) 0 primary-for QGraphicsScene (0xb35f9280) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35f93c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb35f9480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb35f9400) 0 Vtable for QGraphicsView QGraphicsView::_ZTV13QGraphicsView: 68u entries @@ -12555,15 +11465,7 @@ QGraphicsView (0xb35f94c0) 0 QPaintDevice (0xb35f9600) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35f96c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35f9700) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -12957,10 +11859,6 @@ QImageIOPlugin (0xb3381140) 0 QFactoryInterface (0xb3381200) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb33811c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3381280) 0 Class QImageReader size=4 align=4 @@ -13412,10 +12310,6 @@ Class QStyleFactory base size=0 base align=1 QStyleFactory (0xb3381a40) 0 empty -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb3381e80) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -13876,15 +12770,7 @@ Class QStandardItem QStandardItem (0xb327ab00) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb327adc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb327ad40) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -13998,15 +12884,7 @@ QStringListModel (0xb327af00) 0 QObject (0xb327afc0) 0 primary-for QAbstractItemModel (0xb327af80) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb327a540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb327a240) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -14530,35 +13408,15 @@ QTreeView (0xb31cf580) 0 QPaintDevice (0xb31cf700) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb31cf800) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0xb31cf780) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb31cf940) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb31cf8c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb31cfa40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb31cf9c0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -14726,15 +13584,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb31cfd00) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb31cffc0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb31cff40) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -15254,15 +14104,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb2f83700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2f83740) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f83800) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -15297,20 +14139,12 @@ Class QPaintEngine QPaintEngine (0xb2f83780) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f83900) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb2f83880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f83940) 0 Class QColormap size=4 align=4 @@ -15346,25 +14180,13 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0xb2f83a40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb2f83ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f83b00) 0 Class QGLFormat size=4 align=4 base size=4 base align=4 QGLFormat (0xb2f83b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f83c00) 0 Vtable for QGLContext QGLContext::_ZTV10QGLContext: 11u entries @@ -15510,188 +14332,40 @@ QGLFramebufferObject (0xb2f83f00) 0 QPaintDevice (0xb2f83f40) 0 primary-for QGLFramebufferObject (0xb2f83f00) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2f832c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2f83680) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb2f83840) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2f83a00) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb2f83bc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a89000) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2a89080) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2a89100) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2a89180) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2a89300) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2a89380) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2a89400) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2a89480) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a89680) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb2a89700) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb2a897c0) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb2a89840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a898c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a89940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a89a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a89b00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a89bc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a89c40) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb2a89cc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a89d40) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb2a89dc0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb2a89e80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a89f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a89fc0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a89280) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a89d80) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb2a89e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2903000) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2903080) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2903100) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb29031c0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb2903240) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.3.2.linux-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.4.3.2.linux-gcc-ia32.txt index ccdf2c8fd..640e4a73f 100644 --- a/tests/auto/bic/data/QtOpenGL.4.3.2.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.3.2.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f91d80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f91dc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f91e80) 0 empty - QUintForSize<4> (0xb7f91ec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f91f40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f91f80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb5a8f040) 0 empty - QIntForSize<4> (0xb5a8f080) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb5a8f340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5a8f780) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb5a8f7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a8f8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a8f900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a8f940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a8f980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a8f9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a8fa00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a8fa40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a8fa80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a8fac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a8fb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a8fb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a8fb80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a8fbc0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb5a8fcc0) 0 QGenericArgument (0xb5a8fd00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb5a8fec0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb5a8ff80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb59d3000) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb59d3300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb59d3340) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb59d3380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb59d3580) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb59d3680) 0 QString (0xb59d36c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb59d3700) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb59d3a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb59d3dc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb59d3d40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb59d34c0) 0 QObject (0xb59d3500) 0 primary-for QLibrary (0xb59d34c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb59d3840) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb59d3c00) 0 QObject (0xb59d3e40) 0 primary-for QIODevice (0xb59d3c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55f5000) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb55f50c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55f5100) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb55f5140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb55f5200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb55f5180) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb55f5240) 0 QList (0xb55f5280) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb55f5300) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb55f5340) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb55f56c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55f5700) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb55f5c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55f5d00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb55f5d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55f5e00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb55f5e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55f5f00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb55f5f40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb55f5fc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb55f5080) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb55f5f80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb55f5440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb55f5580) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb55f5ac0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb55f5c80) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb55f5cc0) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb55f5dc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb55f5e80) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb55f5ec0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb53b7000) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb53b70c0) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb53b7080) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb53b7040) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb53b7100) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb53b7180) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb53b7140) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb53b71c0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb53b7240) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb53b7200) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb53b7280) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb53b72c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb53b7300) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb53b7580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53b7780) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb53b7800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53b7a00) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb53b7dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53b7e00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53b7e40) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb51f0040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51f0280) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb51f02c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51f0500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb51f0640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51f0740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb51f0780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51f0840) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb51f0880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51f08c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb51f0900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51f0940) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb51f0cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51f0d00) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb51f0e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb51f0ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51f0f00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb51f0f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f00c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f01c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f03c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f04c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f06c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f07c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb51f0b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50620c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50621c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50622c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50623c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50624c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50625c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50626c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5062780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb50627c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb5062800) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5062a80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5062ac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5062bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5062b40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb5062cc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb5062c40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb5062d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5062dc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb5062e00) 0 QObject (0xb5062e40) 0 primary-for QSettings (0xb5062e00) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb5062f40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5062f00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb5062f80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5062fc0) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb5062a00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb5062e80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb5062a40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb4f42000) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb4f42040) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb4f42080) 0 QObject (0xb4f42100) 0 primary-for QIODevice (0xb4f420c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f42180) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb4f42300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f42340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f42380) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4f42440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4f423c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb4f42480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f42500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f42580) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb4f427c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f42880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb4f428c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f42a40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb4f42b00) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f42c40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb4f42b80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4f42d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4f42d00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb4f42e40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f42f00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb4b800c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb4b80140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb4b80100) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb4b801c0) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb4b80200) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb4b80280) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb4b80580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b805c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb4b806c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b80700) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb4b80740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b807c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb4b80c40) 0 QObject (0xb4b80c80) 0 primary-for QEventLoop (0xb4b80c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4b80d80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb4b80e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b80ec0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb4b80f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4afc000) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb4afc080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4afc0c0) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2726,25 +2016,13 @@ QImageIOPlugin (0xb4afc500) 0 QFactoryInterface (0xb4afc5c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb4afc580) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4afc640) 0 Class QImageReader size=4 align=4 base size=4 base align=4 QImageReader (0xb4afc680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4afc740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4afc6c0) 0 Class QPolygon size=4 align=4 @@ -2752,15 +2030,7 @@ Class QPolygon QPolygon (0xb4afc780) 0 QVector (0xb4afc7c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4afc880) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4afc800) 0 Class QPolygonF size=4 align=4 @@ -2783,10 +2053,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb4afcac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4afcb00) 0 empty Class QPainterPath::Element size=20 align=4 @@ -2798,25 +2064,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb4afcb40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4afcdc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4afcd40) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb4afcc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4afce00) 0 empty Class QPainterPathStroker size=4 align=4 @@ -2828,10 +2082,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb4afcf00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4afcf40) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2872,30 +2122,10 @@ QImage (0xb4afc3c0) 0 QPaintDevice (0xb4afc480) 0 primary-for QImage (0xb4afc3c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4afc980) 0 empty -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4afca40) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4afcbc0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4afcc00) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4afca00) 0 Class QColor size=16 align=4 @@ -3083,10 +2313,6 @@ Class QIcon base size=4 base align=4 QIcon (0xb48d9940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb48d9a00) 0 empty Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -3225,10 +2451,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb48d9f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb48d9000) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3526,15 +2748,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb4820840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4820940) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb48208c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3823,20 +3037,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb469c040) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb469c0c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb469c100) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb469c140) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3867,20 +3069,8 @@ QAccessibleInterface (0xb469c200) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb469c240) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb469c3c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb469c340) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb469c2c0) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -4402,55 +3592,23 @@ Class QPen base size=4 base align=4 QPen (0xb4753500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb47535c0) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0xb4753600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4753680) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb47536c0) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4753800) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4753780) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb4753880) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb47538c0) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb4753900) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb4753840) 0 Class QGradient size=56 align=4 @@ -4480,30 +3638,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb4753ac0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4753c00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb4753b80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4753d80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4753d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4753dc0) 0 Class QTextCharFormat size=8 align=4 @@ -4643,10 +3785,6 @@ QTextFrame (0xb4753c80) 0 QObject (0xb44d0040) 0 primary-for QTextObject (0xb44d0000) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44d0180) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -4671,25 +3809,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb44d0240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44d02c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44d0300) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb44d0340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44d0380) 0 empty Class QTextDocumentFragment size=4 align=4 @@ -4756,10 +3882,6 @@ QTextTable (0xb44d0500) 0 QObject (0xb44d05c0) 0 primary-for QTextObject (0xb44d0580) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb44d0740) 0 Class QTextCursor size=4 align=4 @@ -4808,10 +3930,6 @@ Class QTextOption base size=24 base align=4 QTextOption (0xb44d0980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44d09c0) 0 Class QTextInlineObject size=8 align=4 @@ -4828,15 +3946,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb44d0a40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb44d0bc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb44d0b40) 0 Class QTextLine size=8 align=4 @@ -4886,10 +3996,6 @@ QTextDocument (0xb44d0d00) 0 QObject (0xb44d0d40) 0 primary-for QTextDocument (0xb44d0d00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44d0dc0) 0 Class QPalette size=8 align=4 @@ -4907,15 +4013,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb44d0fc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb44d0700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb44d0480) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4977,10 +4075,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb44d0e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42750c0) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5028,15 +4122,7 @@ QStyle (0xb4275100) 0 QObject (0xb4275140) 0 primary-for QStyle (0xb4275100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4275200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4275240) 0 Vtable for QCommonStyle QCommonStyle::_ZTV12QCommonStyle: 35u entries @@ -5242,10 +4328,6 @@ QWindowsXPStyle (0xb4275780) 0 QObject (0xb4275880) 0 primary-for QStyle (0xb4275840) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb4275a40) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -5541,10 +4623,6 @@ QWidget (0xb4275040) 0 QPaintDevice (0xb42751c0) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4275480) 0 Vtable for QValidator QValidator::_ZTV10QValidator: 16u entries @@ -5745,10 +4823,6 @@ QAbstractSpinBox (0xb405a140) 0 QPaintDevice (0xb405a200) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb405a280) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6167,10 +5241,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb405aac0) 0 QStyleOption (0xb405ab00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb405ac80) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6197,10 +5267,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb405af00) 0 QStyleOption (0xb405af40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb405a240) 0 Class QStyleOptionButton size=64 align=4 @@ -6208,10 +5274,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb405a000) 0 QStyleOption (0xb405a100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb405a6c0) 0 Class QStyleOptionTab size=72 align=4 @@ -6226,10 +5288,6 @@ QStyleOptionTabV2 (0xb405a840) 0 QStyleOptionTab (0xb405a980) 0 QStyleOption (0xb405aa80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb405afc0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6256,10 +5314,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb3f9d200) 0 QStyleOption (0xb3f9d240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f9d380) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6292,10 +5346,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb3f9d6c0) 0 QStyleOption (0xb3f9d700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f9d880) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -6351,15 +5401,7 @@ QStyleOptionSpinBox (0xb3f9df80) 0 QStyleOptionComplex (0xb3f9dfc0) 0 QStyleOption (0xb3f9d000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3f9d540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3f9d3c0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6368,10 +5410,6 @@ QStyleOptionQ3ListView (0xb3f9d100) 0 QStyleOptionComplex (0xb3f9d280) 0 QStyleOption (0xb3f9d340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f9de00) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6488,10 +5526,6 @@ Class QStyleFactory base size=0 base align=1 QStyleFactory (0xb3e84780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3e84840) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -6663,10 +5697,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb3e84b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3e84bc0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6697,20 +5727,8 @@ QItemSelectionModel (0xb3e84c00) 0 QObject (0xb3e84c40) 0 primary-for QItemSelectionModel (0xb3e84c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3e84cc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3e84d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3e84d00) 0 Class QItemSelection size=4 align=4 @@ -6872,10 +5890,6 @@ QAbstractItemView (0xb3e84f00) 0 QPaintDevice (0xb3e84180) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3e843c0) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -7140,15 +6154,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb3dd3280) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3dd3540) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3dd34c0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7296,15 +6302,7 @@ Class QTableWidgetSelectionRange base size=16 base align=4 QTableWidgetSelectionRange (0xb3dd3800) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3dd3940) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3dd38c0) 0 Vtable for QTableWidgetItem QTableWidgetItem::_ZTV16QTableWidgetItem: 10u entries @@ -7790,15 +6788,7 @@ Class QStandardItem QStandardItem (0xb3dd3dc0) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3b2b100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3b2b080) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -7926,25 +6916,9 @@ QDirModel (0xb3b2b300) 0 QObject (0xb3b2b380) 0 primary-for QAbstractItemModel (0xb3b2b340) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb3b2b500) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb3b2b480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3b2b600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3b2b580) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8540,15 +7514,7 @@ QActionGroup (0xb3b2b440) 0 QObject (0xb3b2b540) 0 primary-for QActionGroup (0xb3b2b440) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3b2bb40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3b2b880) 0 Vtable for QLayoutItem QLayoutItem::_ZTV11QLayoutItem: 18u entries @@ -9687,10 +8653,6 @@ QMdiArea (0xb38a90c0) 0 QPaintDevice (0xb38a9200) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb38a9280) 0 Vtable for QAbstractButton QAbstractButton::_ZTV15QAbstractButton: 66u entries @@ -10012,10 +8974,6 @@ QMdiSubWindow (0xb38a96c0) 0 QPaintDevice (0xb38a9780) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb38a9800) 0 Vtable for QCalendarWidget QCalendarWidget::_ZTV15QCalendarWidget: 64u entries @@ -10493,10 +9451,6 @@ QDialogButtonBox (0xb38a9f80) 0 QPaintDevice (0xb38a9240) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb38a93c0) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -10576,10 +9530,6 @@ QDockWidget (0xb38a9540) 0 QPaintDevice (0xb38a9980) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb38a9c40) 0 Vtable for QScrollArea QScrollArea::_ZTV11QScrollArea: 65u entries @@ -10930,10 +9880,6 @@ QDateEdit (0xb366c440) 0 QPaintDevice (0xb366c580) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb366c600) 0 Vtable for QFontComboBox QFontComboBox::_ZTV13QFontComboBox: 65u entries @@ -11017,10 +9963,6 @@ QFontComboBox (0xb366c640) 0 QPaintDevice (0xb366c740) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb366c7c0) 0 Vtable for QToolBox QToolBox::_ZTV8QToolBox: 65u entries @@ -11275,10 +10217,6 @@ QTextEdit (0xb366cac0) 0 QPaintDevice (0xb366cc00) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb366cd00) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -12210,10 +11148,6 @@ QMainWindow (0xb35b3980) 0 QPaintDevice (0xb35b3a40) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35b3ac0) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12786,20 +11720,8 @@ Class QGraphicsItem QGraphicsItem (0xb34fe5c0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34fe6c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb34fe700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb34fe7c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -13361,50 +12283,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb34fe480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34fe600) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb34fea00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb34fe680) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb34fedc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb34fec00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3271040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb34fef80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3271140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb32710c0) 0 Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -13451,20 +12337,8 @@ QGraphicsScene (0xb3271180) 0 QObject (0xb32711c0) 0 primary-for QGraphicsScene (0xb3271180) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb32712c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3271380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3271300) 0 Vtable for QGraphicsView QGraphicsView::_ZTV13QGraphicsView: 68u entries @@ -13553,15 +12427,7 @@ QGraphicsView (0xb32713c0) 0 QPaintDevice (0xb3271500) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb32715c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3271600) 0 Vtable for QGraphicsItemAnimation QGraphicsItemAnimation::_ZTV22QGraphicsItemAnimation: 16u entries @@ -13921,10 +12787,6 @@ QAbstractPrintDialog (0xb3271b40) 0 QPaintDevice (0xb3271c40) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3271d00) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -14183,10 +13045,6 @@ QWizard (0xb3271580) 0 QPaintDevice (0xb3271b00) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3271cc0) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -14354,10 +13212,6 @@ QFileDialog (0xb3046100) 0 QPaintDevice (0xb3046200) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb30462c0) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -14694,10 +13548,6 @@ QMessageBox (0xb30467c0) 0 QPaintDevice (0xb30468c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3046980) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -15173,15 +14023,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb2f82300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2f82340) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f82400) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -15216,20 +14058,12 @@ Class QPaintEngine QPaintEngine (0xb2f82380) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f82500) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb2f82480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f82540) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26u entries @@ -15346,25 +14180,13 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0xb2f82880) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb2f82900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f82940) 0 Class QGLFormat size=4 align=4 base size=4 base align=4 QGLFormat (0xb2f82980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2f82a40) 0 Vtable for QGLContext QGLContext::_ZTV10QGLContext: 11u entries @@ -15510,188 +14332,40 @@ QGLFramebufferObject (0xb2f82d40) 0 QPaintDevice (0xb2f82d80) 0 primary-for QGLFramebufferObject (0xb2f82d40) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2f82e80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2f82f00) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb2f82f80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2f82000) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb2f821c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2f82700) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2f829c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2f82ac0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a6e100) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb2a6e180) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a6e200) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2a6e380) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2a6e400) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2a6e480) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2a6e500) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb2a6e5c0) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb2a6e640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a6e6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a6e780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a6e880) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb2a6e940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a6e9c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a6ea40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a6eac0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a6eb40) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb2a6ebc0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb2a6ec80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a6ed40) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb2a6ee00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a6eec0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a6ef40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a6e280) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a6e900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a6ec00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2a6ecc0) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb2a6ee40) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb28f5040) 0 diff --git a/tests/auto/bic/data/QtOpenGL.4.4.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.4.4.0.linux-gcc-ia32.txt index 708f7f324..7490f82c4 100644 --- a/tests/auto/bic/data/QtOpenGL.4.4.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.4.4.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb6bbc8ac) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb6bbc8e8) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7d6cc40) 0 empty - QUintForSize<4> (0xb6bbc960) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb6bbca8c) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb6bbcac8) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7d6ce00) 0 empty - QIntForSize<4> (0xb6bbcb40) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb6bc8f3c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bde12c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bde21c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bde30c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bde3fc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bde4ec) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bde5dc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bde6cc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bde7bc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bde8ac) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bde99c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdea8c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdeb7c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdec6c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bded5c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdee4c) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb6bf6e4c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c2ab04) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6a476cc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a8a7bc) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a8aa50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68d5384) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68d5ca8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68e95dc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68e9f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68fa834) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6905168) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6905a8c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb691b3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb691bce4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb692d618) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb692df3c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6944870) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb695430c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb67a25a0) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb66c2c00) 0 QString (0xb6706960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6706c6c) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QListData base size=4 base align=4 QListData (0xb678e294) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb662d5dc) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -386,15 +228,7 @@ Class QTextCodec QTextCodec (0xb660d924) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb663ec30) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb663ebb8) 0 Class QTextEncoder size=32 align=4 @@ -417,25 +251,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb6670100) 0 QGenericArgument (0xb6664e4c) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb6672348) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb6672168) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb66874b0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6687438) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -527,10 +349,6 @@ QIODevice (0xb64bef80) 0 QObject (0xb64cf4b0) 0 primary-for QIODevice (0xb64bef80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64ef780) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -550,25 +368,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb65286cc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6552ec4) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6552fb4) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb655f528) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb655f4b0) 0 Class QStringList size=4 align=4 @@ -576,15 +382,7 @@ Class QStringList QStringList (0xb6564080) 0 QList (0xb655f564) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb658a2d0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb658a4ec) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -664,10 +462,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb63b9780) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb63c530c) 0 Class QMutexLocker size=4 align=4 @@ -747,35 +541,11 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6293c30) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6293ce4) 0 empty -Class - size=8 align=4 - base size=8 base align=4 - (0xb630bc6c) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb630bd5c) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb630bce4) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb630bdd4) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb630be4c) 0 Class _IO_marker size=12 align=4 @@ -787,10 +557,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb630bec4) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb630bf3c) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -805,10 +571,6 @@ Class QTextStream QTextStream (0xb630bf78) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb636f708) 0 Class QTextStreamManipulator size=24 align=4 @@ -845,40 +607,16 @@ QTextOStream (0xb61961c0) 0 QTextStream (0xb6387e88) 0 primary-for QTextOStream (0xb61961c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb619c924) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb619c99c) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb619c8ac) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb619ca14) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb619ca8c) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb619cb04) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb619cb7c) 0 Class timespec size=8 align=4 @@ -890,80 +628,24 @@ Class timeval base size=8 base align=4 timeval (0xb619cbf4) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb619cc6c) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb619cce4) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb619cd20) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb619ce4c) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb619cdd4) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb619cd98) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb619cec4) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb619cfb4) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb619cf3c) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb61b6000) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb61b60f0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb61b6078) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb61b61a4) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb61b621c) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb61b6294) 0 Class random_data size=28 align=4 @@ -995,20 +677,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb60d7000) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb60d7c6c) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb60d7bf4) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb60d7fb4) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -1028,10 +698,6 @@ Class QtConcurrent::ResultStoreBase QtConcurrent::ResultStoreBase (0xb60f50b4) 0 vptr=((& QtConcurrent::ResultStoreBase::_ZTVN12QtConcurrent15ResultStoreBaseE) + 8u) -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb60f57bc) 0 Vtable for QFutureInterfaceBase QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries @@ -1046,25 +712,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb60f5834) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb6121880) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb612030c) 0 - primary-for QFutureInterface (0xb6121880) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb614dac8) 0 Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1093,34 +742,7 @@ QFutureWatcherBase (0xb61777c0) 0 QObject (0xb6181168) 0 primary-for QFutureWatcherBase (0xb61777c0) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb6177ec0) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb6177f00) 0 - primary-for QFutureWatcher (0xb6177ec0) - QObject (0xb6181ca8) 0 - primary-for QFutureWatcherBase (0xb6177f00) Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1219,60 +841,14 @@ QtConcurrent::ThreadEngineBase (0xb5fce3c0) 0 QRunnable (0xb5fd1c6c) 0 primary-for QtConcurrent::ThreadEngineBase (0xb5fce3c0) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb5fde438) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb5fced40) 0 - QtConcurrent::ThreadEngineStarterBase (0xb5fde4b0) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 -4u -32 0u -36 0u -40 0u -44 0u -48 0u -52 -4u -56 0u -60 (int (*)(...))-0x000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb5fcef00) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb5fcef40) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb5fde960) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb5fcef40) Class std::input_iterator_tag size=1 align=1 @@ -1315,225 +891,49 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb5ffc348) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb5ffc3c0) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb5ffc5dc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5ffc6cc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5ffc744) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5ffc7bc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5ffc834) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5ffc8ac) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5ffc924) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5ffc99c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5ffca14) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5ffca8c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5ffcb04) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5ffcb7c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5ffcbf4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb5ffcc6c) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb5ffcd5c) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb5ffcdd4) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb5ffce4c) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb60161e0) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb6016258) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb6016348) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb60163c0) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb6016438) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6016654) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6016690) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb60166cc) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6016708) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6016744) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6016780) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60167f8) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6016834) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6016870) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60168ac) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60168e8) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6016924) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb603830c) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb607b8e8) 0 empty -Class std::__copy_move - size=1 align=1 - base size=0 base align=1 -std::__copy_move (0xb607bd20) 0 empty -Class std::__copy_move_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_move_backward (0xb607bf3c) 0 empty -Class std::__equal - size=1 align=1 - base size=0 base align=1 -std::__equal (0xb5ebc348) 0 empty -Class std::__lc_rai - size=1 align=1 - base size=0 base align=1 -std::__lc_rai (0xb5ebc4b0) 0 empty -Class std::__lexicographical_compare - size=1 align=1 - base size=0 base align=1 -std::__lexicographical_compare (0xb5ebc618) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5ebcd20) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5ef6744) 0 empty Class lconv size=56 align=4 @@ -1550,10 +950,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb5f0230c) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5f02384) 0 Class tm size=44 align=4 @@ -1570,15 +966,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb5f02654) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb5f027bc) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb5f02744) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1590,32 +978,10 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb5f02834) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb5f7cd5c) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5d9c03c) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5f8f8c0) 0 empty - __gnu_cxx::new_allocator (0xb5d9c078) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5d9c0b4) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5f8f980) 0 empty - __gnu_cxx::new_allocator (0xb5d9c0f0) 0 empty Vtable for __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries @@ -1631,82 +997,19 @@ Class __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind (0xb5d9c30c) 0 nearly-empty vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 8u) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5dfbbf4) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5dfbc30) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5e37c40) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5dfbc6c) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5c9a8e8) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5cd1200) 0 - std::allocator (0xb5cd1240) 0 empty - __gnu_cxx::new_allocator (0xb5c9a960) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5c9a870) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5c9a99c) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5cd13c0) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5c9a9d8) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5c9aa8c) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5cd15c0) 0 - std::allocator (0xb5cd1600) 0 empty - __gnu_cxx::new_allocator (0xb5c9ab04) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5c9aa14) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5c9ab40) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5c9abf4) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5cd1780) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5c9ab7c) 0 Class std::locale size=4 align=4 @@ -1736,97 +1039,16 @@ Class std::locale::_Impl base size=20 base align=4 std::locale::_Impl (0xb5d6bdd4) 0 -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5d80740) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb5d7f744) 0 - primary-for std::collate (0xb5d80740) - -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5d80840) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb5d7f834) 0 - primary-for std::collate (0xb5d80840) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5d7fca8) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5d7fce4) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5b9e7c0) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5d7fd20) 0 empty -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5b9e900) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb5b9e940) 0 - primary-for std::collate_byname (0xb5b9e900) - std::locale::facet (0xb5d7fd98) 0 - primary-for std::collate (0xb5b9e940) - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5b9e9c0) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb5b9ea00) 0 - primary-for std::collate_byname (0xb5b9e9c0) - std::locale::facet (0xb5d7fe88) 0 - primary-for std::collate (0xb5b9ea00) + + + + Vtable for std::ios_base::failure std::ios_base::failure::_ZTVNSt8ios_base7failureE: 5u entries @@ -1872,583 +1094,85 @@ Class std::ios_base std::ios_base (0xb5bafc30) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5c032d0) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) - -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5c03564) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb5c037f8) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb5c6f4b0) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb5c5a744) 0 - primary-for std::ctype (0xb5c6f4b0) - std::ctype_base (0xb5c5a780) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb5c77d70) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb5c8930c) 0 - primary-for std::__ctype_abstract_base (0xb5c77d70) - std::ctype_base (0xb5c89348) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb5c79900) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb5a91be0) 0 - primary-for std::ctype (0xb5c79900) - std::locale::facet (0xb5c89438) 0 - primary-for std::__ctype_abstract_base (0xb5a91be0) - std::ctype_base (0xb5c89474) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb5c79ac0) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb5a9a370) 0 - primary-for std::ctype_byname (0xb5c79ac0) - std::locale::facet (0xb5a98780) 0 - primary-for std::ctype (0xb5a9a370) - std::ctype_base (0xb5a987bc) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb5c79b40) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb5c79b80) 0 - primary-for std::ctype_byname (0xb5c79b40) - std::__ctype_abstract_base (0xb5a9aa00) 0 - primary-for std::ctype (0xb5c79b80) - std::locale::facet (0xb5a98924) 0 - primary-for std::__ctype_abstract_base (0xb5a9aa00) - std::ctype_base (0xb5a98960) 0 empty + + + + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb5aa42d0) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5aac580) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb5aa4b40) 0 - primary-for std::numpunct (0xb5aac580) - -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5aac640) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb5aa4c30) 0 - primary-for std::numpunct (0xb5aac640) -Class __gnu_cxx::__conditional_type - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type (0xb5b15294) 0 empty -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5b31b80) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb5b31bc0) 0 - primary-for std::numpunct_byname (0xb5b31b80) - std::locale::facet (0xb5b158e8) 0 - primary-for std::numpunct (0xb5b31bc0) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5b31c00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5b159d8) 0 - primary-for std::num_get > > (0xb5b31c00) - -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5b31c80) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5b15ac8) 0 - primary-for std::num_put > > (0xb5b31c80) - -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5b31d00) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb5b31d40) 0 - primary-for std::numpunct_byname (0xb5b31d00) - std::locale::facet (0xb5b15bb8) 0 - primary-for std::numpunct (0xb5b31d40) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5b31dc0) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5b15ca8) 0 - primary-for std::num_get > > (0xb5b31dc0) - -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5b31e40) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5b15d98) 0 - primary-for std::num_put > > (0xb5b31e40) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb5b7be80) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb5b853fc) 0 - primary-for std::basic_ios > (0xb5b7be80) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb5b7bec0) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb5b854ec) 0 - primary-for std::basic_ios > (0xb5b7bec0) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb59cbb40) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb59cbb80) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb59cf168) 4 - primary-for std::basic_ios > (0xb59cbb80) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb59cf348) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb59cbcc0) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb59cbd00) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb59cf384) 4 - primary-for std::basic_ios > (0xb59cbd00) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb59cf528) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5a0d580) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb5a0d5c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb59cfa8c) 8 - primary-for std::basic_ios > (0xb5a0d5c0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5a0d680) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5a0d6c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb59cfe10) 8 - primary-for std::basic_ios > (0xb5a0d6c0) - -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5a2d438) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5a2d474) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5a39580) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5a2d4b0) 0 empty -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5a2da8c) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb5a73480 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2486,44 +1210,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5a83050) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb5a73480) 0 - primary-for std::basic_iostream > (0xb5a83050) - subvttidx=4u - std::basic_ios > (0xb5a734c0) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb5a2dac8) 12 - primary-for std::basic_ios > (0xb5a734c0) - std::basic_ostream > (0xb5a73500) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb5a734c0) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5a2dd5c) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb5a73800 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2561,110 +1249,21 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb588d0f0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb5a73800) 0 - primary-for std::basic_iostream > (0xb588d0f0) - subvttidx=4u - std::basic_ios > (0xb5a73840) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb5a2dd98) 12 - primary-for std::basic_ios > (0xb5a73840) - std::basic_ostream > (0xb5a73880) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb5a73840) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5897564) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb58974ec) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb5897474) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb58973c0) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb5897924) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb58cf0f0) 0 -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb57b35a0) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb57bd870) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb57aeb00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb57bd870) - QFutureInterfaceBase (0xb57b3780) 0 - primary-for QFutureInterface (0xb57aeb00) - QRunnable (0xb57b37bc) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb57aeb80) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb57bdc80) 0 - primary-for QtConcurrent::RunFunctionTask (0xb57aeb80) - QFutureInterface (0xb57aebc0) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb57bdc80) - QFutureInterfaceBase (0xb57b3960) 0 - primary-for QFutureInterface (0xb57aebc0) - QRunnable (0xb57b399c) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + Class QLibraryInfo size=1 align=1 @@ -2715,50 +1314,22 @@ QFile (0xb570ff00) 0 QObject (0xb5715ce4) 0 primary-for QIODevice (0xb570ff40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb574d654) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb575d21c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb576d8ac) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb576dbb8) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb577f924) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb577f8ac) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb577fa14) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55a0f78) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55b503c) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2833,10 +1404,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb55dd348) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55ec438) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2926,10 +1493,6 @@ Class QDirIterator QDirIterator (0xb56135dc) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5613dd4) 0 Vtable for QFileSystemWatcher QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries @@ -3067,25 +1630,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb5670d98) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb5670e10) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb5653bb8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb567f618) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb567f780) 0 Class QResource size=4 align=4 @@ -3097,275 +1648,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb54a3078) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54a34b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54a3690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54a3870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54a3a50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54a3c30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54a3e10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ba000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ba1e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ba3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ba5a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ba780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ba960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54bab40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54bad20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54baf00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c10f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c12d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c14b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c1690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c1870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c1a50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c1c30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c1e10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c8000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c81e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c83c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c85a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c8780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c8960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c8b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c8d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c8f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d30f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d32d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d34b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d3690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d3870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d3a50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d3c30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d3e10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d7000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d71e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d73c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d75a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d7780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d7960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d7b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d7d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54d7f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54e00f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54e02d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54e04b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54e0690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54e0870) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3392,45 +1727,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb54e0a50) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb551d4ec) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb551d474) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb551d5dc) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb551d564) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb5550960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5550f78) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5564168) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5564348) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3508,15 +1815,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb53ac3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53b930c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53d1d98) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -3543,10 +1842,6 @@ QEventLoop (0xb53a0bc0) 0 QObject (0xb53e4bf4) 0 primary-for QEventLoop (0xb53a0bc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53f421c) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -3591,20 +1886,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb5419474) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb542a870) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb542a960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54330b4) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -3774,10 +2061,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb548321c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb548399c) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3889,20 +2172,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb52c15dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52c1a8c) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb52c1b7c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52c1fb4) 0 empty Class QMetaProperty size=20 align=4 @@ -3914,10 +2189,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb52fa3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52fa708) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -4129,10 +2400,6 @@ QLibrary (0xb53448c0) 0 QObject (0xb536803c) 0 primary-for QLibrary (0xb53448c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5368fb4) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4169,20 +2436,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb519b564) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb519bbf4) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb519b8e8) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb51b30f0) 0 Class QWriteLocker size=4 align=4 @@ -4209,10 +2468,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb51f26cc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51fc3c0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -4229,70 +2484,42 @@ Class QDate base size=4 base align=4 QDate (0xb52223c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5231d5c) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb5231e4c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52443c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb52444b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb524ebb8) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb524ed98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5264c6c) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb5270d98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5060d20) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb5071d5c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb508312c) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb509e294) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb509eca8) 0 empty Class QLinkedListData size=20 align=4 @@ -4304,40 +2531,24 @@ Class QSize base size=8 base align=4 QSize (0xb511abf4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5140ce4) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb515c870) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f6799c) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb4f856cc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f9e5a0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb4fe51a4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ffe6cc) 0 empty Class QSharedData size=4 align=4 @@ -4385,20 +2596,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb4e96e88) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4eb03fc) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4eb0564) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4eb04ec) 0 Class QXmlStreamAttributes size=4 align=4 @@ -4411,30 +2610,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb4eb05dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ed6000) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb4ed612c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ed6ce4) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb4ed6e10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ee7d98) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -4461,25 +2648,9 @@ Class QXmlStreamWriter base size=4 base align=4 QXmlStreamWriter (0xb4f17654) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4f3d5a0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4f3d618) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4f3d690) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4f3d528) 0 Class QColor size=16 align=4 @@ -4501,10 +2672,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb4d723fc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d7c6cc) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -4802,15 +2969,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb4e09690) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4e09f78) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4e09f00) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -5099,20 +3258,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb4c60780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4c6e870) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4c824b0) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4c93078) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -5143,20 +3290,8 @@ QAccessibleInterface (0xb4e589c0) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb4c93474) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb4c93fb4) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb4c93f3c) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb4c93ec4) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -5669,15 +3804,7 @@ Class QPaintDevice QPaintDevice (0xb4d2e690) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4d40bb8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4d40b40) 0 Class QPolygon size=4 align=4 @@ -5685,15 +3812,7 @@ Class QPolygon QPolygon (0xb4d04d80) 0 QVector (0xb4d40bf4) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4d5cca8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4d5cc30) 0 Class QPolygonF size=4 align=4 @@ -5706,10 +3825,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb4b7dbf4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b98258) 0 empty Class QPainterPath::Element size=20 align=4 @@ -5721,25 +3836,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb4b98a14) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4bc2ac8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4bc2a50) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb4bc26cc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4bc2b04) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5751,10 +3854,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb4bf9384) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4c09474) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -5779,10 +3878,6 @@ QImage (0xb4c24900) 0 QPaintDevice (0xb4c41c6c) 0 primary-for QImage (0xb4c24900) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4aa5168) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -5807,45 +3902,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb4accb7c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ad8690) 0 empty Class QBrushData size=124 align=4 base size=121 base align=4 QBrushData (0xb4ad8924) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4af15a0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4af1528) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb4af1690) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb4af1708) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb4af1780) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb4af1618) 0 Class QGradient size=56 align=4 @@ -5906,10 +3973,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb498f438) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb49db4b0) 0 Class QCursor size=4 align=4 @@ -5997,10 +4060,6 @@ QWidget (0xb49f8b90) 0 QPaintDevice (0xb49e9d20) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4a2fe10) 0 Vtable for QDialog QDialog::_ZTV7QDialog: 66u entries @@ -6251,10 +4310,6 @@ QAbstractPrintDialog (0xb48ce400) 0 QPaintDevice (0xb48cfe10) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb48e3fb4) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -6505,20 +4560,12 @@ QFileDialog (0xb48cee80) 0 QPaintDevice (0xb49207f8) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4932924) 0 Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0xb4953ce4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb47740b4) 0 empty Vtable for QFileSystemModel QFileSystemModel::_ZTV16QFileSystemModel: 42u entries @@ -6980,10 +5027,6 @@ QMessageBox (0xb47f1280) 0 QPaintDevice (0xb47eafb4) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4806dd4) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 67u entries @@ -7488,10 +5531,6 @@ QWizard (0xb4653680) 0 QPaintDevice (0xb46735a0) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4680924) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -7624,10 +5663,6 @@ Class QGraphicsItem QGraphicsItem (0xb46af1e0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb46da924) 0 Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -8184,15 +6219,7 @@ QGraphicsItemGroup (0xb4560040) 0 QGraphicsItem (0xb4562000) 0 primary-for QGraphicsItemGroup (0xb4560040) -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4562870) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4562a14) 0 empty Vtable for QGraphicsLayoutItem QGraphicsLayoutItem::_ZTV19QGraphicsLayoutItem: 8u entries @@ -8544,10 +6571,6 @@ Class QPen base size=4 base align=4 QPen (0xb45dfb7c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb45ec3fc) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -8594,20 +6617,8 @@ QGraphicsScene (0xb45cc6c0) 0 QObject (0xb45ec690) 0 primary-for QGraphicsScene (0xb45cc6c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4610384) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4610dd4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4610d5c) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -8770,65 +6781,21 @@ Class QTextOption base size=24 base align=4 QTextOption (0xb4465a50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4487168) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4496744) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0xb4496a50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44da528) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb44f8f78) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb44f8f00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb451c0f0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb451c078) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb451c834) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb451c7bc) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb451c99c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb451c924) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 65u entries @@ -9083,15 +7050,7 @@ QGraphicsView (0xb43ac480) 0 QPaintDevice (0xb43c0294) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43dab40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43e9744) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 7u entries @@ -9346,10 +7305,6 @@ QImageIOPlugin (0xb425daf0) 0 QFactoryInterface (0xb4257b7c) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb442af00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42695a0) 0 Class QImageReader size=4 align=4 @@ -9525,15 +7480,7 @@ QActionGroup (0xb42e6580) 0 QObject (0xb42f1708) 0 primary-for QActionGroup (0xb42e6580) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb42ff528) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb42ff4b0) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26u entries @@ -9839,10 +7786,6 @@ QAbstractSpinBox (0xb4330d00) 0 QPaintDevice (0xb415fce4) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb416de88) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -10050,15 +7993,7 @@ QStyle (0xb4186a00) 0 QObject (0xb41c4384) 0 primary-for QStyle (0xb4186a00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41e5d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41f9924) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -10317,10 +8252,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb407e040) 0 QStyleOption (0xb4079780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4079f3c) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -10347,10 +8278,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb407eac0) 0 QStyleOption (0xb409dec4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40b18ac) 0 Class QStyleOptionButton size=64 align=4 @@ -10358,10 +8285,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb407ed80) 0 QStyleOption (0xb40b15a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40c9dd4) 0 Class QStyleOptionTab size=72 align=4 @@ -10376,10 +8299,6 @@ QStyleOptionTabV2 (0xb40ca3c0) 0 QStyleOptionTab (0xb40ca400) 0 QStyleOption (0xb40e6e4c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4102ac8) 0 Class QStyleOptionToolBar size=68 align=4 @@ -10406,10 +8325,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb40cad00) 0 QStyleOption (0xb412f474) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb412fe10) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -10442,10 +8357,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb41429c0) 0 QStyleOption (0xb3f7003c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f708ac) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -10510,15 +8421,7 @@ QStyleOptionSpinBox (0xb3fc2600) 0 QStyleOptionComplex (0xb3fc2640) 0 QStyleOption (0xb3fd3078) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3fd3870) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3fd37f8) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -10527,10 +8430,6 @@ QStyleOptionQ3ListView (0xb3fc2880) 0 QStyleOptionComplex (0xb3fc28c0) 0 QStyleOption (0xb3fd3708) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ff30f0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -10627,10 +8526,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb3e4fc6c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3e7e7f8) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -10661,20 +8556,8 @@ QItemSelectionModel (0xb3e52bc0) 0 QObject (0xb3e7ec6c) 0 primary-for QItemSelectionModel (0xb3e52bc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3e95f3c) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3ea9bb8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3ea9b40) 0 Class QItemSelection size=4 align=4 @@ -10804,10 +8687,6 @@ QAbstractItemView (0xb3ed1180) 0 QPaintDevice (0xb3ea9f3c) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ee9d5c) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -11270,15 +9149,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb3d898e8) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3d98384) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3d9830c) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -11419,15 +9290,7 @@ QListView (0xb3d9a140) 0 QPaintDevice (0xb3d98690) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3dc0dd4) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3dc0d5c) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -11720,15 +9583,7 @@ Class QStandardItem QStandardItem (0xb3e37d98) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3cae780) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3cae708) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -12007,15 +9862,7 @@ Class QTableWidgetSelectionRange base size=16 base align=4 QTableWidgetSelectionRange (0xb3d15b7c) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3d268ac) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3d26834) 0 Vtable for QTableWidgetItem QTableWidgetItem::_ZTV16QTableWidgetItem: 10u entries @@ -12292,35 +10139,15 @@ QTreeView (0xb3b7c380) 0 QPaintDevice (0xb3b80870) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3bab03c) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0xb3ba2618) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb3bd7a8c) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb3bd7a14) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3bd7ec4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3bd7e4c) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -13296,15 +11123,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb39960b4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb399630c) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3996b7c) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -13339,20 +11158,12 @@ Class QPaintEngine QPaintEngine (0xb39963fc) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb39b1d5c) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb39b1a14) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb39c4a50) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7u entries @@ -13450,10 +11261,6 @@ QCommonStyle (0xb39b9f00) 0 QObject (0xb38500f0) 0 primary-for QStyle (0xb39b9f40) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb38643c0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -13985,30 +11792,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb38f4e10) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb390c870) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb390c0f0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb392fd20) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb392fca8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3755a50) 0 Class QTextCharFormat size=8 align=4 @@ -14070,15 +11861,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb37fd8ac) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb380a5dc) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb380a564) 0 Class QTextLine size=8 align=4 @@ -14128,15 +11911,7 @@ QTextDocument (0xb37ead40) 0 QObject (0xb38275a0) 0 primary-for QTextDocument (0xb37ead40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3827f3c) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb3658c30) 0 Class QTextCursor size=4 align=4 @@ -14148,15 +11923,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb3658ec4) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb367c294) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb367c21c) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -14318,10 +12085,6 @@ QTextFrame (0xb364df40) 0 QObject (0xb36c1384) 0 primary-for QTextObject (0xb364df80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb36d9d5c) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -14346,25 +12109,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb36e3258) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb36f6d5c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb36f6e4c) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb3703000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb370d3c0) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -15494,10 +13245,6 @@ QDateEdit (0xb3458580) 0 QPaintDevice (0xb346fe4c) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34826cc) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -15658,10 +13405,6 @@ QDialogButtonBox (0xb3458c00) 0 QPaintDevice (0xb34b503c) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34c7474) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -15741,10 +13484,6 @@ QDockWidget (0xb3458f80) 0 QPaintDevice (0xb34e8078) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34f9708) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -15906,10 +13645,6 @@ QFontComboBox (0xb34eb640) 0 QPaintDevice (0xb352e078) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb353e03c) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -16228,10 +13963,6 @@ QMainWindow (0xb3385380) 0 QPaintDevice (0xb338cf78) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb33af0b4) 0 Vtable for QMdiArea QMdiArea::_ZTV8QMdiArea: 65u entries @@ -16317,10 +14048,6 @@ QMdiArea (0xb3385700) 0 QPaintDevice (0xb33afca8) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb33e20f0) 0 Vtable for QMdiSubWindow QMdiSubWindow::_ZTV13QMdiSubWindow: 63u entries @@ -16400,10 +14127,6 @@ QMdiSubWindow (0xb3385b00) 0 QPaintDevice (0xb33e2ce4) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3404e10) 0 Vtable for QMenu QMenu::_ZTV5QMenu: 63u entries @@ -16681,10 +14404,6 @@ QTextEdit (0xb32d07c0) 0 QPaintDevice (0xb32d6a50) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb331a99c) 0 Vtable for QPlainTextEdit QPlainTextEdit::_ZTV14QPlainTextEdit: 69u entries @@ -18206,25 +15925,13 @@ Class QGLColormap base size=4 base align=4 QGLColormap (0xb30bc708) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb30cf0f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb30cf1a4) 0 Class QGLFormat size=4 align=4 base size=4 base align=4 QGLFormat (0xb30cfac8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb2e92528) 0 Vtable for QGLContext QGLContext::_ZTV10QGLContext: 11u entries @@ -18370,203 +16077,43 @@ QGLPixelBuffer (0xb2ec5680) 0 QPaintDevice (0xb2ee2ca8) 0 primary-for QGLPixelBuffer (0xb2ec5680) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2d447bc) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2d5cd5c) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb2e2a078) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2e2ab7c) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb2c49654) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2cbee88) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2cd303c) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2cd321c) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2cd33fc) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2b94bb8) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb2b94d98) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2bbff3c) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2bd83c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2bd8d98) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c1dac8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2a67a50) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb2a67ac8) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb2a8d9d8) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb2a8dce4) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb2add8e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2addec4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2b041e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2b04a8c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2b04ec4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2b10474) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2b1e528) 0 empty -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb2b1ef3c) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2b2c078) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2b2c2d0) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb2b2ca8c) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb29601e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2960960) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb29609d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2960e88) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2960f00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb299e348) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb299e780) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb299eb04) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb29d40b4) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb29d4744) 0 diff --git a/tests/auto/bic/data/QtScript.4.3.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtScript.4.3.0.linux-gcc-ia32.txt index 929e8bf83..b37e2db0b 100644 --- a/tests/auto/bic/data/QtScript.4.3.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtScript.4.3.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f46bc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f46c00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f46d00) 0 empty - QUintForSize<4> (0xb7f46d40) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f46dc0) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f46e00) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7f46f00) 0 empty - QIntForSize<4> (0xb7f46f40) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb737c2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb737c700) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb737c740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb737c900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb737c980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb737ca00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb737ca80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb737cb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb737cb80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb737cc00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb737cc80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb737cd00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb737cd80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb737ce00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb737ce80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb737cf00) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb7288040) 0 QGenericArgument (0xb7288080) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb7288280) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb7288380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7288440) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb7288b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7288c00) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb7288c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7288f00) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb708b240) 0 QString (0xb708b280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb708b300) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb708b980) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb708bdc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb708bd00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -479,10 +313,6 @@ QIODevice (0xb708bb40) 0 QObject (0xb708be40) 0 primary-for QIODevice (0xb708bb40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6eff080) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -512,10 +342,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6eff280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6eff2c0) 0 empty Class QMapData::Node size=8 align=4 @@ -527,10 +353,6 @@ Class QMapData base size=72 base align=4 QMapData (0xb6effa00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6efffc0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -555,15 +377,7 @@ Class QTextCodec QTextCodec (0xb6effec0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6cd1100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6cd1040) 0 Class QTextEncoder size=32 align=4 @@ -575,30 +389,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb6cd11c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6cd1240) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6cd12c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6cd1280) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6cd1300) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6cd1340) 0 Class __gconv_trans_data size=20 align=4 @@ -620,15 +414,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6cd1440) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6cd14c0) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6cd1480) 0 Class _IO_marker size=12 align=4 @@ -640,10 +426,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6cd1540) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6cd1580) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -658,10 +440,6 @@ Class QTextStream QTextStream (0xb6cd15c0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6cd1700) 0 Class QTextStreamManipulator size=24 align=4 @@ -698,40 +476,16 @@ QTextOStream (0xb6cd1a40) 0 QTextStream (0xb6cd1a80) 0 primary-for QTextOStream (0xb6cd1a40) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6cd1c40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6cd1c80) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6cd1c00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6cd1cc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6cd1d00) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6cd1d40) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6cd1d80) 0 Class timespec size=8 align=4 @@ -743,10 +497,6 @@ Class timeval base size=8 base align=4 timeval (0xb6cd1e00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6cd1e40) 0 Class __sched_param size=4 align=4 @@ -763,45 +513,17 @@ Class __pthread_attr_s base size=36 base align=4 __pthread_attr_s (0xb6cd1f00) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6cd1f40) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6cd1f80) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6cd1fc0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6cd1640) 0 Class _pthread_rwlock_t size=32 align=4 base size=32 base align=4 _pthread_rwlock_t (0xb6cd1900) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6cd1ac0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6b7c000) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6b7c040) 0 Class random_data size=28 align=4 @@ -872,10 +594,6 @@ QFile (0xb6b7c7c0) 0 QObject (0xb6b7c840) 0 primary-for QIODevice (0xb6b7c800) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b7c940) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -928,50 +646,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb6b7cb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b7cb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7cbc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6b7cd00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6b7cc40) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb6b7cd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7cdc0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6b7ce00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6b7cf40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6b7ce80) 0 Class QStringList size=4 align=4 @@ -979,30 +669,14 @@ Class QStringList QStringList (0xb6b7cf80) 0 QList (0xb6b7cfc0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6962140) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb69621c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb69623c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6962480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6962540) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1059,10 +733,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb6962580) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6962780) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1192,15 +862,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6962bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6962c00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6962c80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1235,10 +897,6 @@ Class QDirIterator QDirIterator (0xb6962dc0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6962f00) 0 Vtable for QBuffer QBuffer::_ZTV7QBuffer: 30u entries @@ -1313,290 +971,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb6962b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68a8000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68a8040) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb68a8080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a81c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a82c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a83c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a84c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a85c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a86c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a87c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a88c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a89c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68a8e80) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1623,45 +1057,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb68a8ec0) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb673e3c0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb673e400) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb673e580) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb673e4c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb673e700) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb673e640) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb673e7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb673e8c0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1693,80 +1099,48 @@ Class QPoint base size=8 base align=4 QPoint (0xb673eb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb673ef40) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb673e000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb673ec40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb673ee40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb673eec0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb66480c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6648140) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0xb6648240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6648600) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6648740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6648b00) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6648d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6648f00) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6648280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6648480) 0 empty Class QLinkedListData size=20 align=4 @@ -1783,10 +1157,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb65e8380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65e8400) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1808,30 +1178,18 @@ Class QDate base size=4 base align=4 QDate (0xb65e8780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65e8900) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb65e8940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65e8ac0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb65e8b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65e8c40) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -2017,10 +1375,6 @@ QEventLoop (0xb650e200) 0 QObject (0xb650e240) 0 primary-for QEventLoop (0xb650e200) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb650e3c0) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2127,20 +1481,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb650eac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb650ebc0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb650ec00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb650ecc0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2360,10 +1706,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb650e940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb650ec40) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2458,20 +1800,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb6422280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6422300) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb6422340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64223c0) 0 empty Class QMetaProperty size=20 align=4 @@ -2483,10 +1817,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb6422440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64224c0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2543,10 +1873,6 @@ QLibrary (0xb64226c0) 0 QObject (0xb6422700) 0 primary-for QLibrary (0xb64226c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6422800) 0 Class QSemaphore size=4 align=4 @@ -2594,10 +1920,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb6422a80) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb6422b40) 0 Class QMutexLocker size=4 align=4 @@ -2609,20 +1931,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb6422c00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb6422c80) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb6422c40) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb6422d80) 0 Class QWriteLocker size=4 align=4 @@ -2634,25 +1948,9 @@ Class QScriptValue base size=4 base align=4 QScriptValue (0xb6422e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6422f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6422fc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6422a00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6422200) 0 Class QScriptContext size=4 align=4 @@ -2684,10 +1982,6 @@ QScriptEngine (0xb6127080) 0 QObject (0xb61270c0) 0 primary-for QScriptEngine (0xb6127080) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6127380) 0 Vtable for QScriptExtensionInterface QScriptExtensionInterface::_ZTV25QScriptExtensionInterface: 6u entries @@ -2753,28 +2047,8 @@ Class QScriptValueIterator base size=4 base align=4 QScriptValueIterator (0xb6127680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb61a3cc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb61e4640) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb60b5200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb60b5340) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb60b5400) 0 diff --git a/tests/auto/bic/data/QtScript.4.3.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtScript.4.3.0.macx-gcc-ia32.txt index 9c87f5768..7d61f35d2 100644 --- a/tests/auto/bic/data/QtScript.4.3.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtScript.4.3.0.macx-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x66d2c0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x66d340) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x66d500) 0 empty - QUintForSize<4> (0x66d540) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x66d640) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x66d6c0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x66d880) 0 empty - QIntForSize<4> (0x66d8c0) 0 empty Class QSysInfo size=1 align=1 @@ -50,145 +24,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x66de80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6980c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x698180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x698240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x698300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6983c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x698480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x698540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x698600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6986c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x698780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x698840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x698900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6989c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x698a80) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x698b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xec0100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xec0180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xec0200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xec0280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xec0300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xec0380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xec0400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xec0480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xec0500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xec0580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xec0600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xec0680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xec0700) 0 Class QInternal size=1 align=1 @@ -206,10 +72,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xec0880) 0 QGenericArgument (0xec08c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xec0b80) 0 Class QMetaObject size=16 align=4 @@ -226,10 +88,6 @@ Class QChar base size=2 base align=2 QChar (0xec0cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xec0dc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -242,10 +100,6 @@ Class QAtomic QAtomic (0xfc64c0) 0 QBasicAtomic (0xfc6500) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xfc6780) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -312,10 +166,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x106a440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x106a800) 0 empty Class QString::Null size=1 align=1 @@ -337,10 +187,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x11ae040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x11ae480) 0 Class QCharRef size=8 align=4 @@ -353,10 +199,6 @@ Class QConstString QConstString (0x12ea0c0) 0 QString (0x12ea100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x12ea200) 0 empty Class QStringRef size=12 align=4 @@ -424,15 +266,7 @@ Class QListData base size=4 base align=4 QListData (0x12eadc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13e7340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x13e7280) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -524,10 +358,6 @@ QIODevice (0x13e7a00) 0 QObject (0x13e7a40) 0 primary-for QIODevice (0x13e7a00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13e7c40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -557,10 +387,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x14de440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x14de4c0) 0 empty Class QMapData::Node size=8 align=4 @@ -572,10 +398,6 @@ Class QMapData base size=72 base align=4 QMapData (0x1581280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1581a40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -600,15 +422,7 @@ Class QTextCodec QTextCodec (0x15818c0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1581d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1581cc0) 0 Class QTextEncoder size=32 align=4 @@ -643,10 +457,6 @@ Class QTextStream QTextStream (0x16f5040) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16f5300) 0 Class QTextStreamManipulator size=24 align=4 @@ -818,35 +628,15 @@ Class rlimit base size=16 base align=4 rlimit (0x17671c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1767380) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1767400) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x1767300) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1767540) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x17675c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x1767640) 0 Class QVectorData size=16 align=4 @@ -907,10 +697,6 @@ QFile (0x18842c0) 0 QObject (0x1884340) 0 primary-for QIODevice (0x1884300) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1884500) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -963,50 +749,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x1884740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1884800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1884880) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1884a40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1884980) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x1884b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1884d40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1884dc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1884fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1884f00) 0 Class QStringList size=4 align=4 @@ -1014,30 +772,14 @@ Class QStringList QStringList (0x18846c0) 0 QList (0x1994000) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x19944c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1994540) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1994840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1994980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1994a00) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1094,10 +836,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1994a40) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1994d00) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1227,15 +965,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1a5f300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a5f400) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a5f4c0) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1270,10 +1000,6 @@ Class QDirIterator QDirIterator (0x1a5f740) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a5f940) 0 Vtable for QBuffer QBuffer::_ZTV7QBuffer: 30u entries @@ -1348,290 +1074,66 @@ Class QUrl base size=4 base align=4 QUrl (0x1a5fcc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a5fe80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a5ff00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x1a5ff80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7f9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7fa80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7fb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7fc00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7fcc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7fd80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7fe40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7ff00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b7ffc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9a080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9a140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9a200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9a2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9a380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9a440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9a500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9a5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9a680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9a740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9a800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9a8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9a980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9aa40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9ab00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9abc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9ac80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9ad40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9ae00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9aec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1b9af80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1bb6040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1bb6100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1bb61c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1bb6280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1bb6340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1bb6400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1bb64c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1bb6580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1bb6640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1bb6700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1bb67c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1658,65 +1160,21 @@ Class QVariant base size=12 base align=4 QVariant (0x1bb6840) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1bb6e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1bb6ec0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1bb6b80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1bb6a00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1c23180) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1c230c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1c23280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c233c0) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1c23480) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1c23500) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x1c23580) 0 -Class - size=3164 align=4 - base size=3164 base align=4 - (0x1c23600) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1748,80 +1206,48 @@ Class QPoint base size=8 base align=4 QPoint (0x1c23d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c23e40) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x1cf41c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cf4640) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1cf4940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cf49c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x1cf4b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cf4c00) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1cf4dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cf4400) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x1d991c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d995c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1d99a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d99c00) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x1d99e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d99280) 0 empty Class QLinkedListData size=20 align=4 @@ -1838,10 +1264,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1eb1b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eb1c00) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1863,30 +1285,18 @@ Class QDate base size=4 base align=4 QDate (0x1fa9200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fa9400) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1fa9480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fa9680) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1fa9700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fa9880) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -2072,10 +1482,6 @@ QEventLoop (0x2069600) 0 QObject (0x2069640) 0 primary-for QEventLoop (0x2069600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2069840) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2182,20 +1588,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x2123180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2123340) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x21233c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2123500) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2415,10 +1813,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2123f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2123740) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2513,20 +1907,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x21de440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21de500) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x21de580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21de640) 0 empty Class QMetaProperty size=20 align=4 @@ -2538,10 +1924,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x21de700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21de7c0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2598,10 +1980,6 @@ QLibrary (0x21deb40) 0 QObject (0x21deb80) 0 primary-for QLibrary (0x21deb40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21ded40) 0 Class QSemaphore size=4 align=4 @@ -2649,10 +2027,6 @@ Class QMutex base size=4 base align=4 QMutex (0x21de1c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x22a10c0) 0 Class QMutexLocker size=4 align=4 @@ -2664,20 +2038,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x22a1180) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x22a1240) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x22a11c0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x22a1380) 0 Class QWriteLocker size=4 align=4 @@ -2689,25 +2055,9 @@ Class QScriptValue base size=4 base align=4 QScriptValue (0x22a1480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x22a1680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x22a15c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x22a1780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x22a1800) 0 Class QScriptContext size=4 align=4 @@ -2739,10 +2089,6 @@ QScriptEngine (0x22a18c0) 0 QObject (0x22a1900) 0 primary-for QScriptEngine (0x22a18c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x22a1c40) 0 Vtable for QScriptExtensionInterface QScriptExtensionInterface::_ZTV25QScriptExtensionInterface: 6u entries @@ -2808,28 +2154,8 @@ Class QScriptValueIterator base size=4 base align=4 QScriptValueIterator (0x22a1d80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23c3c80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x24012c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x24d6540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24d67c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x24d6880) 0 diff --git a/tests/auto/bic/data/QtScript.4.4.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtScript.4.4.0.linux-gcc-ia32.txt index fb7014612..a7dd5c774 100644 --- a/tests/auto/bic/data/QtScript.4.4.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtScript.4.4.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb782b03c) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb782b078) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7c89b40) 0 empty - QUintForSize<4> (0xb782b0f0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb782b21c) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb782b258) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7c89d00) 0 empty - QIntForSize<4> (0xb782b2d0) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb783f6cc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783f8ac) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783f99c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783fa8c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783fb7c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783fc6c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783fd5c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783fe4c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783ff3c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a03c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a12c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a21c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a30c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a3fc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a4ec) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb785a5dc) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb78765dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb789c294) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6b3ae4c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7bf3c) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b941e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b94b04) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69d8438) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69d8d5c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69eb690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69ebfb4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69fe8e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a0d21c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a0db40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a21474) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a21d98) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a356cc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a46000) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb6a46a8c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6898d20) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb67c3b00) 0 QString (0xb68110f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68113fc) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QListData base size=4 base align=4 QListData (0xb687aac8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6721d5c) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -386,15 +228,7 @@ Class QTextCodec QTextCodec (0xb67210b4) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb673d3c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb673d348) 0 Class QTextEncoder size=32 align=4 @@ -417,25 +251,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb6769000) 0 QGenericArgument (0xb67625dc) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb6762ac8) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb67628e8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6779c30) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6779bb8) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -527,10 +349,6 @@ QIODevice (0xb65bae80) 0 QObject (0xb65bcc30) 0 primary-for QIODevice (0xb65bae80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65d7f3c) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -550,25 +368,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb661de4c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6651654) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6651744) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6651ca8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6651c30) 0 Class QStringList size=4 align=4 @@ -576,15 +382,7 @@ Class QStringList QStringList (0xb662cf80) 0 QList (0xb6651ce4) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb667da50) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb667dc6c) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -664,10 +462,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb64a8f3c) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb64bba8c) 0 Class QMutexLocker size=4 align=4 @@ -747,35 +541,11 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb638e3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb638e474) 0 empty -Class - size=8 align=4 - base size=8 base align=4 - (0xb64253fc) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb64254ec) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6425474) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6425564) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb64255dc) 0 Class _IO_marker size=12 align=4 @@ -787,10 +557,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6425654) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb64256cc) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -805,10 +571,6 @@ Class QTextStream QTextStream (0xb6425708) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6465e88) 0 Class QTextStreamManipulator size=24 align=4 @@ -845,40 +607,16 @@ QTextOStream (0xb62930c0) 0 QTextStream (0xb628f5dc) 0 primary-for QTextOStream (0xb62930c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb62a1078) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb62a10f0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb62a1000) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb62a1168) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb62a11e0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb62a1258) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb62a12d0) 0 Class timespec size=8 align=4 @@ -890,80 +628,24 @@ Class timeval base size=8 base align=4 timeval (0xb62a1348) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb62a13c0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb62a1438) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb62a1474) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb62a15a0) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb62a1528) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb62a14ec) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb62a1618) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb62a1708) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb62a1690) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb62a1780) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb62a1870) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb62a17f8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb62a1924) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb62a199c) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb62a1a14) 0 Class random_data size=28 align=4 @@ -995,20 +677,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb61be7bc) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb61d53fc) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb61d5384) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb61d5744) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -1028,10 +698,6 @@ Class QtConcurrent::ResultStoreBase QtConcurrent::ResultStoreBase (0xb61d5870) 0 vptr=((& QtConcurrent::ResultStoreBase::_ZTVN12QtConcurrent15ResultStoreBaseE) + 8u) -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb61d5f78) 0 Vtable for QFutureInterfaceBase QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries @@ -1046,25 +712,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb61d5708) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb6219780) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb620bac8) 0 - primary-for QFutureInterface (0xb6219780) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb6256258) 0 Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1093,34 +742,7 @@ QFutureWatcherBase (0xb62726c0) 0 QObject (0xb62718e8) 0 primary-for QFutureWatcherBase (0xb62726c0) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb6272dc0) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb6272e00) 0 - primary-for QFutureWatcher (0xb6272dc0) - QObject (0xb608b3fc) 0 - primary-for QFutureWatcherBase (0xb6272e00) Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1219,60 +841,14 @@ QtConcurrent::ThreadEngineBase (0xb60cd2c0) 0 QRunnable (0xb60d33fc) 0 primary-for QtConcurrent::ThreadEngineBase (0xb60cd2c0) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb60d3bf4) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb60cdc40) 0 - QtConcurrent::ThreadEngineStarterBase (0xb60d3c6c) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 -4u -32 0u -36 0u -40 0u -44 0u -48 0u -52 -4u -56 0u -60 (int (*)(...))-0x000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb60cde00) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb60cde40) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb60e80f0) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb60cde40) Class std::input_iterator_tag size=1 align=1 @@ -1315,225 +891,49 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb60e8b40) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb60e8bb8) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb60e8dd4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60e8ec4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60e8f3c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60e8fb4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60e8258) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb610903c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61090b4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb610912c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61091a4) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb610921c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6109294) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb610930c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6109384) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61093fc) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb61094ec) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb6109564) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb61095dc) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb6109960) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb61099d8) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb6109ac8) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb6109b40) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb6109bb8) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6109dd4) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6109e10) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6109e4c) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6109e88) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6109ec4) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6109f00) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6109f78) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6109fb4) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb611e000) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb611e03c) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb611e078) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb611e0b4) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb611ea8c) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb5f99078) 0 empty -Class std::__copy_move - size=1 align=1 - base size=0 base align=1 -std::__copy_move (0xb5f994b0) 0 empty -Class std::__copy_move_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_move_backward (0xb5f996cc) 0 empty -Class std::__equal - size=1 align=1 - base size=0 base align=1 -std::__equal (0xb5f99ac8) 0 empty -Class std::__lc_rai - size=1 align=1 - base size=0 base align=1 -std::__lc_rai (0xb5f99c30) 0 empty -Class std::__lexicographical_compare - size=1 align=1 - base size=0 base align=1 -std::__lexicographical_compare (0xb5f99d98) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5fd7474) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5febec4) 0 empty Class lconv size=56 align=4 @@ -1550,10 +950,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb5ff7a8c) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5ff7b04) 0 Class tm size=44 align=4 @@ -1570,15 +966,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb5ff7dd4) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb5ff7f3c) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb5ff7ec4) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1590,32 +978,10 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb5ff7fb4) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb60814ec) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb60817bc) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5e7b7c0) 0 empty - __gnu_cxx::new_allocator (0xb60817f8) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb6081834) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5e7b880) 0 empty - __gnu_cxx::new_allocator (0xb6081870) 0 empty Vtable for __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries @@ -1631,82 +997,19 @@ Class __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind (0xb6081a8c) 0 nearly-empty vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 8u) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5f24384) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5f243c0) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5f20b40) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5f243fc) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5dbb078) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5db9100) 0 - std::allocator (0xb5db9140) 0 empty - __gnu_cxx::new_allocator (0xb5dbb0f0) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5dbb000) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5dbb12c) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5db92c0) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5dbb168) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5dbb21c) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5db94c0) 0 - std::allocator (0xb5db9500) 0 empty - __gnu_cxx::new_allocator (0xb5dbb294) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5dbb1a4) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5dbb2d0) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5dbb384) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5db9680) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5dbb30c) 0 Class std::locale size=4 align=4 @@ -1736,97 +1039,16 @@ Class std::locale::_Impl base size=20 base align=4 std::locale::_Impl (0xb5e5d528) 0 -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5e68640) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb5e64ec4) 0 - primary-for std::collate (0xb5e68640) -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5e68740) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb5e64fb4) 0 - primary-for std::collate (0xb5e68740) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5c7c3fc) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5c7c438) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5c896c0) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5c7c474) 0 empty -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5c89800) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb5c89840) 0 - primary-for std::collate_byname (0xb5c89800) - std::locale::facet (0xb5c7c4ec) 0 - primary-for std::collate (0xb5c89840) - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5c898c0) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb5c89900) 0 - primary-for std::collate_byname (0xb5c898c0) - std::locale::facet (0xb5c7c5dc) 0 - primary-for std::collate (0xb5c89900) + + + + + Vtable for std::ios_base::failure std::ios_base::failure::_ZTVNSt8ios_base7failureE: 5u entries @@ -1872,583 +1094,85 @@ Class std::ios_base std::ios_base (0xb5ca33c0) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5ce2a50) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5ce2ce4) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb5ce2f78) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb5d58050) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb5d28ec4) 0 - primary-for std::ctype (0xb5d58050) - std::ctype_base (0xb5d28f00) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb5d61910) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb5d71a8c) 0 - primary-for std::__ctype_abstract_base (0xb5d61910) - std::ctype_base (0xb5d71ac8) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb5d66800) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb5b7d780) 0 - primary-for std::ctype (0xb5d66800) - std::locale::facet (0xb5d71bb8) 0 - primary-for std::__ctype_abstract_base (0xb5b7d780) - std::ctype_base (0xb5d71bf4) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb5d669c0) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb5b84f00) 0 - primary-for std::ctype_byname (0xb5d669c0) - std::locale::facet (0xb5b83f00) 0 - primary-for std::ctype (0xb5b84f00) - std::ctype_base (0xb5b83f3c) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb5d66a40) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb5d66a80) 0 - primary-for std::ctype_byname (0xb5d66a40) - std::__ctype_abstract_base (0xb5b88550) 0 - primary-for std::ctype (0xb5d66a80) - std::locale::facet (0xb5b8a078) 0 - primary-for std::__ctype_abstract_base (0xb5b88550) - std::ctype_base (0xb5b8a0b4) 0 empty + + + + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb5b8aac8) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5b96480) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb5b9c2d0) 0 - primary-for std::numpunct (0xb5b96480) -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5b96540) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb5b9c3c0) 0 - primary-for std::numpunct (0xb5b96540) -Class __gnu_cxx::__conditional_type - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type (0xb5bd2a14) 0 empty -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5c1aa80) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb5c1aac0) 0 - primary-for std::numpunct_byname (0xb5c1aa80) - std::locale::facet (0xb5c3103c) 0 - primary-for std::numpunct (0xb5c1aac0) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5c1ab00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5c3112c) 0 - primary-for std::num_get > > (0xb5c1ab00) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5c1ab80) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5c3121c) 0 - primary-for std::num_put > > (0xb5c1ab80) -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5c1ac00) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb5c1ac40) 0 - primary-for std::numpunct_byname (0xb5c1ac00) - std::locale::facet (0xb5c3130c) 0 - primary-for std::numpunct (0xb5c1ac40) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5c1acc0) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5c313fc) 0 - primary-for std::num_get > > (0xb5c1acc0) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5c1ad40) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5c314ec) 0 - primary-for std::num_put > > (0xb5c1ad40) -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb5c6fd80) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb5c31ce4) 0 - primary-for std::basic_ios > (0xb5c6fd80) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb5c6fdc0) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb5c31dd4) 0 - primary-for std::basic_ios > (0xb5c6fdc0) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5ab7a40) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb5ab7a80) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb5a9a8e8) 4 - primary-for std::basic_ios > (0xb5ab7a80) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5a9aac8) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5ab7bc0) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5ab7c00) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5a9ab04) 4 - primary-for std::basic_ios > (0xb5ab7c00) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5a9aca8) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5af8480) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb5af84c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb5af91a4) 8 - primary-for std::basic_ios > (0xb5af84c0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5af8580) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5af85c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5af9528) 8 - primary-for std::basic_ios > (0xb5af85c0) - -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5af9c30) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5af9c6c) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5b25480) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5af9ca8) 0 empty -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5b54168) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb5b61380 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2486,44 +1210,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5b69be0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb5b61380) 0 - primary-for std::basic_iostream > (0xb5b69be0) - subvttidx=4u - std::basic_ios > (0xb5b613c0) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb5b541a4) 12 - primary-for std::basic_ios > (0xb5b613c0) - std::basic_ostream > (0xb5b61400) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb5b613c0) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5b54438) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb5b61700 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2561,110 +1249,21 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5b77c80) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb5b61700) 0 - primary-for std::basic_iostream > (0xb5b77c80) - subvttidx=4u - std::basic_ios > (0xb5b61740) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb5b54474) 12 - primary-for std::basic_ios > (0xb5b61740) - std::basic_ostream > (0xb5b61780) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb5b61740) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5b54d5c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5b54ce4) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb5b54c6c) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb5b54bb8) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb59a003c) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb59a08ac) 0 -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb588bd20) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb58aa410) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb589ba00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb58aa410) - QFutureInterfaceBase (0xb588bf00) 0 - primary-for QFutureInterface (0xb589ba00) - QRunnable (0xb588bf3c) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb589ba80) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb58aa820) 0 - primary-for QtConcurrent::RunFunctionTask (0xb589ba80) - QFutureInterface (0xb589bac0) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb58aa820) - QFutureInterfaceBase (0xb58b00f0) 0 - primary-for QFutureInterface (0xb589bac0) - QRunnable (0xb58b012c) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + Class QLibraryInfo size=1 align=1 @@ -2715,50 +1314,22 @@ QFile (0xb57fee00) 0 QObject (0xb5815474) 0 primary-for QIODevice (0xb57fee40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb582de10) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb584199c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb585f03c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb585f348) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb58720b4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb587203c) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb58721a4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5691708) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56917f8) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2833,10 +1404,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb56c3ac8) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56d4bb8) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2926,10 +1493,6 @@ Class QDirIterator QDirIterator (0xb56f0dd4) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5702564) 0 Vtable for QFileSystemWatcher QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries @@ -3067,25 +1630,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb5766528) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb57665a0) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb574530c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5766d98) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5766f00) 0 Class QResource size=4 align=4 @@ -3097,275 +1648,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb55817f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5581c30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5581e10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559f000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559f1e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559f3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559f5a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559f780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559f960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559fb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559fd20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559ff00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a90f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a92d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a94b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a9690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a9870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a9a50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a9c30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a9e10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae1e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae5a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55aeb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55aed20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55aef00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b90f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b92d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b94b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b9690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b9870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b9a50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b9c30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b9e10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c0000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c01e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c03c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c05a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c0780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c0960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c0b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c0d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c0f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c70f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c72d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c74b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c7690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c7870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c7a50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c7c30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c7e10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ce000) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3392,45 +1727,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb55ce1e0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5600c6c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5600bf4) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb5600d5c) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb5600ce4) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb563f0f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb563f708) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb563f8e8) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb563fac8) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3508,15 +1815,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb548eb7c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5499a8c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54c5528) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -3543,10 +1842,6 @@ QEventLoop (0xb5492ac0) 0 QObject (0xb54d4384) 0 primary-for QEventLoop (0xb5492ac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54d499c) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -3591,20 +1886,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb54f9c30) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5518000) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb55180f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5518834) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -3774,10 +2061,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb556599c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb536f12c) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3889,20 +2172,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb53a8d5c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53dc21c) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb53dc30c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53dc744) 0 empty Class QMetaProperty size=20 align=4 @@ -3914,10 +2189,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb53dcb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53dce88) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -4129,10 +2400,6 @@ QLibrary (0xb542e7c0) 0 QObject (0xb544c7bc) 0 primary-for QLibrary (0xb542e7c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb545b708) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4169,20 +2436,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb5288ce4) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb5295384) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb5295078) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb529d870) 0 Class QWriteLocker size=4 align=4 @@ -4209,10 +2468,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb52d5e4c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52e5b40) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -4229,70 +2484,42 @@ Class QDate base size=4 base align=4 QDate (0xb52f5b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53234ec) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb53235dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb532db40) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb532dc30) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53412d0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb53414b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53542d0) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb5366528) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51513c0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb51684ec) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51688ac) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb5187a14) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5194438) 0 empty Class QLinkedListData size=20 align=4 @@ -4304,40 +2531,24 @@ Class QSize base size=8 base align=4 QSize (0xb5226384) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb522f3c0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb504f000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb504fe88) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb506ce4c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5087d5c) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb50ce924) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50e9e4c) 0 empty Class QSharedData size=4 align=4 @@ -4385,20 +2596,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb4f8e618) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f97b7c) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4f97ce4) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4f97c6c) 0 Class QXmlStreamAttributes size=4 align=4 @@ -4411,30 +2610,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb4f97d5c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fba780) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb4fba8ac) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fc9474) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb4fc95a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fdc528) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -4471,25 +2658,9 @@ Class QScriptValue base size=4 base align=4 QScriptValue (0xb5010870) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb50237f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb50238e8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5023d20) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5023ca8) 0 Vtable for QScriptClass QScriptClass::_ZTV12QScriptClass: 13u entries @@ -4513,10 +2684,6 @@ Class QScriptClass QScriptClass (0xb4e507bc) 0 vptr=((& QScriptClass::_ZTV12QScriptClass) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e631a4) 0 Vtable for QScriptClassPropertyIterator QScriptClassPropertyIterator::_ZTV28QScriptClassPropertyIterator: 13u entries @@ -4580,10 +2747,6 @@ QScriptEngine (0xb5035700) 0 QObject (0xb4e88870) 0 primary-for QScriptEngine (0xb5035700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e9e5dc) 0 Vtable for QScriptEngineAgent QScriptEngineAgent::_ZTV18QScriptEngineAgent: 15u entries @@ -4668,43 +2831,11 @@ Class QScriptValueIterator base size=4 base align=4 QScriptValueIterator (0xb4edd30c) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4f21dd4) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4d4d384) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4df3ec4) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb4df3f3c) 0 -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb4e373fc) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4e37528) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4e37780) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4e377f8) 0 diff --git a/tests/auto/bic/data/QtSql.4.0.0.aix-gcc-power32.txt b/tests/auto/bic/data/QtSql.4.0.0.aix-gcc-power32.txt index 74a08e0c9..2bf021483 100644 --- a/tests/auto/bic/data/QtSql.4.0.0.aix-gcc-power32.txt +++ b/tests/auto/bic/data/QtSql.4.0.0.aix-gcc-power32.txt @@ -53,65 +53,20 @@ Class QBool size=1 align=1 QBool (0x300b7280) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cd9c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cdf80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4540) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4b00) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e00c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0680) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0c40) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb200) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb7c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebd80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8340) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8900) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104480) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104a40) 0 empty Class QFlag size=4 align=4 @@ -125,9 +80,6 @@ Class QChar size=2 align=2 QChar (0x30148980) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30185980) 0 empty Class QBasicAtomic size=4 align=4 @@ -142,13 +94,7 @@ Class sigset_t size=8 align=4 sigset_t (0x3026ad80) 0 -Class - size=8 align=4 - (0x30271200) 0 -Class - size=32 align=8 - (0x30271540) 0 Class fsid_t size=8 align=4 @@ -158,21 +104,9 @@ Class fsid64_t size=16 align=8 fsid64_t (0x30271c40) 0 -Class - size=52 align=4 - (0x302780c0) 0 -Class - size=44 align=4 - (0x30278440) 0 -Class - size=112 align=4 - (0x302787c0) 0 -Class - size=208 align=4 - (0x30278b40) 0 Class _quad size=8 align=4 @@ -186,17 +120,11 @@ Class adspace_t size=68 align=4 adspace_t (0x30281e00) 0 -Class - size=24 align=8 - (0x302865c0) 0 Class label_t size=100 align=4 label_t (0x30286d00) 0 -Class - size=4 align=4 - (0x3028b780) 0 Class sigset size=8 align=4 @@ -238,57 +166,18 @@ Class QByteRef size=8 align=4 QByteRef (0x302b7540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30423740) 0 empty -Class QFlags - size=4 align=4 -QFlags (0x30431080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431340) 0 -Class QFlags - size=4 align=4 -QFlags (0x3042cc00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30442080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431a00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30448800) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046af00) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046e200) 0 -Class QFlags - size=4 align=4 -QFlags (0x304422c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30474f80) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479700) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479a40) 0 Class QInternal size=1 align=1 @@ -306,9 +195,6 @@ Class QString size=4 align=4 QString (0x300a1f40) 0 -Class QFlags - size=4 align=4 -QFlags (0x303cf2c0) 0 Class QLatin1String size=4 align=4 @@ -323,9 +209,6 @@ Class QConstString QConstString (0x300b7640) 0 QString (0x300b7680) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303901c0) 0 empty Class QListData::Data size=24 align=4 @@ -335,9 +218,6 @@ Class QListData size=4 align=4 QListData (0x300732c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x302fb500) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -360,13 +240,7 @@ Class QTextCodec QTextCodec (0x303bab80) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8) -Class QList:: - size=4 align=4 -QList:: (0x30120bc0) 0 -Class QList - size=4 align=4 -QList (0x302cc980) 0 Class QTextEncoder size=32 align=4 @@ -385,21 +259,12 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3036a6c0) 0 QGenericArgument (0x3036a700) 0 -Class QMetaObject:: - size=16 align=4 -QMetaObject:: (0x3009b300) 0 Class QMetaObject size=16 align=4 QMetaObject (0x3058c900) 0 -Class QList:: - size=4 align=4 -QList:: (0x30170600) 0 -Class QList - size=4 align=4 -QList (0x30166f00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4 entries @@ -487,9 +352,6 @@ QIODevice (0x30365880) 0 QObject (0x301e4440) 0 primary-for QIODevice (0x30365880) -Class QFlags - size=4 align=4 -QFlags (0x301ebec0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4 entries @@ -507,38 +369,20 @@ Class QRegExp size=4 align=4 QRegExp (0x303baa80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30148180) 0 empty Class QStringMatcher size=1036 align=4 QStringMatcher (0x3012d8c0) 0 -Class QList:: - size=4 align=4 -QList:: (0x30104900) 0 -Class QList - size=4 align=4 -QList (0x30104380) 0 Class QStringList size=4 align=4 QStringList (0x303bab00) 0 QList (0x300c3280) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x301046c0) 0 -Class QList::iterator - size=4 align=4 -QList::iterator (0x300eba00) 0 -Class QList::const_iterator - size=4 align=4 -QList::const_iterator (0x300eb980) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5 entries @@ -664,9 +508,6 @@ Class QMapData size=72 align=4 QMapData (0x304b4140) 0 -Class - size=32 align=4 - (0x3052cd00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4 entries @@ -680,9 +521,6 @@ Class QTextStream QTextStream (0x3050bbc0) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8) -Class QFlags - size=4 align=4 -QFlags (0x305082c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -767,41 +605,20 @@ QFile (0x3057c8c0) 0 QObject (0x3057c980) 0 primary-for QIODevice (0x3057c900) -Class QFlags - size=4 align=4 -QFlags (0x3058a380) 0 Class QFileInfo size=4 align=4 QFileInfo (0x304b0580) 0 -Class QFlags - size=4 align=4 -QFlags (0x304927c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30390480) 0 empty -Class QList:: - size=4 align=4 -QList:: (0x301dfa40) 0 -Class QList - size=4 align=4 -QList (0x301df900) 0 Class QDir size=4 align=4 QDir (0x304b03c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30365600) 0 -Class QFlags - size=4 align=4 -QFlags (0x303ac7c0) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35 entries @@ -846,9 +663,6 @@ Class QFileEngine QFileEngine (0x3057c7c0) 0 vptr=((&QFileEngine::_ZTV11QFileEngine) + 8) -Class QFlags - size=4 align=4 -QFlags (0x3031a080) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5 entries @@ -910,73 +724,22 @@ Class QMetaType size=1 align=1 QMetaType (0x30079000) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3011fb00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3013d480) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x30148440) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3015dfc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301937c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a18c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a5d00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301ad500) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301add00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b22c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b2b00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6640) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6fc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9600) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9c00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301c1740) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301d7f80) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -998,69 +761,24 @@ Class QVariant size=16 align=8 QVariant (0x30166c00) 0 -Class QList:: - size=4 align=4 -QList:: (0x3057e500) 0 -Class QList - size=4 align=4 -QList (0x302acd80) 0 -Class QMap:: - size=4 align=4 -QMap:: (0x302ed8c0) 0 -Class QMap - size=4 align=4 -QMap (0x302b7980) 0 Class QVariantComparisonHelper size=4 align=4 QVariantComparisonHelper (0x30225880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303e8900) 0 empty -Class - size=12 align=4 - (0x303dab00) 0 -Class - size=44 align=4 - (0x303f70c0) 0 -Class - size=76 align=4 - (0x303f7880) 0 -Class - size=36 align=4 - (0x303fc640) 0 -Class - size=56 align=4 - (0x303fcc40) 0 -Class - size=36 align=4 - (0x30414340) 0 -Class - size=28 align=4 - (0x30414f00) 0 -Class - size=24 align=4 - (0x30486a40) 0 -Class - size=28 align=4 - (0x30486d80) 0 -Class - size=28 align=4 - (0x30492400) 0 Class lconv size=56 align=4 @@ -1102,77 +820,41 @@ Class localeinfo_table size=36 align=4 localeinfo_table (0x303d9cc0) 0 -Class - size=108 align=4 - (0x304dc500) 0 Class _LC_charmap_objhdl size=12 align=4 _LC_charmap_objhdl (0x304dcc80) 0 -Class - size=92 align=4 - (0x30561040) 0 Class _LC_monetary_objhdl size=12 align=4 _LC_monetary_objhdl (0x305614c0) 0 -Class - size=48 align=4 - (0x30561800) 0 Class _LC_numeric_objhdl size=12 align=4 _LC_numeric_objhdl (0x30561d00) 0 -Class - size=56 align=4 - (0x30083180) 0 Class _LC_resp_objhdl size=12 align=4 _LC_resp_objhdl (0x300838c0) 0 -Class - size=248 align=4 - (0x30083c40) 0 Class _LC_time_objhdl size=12 align=4 _LC_time_objhdl (0x3012c400) 0 -Class - size=10 align=2 - (0x3012cc40) 0 -Class - size=16 align=4 - (0x301df180) 0 -Class - size=16 align=4 - (0x301df5c0) 0 -Class - size=20 align=4 - (0x303acac0) 0 -Class - size=104 align=4 - (0x30504a00) 0 Class _LC_collate_objhdl size=12 align=4 _LC_collate_objhdl (0x301bfb80) 0 -Class - size=8 align=4 - (0x301e8b00) 0 -Class - size=80 align=4 - (0x305a0100) 0 Class _LC_ctype_objhdl size=12 align=4 @@ -1186,17 +868,11 @@ Class _LC_locale_objhdl size=12 align=4 _LC_locale_objhdl (0x303da600) 0 -Class _LC_object_handle:: - size=12 align=4 -_LC_object_handle:: (0x305911c0) 0 Class _LC_object_handle size=20 align=4 _LC_object_handle (0x30591080) 0 -Class - size=24 align=4 - (0x3031ed80) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14 entries @@ -1271,13 +947,7 @@ Class QUrl size=4 align=4 QUrl (0x302256c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x306df180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307c8900) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14 entries @@ -1303,9 +973,6 @@ QEventLoop (0x30802000) 0 QObject (0x30802040) 0 primary-for QEventLoop (0x30802000) -Class QFlags - size=4 align=4 -QFlags (0x30803740) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27 entries @@ -1348,17 +1015,11 @@ Class QModelIndex size=16 align=4 QModelIndex (0x3049cc80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304eb5c0) 0 empty Class QPersistentModelIndex size=4 align=4 QPersistentModelIndex (0x3049cb80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3002e700) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42 entries @@ -1524,9 +1185,6 @@ Class QBasicTimer size=4 align=4 QBasicTimer (0x307fe180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30803300) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4 entries @@ -1612,17 +1270,11 @@ Class QMetaMethod size=8 align=4 QMetaMethod (0x30379340) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30880740) 0 empty Class QMetaEnum size=8 align=4 QMetaEnum (0x303793c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3088be80) 0 empty Class QMetaProperty size=20 align=4 @@ -1632,9 +1284,6 @@ Class QMetaClassInfo size=8 align=4 QMetaClassInfo (0x30379540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x308a3780) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17 entries @@ -1902,9 +1551,6 @@ Class QBitRef size=8 align=4 QBitRef (0x305a6140) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864700) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1922,65 +1568,41 @@ Class QHashDummyValue size=1 align=1 QHashDummyValue (0x30893ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30897f00) 0 empty Class QDate size=4 align=4 QDate (0x301eb4c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebe80) 0 empty Class QTime size=4 align=4 QTime (0x301f1e80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30368c00) 0 empty Class QDateTime size=4 align=4 QDateTime (0x304b0440) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304d4880) 0 empty Class QPoint size=8 align=4 QPoint (0x301f9d40) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307b9180) 0 empty Class QPointF size=16 align=8 QPointF (0x30200880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307efcc0) 0 empty Class QLine size=16 align=4 QLine (0x301eb540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3098afc0) 0 empty Class QLineF size=32 align=8 QLineF (0x301eb600) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a335c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1990,41 +1612,26 @@ Class QLocale size=4 align=4 QLocale (0x301eb800) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30822c80) 0 empty Class QSize size=8 align=4 QSize (0x30200a80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864400) 0 empty Class QSizeF size=16 align=8 QSizeF (0x30209200) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a33a80) 0 empty Class QRect size=16 align=4 QRect (0x30213780) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30aad700) 0 empty Class QRectF size=32 align=8 QRectF (0x302138c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a1fdc0) 0 empty Class QSharedData size=4 align=4 @@ -2034,9 +1641,6 @@ Class QVectorData size=16 align=4 QVectorData (0x30ad4ec0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30bc8b80) 0 Class QSqlRecord size=4 align=4 @@ -2165,13 +1769,7 @@ Class QSqlField size=24 align=8 QSqlField (0x30b1b040) 0 -Class QList:: - size=4 align=4 -QList:: (0x304d4240) 0 -Class QList - size=4 align=4 -QList (0x304d8ac0) 0 Class QSqlIndex size=16 align=4 @@ -2423,11 +2021,5 @@ QSqlRelationalTableModel (0x30b5e180) 0 QObject (0x30b5e2c0) 0 primary-for QAbstractItemModel (0x30b5e280) -Class QList::Node - size=4 align=4 -QList::Node (0x30120ac0) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x301dfa00) 0 diff --git a/tests/auto/bic/data/QtSql.4.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtSql.4.0.0.linux-gcc-amd64.txt index 0bb960a47..07ab0ee44 100644 --- a/tests/auto/bic/data/QtSql.4.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtSql.4.0.0.linux-gcc-amd64.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x2aaaac200930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac219850) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac219af0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac219d90) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac22f070) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac22f310) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac22f5b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac22f850) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac22faf0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac22fd90) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac242070) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac242310) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac2425b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac242850) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac242af0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac242d90) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x2aaaac255000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac2e10e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac2e14d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac2e18c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac2e1cb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac3250e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac3254d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac3258c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac325cb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac36c0e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac36c4d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac36c8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac36ccb0) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x2aaaac3b8700) 0 QGenericArgument (0x2aaaac3b8770) 0 -Class QMetaObject:: - size=32 align=8 - base size=32 base align=8 -QMetaObject:: (0x2aaaac3df000) 0 Class QMetaObject size=32 align=8 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x2aaaac3f3c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac426cb0) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=12 base align=8 QByteRef (0x2aaaac55e310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac5f2380) 0 empty Class QString::Null size=1 align=1 @@ -291,10 +171,6 @@ Class QString base size=8 base align=8 QString (0x2aaaac5f2690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac5f2ee0) 0 Class QLatin1String size=8 align=8 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x2aaaac8b21c0) 0 QString (0x2aaaac8b2230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac8b2770) 0 empty Class QListData::Data size=32 align=8 @@ -327,15 +199,7 @@ Class QListData base size=8 base align=8 QListData (0x2aaaac8f3690) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaaca155b0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaaca15460) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x2aaaaca84a10) 0 QObject (0x2aaaaca84a80) 0 primary-for QIODevice (0x2aaaaca84a10) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacab75b0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=128 base align=8 QMapData (0x2aaaacb421c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacc5e0e0) 0 Class QTextCodec::ConverterState size=32 align=8 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x2aaaacc37e00) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 16u) -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaacc7d9a0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaacc7d850) 0 Class QTextEncoder size=40 align=8 @@ -503,30 +351,10 @@ Class QTextDecoder base size=40 base align=8 QTextDecoder (0x2aaaaccb9700) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaaccb9b60) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x2aaaaccb9d20) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaaccb9c40) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaaccb9e00) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaaccb9ee0) 0 Class __gconv_trans_data size=40 align=8 @@ -548,15 +376,7 @@ Class __gconv_info base size=16 base align=8 __gconv_info (0x2aaaaccd4230) 0 -Class :: - size=72 align=8 - base size=72 base align=8 -:: (0x2aaaaccd43f0) 0 -Class - size=72 align=8 - base size=72 base align=8 - (0x2aaaaccd4310) 0 Class _IO_marker size=24 align=8 @@ -568,10 +388,6 @@ Class _IO_FILE base size=216 base align=8 _IO_FILE (0x2aaaaccd44d0) 0 -Class - size=32 align=8 - base size=32 base align=8 - (0x2aaaaccd45b0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x2aaaaccd4620) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacd3d8c0) 0 Class QTextStreamManipulator size=40 align=8 @@ -680,10 +492,6 @@ QFile (0x2aaaace21380) 0 QObject (0x2aaaace21460) 0 primary-for QIODevice (0x2aaaace213f0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaace53230) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=8 base align=8 QRegExp (0x2aaaace84000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaace84e70) 0 empty Class QStringMatcher size=1048 align=8 base size=1044 base align=8 QStringMatcher (0x2aaaacea90e0) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaacea9690) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaacea9540) 0 Class QStringList size=8 align=8 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x2aaaacea97e0) 0 QList (0x2aaaacea9850) 0 -Class QList::iterator - size=8 align=8 - base size=8 base align=8 -QList::iterator (0x2aaaaceff690) 0 -Class QList::const_iterator - size=8 align=8 - base size=8 base align=8 -QList::const_iterator (0x2aaaaceffa10) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=8 base align=8 QFileInfo (0x2aaaacf85380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacf85e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaacfc22a0) 0 empty -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaacfc2a10) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaacfc28c0) 0 Class QDir size=8 align=8 base size=8 base align=8 QDir (0x2aaaacfc2b60) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacfc2e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad025070) 0 Class QUrl size=8 align=8 base size=8 base align=8 QUrl (0x2aaaad060d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad0a9070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad0e12a0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x2aaaad0e18c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad105000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad1051c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad105380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad105540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad105700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad1058c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad105a80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad105c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad105e00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad112000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad1121c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad112380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad112540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad112700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad1128c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad112a80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad112c40) 0 empty Class QVariant::PrivateShared size=16 align=8 @@ -1029,35 +717,15 @@ Class QVariant base size=16 base align=8 QVariant (0x2aaaad112d90) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaad1a0f50) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaad1a0e00) 0 -Class QMap:: - size=8 align=8 - base size=8 base align=8 -QMap:: (0x2aaaad1d0310) 0 -Class QMap - size=8 align=8 - base size=8 base align=8 -QMap (0x2aaaad1d01c0) 0 Class QVariantComparisonHelper size=8 align=8 base size=8 base align=8 QVariantComparisonHelper (0x2aaaad210c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad228700) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1128,10 +796,6 @@ Class QFileEngine QFileEngine (0x2aaaad294b60) 0 vptr=((& QFileEngine::_ZTV11QFileEngine) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad294f50) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5u entries @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x2aaaad2dc7e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad2dc9a0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x2aaaad407cb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad425230) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x2aaaad453070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad453850) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x2aaaad484850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad484a10) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x2aaaad4b8310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad4b88c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x2aaaad4f09a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad4f0bd0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x2aaaad541310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad541a10) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x2aaaad5901c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad5903f0) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x2aaaad63caf0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad66ba80) 0 empty Class QLinkedListData size=32 align=8 @@ -1262,10 +890,6 @@ Class QBitRef base size=12 base align=8 QBitRef (0x2aaaad7dec40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad7f5850) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=8 base align=8 QLocale (0x2aaaad917930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad9623f0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x2aaaad9bda80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad9e3c40) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x2aaaad9e3e70) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaada0b9a0) 0 empty Class QDateTime size=8 align=8 base size=8 base align=8 QDateTime (0x2aaaada0bbd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaada2b770) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x2aaaadab1310) 0 QObject (0x2aaaadab1380) 0 primary-for QEventLoop (0x2aaaadab1310) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaadab1770) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=24 base align=8 QModelIndex (0x2aaaadb2a850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadb45a80) 0 empty Class QPersistentModelIndex size=8 align=8 base size=8 base align=8 QPersistentModelIndex (0x2aaaadb58000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadb58230) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2aaaadbe98c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc23150) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=12 base align=8 QMetaMethod (0x2aaaadc4df50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc73310) 0 empty Class QMetaEnum size=16 align=8 base size=12 base align=8 QMetaEnum (0x2aaaadc73540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc73a10) 0 empty Class QMetaProperty size=32 align=8 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=12 base align=8 QMetaClassInfo (0x2aaaadc73d90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc8f1c0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2062,15 +1642,7 @@ Class QSqlRecord base size=8 base align=8 QSqlRecord (0x2aaaadd3c460) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaadd3cb60) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaadd3ca10) 0 Class QSqlIndex size=32 align=8 @@ -2078,10 +1650,6 @@ Class QSqlIndex QSqlIndex (0x2aaaadd3c7e0) 0 QSqlRecord (0x2aaaadd3c850) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaadd892a0) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -2464,18 +2032,6 @@ QSqlRelationalTableModel (0x2aaaade85d20) 0 QObject (0x2aaaade85f50) 0 primary-for QAbstractItemModel (0x2aaaade85ee0) -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaaadf445b0) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaaadf7f690) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaaae0c3380) 0 diff --git a/tests/auto/bic/data/QtSql.4.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSql.4.0.0.linux-gcc-ia32.txt index 9357a0169..10ecbebc2 100644 --- a/tests/auto/bic/data/QtSql.4.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSql.4.0.0.linux-gcc-ia32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x4001ef40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001ed80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe0c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abe340) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40abe380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abe540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abe5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abe640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abe6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abe740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abe7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abe840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abe8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abe940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abe9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abea40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abeac0) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40abec00) 0 QGenericArgument (0x40abec40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40abee40) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x40abef40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bd1000) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x40bd1700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bd1780) 0 empty Class QString::Null size=1 align=1 @@ -296,10 +176,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x40bd19c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40bd1b00) 0 Class QCharRef size=8 align=4 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x40bd1cc0) 0 QString (0x40bd1d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bd1d80) 0 empty Class QListData::Data size=24 align=4 @@ -327,15 +199,7 @@ Class QListData base size=4 base align=4 QListData (0x40bd1e80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x40e772c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x40e77200) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x40e77500) 0 QObject (0x40e77540) 0 primary-for QIODevice (0x40e77500) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40e77680) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=72 base align=4 QMapData (0x40e77780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40e77d40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x40e77c40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x40e77fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x40e77f00) 0 Class QTextEncoder size=32 align=4 @@ -503,30 +351,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x40e773c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x40e77700) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x40e77cc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x40e77a80) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x40e77d80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41066000) 0 Class __gconv_trans_data size=20 align=4 @@ -548,15 +376,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x41066100) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x41066180) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x41066140) 0 Class _IO_marker size=12 align=4 @@ -568,10 +388,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x41066200) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41066240) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x41066280) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x410663c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -680,10 +492,6 @@ QFile (0x41066b00) 0 QObject (0x41066b80) 0 primary-for QIODevice (0x41066b40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41066c80) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x41066e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41066ec0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x41066f00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x410665c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41066f80) 0 Class QStringList size=4 align=4 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x41066780) 0 QList (0x41066bc0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x411761c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x41176240) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x411766c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41176740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41176780) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x411768c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41176800) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x41176900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x411769c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41176a80) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x41176b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41176c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41176c40) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x41176c80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176d00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176d80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176dc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176e00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176e40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176e80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176f00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176f80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176fc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x412a2000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x412a2040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x412a2080) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1029,35 +717,15 @@ Class QVariant base size=12 base align=4 QVariant (0x412a20c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x412a2680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x412a25c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x412a2800) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x412a2740) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x412a2a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412a2b40) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1142,10 +810,6 @@ Class QFileEngineHandler QFileEngineHandler (0x412a2e00) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412a2f00) 0 Class QHashData::Node size=8 align=4 @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x412a2200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412a2280) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x413ad340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413ad780) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x413ad840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413adc80) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x413add80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413addc0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x413adec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413adf40) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x413ad380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413ad880) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x413adb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e2280) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x414e2480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e2680) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x414e2780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e2900) 0 empty Class QLinkedListData size=20 align=4 @@ -1262,10 +890,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x414e2f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e2fc0) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=4 base align=4 QLocale (0x416e3100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e3140) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x416e32c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e3440) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x416e3480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e3600) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x416e3640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e3780) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x416e3f00) 0 QObject (0x416e3f40) 0 primary-for QEventLoop (0x416e3f00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x416e3380) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x417fa100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fa200) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x417fa280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fa340) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x417fa900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fa9c0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x417fad00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fad80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x417fadc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fae40) 0 empty Class QMetaProperty size=20 align=4 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x417faec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417faf40) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2062,15 +1642,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0x418f6480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x418f6680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x418f65c0) 0 Class QSqlIndex size=16 align=4 @@ -2078,10 +1650,6 @@ Class QSqlIndex QSqlIndex (0x418f64c0) 0 QSqlRecord (0x418f6500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x418f6740) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -2464,18 +2032,6 @@ QSqlRelationalTableModel (0x419db000) 0 QObject (0x419db140) 0 primary-for QAbstractItemModel (0x419db100) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41a22680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41a22d40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41ae8100) 0 diff --git a/tests/auto/bic/data/QtSql.4.0.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtSql.4.0.0.linux-gcc-ppc32.txt index a279f27d0..76e41719d 100644 --- a/tests/auto/bic/data/QtSql.4.0.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtSql.4.0.0.linux-gcc-ppc32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x30ab7540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ab77e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ab7888) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ab7930) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ab79d8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ab7a80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ab7b28) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ab7bd0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ab7c78) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ab7d20) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ab7dc8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ab7e70) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ab7f18) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ab7fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30af3000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30af30a8) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x30af3118) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30af3620) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30af3690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30af3700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30af3770) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30af37e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30af3850) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30af38c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30af3930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30af39a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30af3a10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30af3a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30af3af0) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187980) 0 QGenericArgument (0x30af3c08) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x30af3dc8) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x30af3ea8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30af3f50) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x30bf0af0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30bf0e38) 0 empty Class QString::Null size=1 align=1 @@ -296,20 +176,12 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x30d190a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30d193f0) 0 Class QCharRef size=8 align=4 base size=8 base align=4 QCharRef (0x30d19428) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30d19d58) 0 empty Class QListData::Data size=24 align=4 @@ -321,15 +193,7 @@ Class QListData base size=4 base align=4 QListData (0x30d19f50) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30e0f498) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30e0f3f0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -421,10 +285,6 @@ QIODevice (0x30187b80) 0 QObject (0x30e0f930) 0 primary-for QIODevice (0x30187b80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30e0faf0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -449,30 +309,10 @@ Class QMapData base size=72 base align=4 QMapData (0x30e0ff18) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30f1e348) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x30f1e428) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30f1e3b8) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x30f1e498) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x30f1e508) 0 Class __gconv_trans_data size=20 align=4 @@ -494,15 +334,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x30f1e658) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x30f1e738) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x30f1e6c8) 0 Class _IO_marker size=12 align=4 @@ -514,10 +346,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x30f1e7a8) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x30f1e818) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -532,10 +360,6 @@ Class QTextStream QTextStream (0x30f1e850) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30f1ea10) 0 Class QTextStreamManipulator size=24 align=4 @@ -596,10 +420,6 @@ QFile (0x30187d00) 0 QObject (0x30f1ef88) 0 primary-for QIODevice (0x30187d40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3103f0a8) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -652,25 +472,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x3103f1f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3103f268) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x3103f2d8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3103f498) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3103f3f0) 0 Class QStringList size=4 align=4 @@ -770,130 +578,42 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x3103fc78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3103fce8) 0 empty Class QDir size=4 align=4 base size=4 base align=4 QDir (0x3103fd90) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3103fea8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3103ff18) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x3103ffc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31114000) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311140a8) 0 Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x311140e0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x311141c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31114230) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x311142a0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31114310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31114380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x311143f0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31114460) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x311144d0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31114540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x311145b0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31114620) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31114690) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31114700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31114770) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x311147e0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31114850) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x311148c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -920,35 +640,15 @@ Class QVariant base size=16 base align=8 QVariant (0x311148f8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31114e70) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31114dc8) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x31114af0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x31114f88) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x311a30e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311a31f8) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1033,10 +733,6 @@ Class QFileEngineHandler QFileEngineHandler (0x311a3540) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311a36c8) 0 Class QHashData::Node size=8 align=4 @@ -1053,90 +749,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x311a38c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311a3930) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x311a3000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3129c188) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x3129c310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3129c700) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x3129c8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3129c930) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x3129ca80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3129cb28) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x3129ccb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3129c070) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x3129cd58) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3133d118) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x3133d428) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3133d620) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x3133d850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3133d9d8) 0 empty Class QLinkedListData size=20 align=4 @@ -1153,10 +813,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x31486268) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31486380) 0 empty Class QVectorData size=16 align=4 @@ -1178,40 +834,24 @@ Class QLocale base size=4 base align=4 QLocale (0x31486930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x314869a0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x31486b98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31486d58) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x31486dc8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31486f50) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x31486fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31486e70) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1286,10 +926,6 @@ QTextCodecPlugin (0x311ac280) 0 QFactoryInterface (0x315cb498) 8 nearly-empty primary-for QTextCodecFactoryInterface (0x311ac2c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x315cb8c0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1409,10 +1045,6 @@ QEventLoop (0x311ac3c0) 0 QObject (0x315cbe00) 0 primary-for QEventLoop (0x311ac3c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x315cbf88) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1489,20 +1121,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x31652428) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316525b0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x31652658) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31652770) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1722,10 +1346,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x31652e38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31652f18) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1820,20 +1440,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x316ef118) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316ef1c0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x316ef230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316ef2d8) 0 empty Class QMetaProperty size=20 align=4 @@ -1845,10 +1457,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x316ef380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316ef428) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -1976,15 +1584,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0x316efd20) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x316efee0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x316efe38) 0 Class QSqlIndex size=16 align=4 @@ -1992,10 +1592,6 @@ Class QSqlIndex QSqlIndex (0x311ac800) 0 QSqlRecord (0x316efd58) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x316ef540) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -2378,8 +1974,4 @@ QSqlRelationalTableModel (0x311acb40) 0 QObject (0x3179db60) 0 primary-for QAbstractItemModel (0x311acc40) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x318b9b98) 0 diff --git a/tests/auto/bic/data/QtSql.4.0.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtSql.4.0.0.macx-gcc-ppc32.txt index 6cc488696..719d47f33 100644 --- a/tests/auto/bic/data/QtSql.4.0.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtSql.4.0.0.macx-gcc-ppc32.txt @@ -59,75 +59,19 @@ Class QBool base size=4 base align=4 QBool (0x7b8880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7b8bc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7b8c80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7b8d40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7b8e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7b8ec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7b8f80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7b8300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7fe040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7fe100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7fe1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7fe280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7fe340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7fe400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7fe4c0) 0 empty Class QFlag size=4 align=4 @@ -144,10 +88,6 @@ Class QChar base size=2 base align=2 QChar (0x7fe7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7fe8c0) 0 empty Class QBasicAtomic size=4 align=4 @@ -160,10 +100,6 @@ Class QAtomic QAtomic (0x7fec80) 0 QBasicAtomic (0x7fecc0) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x7fef40) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -245,70 +181,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xebcbc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xebcf80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb3440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb34c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb3540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb35c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb3640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb36c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb3740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb37c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb3840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb38c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb3940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb39c0) 0 Class QInternal size=1 align=1 @@ -335,10 +219,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x1155100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1155540) 0 Class QCharRef size=8 align=4 @@ -351,10 +231,6 @@ Class QConstString QConstString (0x128e140) 0 QString (0x128e180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x128e280) 0 empty Class QListData::Data size=24 align=4 @@ -366,10 +242,6 @@ Class QListData base size=4 base align=4 QListData (0x128e4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x128eac0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -394,15 +266,7 @@ Class QTextCodec QTextCodec (0x128e940) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x128ee00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x128ed40) 0 Class QTextEncoder size=32 align=4 @@ -425,25 +289,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x128ea40) 0 QGenericArgument (0x128ebc0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x13e8280) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x13e8200) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13e8500) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x13e8440) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -535,10 +387,6 @@ QIODevice (0x13e8b40) 0 QObject (0x13e8b80) 0 primary-for QIODevice (0x13e8b40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13e8dc0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -558,25 +406,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x14cf3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x14cf5c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x14cf640) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x14cf840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x14cf780) 0 Class QStringList size=4 align=4 @@ -584,15 +420,7 @@ Class QStringList QStringList (0x14cf900) 0 QList (0x14cf940) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x14cfe00) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x14cfe80) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -748,10 +576,6 @@ Class QTextStream QTextStream (0x165a680) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x165a940) 0 Class QTextStreamManipulator size=24 align=4 @@ -842,50 +666,22 @@ QFile (0x16f8540) 0 QObject (0x16f85c0) 0 primary-for QIODevice (0x16f8580) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16f8780) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x16f87c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16f8880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x16f8900) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x16f8ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x16f8a00) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x16f8b80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16f8cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16f8d80) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35u entries @@ -945,10 +741,6 @@ Class QFileEngineHandler QFileEngineHandler (0x16f8fc0) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18480c0) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -999,90 +791,22 @@ Class QMetaType base size=0 base align=1 QMetaType (0x18482c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x18483c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1848440) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x18484c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1848540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x18485c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1848640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x18486c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1848740) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x18487c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1848840) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x18488c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1848940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x18489c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1848a40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1848ac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1848b40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1848bc0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1109,50 +833,18 @@ Class QVariant base size=16 base align=4 QVariant (0x1848c00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1902100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1902040) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1902300) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1902240) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1902580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x19026c0) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1902780) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1902800) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1902880) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1230,15 +922,7 @@ Class QUrl base size=4 base align=4 QUrl (0x19ce000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19ce200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x19ce280) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1265,10 +949,6 @@ QEventLoop (0x19ce300) 0 QObject (0x19ce340) 0 primary-for QEventLoop (0x19ce300) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19ce540) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1313,20 +993,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x19ce780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x19ce940) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x19cea00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x19ceb40) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1496,10 +1168,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1ac00c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ac01c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1591,20 +1259,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1ac0d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ac0dc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1ac0e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ac0f00) 0 empty Class QMetaProperty size=20 align=4 @@ -1616,10 +1276,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1ac0fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ac04c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1907,10 +1563,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1c02840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c02980) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1932,80 +1584,48 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1c02bc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c02c40) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x1c94400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c94600) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1c94680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c94840) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1c948c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c94a40) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1c94ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c94f40) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x1c94740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c94e80) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1dd61c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dd6240) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x1dd63c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dd6480) 0 empty Class QLinkedListData size=20 align=4 @@ -2017,50 +1637,30 @@ Class QLocale base size=4 base align=4 QLocale (0x1dd6a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dd6ac0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1dd6c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dd68c0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x1f2f0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f2f4c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1f2f840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f2fa00) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x1f2fc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f2fe40) 0 empty Class QSharedData size=4 align=4 @@ -2072,10 +1672,6 @@ Class QVectorData base size=16 base align=4 QVectorData (0x20bb100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x20bb680) 0 Class QSqlRecord size=4 align=4 @@ -2213,15 +1809,7 @@ Class QSqlField base size=20 base align=4 QSqlField (0x20bb800) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2212180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x22120c0) 0 Class QSqlIndex size=16 align=4 @@ -2479,18 +2067,6 @@ QSqlRelationalTableModel (0x2212900) 0 QObject (0x2212a40) 0 primary-for QAbstractItemModel (0x2212a00) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22e0bc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22fea40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23d5000) 0 diff --git a/tests/auto/bic/data/QtSql.4.1.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSql.4.1.0.linux-gcc-ia32.txt index 94e265526..ac830a709 100644 --- a/tests/auto/bic/data/QtSql.4.1.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSql.4.1.0.linux-gcc-ia32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x4001ee80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001ef40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001ef80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001efc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac60c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac61c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac62c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40ac6300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac64c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac65c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac66c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac67c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac68c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac69c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6a40) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40ac6b80) 0 QGenericArgument (0x40ac6bc0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40ac6dc0) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x40ac6ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6f80) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x40bde680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bde700) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x40bde940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40bdea80) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x40bdec40) 0 QString (0x40bdec80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bded00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x40e6d180) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x40e6d5c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x40e6d500) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x40e6d800) 0 QObject (0x40e6d840) 0 primary-for QIODevice (0x40e6d800) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40e6d980) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x40e6db40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40e6db80) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x41030100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41030700) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x41030600) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41030980) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x410308c0) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x41030a40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41030ac0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x41030b40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41030b00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x41030b80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41030bc0) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x41030cc0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x41030d40) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x41030d00) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x41030dc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41030e00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x41030e40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41030f80) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x4118b1c0) 0 QTextStream (0x4118b200) 0 primary-for QTextOStream (0x4118b1c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x4118b3c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x4118b400) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x4118b380) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x4118b440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x4118b480) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x4118b4c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x4118b500) 0 Class timespec size=8 align=4 @@ -701,10 +485,6 @@ Class timeval base size=8 base align=4 timeval (0x4118b580) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x4118b5c0) 0 Class __sched_param size=4 align=4 @@ -721,45 +501,17 @@ Class __pthread_attr_s base size=36 base align=4 __pthread_attr_s (0x4118b680) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0x4118b6c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x4118b700) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x4118b740) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x4118b780) 0 Class _pthread_rwlock_t size=32 align=4 base size=32 base align=4 _pthread_rwlock_t (0x4118b7c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x4118b800) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x4118b840) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x4118b880) 0 Class random_data size=28 align=4 @@ -830,10 +582,6 @@ QFile (0x4118bdc0) 0 QObject (0x4118be40) 0 primary-for QIODevice (0x4118be00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4118bf40) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -886,50 +634,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x4118be80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412ca040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412ca080) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x412ca1c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x412ca100) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x412ca200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412ca280) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x412ca2c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x412ca400) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x412ca340) 0 Class QStringList size=4 align=4 @@ -937,30 +657,14 @@ Class QStringList QStringList (0x412ca440) 0 QList (0x412ca480) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x412ca6c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x412ca740) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x412ca940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412caa00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412caa80) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1017,10 +721,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x412caac0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412cac80) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1175,110 +875,30 @@ Class QUrl base size=4 base align=4 QUrl (0x413db000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x413db0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413db100) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x413db140) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db200) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db280) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db2c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db300) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db3c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db440) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db480) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db4c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db5c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413db600) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1305,35 +925,15 @@ Class QVariant base size=12 base align=4 QVariant (0x413db640) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x413dbc00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x413dbb40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x413dbd80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x413dbcc0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x413dbfc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413db900) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1365,80 +965,48 @@ Class QPoint base size=8 base align=4 QPoint (0x414e3180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e35c0) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x414e3680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3ac0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x414e3bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3c00) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x414e3d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3d80) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x414e3e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3340) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x414e36c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3ec0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x415cf140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cf340) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x415cf440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cf5c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1455,10 +1023,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x415cfc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cfc80) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1475,40 +1039,24 @@ Class QLocale base size=4 base align=4 QLocale (0x415cfec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cff00) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x415cf280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e2000) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x417e2040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e21c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x417e2200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e2340) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1668,10 +1216,6 @@ QEventLoop (0x417e2ac0) 0 QObject (0x417e2b00) 0 primary-for QEventLoop (0x417e2ac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x417e2c40) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1763,20 +1307,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x417e2740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e2b80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x417e2cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e2ec0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1996,10 +1532,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x418d8580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d8640) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2094,20 +1626,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x418d8980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d8a00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x418d8a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d8ac0) 0 empty Class QMetaProperty size=20 align=4 @@ -2119,10 +1643,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x418d8b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d8bc0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2250,15 +1770,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0x419c1140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x419c1340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x419c1280) 0 Class QSqlIndex size=16 align=4 @@ -2266,10 +1778,6 @@ Class QSqlIndex QSqlIndex (0x419c1180) 0 QSqlRecord (0x419c11c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x419c1400) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -2652,23 +2160,7 @@ QSqlRelationalTableModel (0x419c1f00) 0 QObject (0x419c1480) 0 primary-for QAbstractItemModel (0x419c1200) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41ad5500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41ad5880) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41ad5f40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41b95040) 0 diff --git a/tests/auto/bic/data/QtSql.4.1.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtSql.4.1.0.linux-gcc-ppc32.txt index 69c196d9d..f3b5d8680 100644 --- a/tests/auto/bic/data/QtSql.4.1.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtSql.4.1.0.linux-gcc-ppc32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x306c54d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c56c8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c5770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c5818) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c58c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c5968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c5a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c5ab8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c5b60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c5c08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c5cb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c5d58) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c5e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c5ea8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306c5f50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306fa000) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x306fa070) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306fa578) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306fa5e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306fa658) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306fa6c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306fa738) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306fa7a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306fa818) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306fa888) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306fa8f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306fa968) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306fa9d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306faa48) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187ac0) 0 QGenericArgument (0x306fab60) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x306fad20) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x306fae00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306faea8) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x30c0fb98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30c0fee0) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x30d40498) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30d407e0) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x30187d00) 0 QString (0x30e68268) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30e68348) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x30e68a80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30e68fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30e68f18) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x30187dc0) 0 QObject (0x30f583b8) 0 primary-for QIODevice (0x30187dc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30f585b0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x30f58ce8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30f58d58) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x30ffc460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30ffcb28) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x30ffc9d8) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30ffce00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30ffcd58) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x30ffcf18) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30ffcfc0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x30ffcc08) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30ffc738) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x3115d038) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x3115d0a8) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x3115d1f8) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x3115d2d8) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x3115d268) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x3115d348) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x3115d3b8) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x3115d3f0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3115d620) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x30187fc0) 0 QTextStream (0x3115db98) 0 primary-for QTextOStream (0x30187fc0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x3115de70) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x3115dee0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x3115de00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x3115df50) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x3115dfc0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x3115d9d8) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x311e6000) 0 Class timespec size=8 align=4 @@ -701,70 +485,18 @@ Class timeval base size=8 base align=4 timeval (0x311e6070) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x311e60e0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x311e6150) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x311e6230) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x311e61c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x311e62a0) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x311e6380) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x311e6310) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x311e63f0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x311e64d0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x311e6460) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x311e6540) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x311e65b0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x311e6620) 0 Class random_data size=28 align=4 @@ -835,10 +567,6 @@ QFile (0x312b3000) 0 QObject (0x311e6c40) 0 primary-for QIODevice (0x312b3040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311e6dc8) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -891,50 +619,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x311e6f18) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311e6fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311e6d20) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3130e118) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3130e070) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x3130e1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3130e380) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x3130e3f0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3130e5b0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3130e508) 0 Class QStringList size=4 align=4 @@ -942,30 +642,14 @@ Class QStringList QStringList (0x312b3140) 0 QList (0x3130e658) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x3130ea80) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x3130eaf0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x3130ee00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3130ef18) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3130ef88) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1022,10 +706,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x3130efc0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313d21f8) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1180,110 +860,30 @@ Class QUrl base size=4 base align=4 QUrl (0x313d26c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313d2850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313d28c0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x313d2930) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313d2a48) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313d2af0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313d2b98) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313d2c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313d2ce8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313d2d90) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313d2e38) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313d2ee0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313d2f88) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313d2310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313d2658) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3146b070) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3146b118) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3146b1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3146b268) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3146b310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3146b3b8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3146b460) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1310,35 +910,15 @@ Class QVariant base size=16 base align=8 QVariant (0x3146b4d0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3146ba80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3146b9d8) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x3146bc40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x3146bb98) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x3146be00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3146bf18) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1370,80 +950,48 @@ Class QPoint base size=8 base align=4 QPoint (0x31543310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31543700) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x315438f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31543ce8) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x31543f18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31543f88) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x31543498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315435e8) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x31543b60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315e4268) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x315e4540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315e48c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x315e4c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315e4e38) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x315e40e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315e4658) 0 empty Class QLinkedListData size=20 align=4 @@ -1460,10 +1008,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x316dd888) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316dd9a0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1480,40 +1024,24 @@ Class QLocale base size=4 base align=4 QLocale (0x316ddcb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316ddd20) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x316ddf18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31828038) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x318280a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318282a0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x31828310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31828460) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1673,10 +1201,6 @@ QEventLoop (0x312b3680) 0 QObject (0x31828fc0) 0 primary-for QEventLoop (0x312b3680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31828818) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1768,20 +1292,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x318de818) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318de9a0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x318dea10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318deb28) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2001,10 +1517,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x318decb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3197f038) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2099,20 +1611,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x3197f460) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3197f508) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x3197f578) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3197f620) 0 empty Class QMetaProperty size=20 align=4 @@ -2124,10 +1628,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x3197f6c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3197f770) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2255,15 +1755,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0x3197fd58) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31a27188) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31a270e0) 0 Class QSqlIndex size=16 align=4 @@ -2271,10 +1763,6 @@ Class QSqlIndex QSqlIndex (0x312b3b40) 0 QSqlRecord (0x31a27000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31a272d8) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -2657,23 +2145,7 @@ QSqlRelationalTableModel (0x312b3e80) 0 QObject (0x31a27ee0) 0 primary-for QAbstractItemModel (0x312b3f80) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b38038) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31b38770) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b52578) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31bda3f0) 0 diff --git a/tests/auto/bic/data/QtSql.4.1.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtSql.4.1.0.macx-gcc-ia32.txt index e3da0c7b8..cc0eca02a 100644 --- a/tests/auto/bic/data/QtSql.4.1.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSql.4.1.0.macx-gcc-ia32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x62ea00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62ec40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62ed00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62edc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62ee80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62ef40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x65c000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x65c0c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x65c180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x65c240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x65c300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x65c3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x65c480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x65c540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x65c600) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x65c900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x65ca00) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0xde8100) 0 QBasicAtomic (0xde8140) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xde83c0) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xe86080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xe86440) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe86900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe86980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe86a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe86a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe86b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe86b80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe86c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe86c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe86d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe86d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe86e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xe86e80) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xffa5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xffaa00) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x116b600) 0 QString (0x116b640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x116b740) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x116ba40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x11cb580) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x11cb400) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x11cb8c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x11cb800) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x11cbb00) 0 QGenericArgument (0x11cbb40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x11cbe00) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x11cbd80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x11cb680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x11cbfc0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x12fe600) 0 QObject (0x12fe640) 0 primary-for QIODevice (0x12fe600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x12fe880) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x12fef40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x13cf040) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x13cf0c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13cf2c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x13cf200) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x13cf380) 0 QList (0x13cf3c0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x13cf880) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x13cf900) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x144e6c0) 0 QObject (0x144e740) 0 primary-for QIODevice (0x144e700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x144e900) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x144e940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x144ea00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x144ea80) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x144ec40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x144eb80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x144ed00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x144ee40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x144eec0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x144ef00) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1561100) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1561600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1561680) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x15bca00) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15bccc0) 0 Class QTextStreamManipulator size=24 align=4 @@ -1041,35 +829,15 @@ Class rlimit base size=16 base align=4 rlimit (0x1750740) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1750f00) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1750f80) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x1750e80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1750200) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1781040) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x17810c0) 0 Class QVectorData size=16 align=4 @@ -1182,95 +950,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1781b40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1781c80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1781d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1781e00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1781ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1781f80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x17818c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189e040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189e100) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189e1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189e280) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189e340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189e400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189e4c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189e580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189e640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189e700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189e7c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189e880) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1297,50 +993,18 @@ Class QVariant base size=12 base align=4 QVariant (0x189e900) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x189ef80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x189eec0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1928080) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x189ec40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1928300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1928440) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1928500) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1928580) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1928600) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1418,15 +1082,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1928e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19280c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x19288c0) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1453,10 +1109,6 @@ QEventLoop (0x1928dc0) 0 QObject (0x1a02000) 0 primary-for QEventLoop (0x1928dc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a02200) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1501,20 +1153,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1a02440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a02600) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1a02680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a027c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1684,10 +1328,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1a02ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a02fc0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1779,20 +1419,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1ab59c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ab5a80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1ab5b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ab5bc0) 0 empty Class QMetaProperty size=20 align=4 @@ -1804,10 +1436,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1ab5c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ab5d40) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2095,10 +1723,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1bc64c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bc6600) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2110,70 +1734,42 @@ Class QDate base size=4 base align=4 QDate (0x1bc6800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bc6a00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1bc6a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bc6cc0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1bc6d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bc6ec0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1bc6f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c7a040) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x1c7a300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c7a780) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1c7aa80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c7ab00) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x1c7ac80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c7ad40) 0 empty Class QLinkedListData size=20 align=4 @@ -2185,60 +1781,36 @@ Class QLocale base size=4 base align=4 QLocale (0x1d7b0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d7b140) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1d7b280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d7b680) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x1d7ba40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d7be40) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1d7bc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e42080) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x1e42300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e424c0) 0 empty Class QSharedData size=4 align=4 base size=4 base align=4 QSharedData (0x1e428c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e42c40) 0 Class QSqlRecord size=4 align=4 @@ -2376,15 +1948,7 @@ Class QSqlField base size=16 base align=4 QSqlField (0x1fbd500) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1fbd780) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1fbd6c0) 0 Class QSqlIndex size=16 align=4 @@ -2642,23 +2206,7 @@ QSqlRelationalTableModel (0x1fbdf00) 0 QObject (0x1fbd180) 0 primary-for QAbstractItemModel (0x1fbd000) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x20b5380) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x20de200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2125280) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x2189840) 0 diff --git a/tests/auto/bic/data/QtSql.4.1.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtSql.4.1.0.macx-gcc-ppc32.txt index 86e0c4014..650820751 100644 --- a/tests/auto/bic/data/QtSql.4.1.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtSql.4.1.0.macx-gcc-ppc32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x7cd440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cd680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cd740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cd800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cd8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cd980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cda40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cdb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cdbc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cdc80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cdd40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cde00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cdec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7cdf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x80d040) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x80d340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x80d440) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0x80d840) 0 QBasicAtomic (0x80d880) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x80db00) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xee67c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xee6b80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b0c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b5c0) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x100bd00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x11a0140) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x11a0d40) 0 QString (0x11a0d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11a0e80) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x12bc740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x12bcd40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x12bcbc0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x12bc580) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x12bcfc0) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1401140) 0 QGenericArgument (0x1401180) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1401440) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x14013c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x14016c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1401600) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x1401d00) 0 QObject (0x1401d40) 0 primary-for QIODevice (0x1401d00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1401f80) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x14e0580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x14e0780) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x14e0800) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x14e0a00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x14e0940) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x14e0ac0) 0 QList (0x14e0b00) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x14e0fc0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1591000) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x16131c0) 0 QObject (0x1613240) 0 primary-for QIODevice (0x1613200) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1613400) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1613440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1613500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1613580) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1613740) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1613680) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1613800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1613940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16139c0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1613a00) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1613cc0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x17400c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1740140) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x18b1100) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18b13c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -1051,35 +839,15 @@ Class rlimit base size=16 base align=8 rlimit (0x194a0c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x194a180) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x194a200) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x194a100) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x194a280) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x194a300) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x194a380) 0 Class QVectorData size=16 align=4 @@ -1192,95 +960,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x194ae40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x194af80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x194abc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f100) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f280) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f4c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f7c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f880) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8fa00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8fac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8fb80) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1307,50 +1003,18 @@ Class QVariant base size=16 base align=4 QVariant (0x1a8fc00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1af3180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1af30c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1af3380) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1af32c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1af3600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1af3740) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1af3800) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1af3880) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1af3900) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1428,15 +1092,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1bdb000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1bdb1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bdb240) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1463,10 +1119,6 @@ QEventLoop (0x1bdb2c0) 0 QObject (0x1bdb300) 0 primary-for QEventLoop (0x1bdb2c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1bdb500) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1511,20 +1163,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1bdb740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bdb900) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1bdb980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bdbac0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1694,10 +1338,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1cef040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cef140) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1789,20 +1429,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1cefd00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cefdc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1cefe40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ceff00) 0 empty Class QMetaProperty size=20 align=4 @@ -1814,10 +1446,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1ceffc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cef5c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2105,10 +1733,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1e2b840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e2b980) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2120,70 +1744,42 @@ Class QDate base size=4 base align=4 QDate (0x1e2bb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e2bd80) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e2be00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e2bbc0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1e2be80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eec0c0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1eec140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eec5c0) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x1eec880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eecd00) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1eec000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eec200) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x1eec500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eec9c0) 0 empty Class QLinkedListData size=20 align=4 @@ -2195,60 +1791,36 @@ Class QLocale base size=4 base align=4 QLocale (0x1fb9440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fb94c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1fb9600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fb9a00) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x1fb9dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fb97c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x20df280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20df440) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x20df6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20df880) 0 empty Class QSharedData size=4 align=4 base size=4 base align=4 QSharedData (0x20dfc80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x20df2c0) 0 Class QSqlRecord size=4 align=4 @@ -2386,15 +1958,7 @@ Class QSqlField base size=20 base align=4 QSqlField (0x2286880) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2286b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2286a40) 0 Class QSqlIndex size=16 align=4 @@ -2652,23 +2216,7 @@ QSqlRelationalTableModel (0x2366080) 0 QObject (0x23661c0) 0 primary-for QAbstractItemModel (0x2366180) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23d06c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23ee540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24425c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x24a1b80) 0 diff --git a/tests/auto/bic/data/QtSql.4.1.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtSql.4.1.0.win32-gcc-ia32.txt index c33efe4cd..9f80f3de3 100644 --- a/tests/auto/bic/data/QtSql.4.1.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSql.4.1.0.win32-gcc-ia32.txt @@ -18,80 +18,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xad5e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebc80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebe00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07b80) 0 empty Class QFlag size=4 align=4 @@ -108,10 +48,6 @@ Class QChar base size=2 base align=2 QChar (0xb4d840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb70cc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -139,70 +75,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc34f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd4bc40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd78100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd783c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd73c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd78a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd949c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8c80) 0 Class QInternal size=1 align=1 @@ -229,10 +113,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xeac500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeac940) 0 Class QCharRef size=8 align=4 @@ -245,10 +125,6 @@ Class QConstString QConstString (0x11e1880) 0 QString (0x11e18c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11e1c00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -311,10 +187,6 @@ Class QListData base size=4 base align=4 QListData (0x1279f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x137ae40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -339,15 +211,7 @@ Class QTextCodec QTextCodec (0xeac480) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13be140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc3da40) 0 Class QTextEncoder size=32 align=4 @@ -370,25 +234,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x13fcfc0) 0 QGenericArgument (0x1402000) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1419700) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1402580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1433f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1433b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -480,10 +332,6 @@ QIODevice (0x137a700) 0 QObject (0x14bc540) 0 primary-for QIODevice (0x137a700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14bc840) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -503,25 +351,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xeac380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x158b4c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x158b840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x158bd80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x158bc40) 0 Class QStringList size=4 align=4 @@ -529,15 +365,7 @@ Class QStringList QStringList (0xeac400) 0 QList (0x15b8000) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x158bec0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x158be80) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -666,50 +494,22 @@ QFile (0x169f840) 0 QObject (0x169f8c0) 0 primary-for QIODevice (0x169f880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16ae100) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x16d55c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16d5f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1703e40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x172d300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x172d200) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x16d5440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x175b040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x172dc00) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -766,10 +566,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x169f740) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17da340) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -843,10 +639,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x182fc40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x182fd40) 0 empty Class QMapData::Node size=8 align=4 @@ -871,10 +663,6 @@ Class QTextStream QTextStream (0x1a78240) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a78600) 0 Class QTextStreamManipulator size=24 align=4 @@ -911,20 +699,8 @@ QTextOStream (0x1b06440) 0 QTextStream (0x1b06480) 0 primary-for QTextOStream (0x1b06440) -Class - size=8 align=4 - base size=8 base align=4 - (0x1b33680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b33800) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1b525c0) 0 Class QVectorData size=16 align=4 @@ -1037,95 +813,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1ce8bc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d02d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d02ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d19040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d191c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d19340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d194c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d19640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d197c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d19940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d19ac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d19c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d19dc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d19f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d380c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d38240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d383c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d38540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d386c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1152,35 +856,15 @@ Class QVariant base size=16 base align=8 QVariant (0x14338c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1dd4540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d4adc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1dd4840) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1d4ae40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1d4a000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e3a280) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1258,15 +942,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1d38f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ed6440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f07f80) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1293,10 +969,6 @@ QEventLoop (0x1f34600) 0 QObject (0x1f34640) 0 primary-for QEventLoop (0x1f34600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f34940) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1341,20 +1013,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1f6cf40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f9fb40) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1f6cec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f9fe80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1524,10 +1188,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x200fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x204f3c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1620,20 +1280,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x13fc8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20be900) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x13fc940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20bef00) 0 empty Class QMetaProperty size=20 align=4 @@ -1645,10 +1297,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x13fca40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20eb640) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1941,10 +1589,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2239640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2298040) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1956,70 +1600,42 @@ Class QDate base size=4 base align=4 QDate (0x1d38900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22d9900) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1d38b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22fc540) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x16d54c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2325300) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1d38b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2325f40) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1d38c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2373180) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1d38980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2394600) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1d38a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23beb00) 0 empty Class QLinkedListData size=20 align=4 @@ -2031,60 +1647,36 @@ Class QLocale base size=4 base align=4 QLocale (0x1d38a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x250c300) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1d38c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x253a480) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1d38d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x255f9c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1d38d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25cd440) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1d38e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x264b680) 0 empty Class QSharedData size=4 align=4 base size=4 base align=4 QSharedData (0x26f3500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2740040) 0 Class QSqlRecord size=4 align=4 @@ -2222,15 +1814,7 @@ Class QSqlField base size=20 base align=8 QSqlField (0x2740780) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x27e6b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x27e6a00) 0 Class QSqlIndex size=16 align=4 @@ -2488,23 +2072,7 @@ QSqlRelationalTableModel (0x2862fc0) 0 QObject (0x28a2100) 0 primary-for QAbstractItemModel (0x28a20c0) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13be100) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x158bd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a36b40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x172d2c0) 0 diff --git a/tests/auto/bic/data/QtSql.4.2.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSql.4.2.0.linux-gcc-ia32.txt index 5312c4f57..83683ec7c 100644 --- a/tests/auto/bic/data/QtSql.4.2.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSql.4.2.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7ef6bc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7ef6c00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7ef6cc0) 0 empty - QUintForSize<4> (0xb7ef6d00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7ef6d80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7ef6dc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7ef6e80) 0 empty - QIntForSize<4> (0xb7ef6ec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77bf140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bf580) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb77bf5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77bf6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77bf700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77bf740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77bf780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77bf7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77bf800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77bf840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77bf880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77bf8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77bf900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77bf940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77bf980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77bf9c0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb77bfa80) 0 QGenericArgument (0xb77bfac0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb77bfc80) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb77bfd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77bfdc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb731d0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb731d100) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb731d140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb731d2c0) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb731d3c0) 0 QString (0xb731d400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb731d440) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0xb731d740) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb731dac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb731da40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0xb731dc40) 0 QObject (0xb731dc80) 0 primary-for QIODevice (0xb731dc40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb731dd40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb731dec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb731df00) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0xb6ea93c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6ea9940) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0xb6ea9880) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6ea9a80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6ea9a00) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb6ea9b00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6ea9b40) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6ea9bc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6ea9b80) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6ea9c00) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6ea9c40) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6ea9d40) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6ea9dc0) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6ea9d80) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6ea9e40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6ea9e80) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0xb6ea9ec0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6ea9f80) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0xb6ea9f40) 0 QTextStream (0xb6e65000) 0 primary-for QTextOStream (0xb6ea9f40) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e650c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e65100) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6e65080) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e65140) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e65180) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6e651c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e65200) 0 Class timespec size=8 align=4 @@ -738,80 +492,24 @@ Class timeval base size=8 base align=4 timeval (0xb6e65280) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e652c0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6e65300) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6e65340) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6e65400) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6e653c0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6e65380) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e65440) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6e654c0) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6e65480) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e65500) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6e65580) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6e65540) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e655c0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6e65600) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e65640) 0 Class random_data size=28 align=4 @@ -882,10 +580,6 @@ QFile (0xb6e65b00) 0 QObject (0xb6e65b80) 0 primary-for QIODevice (0xb6e65b40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6e65c00) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -938,50 +632,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb6e65d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6e65dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e65e00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6e65ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6e65e40) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb6e65f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e65f40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6e65f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6e65ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6e65fc0) 0 Class QStringList size=4 align=4 @@ -989,30 +655,14 @@ Class QStringList QStringList (0xb6e65bc0) 0 QList (0xb6e65d40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6c30040) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6c30080) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb6c30140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c301c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c30240) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1069,10 +719,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb6c30280) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c30400) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1184,15 +830,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6c306c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c30700) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c30740) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1287,285 +925,65 @@ Class QUrl base size=4 base align=4 QUrl (0xb6c30a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c30ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c30b00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6c30b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c307c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c30a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69830c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69831c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69832c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69833c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69834c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69835c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69836c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6983740) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1592,45 +1010,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6983780) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb69839c0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6983a00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6983b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6983a80) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6983c00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6983b80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6983cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6983d40) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1662,80 +1052,48 @@ Class QPoint base size=8 base align=4 QPoint (0xb6983f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6983900) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6983940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69838c0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6983980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6983c80) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6983e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6983e40) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0xb6983f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6983fc0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb68f3000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68f3200) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb68f32c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68f33c0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb68f3400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68f34c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1752,10 +1110,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb68f3880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68f38c0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1772,30 +1126,18 @@ Class QDate base size=4 base align=4 QDate (0xb68f3b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68f3c00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb68f3c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68f3d00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb68f3d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68f3e00) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1981,10 +1323,6 @@ QEventLoop (0xb68f3bc0) 0 QObject (0xb68f3c80) 0 primary-for QEventLoop (0xb68f3bc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68f3d80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1429,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb674f400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb674f440) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb674f480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb674f500) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2324,10 +1654,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb674f980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb674f9c0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2422,20 +1748,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb674fc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb674fc80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb674fcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb674fd00) 0 empty Class QMetaProperty size=20 align=4 @@ -2447,10 +1765,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb674fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb674fdc0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2507,10 +1821,6 @@ QLibrary (0xb674ff00) 0 QObject (0xb674ff40) 0 primary-for QLibrary (0xb674ff00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb674ffc0) 0 Class QSemaphore size=4 align=4 @@ -2558,10 +1868,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb674f4c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb674f6c0) 0 Class QMutexLocker size=4 align=4 @@ -2573,20 +1879,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb674f7c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb674f940) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb674f880) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb674fb40) 0 Class QWriteLocker size=4 align=4 @@ -2598,15 +1896,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0xb674fc00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb649b0c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb649b040) 0 Class QSqlIndex size=16 align=4 @@ -2614,10 +1904,6 @@ Class QSqlIndex QSqlIndex (0xb674fe80) 0 QSqlRecord (0xb674ff80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb649b100) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -3000,23 +2286,7 @@ QSqlRelationalTableModel (0xb649b9c0) 0 QObject (0xb649bb00) 0 primary-for QAbstractItemModel (0xb649bac0) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb649bbc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb649bc40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb649bcc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb649bd40) 0 diff --git a/tests/auto/bic/data/QtSql.4.2.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtSql.4.2.0.linux-gcc-ppc32.txt index 63901fd68..39a80b768 100644 --- a/tests/auto/bic/data/QtSql.4.2.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtSql.4.2.0.linux-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x305925b0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x30592620) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x3001b9c0) 0 empty - QUintForSize<4> (0x30592770) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x30592850) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x305928c0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x3001ba40) 0 empty - QIntForSize<4> (0x30592a10) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x30592d90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30592f88) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b6038) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b60e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b6188) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b6230) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b62d8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b6380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b6428) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b64d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b6578) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b6620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b66c8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b6770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b6818) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305b68c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x305b6930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305b6e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305b6e70) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305b6ee0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305b6f50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305b6fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30651038) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306510a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30651118) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30651188) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306511f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30651268) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x306512d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30651348) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3001bb80) 0 QGenericArgument (0x30651460) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x30651620) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0x30651700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306517a8) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x30b72508) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b72850) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0x30b728f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b72b28) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0x3001bdc0) 0 QString (0x30ca6cb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30ca6d90) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0x30d9e498) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30d9e9d8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30d9e930) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0x3001be80) 0 QObject (0x30d9eea8) 0 primary-for QIODevice (0x3001be80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30d9e700) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x30eb8658) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30eb86c8) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0x30eb8f18) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30f96540) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0x30f963f0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30f96818) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30f96770) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x30f96930) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30f969d8) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x30f96ab8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30f96a48) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x30f96b28) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x30f96b98) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x30f96ce8) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x30f96dc8) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x30f96d58) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x30f96e38) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x30f96ea8) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0x30f96ee0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x310c1038) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0x310af080) 0 QTextStream (0x310c15b0) 0 primary-for QTextOStream (0x310af080) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x310c1888) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x310c18f8) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x310c1818) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310c1968) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310c19d8) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x310c1a48) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x310c1ab8) 0 Class timespec size=8 align=4 @@ -738,70 +492,18 @@ Class timeval base size=8 base align=4 timeval (0x310c1b28) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x310c1b98) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x310c1c08) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x310c1ce8) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x310c1c78) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310c1d58) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x310c1e38) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x310c1dc8) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310c1ea8) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x310c1f88) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x310c1f18) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310c13f0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x3110b000) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x3110b070) 0 Class random_data size=28 align=4 @@ -872,10 +574,6 @@ QFile (0x310af0c0) 0 QObject (0x3110b930) 0 primary-for QIODevice (0x310af100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3110bab8) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -928,50 +626,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x3110bc08) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3110bcb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3110bd20) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3110bea8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3110be00) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x3110bf50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312b60a8) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x312b6118) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x312b62d8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x312b6230) 0 Class QStringList size=4 align=4 @@ -979,30 +649,14 @@ Class QStringList QStringList (0x310af200) 0 QList (0x312b6380) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x312b67a8) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x312b6818) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x312b6b28) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312b6c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312b6ce8) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1059,10 +713,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x312b6d20) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312b6f88) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1174,15 +824,7 @@ Class QLocale base size=4 base align=4 QLocale (0x31371310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313713b8) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31371460) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1277,285 +919,65 @@ Class QUrl base size=4 base align=4 QUrl (0x31371850) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313719d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31371a48) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x31371ab8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31371c78) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31371d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31371dc8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31371e70) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31371f18) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31371fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313712a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313717e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450070) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450118) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314501c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450268) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450310) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314503b8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450460) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450508) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314505b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450658) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314507a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450850) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314508f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314509a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450a48) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450af0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450b98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450ce8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450d90) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450e38) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450ee0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31450f88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a038) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a0e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a188) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a230) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a2d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a428) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a4d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a578) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a620) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a6c8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a770) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a818) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146a968) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146aa10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146aab8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146ab60) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146ac08) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146acb0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3146ad58) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1582,45 +1004,17 @@ Class QVariant base size=16 base align=8 QVariant (0x3146adc8) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x314aa1c0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x314aa268) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x314aa428) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x314aa380) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x314aa5e8) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x314aa540) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x314aa700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x314aa818) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1652,80 +1046,48 @@ Class QPoint base size=8 base align=4 QPoint (0x314aad58) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x314aad90) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x315720a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31572498) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x315726c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31572738) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x31572888) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31572930) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x31572ab8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31572e38) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x31572310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31572d90) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x31605348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31605540) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x31605770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316058f8) 0 empty Class QLinkedListData size=20 align=4 @@ -1742,10 +1104,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x317671f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317672d8) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1762,30 +1120,18 @@ Class QDate base size=4 base align=4 QDate (0x317676c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31767888) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x317678f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31767ab8) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x31767b28) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31767c78) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1971,10 +1317,6 @@ QEventLoop (0x310af780) 0 QObject (0x3181e700) 0 primary-for QEventLoop (0x310af780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3181e8c0) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2081,20 +1423,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x318ca038) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318ca1c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x318ca230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318ca348) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2314,10 +1648,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x318caa80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318cab60) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2412,20 +1742,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x318caf88) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318ca4d0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x318ca770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318cac78) 0 empty Class QMetaProperty size=20 align=4 @@ -2437,10 +1759,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x3199a000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3199a0a8) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2497,10 +1815,6 @@ QLibrary (0x310afc00) 0 QObject (0x3199a380) 0 primary-for QLibrary (0x310afc00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3199a508) 0 Class QSemaphore size=4 align=4 @@ -2548,10 +1862,6 @@ Class QMutex base size=4 base align=4 QMutex (0x3199a7a8) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x3199a930) 0 Class QMutexLocker size=4 align=4 @@ -2563,20 +1873,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x3199a9d8) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x3199aa80) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x3199aa10) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x3199ab98) 0 Class QWriteLocker size=4 align=4 @@ -2588,15 +1890,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0x3199ac40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3199ae00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3199ad58) 0 Class QSqlIndex size=16 align=4 @@ -2604,10 +1898,6 @@ Class QSqlIndex QSqlIndex (0x310afc80) 0 QSqlRecord (0x3199ac78) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3199af50) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -2990,23 +2280,7 @@ QSqlRelationalTableModel (0x310affc0) 0 QObject (0x31a62a48) 0 primary-for QAbstractItemModel (0x31aee0c0) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b38f18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31b54658) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b6c460) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31bf1b98) 0 diff --git a/tests/auto/bic/data/QtSql.4.2.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtSql.4.2.0.macx-gcc-ia32.txt index 38716ab06..fcb466230 100644 --- a/tests/auto/bic/data/QtSql.4.2.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSql.4.2.0.macx-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x697580) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x697600) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x6977c0) 0 empty - QUintForSize<4> (0x697800) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x697900) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x697980) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x697b40) 0 empty - QIntForSize<4> (0x697b80) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x6bd080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bd2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bd380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bd440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bd500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bd5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bd680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bd740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bd800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bd8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bd980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bda40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bdb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bdbc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6bdc80) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0x6bdf80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x718080) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0x718780) 0 QBasicAtomic (0x7187c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x718a40) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xeb3780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xeb3b40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeb3fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb8040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb80c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb8140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb81c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb8240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb82c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb8340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb83c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb8440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb84c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb8540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xfb85c0) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xfb8dc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x11201c0) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x1120e00) 0 QString (0x1120e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1120f40) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x12337c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1233e00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1233c80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1233f00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1233640) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1353200) 0 QGenericArgument (0x1353240) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1353500) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1353480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1353780) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x13536c0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x1353dc0) 0 QObject (0x1353e00) 0 primary-for QIODevice (0x1353dc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1353a80) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1428680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x14288c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1428940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1428b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1428a80) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x1428c00) 0 QList (0x1428c40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x14c40c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x14c4140) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x14c4f80) 0 QObject (0x14c4540) 0 primary-for QIODevice (0x14c4fc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x155e0c0) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x155e100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x155e1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x155e240) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x155e400) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x155e340) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x155e4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x155e600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x155e680) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x155e6c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x155e980) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x155ee80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x155ef00) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x179d200) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x179d4c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -1078,35 +836,15 @@ Class rlimit base size=16 base align=4 rlimit (0x179d800) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1840700) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1840780) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x1840680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1840800) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1840880) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x1840900) 0 Class QVectorData size=16 align=4 @@ -1244,15 +982,7 @@ Class QLocale base size=4 base align=4 QLocale (0x195c800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x195c8c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x195c980) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1279,270 +1009,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x195cb80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x195cd80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x195ce40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x195cf00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x195cfc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x195c580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a540c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a543c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a546c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a549c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a54fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6e080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6e140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6e200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6e2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6e380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6e440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6e500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6e5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6e680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6e740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6e800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6e8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6e980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6ea40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6eb00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6ebc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6ec80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6ed40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6ee00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6eec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a6ef80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a89040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a89100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a891c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a89280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a89340) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1569,60 +1087,20 @@ Class QVariant base size=12 base align=4 QVariant (0x1a893c0) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a89900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a899c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1a89bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1a89b00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1a89dc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1a89d00) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1a89f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a89680) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1b26000) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b26080) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1b26100) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1700,15 +1178,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1b26940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b26b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b26b80) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1735,10 +1205,6 @@ QEventLoop (0x1b26c00) 0 QObject (0x1b26c40) 0 primary-for QEventLoop (0x1b26c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b26e40) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1783,20 +1249,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1b26540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c0d100) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1c0d180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c0d2c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1966,10 +1424,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1c0da00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c0db00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2076,20 +1530,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1cc1640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cc1700) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1cc1780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cc1840) 0 empty Class QMetaProperty size=20 align=4 @@ -2101,10 +1547,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1cc1900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cc19c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2286,10 +1728,6 @@ QLibrary (0x1d53140) 0 QObject (0x1d53180) 0 primary-for QLibrary (0x1d53140) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d53340) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2326,10 +1764,6 @@ Class QMutex base size=4 base align=4 QMutex (0x1d53680) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x1d53840) 0 Class QMutexLocker size=4 align=4 @@ -2341,20 +1775,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x1d53900) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x1d539c0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x1d53940) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x1d53b00) 0 Class QWriteLocker size=4 align=4 @@ -2412,10 +1838,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1e17400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e17500) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2427,70 +1849,42 @@ Class QDate base size=4 base align=4 QDate (0x1e17780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e17980) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e17a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e17c00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1e17c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e17e00) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1e17e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e17f40) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x1ec0240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ec06c0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1ec09c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ec0a40) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x1ec0bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ec0c80) 0 empty Class QLinkedListData size=20 align=4 @@ -2502,40 +1896,24 @@ Class QSize base size=8 base align=4 QSize (0x1fc9080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fc9480) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x1fc9840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fc9c40) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1fc9240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fc9900) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x2058100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20582c0) 0 empty Class QSharedData size=4 align=4 @@ -2568,10 +1946,6 @@ QTimeLine (0x2058780) 0 QObject (0x20587c0) 0 primary-for QTimeLine (0x2058780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2058a80) 0 Class QSqlRecord size=4 align=4 @@ -2709,15 +2083,7 @@ Class QSqlField base size=16 base align=4 QSqlField (0x21b0280) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x21b0500) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x21b0440) 0 Class QSqlIndex size=16 align=4 @@ -2975,23 +2341,7 @@ QSqlRelationalTableModel (0x21b0c80) 0 QObject (0x21b0dc0) 0 primary-for QAbstractItemModel (0x21b0d80) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22aa500) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22cd380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x231a400) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x239a3c0) 0 diff --git a/tests/auto/bic/data/QtSql.4.2.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtSql.4.2.0.macx-gcc-ppc32.txt index 0677e9026..c99f8e2a9 100644 --- a/tests/auto/bic/data/QtSql.4.2.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtSql.4.2.0.macx-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x9ca180) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x9ca200) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x9ca3c0) 0 empty - QUintForSize<4> (0x9ca400) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x9ca500) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x9ca580) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x9ca740) 0 empty - QIntForSize<4> (0x9ca780) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x9cac80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9caec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9caf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9fb040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9fb100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9fb1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9fb280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9fb340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9fb400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9fb4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9fb580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9fb640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9fb700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9fb7c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9fb880) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0x9fbb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9fbc80) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0xa78280) 0 QBasicAtomic (0xa782c0) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0xa78540) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xf1a280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xf1a640) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1aac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1ab40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1abc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1ac40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1acc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1ad40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1adc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1ae40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1aec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1af40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf1afc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x105e040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x105e0c0) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x105e8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x105ed00) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x11d8900) 0 QString (0x11d8940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11d8a40) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x1292240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1292880) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1292700) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1292bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1292b00) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1292e00) 0 QGenericArgument (0x1292e40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x13b4000) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1292800) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13b4280) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x13b41c0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x13b48c0) 0 QObject (0x13b4900) 0 primary-for QIODevice (0x13b48c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13b4b40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1483140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1483380) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1483400) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1483600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1483540) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x14836c0) 0 QList (0x1483700) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1483bc0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1483c40) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x1529f00) 0 QObject (0x1529f80) 0 primary-for QIODevice (0x1529f40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15a6000) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x15a6040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15a6100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15a6180) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x15a6340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x15a6280) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x15a6400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15a6540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15a65c0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x15a6600) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15a68c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x15a6dc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15a6e40) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x169ae00) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x181f000) 0 Class QTextStreamManipulator size=24 align=4 @@ -1088,40 +846,16 @@ Class rlimit base size=16 base align=8 rlimit (0x181fd80) 0 -Class OSReadSwapInt64(const volatile void*, uintptr_t):: - size=8 align=8 - base size=8 base align=8 -OSReadSwapInt64(const volatile void*, uintptr_t):: (0x181ff80) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x186e640) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x186e6c0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x186e5c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x186e740) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x186e7c0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x186e840) 0 Class QVectorData size=16 align=4 @@ -1259,15 +993,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1992780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1992840) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1992900) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1294,270 +1020,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1992b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1992d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1992dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1992e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1992f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1992200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1992700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a801c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a804c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a807c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a80f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9f9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9fa80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9fb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9fc00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9fcc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9fd80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9fe40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9ff00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a9ffc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab9080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab9140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab9200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab92c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1584,60 +1098,20 @@ Class QVariant base size=16 base align=4 QVariant (0x1ab9340) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab9880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab9940) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1ab9b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1ab9a80) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1ab9d40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1ab9c80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1ab9ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ab9500) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1ab9680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b57000) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1b57080) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1715,15 +1189,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1b578c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b57a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b57b00) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1750,10 +1216,6 @@ QEventLoop (0x1b57b80) 0 QObject (0x1b57bc0) 0 primary-for QEventLoop (0x1b57b80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b57dc0) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1798,20 +1260,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1b57340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c41080) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1c41100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c41240) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1981,10 +1435,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1c41980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c41a80) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1541,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1cf45c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cf4680) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1cf4700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cf47c0) 0 empty Class QMetaProperty size=20 align=4 @@ -2116,10 +1558,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1cf4880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cf4940) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2301,10 +1739,6 @@ QLibrary (0x1d89100) 0 QObject (0x1d89140) 0 primary-for QLibrary (0x1d89100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d89300) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2341,10 +1775,6 @@ Class QMutex base size=4 base align=4 QMutex (0x1d89640) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x1d89800) 0 Class QMutexLocker size=4 align=4 @@ -2356,20 +1786,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x1d898c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x1d89980) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x1d89900) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x1d89ac0) 0 Class QWriteLocker size=4 align=4 @@ -2427,10 +1849,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1e473c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e474c0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2442,70 +1860,42 @@ Class QDate base size=4 base align=4 QDate (0x1e47740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e47940) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e479c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e47bc0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1e47c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e47dc0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1e47e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e47e80) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x1ef0200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ef0680) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1ef0980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ef0a00) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x1ef0b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ef0c40) 0 empty Class QLinkedListData size=20 align=4 @@ -2517,40 +1907,24 @@ Class QSize base size=8 base align=4 QSize (0x1ff6040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ff6440) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x1ff6800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ff6c00) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1ff6180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ff6840) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x20880c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2088280) 0 empty Class QSharedData size=4 align=4 @@ -2583,10 +1957,6 @@ QTimeLine (0x2088740) 0 QObject (0x2088780) 0 primary-for QTimeLine (0x2088740) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2088a40) 0 Class QSqlRecord size=4 align=4 @@ -2724,15 +2094,7 @@ Class QSqlField base size=20 base align=4 QSqlField (0x21df240) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x21df4c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x21df400) 0 Class QSqlIndex size=16 align=4 @@ -2990,23 +2352,7 @@ QSqlRelationalTableModel (0x21dfc40) 0 QObject (0x21dfd80) 0 primary-for QAbstractItemModel (0x21dfd40) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22d84c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22fb340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23483c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23c7380) 0 diff --git a/tests/auto/bic/data/QtSql.4.2.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtSql.4.2.0.win32-gcc-ia32.txt index c26665922..8f02cebbe 100644 --- a/tests/auto/bic/data/QtSql.4.2.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSql.4.2.0.win32-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xa9db00) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xa9dc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xa9df00) 0 empty - QUintForSize<4> (0xac3000) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xac3180) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xac3240) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xac34c0) 0 empty - QIntForSize<4> (0xac3580) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xaf3380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf3b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf3d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf3e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0b900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ba80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0bc00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0bd80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0bf00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb37080) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb60f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb97380) 0 empty Class QBasicAtomic size=4 align=4 @@ -171,75 +81,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc4bb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd71780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd83e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd930c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd83980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd99e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd93780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda58c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdda300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdda600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd9f080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdeb4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdebd00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdf1080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdf1480) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xee1240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee1780) 0 Class QCharRef size=8 align=4 @@ -282,10 +132,6 @@ Class QConstString QConstString (0x11f3dc0) 0 QString (0x11f3e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1260140) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -348,10 +194,6 @@ Class QListData base size=4 base align=4 QListData (0x12d71c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13dc180) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -376,15 +218,7 @@ Class QTextCodec QTextCodec (0xee11c0) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1400480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc5d5c0) 0 Class QTextEncoder size=32 align=4 @@ -407,25 +241,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x144b300) 0 QGenericArgument (0x144b340) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1460ac0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x144b8c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1490340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1476f40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -517,10 +339,6 @@ QIODevice (0x13b5a40) 0 QObject (0x150ab40) 0 primary-for QIODevice (0x13b5a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x150ae40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -540,25 +358,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xee10c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15d9c00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x15d9f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x15f14c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x15f1380) 0 Class QStringList size=4 align=4 @@ -566,15 +372,7 @@ Class QStringList QStringList (0xee1140) 0 QList (0x15f1740) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x15f1600) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x15f15c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -703,50 +501,22 @@ QFile (0x1707080) 0 QObject (0x1707100) 0 primary-for QIODevice (0x17070c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1707940) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x175f140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x175fa80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1778ac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1778f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1778e80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x171dfc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b3c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b3880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -803,10 +573,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x16f6f80) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18520c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -880,10 +646,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x18cbb80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x18cbc80) 0 empty Class QMapData::Node size=8 align=4 @@ -908,10 +670,6 @@ Class QTextStream QTextStream (0x1b06580) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b06940) 0 Class QTextStreamManipulator size=24 align=4 @@ -948,20 +706,8 @@ QTextOStream (0x1b97740) 0 QTextStream (0x1b97780) 0 primary-for QTextOStream (0x1b97740) -Class - size=8 align=4 - base size=8 base align=4 - (0x1bcb980) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1bcbb00) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1bf18c0) 0 Class QVectorData size=16 align=4 @@ -1099,15 +845,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1e59cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ea3980) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ea3040) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1134,270 +872,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1f04400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f27840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f279c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f27b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f27cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f27e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f27fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3b140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3b2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3b440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3b5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3b740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3b8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3ba40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3bbc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3bd40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3bec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5c040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5c1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5c340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5c4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5c640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5c7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5c940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5cac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5cc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5cdc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5cf40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f790c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f79240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f793c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f79540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f796c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f79840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f799c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f79b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f79cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f79e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f79fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f98140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f982c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f98440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f985c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f98740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f988c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f98a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f98bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f98d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f98ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fba040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fba1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fba340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fba4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fba640) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1424,45 +950,17 @@ Class QVariant base size=16 base align=8 QVariant (0x1476c80) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2010e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2010fc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2040480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1fce540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x2040780) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1fce5c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1fba800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20a8100) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1540,15 +1038,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1f27180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2164440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21c2040) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1575,10 +1065,6 @@ QEventLoop (0x21c26c0) 0 QObject (0x21c2700) 0 primary-for QEventLoop (0x21c26c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21c2a00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1623,20 +1109,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x2239200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2239e80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x2239180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22662c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1806,10 +1284,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x22e97c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22e9e00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1917,20 +1391,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x143fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2388bc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x143fc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x239d1c0) 0 empty Class QMetaProperty size=20 align=4 @@ -1942,10 +1408,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x143fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x239d900) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2127,10 +1589,6 @@ QLibrary (0x245e040) 0 QObject (0x245e080) 0 primary-for QLibrary (0x245e040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x245e2c0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2172,10 +1630,6 @@ Class QMutex base size=4 base align=4 QMutex (0x24cf7c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x24fc000) 0 Class QMutexLocker size=4 align=4 @@ -2187,20 +1641,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x24fce00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x250d140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x24fcfc0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x250d900) 0 Class QWriteLocker size=4 align=4 @@ -2258,10 +1704,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2550ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25ab480) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2273,70 +1715,42 @@ Class QDate base size=4 base align=4 QDate (0x1e59b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2603640) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e59bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x262b280) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x175f040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2659040) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1f27340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2659c80) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1f27380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x267de40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1f272c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26c32c0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1f27300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26ee780) 0 empty Class QLinkedListData size=20 align=4 @@ -2348,40 +1762,24 @@ Class QSize base size=8 base align=4 QSize (0x1f27240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27dffc0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1f27280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2831500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1f271c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x28a7000) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1f27200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x292b340) 0 empty Class QSharedData size=4 align=4 @@ -2414,10 +1812,6 @@ QTimeLine (0x299f700) 0 QObject (0x299f740) 0 primary-for QTimeLine (0x299f700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x29ee200) 0 Class QSqlRecord size=4 align=4 @@ -2555,15 +1949,7 @@ Class QSqlField base size=20 base align=8 QSqlField (0x29ee940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2abc040) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2aa0f00) 0 Class QSqlIndex size=16 align=4 @@ -2821,23 +2207,7 @@ QSqlRelationalTableModel (0x2b42680) 0 QObject (0x2b427c0) 0 primary-for QAbstractItemModel (0x2b42780) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1400440) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x15f1480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d366c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1778f40) 0 diff --git a/tests/auto/bic/data/QtSql.4.3.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSql.4.3.0.linux-gcc-ia32.txt index 2bd1018bb..69eb922f5 100644 --- a/tests/auto/bic/data/QtSql.4.3.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSql.4.3.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f8fbc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f8fc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f8fcc0) 0 empty - QUintForSize<4> (0xb7f8fd00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f8fd80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f8fdc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7f8fe80) 0 empty - QIntForSize<4> (0xb7f8fec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb783c180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783c5c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb783c600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783c700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783c740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783c780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783c7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783c800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783c840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783c880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783c8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783c900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783c940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783c980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783c9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783ca00) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb783cb00) 0 QGenericArgument (0xb783cb40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb783cd00) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb783cdc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783ce40) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb73a2140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73a2180) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb73a21c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73a23c0) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb73a24c0) 0 QString (0xb73a2500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73a2540) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb73a2880) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb73a2c00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb73a2b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb73a2e40) 0 QObject (0xb73a2e80) 0 primary-for QLibrary (0xb73a2e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73a2f00) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb73a2fc0) 0 QObject (0xb73a2300) 0 primary-for QIODevice (0xb73a2fc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73a2680) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb73a2800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73a2a40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb73a2c80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6dfb000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb73a2d00) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb6dfb040) 0 QList (0xb6dfb080) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6dfb100) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6dfb140) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6dfb4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6dfb500) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb6dfba40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6dfbb00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6dfbb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6dfbc00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6dfbc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6dfbd00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb6dfbd40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6dfbdc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6dfbe00) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6dfbd80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6dfbe40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6dfbe80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6dfbec0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6dfbf00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6dfbf40) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb6dfbfc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6dfb240) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6dfb380) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6dfb8c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6dfbb80) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6dfbac0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6dfba80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6dfbbc0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6dfbcc0) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6dfbc80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d5b000) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6d5b080) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6d5b040) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d5b0c0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6d5b100) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d5b140) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb6d5b3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d5b5c0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6d5b640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d5b840) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6d5bc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d5bc40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6d5bc80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb6d5b740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d5b800) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6d5b780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d5b7c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6bdc080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdc180) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6bdc1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdc280) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6bdc2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdc300) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6bdc340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdc380) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6bdc700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdc740) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb6bdc880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6bdc900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bdc940) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6bdc980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdca40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdca80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcb00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcb80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcbc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcc00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcc80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdccc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcd00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcd40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcd80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcdc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdce00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdce40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdce80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcf00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcf40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcf80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdcfc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdc0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdc100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdc140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdc200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdc240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6bdc580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68050c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68051c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68052c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68053c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68054c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb68055c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6805600) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6805640) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb68058c0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6805900) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6805a00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6805980) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6805b00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6805a80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6805b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6805c00) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb6805c40) 0 QObject (0xb6805c80) 0 primary-for QSettings (0xb6805c40) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6805d80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6805d40) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6805dc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6805e00) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6805f00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6805f80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6805f40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6805780) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb68057c0) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb6805800) 0 QObject (0xb6805880) 0 primary-for QIODevice (0xb6805840) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6805d00) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb671d100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671d140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb671d180) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb671d240) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb671d1c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb671d280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671d300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671d380) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb671d5c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671d680) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb671d6c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671d840) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb671d900) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671da40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb671d980) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb671db80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb671db00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb671dc40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb671dd00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb671da00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb671dcc0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb671da80) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb671df40) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb653a000) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb653a080) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb653a380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb653a3c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb653a4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb653a500) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb653a540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb653a5c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb653aa40) 0 QObject (0xb653aa80) 0 primary-for QEventLoop (0xb653aa40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb653ab80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb653a880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb653a940) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb653aa00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb653ab00) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb653acc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb653ad80) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2644,10 +1934,6 @@ QTextCodecPlugin (0xb64a7000) 0 QFactoryInterface (0xb64a70c0) 8 nearly-empty primary-for QTextCodecFactoryInterface (0xb64a7080) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64a7180) 0 Class QSqlRecord size=4 align=4 @@ -2987,15 +2273,7 @@ QSqlDriver (0xb64a7a80) 0 QObject (0xb64a7ac0) 0 primary-for QSqlDriver (0xb64a7a80) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64a7c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb64a7c00) 0 Class QSqlIndex size=16 align=4 @@ -3051,18 +2329,6 @@ Class QSqlField base size=16 base align=4 QSqlField (0xb64a7dc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64a7e40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64a7ec0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64a7f40) 0 diff --git a/tests/auto/bic/data/QtSql.4.3.1.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSql.4.3.1.linux-gcc-ia32.txt index e79f2ef97..be6269048 100644 --- a/tests/auto/bic/data/QtSql.4.3.1.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSql.4.3.1.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7facbc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7facc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7faccc0) 0 empty - QUintForSize<4> (0xb7facd00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7facd80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7facdc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7face80) 0 empty - QIntForSize<4> (0xb7facec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7459180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7459240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7459280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74592c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7459300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7459340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7459380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74593c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7459400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7459440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7459480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74594c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7459500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7459540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7459580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74595c0) 0 empty Class QFlag size=4 align=4 @@ -161,10 +75,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb7459a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7459a40) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -227,70 +137,18 @@ Class QListData base size=4 base align=4 QListData (0xb7459d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7459b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7459c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7459cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7459f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7459f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7297000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7297040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7297080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72970c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7297100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7297140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7297180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72971c0) 0 Class QInternal size=1 align=1 @@ -308,10 +166,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb72972c0) 0 QGenericArgument (0xb7297300) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb72974c0) 0 Class QMetaObject size=16 align=4 @@ -328,10 +182,6 @@ Class QChar base size=2 base align=2 QChar (0xb7297580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7297600) 0 empty Class QString::Null size=1 align=1 @@ -348,10 +198,6 @@ Class QString base size=4 base align=4 QString (0xb7297640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7297840) 0 Class QLatin1String size=4 align=4 @@ -369,25 +215,13 @@ Class QConstString QConstString (0xb7297900) 0 QString (0xb7297940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7297980) 0 empty Class QStringRef size=12 align=4 base size=12 base align=4 QStringRef (0xb72979c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb7297b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb7297a80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -479,10 +313,6 @@ QIODevice (0xb7297d40) 0 QObject (0xb7297d80) 0 primary-for QIODevice (0xb7297d40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7297e40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -502,275 +332,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb7297f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7297fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7297780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb72977c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7297b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7297c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7297dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb7297ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe40c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe41c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe42c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe43c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe44c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe45c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe46c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe47c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe48c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe49c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fe4b80) 0 empty Class QMapData::Node size=8 align=4 @@ -807,45 +421,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6eb8000) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6eb8280) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6eb82c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6eb83c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6eb8340) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6eb84c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6eb8440) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6eb8540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6eb85c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -972,10 +558,6 @@ QEventLoop (0xb6eb8a40) 0 QObject (0xb6eb8a80) 0 primary-for QEventLoop (0xb6eb8a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6eb8b80) 0 Vtable for QCoreApplication QCoreApplication::_ZTV16QCoreApplication: 16u entries @@ -1009,10 +591,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb6eb8d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6eb8d80) 0 empty Vtable for QTimer QTimer::_ZTV6QTimer: 14u entries @@ -1069,20 +647,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb6eb8f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6eb8f80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb6eb8fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6eb8180) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1277,20 +847,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb6eb8b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6eb8c40) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb6eb8c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6eb8cc0) 0 empty Class QMetaProperty size=20 align=4 @@ -1302,10 +864,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb6eb8f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c3c000) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1408,100 +966,48 @@ Class QSize base size=8 base align=4 QSize (0xb6c3c300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c3c500) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6c3c580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c3c780) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb6c3c840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c3ca80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6c3cac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c3cd00) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6c3cd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c3ce40) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6c3ce80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c3cf40) 0 empty -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6c3cfc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6c3c0c0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6c3cf80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6c3c180) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6c3c240) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6c3c340) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6c3c380) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6c3c3c0) 0 Class timespec size=8 align=4 @@ -1513,80 +1019,24 @@ Class timeval base size=8 base align=4 timeval (0xb6c3c440) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6c3c480) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6c3c4c0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6c3c5c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6c3c680) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6c3c640) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6c3c600) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6c3c6c0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6c3c740) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6c3c700) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6c3c880) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6c3c900) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6c3c8c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6c3c940) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6c3c980) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6c3c9c0) 0 Class random_data size=28 align=4 @@ -1618,35 +1068,19 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6a6a000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a6a040) 0 empty Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb6a6a7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a6a800) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6a6a840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6a6a900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6a6a880) 0 Class QStringList size=4 align=4 @@ -1654,15 +1088,7 @@ Class QStringList QStringList (0xb6a6a940) 0 QList (0xb6a6a980) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6a6aa00) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6a6aa40) 0 Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1695,15 +1121,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6a6ac40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a6ac80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a6acc0) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1730,10 +1148,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6a6af00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a6af40) 0 empty Class QCryptographicHash size=4 align=4 @@ -1750,20 +1164,12 @@ Class QLine base size=16 base align=4 QLine (0xb68732c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6873300) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6873340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6873380) 0 empty Class QSharedData size=4 align=4 @@ -1775,30 +1181,18 @@ Class QDate base size=4 base align=4 QDate (0xb6873500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68735c0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6873600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68736c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6873700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68737c0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1810,20 +1204,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb6873840) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb68738c0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb6873880) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb6873940) 0 Class QWriteLocker size=4 align=4 @@ -1876,20 +1262,12 @@ Class QMutex base size=4 base align=4 QMutex (0xb6873b80) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb6873c00) 0 Class QMutexLocker size=4 align=4 base size=4 base align=4 QMutexLocker (0xb6873bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6873d00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1914,15 +1292,7 @@ Class QTextCodec QTextCodec (0xb6873c40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6873e40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6873dc0) 0 Class QTextEncoder size=32 align=4 @@ -1934,25 +1304,9 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb6873ec0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6873f40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6873f00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6873f80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6873fc0) 0 Class __gconv_trans_data size=20 align=4 @@ -1974,15 +1328,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6873640) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6873740) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6873680) 0 Class _IO_marker size=12 align=4 @@ -1994,10 +1340,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6873a40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6873cc0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -2012,10 +1354,6 @@ Class QTextStream QTextStream (0xb6873d40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb661f080) 0 Class QTextStreamManipulator size=24 align=4 @@ -2131,35 +1469,15 @@ QFile (0xb661f4c0) 0 QObject (0xb661f540) 0 primary-for QIODevice (0xb661f500) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb661f5c0) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb661f600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb661f640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb661f680) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb661f740) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb661f6c0) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -2212,15 +1530,7 @@ Class QDir base size=4 base align=4 QDir (0xb661f8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb661f940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb661f9c0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2277,10 +1587,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb661fa00) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb661fb80) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2409,15 +1715,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb661fe80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb661ff00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb661ff40) 0 empty Vtable for QDirIterator QDirIterator::_ZTV12QDirIterator: 4u entries @@ -2432,10 +1730,6 @@ Class QDirIterator QDirIterator (0xb661ff80) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb661f200) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -2541,10 +1835,6 @@ QLibrary (0xb661fd40) 0 QObject (0xb661fe40) 0 primary-for QLibrary (0xb661fd40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb661ffc0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2654,15 +1944,7 @@ Class QSqlRecord base size=4 base align=4 QSqlRecord (0xb64c4480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64c4600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb64c4580) 0 Class QSqlIndex size=16 align=4 @@ -2675,10 +1957,6 @@ Class QSqlError base size=16 base align=4 QSqlError (0xb64c4640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64c4680) 0 Vtable for QSqlResult QSqlResult::_ZTV10QSqlResult: 29u entries @@ -3051,18 +2329,6 @@ QSqlRelationalTableModel (0xb64c4f00) 0 QObject (0xb64c4100) 0 primary-for QAbstractItemModel (0xb64c4080) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64c43c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64c4540) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64c4800) 0 diff --git a/tests/auto/bic/data/QtSql.4.3.2.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSql.4.3.2.linux-gcc-ia32.txt index 85ec1d32f..c8900a950 100644 --- a/tests/auto/bic/data/QtSql.4.3.2.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSql.4.3.2.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f1dbc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f1dc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f1dcc0) 0 empty - QUintForSize<4> (0xb7f1dd00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f1dd80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f1ddc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7f1de80) 0 empty - QIntForSize<4> (0xb7f1dec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77ca180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77ca5c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb77ca600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77ca700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77ca740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77ca780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77ca7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77ca800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77ca840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77ca880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77ca8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77ca900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77ca940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77ca980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77ca9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77caa00) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb77cab00) 0 QGenericArgument (0xb77cab40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb77cad00) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb77cadc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cae40) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb7330140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7330180) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb73301c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73303c0) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb73304c0) 0 QString (0xb7330500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7330540) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb7330880) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb7330c00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb7330b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb7330e40) 0 QObject (0xb7330e80) 0 primary-for QLibrary (0xb7330e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7330f00) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb7330fc0) 0 QObject (0xb7330300) 0 primary-for QIODevice (0xb7330fc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7330680) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb7330800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7330a40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb7330c80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6d89000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb7330d00) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb6d89040) 0 QList (0xb6d89080) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6d89100) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6d89140) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6d894c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d89500) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb6d89a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d89b00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6d89b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d89c00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6d89c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d89d00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb6d89d40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6d89dc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6d89e00) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6d89d80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d89e40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d89e80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6d89ec0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d89f00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6d89f40) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb6d89fc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6d89240) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6d89380) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6d898c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6d89b80) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6d89ac0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6d89a80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d89bc0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6d89cc0) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6d89c80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6ce9000) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6ce9080) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6ce9040) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6ce90c0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6ce9100) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6ce9140) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb6ce93c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ce95c0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6ce9640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ce9840) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6ce9c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ce9c40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6ce9c80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb6ce9740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ce9800) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6ce9780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ce97c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6b6a080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b6a180) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6b6a1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b6a280) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6b6a2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b6a300) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6b6a340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b6a380) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6b6a700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b6a740) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb6b6a880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b6a900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b6a940) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6b6a980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6aa40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6aa80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6aac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6ab00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6ab40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6ab80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6abc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6ac00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6ac40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6ac80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6acc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6ad00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6ad40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6ad80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6adc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6ae00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6ae40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6ae80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6aec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6af00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6af40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6af80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6afc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6a0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6a100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6a140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6a200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6a240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b6a580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67930c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67931c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67932c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67933c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67934c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67935c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6793600) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6793640) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb67938c0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6793900) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6793a00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6793980) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6793b00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6793a80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6793b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6793c00) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb6793c40) 0 QObject (0xb6793c80) 0 primary-for QSettings (0xb6793c40) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6793d80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6793d40) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6793dc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6793e00) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6793f00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6793f80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6793f40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6793780) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb67937c0) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb6793800) 0 QObject (0xb6793880) 0 primary-for QIODevice (0xb6793840) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6793d00) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb66ab100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb66ab140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb66ab180) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb66ab240) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb66ab1c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb66ab280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb66ab300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb66ab380) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb66ab5c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb66ab680) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb66ab6c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb66ab840) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb66ab900) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb66aba40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb66ab980) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb66abb80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb66abb00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb66abc40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb66abd00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb66aba00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb66abcc0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb66aba80) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb66abf40) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb64c8000) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb64c8080) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb64c8380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64c83c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb64c84c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64c8500) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb64c8540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64c85c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb64c8a40) 0 QObject (0xb64c8a80) 0 primary-for QEventLoop (0xb64c8a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64c8b80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb64c8880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64c8940) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb64c8a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64c8b00) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb64c8cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64c8d80) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2644,10 +1934,6 @@ QTextCodecPlugin (0xb6436000) 0 QFactoryInterface (0xb64360c0) 8 nearly-empty primary-for QTextCodecFactoryInterface (0xb6436080) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6436180) 0 Class QSqlRecord size=4 align=4 @@ -2987,15 +2273,7 @@ QSqlDriver (0xb6436a80) 0 QObject (0xb6436ac0) 0 primary-for QSqlDriver (0xb6436a80) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6436c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6436c00) 0 Class QSqlIndex size=16 align=4 @@ -3051,18 +2329,6 @@ Class QSqlField base size=16 base align=4 QSqlField (0xb6436dc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6436e40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6436ec0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6436f40) 0 diff --git a/tests/auto/bic/data/QtSql.4.4.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSql.4.4.0.linux-gcc-ia32.txt index fe662bfcd..4f5248d41 100644 --- a/tests/auto/bic/data/QtSql.4.4.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSql.4.4.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb78223fc) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7822438) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7c81b40) 0 empty - QUintForSize<4> (0xb78224b0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb78225dc) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7822618) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7c81d00) 0 empty - QIntForSize<4> (0xb7822690) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7836a8c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7836c6c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7836d5c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7836e4c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7836f3c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb784b03c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb784b12c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb784b21c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb784b30c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb784b3fc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb784b4ec) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb784b5dc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb784b6cc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb784b7bc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb784b8ac) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb784b99c) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb786899c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7894654) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6b3921c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b8430c) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b845a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b84ec4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69cf7f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69db12c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69dba50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69ee384) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69eeca8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a015dc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a01f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a16834) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a24168) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a24a8c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a3c3c0) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb6a3ce4c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb689e078) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb67beb00) 0 QString (0xb68054b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68057bc) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QListData base size=4 base align=4 QListData (0xb686ae88) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb672212c) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -386,15 +228,7 @@ Class QTextCodec QTextCodec (0xb6716474) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6735780) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6735708) 0 Class QTextEncoder size=32 align=4 @@ -417,25 +251,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb6763000) 0 QGenericArgument (0xb675999c) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb6759e88) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb6759ca8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb677e000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6770f78) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -527,10 +349,6 @@ QIODevice (0xb65b4e80) 0 QObject (0xb65cb000) 0 primary-for QIODevice (0xb65b4e80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65e72d0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -550,25 +368,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb662521c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6648a14) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6648b04) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6656078) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6656000) 0 Class QStringList size=4 align=4 @@ -576,15 +382,7 @@ Class QStringList QStringList (0xb6626f80) 0 QList (0xb66560b4) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6671e10) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb668903c) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -664,10 +462,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb64af258) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb64afe4c) 0 Class QMutexLocker size=4 align=4 @@ -747,35 +541,11 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6386780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6386834) 0 empty -Class - size=8 align=4 - base size=8 base align=4 - (0xb64167bc) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb64168ac) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6416834) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6416924) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb641699c) 0 Class _IO_marker size=12 align=4 @@ -787,10 +557,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6416a14) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6416a8c) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -805,10 +571,6 @@ Class QTextStream QTextStream (0xb6416ac8) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6466258) 0 Class QTextStreamManipulator size=24 align=4 @@ -845,40 +607,16 @@ QTextOStream (0xb628c0c0) 0 QTextStream (0xb62859d8) 0 primary-for QTextOStream (0xb628c0c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6295438) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb62954b0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb62953c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6295528) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb62955a0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6295618) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6295690) 0 Class timespec size=8 align=4 @@ -890,80 +628,24 @@ Class timeval base size=8 base align=4 timeval (0xb6295708) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6295780) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb62957f8) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6295834) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6295960) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb62958e8) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb62958ac) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb62959d8) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6295ac8) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6295a50) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6295b40) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6295c30) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6295bb8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6295ce4) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6295d5c) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6295dd4) 0 Class random_data size=28 align=4 @@ -995,20 +677,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb61b4b7c) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb61cd7bc) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb61cd744) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb61cdb04) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -1028,10 +698,6 @@ Class QtConcurrent::ResultStoreBase QtConcurrent::ResultStoreBase (0xb61cdc30) 0 vptr=((& QtConcurrent::ResultStoreBase::_ZTVN12QtConcurrent15ResultStoreBaseE) + 8u) -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb61f62d0) 0 Vtable for QFutureInterfaceBase QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries @@ -1046,25 +712,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb61f6348) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb6212780) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb61f6e88) 0 - primary-for QFutureInterface (0xb6212780) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb6247618) 0 Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1093,34 +742,7 @@ QFutureWatcherBase (0xb626b6c0) 0 QObject (0xb6269ca8) 0 primary-for QFutureWatcherBase (0xb626b6c0) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb626bdc0) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb626be00) 0 - primary-for QFutureWatcher (0xb626bdc0) - QObject (0xb62817bc) 0 - primary-for QFutureWatcherBase (0xb626be00) Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1219,60 +841,14 @@ QtConcurrent::ThreadEngineBase (0xb60c72c0) 0 QRunnable (0xb60c97bc) 0 primary-for QtConcurrent::ThreadEngineBase (0xb60c72c0) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb60c9fb4) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb60c7c40) 0 - QtConcurrent::ThreadEngineStarterBase (0xb60df000) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 -4u -32 0u -36 0u -40 0u -44 0u -48 0u -52 -4u -56 0u -60 (int (*)(...))-0x000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb60c7e00) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb60c7e40) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb60df4b0) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb60c7e40) Class std::input_iterator_tag size=1 align=1 @@ -1315,225 +891,49 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb60dff00) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb60dff78) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb60fd12c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fd21c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fd294) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fd30c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fd384) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fd3fc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fd474) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fd4ec) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fd564) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fd5dc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fd654) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fd6cc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fd744) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fd7bc) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb60fd8ac) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb60fd924) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb60fd99c) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb60fdd20) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb60fdd98) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb60fde88) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb60fdf00) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb60fdf78) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb61101a4) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb61101e0) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb611021c) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6110258) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6110294) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb61102d0) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6110348) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6110384) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb61103c0) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb61103fc) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6110438) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6110474) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb6110e4c) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb6178438) 0 empty -Class std::__copy_move - size=1 align=1 - base size=0 base align=1 -std::__copy_move (0xb6178870) 0 empty -Class std::__copy_move_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_move_backward (0xb6178a8c) 0 empty -Class std::__equal - size=1 align=1 - base size=0 base align=1 -std::__equal (0xb6178e88) 0 empty -Class std::__lc_rai - size=1 align=1 - base size=0 base align=1 -std::__lc_rai (0xb5fc1000) 0 empty -Class std::__lexicographical_compare - size=1 align=1 - base size=0 base align=1 -std::__lexicographical_compare (0xb5fc1168) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5fc1870) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5fec294) 0 empty Class lconv size=56 align=4 @@ -1550,10 +950,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb5feee4c) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5feeec4) 0 Class tm size=44 align=4 @@ -1570,15 +966,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb60181a4) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb601830c) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6018294) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1590,32 +978,10 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb6018384) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb60738ac) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb6073b7c) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5e747c0) 0 empty - __gnu_cxx::new_allocator (0xb6073bb8) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb6073bf4) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5e74880) 0 empty - __gnu_cxx::new_allocator (0xb6073c30) 0 empty Vtable for __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries @@ -1631,82 +997,19 @@ Class __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind (0xb6073e4c) 0 nearly-empty vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 8u) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5f16744) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5f16780) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5f19b40) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5f167bc) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5d94438) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5db2100) 0 - std::allocator (0xb5db2140) 0 empty - __gnu_cxx::new_allocator (0xb5d944b0) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5d943c0) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5d944ec) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5db22c0) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5d94528) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5d945dc) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5db24c0) 0 - std::allocator (0xb5db2500) 0 empty - __gnu_cxx::new_allocator (0xb5d94654) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5d94564) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5d94690) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5d94744) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5db2680) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5d946cc) 0 Class std::locale size=4 align=4 @@ -1736,97 +1039,16 @@ Class std::locale::_Impl base size=20 base align=4 std::locale::_Impl (0xb5e528e8) 0 -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5e60640) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb5e64294) 0 - primary-for std::collate (0xb5e60640) -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5e60740) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb5e64384) 0 - primary-for std::collate (0xb5e60740) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5e647f8) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5e64834) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5c816c0) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5e64870) 0 empty -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5c81800) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb5c81840) 0 - primary-for std::collate_byname (0xb5c81800) - std::locale::facet (0xb5e648e8) 0 - primary-for std::collate (0xb5c81840) - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5c818c0) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb5c81900) 0 - primary-for std::collate_byname (0xb5c818c0) - std::locale::facet (0xb5e649d8) 0 - primary-for std::collate (0xb5c81900) + + + + + Vtable for std::ios_base::failure std::ios_base::failure::_ZTVNSt8ios_base7failureE: 5u entries @@ -1872,583 +1094,85 @@ Class std::ios_base std::ios_base (0xb5c96780) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5cc9e10) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5cc9ec4) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb5cc9f3c) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb5d52050) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb5d4c294) 0 - primary-for std::ctype (0xb5d52050) - std::ctype_base (0xb5d4c2d0) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb5d5a910) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb5d6ae4c) 0 - primary-for std::__ctype_abstract_base (0xb5d5a910) - std::ctype_base (0xb5d6ae88) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb5d5f800) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb5b76780) 0 - primary-for std::ctype (0xb5d5f800) - std::locale::facet (0xb5d6af78) 0 - primary-for std::__ctype_abstract_base (0xb5b76780) - std::ctype_base (0xb5d6afb4) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb5d5f9c0) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb5b7df00) 0 - primary-for std::ctype_byname (0xb5d5f9c0) - std::locale::facet (0xb5b7e2d0) 0 - primary-for std::ctype (0xb5b7df00) - std::ctype_base (0xb5b7e30c) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb5d5fa40) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb5d5fa80) 0 - primary-for std::ctype_byname (0xb5d5fa40) - std::__ctype_abstract_base (0xb5b82550) 0 - primary-for std::ctype (0xb5d5fa80) - std::locale::facet (0xb5b7e474) 0 - primary-for std::__ctype_abstract_base (0xb5b82550) - std::ctype_base (0xb5b7e4b0) 0 empty + + + + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb5b7eec4) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5b90480) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb5b8d690) 0 - primary-for std::numpunct (0xb5b90480) -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5b90540) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb5b8d780) 0 - primary-for std::numpunct (0xb5b90540) -Class __gnu_cxx::__conditional_type - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type (0xb5bc5dd4) 0 empty -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5c13a80) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb5c13ac0) 0 - primary-for std::numpunct_byname (0xb5c13a80) - std::locale::facet (0xb5c183fc) 0 - primary-for std::numpunct (0xb5c13ac0) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5c13b00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5c184ec) 0 - primary-for std::num_get > > (0xb5c13b00) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5c13b80) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5c185dc) 0 - primary-for std::num_put > > (0xb5c13b80) -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5c13c00) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb5c13c40) 0 - primary-for std::numpunct_byname (0xb5c13c00) - std::locale::facet (0xb5c186cc) 0 - primary-for std::numpunct (0xb5c13c40) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5c13cc0) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5c187bc) 0 - primary-for std::num_get > > (0xb5c13cc0) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5c13d40) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5c188ac) 0 - primary-for std::num_put > > (0xb5c13d40) -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb5c68d80) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb5c18780) 0 - primary-for std::basic_ios > (0xb5c68d80) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb5c68dc0) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb5a7d03c) 0 - primary-for std::basic_ios > (0xb5c68dc0) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5ab0a40) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb5ab0a80) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb5a7dd20) 4 - primary-for std::basic_ios > (0xb5ab0a80) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5a7df00) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5ab0bc0) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5ab0c00) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5a7df3c) 4 - primary-for std::basic_ios > (0xb5ab0c00) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5ad7000) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5af2480) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb5af24c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb5ad7564) 8 - primary-for std::basic_ios > (0xb5af24c0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5af2580) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5af25c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5ad78e8) 8 - primary-for std::basic_ios > (0xb5af25c0) - -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5ad7654) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5ad799c) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5b1e480) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5ad7fb4) 0 empty -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5b235a0) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb5b5a380 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2486,44 +1210,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5b62be0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb5b5a380) 0 - primary-for std::basic_iostream > (0xb5b62be0) - subvttidx=4u - std::basic_ios > (0xb5b5a3c0) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb5b235dc) 12 - primary-for std::basic_ios > (0xb5b5a3c0) - std::basic_ostream > (0xb5b5a400) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb5b5a3c0) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5b23870) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb5b5a700 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2561,110 +1249,21 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5b70c80) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb5b5a700) 0 - primary-for std::basic_iostream > (0xb5b70c80) - subvttidx=4u - std::basic_ios > (0xb5b5a740) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb5b238ac) 12 - primary-for std::basic_ios > (0xb5b5a740) - std::basic_ostream > (0xb5b5a780) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb5b5a740) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb598503c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5b23960) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb5b23690) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb5b23000) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb59853fc) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5985c6c) 0 -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb58a10f0) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb58a5410) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb5894a00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb58a5410) - QFutureInterfaceBase (0xb58a12d0) 0 - primary-for QFutureInterface (0xb5894a00) - QRunnable (0xb58a130c) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb5894a80) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb58a5820) 0 - primary-for QtConcurrent::RunFunctionTask (0xb5894a80) - QFutureInterface (0xb5894ac0) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb58a5820) - QFutureInterfaceBase (0xb58a14b0) 0 - primary-for QFutureInterface (0xb5894ac0) - QRunnable (0xb58a14ec) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + Class QLibraryInfo size=1 align=1 @@ -2715,50 +1314,22 @@ QFile (0xb57f7e00) 0 QObject (0xb5805834) 0 primary-for QIODevice (0xb57f7e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb58341a4) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb5834d5c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb58563fc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5856708) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5866474) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb58663fc) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb5866564) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5687ac8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5687bb8) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2833,10 +1404,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb56b8e88) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56c8f78) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2926,10 +1493,6 @@ Class QDirIterator QDirIterator (0xb56f712c) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56f7924) 0 Vtable for QFileSystemWatcher QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries @@ -3067,25 +1630,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb575e8e8) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb575e960) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb573d6cc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5764168) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57642d0) 0 Class QResource size=4 align=4 @@ -3097,275 +1648,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb5572bb8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5597000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55971e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55973c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55975a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5597780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5597960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5597b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5597d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5597f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a10f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a12d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a14b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a1690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a1870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a1a50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a1c30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a1e10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a6000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a61e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a63c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a65a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a6780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a6960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a6b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a6d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a6f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae0f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae2d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae4b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55aea50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55aec30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55aee10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b9000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b91e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b93c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b95a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b9780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b9960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b9b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b9d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b9f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bd0f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bd2d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bd4b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bd690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bd870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bda50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bdc30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bde10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c6000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c61e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c63c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3392,45 +1727,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb55c65a0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb560203c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb55f6fb4) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb560212c) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb56020b4) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb56354b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5635ac8) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5635ca8) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5635e88) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3508,15 +1815,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb5486f3c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5490e4c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54b98e8) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -3543,10 +1842,6 @@ QEventLoop (0xb548bac0) 0 QObject (0xb54c7744) 0 primary-for QEventLoop (0xb548bac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54c7d5c) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -3591,20 +1886,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb54e9870) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55103c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb55104b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5510bf4) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -3774,10 +2061,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb555ed5c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53674ec) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3889,20 +2172,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb53d012c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53d05dc) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb53d06cc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53d0b04) 0 empty Class QMetaProperty size=20 align=4 @@ -3914,10 +2189,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb53d0f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53e6258) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -4129,10 +2400,6 @@ QLibrary (0xb54267c0) 0 QObject (0xb5441bb8) 0 primary-for QLibrary (0xb54267c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5450b04) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4169,20 +2436,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb52870b4) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb5287744) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb5287438) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb5294c30) 0 Class QWriteLocker size=4 align=4 @@ -4209,10 +2468,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb52dc21c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52dcf00) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -4229,70 +2484,42 @@ Class QDate base size=4 base align=4 QDate (0xb52e8f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb531b8ac) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb531b99c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5322f78) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb532e000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5335708) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb53358e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb534d744) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb535b8e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5149834) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb515c8ac) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb515cc6c) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb517cdd4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb518a7f8) 0 empty Class QLinkedListData size=20 align=4 @@ -4304,40 +2531,24 @@ Class QSize base size=8 base align=4 QSize (0xb5216744) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5228834) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb50453c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb504e438) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb506d21c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50890f0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb50c3ce4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50e71e0) 0 empty Class QSharedData size=4 align=4 @@ -4385,20 +2596,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb4f859d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f8ef78) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4f9d0b4) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4f9d03c) 0 Class QXmlStreamAttributes size=4 align=4 @@ -4411,30 +2610,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb4f9d12c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f9db40) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb4f9dc6c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fbe834) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb4fbe960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fd08e8) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -4461,10 +2648,6 @@ Class QXmlStreamWriter base size=4 base align=4 QXmlStreamWriter (0xb50021a4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5002780) 0 Class QSqlRecord size=4 align=4 @@ -4602,15 +2785,7 @@ Class QSqlField base size=16 base align=4 QSqlField (0xb4e5fd20) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4e68d20) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4e68ca8) 0 Class QSqlIndex size=16 align=4 @@ -4868,33 +3043,9 @@ QSqlRelationalTableModel (0xb4ea27c0) 0 QObject (0xb4ec7708) 0 primary-for QAbstractItemModel (0xb4ea28c0) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4f205dc) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4f34b7c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4de9294) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb4de930c) 0 -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb4e0b12c) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4e0b258) 0 diff --git a/tests/auto/bic/data/QtSvg.4.1.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSvg.4.1.0.linux-gcc-ia32.txt index 63cd66544..9b5c58b7b 100644 --- a/tests/auto/bic/data/QtSvg.4.1.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSvg.4.1.0.linux-gcc-ia32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7f5ef00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7f5efc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7879000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7879040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7879080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78790c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7879100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7879140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7879180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78791c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7879200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7879240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7879280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78792c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7879300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7879340) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb7879380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7879480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78794c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7879500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7879540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7879580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78795c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7879600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7879640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7879680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78796c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7879700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7879740) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb7879840) 0 QGenericArgument (0xb7879880) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb7879a40) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0xb7879b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7879b80) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb7879e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7879ec0) 0 empty Class QString::Null size=1 align=1 @@ -250,10 +130,6 @@ Class QString base size=4 base align=4 QString (0xb7879f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a6b040) 0 Class QLatin1String size=4 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0xb6a6b140) 0 QString (0xb6a6b180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a6b1c0) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0xb6a6b4c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6a6b840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6a6b7c0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0xb6a6b9c0) 0 QObject (0xb6a6ba00) 0 primary-for QIODevice (0xb6a6b9c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a6bac0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6a6bc40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a6bc80) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0xb6714180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6714700) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0xb6714640) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6714840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb67147c0) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb67148c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6714900) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6714980) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6714940) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb67149c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6714a00) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6714b00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6714b80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6714b40) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6714c00) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6714c40) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0xb6714c80) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6714d40) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0xb6714f00) 0 QTextStream (0xb6714f40) 0 primary-for QTextOStream (0xb6714f00) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6714040) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6714480) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6714fc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb67146c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6714740) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6714d00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6714ec0) 0 Class timespec size=8 align=4 @@ -701,80 +485,24 @@ Class timeval base size=8 base align=4 timeval (0xb64be000) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb64be040) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb64be080) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb64be0c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb64be180) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb64be140) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb64be100) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb64be1c0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb64be240) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb64be200) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb64be280) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb64be300) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb64be2c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb64be340) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb64be380) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb64be3c0) 0 Class random_data size=28 align=4 @@ -845,10 +573,6 @@ QFile (0xb64be740) 0 QObject (0xb64be7c0) 0 primary-for QIODevice (0xb64be780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64be840) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -901,50 +625,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb64be9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64bea00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64bea40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64beb00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb64bea80) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb64beb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64beb80) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb64bebc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64bec80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb64bec00) 0 Class QStringList size=4 align=4 @@ -952,30 +648,14 @@ Class QStringList QStringList (0xb64becc0) 0 QList (0xb64bed00) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb64bed80) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb64bedc0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb64bee80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64bef00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64bef80) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1032,10 +712,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb64befc0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6492080) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1190,110 +866,30 @@ Class QUrl base size=4 base align=4 QUrl (0xb6492440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64924c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6492500) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6492540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb64925c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6492600) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6492640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6492680) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb64926c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6492700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6492740) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6492780) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb64927c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6492800) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6492840) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6492880) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb64928c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6492900) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6492940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6492980) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb64929c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6492a00) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1320,35 +916,15 @@ Class QVariant base size=12 base align=4 QVariant (0xb6492a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6492d40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6492cc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6492e40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6492dc0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6492fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6492100) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1380,80 +956,48 @@ Class QPoint base size=8 base align=4 QPoint (0xb6492bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6492c00) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6492c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6492e80) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6492f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6225000) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6225040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6225080) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0xb62250c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb62252c0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6225340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6225540) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6225600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6225700) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6225740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6225800) 0 empty Class QLinkedListData size=20 align=4 @@ -1470,10 +1014,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6225bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6225c00) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1490,40 +1030,24 @@ Class QLocale base size=4 base align=4 QLocale (0xb6225dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6225e00) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0xb6225f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6225140) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6225180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6225240) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6225280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6225100) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1683,10 +1207,6 @@ QEventLoop (0xb5ed3080) 0 QObject (0xb5ed30c0) 0 primary-for QEventLoop (0xb5ed3080) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5ed31c0) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1778,20 +1298,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb5ed3600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5ed3640) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb5ed3680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5ed3700) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2011,10 +1523,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb5ed3b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5ed3bc0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2109,20 +1617,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb5ed3e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5ed3e80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb5ed3ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5ed3f00) 0 empty Class QMetaProperty size=20 align=4 @@ -2134,10 +1634,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb5ed3f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5ed3fc0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2260,25 +1756,9 @@ Class QWriteLocker base size=4 base align=4 QWriteLocker (0xb5ed3d40) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5e1a040) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5e1a080) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5e1a0c0) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb5e1a000) 0 Class QColor size=16 align=4 @@ -2295,55 +1775,23 @@ Class QPen base size=4 base align=4 QPen (0xb5e1a280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e1a340) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0xb5e1a380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e1a3c0) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0xb5e1a400) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb5e1a540) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb5e1a4c0) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb5e1a5c0) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb5e1a600) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb5e1a640) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb5e1a580) 0 Class QGradient size=56 align=4 @@ -2373,25 +1821,13 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb5e1a800) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb5e1a940) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb5e1a8c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5e1aac0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5e1aa40) 0 Class QTextCharFormat size=8 align=4 @@ -2531,10 +1967,6 @@ QTextFrame (0xb5e1a200) 0 QObject (0xb5e1a2c0) 0 primary-for QTextObject (0xb5e1a240) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5e1a880) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -2559,25 +1991,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb5e1a9c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d60000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d60040) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb5d60080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d600c0) 0 empty Class QFontMetrics size=4 align=4 @@ -2637,20 +2057,12 @@ QTextDocument (0xb5d60280) 0 QObject (0xb5d602c0) 0 primary-for QTextDocument (0xb5d60280) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5d60380) 0 Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0xb5d603c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5d60400) 0 Class QTextTableCell size=8 align=4 @@ -2701,10 +2113,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb5d60780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d60840) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3002,15 +2410,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb5c72200) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5c72300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5c72280) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3309,15 +2709,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb5c72240) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5c72800) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5c725c0) 0 Class QTextLine size=8 align=4 @@ -3366,10 +2758,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0xb5c72ec0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb5b19040) 0 Class QTextCursor size=4 align=4 @@ -3392,15 +2780,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb5b19240) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5b19380) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5b19300) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4253,10 +3633,6 @@ QFileDialog (0xb5b19c00) 0 QPaintDevice (0xb58dc040) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb58dc100) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -4342,10 +3718,6 @@ QAbstractPrintDialog (0xb58dc140) 0 QPaintDevice (0xb58dc240) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb58dc300) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -4781,10 +4153,6 @@ QImage (0xb58dcb00) 0 QPaintDevice (0xb58dcb40) 0 primary-for QImage (0xb58dcb00) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb58dcc00) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -4891,10 +4259,6 @@ QImageIOPlugin (0xb58dcf40) 0 QFactoryInterface (0xb58dc0c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb58dcfc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb58dc2c0) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -5014,10 +4378,6 @@ Class QIcon base size=4 base align=4 QIcon (0xb583b140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb583b1c0) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -5169,15 +4529,7 @@ Class QPrintEngine QPrintEngine (0xb583b880) 0 nearly-empty vptr=((& QPrintEngine::_ZTV12QPrintEngine) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb583b980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb583b900) 0 Class QPolygon size=4 align=4 @@ -5185,15 +4537,7 @@ Class QPolygon QPolygon (0xb583b9c0) 0 QVector (0xb583ba00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb583bac0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb583ba40) 0 Class QPolygonF size=4 align=4 @@ -5206,60 +4550,20 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb583bb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb583bbc0) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0xb583bc00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb583bc80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb583bd80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb583bd00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb583be80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb583be00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb583bf80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb583bf00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb583b340) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb583b100) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5307,15 +4611,7 @@ QStyle (0xb583b4c0) 0 QObject (0xb583b600) 0 primary-for QStyle (0xb583b4c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb583b8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb583bc40) 0 Class QStylePainter size=12 align=4 @@ -5333,25 +4629,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb56140c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5614340) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb56142c0) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb56141c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5614380) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5363,15 +4647,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb5614440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5614480) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5614540) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -5406,30 +4682,18 @@ Class QPaintEngine QPaintEngine (0xb56144c0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5614640) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb56145c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5614680) 0 Class QItemSelectionRange size=8 align=4 base size=8 base align=4 QItemSelectionRange (0xb56146c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5614700) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5460,20 +4724,8 @@ QItemSelectionModel (0xb5614740) 0 QObject (0xb5614780) 0 primary-for QItemSelectionModel (0xb5614740) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5614800) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb56148c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5614840) 0 Class QItemSelection size=4 align=4 @@ -5481,10 +4733,6 @@ Class QItemSelection QItemSelection (0xb5614900) 0 QList (0xb5614940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5614a00) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -5772,10 +5020,6 @@ QAbstractSpinBox (0xb5614f80) 0 QPaintDevice (0xb5614180) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5614500) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6194,10 +5438,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb5384540) 0 QStyleOption (0xb5384580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5384700) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6224,10 +5464,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb5384980) 0 QStyleOption (0xb53849c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5384b40) 0 Class QStyleOptionButton size=64 align=4 @@ -6235,10 +5471,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb5384a80) 0 QStyleOption (0xb5384ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5384cc0) 0 Class QStyleOptionTab size=72 align=4 @@ -6253,10 +5485,6 @@ QStyleOptionTabV2 (0xb5384d40) 0 QStyleOptionTab (0xb5384d80) 0 QStyleOption (0xb5384dc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5384f40) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6283,10 +5511,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb53845c0) 0 QStyleOption (0xb53846c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5384a40) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6344,15 +5568,7 @@ QStyleOptionSpinBox (0xb52a63c0) 0 QStyleOptionComplex (0xb52a6400) 0 QStyleOption (0xb52a6440) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb52a6640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb52a65c0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6361,10 +5577,6 @@ QStyleOptionQ3ListView (0xb52a64c0) 0 QStyleOptionComplex (0xb52a6500) 0 QStyleOption (0xb52a6540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb52a6800) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6559,10 +5771,6 @@ QAbstractItemView (0xb52a6d80) 0 QPaintDevice (0xb52a6ec0) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb52a6f80) 0 Vtable for QStringListModel QStringListModel::_ZTV16QStringListModel: 42u entries @@ -6745,15 +5953,7 @@ QListView (0xb52a6240) 0 QPaintDevice (0xb52a67c0) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb52a6d40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb52a6a80) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7795,15 +6995,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb5194fc0) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb509f200) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb509f180) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7820,25 +7012,9 @@ Class QItemEditorFactory QItemEditorFactory (0xb509f100) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb509f3c0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb509f340) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb509f4c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb509f440) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8065,15 +7241,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb509fac0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb509fb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb509fb80) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -8921,15 +8089,7 @@ QActionGroup (0xb4f83e00) 0 QObject (0xb4f83e40) 0 primary-for QActionGroup (0xb4f83e00) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4f83f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4f83f00) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9070,10 +8230,6 @@ QCommonStyle (0xb4f83640) 0 QObject (0xb4f83900) 0 primary-for QStyle (0xb4f83780) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb4f83dc0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10601,10 +9757,6 @@ QDateEdit (0xb4d959c0) 0 QPaintDevice (0xb4d95b00) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d95b80) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10764,10 +9916,6 @@ QDockWidget (0xb4d95d40) 0 QPaintDevice (0xb4d95e00) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d95ec0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12441,158 +11589,34 @@ QSvgWidget (0xb4a6e700) 0 QPaintDevice (0xb4a6e7c0) 8 vptr=((& QSvgWidget::_ZTV10QSvgWidget) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4a6e880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a6e900) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4a6e980) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb4a6ea00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb4a6ea80) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb4a6eb00) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb4a6eb80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb4a6ec00) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb4a6ec80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb4a6ed00) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb4a6ed80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb4a6ee00) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb4a6ee80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4a6ef00) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb4a6ef80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4a6e000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a6e140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a6e440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4939000) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb4939140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb49391c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4939240) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb49392c0) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb4939340) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb4939400) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb49394c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4939580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4939640) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb49396c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb49397c0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb4939980) 0 diff --git a/tests/auto/bic/data/QtSvg.4.1.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtSvg.4.1.0.win32-gcc-ia32.txt index c4dac94b8..087876a8b 100644 --- a/tests/auto/bic/data/QtSvg.4.1.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSvg.4.1.0.win32-gcc-ia32.txt @@ -18,80 +18,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xad4e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaea680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaea800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaea980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeab00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeac80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeae00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeaf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07b80) 0 empty Class QFlag size=4 align=4 @@ -108,10 +48,6 @@ Class QChar base size=2 base align=2 QChar (0xb4d840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb71cc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -139,70 +75,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc34f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd4bc40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd78100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd783c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd73c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd78a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd949c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8c80) 0 Class QInternal size=1 align=1 @@ -229,10 +113,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xeac500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeac940) 0 Class QCharRef size=8 align=4 @@ -245,10 +125,6 @@ Class QConstString QConstString (0x11e1880) 0 QString (0x11e18c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11e1c00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -311,10 +187,6 @@ Class QListData base size=4 base align=4 QListData (0x1279f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x137ce40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -339,15 +211,7 @@ Class QTextCodec QTextCodec (0xeac480) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13c0140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc3da40) 0 Class QTextEncoder size=32 align=4 @@ -370,25 +234,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x13fefc0) 0 QGenericArgument (0x1404000) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1417700) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1404580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1432f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1432b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -480,10 +332,6 @@ QIODevice (0x137c700) 0 QObject (0x14bb540) 0 primary-for QIODevice (0x137c700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14bb840) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -503,25 +351,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xeac380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15884c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1588840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1588d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1588c40) 0 Class QStringList size=4 align=4 @@ -529,15 +365,7 @@ Class QStringList QStringList (0xeac400) 0 QList (0x15b6000) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1588ec0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1588e80) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -666,50 +494,22 @@ QFile (0x169c840) 0 QObject (0x169c8c0) 0 primary-for QIODevice (0x169c880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16ab100) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x16d25c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16d2f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1700e40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x172a300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x172a200) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x16d2440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1758040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x172ac00) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -766,10 +566,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x169c740) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d7340) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -843,10 +639,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x182cc40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x182cd40) 0 empty Class QMapData::Node size=8 align=4 @@ -871,10 +663,6 @@ Class QTextStream QTextStream (0x1a79240) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a79600) 0 Class QTextStreamManipulator size=24 align=4 @@ -911,20 +699,8 @@ QTextOStream (0x1b07440) 0 QTextStream (0x1b07480) 0 primary-for QTextOStream (0x1b07440) -Class - size=8 align=4 - base size=8 base align=4 - (0x1b34680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b34800) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1b535c0) 0 Class QVectorData size=16 align=4 @@ -1037,95 +813,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1cecbc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d06d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d06ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1e040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1e1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1e340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1e4c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1e640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1e7c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1e940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1eac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1ec40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1edc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d1ef40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d3b0c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d3b240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d3b3c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d3b540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d3b6c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1152,35 +856,15 @@ Class QVariant base size=16 base align=8 QVariant (0x14328c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1dd7540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d4ddc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1dd7840) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1d4de40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1d4d000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e3e280) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1258,15 +942,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1d3bf80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ed9440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f08f80) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1293,10 +969,6 @@ QEventLoop (0x1f35600) 0 QObject (0x1f35640) 0 primary-for QEventLoop (0x1f35600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f35940) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1341,20 +1013,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1f6df40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fa0b40) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1f6dec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1fa0e80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1524,10 +1188,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2010d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x204f3c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1620,20 +1280,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x13fe8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20c0900) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x13fe940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20c0f00) 0 empty Class QMetaProperty size=20 align=4 @@ -1645,10 +1297,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x13fea40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20ee640) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1941,10 +1589,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x223c640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x229b040) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1956,70 +1600,42 @@ Class QDate base size=4 base align=4 QDate (0x1d3b900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22dc900) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1d3bb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22ff540) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x16d24c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2328300) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1d3bb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2328f40) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1d3bc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2376180) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1d3b980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2397600) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1d3ba00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23c1b00) 0 empty Class QLinkedListData size=20 align=4 @@ -2031,50 +1647,30 @@ Class QLocale base size=4 base align=4 QLocale (0x1d3ba80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2510300) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1d3bc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x253e480) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1d3bd00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25639c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1d3bd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25d2440) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1d3be00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2651680) 0 empty Class QSharedData size=4 align=4 @@ -2096,10 +1692,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x1dc5c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2779c00) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2416,15 +2008,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x28a73c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x28a78c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x28a74c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -2713,15 +2297,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x294be00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2968e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x29793c0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3007,25 +2583,9 @@ Class QPaintDevice QPaintDevice (0x2721dc0) 0 vptr=((&QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a7f540) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a7f680) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2a7f780) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2a7f4c0) 0 Class QColor size=16 align=4 @@ -3037,45 +2597,17 @@ Class QBrush base size=4 base align=4 QBrush (0x1da6d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2ad7300) 0 empty Class QBrushData size=24 align=4 base size=24 base align=4 QBrushData (0x2aaab00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2aec000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2ad78c0) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2aec280) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2aec380) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2aec5c0) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2aec200) 0 Class QGradient size=64 align=8 @@ -3487,10 +3019,6 @@ QAbstractPrintDialog (0x2e19680) 0 QPaintDevice (0x2e19780) 8 vptr=((&QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2e19a40) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 70u entries @@ -3753,10 +3281,6 @@ QFileDialog (0x2e89b40) 0 QPaintDevice (0x2e89c40) 8 vptr=((&QFileDialog::_ZTV11QFileDialog) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2eae600) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 70u entries @@ -4485,10 +4009,6 @@ QImage (0x1dc5400) 0 QPaintDevice (0x3097900) 0 primary-for QImage (0x1dc5400) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3134b00) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 9u entries @@ -4537,10 +4057,6 @@ Class QIcon base size=4 base align=4 QIcon (0x1dc5200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e2bc0) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -4696,10 +4212,6 @@ QImageIOPlugin (0x321d600) 0 QFactoryInterface (0x321d6c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x321d680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x321d880) 0 Class QImageReader size=4 align=4 @@ -4877,15 +4389,7 @@ QActionGroup (0x32c7780) 0 QObject (0x330a600) 0 primary-for QActionGroup (0x32c7780) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x330afc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2ca3940) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -5194,10 +4698,6 @@ QAbstractSpinBox (0x3396ac0) 0 QPaintDevice (0x3396b80) 8 vptr=((&QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3396f00) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 68u entries @@ -5413,15 +4913,7 @@ QStyle (0x2c6f700) 0 QObject (0x345e700) 0 primary-for QStyle (0x2c6f700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x346d040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3483100) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 71u entries @@ -5692,10 +5184,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x35b0500) 0 QStyleOption (0x35b0540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x35b0ac0) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -5722,10 +5210,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x35d2ec0) 0 QStyleOption (0x35d2f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x361aac0) 0 Class QStyleOptionButton size=64 align=4 @@ -5733,10 +5217,6 @@ Class QStyleOptionButton QStyleOptionButton (0x361a8c0) 0 QStyleOption (0x361a900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3656480) 0 Class QStyleOptionTab size=72 align=4 @@ -5751,10 +5231,6 @@ QStyleOptionTabV2 (0x3656bc0) 0 QStyleOptionTab (0x3656c00) 0 QStyleOption (0x3656c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36ab440) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5781,10 +5257,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x36f72c0) 0 QStyleOption (0x36f7300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36f7e00) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5842,15 +5314,7 @@ QStyleOptionSpinBox (0x378ca00) 0 QStyleOptionComplex (0x378ca40) 0 QStyleOption (0x378ca80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x37ae200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x37ae100) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5859,10 +5323,6 @@ QStyleOptionQ3ListView (0x378cf80) 0 QStyleOptionComplex (0x378cfc0) 0 QStyleOption (0x37ae000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37aed40) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6026,10 +5486,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x38a5d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x39080c0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6060,20 +5516,8 @@ QItemSelectionModel (0x39084c0) 0 QObject (0x3908500) 0 primary-for QItemSelectionModel (0x39084c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3908840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x39313c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x39312c0) 0 Class QItemSelection size=4 align=4 @@ -6207,10 +5651,6 @@ QAbstractItemView (0x3931a40) 0 QPaintDevice (0x3931b80) 8 vptr=((&QAbstractItemView::_ZTV17QAbstractItemView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x398a5c0) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -6526,15 +5966,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3a79a80) 0 nearly-empty vptr=((&QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3a9c580) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x3a9c380) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -6679,15 +6111,7 @@ QListView (0x3a9cd40) 0 QPaintDevice (0x3a9cec0) 8 vptr=((&QListView::_ZTV9QListView) + 400u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3af5300) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3af5180) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7492,35 +6916,15 @@ QTreeView (0x3cc1500) 0 QPaintDevice (0x3cc1680) 8 vptr=((&QTreeView::_ZTV9QTreeView) + 408u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3cfe680) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x3cfe240) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x3d4f440) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x3d4f2c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3d4f640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3d4f100) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8375,15 +7779,7 @@ Class QColormap base size=4 base align=4 QColormap (0x2a673c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3ff2a00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3ff2880) 0 Class QPolygon size=4 align=4 @@ -8391,15 +7787,7 @@ Class QPolygon QPolygon (0x1dc5500) 0 QVector (0x3ff2b80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4027e00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4027cc0) 0 Class QPolygonF size=4 align=4 @@ -8412,95 +7800,39 @@ Class QMatrix base size=48 base align=8 QMatrix (0x2376140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4083bc0) 0 empty Class QTextOption size=32 align=8 base size=28 base align=8 QTextOption (0x40a6a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40a6e40) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0x1dc5d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x410d440) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x2721ec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x410d980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x41da340) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x412a580) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x41da6c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x412a640) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x421d380) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x412a780) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x421d700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x274e3c0) 0 Class QTextItem size=1 align=1 base size=0 base align=1 QTextItem (0x410d7c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42bb9c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42bbf40) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 26u entries @@ -8537,20 +7869,12 @@ Class QPaintEngine QPaintEngine (0x2a4a280) 0 vptr=((&QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42d0380) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x42bb700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42bb8c0) 0 Class QPainterPath::Element size=24 align=8 @@ -8562,25 +7886,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x2bb4100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x43ab9c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x43ab840) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x4359340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x43abb80) 0 empty Class QPainterPathStroker size=4 align=4 @@ -8682,10 +7994,6 @@ QCommonStyle (0x4472e40) 0 QObject (0x4472ec0) 0 primary-for QStyle (0x4472e80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x44a1600) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -9007,25 +8315,13 @@ Class QTextLength base size=16 base align=8 QTextLength (0x1d3bf00) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4598100) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x1d3be80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4598a80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x458cbc0) 0 Class QTextCharFormat size=8 align=4 @@ -9080,15 +8376,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x2ba1e00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x46f00c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x46d7d00) 0 Class QTextLine size=8 align=4 @@ -9138,15 +8426,7 @@ QTextDocument (0x453dec0) 0 QObject (0x471b900) 0 primary-for QTextDocument (0x453dec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x471bdc0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4785dc0) 0 Class QTextCursor size=4 align=4 @@ -9158,15 +8438,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x47992c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4799580) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4799400) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -9328,10 +8600,6 @@ QTextFrame (0x471b100) 0 QObject (0x4814340) 0 primary-for QTextObject (0x4814300) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x483c7c0) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -9356,25 +8624,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x46d7540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x489e040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x489e1c0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x47e9600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x489ec40) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -10031,10 +9287,6 @@ QDateEdit (0x4a54080) 0 QPaintDevice (0x4a541c0) 8 vptr=((&QDateEdit::_ZTV9QDateEdit) + 268u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4a12580) 0 Vtable for QDial QDial::_ZTV5QDial: 68u entries @@ -10203,10 +9455,6 @@ QDockWidget (0x4ac4200) 0 QPaintDevice (0x4ac42c0) 8 vptr=((&QDockWidget::_ZTV11QDockWidget) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4ac4780) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 67u entries @@ -12559,158 +11807,34 @@ QSvgWidget (0x51d6980) 0 QPaintDevice (0x51d6a40) 8 vptr=((&QSvgWidget::_ZTV10QSvgWidget) + 240u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13c0100) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1588d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x544d280) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3d4f600) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x3d4f3c0) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x3ff2980) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x4027d80) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x41da2c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x41da640) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x421d300) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x421d680) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x43ab940) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x4598a00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x46f0040) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4799500) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x330af80) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x3a9c500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x58a19c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x58dd7c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x58dd980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x58ddec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5906580) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x172a2c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1dd7500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5906b80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x37ae1c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3931380) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x5951300) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x59515c0) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x5951800) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x59e70c0) 0 diff --git a/tests/auto/bic/data/QtSvg.4.2.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSvg.4.2.0.linux-gcc-ia32.txt index 6079e12d4..c229400a1 100644 --- a/tests/auto/bic/data/QtSvg.4.2.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSvg.4.2.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f31d80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f31dc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f31e80) 0 empty - QUintForSize<4> (0xb7f31ec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f31f40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f31f80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7845040) 0 empty - QIntForSize<4> (0xb7845080) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7845300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78453c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7845400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7845440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7845480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78454c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7845500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7845540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7845580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78455c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7845600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7845640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7845680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78456c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7845700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7845740) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb7845780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7845880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78458c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7845900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7845940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7845980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78459c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7845a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7845a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7845a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7845ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7845b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7845b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7845b80) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb7845c40) 0 QGenericArgument (0xb7845c80) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb7845e40) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb7845f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7845f80) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6b6e280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b6e2c0) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb6b6e300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b6e480) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb6b6e580) 0 QString (0xb6b6e5c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b6e600) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0xb6b6e900) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6b6ec80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6b6ec00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0xb6b6ee00) 0 QObject (0xb6b6ee40) 0 primary-for QIODevice (0xb6b6ee00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b6ef00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6b6e7c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b6e880) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0xb6714580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6714b00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0xb6714a40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6714c40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6714bc0) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb6714cc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6714d00) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6714d80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6714d40) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6714dc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6714e00) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6714f00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6714f80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6714f40) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6714440) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6714880) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0xb6714ac0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb649d040) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0xb649d200) 0 QTextStream (0xb649d240) 0 primary-for QTextOStream (0xb649d200) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb649d300) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb649d340) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb649d2c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb649d380) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb649d3c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb649d400) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb649d440) 0 Class timespec size=8 align=4 @@ -738,80 +492,24 @@ Class timeval base size=8 base align=4 timeval (0xb649d4c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb649d500) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb649d540) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb649d580) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb649d640) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb649d600) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb649d5c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb649d680) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb649d700) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb649d6c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb649d740) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb649d7c0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb649d780) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb649d800) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb649d840) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb649d880) 0 Class random_data size=28 align=4 @@ -882,10 +580,6 @@ QFile (0xb649dd40) 0 QObject (0xb649ddc0) 0 primary-for QIODevice (0xb649dd80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb649de40) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -938,50 +632,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb649dfc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb649d000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb649d1c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb649de00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb649d280) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb649df80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb647e000) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb647e040) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb647e100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb647e080) 0 Class QStringList size=4 align=4 @@ -989,30 +655,14 @@ Class QStringList QStringList (0xb647e140) 0 QList (0xb647e180) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb647e200) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb647e240) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb647e300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb647e380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb647e400) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1069,10 +719,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb647e440) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb647e5c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1184,15 +830,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb647e880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb647e8c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb647e900) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1287,285 +925,65 @@ Class QUrl base size=4 base align=4 QUrl (0xb647ec00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb647ec80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb647ecc0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb647ed00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647edc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647ee00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647ee40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647ee80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647eec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647ef00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647ef40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647ef80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647efc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647e540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647e640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647e700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647e840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647e980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647eb00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb647ebc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f00c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f01c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f02c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f03c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f04c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f05c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f06c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f07c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f08c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb61f0900) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1592,45 +1010,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb61f0940) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb61f0b80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb61f0bc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb61f0cc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb61f0c40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb61f0dc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb61f0d40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb61f0e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61f0f00) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1662,80 +1052,48 @@ Class QPoint base size=8 base align=4 QPoint (0xb61f0b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61f0a80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb61f0e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61f0fc0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6109000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6109040) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6109080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61090c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0xb6109100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6109300) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6109380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6109580) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6109640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6109740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6109780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6109840) 0 empty Class QLinkedListData size=20 align=4 @@ -1752,10 +1110,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6109c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6109c40) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1772,30 +1126,18 @@ Class QDate base size=4 base align=4 QDate (0xb6109ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6109f80) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6109fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61091c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6109200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61092c0) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1981,10 +1323,6 @@ QEventLoop (0xb5d7f040) 0 QObject (0xb5d7f080) 0 primary-for QEventLoop (0xb5d7f040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5d7f180) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1429,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb5d7f680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d7f6c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb5d7f700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d7f780) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2324,10 +1654,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb5d7fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d7fc40) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2422,20 +1748,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb5d7fec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d7ff00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb5d7ff40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d7ff80) 0 empty Class QMetaProperty size=20 align=4 @@ -2447,10 +1765,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb5d7f000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5d7f100) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2507,10 +1821,6 @@ QLibrary (0xb5d7f440) 0 QObject (0xb5d7f500) 0 primary-for QLibrary (0xb5d7f440) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5d7f600) 0 Class QSemaphore size=4 align=4 @@ -2558,10 +1868,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb5d7fbc0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb5d7fdc0) 0 Class QMutexLocker size=4 align=4 @@ -2573,45 +1879,21 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb5d7fe80) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb5cf1040) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb5cf1000) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb5cf10c0) 0 Class QWriteLocker size=4 align=4 base size=4 base align=4 QWriteLocker (0xb5cf1080) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5cf1180) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5cf11c0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb5cf1200) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb5cf1140) 0 Class QColor size=16 align=4 @@ -2628,20 +1910,8 @@ Class QPen base size=4 base align=4 QPen (0xb5cf13c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5cf1480) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5cf1540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5cf14c0) 0 Class QPolygon size=4 align=4 @@ -2649,15 +1919,7 @@ Class QPolygon QPolygon (0xb5cf1580) 0 QVector (0xb5cf15c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5cf1680) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5cf1600) 0 Class QPolygonF size=4 align=4 @@ -2680,10 +1942,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb5cf1880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5cf18c0) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2724,10 +1982,6 @@ QImage (0xb5cf1a40) 0 QPaintDevice (0xb5cf1a80) 0 primary-for QImage (0xb5cf1a40) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5cf1bc0) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -2752,45 +2006,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb5cf1d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5cf1dc0) 0 empty Class QBrushData size=72 align=4 base size=72 base align=4 QBrushData (0xb5cf1e00) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb5cf1f40) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb5cf1ec0) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb5cf1fc0) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb5cf1240) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb5cf1280) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb5cf1f80) 0 Class QGradient size=56 align=4 @@ -2820,30 +2046,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb5cf1800) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb5cf1b00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb5cf1980) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5cf1cc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5cf1b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5cf1d00) 0 Class QTextCharFormat size=8 align=4 @@ -2983,10 +2193,6 @@ QTextFrame (0xb5acc580) 0 QObject (0xb5acc600) 0 primary-for QTextObject (0xb5acc5c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acc740) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -3011,25 +2217,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb5acc800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acc880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acc8c0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb5acc900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5acc940) 0 empty Class QFontMetrics size=4 align=4 @@ -3089,20 +2283,12 @@ QTextDocument (0xb5accb00) 0 QObject (0xb5accb40) 0 primary-for QTextDocument (0xb5accb00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5accbc0) 0 Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0xb5accc00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5accc40) 0 Class QTextTableCell size=8 align=4 @@ -3143,10 +2329,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb5acce80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5accf40) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3444,15 +2626,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb5a4ec00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5a4ed00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5a4ec80) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3751,15 +2925,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb58e3480) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb58e3600) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb58e3580) 0 Class QTextLine size=8 align=4 @@ -3808,10 +2974,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0xb58e3880) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb58e3940) 0 Class QTextCursor size=4 align=4 @@ -3834,15 +2996,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb58e3b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb58e3c80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb58e3c00) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4206,10 +3360,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb58e3f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb56ef040) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -4240,20 +3390,8 @@ QItemSelectionModel (0xb56ef080) 0 QObject (0xb56ef0c0) 0 primary-for QItemSelectionModel (0xb56ef080) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56ef140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb56ef200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb56ef180) 0 Class QItemSelection size=4 align=4 @@ -4460,20 +3598,12 @@ QAbstractSpinBox (0xb56ef680) 0 QPaintDevice (0xb56ef740) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56ef800) 0 Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0xb56ef840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb56ef900) 0 empty Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -4681,15 +3811,7 @@ QStyle (0xb56efc40) 0 QObject (0xb56efc80) 0 primary-for QStyle (0xb56efc40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56efd40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56efd80) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -4948,10 +4070,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb56efc00) 0 QStyleOption (0xb56efbc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5466080) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -4978,10 +4096,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb5466300) 0 QStyleOption (0xb5466340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54664c0) 0 Class QStyleOptionButton size=64 align=4 @@ -4989,10 +4103,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb5466400) 0 QStyleOption (0xb5466440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5466640) 0 Class QStyleOptionTab size=72 align=4 @@ -5007,10 +4117,6 @@ QStyleOptionTabV2 (0xb54666c0) 0 QStyleOptionTab (0xb5466700) 0 QStyleOption (0xb5466740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54668c0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5037,10 +4143,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb5466b00) 0 QStyleOption (0xb5466b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5466c80) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5066,10 +4168,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb5466e80) 0 QStyleOption (0xb5466ec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5466040) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -5110,15 +4208,7 @@ QStyleOptionSpinBox (0xb5466c40) 0 QStyleOptionComplex (0xb5466cc0) 0 QStyleOption (0xb5466d80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb536b100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb536b080) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5127,10 +4217,6 @@ QStyleOptionQ3ListView (0xb5466e40) 0 QStyleOptionComplex (0xb5466f00) 0 QStyleOption (0xb536b000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb536b2c0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5338,10 +4424,6 @@ QAbstractItemView (0xb536ba00) 0 QPaintDevice (0xb536bb40) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb536bc00) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -6106,10 +5188,6 @@ QMessageBox (0xb524e580) 0 QPaintDevice (0xb524e680) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb524e740) 0 Vtable for QProgressDialog QProgressDialog::_ZTV15QProgressDialog: 66u entries @@ -6360,10 +5438,6 @@ QFileDialog (0xb524ea80) 0 QPaintDevice (0xb524eb80) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb524ec40) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -6449,10 +5523,6 @@ QAbstractPrintDialog (0xb524ec80) 0 QPaintDevice (0xb524ed80) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb524ee40) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -6874,10 +5944,6 @@ QImageIOPlugin (0xb514d3c0) 0 QFactoryInterface (0xb514d480) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb514d440) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb514d500) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -7225,50 +6291,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb514d5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb514d7c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb514db80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb514da00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb50c0040) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb514de40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb50c0140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb50c00c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb50c0240) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb50c01c0) 0 Class QStylePainter size=12 align=4 @@ -7286,25 +6316,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb50c0340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb50c05c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb50c0540) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb50c0440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50c0600) 0 empty Class QPainterPathStroker size=4 align=4 @@ -7316,15 +6334,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb50c0700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50c0740) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb50c0800) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -7359,25 +6369,13 @@ Class QPaintEngine QPaintEngine (0xb50c0780) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb50c0900) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb50c0880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb50c0940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb50c0a00) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -7467,15 +6465,7 @@ QStringListModel (0xb50c0b00) 0 QObject (0xb50c0bc0) 0 primary-for QAbstractItemModel (0xb50c0b80) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb50c0d40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb50c0cc0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7718,15 +6708,7 @@ Class QStandardItem QStandardItem (0xb50c0d80) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4eb0180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4eb0100) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -8547,15 +7529,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb4eb0000) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb4eb0dc0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb4eb0ac0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8572,25 +7546,9 @@ Class QItemEditorFactory QItemEditorFactory (0xb4eb0880) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4e24100) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4e24080) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4e24200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4e24180) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8817,15 +7775,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb4e24800) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e24880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e248c0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -9778,15 +8728,7 @@ QActionGroup (0xb4d12f80) 0 QObject (0xb4d12fc0) 0 primary-for QActionGroup (0xb4d12f80) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4d12380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4d12180) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9956,10 +8898,6 @@ QCommonStyle (0xb4d12f40) 0 QObject (0xb4a69040) 0 primary-for QStyle (0xb4a69000) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb4a69200) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10481,15 +9419,7 @@ Class QGraphicsItem QGraphicsItem (0xb4a69fc0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4a69080) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4a691c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -11262,20 +10192,8 @@ QGraphicsView (0xb4953880) 0 QPaintDevice (0xb49539c0) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4953a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4953b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4953a80) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -12527,10 +11445,6 @@ QDateEdit (0xb4861080) 0 QPaintDevice (0xb48616c0) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4861840) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -12690,10 +11604,6 @@ QDockWidget (0xb4793040) 0 QPaintDevice (0xb4793100) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47931c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12851,10 +11761,6 @@ QDialogButtonBox (0xb4793340) 0 QPaintDevice (0xb4793400) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4793480) 0 Vtable for QMainWindow QMainWindow::_ZTV11QMainWindow: 64u entries @@ -13028,10 +11934,6 @@ QTextEdit (0xb4793600) 0 QPaintDevice (0xb4793740) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4793840) 0 Vtable for QProgressBar QProgressBar::_ZTV12QProgressBar: 64u entries @@ -14034,10 +12936,6 @@ QFontComboBox (0xb470d600) 0 QPaintDevice (0xb470d700) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb470d780) 0 Vtable for QToolBar QToolBar::_ZTV8QToolBar: 63u entries @@ -14611,178 +13509,38 @@ QGraphicsSvgItem (0xb445ca00) 0 QGraphicsItem (0xb445cb40) 8 vptr=((& QGraphicsSvgItem::_ZTV16QGraphicsSvgItem) + 76u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb445cc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb445ce80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb439d040) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb439d0c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb439d140) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb439d1c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb439d240) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb439d2c0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb439d340) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb439d3c0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb439d440) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb439d4c0) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb439d540) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb439d780) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb439d800) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb439d900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb439da00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb439dac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb439dbc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb439dc80) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb439dd00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb439dd80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb439de00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb439de80) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb439df00) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb439dfc0) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb439d880) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb439dec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb439df80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb40d4040) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb40d4100) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb40d41c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb40d4240) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb40d42c0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb40d4480) 0 diff --git a/tests/auto/bic/data/QtSvg.4.2.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtSvg.4.2.0.linux-gcc-ppc32.txt index f4c20dbd3..06800ad7e 100644 --- a/tests/auto/bic/data/QtSvg.4.2.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtSvg.4.2.0.linux-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x305ed3f0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x305ed460) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x3001bac0) 0 empty - QUintForSize<4> (0x305ed5b0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x305ed690) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x305ed700) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x3001bb40) 0 empty - QIntForSize<4> (0x305ed850) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x305edbd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305eddc8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305ede70) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305edf18) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305edfc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30616070) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30616118) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306161c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30616268) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30616310) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306163b8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30616460) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30616508) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306165b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30616658) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30616700) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x30616770) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30616c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30616cb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30616d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30616d90) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30616e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30616e70) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30616ee0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30616f50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30616fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312f8038) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312f80a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312f8118) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312f8188) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3001bc80) 0 QGenericArgument (0x312f82a0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x312f8460) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0x312f8540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312f85e8) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x31404348) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31404690) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0x31404738) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31404968) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0x3001bec0) 0 QString (0x31528af0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31528bd0) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0x31622268) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x316227a8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31622700) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0x3001bf80) 0 QObject (0x31622c78) 0 primary-for QIODevice (0x3001bf80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31622e70) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x3174d498) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3174d508) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0x3174dd58) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31871348) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0x318711f8) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31871620) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31871578) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x31871738) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x318717e0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x318718c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31871850) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x31871930) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x318719a0) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x31871af0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x31871bd0) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x31871b60) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x31871c40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x31871cb0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0x31871ce8) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31871f18) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0x31810180) 0 QTextStream (0x319473f0) 0 primary-for QTextOStream (0x31810180) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x319476c8) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x31947738) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x31947658) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x319477a8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31947818) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x31947888) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x319478f8) 0 Class timespec size=8 align=4 @@ -738,70 +492,18 @@ Class timeval base size=8 base align=4 timeval (0x31947968) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x319479d8) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x31947a48) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x31947b28) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x31947ab8) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x31947b98) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x31947c78) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x31947c08) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x31947ce8) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x31947dc8) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x31947d58) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31947e38) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x31947ea8) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x31947f18) 0 Class random_data size=28 align=4 @@ -872,10 +574,6 @@ QFile (0x318101c0) 0 QObject (0x319a0770) 0 primary-for QIODevice (0x31810200) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x319a08f8) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -928,50 +626,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x319a0a48) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x319a0af0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x319a0b60) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x319a0ce8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x319a0c40) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x319a0d90) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x319a0f88) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x319a0700) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31b3e118) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31b3e070) 0 Class QStringList size=4 align=4 @@ -979,30 +649,14 @@ Class QStringList QStringList (0x31810300) 0 QList (0x31b3e1c0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x31b3e5e8) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x31b3e658) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x31b3e968) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31b3ea80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31b3eb28) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1059,10 +713,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x31b3eb60) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31b3edc8) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1174,15 +824,7 @@ Class QLocale base size=4 base align=4 QLocale (0x31c0e0e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31c0e188) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31c0e230) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1277,285 +919,65 @@ Class QUrl base size=4 base align=4 QUrl (0x31c0e620) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31c0e7a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31c0e818) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x31c0e888) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c0ea48) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c0eaf0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c0eb98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c0ec40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c0ece8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c0ed90) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c0ee38) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c0eee0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c0ef88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31c0e348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd90a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9150) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd91f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd92a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd93f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9498) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd95e8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9738) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd97e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9888) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9930) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd99d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9b28) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9bd0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9c78) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9dc8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9e70) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9f18) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cd9fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf1070) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf1118) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf11c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf1268) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf1310) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf13b8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf1460) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf1508) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf15b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf1658) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf1700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf17a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf1850) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf18f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf19a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf1a48) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf1af0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31cf1b98) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1582,45 +1004,17 @@ Class QVariant base size=16 base align=8 QVariant (0x31cf1c08) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x31cf1ee0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x31d40070) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31d40230) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31d40188) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x31d403f0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x31d40348) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x31d40508) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d40620) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1652,80 +1046,48 @@ Class QPoint base size=8 base align=4 QPoint (0x31d40b60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31d40f50) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x31d40ce8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31dfd1f8) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x31dfd428) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31dfd498) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x31dfd5e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31dfd690) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x31dfd818) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31dfdb98) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x31dfde70) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31dfd8c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x31e97188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e97380) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x31e975b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31e97738) 0 empty Class QLinkedListData size=20 align=4 @@ -1742,10 +1104,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x31fef038) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31fef118) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1762,30 +1120,18 @@ Class QDate base size=4 base align=4 QDate (0x31fef508) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31fef6c8) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x31fef738) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31fef8f8) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x31fef968) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31fefab8) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1971,10 +1317,6 @@ QEventLoop (0x31810880) 0 QObject (0x320b3508) 0 primary-for QEventLoop (0x31810880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x320b36c8) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2081,20 +1423,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x320b38f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3215e000) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x3215e070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3215e188) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2314,10 +1648,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x3215e8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3215e9a0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2412,20 +1742,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x3215edc8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3215ee70) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x3215eee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3215ef88) 0 empty Class QMetaProperty size=20 align=4 @@ -2437,10 +1759,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x3215e310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3215e738) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2497,10 +1815,6 @@ QLibrary (0x31810d00) 0 QObject (0x322231c0) 0 primary-for QLibrary (0x31810d00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32223348) 0 Class QSemaphore size=4 align=4 @@ -2548,10 +1862,6 @@ Class QMutex base size=4 base align=4 QMutex (0x322235e8) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x32223770) 0 Class QMutexLocker size=4 align=4 @@ -2563,45 +1873,21 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x32223818) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x322238c0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x32223850) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x322239d8) 0 Class QWriteLocker size=4 align=4 base size=4 base align=4 QWriteLocker (0x32223968) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x32223c08) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x32223c78) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x32223ce8) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x32223b98) 0 Class QColor size=16 align=4 @@ -2618,20 +1904,8 @@ Class QPen base size=4 base align=4 QPen (0x322e6000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322e6188) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x322e6348) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x322e6268) 0 Class QPolygon size=4 align=4 @@ -2639,15 +1913,7 @@ Class QPolygon QPolygon (0x31810dc0) 0 QVector (0x322e63b8) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x322e6770) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x322e6690) 0 Class QPolygonF size=4 align=4 @@ -2670,10 +1936,6 @@ Class QMatrix base size=48 base align=8 QMatrix (0x322e6c78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x322e6ce8) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2714,10 +1976,6 @@ QImage (0x31810e80) 0 QPaintDevice (0x322e6070) 0 primary-for QImage (0x31810e80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x323bf188) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -2742,45 +2000,17 @@ Class QBrush base size=4 base align=4 QBrush (0x323bf428) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x323bf4d0) 0 empty Class QBrushData size=72 align=8 base size=72 base align=8 QBrushData (0x323bf540) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x323bf770) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x323bf690) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x323bf888) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x323bf8f8) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x323bf968) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x323bf818) 0 Class QGradient size=64 align=8 @@ -2810,30 +2040,14 @@ Class QTextLength base size=16 base align=8 QTextLength (0x323bfa48) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x323bfd90) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x323bfc40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x323bf620) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x323bf000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x323bfe38) 0 Class QTextCharFormat size=8 align=4 @@ -2973,10 +2187,6 @@ QTextFrame (0x324ba280) 0 QObject (0x324a6578) 0 primary-for QTextObject (0x324ba2c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x324a6a10) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -3001,25 +2211,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x324a6bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x324a6f50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x324a6268) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x324a6690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3255d188) 0 empty Class QFontMetrics size=4 align=4 @@ -3079,20 +2277,12 @@ QTextDocument (0x324ba300) 0 QObject (0x3255d460) 0 primary-for QTextDocument (0x324ba300) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3255d620) 0 Class QTextOption size=32 align=8 base size=28 base align=8 QTextOption (0x3255d658) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3255d738) 0 Class QTextTableCell size=8 align=4 @@ -3133,10 +2323,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x3255db98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3255dd20) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3434,15 +2620,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x32631348) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32631ab8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32631770) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3741,15 +2919,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x326f9188) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x326f9428) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x326f9348) 0 Class QTextLine size=8 align=4 @@ -3798,10 +2968,6 @@ Class QTextDocumentFragment base size=4 base align=4 QTextDocumentFragment (0x326f9850) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x326f9968) 0 Class QTextCursor size=4 align=4 @@ -3824,15 +2990,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x326f9ee0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x326f9a48) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x326f9000) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -4196,10 +3354,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x328db460) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x328db818) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -4230,20 +3384,8 @@ QItemSelectionModel (0x327e2240) 0 QObject (0x328db8c0) 0 primary-for QItemSelectionModel (0x327e2240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x328dba48) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x328dbb98) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x328dbaf0) 0 Class QItemSelection size=4 align=4 @@ -4450,20 +3592,12 @@ QAbstractSpinBox (0x327e2480) 0 QPaintDevice (0x329b7000) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x329b71f8) 0 Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0x329b7230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x329b7310) 0 empty Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -4671,15 +3805,7 @@ QStyle (0x327e26c0) 0 QObject (0x329b7770) 0 primary-for QStyle (0x327e26c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x329b7930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x329b79a0) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -4938,10 +4064,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x327e2940) 0 QStyleOption (0x329b7460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x329b7f88) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -4968,10 +4090,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x327e2a80) 0 QStyleOption (0x32ae3428) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ae3620) 0 Class QStyleOptionButton size=64 align=4 @@ -4979,10 +4097,6 @@ Class QStyleOptionButton QStyleOptionButton (0x327e2b00) 0 QStyleOption (0x32ae3540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ae3818) 0 Class QStyleOptionTab size=72 align=4 @@ -4997,10 +4111,6 @@ QStyleOptionTabV2 (0x327e2bc0) 0 QStyleOptionTab (0x327e2c00) 0 QStyleOption (0x32ae3930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ae3c08) 0 Class QStyleOptionToolBar size=68 align=4 @@ -5027,10 +4137,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x327e2d40) 0 QStyleOption (0x32ae3ea8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32ae3460) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -5056,10 +4162,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x327e2e40) 0 QStyleOption (0x32b8d0e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32b8d2d8) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -5100,15 +4202,7 @@ QStyleOptionSpinBox (0x32bc6040) 0 QStyleOptionComplex (0x32bc6080) 0 QStyleOption (0x32b8da10) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x32b8dcb0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x32b8dc08) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -5117,10 +4211,6 @@ QStyleOptionQ3ListView (0x32bc60c0) 0 QStyleOptionComplex (0x32bc6100) 0 QStyleOption (0x32b8db28) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32b8df18) 0 Class QStyleOptionToolButton size=96 align=4 @@ -5328,10 +4418,6 @@ QAbstractItemView (0x32bc64c0) 0 QPaintDevice (0x32c26460) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32c26658) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -6096,10 +5182,6 @@ QMessageBox (0x32bc6cc0) 0 QPaintDevice (0x32d0d3f0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32d0d620) 0 Vtable for QProgressDialog QProgressDialog::_ZTV15QProgressDialog: 66u entries @@ -6350,10 +5432,6 @@ QFileDialog (0x32bc6f00) 0 QPaintDevice (0x32d0da10) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32d0dc08) 0 Vtable for QAbstractPrintDialog QAbstractPrintDialog::_ZTV20QAbstractPrintDialog: 67u entries @@ -6439,10 +5517,6 @@ QAbstractPrintDialog (0x32df1000) 0 QPaintDevice (0x32d0dd90) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32d0df88) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -6864,10 +5938,6 @@ QImageIOPlugin (0x32df1480) 0 QFactoryInterface (0x32e22850) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x32df14c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32e22a48) 0 Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -7215,50 +6285,14 @@ Class QPainter base size=4 base align=4 QPainter (0x32ef1dc8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32fa30e0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32fa3268) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32fa3188) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32fa3428) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32fa3348) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32fa35e8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32fa3508) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32fa37a8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32fa36c8) 0 Class QStylePainter size=12 align=4 @@ -7276,25 +6310,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x32fa3a48) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x32fa3ee0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32fa3e00) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x32fa3c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x32fa3f88) 0 empty Class QPainterPathStroker size=4 align=4 @@ -7306,15 +6328,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x330a11c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x330a1268) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x330a13f0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -7349,25 +6363,13 @@ Class QPaintEngine QPaintEngine (0x330a12d8) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x330a15e8) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x330a1540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x330a1658) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x330a1770) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -7457,15 +6459,7 @@ QStringListModel (0x32df1900) 0 QObject (0x330a1a80) 0 primary-for QAbstractItemModel (0x32df1980) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x330a1d58) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x330a1c78) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -7708,15 +6702,7 @@ Class QStandardItem QStandardItem (0x3318a498) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3318a850) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3318a7a8) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -8537,15 +7523,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x332ed658) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x332edab8) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x332ed9a0) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8562,25 +7540,9 @@ Class QItemEditorFactory QItemEditorFactory (0x332ed8c0) 0 vptr=((& QItemEditorFactory::_ZTV18QItemEditorFactory) + 8u) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x332edea8) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x332eddc8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x332ed268) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x332edf88) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8807,15 +7769,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x333c97e0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x333c98c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x333c9930) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -9768,15 +8722,7 @@ QActionGroup (0x33538240) 0 QObject (0x33503818) 0 primary-for QActionGroup (0x33538240) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x335bf0e0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x335bf038) 0 Vtable for QSound QSound::_ZTV6QSound: 14u entries @@ -9946,10 +8892,6 @@ QCommonStyle (0x335383c0) 0 QObject (0x335bf658) 0 primary-for QStyle (0x33538400) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x335bf850) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10471,15 +9413,7 @@ Class QGraphicsItem QGraphicsItem (0x3368d460) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3368d770) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3368d7e0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -11252,20 +10186,8 @@ QGraphicsView (0x33787100) 0 QPaintDevice (0x33738e38) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33738930) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x337cf000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x33738bd0) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -12517,10 +11439,6 @@ QDateEdit (0x33787e00) 0 QPaintDevice (0x338c9f18) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x338c96c8) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -12680,10 +11598,6 @@ QDockWidget (0x33787fc0) 0 QPaintDevice (0x339a90a8) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x339a9310) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -12841,10 +11755,6 @@ QDialogButtonBox (0x339b10c0) 0 QPaintDevice (0x339a9540) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x339a9738) 0 Vtable for QMainWindow QMainWindow::_ZTV11QMainWindow: 64u entries @@ -13018,10 +11928,6 @@ QTextEdit (0x339b11c0) 0 QPaintDevice (0x339a9968) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x339a9c08) 0 Vtable for QProgressBar QProgressBar::_ZTV12QProgressBar: 64u entries @@ -14024,10 +12930,6 @@ QFontComboBox (0x339b1ac0) 0 QPaintDevice (0x33bc6118) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33bc6310) 0 Vtable for QToolBar QToolBar::_ZTV8QToolBar: 63u entries @@ -14601,178 +13503,38 @@ QGraphicsSvgItem (0x33ca4400) 0 QGraphicsItem (0x33d2fe00) 8 vptr=((& QGraphicsSvgItem::_ZTV16QGraphicsSvgItem) + 76u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33dd3700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x33dd3e38) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33deec40) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x33e3fe00) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x33e5e428) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x33e8b070) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x33e8bd20) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x33e8bfc0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x33f31f88) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x33f4e118) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x33f4e2a0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x33f4e428) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x33f4e5b0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33f86ab8) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x33f86cb0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x33fca3f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3404b2a0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3404b690) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3404ba80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34080188) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x340802a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34080428) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34080d90) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x340a7540) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x340a7738) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x340a7d58) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x340e61f8) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x340e6770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x340e68f8) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x340e69a0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x340e6d90) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x34115188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34115498) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x34115540) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x34115ea8) 0 diff --git a/tests/auto/bic/data/QtSvg.4.2.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtSvg.4.2.0.macx-gcc-ia32.txt index 068a6b886..17e749147 100644 --- a/tests/auto/bic/data/QtSvg.4.2.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSvg.4.2.0.macx-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x702cc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x702d40) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x702f00) 0 empty - QUintForSize<4> (0x702f40) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x708040) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x7080c0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x708280) 0 empty - QIntForSize<4> (0x7082c0) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x7087c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x708a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x708ac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x708b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x708c40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x708d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x708dc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x708e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x708f40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x168d000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x168d0c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x168d180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x168d240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x168d300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x168d3c0) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0x168d6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x168d7c0) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0x168dec0) 0 QBasicAtomic (0x168df00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x171a180) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0x171aec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x17ad280) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17ad700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17ad780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17ad800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17ad880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17ad900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17ad980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17ada00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17ada80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17adb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17adb80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17adc00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17adc80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17add00) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x195d4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x195d900) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x1aaa540) 0 QString (0x1aaa580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1aaa680) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x1aaaf00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b20480) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1b20300) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1b207c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1b20700) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1b20a00) 0 QGenericArgument (0x1b20a40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1b20d00) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1b20c80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1b20f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1b20ec0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x1c58500) 0 QObject (0x1c58540) 0 primary-for QIODevice (0x1c58500) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1c58780) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1c58e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c58b40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1d2b040) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1d2b240) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d2b180) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x1d2b300) 0 QList (0x1d2b340) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1d2b800) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1d2b880) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x1da4640) 0 QObject (0x1da46c0) 0 primary-for QIODevice (0x1da4680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1da4880) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1da48c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1da4980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1da4a00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1da4bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1da4b00) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1da4c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1da4dc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1da4e40) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1da4e80) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ec8040) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1ec8540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ec85c0) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x1f2a9c0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f2ac80) 0 Class QTextStreamManipulator size=24 align=4 @@ -1078,35 +836,15 @@ Class rlimit base size=16 base align=4 rlimit (0x20c3700) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x20c3e80) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x20c3f00) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x20c3e00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x20c3f80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x20c31c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x20f4040) 0 Class QVectorData size=16 align=4 @@ -1244,15 +982,7 @@ Class QLocale base size=4 base align=4 QLocale (0x20f4f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20f49c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x20f4ec0) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1279,270 +1009,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x22ca1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ca3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ca480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ca540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ca600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ca6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ca780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ca840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ca900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ca9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22caa80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22cab40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22cac00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22cacc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22cad80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22cae40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22caf00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22cafc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ff040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ff100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ff1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ff280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ff340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ff400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ff4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ff580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ff640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ff700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ff7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ff880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ff940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ffa00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ffac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ffb80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ffc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ffd00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ffdc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22ffe80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fff40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231a9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231aa80) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1569,60 +1087,20 @@ Class QVariant base size=12 base align=4 QVariant (0x231ab00) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x231ad40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x2372000) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2372200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2372140) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x2372400) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x2372340) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x2372580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23726c0) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x2372780) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2372800) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x2372880) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1700,15 +1178,7 @@ Class QUrl base size=4 base align=4 QUrl (0x2372cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2427180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2427200) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1735,10 +1205,6 @@ QEventLoop (0x2427280) 0 QObject (0x24272c0) 0 primary-for QEventLoop (0x2427280) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x24274c0) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1783,20 +1249,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x2427700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24278c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x2427940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2427a80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1966,10 +1424,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x252b040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x252b140) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2076,20 +1530,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x252be80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x252bf40) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x252bfc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x252b5c0) 0 empty Class QMetaProperty size=20 align=4 @@ -2101,10 +1547,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x252ba00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2599000) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2286,10 +1728,6 @@ QLibrary (0x25999c0) 0 QObject (0x2599a00) 0 primary-for QLibrary (0x25999c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2599bc0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2326,10 +1764,6 @@ Class QMutex base size=4 base align=4 QMutex (0x2599f00) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x2599640) 0 Class QMutexLocker size=4 align=4 @@ -2341,20 +1775,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x2599b00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x265c040) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x2599d00) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x265c180) 0 Class QWriteLocker size=4 align=4 @@ -2412,10 +1838,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x265cb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x265cc80) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2427,70 +1849,42 @@ Class QDate base size=4 base align=4 QDate (0x265cf00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2721040) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x27210c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27212c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x2721340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27214c0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x2721540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27219c0) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x2721c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2721400) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x2721e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2721f40) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x27aa100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27aa1c0) 0 empty Class QLinkedListData size=20 align=4 @@ -2502,40 +1896,24 @@ Class QSize base size=8 base align=4 QSize (0x27aa800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27aac00) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x27aafc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x289f000) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x289f480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x289f640) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x289f8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x289fa80) 0 empty Class QSharedData size=4 align=4 @@ -2583,10 +1961,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x29da380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x29da540) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2625,15 +1999,7 @@ Class QMacMime QMacMime (0x29da740) 0 vptr=((& QMacMime::_ZTV8QMacMime) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x29daa80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x29da9c0) 0 Vtable for QMacPasteboardMime QMacPasteboardMime::_ZTV18QMacPasteboardMime: 10u entries @@ -2934,15 +2300,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0x2adb380) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2adb540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2adb480) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3231,15 +2589,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2b31f40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b313c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b316c0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3628,40 +2978,16 @@ Class QPaintDevice QPaintDevice (0x2bd76c0) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2bd7a00) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2bd7a80) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2bd7b00) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2bd7980) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0x2bd7900) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2bd7f40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2bd7e40) 0 Class QPolygon size=4 align=4 @@ -3669,15 +2995,7 @@ Class QPolygon QPolygon (0x2bd7fc0) 0 QVector (0x2bd7180) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2c612c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2c611c0) 0 Class QPolygonF size=4 align=4 @@ -3690,10 +3008,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0x2c61680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2c61700) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3718,10 +3032,6 @@ QImage (0x2c61900) 0 QPaintDevice (0x2c61940) 0 primary-for QImage (0x2c61900) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2c61d00) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -3746,45 +3056,17 @@ Class QBrush base size=4 base align=4 QBrush (0x2c61fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d5c080) 0 empty Class QBrushData size=72 align=4 base size=72 base align=4 QBrushData (0x2d5c100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2d5c380) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2d5c280) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0x2d5c4c0) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0x2d5c540) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0x2d5c5c0) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0x2d5c440) 0 Class QGradient size=56 align=4 @@ -4180,10 +3462,6 @@ QAbstractPrintDialog (0x2f6d280) 0 QPaintDevice (0x2f6d340) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2f6d5c0) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -4434,10 +3712,6 @@ QFileDialog (0x2f6db00) 0 QPaintDevice (0x2f6dbc0) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2f6de80) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4844,10 +4118,6 @@ QMessageBox (0x3018800) 0 QPaintDevice (0x30188c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3018b40) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 67u entries @@ -5202,25 +4472,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x3111480) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x31119c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x31118c0) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x31116c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3111a80) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5275,15 +4533,7 @@ Class QGraphicsItem QGraphicsItem (0x3111e00) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3111f80) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31c2040) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -5872,10 +5122,6 @@ Class QPen base size=4 base align=4 QPen (0x323bbc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x323bd40) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -6044,60 +5290,20 @@ Class QTextOption base size=24 base align=4 QTextOption (0x32a4a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32a4b00) 0 Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x32a4b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32a4600) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33650c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x32a4c80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33652c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33651c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33654c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33653c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3365680) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3365580) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 65u entries @@ -6352,20 +5558,8 @@ QGraphicsView (0x3365c40) 0 QPaintDevice (0x3365d40) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3365f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3486000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3365880) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 7u entries @@ -6392,10 +5586,6 @@ Class QIcon base size=4 base align=4 QIcon (0x3486580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34866c0) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -6551,10 +5741,6 @@ QImageIOPlugin (0x351ec80) 0 QFactoryInterface (0x3486c00) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x34869c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3526180) 0 Class QImageReader size=4 align=4 @@ -6730,15 +5916,7 @@ QActionGroup (0x3526e00) 0 QObject (0x3526e40) 0 primary-for QActionGroup (0x3526e00) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x35264c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3526040) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -7043,10 +6221,6 @@ QAbstractSpinBox (0x361cc00) 0 QPaintDevice (0x361cc80) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x361cf00) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -7254,15 +6428,7 @@ QStyle (0x36c4240) 0 QObject (0x36c4280) 0 primary-for QStyle (0x36c4240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36c44c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36c4540) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -7521,10 +6687,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x36c4e40) 0 QStyleOption (0x36c4e80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36c4940) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -7551,10 +6713,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x37c9480) 0 QStyleOption (0x37c94c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37c9780) 0 Class QStyleOptionButton size=64 align=4 @@ -7562,10 +6720,6 @@ Class QStyleOptionButton QStyleOptionButton (0x37c9640) 0 QStyleOption (0x37c9680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37c9a40) 0 Class QStyleOptionTab size=72 align=4 @@ -7580,10 +6734,6 @@ QStyleOptionTabV2 (0x37c9b80) 0 QStyleOptionTab (0x37c9bc0) 0 QStyleOption (0x37c9c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37c9f80) 0 Class QStyleOptionToolBar size=68 align=4 @@ -7610,10 +6760,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x38640c0) 0 QStyleOption (0x3864100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3864380) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -7639,10 +6785,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x38647c0) 0 QStyleOption (0x3864800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3864ac0) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -7683,15 +6825,7 @@ QStyleOptionSpinBox (0x38e4180) 0 QStyleOptionComplex (0x38e41c0) 0 QStyleOption (0x38e4200) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x38e4580) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x38e44c0) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -7700,10 +6834,6 @@ QStyleOptionQ3ListView (0x38e4340) 0 QStyleOptionComplex (0x38e4380) 0 QStyleOption (0x38e43c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x38e4900) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7794,10 +6924,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x39622c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3962700) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -7828,20 +6954,8 @@ QItemSelectionModel (0x39627c0) 0 QObject (0x3962800) 0 primary-for QItemSelectionModel (0x39627c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x39629c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3962b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3962a80) 0 Class QItemSelection size=4 align=4 @@ -7971,10 +7085,6 @@ QAbstractItemView (0x3962d00) 0 QPaintDevice (0x3962e00) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3962f40) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -8312,15 +7422,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3a41bc0) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3a41b40) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x3a41140) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8461,15 +7563,7 @@ QListView (0x3aed180) 0 QPaintDevice (0x3aed2c0) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3aed6c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3aed5c0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -8762,15 +7856,7 @@ Class QStandardItem QStandardItem (0x3ba5180) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3ba55c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3ba5500) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -9288,35 +8374,15 @@ QTreeView (0x3cee240) 0 QPaintDevice (0x3cee380) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3cee640) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x3cee540) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x3ceeac0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x3cee9c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3ceec80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3ceebc0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -10197,15 +9263,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x3efca80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3efcb40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3efcd00) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -10240,20 +9298,12 @@ Class QPaintEngine QPaintEngine (0x3efcbc0) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3efcf40) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x3efce80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3efcfc0) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7u entries @@ -10346,10 +9396,6 @@ QCommonStyle (0x3ff6440) 0 QObject (0x3ff64c0) 0 primary-for QStyle (0x3ff6480) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x3ff67c0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10723,30 +9769,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0x408d6c0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x408da80) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x408d900) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x408de40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x408dd40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x408df40) 0 Class QTextCharFormat size=8 align=4 @@ -10801,15 +9831,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x4168280) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4168580) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4168480) 0 Class QTextLine size=8 align=4 @@ -10859,15 +9881,7 @@ QTextDocument (0x4168880) 0 QObject (0x41688c0) 0 primary-for QTextDocument (0x4168880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4168ac0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4168c00) 0 Class QTextCursor size=4 align=4 @@ -10879,15 +9893,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x4168d40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4168f80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4168e80) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -11049,10 +10055,6 @@ QTextFrame (0x4253780) 0 QObject (0x4253800) 0 primary-for QTextObject (0x42537c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4253d40) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -11077,25 +10079,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x4253f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42c2280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42c2340) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x42c2400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42c2600) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -12057,10 +11047,6 @@ QDateEdit (0x43eee00) 0 QPaintDevice (0x43eef00) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x43eed00) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12221,10 +11207,6 @@ QDialogButtonBox (0x44bc240) 0 QPaintDevice (0x44bc2c0) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44bc500) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -12304,10 +11286,6 @@ QDockWidget (0x44bc540) 0 QPaintDevice (0x44bc5c0) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44bc880) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12469,10 +11447,6 @@ QFontComboBox (0x44bcb00) 0 QPaintDevice (0x44bcbc0) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44bce00) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -14041,10 +13015,6 @@ QTextEdit (0x475e9c0) 0 QPaintDevice (0x475eac0) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x475ee00) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -14634,188 +13604,40 @@ QSvgWidget (0x49ba980) 0 QPaintDevice (0x49baa00) 8 vptr=((& QSvgWidget::_ZTV10QSvgWidget) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4a7c280) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4aa6100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4af6180) 0 empty -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x4b38600) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4b38d00) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0x4b8f400) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4bad900) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4badac0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4badc80) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4bade40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4ca43c0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x4ca4600) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4cc3c40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4cc3f40) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4ce75c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4d07900) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x4dbf680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4dbf600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4de7240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4de77c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4de7b40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4de7fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e036c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e03bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e03e40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e03f00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e27180) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x4e27300) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x4e27a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e6b040) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e6b100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e6b580) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e6b640) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e6ba00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e6bd40) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x4e8e080) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x4e8ef00) 0 diff --git a/tests/auto/bic/data/QtSvg.4.2.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtSvg.4.2.0.macx-gcc-ppc32.txt index 8cbc11236..4e180e518 100644 --- a/tests/auto/bic/data/QtSvg.4.2.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtSvg.4.2.0.macx-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xa378c0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xa37940) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xa37b00) 0 empty - QUintForSize<4> (0xa37b40) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xa37c40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xa37cc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xa37e80) 0 empty - QIntForSize<4> (0xa37ec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xa453c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa45600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa456c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa45780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa45840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa45900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa459c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa45a80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa45b40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa45c00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa45cc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa45d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa45e40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa45f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa45fc0) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0xa7f2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa7f3c0) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0xa7f9c0) 0 QBasicAtomic (0xa7fa00) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0xa7fc80) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0x17709c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1770d80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1872200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1872280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1872300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1872380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1872400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1872480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1872500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1872580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1872600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1872680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1872700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1872780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1872800) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x1872ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19e8400) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x1aee040) 0 QString (0x1aee080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1aee180) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x1aeea00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1aee640) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1aeeec0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1c0c240) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1c0c180) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1c0c480) 0 QGenericArgument (0x1c0c4c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1c0c780) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1c0c700) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1c0ca00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1c0c940) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x1c0cb80) 0 QObject (0x1c0cd00) 0 primary-for QIODevice (0x1c0cb80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1cd1200) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1cd1900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cd1b40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1cd1bc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1cd1dc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1cd1d00) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x1cd1e80) 0 QList (0x1cd1ec0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1d8b300) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1d8b380) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x1e09540) 0 QObject (0x1e095c0) 0 primary-for QIODevice (0x1e09580) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e09780) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1e097c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e09880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e09900) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1e09ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1e09a00) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1e09b80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e09cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e09d40) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1e09d80) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e09f80) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1f094c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f09540) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x1fe0500) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1fe07c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -1088,40 +846,16 @@ Class rlimit base size=16 base align=8 rlimit (0x20fc440) 0 -Class OSReadSwapInt64(const volatile void*, uintptr_t):: - size=8 align=8 - base size=8 base align=8 -OSReadSwapInt64(const volatile void*, uintptr_t):: (0x20fc640) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x20fcd80) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x20fce00) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x20fcd00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x20fce80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x20fcf00) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x20fcf80) 0 Class QVectorData size=16 align=4 @@ -1259,15 +993,7 @@ Class QLocale base size=4 base align=4 QLocale (0x2131ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2131f80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2131ac0) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1294,270 +1020,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x22fc140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fc340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fc400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fc4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fc580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fc640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fc700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fc7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fc880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fc940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fca00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fcac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fcb80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fcc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fcd00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fcdc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fce80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fcf40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x22fc080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232f080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232f140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232f200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232f2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232f380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232f440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232f500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232f5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232f680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232f740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232f800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232f8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232f980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232fa40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232fb00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232fbc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232fc80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232fd40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232fe00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232fec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x232ff80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234b040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234b100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234b1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234b280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234b340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234b400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234b4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234b580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234b640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234b700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234b7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234b880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234b940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234ba00) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1584,60 +1098,20 @@ Class QVariant base size=16 base align=4 QVariant (0x234ba80) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234bfc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x234bd40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x23a3180) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x23a30c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x23a3380) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x23a32c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x23a3500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23a3640) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x23a3700) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x23a3780) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x23a3800) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1715,15 +1189,7 @@ Class QUrl base size=4 base align=4 QUrl (0x23a3ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x245e100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x245e180) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1750,10 +1216,6 @@ QEventLoop (0x245e200) 0 QObject (0x245e240) 0 primary-for QEventLoop (0x245e200) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x245e440) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1798,20 +1260,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x245e680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x245e840) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x245e8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x245ea00) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1981,10 +1435,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x245ee80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25680c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1541,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x2568e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2568ec0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x2568f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2568240) 0 empty Class QMetaProperty size=20 align=4 @@ -2116,10 +1558,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x25686c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2568a00) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2301,10 +1739,6 @@ QLibrary (0x25cb980) 0 QObject (0x25cb9c0) 0 primary-for QLibrary (0x25cb980) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x25cbb80) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2341,10 +1775,6 @@ Class QMutex base size=4 base align=4 QMutex (0x25cbec0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x25cb440) 0 Class QMutexLocker size=4 align=4 @@ -2356,20 +1786,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x25cb900) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x268d000) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x25cbac0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x268d140) 0 Class QWriteLocker size=4 align=4 @@ -2427,10 +1849,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x268db40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x268dc40) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2442,70 +1860,42 @@ Class QDate base size=4 base align=4 QDate (0x268dec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x274f000) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x274f080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x274f280) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x274f300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x274f480) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x274f500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x274f980) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x274fc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x274f340) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x274fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x274fe80) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x27d90c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27d9180) 0 empty Class QLinkedListData size=20 align=4 @@ -2517,40 +1907,24 @@ Class QSize base size=8 base align=4 QSize (0x27d97c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27d9bc0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x27d9f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27d9fc0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x28cd440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x28cd600) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x28cd880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x28cda40) 0 empty Class QSharedData size=4 align=4 @@ -2598,10 +1972,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x2a1b340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a1b500) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2640,15 +2010,7 @@ Class QMacMime QMacMime (0x2a1b700) 0 vptr=((& QMacMime::_ZTV8QMacMime) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2a1ba40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2a1b980) 0 Vtable for QMacPasteboardMime QMacPasteboardMime::_ZTV18QMacPasteboardMime: 10u entries @@ -2949,15 +2311,7 @@ Class QInputMethodEvent::Attribute base size=28 base align=4 QInputMethodEvent::Attribute (0x2b0a380) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2b0a540) 0 - -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2b0a480) 0 + Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3246,15 +2600,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2b5ff40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b5f3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2b5f6c0) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3643,40 +2989,16 @@ Class QPaintDevice QPaintDevice (0x2c066c0) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2c06a00) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2c06a80) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2c06b00) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2c06980) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0x2c06900) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2c06f40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2c06e40) 0 Class QPolygon size=4 align=4 @@ -3684,15 +3006,7 @@ Class QPolygon QPolygon (0x2c06fc0) 0 QVector (0x2c06180) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2c8f2c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2c8f1c0) 0 Class QPolygonF size=4 align=4 @@ -3705,10 +3019,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0x2c8f680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2c8f700) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3733,10 +3043,6 @@ QImage (0x2c8f900) 0 QPaintDevice (0x2c8f940) 0 primary-for QImage (0x2c8f900) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2c8fd00) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -3761,45 +3067,17 @@ Class QBrush base size=4 base align=4 QBrush (0x2c8ffc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2d81080) 0 empty Class QBrushData size=72 align=4 base size=72 base align=4 QBrushData (0x2d81100) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2d81380) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2d81280) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2d814c0) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2d81540) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2d815c0) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2d81440) 0 Class QGradient size=56 align=4 @@ -4195,10 +3473,6 @@ QAbstractPrintDialog (0x2f91280) 0 QPaintDevice (0x2f91340) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2f915c0) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -4449,10 +3723,6 @@ QFileDialog (0x2f91b00) 0 QPaintDevice (0x2f91bc0) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2f91e80) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -4859,10 +4129,6 @@ QMessageBox (0x3048800) 0 QPaintDevice (0x30488c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3048b40) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 67u entries @@ -5217,25 +4483,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x313e480) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x313e9c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x313e8c0) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x313e6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313ea80) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5290,15 +4544,7 @@ Class QGraphicsItem QGraphicsItem (0x313ee00) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313ef80) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31ed040) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -5887,10 +5133,6 @@ Class QPen base size=4 base align=4 QPen (0x3266bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3266d40) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -6059,60 +5301,20 @@ Class QTextOption base size=24 base align=4 QTextOption (0x32d0a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32d0b00) 0 Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x32d0b80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x32d07c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3391100) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3391000) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3391300) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3391200) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3391500) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3391400) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x33916c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x33915c0) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 65u entries @@ -6367,20 +5569,8 @@ QGraphicsView (0x3391c80) 0 QPaintDevice (0x3391d80) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3391fc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x34b1040) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3391b80) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 7u entries @@ -6407,10 +5597,6 @@ Class QIcon base size=4 base align=4 QIcon (0x34b15c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x34b1700) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -6566,10 +5752,6 @@ QImageIOPlugin (0x3549b80) 0 QFactoryInterface (0x34b1e40) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x34b1c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x35511c0) 0 Class QImageReader size=4 align=4 @@ -6745,15 +5927,7 @@ QActionGroup (0x3551e40) 0 QObject (0x3551e80) 0 primary-for QActionGroup (0x3551e40) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3551600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3551380) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -7058,10 +6232,6 @@ QAbstractSpinBox (0x3647c40) 0 QPaintDevice (0x3647cc0) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3647f40) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -7269,15 +6439,7 @@ QStyle (0x36ef280) 0 QObject (0x36ef2c0) 0 primary-for QStyle (0x36ef280) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36ef500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36ef580) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -7536,10 +6698,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x36efe80) 0 QStyleOption (0x36efec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x36efbc0) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -7566,10 +6724,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x37f14c0) 0 QStyleOption (0x37f1500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37f17c0) 0 Class QStyleOptionButton size=64 align=4 @@ -7577,10 +6731,6 @@ Class QStyleOptionButton QStyleOptionButton (0x37f1680) 0 QStyleOption (0x37f16c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37f1a80) 0 Class QStyleOptionTab size=72 align=4 @@ -7595,10 +6745,6 @@ QStyleOptionTabV2 (0x37f1bc0) 0 QStyleOptionTab (0x37f1c00) 0 QStyleOption (0x37f1c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x37f1fc0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -7625,10 +6771,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x388d100) 0 QStyleOption (0x388d140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x388d3c0) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -7654,10 +6796,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x388d800) 0 QStyleOption (0x388d840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x388db00) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -7698,15 +6836,7 @@ QStyleOptionSpinBox (0x390d200) 0 QStyleOptionComplex (0x390d240) 0 QStyleOption (0x390d280) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x390d600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x390d540) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -7715,10 +6845,6 @@ QStyleOptionQ3ListView (0x390d3c0) 0 QStyleOptionComplex (0x390d400) 0 QStyleOption (0x390d440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x390d980) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7809,10 +6935,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x398b340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x398b780) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -7843,20 +6965,8 @@ QItemSelectionModel (0x398b840) 0 QObject (0x398b880) 0 primary-for QItemSelectionModel (0x398b840) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x398ba40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x398bbc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x398bb00) 0 Class QItemSelection size=4 align=4 @@ -7986,10 +7096,6 @@ QAbstractItemView (0x398bd80) 0 QPaintDevice (0x398be80) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3a59000) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -8327,15 +7433,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x3a59c00) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x3a59d00) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x3a59300) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8476,15 +7574,7 @@ QListView (0x3b0f1c0) 0 QPaintDevice (0x3b0f300) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3b0f700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x3b0f600) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -8777,15 +7867,7 @@ Class QStandardItem QStandardItem (0x3bce1c0) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3bce600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3bce540) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -9303,35 +8385,15 @@ QTreeView (0x3d0c280) 0 QPaintDevice (0x3d0c3c0) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3d0c680) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x3d0c580) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x3d0cb00) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x3d0ca00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3d0ccc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3d0cc00) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -10212,15 +9274,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x3f24ac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3f24b80) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f24d40) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -10255,20 +9309,12 @@ Class QPaintEngine QPaintEngine (0x3f24c00) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f24180) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x3f24f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f24480) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7u entries @@ -10361,10 +9407,6 @@ QCommonStyle (0x400f540) 0 QObject (0x400f5c0) 0 primary-for QStyle (0x400f580) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x400f8c0) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10738,30 +9780,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0x40ac7c0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x40acb80) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x40aca00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x40acf40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x40ace40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac240) 0 Class QTextCharFormat size=8 align=4 @@ -10816,15 +9842,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x4189340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4189640) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4189540) 0 Class QTextLine size=8 align=4 @@ -10874,15 +9892,7 @@ QTextDocument (0x4189940) 0 QObject (0x4189980) 0 primary-for QTextDocument (0x4189940) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4189b80) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x4189cc0) 0 Class QTextCursor size=4 align=4 @@ -10894,15 +9904,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x4189e00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x4189880) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x4189f40) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -11064,10 +10066,6 @@ QTextFrame (0x426e880) 0 QObject (0x426e900) 0 primary-for QTextObject (0x426e8c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x426ee40) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -11092,25 +10090,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x426e480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42e4340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42e4400) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x42e44c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x42e46c0) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -12072,10 +11058,6 @@ QDateEdit (0x4408ec0) 0 QPaintDevice (0x4408fc0) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44cf040) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12236,10 +11218,6 @@ QDialogButtonBox (0x44cf300) 0 QPaintDevice (0x44cf380) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44cf5c0) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -12319,10 +11297,6 @@ QDockWidget (0x44cf600) 0 QPaintDevice (0x44cf680) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44cf940) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -12484,10 +11458,6 @@ QFontComboBox (0x44cfbc0) 0 QPaintDevice (0x44cfc80) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44cfec0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -14056,10 +13026,6 @@ QTextEdit (0x4786ac0) 0 QPaintDevice (0x4786bc0) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4786f00) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -14649,188 +13615,40 @@ QSvgWidget (0x49e0a40) 0 QPaintDevice (0x49e0ac0) 8 vptr=((& QSvgWidget::_ZTV10QSvgWidget) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4aa2340) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4acb1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4b1f240) 0 empty -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x4b5f6c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4b5fdc0) 0 -Class QVectorTypedData - size=40 align=4 - base size=40 base align=4 -QVectorTypedData (0x4bb74c0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4bd49c0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4bd4b80) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0x4bd4d40) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4bd4f00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4ccc480) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x4ccc6c0) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4cebd00) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x4d0d000) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x4d0d680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4d309c0) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x4de4740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e0b080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e0b300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e0b880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e0bc00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e27080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e27780) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e27c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e27f00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e27fc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e4c240) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x4e4c3c0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x4e4cac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e91100) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e911c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e91640) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e91700) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e91ac0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4e91e00) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x4eb6140) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x4eb6fc0) 0 diff --git a/tests/auto/bic/data/QtSvg.4.2.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtSvg.4.2.0.win32-gcc-ia32.txt index c434f460c..dcbff5773 100644 --- a/tests/auto/bic/data/QtSvg.4.2.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSvg.4.2.0.win32-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xa9db00) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xa9dc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xa9df00) 0 empty - QUintForSize<4> (0xac2000) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xac2180) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xac2240) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xac24c0) 0 empty - QIntForSize<4> (0xac2580) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xaf4380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0aa80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ac00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ad80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0af00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb36080) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb60f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb97380) 0 empty Class QBasicAtomic size=4 align=4 @@ -171,75 +81,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc4bb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd72780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd84e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd940c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd84980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd9ae40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd94780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda58c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda0080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde94c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde9d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef480) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xee0240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee0780) 0 Class QCharRef size=8 align=4 @@ -282,10 +132,6 @@ Class QConstString QConstString (0x11f3dc0) 0 QString (0x11f3e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1260140) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -348,10 +194,6 @@ Class QListData base size=4 base align=4 QListData (0x12d61c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13dc180) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -376,15 +218,7 @@ Class QTextCodec QTextCodec (0xee01c0) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1400480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc5d5c0) 0 Class QTextEncoder size=32 align=4 @@ -407,25 +241,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x144b300) 0 QGenericArgument (0x144b340) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1460ac0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x144b8c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1490340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1476f40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -517,10 +339,6 @@ QIODevice (0x13b5a40) 0 QObject (0x150ab40) 0 primary-for QIODevice (0x13b5a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x150ae40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -540,25 +358,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xee00c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15d9c00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x15d9f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x15f14c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x15f1380) 0 Class QStringList size=4 align=4 @@ -566,15 +372,7 @@ Class QStringList QStringList (0xee0140) 0 QList (0x15f1740) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x15f1600) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x15f15c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -703,50 +501,22 @@ QFile (0x1705080) 0 QObject (0x1705100) 0 primary-for QIODevice (0x17050c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1705940) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x175d140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x175da80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1776ac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1776f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1776e80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x171bfc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b1c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b1880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -803,10 +573,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x16f5f80) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x184e0c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -880,10 +646,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x18bbb80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x18bbc80) 0 empty Class QMapData::Node size=8 align=4 @@ -908,10 +670,6 @@ Class QTextStream QTextStream (0x1afb580) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1afb940) 0 Class QTextStreamManipulator size=24 align=4 @@ -948,20 +706,8 @@ QTextOStream (0x1b8c740) 0 QTextStream (0x1b8c780) 0 primary-for QTextOStream (0x1b8c740) -Class - size=8 align=4 - base size=8 base align=4 - (0x1bc1980) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1bc1b00) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1be78c0) 0 Class QVectorData size=16 align=4 @@ -1099,15 +845,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1e50cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e98980) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e98040) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1134,270 +872,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1ef9400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f19840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f199c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f19b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f19cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f19e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f19fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2d140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2d2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2d440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2d5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2d740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2d8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2da40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2dbc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2dd40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2dec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4dac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4dc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4ddc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4df40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6ab40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6acc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6ae40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6afc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f892c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f895c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f898c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fab040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fab1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fab340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fab4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fab640) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1424,45 +950,17 @@ Class QVariant base size=16 base align=8 QVariant (0x1476c80) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ffde00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ffdfc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2031480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1fbf540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x2031780) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1fbf5c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1fab800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2099100) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1540,15 +1038,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1f19180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2155440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21b3040) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1575,10 +1065,6 @@ QEventLoop (0x21b36c0) 0 QObject (0x21b3700) 0 primary-for QEventLoop (0x21b36c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21b3a00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1623,20 +1109,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x222b200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x222be80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x222b180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22542c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1806,10 +1284,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x22d77c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22d7e00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1917,20 +1391,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x143fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x237abc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x143fc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x238f1c0) 0 empty Class QMetaProperty size=20 align=4 @@ -1942,10 +1408,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x143fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x238f900) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2127,10 +1589,6 @@ QLibrary (0x244d040) 0 QObject (0x244d080) 0 primary-for QLibrary (0x244d040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x244d2c0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2172,10 +1630,6 @@ Class QMutex base size=4 base align=4 QMutex (0x24be7c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x24eb000) 0 Class QMutexLocker size=4 align=4 @@ -2187,20 +1641,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x24ebe00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x24fc140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x24ebfc0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x24fc900) 0 Class QWriteLocker size=4 align=4 @@ -2258,10 +1704,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x253eac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2599480) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2273,70 +1715,42 @@ Class QDate base size=4 base align=4 QDate (0x1e50b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25f1640) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e50bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2619280) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x175d040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2648040) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1f19340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2648c80) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1f19380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2670e40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1f192c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26b72c0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1f19300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26e2780) 0 empty Class QLinkedListData size=20 align=4 @@ -2348,40 +1762,24 @@ Class QSize base size=8 base align=4 QSize (0x1f19240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27d3fc0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1f19280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2826500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1f191c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x28b7000) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1f19200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x293d340) 0 empty Class QSharedData size=4 align=4 @@ -2429,10 +1827,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0x1f19700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a4e280) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -2749,15 +2143,7 @@ Class QInputMethodEvent::Attribute base size=32 base align=8 QInputMethodEvent::Attribute (0x2b46e80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2b6e380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2b46f80) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3046,15 +2432,7 @@ Class QAccessible base size=0 base align=1 QAccessible (0x2c1abc0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c2fc40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2c3d180) 0 Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3445,40 +2823,16 @@ Class QPaintDevice QPaintDevice (0x29cff80) 0 vptr=((&QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2d73dc0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2d73f00) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0x2db4000) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0x2d73d40) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0x1f194c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2de2540) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2de23c0) 0 Class QPolygon size=4 align=4 @@ -3486,15 +2840,7 @@ Class QPolygon QPolygon (0x1f195c0) 0 QVector (0x2de2700) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2e1e980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2e1e840) 0 Class QPolygonF size=4 align=4 @@ -3507,10 +2853,6 @@ Class QMatrix base size=48 base align=8 QMatrix (0x1f19800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2e7b800) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3537,10 +2879,6 @@ QImage (0x1f19580) 0 QPaintDevice (0x2e9dcc0) 0 primary-for QImage (0x1f19580) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2f59000) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 9u entries @@ -3567,45 +2905,17 @@ Class QBrush base size=4 base align=4 QBrush (0x1f19480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2faca00) 0 empty Class QBrushData size=72 align=8 base size=72 base align=8 QBrushData (0x2fac1c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x2fcb900) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2fcb080) 0 -Class QGradient:::: - size=32 align=8 - base size=32 base align=8 -QGradient:::: (0x2fcbb40) 0 -Class QGradient:::: - size=40 align=8 - base size=40 base align=8 -QGradient:::: (0x2fcbc40) 0 -Class QGradient:::: - size=24 align=8 - base size=24 base align=8 -QGradient:::: (0x2fcbe80) 0 -Class QGradient:: - size=40 align=8 - base size=40 base align=8 -QGradient:: (0x2fcbac0) 0 Class QGradient size=64 align=8 @@ -4017,10 +3327,6 @@ QAbstractPrintDialog (0x3353080) 0 QPaintDevice (0x3353180) 8 vptr=((&QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3353440) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 70u entries @@ -4283,10 +3589,6 @@ QFileDialog (0x33c99c0) 0 QPaintDevice (0x33c9ac0) 8 vptr=((&QFileDialog::_ZTV11QFileDialog) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x33fa480) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 70u entries @@ -4713,10 +4015,6 @@ QMessageBox (0x3567900) 0 QPaintDevice (0x3567a00) 8 vptr=((&QMessageBox::_ZTV11QMessageBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x357c680) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 71u entries @@ -5087,25 +4385,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0x2e57a80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x36c5980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x36c5800) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0x36aa1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x36c5b40) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5160,15 +4446,7 @@ Class QGraphicsItem QGraphicsItem (0x372d540) 0 vptr=((&QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x372d680) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3765580) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -5757,10 +5035,6 @@ Class QPen base size=4 base align=4 QPen (0x1f19740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3897e00) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -5929,60 +5203,20 @@ Class QTextOption base size=28 base align=8 QTextOption (0x3936a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3936e40) 0 Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0x2a00080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3994a00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a523c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39a97c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a52740) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39a9880) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a92400) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x39a99c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x3a92700) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x2a09700) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 69u entries @@ -6249,20 +5483,8 @@ QGraphicsView (0x373ea40) 0 QPaintDevice (0x3b5cc40) 8 vptr=((&QGraphicsView::_ZTV13QGraphicsView) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3b951c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3bfd440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x372da80) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 9u entries @@ -6291,10 +5513,6 @@ Class QIcon base size=4 base align=4 QIcon (0x1f19540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3c89400) 0 empty Vtable for QIconEngine QIconEngine::_ZTV11QIconEngine: 9u entries @@ -6450,10 +5668,6 @@ QImageIOPlugin (0x3ca8fc0) 0 QFactoryInterface (0x3cc7080) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0x3cc7040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3cc7240) 0 Class QImageReader size=4 align=4 @@ -6631,15 +5845,7 @@ QActionGroup (0x3d981c0) 0 QObject (0x3dd7540) 0 primary-for QActionGroup (0x3d981c0) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3e00000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31dad80) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 25u entries @@ -6948,10 +6154,6 @@ QAbstractSpinBox (0x3ec1100) 0 QPaintDevice (0x3ec11c0) 8 vptr=((&QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3ec16c0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 68u entries @@ -7167,15 +6369,7 @@ QStyle (0x31a89c0) 0 QObject (0x3f8a340) 0 primary-for QStyle (0x31a89c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3f8ac80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3fafe40) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 71u entries @@ -7446,10 +6640,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0x4111f40) 0 QStyleOption (0x4111f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4127440) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -7476,10 +6666,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0x416f740) 0 QStyleOption (0x416f780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4195240) 0 Class QStyleOptionButton size=64 align=4 @@ -7487,10 +6673,6 @@ Class QStyleOptionButton QStyleOptionButton (0x41950c0) 0 QStyleOption (0x4195100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4195b80) 0 Class QStyleOptionTab size=72 align=4 @@ -7505,10 +6687,6 @@ QStyleOptionTabV2 (0x41ed2c0) 0 QStyleOptionTab (0x41ed300) 0 QStyleOption (0x41ed340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41eda80) 0 Class QStyleOptionToolBar size=68 align=4 @@ -7535,10 +6713,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0x423c800) 0 QStyleOption (0x423c840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x428c240) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -7564,10 +6738,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0x42d9240) 0 QStyleOption (0x42d9280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x42d9940) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -7608,15 +6778,7 @@ QStyleOptionSpinBox (0x435b5c0) 0 QStyleOptionComplex (0x435b600) 0 QStyleOption (0x435b640) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x435bc80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x435bb80) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -7625,10 +6787,6 @@ QStyleOptionQ3ListView (0x435bac0) 0 QStyleOptionComplex (0x435bb00) 0 QStyleOption (0x435bb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x438f740) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7719,10 +6877,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0x4466380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x44909c0) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -7753,20 +6907,8 @@ QItemSelectionModel (0x4490dc0) 0 QObject (0x4490e00) 0 primary-for QItemSelectionModel (0x4490dc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x44cc140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x44ccfc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x44ccec0) 0 Class QItemSelection size=4 align=4 @@ -7900,10 +7042,6 @@ QAbstractItemView (0x451f640) 0 QPaintDevice (0x451f780) 8 vptr=((&QAbstractItemView::_ZTV17QAbstractItemView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4548480) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -8245,15 +7383,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0x46a1200) 0 nearly-empty vptr=((&QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0x46a1f00) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0x46a1d00) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -8398,15 +7528,7 @@ QListView (0x46c0680) 0 QPaintDevice (0x46c0800) 8 vptr=((&QListView::_ZTV9QListView) + 400u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x46dde40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x46ddcc0) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -8703,15 +7825,7 @@ Class QStandardItem QStandardItem (0x48163c0) 0 vptr=((&QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x48cf880) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x48168c0) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -9241,35 +8355,15 @@ QTreeView (0x4a3d980) 0 QPaintDevice (0x4a3db00) 8 vptr=((&QTreeView::_ZTV9QTreeView) + 408u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4a68ec0) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0x4a68a80) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0x4a9ccc0) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0x4a9cb40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x4a9cf00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x4a9c9c0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -10158,15 +9252,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0x3994840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4e0dec0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4e384c0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 26u entries @@ -10203,20 +9289,12 @@ Class QPaintEngine QPaintEngine (0x2d27b00) 0 vptr=((&QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4e38940) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0x4e0dc40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4e0ddc0) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 9u entries @@ -10313,10 +9391,6 @@ QCommonStyle (0x4f7bc40) 0 QObject (0x4f7bcc0) 0 primary-for QStyle (0x4f7bc80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x4fb3500) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -10690,30 +9764,14 @@ Class QTextLength base size=16 base align=8 QTextLength (0x1f19780) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x5129f80) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0x1f197c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x513c900) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x5129a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5129600) 0 Class QTextCharFormat size=8 align=4 @@ -10768,15 +9826,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0x30b7dc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x52d3780) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x52d3400) 0 Class QTextLine size=8 align=4 @@ -10826,15 +9876,7 @@ QTextDocument (0x381e300) 0 QObject (0x5300fc0) 0 primary-for QTextDocument (0x381e300) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5315500) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0x5385700) 0 Class QTextCursor size=4 align=4 @@ -10846,15 +9888,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0x5385c00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0x5385ec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0x5385d40) 0 Class QAbstractTextDocumentLayout::PaintContext size=56 align=8 @@ -11016,10 +10050,6 @@ QTextFrame (0x53007c0) 0 QObject (0x542c180) 0 primary-for QTextObject (0x542c140) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5455700) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -11044,25 +10074,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0x52aec40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x5486f80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x54a1100) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0x53f5280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x54a1b80) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -12056,10 +11074,6 @@ QDateEdit (0x5765940) 0 QPaintDevice (0x5765a80) 8 vptr=((&QDateEdit::_ZTV9QDateEdit) + 268u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x573bc40) 0 Vtable for QDial QDial::_ZTV5QDial: 68u entries @@ -12228,10 +11242,6 @@ QDialogButtonBox (0x57d6bc0) 0 QPaintDevice (0x57d6c80) 8 vptr=((&QDialogButtonBox::_ZTV16QDialogButtonBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x57d6d80) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 67u entries @@ -12315,10 +11325,6 @@ QDockWidget (0x582ba00) 0 QPaintDevice (0x582bac0) 8 vptr=((&QDockWidget::_ZTV11QDockWidget) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x582bf40) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 67u entries @@ -12488,10 +11494,6 @@ QFontComboBox (0x59093c0) 0 QPaintDevice (0x59094c0) 8 vptr=((&QFontComboBox::_ZTV13QFontComboBox) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x59098c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 67u entries @@ -14136,10 +13138,6 @@ QTextEdit (0x54a1dc0) 0 QPaintDevice (0x5d6cb00) 8 vptr=((&QTextEdit::_ZTV9QTextEdit) + 264u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x5d972c0) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 78u entries @@ -14753,178 +13751,38 @@ QSvgWidget (0x61270c0) 0 QPaintDevice (0x6127180) 8 vptr=((&QSvgWidget::_ZTV10QSvgWidget) + 240u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1400440) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x15f1480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x639be00) 0 empty -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0x2de24c0) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x2e1e900) 0 -Class QVectorTypedData - size=40 align=8 - base size=40 base align=8 -QVectorTypedData (0x36c5900) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x3a52340) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x3a526c0) 0 -Class QVectorTypedData - size=48 align=8 - base size=48 base align=8 -QVectorTypedData (0x3a92380) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x3a92680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x4a9cec0) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0x4a9cc40) 0 -Class QVectorTypedData - size=32 align=8 - base size=32 base align=8 -QVectorTypedData (0x513c880) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0x52d3700) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0x5385e40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3dd7fc0) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0x46a1e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a25cc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a59040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a59880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a59a40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a59f80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a829c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1776f40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x2031440) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0x6abb100) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0x6abb3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6abb600) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3bfd400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6abb880) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x435bc40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x44ccf80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x48cf840) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0x6abbf80) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0x6b51900) 0 diff --git a/tests/auto/bic/data/QtSvg.4.3.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSvg.4.3.0.linux-gcc-ia32.txt index 0ceb56865..7b6328955 100644 --- a/tests/auto/bic/data/QtSvg.4.3.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSvg.4.3.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f40e40) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f40e80) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f40f40) 0 empty - QUintForSize<4> (0xb7f40f80) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7840000) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7840040) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7840100) 0 empty - QIntForSize<4> (0xb7840140) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7840400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78404c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7840500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7840540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7840580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78405c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7840600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7840640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7840680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78406c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7840700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7840740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7840780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78407c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7840800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7840840) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb7840880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7840980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78409c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7840a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7840a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7840a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7840ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7840b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7840b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7840b80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7840bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7840c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7840c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7840c80) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb7840d80) 0 QGenericArgument (0xb7840dc0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb7840f80) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb5b3b040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5b3b0c0) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb5b3b3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5b3b400) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb5b3b440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5b3b640) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb5b3b740) 0 QString (0xb5b3b780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5b3b7c0) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb5b3bb00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5b3be80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5b3be00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb5b3b9c0) 0 QObject (0xb5b3ba80) 0 primary-for QLibrary (0xb5b3b9c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5b3bcc0) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb576c000) 0 QObject (0xb576c040) 0 primary-for QIODevice (0xb576c000) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb576c100) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb576c1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb576c200) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb576c240) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb576c300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb576c280) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb576c340) 0 QList (0xb576c380) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb576c400) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb576c440) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb576c7c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb576c800) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb576cd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb576ce00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb576ce40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb576cf00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb576cf40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb576c080) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb576c180) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb576c680) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb576cbc0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb576c540) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb576cd80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb576cdc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb576ce80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb576cec0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb576cf80) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb554a000) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb554a040) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb554a080) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb554a0c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb554a180) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb554a140) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb554a100) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb554a1c0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb554a240) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb554a200) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb554a280) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb554a300) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb554a2c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb554a340) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb554a380) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb554a3c0) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb554a640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb554a840) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb554a8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb554aac0) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb554ae80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb554aec0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb554af00) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb5366100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5366340) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb5366380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53665c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb5366700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5366800) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb5366840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5366900) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb5366940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5366980) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb53669c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5366a00) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb5366d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5366dc0) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb5366f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5366f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5366fc0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb5366140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb53662c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb53663c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb53664c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb53667c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb53668c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5366c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fee880) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb4fee8c0) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb4feeb40) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb4feeb80) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4feec80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4feec00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb4feed80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb4feed00) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb4feee00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4feee80) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb4feeec0) 0 QObject (0xb4feef00) 0 primary-for QSettings (0xb4feeec0) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb4feea00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb4feefc0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb4feea40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb4feea80) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb4feef80) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb4ecd040) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb4ecd000) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb4ecd0c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb4ecd100) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb4ecd140) 0 QObject (0xb4ecd1c0) 0 primary-for QIODevice (0xb4ecd180) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ecd240) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb4ecd3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ecd400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ecd440) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4ecd500) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4ecd480) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb4ecd540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ecd5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ecd640) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb4ecd880) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ecd940) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb4ecd980) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ecdb00) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb4ecdbc0) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ecdd00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb4ecdc40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4ecde40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4ecddc0) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb4ecdf00) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ecdfc0) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb4cf91c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb4cf9240) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb4cf9200) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb4cf92c0) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb4cf9300) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb4cf9380) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb4cf9680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cf96c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb4cf97c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cf9800) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb4cf9840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cf98c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb4cf9d40) 0 QObject (0xb4cf9d80) 0 primary-for QEventLoop (0xb4cf9d40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4cf9e80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb4a78040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a78080) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb4a780c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a78100) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb4a78180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a781c0) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2726,25 +2016,13 @@ QImageIOPlugin (0xb4a78600) 0 QFactoryInterface (0xb4a786c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb4a78680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4a78740) 0 Class QImageReader size=4 align=4 base size=4 base align=4 QImageReader (0xb4a78780) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a78840) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a787c0) 0 Class QPolygon size=4 align=4 @@ -2752,15 +2030,7 @@ Class QPolygon QPolygon (0xb4a78880) 0 QVector (0xb4a788c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a78980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a78900) 0 Class QPolygonF size=4 align=4 @@ -2783,10 +2053,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb4a78bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a78c00) 0 empty Class QPainterPath::Element size=20 align=4 @@ -2798,25 +2064,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb4a78c40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a78ec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a78e40) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb4a78d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a78f00) 0 empty Class QPainterPathStroker size=4 align=4 @@ -2828,10 +2082,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb4a78000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a78280) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2872,30 +2122,10 @@ QImage (0xb4a78a80) 0 QPaintDevice (0xb4a78ac0) 0 primary-for QImage (0xb4a78a80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a78b00) 0 empty -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4869000) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4869040) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4869080) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4a78d00) 0 Class QColor size=16 align=4 @@ -3083,10 +2313,6 @@ Class QIcon base size=4 base align=4 QIcon (0xb4869a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4869ac0) 0 empty Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -3225,10 +2451,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb48690c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4869100) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3526,15 +2748,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb479d940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb479da40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb479d9c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3823,20 +3037,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb4828140) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb48281c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4828200) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4828240) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3867,20 +3069,8 @@ QAccessibleInterface (0xb4828300) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb4828340) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb48284c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb4828440) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb48283c0) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -4402,55 +3592,23 @@ Class QPen base size=4 base align=4 QPen (0xb46db640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb46db700) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0xb46db740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb46db780) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb46db7c0) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb46db900) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb46db880) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb46db980) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb46db9c0) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb46dba00) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb46db940) 0 Class QGradient size=56 align=4 @@ -4480,30 +3638,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb46dbbc0) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb46dbd00) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb46dbc80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb46dbe80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb46dbe00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb46dbec0) 0 Class QTextCharFormat size=8 align=4 @@ -4643,10 +3785,6 @@ QTextFrame (0xb44560c0) 0 QObject (0xb4456140) 0 primary-for QTextObject (0xb4456100) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4456280) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -4671,25 +3809,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb4456340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44563c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4456400) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb4456440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4456480) 0 empty Class QTextDocumentFragment size=4 align=4 @@ -4756,10 +3882,6 @@ QTextTable (0xb4456600) 0 QObject (0xb44566c0) 0 primary-for QTextObject (0xb4456680) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4456840) 0 Class QTextCursor size=4 align=4 @@ -4808,10 +3930,6 @@ Class QTextOption base size=24 base align=4 QTextOption (0xb4456a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4456ac0) 0 Class QTextInlineObject size=8 align=4 @@ -4828,15 +3946,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb4456b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4456cc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4456c40) 0 Class QTextLine size=8 align=4 @@ -4886,10 +3996,6 @@ QTextDocument (0xb4456e00) 0 QObject (0xb4456e40) 0 primary-for QTextDocument (0xb4456e00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4456ec0) 0 Class QPalette size=8 align=4 @@ -4907,15 +4013,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb4456700) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4456d80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb44569c0) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4977,10 +4075,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb43f4080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43f4180) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5028,15 +4122,7 @@ QStyle (0xb43f41c0) 0 QObject (0xb43f4200) 0 primary-for QStyle (0xb43f41c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43f42c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43f4300) 0 Vtable for QCommonStyle QCommonStyle::_ZTV12QCommonStyle: 35u entries @@ -5242,10 +4328,6 @@ QWindowsXPStyle (0xb43f4840) 0 QObject (0xb43f4940) 0 primary-for QStyle (0xb43f4900) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb43f4b00) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -5541,10 +4623,6 @@ QWidget (0xb43f4280) 0 QPaintDevice (0xb43f4540) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43f4800) 0 Vtable for QValidator QValidator::_ZTV10QValidator: 16u entries @@ -5745,10 +4823,6 @@ QAbstractSpinBox (0xb41d9240) 0 QPaintDevice (0xb41d9300) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41d9380) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6167,10 +5241,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb41d9bc0) 0 QStyleOption (0xb41d9c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41d9d80) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6197,10 +5267,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb41d9000) 0 QStyleOption (0xb41d9100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41d9680) 0 Class QStyleOptionButton size=64 align=4 @@ -6208,10 +5274,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb41d9340) 0 QStyleOption (0xb41d94c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41d9a80) 0 Class QStyleOptionTab size=72 align=4 @@ -6226,10 +5288,6 @@ QStyleOptionTabV2 (0xb41d9b80) 0 QStyleOptionTab (0xb41d9c40) 0 QStyleOption (0xb41d9d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f210c0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6256,10 +5314,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb3f21300) 0 QStyleOption (0xb3f21340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f21480) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6292,10 +5346,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb3f217c0) 0 QStyleOption (0xb3f21800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f21980) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -6351,15 +5401,7 @@ QStyleOptionSpinBox (0xb3f21080) 0 QStyleOptionComplex (0xb3f21100) 0 QStyleOption (0xb3f21200) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3f21840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3f21580) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6368,10 +5410,6 @@ QStyleOptionQ3ListView (0xb3f21380) 0 QStyleOptionComplex (0xb3f21440) 0 QStyleOption (0xb3f214c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ff2040) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6488,10 +5526,6 @@ Class QStyleFactory base size=0 base align=1 QStyleFactory (0xb3ff28c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ff2980) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -6663,10 +5697,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb3ff2c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3ff2d00) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6697,20 +5727,8 @@ QItemSelectionModel (0xb3ff2d40) 0 QObject (0xb3ff2d80) 0 primary-for QItemSelectionModel (0xb3ff2d40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ff2e00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3ff2ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3ff2e40) 0 Class QItemSelection size=4 align=4 @@ -6872,10 +5890,6 @@ QAbstractItemView (0xb3ff2000) 0 QPaintDevice (0xb3ff2500) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3ff2880) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -7140,15 +6154,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb3d5d340) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3d5d600) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3d5d580) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7296,15 +6302,7 @@ Class QTableWidgetSelectionRange base size=16 base align=4 QTableWidgetSelectionRange (0xb3d5d8c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3d5da00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3d5d980) 0 Vtable for QTableWidgetItem QTableWidgetItem::_ZTV16QTableWidgetItem: 10u entries @@ -7790,15 +6788,7 @@ Class QStandardItem QStandardItem (0xb3c8b080) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3c8b240) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3c8b1c0) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -7926,25 +6916,9 @@ QDirModel (0xb3c8b440) 0 QObject (0xb3c8b4c0) 0 primary-for QAbstractItemModel (0xb3c8b480) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb3c8b640) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb3c8b5c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3c8b740) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3c8b6c0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8540,15 +7514,7 @@ QActionGroup (0xb3c8b780) 0 QObject (0xb3c8b9c0) 0 primary-for QActionGroup (0xb3c8b780) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3c8bfc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3c8bc80) 0 Vtable for QLayoutItem QLayoutItem::_ZTV11QLayoutItem: 18u entries @@ -9687,10 +8653,6 @@ QMdiArea (0xb38311c0) 0 QPaintDevice (0xb3831300) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3831380) 0 Vtable for QAbstractButton QAbstractButton::_ZTV15QAbstractButton: 66u entries @@ -10012,10 +8974,6 @@ QMdiSubWindow (0xb38317c0) 0 QPaintDevice (0xb3831880) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3831900) 0 Vtable for QCalendarWidget QCalendarWidget::_ZTV15QCalendarWidget: 64u entries @@ -10493,10 +9451,6 @@ QDialogButtonBox (0xb3831040) 0 QPaintDevice (0xb38314c0) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3831640) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -10576,10 +9530,6 @@ QDockWidget (0xb3831780) 0 QPaintDevice (0xb3831c00) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3831e80) 0 Vtable for QScrollArea QScrollArea::_ZTV11QScrollArea: 65u entries @@ -10930,10 +9880,6 @@ QDateEdit (0xb37f9500) 0 QPaintDevice (0xb37f9640) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37f96c0) 0 Vtable for QFontComboBox QFontComboBox::_ZTV13QFontComboBox: 65u entries @@ -11017,10 +9963,6 @@ QFontComboBox (0xb37f9700) 0 QPaintDevice (0xb37f9800) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37f9880) 0 Vtable for QToolBox QToolBox::_ZTV8QToolBox: 65u entries @@ -11275,10 +10217,6 @@ QTextEdit (0xb37f9b80) 0 QPaintDevice (0xb37f9cc0) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37f9dc0) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -12210,10 +11148,6 @@ QMainWindow (0xb352fa80) 0 QPaintDevice (0xb352fb40) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb352fbc0) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12786,20 +11720,8 @@ Class QGraphicsItem QGraphicsItem (0xb3481700) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3481800) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb3481840) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb3481900) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -13361,50 +12283,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb3481780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3481740) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3481d40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3481b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb33e5000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3481f00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb33e5100) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb33e5080) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb33e5200) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb33e5180) 0 Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -13451,20 +12337,8 @@ QGraphicsScene (0xb33e5240) 0 QObject (0xb33e5280) 0 primary-for QGraphicsScene (0xb33e5240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb33e5380) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb33e5440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb33e53c0) 0 Vtable for QGraphicsView QGraphicsView::_ZTV13QGraphicsView: 68u entries @@ -13553,15 +12427,7 @@ QGraphicsView (0xb33e5480) 0 QPaintDevice (0xb33e55c0) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb33e5680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb33e56c0) 0 Vtable for QGraphicsItemAnimation QGraphicsItemAnimation::_ZTV22QGraphicsItemAnimation: 16u entries @@ -13921,10 +12787,6 @@ QAbstractPrintDialog (0xb33e5c00) 0 QPaintDevice (0xb33e5d00) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb33e5dc0) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -14183,10 +13045,6 @@ QWizard (0xb33e5a40) 0 QPaintDevice (0xb31a3000) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb31a3080) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -14354,10 +13212,6 @@ QFileDialog (0xb31a3200) 0 QPaintDevice (0xb31a3300) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb31a33c0) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -14694,10 +13548,6 @@ QMessageBox (0xb31a38c0) 0 QPaintDevice (0xb31a39c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb31a3a80) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -15173,15 +14023,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb310a3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb310a400) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb310a4c0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -15216,20 +14058,12 @@ Class QPaintEngine QPaintEngine (0xb310a440) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb310a5c0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb310a540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb310a600) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26u entries @@ -15526,188 +14360,40 @@ QGraphicsSvgItem (0xb2e90f40) 0 QGraphicsItem (0xb2e90fc0) 8 vptr=((& QGraphicsSvgItem::_ZTV16QGraphicsSvgItem) + 76u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2e90dc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c63000) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb2c63080) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2c63100) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb2c63180) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2c63300) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2c63380) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2c63400) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c63600) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb2c63680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c63700) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2c63880) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2c63900) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2c63980) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2c63a00) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb2c63ac0) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb2c63b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c63bc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c63c80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c63d80) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb2c63e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c63ec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c63f40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c63fc0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c63780) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb2c63800) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb2c63b00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb29e8000) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb29e80c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb29e8180) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb29e8200) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb29e82c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb29e8380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb29e8400) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb29e8480) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb29e8640) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb29e86c0) 0 diff --git a/tests/auto/bic/data/QtSvg.4.3.1.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSvg.4.3.1.linux-gcc-ia32.txt index bde594f61..a85c6ce79 100644 --- a/tests/auto/bic/data/QtSvg.4.3.1.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSvg.4.3.1.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7ef6e40) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7ef6e80) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7ef6f40) 0 empty - QUintForSize<4> (0xb7ef6f80) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb73f7000) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb73f7040) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb73f7100) 0 empty - QIntForSize<4> (0xb73f7140) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb73f7400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f74c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f7500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f7540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f7580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f75c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f7600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f7640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f7680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f76c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f7700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f7740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f7780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f77c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f7800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f7840) 0 empty Class QFlag size=4 align=4 @@ -161,10 +75,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb73f7c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73f7cc0) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -227,70 +137,18 @@ Class QListData base size=4 base align=4 QListData (0xb73f7fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593a1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593a200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593a240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593a280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593a2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593a300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593a340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593a380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593a3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593a400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593a440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593a480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593a4c0) 0 Class QInternal size=1 align=1 @@ -308,10 +166,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb593a5c0) 0 QGenericArgument (0xb593a600) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb593a7c0) 0 Class QMetaObject size=16 align=4 @@ -328,10 +182,6 @@ Class QChar base size=2 base align=2 QChar (0xb593a880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb593a900) 0 empty Class QString::Null size=1 align=1 @@ -348,10 +198,6 @@ Class QString base size=4 base align=4 QString (0xb593a940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593ab40) 0 Class QLatin1String size=4 align=4 @@ -369,25 +215,13 @@ Class QConstString QConstString (0xb593ac00) 0 QString (0xb593ac40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb593ac80) 0 empty Class QStringRef size=12 align=4 base size=12 base align=4 QStringRef (0xb593acc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb593ae00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb593ad80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -479,10 +313,6 @@ QIODevice (0xb593a100) 0 QObject (0xb593aa80) 0 primary-for QIODevice (0xb593a100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb593ae80) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -502,275 +332,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb5534040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55341c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55342c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55343c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55344c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55345c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55346c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55347c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55348c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55349c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5534e40) 0 empty Class QMapData::Node size=8 align=4 @@ -807,45 +421,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb55a02c0) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb55a0540) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb55a0580) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb55a0680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb55a0600) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb55a0780) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb55a0700) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb55a0800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55a0880) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -972,10 +558,6 @@ QEventLoop (0xb55a0d00) 0 QObject (0xb55a0d40) 0 primary-for QEventLoop (0xb55a0d00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55a0e40) 0 Vtable for QCoreApplication QCoreApplication::_ZTV16QCoreApplication: 16u entries @@ -1009,10 +591,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb55a0140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55a0400) 0 empty Vtable for QTimer QTimer::_ZTV6QTimer: 14u entries @@ -1069,20 +647,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb55a0900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55a09c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb55a0a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55a0b40) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1277,20 +847,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb538d180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb538d1c0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb538d200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb538d240) 0 empty Class QMetaProperty size=20 align=4 @@ -1302,10 +864,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb538d2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb538d300) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1408,100 +966,48 @@ Class QSize base size=8 base align=4 QSize (0xb538d600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb538d800) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb538d880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb538da80) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb538db40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb538dd80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb538ddc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb538d080) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb538d140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb538d3c0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb538d480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb538d540) 0 empty -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb538d680) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb538d6c0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb538d640) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb538d700) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb538d740) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb538d780) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb538d7c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb538d8c0) 0 Class timespec size=8 align=4 @@ -1513,80 +1019,24 @@ Class timeval base size=8 base align=4 timeval (0xb538d940) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb538d980) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb538d9c0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb538da00) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb538dbc0) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb538db80) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb538da40) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb538dc00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb538dc80) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb538dc40) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb538dcc0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb538dd40) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb538dd00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb538de00) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb538de40) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb538de80) 0 Class random_data size=28 align=4 @@ -1618,35 +1068,19 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb516e280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb516e2c0) 0 empty Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb516ea40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb516ea80) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb516eac0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb516eb80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb516eb00) 0 Class QStringList size=4 align=4 @@ -1654,15 +1088,7 @@ Class QStringList QStringList (0xb516ebc0) 0 QList (0xb516ec00) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb516ec80) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb516ecc0) 0 Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1695,15 +1121,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb516eec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb516ef00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb516ef40) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1730,10 +1148,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb4f730c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f73100) 0 empty Class QCryptographicHash size=4 align=4 @@ -1750,20 +1164,12 @@ Class QLine base size=16 base align=4 QLine (0xb4f73540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f73580) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb4f735c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f73600) 0 empty Class QSharedData size=4 align=4 @@ -1775,30 +1181,18 @@ Class QDate base size=4 base align=4 QDate (0xb4f73780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f73840) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb4f73880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f73940) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb4f73980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f73a40) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1810,20 +1204,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb4f73ac0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb4f73b40) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb4f73b00) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb4f73bc0) 0 Class QWriteLocker size=4 align=4 @@ -1876,20 +1262,12 @@ Class QMutex base size=4 base align=4 QMutex (0xb4f73e00) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb4f73e80) 0 Class QMutexLocker size=4 align=4 base size=4 base align=4 QMutexLocker (0xb4f73e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4f73f80) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1914,15 +1292,7 @@ Class QTextCodec QTextCodec (0xb4f73ec0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4f738c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4f737c0) 0 Class QTextEncoder size=32 align=4 @@ -1934,25 +1304,9 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb4f739c0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb4f73cc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb4f73a00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb4f73f40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb4f73fc0) 0 Class __gconv_trans_data size=20 align=4 @@ -1974,15 +1328,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb4d940c0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb4d94140) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb4d94100) 0 Class _IO_marker size=12 align=4 @@ -1994,10 +1340,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb4d941c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb4d94200) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -2012,10 +1354,6 @@ Class QTextStream QTextStream (0xb4d94240) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d94300) 0 Class QTextStreamManipulator size=24 align=4 @@ -2131,35 +1469,15 @@ QFile (0xb4d94740) 0 QObject (0xb4d947c0) 0 primary-for QIODevice (0xb4d94780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d94840) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb4d94880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d948c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d94900) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4d949c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4d94940) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -2212,15 +1530,7 @@ Class QDir base size=4 base align=4 QDir (0xb4d94b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d94bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d94c40) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2277,10 +1587,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb4d94c80) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d94e00) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2409,15 +1715,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb4d94640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d94800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d94b00) 0 empty Vtable for QDirIterator QDirIterator::_ZTV12QDirIterator: 4u entries @@ -2432,10 +1730,6 @@ Class QDirIterator QDirIterator (0xb4d94d80) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d94f00) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -2541,10 +1835,6 @@ QLibrary (0xb4bc9280) 0 QObject (0xb4bc92c0) 0 primary-for QLibrary (0xb4bc9280) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4bc9340) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2674,10 +1964,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb4bc9880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4bc9980) 0 Vtable for QLayoutItem QLayoutItem::_ZTV11QLayoutItem: 18u entries @@ -3103,40 +2389,16 @@ Class QPaintDevice QPaintDevice (0xb4bc9780) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4bc9ac0) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4bc9b80) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4bc9cc0) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4bc9a00) 0 Class QColor size=16 align=4 base size=14 base align=4 QColor (0xb4bc9900) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb49a5000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4bc9e00) 0 Class QPolygon size=4 align=4 @@ -3144,15 +2406,7 @@ Class QPolygon QPolygon (0xb49a5040) 0 QVector (0xb49a5080) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb49a5140) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb49a50c0) 0 Class QPolygonF size=4 align=4 @@ -3175,10 +2429,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb49a5380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb49a53c0) 0 empty Class QPainterPath::Element size=20 align=4 @@ -3190,25 +2440,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb49a5400) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb49a5680) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb49a5600) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb49a5500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb49a56c0) 0 empty Class QPainterPathStroker size=4 align=4 @@ -3220,10 +2458,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb49a57c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb49a5800) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -3248,10 +2482,6 @@ QImage (0xb49a58c0) 0 QPaintDevice (0xb49a5900) 0 primary-for QImage (0xb49a58c0) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb49a5a40) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -3276,45 +2506,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb49a5c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb49a5c80) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb49a5cc0) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb49a5e00) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb49a5d80) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb49a5e80) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb49a5ec0) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb49a5f00) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb49a5e40) 0 Class QGradient size=56 align=4 @@ -3380,10 +2582,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb49a5d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb47fd080) 0 empty Class QWidgetData size=64 align=4 @@ -3466,10 +2664,6 @@ QWidget (0xb47fd100) 0 QPaintDevice (0xb47fd180) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47fd380) 0 Class QToolTip size=1 align=1 @@ -3558,10 +2752,6 @@ Class QIcon base size=4 base align=4 QIcon (0xb47fd600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb47fd6c0) 0 empty Vtable for QAction QAction::_ZTV7QAction: 14u entries @@ -3613,15 +2803,7 @@ QActionGroup (0xb47fd800) 0 QObject (0xb47fd840) 0 primary-for QActionGroup (0xb47fd800) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb47fd980) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb47fd900) 0 Vtable for QShortcut QShortcut::_ZTV9QShortcut: 14u entries @@ -3961,15 +3143,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb45dd2c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb45dd3c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb45dd340) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -4663,10 +3837,6 @@ QAbstractPrintDialog (0xb447f200) 0 QPaintDevice (0xb447f300) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb447f3c0) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -4837,10 +4007,6 @@ QMessageBox (0xb447f5c0) 0 QPaintDevice (0xb447f6c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb447f780) 0 Vtable for QProgressDialog QProgressDialog::_ZTV15QProgressDialog: 66u entries @@ -5091,10 +4257,6 @@ QFileDialog (0xb447fac0) 0 QPaintDevice (0xb447fbc0) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb447fc80) 0 Vtable for QErrorMessage QErrorMessage::_ZTV13QErrorMessage: 66u entries @@ -5505,10 +4667,6 @@ QWizard (0xb447fc40) 0 QPaintDevice (0xb43d1040) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43d10c0) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -5850,10 +5008,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb43d1700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb43d1780) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -5884,20 +5038,8 @@ QItemSelectionModel (0xb43d17c0) 0 QObject (0xb43d1800) 0 primary-for QItemSelectionModel (0xb43d17c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43d1880) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb43d1940) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb43d18c0) 0 Class QItemSelection size=4 align=4 @@ -6104,10 +5246,6 @@ QAbstractSpinBox (0xb43d1dc0) 0 QPaintDevice (0xb43d1e80) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43d1f00) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6315,15 +5453,7 @@ QStyle (0xb43d1a80) 0 QObject (0xb43d1b80) 0 primary-for QStyle (0xb43d1a80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43d1d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43d1ec0) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -6582,10 +5712,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb4187500) 0 QStyleOption (0xb4187540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41876c0) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6612,10 +5738,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb4187940) 0 QStyleOption (0xb4187980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4187b00) 0 Class QStyleOptionButton size=64 align=4 @@ -6623,10 +5745,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb4187a40) 0 QStyleOption (0xb4187a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4187c80) 0 Class QStyleOptionTab size=72 align=4 @@ -6641,10 +5759,6 @@ QStyleOptionTabV2 (0xb4187d00) 0 QStyleOptionTab (0xb4187d40) 0 QStyleOption (0xb4187d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4187f00) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6671,10 +5785,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb4187580) 0 QStyleOption (0xb4187680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4187a00) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6707,10 +5817,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb40950c0) 0 QStyleOption (0xb4095100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4095280) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -6766,15 +5872,7 @@ QStyleOptionSpinBox (0xb4095980) 0 QStyleOptionComplex (0xb40959c0) 0 QStyleOption (0xb4095a00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4095c00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4095b80) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6783,10 +5881,6 @@ QStyleOptionQ3ListView (0xb4095a80) 0 QStyleOptionComplex (0xb4095ac0) 0 QStyleOption (0xb4095b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4095dc0) 0 Class QStyleOptionToolButton size=96 align=4 @@ -7000,10 +6094,6 @@ QAbstractItemView (0xb3f4a140) 0 QPaintDevice (0xb3f4a280) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f4a340) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -7384,20 +6474,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb3f4ac40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f4acc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f4ad00) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb3f4ad40) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -7428,20 +6506,8 @@ QAccessibleInterface (0xb3f4ae00) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb3f4ae40) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3f4afc0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3f4af40) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb3f4aec0) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -8862,10 +7928,6 @@ QDateEdit (0xb3d42a40) 0 QPaintDevice (0xb3d42b80) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3d42c00) 0 Vtable for QButtonGroup QButtonGroup::_ZTV12QButtonGroup: 14u entries @@ -8970,10 +8032,6 @@ QDockWidget (0xb3d42d00) 0 QPaintDevice (0xb3d42dc0) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3d42e80) 0 Vtable for QMainWindow QMainWindow::_ZTV11QMainWindow: 64u entries @@ -9054,10 +8112,6 @@ QMainWindow (0xb3d42ec0) 0 QPaintDevice (0xb3d42f80) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3d420c0) 0 Vtable for QMenu QMenu::_ZTV5QMenu: 63u entries @@ -9867,10 +8921,6 @@ QFontComboBox (0xb3cb59c0) 0 QPaintDevice (0xb3cb5ac0) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3cb5b40) 0 Vtable for QToolBox QToolBox::_ZTV8QToolBox: 65u entries @@ -10277,10 +9327,6 @@ QMdiArea (0xb3cb54c0) 0 QPaintDevice (0xb3cb5cc0) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3cb5e40) 0 Vtable for QLabel QLabel::_ZTV6QLabel: 63u entries @@ -10597,10 +9643,6 @@ QMdiSubWindow (0xb3a2c3c0) 0 QPaintDevice (0xb3a2c480) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3a2c500) 0 Vtable for QMenuItem QMenuItem::_ZTV9QMenuItem: 14u entries @@ -10672,60 +9714,32 @@ QTextDocument (0xb3a2c700) 0 QObject (0xb3a2c740) 0 primary-for QTextDocument (0xb3a2c700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3a2c7c0) 0 Class QTextOption size=24 align=4 base size=24 base align=4 QTextOption (0xb3a2c800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3a2c840) 0 Class QPen size=4 align=4 base size=4 base align=4 QPen (0xb3a2c880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3a2c940) 0 empty Class QTextLength size=12 align=4 base size=12 base align=4 QTextLength (0xb3a2c980) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb3a2cac0) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb3a2ca40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3a2cc40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3a2cbc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3a2cc80) 0 Class QTextCharFormat size=8 align=4 @@ -10765,10 +9779,6 @@ QTextTableFormat (0xb3a2cf80) 0 QTextFrameFormat (0xb3a2cfc0) 0 QTextFormat (0xb3a2c100) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb3a2c380) 0 Class QTextCursor size=4 align=4 @@ -10875,10 +9885,6 @@ QTextFrame (0xb3a2ca00) 0 QObject (0xb3a2cb00) 0 primary-for QTextObject (0xb3a2ca80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb38230c0) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -10903,25 +9909,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb3823180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3823200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3823240) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb3823280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb38232c0) 0 empty Class QTextInlineObject size=8 align=4 @@ -10938,15 +9932,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb3823340) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb38234c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3823440) 0 Class QTextLine size=8 align=4 @@ -11046,10 +10032,6 @@ QTextEdit (0xb3823540) 0 QPaintDevice (0xb3823680) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3823780) 0 Vtable for QLCDNumber QLCDNumber::_ZTV10QLCDNumber: 63u entries @@ -11289,10 +10271,6 @@ QDialogButtonBox (0xb3823ac0) 0 QPaintDevice (0xb3823b80) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3823c00) 0 Vtable for QCalendarWidget QCalendarWidget::_ZTV15QCalendarWidget: 64u entries @@ -11556,15 +10534,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb3823d80) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb377c0c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb377c040) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -11788,20 +10758,8 @@ Class QGraphicsItem QGraphicsItem (0xb377c7c0) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb377c8c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb377c900) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb377c9c0) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -12363,50 +11321,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb377cb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb377cd00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb351c000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb377cf00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb351c100) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb351c080) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb351c200) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb351c180) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb351c300) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb351c280) 0 Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -12453,20 +11375,8 @@ QGraphicsScene (0xb351c340) 0 QObject (0xb351c380) 0 primary-for QGraphicsScene (0xb351c340) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb351c480) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb351c540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb351c4c0) 0 Vtable for QGraphicsView QGraphicsView::_ZTV13QGraphicsView: 68u entries @@ -12555,15 +11465,7 @@ QGraphicsView (0xb351c580) 0 QPaintDevice (0xb351c6c0) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb351c780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb351c7c0) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -12957,10 +11859,6 @@ QImageIOPlugin (0xb34a0240) 0 QFactoryInterface (0xb34a0300) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb34a02c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34a0380) 0 Class QImageReader size=4 align=4 @@ -13412,10 +12310,6 @@ Class QStyleFactory base size=0 base align=1 QStyleFactory (0xb34a0e00) 0 empty -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb339a080) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -13876,15 +12770,7 @@ Class QStandardItem QStandardItem (0xb339ac40) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb339af00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb339ae80) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -13998,15 +12884,7 @@ QStringListModel (0xb339a040) 0 QObject (0xb339a380) 0 primary-for QAbstractItemModel (0xb339a180) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb339a9c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb339a680) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -14530,35 +13408,15 @@ QTreeView (0xb3103640) 0 QPaintDevice (0xb31037c0) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb31038c0) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0xb3103840) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb3103a00) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb3103980) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3103b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3103a80) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -14726,15 +13584,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb3103dc0) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3103440) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3103140) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -15254,15 +14104,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb3085800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3085840) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3085900) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -15297,20 +14139,12 @@ Class QPaintEngine QPaintEngine (0xb3085880) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3085a00) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb3085980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3085a40) 0 Class QColormap size=4 align=4 @@ -15526,188 +14360,40 @@ QGraphicsSvgItem (0xb2d290c0) 0 QGraphicsItem (0xb2d29140) 8 vptr=((& QGraphicsSvgItem::_ZTV16QGraphicsSvgItem) + 76u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2d29200) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2d29280) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb2d29300) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2d29380) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb2d29400) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2d29580) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2d29600) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2d29680) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2d29700) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2d29880) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2d29900) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2d29980) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2d29a00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2d29c00) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb2d29c80) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb2d29d40) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb2d29dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2d29e40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2d29ec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2d29f80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2d29480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2d29d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2959040) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb29590c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2959140) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb29591c0) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb2959280) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2959340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb29593c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2959440) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2959500) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb29595c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2959680) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2959700) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2959780) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb2959980) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb2959a00) 0 diff --git a/tests/auto/bic/data/QtSvg.4.3.2.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSvg.4.3.2.linux-gcc-ia32.txt index 81ebfb7f4..5c0b9f9b0 100644 --- a/tests/auto/bic/data/QtSvg.4.3.2.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSvg.4.3.2.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f3ae40) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f3ae80) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f3af40) 0 empty - QUintForSize<4> (0xb7f3af80) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb783a000) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb783a040) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb783a100) 0 empty - QIntForSize<4> (0xb783a140) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb783a400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a6c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a7c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb783a840) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb783a880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783a980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783a9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783aa00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783aa40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783aa80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783aac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783ab00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783ab40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783ab80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783abc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783ac00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783ac40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb783ac80) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb783ad80) 0 QGenericArgument (0xb783adc0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb783af80) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb5b35040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5b350c0) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb5b353c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5b35400) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb5b35440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5b35640) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb5b35740) 0 QString (0xb5b35780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5b357c0) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb5b35b00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5b35e80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5b35e00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb5b359c0) 0 QObject (0xb5b35a80) 0 primary-for QLibrary (0xb5b359c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5b35cc0) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb5766000) 0 QObject (0xb5766040) 0 primary-for QIODevice (0xb5766000) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5766100) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb57661c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5766200) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb5766240) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5766300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5766280) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb5766340) 0 QList (0xb5766380) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb5766400) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb5766440) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb57667c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5766800) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb5766d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5766e00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb5766e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5766f00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb5766f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5766080) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb5766180) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb5766680) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb5766bc0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb5766540) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5766d80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5766dc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb5766e80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5766ec0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5766f80) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb5544000) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5544040) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb5544080) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb55440c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb5544180) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb5544140) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb5544100) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb55441c0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb5544240) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb5544200) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb5544280) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb5544300) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb55442c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb5544340) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb5544380) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb55443c0) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb5544640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5544840) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb55448c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5544ac0) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb5544e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5544ec0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5544f00) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb5361100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5361340) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb5361380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53615c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb5361700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5361800) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb5361840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5361900) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb5361940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5361980) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb53619c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5361a00) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb5361d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5361dc0) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb5361f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5361f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5361fc0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb5361140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb53612c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb53613c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb53614c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb53617c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb53618c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5361c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe80c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe81c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe82c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe83c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe84c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe85c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe86c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe87c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb4fe8880) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb4fe88c0) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb4fe8b40) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb4fe8b80) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4fe8c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4fe8c00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb4fe8d80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb4fe8d00) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb4fe8e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fe8e80) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb4fe8ec0) 0 QObject (0xb4fe8f00) 0 primary-for QSettings (0xb4fe8ec0) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb4fe8a00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb4fe8fc0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb4fe8a40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb4fe8a80) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb4fe8f80) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb4ec7040) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb4ec7000) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb4ec70c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb4ec7100) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb4ec7140) 0 QObject (0xb4ec71c0) 0 primary-for QIODevice (0xb4ec7180) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ec7240) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb4ec73c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ec7400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ec7440) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4ec7500) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4ec7480) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb4ec7540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ec75c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ec7640) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb4ec7880) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ec7940) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb4ec7980) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ec7b00) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb4ec7bc0) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ec7d00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb4ec7c40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4ec7e40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4ec7dc0) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb4ec7f00) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ec7fc0) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb4cf41c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb4cf4240) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb4cf4200) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb4cf42c0) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb4cf4300) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb4cf4380) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb4cf4680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cf46c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb4cf47c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cf4800) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb4cf4840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cf48c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb4cf4d40) 0 QObject (0xb4cf4d80) 0 primary-for QEventLoop (0xb4cf4d40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4cf4e80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb4a72040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a72080) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb4a720c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a72100) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb4a72180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a721c0) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2726,25 +2016,13 @@ QImageIOPlugin (0xb4a72600) 0 QFactoryInterface (0xb4a726c0) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb4a72680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4a72740) 0 Class QImageReader size=4 align=4 base size=4 base align=4 QImageReader (0xb4a72780) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a72840) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a727c0) 0 Class QPolygon size=4 align=4 @@ -2752,15 +2030,7 @@ Class QPolygon QPolygon (0xb4a72880) 0 QVector (0xb4a728c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a72980) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a72900) 0 Class QPolygonF size=4 align=4 @@ -2783,10 +2053,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb4a72bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a72c00) 0 empty Class QPainterPath::Element size=20 align=4 @@ -2798,25 +2064,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb4a72c40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4a72ec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4a72e40) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb4a72d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a72f00) 0 empty Class QPainterPathStroker size=4 align=4 @@ -2828,10 +2082,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb4a72000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a72280) 0 empty Vtable for QPaintDevice QPaintDevice::_ZTV12QPaintDevice: 7u entries @@ -2872,30 +2122,10 @@ QImage (0xb4a72a80) 0 QPaintDevice (0xb4a72ac0) 0 primary-for QImage (0xb4a72a80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4a72b00) 0 empty -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4864000) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4864040) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4864080) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4a72d00) 0 Class QColor size=16 align=4 @@ -3083,10 +2313,6 @@ Class QIcon base size=4 base align=4 QIcon (0xb4864a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4864ac0) 0 empty Vtable for QPicture QPicture::_ZTV8QPicture: 8u entries @@ -3225,10 +2451,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb48640c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4864100) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -3526,15 +2748,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb4797940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4797a40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb47979c0) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -3823,20 +3037,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb4823140) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb48231c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4823200) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4823240) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -3867,20 +3069,8 @@ QAccessibleInterface (0xb4823300) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb4823340) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb48234c0) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb4823440) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb48233c0) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -4402,55 +3592,23 @@ Class QPen base size=4 base align=4 QPen (0xb46d6640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb46d6700) 0 empty Class QBrush size=4 align=4 base size=4 base align=4 QBrush (0xb46d6740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb46d67c0) 0 empty Class QBrushData size=108 align=4 base size=105 base align=4 QBrushData (0xb46d6800) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb46d6940) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb46d68c0) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb46d69c0) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb46d6a00) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb46d6a40) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb46d6980) 0 Class QGradient size=56 align=4 @@ -4480,30 +3638,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb46d6c00) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb46d6d40) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb46d6cc0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb46d6ec0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb46d6e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb46d6f00) 0 Class QTextCharFormat size=8 align=4 @@ -4643,10 +3785,6 @@ QTextFrame (0xb44510c0) 0 QObject (0xb4451140) 0 primary-for QTextObject (0xb4451100) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4451280) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -4671,25 +3809,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb4451340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44513c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4451400) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb4451440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4451480) 0 empty Class QTextDocumentFragment size=4 align=4 @@ -4756,10 +3882,6 @@ QTextTable (0xb4451600) 0 QObject (0xb44516c0) 0 primary-for QTextObject (0xb4451680) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4451840) 0 Class QTextCursor size=4 align=4 @@ -4808,10 +3930,6 @@ Class QTextOption base size=24 base align=4 QTextOption (0xb4451a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4451ac0) 0 Class QTextInlineObject size=8 align=4 @@ -4828,15 +3946,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb4451b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4451cc0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4451c40) 0 Class QTextLine size=8 align=4 @@ -4886,10 +3996,6 @@ QTextDocument (0xb4451e00) 0 QObject (0xb4451e40) 0 primary-for QTextDocument (0xb4451e00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4451ec0) 0 Class QPalette size=8 align=4 @@ -4907,15 +4013,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb4451700) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4451d80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb44519c0) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -4977,10 +4075,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb43ef080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43ef180) 0 Vtable for QStyle QStyle::_ZTV6QStyle: 35u entries @@ -5028,15 +4122,7 @@ QStyle (0xb43ef1c0) 0 QObject (0xb43ef200) 0 primary-for QStyle (0xb43ef1c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43ef2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43ef300) 0 Vtable for QCommonStyle QCommonStyle::_ZTV12QCommonStyle: 35u entries @@ -5242,10 +4328,6 @@ QWindowsXPStyle (0xb43ef840) 0 QObject (0xb43ef940) 0 primary-for QStyle (0xb43ef900) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb43efb00) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -5541,10 +4623,6 @@ QWidget (0xb43ef280) 0 QPaintDevice (0xb43ef540) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb43ef800) 0 Vtable for QValidator QValidator::_ZTV10QValidator: 16u entries @@ -5745,10 +4823,6 @@ QAbstractSpinBox (0xb41d4240) 0 QPaintDevice (0xb41d4300) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41d4380) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -6167,10 +5241,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb41d4bc0) 0 QStyleOption (0xb41d4c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41d4d80) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -6197,10 +5267,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb41d4000) 0 QStyleOption (0xb41d4100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41d4680) 0 Class QStyleOptionButton size=64 align=4 @@ -6208,10 +5274,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb41d4340) 0 QStyleOption (0xb41d44c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb41d4a80) 0 Class QStyleOptionTab size=72 align=4 @@ -6226,10 +5288,6 @@ QStyleOptionTabV2 (0xb41d4b80) 0 QStyleOptionTab (0xb41d4c40) 0 QStyleOption (0xb41d4d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f1d0c0) 0 Class QStyleOptionToolBar size=68 align=4 @@ -6256,10 +5314,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb3f1d300) 0 QStyleOption (0xb3f1d340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f1d480) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -6292,10 +5346,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb3f1d7c0) 0 QStyleOption (0xb3f1d800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f1d980) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -6351,15 +5401,7 @@ QStyleOptionSpinBox (0xb3f1d080) 0 QStyleOptionComplex (0xb3f1d100) 0 QStyleOption (0xb3f1d200) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3f1d840) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3f1d580) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -6368,10 +5410,6 @@ QStyleOptionQ3ListView (0xb3f1d380) 0 QStyleOptionComplex (0xb3f1d440) 0 QStyleOption (0xb3f1d4c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3fec040) 0 Class QStyleOptionToolButton size=96 align=4 @@ -6488,10 +5526,6 @@ Class QStyleFactory base size=0 base align=1 QStyleFactory (0xb3fec8c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3fec980) 0 Class QTreeWidgetItemIterator size=12 align=4 @@ -6663,10 +5697,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb3fecc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3fecd00) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -6697,20 +5727,8 @@ QItemSelectionModel (0xb3fecd40) 0 QObject (0xb3fecd80) 0 primary-for QItemSelectionModel (0xb3fecd40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3fece00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3fecec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3fece40) 0 Class QItemSelection size=4 align=4 @@ -6872,10 +5890,6 @@ QAbstractItemView (0xb3fec000) 0 QPaintDevice (0xb3fec500) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3fec880) 0 Vtable for QListView QListView::_ZTV9QListView: 103u entries @@ -7140,15 +6154,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb3d58340) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3d58600) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3d58580) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -7296,15 +6302,7 @@ Class QTableWidgetSelectionRange base size=16 base align=4 QTableWidgetSelectionRange (0xb3d588c0) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3d58a00) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3d58980) 0 Vtable for QTableWidgetItem QTableWidgetItem::_ZTV16QTableWidgetItem: 10u entries @@ -7790,15 +6788,7 @@ Class QStandardItem QStandardItem (0xb3c87080) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3c87240) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3c871c0) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -7926,25 +6916,9 @@ QDirModel (0xb3c87440) 0 QObject (0xb3c874c0) 0 primary-for QAbstractItemModel (0xb3c87480) -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb3c87640) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb3c875c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3c87740) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3c876c0) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -8540,15 +7514,7 @@ QActionGroup (0xb3c87780) 0 QObject (0xb3c879c0) 0 primary-for QActionGroup (0xb3c87780) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3c87fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3c87c80) 0 Vtable for QLayoutItem QLayoutItem::_ZTV11QLayoutItem: 18u entries @@ -9687,10 +8653,6 @@ QMdiArea (0xb382c1c0) 0 QPaintDevice (0xb382c300) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb382c380) 0 Vtable for QAbstractButton QAbstractButton::_ZTV15QAbstractButton: 66u entries @@ -10012,10 +8974,6 @@ QMdiSubWindow (0xb382c7c0) 0 QPaintDevice (0xb382c880) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb382c900) 0 Vtable for QCalendarWidget QCalendarWidget::_ZTV15QCalendarWidget: 64u entries @@ -10493,10 +9451,6 @@ QDialogButtonBox (0xb382c040) 0 QPaintDevice (0xb382c4c0) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb382c640) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -10576,10 +9530,6 @@ QDockWidget (0xb382c780) 0 QPaintDevice (0xb382cc00) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb382ce80) 0 Vtable for QScrollArea QScrollArea::_ZTV11QScrollArea: 65u entries @@ -10930,10 +9880,6 @@ QDateEdit (0xb37f5500) 0 QPaintDevice (0xb37f5640) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37f56c0) 0 Vtable for QFontComboBox QFontComboBox::_ZTV13QFontComboBox: 65u entries @@ -11017,10 +9963,6 @@ QFontComboBox (0xb37f5700) 0 QPaintDevice (0xb37f5800) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37f5880) 0 Vtable for QToolBox QToolBox::_ZTV8QToolBox: 65u entries @@ -11275,10 +10217,6 @@ QTextEdit (0xb37f5b80) 0 QPaintDevice (0xb37f5cc0) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb37f5dc0) 0 Vtable for QTextBrowser QTextBrowser::_ZTV12QTextBrowser: 74u entries @@ -12210,10 +11148,6 @@ QMainWindow (0xb352aa80) 0 QPaintDevice (0xb352ab40) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb352abc0) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -12786,20 +11720,8 @@ Class QGraphicsItem QGraphicsItem (0xb347b700) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb347b800) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb347b840) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb347b900) 0 empty Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -13361,50 +12283,14 @@ Class QPainter base size=4 base align=4 QPainter (0xb347b780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb347b740) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb347bd40) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb347bb40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb33e0000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb347bf00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb33e0100) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb33e0080) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb33e0200) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb33e0180) 0 Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -13451,20 +12337,8 @@ QGraphicsScene (0xb33e0240) 0 QObject (0xb33e0280) 0 primary-for QGraphicsScene (0xb33e0240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb33e0380) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb33e0440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb33e03c0) 0 Vtable for QGraphicsView QGraphicsView::_ZTV13QGraphicsView: 68u entries @@ -13553,15 +12427,7 @@ QGraphicsView (0xb33e0480) 0 QPaintDevice (0xb33e05c0) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb33e0680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb33e06c0) 0 Vtable for QGraphicsItemAnimation QGraphicsItemAnimation::_ZTV22QGraphicsItemAnimation: 16u entries @@ -13921,10 +12787,6 @@ QAbstractPrintDialog (0xb33e0c00) 0 QPaintDevice (0xb33e0d00) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb33e0dc0) 0 Vtable for QPrintDialog QPrintDialog::_ZTV12QPrintDialog: 67u entries @@ -14183,10 +13045,6 @@ QWizard (0xb33e0a40) 0 QPaintDevice (0xb319d000) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb319d080) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -14354,10 +13212,6 @@ QFileDialog (0xb319d200) 0 QPaintDevice (0xb319d300) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb319d3c0) 0 Vtable for QFontDialog QFontDialog::_ZTV11QFontDialog: 66u entries @@ -14694,10 +13548,6 @@ QMessageBox (0xb319d8c0) 0 QPaintDevice (0xb319d9c0) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb319da80) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -15173,15 +14023,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb31053c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3105400) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb31054c0) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -15216,20 +14058,12 @@ Class QPaintEngine QPaintEngine (0xb3105440) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb31055c0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb3105540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3105600) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26u entries @@ -15526,188 +14360,40 @@ QGraphicsSvgItem (0xb2e8bf40) 0 QGraphicsItem (0xb2e8bfc0) 8 vptr=((& QGraphicsSvgItem::_ZTV16QGraphicsSvgItem) + 76u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2e8bdc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c5d000) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb2c5d080) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2c5d100) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb2c5d180) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2c5d300) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2c5d380) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2c5d400) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c5d600) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb2c5d680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c5d700) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2c5d880) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2c5d900) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2c5d980) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2c5da00) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb2c5dac0) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb2c5db40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c5dbc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c5dc80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c5dd80) 0 empty -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb2c5de40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c5dec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c5df40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c5dfc0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c5d780) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb2c5d800) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb2c5db00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb29e2000) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb29e20c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb29e2180) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb29e2200) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb29e22c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb29e2380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb29e2400) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb29e2480) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb29e2640) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb29e26c0) 0 diff --git a/tests/auto/bic/data/QtSvg.4.4.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSvg.4.4.0.linux-gcc-ia32.txt index e2ee205f5..a802fc8d3 100644 --- a/tests/auto/bic/data/QtSvg.4.4.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSvg.4.4.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7858c30) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7858c6c) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7c47c40) 0 empty - QUintForSize<4> (0xb7858ce4) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7858e10) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7858e4c) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7c47e00) 0 empty - QIntForSize<4> (0xb7858ec4) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb6a242d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a244b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a245a0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a24690) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a24780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a24870) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a24960) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a24a50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a24b40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a24c30) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a24d20) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a24e10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a24f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a3f000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a3f0f0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a3f1e0) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb6a5b1e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a77e88) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb692ba50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb696fb40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb696fdd4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bc708) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69c803c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69c8960) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69da294) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69dabb8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69ed4ec) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69ede10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a01744) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a0f078) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a0f99c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68262d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6826bf4) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb683c690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb688a924) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb67abc00) 0 QString (0xb67e7ce4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6803000) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QListData base size=4 base align=4 QListData (0xb6670690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6515960) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -386,15 +228,7 @@ Class QTextCodec QTextCodec (0xb66e3ca8) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb65240b4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6524f78) 0 Class QTextEncoder size=32 align=4 @@ -417,25 +251,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb6558100) 0 QGenericArgument (0xb65591e0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb65596cc) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb65594ec) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6569834) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb65697bc) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -527,10 +349,6 @@ QIODevice (0xb65a6f80) 0 QObject (0xb65ae834) 0 primary-for QIODevice (0xb65a6f80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65ceb40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -550,25 +368,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb660da50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6442258) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6442348) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64428ac) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6442834) 0 Class QStringList size=4 align=4 @@ -576,15 +382,7 @@ Class QStringList QStringList (0xb644c080) 0 QList (0xb64428e8) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6471654) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6471870) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -664,10 +462,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb64a4b04) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb64b3690) 0 Class QMutexLocker size=4 align=4 @@ -747,35 +541,11 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb637bfb4) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb637f078) 0 empty -Class - size=8 align=4 - base size=8 base align=4 - (0xb621d000) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb621d0f0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb621d078) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb621d168) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb621d1e0) 0 Class _IO_marker size=12 align=4 @@ -787,10 +557,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb621d258) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb621d2d0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -805,10 +571,6 @@ Class QTextStream QTextStream (0xb621d30c) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6254a8c) 0 Class QTextStreamManipulator size=24 align=4 @@ -845,40 +607,16 @@ QTextOStream (0xb627e1c0) 0 QTextStream (0xb62821e0) 0 primary-for QTextOStream (0xb627e1c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6282ca8) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6282d20) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6282c30) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6282d98) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6282e10) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6282e88) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6282f00) 0 Class timespec size=8 align=4 @@ -890,80 +628,24 @@ Class timeval base size=8 base align=4 timeval (0xb6282f78) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb62825a0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb629c03c) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb629c078) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb629c1a4) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb629c12c) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb629c0f0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb629c21c) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb629c30c) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb629c294) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb629c384) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb629c474) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb629c3fc) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb629c528) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb629c5a0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb629c618) 0 Class random_data size=28 align=4 @@ -995,20 +677,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb61b03c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb61c8000) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb61b0fb4) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb61c8348) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -1028,10 +698,6 @@ Class QtConcurrent::ResultStoreBase QtConcurrent::ResultStoreBase (0xb61c8474) 0 vptr=((& QtConcurrent::ResultStoreBase::_ZTVN12QtConcurrent15ResultStoreBaseE) + 8u) -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb61c8b7c) 0 Vtable for QFutureInterfaceBase QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries @@ -1046,25 +712,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb61c8bf4) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb6009880) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb62046cc) 0 - primary-for QFutureInterface (0xb6009880) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb6032e4c) 0 Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1093,34 +742,7 @@ QFutureWatcherBase (0xb60607c0) 0 QObject (0xb60644ec) 0 primary-for QFutureWatcherBase (0xb60607c0) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb6060ec0) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb6060f00) 0 - primary-for QFutureWatcher (0xb6060ec0) - QObject (0xb607d000) 0 - primary-for QFutureWatcherBase (0xb6060f00) Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1219,60 +841,14 @@ QtConcurrent::ThreadEngineBase (0xb60b73c0) 0 QRunnable (0xb60c3000) 0 primary-for QtConcurrent::ThreadEngineBase (0xb60b73c0) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb60c37f8) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb60b7d40) 0 - QtConcurrent::ThreadEngineStarterBase (0xb60c3870) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 -4u -32 0u -36 0u -40 0u -44 0u -48 0u -52 -4u -56 0u -60 (int (*)(...))-0x000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb60b7f00) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb60b7f40) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb60c3d20) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb60b7f40) Class std::input_iterator_tag size=1 align=1 @@ -1315,225 +891,49 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb60dc6cc) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb60dc744) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb60dc960) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60dca50) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60dcac8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60dcb40) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60dcbb8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60dcc30) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60dcca8) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60dcd20) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60dcd98) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60dce10) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60dce88) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60dcf00) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60dcf78) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb60fb000) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb60fb0f0) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb60fb168) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb60fb1e0) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb60fb564) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb60fb5dc) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb60fb6cc) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb60fb744) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb60fb7bc) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb60fb9d8) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb60fba14) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb60fba50) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb60fba8c) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb60fbac8) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb60fbb04) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60fbb7c) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60fbbb8) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60fbbf4) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60fbc30) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60fbc6c) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60fbca8) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb5f1c690) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb5f40c6c) 0 empty -Class std::__copy_move - size=1 align=1 - base size=0 base align=1 -std::__copy_move (0xb5f930b4) 0 empty -Class std::__copy_move_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_move_backward (0xb5f932d0) 0 empty -Class std::__equal - size=1 align=1 - base size=0 base align=1 -std::__equal (0xb5f936cc) 0 empty -Class std::__lc_rai - size=1 align=1 - base size=0 base align=1 -std::__lc_rai (0xb5f93834) 0 empty -Class std::__lexicographical_compare - size=1 align=1 - base size=0 base align=1 -std::__lexicographical_compare (0xb5f9399c) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5fd6078) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5fdaac8) 0 empty Class lconv size=56 align=4 @@ -1550,10 +950,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb5fe9690) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5fe9708) 0 Class tm size=44 align=4 @@ -1570,15 +966,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb5fe99d8) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb5fe9b40) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb5fe9ac8) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1590,32 +978,10 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb5fe9bb8) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb5e7a0f0) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5e7a3c0) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5e788c0) 0 empty - __gnu_cxx::new_allocator (0xb5e7a3fc) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5e7a438) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5e78980) 0 empty - __gnu_cxx::new_allocator (0xb5e7a474) 0 empty Vtable for __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries @@ -1631,82 +997,19 @@ Class __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind (0xb5e7a690) 0 nearly-empty vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 8u) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5ed9f78) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5ed9fb4) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5d1fc40) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5ed9f3c) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5d6dc6c) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5db8200) 0 - std::allocator (0xb5db8240) 0 empty - __gnu_cxx::new_allocator (0xb5d6dce4) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5d6dbf4) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5d6dd20) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5db83c0) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5d6dd5c) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5d6de10) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5db85c0) 0 - std::allocator (0xb5db8600) 0 empty - __gnu_cxx::new_allocator (0xb5d6de88) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5d6dd98) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5d6dec4) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5d6df78) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5db8780) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5d6df00) 0 Class std::locale size=4 align=4 @@ -1736,97 +1039,16 @@ Class std::locale::_Impl base size=20 base align=4 std::locale::_Impl (0xb5c5f12c) 0 -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5c67740) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb5c66ac8) 0 - primary-for std::collate (0xb5c67740) - -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5c67840) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb5c66bb8) 0 - primary-for std::collate (0xb5c67840) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5c66b7c) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5c66c6c) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5c8a7c0) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5c92000) 0 empty -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5c8a900) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb5c8a940) 0 - primary-for std::collate_byname (0xb5c8a900) - std::locale::facet (0xb5c92078) 0 - primary-for std::collate (0xb5c8a940) - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5c8a9c0) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb5c8aa00) 0 - primary-for std::collate_byname (0xb5c8a9c0) - std::locale::facet (0xb5c92168) 0 - primary-for std::collate (0xb5c8aa00) + + + + Vtable for std::ios_base::failure std::ios_base::failure::_ZTVNSt8ios_base7failureE: 5u entries @@ -1872,583 +1094,85 @@ Class std::ios_base std::ios_base (0xb5c9221c) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5ce9654) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) - -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5ce98e8) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb5ce9b7c) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb5b574b0) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb5b31ac8) 0 - primary-for std::ctype (0xb5b574b0) - std::ctype_base (0xb5b31b04) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb5b60d70) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb5b71690) 0 - primary-for std::__ctype_abstract_base (0xb5b60d70) - std::ctype_base (0xb5b716cc) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb5b61900) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb5b7abe0) 0 - primary-for std::ctype (0xb5b61900) - std::locale::facet (0xb5b717bc) 0 - primary-for std::__ctype_abstract_base (0xb5b7abe0) - std::ctype_base (0xb5b717f8) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb5b61ac0) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb5b83370) 0 - primary-for std::ctype_byname (0xb5b61ac0) - std::locale::facet (0xb5b81b04) 0 - primary-for std::ctype (0xb5b83370) - std::ctype_base (0xb5b81b40) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb5b61b40) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb5b61b80) 0 - primary-for std::ctype_byname (0xb5b61b40) - std::__ctype_abstract_base (0xb5b83a00) 0 - primary-for std::ctype (0xb5b61b80) - std::locale::facet (0xb5b81ca8) 0 - primary-for std::__ctype_abstract_base (0xb5b83a00) - std::ctype_base (0xb5b81ce4) 0 empty + + + + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb5b8b654) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5b95580) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb5b8bec4) 0 - primary-for std::numpunct (0xb5b95580) - -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5b95640) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb5b8bfb4) 0 - primary-for std::numpunct (0xb5b95640) -Class __gnu_cxx::__conditional_type - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type (0xb5be8618) 0 empty -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5a1ab80) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb5a1abc0) 0 - primary-for std::numpunct_byname (0xb5a1ab80) - std::locale::facet (0xb5be8c6c) 0 - primary-for std::numpunct (0xb5a1abc0) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5a1ac00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5be8d5c) 0 - primary-for std::num_get > > (0xb5a1ac00) - -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5a1ac80) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5be8e4c) 0 - primary-for std::num_put > > (0xb5a1ac80) - -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5a1ad00) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb5a1ad40) 0 - primary-for std::numpunct_byname (0xb5a1ad00) - std::locale::facet (0xb5be8f3c) 0 - primary-for std::numpunct (0xb5a1ad40) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5a1adc0) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5be85dc) 0 - primary-for std::num_get > > (0xb5a1adc0) - -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5a1ae40) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5be8f00) 0 - primary-for std::num_put > > (0xb5a1ae40) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb5a65e80) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb5a607bc) 0 - primary-for std::basic_ios > (0xb5a65e80) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb5a65ec0) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb5a608ac) 0 - primary-for std::basic_ios > (0xb5a65ec0) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5ab6b40) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb5ab6b80) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb5aa14ec) 4 - primary-for std::basic_ios > (0xb5ab6b80) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5aa16cc) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5ab6cc0) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5ab6d00) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5aa1708) 4 - primary-for std::basic_ios > (0xb5ab6d00) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5aa18ac) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5af5580) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb5af55c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb5aa1e10) 8 - primary-for std::basic_ios > (0xb5af55c0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5af5680) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5af56c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb59060f0) 8 - primary-for std::basic_ios > (0xb5af56c0) - -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb59067f8) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5906834) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5923580) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5906870) 0 empty -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5906e4c) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb595c480 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2486,44 +1210,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb596c050) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb595c480) 0 - primary-for std::basic_iostream > (0xb596c050) - subvttidx=4u - std::basic_ios > (0xb595c4c0) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb5906e88) 12 - primary-for std::basic_ios > (0xb595c4c0) - std::basic_ostream > (0xb595c500) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb595c4c0) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5971000) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb595c800 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2561,110 +1249,21 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb597b0f0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb595c800) 0 - primary-for std::basic_iostream > (0xb597b0f0) - subvttidx=4u - std::basic_ios > (0xb595c840) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb597103c) 12 - primary-for std::basic_ios > (0xb595c840) - std::basic_ostream > (0xb595c880) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb595c840) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5971924) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb59718ac) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb5971834) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb5971780) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb5971ce4) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb59a94b0) 0 -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb5895924) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb58a5870) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb5898b00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb58a5870) - QFutureInterfaceBase (0xb5895b04) 0 - primary-for QFutureInterface (0xb5898b00) - QRunnable (0xb5895b40) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb5898b80) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb58a5c80) 0 - primary-for QtConcurrent::RunFunctionTask (0xb5898b80) - QFutureInterface (0xb5898bc0) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb58a5c80) - QFutureInterfaceBase (0xb5895ce4) 0 - primary-for QFutureInterface (0xb5898bc0) - QRunnable (0xb5895d20) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + Class QLibraryInfo size=1 align=1 @@ -2715,50 +1314,22 @@ QFile (0xb57f9f00) 0 QObject (0xb561b078) 0 primary-for QIODevice (0xb57f9f40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56339d8) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb56455a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5653c30) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5653f3c) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5668ca8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5668c30) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb5668d98) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb569330c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56933fc) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2833,10 +1404,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb56c16cc) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56d47bc) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2926,10 +1493,6 @@ Class QDirIterator QDirIterator (0xb56f599c) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5504168) 0 Vtable for QFileSystemWatcher QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries @@ -3067,25 +1630,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb556512c) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb55651a4) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb5539f3c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb556599c) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5565b04) 0 Class QResource size=4 align=4 @@ -3097,275 +1648,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb558e3fc) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb558e834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb558ea14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb558ebf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb558edd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb558efb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a71a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a7384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a7564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a7744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a7924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a7b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a7ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a7ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae0b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ae834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55aea14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55aebf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55aedd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55aefb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b71a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b7384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b7564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b7744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b7924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b7b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b7ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55b7ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bf0b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bf294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bf474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bf654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bf834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bfa14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bfbf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bfdd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55bffb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c61a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c6384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c6564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c6744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c6924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c6b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c6ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55c6ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55cd0b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55cd294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55cd474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55cd654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55cd834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55cda14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55cdbf4) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3392,45 +1727,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb55cddd4) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5400870) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb54007f8) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb5400960) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb54008e8) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb5436ce4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb544230c) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb54424ec) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb54426cc) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3508,15 +1815,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb5493744) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54a1690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54cb0f0) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -3543,10 +1842,6 @@ QEventLoop (0xb548abc0) 0 QObject (0xb54cbf78) 0 primary-for QEventLoop (0xb548abc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54da5a0) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -3591,20 +1886,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb54fb834) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb530dbf4) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb530dce4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5316438) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -3774,10 +2061,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb53635a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5363d20) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3889,20 +2172,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb53a7960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53a7e10) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb53a7f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53e0348) 0 empty Class QMetaProperty size=20 align=4 @@ -3914,10 +2189,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb53e0744) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53e0a8c) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -4129,10 +2400,6 @@ QLibrary (0xb52288c0) 0 QObject (0xb524b3c0) 0 primary-for QLibrary (0xb52288c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb525b30c) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4169,20 +2436,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb52848e8) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb5284f78) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb5284c6c) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb529a474) 0 Class QWriteLocker size=4 align=4 @@ -4209,10 +2468,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb52d3a50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52e2744) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -4229,70 +2484,42 @@ Class QDate base size=4 base align=4 QDate (0xb50de744) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50ff0f0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb50ff1e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb510c744) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb510c834) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5114f3c) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb51270b4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5127690) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb514312c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5143a14) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb51670f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51674b0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb5184618) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb519703c) 0 empty Class QLinkedListData size=20 align=4 @@ -4304,40 +2531,24 @@ Class QSize base size=8 base align=4 QSize (0xb4ff0f78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5025960) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb5040bf4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb504dd20) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb506ba50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5085924) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb50cb528) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ee4a50) 0 empty Class QSharedData size=4 align=4 @@ -4385,20 +2596,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb4f8b1e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f96780) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4f968e8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4f96870) 0 Class QXmlStreamAttributes size=4 align=4 @@ -4411,30 +2610,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb4f96960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fb9384) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb4fb94b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fc9078) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb4fc91a4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4de012c) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -4461,25 +2648,9 @@ Class QXmlStreamWriter base size=4 base align=4 QXmlStreamWriter (0xb4dfa9d8) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4e25924) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4e2599c) 0 -Class QColor:::: - size=10 align=2 - base size=10 base align=2 -QColor:::: (0xb4e25a14) 0 -Class QColor:: - size=10 align=2 - base size=10 base align=2 -QColor:: (0xb4e258ac) 0 Class QColor size=16 align=4 @@ -4501,10 +2672,6 @@ Class QKeySequence base size=4 base align=4 QKeySequence (0xb4e54780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4e63a50) 0 empty Vtable for QMimeSource QMimeSource::_ZTV11QMimeSource: 7u entries @@ -4802,15 +2969,7 @@ Class QInputMethodEvent::Attribute base size=24 base align=4 QInputMethodEvent::Attribute (0xb4ceda50) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4cf930c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4cf9294) 0 Vtable for QInputMethodEvent QInputMethodEvent::_ZTV17QInputMethodEvent: 4u entries @@ -5099,20 +3258,8 @@ Class QAccessible base size=0 base align=1 QAccessible (0xb4d512d0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d51bf4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4d65834) 0 -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4d7c3fc) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 19u entries @@ -5143,20 +3290,8 @@ QAccessibleInterface (0xb4d409c0) 0 nearly-empty vptr=((& QAccessibleInterface::_ZTV20QAccessibleInterface) + 8u) QAccessible (0xb4d7c7f8) 0 empty -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb4d8c30c) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb4d8c294) 0 -Class QSet - size=4 align=4 - base size=4 base align=4 -QSet (0xb4d8c21c) 0 Vtable for QAccessibleInterfaceEx QAccessibleInterfaceEx::_ZTV22QAccessibleInterfaceEx: 22u entries @@ -5669,15 +3804,7 @@ Class QPaintDevice QPaintDevice (0xb4c14a50) 0 vptr=((& QPaintDevice::_ZTV12QPaintDevice) + 8u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4c26f3c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4c26ec4) 0 Class QPolygon size=4 align=4 @@ -5685,15 +3812,7 @@ Class QPolygon QPolygon (0xb4bebd80) 0 QVector (0xb4c26f78) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4c5603c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4c41fb4) 0 Class QPolygonF size=4 align=4 @@ -5706,10 +3825,6 @@ Class QMatrix base size=48 base align=4 QMatrix (0xb4c56f78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4c815dc) 0 empty Class QPainterPath::Element size=20 align=4 @@ -5721,25 +3836,13 @@ Class QPainterPath base size=4 base align=4 QPainterPath (0xb4c81d98) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4ca5e4c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4ca5dd4) 0 Class QPainterPathPrivate size=8 align=4 base size=8 base align=4 QPainterPathPrivate (0xb4ca5a50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ca5e88) 0 empty Class QPainterPathStroker size=4 align=4 @@ -5751,10 +3854,6 @@ Class QTransform base size=80 base align=4 QTransform (0xb4ade708) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4aee7f8) 0 empty Class QImageTextKeyLang size=8 align=4 @@ -5779,10 +3878,6 @@ QImage (0xb4b0c900) 0 QPaintDevice (0xb4b53000) 0 primary-for QImage (0xb4b0c900) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b894ec) 0 empty Vtable for QPixmap QPixmap::_ZTV7QPixmap: 7u entries @@ -5807,45 +3902,17 @@ Class QBrush base size=4 base align=4 QBrush (0xb4bb2f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4bbea14) 0 empty Class QBrushData size=124 align=4 base size=121 base align=4 QBrushData (0xb4bbeca8) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb4bd2924) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb4bd28ac) 0 -Class QGradient:::: - size=32 align=4 - base size=32 base align=4 -QGradient:::: (0xb4bd2a14) 0 -Class QGradient:::: - size=40 align=4 - base size=40 base align=4 -QGradient:::: (0xb4bd2a8c) 0 -Class QGradient:::: - size=24 align=4 - base size=24 base align=4 -QGradient:::: (0xb4bd2b04) 0 -Class QGradient:: - size=40 align=4 - base size=40 base align=4 -QGradient:: (0xb4bd299c) 0 Class QGradient size=56 align=4 @@ -5906,10 +3973,6 @@ Class QSizePolicy base size=4 base align=4 QSizePolicy (0xb4a747bc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4ac3834) 0 Class QCursor size=4 align=4 @@ -5997,10 +4060,6 @@ QWidget (0xb48e1b90) 0 QPaintDevice (0xb48e30b4) 8 vptr=((& QWidget::_ZTV7QWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb490ee10) 0 Vtable for QDialog QDialog::_ZTV7QDialog: 66u entries @@ -6251,10 +4310,6 @@ QAbstractPrintDialog (0xb49bb400) 0 QPaintDevice (0xb49ca168) 8 vptr=((& QAbstractPrintDialog::_ZTV20QAbstractPrintDialog) + 248u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47d730c) 0 Vtable for QColorDialog QColorDialog::_ZTV12QColorDialog: 66u entries @@ -6505,20 +4560,12 @@ QFileDialog (0xb49bbe80) 0 QPaintDevice (0xb4803bb8) 8 vptr=((& QFileDialog::_ZTV11QFileDialog) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4815ca8) 0 Class QIcon size=4 align=4 base size=4 base align=4 QIcon (0xb4844078) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb485a438) 0 empty Vtable for QFileSystemModel QFileSystemModel::_ZTV16QFileSystemModel: 42u entries @@ -6980,10 +5027,6 @@ QMessageBox (0xb46d2280) 0 QPaintDevice (0xb46d630c) 8 vptr=((& QMessageBox::_ZTV11QMessageBox) + 244u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb46f6168) 0 Vtable for QPageSetupDialog QPageSetupDialog::_ZTV16QPageSetupDialog: 67u entries @@ -7488,10 +5531,6 @@ QWizard (0xb4743680) 0 QPaintDevice (0xb475b960) 8 vptr=((& QWizard::_ZTV7QWizard) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb476dca8) 0 Vtable for QWizardPage QWizardPage::_ZTV11QWizardPage: 68u entries @@ -7624,10 +5663,6 @@ Class QGraphicsItem QGraphicsItem (0xb479f564) 0 vptr=((& QGraphicsItem::_ZTV13QGraphicsItem) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb47c5d5c) 0 Vtable for QAbstractGraphicsShapeItem QAbstractGraphicsShapeItem::_ZTV26QAbstractGraphicsShapeItem: 39u entries @@ -8184,15 +6219,7 @@ QGraphicsItemGroup (0xb464a040) 0 QGraphicsItem (0xb46443c0) 0 primary-for QGraphicsItemGroup (0xb464a040) -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4644c30) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4644dd4) 0 empty Vtable for QGraphicsLayoutItem QGraphicsLayoutItem::_ZTV19QGraphicsLayoutItem: 8u entries @@ -8544,10 +6571,6 @@ Class QPen base size=4 base align=4 QPen (0xb44c3f3c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb44d1780) 0 empty Vtable for QGraphicsScene QGraphicsScene::_ZTV14QGraphicsScene: 34u entries @@ -8594,20 +6617,8 @@ QGraphicsScene (0xb46b56c0) 0 QObject (0xb44d1a14) 0 primary-for QGraphicsScene (0xb46b56c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44f6744) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4508168) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb45080f0) 0 Vtable for QGraphicsSceneEvent QGraphicsSceneEvent::_ZTV19QGraphicsSceneEvent: 4u entries @@ -8770,65 +6781,21 @@ Class QTextOption base size=24 base align=4 QTextOption (0xb454be10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb456c4ec) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb457dac8) 0 empty Class QPainter size=4 align=4 base size=4 base align=4 QPainter (0xb457ddd4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb45918ac) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb43f330c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb43f3294) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb43f3474) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb43f33fc) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb43f3bb8) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb43f3b40) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb43f3d20) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb43f3ca8) 0 Vtable for QAbstractScrollArea QAbstractScrollArea::_ZTV19QAbstractScrollArea: 65u entries @@ -9083,15 +7050,7 @@ QGraphicsView (0xb4494480) 0 QPaintDevice (0xb44a5618) 8 vptr=((& QGraphicsView::_ZTV13QGraphicsView) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb44b1ec4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42d1ac8) 0 Vtable for QBitmap QBitmap::_ZTV7QBitmap: 7u entries @@ -9346,10 +7305,6 @@ QImageIOPlugin (0xb4344af0) 0 QFactoryInterface (0xb433af00) 8 nearly-empty primary-for QImageIOHandlerFactoryInterface (0xb4313f00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb434d960) 0 Class QImageReader size=4 align=4 @@ -9525,15 +7480,7 @@ QActionGroup (0xb41d0580) 0 QObject (0xb41d7a8c) 0 primary-for QActionGroup (0xb41d0580) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb41e58ac) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb41e5834) 0 Vtable for QInputContext QInputContext::_ZTV13QInputContext: 26u entries @@ -9839,10 +7786,6 @@ QAbstractSpinBox (0xb4219d00) 0 QPaintDevice (0xb425203c) 8 vptr=((& QAbstractSpinBox::_ZTV16QAbstractSpinBox) + 252u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb42671e0) 0 Vtable for QAbstractSlider QAbstractSlider::_ZTV15QAbstractSlider: 64u entries @@ -10050,15 +7993,7 @@ QStyle (0xb426da00) 0 QObject (0xb42ac708) 0 primary-for QStyle (0xb426da00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40dc078) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb40dcca8) 0 Vtable for QTabBar QTabBar::_ZTV7QTabBar: 67u entries @@ -10317,10 +8252,6 @@ Class QStyleOptionFrame QStyleOptionFrame (0xb4166040) 0 QStyleOption (0xb415eb04) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb416d258) 0 Class QStyleOptionFrameV2 size=56 align=4 @@ -10347,10 +8278,6 @@ Class QStyleOptionHeader QStyleOptionHeader (0xb4166ac0) 0 QStyleOption (0xb419721c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4197c6c) 0 Class QStyleOptionButton size=64 align=4 @@ -10358,10 +8285,6 @@ Class QStyleOptionButton QStyleOptionButton (0xb4166d80) 0 QStyleOption (0xb4197960) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3fc7168) 0 Class QStyleOptionTab size=72 align=4 @@ -10376,10 +8299,6 @@ QStyleOptionTabV2 (0xb41b23c0) 0 QStyleOptionTab (0xb41b2400) 0 QStyleOption (0xb3fe01a4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3fe0e4c) 0 Class QStyleOptionToolBar size=68 align=4 @@ -10406,10 +8325,6 @@ Class QStyleOptionMenuItem QStyleOptionMenuItem (0xb41b2d00) 0 QStyleOption (0xb4012834) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4024168) 0 Class QStyleOptionQ3ListViewItem size=64 align=4 @@ -10442,10 +8357,6 @@ Class QStyleOptionViewItem QStyleOptionViewItem (0xb402c9c0) 0 QStyleOption (0xb40543c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4054c30) 0 Class QStyleOptionViewItemV2 size=84 align=4 @@ -10510,15 +8421,7 @@ QStyleOptionSpinBox (0xb40aa600) 0 QStyleOptionComplex (0xb40aa640) 0 QStyleOption (0xb40b3474) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb40b3c6c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb40b3bf4) 0 Class QStyleOptionQ3ListView size=84 align=4 @@ -10527,10 +8430,6 @@ QStyleOptionQ3ListView (0xb40aa880) 0 QStyleOptionComplex (0xb40aa8c0) 0 QStyleOption (0xb40b3b04) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3eda474) 0 Class QStyleOptionToolButton size=96 align=4 @@ -10627,10 +8526,6 @@ Class QItemSelectionRange base size=8 base align=4 QItemSelectionRange (0xb3f319d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3f62b7c) 0 empty Vtable for QItemSelectionModel QItemSelectionModel::_ZTV19QItemSelectionModel: 18u entries @@ -10661,20 +8556,8 @@ QItemSelectionModel (0xb3f3abc0) 0 QObject (0xb3f7c000) 0 primary-for QItemSelectionModel (0xb3f3abc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3f8b294) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3f8bf3c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3f8bec4) 0 Class QItemSelection size=4 align=4 @@ -10804,10 +8687,6 @@ QAbstractItemView (0xb3fb9180) 0 QPaintDevice (0xb3fba2d0) 8 vptr=((& QAbstractItemView::_ZTV17QAbstractItemView) + 392u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3de00b4) 0 Vtable for QAbstractProxyModel QAbstractProxyModel::_ZTV19QAbstractProxyModel: 47u entries @@ -11270,15 +9149,7 @@ Class QItemEditorCreatorBase QItemEditorCreatorBase (0xb3e6ac6c) 0 nearly-empty vptr=((& QItemEditorCreatorBase::_ZTV22QItemEditorCreatorBase) + 8u) -Class QHash:: - size=4 align=4 - base size=4 base align=4 -QHash:: (0xb3e7d708) 0 -Class QHash - size=4 align=4 - base size=4 base align=4 -QHash (0xb3e7d690) 0 Vtable for QItemEditorFactory QItemEditorFactory::_ZTV18QItemEditorFactory: 6u entries @@ -11419,15 +9290,7 @@ QListView (0xb3e83140) 0 QPaintDevice (0xb3e7da14) 8 vptr=((& QListView::_ZTV9QListView) + 392u) -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3ebb12c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3ebb0b4) 0 Vtable for QListWidgetItem QListWidgetItem::_ZTV15QListWidgetItem: 11u entries @@ -11720,15 +9583,7 @@ Class QStandardItem QStandardItem (0xb3d370f0) 0 vptr=((& QStandardItem::_ZTV13QStandardItem) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3d93b04) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3d93a8c) 0 Vtable for QStandardItemModel QStandardItemModel::_ZTV18QStandardItemModel: 42u entries @@ -12007,15 +9862,7 @@ Class QTableWidgetSelectionRange base size=16 base align=4 QTableWidgetSelectionRange (0xb3beff00) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb3c0bc30) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb3c0bbb8) 0 Vtable for QTableWidgetItem QTableWidgetItem::_ZTV16QTableWidgetItem: 10u entries @@ -12292,35 +10139,15 @@ QTreeView (0xb3c64380) 0 QPaintDevice (0xb3c68bf4) 8 vptr=((& QTreeView::_ZTV9QTreeView) + 400u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3c913c0) 0 Class QTreeWidgetItemIterator size=12 align=4 base size=12 base align=4 QTreeWidgetItemIterator (0xb3c819d8) 0 -Class QVector >:: - size=4 align=4 - base size=4 base align=4 -QVector >:: (0xb3cb9e10) 0 -Class QVector > - size=4 align=4 - base size=4 base align=4 -QVector > (0xb3cb9d98) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb3ad621c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb3ad61a4) 0 Vtable for QTreeWidgetItem QTreeWidgetItem::_ZTV15QTreeWidgetItem: 10u entries @@ -13296,15 +11123,7 @@ Class QTextItem base size=0 base align=1 QTextItem (0xb3a7d438) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb3a7d690) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3a7df00) 0 Vtable for QPaintEngine QPaintEngine::_ZTV12QPaintEngine: 24u entries @@ -13339,20 +11158,12 @@ Class QPaintEngine QPaintEngine (0xb3a7d780) 0 vptr=((& QPaintEngine::_ZTV12QPaintEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3aa50f0) 0 Class QPaintEngineState size=4 align=4 base size=4 base align=4 QPaintEngineState (0xb3a96dd4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3aa5e10) 0 Vtable for QPrinter QPrinter::_ZTV8QPrinter: 7u entries @@ -13450,10 +11261,6 @@ QCommonStyle (0xb3aa2f00) 0 QObject (0xb3934474) 0 primary-for QStyle (0xb3aa2f40) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb394a744) 0 Vtable for QMotifStyle QMotifStyle::_ZTV11QMotifStyle: 35u entries @@ -13985,30 +11792,14 @@ Class QTextLength base size=12 base align=4 QTextLength (0xb37eb168) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb37f3bf4) 0 Class QTextFormat size=8 align=4 base size=8 base align=4 QTextFormat (0xb37f3474) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb382a0b4) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb382a03c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb382add4) 0 Class QTextCharFormat size=8 align=4 @@ -14070,15 +11861,7 @@ Class QTextLayout base size=4 base align=4 QTextLayout (0xb36e3c30) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb36ef960) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb36ef8e8) 0 Class QTextLine size=8 align=4 @@ -14128,15 +11911,7 @@ QTextDocument (0xb36d2d40) 0 QObject (0xb370d924) 0 primary-for QTextDocument (0xb36d2d40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3726294) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb3735fb4) 0 Class QTextCursor size=4 align=4 @@ -14148,15 +11923,7 @@ Class QAbstractTextDocumentLayout::Selection base size=12 base align=4 QAbstractTextDocumentLayout::Selection (0xb375b21c) 0 -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb375b618) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb375b5a0) 0 Class QAbstractTextDocumentLayout::PaintContext size=48 align=4 @@ -14318,10 +12085,6 @@ QTextFrame (0xb3734f40) 0 QObject (0xb37a6708) 0 primary-for QTextObject (0xb3734f80) -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb35c80f0) 0 empty Vtable for QTextBlockUserData QTextBlockUserData::_ZTV18QTextBlockUserData: 4u entries @@ -14346,25 +12109,13 @@ Class QTextBlock base size=8 base align=4 QTextBlock (0xb35c85dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb35e80f0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb35e81e0) 0 empty Class QTextFragment size=12 align=4 base size=12 base align=4 QTextFragment (0xb35e8384) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb35f5744) 0 empty Vtable for QSyntaxHighlighter QSyntaxHighlighter::_ZTV18QSyntaxHighlighter: 15u entries @@ -15494,10 +13245,6 @@ QDateEdit (0xb3542580) 0 QPaintDevice (0xb35651a4) 8 vptr=((& QDateEdit::_ZTV9QDateEdit) + 260u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3565a50) 0 Vtable for QDial QDial::_ZTV5QDial: 64u entries @@ -15658,10 +13405,6 @@ QDialogButtonBox (0xb3542c00) 0 QPaintDevice (0xb359e3c0) 8 vptr=((& QDialogButtonBox::_ZTV16QDialogButtonBox) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb35ab7f8) 0 Vtable for QDockWidget QDockWidget::_ZTV11QDockWidget: 63u entries @@ -15741,10 +13484,6 @@ QDockWidget (0xb3542f80) 0 QPaintDevice (0xb33c63fc) 8 vptr=((& QDockWidget::_ZTV11QDockWidget) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb33dea8c) 0 Vtable for QFocusFrame QFocusFrame::_ZTV11QFocusFrame: 63u entries @@ -15906,10 +13645,6 @@ QFontComboBox (0xb33d3640) 0 QPaintDevice (0xb34163fc) 8 vptr=((& QFontComboBox::_ZTV13QFontComboBox) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb34243c0) 0 Vtable for QGroupBox QGroupBox::_ZTV9QGroupBox: 63u entries @@ -16228,10 +13963,6 @@ QMainWindow (0xb346d380) 0 QPaintDevice (0xb347f2d0) 8 vptr=((& QMainWindow::_ZTV11QMainWindow) + 236u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3496438) 0 Vtable for QMdiArea QMdiArea::_ZTV8QMdiArea: 65u entries @@ -16317,10 +14048,6 @@ QMdiArea (0xb346d700) 0 QPaintDevice (0xb32b803c) 8 vptr=((& QMdiArea::_ZTV8QMdiArea) + 240u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb32ca474) 0 Vtable for QMdiSubWindow QMdiSubWindow::_ZTV13QMdiSubWindow: 63u entries @@ -16400,10 +14127,6 @@ QMdiSubWindow (0xb346db00) 0 QPaintDevice (0xb32eb078) 8 vptr=((& QMdiSubWindow::_ZTV13QMdiSubWindow) + 232u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb32fb168) 0 Vtable for QMenu QMenu::_ZTV5QMenu: 63u entries @@ -16681,10 +14404,6 @@ QTextEdit (0xb31ba7c0) 0 QPaintDevice (0xb31bddd4) 8 vptr=((& QTextEdit::_ZTV9QTextEdit) + 256u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb3201d20) 0 Vtable for QPlainTextEdit QPlainTextEdit::_ZTV14QPlainTextEdit: 69u entries @@ -18386,203 +16105,43 @@ QSvgWidget (0xb2fcb100) 0 QPaintDevice (0xb2fc5780) 8 vptr=((& QSvgWidget::_ZTV10QSvgWidget) + 232u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3028870) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb3040e10) 0 -Class QVectorTypedData - size=24 align=4 - base size=24 base align=4 -QVectorTypedData (0xb2f0d12c) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2f0dc30) 0 -Class QVectorTypedData - size=36 align=4 - base size=36 base align=4 -QVectorTypedData (0xb2f2b708) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2f9bf3c) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2fb30f0) 0 -Class QVectorTypedData - size=48 align=4 - base size=48 base align=4 -QVectorTypedData (0xb2fb32d0) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2fb34b0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2e74c6c) 0 -Class QVectorTypedData > - size=20 align=4 - base size=20 base align=4 -QVectorTypedData > (0xb2e74e4c) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2c76000) 0 -Class QVectorTypedData - size=32 align=4 - base size=32 base align=4 -QVectorTypedData (0xb2c76474) 0 -Class QVectorTypedData - size=28 align=4 - base size=28 base align=4 -QVectorTypedData (0xb2c76e4c) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2cbbb7c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2d1303c) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb2d130b4) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb2d2afb4) 0 empty -Class QHashNode - size=16 align=4 - base size=13 base align=4 -QHashNode (0xb2d3a2d0) 0 -Class QHashNode - size=16 align=4 - base size=16 base align=4 -QHashNode (0xb2d6fec4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2b84474) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2b847bc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2b95078) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2b954b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2b95a50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2ba8b04) 0 empty -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb2bb4168) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2bb4294) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2bb44ec) 0 -Class QVector::realloc(int, int) [with T = QPoint]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPoint]:: (0xb2bb4ca8) 0 -Class QVector::realloc(int, int) [with T = QPointF]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPointF]:: (0xb2be63fc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2be6b7c) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2be6bf4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb2c24078) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c240f0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c24564) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb2c2499c) 0 -Class QVector::realloc(int, int) [with T = QTextLength]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QTextLength]:: (0xb2c24d20) 0 -Class QHashDummyNode - size=12 align=4 - base size=12 base align=4 -QHashDummyNode (0xb2c562d0) 0 -Class QVector::realloc(int, int) [with T = QPainterPath::Element]:: - size=4 align=4 - base size=4 base align=4 -QVector::realloc(int, int) [with T = QPainterPath::Element]:: (0xb2c56960) 0 diff --git a/tests/auto/bic/data/QtTest.4.1.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtTest.4.1.0.linux-gcc-ia32.txt index fb9596e1e..40f7bf90e 100644 --- a/tests/auto/bic/data/QtTest.4.1.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtTest.4.1.0.linux-gcc-ia32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7f75f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78410c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78411c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78412c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841380) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb78413c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78414c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7841500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7841540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7841580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78415c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7841600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7841640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7841680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb78416c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7841700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7841740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7841780) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb7841880) 0 QGenericArgument (0xb78418c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb7841a80) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0xb7841b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841bc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb7841ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7841f00) 0 empty Class QString::Null size=1 align=1 @@ -250,10 +130,6 @@ Class QString base size=4 base align=4 QString (0xb7841f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb724f080) 0 Class QLatin1String size=4 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0xb724f180) 0 QString (0xb724f1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb724f200) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0xb724f500) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb724f880) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb724f800) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0xb724fa00) 0 QObject (0xb724fa40) 0 primary-for QIODevice (0xb724fa00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb724fb00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb724fc80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb724fcc0) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0xb6efc1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6efc740) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0xb6efc680) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6efc880) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6efc800) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb6efc900) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6efc940) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6efc9c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6efc980) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6efca00) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6efca40) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6efcb40) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6efcbc0) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6efcb80) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6efcc40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6efcc80) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0xb6efccc0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6efcd80) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0xb6efcf40) 0 QTextStream (0xb6efcf80) 0 primary-for QTextOStream (0xb6efcf40) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6efc4c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6efc700) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6efc080) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6efc780) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6efcd40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6efcf00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6efcfc0) 0 Class timespec size=8 align=4 @@ -701,80 +485,24 @@ Class timeval base size=8 base align=4 timeval (0xb6eb1040) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6eb1080) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6eb10c0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6eb1100) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6eb11c0) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6eb1180) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6eb1140) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6eb1200) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6eb1280) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6eb1240) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6eb12c0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6eb1340) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6eb1300) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6eb1380) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6eb13c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6eb1400) 0 Class random_data size=28 align=4 @@ -845,10 +573,6 @@ QFile (0xb6eb1780) 0 QObject (0xb6eb1800) 0 primary-for QIODevice (0xb6eb17c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6eb1880) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -901,50 +625,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb6eb1a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6eb1a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6eb1a80) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6eb1b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6eb1ac0) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb6eb1b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6eb1bc0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6eb1c00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6eb1cc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6eb1c40) 0 Class QStringList size=4 align=4 @@ -952,30 +648,14 @@ Class QStringList QStringList (0xb6eb1d00) 0 QList (0xb6eb1d40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6eb1dc0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6eb1e00) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb6eb1ec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6eb1f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6eb1fc0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1032,10 +712,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb6eb1740) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c7a0c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1190,110 +866,30 @@ Class QUrl base size=4 base align=4 QUrl (0xb6c7a480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c7a500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c7a540) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6c7a580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a600) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a680) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a6c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a740) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a780) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a7c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a800) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a840) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a880) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a8c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a900) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a980) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7a9c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7aa00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb6c7aa40) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1320,35 +916,15 @@ Class QVariant base size=12 base align=4 QVariant (0xb6c7aa80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6c7ad80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6c7ad00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6c7ae80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6c7ae00) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6c7a040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c7a200) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1380,80 +956,48 @@ Class QPoint base size=8 base align=4 QPoint (0xb6c7abc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c7ac00) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6c7aec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c7af80) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6a0f000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0f040) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6a0f080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0f0c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0xb6a0f100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0f300) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6a0f380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0f580) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6a0f640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0f740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6a0f780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0f840) 0 empty Class QLinkedListData size=20 align=4 @@ -1470,10 +1014,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6a0fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0fc40) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1490,40 +1030,24 @@ Class QLocale base size=4 base align=4 QLocale (0xb6a0fe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0fe40) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0xb6a0ffc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0f1c0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6a0f200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0f2c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6a0f140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0f180) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1683,10 +1207,6 @@ QEventLoop (0xb68bf100) 0 QObject (0xb68bf140) 0 primary-for QEventLoop (0xb68bf100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68bf240) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1778,20 +1298,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb68bf680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68bf6c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb68bf700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68bf780) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2011,10 +1523,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb68bfc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68bfc40) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2109,20 +1617,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb68bfec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68bff00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb68bff40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68bff80) 0 empty Class QMetaProperty size=20 align=4 @@ -2134,10 +1634,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb68bf000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68bf0c0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2265,30 +1761,10 @@ Class QTestData base size=4 base align=4 QTestData (0xb65f50c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb65f5100) 0 empty -Class QList >:: - size=4 align=4 - base size=4 base align=4 -QList >:: (0xb65f5340) 0 -Class QList > - size=4 align=4 - base size=4 base align=4 -QList > (0xb65f52c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb65f5500) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb65f5480) 0 Vtable for QSignalSpy QSignalSpy::_ZTV10QSignalSpy: 14u entries @@ -2341,48 +1817,12 @@ QTestEventLoop (0xb65f5780) 0 QObject (0xb65f57c0) 0 primary-for QTestEventLoop (0xb65f5780) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb65f5880) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb65f59c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65f5a40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb65f5ac0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb65f5bc0) 0 -Class QTypeInfo > - size=1 align=1 - base size=0 base align=1 -QTypeInfo > (0xb65f5c40) 0 empty -Class QList >::Node - size=4 align=4 - base size=4 base align=4 -QList >::Node (0xb65f5cc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb65f5d40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb65f5dc0) 0 diff --git a/tests/auto/bic/data/QtTest.4.1.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtTest.4.1.0.win32-gcc-ia32.txt index b152f4163..82131cf80 100644 --- a/tests/auto/bic/data/QtTest.4.1.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtTest.4.1.0.win32-gcc-ia32.txt @@ -18,80 +18,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xad5e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebc80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebe00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07b80) 0 empty Class QFlag size=4 align=4 @@ -108,10 +48,6 @@ Class QChar base size=2 base align=2 QChar (0xb4d840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb70cc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -139,70 +75,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc34f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd4bc40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd77100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd773c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd72c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd77a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd949c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8c80) 0 Class QInternal size=1 align=1 @@ -229,10 +113,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xeac500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeac940) 0 Class QCharRef size=8 align=4 @@ -245,10 +125,6 @@ Class QConstString QConstString (0x11e1880) 0 QString (0x11e18c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11e1c00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -311,10 +187,6 @@ Class QListData base size=4 base align=4 QListData (0x1279f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x137ce40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -339,15 +211,7 @@ Class QTextCodec QTextCodec (0xeac480) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13c0140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc3da40) 0 Class QTextEncoder size=32 align=4 @@ -370,25 +234,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x13fefc0) 0 QGenericArgument (0x1404000) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1417700) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1404580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1431f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1431b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -480,10 +332,6 @@ QIODevice (0x137c700) 0 QObject (0x14bb540) 0 primary-for QIODevice (0x137c700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14bb840) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -503,25 +351,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xeac380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15884c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1588840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1588d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1588c40) 0 Class QStringList size=4 align=4 @@ -529,15 +365,7 @@ Class QStringList QStringList (0xeac400) 0 QList (0x15b6000) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1588ec0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1588e80) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -666,50 +494,22 @@ QFile (0x169c840) 0 QObject (0x169c8c0) 0 primary-for QIODevice (0x169c880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16ab100) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x16d25c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16d2f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1700e40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x172a300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x172a200) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x16d2440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1758040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x172ac00) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -766,10 +566,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x169c740) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d7340) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -843,10 +639,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x182cc40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x182cd40) 0 empty Class QMapData::Node size=8 align=4 @@ -871,10 +663,6 @@ Class QTextStream QTextStream (0x1a78240) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a78600) 0 Class QTextStreamManipulator size=24 align=4 @@ -911,20 +699,8 @@ QTextOStream (0x1b06440) 0 QTextStream (0x1b06480) 0 primary-for QTextOStream (0x1b06440) -Class - size=8 align=4 - base size=8 base align=4 - (0x1b33680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b33800) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1b525c0) 0 Class QVectorData size=16 align=4 @@ -1037,95 +813,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1ce1bc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1cfbd40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1cfbec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d15040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d151c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d15340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d154c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d15640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d157c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d15940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d15ac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d15c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d15dc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d15f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d340c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d34240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d343c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d34540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d346c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1152,35 +856,15 @@ Class QVariant base size=16 base align=8 QVariant (0x14318c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1dd0540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d46dc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1dd0840) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1d46e40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1d46000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e36280) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1258,15 +942,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1d34f80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ed2440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f01f80) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1293,10 +969,6 @@ QEventLoop (0x1f2e600) 0 QObject (0x1f2e640) 0 primary-for QEventLoop (0x1f2e600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f2e940) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1341,20 +1013,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1f66f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f9ab40) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1f66ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f9ae80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1524,10 +1188,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x200bd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x204b3c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1620,20 +1280,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x13fe8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20ba900) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x13fe940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20baf00) 0 empty Class QMetaProperty size=20 align=4 @@ -1645,10 +1297,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x13fea40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20e8640) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1941,10 +1589,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x2235640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2294040) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1956,70 +1600,42 @@ Class QDate base size=4 base align=4 QDate (0x1d34900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22d1900) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1d34b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22f4540) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x16d24c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x231d300) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1d34b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x231df40) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1d34c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x236e180) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1d34980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x238f600) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1d34a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23b9b00) 0 empty Class QLinkedListData size=20 align=4 @@ -2031,75 +1647,39 @@ Class QLocale base size=4 base align=4 QLocale (0x1d34a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x250a300) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1d34c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2538480) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1d34d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x255d9c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1d34d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25cb440) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1d34e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2649680) 0 empty Class QSharedData size=4 align=4 base size=4 base align=4 QSharedData (0x26f1500) 0 -Class QList >:: - size=4 align=4 - base size=4 base align=4 -QList >:: (0x2719e40) 0 -Class QList > - size=4 align=4 - base size=4 base align=4 -QList > (0x2719d00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x27513c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x137c9c0) 0 Vtable for QSignalSpy QSignalSpy::_ZTV10QSignalSpy: 14u entries @@ -2132,10 +1712,6 @@ Class QTestData base size=4 base align=4 QTestData (0x27d73c0) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x27f47c0) 0 empty Vtable for QTestEventLoop QTestEventLoop::_ZTV14QTestEventLoop: 14u entries @@ -2162,48 +1738,12 @@ QTestEventLoop (0x2816ec0) 0 QObject (0x2816f00) 0 primary-for QTestEventLoop (0x2816ec0) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x2843600) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13c0100) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1588d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x29fb6c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x2751380) 0 -Class QTypeInfo > - size=1 align=1 - base size=0 base align=1 -QTypeInfo > (0x2a73240) 0 empty -Class QList >::Node - size=4 align=4 - base size=4 base align=4 -QList >::Node (0x2719e00) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x172a2c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1dd0500) 0 diff --git a/tests/auto/bic/data/QtTest.4.2.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtTest.4.2.0.linux-gcc-ia32.txt index 7bc73ba60..a8441c6a0 100644 --- a/tests/auto/bic/data/QtTest.4.2.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtTest.4.2.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f36d80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f36dc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f36e80) 0 empty - QUintForSize<4> (0xb7f36ec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f36f40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f36f80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb77f3040) 0 empty - QIntForSize<4> (0xb77f3080) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77f3300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f33c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f3400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f3440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f3480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f34c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f3500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f3540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f3580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f35c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f3600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f3640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f3680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f36c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f3700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f3740) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb77f3780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f3880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f38c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f3900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f3940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f3980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f39c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f3a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f3a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f3a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f3ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f3b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f3b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f3b80) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb77f3c40) 0 QGenericArgument (0xb77f3c80) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb77f3e40) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb77f3f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f3f80) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb733d280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb733d2c0) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb733d300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb733d480) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb733d580) 0 QString (0xb733d5c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb733d600) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0xb733d900) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb733dc80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb733dc00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0xb733de00) 0 QObject (0xb733de40) 0 primary-for QIODevice (0xb733de00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb733df00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb733d7c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb733d880) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0xb6ee3580) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6ee3b00) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0xb6ee3a40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6ee3c40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6ee3bc0) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb6ee3cc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6ee3d00) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6ee3d80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6ee3d40) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6ee3dc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6ee3e00) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6ee3f00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6ee3f80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6ee3f40) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6ee3440) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6ee3880) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0xb6ee3ac0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6e73040) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0xb6e73200) 0 QTextStream (0xb6e73240) 0 primary-for QTextOStream (0xb6e73200) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e73300) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e73340) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6e732c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e73380) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e733c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6e73400) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e73440) 0 Class timespec size=8 align=4 @@ -738,80 +492,24 @@ Class timeval base size=8 base align=4 timeval (0xb6e734c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e73500) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6e73540) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6e73580) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6e73640) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6e73600) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6e735c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e73680) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6e73700) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6e736c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e73740) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6e737c0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6e73780) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e73800) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6e73840) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e73880) 0 Class random_data size=28 align=4 @@ -882,10 +580,6 @@ QFile (0xb6e73d40) 0 QObject (0xb6e73dc0) 0 primary-for QIODevice (0xb6e73d80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6e73e40) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -938,50 +632,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb6e73fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6e73000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e731c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6e73e00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6e73280) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb6e73f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c4a000) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6c4a040) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6c4a100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6c4a080) 0 Class QStringList size=4 align=4 @@ -989,30 +655,14 @@ Class QStringList QStringList (0xb6c4a140) 0 QList (0xb6c4a180) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6c4a200) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6c4a240) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb6c4a300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c4a380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c4a400) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1069,10 +719,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb6c4a440) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c4a5c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1184,15 +830,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6c4a880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c4a8c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c4a900) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1287,285 +925,65 @@ Class QUrl base size=4 base align=4 QUrl (0xb6c4ac00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c4ac80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c4acc0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6c4ad00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4adc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4ae00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4ae40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4ae80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4aec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4af00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4af40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4af80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4afc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4a540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4a640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4a700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4a840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4a980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4ab00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c4abc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69bd900) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1592,45 +1010,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb69bd940) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb69bdb80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb69bdbc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb69bdcc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb69bdc40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb69bddc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb69bdd40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb69bde80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69bdf00) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1662,80 +1052,48 @@ Class QPoint base size=8 base align=4 QPoint (0xb69bdb40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69bda80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb69bde40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69bdfc0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb68d7000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68d7040) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb68d7080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68d70c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0xb68d7100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68d7300) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb68d7380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68d7580) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb68d7640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68d7740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb68d7780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68d7840) 0 empty Class QLinkedListData size=20 align=4 @@ -1752,10 +1110,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb68d7c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68d7c40) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1772,30 +1126,18 @@ Class QDate base size=4 base align=4 QDate (0xb68d7ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68d7f80) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb68d7fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68d71c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb68d7200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68d72c0) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1981,10 +1323,6 @@ QEventLoop (0xb6763040) 0 QObject (0xb6763080) 0 primary-for QEventLoop (0xb6763040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6763180) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1429,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb6763680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67636c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb6763700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6763780) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2324,10 +1654,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb6763c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6763c40) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2422,20 +1748,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb6763ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6763f00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb6763f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6763f80) 0 empty Class QMetaProperty size=20 align=4 @@ -2447,10 +1765,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb6763000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6763100) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2507,10 +1821,6 @@ QLibrary (0xb6763440) 0 QObject (0xb6763500) 0 primary-for QLibrary (0xb6763440) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6763600) 0 Class QSemaphore size=4 align=4 @@ -2558,10 +1868,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb6763bc0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb6763dc0) 0 Class QMutexLocker size=4 align=4 @@ -2573,20 +1879,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb6763e80) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb64c1040) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb64c1000) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb64c10c0) 0 Class QWriteLocker size=4 align=4 @@ -2598,25 +1896,9 @@ Class QTestData base size=4 base align=4 QTestData (0xb64c11c0) 0 -Class QList >:: - size=4 align=4 - base size=4 base align=4 -QList >:: (0xb64c1400) 0 -Class QList > - size=4 align=4 - base size=4 base align=4 -QList > (0xb64c1380) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64c15c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb64c1540) 0 Vtable for QSignalSpy QSignalSpy::_ZTV10QSignalSpy: 14u entries @@ -2669,48 +1951,12 @@ QTestEventLoop (0xb64c1800) 0 QObject (0xb64c1840) 0 primary-for QTestEventLoop (0xb64c1800) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb64c1900) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64c1a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64c1ac0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64c1b40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64c1bc0) 0 -Class QTypeInfo > - size=1 align=1 - base size=0 base align=1 -QTypeInfo > (0xb64c1c40) 0 empty -Class QList >::Node - size=4 align=4 - base size=4 base align=4 -QList >::Node (0xb64c1cc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64c1d40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb64c1dc0) 0 diff --git a/tests/auto/bic/data/QtTest.4.2.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtTest.4.2.0.linux-gcc-ppc32.txt index 85a06f8f2..a2b4de4dc 100644 --- a/tests/auto/bic/data/QtTest.4.2.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtTest.4.2.0.linux-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x30590d90) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x30590e00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x3001bac0) 0 empty - QUintForSize<4> (0x30590f50) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x30597038) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x305970a8) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x3001bb40) 0 empty - QIntForSize<4> (0x305971f8) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x30597578) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30597770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30597818) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305978c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30597968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30597a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30597ab8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30597b60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30597c08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30597cb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30597d58) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30597e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30597ea8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30597f50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305cc000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305cc0a8) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x305cc118) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305cc5e8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305cc658) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305cc6c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305cc738) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305cc7a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305cc818) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305cc888) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305cc8f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305cc968) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305cc9d8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305cca48) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305ccab8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305ccb28) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3001bc80) 0 QGenericArgument (0x305ccc40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x305cce00) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0x305ccee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305ccf88) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x30af0ce8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30be8038) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0x30be80e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30be8310) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0x3001bec0) 0 QString (0x30d57498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30d57578) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0x30d57c78) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30e4c0e0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30e4c038) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0x3001bf80) 0 QObject (0x30e4c5b0) 0 primary-for QIODevice (0x3001bf80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30e4c7a8) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x30e4cee0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30e4cf50) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0x30f076c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30f07d58) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0x30f07c08) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30f07968) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30f07f88) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x31068070) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31068118) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x310681f8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31068188) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x31068268) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x310682d8) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x31068428) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x31068508) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x31068498) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x31068578) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x310685e8) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0x31068620) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31068850) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0x30f93180) 0 QTextStream (0x31068dc8) 0 primary-for QTextOStream (0x30f93180) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x310f5000) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x310f5070) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x31068c08) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310f50e0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310f5150) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x310f51c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x310f5230) 0 Class timespec size=8 align=4 @@ -738,70 +492,18 @@ Class timeval base size=8 base align=4 timeval (0x310f52a0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x310f5310) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x310f5380) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x310f5460) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x310f53f0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310f54d0) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x310f55b0) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x310f5540) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310f5620) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x310f5700) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x310f5690) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310f5770) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x310f57e0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310f5850) 0 Class random_data size=28 align=4 @@ -872,10 +574,6 @@ QFile (0x30f931c0) 0 QObject (0x311fa118) 0 primary-for QIODevice (0x30f93200) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311fa2a0) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -928,50 +626,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x311fa3f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311fa498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311fa508) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x311fa690) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x311fa5e8) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x311fa738) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311fa930) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x311fa9a0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x311fab60) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x311faab8) 0 Class QStringList size=4 align=4 @@ -979,30 +649,14 @@ Class QStringList QStringList (0x30f93300) 0 QList (0x311fac08) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x311fa1f8) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x312f7000) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x312f7310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312f7428) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312f74d0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1059,10 +713,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x312f7508) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312f7770) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1174,15 +824,7 @@ Class QLocale base size=4 base align=4 QLocale (0x312f7b28) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312f7bd0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312f7c78) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1277,285 +919,65 @@ Class QUrl base size=4 base align=4 QUrl (0x312f7888) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3140f070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3140f0e0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x3140f150) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140f310) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140f3b8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140f460) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140f508) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140f5b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140f658) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140f700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140f7a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140f850) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140f8f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140f9a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140fa48) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140faf0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140fb98) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140fc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140fce8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140fd90) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140fe38) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140fee0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3140ff88) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e038) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e0e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e188) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e230) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e2d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e428) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e4d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e578) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e620) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e6c8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e770) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e818) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145e968) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145ea10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145eab8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145eb60) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145ec08) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145ecb0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145ed58) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145ee00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145eea8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3145ef50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3147c000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3147c0a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3147c150) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3147c1f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3147c2a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3147c348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3147c3f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3147c498) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x3147c540) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1582,45 +1004,17 @@ Class QVariant base size=16 base align=8 QVariant (0x3147c5b0) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x3147ca48) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x3147caf0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3147ccb0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3147cc08) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x3147ce70) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x3147cdc8) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x3147cf88) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3147c888) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1652,80 +1046,48 @@ Class QPoint base size=8 base align=4 QPoint (0x315084d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315088c0) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x31508ab8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31508ea8) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x315085e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315086c8) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x31508bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31508d20) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x315c40e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315c4460) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x315c4738) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315c4ab8) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x315c4e38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315c4188) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x315c4930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315c4f50) 0 empty Class QLinkedListData size=20 align=4 @@ -1742,10 +1104,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x316a5a10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316a5af0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1762,30 +1120,18 @@ Class QDate base size=4 base align=4 QDate (0x316a5ee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317c7000) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x317c7070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317c7230) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x317c72a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x317c73f0) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1971,10 +1317,6 @@ QEventLoop (0x30f93880) 0 QObject (0x317c7118) 0 primary-for QEventLoop (0x30f93880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x317c7b60) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2081,20 +1423,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x3189d9d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3189db60) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x3189dbd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3189dce8) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2314,10 +1648,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x31945188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31945268) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2412,20 +1742,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x31945690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31945738) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x319457a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31945850) 0 empty Class QMetaProperty size=20 align=4 @@ -2437,10 +1759,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x319458f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x319459a0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2497,10 +1815,6 @@ QLibrary (0x30f93d00) 0 QObject (0x31945c78) 0 primary-for QLibrary (0x30f93d00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31945e00) 0 Class QSemaphore size=4 align=4 @@ -2548,10 +1862,6 @@ Class QMutex base size=4 base align=4 QMutex (0x31945380) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x31a01070) 0 Class QMutexLocker size=4 align=4 @@ -2563,20 +1873,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x31a01118) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x31a011c0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x31a01150) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x31a012d8) 0 Class QWriteLocker size=4 align=4 @@ -2588,25 +1890,9 @@ Class QTestData base size=4 base align=4 QTestData (0x31a01460) 0 -Class QList >:: - size=4 align=4 - base size=4 base align=4 -QList >:: (0x31a01b98) 0 -Class QList > - size=4 align=4 - base size=4 base align=4 -QList > (0x31a01af0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31a01dc8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31a01d20) 0 Vtable for QSignalSpy QSignalSpy::_ZTV10QSignalSpy: 14u entries @@ -2659,48 +1945,12 @@ QTestEventLoop (0x30f93f40) 0 QObject (0x31aa9310) 0 primary-for QTestEventLoop (0x30f93f40) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x31aa9540) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b18d20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31b35460) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b50268) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b93f88) 0 -Class QTypeInfo > - size=1 align=1 - base size=0 base align=1 -QTypeInfo > (0x31bbc1c0) 0 empty -Class QList >::Node - size=4 align=4 - base size=4 base align=4 -QList >::Node (0x31bfca10) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31bfcdc8) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31c28348) 0 diff --git a/tests/auto/bic/data/QtTest.4.2.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtTest.4.2.0.macx-gcc-ia32.txt index 8c047819f..b1a9b8b73 100644 --- a/tests/auto/bic/data/QtTest.4.2.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtTest.4.2.0.macx-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x696900) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x696980) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x696b40) 0 empty - QUintForSize<4> (0x696b80) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x696c80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x696d00) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x696ec0) 0 empty - QIntForSize<4> (0x696f00) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x6a2400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a2640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a2700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a27c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a2880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a2940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a2a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a2ac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a2b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a2c40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a2d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a2dc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a2e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6a2f40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6dd000) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0x6dd300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6dd400) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0x6ddb00) 0 QBasicAtomic (0x6ddb40) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x6dddc0) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xe85b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xe85ec0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf65340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf653c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf65440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf654c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf65540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf655c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf65640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf656c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf65740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf657c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf65840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf658c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf65940) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x10f3100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x10f3540) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x1212180) 0 QString (0x12121c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x12122c0) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x1212b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1324080) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x12125c0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13243c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1324300) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1324600) 0 QGenericArgument (0x1324640) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1324900) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1324880) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1324b80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1324ac0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x13e50c0) 0 QObject (0x13e5100) 0 primary-for QIODevice (0x13e50c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13e5340) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x13e5a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x13e5c80) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x13e5d00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13e5f00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x13e5e40) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x13e5fc0) 0 QList (0x13e5200) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x14b4440) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x14b44c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x1531200) 0 QObject (0x1531280) 0 primary-for QIODevice (0x1531240) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1531440) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1531480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1531540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15315c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1531780) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x15316c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1531840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1531980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1531a00) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1531a40) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1531d00) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1654100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1654180) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x17155c0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1715880) 0 Class QTextStreamManipulator size=24 align=4 @@ -1078,35 +836,15 @@ Class rlimit base size=16 base align=4 rlimit (0x1836300) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1836a80) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1836b00) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x1836a00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1836b80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1836c00) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x1836c80) 0 Class QVectorData size=16 align=4 @@ -1244,15 +982,7 @@ Class QLocale base size=4 base align=4 QLocale (0x18d7b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x18d7c40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18d7d00) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1279,270 +1009,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x18d7f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x18d7e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a482c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a485c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a488c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a48f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a681c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a684c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a687c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a68f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a83000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a830c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a83180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a83240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a83300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a833c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a83480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a83540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a83600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a836c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1569,60 +1087,20 @@ Class QVariant base size=12 base align=4 QVariant (0x1a83740) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a83c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a83d40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1a83f40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1a83e80) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1af2040) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1a83a00) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1af21c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1af2300) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1af23c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1af2440) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1af24c0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1700,15 +1178,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1af2d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1af2ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1af2f40) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1735,10 +1205,6 @@ QEventLoop (0x1af2fc0) 0 QObject (0x1af20c0) 0 primary-for QEventLoop (0x1af2fc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1bd9100) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1783,20 +1249,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1bd9340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bd9500) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1bd9580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bd96c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1966,10 +1424,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1bd9e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1bd9f00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2076,20 +1530,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1cb5a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cb5b40) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1cb5bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cb5c80) 0 empty Class QMetaProperty size=20 align=4 @@ -2101,10 +1547,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1cb5d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1cb5e00) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2286,10 +1728,6 @@ QLibrary (0x1d25580) 0 QObject (0x1d255c0) 0 primary-for QLibrary (0x1d25580) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d25780) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2326,10 +1764,6 @@ Class QMutex base size=4 base align=4 QMutex (0x1d25ac0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x1d25c80) 0 Class QMutexLocker size=4 align=4 @@ -2341,20 +1775,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x1d25d40) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x1d25e00) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x1d25d80) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x1d25f40) 0 Class QWriteLocker size=4 align=4 @@ -2412,10 +1838,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1de17c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1de18c0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2427,70 +1849,42 @@ Class QDate base size=4 base align=4 QDate (0x1de1b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1de1d40) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1de1dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1de1fc0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1de1b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eac000) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1eac080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eac500) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x1eac7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eacc40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1eacf40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eacfc0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x1eac340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eac800) 0 empty Class QLinkedListData size=20 align=4 @@ -2502,40 +1896,24 @@ Class QSize base size=8 base align=4 QSize (0x1f4c440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f4c840) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x1f4cc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f4c240) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x20270c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2027280) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x2027500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20276c0) 0 empty Class QSharedData size=4 align=4 @@ -2568,25 +1946,9 @@ QTimeLine (0x2027b80) 0 QObject (0x2027bc0) 0 primary-for QTimeLine (0x2027b80) -Class QList >:: - size=4 align=4 - base size=4 base align=4 -QList >:: (0x2027f00) 0 -Class QList > - size=4 align=4 - base size=4 base align=4 -QList > (0x2027e40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x216a000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2027540) 0 Vtable for QSignalSpy QSignalSpy::_ZTV10QSignalSpy: 14u entries @@ -2644,48 +2006,12 @@ QTestEventLoop (0x216a140) 0 QObject (0x216a200) 0 primary-for QTestEventLoop (0x216a140) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x221e000) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x227bc40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x229aac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22ebb40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x2321980) 0 -Class QTypeInfo > - size=1 align=1 - base size=0 base align=1 -QTypeInfo > (0x2321c00) 0 empty -Class QList >::Node - size=4 align=4 - base size=4 base align=4 -QList >::Node (0x2398c40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23c9100) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23c9740) 0 diff --git a/tests/auto/bic/data/QtTest.4.2.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtTest.4.2.0.macx-gcc-ppc32.txt index 38d733b48..4b3f06ff1 100644 --- a/tests/auto/bic/data/QtTest.4.2.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtTest.4.2.0.macx-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x9ca500) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x9ca580) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x9ca740) 0 empty - QUintForSize<4> (0x9ca780) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x9ca880) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x9ca900) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x9caac0) 0 empty - QIntForSize<4> (0x9cab00) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x9f3000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f3240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f3300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f33c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f3480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f3540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f3600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f36c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f3780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f3840) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f3900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f39c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f3a80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f3b40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9f3c00) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0x9f3f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa57000) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0xa57600) 0 QBasicAtomic (0xa57640) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0xa578c0) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xf03600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xf039c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf03e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf03ec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf03f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf03fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b0c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x100b440) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x100bc40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1181040) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x1181c80) 0 QString (0x1181cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1181dc0) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x1289640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1289c80) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1289b00) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1289fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1289f00) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x139d080) 0 QGenericArgument (0x139d0c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x139d380) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x139d300) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x139d600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x139d540) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x139dc40) 0 QObject (0x139dc80) 0 primary-for QIODevice (0x139dc40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x139dec0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1465500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1465740) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x14657c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x14659c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1465900) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x1465a80) 0 QList (0x1465ac0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1465f80) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x14651c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x157b180) 0 QObject (0x157b200) 0 primary-for QIODevice (0x157b1c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x157b3c0) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x157b400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x157b4c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x157b540) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x157b700) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x157b640) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x157b7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x157b900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x157b980) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x157b9c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x157bc80) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x168b080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x168b100) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x17db100) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17db3c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -1088,40 +846,16 @@ Class rlimit base size=16 base align=8 rlimit (0x1866080) 0 -Class OSReadSwapInt64(const volatile void*, uintptr_t):: - size=8 align=8 - base size=8 base align=8 -OSReadSwapInt64(const volatile void*, uintptr_t):: (0x1866280) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x18669c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1866a40) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x1866940) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1866ac0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1866b40) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1866bc0) 0 Class QVectorData size=16 align=4 @@ -1259,15 +993,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1917b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1917bc0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1917c80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1294,270 +1020,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1917e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1917880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7a9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7aa80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7ab40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7ac00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7acc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7ad80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7ae40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7af00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a7afc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a942c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a945c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a948c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a94f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab6040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab6100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab61c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab6280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab6340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab6400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab64c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab6580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab6640) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1584,60 +1098,20 @@ Class QVariant base size=16 base align=4 QVariant (0x1ab66c0) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab6c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ab6cc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1ab6ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1ab6e00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1ab6a00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1ab6880) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1b29140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b29280) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1b29340) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b293c0) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1b29440) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1715,15 +1189,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1b29c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b29e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b29ec0) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1750,10 +1216,6 @@ QEventLoop (0x1b29f40) 0 QObject (0x1b29f80) 0 primary-for QEventLoop (0x1b29f40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1c10040) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1798,20 +1260,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1c10280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c10440) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1c104c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c10600) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1981,10 +1435,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1c10d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c10e40) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1541,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1ce79c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ce7a80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1ce7b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ce7bc0) 0 empty Class QMetaProperty size=20 align=4 @@ -2116,10 +1558,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1ce7c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ce7d40) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2301,10 +1739,6 @@ QLibrary (0x1d56540) 0 QObject (0x1d56580) 0 primary-for QLibrary (0x1d56540) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d56740) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2341,10 +1775,6 @@ Class QMutex base size=4 base align=4 QMutex (0x1d56a80) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x1d56c40) 0 Class QMutexLocker size=4 align=4 @@ -2356,20 +1786,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x1d56d00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x1d56dc0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x1d56d40) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x1d56f00) 0 Class QWriteLocker size=4 align=4 @@ -2427,10 +1849,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1e1a740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e1a840) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2442,70 +1860,42 @@ Class QDate base size=4 base align=4 QDate (0x1e1aac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e1acc0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e1ad40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e1af40) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1e1afc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e1ae00) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1edc040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1edc4c0) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x1edc780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1edcc00) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1edcf00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1edcf80) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x1edc280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1edc400) 0 empty Class QLinkedListData size=20 align=4 @@ -2517,40 +1907,24 @@ Class QSize base size=8 base align=4 QSize (0x1f7a400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f7a800) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x1f7abc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f7afc0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x2055080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2055240) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x20554c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2055680) 0 empty Class QSharedData size=4 align=4 @@ -2583,25 +1957,9 @@ QTimeLine (0x2055b40) 0 QObject (0x2055b80) 0 primary-for QTimeLine (0x2055b40) -Class QList >:: - size=4 align=4 - base size=4 base align=4 -QList >:: (0x2055ec0) 0 -Class QList > - size=4 align=4 - base size=4 base align=4 -QList > (0x2055e00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2055c40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2055140) 0 Vtable for QSignalSpy QSignalSpy::_ZTV10QSignalSpy: 14u entries @@ -2659,48 +2017,12 @@ QTestEventLoop (0x21aaf80) 0 QObject (0x21aafc0) 0 primary-for QTestEventLoop (0x21aaf80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x21aae80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22a8b80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22c6a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2317a80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23508c0) 0 -Class QTypeInfo > - size=1 align=1 - base size=0 base align=1 -QTypeInfo > (0x2350b40) 0 empty -Class QList >::Node - size=4 align=4 - base size=4 base align=4 -QList >::Node (0x23c6b80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23f5040) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23f5680) 0 diff --git a/tests/auto/bic/data/QtTest.4.2.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtTest.4.2.0.win32-gcc-ia32.txt index 224be3de0..ea4291ca1 100644 --- a/tests/auto/bic/data/QtTest.4.2.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtTest.4.2.0.win32-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xa9db00) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xa9dc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xa9df00) 0 empty - QUintForSize<4> (0xac2000) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xac2180) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xac2240) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xac24c0) 0 empty - QIntForSize<4> (0xac2580) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xaf4380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0aa80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ac00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ad80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0af00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb36080) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb60f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb97380) 0 empty Class QBasicAtomic size=4 align=4 @@ -171,75 +81,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc4bb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd72780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd84e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd940c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd84980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd9ae40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd94780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda58c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda0080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde94c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde9d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef480) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xee1240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee1780) 0 Class QCharRef size=8 align=4 @@ -282,10 +132,6 @@ Class QConstString QConstString (0x11f2dc0) 0 QString (0x11f2e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1260140) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -348,10 +194,6 @@ Class QListData base size=4 base align=4 QListData (0x12d61c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13dc180) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -376,15 +218,7 @@ Class QTextCodec QTextCodec (0xee11c0) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1400480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc5d5c0) 0 Class QTextEncoder size=32 align=4 @@ -407,25 +241,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x144d300) 0 QGenericArgument (0x144d340) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1462ac0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x144d8c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1492340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1478f40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -517,10 +339,6 @@ QIODevice (0x13b5a40) 0 QObject (0x150cb40) 0 primary-for QIODevice (0x13b5a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x150ce40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -540,25 +358,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xee10c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15dbc00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x15dbf80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x15f34c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x15f3380) 0 Class QStringList size=4 align=4 @@ -566,15 +372,7 @@ Class QStringList QStringList (0xee1140) 0 QList (0x15f3740) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x15f3600) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x15f35c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -703,50 +501,22 @@ QFile (0x1706080) 0 QObject (0x1706100) 0 primary-for QIODevice (0x17060c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1706940) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x175e140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x175ea80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1777ac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1777f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1777e80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x171cfc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b2c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17b2880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -803,10 +573,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x16f6f80) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18520c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -880,10 +646,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x18bbb80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x18bbc80) 0 empty Class QMapData::Node size=8 align=4 @@ -908,10 +670,6 @@ Class QTextStream QTextStream (0x1afc580) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1afc940) 0 Class QTextStreamManipulator size=24 align=4 @@ -948,20 +706,8 @@ QTextOStream (0x1b8c740) 0 QTextStream (0x1b8c780) 0 primary-for QTextOStream (0x1b8c740) -Class - size=8 align=4 - base size=8 base align=4 - (0x1bc1980) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1bc1b00) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1be78c0) 0 Class QVectorData size=16 align=4 @@ -1099,15 +845,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1e51cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e95980) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e95040) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1134,270 +872,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1ef6400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f18840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f189c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f18b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f18cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f18e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f18fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2c140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2c2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2c440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2c5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2c740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2c8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2ca40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2cbc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2cd40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f2cec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4d940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4dac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4dc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4ddc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f4df40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6a9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6ab40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6acc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6ae40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f6afc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f892c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f895c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f898c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f89ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fab040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fab1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fab340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fab4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1fab640) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1424,45 +950,17 @@ Class QVariant base size=16 base align=8 QVariant (0x1478c80) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ffde00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ffdfc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2031480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1fbf540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x2031780) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1fbf5c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1fab800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2099100) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1540,15 +1038,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1f18180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2155440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21b3040) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1575,10 +1065,6 @@ QEventLoop (0x21b36c0) 0 QObject (0x21b3700) 0 primary-for QEventLoop (0x21b36c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21b3a00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1623,20 +1109,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x222a200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x222ae80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x222a180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22572c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1806,10 +1284,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x22da7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22dae00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1917,20 +1391,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x143fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2376bc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x143fc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x238b1c0) 0 empty Class QMetaProperty size=20 align=4 @@ -1942,10 +1408,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x143fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x238b900) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2127,10 +1589,6 @@ QLibrary (0x2449040) 0 QObject (0x2449080) 0 primary-for QLibrary (0x2449040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x24492c0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2172,10 +1630,6 @@ Class QMutex base size=4 base align=4 QMutex (0x24ba7c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x24e7000) 0 Class QMutexLocker size=4 align=4 @@ -2187,20 +1641,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x24e7e00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x24f6140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x24e7fc0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x24f6900) 0 Class QWriteLocker size=4 align=4 @@ -2258,10 +1704,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x253aac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2594480) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2273,70 +1715,42 @@ Class QDate base size=4 base align=4 QDate (0x1e51b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25ec640) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e51bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2614280) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x175e040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2643040) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1f18340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2643c80) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1f18380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x266be40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1f182c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26b22c0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1f18300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26dd780) 0 empty Class QLinkedListData size=20 align=4 @@ -2348,40 +1762,24 @@ Class QSize base size=8 base align=4 QSize (0x1f18240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27cffc0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1f18280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2820500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1f181c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x28a7000) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1f18200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x292b340) 0 empty Class QSharedData size=4 align=4 @@ -2414,25 +1812,9 @@ QTimeLine (0x299f700) 0 QObject (0x299f740) 0 primary-for QTimeLine (0x299f700) -Class QList >:: - size=4 align=4 - base size=4 base align=4 -QList >:: (0x29ef000) 0 -Class QList > - size=4 align=4 - base size=4 base align=4 -QList > (0x29bcec0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x29ef580) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x13b5d00) 0 Vtable for QSignalSpy QSignalSpy::_ZTV10QSignalSpy: 14u entries @@ -2490,48 +1872,12 @@ QTestEventLoop (0x2b09180) 0 QObject (0x2b091c0) 0 primary-for QTestEventLoop (0x2b09180) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0x2b09b40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1400440) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x15f3480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2cc8f80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x29ef540) 0 -Class QTypeInfo > - size=1 align=1 - base size=0 base align=1 -QTypeInfo > (0x2d9e4c0) 0 empty -Class QList >::Node - size=4 align=4 - base size=4 base align=4 -QList >::Node (0x29bcfc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1777f40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x2031440) 0 diff --git a/tests/auto/bic/data/QtTest.4.3.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtTest.4.3.0.linux-gcc-ia32.txt index a19e4412d..7535e0de9 100644 --- a/tests/auto/bic/data/QtTest.4.3.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtTest.4.3.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f03d80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f03dc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f03e80) 0 empty - QUintForSize<4> (0xb7f03ec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f03f40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f03f80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb77a5040) 0 empty - QIntForSize<4> (0xb77a5080) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77a5340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a5400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a5440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a5480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a54c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a5500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a5540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a5580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a55c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a5600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a5640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a5680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a56c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a5700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a5740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77a5780) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb77a57c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77a58c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77a5900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77a5940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77a5980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77a59c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77a5a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77a5a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77a5a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77a5ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77a5b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77a5b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77a5b80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77a5bc0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb77a5cc0) 0 QGenericArgument (0xb77a5d00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb77a5ec0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb77a5f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72e5000) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb72e5300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72e5340) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb72e5380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72e5580) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb72e5680) 0 QString (0xb72e56c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72e5700) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb72e5a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb72e5dc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb72e5d40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb72e54c0) 0 QObject (0xb72e5500) 0 primary-for QLibrary (0xb72e54c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72e5840) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb72e5c00) 0 QObject (0xb72e5e40) 0 primary-for QIODevice (0xb72e5c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6f09000) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb6f090c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6f09100) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6f09140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6f09200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6f09180) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb6f09240) 0 QList (0xb6f09280) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6f09300) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6f09340) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6f096c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6f09700) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb6f09c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6f09d00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6f09d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6f09e00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6f09e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6f09f00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb6f09f40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6f09fc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6f09080) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6f09f80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6f09440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6f09580) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6f09ac0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6f09c80) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6f09cc0) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb6f09dc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6f09e80) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6f09ec0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6cca000) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6cca0c0) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6cca080) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6cca040) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6cca100) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6cca180) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6cca140) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6cca1c0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6cca240) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6cca200) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6cca280) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6cca2c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6cca300) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb6cca580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cca780) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6cca800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ccaa00) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6ccadc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ccae00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6ccae40) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb6b03040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b03280) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6b032c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b03500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6b03640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b03740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6b03780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b03840) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6b03880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b038c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6b03900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b03940) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6b03cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b03d00) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb6b03e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b03ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b03f00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6b03f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b030c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b031c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b033c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b034c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b036c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b037c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b03b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67730c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67731c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67732c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67733c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67734c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67735c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67736c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6773780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67737c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6773800) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6773a80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6773ac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6773bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6773b40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6773cc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6773c40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6773d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6773dc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb6773e00) 0 QObject (0xb6773e40) 0 primary-for QSettings (0xb6773e00) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6773f40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6773f00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6773f80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6773fc0) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6773a00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6773e80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6773a40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6653000) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6653040) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb6653080) 0 QObject (0xb6653100) 0 primary-for QIODevice (0xb66530c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6653180) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb6653300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6653340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6653380) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6653440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb66533c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb6653480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6653500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6653580) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb66537c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6653880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb66538c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6653a40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb6653b00) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6653c40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb6653b80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6653d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6653d00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb6653e40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6653f00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb64930c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb6493140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb6493100) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb64931c0) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb6493200) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb6493280) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb6493580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64935c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb64936c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6493700) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb6493740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64937c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb6493c40) 0 QObject (0xb6493c80) 0 primary-for QEventLoop (0xb6493c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6493d80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb6493e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6493ec0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb6493f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb640c000) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb640c080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb640c0c0) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2669,35 +1959,15 @@ QTestEventLoop (0xb640c380) 0 QObject (0xb640c3c0) 0 primary-for QTestEventLoop (0xb640c380) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb640c480) 0 Class QTestData size=4 align=4 base size=4 base align=4 QTestData (0xb640c740) 0 -Class QList >:: - size=4 align=4 - base size=4 base align=4 -QList >:: (0xb640c9c0) 0 -Class QList > - size=4 align=4 - base size=4 base align=4 -QList > (0xb640c940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb640cb80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb640cb00) 0 Vtable for QSignalSpy QSignalSpy::_ZTV10QSignalSpy: 14u entries @@ -2725,38 +1995,10 @@ QSignalSpy (0xb640ca00) 0 primary-for QSignalSpy (0xb640ca00) QList > (0xb640ca80) 8 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb640ccc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb640cd40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb640cdc0) 0 -Class QTypeInfo > - size=1 align=1 - base size=0 base align=1 -QTypeInfo > (0xb640ce40) 0 empty -Class QList >::Node - size=4 align=4 - base size=4 base align=4 -QList >::Node (0xb640cec0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb640cf40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb640cfc0) 0 diff --git a/tests/auto/bic/data/QtTest.4.3.1.linux-gcc-ia32.txt b/tests/auto/bic/data/QtTest.4.3.1.linux-gcc-ia32.txt index e5b39cb2d..8d794d190 100644 --- a/tests/auto/bic/data/QtTest.4.3.1.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtTest.4.3.1.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f7ed80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f7edc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f7ee80) 0 empty - QUintForSize<4> (0xb7f7eec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f7ef40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f7ef80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7420040) 0 empty - QIntForSize<4> (0xb7420080) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7420340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7420400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7420440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7420480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74204c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7420500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7420540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7420580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74205c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7420600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7420640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7420680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb74206c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7420700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7420740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7420780) 0 empty Class QFlag size=4 align=4 @@ -161,10 +75,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb7420bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7420c00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -227,70 +137,18 @@ Class QListData base size=4 base align=4 QListData (0xb7420f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce1c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce400) 0 Class QInternal size=1 align=1 @@ -308,10 +166,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb73ce500) 0 QGenericArgument (0xb73ce540) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb73ce700) 0 Class QMetaObject size=16 align=4 @@ -328,10 +182,6 @@ Class QChar base size=2 base align=2 QChar (0xb73ce7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73ce840) 0 empty Class QString::Null size=1 align=1 @@ -348,10 +198,6 @@ Class QString base size=4 base align=4 QString (0xb73ce880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73cea80) 0 Class QLatin1String size=4 align=4 @@ -369,25 +215,13 @@ Class QConstString QConstString (0xb73ceb40) 0 QString (0xb73ceb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb73cebc0) 0 empty Class QStringRef size=12 align=4 base size=12 base align=4 QStringRef (0xb73cec00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb73ced40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb73cecc0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -479,10 +313,6 @@ QIODevice (0xb73cef80) 0 QObject (0xb73cefc0) 0 primary-for QIODevice (0xb73cef80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb73ce000) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -502,275 +332,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb73cea00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb30c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb31c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb32c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb33c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb34c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb35c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb36c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb37c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb38c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb39c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6fb3d40) 0 empty Class QMapData::Node size=8 align=4 @@ -807,45 +421,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6df2200) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6df2480) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6df24c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6df25c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6df2540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6df26c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6df2640) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6df2740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6df27c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -972,10 +558,6 @@ QEventLoop (0xb6df2c40) 0 QObject (0xb6df2c80) 0 primary-for QEventLoop (0xb6df2c40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6df2d80) 0 Vtable for QCoreApplication QCoreApplication::_ZTV16QCoreApplication: 16u entries @@ -1009,10 +591,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb6df2f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6df2f80) 0 empty Vtable for QTimer QTimer::_ZTV6QTimer: 14u entries @@ -1069,20 +647,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb6df2440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6df2340) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb6df2400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6df2840) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1277,20 +847,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb6bee080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bee0c0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb6bee100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bee140) 0 empty Class QMetaProperty size=20 align=4 @@ -1302,10 +864,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb6bee1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bee200) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1408,100 +966,48 @@ Class QSize base size=8 base align=4 QSize (0xb6bee500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bee700) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6bee780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bee980) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb6beea40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6beec80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6beecc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6beef00) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6beef40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bee040) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6bee2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bee380) 0 empty -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6bee540) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6bee580) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6bee440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6bee5c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6bee600) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6bee640) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6bee680) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6bee6c0) 0 Class timespec size=8 align=4 @@ -1513,80 +1019,24 @@ Class timeval base size=8 base align=4 timeval (0xb6bee800) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6bee840) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6bee880) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6bee8c0) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6beea80) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6bee940) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6bee900) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6beeac0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6beeb40) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6beeb00) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6beeb80) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6beec00) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6beebc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6beec40) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6beed00) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6beed40) 0 Class random_data size=28 align=4 @@ -1618,35 +1068,19 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6a0d1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0d200) 0 empty Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb6a0d980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0d9c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6a0da00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6a0dac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6a0da40) 0 Class QStringList size=4 align=4 @@ -1654,15 +1088,7 @@ Class QStringList QStringList (0xb6a0db00) 0 QList (0xb6a0db40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6a0dbc0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6a0dc00) 0 Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1695,15 +1121,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6a0de00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6a0de40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a0de80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1730,10 +1148,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb67e7000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67e7040) 0 empty Class QCryptographicHash size=4 align=4 @@ -1750,20 +1164,12 @@ Class QLine base size=16 base align=4 QLine (0xb67e7480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67e74c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb67e7500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67e7540) 0 empty Class QSharedData size=4 align=4 @@ -1775,30 +1181,18 @@ Class QDate base size=4 base align=4 QDate (0xb67e76c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67e7780) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb67e77c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67e7880) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb67e78c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67e7980) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1810,20 +1204,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb67e7a00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb67e7a80) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb67e7a40) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb67e7b00) 0 Class QWriteLocker size=4 align=4 @@ -1876,20 +1262,12 @@ Class QMutex base size=4 base align=4 QMutex (0xb67e7d40) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb67e7dc0) 0 Class QMutexLocker size=4 align=4 base size=4 base align=4 QMutexLocker (0xb67e7d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb67e7ec0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1914,15 +1292,7 @@ Class QTextCodec QTextCodec (0xb67e7e00) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb67e73c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb67e7f80) 0 Class QTextEncoder size=32 align=4 @@ -1934,25 +1304,9 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb67e7740) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb67e7840) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb67e7800) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb67e7900) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb67e7940) 0 Class __gconv_trans_data size=20 align=4 @@ -1974,15 +1328,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb65cb000) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb65cb080) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb65cb040) 0 Class _IO_marker size=12 align=4 @@ -1994,10 +1340,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb65cb100) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb65cb140) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -2012,10 +1354,6 @@ Class QTextStream QTextStream (0xb65cb180) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65cb240) 0 Class QTextStreamManipulator size=24 align=4 @@ -2131,35 +1469,15 @@ QFile (0xb65cb680) 0 QObject (0xb65cb700) 0 primary-for QIODevice (0xb65cb6c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65cb780) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb65cb7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65cb800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65cb840) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb65cb900) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb65cb880) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -2212,15 +1530,7 @@ Class QDir base size=4 base align=4 QDir (0xb65cba80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65cbb00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65cbb80) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2277,10 +1587,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb65cbbc0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65cbd40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2409,15 +1715,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb65cb200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65cb480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65cb580) 0 empty Vtable for QDirIterator QDirIterator::_ZTV12QDirIterator: 4u entries @@ -2432,10 +1730,6 @@ Class QDirIterator QDirIterator (0xb65cb640) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb65cba40) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -2541,10 +1835,6 @@ QLibrary (0xb644c140) 0 QObject (0xb644c180) 0 primary-for QLibrary (0xb644c140) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb644c200) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2649,25 +1939,9 @@ Class QTestData base size=4 base align=4 QTestData (0xb644c680) 0 -Class QList >:: - size=4 align=4 - base size=4 base align=4 -QList >:: (0xb644c9c0) 0 -Class QList > - size=4 align=4 - base size=4 base align=4 -QList > (0xb644c940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb644cb80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb644cb00) 0 Vtable for QSignalSpy QSignalSpy::_ZTV10QSignalSpy: 14u entries @@ -2720,43 +1994,11 @@ QTestEventLoop (0xb644cd80) 0 QObject (0xb644cdc0) 0 primary-for QTestEventLoop (0xb644cd80) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb644ce80) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb644cfc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb644c1c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb644c340) 0 -Class QTypeInfo > - size=1 align=1 - base size=0 base align=1 -QTypeInfo > (0xb644c600) 0 empty -Class QList >::Node - size=4 align=4 - base size=4 base align=4 -QList >::Node (0xb644c740) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb644c840) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb644c8c0) 0 diff --git a/tests/auto/bic/data/QtTest.4.3.2.linux-gcc-ia32.txt b/tests/auto/bic/data/QtTest.4.3.2.linux-gcc-ia32.txt index 25081aed0..d0070d13b 100644 --- a/tests/auto/bic/data/QtTest.4.3.2.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtTest.4.3.2.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f3fd80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f3fdc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f3fe80) 0 empty - QUintForSize<4> (0xb7f3fec0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f3ff40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f3ff80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb77e1040) 0 empty - QIntForSize<4> (0xb77e1080) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77e1340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e1400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e1440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e1480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e14c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e1500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e1540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e1580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e15c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e1600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e1640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e1680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e16c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e1700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e1740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77e1780) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb77e17c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77e18c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77e1900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77e1940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77e1980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77e19c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77e1a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77e1a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77e1a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77e1ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77e1b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77e1b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77e1b80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77e1bc0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb77e1cc0) 0 QGenericArgument (0xb77e1d00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb77e1ec0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb77e1f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7321000) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb7321300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7321340) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb7321380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7321580) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb7321680) 0 QString (0xb73216c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7321700) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb7321a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb7321dc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb7321d40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb73214c0) 0 QObject (0xb7321500) 0 primary-for QLibrary (0xb73214c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7321840) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb7321c00) 0 QObject (0xb7321e40) 0 primary-for QIODevice (0xb7321c00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6f45000) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb6f450c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6f45100) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6f45140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6f45200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6f45180) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb6f45240) 0 QList (0xb6f45280) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6f45300) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6f45340) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6f456c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6f45700) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb6f45c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6f45d00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6f45d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6f45e00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6f45e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6f45f00) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb6f45f40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6f45fc0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6f45080) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6f45f80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6f45440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6f45580) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6f45ac0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6f45c80) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6f45cc0) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb6f45dc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6f45e80) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6f45ec0) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6d06000) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6d060c0) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6d06080) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6d06040) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d06100) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6d06180) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6d06140) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d061c0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6d06240) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6d06200) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d06280) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6d062c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6d06300) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb6d06580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d06780) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6d06800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d06a00) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6d06dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d06e00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6d06e40) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb6b3f040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b3f280) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6b3f2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b3f500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6b3f640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b3f740) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6b3f780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b3f840) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6b3f880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b3f8c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6b3f900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b3f940) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6b3fcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b3fd00) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb6b3fe40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b3fec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b3ff00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6b3ff40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3f800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b3fb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b00c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b01c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b02c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b03c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b04c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b05c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b06c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b0780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67b07c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb67b0800) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb67b0a80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb67b0ac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb67b0bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb67b0b40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb67b0cc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb67b0c40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb67b0d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67b0dc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb67b0e00) 0 QObject (0xb67b0e40) 0 primary-for QSettings (0xb67b0e00) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb67b0f40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb67b0f00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb67b0f80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb67b0fc0) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb67b0a00) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb67b0e80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb67b0a40) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb668f000) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb668f040) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb668f080) 0 QObject (0xb668f100) 0 primary-for QIODevice (0xb668f0c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb668f180) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb668f300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb668f340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb668f380) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb668f440) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb668f3c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb668f480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb668f500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb668f580) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb668f7c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb668f880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb668f8c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb668fa40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb668fb00) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb668fc40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb668fb80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb668fd80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb668fd00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb668fe40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb668ff00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb64cf0c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb64cf140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb64cf100) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb64cf1c0) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb64cf200) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb64cf280) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb64cf580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64cf5c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb64cf6c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64cf700) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb64cf740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64cf7c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb64cfc40) 0 QObject (0xb64cfc80) 0 primary-for QEventLoop (0xb64cfc40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64cfd80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb64cfe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64cfec0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb64cff80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6448000) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb6448080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64480c0) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2669,35 +1959,15 @@ QTestEventLoop (0xb6448380) 0 QObject (0xb64483c0) 0 primary-for QTestEventLoop (0xb6448380) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb6448480) 0 Class QTestData size=4 align=4 base size=4 base align=4 QTestData (0xb6448740) 0 -Class QList >:: - size=4 align=4 - base size=4 base align=4 -QList >:: (0xb64489c0) 0 -Class QList > - size=4 align=4 - base size=4 base align=4 -QList > (0xb6448940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6448b80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6448b00) 0 Vtable for QSignalSpy QSignalSpy::_ZTV10QSignalSpy: 14u entries @@ -2725,38 +1995,10 @@ QSignalSpy (0xb6448a00) 0 primary-for QSignalSpy (0xb6448a00) QList > (0xb6448a80) 8 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6448cc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6448d40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6448dc0) 0 -Class QTypeInfo > - size=1 align=1 - base size=0 base align=1 -QTypeInfo > (0xb6448e40) 0 empty -Class QList >::Node - size=4 align=4 - base size=4 base align=4 -QList >::Node (0xb6448ec0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6448f40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6448fc0) 0 diff --git a/tests/auto/bic/data/QtTest.4.4.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtTest.4.4.0.linux-gcc-ia32.txt index e19076b50..e8a507138 100644 --- a/tests/auto/bic/data/QtTest.4.4.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtTest.4.4.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb79373fc) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7937438) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7d96b80) 0 empty - QUintForSize<4> (0xb79374b0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb79375dc) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7937618) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7d96d40) 0 empty - QIntForSize<4> (0xb7937690) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7949a8c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7949c6c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7949d5c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7949e4c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7949f3c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb795e03c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb795e12c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb795e21c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb795e30c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb795e3fc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb795e4ec) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb795e5dc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb795e6cc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb795e7bc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb795e8ac) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb795e99c) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb797e99c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb79a8654) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6c2e21c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c7a30c) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c7a5a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c7aec4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6ac47f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6acf12c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6acfa50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6ae2384) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6ae2ca8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6af65dc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6af6f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b0a834) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b18168) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b18a8c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b2f3c0) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb6b2fe4c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6991078) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb68aeb40) 0 QString (0xb68f84b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68f87bc) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QListData base size=4 base align=4 QListData (0xb695de88) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb681612c) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -386,15 +228,7 @@ Class QTextCodec QTextCodec (0xb6808474) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6827780) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6827708) 0 Class QTextEncoder size=32 align=4 @@ -417,25 +251,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb6855040) 0 QGenericArgument (0xb684b99c) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb684be88) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb684bca8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6870000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6863f78) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -527,10 +349,6 @@ QIODevice (0xb66a6ec0) 0 QObject (0xb66bf000) 0 primary-for QIODevice (0xb66a6ec0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb66db2d0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -550,25 +368,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb671921c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb673ca14) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb673cb04) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6749078) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6749000) 0 Class QStringList size=4 align=4 @@ -576,15 +382,7 @@ Class QStringList QStringList (0xb671afc0) 0 QList (0xb67490b4) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6764e10) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb677c03c) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -664,10 +462,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb65a2258) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb65a2e4c) 0 Class QMutexLocker size=4 align=4 @@ -747,35 +541,11 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6479780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6479834) 0 empty -Class - size=8 align=4 - base size=8 base align=4 - (0xb65087bc) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb65088ac) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6508834) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6508924) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb650899c) 0 Class _IO_marker size=12 align=4 @@ -787,10 +557,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6508a14) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6508a8c) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -805,10 +571,6 @@ Class QTextStream QTextStream (0xb6508ac8) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6559258) 0 Class QTextStreamManipulator size=24 align=4 @@ -845,40 +607,16 @@ QTextOStream (0xb637e100) 0 QTextStream (0xb65789d8) 0 primary-for QTextOStream (0xb637e100) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6389438) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb63894b0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb63893c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6389528) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb63895a0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6389618) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6389690) 0 Class timespec size=8 align=4 @@ -890,80 +628,24 @@ Class timeval base size=8 base align=4 timeval (0xb6389708) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6389780) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb63897f8) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6389834) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6389960) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb63898e8) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb63898ac) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb63899d8) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6389ac8) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6389a50) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6389b40) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6389c30) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6389bb8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6389ce4) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6389d5c) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6389dd4) 0 Class random_data size=28 align=4 @@ -995,20 +677,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb62a7b7c) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb62c07bc) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb62c0744) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb62c0b04) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -1028,10 +698,6 @@ Class QtConcurrent::ResultStoreBase QtConcurrent::ResultStoreBase (0xb62c0c30) 0 vptr=((& QtConcurrent::ResultStoreBase::_ZTVN12QtConcurrent15ResultStoreBaseE) + 8u) -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb62ea2d0) 0 Vtable for QFutureInterfaceBase QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries @@ -1046,25 +712,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb62ea348) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb63067c0) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb62eae88) 0 - primary-for QFutureInterface (0xb63067c0) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb633a618) 0 Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1093,34 +742,7 @@ QFutureWatcherBase (0xb635e700) 0 QObject (0xb635cca8) 0 primary-for QFutureWatcherBase (0xb635e700) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb635ee00) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb635ee40) 0 - primary-for QFutureWatcher (0xb635ee00) - QObject (0xb63747bc) 0 - primary-for QFutureWatcherBase (0xb635ee40) Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1219,60 +841,14 @@ QtConcurrent::ThreadEngineBase (0xb61b9300) 0 QRunnable (0xb61be7bc) 0 primary-for QtConcurrent::ThreadEngineBase (0xb61b9300) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb61befb4) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb61b9c80) 0 - QtConcurrent::ThreadEngineStarterBase (0xb61d2000) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 -4u -32 0u -36 0u -40 0u -44 0u -48 0u -52 -4u -56 0u -60 (int (*)(...))-0x000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb61b9e40) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb61b9e80) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb61d24b0) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb61b9e80) Class std::input_iterator_tag size=1 align=1 @@ -1315,225 +891,49 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb61d2f00) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb61d2f78) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb61ef12c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61ef21c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61ef294) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61ef30c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61ef384) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61ef3fc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61ef474) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61ef4ec) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61ef564) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61ef5dc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61ef654) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61ef6cc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61ef744) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61ef7bc) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb61ef8ac) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb61ef924) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb61ef99c) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb61efd20) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb61efd98) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb61efe88) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb61eff00) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb61eff78) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb62021a4) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb62021e0) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb620221c) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6202258) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6202294) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb62022d0) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6202348) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6202384) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb62023c0) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb62023fc) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6202438) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6202474) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb6202e4c) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb626a438) 0 empty -Class std::__copy_move - size=1 align=1 - base size=0 base align=1 -std::__copy_move (0xb626a870) 0 empty -Class std::__copy_move_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_move_backward (0xb626aa8c) 0 empty -Class std::__equal - size=1 align=1 - base size=0 base align=1 -std::__equal (0xb626ae88) 0 empty -Class std::__lc_rai - size=1 align=1 - base size=0 base align=1 -std::__lc_rai (0xb60b3000) 0 empty -Class std::__lexicographical_compare - size=1 align=1 - base size=0 base align=1 -std::__lexicographical_compare (0xb60b3168) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb60b3870) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb60de294) 0 empty Class lconv size=56 align=4 @@ -1550,10 +950,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb60e0e4c) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb60e0ec4) 0 Class tm size=44 align=4 @@ -1570,15 +966,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb610b1a4) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb610b30c) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb610b294) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1590,32 +978,10 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb610b384) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb61658ac) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb6165b7c) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5f68800) 0 empty - __gnu_cxx::new_allocator (0xb6165bb8) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb6165bf4) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5f688c0) 0 empty - __gnu_cxx::new_allocator (0xb6165c30) 0 empty Vtable for __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries @@ -1631,82 +997,19 @@ Class __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind (0xb6165e4c) 0 nearly-empty vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 8u) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb600a744) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb600a780) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb600db80) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb600a7bc) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5e88438) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5ea7140) 0 - std::allocator (0xb5ea7180) 0 empty - __gnu_cxx::new_allocator (0xb5e884b0) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5e883c0) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5e884ec) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5ea7300) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5e88528) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5e885dc) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5ea7500) 0 - std::allocator (0xb5ea7540) 0 empty - __gnu_cxx::new_allocator (0xb5e88654) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5e88564) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5e88690) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5e88744) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5ea76c0) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5e886cc) 0 Class std::locale size=4 align=4 @@ -1736,97 +1039,16 @@ Class std::locale::_Impl base size=20 base align=4 std::locale::_Impl (0xb5f468e8) 0 -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5f54680) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb5f59294) 0 - primary-for std::collate (0xb5f54680) -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5f54780) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb5f59384) 0 - primary-for std::collate (0xb5f54780) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5f597f8) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5f59834) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5d75700) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5f59870) 0 empty -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5d75840) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb5d75880) 0 - primary-for std::collate_byname (0xb5d75840) - std::locale::facet (0xb5f598e8) 0 - primary-for std::collate (0xb5d75880) - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5d75900) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb5d75940) 0 - primary-for std::collate_byname (0xb5d75900) - std::locale::facet (0xb5f599d8) 0 - primary-for std::collate (0xb5d75940) + + + + + Vtable for std::ios_base::failure std::ios_base::failure::_ZTVNSt8ios_base7failureE: 5u entries @@ -1872,583 +1094,85 @@ Class std::ios_base std::ios_base (0xb5d8b780) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5dbce10) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5dbcec4) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb5dbcf3c) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb5e44140) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb5e3f294) 0 - primary-for std::ctype (0xb5e44140) - std::ctype_base (0xb5e3f2d0) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb5e4ca00) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb5e5ce4c) 0 - primary-for std::__ctype_abstract_base (0xb5e4ca00) - std::ctype_base (0xb5e5ce88) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb5e50840) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb5c68870) 0 - primary-for std::ctype (0xb5e50840) - std::locale::facet (0xb5e5cf78) 0 - primary-for std::__ctype_abstract_base (0xb5c68870) - std::ctype_base (0xb5e5cfb4) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb5e50a00) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb5c70d20) 0 - primary-for std::ctype_byname (0xb5e50a00) - std::locale::facet (0xb5c712d0) 0 - primary-for std::ctype (0xb5c70d20) - std::ctype_base (0xb5c7130c) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb5e50a80) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb5e50ac0) 0 - primary-for std::ctype_byname (0xb5e50a80) - std::__ctype_abstract_base (0xb5c75640) 0 - primary-for std::ctype (0xb5e50ac0) - std::locale::facet (0xb5c71474) 0 - primary-for std::__ctype_abstract_base (0xb5c75640) - std::ctype_base (0xb5c714b0) 0 empty + + + + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb5c71ec4) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5c854c0) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb5c81690) 0 - primary-for std::numpunct (0xb5c854c0) -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5c85580) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb5c81780) 0 - primary-for std::numpunct (0xb5c85580) -Class __gnu_cxx::__conditional_type - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type (0xb5cb9dd4) 0 empty -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5d07ac0) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb5d07b00) 0 - primary-for std::numpunct_byname (0xb5d07ac0) - std::locale::facet (0xb5d0c3fc) 0 - primary-for std::numpunct (0xb5d07b00) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5d07b40) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5d0c4ec) 0 - primary-for std::num_get > > (0xb5d07b40) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5d07bc0) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5d0c5dc) 0 - primary-for std::num_put > > (0xb5d07bc0) -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5d07c40) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb5d07c80) 0 - primary-for std::numpunct_byname (0xb5d07c40) - std::locale::facet (0xb5d0c6cc) 0 - primary-for std::numpunct (0xb5d07c80) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5d07d00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5d0c7bc) 0 - primary-for std::num_get > > (0xb5d07d00) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5d07d80) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5d0c8ac) 0 - primary-for std::num_put > > (0xb5d07d80) -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb5d5adc0) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb5d0c780) 0 - primary-for std::basic_ios > (0xb5d5adc0) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb5d5ae00) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb5b7003c) 0 - primary-for std::basic_ios > (0xb5d5ae00) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5ba6a80) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb5ba6ac0) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb5b70d20) 4 - primary-for std::basic_ios > (0xb5ba6ac0) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5b70f00) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5ba6c00) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5ba6c40) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5b70f3c) 4 - primary-for std::basic_ios > (0xb5ba6c40) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5bcc000) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5be54c0) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb5be5500) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb5bcc564) 8 - primary-for std::basic_ios > (0xb5be5500) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5be55c0) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5be5600) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5bcc8e8) 8 - primary-for std::basic_ios > (0xb5be5600) - -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5bcc654) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5bcc99c) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5c114c0) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5bccfb4) 0 empty -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5c165a0) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb5c4d3c0 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2486,44 +1210,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5c56cd0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb5c4d3c0) 0 - primary-for std::basic_iostream > (0xb5c56cd0) - subvttidx=4u - std::basic_ios > (0xb5c4d400) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb5c165dc) 12 - primary-for std::basic_ios > (0xb5c4d400) - std::basic_ostream > (0xb5c4d440) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb5c4d400) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5c16870) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb5c4d740 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2561,110 +1249,21 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5c63d70) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb5c4d740) 0 - primary-for std::basic_iostream > (0xb5c63d70) - subvttidx=4u - std::basic_ios > (0xb5c4d780) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb5c168ac) 12 - primary-for std::basic_ios > (0xb5c4d780) - std::basic_ostream > (0xb5c4d7c0) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb5c4d780) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5a7803c) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5c16960) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb5c16690) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb5c16000) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb5a783fc) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5a78c6c) 0 -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb59950f0) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb5997500) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb5988a40) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb5997500) - QFutureInterfaceBase (0xb59952d0) 0 - primary-for QFutureInterface (0xb5988a40) - QRunnable (0xb599530c) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb5988ac0) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb5997910) 0 - primary-for QtConcurrent::RunFunctionTask (0xb5988ac0) - QFutureInterface (0xb5988b00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb5997910) - QFutureInterfaceBase (0xb59954b0) 0 - primary-for QFutureInterface (0xb5988b00) - QRunnable (0xb59954ec) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + Class QLibraryInfo size=1 align=1 @@ -2715,50 +1314,22 @@ QFile (0xb58ebe40) 0 QObject (0xb58fa834) 0 primary-for QIODevice (0xb58ebe80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb59281a4) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb5928d5c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb594b3fc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb594b708) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb595c474) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb595c3fc) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb595c564) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb577eac8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb577ebb8) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2833,10 +1404,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb57ace88) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57bbf78) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2926,10 +1493,6 @@ Class QDirIterator QDirIterator (0xb57ec12c) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57ec924) 0 Vtable for QFileSystemWatcher QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries @@ -3067,25 +1630,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb58508e8) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb5850960) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb58316cc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5856168) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb58562d0) 0 Class QResource size=4 align=4 @@ -3097,275 +1648,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb5664bb8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5689000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56891e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56893c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56895a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5689780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5689960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5689b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5689d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5689f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56930f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56932d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56934b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5693690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5693870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5693a50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5693c30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5693e10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5698000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56981e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56983c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56985a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5698780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5698960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5698b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5698d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5698f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56a10f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56a12d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56a14b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56a1690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56a1870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56a1a50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56a1c30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56a1e10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56ab000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56ab1e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56ab3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56ab5a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56ab780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56ab960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56abb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56abd20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56abf00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56b00f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56b02d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56b04b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56b0690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56b0870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56b0a50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56b0c30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56b0e10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56b8000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56b81e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56b83c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3392,45 +1727,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb56b85a0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb56f603c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb56eafb4) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb56f612c) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb56f60b4) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb57284b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5728ac8) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5728ca8) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5728e88) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3508,15 +1815,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb5579f3c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5584e4c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55ac8e8) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -3543,10 +1842,6 @@ QEventLoop (0xb5576b00) 0 QObject (0xb55bb744) 0 primary-for QEventLoop (0xb5576b00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55bbd5c) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -3591,20 +1886,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb55dc870) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb56033c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb56034b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5603bf4) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -3774,10 +2061,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb5651d5c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb545a4ec) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3889,20 +2172,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb54c312c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54c35dc) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb54c36cc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54c3b04) 0 empty Class QMetaProperty size=20 align=4 @@ -3914,10 +2189,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb54c3f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54d8258) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -4129,10 +2400,6 @@ QLibrary (0xb551c800) 0 QObject (0xb5536bb8) 0 primary-for QLibrary (0xb551c800) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5545b04) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4169,20 +2436,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb537b0b4) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb537b744) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb537b438) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb5388c30) 0 Class QWriteLocker size=4 align=4 @@ -4209,10 +2468,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb53d021c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53d0f00) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -4229,70 +2484,42 @@ Class QDate base size=4 base align=4 QDate (0xb53ddf00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb540d8ac) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb540d99c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5414f78) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb5421000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5428708) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb54288e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5440744) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb544f8e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb523d834) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb524f8ac) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb524fc6c) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb5271dd4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb527e7f8) 0 empty Class QLinkedListData size=20 align=4 @@ -4304,40 +2531,24 @@ Class QSize base size=8 base align=4 QSize (0xb530a744) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb531d834) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb51393c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5142438) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb516021c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb517c0f0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb51b6ce4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51da1e0) 0 empty Class QSharedData size=4 align=4 @@ -4385,20 +2596,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb50799d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5082f78) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb50920b4) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb509203c) 0 Class QXmlStreamAttributes size=4 align=4 @@ -4411,30 +2610,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb509212c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5092b40) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb5092c6c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50b2834) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb50b2960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50c68e8) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -4461,25 +2648,9 @@ Class QXmlStreamWriter base size=4 base align=4 QXmlStreamWriter (0xb50f71a4) 0 -Class QList >:: - size=4 align=4 - base size=4 base align=4 -QList >:: (0xb50f77f8) 0 -Class QList > - size=4 align=4 - base size=4 base align=4 -QList > (0xb50f7780) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb50f7a50) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb50f79d8) 0 Vtable for QSignalSpy QSignalSpy::_ZTV10QSignalSpy: 14u entries @@ -4537,58 +2708,14 @@ QTestEventLoop (0xb4f8b700) 0 QObject (0xb4fa40f0) 0 primary-for QTestEventLoop (0xb4f8b700) -Class QPointer - size=4 align=4 - base size=4 base align=4 -QPointer (0xb4fb21a4) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4fff99c) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb5014f3c) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4e9f690) 0 -Class QTypeInfo > - size=1 align=1 - base size=0 base align=1 -QTypeInfo > (0xb4e9f870) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ed9d5c) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb4ed9dd4) 0 -Class QList >::Node - size=4 align=4 - base size=4 base align=4 -QList >::Node (0xb4f0bec4) 0 -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb4d335a0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4d336cc) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4d33e10) 0 diff --git a/tests/auto/bic/data/QtXml.4.0.0.aix-gcc-power32.txt b/tests/auto/bic/data/QtXml.4.0.0.aix-gcc-power32.txt index d131c8752..83a6e887d 100644 --- a/tests/auto/bic/data/QtXml.4.0.0.aix-gcc-power32.txt +++ b/tests/auto/bic/data/QtXml.4.0.0.aix-gcc-power32.txt @@ -53,65 +53,20 @@ Class QBool size=1 align=1 QBool (0x300b7280) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cd9c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300cdf80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4540) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300d4b00) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e00c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0680) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300e0c40) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb200) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300eb7c0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebd80) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8340) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8900) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300f8ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104480) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30104a40) 0 empty Class QFlag size=4 align=4 @@ -125,9 +80,6 @@ Class QChar size=2 align=2 QChar (0x30148980) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30185980) 0 empty Class QBasicAtomic size=4 align=4 @@ -142,13 +94,7 @@ Class sigset_t size=8 align=4 sigset_t (0x3026ad80) 0 -Class - size=8 align=4 - (0x30271200) 0 -Class - size=32 align=8 - (0x30271540) 0 Class fsid_t size=8 align=4 @@ -158,21 +104,9 @@ Class fsid64_t size=16 align=8 fsid64_t (0x30271c40) 0 -Class - size=52 align=4 - (0x302780c0) 0 -Class - size=44 align=4 - (0x30278440) 0 -Class - size=112 align=4 - (0x302787c0) 0 -Class - size=208 align=4 - (0x30278b40) 0 Class _quad size=8 align=4 @@ -186,17 +120,11 @@ Class adspace_t size=68 align=4 adspace_t (0x30281e00) 0 -Class - size=24 align=8 - (0x302865c0) 0 Class label_t size=100 align=4 label_t (0x30286d00) 0 -Class - size=4 align=4 - (0x3028b780) 0 Class sigset size=8 align=4 @@ -238,57 +166,18 @@ Class QByteRef size=8 align=4 QByteRef (0x302b7540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30423740) 0 empty -Class QFlags - size=4 align=4 -QFlags (0x30431080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431340) 0 -Class QFlags - size=4 align=4 -QFlags (0x3042cc00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30442080) 0 -Class QFlags - size=4 align=4 -QFlags (0x30431a00) 0 -Class QFlags - size=4 align=4 -QFlags (0x30448800) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046af00) 0 -Class QFlags - size=4 align=4 -QFlags (0x3046e200) 0 -Class QFlags - size=4 align=4 -QFlags (0x304422c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30474f80) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479700) 0 -Class QFlags - size=4 align=4 -QFlags (0x30479a40) 0 Class QInternal size=1 align=1 @@ -306,9 +195,6 @@ Class QString size=4 align=4 QString (0x300a1f40) 0 -Class QFlags - size=4 align=4 -QFlags (0x303cf2c0) 0 Class QLatin1String size=4 align=4 @@ -323,9 +209,6 @@ Class QConstString QConstString (0x300b7640) 0 QString (0x300b7680) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303901c0) 0 empty Class QListData::Data size=24 align=4 @@ -335,9 +218,6 @@ Class QListData size=4 align=4 QListData (0x300732c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x302fb500) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -360,13 +240,7 @@ Class QTextCodec QTextCodec (0x303bab80) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8) -Class QList:: - size=4 align=4 -QList:: (0x30120bc0) 0 -Class QList - size=4 align=4 -QList (0x302cc980) 0 Class QTextEncoder size=32 align=4 @@ -385,21 +259,12 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3036a6c0) 0 QGenericArgument (0x3036a700) 0 -Class QMetaObject:: - size=16 align=4 -QMetaObject:: (0x3009b300) 0 Class QMetaObject size=16 align=4 QMetaObject (0x3058c900) 0 -Class QList:: - size=4 align=4 -QList:: (0x30170600) 0 -Class QList - size=4 align=4 -QList (0x30166f00) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4 entries @@ -487,9 +352,6 @@ QIODevice (0x30365880) 0 QObject (0x301e4440) 0 primary-for QIODevice (0x30365880) -Class QFlags - size=4 align=4 -QFlags (0x301ebec0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4 entries @@ -507,38 +369,20 @@ Class QRegExp size=4 align=4 QRegExp (0x303baa80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30148180) 0 empty Class QStringMatcher size=1036 align=4 QStringMatcher (0x3012d8c0) 0 -Class QList:: - size=4 align=4 -QList:: (0x30104900) 0 -Class QList - size=4 align=4 -QList (0x30104380) 0 Class QStringList size=4 align=4 QStringList (0x303bab00) 0 QList (0x300c3280) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x301046c0) 0 -Class QList::iterator - size=4 align=4 -QList::iterator (0x300eba00) 0 -Class QList::const_iterator - size=4 align=4 -QList::const_iterator (0x300eb980) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5 entries @@ -664,9 +508,6 @@ Class QMapData size=72 align=4 QMapData (0x304b4140) 0 -Class - size=32 align=4 - (0x3052cd00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4 entries @@ -680,9 +521,6 @@ Class QTextStream QTextStream (0x3050bbc0) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8) -Class QFlags - size=4 align=4 -QFlags (0x305082c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -767,41 +605,20 @@ QFile (0x3057c8c0) 0 QObject (0x3057c980) 0 primary-for QIODevice (0x3057c900) -Class QFlags - size=4 align=4 -QFlags (0x3058a380) 0 Class QFileInfo size=4 align=4 QFileInfo (0x304b0580) 0 -Class QFlags - size=4 align=4 -QFlags (0x304927c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30390480) 0 empty -Class QList:: - size=4 align=4 -QList:: (0x301dfa40) 0 -Class QList - size=4 align=4 -QList (0x301df900) 0 Class QDir size=4 align=4 QDir (0x304b03c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x30365600) 0 -Class QFlags - size=4 align=4 -QFlags (0x303ac7c0) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35 entries @@ -846,9 +663,6 @@ Class QFileEngine QFileEngine (0x3057c7c0) 0 vptr=((&QFileEngine::_ZTV11QFileEngine) + 8) -Class QFlags - size=4 align=4 -QFlags (0x3031a080) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5 entries @@ -910,73 +724,22 @@ Class QMetaType size=1 align=1 QMetaType (0x30079000) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3011fb00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3013d480) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x30148440) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x3015dfc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301937c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a18c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301a5d00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301ad500) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301add00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b22c0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b2b00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6640) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b6fc0) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9600) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301b9c00) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301c1740) 0 empty -Class QMetaTypeId - size=1 align=1 -QMetaTypeId (0x301d7f80) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -998,69 +761,24 @@ Class QVariant size=16 align=8 QVariant (0x30166c00) 0 -Class QList:: - size=4 align=4 -QList:: (0x3057e500) 0 -Class QList - size=4 align=4 -QList (0x302acd80) 0 -Class QMap:: - size=4 align=4 -QMap:: (0x302ed8c0) 0 -Class QMap - size=4 align=4 -QMap (0x302b7980) 0 Class QVariantComparisonHelper size=4 align=4 QVariantComparisonHelper (0x30225880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x303e8900) 0 empty -Class - size=12 align=4 - (0x303dab00) 0 -Class - size=44 align=4 - (0x303f70c0) 0 -Class - size=76 align=4 - (0x303f7880) 0 -Class - size=36 align=4 - (0x303fc640) 0 -Class - size=56 align=4 - (0x303fcc40) 0 -Class - size=36 align=4 - (0x30414340) 0 -Class - size=28 align=4 - (0x30414f00) 0 -Class - size=24 align=4 - (0x30486a40) 0 -Class - size=28 align=4 - (0x30486d80) 0 -Class - size=28 align=4 - (0x30492400) 0 Class lconv size=56 align=4 @@ -1102,77 +820,41 @@ Class localeinfo_table size=36 align=4 localeinfo_table (0x303d9cc0) 0 -Class - size=108 align=4 - (0x304dc500) 0 Class _LC_charmap_objhdl size=12 align=4 _LC_charmap_objhdl (0x304dcc80) 0 -Class - size=92 align=4 - (0x30561040) 0 Class _LC_monetary_objhdl size=12 align=4 _LC_monetary_objhdl (0x305614c0) 0 -Class - size=48 align=4 - (0x30561800) 0 Class _LC_numeric_objhdl size=12 align=4 _LC_numeric_objhdl (0x30561d00) 0 -Class - size=56 align=4 - (0x30083180) 0 Class _LC_resp_objhdl size=12 align=4 _LC_resp_objhdl (0x300838c0) 0 -Class - size=248 align=4 - (0x30083c40) 0 Class _LC_time_objhdl size=12 align=4 _LC_time_objhdl (0x3012c400) 0 -Class - size=10 align=2 - (0x3012cc40) 0 -Class - size=16 align=4 - (0x301df180) 0 -Class - size=16 align=4 - (0x301df5c0) 0 -Class - size=20 align=4 - (0x303acac0) 0 -Class - size=104 align=4 - (0x30504a00) 0 Class _LC_collate_objhdl size=12 align=4 _LC_collate_objhdl (0x301bfb80) 0 -Class - size=8 align=4 - (0x301e8b00) 0 -Class - size=80 align=4 - (0x305a0100) 0 Class _LC_ctype_objhdl size=12 align=4 @@ -1186,17 +868,11 @@ Class _LC_locale_objhdl size=12 align=4 _LC_locale_objhdl (0x303da600) 0 -Class _LC_object_handle:: - size=12 align=4 -_LC_object_handle:: (0x305911c0) 0 Class _LC_object_handle size=20 align=4 _LC_object_handle (0x30591080) 0 -Class - size=24 align=4 - (0x3031ed80) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14 entries @@ -1271,13 +947,7 @@ Class QUrl size=4 align=4 QUrl (0x302256c0) 0 -Class QFlags - size=4 align=4 -QFlags (0x306df180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307c8900) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14 entries @@ -1303,9 +973,6 @@ QEventLoop (0x30802000) 0 QObject (0x30802040) 0 primary-for QEventLoop (0x30802000) -Class QFlags - size=4 align=4 -QFlags (0x30803740) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27 entries @@ -1348,17 +1015,11 @@ Class QModelIndex size=16 align=4 QModelIndex (0x3049cc80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304eb5c0) 0 empty Class QPersistentModelIndex size=4 align=4 QPersistentModelIndex (0x3049cb80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3002e700) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42 entries @@ -1524,9 +1185,6 @@ Class QBasicTimer size=4 align=4 QBasicTimer (0x307fe180) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30803300) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4 entries @@ -1612,17 +1270,11 @@ Class QMetaMethod size=8 align=4 QMetaMethod (0x30379340) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30880740) 0 empty Class QMetaEnum size=8 align=4 QMetaEnum (0x303793c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3088be80) 0 empty Class QMetaProperty size=20 align=4 @@ -1632,9 +1284,6 @@ Class QMetaClassInfo size=8 align=4 QMetaClassInfo (0x30379540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x308a3780) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17 entries @@ -1902,9 +1551,6 @@ Class QBitRef size=8 align=4 QBitRef (0x305a6140) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864700) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1922,65 +1568,41 @@ Class QHashDummyValue size=1 align=1 QHashDummyValue (0x30893ec0) 0 empty -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30897f00) 0 empty Class QDate size=4 align=4 QDate (0x301eb4c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x300ebe80) 0 empty Class QTime size=4 align=4 QTime (0x301f1e80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30368c00) 0 empty Class QDateTime size=4 align=4 QDateTime (0x304b0440) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x304d4880) 0 empty Class QPoint size=8 align=4 QPoint (0x301f9d40) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307b9180) 0 empty Class QPointF size=16 align=8 QPointF (0x30200880) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x307efcc0) 0 empty Class QLine size=16 align=4 QLine (0x301eb540) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x3098afc0) 0 empty Class QLineF size=32 align=8 QLineF (0x301eb600) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a335c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1990,41 +1612,26 @@ Class QLocale size=4 align=4 QLocale (0x301eb800) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30822c80) 0 empty Class QSize size=8 align=4 QSize (0x30200a80) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30864400) 0 empty Class QSizeF size=16 align=8 QSizeF (0x30209200) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a33a80) 0 empty Class QRect size=16 align=4 QRect (0x30213780) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30aad700) 0 empty Class QRectF size=32 align=8 QRectF (0x302138c0) 0 -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30a1fdc0) 0 empty Class QSharedData size=4 align=4 @@ -2127,13 +1734,7 @@ Class QXmlAttributes::Attribute size=16 align=4 QXmlAttributes::Attribute (0x301d1980) 0 -Class QList:: - size=4 align=4 -QList:: (0x304fb8c0) 0 -Class QList - size=4 align=4 -QList (0x304ffa00) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4 entries @@ -2147,13 +1748,7 @@ Class QXmlAttributes QXmlAttributes (0x307b61c0) 0 vptr=((&QXmlAttributes::_ZTV14QXmlAttributes) + 8) -Class QTypeInfo - size=1 align=1 -QTypeInfo (0x30b26cc0) 0 empty -Class QList::Node - size=4 align=4 -QList::Node (0x304fb880) 0 Vtable for QXmlInputSource QXmlInputSource::_ZTV15QXmlInputSource: 11 entries @@ -2458,11 +2053,5 @@ QXmlDefaultHandler (0x307b62c0) 0 QXmlDeclHandler (0x30aefe40) 20 nearly-empty vptr=((&QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268) -Class QList::Node - size=4 align=4 -QList::Node (0x30120ac0) 0 -Class QList::Node - size=4 align=4 -QList::Node (0x301dfa00) 0 diff --git a/tests/auto/bic/data/QtXml.4.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtXml.4.0.0.linux-gcc-amd64.txt index be980d573..1e5b2a25f 100644 --- a/tests/auto/bic/data/QtXml.4.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtXml.4.0.0.linux-gcc-amd64.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x2aaaac211070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac211f50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac226230) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac2264d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac226770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac226a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac226cb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac226f50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac238230) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac2384d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac238770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac238a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac238cb0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac238f50) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac249230) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac2494d0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x2aaaac249700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac2767e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac276bd0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac301000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac3013f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac3017e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac301bd0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac347000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac3473f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac3477e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac347bd0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac393000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac3933f0) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x2aaaac393e00) 0 QGenericArgument (0x2aaaac393e70) 0 -Class QMetaObject:: - size=32 align=8 - base size=32 base align=8 -QMetaObject:: (0x2aaaac3c5700) 0 Class QMetaObject size=32 align=8 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x2aaaac3fc380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac4343f0) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=12 base align=8 QByteRef (0x2aaaac555a10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac5e4a80) 0 empty Class QString::Null size=1 align=1 @@ -291,10 +171,6 @@ Class QString base size=8 base align=8 QString (0x2aaaac5e4d90) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaac674620) 0 Class QLatin1String size=8 align=8 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x2aaaac8a98c0) 0 QString (0x2aaaac8a9930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaac8a9e70) 0 empty Class QListData::Data size=32 align=8 @@ -327,15 +199,7 @@ Class QListData base size=8 base align=8 QListData (0x2aaaac8e4d90) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaaca03cb0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaaca03b60) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x2aaaaca8d150) 0 QObject (0x2aaaaca8d1c0) 0 primary-for QIODevice (0x2aaaaca8d150) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaaca8dd20) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=128 base align=8 QMapData (0x2aaaacb318c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacc4e7e0) 0 Class QTextCodec::ConverterState size=32 align=8 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x2aaaacc4e540) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 16u) -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaacc890e0) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaacc78f50) 0 Class QTextEncoder size=40 align=8 @@ -503,30 +351,10 @@ Class QTextDecoder base size=40 base align=8 QTextDecoder (0x2aaaacc89e00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaaccc62a0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x2aaaaccc6460) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x2aaaaccc6380) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaaccc6540) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x2aaaaccc6620) 0 Class __gconv_trans_data size=40 align=8 @@ -548,15 +376,7 @@ Class __gconv_info base size=16 base align=8 __gconv_info (0x2aaaaccc6930) 0 -Class :: - size=72 align=8 - base size=72 base align=8 -:: (0x2aaaaccc6af0) 0 -Class - size=72 align=8 - base size=72 base align=8 - (0x2aaaaccc6a10) 0 Class _IO_marker size=24 align=8 @@ -568,10 +388,6 @@ Class _IO_FILE base size=216 base align=8 _IO_FILE (0x2aaaaccc6bd0) 0 -Class - size=32 align=8 - base size=32 base align=8 - (0x2aaaaccc6cb0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x2aaaaccc6d20) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacd47000) 0 Class QTextStreamManipulator size=40 align=8 @@ -680,10 +492,6 @@ QFile (0x2aaaace14a80) 0 QObject (0x2aaaace14b60) 0 primary-for QIODevice (0x2aaaace14af0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaace48930) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=8 base align=8 QRegExp (0x2aaaace7b700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaace9f5b0) 0 empty Class QStringMatcher size=1048 align=8 base size=1044 base align=8 QStringMatcher (0x2aaaace9f7e0) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaace9fd90) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaace9fc40) 0 Class QStringList size=8 align=8 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x2aaaace9fee0) 0 QList (0x2aaaace9ff50) 0 -Class QList::iterator - size=8 align=8 - base size=8 base align=8 -QList::iterator (0x2aaaacefad90) 0 -Class QList::const_iterator - size=8 align=8 - base size=8 base align=8 -QList::const_iterator (0x2aaaacf1a150) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=8 base align=8 QFileInfo (0x2aaaacf6eaf0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacfad540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaacfad9a0) 0 empty -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaacfd4150) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaacfd4000) 0 Class QDir size=8 align=8 base size=8 base align=8 QDir (0x2aaaacfd42a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacfd4540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaacfd4770) 0 Class QUrl size=8 align=8 base size=8 base align=8 QUrl (0x2aaaad07a460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad07a770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad0d69a0) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x2aaaad0f3000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0f3700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0f38c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0f3a80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0f3c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad0f3e00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10c000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10c1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10c380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10c540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10c700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10c8c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10ca80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10cc40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad10ce00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad117000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad1171c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x2aaaad117380) 0 empty Class QVariant::PrivateShared size=16 align=8 @@ -1029,35 +717,15 @@ Class QVariant base size=16 base align=8 QVariant (0x2aaaad1174d0) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaad1aa690) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaad1aa540) 0 -Class QMap:: - size=8 align=8 - base size=8 base align=8 -QMap:: (0x2aaaad1aaa10) 0 -Class QMap - size=8 align=8 - base size=8 base align=8 -QMap (0x2aaaad1aa8c0) 0 Class QVariantComparisonHelper size=8 align=8 base size=8 base align=8 QVariantComparisonHelper (0x2aaaad21b380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad21be00) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1128,10 +796,6 @@ Class QFileEngine QFileEngine (0x2aaaad29d230) 0 vptr=((& QFileEngine::_ZTV11QFileEngine) + 16u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaad29d620) 0 Vtable for QFileEngineHandler QFileEngineHandler::_ZTV18QFileEngineHandler: 5u entries @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x2aaaad2d3ee0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad2f70e0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x2aaaad4183f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad418bd0) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x2aaaad447770) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad447f50) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x2aaaad479f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad49b150) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x2aaaad4aea10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad4d1000) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x2aaaad5000e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad5007e0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x2aaaad534a10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad534c40) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x2aaaad5868c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad5ba690) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x2aaaad647230) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad6771c0) 0 empty Class QLinkedListData size=32 align=8 @@ -1262,10 +890,6 @@ Class QBitRef base size=12 base align=8 QBitRef (0x2aaaad7ea380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad7eaf50) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=8 base align=8 QLocale (0x2aaaad920070) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad920af0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x2aaaad9cc1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaad9ee380) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x2aaaad9ee5b0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaada120e0) 0 empty Class QDateTime size=8 align=8 base size=8 base align=8 QDateTime (0x2aaaada12310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaada12f50) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x2aaaada9aa80) 0 QObject (0x2aaaada9aaf0) 0 primary-for QEventLoop (0x2aaaada9aa80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2aaaada9aee0) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=24 base align=8 QModelIndex (0x2aaaadb22f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadb4c1c0) 0 empty Class QPersistentModelIndex size=8 align=8 base size=8 base align=8 QPersistentModelIndex (0x2aaaadb4c700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadb4c930) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2aaaadbcfcb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc1e850) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=12 base align=8 QMetaMethod (0x2aaaadc5d690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc5da80) 0 empty Class QMetaEnum size=16 align=8 base size=12 base align=8 QMetaEnum (0x2aaaadc5dcb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc7f150) 0 empty Class QMetaProperty size=32 align=8 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=12 base align=8 QMetaClassInfo (0x2aaaadc7f4d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaadc7f8c0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2169,15 +1749,7 @@ Class QXmlAttributes::Attribute base size=32 base align=8 QXmlAttributes::Attribute (0x2aaaaddbbee0) 0 -Class QList:: - size=8 align=8 - base size=8 base align=8 -QList:: (0x2aaaaddee230) 0 -Class QList - size=8 align=8 - base size=8 base align=8 -QList (0x2aaaaddee0e0) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -2507,28 +2079,8 @@ QXmlDefaultHandler (0x2aaaade8e4e0) 0 QXmlDeclHandler (0x2aaaade8d3f0) 40 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 536u) -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaaadf6e540) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaaadfaa620) 0 -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaaae0e3ee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2aaaae0f6850) 0 empty -Class QList::Node - size=8 align=8 - base size=8 base align=8 -QList::Node (0x2aaaae0f69a0) 0 diff --git a/tests/auto/bic/data/QtXml.4.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtXml.4.0.0.linux-gcc-ia32.txt index 3f5e15dd5..f881e61e5 100644 --- a/tests/auto/bic/data/QtXml.4.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXml.4.0.0.linux-gcc-ia32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x4001ef40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001ed80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc0c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc2c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40abc340) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40abc380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abc540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abc5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abc640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abc6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abc740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abc7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abc840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abc8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abc940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abc9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abca40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40abcac0) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40abcc00) 0 QGenericArgument (0x40abcc40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40abce40) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x40abcf40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bd1000) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x40bd1700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bd1780) 0 empty Class QString::Null size=1 align=1 @@ -296,10 +176,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x40bd19c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40bd1b00) 0 Class QCharRef size=8 align=4 @@ -312,10 +188,6 @@ Class QConstString QConstString (0x40bd1cc0) 0 QString (0x40bd1d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bd1d80) 0 empty Class QListData::Data size=24 align=4 @@ -327,15 +199,7 @@ Class QListData base size=4 base align=4 QListData (0x40bd1e80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x40e772c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x40e77200) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -427,10 +291,6 @@ QIODevice (0x40e77500) 0 QObject (0x40e77540) 0 primary-for QIODevice (0x40e77500) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40e77680) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -455,10 +315,6 @@ Class QMapData base size=72 base align=4 QMapData (0x40e77780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40e77d40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -483,15 +339,7 @@ Class QTextCodec QTextCodec (0x40e77c40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x40e77fc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x40e77f00) 0 Class QTextEncoder size=32 align=4 @@ -503,30 +351,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x40e773c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x40e77700) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x40e77cc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x40e77a80) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x40e77d80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41066000) 0 Class __gconv_trans_data size=20 align=4 @@ -548,15 +376,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x41066100) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x41066180) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x41066140) 0 Class _IO_marker size=12 align=4 @@ -568,10 +388,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x41066200) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41066240) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -586,10 +402,6 @@ Class QTextStream QTextStream (0x41066280) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x410663c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -680,10 +492,6 @@ QFile (0x41066b00) 0 QObject (0x41066b80) 0 primary-for QIODevice (0x41066b40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41066c80) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -736,25 +544,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x41066e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41066ec0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x41066f00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x410665c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41066f80) 0 Class QStringList size=4 align=4 @@ -762,15 +558,7 @@ Class QStringList QStringList (0x41066780) 0 QList (0x41066bc0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x411761c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x41176240) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -864,145 +652,45 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x411766c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41176740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41176780) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x411768c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x41176800) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x41176900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x411769c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41176a80) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x41176b00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41176c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41176c40) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x41176c80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176d00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176d80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176dc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176e00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176e40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176e80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176f00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176f80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176fc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x41176640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x412a1000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x412a1040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x412a1080) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1029,35 +717,15 @@ Class QVariant base size=12 base align=4 QVariant (0x412a10c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x412a1680) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x412a15c0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x412a1800) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x412a1740) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x412a1a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412a1b40) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1142,10 +810,6 @@ Class QFileEngineHandler QFileEngineHandler (0x412a1e00) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412a1f00) 0 Class QHashData::Node size=8 align=4 @@ -1162,90 +826,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x412a1200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412a1280) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x413ad340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413ad780) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x413ad840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413adc80) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x413add80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413addc0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x413adec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413adf40) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x413ad380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413ad880) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x413adb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e2280) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x414e2480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e2680) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x414e2780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e2900) 0 empty Class QLinkedListData size=20 align=4 @@ -1262,10 +890,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x414e2f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e2fc0) 0 empty Class QVectorData size=16 align=4 @@ -1287,40 +911,24 @@ Class QLocale base size=4 base align=4 QLocale (0x416e3100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e3140) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x416e32c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e3440) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x416e3480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e3600) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x416e3640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x416e3780) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1480,10 +1088,6 @@ QEventLoop (0x416e3f00) 0 QObject (0x416e3f40) 0 primary-for QEventLoop (0x416e3f00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x416e3380) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1575,20 +1179,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x417fa100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fa200) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x417fa280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fa340) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1808,10 +1404,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x417fa900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fa9c0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1906,20 +1498,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x417fad00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fad80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x417fadc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417fae40) 0 empty Class QMetaProperty size=20 align=4 @@ -1931,10 +1515,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x417faec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417faf40) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2169,15 +1749,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0x418f6d80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x418f6f00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x418f6e40) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -2507,28 +2079,8 @@ QXmlDefaultHandler (0x419d1ec4) 0 QXmlDeclHandler (0x4199ca40) 20 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41a49280) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41a49940) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41ac9c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41ac9dc0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41ac9e80) 0 diff --git a/tests/auto/bic/data/QtXml.4.0.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtXml.4.0.0.linux-gcc-ppc32.txt index 051635f91..b656a27a8 100644 --- a/tests/auto/bic/data/QtXml.4.0.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtXml.4.0.0.linux-gcc-ppc32.txt @@ -59,145 +59,37 @@ Class QBool base size=1 base align=1 QBool (0x30acd0e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acd380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acd428) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acd4d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acd578) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acd620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acd6c8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acd770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acd818) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acd8c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acd968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acda10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acdab8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acdb60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acdc08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30acdcb0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x30acdd20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b12230) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b122a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b12310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b12380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b123f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b12460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b124d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b12540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b125b0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b12620) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b12690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b12700) 0 Class QInternal size=1 align=1 @@ -215,10 +107,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187980) 0 QGenericArgument (0x30b12818) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x30b129d8) 0 Class QMetaObject size=16 align=4 @@ -235,10 +123,6 @@ Class QChar base size=2 base align=2 QChar (0x30b12ab8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b12b60) 0 empty Class QBasicAtomic size=4 align=4 @@ -271,10 +155,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x30c20700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30c20a48) 0 empty Class QString::Null size=1 align=1 @@ -296,20 +176,12 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x30c20cb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30d67000) 0 Class QCharRef size=8 align=4 base size=8 base align=4 QCharRef (0x30d67038) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30d67968) 0 empty Class QListData::Data size=24 align=4 @@ -321,15 +193,7 @@ Class QListData base size=4 base align=4 QListData (0x30d67b60) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30e98070) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30d67dc8) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -421,10 +285,6 @@ QIODevice (0x30187b80) 0 QObject (0x30e98508) 0 primary-for QIODevice (0x30187b80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30e986c8) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -449,30 +309,10 @@ Class QMapData base size=72 base align=4 QMapData (0x30e98af0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30e98310) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x30fa6000) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x30e98888) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x30fa6070) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x30fa60e0) 0 Class __gconv_trans_data size=20 align=4 @@ -494,15 +334,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x30fa6230) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x30fa6310) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x30fa62a0) 0 Class _IO_marker size=12 align=4 @@ -514,10 +346,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x30fa6380) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x30fa63f0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -532,10 +360,6 @@ Class QTextStream QTextStream (0x30fa6428) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30fa65e8) 0 Class QTextStreamManipulator size=24 align=4 @@ -596,10 +420,6 @@ QFile (0x30187d00) 0 QObject (0x30fa6b60) 0 primary-for QIODevice (0x30187d40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30fa6ce8) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -652,25 +472,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x30fa6e38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30fa6ea8) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x30fa6f18) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3106c038) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30fa6c40) 0 Class QStringList size=4 align=4 @@ -770,130 +578,42 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x3106c818) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3106c888) 0 empty Class QDir size=4 align=4 base size=4 base align=4 QDir (0x3106c930) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3106ca48) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3106cab8) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0x3106cb60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3106cc78) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3106cd20) 0 Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x3106cd58) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3106ce38) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3106cea8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3106cf18) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3106cf88) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x3106c690) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31130000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31130070) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x311300e0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31130150) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x311301c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31130230) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x311302a0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31130310) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31130380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x311303f0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31130460) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x311304d0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -920,35 +640,15 @@ Class QVariant base size=16 base align=8 QVariant (0x31130508) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31130a80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x311309d8) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x31130c40) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x31130b98) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x31130e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31130f18) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1033,10 +733,6 @@ Class QFileEngineHandler QFileEngineHandler (0x311e10e0) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311e1268) 0 Class QHashData::Node size=8 align=4 @@ -1053,90 +749,54 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x311e1460) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311e14d0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x311e1b98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311e1f88) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x311e1c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312bb118) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x312bb2d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312bb348) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x312bb498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312bb540) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x312bb6c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312bba48) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x312bbcb0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312bb070) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x312bbf88) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3136e1c0) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x3136e3f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3136e578) 0 empty Class QLinkedListData size=20 align=4 @@ -1153,10 +813,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x3136efc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3136e498) 0 empty Class QVectorData size=16 align=4 @@ -1178,40 +834,24 @@ Class QLocale base size=4 base align=4 QLocale (0x314a0540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x314a05b0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x314a07a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x314a0968) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x314a09d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x314a0b60) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x314a0bd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x314a0d20) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1286,10 +926,6 @@ QTextCodecPlugin (0x311a3280) 0 QFactoryInterface (0x315e6038) 8 nearly-empty primary-for QTextCodecFactoryInterface (0x311a32c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x315e6460) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1409,10 +1045,6 @@ QEventLoop (0x311a33c0) 0 QObject (0x315e69a0) 0 primary-for QEventLoop (0x311a33c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x315e6b28) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1489,20 +1121,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x315e6f88) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3166e150) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x3166e1f8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3166e310) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1722,10 +1346,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x3166e9d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3166eab8) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1820,20 +1440,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x3166eee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3166ef88) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x3166e268) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3166e700) 0 empty Class QMetaProperty size=20 align=4 @@ -1845,10 +1457,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x3166ebd0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3170a000) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2083,15 +1691,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0x3170ad20) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x3170aea8) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x3170ae00) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -2421,18 +2021,6 @@ QXmlDefaultHandler (0x31827348) 0 QXmlDeclHandler (0x317eef88) 20 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x318e9a10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3190b658) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x3190b700) 0 diff --git a/tests/auto/bic/data/QtXml.4.0.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtXml.4.0.0.macx-gcc-ppc32.txt index cc77feea4..fae8d3c15 100644 --- a/tests/auto/bic/data/QtXml.4.0.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtXml.4.0.0.macx-gcc-ppc32.txt @@ -59,75 +59,19 @@ Class QBool base size=4 base align=4 QBool (0x7c43c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c4700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c47c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c4880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c4940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c4a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c4ac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c4b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c4c40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c4d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c4dc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c4e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c4f40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7c4080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x809080) 0 empty Class QFlag size=4 align=4 @@ -144,10 +88,6 @@ Class QChar base size=2 base align=2 QChar (0x809380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x809480) 0 empty Class QBasicAtomic size=4 align=4 @@ -160,10 +100,6 @@ Class QAtomic QAtomic (0x809840) 0 QBasicAtomic (0x809880) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x809b00) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -245,70 +181,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xed4780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xed4b40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6480) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xff6580) 0 Class QInternal size=1 align=1 @@ -335,10 +219,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xff6cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1188100) 0 Class QCharRef size=8 align=4 @@ -351,10 +231,6 @@ Class QConstString QConstString (0x1188d00) 0 QString (0x1188d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1188e40) 0 empty Class QListData::Data size=24 align=4 @@ -366,10 +242,6 @@ Class QListData base size=4 base align=4 QListData (0x12bd080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x12bd680) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -394,15 +266,7 @@ Class QTextCodec QTextCodec (0x12bd500) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x12bd9c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x12bd900) 0 Class QTextEncoder size=32 align=4 @@ -425,25 +289,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x12bdc00) 0 QGenericArgument (0x12bdc40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x12bdf00) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x12bde80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x14060c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1406000) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -535,10 +387,6 @@ QIODevice (0x1406700) 0 QObject (0x1406740) 0 primary-for QIODevice (0x1406700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1406980) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -558,25 +406,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x14063c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1509140) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x15091c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x15093c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1509300) 0 Class QStringList size=4 align=4 @@ -584,15 +420,7 @@ Class QStringList QStringList (0x1509480) 0 QList (0x15094c0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1509980) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1509a00) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -748,10 +576,6 @@ Class QTextStream QTextStream (0x1686240) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1686500) 0 Class QTextStreamManipulator size=24 align=4 @@ -842,50 +666,22 @@ QFile (0x17170c0) 0 QObject (0x1717140) 0 primary-for QIODevice (0x1717100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1717300) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1717340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1717400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1717480) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1717640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1717580) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1717700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1717840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1717900) 0 Vtable for QFileEngine QFileEngine::_ZTV11QFileEngine: 35u entries @@ -945,10 +741,6 @@ Class QFileEngineHandler QFileEngineHandler (0x1717b40) 0 nearly-empty vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1717d00) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -999,90 +791,22 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1717f00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1717240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1717c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c000) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c080) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c100) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c180) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c200) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c280) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c300) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c480) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c600) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c680) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x187c700) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1109,50 +833,18 @@ Class QVariant base size=16 base align=4 QVariant (0x187c740) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x187cdc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x187cd00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x187cfc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x187cf00) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x192d0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x192d200) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x192d2c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x192d340) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x192d3c0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1230,15 +922,7 @@ Class QUrl base size=4 base align=4 QUrl (0x192dc80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x192de80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x192df00) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1265,10 +949,6 @@ QEventLoop (0x192df80) 0 QObject (0x192dfc0) 0 primary-for QEventLoop (0x192df80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a23100) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1313,20 +993,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1a23340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a23500) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1a235c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a23700) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1496,10 +1168,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1a23dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a23ec0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1591,20 +1259,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1ae7840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ae7900) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1ae7980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ae7a40) 0 empty Class QMetaProperty size=20 align=4 @@ -1616,10 +1276,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1ae7b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ae7bc0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1907,10 +1563,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1c363c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c36500) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1932,80 +1584,48 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1c36740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c367c0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x1c36fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d5a140) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1d5a1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d5a380) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1d5a400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d5a580) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1d5a600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d5aa80) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x1d5ac40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d5a280) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1d5a8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d5a9c0) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x1d5af00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e22040) 0 empty Class QLinkedListData size=20 align=4 @@ -2017,50 +1637,30 @@ Class QLocale base size=4 base align=4 QLocale (0x1e22600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e22680) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1e227c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e22bc0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x1e22e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e22a80) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1f4f240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f4f400) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x1f4f680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f4f840) 0 empty Class QSharedData size=4 align=4 @@ -2184,15 +1784,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0x2148a80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2148c40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2148b80) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -2522,28 +2114,8 @@ QXmlDefaultHandler (0x2273900) 0 QXmlDeclHandler (0x223d280) 20 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22f9e40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x2319cc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23f8100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23f8380) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23f8440) 0 diff --git a/tests/auto/bic/data/QtXml.4.1.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtXml.4.1.0.linux-gcc-ia32.txt index c759b3317..eee818724 100644 --- a/tests/auto/bic/data/QtXml.4.1.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXml.4.1.0.linux-gcc-ia32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x4001ee80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001ef40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001ef80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x4001efc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6040) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac60c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac61c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac62c0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x40ac6300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac64c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac65c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac66c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac67c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac68c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac69c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40ac6a40) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x40ac6b80) 0 QGenericArgument (0x40ac6bc0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x40ac6dc0) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x40ac6ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40ac6f80) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x40bde680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bde700) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x40bde940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40bdea80) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x40bdec40) 0 QString (0x40bdec80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40bded00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x40e6d180) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x40e6d5c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x40e6d500) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x40e6d800) 0 QObject (0x40e6d840) 0 primary-for QIODevice (0x40e6d800) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x40e6d980) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x40e6db40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x40e6db80) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x41030100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41030700) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x41030600) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x41030980) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x410308c0) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x41030a40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41030ac0) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x41030b40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x41030b00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x41030b80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41030bc0) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x41030cc0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x41030d40) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x41030d00) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0x41030dc0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x41030e00) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x41030e40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x41030f80) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x4118a1c0) 0 QTextStream (0x4118a200) 0 primary-for QTextOStream (0x4118a1c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x4118a3c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x4118a400) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x4118a380) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x4118a440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x4118a480) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x4118a4c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x4118a500) 0 Class timespec size=8 align=4 @@ -701,10 +485,6 @@ Class timeval base size=8 base align=4 timeval (0x4118a580) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x4118a5c0) 0 Class __sched_param size=4 align=4 @@ -721,45 +501,17 @@ Class __pthread_attr_s base size=36 base align=4 __pthread_attr_s (0x4118a680) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0x4118a6c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x4118a700) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x4118a740) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x4118a780) 0 Class _pthread_rwlock_t size=32 align=4 base size=32 base align=4 _pthread_rwlock_t (0x4118a7c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x4118a800) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x4118a840) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x4118a880) 0 Class random_data size=28 align=4 @@ -830,10 +582,6 @@ QFile (0x4118adc0) 0 QObject (0x4118ae40) 0 primary-for QIODevice (0x4118ae00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x4118af40) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -886,50 +634,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x4118ae80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412c9040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412c9080) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x412c91c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x412c9100) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x412c9200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x412c9280) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x412c92c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x412c9400) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x412c9340) 0 Class QStringList size=4 align=4 @@ -937,30 +657,14 @@ Class QStringList QStringList (0x412c9440) 0 QList (0x412c9480) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x412c96c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x412c9740) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x412c9940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412c9a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412c9a80) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1017,10 +721,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x412c9ac0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x412c9c80) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1175,110 +875,30 @@ Class QUrl base size=4 base align=4 QUrl (0x413da000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x413da0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413da100) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x413da140) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da200) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da280) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da2c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da300) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da380) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da3c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da440) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da480) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da4c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da5c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x413da600) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1305,35 +925,15 @@ Class QVariant base size=12 base align=4 QVariant (0x413da640) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x413dac00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x413dab40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x413dad80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x413dacc0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x413dafc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x413da900) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1365,80 +965,48 @@ Class QPoint base size=8 base align=4 QPoint (0x414e3180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e35c0) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x414e3680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3ac0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x414e3bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3c00) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x414e3d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3d80) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x414e3e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3340) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x414e36c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x414e3ec0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x415cf140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cf340) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x415cf440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cf5c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1455,10 +1023,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x415cfc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cfc80) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1475,40 +1039,24 @@ Class QLocale base size=4 base align=4 QLocale (0x415cfec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x415cff00) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x415cf280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e1000) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x417e1040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e11c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x417e1200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e1340) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1668,10 +1216,6 @@ QEventLoop (0x417e1ac0) 0 QObject (0x417e1b00) 0 primary-for QEventLoop (0x417e1ac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x417e1c40) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1763,20 +1307,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x417e1740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e1b80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x417e1cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x417e1ec0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1996,10 +1532,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x418d8580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d8640) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2094,20 +1626,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x418d8980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d8a00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x418d8a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d8ac0) 0 empty Class QMetaProperty size=20 align=4 @@ -2119,10 +1643,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x418d8b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x418d8bc0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2357,15 +1877,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0x419c1a40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x419c1bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x419c1b00) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -2695,33 +2207,9 @@ QXmlDefaultHandler (0x41a81288) 0 QXmlDeclHandler (0x41a67640) 20 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41aff100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41aff480) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41affb40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41b7cbc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x41b7cd00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x41b7cdc0) 0 diff --git a/tests/auto/bic/data/QtXml.4.1.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtXml.4.1.0.linux-gcc-ppc32.txt index b9691df57..2da296a5b 100644 --- a/tests/auto/bic/data/QtXml.4.1.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtXml.4.1.0.linux-gcc-ppc32.txt @@ -18,145 +18,37 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x306d3188) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d3380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d3428) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d34d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d3578) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d3620) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d36c8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d3770) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d3818) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d38c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d3968) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d3a10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d3ab8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d3b60) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d3c08) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x306d3cb0) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x306d3d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3071c230) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3071c2a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3071c310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3071c380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3071c3f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3071c460) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3071c4d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3071c540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3071c5b0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3071c620) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3071c690) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3071c700) 0 Class QInternal size=1 align=1 @@ -174,10 +66,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x30187ac0) 0 QGenericArgument (0x3071c818) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x3071c9d8) 0 Class QMetaObject size=16 align=4 @@ -194,10 +82,6 @@ Class QChar base size=2 base align=2 QChar (0x3071cab8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3071cb60) 0 empty Class QBasicAtomic size=4 align=4 @@ -230,10 +114,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x30c41850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30c41b98) 0 empty Class QString::Null size=1 align=1 @@ -255,10 +135,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x30d89150) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30d89498) 0 Class QCharRef size=8 align=4 @@ -271,10 +147,6 @@ Class QConstString QConstString (0x30187d00) 0 QString (0x30d89f18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30e71000) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -337,15 +209,7 @@ Class QListData base size=4 base align=4 QListData (0x30e71738) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30e71c78) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30e71bd0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -437,10 +301,6 @@ QIODevice (0x30187dc0) 0 QObject (0x30f7f000) 0 primary-for QIODevice (0x30187dc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30f7f1f8) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -470,10 +330,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x30f7f930) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30f7f9a0) 0 empty Class QMapData::Node size=8 align=4 @@ -485,10 +341,6 @@ Class QMapData base size=72 base align=4 QMapData (0x310610e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x310617a8) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -513,15 +365,7 @@ Class QTextCodec QTextCodec (0x31061658) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31061a80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x310619d8) 0 Class QTextEncoder size=32 align=4 @@ -533,30 +377,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x31061b98) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31061c40) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x31061d20) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31061cb0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x31061d90) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x31061e00) 0 Class __gconv_trans_data size=20 align=4 @@ -578,15 +402,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x31061f50) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x31061738) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x31061fc0) 0 Class _IO_marker size=12 align=4 @@ -598,10 +414,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x31163000) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x31163070) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -616,10 +428,6 @@ Class QTextStream QTextStream (0x311630a8) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311632d8) 0 Class QTextStreamManipulator size=24 align=4 @@ -656,40 +464,16 @@ QTextOStream (0x30187fc0) 0 QTextStream (0x31163850) 0 primary-for QTextOStream (0x30187fc0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x31163b28) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x31163b98) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x31163ab8) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31163c08) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31163c78) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x31163ce8) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x31163d58) 0 Class timespec size=8 align=4 @@ -701,70 +485,18 @@ Class timeval base size=8 base align=4 timeval (0x31163dc8) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x31163e38) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x31163ea8) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x31163f88) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x31163f18) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x31163230) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x311ec038) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x311638f8) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x311ec0a8) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x311ec188) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x311ec118) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x311ec1f8) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x311ec268) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x311ec2d8) 0 Class random_data size=28 align=4 @@ -835,10 +567,6 @@ QFile (0x312b3000) 0 QObject (0x311ec8f8) 0 primary-for QIODevice (0x312b3040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311eca80) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -891,50 +619,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x311ecbd0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x311ecc78) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311ecce8) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x311ece70) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x311ecdc8) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x311ecf18) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31337038) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x313370a8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31337268) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x313371c0) 0 Class QStringList size=4 align=4 @@ -942,30 +642,14 @@ Class QStringList QStringList (0x312b3140) 0 QList (0x31337310) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x31337738) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x313377a8) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x31337ab8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31337bd0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31337c40) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1022,10 +706,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x31337c78) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31337ea8) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1180,110 +860,30 @@ Class QUrl base size=4 base align=4 QUrl (0x313f7310) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313f7498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313f7508) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x313f7578) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f7690) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f7738) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f77e0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f7888) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f7930) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f79d8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f7a80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f7b28) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f7bd0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f7c78) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f7d20) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f7dc8) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f7e70) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f7f18) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f7fc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x313f72a0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31471070) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x31471118) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1310,35 +910,15 @@ Class QVariant base size=16 base align=8 QVariant (0x31471188) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31471738) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31471690) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x314718f8) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x31471850) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x31471ab8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31471bd0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1370,80 +950,48 @@ Class QPoint base size=8 base align=4 QPoint (0x31471d20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31562348) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x31562540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31562930) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x31562b60) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31562bd0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x31562d20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31562dc8) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x31562f50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31562578) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x315fe0e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315fe460) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x315fe7e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315fe9d8) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x315fec08) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x315fed90) 0 empty Class QLinkedListData size=20 align=4 @@ -1460,10 +1008,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x3173b508) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3173b620) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1480,40 +1024,24 @@ Class QLocale base size=4 base align=4 QLocale (0x3173b930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3173b9a0) 0 empty Class QDate size=4 align=4 base size=4 base align=4 QDate (0x3173bb98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3173bd58) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x3173bdc8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3173bfc0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x3173bc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x3184d038) 0 empty Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -1673,10 +1201,6 @@ QEventLoop (0x312b3680) 0 QObject (0x3184db98) 0 primary-for QEventLoop (0x312b3680) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x3184dd20) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1768,20 +1292,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x318f93f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318f9578) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x318f95e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318f9700) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2001,10 +1517,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x318f9e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318f9ee0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2099,20 +1611,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x319a10a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x319a1150) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x319a11c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x319a1268) 0 empty Class QMetaProperty size=20 align=4 @@ -2124,10 +1628,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x319a1310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x319a13b8) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2362,15 +1862,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0x31a750a8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31a75230) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31a75188) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -2700,33 +2192,9 @@ QXmlDefaultHandler (0x31ad84b0) 0 QXmlDeclHandler (0x31ad51c0) 20 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b580a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31b587e0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b715e8) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31bfa310) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31bfa540) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31bfa5e8) 0 diff --git a/tests/auto/bic/data/QtXml.4.1.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtXml.4.1.0.macx-gcc-ia32.txt index 71f1d1533..917cda7fd 100644 --- a/tests/auto/bic/data/QtXml.4.1.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXml.4.1.0.macx-gcc-ia32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x62e640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62e880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62e940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62ea00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62eac0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62eb80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62ec40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62ed00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62edc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62ee80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x62ef40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x665000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6650c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x665180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x665240) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x665540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x665640) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0x665d40) 0 QBasicAtomic (0x665d80) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xe07000) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xe07cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xeaf080) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeaf540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeaf5c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeaf640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeaf6c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeaf740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeaf7c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeaf840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeaf8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeaf940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeaf9c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeafa40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeafac0) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x1056200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1056640) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x1172240) 0 QString (0x1172280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1172380) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x1172c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x126e180) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x126e000) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x126e4c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x126e400) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x126e700) 0 QGenericArgument (0x126e740) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x126ea00) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x126e980) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x126ec80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x126ebc0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x13261c0) 0 QObject (0x1326200) 0 primary-for QIODevice (0x13261c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1326440) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1326b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1326d00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1326d80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1326f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1326ec0) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x13267c0) 0 QList (0x13f0000) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x13f04c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x13f0540) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x1452280) 0 QObject (0x1452300) 0 primary-for QIODevice (0x14522c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14524c0) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1452500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14525c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1452640) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1452800) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1452740) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x14528c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1452a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1452a80) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1452ac0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1452d80) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x1582180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1582200) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x1640600) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16408c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -1041,35 +829,15 @@ Class rlimit base size=16 base align=4 rlimit (0x175b340) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x175bb00) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x175bb80) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x175ba80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x175bc00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x175bc80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x175bd00) 0 Class QVectorData size=16 align=4 @@ -1182,95 +950,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x17f5780) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x17f58c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x17f5980) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x17f5a40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x17f5b00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x17f5bc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x17f5c80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x17f5d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x17f5e00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x17f5ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x17f5f80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x17f5500) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189a040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189a100) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189a1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189a280) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189a340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189a400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x189a4c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1297,50 +993,18 @@ Class QVariant base size=12 base align=4 QVariant (0x189a540) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x189abc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x189ab00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x189adc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x189ad00) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x189a780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1952000) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x19520c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1952140) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x19521c0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1418,15 +1082,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1952a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1952bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1952c40) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1453,10 +1109,6 @@ QEventLoop (0x1952cc0) 0 QObject (0x1952d00) 0 primary-for QEventLoop (0x1952cc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1952f00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1501,20 +1153,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1a23000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a231c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1a23240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a23380) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1684,10 +1328,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1a23a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1a23b80) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1779,20 +1419,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1abf540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1abf600) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1abf680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1abf740) 0 empty Class QMetaProperty size=20 align=4 @@ -1804,10 +1436,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1abf800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1abf8c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2095,10 +1723,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1be2100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1be2240) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2110,70 +1734,42 @@ Class QDate base size=4 base align=4 QDate (0x1be2440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1be2640) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1be26c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1be2900) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1be2980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1be2b00) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1be2b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1be2480) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x1be2e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c97340) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1c97640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c976c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x1c97840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c97900) 0 empty Class QLinkedListData size=20 align=4 @@ -2185,50 +1781,30 @@ Class QLocale base size=4 base align=4 QLocale (0x1c97ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c97f40) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1c97100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dd11c0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x1dd1580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dd1980) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1dd1e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dd1fc0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x1dd18c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1eae080) 0 empty Class QSharedData size=4 align=4 @@ -2347,15 +1923,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0x1fda040) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1fda200) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1fda140) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -2685,33 +2253,9 @@ QXmlDefaultHandler (0x2043780) 0 QXmlDeclHandler (0x203b440) 20 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x20c9680) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x20e8500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2138580) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x21a09c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21a0c40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x21a0d00) 0 diff --git a/tests/auto/bic/data/QtXml.4.1.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtXml.4.1.0.macx-gcc-ppc32.txt index 05b19eba4..ef1ff04ef 100644 --- a/tests/auto/bic/data/QtXml.4.1.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtXml.4.1.0.macx-gcc-ppc32.txt @@ -18,75 +18,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x7e8080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e82c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e8380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e8440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e8500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e85c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e8680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e8740) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e8800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e88c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e8980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e8a40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e8b00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e8bc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x7e8c80) 0 empty Class QFlag size=4 align=4 @@ -103,10 +47,6 @@ Class QChar base size=2 base align=2 QChar (0x7e8f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x84c080) 0 empty Class QBasicAtomic size=4 align=4 @@ -119,10 +59,6 @@ Class QAtomic QAtomic (0x84c480) 0 QBasicAtomic (0x84c4c0) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0x84c740) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -204,70 +140,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xf2a400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xf2a7c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf2ac80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf2ad00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf2ad80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf2ae00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf2ae80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf2af00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf2af80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1057000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1057080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1057100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1057180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1057200) 0 Class QInternal size=1 align=1 @@ -294,10 +178,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x1057940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1057d80) 0 Class QCharRef size=8 align=4 @@ -310,10 +190,6 @@ Class QConstString QConstString (0x1224980) 0 QString (0x12249c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1224ac0) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -376,10 +252,6 @@ Class QListData base size=4 base align=4 QListData (0x12d7300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x12d7900) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -404,15 +276,7 @@ Class QTextCodec QTextCodec (0x12d7780) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x12d7c40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x12d7b80) 0 Class QTextEncoder size=32 align=4 @@ -435,25 +299,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x12d7e80) 0 QGenericArgument (0x12d7ec0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x140d080) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x140d000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x140d300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x140d240) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -545,10 +397,6 @@ QIODevice (0x140d940) 0 QObject (0x140d980) 0 primary-for QIODevice (0x140d940) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x140dbc0) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -568,25 +416,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1505180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1505380) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1505400) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1505600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1505540) 0 Class QStringList size=4 align=4 @@ -594,15 +430,7 @@ Class QStringList QStringList (0x15056c0) 0 QList (0x1505700) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1505bc0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1505c40) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -736,50 +564,22 @@ QFile (0x15b2f00) 0 QObject (0x15b2f80) 0 primary-for QIODevice (0x15b2f40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x163a000) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x163a040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x163a100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x163a180) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x163a340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x163a280) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x163a400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x163a540) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x163a5c0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -836,10 +636,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x163a600) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x163a8c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -913,10 +709,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x163adc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x163ae40) 0 empty Class QMapData::Node size=8 align=4 @@ -941,10 +733,6 @@ Class QTextStream QTextStream (0x174fdc0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x174ffc0) 0 Class QTextStreamManipulator size=24 align=4 @@ -1051,35 +839,15 @@ Class rlimit base size=16 base align=8 rlimit (0x1908d80) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1908e40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x1908ec0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x1908dc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1908f40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1908fc0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1908780) 0 Class QVectorData size=16 align=4 @@ -1192,95 +960,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1952a80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1952bc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1952c80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1952d40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1952e00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1952ec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1952f80) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1952800) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f100) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f1c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f280) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f400) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f4c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f580) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f700) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1a8f7c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1307,50 +1003,18 @@ Class QVariant base size=16 base align=4 QVariant (0x1a8f840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1a8fec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1a8fe00) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1a8fb80) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1a8fa00) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1b2d240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b2d380) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1b2d440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b2d4c0) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1b2d540) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1428,15 +1092,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1b2dd80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b2df40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b2dfc0) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1463,10 +1119,6 @@ QEventLoop (0x1b2d100) 0 QObject (0x1b2d800) 0 primary-for QEventLoop (0x1b2d100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1c34140) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1511,20 +1163,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1c34380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c34540) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1c345c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c34700) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1694,10 +1338,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1c34e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c34f00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1789,20 +1429,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1d11900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d119c0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1d11a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d11b00) 0 empty Class QMetaProperty size=20 align=4 @@ -1814,10 +1446,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1d11bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d11c80) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2105,10 +1733,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1e61440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e61580) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2120,70 +1744,42 @@ Class QDate base size=4 base align=4 QDate (0x1e61780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e61980) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e61a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e61c40) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1e61cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e61e40) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1e61ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e61f80) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x1f06280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f06700) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1f06a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f06a80) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x1f06c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f06cc0) 0 empty Class QLinkedListData size=20 align=4 @@ -2195,50 +1791,30 @@ Class QLocale base size=4 base align=4 QLocale (0x202d040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x202d0c0) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x202d200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x202d600) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x202d9c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x202ddc0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x202db00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2110000) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x2110280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2110440) 0 empty Class QSharedData size=4 align=4 @@ -2357,15 +1933,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0x22ca380) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x22ca540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x22ca480) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -2695,33 +2263,9 @@ QXmlDefaultHandler (0x2362a80) 0 QXmlDeclHandler (0x234c800) 20 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23ed9c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x240b840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x245e8c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x24c2d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x24c2f80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x24eb040) 0 diff --git a/tests/auto/bic/data/QtXml.4.1.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtXml.4.1.0.win32-gcc-ia32.txt index bc8d77bf6..9ffb7e31b 100644 --- a/tests/auto/bic/data/QtXml.4.1.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXml.4.1.0.win32-gcc-ia32.txt @@ -18,80 +18,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xad5e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb680) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb800) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaeb980) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebb00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebc80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebe00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaebf80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07100) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07700) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07880) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07a00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb07b80) 0 empty Class QFlag size=4 align=4 @@ -108,10 +48,6 @@ Class QChar base size=2 base align=2 QChar (0xb4d840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb71cc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -139,70 +75,18 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc34f80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd4bc40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd78100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd783c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd73c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd78a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd949c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdc8440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd8d340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd8c80) 0 Class QInternal size=1 align=1 @@ -229,10 +113,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xeac500) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xeac940) 0 Class QCharRef size=8 align=4 @@ -245,10 +125,6 @@ Class QConstString QConstString (0x11e1880) 0 QString (0x11e18c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11e1c00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -311,10 +187,6 @@ Class QListData base size=4 base align=4 QListData (0x1279f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x137ce40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -339,15 +211,7 @@ Class QTextCodec QTextCodec (0xeac480) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x13c0140) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc3da40) 0 Class QTextEncoder size=32 align=4 @@ -370,25 +234,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x13fefc0) 0 QGenericArgument (0x1404000) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1417700) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1404580) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1431f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1431b80) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -480,10 +332,6 @@ QIODevice (0x137c700) 0 QObject (0x14bb540) 0 primary-for QIODevice (0x137c700) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14bb840) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -503,25 +351,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xeac380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15884c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1588840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1588d80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1588c40) 0 Class QStringList size=4 align=4 @@ -529,15 +365,7 @@ Class QStringList QStringList (0xeac400) 0 QList (0x15b6000) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1588ec0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1588e80) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -666,50 +494,22 @@ QFile (0x169c840) 0 QObject (0x169c8c0) 0 primary-for QIODevice (0x169c880) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16ab100) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x16d25c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16d2f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1700e40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x172a300) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x172a200) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x16d2440) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1758040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x172ac00) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -766,10 +566,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x169c740) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17d7340) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -843,10 +639,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x182cc40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x182cd40) 0 empty Class QMapData::Node size=8 align=4 @@ -871,10 +663,6 @@ Class QTextStream QTextStream (0x1a78240) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1a78600) 0 Class QTextStreamManipulator size=24 align=4 @@ -911,20 +699,8 @@ QTextOStream (0x1b06440) 0 QTextStream (0x1b06480) 0 primary-for QTextOStream (0x1b06440) -Class - size=8 align=4 - base size=8 base align=4 - (0x1b33680) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1b33800) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1b525c0) 0 Class QVectorData size=16 align=4 @@ -1037,95 +813,23 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1ce4bc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1cfed40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1cfeec0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d11040) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d111c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d11340) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d114c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d11640) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d117c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d11940) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d11ac0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d11c40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d11dc0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d11f40) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d2f0c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d2f240) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d2f3c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d2f540) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0x1d2f6c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1152,35 +856,15 @@ Class QVariant base size=16 base align=8 QVariant (0x14318c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1dcb540) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1d41dc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1dcb840) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1d41e40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1d41000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e31280) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1258,15 +942,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1d2ff80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ecc440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1efcf80) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1293,10 +969,6 @@ QEventLoop (0x1f2a600) 0 QObject (0x1f2a640) 0 primary-for QEventLoop (0x1f2a600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1f2a940) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1341,20 +1013,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1f62f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f95b40) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1f62ec0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f95e80) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1524,10 +1188,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x2001d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20443c0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1620,20 +1280,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x13fe8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20b3900) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x13fe940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20b3f00) 0 empty Class QMetaProperty size=20 align=4 @@ -1645,10 +1297,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x13fea40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x20e0640) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -1941,10 +1589,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x222e640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x228d040) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1956,70 +1600,42 @@ Class QDate base size=4 base align=4 QDate (0x1d2f900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22cb900) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1d2fb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22ee540) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x16d24c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2318300) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1d2fb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2318f40) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1d2fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2369180) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1d2f980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x238b600) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1d2fa00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23b5b00) 0 empty Class QLinkedListData size=20 align=4 @@ -2031,50 +1647,30 @@ Class QLocale base size=4 base align=4 QLocale (0x1d2fa80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2508300) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x1d2fc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2536480) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1d2fd00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x255b9c0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1d2fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25c9440) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1d2fe00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2648680) 0 empty Class QSharedData size=4 align=4 @@ -2193,15 +1789,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0x27dec40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x27def00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x27ded80) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -2531,33 +2119,9 @@ QXmlDefaultHandler (0x27de200) 0 QXmlDeclHandler (0x286c5c0) 20 nearly-empty vptr=((&QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x13c0100) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1588d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2a496c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x172a2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2b13c00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x27deec0) 0 diff --git a/tests/auto/bic/data/QtXml.4.2.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtXml.4.2.0.linux-gcc-ia32.txt index b363d197b..6ce60a8df 100644 --- a/tests/auto/bic/data/QtXml.4.2.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXml.4.2.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f27bc0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f27c00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f27cc0) 0 empty - QUintForSize<4> (0xb7f27d00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f27d80) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f27dc0) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7f27e80) 0 empty - QIntForSize<4> (0xb7f27ec0) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77f0140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0280) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f02c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f03c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f04c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0580) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb77f05c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f06c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f0700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f0740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f0780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f07c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f0800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f0840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f0880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f08c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f0900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f0940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f0980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77f09c0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb77f0a80) 0 QGenericArgument (0xb77f0ac0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb77f0c80) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb77f0d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77f0dc0) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb734e0c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb734e100) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb734e140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb734e2c0) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb734e3c0) 0 QString (0xb734e400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb734e440) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0xb734e740) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb734eac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb734ea40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0xb734ec40) 0 QObject (0xb734ec80) 0 primary-for QIODevice (0xb734ec40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb734ed40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb734eec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb734ef00) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0xb6eda3c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6eda940) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0xb6eda880) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6edaa80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6edaa00) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb6edab00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6edab40) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6edabc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6edab80) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6edac00) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6edac40) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6edad40) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6edadc0) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6edad80) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6edae40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6edae80) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0xb6edaec0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6edaf80) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0xb6edaf40) 0 QTextStream (0xb6e96000) 0 primary-for QTextOStream (0xb6edaf40) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e960c0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6e96100) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6e96080) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e96140) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e96180) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6e961c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e96200) 0 Class timespec size=8 align=4 @@ -738,80 +492,24 @@ Class timeval base size=8 base align=4 timeval (0xb6e96280) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6e962c0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6e96300) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6e96340) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6e96400) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6e963c0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6e96380) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e96440) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6e964c0) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6e96480) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e96500) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6e96580) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6e96540) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6e965c0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6e96600) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6e96640) 0 Class random_data size=28 align=4 @@ -882,10 +580,6 @@ QFile (0xb6e96b00) 0 QObject (0xb6e96b80) 0 primary-for QIODevice (0xb6e96b40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6e96c00) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -938,50 +632,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb6e96d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6e96dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e96e00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6e96ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6e96e40) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb6e96f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6e96f40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6e96f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6e96ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6e96fc0) 0 Class QStringList size=4 align=4 @@ -989,30 +655,14 @@ Class QStringList QStringList (0xb6e96bc0) 0 QList (0xb6e96d40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6c61040) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6c61080) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb6c61140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c611c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c61240) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1069,10 +719,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb6c61280) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c61400) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1184,15 +830,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6c616c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c61700) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c61740) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1287,285 +925,65 @@ Class QUrl base size=4 base align=4 QUrl (0xb6c61a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6c61ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6c61b00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6c61b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c617c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6c61a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b40c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b41c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b42c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b43c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b44c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b45c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b46c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb69b4740) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1592,45 +1010,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb69b4780) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb69b49c0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb69b4a00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb69b4b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb69b4a80) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb69b4c00) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb69b4b80) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb69b4cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69b4d40) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1662,80 +1052,48 @@ Class QPoint base size=8 base align=4 QPoint (0xb69b4f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69b4900) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb69b4940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69b48c0) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb69b4980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69b4c80) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb69b4e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69b4e40) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0xb69b4f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69b4fc0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6924000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6924200) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb69242c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69243c0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6924400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69244c0) 0 empty Class QLinkedListData size=20 align=4 @@ -1752,10 +1110,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6924880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69248c0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1772,30 +1126,18 @@ Class QDate base size=4 base align=4 QDate (0xb6924b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6924c00) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6924c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6924d00) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6924d40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6924e00) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1981,10 +1323,6 @@ QEventLoop (0xb6924bc0) 0 QObject (0xb6924c80) 0 primary-for QEventLoop (0xb6924bc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6924d80) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1429,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb677f400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb677f440) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb677f480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb677f500) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2324,10 +1654,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb677f980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb677f9c0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2422,20 +1748,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb677fc40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb677fc80) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb677fcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb677fd00) 0 empty Class QMetaProperty size=20 align=4 @@ -2447,10 +1765,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb677fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb677fdc0) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2507,10 +1821,6 @@ QLibrary (0xb677ff00) 0 QObject (0xb677ff40) 0 primary-for QLibrary (0xb677ff00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb677ffc0) 0 Class QSemaphore size=4 align=4 @@ -2558,10 +1868,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb677f4c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb677f6c0) 0 Class QMutexLocker size=4 align=4 @@ -2573,20 +1879,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb677f7c0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb677f940) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb677f880) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb677fb40) 0 Class QWriteLocker size=4 align=4 @@ -2705,15 +2003,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0xb64da840) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb64da940) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb64da8c0) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -3043,33 +2333,9 @@ QXmlDefaultHandler (0xb655e730) 0 QXmlDeclHandler (0xb64dac00) 20 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb63dd040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63dd0c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb63dd140) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb63dd1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63dd240) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb63dd2c0) 0 diff --git a/tests/auto/bic/data/QtXml.4.2.0.linux-gcc-ppc32.txt b/tests/auto/bic/data/QtXml.4.2.0.linux-gcc-ppc32.txt index 2ae5af69c..f61b3d2e0 100644 --- a/tests/auto/bic/data/QtXml.4.2.0.linux-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtXml.4.2.0.linux-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x30592150) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x305921c0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x3001b9c0) 0 empty - QUintForSize<4> (0x30592310) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x305923f0) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x30592460) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x3001ba40) 0 empty - QIntForSize<4> (0x305925b0) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x30592930) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30592b28) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30592bd0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30592c78) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30592d20) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30592dc8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30592e70) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30592f18) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30592fc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305c1070) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305c1118) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305c11c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305c1268) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305c1310) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305c13b8) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x305c1460) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0x305c14d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c19a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c1a10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c1a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c1af0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c1b60) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c1bd0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c1c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c1cb0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c1d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c1d90) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c1e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c1e70) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x305c1ee0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0x3001bb80) 0 QGenericArgument (0x30aac000) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x30aac1c0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0x30aac2a0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30aac348) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0x30b920a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30b923f0) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0x30b92498) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30b926c8) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0x3001bdc0) 0 QString (0x30d0d850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30d0d930) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -374,15 +216,7 @@ Class QListData base size=4 base align=4 QListData (0x30d0dd20) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x30db04d0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x30db0428) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -474,10 +308,6 @@ QIODevice (0x3001be80) 0 QObject (0x30db09a0) 0 primary-for QIODevice (0x3001be80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x30db0b98) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -507,10 +337,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x30edb1c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x30edb230) 0 empty Class QMapData::Node size=8 align=4 @@ -522,10 +348,6 @@ Class QMapData base size=72 base align=4 QMapData (0x30edba80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x310330a8) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -550,15 +372,7 @@ Class QTextCodec QTextCodec (0x30edbfc0) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31033380) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x310332d8) 0 Class QTextEncoder size=32 align=4 @@ -570,30 +384,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0x31033498) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x31033540) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0x31033620) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310335b0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0x31033690) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x31033700) 0 Class __gconv_trans_data size=20 align=4 @@ -615,15 +409,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0x31033850) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0x31033930) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0x310338c0) 0 Class _IO_marker size=12 align=4 @@ -635,10 +421,6 @@ Class _IO_FILE base size=152 base align=8 _IO_FILE (0x310339a0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x31033a10) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -653,10 +435,6 @@ Class QTextStream QTextStream (0x31033a48) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31033c78) 0 Class QTextStreamManipulator size=24 align=4 @@ -693,40 +471,16 @@ QTextOStream (0x310ae080) 0 QTextStream (0x310e1118) 0 primary-for QTextOStream (0x310ae080) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x310e13f0) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x310e1460) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x310e1380) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310e14d0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310e1540) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x310e15b0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x310e1620) 0 Class timespec size=8 align=4 @@ -738,70 +492,18 @@ Class timeval base size=8 base align=4 timeval (0x310e1690) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0x310e1700) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0x310e1770) 0 -Class :: - size=24 align=4 - base size=24 base align=4 -:: (0x310e1850) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0x310e17e0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310e18c0) 0 -Class :: - size=48 align=8 - base size=48 base align=8 -:: (0x310e19a0) 0 -Class - size=48 align=8 - base size=48 base align=8 - (0x310e1930) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310e1a10) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0x310e1af0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0x310e1a80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x310e1b60) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0x310e1bd0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0x310e1c40) 0 Class random_data size=28 align=4 @@ -872,10 +574,6 @@ QFile (0x310ae0c0) 0 QObject (0x311964d0) 0 primary-for QIODevice (0x310ae100) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31196658) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -928,50 +626,22 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0x311967a8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x31196850) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x311968c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31196a48) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x311969a0) 0 Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0x31196af0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31196ce8) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x31196d58) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31196f18) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31196e70) 0 Class QStringList size=4 align=4 @@ -979,30 +649,14 @@ Class QStringList QStringList (0x310ae200) 0 QList (0x31196fc0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x312dd348) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x312dd3b8) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x312dd6c8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312dd7e0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312dd888) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1059,10 +713,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x312dd8c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312ddb28) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1174,15 +824,7 @@ Class QLocale base size=4 base align=4 QLocale (0x312ddee0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x312ddf88) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x312ddc40) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1277,285 +919,65 @@ Class QUrl base size=4 base align=4 QUrl (0x313d8348) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x313d84d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x313d8540) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0x313d85b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d8770) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d8818) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d88c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d8968) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d8a10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d8ab8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d8b60) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d8c08) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d8cb0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d8d58) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d8e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d8ea8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d8f50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x313d8070) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314570a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457150) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314571f8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314572a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457348) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314573f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457498) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314575e8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457738) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314577e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457888) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457930) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314579d8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457b28) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457bd0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457c78) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457dc8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457e70) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457f18) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31457fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31471070) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31471118) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314711c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31471268) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31471310) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314713b8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31471460) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31471508) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314715b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31471658) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31471700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314717a8) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x31471850) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x314718f8) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1582,45 +1004,17 @@ Class QVariant base size=16 base align=8 QVariant (0x31471968) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x31471e00) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0x31471ea8) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x31471bd0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x31471fc0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x314d8150) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x314d80a8) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x314d8268) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x314d8380) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1652,80 +1046,48 @@ Class QPoint base size=8 base align=4 QPoint (0x314d88c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x314d8cb0) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x314d8ea8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x314d8ab8) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x315910a8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31591118) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x31591268) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31591310) 0 empty Class QSize size=8 align=4 base size=8 base align=4 QSize (0x31591498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31591818) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x31591af0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31591e70) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x31591c08) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31642038) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x31642268) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x316423f0) 0 empty Class QLinkedListData size=20 align=4 @@ -1742,10 +1104,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x31642e38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31642f18) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1762,30 +1120,18 @@ Class QDate base size=4 base align=4 QDate (0x31788268) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31788428) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x31788498) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31788658) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x317886c8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31788818) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1971,10 +1317,6 @@ QEventLoop (0x310ae780) 0 QObject (0x31850230) 0 primary-for QEventLoop (0x310ae780) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x318503f0) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2081,20 +1423,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x31850e38) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31850fc0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x318501c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31850738) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2314,10 +1648,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x318ff5e8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318ff6c8) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -2412,20 +1742,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x318ffaf0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318ffb98) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x318ffc08) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318ffcb0) 0 empty Class QMetaProperty size=20 align=4 @@ -2437,10 +1759,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x318ffd58) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x318ffe00) 0 empty Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2497,10 +1815,6 @@ QLibrary (0x310aec00) 0 QObject (0x318ff578) 0 primary-for QLibrary (0x310aec00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x319cb038) 0 Class QSemaphore size=4 align=4 @@ -2548,10 +1862,6 @@ Class QMutex base size=4 base align=4 QMutex (0x319cb2d8) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x319cb460) 0 Class QMutexLocker size=4 align=4 @@ -2563,20 +1873,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x319cb508) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x319cb5b0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x319cb540) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x319cb6c8) 0 Class QWriteLocker size=4 align=4 @@ -2695,15 +1997,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0x319cbb98) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x319cbd20) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x319cbc78) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -3033,33 +2327,9 @@ QXmlDefaultHandler (0x31adb078) 0 QXmlDeclHandler (0x31aa7e38) 20 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b46ea8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31b605e8) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31b7b3f0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31c059d8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x31c05c08) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x31c05cb0) 0 diff --git a/tests/auto/bic/data/QtXml.4.2.0.macx-gcc-ia32.txt b/tests/auto/bic/data/QtXml.4.2.0.macx-gcc-ia32.txt index e3c6ab819..3a92b2cbc 100644 --- a/tests/auto/bic/data/QtXml.4.2.0.macx-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXml.4.2.0.macx-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x698080) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x698100) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x6982c0) 0 empty - QUintForSize<4> (0x698300) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x698400) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x698480) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x698640) 0 empty - QIntForSize<4> (0x698680) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x698b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x698dc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x698e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x698f40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c9000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c90c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c9180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c9240) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c9300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c93c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c9480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c9540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c9600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c96c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c9780) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0x6c9a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x6c9b80) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0xe56280) 0 QBasicAtomic (0xe562c0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xe56540) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xee7280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xee7640) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee7ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee7b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee7bc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee7c40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee7cc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee7d40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee7dc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee7e40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee7ec0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee7f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee7fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x102c040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x102c0c0) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x102c8c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x102cd00) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x11a6900) 0 QString (0x11a6940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x11a6a40) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x1261240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1261880) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1261700) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1261bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1261b00) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1261e00) 0 QGenericArgument (0x1261e40) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1382000) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1261800) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1382280) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x13821c0) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x13828c0) 0 QObject (0x1382900) 0 primary-for QIODevice (0x13828c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1382b40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x1459140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1459380) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x1459400) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1459600) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1459540) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x14596c0) 0 QList (0x1459700) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x1459bc0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x1459c40) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x14f7a80) 0 QObject (0x14f7b00) 0 primary-for QIODevice (0x14f7ac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14f7cc0) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x14f7d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x14f7dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x14f7e40) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x14f7040) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x14f7f40) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x14f7640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15cb0c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15cb140) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x15cb180) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x15cb440) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x15cb940) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15cb9c0) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x166fd80) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x166fa40) 0 Class QTextStreamManipulator size=24 align=4 @@ -1078,35 +836,15 @@ Class rlimit base size=16 base align=4 rlimit (0x1803b00) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x184d200) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x184d280) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x184d180) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x184d300) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x184d380) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0x184d400) 0 Class QVectorData size=16 align=4 @@ -1244,15 +982,7 @@ Class QLocale base size=4 base align=4 QLocale (0x19c2280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x19c2340) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19c2400) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1279,270 +1009,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x19c2600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19c2800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19c28c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19c2980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19c2a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19c2b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19c2bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19c2c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19c2d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19c2e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19c2ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19c2f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19c2200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5c040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5c100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5c1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5c280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5c340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5c400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5c4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5c580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5c640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5c700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5c7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5c880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5c940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5ca00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5cac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5cb80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5cc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5cd00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5cdc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5ce80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a5cf40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a750c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a753c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a756c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a759c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a75e40) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1569,60 +1087,20 @@ Class QVariant base size=12 base align=4 QVariant (0x1a75ec0) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aaf400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aaf4c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1aaf6c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1aaf600) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1aaf8c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1aaf800) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1aafa40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1aafb80) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1aafc40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1aafcc0) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1aafd40) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1700,15 +1178,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1b70400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b705c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b70640) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1735,10 +1205,6 @@ QEventLoop (0x1b706c0) 0 QObject (0x1b70700) 0 primary-for QEventLoop (0x1b706c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1b70900) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1783,20 +1249,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1b70b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b70d00) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1b70d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1b70ec0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1966,10 +1424,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1c52480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c52580) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2076,20 +1530,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1ce2040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ce2100) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1ce2180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ce2240) 0 empty Class QMetaProperty size=20 align=4 @@ -2101,10 +1547,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1ce2300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ce23c0) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2286,10 +1728,6 @@ QLibrary (0x1ce2d80) 0 QObject (0x1ce2dc0) 0 primary-for QLibrary (0x1ce2d80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ce2f80) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2326,10 +1764,6 @@ Class QMutex base size=4 base align=4 QMutex (0x1d9e0c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x1d9e280) 0 Class QMutexLocker size=4 align=4 @@ -2341,20 +1775,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x1d9e340) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x1d9e400) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x1d9e380) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x1d9e540) 0 Class QWriteLocker size=4 align=4 @@ -2412,10 +1838,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1d9ef40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e36000) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2427,70 +1849,42 @@ Class QDate base size=4 base align=4 QDate (0x1e36280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e36480) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e36500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e36700) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1e36780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e36900) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1e36980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e36e00) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0x1e365c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e36d40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1ee12c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ee1340) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0x1ee14c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ee1580) 0 empty Class QLinkedListData size=20 align=4 @@ -2502,40 +1896,24 @@ Class QSize base size=8 base align=4 QSize (0x1ee1bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ee1fc0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0x1ff1180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ff1580) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1ff1a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ff1bc0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0x1ff1e40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ff11c0) 0 empty Class QSharedData size=4 align=4 @@ -2680,15 +2058,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0x2105d40) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2105f00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2105e40) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -3018,33 +2388,9 @@ QXmlDefaultHandler (0x2224600) 0 QXmlDeclHandler (0x2226080) 20 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22b2700) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22d0580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2321600) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23a4440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23a46c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23a4780) 0 diff --git a/tests/auto/bic/data/QtXml.4.2.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtXml.4.2.0.macx-gcc-ppc32.txt index 9966650cb..8b438f03c 100644 --- a/tests/auto/bic/data/QtXml.4.2.0.macx-gcc-ppc32.txt +++ b/tests/auto/bic/data/QtXml.4.2.0.macx-gcc-ppc32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0x9c8c80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0x9c8d00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0x9c8ec0) 0 empty - QUintForSize<4> (0x9c8f00) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0x9cf000) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0x9cf080) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0x9cf240) 0 empty - QIntForSize<4> (0x9cf280) 0 empty Class QSysInfo size=1 align=1 @@ -50,75 +24,19 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0x9cf780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9cf9c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9cfa80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9cfb40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9cfc00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9cfcc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9cfd80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9cfe40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9cff00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x9cffc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa07080) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa07140) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa07200) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa072c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa07380) 0 empty Class QFlag size=4 align=4 @@ -135,10 +53,6 @@ Class QChar base size=2 base align=2 QChar (0xa07680) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xa07780) 0 empty Class QBasicAtomic size=4 align=4 @@ -151,10 +65,6 @@ Class QAtomic QAtomic (0xa07d80) 0 QBasicAtomic (0xa07dc0) 0 -Class - size=128 align=8 - base size=128 base align=8 - (0xeb4040) 0 Class __darwin_pthread_handler_rec size=12 align=4 @@ -236,75 +146,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xeb4d80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xf58140) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf585c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf58640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf586c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf58740) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf587c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf58840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf588c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf58940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf589c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf58a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf58ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf58b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xf58bc0) 0 Class QInternal size=1 align=1 @@ -331,10 +185,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0x1118380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x11187c0) 0 Class QCharRef size=8 align=4 @@ -347,10 +197,6 @@ Class QConstString QConstString (0x1235400) 0 QString (0x1235440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1235540) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -413,10 +259,6 @@ Class QListData base size=4 base align=4 QListData (0x1235dc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1309300) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -441,15 +283,7 @@ Class QTextCodec QTextCodec (0x1309180) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1309640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1309580) 0 Class QTextEncoder size=32 align=4 @@ -472,25 +306,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x1309880) 0 QGenericArgument (0x13098c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1309b80) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x1309b00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1309e00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1309d40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -582,10 +404,6 @@ QIODevice (0x13f4380) 0 QObject (0x13f43c0) 0 primary-for QIODevice (0x13f4380) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13f4600) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -605,25 +423,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0x13f4d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x13f4f40) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x13f4fc0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x14c6100) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x14c6040) 0 Class QStringList size=4 align=4 @@ -631,15 +437,7 @@ Class QStringList QStringList (0x14c61c0) 0 QList (0x14c6200) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x14c66c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x14c6740) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -773,50 +571,22 @@ QFile (0x153b940) 0 QObject (0x153b9c0) 0 primary-for QIODevice (0x153b980) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x153bb80) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x153bbc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x153bc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x153bd00) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x153bec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x153be00) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x153bf80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1611040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16110c0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -873,10 +643,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x1611100) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x16113c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -950,10 +716,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x16118c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1611940) 0 empty Class QMapData::Node size=8 align=4 @@ -978,10 +740,6 @@ Class QTextStream QTextStream (0x170f8c0) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x170fb80) 0 Class QTextStreamManipulator size=24 align=4 @@ -1088,40 +846,16 @@ Class rlimit base size=16 base align=8 rlimit (0x1849840) 0 -Class OSReadSwapInt64(const volatile void*, uintptr_t):: - size=8 align=8 - base size=8 base align=8 -OSReadSwapInt64(const volatile void*, uintptr_t):: (0x1849a40) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x187b140) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0x187b1c0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0x187b0c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x187b240) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x187b2c0) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x187b340) 0 Class QVectorData size=16 align=4 @@ -1259,15 +993,7 @@ Class QLocale base size=4 base align=4 QLocale (0x19f41c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x19f4280) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x19f4340) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1294,270 +1020,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x19f4540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19f4740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19f4800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19f48c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19f4980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19f4a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19f4b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19f4bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19f4c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19f4d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19f4e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19f4ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19f4f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x19f4480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a862c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a865c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a868c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86c80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1a86f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa71c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa74c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa77c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1aa7dc0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1584,60 +1098,20 @@ Class QVariant base size=16 base align=4 QVariant (0x1aa7e40) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ae5380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1ae5440) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1ae5640) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1ae5580) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x1ae5840) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1ae5780) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1ae59c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ae5b00) 0 empty -Class - size=16 align=4 - base size=16 base align=4 - (0x1ae5bc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1ae5c40) 0 -Class - size=3156 align=4 - base size=3156 base align=4 - (0x1ae5cc0) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1715,15 +1189,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1ba0340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ba0500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ba0580) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1750,10 +1216,6 @@ QEventLoop (0x1ba0600) 0 QObject (0x1ba0640) 0 primary-for QEventLoop (0x1ba0600) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1ba0840) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1798,20 +1260,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x1ba0a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ba0c40) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x1ba0cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1ba0e00) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1981,10 +1435,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x1c84400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1c84500) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2091,20 +1541,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x1c84f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d19080) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x1d19100) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d191c0) 0 empty Class QMetaProperty size=20 align=4 @@ -2116,10 +1558,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x1d19280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1d19340) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2301,10 +1739,6 @@ QLibrary (0x1d19d40) 0 QObject (0x1d19d80) 0 primary-for QLibrary (0x1d19d40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1d19f40) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2341,10 +1775,6 @@ Class QMutex base size=4 base align=4 QMutex (0x1dd4080) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x1dd4240) 0 Class QMutexLocker size=4 align=4 @@ -2356,20 +1786,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x1dd4300) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x1dd43c0) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x1dd4340) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x1dd4500) 0 Class QWriteLocker size=4 align=4 @@ -2427,10 +1849,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x1dd4f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1dd4740) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2442,70 +1860,42 @@ Class QDate base size=4 base align=4 QDate (0x1e65240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e65440) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e654c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e656c0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1e65740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e658c0) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1e65940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e65dc0) 0 empty Class QPointF size=16 align=8 base size=16 base align=4 QPointF (0x1e65500) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e65c80) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1f13280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f13300) 0 empty Class QLineF size=32 align=8 base size=32 base align=4 QLineF (0x1f13480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f13540) 0 empty Class QLinkedListData size=20 align=4 @@ -2517,40 +1907,24 @@ Class QSize base size=8 base align=4 QSize (0x1f13b80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1f13f80) 0 empty Class QSizeF size=16 align=8 base size=16 base align=4 QSizeF (0x2020140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2020540) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x20209c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2020b80) 0 empty Class QRectF size=32 align=8 base size=32 base align=4 QRectF (0x2020e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2020fc0) 0 empty Class QSharedData size=4 align=4 @@ -2695,15 +2069,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0x2135d00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2135ec0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2135e00) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -3033,33 +2399,9 @@ QXmlDefaultHandler (0x2251700) 0 QXmlDeclHandler (0x2252040) 20 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22e06c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x22fe540) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x234f5c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23d2400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23d2680) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x23d2740) 0 diff --git a/tests/auto/bic/data/QtXml.4.2.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtXml.4.2.0.win32-gcc-ia32.txt index cbc1df62c..318b311cb 100644 --- a/tests/auto/bic/data/QtXml.4.2.0.win32-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXml.4.2.0.win32-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xa9db00) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xa9dc00) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xa9df00) 0 empty - QUintForSize<4> (0xac2000) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xac2180) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xac2240) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xac24c0) 0 empty - QIntForSize<4> (0xac2580) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xaf4380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4b80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xaf4e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a180) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0a900) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0aa80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ac00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0ad80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb0af00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb36080) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb60f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb97380) 0 empty Class QBasicAtomic size=4 align=4 @@ -171,75 +81,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xc4bb00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xd72780) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd84e00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd940c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd84980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd9ae40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xd94780) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda58c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9300) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdd9600) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xda0080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde94c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xde9d00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xdef480) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QLatin1String base size=4 base align=4 QLatin1String (0xee0240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xee0780) 0 Class QCharRef size=8 align=4 @@ -282,10 +132,6 @@ Class QConstString QConstString (0x11f3dc0) 0 QString (0x11f3e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1260140) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -348,10 +194,6 @@ Class QListData base size=4 base align=4 QListData (0x12d61c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x13dc180) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -376,15 +218,7 @@ Class QTextCodec QTextCodec (0xee01c0) 0 nearly-empty vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1400480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xc5d5c0) 0 Class QTextEncoder size=32 align=4 @@ -407,25 +241,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0x144b300) 0 QGenericArgument (0x144b340) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0x1460ac0) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0x144b8c0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1490340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1476f40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -517,10 +339,6 @@ QIODevice (0x13b5a40) 0 QObject (0x150ab40) 0 primary-for QIODevice (0x13b5a40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x150ae40) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -540,25 +358,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xee00c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x15d9c00) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0x15d9f80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x15f14c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x15f1380) 0 Class QStringList size=4 align=4 @@ -566,15 +372,7 @@ Class QStringList QStringList (0xee0140) 0 QList (0x15f1740) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0x15f1600) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0x15f15c0) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -703,50 +501,22 @@ QFile (0x1700080) 0 QObject (0x1700100) 0 primary-for QIODevice (0x17000c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1700940) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0x1758140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1758a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1771ac0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x1771f80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1771e80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0x1716fc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17acc80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x17ac880) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -803,10 +573,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0x16f0f80) 0 vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x18490c0) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -880,10 +646,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0x18abb80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x18abc80) 0 empty Class QMapData::Node size=8 align=4 @@ -908,10 +670,6 @@ Class QTextStream QTextStream (0x1aec580) 0 vptr=((&QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1aec940) 0 Class QTextStreamManipulator size=24 align=4 @@ -948,20 +706,8 @@ QTextOStream (0x1b7d740) 0 QTextStream (0x1b7d780) 0 primary-for QTextOStream (0x1b7d740) -Class - size=8 align=4 - base size=8 base align=4 - (0x1bb1980) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0x1bb1b00) 0 -Class - size=16 align=8 - base size=16 base align=8 - (0x1bd78c0) 0 Class QVectorData size=16 align=4 @@ -1099,15 +845,7 @@ Class QLocale base size=4 base align=4 QLocale (0x1e3dcc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x1e87980) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x1e87040) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1134,270 +872,58 @@ Class QMetaType base size=0 base align=1 QMetaType (0x1ee9400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f0a840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f0a9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f0ab40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f0acc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f0ae40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f0afc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1e140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1e2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1e440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1e5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1e740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1e8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1ea40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1ebc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1ed40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f1eec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3e040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3e1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3e340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3e4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3e640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3e7c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3e940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3eac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3ec40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3edc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f3ef40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5b0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5b240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5b3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5b540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5b6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5b840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5b9c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5bb40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5bcc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5be40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f5bfc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7a140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7a2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7a440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7a5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7a740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7a8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7aa40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7abc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7ad40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f7aec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9c040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9c1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9c340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9c4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1f9c640) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1424,45 +950,17 @@ Class QVariant base size=16 base align=8 QVariant (0x1476c80) 0 -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1feee00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0x1feefc0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2022480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x1fb0540) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0x2022780) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0x1fb05c0) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0x1f9c800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x208a100) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1540,15 +1038,7 @@ Class QUrl base size=4 base align=4 QUrl (0x1f0a180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x2144440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x21a2040) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -1575,10 +1065,6 @@ QEventLoop (0x21a26c0) 0 QObject (0x21a2700) 0 primary-for QEventLoop (0x21a26c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x21a2a00) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -1623,20 +1109,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0x221d200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x221de80) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0x221d180) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22492c0) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1806,10 +1284,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0x22ce7c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x22cee00) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -1917,20 +1391,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0x143fc00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2372bc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0x143fc80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x23871c0) 0 empty Class QMetaProperty size=20 align=4 @@ -1942,10 +1408,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0x143fd80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2387900) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2127,10 +1589,6 @@ QLibrary (0x2446040) 0 QObject (0x2446080) 0 primary-for QLibrary (0x2446040) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0x24462c0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2172,10 +1630,6 @@ Class QMutex base size=4 base align=4 QMutex (0x24b77c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0x24e5000) 0 Class QMutexLocker size=4 align=4 @@ -2187,20 +1641,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0x24e5e00) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0x24f7140) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0x24e5fc0) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0x24f7900) 0 Class QWriteLocker size=4 align=4 @@ -2258,10 +1704,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0x253aac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2595480) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -2273,70 +1715,42 @@ Class QDate base size=4 base align=4 QDate (0x1e3db40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x25ed640) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0x1e3dbc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2615280) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0x1758040) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2644040) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0x1f0a340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2644c80) 0 empty Class QPointF size=16 align=8 base size=16 base align=8 QPointF (0x1f0a380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x266ce40) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0x1f0a2c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26b32c0) 0 empty Class QLineF size=32 align=8 base size=32 base align=8 QLineF (0x1f0a300) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x26de780) 0 empty Class QLinkedListData size=20 align=4 @@ -2348,40 +1762,24 @@ Class QSize base size=8 base align=4 QSize (0x1f0a240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x27d0fc0) 0 empty Class QSizeF size=16 align=8 base size=16 base align=8 QSizeF (0x1f0a280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2820500) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0x1f0a1c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x28a7000) 0 empty Class QRectF size=32 align=8 base size=32 base align=8 QRectF (0x1f0a200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x292b340) 0 empty Class QSharedData size=4 align=4 @@ -2526,15 +1924,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0x2a83d80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0x2a9b040) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0x2a83ec0) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -2864,33 +2254,9 @@ QXmlDefaultHandler (0x2a83340) 0 QXmlDeclHandler (0x2b13700) 20 nearly-empty vptr=((&QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1400440) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x15f1480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2cf0b80) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x1771f40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0x2e19e00) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0x2a9b000) 0 diff --git a/tests/auto/bic/data/QtXml.4.3.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtXml.4.3.0.linux-gcc-ia32.txt index a0788b732..0dc3e8b08 100644 --- a/tests/auto/bic/data/QtXml.4.3.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXml.4.3.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f0ac80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f0acc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7f0ad80) 0 empty - QUintForSize<4> (0xb7f0adc0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7f0ae40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7f0ae80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7f0af40) 0 empty - QIntForSize<4> (0xb7f0af80) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77b3240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b33c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b34c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b35c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3680) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb77b36c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b37c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b3800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b3840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b3880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b38c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b3900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b3940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b3980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b39c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b3a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b3a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b3a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77b3ac0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb77b3bc0) 0 QGenericArgument (0xb77b3c00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb77b3dc0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb77b3e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b3f00) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb7315200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7315240) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb7315280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7315480) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb7315580) 0 QString (0xb73155c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7315600) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb7315940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb7315cc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb7315c40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb7315f00) 0 QObject (0xb7315f40) 0 primary-for QLibrary (0xb7315f00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7315fc0) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb7315740) 0 QObject (0xb7315800) 0 primary-for QIODevice (0xb7315740) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7315b00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb7315dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7315f80) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6d72000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6d720c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6d72040) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb6d72100) 0 QList (0xb6d72140) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6d721c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6d72200) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6d72580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d725c0) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb6d72b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d72bc0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6d72c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d72cc0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6d72d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d72dc0) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb6d72e00) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6d72e80) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6d72ec0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6d72e40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d72f00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d72f40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6d72f80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d72fc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6d72300) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb6d72980) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6d72b40) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6d72b80) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6d72c40) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6d72d80) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6d72d40) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6d72c80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6cd4000) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6cd4080) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6cd4040) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6cd40c0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6cd4140) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6cd4100) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6cd4180) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6cd41c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6cd4200) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb6cd4480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cd4680) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6cd4700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cd4900) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6cd4cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cd4d00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6cd4d40) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb6cd48c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cd4b80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6cd4dc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b36200) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6b36340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b36440) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6b36480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b36540) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6b36580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b365c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6b36600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b36640) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6b369c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b36a00) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb6b36b40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b36bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b36c00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6b36c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36d00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36dc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36e00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36e40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36f40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b360c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b361c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b363c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b364c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b36840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e2c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e5c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb677e6c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb677e700) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb677e980) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb677e9c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb677eac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb677ea40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb677ebc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb677eb40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb677ec40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb677ecc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb677ed00) 0 QObject (0xb677ed40) 0 primary-for QSettings (0xb677ed00) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb677ee40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb677ee00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb677ee80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb677eec0) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb677efc0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb677e880) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb677e840) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb677e900) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb677e940) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb677ed80) 0 QObject (0xb666f000) 0 primary-for QIODevice (0xb677edc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666f080) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb666f200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666f240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb666f280) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb666f340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb666f2c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb666f380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666f400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666f480) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb666f6c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666f780) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb666f7c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666f940) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb666fa00) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666fb40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb666fa80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb666fc80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb666fc00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb666fd40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb666fe00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb666fdc0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb64a8000) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb666ff80) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb64a8080) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb64a80c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb64a8140) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb64a8440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64a8480) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb64a8580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64a85c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb64a8600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64a8680) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb64a8b00) 0 QObject (0xb64a8b40) 0 primary-for QEventLoop (0xb64a8b00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64a8c40) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb64a8ac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64a8bc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb64a8cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64a8d80) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb64a8f00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64a8fc0) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2654,15 +1944,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0xb6420300) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6420400) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6420380) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -3002,20 +2284,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb6420e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6420ec0) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb6420f80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb6420f00) 0 Class QXmlStreamAttributes size=4 align=4 @@ -3028,30 +2298,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb6420200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6420240) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb6420440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64204c0) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb6420640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64206c0) 0 empty Class QXmlStreamReader size=4 align=4 @@ -3165,28 +2423,8 @@ Class QDomProcessingInstruction QDomProcessingInstruction (0xb6153680) 0 QDomNode (0xb61536c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6153740) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb61537c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6153840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61538c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6153940) 0 diff --git a/tests/auto/bic/data/QtXml.4.3.1.linux-gcc-ia32.txt b/tests/auto/bic/data/QtXml.4.3.1.linux-gcc-ia32.txt index 97af1881c..6f17d8f0e 100644 --- a/tests/auto/bic/data/QtXml.4.3.1.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXml.4.3.1.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7ef1c80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7ef1cc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7ef1d80) 0 empty - QUintForSize<4> (0xb7ef1dc0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7ef1e40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7ef1e80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7ef1f40) 0 empty - QIntForSize<4> (0xb7ef1f80) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb739b240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b4c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b5c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739b680) 0 empty Class QFlag size=4 align=4 @@ -161,10 +75,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb739bac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb739bb00) 0 empty Vtable for std::exception std::exception::_ZTVSt9exception: 5u entries @@ -227,70 +137,18 @@ Class QListData base size=4 base align=4 QListData (0xb739be00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb739bd80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb739bfc0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71c2000) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71c2040) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71c2080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71c20c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71c2100) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71c2140) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71c2180) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71c21c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71c2200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71c2240) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71c2280) 0 Class QInternal size=1 align=1 @@ -308,10 +166,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb71c2380) 0 QGenericArgument (0xb71c23c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb71c2580) 0 Class QMetaObject size=16 align=4 @@ -328,10 +182,6 @@ Class QChar base size=2 base align=2 QChar (0xb71c2640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb71c26c0) 0 empty Class QString::Null size=1 align=1 @@ -348,10 +198,6 @@ Class QString base size=4 base align=4 QString (0xb71c2700) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71c2900) 0 Class QLatin1String size=4 align=4 @@ -369,25 +215,13 @@ Class QConstString QConstString (0xb71c29c0) 0 QString (0xb71c2a00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb71c2a40) 0 empty Class QStringRef size=12 align=4 base size=12 base align=4 QStringRef (0xb71c2a80) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb71c2bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb71c2b40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -479,10 +313,6 @@ QIODevice (0xb71c2e00) 0 QObject (0xb71c2e40) 0 primary-for QIODevice (0xb71c2e00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb71c2f00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -502,275 +332,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb71c2fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb71c2c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb71c2cc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb71c2e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb71c2f80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f280c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f281c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f282c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f283c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f284c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f285c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f286c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f287c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f288c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28900) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f289c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28a00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28a40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28a80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28b80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28bc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6f28c40) 0 empty Class QMapData::Node size=8 align=4 @@ -807,45 +421,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6dd50c0) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6dd5340) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6dd5380) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6dd5480) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6dd5400) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6dd5580) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6dd5500) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6dd5600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6dd5680) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -972,10 +558,6 @@ QEventLoop (0xb6dd5b00) 0 QObject (0xb6dd5b40) 0 primary-for QEventLoop (0xb6dd5b00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6dd5c40) 0 Vtable for QCoreApplication QCoreApplication::_ZTV16QCoreApplication: 16u entries @@ -1009,10 +591,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb6dd5e00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6dd5e40) 0 empty Vtable for QTimer QTimer::_ZTV6QTimer: 14u entries @@ -1069,20 +647,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb6dd5200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6dd5240) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb6dd5280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6dd5300) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -1277,20 +847,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb6dd5d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6dd5f00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb6dd5fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7a000) 0 empty Class QMetaProperty size=20 align=4 @@ -1302,10 +864,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb6b7a080) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7a0c0) 0 empty Vtable for QSocketNotifier QSocketNotifier::_ZTV15QSocketNotifier: 14u entries @@ -1408,100 +966,48 @@ Class QSize base size=8 base align=4 QSize (0xb6b7a3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7a5c0) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6b7a640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7a840) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb6b7a900) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7ab40) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6b7ab80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7adc0) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6b7ae00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7af00) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6b7af40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b7a180) 0 empty -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6b7a300) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6b7a400) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6b7a240) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6b7a440) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6b7a480) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6b7a4c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6b7a500) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6b7a540) 0 Class timespec size=8 align=4 @@ -1513,80 +1019,24 @@ Class timeval base size=8 base align=4 timeval (0xb6b7a680) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6b7a6c0) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6b7a700) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6b7a740) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6b7a800) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6b7a7c0) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6b7a780) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6b7a940) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6b7a9c0) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6b7a980) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6b7aa00) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6b7aa80) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6b7aa40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6b7aac0) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6b7ab00) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6b7abc0) 0 Class random_data size=28 align=4 @@ -1618,35 +1068,19 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb69a70c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69a7100) 0 empty Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb69a7880) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69a78c0) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb69a7900) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb69a79c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb69a7940) 0 Class QStringList size=4 align=4 @@ -1654,15 +1088,7 @@ Class QStringList QStringList (0xb69a7a00) 0 QList (0xb69a7a40) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb69a7ac0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb69a7b00) 0 Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -1695,15 +1121,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb69a7d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69a7d40) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69a7d80) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -1730,10 +1148,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb69a7fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69a76c0) 0 empty Class QCryptographicHash size=4 align=4 @@ -1750,20 +1164,12 @@ Class QLine base size=16 base align=4 QLine (0xb6770380) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb67703c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6770400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6770440) 0 empty Class QSharedData size=4 align=4 @@ -1775,30 +1181,18 @@ Class QDate base size=4 base align=4 QDate (0xb67705c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6770680) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb67706c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6770780) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb67707c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6770880) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -1810,20 +1204,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb6770900) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb6770980) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb6770940) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb6770a00) 0 Class QWriteLocker size=4 align=4 @@ -1876,20 +1262,12 @@ Class QMutex base size=4 base align=4 QMutex (0xb6770c40) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb6770cc0) 0 Class QMutexLocker size=4 align=4 base size=4 base align=4 QMutexLocker (0xb6770c80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6770dc0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1914,15 +1292,7 @@ Class QTextCodec QTextCodec (0xb6770d00) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6770f00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6770e80) 0 Class QTextEncoder size=32 align=4 @@ -1934,25 +1304,9 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb6770f80) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb67702c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6770fc0) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6770600) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6770640) 0 Class __gconv_trans_data size=20 align=4 @@ -1974,15 +1328,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6770840) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6770d80) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6770b00) 0 Class _IO_marker size=12 align=4 @@ -1994,10 +1340,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6542000) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6542040) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -2012,10 +1354,6 @@ Class QTextStream QTextStream (0xb6542080) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6542140) 0 Class QTextStreamManipulator size=24 align=4 @@ -2131,35 +1469,15 @@ QFile (0xb6542580) 0 QObject (0xb6542600) 0 primary-for QIODevice (0xb65425c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6542680) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb65426c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6542700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6542740) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6542800) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6542780) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -2212,15 +1530,7 @@ Class QDir base size=4 base align=4 QDir (0xb6542980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6542a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6542a80) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2277,10 +1587,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb6542ac0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6542c40) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2409,15 +1715,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb6542f40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6542fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6542100) 0 empty Vtable for QDirIterator QDirIterator::_ZTV12QDirIterator: 4u entries @@ -2432,10 +1730,6 @@ Class QDirIterator QDirIterator (0xb65422c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6542480) 0 Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -2541,10 +1835,6 @@ QLibrary (0xb63eb000) 0 QObject (0xb63eb040) 0 primary-for QLibrary (0xb63eb000) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb63eb0c0) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -2654,20 +1944,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb63eb580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63eb5c0) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb63eb680) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb63eb600) 0 Class QXmlStreamAttributes size=4 align=4 @@ -2680,30 +1958,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb63eb740) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63eb780) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb63eb800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63eb840) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb63eb8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb63eb900) 0 empty Class QXmlStreamReader size=4 align=4 @@ -2827,15 +2093,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0xb62fe140) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb62fe240) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb62fe1c0) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -3165,28 +2423,8 @@ QXmlDefaultHandler (0xb6155948) 0 QXmlDeclHandler (0xb62fea40) 20 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb62fecc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb62fed40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb62fedc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb62fee40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb62feec0) 0 diff --git a/tests/auto/bic/data/QtXml.4.3.2.linux-gcc-ia32.txt b/tests/auto/bic/data/QtXml.4.3.2.linux-gcc-ia32.txt index 4098d452c..12730a8cf 100644 --- a/tests/auto/bic/data/QtXml.4.3.2.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXml.4.3.2.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7ef0c80) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7ef0cc0) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7ef0d80) 0 empty - QUintForSize<4> (0xb7ef0dc0) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7ef0e40) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7ef0e80) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7ef0f40) 0 empty - QIntForSize<4> (0xb7ef0f80) 0 empty Class QSysInfo size=1 align=1 @@ -50,150 +24,38 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7799240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7799300) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7799340) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7799380) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77993c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7799400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7799440) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7799480) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77994c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7799500) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7799540) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7799580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77995c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7799600) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7799640) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7799680) 0 empty Class QFlag size=4 align=4 base size=4 base align=4 QFlag (0xb77996c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77997c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7799800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7799840) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7799880) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77998c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7799900) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7799940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7799980) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb77999c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7799a00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7799a40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7799a80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb7799ac0) 0 Class QInternal size=1 align=1 @@ -211,10 +73,6 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb7799bc0) 0 QGenericArgument (0xb7799c00) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb7799dc0) 0 Class QMetaObject size=16 align=4 @@ -231,10 +89,6 @@ Class QChar base size=2 base align=2 QChar (0xb7799e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7799f00) 0 empty Class QBasicAtomic size=4 align=4 @@ -267,10 +121,6 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb72fc200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72fc240) 0 empty Class QString::Null size=1 align=1 @@ -287,10 +137,6 @@ Class QString base size=4 base align=4 QString (0xb72fc280) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72fc480) 0 Class QLatin1String size=4 align=4 @@ -308,10 +154,6 @@ Class QConstString QConstString (0xb72fc580) 0 QString (0xb72fc5c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72fc600) 0 empty Class QStringRef size=12 align=4 @@ -379,15 +221,7 @@ Class QListData base size=4 base align=4 QListData (0xb72fc940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb72fccc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb72fcc40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -463,10 +297,6 @@ QLibrary (0xb72fcf00) 0 QObject (0xb72fcf40) 0 primary-for QLibrary (0xb72fcf00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72fcfc0) 0 Class QUuid size=16 align=4 @@ -514,10 +344,6 @@ QIODevice (0xb72fc740) 0 QObject (0xb72fc800) 0 primary-for QIODevice (0xb72fc740) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb72fcb00) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -537,25 +363,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb72fcdc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb72fcf80) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6d58000) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6d580c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6d58040) 0 Class QStringList size=4 align=4 @@ -563,15 +377,7 @@ Class QStringList QStringList (0xb6d58100) 0 QList (0xb6d58140) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb6d581c0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb6d58200) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -627,10 +433,6 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb6d58580) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d585c0) 0 empty Class QCryptographicHash size=4 align=4 @@ -642,75 +444,35 @@ Class QDate base size=4 base align=4 QDate (0xb6d58b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d58bc0) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb6d58c00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d58cc0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb6d58d00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6d58dc0) 0 empty Class QByteArrayMatcher size=1032 align=4 base size=1032 base align=4 QByteArrayMatcher (0xb6d58e00) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6d58e80) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb6d58ec0) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb6d58e40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d58f00) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d58f40) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6d58f80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6d58fc0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6d58300) 0 Class timespec size=8 align=4 @@ -722,80 +484,24 @@ Class timeval base size=8 base align=4 timeval (0xb6d58980) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb6d58b40) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb6d58b80) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb6d58c40) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb6d58d80) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb6d58d40) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb6d58c80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6cba000) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6cba080) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb6cba040) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6cba0c0) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb6cba140) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb6cba100) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6cba180) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb6cba1c0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb6cba200) 0 Class random_data size=28 align=4 @@ -817,20 +523,12 @@ Class QSize base size=8 base align=4 QSize (0xb6cba480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cba680) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb6cba700) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cba900) 0 empty Class QLinkedListData size=20 align=4 @@ -842,15 +540,7 @@ Class QLocale base size=4 base align=4 QLocale (0xb6cbacc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cbad00) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6cbad40) 0 Vtable for QSystemLocale QSystemLocale::_ZTV13QSystemLocale: 6u entries @@ -887,60 +577,36 @@ Class QPoint base size=8 base align=4 QPoint (0xb6cba8c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6cbab80) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb6cbadc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b1c200) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb6b1c340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b1c440) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb6b1c480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b1c540) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb6b1c580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b1c5c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb6b1c600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b1c640) 0 empty Vtable for QTimeLine QTimeLine::_ZTV9QTimeLine: 15u entries @@ -978,10 +644,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb6b1c9c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b1ca00) 0 empty Class QLibraryInfo size=1 align=1 @@ -993,290 +655,66 @@ Class QUrl base size=4 base align=4 QUrl (0xb6b1cb40) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6b1cbc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6b1cc00) 0 empty Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb6b1cc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1cd00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1cd40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1cd80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1cdc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1ce00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1ce40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1ce80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1cec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1cf00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1cf40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1cf80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1cfc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c0c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c4c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6b1c840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764040) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67640c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764180) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67641c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67642c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67643c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764400) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67644c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764540) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67645c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb6764680) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb67646c0) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -1303,45 +741,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb6764700) 0 -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb6764980) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb67649c0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6764ac0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6764a40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb6764bc0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb6764b40) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb6764c40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6764cc0) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -1368,25 +778,9 @@ QSettings (0xb6764d00) 0 QObject (0xb6764d40) 0 primary-for QSettings (0xb6764d00) -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6764e40) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6764e00) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6764e80) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6764ec0) 0 Class __gconv_trans_data size=20 align=4 @@ -1408,15 +802,7 @@ Class __gconv_info base size=8 base align=4 __gconv_info (0xb6764fc0) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb6764880) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb6764840) 0 Class _IO_marker size=12 align=4 @@ -1428,10 +814,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6764900) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6764940) 0 Vtable for QFile QFile::_ZTV5QFile: 31u entries @@ -1477,10 +859,6 @@ QFile (0xb6764d80) 0 QObject (0xb6655000) 0 primary-for QIODevice (0xb6764dc0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6655080) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -1533,40 +911,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb6655200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6655240) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6655280) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6655340) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb66552c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb6655380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6655400) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6655480) 0 Vtable for QProcess QProcess::_ZTV8QProcess: 31u entries @@ -1650,10 +1004,6 @@ Class QDirIterator QDirIterator (0xb66556c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6655780) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -1710,10 +1060,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb66557c0) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6655940) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -1747,10 +1093,6 @@ Class QAbstractFileEngineIterator QAbstractFileEngineIterator (0xb6655a00) 0 vptr=((& QAbstractFileEngineIterator::_ZTV27QAbstractFileEngineIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6655b40) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -1775,15 +1117,7 @@ Class QTextCodec QTextCodec (0xb6655a80) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6655c80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6655c00) 0 Class QTextEncoder size=32 align=4 @@ -1808,10 +1142,6 @@ Class QTextStream QTextStream (0xb6655d40) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6655e00) 0 Class QTextStreamManipulator size=24 align=4 @@ -1958,20 +1288,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb6655dc0) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb648e000) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb6655f80) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb648e080) 0 Class QWriteLocker size=4 align=4 @@ -1983,10 +1305,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb648e0c0) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb648e140) 0 Class QMutexLocker size=4 align=4 @@ -2066,10 +1384,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb648e440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb648e480) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -2104,20 +1418,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb648e580) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb648e5c0) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb648e600) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb648e680) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -2357,10 +1663,6 @@ QEventLoop (0xb648eb00) 0 QObject (0xb648eb40) 0 primary-for QEventLoop (0xb648eb00) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb648ec40) 0 Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -2555,20 +1857,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb648eac0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb648ebc0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb648ecc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb648ed80) 0 empty Class QMetaProperty size=20 align=4 @@ -2580,10 +1874,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb648ef00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb648efc0) 0 empty Vtable for QTextCodecFactoryInterface QTextCodecFactoryInterface::_ZTV26QTextCodecFactoryInterface: 6u entries @@ -2654,15 +1944,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0xb6406300) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6406400) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6406380) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -3002,20 +2284,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb6406e80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6406ec0) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb6406f80) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb6406f00) 0 Class QXmlStreamAttributes size=4 align=4 @@ -3028,30 +2298,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb6406200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6406240) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb6406440) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64064c0) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb6406640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64066c0) 0 empty Class QXmlStreamReader size=4 align=4 @@ -3165,28 +2423,8 @@ Class QDomProcessingInstruction QDomProcessingInstruction (0xb6139680) 0 QDomNode (0xb61396c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6139740) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb61397c0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6139840) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb61398c0) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb6139940) 0 diff --git a/tests/auto/bic/data/QtXml.4.4.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtXml.4.4.0.linux-gcc-ia32.txt index b39d2ed48..0a2fb273b 100644 --- a/tests/auto/bic/data/QtXml.4.4.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXml.4.4.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb78937bc) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb78937f8) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7cf3b40) 0 empty - QUintForSize<4> (0xb7893870) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb789399c) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb78939d8) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7cf3d00) 0 empty - QIntForSize<4> (0xb7893a50) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb789fe4c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b703c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b712c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b721c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b730c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b73fc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b74ec) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b75dc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b76cc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b77bc) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b78ac) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b799c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b7a8c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b7b7c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b7c6c) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb78b7d5c) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb78d0d5c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7902a14) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6b895dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6bce6cc) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6bce960) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a19294) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a19bb8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a2b4ec) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a2be10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a3d744) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a48078) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a4899c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a602d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a60bf4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a71528) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a71e4c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a89780) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb6a9721c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68e9438) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb680db00) 0 QString (0xb684c870) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb684cb7c) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QListData base size=4 base align=4 QListData (0xb68d31a4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb67704ec) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -386,15 +228,7 @@ Class QTextCodec QTextCodec (0xb6757834) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6781b40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6781ac8) 0 Class QTextEncoder size=32 align=4 @@ -417,25 +251,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb67b1000) 0 QGenericArgument (0xb67a5d5c) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb67b4258) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb67b4078) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb67cb3c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb67cb348) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -527,10 +349,6 @@ QIODevice (0xb6604e80) 0 QObject (0xb66153c0) 0 primary-for QIODevice (0xb6604e80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6631690) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -550,25 +368,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb666f5dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6696dd4) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6696ec4) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb66a3438) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb66a33c0) 0 Class QStringList size=4 align=4 @@ -576,15 +382,7 @@ Class QStringList QStringList (0xb6676f80) 0 QList (0xb66a3474) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb66ce1e0) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb66ce3fc) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -664,10 +462,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb64fb618) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb650621c) 0 Class QMutexLocker size=4 align=4 @@ -747,35 +541,11 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb65d5b40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65d5bf4) 0 empty -Class - size=8 align=4 - base size=8 base align=4 - (0xb6458b7c) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6458c6c) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6458bf4) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb6458ce4) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6458d5c) 0 Class _IO_marker size=12 align=4 @@ -787,10 +557,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6458dd4) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6458e4c) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -805,10 +571,6 @@ Class QTextStream QTextStream (0xb6458e88) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb64b4618) 0 Class QTextStreamManipulator size=24 align=4 @@ -845,40 +607,16 @@ QTextOStream (0xb62dc0c0) 0 QTextStream (0xb64ced98) 0 primary-for QTextOStream (0xb62dc0c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb62e0834) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb62e08ac) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb62e07bc) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb62e0924) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb62e099c) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb62e0a14) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb62e0a8c) 0 Class timespec size=8 align=4 @@ -890,80 +628,24 @@ Class timeval base size=8 base align=4 timeval (0xb62e0b04) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb62e0b7c) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb62e0bf4) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb62e0c30) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb62e0d5c) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb62e0ce4) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb62e0ca8) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb62e0dd4) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb62e0ec4) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb62e0e4c) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb62e0f3c) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb62fa000) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb62e0fb4) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb62fa0b4) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb62fa12c) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb62fa1a4) 0 Class random_data size=28 align=4 @@ -995,20 +677,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb6200f3c) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb621cb7c) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb621cb04) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb621cec4) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -1028,10 +698,6 @@ Class QtConcurrent::ResultStoreBase QtConcurrent::ResultStoreBase (0xb621ce88) 0 vptr=((& QtConcurrent::ResultStoreBase::_ZTVN12QtConcurrent15ResultStoreBaseE) + 8u) -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb62386cc) 0 Vtable for QFutureInterfaceBase QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries @@ -1046,25 +712,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb6238744) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb6262780) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb626621c) 0 - primary-for QFutureInterface (0xb6262780) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb62919d8) 0 Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1093,34 +742,7 @@ QFutureWatcherBase (0xb62bb6c0) 0 QObject (0xb62c5078) 0 primary-for QFutureWatcherBase (0xb62bb6c0) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb62bbdc0) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb62bbe00) 0 - primary-for QFutureWatcher (0xb62bbdc0) - QObject (0xb62c5bb8) 0 - primary-for QFutureWatcherBase (0xb62bbe00) Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1219,60 +841,14 @@ QtConcurrent::ThreadEngineBase (0xb61172c0) 0 QRunnable (0xb6113b7c) 0 primary-for QtConcurrent::ThreadEngineBase (0xb61172c0) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb6126348) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb6117c40) 0 - QtConcurrent::ThreadEngineStarterBase (0xb61263c0) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 -4u -32 0u -36 0u -40 0u -44 0u -48 0u -52 -4u -56 0u -60 (int (*)(...))-0x000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb6117e00) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb6117e40) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb6126870) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb6117e40) Class std::input_iterator_tag size=1 align=1 @@ -1315,225 +891,49 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb6144258) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb61442d0) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb61444ec) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61445dc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6144654) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61446cc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6144744) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61447bc) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6144834) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb61448ac) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6144924) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614499c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6144a14) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6144a8c) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6144b04) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb6144b7c) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb6144c6c) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb6144ce4) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb6144d5c) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb615c0f0) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb615c168) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb615c258) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb615c2d0) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb615c348) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb615c564) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb615c5a0) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb615c5dc) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb615c618) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb615c654) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb615c690) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb615c708) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb615c744) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb615c780) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb615c7bc) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb615c7f8) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb615c834) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb617c21c) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb61be7f8) 0 empty -Class std::__copy_move - size=1 align=1 - base size=0 base align=1 -std::__copy_move (0xb61bec30) 0 empty -Class std::__copy_move_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_move_backward (0xb61bee4c) 0 empty -Class std::__equal - size=1 align=1 - base size=0 base align=1 -std::__equal (0xb6003258) 0 empty -Class std::__lc_rai - size=1 align=1 - base size=0 base align=1 -std::__lc_rai (0xb60033c0) 0 empty -Class std::__lexicographical_compare - size=1 align=1 - base size=0 base align=1 -std::__lexicographical_compare (0xb6003528) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb6003c30) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb6037654) 0 empty Class lconv size=56 align=4 @@ -1550,10 +950,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb604a21c) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb604a294) 0 Class tm size=44 align=4 @@ -1570,15 +966,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb604a564) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb604a6cc) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb604a654) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1590,32 +978,10 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb604a744) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb60c0c6c) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb60c0f3c) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb60d37c0) 0 empty - __gnu_cxx::new_allocator (0xb60c0f78) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb60c0fb4) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb60d3880) 0 empty - __gnu_cxx::new_allocator (0xb5eda000) 0 empty Vtable for __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries @@ -1631,82 +997,19 @@ Class __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind (0xb5eda21c) 0 nearly-empty vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 8u) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5f2fb04) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5f2fb40) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5f69b40) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5f2fb7c) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5dcf7f8) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5e02100) 0 - std::allocator (0xb5e02140) 0 empty - __gnu_cxx::new_allocator (0xb5dcf870) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5dcf780) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5dcf8ac) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5e022c0) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5dcf8e8) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5dcf99c) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5e024c0) 0 - std::allocator (0xb5e02500) 0 empty - __gnu_cxx::new_allocator (0xb5dcfa14) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5dcf924) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5dcfa50) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5dcfb04) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5e02680) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5dcfa8c) 0 Class std::locale size=4 align=4 @@ -1736,97 +1039,16 @@ Class std::locale::_Impl base size=20 base align=4 std::locale::_Impl (0xb5ea0ce4) 0 -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5eb1640) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb5eb0654) 0 - primary-for std::collate (0xb5eb1640) -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5eb1740) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb5eb0744) 0 - primary-for std::collate (0xb5eb1740) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5eb0bb8) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5eb0bf4) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5cd06c0) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5eb0c30) 0 empty -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5cd0800) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb5cd0840) 0 - primary-for std::collate_byname (0xb5cd0800) - std::locale::facet (0xb5eb0ca8) 0 - primary-for std::collate (0xb5cd0840) - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5cd08c0) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb5cd0900) 0 - primary-for std::collate_byname (0xb5cd08c0) - std::locale::facet (0xb5eb0d98) 0 - primary-for std::collate (0xb5cd0900) + + + + + Vtable for std::ios_base::failure std::ios_base::failure::_ZTVNSt8ios_base7failureE: 5u entries @@ -1872,583 +1094,85 @@ Class std::ios_base std::ios_base (0xb5ce4b40) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5d371e0) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5d37474) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb5d37708) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb5d9dfa0) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb5d8b654) 0 - primary-for std::ctype (0xb5d9dfa0) - std::ctype_base (0xb5d8b690) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb5daa870) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb5dbc21c) 0 - primary-for std::__ctype_abstract_base (0xb5daa870) - std::ctype_base (0xb5dbc258) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb5dae800) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb5bc76e0) 0 - primary-for std::ctype (0xb5dae800) - std::locale::facet (0xb5dbc348) 0 - primary-for std::__ctype_abstract_base (0xb5bc76e0) - std::ctype_base (0xb5dbc384) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb5dae9c0) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb5bcee60) 0 - primary-for std::ctype_byname (0xb5dae9c0) - std::locale::facet (0xb5bcd690) 0 - primary-for std::ctype (0xb5bcee60) - std::ctype_base (0xb5bcd6cc) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb5daea40) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb5daea80) 0 - primary-for std::ctype_byname (0xb5daea40) - std::__ctype_abstract_base (0xb5bd24b0) 0 - primary-for std::ctype (0xb5daea80) - std::locale::facet (0xb5bcd834) 0 - primary-for std::__ctype_abstract_base (0xb5bd24b0) - std::ctype_base (0xb5bcd870) 0 empty + + + + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb5bd91e0) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5be0480) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb5bd9a50) 0 - primary-for std::numpunct (0xb5be0480) -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5be0540) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb5bd9b40) 0 - primary-for std::numpunct (0xb5be0540) -Class __gnu_cxx::__conditional_type - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type (0xb5c4a1a4) 0 empty -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5c64a80) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb5c64ac0) 0 - primary-for std::numpunct_byname (0xb5c64a80) - std::locale::facet (0xb5c4a7f8) 0 - primary-for std::numpunct (0xb5c64ac0) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5c64b00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5c4a8e8) 0 - primary-for std::num_get > > (0xb5c64b00) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5c64b80) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5c4a9d8) 0 - primary-for std::num_put > > (0xb5c64b80) -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5c64c00) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb5c64c40) 0 - primary-for std::numpunct_byname (0xb5c64c00) - std::locale::facet (0xb5c4aac8) 0 - primary-for std::numpunct (0xb5c64c40) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5c64cc0) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5c4abb8) 0 - primary-for std::num_get > > (0xb5c64cc0) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5c64d40) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5c4aca8) 0 - primary-for std::num_put > > (0xb5c64d40) -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb5cb8d80) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb5cb930c) 0 - primary-for std::basic_ios > (0xb5cb8d80) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb5cb8dc0) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb5cb93fc) 0 - primary-for std::basic_ios > (0xb5cb8dc0) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5b00a40) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb5b00a80) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb5b06078) 4 - primary-for std::basic_ios > (0xb5b00a80) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5b06258) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5b00bc0) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5b00c00) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5b06294) 4 - primary-for std::basic_ios > (0xb5b00c00) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5b06438) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5b42480) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb5b424c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb5b0699c) 8 - primary-for std::basic_ios > (0xb5b424c0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5b42580) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5b425c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5b06d20) 8 - primary-for std::basic_ios > (0xb5b425c0) - -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5b64348) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5b64384) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5b6e480) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5b643c0) 0 empty -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5b6499c) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb5ba9380 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2486,44 +1210,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5bb2b40) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb5ba9380) 0 - primary-for std::basic_iostream > (0xb5bb2b40) - subvttidx=4u - std::basic_ios > (0xb5ba93c0) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb5b649d8) 12 - primary-for std::basic_ios > (0xb5ba93c0) - std::basic_ostream > (0xb5ba9400) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb5ba93c0) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5b64c6c) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb5ba9700 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2561,110 +1249,21 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5bc0be0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb5ba9700) 0 - primary-for std::basic_iostream > (0xb5bc0be0) - subvttidx=4u - std::basic_ios > (0xb5ba9740) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb5b64ca8) 12 - primary-for std::basic_ios > (0xb5ba9740) - std::basic_ostream > (0xb5ba9780) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb5ba9740) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb59cb474) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb59cb3fc) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb59cb384) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb59cb2d0) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb59cb834) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb59cbf00) 0 -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb58ea4b0) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb58f5370) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb58e4a00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb58f5370) - QFutureInterfaceBase (0xb58ea690) 0 - primary-for QFutureInterface (0xb58e4a00) - QRunnable (0xb58ea6cc) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb58e4a80) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb58f5780) 0 - primary-for QtConcurrent::RunFunctionTask (0xb58e4a80) - QFutureInterface (0xb58e4ac0) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb58f5780) - QFutureInterfaceBase (0xb58ea870) 0 - primary-for QFutureInterface (0xb58e4ac0) - QRunnable (0xb58ea8ac) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + Class QLibraryInfo size=1 align=1 @@ -2715,50 +1314,22 @@ QFile (0xb5847e00) 0 QObject (0xb584abf4) 0 primary-for QIODevice (0xb5847e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5880564) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb588f12c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb58a17bc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb58a1ac8) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb58b2834) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb58b27bc) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb58b2924) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56d1e88) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56d1f78) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2833,10 +1404,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb5711258) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5723348) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2926,10 +1493,6 @@ Class QDirIterator QDirIterator (0xb57454ec) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5745ce4) 0 Vtable for QFileSystemWatcher QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries @@ -3067,25 +1630,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb57a6ca8) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb57a6d20) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb5787a8c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb57b4528) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57b4690) 0 Class QResource size=4 align=4 @@ -3097,275 +1648,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb55b9f78) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55da3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55da5a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55da780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55da960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55dab40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55dad20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55daf00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ed0f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ed2d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ed4b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ed690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ed870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55eda50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55edc30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55ede10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55f5000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55f51e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55f53c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55f55a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55f5780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55f5960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55f5b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55f5d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55f5f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fd0f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fd2d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fd4b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fd690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fd870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fda50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fdc30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55fde10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5607000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56071e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56073c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56075a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5607780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5607960) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5607b40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5607d20) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5607f00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560c0f0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560c2d0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560c4b0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560c690) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560c870) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560ca50) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560cc30) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb560ce10) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5615000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56151e0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56153c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56155a0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5615780) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3392,45 +1727,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb5615960) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb56503fc) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5650384) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb56504ec) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb5650474) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb5684870) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5684e88) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5698078) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5698258) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3508,15 +1815,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb54df2d0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54ec21c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5503ca8) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -3543,10 +1842,6 @@ QEventLoop (0xb54dbac0) 0 QObject (0xb5515b04) 0 primary-for QEventLoop (0xb54dbac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb552912c) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -3591,20 +1886,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb554c384) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb555f780) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb555f870) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb555ffb4) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -3774,10 +2061,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb55b712c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb55b78ac) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3889,20 +2172,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb53f44ec) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53f499c) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb53f4a8c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53f4ec4) 0 empty Class QMetaProperty size=20 align=4 @@ -3914,10 +2189,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb542f2d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb542f618) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -4129,10 +2400,6 @@ QLibrary (0xb54767c0) 0 QObject (0xb548cf78) 0 primary-for QLibrary (0xb54767c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb549eec4) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4169,20 +2436,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb52d3474) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb52d3b04) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb52d37f8) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb52eb000) 0 Class QWriteLocker size=4 align=4 @@ -4209,10 +2468,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb53285dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53312d0) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -4229,70 +2484,42 @@ Class QDate base size=4 base align=4 QDate (0xb535a2d0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5366c6c) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb5366d5c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb537d2d0) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb537d3c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5384ac8) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb5384ca8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb539bb7c) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb53a9ca8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5199c30) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb51a8c6c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51be03c) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb51d41a4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51d4bb8) 0 empty Class QLinkedListData size=20 align=4 @@ -4304,40 +2531,24 @@ Class QSize base size=8 base align=4 QSize (0xb5255b04) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5277bf4) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb5293780) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb509d8ac) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb50bd5dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50d64b0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb511d0b4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51355dc) 0 empty Class QSharedData size=4 align=4 @@ -4385,20 +2596,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb4fced98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fe830c) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4fe8474) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4fe83fc) 0 Class QXmlStreamAttributes size=4 align=4 @@ -4411,30 +2610,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb4fe84ec) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fe8f00) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb500c03c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb500cbf4) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb500cd20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb501cca8) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -4573,15 +2760,7 @@ Class QXmlAttributes::Attribute base size=16 base align=4 QXmlAttributes::Attribute (0xb4eac2d0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4eac5dc) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4eac564) 0 Vtable for QXmlAttributes QXmlAttributes::_ZTV14QXmlAttributes: 4u entries @@ -4911,43 +3090,11 @@ QXmlDefaultHandler (0xb4ef87e8) 0 QXmlDeclHandler (0xb4eeebf4) 20 nearly-empty vptr=((& QXmlDefaultHandler::_ZTV18QXmlDefaultHandler) + 268u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4f658ac) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4f78e4c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4e2e438) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb4e2e4b0) 0 -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb4e561e0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4e5630c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4e56564) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4e565dc) 0 diff --git a/tests/auto/bic/data/QtXmlPatterns.4.4.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtXmlPatterns.4.4.0.linux-gcc-ia32.txt index ffc05cd85..b3f65d144 100644 --- a/tests/auto/bic/data/QtXmlPatterns.4.4.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXmlPatterns.4.4.0.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb77a33c0) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb77a33fc) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7bfab40) 0 empty - QUintForSize<4> (0xb77a3474) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb77a35a0) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb77a35dc) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7bfad00) 0 empty - QIntForSize<4> (0xb77a3654) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb77b7a50) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b7c30) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b7d20) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b7e10) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77b7f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cd000) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cd0f0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cd1e0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cd2d0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cd3c0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cd4b0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cd5a0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cd690) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cd780) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cd870) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb77cd960) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb77eb960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7815618) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6a7a1e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb68c72d0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68c7564) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68c7e88) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb690f7bc) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb691b0f0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb691ba14) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb692e348) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb692ec6c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69435a0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6943ec4) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69577f8) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb696312c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6963a50) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb697c384) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb697ce10) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb67e003c) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb66fdb00) 0 QString (0xb6745474) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6745780) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QListData base size=4 base align=4 QListData (0xb67aae4c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb66630f0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -386,15 +228,7 @@ Class QTextCodec QTextCodec (0xb6656438) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6675744) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb66756cc) 0 Class QTextEncoder size=32 align=4 @@ -417,25 +251,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb66a2000) 0 QGenericArgument (0xb6699960) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb6699e4c) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb6699c6c) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb66b1fb4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb66b1f3c) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -527,10 +349,6 @@ QIODevice (0xb64f5e80) 0 QObject (0xb64f1fb4) 0 primary-for QIODevice (0xb64f5e80) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6527294) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -550,25 +368,13 @@ Class QRegExp base size=4 base align=4 QRegExp (0xb65681e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb65889d8) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb6588ac8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb659603c) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6588fb4) 0 Class QStringList size=4 align=4 @@ -576,15 +382,7 @@ Class QStringList QStringList (0xb6566f80) 0 QList (0xb6596078) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb65b1dd4) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb63c1000) 0 Vtable for QFactoryInterface QFactoryInterface::_ZTV17QFactoryInterface: 5u entries @@ -664,10 +462,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb63f021c) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb63f0e10) 0 Class QMutexLocker size=4 align=4 @@ -747,35 +541,11 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb62c6744) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb62c67f8) 0 empty -Class - size=8 align=4 - base size=8 base align=4 - (0xb6356780) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6356870) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb63567f8) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb63568e8) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6356960) 0 Class _IO_marker size=12 align=4 @@ -787,10 +557,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb63569d8) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6356a50) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -805,10 +571,6 @@ Class QTextStream QTextStream (0xb6356a8c) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb63a621c) 0 Class QTextStreamManipulator size=24 align=4 @@ -845,40 +607,16 @@ QTextOStream (0xb61cc0c0) 0 QTextStream (0xb61c599c) 0 primary-for QTextOStream (0xb61cc0c0) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb61d53fc) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb61d5474) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb61d5384) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb61d54ec) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb61d5564) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb61d55dc) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb61d5654) 0 Class timespec size=8 align=4 @@ -890,80 +628,24 @@ Class timeval base size=8 base align=4 timeval (0xb61d56cc) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb61d5744) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb61d57bc) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb61d57f8) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb61d5924) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb61d58ac) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb61d5870) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb61d599c) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb61d5a8c) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb61d5a14) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb61d5b04) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb61d5bf4) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb61d5b7c) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb61d5ca8) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb61d5d20) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb61d5d98) 0 Class random_data size=28 align=4 @@ -995,20 +677,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb60f7b40) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb610f780) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb610f708) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb610fac8) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -1028,10 +698,6 @@ Class QtConcurrent::ResultStoreBase QtConcurrent::ResultStoreBase (0xb610fbf4) 0 vptr=((& QtConcurrent::ResultStoreBase::_ZTVN12QtConcurrent15ResultStoreBaseE) + 8u) -Class QMap::iterator - size=4 align=4 - base size=4 base align=4 -QMap::iterator (0xb6138294) 0 Vtable for QFutureInterfaceBase QFutureInterfaceBase::_ZTV20QFutureInterfaceBase: 4u entries @@ -1046,25 +712,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb613830c) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb6154780) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb6138e4c) 0 - primary-for QFutureInterface (0xb6154780) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb61895dc) 0 Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1093,34 +742,7 @@ QFutureWatcherBase (0xb61ad6c0) 0 QObject (0xb61abc6c) 0 primary-for QFutureWatcherBase (0xb61ad6c0) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb61addc0) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb61ade00) 0 - primary-for QFutureWatcher (0xb61addc0) - QObject (0xb5fc1780) 0 - primary-for QFutureWatcherBase (0xb61ade00) Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1219,60 +841,14 @@ QtConcurrent::ThreadEngineBase (0xb60082c0) 0 QRunnable (0xb6009780) 0 primary-for QtConcurrent::ThreadEngineBase (0xb60082c0) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb6009f78) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb6008c40) 0 - QtConcurrent::ThreadEngineStarterBase (0xb60098ac) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 -4u -32 0u -36 0u -40 0u -44 0u -48 0u -52 -4u -56 0u -60 (int (*)(...))-0x000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb6008e00) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb6008e40) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb601f474) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb6008e40) Class std::input_iterator_tag size=1 align=1 @@ -1315,225 +891,49 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb601fec4) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb601ff3c) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb603e0f0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb603e1e0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb603e258) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb603e2d0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb603e348) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb603e3c0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb603e438) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb603e4b0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb603e528) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb603e5a0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb603e618) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb603e690) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb603e708) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb603e780) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb603e870) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb603e8e8) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb603e960) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb603ece4) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb603ed5c) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb603ee4c) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb603eec4) 0 empty -Class std::__is_byte - size=1 align=1 - base size=0 base align=1 -std::__is_byte (0xb603ef3c) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6051168) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb60511a4) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb60511e0) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb605121c) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6051258) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb6051294) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb605130c) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6051348) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6051384) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60513c0) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb60513fc) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb6051438) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb6051e10) 0 empty -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb60b83fc) 0 empty -Class std::__copy_move - size=1 align=1 - base size=0 base align=1 -std::__copy_move (0xb60b8834) 0 empty -Class std::__copy_move_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_move_backward (0xb60b8a50) 0 empty -Class std::__equal - size=1 align=1 - base size=0 base align=1 -std::__equal (0xb60b8e4c) 0 empty -Class std::__lc_rai - size=1 align=1 - base size=0 base align=1 -std::__lc_rai (0xb60b8fb4) 0 empty -Class std::__lexicographical_compare - size=1 align=1 - base size=0 base align=1 -std::__lexicographical_compare (0xb5f0412c) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5f04834) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5f2c258) 0 empty Class lconv size=56 align=4 @@ -1550,10 +950,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb5f2ee10) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb5f2ee88) 0 Class tm size=44 align=4 @@ -1570,15 +966,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb5f59168) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb5f592d0) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb5f59258) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1590,32 +978,10 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb5f59348) 0 -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb5fb3870) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5fb3b40) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5dc37c0) 0 empty - __gnu_cxx::new_allocator (0xb5fb3b7c) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5fb3bb8) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5dc3880) 0 empty - __gnu_cxx::new_allocator (0xb5fb3bf4) 0 empty Vtable for __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE: 5u entries @@ -1631,82 +997,19 @@ Class __cxxabiv1::__forced_unwind __cxxabiv1::__forced_unwind (0xb5fb3e10) 0 nearly-empty vptr=((& __cxxabiv1::__forced_unwind::_ZTVN10__cxxabiv115__forced_unwindE) + 8u) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5e66708) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5e66744) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5e69b40) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5e66780) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5ce53fc) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5d03100) 0 - std::allocator (0xb5d03140) 0 empty - __gnu_cxx::new_allocator (0xb5ce5474) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5ce5384) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5ce54b0) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5d032c0) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5ce54ec) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5ce55a0) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5d034c0) 0 - std::allocator (0xb5d03500) 0 empty - __gnu_cxx::new_allocator (0xb5ce5618) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5ce5528) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5ce5654) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5ce5708) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5d03680) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5ce5690) 0 Class std::locale size=4 align=4 @@ -1736,97 +1039,16 @@ Class std::locale::_Impl base size=20 base align=4 std::locale::_Impl (0xb5da28ac) 0 -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5db0640) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb5db5258) 0 - primary-for std::collate (0xb5db0640) -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5db0740) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb5db5348) 0 - primary-for std::collate (0xb5db0740) -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5db57bc) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5db57f8) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5bd26c0) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5db5834) 0 empty -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5bd2800) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb5bd2840) 0 - primary-for std::collate_byname (0xb5bd2800) - std::locale::facet (0xb5db58ac) 0 - primary-for std::collate (0xb5bd2840) - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb5bd28c0) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb5bd2900) 0 - primary-for std::collate_byname (0xb5bd28c0) - std::locale::facet (0xb5db599c) 0 - primary-for std::collate (0xb5bd2900) + + + + + Vtable for std::ios_base::failure std::ios_base::failure::_ZTVNSt8ios_base7failureE: 5u entries @@ -1872,583 +1094,85 @@ Class std::ios_base std::ios_base (0xb5be7744) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5c19dd4) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5c19e4c) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb5c19f3c) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb5c9dfa0) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb5c9c258) 0 - primary-for std::ctype (0xb5c9dfa0) - std::ctype_base (0xb5c9c294) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb5cab870) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb5abae10) 0 - primary-for std::__ctype_abstract_base (0xb5cab870) - std::ctype_base (0xb5abae4c) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb5caf800) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb5ac66e0) 0 - primary-for std::ctype (0xb5caf800) - std::locale::facet (0xb5abaf3c) 0 - primary-for std::__ctype_abstract_base (0xb5ac66e0) - std::ctype_base (0xb5abaf78) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb5caf9c0) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb5acde60) 0 - primary-for std::ctype_byname (0xb5caf9c0) - std::locale::facet (0xb5ace294) 0 - primary-for std::ctype (0xb5acde60) - std::ctype_base (0xb5ace2d0) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname::~ctype_byname -12 std::ctype_byname::~ctype_byname -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb5cafa40) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb5cafa80) 0 - primary-for std::ctype_byname (0xb5cafa40) - std::__ctype_abstract_base (0xb5ad24b0) 0 - primary-for std::ctype (0xb5cafa80) - std::locale::facet (0xb5ace438) 0 - primary-for std::__ctype_abstract_base (0xb5ad24b0) - std::ctype_base (0xb5ace474) 0 empty + + + + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb5acee88) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5ae0480) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb5adc654) 0 - primary-for std::numpunct (0xb5ae0480) -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5ae0540) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb5adc744) 0 - primary-for std::numpunct (0xb5ae0540) -Class __gnu_cxx::__conditional_type - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type (0xb5b17d98) 0 empty -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5b64a80) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb5b64ac0) 0 - primary-for std::numpunct_byname (0xb5b64a80) - std::locale::facet (0xb5b6b3c0) 0 - primary-for std::numpunct (0xb5b64ac0) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5b64b00) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5b6b4b0) 0 - primary-for std::num_get > > (0xb5b64b00) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5b64b80) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb5b6b5a0) 0 - primary-for std::num_put > > (0xb5b64b80) -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb5b64c00) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb5b64c40) 0 - primary-for std::numpunct_byname (0xb5b64c00) - std::locale::facet (0xb5b6b690) 0 - primary-for std::numpunct (0xb5b64c40) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb5b64cc0) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5b6b780) 0 - primary-for std::num_get > > (0xb5b64cc0) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb5b64d40) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb5b6b870) 0 - primary-for std::num_put > > (0xb5b64d40) -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb5bb8d80) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb5b6b654) 0 - primary-for std::basic_ios > (0xb5bb8d80) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb5bb8dc0) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb5b6b924) 0 - primary-for std::basic_ios > (0xb5bb8dc0) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5a02a40) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb5a02a80) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb59d7ca8) 4 - primary-for std::basic_ios > (0xb5a02a80) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb59d7e88) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -4u -24 (int (*)(...))-0x000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5a02bc0) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5a02c00) 4 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb59d7ec4) 4 - primary-for std::basic_ios > (0xb5a02c00) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb59d7f78) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5a42480) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb5a424c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb5a31528) 8 - primary-for std::basic_ios > (0xb5a424c0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 -8u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5a42580) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5a425c0) 8 virtual - vptridx=4u vbaseoffset=-0x00000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5a318ac) 8 - primary-for std::basic_ios > (0xb5a425c0) - -Class __gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__conditional_type, __gnu_cxx::__numeric_traits_floating > (0xb5a31fb4) 0 empty -Class __gnu_cxx::__numeric_traits_integer - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__numeric_traits_integer (0xb5a31618) 0 empty -Class __gnu_cxx::__numeric_traits - size=1 align=1 - base size=1 base align=1 -__gnu_cxx::__numeric_traits (0xb5a6e480) 0 empty - __gnu_cxx::__numeric_traits_integer (0xb5a31960) 0 empty -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5a784ec) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb5aaa380 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -2486,44 +1210,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5ab4b40) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb5aaa380) 0 - primary-for std::basic_iostream > (0xb5ab4b40) - subvttidx=4u - std::basic_ios > (0xb5aaa3c0) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb5a78528) 12 - primary-for std::basic_ios > (0xb5aaa3c0) - std::basic_ostream > (0xb5aaa400) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb5aaa3c0) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5a787bc) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 -12u -44 (int (*)(...))-0x00000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb5aaa700 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -2561,110 +1249,21 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb58bdbe0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb5aaa700) 0 - primary-for std::basic_iostream > (0xb58bdbe0) - subvttidx=4u - std::basic_ios > (0xb5aaa740) 12 virtual - vptridx=20u vbaseoffset=-0x00000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb5a787f8) 12 - primary-for std::basic_ios > (0xb5aaa740) - std::basic_ostream > (0xb5aaa780) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb5aaa740) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb58d5000) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5a788ac) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb5a785dc) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb5a78f3c) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb58d53c0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb58d5c30) 0 -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb57f10b4) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb57f6370) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb57e5a00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb57f6370) - QFutureInterfaceBase (0xb57f1294) 0 - primary-for QFutureInterface (0xb57e5a00) - QRunnable (0xb57f12d0) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb57e5a80) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb57f6780) 0 - primary-for QtConcurrent::RunFunctionTask (0xb57e5a80) - QFutureInterface (0xb57e5ac0) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb57f6780) - QFutureInterfaceBase (0xb57f1474) 0 - primary-for QFutureInterface (0xb57e5ac0) - QRunnable (0xb57f14b0) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + Class QLibraryInfo size=1 align=1 @@ -2715,50 +1314,22 @@ QFile (0xb5747e00) 0 QObject (0xb57567f8) 0 primary-for QIODevice (0xb5747e40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5784168) 0 Class QFileInfo size=4 align=4 base size=4 base align=4 QFileInfo (0xb5784d20) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb57a63c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb57a66cc) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb55b6438) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb55b63c0) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb55b6528) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55d8a8c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb55d8b7c) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -2833,10 +1404,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb5609e4c) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5619f3c) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -2926,10 +1493,6 @@ Class QDirIterator QDirIterator (0xb56480f0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56488e8) 0 Vtable for QFileSystemWatcher QFileSystemWatcher::_ZTV18QFileSystemWatcher: 14u entries @@ -3067,25 +1630,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb56ae8ac) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb56ae924) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb568d690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb56b412c) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb56b4294) 0 Class QResource size=4 align=4 @@ -3097,275 +1648,59 @@ Class QMetaType base size=0 base align=1 QMetaType (0xb54c2b7c) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54c2fb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54e71a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54e7384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54e7564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54e7744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54e7924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54e7b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54e7ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54e7ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f10b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f1294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f1474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f1654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f1834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f1a14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f1bf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f1dd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f1fb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f61a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f6384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f6564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f6744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f6924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f6b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f6ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54f6ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ff0b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ff294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ff474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ff654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ff834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ffa14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ffbf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54ffdd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb54fffb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55091a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5509384) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5509564) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5509744) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5509924) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5509b04) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5509ce4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5509ec4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550d0b4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550d294) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550d474) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550d654) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550d834) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550da14) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550dbf4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550ddd4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb550dfb4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55161a4) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5516384) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3392,45 +1727,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb5516564) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb5552000) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb5547f78) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb55520f0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb5552078) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb5585474) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5585a8c) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5585c6c) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5585e4c) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3508,15 +1815,7 @@ Class QUrl base size=4 base align=4 QUrl (0xb53d6f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53e0e10) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb540a8ac) 0 empty Vtable for QEventLoop QEventLoop::_ZTV10QEventLoop: 14u entries @@ -3543,10 +1842,6 @@ QEventLoop (0xb53dbac0) 0 QObject (0xb5419708) 0 primary-for QEventLoop (0xb53dbac0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5419d20) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -3591,20 +1886,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb5439fb4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5460384) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb5460474) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5460bb8) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -3774,10 +2061,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb54aed20) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52b74b0) 0 empty Vtable for QEvent QEvent::_ZTV6QEvent: 4u entries @@ -3889,20 +2172,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb53200f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53205a0) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb5320690) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5320ac8) 0 empty Class QMetaProperty size=20 align=4 @@ -3914,10 +2189,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb5320ec4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb533621c) 0 empty Vtable for QMimeData QMimeData::_ZTV9QMimeData: 17u entries @@ -4129,10 +2400,6 @@ QLibrary (0xb53767c0) 0 QObject (0xb5392b7c) 0 primary-for QLibrary (0xb53767c0) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53a2ac8) 0 Vtable for QPluginLoader QPluginLoader::_ZTV13QPluginLoader: 14u entries @@ -4169,20 +2436,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb51d8078) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb51d8708) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb51d83fc) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb51e5bf4) 0 Class QWriteLocker size=4 align=4 @@ -4209,10 +2468,6 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb522d1e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb522dec4) 0 empty Class QByteArrayMatcher size=1032 align=4 @@ -4229,70 +2484,42 @@ Class QDate base size=4 base align=4 QDate (0xb5239ec4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb526b870) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb526b960) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5273f3c) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb5273384) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52866cc) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb52868ac) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb529d708) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb508b8ac) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb509a7bc) 0 empty Class QLine size=16 align=4 base size=16 base align=4 QLine (0xb50ad870) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50adc30) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb50ced98) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50db7bc) 0 empty Class QLinkedListData size=20 align=4 @@ -4304,40 +2531,24 @@ Class QSize base size=8 base align=4 QSize (0xb5166708) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51797bc) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb4f95384) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f9e3fc) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb4fbe1e0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fd90b4) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb5014ca8) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50371a4) 0 empty Class QSharedData size=4 align=4 @@ -4385,20 +2596,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb4ed599c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4edef3c) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4eef078) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4eef000) 0 Class QXmlStreamAttributes size=4 align=4 @@ -4411,30 +2610,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb4eef0f0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4eefb04) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb4eefc30) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f0f7f8) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb4f0f924) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f218ac) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -4616,20 +2803,12 @@ QNetworkAccessManager (0xb4f777c0) 0 QObject (0xb4da3564) 0 primary-for QNetworkAccessManager (0xb4f777c0) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4db5564) 0 Class QNetworkCookie size=4 align=4 base size=4 base align=4 QNetworkCookie (0xb4da3f3c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4db5780) 0 empty Vtable for QNetworkCookieJar QNetworkCookieJar::_ZTV17QNetworkCookieJar: 16u entries @@ -4658,30 +2837,14 @@ QNetworkCookieJar (0xb4f77c00) 0 QObject (0xb4db5870) 0 primary-for QNetworkCookieJar (0xb4f77c00) -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4dcc3c0) 0 empty -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4dcc564) 0 empty -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4dccbf4) 0 Class QNetworkRequest size=4 align=4 base size=4 base align=4 QNetworkRequest (0xb4dcc708) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4dccdd4) 0 empty Vtable for QNetworkReply QNetworkReply::_ZTV13QNetworkReply: 33u entries @@ -4797,20 +2960,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0xb4e1da8c) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4e2d618) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0xb4e1dd5c) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e2d744) 0 Class QNetworkProxy size=4 align=4 @@ -5006,10 +3161,6 @@ QUdpSocket (0xb4e4acc0) 0 QObject (0xb4e84bf4) 0 primary-for QIODevice (0xb4e4ad40) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4c93ac8) 0 Class QSslCertificate size=4 align=4 @@ -5073,10 +3224,6 @@ QSslSocket (0xb4c9c2c0) 0 QObject (0xb4cc4000) 0 primary-for QIODevice (0xb4c9c380) -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4cdc3fc) 0 empty Class QSslConfiguration size=4 align=4 @@ -5088,25 +3235,13 @@ Class QSslKey base size=4 base align=4 QSslKey (0xb4cdcc30) 0 -Class QSourceLocation:: - size=8 align=4 - base size=8 base align=4 -QSourceLocation:: (0xb4ceb654) 0 Class QSourceLocation size=20 align=4 base size=20 base align=4 QSourceLocation (0xb4ceb21c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ceb690) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4ceb780) 0 empty Vtable for QAbstractMessageHandler QAbstractMessageHandler::_ZTV23QAbstractMessageHandler: 15u entries @@ -5165,20 +3300,8 @@ Class QXmlName base size=8 base align=4 QXmlName (0xb4d0d0b4) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d0fec4) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4d0ffb4) 0 empty -Class QPatternist::NodeIndexStorage:: - size=8 align=4 - base size=8 base align=4 -QPatternist::NodeIndexStorage:: (0xb4d1b1a4) 0 Class QPatternist::NodeIndexStorage size=20 align=4 @@ -5224,30 +3347,14 @@ QAbstractXmlNodeModel (0xb4d0c900) 0 vptr=((& QAbstractXmlNodeModel::_ZTV21QAbstractXmlNodeModel) + 8u) QSharedData (0xb4d42b04) 4 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d4a8ac) 0 empty -Class QXmlItem:: - size=20 align=4 - base size=20 base align=4 -QXmlItem:: (0xb4d4aec4) 0 Class QXmlItem size=20 align=4 base size=20 base align=4 QXmlItem (0xb4d4a99c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d4af78) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4d5b03c) 0 empty Vtable for QAbstractXmlReceiver QAbstractXmlReceiver::_ZTV20QAbstractXmlReceiver: 18u entries @@ -5377,10 +3484,6 @@ QXmlFormatter (0xb4d710c0) 0 QAbstractXmlReceiver (0xb4d7603c) 0 primary-for QXmlSerializer (0xb4d71100) -Class QExplicitlySharedDataPointer - size=4 align=4 - base size=4 base align=4 -QExplicitlySharedDataPointer (0xb4d76654) 0 Class QXmlNamePool size=4 align=4 @@ -5400,68 +3503,16 @@ Class QXmlResultItems QXmlResultItems (0xb4d76690) 0 vptr=((& QXmlResultItems::_ZTV15QXmlResultItems) + 8u) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4bd603c) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4be85dc) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4aa4c30) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb4aa4ca8) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4acb7bc) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4acb744) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4acbfb4) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4acbf3c) 0 -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb4aff9d8) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4affb04) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4b14e4c) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4b390b4) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4b3912c) 0 diff --git a/tests/auto/bic/data/QtXmlPatterns.4.4.1.linux-gcc-ia32.txt b/tests/auto/bic/data/QtXmlPatterns.4.4.1.linux-gcc-ia32.txt index baf261b63..e4e14be8a 100644 --- a/tests/auto/bic/data/QtXmlPatterns.4.4.1.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtXmlPatterns.4.4.1.linux-gcc-ia32.txt @@ -1,34 +1,8 @@ -Class QUintForSize<4> - size=1 align=1 - base size=0 base align=1 -QUintForSize<4> (0xb7f56f40) 0 empty -Class QUintForSize<8> - size=1 align=1 - base size=0 base align=1 -QUintForSize<8> (0xb7f56f80) 0 empty -Class QUintForType - size=1 align=1 - base size=1 base align=1 -QUintForType (0xb7a60040) 0 empty - QUintForSize<4> (0xb7a60080) 0 empty -Class QIntForSize<4> - size=1 align=1 - base size=0 base align=1 -QIntForSize<4> (0xb7a601c0) 0 empty -Class QIntForSize<8> - size=1 align=1 - base size=0 base align=1 -QIntForSize<8> (0xb7a60200) 0 empty -Class QIntForType - size=1 align=1 - base size=1 base align=1 -QIntForType (0xb7a602c0) 0 empty - QIntForSize<4> (0xb7a60300) 0 empty Class QSysInfo size=1 align=1 @@ -50,80 +24,20 @@ Class qIsNull(float)::U base size=4 base align=4 qIsNull(float)::U (0xb7a60b00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60bc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60c00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60c40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60c80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60cc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60d00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60d40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60d80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60dc0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60e00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60e40) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60e80) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60ec0) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60f00) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb7a60f40) 0 empty Class QFlag size=4 align=4 @@ -140,10 +54,6 @@ Class QChar base size=2 base align=2 QChar (0xb7a96400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb6ad4840) 0 empty Class QBasicAtomicInt size=4 align=4 @@ -176,75 +86,19 @@ Class QByteRef base size=8 base align=4 QByteRef (0xb6b812c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb69bd240) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bd340) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb69bdc00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a104c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a10d80) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a21640) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a21f00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a337c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a3f080) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a3f940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a53200) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a53ac0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a6b380) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6a6bc40) 0 Class QInternal size=1 align=1 @@ -266,10 +120,6 @@ Class QString base size=4 base align=4 QString (0xb6a7f680) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb68cc300) 0 Class QLatin1String size=4 align=4 @@ -287,10 +137,6 @@ Class QConstString QConstString (0xb681c1c0) 0 QString (0xb681c200) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb681c340) 0 empty Class QStringRef size=12 align=4 @@ -358,10 +204,6 @@ Class QMutex base size=4 base align=4 QMutex (0xb6867200) 0 -Class QMutexLocker:: - size=4 align=4 - base size=4 base align=4 -QMutexLocker:: (0xb6867bc0) 0 Class QMutexLocker size=4 align=4 @@ -447,25 +289,13 @@ Class QGenericReturnArgument QGenericReturnArgument (0xb6741880) 0 QGenericArgument (0xb67418c0) 0 -Class QMetaObject:: - size=16 align=4 - base size=16 base align=4 -QMetaObject:: (0xb6741c80) 0 Class QMetaObject size=16 align=4 base size=16 base align=4 QMetaObject (0xb6741ac0) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb65e3bc0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb65e3b40) 0 Vtable for QObjectData QObjectData::_ZTV11QObjectData: 4u entries @@ -557,10 +387,6 @@ QIODevice (0xb6628400) 0 QObject (0xb6628440) 0 primary-for QIODevice (0xb6628400) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb6647240) 0 Vtable for QDataStream QDataStream::_ZTV11QDataStream: 4u entries @@ -590,15 +416,7 @@ Class QHashDummyValue base size=0 base align=1 QHashDummyValue (0xb64ab400) 0 empty -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb64ab440) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb653a8c0) 0 Class QTextCodec::ConverterState size=28 align=4 @@ -623,15 +441,7 @@ Class QTextCodec QTextCodec (0xb64abb40) 0 nearly-empty vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u) -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb6547800) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb6547780) 0 Class QTextEncoder size=32 align=4 @@ -643,30 +453,10 @@ Class QTextDecoder base size=32 base align=4 QTextDecoder (0xb656acc0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6575100) 0 -Class :: - size=4 align=4 - base size=4 base align=4 -:: (0xb6575180) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb6575140) 0 -Class - size=12 align=4 - base size=12 base align=4 - (0xb65751c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb6575200) 0 Class _IO_marker size=12 align=4 @@ -678,10 +468,6 @@ Class _IO_FILE base size=148 base align=4 _IO_FILE (0xb6575280) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb65752c0) 0 Vtable for QTextStream QTextStream::_ZTV11QTextStream: 4u entries @@ -696,10 +482,6 @@ Class QTextStream QTextStream (0xb6575300) 0 vptr=((& QTextStream::_ZTV11QTextStream) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb63a65c0) 0 Class QTextStreamManipulator size=24 align=4 @@ -736,40 +518,16 @@ QTextOStream (0xb63cb280) 0 QTextStream (0xb63cb2c0) 0 primary-for QTextOStream (0xb63cb280) -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb63cb900) 0 -Class wait:: - size=4 align=4 - base size=4 base align=4 -wait:: (0xb63cb940) 0 Class wait size=4 align=4 base size=4 base align=4 wait (0xb63cb8c0) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb63cb980) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb63cb9c0) 0 -Class - size=16 align=4 - base size=16 base align=4 - (0xb63cba00) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb63cba40) 0 Class timespec size=8 align=4 @@ -781,80 +539,24 @@ Class timeval base size=8 base align=4 timeval (0xb63cbac0) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb63cbb00) 0 -Class - size=36 align=4 - base size=36 base align=4 - (0xb63cbb40) 0 Class __pthread_internal_slist size=4 align=4 base size=4 base align=4 __pthread_internal_slist (0xb63cbb80) 0 -Class ::__pthread_mutex_s:: - size=4 align=4 - base size=4 base align=4 -::__pthread_mutex_s:: (0xb63cbc40) 0 -Class ::__pthread_mutex_s - size=24 align=4 - base size=24 base align=4 -::__pthread_mutex_s (0xb63cbc00) 0 -Class - size=24 align=4 - base size=24 base align=4 - (0xb63cbbc0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb63cbc80) 0 -Class :: - size=44 align=4 - base size=44 base align=4 -:: (0xb63cbd00) 0 -Class - size=48 align=4 - base size=48 base align=4 - (0xb63cbcc0) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb63cbd40) 0 -Class :: - size=32 align=4 - base size=32 base align=4 -:: (0xb63cbdc0) 0 -Class - size=32 align=4 - base size=32 base align=4 - (0xb63cbd80) 0 -Class - size=8 align=4 - base size=8 base align=4 - (0xb63cbe40) 0 -Class - size=20 align=4 - base size=20 base align=4 - (0xb63cbe80) 0 -Class - size=4 align=4 - base size=4 base align=4 - (0xb63cbec0) 0 Class random_data size=28 align=4 @@ -886,20 +588,8 @@ Class QtConcurrent::ResultItem base size=8 base align=4 QtConcurrent::ResultItem (0xb62d9ac0) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb62f9180) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb62f9100) 0 -Class QMap::const_iterator - size=4 align=4 - base size=4 base align=4 -QMap::const_iterator (0xb62f9540) 0 Class QtConcurrent::ResultIteratorBase size=8 align=4 @@ -932,25 +622,8 @@ Class QFutureInterfaceBase QFutureInterfaceBase (0xb62f9780) 0 vptr=((& QFutureInterfaceBase::_ZTV20QFutureInterfaceBase) + 8u) -Vtable for QFutureInterface -QFutureInterface::_ZTV16QFutureInterfaceIvE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI16QFutureInterfaceIvE) -8 QFutureInterface::~QFutureInterface -12 QFutureInterface::~QFutureInterface -Class QFutureInterface - size=8 align=4 - base size=8 base align=4 -QFutureInterface (0xb62f9e80) 0 - vptr=((& QFutureInterface::_ZTV16QFutureInterfaceIvE) + 8u) - QFutureInterfaceBase (0xb62f9ec0) 0 - primary-for QFutureInterface (0xb62f9e80) -Class QFuture - size=8 align=4 - base size=8 base align=4 -QFuture (0xb63500c0) 0 Vtable for QRunnable QRunnable::_ZTV9QRunnable: 5u entries @@ -1017,64 +690,10 @@ QThreadPool (0xb619b1c0) 0 QObject (0xb619b200) 0 primary-for QThreadPool (0xb619b1c0) -Class QtConcurrent::SelectSpecialization - size=1 align=1 - base size=0 base align=1 -QtConcurrent::SelectSpecialization (0xb619b800) 0 empty -Vtable for QtConcurrent::RunFunctionTaskBase -QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -8 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -12 QtConcurrent::RunFunctionTaskBase::~RunFunctionTaskBase -16 QtConcurrent::RunFunctionTaskBase::run [with T = void] -20 __cxa_pure_virtual -24 (int (*)(...))-0x00000000000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent19RunFunctionTaskBaseIvEE) -32 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvE3runEv -36 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED1Ev -40 QtConcurrent::RunFunctionTaskBase::_ZThn8_N12QtConcurrent19RunFunctionTaskBaseIvED0Ev -Class QtConcurrent::RunFunctionTaskBase - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTaskBase (0xb619b9c0) 0 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 8u) - QFutureInterface (0xb619ba00) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb619b9c0) - QFutureInterfaceBase (0xb619ba40) 0 - primary-for QFutureInterface (0xb619ba00) - QRunnable (0xb619ba80) 8 - vptr=((& QtConcurrent::RunFunctionTaskBase::_ZTVN12QtConcurrent19RunFunctionTaskBaseIvEE) + 32u) - -Vtable for QtConcurrent::RunFunctionTask -QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -8 QtConcurrent::RunFunctionTask::~RunFunctionTask -12 QtConcurrent::RunFunctionTask::~RunFunctionTask -16 QtConcurrent::RunFunctionTask::run -20 __cxa_pure_virtual -24 (int (*)(...))-0x00000000000000008 -28 (int (*)(...))(& _ZTIN12QtConcurrent15RunFunctionTaskIvEE) -32 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvE3runEv -36 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED1Ev -40 QtConcurrent::RunFunctionTask::_ZThn8_N12QtConcurrent15RunFunctionTaskIvED0Ev -Class QtConcurrent::RunFunctionTask - size=16 align=4 - base size=16 base align=4 -QtConcurrent::RunFunctionTask (0xb619bb40) 0 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 8u) - QtConcurrent::RunFunctionTaskBase (0xb619bb80) 0 - primary-for QtConcurrent::RunFunctionTask (0xb619bb40) - QFutureInterface (0xb619bbc0) 0 - primary-for QtConcurrent::RunFunctionTaskBase (0xb619bb80) - QFutureInterfaceBase (0xb619bc00) 0 - primary-for QFutureInterface (0xb619bbc0) - QRunnable (0xb619bc40) 8 - vptr=((& QtConcurrent::RunFunctionTask::_ZTVN12QtConcurrent15RunFunctionTaskIvEE) + 32u) + Vtable for QFutureWatcherBase QFutureWatcherBase::_ZTV18QFutureWatcherBase: 16u entries @@ -1103,39 +722,8 @@ QFutureWatcherBase (0xb6270ac0) 0 QObject (0xb6270b00) 0 primary-for QFutureWatcherBase (0xb6270ac0) -Vtable for QFutureWatcher -QFutureWatcher::_ZTV14QFutureWatcherIvE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI14QFutureWatcherIvE) -8 QFutureWatcherBase::metaObject -12 QFutureWatcherBase::qt_metacast -16 QFutureWatcherBase::qt_metacall -20 QFutureWatcher::~QFutureWatcher -24 QFutureWatcher::~QFutureWatcher -28 QFutureWatcherBase::event -32 QObject::eventFilter -36 QObject::timerEvent -40 QObject::childEvent -44 QObject::customEvent -48 QFutureWatcherBase::connectNotify -52 QFutureWatcherBase::disconnectNotify -56 QFutureWatcher::futureInterface -60 QFutureWatcher::futureInterface -Class QFutureWatcher - size=16 align=4 - base size=16 base align=4 -QFutureWatcher (0xb60b7000) 0 - vptr=((& QFutureWatcher::_ZTV14QFutureWatcherIvE) + 8u) - QFutureWatcherBase (0xb60b7040) 0 - primary-for QFutureWatcher (0xb60b7000) - QObject (0xb60b7080) 0 - primary-for QFutureWatcherBase (0xb60b7040) - -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb60b7900) 0 + Class QWaitCondition size=4 align=4 @@ -1169,60 +757,14 @@ QtConcurrent::ThreadEngineBase (0xb612ea40) 0 QRunnable (0xb612ea80) 0 primary-for QtConcurrent::ThreadEngineBase (0xb612ea40) -Class QtConcurrent::ThreadEngineStarterBase - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarterBase (0xb612ed00) 0 -Class QtConcurrent::ThreadEngineStarter - size=4 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngineStarter (0xb612ed40) 0 - QtConcurrent::ThreadEngineStarterBase (0xb612ed80) 0 -Vtable for QtConcurrent::ThreadEngine -QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE: 26u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -12 QtConcurrent::ThreadEngine::result [with T = void] -16 QtConcurrent::ThreadEngine::asynchronousFinish [with T = void] -20 QtConcurrent::ThreadEngine::~ThreadEngine -24 QtConcurrent::ThreadEngine::~ThreadEngine -28 4294967292u -32 0u -36 0u -40 0u -44 0u -48 0u -52 4294967292u -56 0u -60 (int (*)(...))-0x00000000000000004 -64 (int (*)(...))(& _ZTIN12QtConcurrent12ThreadEngineIvEE) -68 QtConcurrent::ThreadEngineBase::run -72 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED1Ev -76 QtConcurrent::ThreadEngine::_ZTv0_n16_N12QtConcurrent12ThreadEngineIvED0Ev -80 QtConcurrent::ThreadEngineBase::start -84 QtConcurrent::ThreadEngineBase::finish -88 QtConcurrent::ThreadEngineBase::threadFunction -92 QtConcurrent::ThreadEngineBase::shouldStartThread -96 QtConcurrent::ThreadEngineBase::shouldThrottleThread -100 QtConcurrent::ThreadEngine::_ZTv0_n40_N12QtConcurrent12ThreadEngineIvE18asynchronousFinishEv VTT for QtConcurrent::ThreadEngine QtConcurrent::ThreadEngine::_ZTTN12QtConcurrent12ThreadEngineIvEE: 2u entries 0 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) 4 ((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) -Class QtConcurrent::ThreadEngine - size=36 align=4 - base size=4 base align=4 -QtConcurrent::ThreadEngine (0xb614d080) 0 nearly-empty - vptridx=0u vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 12u) - QtConcurrent::ThreadEngineBase (0xb614d0c0) 4 virtual - vptridx=4u vbaseoffset=-0x0000000000000000c vptr=((& QtConcurrent::ThreadEngine::_ZTVN12QtConcurrent12ThreadEngineIvEE) + 68u) - QRunnable (0xb614d100) 4 - primary-for QtConcurrent::ThreadEngineBase (0xb614d0c0) Class std::input_iterator_tag size=1 align=1 @@ -1265,170 +807,38 @@ Class std::__false_type base size=0 base align=1 std::__false_type (0xb614d600) 0 empty -Class std::__truth_type - size=1 align=1 - base size=0 base align=1 -std::__truth_type (0xb614d680) 0 empty -Class std::__is_void - size=1 align=1 - base size=0 base align=1 -std::__is_void (0xb614d7c0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614d840) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614d880) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614d8c0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614d900) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614d940) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614d980) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614d9c0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614da00) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614da40) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614da80) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614dac0) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614db00) 0 empty -Class std::__is_integer - size=1 align=1 - base size=0 base align=1 -std::__is_integer (0xb614db40) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb614dbc0) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb614dc00) 0 empty -Class std::__is_floating - size=1 align=1 - base size=0 base align=1 -std::__is_floating (0xb614dc40) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb617b000) 0 empty -Class std::__is_char - size=1 align=1 - base size=0 base align=1 -std::__is_char (0xb617b040) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb617b200) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb617b240) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb617b280) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb617b2c0) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb617b300) 0 empty -Class __gnu_cxx::__add_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__add_unsigned (0xb617b340) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb617b3c0) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb617b400) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb617b440) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb617b480) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb617b4c0) 0 empty -Class __gnu_cxx::__remove_unsigned - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::__remove_unsigned (0xb617b500) 0 empty -Class std::iterator - size=1 align=1 - base size=0 base align=1 -std::iterator (0xb617b600) 0 empty Class lconv size=56 align=4 @@ -1445,10 +855,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb617b880) 0 -Class - size=128 align=4 - base size=128 base align=4 - (0xb617b8c0) 0 Class tm size=44 align=4 @@ -1465,15 +871,7 @@ Class _pthread_cleanup_buffer base size=16 base align=4 _pthread_cleanup_buffer (0xb617b9c0) 0 -Class :: - size=28 align=4 - base size=28 base align=4 -:: (0xb617ba40) 0 -Class - size=44 align=4 - base size=44 base align=4 - (0xb617ba00) 0 Class __pthread_cleanup_frame size=16 align=4 @@ -1485,243 +883,55 @@ Class __pthread_cleanup_class base size=16 base align=4 __pthread_cleanup_class (0xb617bac0) 0 -Class std::__iter_swap - size=1 align=1 - base size=0 base align=1 -std::__iter_swap (0xb6004140) 0 empty -Class std::__copy - size=1 align=1 - base size=0 base align=1 -std::__copy (0xb6004200) 0 empty -Class std::__copy_normal - size=1 align=1 - base size=0 base align=1 -std::__copy_normal (0xb6004280) 0 empty -Class std::__copy_normal - size=1 align=1 - base size=0 base align=1 -std::__copy_normal (0xb60042c0) 0 empty -Class std::__copy_normal - size=1 align=1 - base size=0 base align=1 -std::__copy_normal (0xb6004300) 0 empty -Class std::__copy_backward - size=1 align=1 - base size=0 base align=1 -std::__copy_backward (0xb60043c0) 0 empty -Class std::__copy_backward_normal - size=1 align=1 - base size=0 base align=1 -std::__copy_backward_normal (0xb6004440) 0 empty -Class std::__copy_backward_normal - size=1 align=1 - base size=0 base align=1 -std::__copy_backward_normal (0xb6004480) 0 empty -Class std::__copy_backward_normal - size=1 align=1 - base size=0 base align=1 -std::__copy_backward_normal (0xb60044c0) 0 empty -Class std::__fill - size=1 align=1 - base size=0 base align=1 -std::__fill (0xb6004540) 0 empty -Class std::__fill_n - size=1 align=1 - base size=0 base align=1 -std::__fill_n (0xb60045c0) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb6004780) 0 empty -Class std::char_traits - size=1 align=1 - base size=0 base align=1 -std::char_traits (0xb5ebfc00) 0 empty -Class std::allocator - size=1 align=1 - base size=0 base align=1 -std::allocator (0xb5ec7fc0) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5eec100) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5eec140) 0 empty - __gnu_cxx::new_allocator (0xb5eec180) 0 empty -Class __gnu_cxx::new_allocator - size=1 align=1 - base size=0 base align=1 -__gnu_cxx::new_allocator (0xb5eec1c0) 0 empty -Class std::allocator - size=1 align=1 - base size=1 base align=1 -std::allocator (0xb5eec200) 0 empty - __gnu_cxx::new_allocator (0xb5eec240) 0 empty Class std::__numeric_limits_base size=1 align=1 base size=0 base align=1 std::__numeric_limits_base (0xb5eec380) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec440) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec480) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec4c0) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec500) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec540) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec580) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec5c0) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec600) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec640) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec680) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec6c0) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec700) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec740) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec780) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eec9c0) 0 empty -Class std::numeric_limits - size=1 align=1 - base size=0 base align=1 -std::numeric_limits (0xb5eecc00) 0 empty -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5dc4800) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5dc4880) 0 - std::allocator (0xb5dc48c0) 0 empty - __gnu_cxx::new_allocator (0xb5dc4900) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5dc4780) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5dc4940) 0 -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5dc4980) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5dc49c0) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5dc4a80) 0 empty -Class std::basic_string, std::allocator >::_Alloc_hider - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator >::_Alloc_hider (0xb5dc4b00) 0 - std::allocator (0xb5dc4b40) 0 empty - __gnu_cxx::new_allocator (0xb5dc4b80) 0 empty -Class std::basic_string, std::allocator > - size=4 align=4 - base size=4 base align=4 -std::basic_string, std::allocator > (0xb5dc4a00) 0 -Class std::basic_string, std::allocator >::_Rep_base - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep_base (0xb5dc4bc0) 0 -Class std::allocator::rebind - size=1 align=1 - base size=0 base align=1 -std::allocator::rebind (0xb5dc4cc0) 0 empty -Class std::basic_string, std::allocator >::_Rep - size=12 align=4 - base size=12 base align=4 -std::basic_string, std::allocator >::_Rep (0xb5dc4c00) 0 - std::basic_string, std::allocator >::_Rep_base (0xb5dc4c40) 0 Class std::locale size=4 align=4 @@ -1795,447 +1005,63 @@ Class std::ios_base std::ios_base (0xb5be5040) 0 vptr=((& std::ios_base::_ZTVSt8ios_base) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIcSt11char_traitsIcEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = char, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = char, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = char, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = char, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = char, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = char, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = char, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = char, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = char, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = char, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = char, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = char, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5c18ac0) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIcSt11char_traitsIcEE) + 8u) -Vtable for std::basic_streambuf > -std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15basic_streambufIwSt11char_traitsIwEE) -8 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_streambuf<_CharT, _Traits>::~basic_streambuf [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_streambuf<_CharT, _Traits>::imbue [with _CharT = wchar_t, _Traits = std::char_traits] -20 std::basic_streambuf<_CharT, _Traits>::setbuf [with _CharT = wchar_t, _Traits = std::char_traits] -24 std::basic_streambuf<_CharT, _Traits>::seekoff [with _CharT = wchar_t, _Traits = std::char_traits] -28 std::basic_streambuf<_CharT, _Traits>::seekpos [with _CharT = wchar_t, _Traits = std::char_traits] -32 std::basic_streambuf<_CharT, _Traits>::sync [with _CharT = wchar_t, _Traits = std::char_traits] -36 std::basic_streambuf<_CharT, _Traits>::showmanyc [with _CharT = wchar_t, _Traits = std::char_traits] -40 std::basic_streambuf<_CharT, _Traits>::xsgetn [with _CharT = wchar_t, _Traits = std::char_traits] -44 std::basic_streambuf<_CharT, _Traits>::underflow [with _CharT = wchar_t, _Traits = std::char_traits] -48 std::basic_streambuf<_CharT, _Traits>::uflow [with _CharT = wchar_t, _Traits = std::char_traits] -52 std::basic_streambuf<_CharT, _Traits>::pbackfail [with _CharT = wchar_t, _Traits = std::char_traits] -56 std::basic_streambuf<_CharT, _Traits>::xsputn [with _CharT = wchar_t, _Traits = std::char_traits] -60 std::basic_streambuf<_CharT, _Traits>::overflow [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_streambuf > - size=32 align=4 - base size=32 base align=4 -std::basic_streambuf > (0xb5c18cc0) 0 - vptr=((& std::basic_streambuf >::_ZTVSt15basic_streambufIwSt11char_traitsIwEE) + 8u) + + Class std::ctype_base size=1 align=1 base size=0 base align=1 std::ctype_base (0xb5c18fc0) 0 empty -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIcE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype - size=544 align=4 - base size=542 base align=4 -std::ctype (0xb5a875c0) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIcE) + 8u) - std::locale::facet (0xb5a87600) 0 - primary-for std::ctype (0xb5a875c0) - std::ctype_base (0xb5a87640) 0 empty - -Vtable for std::__ctype_abstract_base -std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt21__ctype_abstract_baseIwE) -8 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -12 std::__ctype_abstract_base<_CharT>::~__ctype_abstract_base [with _CharT = wchar_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -44 __cxa_pure_virtual -48 __cxa_pure_virtual -52 __cxa_pure_virtual -56 __cxa_pure_virtual -60 __cxa_pure_virtual -Class std::__ctype_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__ctype_abstract_base (0xb5ab3800) 0 - vptr=((& std::__ctype_abstract_base::_ZTVSt21__ctype_abstract_baseIwE) + 8u) - std::locale::facet (0xb5ab3840) 0 - primary-for std::__ctype_abstract_base (0xb5ab3800) - std::ctype_base (0xb5ab3880) 0 empty - -Vtable for std::ctype -std::ctype::_ZTVSt5ctypeIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt5ctypeIwE) -8 std::ctype::~ctype -12 std::ctype::~ctype -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype - size=1264 align=4 - base size=1264 base align=4 -std::ctype (0xb5ab3900) 0 - vptr=((& std::ctype::_ZTVSt5ctypeIwE) + 8u) - std::__ctype_abstract_base (0xb5ab3940) 0 - primary-for std::ctype (0xb5ab3900) - std::locale::facet (0xb5ab3980) 0 - primary-for std::__ctype_abstract_base (0xb5ab3940) - std::ctype_base (0xb5ab39c0) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIcE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIcE) -8 std::ctype_byname<_CharT>::~ctype_byname [with _CharT = char] -12 std::ctype_byname<_CharT>::~ctype_byname [with _CharT = char] -16 std::ctype::do_toupper -20 std::ctype::do_toupper -24 std::ctype::do_tolower -28 std::ctype::do_tolower -32 std::ctype::do_widen -36 std::ctype::do_widen -40 std::ctype::do_narrow -44 std::ctype::do_narrow - -Class std::ctype_byname - size=544 align=4 - base size=542 base align=4 -std::ctype_byname (0xb5ac2d80) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIcE) + 8u) - std::ctype (0xb5ac2dc0) 0 - primary-for std::ctype_byname (0xb5ac2d80) - std::locale::facet (0xb5ac2e00) 0 - primary-for std::ctype (0xb5ac2dc0) - std::ctype_base (0xb5ac2e40) 0 empty - -Vtable for std::ctype_byname -std::ctype_byname::_ZTVSt12ctype_bynameIwE: 16u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt12ctype_bynameIwE) -8 std::ctype_byname<_CharT>::~ctype_byname [with _CharT = wchar_t] -12 std::ctype_byname<_CharT>::~ctype_byname [with _CharT = wchar_t] -16 std::ctype::do_is -20 std::ctype::do_is -24 std::ctype::do_scan_is -28 std::ctype::do_scan_not -32 std::ctype::do_toupper -36 std::ctype::do_toupper -40 std::ctype::do_tolower -44 std::ctype::do_tolower -48 std::ctype::do_widen -52 std::ctype::do_widen -56 std::ctype::do_narrow -60 std::ctype::do_narrow - -Class std::ctype_byname - size=1264 align=4 - base size=1264 base align=4 -std::ctype_byname (0xb5ac2f00) 0 - vptr=((& std::ctype_byname::_ZTVSt12ctype_bynameIwE) + 8u) - std::ctype (0xb5ac2f40) 0 - primary-for std::ctype_byname (0xb5ac2f00) - std::__ctype_abstract_base (0xb5ac2f80) 0 - primary-for std::ctype (0xb5ac2f40) - std::locale::facet (0xb5ac2fc0) 0 - primary-for std::__ctype_abstract_base (0xb5ac2f80) - std::ctype_base (0xb5ac2cc0) 0 empty + + + + + + + + Class std::codecvt_base size=1 align=1 base size=0 base align=1 std::codecvt_base (0xb5acf700) 0 empty -Vtable for std::__codecvt_abstract_base -std::__codecvt_abstract_base::_ZTVSt23__codecvt_abstract_baseIcc11__mbstate_tE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt23__codecvt_abstract_baseIcc11__mbstate_tE) -8 std::__codecvt_abstract_base<_InternT, _ExternT, _StateT>::~__codecvt_abstract_base [with _InternT = char, _ExternT = char, _StateT = __mbstate_t] -12 std::__codecvt_abstract_base<_InternT, _ExternT, _StateT>::~__codecvt_abstract_base [with _InternT = char, _ExternT = char, _StateT = __mbstate_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -Class std::__codecvt_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__codecvt_abstract_base (0xb5acf880) 0 - vptr=((& std::__codecvt_abstract_base::_ZTVSt23__codecvt_abstract_baseIcc11__mbstate_tE) + 8u) - std::locale::facet (0xb5acf8c0) 0 - primary-for std::__codecvt_abstract_base (0xb5acf880) - std::codecvt_base (0xb5acf900) 0 empty - -Vtable for std::codecvt -std::codecvt::_ZTVSt7codecvtIcc11__mbstate_tE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7codecvtIcc11__mbstate_tE) -8 std::codecvt::~codecvt -12 std::codecvt::~codecvt -16 std::codecvt::do_out -20 std::codecvt::do_unshift -24 std::codecvt::do_in -28 std::codecvt::do_encoding -32 std::codecvt::do_always_noconv -36 std::codecvt::do_length -40 std::codecvt::do_max_length - -Class std::codecvt - size=12 align=4 - base size=12 base align=4 -std::codecvt (0xb5acf980) 0 - vptr=((& std::codecvt::_ZTVSt7codecvtIcc11__mbstate_tE) + 8u) - std::__codecvt_abstract_base (0xb5acf9c0) 0 - primary-for std::codecvt (0xb5acf980) - std::locale::facet (0xb5acfa00) 0 - primary-for std::__codecvt_abstract_base (0xb5acf9c0) - std::codecvt_base (0xb5acfa40) 0 empty - -Vtable for std::__codecvt_abstract_base -std::__codecvt_abstract_base::_ZTVSt23__codecvt_abstract_baseIwc11__mbstate_tE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt23__codecvt_abstract_baseIwc11__mbstate_tE) -8 std::__codecvt_abstract_base<_InternT, _ExternT, _StateT>::~__codecvt_abstract_base [with _InternT = wchar_t, _ExternT = char, _StateT = __mbstate_t] -12 std::__codecvt_abstract_base<_InternT, _ExternT, _StateT>::~__codecvt_abstract_base [with _InternT = wchar_t, _ExternT = char, _StateT = __mbstate_t] -16 __cxa_pure_virtual -20 __cxa_pure_virtual -24 __cxa_pure_virtual -28 __cxa_pure_virtual -32 __cxa_pure_virtual -36 __cxa_pure_virtual -40 __cxa_pure_virtual -Class std::__codecvt_abstract_base - size=8 align=4 - base size=8 base align=4 -std::__codecvt_abstract_base (0xb5ae9580) 0 - vptr=((& std::__codecvt_abstract_base::_ZTVSt23__codecvt_abstract_baseIwc11__mbstate_tE) + 8u) - std::locale::facet (0xb5ae95c0) 0 - primary-for std::__codecvt_abstract_base (0xb5ae9580) - std::codecvt_base (0xb5ae9600) 0 empty - -Vtable for std::codecvt -std::codecvt::_ZTVSt7codecvtIwc11__mbstate_tE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7codecvtIwc11__mbstate_tE) -8 std::codecvt::~codecvt -12 std::codecvt::~codecvt -16 std::codecvt::do_out -20 std::codecvt::do_unshift -24 std::codecvt::do_in -28 std::codecvt::do_encoding -32 std::codecvt::do_always_noconv -36 std::codecvt::do_length -40 std::codecvt::do_max_length - -Class std::codecvt - size=12 align=4 - base size=12 base align=4 -std::codecvt (0xb5ae9680) 0 - vptr=((& std::codecvt::_ZTVSt7codecvtIwc11__mbstate_tE) + 8u) - std::__codecvt_abstract_base (0xb5ae96c0) 0 - primary-for std::codecvt (0xb5ae9680) - std::locale::facet (0xb5ae9700) 0 - primary-for std::__codecvt_abstract_base (0xb5ae96c0) - std::codecvt_base (0xb5ae9740) 0 empty + + + + + Class std::__num_base size=1 align=1 base size=0 base align=1 std::__num_base (0xb5af42c0) 0 empty -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIcE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = char] -12 std::numpunct<_CharT>::~numpunct [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5af4800) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIcE) + 8u) - std::locale::facet (0xb5af4840) 0 - primary-for std::numpunct (0xb5af4800) -Vtable for std::numpunct -std::numpunct::_ZTVSt8numpunctIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8numpunctIwE) -8 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -12 std::numpunct<_CharT>::~numpunct [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct - size=12 align=4 - base size=12 base align=4 -std::numpunct (0xb5af48c0) 0 - vptr=((& std::numpunct::_ZTVSt8numpunctIwE) + 8u) - std::locale::facet (0xb5af4900) 0 - primary-for std::numpunct (0xb5af48c0) -Vtable for std::collate -std::collate::_ZTVSt7collateIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIcE) -8 std::collate<_CharT>::~collate [with _CharT = char] -12 std::collate<_CharT>::~collate [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5af4b80) 0 - vptr=((& std::collate::_ZTVSt7collateIcE) + 8u) - std::locale::facet (0xb5af4bc0) 0 - primary-for std::collate (0xb5af4b80) -Vtable for std::collate -std::collate::_ZTVSt7collateIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7collateIwE) -8 std::collate<_CharT>::~collate [with _CharT = wchar_t] -12 std::collate<_CharT>::~collate [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate - size=12 align=4 - base size=12 base align=4 -std::collate (0xb5af4c80) 0 - vptr=((& std::collate::_ZTVSt7collateIwE) + 8u) - std::locale::facet (0xb5af4cc0) 0 - primary-for std::collate (0xb5af4c80) + + + + Class std::time_base size=1 align=1 base size=0 base align=1 std::time_base (0xb5af4e00) 0 empty -Vtable for std::__timepunct_cache -std::__timepunct_cache::_ZTVSt17__timepunct_cacheIcE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt17__timepunct_cacheIcE) -8 std::__timepunct_cache<_CharT>::~__timepunct_cache [with _CharT = char] -12 std::__timepunct_cache<_CharT>::~__timepunct_cache [with _CharT = char] - -Class std::__timepunct_cache - size=200 align=4 - base size=197 base align=4 -std::__timepunct_cache (0xb5af4ec0) 0 - vptr=((& std::__timepunct_cache::_ZTVSt17__timepunct_cacheIcE) + 8u) - std::locale::facet (0xb5af4f00) 0 - primary-for std::__timepunct_cache (0xb5af4ec0) - -Vtable for std::__timepunct_cache -std::__timepunct_cache::_ZTVSt17__timepunct_cacheIwE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt17__timepunct_cacheIwE) -8 std::__timepunct_cache<_CharT>::~__timepunct_cache [with _CharT = wchar_t] -12 std::__timepunct_cache<_CharT>::~__timepunct_cache [with _CharT = wchar_t] - -Class std::__timepunct_cache - size=200 align=4 - base size=197 base align=4 -std::__timepunct_cache (0xb5af4f80) 0 - vptr=((& std::__timepunct_cache::_ZTVSt17__timepunct_cacheIwE) + 8u) - std::locale::facet (0xb5af4fc0) 0 - primary-for std::__timepunct_cache (0xb5af4f80) - -Vtable for std::__timepunct -std::__timepunct::_ZTVSt11__timepunctIcE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt11__timepunctIcE) -8 std::__timepunct<_CharT>::~__timepunct [with _CharT = char] -12 std::__timepunct<_CharT>::~__timepunct [with _CharT = char] -Class std::__timepunct - size=20 align=4 - base size=20 base align=4 -std::__timepunct (0xb5af4940) 0 - vptr=((& std::__timepunct::_ZTVSt11__timepunctIcE) + 8u) - std::locale::facet (0xb5af4c00) 0 - primary-for std::__timepunct (0xb5af4940) -Vtable for std::__timepunct -std::__timepunct::_ZTVSt11__timepunctIwE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt11__timepunctIwE) -8 std::__timepunct<_CharT>::~__timepunct [with _CharT = wchar_t] -12 std::__timepunct<_CharT>::~__timepunct [with _CharT = wchar_t] -Class std::__timepunct - size=20 align=4 - base size=20 base align=4 -std::__timepunct (0xb5af4d00) 0 - vptr=((& std::__timepunct::_ZTVSt11__timepunctIwE) + 8u) - std::locale::facet (0xb5af4f40) 0 - primary-for std::__timepunct (0xb5af4d00) + + + + Class std::money_base::pattern size=4 align=1 @@ -2247,178 +1073,26 @@ Class std::money_base base size=0 base align=1 std::money_base (0xb5b67280) 0 empty -Vtable for std::moneypunct -std::moneypunct::_ZTVSt10moneypunctIcLb1EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt10moneypunctIcLb1EE) -8 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = char, bool _Intl = true] -12 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = char, bool _Intl = true] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = char, bool _Intl = true] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = char, bool _Intl = true] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = char, bool _Intl = true] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = char, bool _Intl = true] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = char, bool _Intl = true] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = char, bool _Intl = true] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = char, bool _Intl = true] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = char, bool _Intl = true] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = char, bool _Intl = true] - -Class std::moneypunct - size=12 align=4 - base size=12 base align=4 -std::moneypunct (0xb5b675c0) 0 - vptr=((& std::moneypunct::_ZTVSt10moneypunctIcLb1EE) + 8u) - std::locale::facet (0xb5b67600) 0 - primary-for std::moneypunct (0xb5b675c0) - std::money_base (0xb5b67640) 0 empty - -Vtable for std::moneypunct -std::moneypunct::_ZTVSt10moneypunctIcLb0EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt10moneypunctIcLb0EE) -8 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = char, bool _Intl = false] -12 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = char, bool _Intl = false] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = char, bool _Intl = false] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = char, bool _Intl = false] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = char, bool _Intl = false] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = char, bool _Intl = false] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = char, bool _Intl = false] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = char, bool _Intl = false] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = char, bool _Intl = false] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = char, bool _Intl = false] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = char, bool _Intl = false] - -Class std::moneypunct - size=12 align=4 - base size=12 base align=4 -std::moneypunct (0xb5b676c0) 0 - vptr=((& std::moneypunct::_ZTVSt10moneypunctIcLb0EE) + 8u) - std::locale::facet (0xb5b67700) 0 - primary-for std::moneypunct (0xb5b676c0) - std::money_base (0xb5b67740) 0 empty - -Vtable for std::moneypunct -std::moneypunct::_ZTVSt10moneypunctIwLb1EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt10moneypunctIwLb1EE) -8 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = wchar_t, bool _Intl = true] -12 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = wchar_t, bool _Intl = true] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = wchar_t, bool _Intl = true] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = wchar_t, bool _Intl = true] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = wchar_t, bool _Intl = true] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = wchar_t, bool _Intl = true] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = wchar_t, bool _Intl = true] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = wchar_t, bool _Intl = true] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = wchar_t, bool _Intl = true] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = wchar_t, bool _Intl = true] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = wchar_t, bool _Intl = true] - -Class std::moneypunct - size=12 align=4 - base size=12 base align=4 -std::moneypunct (0xb5b677c0) 0 - vptr=((& std::moneypunct::_ZTVSt10moneypunctIwLb1EE) + 8u) - std::locale::facet (0xb5b67800) 0 - primary-for std::moneypunct (0xb5b677c0) - std::money_base (0xb5b67840) 0 empty - -Vtable for std::moneypunct -std::moneypunct::_ZTVSt10moneypunctIwLb0EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt10moneypunctIwLb0EE) -8 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = wchar_t, bool _Intl = false] -12 std::moneypunct<_CharT, _Intl>::~moneypunct [with _CharT = wchar_t, bool _Intl = false] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = wchar_t, bool _Intl = false] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = wchar_t, bool _Intl = false] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = wchar_t, bool _Intl = false] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = wchar_t, bool _Intl = false] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = wchar_t, bool _Intl = false] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = wchar_t, bool _Intl = false] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = wchar_t, bool _Intl = false] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = wchar_t, bool _Intl = false] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = wchar_t, bool _Intl = false] - -Class std::moneypunct - size=12 align=4 - base size=12 base align=4 -std::moneypunct (0xb5b678c0) 0 - vptr=((& std::moneypunct::_ZTVSt10moneypunctIwLb0EE) + 8u) - std::locale::facet (0xb5b67900) 0 - primary-for std::moneypunct (0xb5b678c0) - std::money_base (0xb5b67940) 0 empty + + + + + + + Class std::messages_base size=1 align=1 base size=0 base align=1 std::messages_base (0xb5b67b40) 0 empty -Vtable for std::messages -std::messages::_ZTVSt8messagesIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8messagesIcE) -8 std::messages<_CharT>::~messages [with _CharT = char] -12 std::messages<_CharT>::~messages [with _CharT = char] -16 std::messages<_CharT>::do_open [with _CharT = char] -20 std::messages<_CharT>::do_get [with _CharT = char] -24 std::messages<_CharT>::do_close [with _CharT = char] - -Class std::messages - size=16 align=4 - base size=16 base align=4 -std::messages (0xb5b67c40) 0 - vptr=((& std::messages::_ZTVSt8messagesIcE) + 8u) - std::locale::facet (0xb5b67c80) 0 - primary-for std::messages (0xb5b67c40) - std::messages_base (0xb5b67cc0) 0 empty - -Vtable for std::messages -std::messages::_ZTVSt8messagesIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8messagesIwE) -8 std::messages<_CharT>::~messages [with _CharT = wchar_t] -12 std::messages<_CharT>::~messages [with _CharT = wchar_t] -16 std::messages<_CharT>::do_open [with _CharT = wchar_t] -20 std::messages<_CharT>::do_get [with _CharT = wchar_t] -24 std::messages<_CharT>::do_close [with _CharT = wchar_t] - -Class std::messages - size=16 align=4 - base size=16 base align=4 -std::messages (0xb5b67e40) 0 - vptr=((& std::messages::_ZTVSt8messagesIwE) + 8u) - std::locale::facet (0xb5b67e80) 0 - primary-for std::messages (0xb5b67e40) - std::messages_base (0xb5b67ec0) 0 empty - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIcSt11char_traitsIcEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = char, _Traits = std::char_traits] - -Class std::basic_ios > - size=136 align=4 - base size=136 base align=4 -std::basic_ios > (0xb5b67d00) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIcSt11char_traitsIcEE) + 8u) - std::ios_base (0xb5b67f00) 0 - primary-for std::basic_ios > (0xb5b67d00) - -Vtable for std::basic_ios > -std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE: 4u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9basic_iosIwSt11char_traitsIwEE) -8 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] -12 std::basic_ios<_CharT, _Traits>::~basic_ios [with _CharT = wchar_t, _Traits = std::char_traits] - -Class std::basic_ios > - size=140 align=4 - base size=140 base align=4 -std::basic_ios > (0xb59f7040) 0 - vptr=((& std::basic_ios >::_ZTVSt9basic_iosIwSt11char_traitsIwEE) + 8u) - std::ios_base (0xb59f7080) 0 - primary-for std::basic_ios > (0xb59f7040) + + + + + + + Vtable for std::type_info std::type_info::_ZTVSt9type_info: 8u entries @@ -2469,774 +1143,95 @@ std::bad_typeid (0xb59f7b00) 0 nearly-empty std::exception (0xb59f7b40) 0 nearly-empty primary-for std::bad_typeid (0xb59f7b00) -Class std::iterator_traits - size=1 align=1 - base size=0 base align=1 -std::iterator_traits (0xb59f7e00) 0 empty -Class __gnu_cxx::__normal_iterator, std::allocator > > - size=4 align=4 - base size=4 base align=4 -__gnu_cxx::__normal_iterator, std::allocator > > (0xb59f7d80) 0 -Vtable for std::moneypunct_byname -std::moneypunct_byname::_ZTVSt17moneypunct_bynameIcLb0EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt17moneypunct_bynameIcLb0EE) -8 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = char, bool _Intl = false] -12 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = char, bool _Intl = false] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = char, bool _Intl = false] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = char, bool _Intl = false] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = char, bool _Intl = false] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = char, bool _Intl = false] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = char, bool _Intl = false] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = char, bool _Intl = false] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = char, bool _Intl = false] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = char, bool _Intl = false] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = char, bool _Intl = false] - -Class std::moneypunct_byname - size=12 align=4 - base size=12 base align=4 -std::moneypunct_byname (0xb59f7e40) 0 - vptr=((& std::moneypunct_byname::_ZTVSt17moneypunct_bynameIcLb0EE) + 8u) - std::moneypunct (0xb59f7e80) 0 - primary-for std::moneypunct_byname (0xb59f7e40) - std::locale::facet (0xb59f7ec0) 0 - primary-for std::moneypunct (0xb59f7e80) - std::money_base (0xb59f7f00) 0 empty - -Vtable for std::moneypunct_byname -std::moneypunct_byname::_ZTVSt17moneypunct_bynameIcLb1EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt17moneypunct_bynameIcLb1EE) -8 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = char, bool _Intl = true] -12 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = char, bool _Intl = true] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = char, bool _Intl = true] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = char, bool _Intl = true] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = char, bool _Intl = true] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = char, bool _Intl = true] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = char, bool _Intl = true] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = char, bool _Intl = true] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = char, bool _Intl = true] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = char, bool _Intl = true] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = char, bool _Intl = true] - -Class std::moneypunct_byname - size=12 align=4 - base size=12 base align=4 -std::moneypunct_byname (0xb59f7f80) 0 - vptr=((& std::moneypunct_byname::_ZTVSt17moneypunct_bynameIcLb1EE) + 8u) - std::moneypunct (0xb59f7fc0) 0 - primary-for std::moneypunct_byname (0xb59f7f80) - std::locale::facet (0xb59f7000) 0 - primary-for std::moneypunct (0xb59f7fc0) - std::money_base (0xb59f70c0) 0 empty - -Vtable for std::money_get > > -std::money_get > >::_ZTVSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 6u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::money_get<_CharT, _InIter>::~money_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::money_get<_CharT, _InIter>::~money_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::money_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::money_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -Class std::money_get > > - size=8 align=4 - base size=8 base align=4 -std::money_get > > (0xb59f76c0) 0 - vptr=((& std::money_get > >::_ZTVSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb59f7ac0) 0 - primary-for std::money_get > > (0xb59f76c0) -Vtable for std::money_put > > -std::money_put > >::_ZTVSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 6u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::money_put<_CharT, _OutIter>::~money_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::money_put<_CharT, _OutIter>::~money_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::money_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::money_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -Class std::money_put > > - size=8 align=4 - base size=8 base align=4 -std::money_put > > (0xb59f7d00) 0 - vptr=((& std::money_put > >::_ZTVSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb59f7d40) 0 - primary-for std::money_put > > (0xb59f7d00) -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIcE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIcE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = char] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = char] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = char] -24 std::numpunct<_CharT>::do_grouping [with _CharT = char] -28 std::numpunct<_CharT>::do_truename [with _CharT = char] -32 std::numpunct<_CharT>::do_falsename [with _CharT = char] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb58d1000) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIcE) + 8u) - std::numpunct (0xb58d1040) 0 - primary-for std::numpunct_byname (0xb58d1000) - std::locale::facet (0xb58d1080) 0 - primary-for std::numpunct (0xb58d1040) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb58d1100) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb58d1140) 0 - primary-for std::num_get > > (0xb58d1100) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb58d11c0) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb58d1200) 0 - primary-for std::num_put > > (0xb58d11c0) -Vtable for std::time_put > > -std::time_put > >::_ZTVSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 5u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::time_put<_CharT, _OutIter>::~time_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::time_put<_CharT, _OutIter>::~time_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::time_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -Class std::time_put > > - size=8 align=4 - base size=8 base align=4 -std::time_put > > (0xb58d1280) 0 - vptr=((& std::time_put > >::_ZTVSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb58d12c0) 0 - primary-for std::time_put > > (0xb58d1280) -Vtable for std::time_put_byname > > -std::time_put_byname > >::_ZTVSt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE: 5u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::time_put_byname<_CharT, _OutIter>::~time_put_byname [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -12 std::time_put_byname<_CharT, _OutIter>::~time_put_byname [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -16 std::time_put<_CharT, _OutIter>::do_put [with _CharT = char, _OutIter = std::ostreambuf_iterator >] -Class std::time_put_byname > > - size=8 align=4 - base size=8 base align=4 -std::time_put_byname > > (0xb58d1340) 0 - vptr=((& std::time_put_byname > >::_ZTVSt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::time_put > > (0xb58d1380) 0 - primary-for std::time_put_byname > > (0xb58d1340) - std::locale::facet (0xb58d13c0) 0 - primary-for std::time_put > > (0xb58d1380) - -Vtable for std::time_get > > -std::time_get > >::_ZTVSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::time_get<_CharT, _InIter>::~time_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::time_get<_CharT, _InIter>::~time_get [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::time_get<_CharT, _InIter>::do_date_order [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::time_get<_CharT, _InIter>::do_get_time [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::time_get<_CharT, _InIter>::do_get_date [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::time_get<_CharT, _InIter>::do_get_weekday [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::time_get<_CharT, _InIter>::do_get_monthname [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::time_get<_CharT, _InIter>::do_get_year [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::time_get > > - size=8 align=4 - base size=8 base align=4 -std::time_get > > (0xb58d1440) 0 - vptr=((& std::time_get > >::_ZTVSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::locale::facet (0xb58d1480) 0 - primary-for std::time_get > > (0xb58d1440) - std::time_base (0xb58d14c0) 0 empty - -Vtable for std::time_get_byname > > -std::time_get_byname > >::_ZTVSt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) -8 std::time_get_byname<_CharT, _InIter>::~time_get_byname [with _CharT = char, _InIter = std::istreambuf_iterator >] -12 std::time_get_byname<_CharT, _InIter>::~time_get_byname [with _CharT = char, _InIter = std::istreambuf_iterator >] -16 std::time_get<_CharT, _InIter>::do_date_order [with _CharT = char, _InIter = std::istreambuf_iterator >] -20 std::time_get<_CharT, _InIter>::do_get_time [with _CharT = char, _InIter = std::istreambuf_iterator >] -24 std::time_get<_CharT, _InIter>::do_get_date [with _CharT = char, _InIter = std::istreambuf_iterator >] -28 std::time_get<_CharT, _InIter>::do_get_weekday [with _CharT = char, _InIter = std::istreambuf_iterator >] -32 std::time_get<_CharT, _InIter>::do_get_monthname [with _CharT = char, _InIter = std::istreambuf_iterator >] -36 std::time_get<_CharT, _InIter>::do_get_year [with _CharT = char, _InIter = std::istreambuf_iterator >] - -Class std::time_get_byname > > - size=8 align=4 - base size=8 base align=4 -std::time_get_byname > > (0xb58d1540) 0 - vptr=((& std::time_get_byname > >::_ZTVSt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE) + 8u) - std::time_get > > (0xb58d1580) 0 - primary-for std::time_get_byname > > (0xb58d1540) - std::locale::facet (0xb58d15c0) 0 - primary-for std::time_get > > (0xb58d1580) - std::time_base (0xb58d1600) 0 empty - -Vtable for std::messages_byname -std::messages_byname::_ZTVSt15messages_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15messages_bynameIcE) -8 std::messages_byname<_CharT>::~messages_byname [with _CharT = char] -12 std::messages_byname<_CharT>::~messages_byname [with _CharT = char] -16 std::messages<_CharT>::do_open [with _CharT = char] -20 std::messages<_CharT>::do_get [with _CharT = char] -24 std::messages<_CharT>::do_close [with _CharT = char] - -Class std::messages_byname - size=16 align=4 - base size=16 base align=4 -std::messages_byname (0xb58d1680) 0 - vptr=((& std::messages_byname::_ZTVSt15messages_bynameIcE) + 8u) - std::messages (0xb58d16c0) 0 - primary-for std::messages_byname (0xb58d1680) - std::locale::facet (0xb58d1700) 0 - primary-for std::messages (0xb58d16c0) - std::messages_base (0xb58d1740) 0 empty - -Vtable for std::codecvt_byname -std::codecvt_byname::_ZTVSt14codecvt_bynameIcc11__mbstate_tE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14codecvt_bynameIcc11__mbstate_tE) -8 std::codecvt_byname<_InternT, _ExternT, _StateT>::~codecvt_byname [with _InternT = char, _ExternT = char, _StateT = __mbstate_t] -12 std::codecvt_byname<_InternT, _ExternT, _StateT>::~codecvt_byname [with _InternT = char, _ExternT = char, _StateT = __mbstate_t] -16 std::codecvt::do_out -20 std::codecvt::do_unshift -24 std::codecvt::do_in -28 std::codecvt::do_encoding -32 std::codecvt::do_always_noconv -36 std::codecvt::do_length -40 std::codecvt::do_max_length - -Class std::codecvt_byname - size=12 align=4 - base size=12 base align=4 -std::codecvt_byname (0xb58d1800) 0 - vptr=((& std::codecvt_byname::_ZTVSt14codecvt_bynameIcc11__mbstate_tE) + 8u) - std::codecvt (0xb58d1840) 0 - primary-for std::codecvt_byname (0xb58d1800) - std::__codecvt_abstract_base (0xb58d1880) 0 - primary-for std::codecvt (0xb58d1840) - std::locale::facet (0xb58d18c0) 0 - primary-for std::__codecvt_abstract_base (0xb58d1880) - std::codecvt_base (0xb58d1900) 0 empty - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIcE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIcE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = char] -16 std::collate<_CharT>::do_compare [with _CharT = char] -20 std::collate<_CharT>::do_transform [with _CharT = char] -24 std::collate<_CharT>::do_hash [with _CharT = char] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb58d1980) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIcE) + 8u) - std::collate (0xb58d19c0) 0 - primary-for std::collate_byname (0xb58d1980) - std::locale::facet (0xb58d1a00) 0 - primary-for std::collate (0xb58d19c0) - -Vtable for std::moneypunct_byname -std::moneypunct_byname::_ZTVSt17moneypunct_bynameIwLb0EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt17moneypunct_bynameIwLb0EE) -8 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = wchar_t, bool _Intl = false] -12 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = wchar_t, bool _Intl = false] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = wchar_t, bool _Intl = false] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = wchar_t, bool _Intl = false] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = wchar_t, bool _Intl = false] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = wchar_t, bool _Intl = false] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = wchar_t, bool _Intl = false] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = wchar_t, bool _Intl = false] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = wchar_t, bool _Intl = false] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = wchar_t, bool _Intl = false] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = wchar_t, bool _Intl = false] - -Class std::moneypunct_byname - size=12 align=4 - base size=12 base align=4 -std::moneypunct_byname (0xb58d1ac0) 0 - vptr=((& std::moneypunct_byname::_ZTVSt17moneypunct_bynameIwLb0EE) + 8u) - std::moneypunct (0xb58d1b00) 0 - primary-for std::moneypunct_byname (0xb58d1ac0) - std::locale::facet (0xb58d1b40) 0 - primary-for std::moneypunct (0xb58d1b00) - std::money_base (0xb58d1b80) 0 empty - -Vtable for std::moneypunct_byname -std::moneypunct_byname::_ZTVSt17moneypunct_bynameIwLb1EE: 13u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt17moneypunct_bynameIwLb1EE) -8 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = wchar_t, bool _Intl = true] -12 std::moneypunct_byname<_CharT, _Intl>::~moneypunct_byname [with _CharT = wchar_t, bool _Intl = true] -16 std::moneypunct<_CharT, _Intl>::do_decimal_point [with _CharT = wchar_t, bool _Intl = true] -20 std::moneypunct<_CharT, _Intl>::do_thousands_sep [with _CharT = wchar_t, bool _Intl = true] -24 std::moneypunct<_CharT, _Intl>::do_grouping [with _CharT = wchar_t, bool _Intl = true] -28 std::moneypunct<_CharT, _Intl>::do_curr_symbol [with _CharT = wchar_t, bool _Intl = true] -32 std::moneypunct<_CharT, _Intl>::do_positive_sign [with _CharT = wchar_t, bool _Intl = true] -36 std::moneypunct<_CharT, _Intl>::do_negative_sign [with _CharT = wchar_t, bool _Intl = true] -40 std::moneypunct<_CharT, _Intl>::do_frac_digits [with _CharT = wchar_t, bool _Intl = true] -44 std::moneypunct<_CharT, _Intl>::do_pos_format [with _CharT = wchar_t, bool _Intl = true] -48 std::moneypunct<_CharT, _Intl>::do_neg_format [with _CharT = wchar_t, bool _Intl = true] - -Class std::moneypunct_byname - size=12 align=4 - base size=12 base align=4 -std::moneypunct_byname (0xb58d1c00) 0 - vptr=((& std::moneypunct_byname::_ZTVSt17moneypunct_bynameIwLb1EE) + 8u) - std::moneypunct (0xb58d1c40) 0 - primary-for std::moneypunct_byname (0xb58d1c00) - std::locale::facet (0xb58d1c80) 0 - primary-for std::moneypunct (0xb58d1c40) - std::money_base (0xb58d1cc0) 0 empty - -Vtable for std::money_get > > -std::money_get > >::_ZTVSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 6u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::money_get<_CharT, _InIter>::~money_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::money_get<_CharT, _InIter>::~money_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::money_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::money_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -Class std::money_get > > - size=8 align=4 - base size=8 base align=4 -std::money_get > > (0xb58d1d40) 0 - vptr=((& std::money_get > >::_ZTVSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb58d1d80) 0 - primary-for std::money_get > > (0xb58d1d40) -Vtable for std::money_put > > -std::money_put > >::_ZTVSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 6u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::money_put<_CharT, _OutIter>::~money_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::money_put<_CharT, _OutIter>::~money_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::money_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::money_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -Class std::money_put > > - size=8 align=4 - base size=8 base align=4 -std::money_put > > (0xb58d1e40) 0 - vptr=((& std::money_put > >::_ZTVSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb58d1e80) 0 - primary-for std::money_put > > (0xb58d1e40) -Vtable for std::numpunct_byname -std::numpunct_byname::_ZTVSt15numpunct_bynameIwE: 9u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15numpunct_bynameIwE) -8 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -12 std::numpunct_byname<_CharT>::~numpunct_byname [with _CharT = wchar_t] -16 std::numpunct<_CharT>::do_decimal_point [with _CharT = wchar_t] -20 std::numpunct<_CharT>::do_thousands_sep [with _CharT = wchar_t] -24 std::numpunct<_CharT>::do_grouping [with _CharT = wchar_t] -28 std::numpunct<_CharT>::do_truename [with _CharT = wchar_t] -32 std::numpunct<_CharT>::do_falsename [with _CharT = wchar_t] - -Class std::numpunct_byname - size=12 align=4 - base size=12 base align=4 -std::numpunct_byname (0xb58d1f40) 0 - vptr=((& std::numpunct_byname::_ZTVSt15numpunct_bynameIwE) + 8u) - std::numpunct (0xb58d1f80) 0 - primary-for std::numpunct_byname (0xb58d1f40) - std::locale::facet (0xb58d1fc0) 0 - primary-for std::numpunct (0xb58d1f80) - -Vtable for std::num_get > > -std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 15u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::num_get<_CharT, _InIter>::~num_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -40 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -44 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -48 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -52 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -56 std::num_get<_CharT, _InIter>::do_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::num_get > > - size=8 align=4 - base size=8 base align=4 -std::num_get > > (0xb58d10c0) 0 - vptr=((& std::num_get > >::_ZTVSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb58d1180) 0 - primary-for std::num_get > > (0xb58d10c0) -Vtable for std::num_put > > -std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 12u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::num_put<_CharT, _OutIter>::~num_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -20 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -24 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -28 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -32 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -36 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -40 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -44 std::num_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] - -Class std::num_put > > - size=8 align=4 - base size=8 base align=4 -std::num_put > > (0xb58d1240) 0 - vptr=((& std::num_put > >::_ZTVSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb58d1300) 0 - primary-for std::num_put > > (0xb58d1240) -Vtable for std::time_put > > -std::time_put > >::_ZTVSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 5u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::time_put<_CharT, _OutIter>::~time_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::time_put<_CharT, _OutIter>::~time_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::time_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -Class std::time_put > > - size=8 align=4 - base size=8 base align=4 -std::time_put > > (0xb58d1400) 0 - vptr=((& std::time_put > >::_ZTVSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb58d1500) 0 - primary-for std::time_put > > (0xb58d1400) -Vtable for std::time_put_byname > > -std::time_put_byname > >::_ZTVSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE: 5u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::time_put_byname<_CharT, _OutIter>::~time_put_byname [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -12 std::time_put_byname<_CharT, _OutIter>::~time_put_byname [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -16 std::time_put<_CharT, _OutIter>::do_put [with _CharT = wchar_t, _OutIter = std::ostreambuf_iterator >] -Class std::time_put_byname > > - size=8 align=4 - base size=8 base align=4 -std::time_put_byname > > (0xb58d1640) 0 - vptr=((& std::time_put_byname > >::_ZTVSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::time_put > > (0xb58d1780) 0 - primary-for std::time_put_byname > > (0xb58d1640) - std::locale::facet (0xb58d1940) 0 - primary-for std::time_put > > (0xb58d1780) - -Vtable for std::time_get > > -std::time_get > >::_ZTVSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::time_get<_CharT, _InIter>::~time_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::time_get<_CharT, _InIter>::~time_get [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::time_get<_CharT, _InIter>::do_date_order [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::time_get<_CharT, _InIter>::do_get_time [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::time_get<_CharT, _InIter>::do_get_date [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::time_get<_CharT, _InIter>::do_get_weekday [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::time_get<_CharT, _InIter>::do_get_monthname [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::time_get<_CharT, _InIter>::do_get_year [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::time_get > > - size=8 align=4 - base size=8 base align=4 -std::time_get > > (0xb58d1a40) 0 - vptr=((& std::time_get > >::_ZTVSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::locale::facet (0xb58d1bc0) 0 - primary-for std::time_get > > (0xb58d1a40) - std::time_base (0xb58d1d00) 0 empty - -Vtable for std::time_get_byname > > -std::time_get_byname > >::_ZTVSt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE: 10u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) -8 std::time_get_byname<_CharT, _InIter>::~time_get_byname [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -12 std::time_get_byname<_CharT, _InIter>::~time_get_byname [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -16 std::time_get<_CharT, _InIter>::do_date_order [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -20 std::time_get<_CharT, _InIter>::do_get_time [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -24 std::time_get<_CharT, _InIter>::do_get_date [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -28 std::time_get<_CharT, _InIter>::do_get_weekday [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -32 std::time_get<_CharT, _InIter>::do_get_monthname [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] -36 std::time_get<_CharT, _InIter>::do_get_year [with _CharT = wchar_t, _InIter = std::istreambuf_iterator >] - -Class std::time_get_byname > > - size=8 align=4 - base size=8 base align=4 -std::time_get_byname > > (0xb58d1dc0) 0 - vptr=((& std::time_get_byname > >::_ZTVSt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE) + 8u) - std::time_get > > (0xb58d1ec0) 0 - primary-for std::time_get_byname > > (0xb58d1dc0) - std::locale::facet (0xb5935000) 0 - primary-for std::time_get > > (0xb58d1ec0) - std::time_base (0xb5935040) 0 empty - -Vtable for std::messages_byname -std::messages_byname::_ZTVSt15messages_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt15messages_bynameIwE) -8 std::messages_byname<_CharT>::~messages_byname [with _CharT = wchar_t] -12 std::messages_byname<_CharT>::~messages_byname [with _CharT = wchar_t] -16 std::messages<_CharT>::do_open [with _CharT = wchar_t] -20 std::messages<_CharT>::do_get [with _CharT = wchar_t] -24 std::messages<_CharT>::do_close [with _CharT = wchar_t] - -Class std::messages_byname - size=16 align=4 - base size=16 base align=4 -std::messages_byname (0xb59350c0) 0 - vptr=((& std::messages_byname::_ZTVSt15messages_bynameIwE) + 8u) - std::messages (0xb5935100) 0 - primary-for std::messages_byname (0xb59350c0) - std::locale::facet (0xb5935140) 0 - primary-for std::messages (0xb5935100) - std::messages_base (0xb5935180) 0 empty - -Vtable for std::codecvt_byname -std::codecvt_byname::_ZTVSt14codecvt_bynameIwc11__mbstate_tE: 11u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14codecvt_bynameIwc11__mbstate_tE) -8 std::codecvt_byname<_InternT, _ExternT, _StateT>::~codecvt_byname [with _InternT = wchar_t, _ExternT = char, _StateT = __mbstate_t] -12 std::codecvt_byname<_InternT, _ExternT, _StateT>::~codecvt_byname [with _InternT = wchar_t, _ExternT = char, _StateT = __mbstate_t] -16 std::codecvt::do_out -20 std::codecvt::do_unshift -24 std::codecvt::do_in -28 std::codecvt::do_encoding -32 std::codecvt::do_always_noconv -36 std::codecvt::do_length -40 std::codecvt::do_max_length - -Class std::codecvt_byname - size=12 align=4 - base size=12 base align=4 -std::codecvt_byname (0xb5935240) 0 - vptr=((& std::codecvt_byname::_ZTVSt14codecvt_bynameIwc11__mbstate_tE) + 8u) - std::codecvt (0xb5935280) 0 - primary-for std::codecvt_byname (0xb5935240) - std::__codecvt_abstract_base (0xb59352c0) 0 - primary-for std::codecvt (0xb5935280) - std::locale::facet (0xb5935300) 0 - primary-for std::__codecvt_abstract_base (0xb59352c0) - std::codecvt_base (0xb5935340) 0 empty - -Vtable for std::collate_byname -std::collate_byname::_ZTVSt14collate_bynameIwE: 7u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTISt14collate_bynameIwE) -8 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -12 std::collate_byname<_CharT>::~collate_byname [with _CharT = wchar_t] -16 std::collate<_CharT>::do_compare [with _CharT = wchar_t] -20 std::collate<_CharT>::do_transform [with _CharT = wchar_t] -24 std::collate<_CharT>::do_hash [with _CharT = wchar_t] - -Class std::collate_byname - size=12 align=4 - base size=12 base align=4 -std::collate_byname (0xb59353c0) 0 - vptr=((& std::collate_byname::_ZTVSt14collate_bynameIwE) + 8u) - std::collate (0xb5935400) 0 - primary-for std::collate_byname (0xb59353c0) - std::locale::facet (0xb5935440) 0 - primary-for std::collate (0xb5935400) - -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSo: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISo) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = char, _Traits = std::char_traits] -20 4294967292u -24 (int (*)(...))-0x00000000000000004 -28 (int (*)(...))(& _ZTISo) -32 std::basic_ostream >::_ZTv0_n12_NSoD1Ev -36 std::basic_ostream >::_ZTv0_n12_NSoD0Ev + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSo: 2u entries 0 ((& std::basic_ostream >::_ZTVSo) + 12u) 4 ((& std::basic_ostream >::_ZTVSo) + 32u) -Class std::basic_ostream > - size=140 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5935500) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSo) + 12u) - std::basic_ios > (0xb5935540) 4 virtual - vptridx=4u vbaseoffset=-0x0000000000000000c vptr=((& std::basic_ostream >::_ZTVSo) + 32u) - std::ios_base (0xb5935580) 4 - primary-for std::basic_ios > (0xb5935540) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb5935640) 0 -Vtable for std::basic_ostream > -std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE: 10u entries -0 4u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -12 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_ostream<_CharT, _Traits>::~basic_ostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4294967292u -24 (int (*)(...))-0x00000000000000004 -28 (int (*)(...))(& _ZTISt13basic_ostreamIwSt11char_traitsIwEE) -32 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED1Ev -36 std::basic_ostream >::_ZTv0_n12_NSt13basic_ostreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_ostream > std::basic_ostream >::_ZTTSt13basic_ostreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_ostream > - size=144 align=4 - base size=4 base align=4 -std::basic_ostream > (0xb5935680) 0 nearly-empty - vptridx=0u vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb59356c0) 4 virtual - vptridx=4u vbaseoffset=-0x0000000000000000c vptr=((& std::basic_ostream >::_ZTVSt13basic_ostreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5935700) 4 - primary-for std::basic_ios > (0xb59356c0) - -Class std::basic_ostream >::sentry - size=8 align=4 - base size=8 base align=4 -std::basic_ostream >::sentry (0xb59357c0) 0 -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSi: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISi) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = char, _Traits = std::char_traits] -20 4294967288u -24 (int (*)(...))-0x00000000000000008 -28 (int (*)(...))(& _ZTISi) -32 std::basic_istream >::_ZTv0_n12_NSiD1Ev -36 std::basic_istream >::_ZTv0_n12_NSiD0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSi: 2u entries 0 ((& std::basic_istream >::_ZTVSi) + 12u) 4 ((& std::basic_istream >::_ZTVSi) + 32u) -Class std::basic_istream > - size=144 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5935880) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSi) + 12u) - std::basic_ios > (0xb59358c0) 8 virtual - vptridx=4u vbaseoffset=-0x0000000000000000c vptr=((& std::basic_istream >::_ZTVSi) + 32u) - std::ios_base (0xb5935900) 8 - primary-for std::basic_ios > (0xb59358c0) - -Vtable for std::basic_istream > -std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE: 10u entries -0 8u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -12 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_istream<_CharT, _Traits>::~basic_istream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4294967288u -24 (int (*)(...))-0x00000000000000008 -28 (int (*)(...))(& _ZTISt13basic_istreamIwSt11char_traitsIwEE) -32 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED1Ev -36 std::basic_istream >::_ZTv0_n12_NSt13basic_istreamIwSt11char_traitsIwEED0Ev + VTT for std::basic_istream > std::basic_istream >::_ZTTSt13basic_istreamIwSt11char_traitsIwEE: 2u entries 0 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) 4 ((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_istream > - size=148 align=4 - base size=8 base align=4 -std::basic_istream > (0xb5935bc0) 0 - vptridx=0u vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 12u) - std::basic_ios > (0xb5935c00) 8 virtual - vptridx=4u vbaseoffset=-0x0000000000000000c vptr=((& std::basic_istream >::_ZTVSt13basic_istreamIwSt11char_traitsIwEE) + 32u) - std::ios_base (0xb5935c40) 8 - primary-for std::basic_ios > (0xb5935c00) - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb5935080) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSd: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISd) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = char, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x00000000000000008 -28 (int (*)(...))(& _ZTISd) -32 std::basic_iostream >::_ZThn8_NSdD1Ev -36 std::basic_iostream >::_ZThn8_NSdD0Ev -40 4294967284u -44 (int (*)(...))-0x0000000000000000c -48 (int (*)(...))(& _ZTISd) -52 std::basic_iostream >::_ZTv0_n12_NSdD1Ev -56 std::basic_iostream >::_ZTv0_n12_NSdD0Ev + Construction vtable for std::basic_istream > (0xb5935380 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSd0_Si: 10u entries @@ -3274,44 +1269,8 @@ std::basic_iostream >::_ZTTSd: 7u entries 20 ((& std::basic_iostream >::_ZTVSd) + 52u) 24 ((& std::basic_iostream >::_ZTVSd) + 32u) -Class std::basic_iostream > - size=148 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb59351c0) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSd) + 12u) - std::basic_istream > (0xb5935380) 0 - primary-for std::basic_iostream > (0xb59351c0) - subvttidx=4u - std::basic_ios > (0xb5935480) 12 virtual - vptridx=20u vbaseoffset=-0x0000000000000000c vptr=((& std::basic_iostream >::_ZTVSd) + 52u) - std::ios_base (0xb5935600) 12 - primary-for std::basic_ios > (0xb5935480) - std::basic_ostream > (0xb5935780) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSd) + 32u) - std::basic_ios > (0xb5935480) alternative-path - -Class std::basic_istream >::sentry - size=1 align=1 - base size=1 base align=1 -std::basic_istream >::sentry (0xb59359c0) 0 -Vtable for std::basic_iostream > -std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE: 15u entries -0 12u -4 (int (*)(...))0 -8 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -12 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -16 std::basic_iostream<_CharT, _Traits>::~basic_iostream [with _CharT = wchar_t, _Traits = std::char_traits] -20 4u -24 (int (*)(...))-0x00000000000000008 -28 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -32 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -36 std::basic_iostream >::_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev -40 4294967284u -44 (int (*)(...))-0x0000000000000000c -48 (int (*)(...))(& _ZTISt14basic_iostreamIwSt11char_traitsIwEE) -52 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev -56 std::basic_iostream >::_ZTv0_n12_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev + Construction vtable for std::basic_istream > (0xb5935c80 instance) in std::basic_iostream > std::basic_iostream >::_ZTCSt14basic_iostreamIwSt11char_traitsIwEE0_St13basic_istreamIwS1_E: 10u entries @@ -3349,71 +1308,28 @@ std::basic_iostream >::_ZTTSt14basic_iostream 20 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) 24 ((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) -Class std::basic_iostream > - size=152 align=4 - base size=12 base align=4 -std::basic_iostream > (0xb5935940) 0 - vptridx=0u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 12u) - std::basic_istream > (0xb5935c80) 0 - primary-for std::basic_iostream > (0xb5935940) - subvttidx=4u - std::basic_ios > (0xb5935cc0) 12 virtual - vptridx=20u vbaseoffset=-0x0000000000000000c vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 52u) - std::ios_base (0xb5935d00) 12 - primary-for std::basic_ios > (0xb5935cc0) - std::basic_ostream > (0xb5808000) 8 nearly-empty - subvttidx=12u vptridx=24u vptr=((& std::basic_iostream >::_ZTVSt14basic_iostreamIwSt11char_traitsIwEE) + 32u) - std::basic_ios > (0xb5935cc0) alternative-path - -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb5808380) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb5808300) 0 -Class QtConcurrent::Median - size=24 align=4 - base size=22 base align=4 -QtConcurrent::Median (0xb5808280) 0 + Class QtConcurrent::BlockSizeManager size=72 align=4 base size=72 base align=4 QtConcurrent::BlockSizeManager (0xb58081c0) 0 -Class QtConcurrent::ResultReporter - size=1 align=1 - base size=0 base align=1 -QtConcurrent::ResultReporter (0xb5808600) 0 empty Class QRegExp size=4 align=4 base size=4 base align=4 QRegExp (0xb5808940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb585f940) 0 empty Class QStringMatcher size=1036 align=4 base size=1036 base align=4 QStringMatcher (0xb585f980) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb585fe40) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb585fdc0) 0 Class QStringList size=4 align=4 @@ -3421,290 +1337,66 @@ Class QStringList QStringList (0xb585fe80) 0 QList (0xb585fec0) 0 -Class QList::iterator - size=4 align=4 - base size=4 base align=4 -QList::iterator (0xb5694140) 0 -Class QList::const_iterator - size=4 align=4 - base size=4 base align=4 -QList::const_iterator (0xb5694300) 0 Class QMetaType size=1 align=1 base size=0 base align=1 QMetaType (0xb56fcc40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56fce00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb56fcf40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb577d080) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb577d1c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb577d300) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb577d440) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb577d580) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb577d6c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb577d800) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb577d940) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb577da80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb577dbc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb577dd00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb577de40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb577df80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55840c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5584200) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5584340) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5584480) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55845c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5584700) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5584840) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5584980) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5584ac0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5584c00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5584d40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5584e80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5584fc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5591100) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5591240) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5591380) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55914c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5591600) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5591740) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5591880) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55919c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5591b00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5591c40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5591d80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb5591ec0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559d000) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559d140) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559d280) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559d3c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559d500) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559d640) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559d780) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559d8c0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559da00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559db40) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559dc80) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559ddc0) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb559df00) 0 empty -Class QMetaTypeId2 - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 (0xb55a7040) 0 empty Class QVariant::PrivateShared size=8 align=4 @@ -3731,45 +1423,17 @@ Class QVariant base size=12 base align=4 QVariant (0xb55a7180) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb55e02c0) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb55e0240) 0 -Class QMap:: - size=4 align=4 - base size=4 base align=4 -QMap:: (0xb55e03c0) 0 -Class QMap - size=4 align=4 - base size=4 base align=4 -QMap (0xb55e0340) 0 Class QVariantComparisonHelper size=4 align=4 base size=4 base align=4 QVariantComparisonHelper (0xb560cd40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb560cf80) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb56220c0) 0 empty -Class QMetaTypeId2 > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId2 > (0xb5622200) 0 empty Vtable for QSettings QSettings::_ZTV9QSettings: 14u entries @@ -3840,10 +1504,6 @@ QFile (0xb56581c0) 0 QObject (0xb5658240) 0 primary-for QIODevice (0xb5658200) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb566c440) 0 Vtable for QTemporaryFile QTemporaryFile::_ZTV14QTemporaryFile: 31u entries @@ -3965,40 +1625,16 @@ Class QFileInfo base size=4 base align=4 QFileInfo (0xb54a89c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54bad00) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb54baec0) 0 empty -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb54d0b00) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb54d0a80) 0 Class QDir size=4 align=4 base size=4 base align=4 QDir (0xb54d0c00) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54fa2c0) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb54fa3c0) 0 Class QAbstractFileEngine::ExtensionOption size=1 align=1 @@ -4073,10 +1709,6 @@ Class QAbstractFileEngine QAbstractFileEngine (0xb5525c40) 0 vptr=((& QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5532e80) 0 Vtable for QAbstractFileEngineHandler QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries @@ -4220,25 +1852,13 @@ Class QLocale::Data base size=4 base align=2 QLocale::Data (0xb538a780) 0 -Class QLocale:: - size=4 align=4 - base size=4 base align=4 -QLocale:: (0xb538a7c0) 0 Class QLocale size=4 align=4 base size=4 base align=4 QLocale (0xb5568400) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb538afc0) 0 empty -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5391080) 0 Class QResource size=4 align=4 @@ -4258,25 +1878,13 @@ Class QDirIterator QDirIterator (0xb53af3c0) 0 vptr=((& QDirIterator::_ZTV12QDirIterator) + 8u) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53afb80) 0 Class QUrl size=4 align=4 base size=4 base align=4 QUrl (0xb53c3940) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb53cf940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb53eda80) 0 empty Class QSystemSemaphore size=4 align=4 @@ -4335,10 +1943,6 @@ QEventLoop (0xb5414580) 0 QObject (0xb54145c0) 0 primary-for QEventLoop (0xb5414580) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb5414bc0) 0 Vtable for QAbstractEventDispatcher QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries @@ -4483,10 +2087,6 @@ Class QBasicTimer base size=4 base align=4 QBasicTimer (0xb5277c80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52773c0) 0 empty Vtable for QTimer QTimer::_ZTV6QTimer: 14u entries @@ -4543,20 +2143,12 @@ Class QMetaMethod base size=8 base align=4 QMetaMethod (0xb52a1800) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52a1b00) 0 empty Class QMetaEnum size=8 align=4 base size=8 base align=4 QMetaEnum (0xb52a1b40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52a1d40) 0 empty Class QMetaProperty size=20 align=4 @@ -4568,10 +2160,6 @@ Class QMetaClassInfo base size=8 base align=4 QMetaClassInfo (0xb52a1fc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52bf100) 0 empty Class __exception size=32 align=4 @@ -4686,20 +2274,12 @@ Class QModelIndex base size=16 base align=4 QModelIndex (0xb531b280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb532df40) 0 empty Class QPersistentModelIndex size=4 align=4 base size=4 base align=4 QPersistentModelIndex (0xb532df80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5334680) 0 empty Vtable for QAbstractItemModel QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries @@ -4895,20 +2475,12 @@ Class QSize base size=8 base align=4 QSize (0xb51889c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5196b80) 0 empty Class QSizeF size=16 align=4 base size=16 base align=4 QSizeF (0xb51ac940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb51bab80) 0 empty Class QBitArray size=4 align=4 @@ -4920,50 +2492,30 @@ Class QBitRef base size=8 base align=4 QBitRef (0xb51f9940) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb520b240) 0 empty Class QPoint size=8 align=4 base size=8 base align=4 QPoint (0xb520b340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb521a200) 0 empty Class QPointF size=16 align=4 base size=16 base align=4 QPointF (0xb52248c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb5230900) 0 empty Class QRect size=16 align=4 base size=16 base align=4 QRect (0xb523fb80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb52595c0) 0 empty Class QRectF size=32 align=4 base size=32 base align=4 QRectF (0xb509d640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb50b7740) 0 empty Class QTextBoundaryFinder size=28 align=4 @@ -4985,20 +2537,12 @@ Class QLine base size=16 base align=4 QLine (0xb510a340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb510a6c0) 0 empty Class QLineF size=32 align=4 base size=32 base align=4 QLineF (0xb5165bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4f78440) 0 empty Class QCryptographicHash size=4 align=4 @@ -5010,30 +2554,18 @@ Class QDate base size=4 base align=4 QDate (0xb4f9a640) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fa8a40) 0 empty Class QTime size=4 align=4 base size=4 base align=4 QTime (0xb4fa8a80) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fb9b80) 0 empty Class QDateTime size=4 align=4 base size=4 base align=4 QDateTime (0xb4fb9bc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4fc6fc0) 0 empty Class QLinkedListData size=20 align=4 @@ -5079,10 +2611,6 @@ QLibrary (0xb4fdd480) 0 QObject (0xb4fdd4c0) 0 primary-for QLibrary (0xb4fdd480) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4fdd3c0) 0 Class QUuid size=16 align=4 @@ -5129,20 +2657,12 @@ Class QReadWriteLock base size=4 base align=4 QReadWriteLock (0xb4e91280) 0 -Class QReadLocker:: - size=4 align=4 - base size=4 base align=4 -QReadLocker:: (0xb4e91940) 0 Class QReadLocker size=4 align=4 base size=4 base align=4 QReadLocker (0xb4e91640) 0 -Class QWriteLocker:: - size=4 align=4 - base size=4 base align=4 -QWriteLocker:: (0xb4e99a40) 0 Class QWriteLocker size=4 align=4 @@ -5159,20 +2679,8 @@ Class QXmlStreamAttribute base size=53 base align=4 QXmlStreamAttribute (0xb4eb8140) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ec5100) 0 empty -Class QVector:: - size=4 align=4 - base size=4 base align=4 -QVector:: (0xb4ec51c0) 0 -Class QVector - size=4 align=4 - base size=4 base align=4 -QVector (0xb4ec5140) 0 Class QXmlStreamAttributes size=4 align=4 @@ -5185,30 +2693,18 @@ Class QXmlStreamNamespaceDeclaration base size=28 base align=4 QXmlStreamNamespaceDeclaration (0xb4ec5280) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ec5a00) 0 empty Class QXmlStreamNotationDeclaration size=40 align=4 base size=40 base align=4 QXmlStreamNotationDeclaration (0xb4ec5a40) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ef2280) 0 empty Class QXmlStreamEntityDeclaration size=64 align=4 base size=64 base align=4 QXmlStreamEntityDeclaration (0xb4ef22c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ef2d00) 0 empty Vtable for QXmlStreamEntityResolver QXmlStreamEntityResolver::_ZTV24QXmlStreamEntityResolver: 6u entries @@ -5536,25 +3032,13 @@ QUdpSocket (0xb4da4400) 0 QObject (0xb4da44c0) 0 primary-for QIODevice (0xb4da4480) -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4da4e80) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4dc0ec0) 0 Class QNetworkRequest size=4 align=4 base size=4 base align=4 QNetworkRequest (0xb4dc0980) 0 -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4dc0fc0) 0 empty Vtable for QHttpHeader QHttpHeader::_ZTV11QHttpHeader: 8u entries @@ -5757,20 +3241,12 @@ QNetworkReply (0xb4e21700) 0 QObject (0xb4e21780) 0 primary-for QIODevice (0xb4e21740) -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4e406c0) 0 Class QNetworkCookie size=4 align=4 base size=4 base align=4 QNetworkCookie (0xb4e40000) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4e40800) 0 empty Vtable for QNetworkCookieJar QNetworkCookieJar::_ZTV17QNetworkCookieJar: 16u entries @@ -5799,15 +3275,7 @@ QNetworkCookieJar (0xb4e40840) 0 QObject (0xb4e40880) 0 primary-for QNetworkCookieJar (0xb4e40840) -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4e40fc0) 0 empty -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4e5a000) 0 empty Class QAuthenticator size=4 align=4 @@ -5819,20 +3287,12 @@ Class QNetworkAddressEntry base size=4 base align=4 QNetworkAddressEntry (0xb4e5a500) 0 -Class QSharedDataPointer - size=4 align=4 - base size=4 base align=4 -QSharedDataPointer (0xb4e68140) 0 Class QNetworkInterface size=4 align=4 base size=4 base align=4 QNetworkInterface (0xb4e5a800) 0 -Class QFlags - size=4 align=4 - base size=4 base align=4 -QFlags (0xb4e68200) 0 Class QHostInfo size=4 align=4 @@ -5906,10 +3366,6 @@ QSslSocket (0xb4c79680) 0 QObject (0xb4c79780) 0 primary-for QIODevice (0xb4c79740) -Class QMetaTypeId > - size=1 align=1 - base size=0 base align=1 -QMetaTypeId > (0xb4c8c7c0) 0 empty Class QSslConfiguration size=4 align=4 @@ -5926,20 +3382,8 @@ Class QXmlName base size=8 base align=4 QXmlName (0xb4c9f480) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cac300) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4cac340) 0 empty -Class QPatternist::NodeIndexStorage:: - size=8 align=4 - base size=8 base align=4 -QPatternist::NodeIndexStorage:: (0xb4cac440) 0 Class QPatternist::NodeIndexStorage size=20 align=4 @@ -5985,30 +3429,14 @@ QAbstractXmlNodeModel (0xb4cd56c0) 0 vptr=((& QAbstractXmlNodeModel::_ZTV21QAbstractXmlNodeModel) + 8u) QSharedData (0xb4cd5700) 4 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ce3300) 0 empty -Class QXmlItem:: - size=20 align=4 - base size=20 base align=4 -QXmlItem:: (0xb4ce3880) 0 Class QXmlItem size=20 align=4 base size=20 base align=4 QXmlItem (0xb4ce3340) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4ce38c0) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4ce3900) 0 empty Vtable for QAbstractXmlReceiver QAbstractXmlReceiver::_ZTV20QAbstractXmlReceiver: 18u entries @@ -6102,35 +3530,19 @@ QXmlFormatter (0xb4cf93c0) 0 QAbstractXmlReceiver (0xb4cf9440) 0 primary-for QXmlSerializer (0xb4cf9400) -Class QExplicitlySharedDataPointer - size=4 align=4 - base size=4 base align=4 -QExplicitlySharedDataPointer (0xb4cf9940) 0 Class QXmlNamePool size=4 align=4 base size=4 base align=4 QXmlNamePool (0xb4cf9600) 0 -Class QSourceLocation:: - size=8 align=4 - base size=8 base align=4 -QSourceLocation:: (0xb4cf9dc0) 0 Class QSourceLocation size=20 align=4 base size=20 base align=4 QSourceLocation (0xb4cf9980) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4cf9e00) 0 empty -Class QMetaTypeId - size=1 align=1 - base size=0 base align=1 -QMetaTypeId (0xb4cf9e40) 0 empty Vtable for QAbstractMessageHandler QAbstractMessageHandler::_ZTV23QAbstractMessageHandler: 15u entries @@ -6233,68 +3645,16 @@ QAbstractUriResolver (0xb4d1fd40) 0 QObject (0xb4d1fd80) 0 primary-for QAbstractUriResolver (0xb4d1fd40) -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4d32440) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4d324c0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d328c0) 0 empty -Class QMap::Node - size=20 align=4 - base size=20 base align=4 -QMap::Node (0xb4d32940) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4d32a80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4d32a00) 0 -Class QList:: - size=4 align=4 - base size=4 base align=4 -QList:: (0xb4d32b80) 0 -Class QList - size=4 align=4 - base size=4 base align=4 -QList (0xb4d32b00) 0 -Class QMap::PayloadNode - size=16 align=4 - base size=16 base align=4 -QMap::PayloadNode (0xb4d32bc0) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4d32c40) 0 -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4d32cc0) 0 -Class QTypeInfo - size=1 align=1 - base size=0 base align=1 -QTypeInfo (0xb4d32d40) 0 empty -Class QList::Node - size=4 align=4 - base size=4 base align=4 -QList::Node (0xb4d32dc0) 0 -- cgit v1.2.3 From 2d8716756ef648dcb34d7493d145360a0e029393 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 25 Jul 2009 10:41:00 +0200 Subject: Fix warnings when compiling Qt (tst_warnings). Don't use old-style casts in Qt code. And avoid signed/unsigned comparisons (sizeof returns size_t, which is unsigned). --- src/corelib/tools/qstringbuilder.h | 4 ++-- src/testlib/qtestcoreelement.h | 2 +- src/testlib/qtestfilelogger.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index 3b4325339..463c32dac 100644 --- a/src/corelib/tools/qstringbuilder.h +++ b/src/corelib/tools/qstringbuilder.h @@ -163,7 +163,7 @@ template <> struct QConcatenable static inline void appendTo(const QString &a, QChar *&out) { const int n = a.size(); - memcpy(out, (char*)a.constData(), sizeof(QChar) * n); + memcpy(out, reinterpret_cast(a.constData()), sizeof(QChar) * n); out += n; } }; @@ -175,7 +175,7 @@ template <> struct QConcatenable static inline void appendTo(QStringRef a, QChar *&out) { const int n = a.size(); - memcpy(out, (char*)a.constData(), sizeof(QChar) * n); + memcpy(out, reinterpret_cast(a.constData()), sizeof(QChar) * n); out += n; } }; diff --git a/src/testlib/qtestcoreelement.h b/src/testlib/qtestcoreelement.h index a6aa56d08..8c029b5ec 100644 --- a/src/testlib/qtestcoreelement.h +++ b/src/testlib/qtestcoreelement.h @@ -74,7 +74,7 @@ class QTestCoreElement: public QTestCoreList template QTestCoreElement::QTestCoreElement(int t) -:listOfAttributes(0), type((QTest::LogElementType)t) + :listOfAttributes(0), type(QTest::LogElementType(t)) { } diff --git a/src/testlib/qtestfilelogger.cpp b/src/testlib/qtestfilelogger.cpp index a717058b1..a64a452a2 100644 --- a/src/testlib/qtestfilelogger.cpp +++ b/src/testlib/qtestfilelogger.cpp @@ -73,10 +73,10 @@ void QTestFileLogger::init() QTestResult::currentTestObjectName()); // Keep filenames simple - for (int i = 0; i < sizeof(filename) && filename[i]; ++i) { + for (uint i = 0; i < sizeof(filename) && filename[i]; ++i) { char& c = filename[i]; - if (!(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9' || c == '-' - || c == '.')) { + if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') + || (c >= '0' && c <= '9') || c == '-' || c == '.')) { c = '_'; } } -- cgit v1.2.3 From a4bee26c82d87241bde62188f7871d601e3242d3 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 25 Jul 2009 11:30:30 +0200 Subject: Add support for debugging and valgrinding external tests This requires modifying slightl QProcess on Unix to forward stdin too. --- tests/auto/qsharedpointer/externaltests.cpp | 84 +++++++++++++++++++++++++---- 1 file changed, 74 insertions(+), 10 deletions(-) diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp index 8077b841e..d10c16167 100644 --- a/tests/auto/qsharedpointer/externaltests.cpp +++ b/tests/auto/qsharedpointer/externaltests.cpp @@ -55,6 +55,11 @@ # error DEFAULT_MAKESPEC not defined #endif +#ifdef Q_OS_UNIX +# include +# include +#endif + static QString makespec() { static const char default_makespec[] = DEFAULT_MAKESPEC; @@ -104,6 +109,27 @@ static bool removeRecursive(const QString &pathname) QT_BEGIN_NAMESPACE namespace QTest { + class QExternalProcess: public QProcess + { + protected: +#ifdef Q_OS_UNIX + void setupChildProcess() + { + // run in user code + QProcess::setupChildProcess(); + + if (processChannelMode() == ForwardedChannels) { + // reopen /dev/tty into stdin + int fd = ::open("/dev/tty", O_RDONLY); + if (fd == -1) + return; + ::dup2(fd, 0); + ::close(fd); + } + } +#endif + }; + class QExternalTestPrivate { public: @@ -373,11 +399,7 @@ namespace QTest { "\n" "void q_external_test_user_code()\n" "{\n" - " // HERE STARTS THE USER CODE\n"; - sourceCode += body; - sourceCode += - "\n" - " // HERE ENDS THE USER CODE\n" + "#include \"user_code.cpp\"\n" "}\n" "\n" "#ifdef Q_OS_WIN\n" @@ -442,6 +464,15 @@ namespace QTest { } sourceFile.write(sourceCode); + sourceFile.close(); + + sourceFile.setFileName(temporaryDir + QLatin1String("/user_code.cpp")); + if (!sourceFile.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) { + std_err = sourceFile.errorString().toLocal8Bit(); + return false; + } + sourceFile.write(body); + return true; } @@ -552,6 +583,24 @@ namespace QTest { "embedded:test_run.commands += -qws\n" "QMAKE_EXTRA_TARGETS += test_run\n"); + // Use qmake to debug: + projectFile.write( + "\n" + "*-g++* {\n" + " unix:test_debug.commands = gdb --args ./$(QMAKE_TARGET)\n" + " else:test_debug.commands = gdb --args $(QMAKE_TARGET)\n" + " embedded:test_debug.commands += -qws\n" + " QMAKE_EXTRA_TARGETS += test_debug\n" + "}\n"); + + // Also use qmake to run the app with valgrind: + projectFile.write( + "\n" + "unix:test_valgrind.commands = valgrind ./$(QMAKE_TARGET)\n" + "else:test_valgrind.commands = valgrind $(QMAKE_TARGET)\n" + "embedded:test_valgrind.commands += -qws\n" + "QMAKE_EXTRA_TARGETS += test_valgrind\n"); + return true; } @@ -593,7 +642,7 @@ namespace QTest { { Q_ASSERT(!temporaryDir.isEmpty()); - QProcess make; + QExternalProcess make; make.setWorkingDirectory(temporaryDir); QStringList environment = QProcess::systemEnvironment(); @@ -601,10 +650,22 @@ namespace QTest { make.setEnvironment(environment); QStringList args; - if (target == Compile) + QProcess::ProcessChannelMode channelMode = QProcess::SeparateChannels; + if (target == Compile) { args << QLatin1String("test_compile"); - else if (target == Run) - args << QLatin1String("test_run"); + } else if (target == Run) { + QByteArray run = qgetenv("QTEST_EXTERNAL_RUN"); + if (run == "valgrind") + args << QLatin1String("test_valgrind"); + else if (run == "debug") + args << QLatin1String("test_debug"); + else + args << QLatin1String("test_run"); + if (!run.isEmpty()) + channelMode = QProcess::ForwardedChannels; + } + + make.setProcessChannelMode(channelMode); #if defined(Q_OS_WIN) && !defined(Q_CC_MINGW) make.start(QLatin1String("nmake.exe"), args); @@ -630,7 +691,10 @@ namespace QTest { return false; } - bool ok = make.waitForFinished(); + make.closeWriteChannel(); + bool ok = make.waitForFinished(channelMode == QProcess::ForwardedChannels ? -1 : 60000); + if (!ok) + make.terminate(); exitCode = make.exitCode(); std_out += make.readAllStandardOutput(); std_err += make.readAllStandardError(); -- cgit v1.2.3 From 4c12010fac555bce0a6c8d69a267a56f4c15087f Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 25 Jul 2009 12:05:28 +0200 Subject: Fix a running external tests: user program headers must come first. No wonder QT_SHAREDPOINTER_TRACK_POINTERS was having no effect: there was an #include before it. --- tests/auto/qsharedpointer/externaltests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp index d10c16167..aaef779d6 100644 --- a/tests/auto/qsharedpointer/externaltests.cpp +++ b/tests/auto/qsharedpointer/externaltests.cpp @@ -360,6 +360,8 @@ namespace QTest { sourceCode.clear(); sourceCode.reserve(8192); + sourceCode += programHeader; + // Add Qt header includes if (qtModules & QExternalTest::QtCore) sourceCode += "#include \n"; @@ -393,8 +395,6 @@ namespace QTest { "#include \n" "#include \n"; - sourceCode += programHeader; - sourceCode += "\n" "void q_external_test_user_code()\n" -- cgit v1.2.3 From 486920375bdd00ac47b44a770838e50071220b46 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 25 Jul 2009 12:07:27 +0200 Subject: Fix compilation with older GCC versions: need a constructor. I don't know exactly why this is needed, but otherwise GCC complains that there is no default constructor. --- src/corelib/tools/qsharedpointer_impl.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 2c9cd95e6..630ca4f76 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -257,6 +257,11 @@ namespace QtSharedPointer { *ptr = &d->data; return d; } + + private: + // prevent construction and the emission of virtual symbols + ExternalRefCountWithContiguousData(); + ~ExternalRefCountWithContiguousData(); }; template -- cgit v1.2.3 From c5d8cf81436ead74b6bab6332f59cf86411aef16 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 25 Jul 2009 13:20:33 +0200 Subject: No link-errors when building from repository --- tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro | 1 + tests/auto/qgraphicsview/tst_qgraphicsview.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro b/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro index 740a23e96..d1bf3cc58 100644 --- a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro +++ b/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro @@ -1,3 +1,4 @@ load(qttest_p4) +requires(contains(QT_CONFIG,private_tests)) SOURCES += tst_qgraphicssceneindex.cpp diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index 37c5967a9..8056d745b 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -2253,6 +2253,8 @@ void tst_QGraphicsView::viewportUpdateMode2() QTest::qWait(300); const QRect viewportRect = view.viewport()->rect(); QCOMPARE(viewportRect, QRect(0, 0, 200, 200)); + +#if defined QT_BUILD_INTERNAL QGraphicsViewPrivate *viewPrivate = static_cast(qt_widget_private(&view)); QRect boundingRect; @@ -2280,6 +2282,7 @@ void tst_QGraphicsView::viewportUpdateMode2() QCOMPARE(view.lastUpdateRegions.size(), 1); // Note that we adjust by 2 for antialiasing. QCOMPARE(view.lastUpdateRegions.at(0), QRegion(boundingRect.adjusted(-2, -2, 2, 2) & viewportRect)); +#endif } void tst_QGraphicsView::acceptDrops() @@ -3454,6 +3457,7 @@ void tst_QGraphicsView::update() const QRect viewportRect = view.viewport()->rect(); QCOMPARE(viewportRect, QRect(0, 0, 200, 200)); +#if defined QT_BUILD_INTERNAL const bool intersects = updateRect.intersects(viewportRect); QGraphicsViewPrivate *viewPrivate = static_cast(qt_widget_private(&view)); QCOMPARE(viewPrivate->updateRect(updateRect), intersects); @@ -3472,6 +3476,7 @@ void tst_QGraphicsView::update() QCOMPARE(view.lastUpdateRegions.at(0), QRegion(updateRect.adjusted(-2, -2, 2, 2) & viewportRect)); } QVERIFY(!viewPrivate->fullUpdatePending); +#endif } void tst_QGraphicsView::inputMethodSensitivity() -- cgit v1.2.3 From bdca76715f52df3730b33dfd240085486e6f8e01 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 25 Jul 2009 13:21:30 +0200 Subject: Build without Qt3Support --- tests/auto/qsettings/tst_qsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qsettings/tst_qsettings.cpp b/tests/auto/qsettings/tst_qsettings.cpp index 5b9e9e1ec..d0f11aaf4 100644 --- a/tests/auto/qsettings/tst_qsettings.cpp +++ b/tests/auto/qsettings/tst_qsettings.cpp @@ -341,7 +341,7 @@ void tst_QSettings::init() #if defined(Q_OS_WINCE) removePath(settingsPath()); #else - if (qWinVersion() & Qt::WV_NT_based) + if (QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) system(QString("rmdir /Q /S %1").arg(settingsPath()).toLatin1()); else system(QString("deltree /Y %1").arg(settingsPath()).toLatin1()); -- cgit v1.2.3 From ad28fb5e4a90f671af94baed19a2cab18f07cc30 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 25 Jul 2009 13:38:10 +0200 Subject: Compile from repo checkout --- tests/auto/qurl/tst_qurl.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index 78ea14665..d487908bd 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -3212,11 +3212,13 @@ void tst_QUrl::std3violations() { QFETCH(QString, source); +#ifdef QT_BUILD_INTERNAL { QString prepped = source; qt_nameprep(&prepped, 0); QVERIFY(!qt_check_std3rules(prepped.constData(), prepped.length())); } +#endif if (source.contains('.')) return; // this test ends here -- cgit v1.2.3 From 1aa359225fbeee7780ab4e4145e57b8dd51d8f81 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 25 Jul 2009 13:48:47 +0200 Subject: Doc: \em is not a qdoc command, \e is correct --- src/gui/image/qpixmap_mac.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp index c14c05939..45392f160 100644 --- a/src/gui/image/qpixmap_mac.cpp +++ b/src/gui/image/qpixmap_mac.cpp @@ -930,7 +930,7 @@ QPixmap QPixmap::grabWindow(WId window, int x, int y, int w, int h) relocated. \warning This function is only available on Mac OS X. - \warning As of Qt 4.6, this function \em{always} returns zero. + \warning As of Qt 4.6, this function \e{always} returns zero. */ Qt::HANDLE QPixmap::macQDHandle() const @@ -945,7 +945,7 @@ Qt::HANDLE QPixmap::macQDHandle() const long as it can be relocated. \warning This function is only available on Mac OS X. - \warning As of Qt 4.6, this function \em{always} returns zero. + \warning As of Qt 4.6, this function \e{always} returns zero. */ Qt::HANDLE QPixmap::macQDAlphaHandle() const -- cgit v1.2.3 From dcaeddda521f90dafa1608ff8769719da5113d5e Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 25 Jul 2009 14:02:10 +0200 Subject: Revert "Doc: Clarified that the format used in QImage::fromData() is the image" This reverts commit 1368c210ef9976f68eb9fb1c3e4dc14f4fa4edd2, which accidentially reverted previous commits. --- src/gui/image/qimage.cpp | 58 ++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index ec362242e..7d7dde1b1 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -612,9 +612,6 @@ bool QImageData::checkForAlphaPixels() const \table \header \o Function \o Description \row - \o setAlphaChannel() - \o Sets the alpha channel of the image. - \row \o setDotsPerMeterX() \o Defines the aspect ratio by setting the number of pixels that fit horizontally in a physical meter. @@ -1691,8 +1688,12 @@ void QImage::setColorTable(const QVector colors) d->colortable = colors; d->has_alpha_clut = false; - for (int i = 0; i < d->colortable.size(); ++i) - d->has_alpha_clut |= (qAlpha(d->colortable.at(i)) != 255); + for (int i = 0; i < d->colortable.size(); ++i) { + if (qAlpha(d->colortable.at(i)) != 255) { + d->has_alpha_clut = true; + break; + } + } } /*! @@ -3947,10 +3948,8 @@ QImage QImage::scaled(const QSize& s, Qt::AspectRatioMode aspectMode, Qt::Transf if (newSize == size()) return copy(); - QImage img; - QTransform wm; - wm.scale((qreal)newSize.width() / width(), (qreal)newSize.height() / height()); - img = transformed(wm, mode); + QTransform wm = QTransform::fromScale((qreal)newSize.width() / width(), (qreal)newSize.height() / height()); + QImage img = transformed(wm, mode); return img; } @@ -3977,9 +3976,8 @@ QImage QImage::scaledToWidth(int w, Qt::TransformationMode mode) const if (w <= 0) return QImage(); - QTransform wm; qreal factor = (qreal) w / width(); - wm.scale(factor, factor); + QTransform wm = QTransform::fromScale(factor, factor); return transformed(wm, mode); } @@ -4006,9 +4004,8 @@ QImage QImage::scaledToHeight(int h, Qt::TransformationMode mode) const if (h <= 0) return QImage(); - QTransform wm; qreal factor = (qreal) h / height(); - wm.scale(factor, factor); + QTransform wm = QTransform::fromScale(factor, factor); return transformed(wm, mode); } @@ -4629,17 +4626,14 @@ bool QImage::loadFromData(const uchar *data, int len, const char *format) \fn QImage QImage::fromData(const uchar *data, int size, const char *format) Constructs a QImage from the first \a size bytes of the given - binary \a data. The loader attempts to read the image, either using the - optional image \a format specified or by determining the image format from - the data. - - If \a format is not specified (which is the default), the loader probes the - file for a header to determine the file format. If \a format is specified, - it must be one of the values returned by QImageReader::supportedImageFormats(). + binary \a data. The loader attempts to read the image using the + specified \a format. If \a format is not specified (which is the default), + the loader probes the file for a header to guess the file format. - If the loading of the image fails, the image returned will be a null image. + If the loading of the image failed, this object is a null image. - \sa load(), save(), {QImage#Reading and Writing Image Files}{Reading and Writing Image Files} + \sa load(), save(), {QImage#Reading and Writing Image + Files}{Reading and Writing Image Files} */ QImage QImage::fromData(const uchar *data, int size, const char *format) { @@ -4767,7 +4761,7 @@ QDataStream &operator>>(QDataStream &s, QImage &image) image = QImageReader(s.device(), 0).read(); return s; } -#endif +#endif // QT_NO_DATASTREAM #ifdef QT3_SUPPORT @@ -4857,8 +4851,6 @@ bool QImage::operator==(const QImage & i) const return false; if (d->format != Format_RGB32) { - if (d->colortable != i.d->colortable) - return false; if (d->format >= Format_ARGB32) { // all bits defined const int n = d->width * d->depth / 8; if (n == d->bytes_per_line && n == i.d->bytes_per_line) { @@ -4871,11 +4863,13 @@ bool QImage::operator==(const QImage & i) const } } } else { - int w = width(); - int h = height(); + const int w = width(); + const int h = height(); + const QVector &colortable = d->colortable; + const QVector &icolortable = i.d->colortable; for (int y=0; y Date: Sat, 25 Jul 2009 15:05:25 +0200 Subject: Using QNetworkAccessManager, so need to pull in QtNetwork --- tests/auto/qxmlschema/qxmlschema.pro | 1 + tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/auto/qxmlschema/qxmlschema.pro b/tests/auto/qxmlschema/qxmlschema.pro index 9dd7469ac..f5abe4fd0 100644 --- a/tests/auto/qxmlschema/qxmlschema.pro +++ b/tests/auto/qxmlschema/qxmlschema.pro @@ -1,4 +1,5 @@ load(qttest_p4) SOURCES += tst_qxmlschema.cpp +QT += network include (../xmlpatterns.pri) diff --git a/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro b/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro index 88ef317d4..0b439d743 100644 --- a/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro +++ b/tests/auto/qxmlschemavalidator/qxmlschemavalidator.pro @@ -1,4 +1,5 @@ load(qttest_p4) SOURCES += tst_qxmlschemavalidator.cpp +QT += network include (../xmlpatterns.pri) -- cgit v1.2.3 From 04a7da1d0dc68d15b3c620e902f1d9cc1e37ef20 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 25 Jul 2009 15:31:15 +0200 Subject: Doc: Replace links to obsolete APIs. --- doc/src/paintsystem.qdoc | 4 +--- doc/src/resources.qdoc | 2 +- src/corelib/io/qdatastream.cpp | 10 ++++++---- src/corelib/io/qprocess.cpp | 6 +++--- src/corelib/io/qresource.cpp | 2 +- src/gui/dialogs/qabstractprintdialog.cpp | 6 ++---- src/gui/graphicsview/qgraphicssceneevent.cpp | 2 +- src/gui/image/qimage.cpp | 5 ++--- src/gui/itemviews/qlistwidget.cpp | 2 +- src/gui/itemviews/qtablewidget.cpp | 2 +- src/gui/itemviews/qtreewidget.cpp | 8 ++++---- src/gui/kernel/qgridlayout.cpp | 19 ++++++++++--------- src/gui/painting/qpainterpath.cpp | 2 +- src/gui/painting/qprinter.cpp | 4 ++-- src/gui/text/qtextlist.cpp | 2 -- 15 files changed, 36 insertions(+), 40 deletions(-) diff --git a/doc/src/paintsystem.qdoc b/doc/src/paintsystem.qdoc index 56f60a3c9..a75908bbe 100644 --- a/doc/src/paintsystem.qdoc +++ b/doc/src/paintsystem.qdoc @@ -292,9 +292,7 @@ looking the same. Qt provides the QPicture::load() and QPicture::save() functions - for loading and saving pictures. But in addition the QPictureIO - class is provided to enable the programmer to install new picture - file formats in addition to those that Qt provides. + as well as streaming operators for loading and saving pictures. \section2 Printer diff --git a/doc/src/resources.qdoc b/doc/src/resources.qdoc index e4d4c3592..6f3f939cd 100644 --- a/doc/src/resources.qdoc +++ b/doc/src/resources.qdoc @@ -175,7 +175,7 @@ Qt's resources support the concept of a search path list. If you then refer to a resource with \c : instead of \c :/ as the prefix, the resource will be looked up using the search path list. The search - path list is empty at startup; call QDir::addResourceSearchPath() to + path list is empty at startup; call QDir::addSearchPath() to add paths to it. If you have resources in a static library, you might need to diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index 244299caf..102386869 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -362,17 +362,19 @@ QDataStream::~QDataStream() /*! \fn QIODevice *QDataStream::device() const - Returns the I/O device currently set. + Returns the I/O device currently set, or 0 if no + device is currently set. - \sa setDevice(), unsetDevice() + \sa setDevice() */ /*! void QDataStream::setDevice(QIODevice *d) - Sets the I/O device to \a d. + Sets the I/O device to \a d, which can be 0 + to unset to current I/O device. - \sa device(), unsetDevice() + \sa device() */ void QDataStream::setDevice(QIODevice *d) diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 8d23d3586..e75c31465 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -305,7 +305,7 @@ void QProcessPrivate::Channel::clear() writes to its standard output and standard error will be written to the standard output and standard error of the main process. - \sa setReadChannelMode() + \sa setProcessChannelMode() */ /*! @@ -862,7 +862,7 @@ void QProcess::setReadChannelMode(ProcessChannelMode mode) Returns the channel mode of the QProcess standard output and standard error channels. - \sa setReadChannelMode(), ProcessChannelMode, setReadChannel() + \sa setProcessChannelMode(), ProcessChannelMode, setReadChannel() */ QProcess::ProcessChannelMode QProcess::processChannelMode() const { @@ -879,7 +879,7 @@ QProcess::ProcessChannelMode QProcess::processChannelMode() const \snippet doc/src/snippets/code/src_corelib_io_qprocess.cpp 0 - \sa readChannelMode(), ProcessChannelMode, setReadChannel() + \sa processChannelMode(), ProcessChannelMode, setReadChannel() */ void QProcess::setProcessChannelMode(ProcessChannelMode mode) { diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index a70b92fb1..16927ea0a 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -575,7 +575,7 @@ QResource::addSearchPath(const QString &path) Returns the current search path list. This list is consulted when creating a relative resource. - \sa addSearchPath() + \sa QDir::addSearchPath() QDir::setSearchPaths() */ QStringList diff --git a/src/gui/dialogs/qabstractprintdialog.cpp b/src/gui/dialogs/qabstractprintdialog.cpp index 2ffc40089..beb69182f 100644 --- a/src/gui/dialogs/qabstractprintdialog.cpp +++ b/src/gui/dialogs/qabstractprintdialog.cpp @@ -395,10 +395,8 @@ void QAbstractPrintDialogPrivate::setPrinter(QPrinter *newPrinter) On Windows and Mac OS X, the native print dialog is used, which means that some QWidget and QDialog properties set on the dialog won't be respected. - The native print dialog on - Mac OS X does not support setting printer options, i.e. - QAbstractPrintDialog::setEnabledOptions() and - QAbstractPrintDialog::addEnabledOption() have no effect. + The native print dialog on Mac OS X does not support setting printer options, + i.e. setOptions() and setOption() have no effect. In Qt 4.4, it was possible to use the static functions to show a sheet on Mac OS X. This is no longer supported in Qt 4.5. If you want this diff --git a/src/gui/graphicsview/qgraphicssceneevent.cpp b/src/gui/graphicsview/qgraphicssceneevent.cpp index 53019f2e1..92af0ccbb 100644 --- a/src/gui/graphicsview/qgraphicssceneevent.cpp +++ b/src/gui/graphicsview/qgraphicssceneevent.cpp @@ -1476,7 +1476,7 @@ void QGraphicsSceneDragDropEvent::acceptProposedAction() /*! Returns the action that was performed in this drag and drop. This should be set by the receiver of the drop and is - returned by QDrag::start(). + returned by QDrag::exec(). \sa setDropAction(), acceptProposedAction() */ diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 7d7dde1b1..dd5676570 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -590,9 +590,8 @@ bool QImageData::checkForAlphaPixels() const The mirrored() function returns a mirror of the image in the desired direction, the scaled() returns a copy of the image scaled - to a rectangle of the desired measures, the rgbSwapped() function - constructs a BGR image from a RGB image, and the alphaChannel() - function constructs an image from this image's alpha channel. + to a rectangle of the desired measures, and the rgbSwapped() function + constructs a BGR image from a RGB image. The scaledToWidth() and scaledToHeight() functions return scaled copies of the image. diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp index 121b1df33..25656571b 100644 --- a/src/gui/itemviews/qlistwidget.cpp +++ b/src/gui/itemviews/qlistwidget.cpp @@ -1289,7 +1289,7 @@ void QListWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft, This signal is emitted whenever the selection changes. - \sa selectedItems() isItemSelected() currentItemChanged() + \sa selectedItems() QListWidgetItem::isSelected() currentItemChanged() */ /*! diff --git a/src/gui/itemviews/qtablewidget.cpp b/src/gui/itemviews/qtablewidget.cpp index d975d58e5..5756f35b7 100644 --- a/src/gui/itemviews/qtablewidget.cpp +++ b/src/gui/itemviews/qtablewidget.cpp @@ -1719,7 +1719,7 @@ void QTableWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft, This signal is emitted whenever the selection changes. - \sa selectedItems() isItemSelected() + \sa selectedItems() QTableWidgetItem::isSelected() */ diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp index ccfa568de..e724a7d2c 100644 --- a/src/gui/itemviews/qtreewidget.cpp +++ b/src/gui/itemviews/qtreewidget.cpp @@ -2437,7 +2437,7 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft, \note This signal will not be emitted if an item changes its state when expandAll() is invoked. - \sa isItemExpanded(), itemCollapsed(), expandItem() + \sa QTreeWidgetItem::isExpanded(), itemCollapsed(), expandItem() */ /*! @@ -2449,7 +2449,7 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft, \note This signal will not be emitted if an item changes its state when collapseAll() is invoked. - \sa isItemExpanded(), itemExpanded(), collapseItem() + \sa QTreeWidgetItem::isExpanded(), itemExpanded(), collapseItem() */ /*! @@ -3109,9 +3109,9 @@ bool QTreeWidget::isItemExpanded(const QTreeWidgetItem *item) const \sa expandItem(), collapseItem(), itemExpanded() - \obsolete + \obsolete - This function is deprecated. Use \l{QTreeWidgetItem::setExpanded()} instead. + This function is deprecated. Use \l{QTreeWidgetItem::setExpanded()} instead. */ void QTreeWidget::setItemExpanded(const QTreeWidgetItem *item, bool expand) { diff --git a/src/gui/kernel/qgridlayout.cpp b/src/gui/kernel/qgridlayout.cpp index 8dbc3cb7d..7ac874e9e 100644 --- a/src/gui/kernel/qgridlayout.cpp +++ b/src/gui/kernel/qgridlayout.cpp @@ -1034,14 +1034,15 @@ QRect QGridLayoutPrivate::cellRect(int row, int col) const other layouts into the cells of your grid layout using addWidget(), addItem(), and addLayout(). - QGridLayout also includes two margin widths: the margin() and the - spacing(). The margin is the width of the reserved space along - each of the QGridLayout's four sides. The spacing is the width of - the automatically allocated spacing between neighboring boxes. - - The default margin() and spacing() values are provided by the - style. The default margin Qt styles specify is 9 for child - widgets and 11 for windows. The spacing defaults to the same as + QGridLayout also includes two margin widths: + the \l{getContentsMargins()}{contents margin} and the spacing(). + The contents margin is the width of the reserved space along each + of the QGridLayout's four sides. The spacing() is the width of the + automatically allocated spacing between neighboring boxes. + + The default contents margin values are provided by the + \l{QStyle::pixelMetric()}{style}. The default value Qt styles specify + is 9 for child widgets and 11 for windows. The spacing defaults to the same as the margin width for a top-level layout, or to the same as the parent layout. @@ -1078,7 +1079,7 @@ QGridLayout::QGridLayout() #ifdef QT3_SUPPORT /*! - \obsolete + \obsolete Constructs a new QGridLayout with \a nRows rows, \a nCols columns and parent widget, \a parent. \a parent may not be 0. The grid layout is called \a name. diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index 027d5c89a..ea86cf590 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -3156,7 +3156,7 @@ void QPainterPath::addRoundRect(const QRectF &r, int xRnd, int yRnd) Set operations on paths will treat the paths as areas. Non-closed paths will be treated as implicitly closed. - \sa intersected(), subtracted(), subtractedInverted() + \sa intersected(), subtracted() */ QPainterPath QPainterPath::united(const QPainterPath &p) const { diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp index 411b74dd6..02a5a0216 100644 --- a/src/gui/painting/qprinter.cpp +++ b/src/gui/painting/qprinter.cpp @@ -2162,8 +2162,8 @@ bool QPrinter::collateCopiesEnabled() const } /*! - Use QPrintDialog::addEnabledOption(QPrintDialog::PrintCollateCopies) - or QPrintDialog::setEnabledOptions(QPrintDialog::enabledOptions() + Use QPrintDialog::setOption(QPrintDialog::PrintCollateCopies) + or QPrintDialog::setOptions(QPrintDialog::options() & ~QPrintDialog::PrintCollateCopies) instead, depending on \a enable. */ diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp index 02b1c63dc..5e9898a02 100644 --- a/src/gui/text/qtextlist.cpp +++ b/src/gui/text/qtextlist.cpp @@ -129,8 +129,6 @@ QTextList::~QTextList() /*! Returns the number of items in the list. - - \sa isEmpty() */ int QTextList::count() const { -- cgit v1.2.3 From 7bd3b2655bf11d829f2bae26b75a757d9b30aa03 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 25 Jul 2009 16:12:35 +0200 Subject: Doc: Replace more links to obsolete APIs. --- doc/src/snippets/code/doc_src_styles.qdoc | 2 +- doc/src/styles.qdoc | 16 ++++++++-------- src/gui/styles/qstyle.cpp | 26 +++++--------------------- src/gui/styles/qstyleoption.cpp | 10 ++++------ 4 files changed, 18 insertions(+), 36 deletions(-) diff --git a/doc/src/snippets/code/doc_src_styles.qdoc b/doc/src/snippets/code/doc_src_styles.qdoc index e11dc0523..9d5756a36 100644 --- a/doc/src/snippets/code/doc_src_styles.qdoc +++ b/doc/src/snippets/code/doc_src_styles.qdoc @@ -1,5 +1,5 @@ //! [0] - opt.init(q); + opt.initFrom(q); if (down) opt.state |= QStyle::State_Sunken; if (tristate && noChange) diff --git a/doc/src/styles.qdoc b/doc/src/styles.qdoc index b818c4ae5..752fef097 100644 --- a/doc/src/styles.qdoc +++ b/doc/src/styles.qdoc @@ -246,7 +246,7 @@ defined by the \l{QStyle::}{State} enum. Some of the state flags have different meanings depending on the widget, but others are common for all widgets like State_Disabled. It is QStyleOption that sets - the common states with QStyleOption::init(); the rest of the + the common states with QStyleOption::initFrom(); the rest of the states are set by the individual widgets. Most notably, the style options contain the palette and bounding @@ -502,7 +502,7 @@ \snippet doc/src/snippets/code/doc_src_styles.qdoc 0 First we let QStyleOption set up the option with the information - that is common for all widgets with \c init(). We will look at + that is common for all widgets with \c initFrom(). We will look at this shortly. The down boolean is true when the user press the box down; this is @@ -514,7 +514,7 @@ set - you set this in QStyle::polish(). In addition, the style option also contains the text, icon, and icon size of the button. - \l{QStyleOption::}{init()} sets up the style option with the + \l{QStyleOption::}{initFrom()} sets up the style option with the attributes that are common for all widgets. We print its implementation here: @@ -726,9 +726,9 @@ \section2 Common Widget Properties Some states and variables are common for all widgets. These are - set with QStyleOption::init(). Not all elements use this function; + set with QStyleOption::initFrom(). Not all elements use this function; it is the widgets that create the style options, and for some - elements the information from \l{QStyleOption::}{init()} is not + elements the information from \l{QStyleOption::}{initFrom()} is not necessary. A table with the common states follows: @@ -1451,7 +1451,7 @@ \o Set if it is a horizontal splitter \endtable - QSplitter does not use \l{QStyleOption::}{init()} to set up its + QSplitter does not use \l{QStyleOption::}{initFrom()} to set up its option; it sets the State_MouseOver and State_Disabled flags itself. @@ -1625,7 +1625,7 @@ QToolBarSaparator uses QStyleOption for their style option. It sets the State_horizontal flag if the toolbar they live in is - horizontal. Other than that, they use \l{QStyleOption::}{init()}. + horizontal. Other than that, they use \l{QStyleOption::}{initFrom()}. The style option for QToolBar is QStyleOptionToolBar. The only state flag set (besides the common flags) is State_Horizontal @@ -1757,7 +1757,7 @@ The setup of the style option for CE_MenuTearOff and CE_MenuScroller also uses QStyleOptionMenuItem; they only set the \c menuRect variable in addition to the common settings with - QStyleOption's \l{QStyleOption::}{init()}. + QStyleOption's \l{QStyleOption::}{initFrom()}. \section3 Menu Bar diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp index a5ab80ef8..c86997675 100644 --- a/src/gui/styles/qstyle.cpp +++ b/src/gui/styles/qstyle.cpp @@ -1108,7 +1108,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, \value CC_ScrollBar A scroll bar, like QScrollBar. \value CC_Slider A slider, like QSlider. \value CC_ToolButton A tool button, like QToolButton. - \value CC_TitleBar A Title bar, like those used in QWorkspace. + \value CC_TitleBar A Title bar, like those used in QMdiSubWindow. \value CC_Q3ListView Used for drawing the Q3ListView class. \value CC_GroupBox A group box, like QGroupBox. \value CC_Dial A dial, like QDial. @@ -1894,7 +1894,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, can follow some existing GUI style or guideline. \value SP_TitleBarMinButton Minimize button on title bars (e.g., - in QWorkspace). + in QMdiSubWindow). \value SP_TitleBarMenuButton Menu button on a title bar. \value SP_TitleBarMaxButton Maximize button on title bars. \value SP_TitleBarCloseButton Close button on title bars. @@ -1966,22 +1966,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, \value SP_CustomBase Base value for custom standard pixmaps; custom values must be greater than this value. - \sa standardPixmap() standardIcon() -*/ - -/*### - \enum QStyle::IconMode - - This enum represents the effects performed on a pixmap to achieve a - GUI style's perferred way of representing the image in different - states. - - \value IM_Disabled A disabled pixmap (drawn on disabled widgets) - \value IM_Active An active pixmap (drawn on active tool buttons and menu items) - \value IM_CustomBase Base value for custom PixmapTypes; custom - values must be greater than this value - - \sa generatedIconPixmap() + \sa standardIcon() */ /*! @@ -2264,7 +2249,7 @@ QPalette QStyle::standardPalette() const slot in your subclass instead. The standardIcon() function will dynamically detect the slot and call it. - \sa standardIconImplementation(), standardPixmap() + \sa standardIconImplementation() */ QIcon QStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const @@ -2289,8 +2274,7 @@ QIcon QStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *opti subclass; because of binary compatibility constraints, the standardIcon() function (introduced in Qt 4.1) is not virtual. Instead, standardIcon() will dynamically detect and call - \e this slot. The default implementation simply calls the - standardPixmap() function with the given parameters. + \e this slot. The \a standardIcon is a standard pixmap which can follow some existing GUI style or guideline. The \a option argument can be diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp index e1743702d..0ff1ccfae 100644 --- a/src/gui/styles/qstyleoption.cpp +++ b/src/gui/styles/qstyleoption.cpp @@ -4258,8 +4258,7 @@ QStyleOptionRubberBand::QStyleOptionRubberBand(int version) parameters for drawing a title bar. QStyleOptionTitleBar contains all the information that QStyle - functions need to draw the title bars of QWorkspace's MDI - children. + functions need to draw the title bar of a QMdiSubWindow. For performance reasons, the access to the member variables is direct (i.e., using the \c . or \c -> operator). This low-level feel @@ -4269,7 +4268,7 @@ QStyleOptionRubberBand::QStyleOptionRubberBand(int version) For an example demonstrating how style options can be used, see the \l {widgets/styles}{Styles} example. - \sa QStyleOption, QStyleOptionComplex, QWorkspace + \sa QStyleOption, QStyleOptionComplex, QMdiSubWindow */ /*! @@ -4983,8 +4982,7 @@ QStyleOptionSizeGrip::QStyleOptionSizeGrip(int version) */ /*! - Constructs a QStyleOptionGraphicsItem. The levelOfDetail parameter is - initialized to 1. + Constructs a QStyleOptionGraphicsItem. */ QStyleOptionGraphicsItem::QStyleOptionGraphicsItem() : QStyleOption(Version, Type), levelOfDetail(1) @@ -5054,7 +5052,7 @@ qreal QStyleOptionGraphicsItem::levelOfDetailFromTransform(const QTransform &wor To find the dimentions of an item in screen coordinates (i.e., pixels), you can use the mapping functions of QMatrix, such as QMatrix::map(). - \sa QStyleOptionGraphicsItem::levelOfDetail + \sa QStyleOptionGraphicsItem::levelOfDetailFromTransform() */ /*! -- cgit v1.2.3 From 965639a06e624534f4ad8e869fea7b2df33a657d Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 25 Jul 2009 21:29:32 +0200 Subject: Doc: Document that coordinates are dropped. --- src/gui/math3d/qvector3d.cpp | 6 ++++-- src/gui/math3d/qvector4d.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp index 881f47c84..c1f5a3e51 100644 --- a/src/gui/math3d/qvector3d.cpp +++ b/src/gui/math3d/qvector3d.cpp @@ -513,7 +513,8 @@ QVector4D QVector3D::toVector4D() const /*! \fn QPoint QVector3D::toPoint() const - Returns the QPoint form of this 3D vector. + Returns the QPoint form of this 3D vector. The z coordinate + is dropped. \sa toPointF(), toVector2D() */ @@ -521,7 +522,8 @@ QVector4D QVector3D::toVector4D() const /*! \fn QPointF QVector3D::toPointF() const - Returns the QPointF form of this 3D vector. + Returns the QPointF form of this 3D vector. The z coordinate + is dropped. \sa toPoint(), toVector2D() */ diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp index 1a84db600..ae03bc78a 100644 --- a/src/gui/math3d/qvector4d.cpp +++ b/src/gui/math3d/qvector4d.cpp @@ -484,7 +484,8 @@ QVector3D QVector4D::toVector3DAffine() const /*! \fn QPoint QVector4D::toPoint() const - Returns the QPoint form of this 4D vector. + Returns the QPoint form of this 4D vector. The z and w coordinates + are dropped. \sa toPointF(), toVector2D() */ @@ -492,7 +493,8 @@ QVector3D QVector4D::toVector3DAffine() const /*! \fn QPointF QVector4D::toPointF() const - Returns the QPointF form of this 4D vector. + Returns the QPointF form of this 4D vector. The z and w coordinates + are dropped. \sa toPoint(), toVector2D() */ -- cgit v1.2.3 From 99ecf471075088eba042575772196e63cab5b8f8 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sun, 26 Jul 2009 00:43:12 +0200 Subject: Doc: Replace QMatrix with QTransform and respective functions in various places. --- doc/src/coordsys.qdoc | 18 +++++++++--------- doc/src/examples/transformations.qdoc | 6 +++--- doc/src/graphicsview.qdoc | 10 +++------- src/gui/graphicsview/qgraphicsscene.cpp | 2 +- src/gui/graphicsview/qgraphicsview.cpp | 20 +++++++++++--------- src/gui/painting/qmatrix.cpp | 7 +++++-- src/gui/painting/qpainter.cpp | 2 +- 7 files changed, 33 insertions(+), 32 deletions(-) diff --git a/doc/src/coordsys.qdoc b/doc/src/coordsys.qdoc index 7ba3946c5..4a73d6744 100644 --- a/doc/src/coordsys.qdoc +++ b/doc/src/coordsys.qdoc @@ -224,12 +224,12 @@ Transformations} demo for a visualization of a sheared coordinate system. All the transformation operations operate on QPainter's transformation matrix that you can retrieve using the - QPainter::worldMatrix() function. A matrix transforms a point in the - plane to another point. + QPainter::worldTransform() function. A matrix transforms a point + in the plane to another point. If you need the same transformations over and over, you can also - use QMatrix objects and the QPainter::worldMatrix() and - QPainter::setWorldMatrix() functions. You can at any time save the + use QTransform objects and the QPainter::worldTransform() and + QPainter::setWorldTransform() functions. You can at any time save the QPainter's transformation matrix by calling the QPainter::save() function which saves the matrix on an internal stack. The QPainter::restore() function pops it back. @@ -318,7 +318,7 @@ transformations affects the result. For more information about the transformation matrix, see the - QMatrix documentation. + QTransform documentation. \section1 Window-Viewport Conversion @@ -328,7 +328,7 @@ The mapping of the logical coordinates to the physical coordinates are handled by QPainter's world transformation \l - {QPainter::worldMatrix()}{worldMatrix()} (described in the \l + {QPainter::worldTransform()}{worldTransform()} (described in the \l Transformations section), and QPainter's \l {QPainter::viewport()}{viewport()} and \l {QPainter::window()}{window()}. The viewport represents the @@ -419,14 +419,14 @@ \endtable The 2D transformations of the coordinate system are specified - using the QMatrix class: + using the QTransform class: \table \header \o Class \o Description \row - \o QMatrix + \o QTransform \o - A 3 x 3 transformation matrix. Use QMatrix to rotate, shear, + A 3 x 3 transformation matrix. Use QTransform to rotate, shear, scale, or translate the coordinate system. \endtable diff --git a/doc/src/examples/transformations.qdoc b/doc/src/examples/transformations.qdoc index a449d4ca1..a5f92a8d1 100644 --- a/doc/src/examples/transformations.qdoc +++ b/doc/src/examples/transformations.qdoc @@ -85,10 +85,10 @@ All the tranformation operations operate on QPainter's tranformation matrix that you can retrieve using the - QPainter::matrix() function. A matrix transforms a point in the + QPainter::worldTransform() function. A matrix transforms a point in the plane to another point. For more information about the transformation matrix, see the \l {The Coordinate System} and - QMatrix documentation. + QTransform documentation. \snippet examples/painting/transformations/renderarea.h 0 @@ -375,7 +375,7 @@ All the tranformation operations operate on QPainter's tranformation matrix. For more information about the transformation matrix, see the \l {The Coordinate System} and - QMatrix documentation. + QTransform documentation. The Qt reference documentation provides several painting demos. Among these is the \l {demos/affine}{Affine diff --git a/doc/src/graphicsview.qdoc b/doc/src/graphicsview.qdoc index f42c0d470..89f9f3d71 100644 --- a/doc/src/graphicsview.qdoc +++ b/doc/src/graphicsview.qdoc @@ -141,7 +141,7 @@ to scene coordinates where appropriate), before sending the events to the visualized scene. - Using its transformation matrix, QGraphicsView::matrix(), the view can + Using its transformation matrix, QGraphicsView::transform(), the view can \e transform the scene's coordinate system. This allows advanced navigation features such as zooming and rotation. For convenience, QGraphicsView also provides functions for translating between view and @@ -174,7 +174,7 @@ also provides many functions for mapping coordinates between the item and the scene, and from item to item. Also, like QGraphicsView, it can transform its coordinate system using a matrix: - QGraphicsItem::matrix(). This is useful for rotating and scaling + QGraphicsItem::transform(). This is useful for rotating and scaling individual items. Items can contain other items (children). Parent items' @@ -461,11 +461,7 @@ By making an item a child of another, you can achieve the most essential feature of item grouping: the items will move together, and - all transformations are propagated from parent to child. QGraphicsItem - can also handle all events for its children (see - QGraphicsItem::setHandlesChildEvents()). This allows the parent item - to act on behalf of its children, effectively treating all items as - one. + all transformations are propagated from parent to child. In addition, QGraphicsItemGroup is a special item that combines child event handling with a useful interface for adding and removing items diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 9b6414dbb..0dce26b35 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -4697,7 +4697,7 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool background has been drawn, and before the foreground has been drawn. All painting is done in \e scene coordinates. Before drawing each item, the painter must be transformed using - QGraphicsItem::sceneMatrix(). + QGraphicsItem::sceneTransform(). The \a options parameter is the list of style option objects for each item in \a items. The \a numItems parameter is the number of diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 53b044cd8..ca55f2e96 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -97,8 +97,8 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime < setViewport(new QGLWidget). QGraphicsView takes ownership of the viewport widget. - QGraphicsView supports affine transformations, using QMatrix. You can - either pass a matrix to setMatrix(), or you can call one of the + QGraphicsView supports affine transformations, using QTransform. You can + either pass a matrix to setTransform(), or you can call one of the convenience functions rotate(), scale(), translate() or shear(). The most two common transformations are scaling, which is used to implement zooming, and rotation. QGraphicsView keeps the center of the view fixed @@ -1583,7 +1583,7 @@ void QGraphicsView::setSceneRect(const QRectF &rect) Returns the current transformation matrix for the view. If no current transformation is set, the identity matrix is returned. - \sa setMatrix(), rotate(), scale(), shear(), translate() + \sa setMatrix(), transform(), rotate(), scale(), shear(), translate() */ QMatrix QGraphicsView::matrix() const { @@ -1615,7 +1615,7 @@ QMatrix QGraphicsView::matrix() const a view coordinate to a floating point scene coordinate, or mapFromScene() to map from floating point scene coordinates to view coordinates. - \sa matrix(), rotate(), scale(), shear(), translate() + \sa matrix(), setTransform(), rotate(), scale(), shear(), translate() */ void QGraphicsView::setMatrix(const QMatrix &matrix, bool combine) { @@ -1624,6 +1624,8 @@ void QGraphicsView::setMatrix(const QMatrix &matrix, bool combine) /*! Resets the view transformation matrix to the identity matrix. + + \sa resetTransform() */ void QGraphicsView::resetMatrix() { @@ -1633,7 +1635,7 @@ void QGraphicsView::resetMatrix() /*! Rotates the current view transformation \a angle degrees clockwise. - \sa setMatrix(), matrix(), scale(), shear(), translate() + \sa setTransform(), transform(), scale(), shear(), translate() */ void QGraphicsView::rotate(qreal angle) { @@ -1646,7 +1648,7 @@ void QGraphicsView::rotate(qreal angle) /*! Scales the current view transformation by (\a sx, \a sy). - \sa setMatrix(), matrix(), rotate(), shear(), translate() + \sa setTransform(), transform(), rotate(), shear(), translate() */ void QGraphicsView::scale(qreal sx, qreal sy) { @@ -1659,7 +1661,7 @@ void QGraphicsView::scale(qreal sx, qreal sy) /*! Shears the current view transformation by (\a sh, \a sv). - \sa setMatrix(), matrix(), rotate(), scale(), translate() + \sa setTransform(), transform(), rotate(), scale(), translate() */ void QGraphicsView::shear(qreal sh, qreal sv) { @@ -1672,7 +1674,7 @@ void QGraphicsView::shear(qreal sh, qreal sv) /*! Translates the current view transformation by (\a dx, \a dy). - \sa setMatrix(), matrix(), rotate(), shear() + \sa setTransform(), transform(), rotate(), shear() */ void QGraphicsView::translate(qreal dx, qreal dy) { @@ -1830,7 +1832,7 @@ void QGraphicsView::ensureVisible(const QGraphicsItem *item, int xmargin, int ym If \a rect is empty, or if the viewport is too small, this function will do nothing. - \sa setMatrix(), ensureVisible(), centerOn() + \sa setTransform(), ensureVisible(), centerOn() */ void QGraphicsView::fitInView(const QRectF &rect, Qt::AspectRatioMode aspectRatioMode) { diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp index 221267f0b..bc0823583 100644 --- a/src/gui/painting/qmatrix.cpp +++ b/src/gui/painting/qmatrix.cpp @@ -60,6 +60,9 @@ QT_BEGIN_NAMESPACE A matrix specifies how to translate, scale, shear or rotate the coordinate system, and is typically used when rendering graphics. + QMatrix, in contrast to QTransform, does not allow perspective + transformations. QTransform is the recommended transformation + class in Qt. A QMatrix object can be built using the setMatrix(), scale(), rotate(), translate() and shear() functions. Alternatively, it @@ -172,8 +175,8 @@ QT_BEGIN_NAMESPACE \snippet doc/src/snippets/matrix/matrix.cpp 2 \endtable - \sa QPainter, {The Coordinate System}, {demos/affine}{Affine - Transformations Demo}, {Transformations Example} + \sa QPainter, QTransform, {The Coordinate System}, + {demos/affine}{Affine Transformations Demo}, {Transformations Example} */ diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 04600718c..4c10a5a08 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -1016,7 +1016,7 @@ void QPainterPrivate::updateState(QPainterState *newState) \o layoutDirection() defines the layout direction used by the painter when drawing text. - \o matrixEnabled() tells whether world transformation is enabled. + \o worldMatrixEnabled() tells whether world transformation is enabled. \o viewTransformEnabled() tells whether view transformation is enabled. -- cgit v1.2.3 From 092b004126f82545b4237e43507f21920d06ac58 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sun, 26 Jul 2009 00:43:36 +0200 Subject: Doc: Remove more links to obsolete functions. --- doc/src/examples/scribble.qdoc | 2 +- src/gui/embedded/qdirectpainter_qws.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/src/examples/scribble.qdoc b/doc/src/examples/scribble.qdoc index 3a5e01861..f32440a77 100644 --- a/doc/src/examples/scribble.qdoc +++ b/doc/src/examples/scribble.qdoc @@ -354,7 +354,7 @@ To retrieve a new pen width in the \c penWidth() slot, we use QInputDialog. The QInputDialog class provides a simple convenience dialog to get a single value from the user. We use - the static QInputDialog::getInteger() function, which combines a + the static QInputDialog::getInt() function, which combines a QLabel and a QSpinBox. The QSpinBox is initialized with the scribble area's pen width, allows a range from 1 to 50, a step of 1 (meaning that the up and down arrow increment or decrement the diff --git a/src/gui/embedded/qdirectpainter_qws.cpp b/src/gui/embedded/qdirectpainter_qws.cpp index e97367c8c..b3dff066d 100644 --- a/src/gui/embedded/qdirectpainter_qws.cpp +++ b/src/gui/embedded/qdirectpainter_qws.cpp @@ -150,14 +150,14 @@ QT_BEGIN_NAMESPACE \value ReservedSynchronous The allocated region will never change and each function that changes the allocated region will be blocking. - \sa reservedRegion(), allocatedRegion() + \sa allocatedRegion() */ /*! \fn QRegion QDirectPainter::region() \obsolete - Use QDirectPainter::reservedRegion() instead. + Use QDirectPainter::allocatedRegion() instead. */ static inline QScreen *getPrimaryScreen() @@ -346,7 +346,7 @@ void QDirectPainter::setRegion(const QRegion ®ion) returned by the allocatedRegion() function. Otherwise they might differ (see \l {Dynamic Allocation} for details). - \sa geometry(), setRegion() + \sa geometry(), setRegion(), allocatedRegion() */ QRegion QDirectPainter::requestedRegion() const { @@ -540,7 +540,7 @@ void QDirectPainter::lower() any. If not released explicitly, the region will be released on application exit. - \sa reservedRegion(), {Static Allocation} + \sa allocatedRegion(), {Static Allocation} \obsolete -- cgit v1.2.3 From f68fed388dcdba6ab6dad3af4933bcd3aa123cf8 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Fri, 24 Jul 2009 03:40:51 +0200 Subject: Add QGraphicsItem::ItemAutoDetectsFocusProxy and improve subfocus support. If you set this flag on an item, and descendant item that gains input focus will become this item's focus proxy. This simplifies how focus proxy items are assigned from QML; instead of binding the possible focusProxy property to a named child widget, this assignment happens automatically as you set the focus property of a descendant to true. As part of this change, QGraphicsWidget::focusWidget behavior has been improved and moved into QGraphicsItem. For example, if you set focus on an item that it's part of a scene, it can gain focus once the parent has been assigned (which is how object trees are built in QML). Autotests are included. Reviewed-by: Michael Brasser --- src/gui/graphicsview/qgraphicsitem.cpp | 120 ++++++++++++++++++++----- src/gui/graphicsview/qgraphicsitem.h | 5 +- src/gui/graphicsview/qgraphicsitem_p.h | 9 +- src/gui/graphicsview/qgraphicsscene.cpp | 29 ++++-- src/gui/graphicsview/qgraphicswidget.cpp | 8 +- src/gui/graphicsview/qgraphicswidget_p.cpp | 34 ------- src/gui/graphicsview/qgraphicswidget_p.h | 4 - tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 107 ++++++++++++++++++++++ 8 files changed, 243 insertions(+), 73 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 0ff3685f3..242535468 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -325,6 +325,10 @@ \value ItemAcceptsInputMethod The item supports input methods typically used for Asian languages. This flag was introduced in Qt 4.6. + + \value ItemAutoDetectsFocusProxy The item will assign any child that + gains input focus as its focus proxy. See also focusProxy(). + This flag was introduced in Qt 4.6. */ /*! @@ -907,12 +911,12 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent) scene->d_func()->index->itemChange(q, QGraphicsItem::ItemParentChange, newParentVariant); } - if (QGraphicsWidget *w = isWidget ? static_cast(q) : q->parentWidget()) { - // Update the child focus chain; when reparenting a widget that has a + QGraphicsItem *lastSubFocusItem = subFocusItem; + if (subFocusItem) { + // Update the child focus chain; when reparenting an item that has a // focus child, ensure that that focus child clears its focus child // chain from our parents before it's reparented. - if (QGraphicsWidget *focusChild = w->focusWidget()) - focusChild->clearFocus(); + subFocusItem->clearFocus(); } // We anticipate geometry changes. If the item is deleted, it will be @@ -1000,6 +1004,21 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent) resolveDepth(parent ? parent->d_ptr->depth : -1); dirtySceneTransform = 1; + // Restore the sub focus chain. + if (lastSubFocusItem) + lastSubFocusItem->d_ptr->setSubFocus(); + + // Auto-update focus proxy. The closest parent that detects + // focus proxies is updated as the proxy gains or loses focus. + QGraphicsItem *p = newParent; + while (p) { + if (p->d_ptr->flags & QGraphicsItem::ItemAutoDetectsFocusProxy) { + p->setFocusProxy(q); + break; + } + p = p->d_ptr->parent; + } + // Deliver post-change notification q->itemChange(QGraphicsItem::ItemParentHasChanged, newParentVariant); @@ -2463,33 +2482,45 @@ bool QGraphicsItem::hasFocus() const be passed into any focus event generated by this function; it is used to give an explanation of what caused the item to get focus. - Only items that set the ItemIsFocusable flag can accept keyboard focus. + Only enabled items that set the ItemIsFocusable flag can accept keyboard + focus. - If this item is not visible (i.e., isVisible() returns false), not - enabled, not associated with a scene, or if it already has input focus, - this function will do nothing. + If this item is not visible, or not associated with a scene, it will not + gain immediate input focus. However, it will be registered as the preferred + focus item for its subtree of items, should it later become visible. As a result of calling this function, this item will receive a focus in event with \a focusReason. If another item already has focus, that item will first receive a focus out event indicating that it has lost input focus. - \sa clearFocus(), hasFocus() + \sa clearFocus(), hasFocus(), focusItem() */ void QGraphicsItem::setFocus(Qt::FocusReason focusReason) { - if (!d_ptr->scene || !isEnabled() || hasFocus() || !(d_ptr->flags & ItemIsFocusable)) + // Disabled / unfocusable items cannot accept focus. + if (!isEnabled() || !(d_ptr->flags & QGraphicsItem::ItemIsFocusable)) + return; + + // Find focus proxy. + QGraphicsItem *f = this; + while (f->d_ptr->focusProxy) + f = f->d_ptr->focusProxy; + + // Return if it already has focus. + if (d_ptr->scene && d_ptr->scene->focusItem() == f) return; - QGraphicsItem *item = this; - QGraphicsItem *f; - while ((f = item->d_ptr->focusProxy)) - item = f; - if (item->isVisible()) { - // Visible items immediately gain focus from scene. - d_ptr->scene->d_func()->setFocusItemHelper(item, focusReason); - } else if (item->d_ptr->isWidget) { - // Just set up subfocus. - static_cast(item)->d_func()->setFocusWidget(); + + // Update the child focus chain. + d_ptr->setSubFocus(); + + // Update the scene's focus item. + if (d_ptr->scene) { + QGraphicsWidget *w = window(); + if (!w || w->isActiveWindow()) { + // Visible items immediately gain focus from scene. + d_ptr->scene->d_func()->setFocusItemHelper(f, focusReason); + } } } @@ -2508,10 +2539,8 @@ void QGraphicsItem::clearFocus() { if (!d_ptr->scene) return; - if (d_ptr->isWidget) { - // Invisible widget items with focus must explicitly clear subfocus. - static_cast(this)->d_func()->clearFocusWidget(); - } + // Invisible items with focus must explicitly clear subfocus. + d_ptr->clearSubFocus(); if (hasFocus()) { // If this item has the scene's input focus, clear it. d_ptr->scene->setFocusItem(0); @@ -2578,6 +2607,18 @@ void QGraphicsItem::setFocusProxy(QGraphicsItem *item) } } +/*! + If this item, a child or descendant of this item currently has input + focus, this function will return a pointer to that item. If + no descendant has input focus, 0 is returned. + + \sa QWidget::focusWidget() +*/ +QGraphicsItem *QGraphicsItem::focusItem() const +{ + return d_ptr->subFocusItem; +} + /*! \since 4.4 Grabs the mouse input. @@ -4666,6 +4707,34 @@ void QGraphicsItemPrivate::ensureSceneTransform() ensureSceneTransformRecursive(&that); } +/*! + \internal +*/ +void QGraphicsItemPrivate::setSubFocus() +{ + // Update focus child chain. + QGraphicsItem *item = q_ptr; + QGraphicsItem *parent = item; + bool hidden = !visible; + do { + parent->d_func()->subFocusItem = item; + } while (!parent->isWindow() && (parent = parent->d_ptr->parent) && (!hidden || !parent->d_func()->visible)); +} + +/*! + \internal +*/ +void QGraphicsItemPrivate::clearSubFocus() +{ + // Reset focus child chain. + QGraphicsItem *parent = q_ptr; + do { + if (parent->d_ptr->subFocusItem != q_ptr) + break; + parent->d_ptr->subFocusItem = 0; + } while (!parent->isWindow() && (parent = parent->d_ptr->parent)); +} + /*! \internal @@ -10038,6 +10107,9 @@ QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlag flag) case QGraphicsItem::ItemAcceptsInputMethod: str = "ItemAcceptsInputMethod"; break; + case QGraphicsItem::ItemAutoDetectsFocusProxy: + str = "ItemAutoDetectsFocusProxy"; + break; } debug << str; return debug; diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index 5c9297f6e..0e21a47f0 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -99,7 +99,8 @@ public: ItemUsesExtendedStyleOption = 0x200, ItemHasNoContents = 0x400, ItemSendsGeometryChanges = 0x800, - ItemAcceptsInputMethod = 0x1000 + ItemAcceptsInputMethod = 0x1000, + ItemAutoDetectsFocusProxy = 0x2000 // NB! Don't forget to increase the d_ptr->flags bit field by 1 when adding a new flag. }; Q_DECLARE_FLAGS(GraphicsItemFlags, GraphicsItemFlag) @@ -229,6 +230,8 @@ public: QGraphicsItem *focusProxy() const; void setFocusProxy(QGraphicsItem *item); + QGraphicsItem *focusItem() const; + void grabMouse(); void ungrabMouse(); void grabKeyboard(); diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 1cf188e6a..c208b9966 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -123,6 +123,7 @@ public: siblingIndex(-1), depth(0), focusProxy(0), + subFocusItem(0), acceptedMouseButtons(0x1f), visible(1), explicitlyHidden(0), @@ -391,6 +392,9 @@ public: || (childrenCombineOpacity() && isFullyTransparent()); } + void setSubFocus(); + void clearSubFocus(); + inline QTransform transformToParent() const; inline void ensureSortedChildren(); @@ -411,6 +415,7 @@ public: int siblingIndex; int depth; QGraphicsItem *focusProxy; + QGraphicsItem *subFocusItem; // Packed 32 bytes quint32 acceptedMouseButtons : 5; @@ -440,7 +445,7 @@ public: // New 32 bits quint32 fullUpdatePending : 1; - quint32 flags : 13; + quint32 flags : 14; quint32 dirtyChildrenBoundingRect : 1; quint32 paintedViewBoundingRectsNeedRepaint : 1; quint32 dirtySceneTransform : 1; @@ -453,7 +458,7 @@ public: quint32 acceptedTouchBeginEvent : 1; quint32 filtersDescendantEvents : 1; quint32 sceneTransformTranslateOnly : 1; - quint32 unused : 6; // feel free to use + quint32 unused : 5; // feel free to use // Optional stacking order int globalStackingOrder; diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 0dce26b35..f223cbe91 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -484,6 +484,8 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item) index->removeItem(item); } + item->d_ptr->clearSubFocus(); + if (!item->d_ptr->inDestructor && item == tabFocusFirst) { QGraphicsWidget *widget = static_cast(item); widget->d_func()->fixFocusChainBeforeReparenting(0, 0); @@ -572,17 +574,34 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item, Q_Q(QGraphicsScene); if (item == focusItem) return; + + // Clear focus if asked to set focus on something that can't + // accept input focus. if (item && (!(item->flags() & QGraphicsItem::ItemIsFocusable) || !item->isVisible() || !item->isEnabled())) { item = 0; } + // Set focus on the scene if an item requests focus. if (item) { q->setFocus(focusReason); if (item == focusItem) return; } + // Auto-update focus proxy. The closest parent that detects + // focus proxies is updated as the proxy gains or loses focus. + if (item) { + QGraphicsItem *p = item->d_ptr->parent; + while (p) { + if (p->d_ptr->flags & QGraphicsItem::ItemAutoDetectsFocusProxy) { + p->setFocusProxy(item); + break; + } + p = p->d_ptr->parent; + } + } + if (focusItem) { QFocusEvent event(QEvent::FocusOut, focusReason); lastFocusItem = focusItem; @@ -602,11 +621,6 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item, } if (item) { - if (item->isWidget()) { - // Update focus child chain. - static_cast(item)->d_func()->setFocusWidget(); - } - focusItem = item; QFocusEvent event(QEvent::FocusIn, focusReason); sendEvent(item, &event); @@ -2342,6 +2356,11 @@ void QGraphicsScene::addItem(QGraphicsItem *item) // Deliver post-change notification item->itemChange(QGraphicsItem::ItemSceneHasChanged, newSceneVariant); + // Ensure that newly added items that have subfocus set, gain + // focus automatically if there isn't a focus item already. + if (!d->focusItem && item->focusItem()) + item->focusItem()->setFocus(); + d->updateInputMethodSensitivityInViews(); } diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index 86c0b4866..6937584ad 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -1716,14 +1716,16 @@ void QGraphicsWidget::setFocusPolicy(Qt::FocusPolicy policy) /*! If this widget, a child or descendant of this widget currently has input focus, this function will return a pointer to that widget. If - no descendant has input focus, 0 is returned. + no descendant widget has input focus, 0 is returned. - \sa QWidget::focusWidget() + \sa QGraphicsItem::focusItem(), QWidget::focusWidget() */ QGraphicsWidget *QGraphicsWidget::focusWidget() const { Q_D(const QGraphicsWidget); - return d->focusChild; + if (d->subFocusItem && d->subFocusItem->d_ptr->isWidget) + return static_cast(d->subFocusItem); + return 0; } /*! \property QGraphicsWidget::horizontalShear diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp index c9212f7af..8eac063ae 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.cpp +++ b/src/gui/graphicsview/qgraphicswidget_p.cpp @@ -626,34 +626,6 @@ bool QGraphicsWidgetPrivate::hasDecoration() const return (windowFlags & Qt::Window) && (windowFlags & Qt::WindowTitleHint); } -/*! - \internal -*/ -void QGraphicsWidgetPrivate::setFocusWidget() -{ - // Update focus child chain. - QGraphicsWidget *widget = static_cast(q_ptr); - QGraphicsWidget *parent = widget; - bool hidden = !visible; - do { - parent->d_func()->focusChild = widget; - } while (!parent->isWindow() && (parent = parent->parentWidget()) && (!hidden || !parent->d_func()->visible)); -} - -/*! - \internal -*/ -void QGraphicsWidgetPrivate::clearFocusWidget() -{ - // Reset focus child chain. - QGraphicsWidget *parent = static_cast(q_ptr); - do { - if (parent->d_func()->focusChild != q_ptr) - break; - parent->d_func()->focusChild = 0; - } while (!parent->isWindow() && (parent = parent->parentWidget())); -} - /** * is called after a reparent has taken place to fix up the focus chain(s) */ @@ -670,12 +642,6 @@ void QGraphicsWidgetPrivate::fixFocusChainBeforeReparenting(QGraphicsWidget *new QGraphicsWidget *firstOld = 0; bool wasPreviousNew = true; - - if (focusChild) { - // Ensure that the current focus child doesn't leave pointers around - // before reparenting. - focusChild->clearFocus(); - } while (w != q) { bool isCurrentNew = q->isAncestorOf(w); diff --git a/src/gui/graphicsview/qgraphicswidget_p.h b/src/gui/graphicsview/qgraphicswidget_p.h index 0c34baa2e..92e520a86 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.h +++ b/src/gui/graphicsview/qgraphicswidget_p.h @@ -83,7 +83,6 @@ public: focusPolicy(Qt::NoFocus), focusNext(0), focusPrev(0), - focusChild(0), windowFlags(0), windowData(0), setWindowFrameMargins(false), @@ -178,9 +177,6 @@ public: Qt::FocusPolicy focusPolicy; QGraphicsWidget *focusNext; QGraphicsWidget *focusPrev; - QGraphicsWidget *focusChild; - void setFocusWidget(); - void clearFocusWidget(); // Windows Qt::WindowFlags windowFlags; diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 011e480b0..9f1693dc8 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -275,6 +275,9 @@ private slots: void itemHasNoContents(); void hitTestUntransformableItem(); void focusProxy(); + void autoDetectFocusProxy(); + void subFocus(); + void reverseCreateAutoFocusProxy(); // task specific tests below me void task141694_textItemEnsureVisible(); @@ -7464,5 +7467,109 @@ void tst_QGraphicsItem::focusProxy() QCOMPARE(item3->focusProxy(), (QGraphicsItem *)0); } +void tst_QGraphicsItem::autoDetectFocusProxy() +{ + QGraphicsScene scene; + QGraphicsItem *item = scene.addRect(0, 0, 10, 10); + item->setFlag(QGraphicsItem::ItemIsFocusable); + + QGraphicsItem *item2 = scene.addRect(0, 0, 10, 10); + item2->setParentItem(item); + item2->setFlag(QGraphicsItem::ItemIsFocusable); + + QGraphicsItem *item3 = scene.addRect(0, 0, 10, 10); + item3->setParentItem(item2); + item3->setFlag(QGraphicsItem::ItemIsFocusable); + + item->setFlag(QGraphicsItem::ItemAutoDetectsFocusProxy); + QCOMPARE(item->focusProxy(), (QGraphicsItem *)0); + + item2->setFocus(); + QCOMPARE(item->focusProxy(), item2); + item3->setFocus(); + QCOMPARE(item->focusProxy(), item3); + item3->clearFocus(); + QCOMPARE(item->focusProxy(), item3); +} + +void tst_QGraphicsItem::subFocus() +{ + // Construct a text item that's not part of a scene (yet) + // and has no parent. Setting focus on it will not make + // the item gain input focus; that requires a scene. But + // it does set subfocus, indicating that the item wishes + // to gain focus later. + QGraphicsTextItem *text = new QGraphicsTextItem("Hello"); + text->setTextInteractionFlags(Qt::TextEditorInteraction); + QVERIFY(!text->hasFocus()); + text->setFocus(); + QVERIFY(!text->hasFocus()); + QCOMPARE(text->focusItem(), (QGraphicsItem *)text); + + // Add a sibling. + QGraphicsTextItem *text2 = new QGraphicsTextItem("Hi"); + text2->setTextInteractionFlags(Qt::TextEditorInteraction); + text2->setPos(30, 30); + + // Add both items to a scene and check that it's text that + // got input focus. + QGraphicsScene scene; + scene.addItem(text); + scene.addItem(text2); + QVERIFY(text->hasFocus()); + + text->setData(0, "text"); + text2->setData(0, "text2"); + + // Remove text2 and set subfocus on it. Then readd. Reparent it onto the + // other item and see that although it becomes text's focus + // item, it does not immediately gain input focus. + scene.removeItem(text2); + text2->setFocus(); + scene.addItem(text2); + QCOMPARE(text2->focusItem(), (QGraphicsItem *)text2); + text2->setParentItem(text); + qDebug() << text->data(0).toString() << (void*)(QGraphicsItem *)text; + qDebug() << text2->data(0).toString() << (void*)(QGraphicsItem *)text2; + QCOMPARE(text->focusItem(), (QGraphicsItem *)text2); + QVERIFY(text->hasFocus()); + QVERIFY(!text2->hasFocus()); + + // Remove both items from the scene, restore subfocus and + // readd them. Now the subfocus should kick in and give + // text2 focus. + scene.removeItem(text); + QCOMPARE(text->focusItem(), (QGraphicsItem *)0); + QCOMPARE(text2->focusItem(), (QGraphicsItem *)0); + text2->setFocus(); + QCOMPARE(text->focusItem(), (QGraphicsItem *)text2); + QCOMPARE(text2->focusItem(), (QGraphicsItem *)text2); + scene.addItem(text); + + // Hiding and showing text should pass focus to text2. + QCOMPARE(text->focusItem(), (QGraphicsItem *)text2); + QVERIFY(text2->hasFocus()); +} + +void tst_QGraphicsItem::reverseCreateAutoFocusProxy() +{ + QGraphicsTextItem *text = new QGraphicsTextItem; + text->setTextInteractionFlags(Qt::TextEditorInteraction); + text->setFlag(QGraphicsItem::ItemAutoDetectsFocusProxy); + + QGraphicsTextItem *text2 = new QGraphicsTextItem; + text2->setTextInteractionFlags(Qt::TextEditorInteraction); + text2->setFocus(); + QVERIFY(!text2->hasFocus()); + QCOMPARE(text->focusProxy(), (QGraphicsItem *)0); + text2->setParentItem(text); + QCOMPARE(text->focusProxy(), (QGraphicsItem *)text2); + QCOMPARE(text->focusItem(), (QGraphicsItem *)text2); + + QGraphicsScene scene; + scene.addItem(text); + QVERIFY(text2->hasFocus()); +} + QTEST_MAIN(tst_QGraphicsItem) #include "tst_qgraphicsitem.moc" -- cgit v1.2.3 From 3bf3981c7026de9017887d08312391b54fe8afc6 Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Mon, 27 Jul 2009 09:30:20 +0200 Subject: Really, really fix HPUX this time The conditionals were the wrong way round. Reviewed-By: Samuel --- src/opengl/qgl_x11.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 64f5810d2..a95b7a084 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1648,7 +1648,7 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qi void QGLTexture::deleteBoundPixmap() { -#if !defined(GLX_VERSION_1_3) || defined(Q_OS_HPUX) +#if defined(GLX_VERSION_1_3) && !defined(Q_OS_HPUX) if (boundPixmap) { glXReleaseTexImageEXT(QX11Info::display(), boundPixmap, GLX_FRONT_LEFT_EXT); glXDestroyPixmap(QX11Info::display(), boundPixmap); -- cgit v1.2.3 From 8bbe5d242a9534ad29f25f800fcb5b600b3d6750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Mon, 27 Jul 2009 09:53:47 +0200 Subject: Mac/Cocoa: Remove separator line for "unified document tabs" Call [NSToolbar setShowsBaselineSeparator] on the (unified) toolbar if the window contains tabs in document mode. Task-number: 252660 Reviewed-by: Richard Moe Gustavsen --- src/gui/kernel/qt_cocoa_helpers_mac.mm | 11 +++++++++++ src/gui/kernel/qt_cocoa_helpers_mac_p.h | 1 + src/gui/widgets/qtabbar.cpp | 10 +++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index 3d4164a31..1c4177e12 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -1069,6 +1069,17 @@ void qt_mac_updateContentBorderMetricts(void * /*OSWindowRef */window, const ::H #endif } +void qt_mac_showBaseLineSeparator(void * /*OSWindowRef */window, bool show) +{ +#if QT_MAC_USE_COCOA + QMacCocoaAutoReleasePool pool; + OSWindowRef theWindow = static_cast(window); + NSToolbar *macToolbar = [theWindow toolbar]; + if (macToolbar) + [macToolbar setShowsBaselineSeparator: show]; +#endif +} + QStringList qt_mac_NSArrayToQStringList(void *nsarray) { QStringList result; diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h index 2cc7dee03..741edd6be 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h +++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h @@ -125,6 +125,7 @@ void macWindowSetHasShadow( void * /*OSWindowRef*/ window, bool hasShadow ); void macWindowFlush(void * /*OSWindowRef*/ window); void macSendToolbarChangeEvent(QWidget *widget); void qt_mac_updateContentBorderMetricts(void * /*OSWindowRef */window, const ::HIContentBorderMetrics &metrics); +void qt_mac_showBaseLineSeparator(void * /*OSWindowRef */window, bool show); void * /*NSImage */qt_mac_create_nsimage(const QPixmap &pm); void qt_mac_update_mouseTracking(QWidget *widget); OSStatus qt_mac_drawCGImage(CGContextRef cg, const CGRect *inbounds, CGImageRef); diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp index 690e624b1..6b027b1a4 100644 --- a/src/gui/widgets/qtabbar.cpp +++ b/src/gui/widgets/qtabbar.cpp @@ -87,13 +87,17 @@ void QTabBarPrivate::updateMacBorderMetrics() // TODO: get metrics to preserve the bottom value // TODO: test tab bar position - // push the black line at the bottom of the menu bar down to the client are so we can paint over it + OSWindowRef window = qt_mac_window_for(q); + + // push base line separator down to the client are so we can paint over it (Carbon) metrics.top = (documentMode && q->isVisible()) ? 1 : 0; metrics.bottom = 0; metrics.left = 0; metrics.right = 0; - - qt_mac_updateContentBorderMetricts(qt_mac_window_for(q), metrics); + qt_mac_updateContentBorderMetricts(window, metrics); + + // hide the base line separator if the tabs have docuemnt mode enabled (Cocoa) + qt_mac_showBaseLineSeparator(window, !documentMode); } #endif } -- cgit v1.2.3 From 2ff32a829ca0c8f2781eac0f90d14a0d70755e10 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Mon, 27 Jul 2009 10:03:27 +0200 Subject: Doc - fixed a typo [describles->describes] Task: 258573 Reviewed-By: TrustMe --- src/gui/styles/qstyleoption.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp index 0ff1ccfae..7547dda3a 100644 --- a/src/gui/styles/qstyleoption.cpp +++ b/src/gui/styles/qstyleoption.cpp @@ -657,7 +657,7 @@ QStyleOptionFrameV2 &QStyleOptionFrameV2::operator=(const QStyleOptionFrame &oth /*! \enum QStyleOptionFrameV2::FrameFeature - This enum describles the different types of features a frame can have. + This enum describes the different types of features a frame can have. \value None Indicates a normal frame. \value Flat Indicates a flat frame. @@ -899,7 +899,7 @@ QStyleOptionViewItemV2 &QStyleOptionViewItemV2::operator=(const QStyleOptionView /*! \enum QStyleOptionViewItemV2::ViewItemFeature - This enum describles the different types of features an item can have. + This enum describes the different types of features an item can have. \value None Indicates a normal item. \value WrapText Indicates an item with wrapped text. -- cgit v1.2.3 From a1ca36db95758e8929bcf2fbe4ecd1b2b5047f20 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 27 Jul 2009 11:10:18 +0200 Subject: Doc: replace links to obsolete APIs --- src/script/qscriptengine.cpp | 2 +- src/script/qscriptvalue.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/script/qscriptengine.cpp b/src/script/qscriptengine.cpp index de78403d1..911d71483 100644 --- a/src/script/qscriptengine.cpp +++ b/src/script/qscriptengine.cpp @@ -935,7 +935,7 @@ QScriptSyntaxCheckResult QScriptEngine::checkSyntax(const QString &program) the file name is accessible through the "fileName" property if it's provided with this function. - \sa canEvaluate(), hasUncaughtException(), isEvaluating(), abortEvaluation() + \sa checkSyntax(), hasUncaughtException(), isEvaluating(), abortEvaluation() */ QScriptValue QScriptEngine::evaluate(const QString &program, const QString &fileName, int lineNumber) { diff --git a/src/script/qscriptvalue.cpp b/src/script/qscriptvalue.cpp index 48e1318b5..520e76f1f 100644 --- a/src/script/qscriptvalue.cpp +++ b/src/script/qscriptvalue.cpp @@ -1442,7 +1442,7 @@ bool QScriptValue::isUndefined() const Note that function values, variant values, and QObject values are objects, so this function returns true for such values. - \sa toObject(), QScriptEngine::newObject() + \sa QScriptEngine::toObject(), QScriptEngine::newObject() */ bool QScriptValue::isObject() const { -- cgit v1.2.3 From 9745d9d485e153d2f22e04770e9caecb9f0eaaca Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Mon, 27 Jul 2009 11:18:35 +0200 Subject: QHttpNetworkConnectionPrivate: Removed wrong comment The comment was speaking about upload progress, however the code is about download progress. Reviewed-by: TrustMe --- src/network/access/qhttpnetworkconnection.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 3f0b24460..66aeb22cd 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -571,9 +571,6 @@ bool QHttpNetworkConnectionPrivate::expand(QAbstractSocket *socket, QHttpNetwork // make sure that the reply is valid if (channels[i].reply != reply) return true; - // emit dataReadProgress signal (signal is currently not connected - // to the rest of QNAM) since readProgress of the - // QNonContiguousByteDevice is used emit reply->dataReadProgress(reply->d_func()->totalProgress, 0); // make sure that the reply is valid if (channels[i].reply != reply) @@ -700,9 +697,6 @@ void QHttpNetworkConnectionPrivate::receiveReply(QAbstractSocket *socket, QHttpN // make sure that the reply is valid if (channels[i].reply != reply) return; - // emit dataReadProgress signal (signal is currently not connected - // to the rest of QNAM) since readProgress of the - // QNonContiguousByteDevice is used emit reply->dataReadProgress(reply->d_func()->totalProgress, reply->d_func()->bodyLength); // make sure that the reply is valid if (channels[i].reply != reply) -- cgit v1.2.3 From a5190a05bfe809339e9612c9013f0f8213791768 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 27 Jul 2009 11:26:22 +0200 Subject: Doc: QTextLayout is the class to use in interactive text controls. --- doc/src/i18n.qdoc | 12 ++++++------ src/gui/text/qfontmetrics.cpp | 10 ++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/doc/src/i18n.qdoc b/doc/src/i18n.qdoc index 596492633..d043f45ae 100644 --- a/doc/src/i18n.qdoc +++ b/doc/src/i18n.qdoc @@ -144,13 +144,13 @@ aligned, so for these languages use the version of drawText() that takes a QRect since this will align in accordance with the language. - \o When you write your own text input controls, use \l - QFontMetrics::charWidth() to determine the width of a character in a - string. In some languages (e.g. Arabic or languages from the Indian + \o When you write your own text input controls, use QTextLayout. + In some languages (e.g. Arabic or languages from the Indian subcontinent), the width and shape of a glyph changes depending on the - surrounding characters. Writing input controls usually requires a - certain knowledge of the scripts it is going to be used in. Usually - the easiest way is to subclass QLineEdit or QTextEdit. + surrounding characters, which QTextLayout takes into account. + Writing input controls usually requires a certain knowledge of the + scripts it is going to be used in. Usually the easiest way is to + subclass QLineEdit or QTextEdit. \endlist diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index abab91c65..f5580111b 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -557,9 +557,8 @@ int QFontMetrics::width(const QString &text, int len) const \warning This function will produce incorrect results for Arabic characters or non-spacing marks in the middle of a string, as the glyph shaping and positioning of marks that happens when - processing strings cannot be taken into account. Use charWidth() - instead if you aren't looking for the width of isolated - characters. + processing strings cannot be taken into account. When implementing + an interactive text control, use QTextLayout instead. \sa boundingRect(), charWidth() */ @@ -1386,9 +1385,8 @@ qreal QFontMetricsF::width(const QString &text) const \warning This function will produce incorrect results for Arabic characters or non-spacing marks in the middle of a string, as the glyph shaping and positioning of marks that happens when - processing strings cannot be taken into account. Use charWidth() - instead if you aren't looking for the width of isolated - characters. + processing strings cannot be taken into account. When implementing + an interactive text control, use QTextLayout instead. \sa boundingRect() */ -- cgit v1.2.3 From 1ba51aebe818746c13c58fda8e9c8cf4f73ea1ba Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 27 Jul 2009 11:33:59 +0200 Subject: Doc: QTextLayout is the class to use in interactive text controls. --- src/gui/text/qfontmetrics.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index f5580111b..012c0f6c7 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -560,7 +560,7 @@ int QFontMetrics::width(const QString &text, int len) const processing strings cannot be taken into account. When implementing an interactive text control, use QTextLayout instead. - \sa boundingRect(), charWidth() + \sa boundingRect() */ int QFontMetrics::width(QChar ch) const { -- cgit v1.2.3 From 14b772b03e0c1f5bcd5f7c25d0ae35593a9f6427 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 27 Jul 2009 12:18:51 +0200 Subject: Doc: Obsolete QMatrix and QPainter APIs using it. QTransform and respective APIs should be used. Still some changes required - Some references to QMatrix left in documentation - Qt code uses QMatrix APIs (ie translationX) Reviewed-by: Samuel --- doc/src/paintsystem.qdoc | 2 +- src/gui/image/qbitmap.cpp | 3 +- src/gui/painting/qmatrix.cpp | 1 + src/gui/painting/qpainter.cpp | 90 ++++++++++++++++++++++++++----------------- 4 files changed, 58 insertions(+), 38 deletions(-) diff --git a/doc/src/paintsystem.qdoc b/doc/src/paintsystem.qdoc index a75908bbe..c2434e07b 100644 --- a/doc/src/paintsystem.qdoc +++ b/doc/src/paintsystem.qdoc @@ -121,7 +121,7 @@ Normally, QPainter draws in a "natural" coordinate system, but it is able to perform view and world transformations using the - QMatrix class. For more information, see \l {The Coordinate + QTransform class. For more information, see \l {The Coordinate System} documentation which also describes the rendering process, i.e. the relation between the logical representation and the rendered pixels, and the benefits of anti-aliased painting. diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp index 6bca5045a..78c3396a1 100644 --- a/src/gui/image/qbitmap.cpp +++ b/src/gui/image/qbitmap.cpp @@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE 0 for black and 1 for white. The QBitmap class provides the transformed() function returning a - transformed copy of the bitmap; use the QMatrix argument to + transformed copy of the bitmap; use the QTransform argument to translate, scale, shear, and rotate the bitmap. In addition, QBitmap provides the static fromData() function which returns a bitmap constructed from the given \c uchar data, and the static @@ -318,6 +318,7 @@ QBitmap QBitmap::transformed(const QTransform &matrix) const /*! \overload + \obsolete This convenience function converts the \a matrix to a QTransform and calls the overloaded function. diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp index bc0823583..39f4d95d8 100644 --- a/src/gui/painting/qmatrix.cpp +++ b/src/gui/painting/qmatrix.cpp @@ -55,6 +55,7 @@ QT_BEGIN_NAMESPACE \class QMatrix \brief The QMatrix class specifies 2D transformations of a coordinate system. + \obsolete \ingroup multimedia diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 4c10a5a08..4ebfc5014 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -1005,7 +1005,7 @@ void QPainterPrivate::updateState(QPainterState *newState) \o brushOrigin() defines the origin of the tiled brushes, normally the origin of widget's background. - \o viewport(), window(), worldMatrix() make up the painter's coordinate + \o viewport(), window(), worldTransform() make up the painter's coordinate transformation system. For more information, see the \l {Coordinate Transformations} section and the \l {The Coordinate System} documentation. @@ -1212,15 +1212,15 @@ void QPainterPrivate::updateState(QPainterState *newState) \endtable All the tranformation operations operate on the transformation - worldMatrix(). A matrix transforms a point in the plane to another + worldTransform(). A matrix transforms a point in the plane to another point. For more information about the transformation matrix, see - the \l {The Coordinate System} and QMatrix documentation. + the \l {The Coordinate System} and QTransform documentation. - The setWorldMatrix() function can replace or add to the currently - set worldMatrix(). The resetMatrix() function resets any + The setWorldTransform() function can replace or add to the currently + set worldTransform(). The resetTransform() function resets any transformations that were made using translate(), scale(), - shear(), rotate(), setWorldMatrix(), setViewport() and setWindow() - functions. The deviceMatrix() returns the matrix that transforms + shear(), rotate(), setWorldTransform(), setViewport() and setWindow() + functions. The deviceTransform() returns the matrix that transforms from logical coordinates to device coordinates of the platform dependent paint device. The latter function is only needed when using platform painting commands on the platform dependent handle, @@ -1229,11 +1229,11 @@ void QPainterPrivate::updateState(QPainterState *newState) When drawing with QPainter, we specify points using logical coordinates which then are converted into the physical coordinates of the paint device. The mapping of the logical coordinates to the - physical coordinates are handled by QPainter's combinedMatrix(), a - combination of viewport() and window() and worldMatrix(). The + physical coordinates are handled by QPainter's combinedTransform(), a + combination of viewport() and window() and worldTransform(). The viewport() represents the physical coordinates specifying an arbitrary rectangle, the window() describes the same rectangle in - logical coordinates, and the worldMatrix() is identical with the + logical coordinates, and the worldTransform() is identical with the transformation matrix. See also \l {The Coordinate System} documentation. @@ -2677,6 +2677,7 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op) /*! \since 4.2 + \obsolete Sets the transformation matrix to \a matrix and enables transformations. @@ -2715,7 +2716,7 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op) and window-viewport conversion, see \l {The Coordinate System} documentation. - \sa worldMatrixEnabled(), QMatrix + \sa setWorldTransform(), QTransform */ void QPainter::setWorldMatrix(const QMatrix &matrix, bool combine) @@ -2725,6 +2726,7 @@ void QPainter::setWorldMatrix(const QMatrix &matrix, bool combine) /*! \since 4.2 + \obsolete Returns the world transformation matrix. @@ -2774,6 +2776,7 @@ const QMatrix &QPainter::matrix() const /*! \since 4.2 + \obsolete Returns the transformation matrix combining the current window/viewport and world transformation. @@ -2781,7 +2784,7 @@ const QMatrix &QPainter::matrix() const It is advisable to use combinedTransform() instead of this function to preserve the properties of perspective transformations. - \sa setWorldMatrix(), setWindow(), setViewport() + \sa setWorldTransform(), setWindow(), setViewport() */ QMatrix QPainter::combinedMatrix() const { @@ -2790,6 +2793,8 @@ QMatrix QPainter::combinedMatrix() const /*! + \obsolete + Returns the matrix that transforms from logical coordinates to device coordinates of the platform dependent paint device. @@ -2817,6 +2822,8 @@ const QMatrix &QPainter::deviceMatrix() const } /*! + \obsolete + Resets any transformations that were made using translate(), scale(), shear(), rotate(), setWorldMatrix(), setViewport() and setWindow(). @@ -2841,7 +2848,7 @@ void QPainter::resetMatrix() transformations if \a enable is false. The world transformation matrix is not changed. - \sa worldMatrixEnabled(), worldMatrix(), {QPainter#Coordinate + \sa worldMatrixEnabled(), worldTransform(), {QPainter#Coordinate Transformations}{Coordinate Transformations} */ @@ -2870,7 +2877,7 @@ void QPainter::setWorldMatrixEnabled(bool enable) Returns true if world transformation is enabled; otherwise returns false. - \sa setWorldMatrixEnabled(), worldMatrix(), {The Coordinate System} + \sa setWorldMatrixEnabled(), worldTransform(), {The Coordinate System} */ bool QPainter::worldMatrixEnabled() const @@ -2912,7 +2919,7 @@ bool QPainter::matrixEnabled() const /*! Scales the coordinate system by (\a{sx}, \a{sy}). - \sa setWorldMatrix() {QPainter#Coordinate Transformations}{Coordinate + \sa setWorldTransform() {QPainter#Coordinate Transformations}{Coordinate Transformations} */ @@ -2936,7 +2943,7 @@ void QPainter::scale(qreal sx, qreal sy) /*! Shears the coordinate system by (\a{sh}, \a{sv}). - \sa setWorldMatrix(), {QPainter#Coordinate Transformations}{Coordinate + \sa setWorldTransform(), {QPainter#Coordinate Transformations}{Coordinate Transformations} */ @@ -2962,7 +2969,7 @@ void QPainter::shear(qreal sh, qreal sv) Rotates the coordinate system the given \a angle clockwise. - \sa setWorldMatrix(), {QPainter#Coordinate Transformations}{Coordinate + \sa setWorldTransform(), {QPainter#Coordinate Transformations}{Coordinate Transformations} */ @@ -2987,7 +2994,7 @@ void QPainter::rotate(qreal a) Translates the coordinate system by the given \a offset; i.e. the given \a offset is added to points. - \sa setWorldMatrix(), {QPainter#Coordinate Transformations}{Coordinate + \sa setWorldTransform(), {QPainter#Coordinate Transformations}{Coordinate Transformations} */ void QPainter::translate(const QPointF &offset) @@ -6769,7 +6776,7 @@ QPainter::RenderHints QPainter::renderHints() const Returns true if view transformation is enabled; otherwise returns false. - \sa setViewTransformEnabled(), worldMatrix() + \sa setViewTransformEnabled(), worldTransform() */ bool QPainter::viewTransformEnabled() const @@ -6925,7 +6932,7 @@ QRect QPainter::viewport() const /*! \fn void QPainter::resetXForm() \compat - Use resetMatrix() instead. + Use resetTransform() instead. */ /*! \fn void QPainter::setViewXForm(bool enabled) @@ -6971,14 +6978,16 @@ void QPainter::setViewTransformEnabled(bool enable) #ifdef QT3_SUPPORT /*! - Use the worldMatrix() combined with QMatrix::dx() instead. + \obsolete + + Use the worldTransform() combined with QTransform::dx() instead. \oldcode QPainter painter(this); qreal x = painter.translationX(); \newcode QPainter painter(this); - qreal x = painter.worldMatrix().dx(); + qreal x = painter.worldTransform().dx(); \endcode */ qreal QPainter::translationX() const @@ -6992,14 +7001,16 @@ qreal QPainter::translationX() const } /*! - Use the worldMatrix() combined with QMatrix::dy() instead. + \obsolete + + Use the worldTransform() combined with QTransform::dy() instead. \oldcode QPainter painter(this); qreal y = painter.translationY(); \newcode QPainter painter(this); - qreal y = painter.worldMatrix().dy(); + qreal y = painter.worldTransform().dy(); \endcode */ qreal QPainter::translationY() const @@ -7097,7 +7108,7 @@ QPolygon QPainter::xForm(const QPolygon &a) const QPolygon transformed = painter.xForm(polygon, index, count) \newcode QPainter painter(this); - QPolygon transformed = polygon.mid(index, count) * painter.combinedMatrix(); + QPolygon transformed = polygon.mid(index, count) * painter.combinedTransform(); \endcode */ @@ -7112,15 +7123,16 @@ QPolygon QPainter::xForm(const QPolygon &av, int index, int npoints) const /*! \fn QPoint QPainter::xFormDev(const QPoint &point) const \overload + \obsolete - Use combinedTransform() combined with QMatrix::inverted() instead. + Use combinedTransform() combined with QTransform::inverted() instead. \oldcode QPainter painter(this); QPoint transformed = painter.xFormDev(point); \newcode QPainter painter(this); - QPoint transformed = point * painter.combinedMatrix().inverted(); + QPoint transformed = point * painter.combinedTransform().inverted(); \endcode */ @@ -7139,15 +7151,16 @@ QPoint QPainter::xFormDev(const QPoint &p) const /*! \fn QRect QPainter::xFormDev(const QRect &rectangle) const \overload + \obsolete - Use mapRect() combined with QMatrix::inverted() instead. + Use combinedTransform() combined with QTransform::inverted() instead. \oldcode QPainter painter(this); QRect transformed = painter.xFormDev(rectangle); \newcode QPainter painter(this); - QRect transformed = painter.combinedMatrix().inverted(rectangle); + QRect transformed = painter.combinedTransform().inverted(rectangle); \endcode */ @@ -7167,16 +7180,16 @@ QRect QPainter::xFormDev(const QRect &r) const \overload \fn QPoint QPainter::xFormDev(const QPolygon &polygon) const - \overload + \obsolete - Use combinedMatrix() combined with QMatrix::inverted() instead. + Use combinedTransform() combined with QTransform::inverted() instead. \oldcode QPainter painter(this); QPolygon transformed = painter.xFormDev(rectangle); \newcode QPainter painter(this); - QPolygon transformed = polygon * painter.combinedMatrix().inverted(); + QPolygon transformed = polygon * painter.combinedTransform().inverted(); \endcode */ @@ -7195,15 +7208,16 @@ QPolygon QPainter::xFormDev(const QPolygon &a) const /*! \fn QPolygon QPainter::xFormDev(const QPolygon &polygon, int index, int count) const \overload + \obsolete - Use combinedMatrix() combined with QPolygon::mid() and QMatrix::inverted() instead. + Use combinedTransform() combined with QPolygon::mid() and QTransform::inverted() instead. \oldcode QPainter painter(this); QPolygon transformed = painter.xFormDev(polygon, index, count); \newcode QPainter painter(this); - QPolygon transformed = polygon.mid(index, count) * painter.combinedMatrix().inverted(); + QPolygon transformed = polygon.mid(index, count) * painter.combinedTransform().inverted(); \endcode */ @@ -8107,7 +8121,7 @@ void bitBlt(QPaintDevice *dst, int dx, int dy, \row \o QPaintEngine::DirtyClipRegion \o clipRegion() \row \o QPaintEngine::DirtyCompositionMode \o compositionMode() \row \o QPaintEngine::DirtyFont \o font() - \row \o QPaintEngine::DirtyTransform \o matrix() + \row \o QPaintEngine::DirtyTransform \o transform() \row \o QPaintEngine::DirtyClipEnabled \o isClipEnabled() \row \o QPaintEngine::DirtyPen \o pen() \row \o QPaintEngine::DirtyHints \o renderHints() @@ -8226,10 +8240,14 @@ QFont QPaintEngineState::font() const /*! \since 4.2 + \obsolete Returns the matrix in the current paint engine state. + \note It is advisable to use transform() instead of this function to + preserve the properties of perspective transformations. + This variable should only be used when the state() returns a combination which includes the QPaintEngine::DirtyTransform flag. @@ -8534,7 +8552,7 @@ const QTransform & QPainter::worldTransform() const Returns the transformation matrix combining the current window/viewport and world transformation. - \sa setWorldMatrix(), setWindow(), setViewport() + \sa setWorldTransform(), setWindow(), setViewport() */ QTransform QPainter::combinedTransform() const -- cgit v1.2.3 From f2135cccffbef6d6accb49f404d9b23ade418641 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 27 Jul 2009 13:28:52 +0200 Subject: "enabled" parameter should default to true, as with QGraphicsView and QPainter. Reviewed-by: Simon Hausmann --- src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp | 2 ++ src/3rdparty/webkit/WebKit/qt/Api/qwebview.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp index 34da64426..6c5860cfe 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp @@ -617,6 +617,8 @@ qreal QWebView::textSizeMultiplier() const These hints are used to initialize QPainter before painting the web page. QPainter::TextAntialiasing is enabled by default. + + \sa QPainter::renderHints() */ QPainter::RenderHints QWebView::renderHints() const { diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h index 5c2c7a0b8..0dab92546 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h @@ -106,7 +106,7 @@ public: QPainter::RenderHints renderHints() const; void setRenderHints(QPainter::RenderHints hints); - void setRenderHint(QPainter::RenderHint hint, bool enabled); + void setRenderHint(QPainter::RenderHint hint, bool enabled = true); bool findText(const QString &subString, QWebPage::FindFlags options = 0); -- cgit v1.2.3 From 1edad2af19ee67c3e3504c8226fc3cfef9fd51a1 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 27 Jul 2009 13:23:26 +0200 Subject: Refactor monotonic time code to avoid duplication. Merge the monotonic clock source detection in qeventdispatcher_unix.cpp with that in qcore_unix.cpp. As discussed with Thiago, we're also removing older compat code at the same time (spinning on select() when we think it woke up early). Reviewed-by: Thiago --- src/corelib/kernel/qcore_unix.cpp | 71 ++++++++++++++------ src/corelib/kernel/qcore_unix_p.h | 2 + src/corelib/kernel/qeventdispatcher_unix.cpp | 97 ++-------------------------- src/corelib/kernel/qeventdispatcher_unix_p.h | 4 -- 4 files changed, 60 insertions(+), 114 deletions(-) diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp index c5b0fc760..6ef56fdb8 100644 --- a/src/corelib/kernel/qcore_unix.cpp +++ b/src/corelib/kernel/qcore_unix.cpp @@ -55,37 +55,72 @@ QT_BEGIN_NAMESPACE -static inline timeval gettime() +bool qt_gettime_is_monotonic() { - timeval tv; -#ifndef QT_NO_CLOCK_MONOTONIC - // use the monotonic clock - static volatile bool monotonicClockDisabled = false; - struct timespec ts; - if (!monotonicClockDisabled) { - if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1) { - monotonicClockDisabled = true; - } else { - tv.tv_sec = ts.tv_sec; - tv.tv_usec = ts.tv_nsec / 1000; - return tv; - } +#if (_POSIX_MONOTONIC_CLOCK-0 > 0) || defined(Q_OS_MAC) + return true; +#else + static int returnValue = 0; + + if (returnValue == 0) { +# if (_POSIX_MONOTONIC_CLOCK-0 < 0) + returnValue = -1; +# elif (_POSIX_MONOTONIC_CLOCK == 0) + // detect if the system support monotonic timers + long x = sysconf(_SC_MONOTONIC_CLOCK); + returnValue = (x >= 200112L) ? 1 : -1; +# endif } + + return returnValue != -1; #endif +} + +timeval qt_gettime() +{ + timeval tv; +#if defined(Q_OS_MAC) + static mach_timebase_info_data_t info = {0,0}; + if (info.denom == 0) + mach_timebase_info(&info); + + uint64_t cpu_time = mach_absolute_time(); + uint64_t nsecs = cpu_time * (info.numer / info.denom); + tv.tv_sec = nsecs * 1e-9; + tv.tv_usec = nsecs * 1e-3 - (t.tv_sec * 1e6); + return tv; +#elif (_POSIX_MONOTONIC_CLOCK-0 > 0) + timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + tv.tv_sec = ts.tv_sec; + tv.tv_usec = ts.tv_nsec / 1000; + return tv; +#else +# if !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_BOOTSTRAPPED) + if (qt_gettime_is_monotonic()) { + timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + tv.tv_sec = ts.tv_sec; + tv.tv_usec = ts.tv_nsec / 1000; + return tv; + } +# endif // use gettimeofday ::gettimeofday(&tv, 0); return tv; +#endif } static inline bool time_update(struct timeval *tv, const struct timeval &start, const struct timeval &timeout) { - struct timeval now = gettime(); - if (now < start) { - // clock reset, give up + if (!qt_gettime_is_monotonic()) { + // we cannot recalculate the timeout without a monotonic clock as the time may have changed return false; } + // clock source is monotonic, so we can recalculate how much timeout is left + struct timeval now = qt_gettime(); *tv = timeout + start - now; return true; } @@ -100,7 +135,7 @@ int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept, return ret; } - timeval start = gettime(); + timeval start = qt_gettime(); timeval timeout = *orig_timeout; // loop and recalculate the timeout as needed diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h index dd9784145..bffd67071 100644 --- a/src/corelib/kernel/qcore_unix_p.h +++ b/src/corelib/kernel/qcore_unix_p.h @@ -267,6 +267,8 @@ static inline pid_t qt_safe_waitpid(pid_t pid, int *status, int options) return ret; } +bool qt_gettime_is_monotonic(); +timeval qt_gettime(); Q_CORE_EXPORT int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept, const struct timeval *tv); diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 21395450b..6f1256b31 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -67,25 +67,6 @@ QT_BEGIN_NAMESPACE Q_CORE_EXPORT bool qt_disable_lowpriority_timers=false; -// check for _POSIX_MONOTONIC_CLOCK support -static bool supportsMonotonicClock() -{ - bool returnValue; - -#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) - returnValue = false; -# if (_POSIX_MONOTONIC_CLOCK == 0) - // detect if the system support monotonic timers - long x = sysconf(_SC_MONOTONIC_CLOCK); - returnValue = x >= 200112L; -# endif -#else - returnValue = true; -#endif - - return returnValue; -} - /***************************************************************************** UNIX signal handling *****************************************************************************/ @@ -281,12 +262,11 @@ int QEventDispatcherUNIXPrivate::doSelect(QEventLoop::ProcessEventsFlags flags, */ QTimerInfoList::QTimerInfoList() - : useMonotonicTimers(supportsMonotonicClock()) { - getTime(currentTime); + currentTime = qt_gettime(); #if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) - if (!useMonotonicTimers) { + if (!qt_gettime_is_monotonic()) { // not using monotonic timers, initialize the timeChanged() machinery previousTime = currentTime; @@ -309,8 +289,7 @@ QTimerInfoList::QTimerInfoList() timeval QTimerInfoList::updateCurrentTime() { - getTime(currentTime); - return currentTime; + return (currentTime = qt_gettime()); } #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC)) || defined(QT_BOOTSTRAPPED) @@ -364,38 +343,9 @@ bool QTimerInfoList::timeChanged(timeval *delta) return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); } -void QTimerInfoList::getTime(timeval &t) -{ -#if !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_BOOTSTRAPPED) - if (useMonotonicTimers) { - timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - t.tv_sec = ts.tv_sec; - t.tv_usec = ts.tv_nsec / 1000; - return; - } -#endif - - gettimeofday(&t, 0); - // NTP-related fix - while (t.tv_usec >= 1000000l) { - t.tv_usec -= 1000000l; - ++t.tv_sec; - } - while (t.tv_usec < 0l) { - if (t.tv_sec > 0l) { - t.tv_usec += 1000000l; - --t.tv_sec; - } else { - t.tv_usec = 0l; - break; - } - } -} - void QTimerInfoList::repairTimersIfNeeded() { - if (useMonotonicTimers) + if (qt_gettime_is_monotonic()) return; timeval delta; if (timeChanged(&delta)) @@ -404,25 +354,6 @@ void QTimerInfoList::repairTimersIfNeeded() #else // !(_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(QT_BOOTSTRAPPED) -void QTimerInfoList::getTime(timeval &t) -{ -#if defined(Q_OS_MAC) - static mach_timebase_info_data_t info = {0,0}; - if (info.denom == 0) - mach_timebase_info(&info); - - uint64_t cpu_time = mach_absolute_time(); - uint64_t nsecs = cpu_time * (info.numer / info.denom); - t.tv_sec = nsecs * 1e-9; - t.tv_usec = nsecs * 1e-3 - (t.tv_sec * 1e6); -#else - timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - t.tv_sec = ts.tv_sec; - t.tv_usec = ts.tv_nsec / 1000; -#endif -} - void QTimerInfoList::repairTimersIfNeeded() { } @@ -648,25 +579,7 @@ QEventDispatcherUNIX::~QEventDispatcherUNIX() int QEventDispatcherUNIX::select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, timeval *timeout) { - Q_D(QEventDispatcherUNIX); - if (timeout && d->timerList.useMonotonicTimers) { - // handle the case where select returns with a timeout, too - // soon. - timeval tvStart = d->timerList.currentTime; - timeval tvCurrent = tvStart; - timeval originalTimeout = *timeout; - - int nsel; - do { - timeval tvRest = originalTimeout + tvStart - tvCurrent; - nsel = ::select(nfds, readfds, writefds, exceptfds, &tvRest); - d->timerList.getTime(tvCurrent); - } while (nsel == 0 && (tvCurrent - tvStart) < originalTimeout); - - return nsel; - } - - return ::select(nfds, readfds, writefds, exceptfds, timeout); + return ::qt_safe_select(nfds, readfds, writefds, exceptfds, timeout); } /*! diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index 28e7f9be5..61d94c902 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -141,10 +141,6 @@ class QTimerInfoList : public QList public: QTimerInfoList(); - const bool useMonotonicTimers; - - void getTime(timeval &t); - timeval currentTime; timeval updateCurrentTime(); -- cgit v1.2.3 From fb49d313e30fca8c3af58ecc7ed4310c78e99b79 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 27 Jul 2009 13:31:43 +0200 Subject: Avoid floating point code when converting Mach time to timeval Mac OS X only change Reviewed-by: Thiago --- src/corelib/kernel/qcore_unix.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp index 6ef56fdb8..d0a4d8fcf 100644 --- a/src/corelib/kernel/qcore_unix.cpp +++ b/src/corelib/kernel/qcore_unix.cpp @@ -86,8 +86,8 @@ timeval qt_gettime() uint64_t cpu_time = mach_absolute_time(); uint64_t nsecs = cpu_time * (info.numer / info.denom); - tv.tv_sec = nsecs * 1e-9; - tv.tv_usec = nsecs * 1e-3 - (t.tv_sec * 1e6); + tv.tv_sec = nsecs / 1000000000ull; + tv.tv_usec = (nsecs / 1000) - (t.tv_sec * 1000000); return tv; #elif (_POSIX_MONOTONIC_CLOCK-0 > 0) timespec ts; -- cgit v1.2.3 From 29031b406f0266b0b47ef7e8113ec861a90f201e Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Mon, 27 Jul 2009 13:15:19 +0200 Subject: Fixed SC_ComboBoxArrow returning inverted subControlRect on vista The arrow was reported to be on the wrong side of the control. Technically the arrow part seems to cover the whole rect on Vista and Gtk+ but due to compatibility it is probably safer to keep the old rects for now. Task-number: 252857 Reviewed-by: ogoffart --- src/gui/styles/qwindowsvistastyle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/styles/qwindowsvistastyle.cpp b/src/gui/styles/qwindowsvistastyle.cpp index f3d0f04f9..298207d7c 100644 --- a/src/gui/styles/qwindowsvistastyle.cpp +++ b/src/gui/styles/qwindowsvistastyle.cpp @@ -2229,7 +2229,7 @@ QRect QWindowsVistaStyle::subControlRect(ComplexControl control, const QStyleOpt rect = cb->rect; break; case SC_ComboBoxArrow: - rect.setRect(cb->editable ? xpos : 0, y , wi - xpos, he); + rect.setRect(xpos, y , wi - xpos, he); break; case SC_ComboBoxEditField: rect.setRect(x + margin, y + margin, wi - 2 * margin - 16, he - 2 * margin); -- cgit v1.2.3 From ed00fff3cb3f3f1ec01f5d69168222c3ce8d51b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Mon, 27 Jul 2009 14:17:23 +0200 Subject: Make the Character Palette work on Mac/Cocoa. Handle the case when insertText is called with no corresponding keyDown. This fix is for the Cocoa port. Task-number: 147379 --- src/gui/kernel/qcocoaview_mac.mm | 20 ++++++++++++++++---- src/gui/kernel/qcocoaview_mac_p.h | 1 + 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 3bc348ccc..57c911783 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -200,6 +200,7 @@ extern "C" { composingText = new QString(); composing = false; sendKeyEvents = true; + inKeyDown = false; currentCustomTypes = 0; [self setHidden:YES]; return self; @@ -983,6 +984,7 @@ extern "C" { - (void)keyDown:(NSEvent *)theEvent { + inKeyDown = true; sendKeyEvents = true; QWidget *widgetToGetKey = qwidget; @@ -1002,6 +1004,7 @@ extern "C" { if (!keyOK && !sendToPopup) [super keyDown:theEvent]; } + inKeyDown = false; } @@ -1039,14 +1042,23 @@ extern "C" { - (void) insertText:(id)aString { - if ([aString length] && composing) { - // Send the commit string to the widget. - QString commitText; + QString commitText; + if ([aString length]) { if ([aString isKindOfClass:[NSAttributedString class]]) { - commitText = QCFString::toQString(reinterpret_cast([aString string])); + commitText = QCFString::toQString(reinterpret_cast([aString string])); } else { commitText = QCFString::toQString(reinterpret_cast(aString)); }; + } + + if ([aString length] && !inKeyDown) { + // Handle the case where insertText is called from somewhere else than the keyDown + // implementation, for example when inserting text from the character palette. + QInputMethodEvent e; + e.setCommitString(commitText); + qt_sendSpontaneousEvent(qwidget, &e); + } else if ([aString length] && composing) { + // Send the commit string to the widget. composing = false; sendKeyEvents = false; QInputMethodEvent e; diff --git a/src/gui/kernel/qcocoaview_mac_p.h b/src/gui/kernel/qcocoaview_mac_p.h index 4762b1780..932c6ca2c 100644 --- a/src/gui/kernel/qcocoaview_mac_p.h +++ b/src/gui/kernel/qcocoaview_mac_p.h @@ -85,6 +85,7 @@ Q_GUI_EXPORT bool composing; int composingLength; bool sendKeyEvents; + bool inKeyDown; QString *composingText; QStringList *currentCustomTypes; NSInteger dragEnterSequence; -- cgit v1.2.3 From 521f9b245330665f114238e1a888161c696fed03 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 27 Jul 2009 14:40:51 +0200 Subject: Compile on Mac OS X Need the right include for the mach_*() functions. --- src/corelib/kernel/qcore_unix.cpp | 4 ++++ src/corelib/kernel/qeventdispatcher_unix.cpp | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp index d0a4d8fcf..b321518ea 100644 --- a/src/corelib/kernel/qcore_unix.cpp +++ b/src/corelib/kernel/qcore_unix.cpp @@ -47,6 +47,10 @@ #include "qeventdispatcher_unix_p.h" // for the timeval operators +#ifdef Q_OS_MAC +#include +#endif + #if !defined(QT_NO_CLOCK_MONOTONIC) # if defined(QT_BOOTSTRAPPED) # define QT_NO_CLOCK_MONOTONIC diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 6f1256b31..2943c6d2f 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -59,10 +59,6 @@ # include #endif -#ifdef Q_OS_MAC -#include -#endif - QT_BEGIN_NAMESPACE Q_CORE_EXPORT bool qt_disable_lowpriority_timers=false; -- cgit v1.2.3 From 3fd2f0423bf9affe27c8f1cc801f7ded165f173d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 27 Jul 2009 14:46:48 +0200 Subject: Fix qmake dependency generation for include statements with local files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The header file should be looked up relative to the directory of the compilation unit and not qmake's current directory or the like. Simplified the logic slightly to achieve that. Reviewed-by: João Abecasis --- qmake/generators/makefiledeps.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index 34a5322f1..d907394bc 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -378,17 +378,19 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file) files_changed = true; file->dep_checked = true; + const QMakeLocalFileName sourceFile = fixPathForFile(file->file, true); + struct stat fst; char *buffer = 0; int buffer_len = 0; { int fd; #if defined(_MSC_VER) && _MSC_VER >= 1400 - if (_sopen_s(&fd, fixPathForFile(file->file, true).local().toLatin1().constData(), + if (_sopen_s(&fd, sourceFile.local().toLatin1().constData(), _O_RDONLY, _SH_DENYNO, _S_IREAD) != 0) fd = -1; #else - fd = open(fixPathForFile(file->file, true).local().toLatin1().constData(), O_RDONLY); + fd = open(sourceFile.local().toLatin1().constData(), O_RDONLY); #endif if(fd == -1 || fstat(fd, &fst) || S_ISDIR(fst.st_mode)) return false; @@ -623,12 +625,8 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file) QMakeLocalFileName lfn(inc); if(QDir::isRelativePath(lfn.real())) { if(try_local) { - QString dir = findFileInfo(file->file).path(); - if(QDir::isRelativePath(dir)) - dir.prepend(qmake_getpwd() + "/"); - if(!dir.endsWith("/")) - dir += "/"; - QMakeLocalFileName f(dir + lfn.local()); + QDir sourceDir = findFileInfo(sourceFile).dir(); + QMakeLocalFileName f(sourceDir.absoluteFilePath(lfn.local())); if(findFileInfo(f).exists()) { lfn = fixPathForFile(f); exists = true; -- cgit v1.2.3 From f066d03865743d0e854202bec7e9b13523625fa6 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 27 Jul 2009 15:20:01 +0200 Subject: Doc: QPictureIO and QPictureFormatPlugin have been obsolete for a while. --- doc/src/plugins-howto.qdoc | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/src/plugins-howto.qdoc b/doc/src/plugins-howto.qdoc index 4c37f8e77..3e5cc931d 100644 --- a/doc/src/plugins-howto.qdoc +++ b/doc/src/plugins-howto.qdoc @@ -92,7 +92,6 @@ \row \o QInputContextPlugin \o \c inputmethods \o Case Sensitive \row \o QKbdDriverPlugin \o \c kbddrivers \o Case Insensitive \row \o QMouseDriverPlugin \o \c mousedrivers \o Case Insensitive - \row \o QPictureFormatPlugin \o \c pictureformats \o Case Sensitive \row \o QScreenDriverPlugin \o \c gfxdrivers \o Case Insensitive \row \o QScriptExtensionPlugin \o \c script \o Case Sensitive \row \o QSqlDriverPlugin \o \c sqldrivers \o Case Sensitive -- cgit v1.2.3 From 38d668cb3026e4e3e253c8b0fbd075c52e251e90 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Mon, 27 Jul 2009 15:34:35 +0200 Subject: Fix qmake.pro so it can build qmake. qmake now uses a few of the files from the 'codecs' directory so add that directory to the VPATH directory such that building qmake using this .pro file is possible. Reviewed-by: TrustMe --- qmake/qmake.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/qmake/qmake.pro b/qmake/qmake.pro index 38c58fbe7..574006185 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -15,6 +15,7 @@ MOC_DIR = . VPATH += $$QT_SOURCE_TREE/src/corelib/global \ $$QT_SOURCE_TREE/src/corelib/tools \ $$QT_SOURCE_TREE/src/corelib/kernel \ + $$QT_SOURCE_TREE/src/corelib/codecs \ $$QT_SOURCE_TREE/src/corelib/plugin \ $$QT_SOURCE_TREE/src/corelib/io \ $$QT_SOURCE_TREE/src/script -- cgit v1.2.3 From 85a410db4ded672566cb621ab1e13da691d26891 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 27 Jul 2009 15:53:43 +0200 Subject: Compile on Mac OS X --- src/corelib/kernel/qcore_unix.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp index b321518ea..28c1d9cd9 100644 --- a/src/corelib/kernel/qcore_unix.cpp +++ b/src/corelib/kernel/qcore_unix.cpp @@ -91,7 +91,7 @@ timeval qt_gettime() uint64_t cpu_time = mach_absolute_time(); uint64_t nsecs = cpu_time * (info.numer / info.denom); tv.tv_sec = nsecs / 1000000000ull; - tv.tv_usec = (nsecs / 1000) - (t.tv_sec * 1000000); + tv.tv_usec = (nsecs / 1000) - (tv.tv_sec * 1000000); return tv; #elif (_POSIX_MONOTONIC_CLOCK-0 > 0) timespec ts; -- cgit v1.2.3 From 0daacc471911bccd9167a35aa83cd4ccd1a313f5 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Mon, 27 Jul 2009 15:54:15 +0200 Subject: "MAP" is a too common name to use it without #undef'ing it first Reviewed-by: TrustMe --- src/gui/painting/qtransform.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index f0b235197..45939c155 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -52,7 +52,9 @@ QT_BEGIN_NAMESPACE #define Q_NEAR_CLIP 0.000001 - +#ifdef MAP +# undef MAP +#endif #define MAP(x, y, nx, ny) \ do { \ qreal FX_ = x; \ -- cgit v1.2.3 From 206adbb56bb80eab49b09bdd138e018bfe6be3dc Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 27 Jul 2009 16:03:06 +0200 Subject: Doc: Document format for new Math3D classes as well as QTransform --- doc/src/datastreamformat.qdoc | 56 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/doc/src/datastreamformat.qdoc b/doc/src/datastreamformat.qdoc index dea193fb3..5db85cb6a 100644 --- a/doc/src/datastreamformat.qdoc +++ b/doc/src/datastreamformat.qdoc @@ -220,6 +220,25 @@ \o dx (double) \o dy (double) \endlist + \row \o QMatrix4x4 + \o \list + \o m11 (double) + \o m12 (double) + \o m13 (double) + \o m14 (double) + \o m21 (double) + \o m22 (double) + \o m23 (double) + \o m24 (double) + \o m31 (double) + \o m32 (double) + \o m33 (double) + \o m34 (double) + \o m41 (double) + \o m42 (double) + \o m43 (double) + \o m44 (double) + \endlist \row \o QPair \o \list \o first (T1) @@ -266,6 +285,13 @@ \o The x coordinate (qint32) \o The y coordinate (qint32) \endlist + \row \o QQuaternion + \o \list + \o The scalar component (double) + \o The x coordinate (double) + \o The y coordinate (double) + \o The z coordinate (double) + \endlist \row \o QRect \o \list \o left (qint32) @@ -301,6 +327,18 @@ \o \list \o Milliseconds since midnight (quint32) \endlist + \row \o QTransform + \o \list + \o m11 (double) + \o m12 (double) + \o m13 (double) + \o m21 (double) + \o m22 (double) + \o m23 (double) + \o m31 (double) + \o m32 (double) + \o m33 (double) + \endlist \row \o QUrl \o \list \o Holds an URL (QString) @@ -311,6 +349,24 @@ \o The null flag (qint8) \o The data of the specified type \endlist + \row \o QVector2D + \o \list + \o the x coordinate (double) + \o the y coordinate (double) + \endlist + \row \o QVector3D + \o \list + \o the x coordinate (double) + \o the y coordinate (double) + \o the z coordinate (double) + \endlist + \row \o QVector4D + \o \list + \o the x coordinate (double) + \o the y coordinate (double) + \o the z coordinate (double) + \o the w coordinate (double) + \endlist \row \o QVector \o \list \o The number of items (quint32) -- cgit v1.2.3 From 6c1bc11a0a45f1ea04e271526997ea5002bf5f86 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 27 Jul 2009 16:07:57 +0200 Subject: Doc: Remove reference to QMatrix As pointed out on IRC, setTransform is used most frequently in code and in an ideal world would be the only such function. --- src/gui/painting/qpainter.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 4ebfc5014..9c7a7faa6 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -8428,11 +8428,7 @@ qreal QPaintEngineState::opacity() const If \a combine is true, the specified \a transform is combined with the current matrix; otherwise it replaces the current matrix. - This function has been added for compatibility with setMatrix(), - but as with setMatrix() the preferred method of setting a - transformation on the painter is through setWorldTransform(). - - \sa transform() + \sa transform() setWorldTransform() */ void QPainter::setTransform(const QTransform &transform, bool combine ) @@ -8442,6 +8438,8 @@ void QPainter::setTransform(const QTransform &transform, bool combine ) /*! Returns the world transformation matrix. + + \sa worldTransform() */ const QTransform & QPainter::transform() const -- cgit v1.2.3 From e2d4cd1536345fc51b509affba45041f2cf1752f Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 24 Jul 2009 13:18:34 +0200 Subject: Fix warning with Sun CC 5.9 and xlC 7: no new types inside anonymous unions. See ba191b0a26b966ad1fb596a905307399922bc44a for a similar commit done to QStringMatcher. Reviewed-By: Bradley T. Hughes --- src/corelib/tools/qbytearraymatcher.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index 697b6ff63..4bad24c22 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -81,13 +81,14 @@ private: // explicitely allow anonymous unions for RVCT to prevent compiler warnings #pragma anon_unions #endif + struct Data { + uchar q_skiptable[256]; + const uchar *p; + int l; + }; union { uint dummy[256]; - struct { - uchar q_skiptable[256]; - const uchar *p; - int l; - } p; + Data p; }; }; -- cgit v1.2.3 From f7e837ae1534b519bbe604fbb1eef22c35d37de1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 24 Jul 2009 19:38:19 +0200 Subject: Sun CC 5.9 still doesn't support Template-Template Parameters I had added the version check when we only had CC 5.5 and 5.6, expecting that 5.7 would have the support. And if it didn't, then someone would notice the compile error in QtConcurrent, bumping the version number here. Except that QtConcurrent was never enabled with Sun CC. Which meant that we never got to test TTP support. Reviewed-By: Bradley T. Hughes --- src/corelib/global/qglobal.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 461bd3649..3625f2be3 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -653,9 +653,7 @@ namespace QT_NAMESPACE {} in which case _BOOL is not defined this is the default in 4.2 compatibility mode triggered by -compat=4 */ # if __SUNPRO_CC >= 0x500 -# if __SUNPRO_CC < 0x570 -# define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS -# endif +# define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS /* see http://developers.sun.com/sunstudio/support/Ccompare.html */ # if __SUNPRO_CC >= 0x590 # define Q_ALIGNOF(type) __alignof__(type) -- cgit v1.2.3 From f120b5e4b63cbc30874fa21947b75d352f18d7df Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 27 Jul 2009 14:43:35 +0200 Subject: Make the STL test a little more strict, using constructs used by Concurrent. At least the RogueWave STL found in Sun Studio 12 (latest version available) isn't standards-compliant enough for QtConcurrent's needs. Note that WebKit also requires STL support, so this means QtWebKit will not compile with RW STL on Solaris. Reviewed-By: Bradley T. Hughes --- config.tests/unix/stl/stltest.cpp | 61 ++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 10 deletions(-) diff --git a/config.tests/unix/stl/stltest.cpp b/config.tests/unix/stl/stltest.cpp index ff653a4ea..4d74ed1c1 100644 --- a/config.tests/unix/stl/stltest.cpp +++ b/config.tests/unix/stl/stltest.cpp @@ -9,6 +9,53 @@ templates for common STL container classes. #include #include +// something mean to see if the compiler and C++ standard lib are good enough +template +class DummyClass +{ + // everything in std namespace ? + typedef std::bidirectional_iterator_tag i; + typedef std::ptrdiff_t d; + // typename implemented ? + typedef typename std::map::iterator MyIterator; +}; + +// extracted from QVector's strict iterator +template +class DummyIterator +{ + typedef DummyIterator iterator; +public: + T *i; + typedef std::random_access_iterator_tag iterator_category; + typedef ptrdiff_t difference_type; + typedef T value_type; + typedef T *pointer; + typedef T &reference; + + inline DummyIterator() : i(0) {} + inline DummyIterator(T *n) : i(n) {} + inline DummyIterator(const DummyIterator &o): i(o.i){} + inline T &operator*() const { return *i; } + inline T *operator->() const { return i; } + inline T &operator[](int j) const { return *(i + j); } + inline bool operator==(const DummyIterator &o) const { return i == o.i; } + inline bool operator!=(const DummyIterator &o) const { return i != o.i; } + inline bool operator<(const DummyIterator& other) const { return i < other.i; } + inline bool operator<=(const DummyIterator& other) const { return i <= other.i; } + inline bool operator>(const DummyIterator& other) const { return i > other.i; } + inline bool operator>=(const DummyIterator& other) const { return i >= other.i; } + inline DummyIterator &operator++() { ++i; return *this; } + inline DummyIterator operator++(int) { T *n = i; ++i; return n; } + inline DummyIterator &operator--() { i--; return *this; } + inline DummyIterator operator--(int) { T *n = i; i--; return n; } + inline DummyIterator &operator+=(int j) { i+=j; return *this; } + inline DummyIterator &operator-=(int j) { i-=j; return *this; } + inline DummyIterator operator+(int j) const { return DummyIterator(i+j); } + inline DummyIterator operator-(int j) const { return DummyIterator(i-j); } + inline int operator-(DummyIterator j) const { return i - j.i; } +}; + int main() { std::vector v1; @@ -53,16 +100,10 @@ int main() int m2size = m2.size(); m2size = 0; + DummyIterator it1, it2; + int n = std::distance(it1, it2); + std::advance(it1, 3); + return 0; } -// something mean to see if the compiler and C++ standard lib are good enough -template -class DummyClass -{ - // everything in std namespace ? - typedef std::bidirectional_iterator_tag i; - typedef std::ptrdiff_t d; - // typename implemented ? - typedef typename std::map::iterator MyIterator; -}; -- cgit v1.2.3 From b2261de3937e7574b4d17b055f685878c33ec319 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 24 Jul 2009 20:46:37 +0200 Subject: Work around a Sun CC 5.9 compiler bug: the threadEngine variable isn't found. QtConcurrent had the following code: template class ThreadEngineStarterBase { ... protected: ThreadEngine *threadEngine; }; template class ThreadEngineStarter : public ThreadEngineStarterBase { public: ThreadEngineStarter(ThreadEngine *threadEngine) :ThreadEngineStarterBase(threadEngine) {} [...] }; The Sun CC compiler simply didn't parse the parameter declaration in the constructor. Instead of complaining, it silently ignored the problem. Which meant that the constructor simply used the uninitialised member variable from the base class to call the parent constructor, which ended up initialised with itself. You'd think that it's just because the parameter has the same name as a member variable. But it appears to be a compiler bug altogether. If you change the name, then you start getting compile errors. This change is a workaround that worked. Reviewed-By: Bradley T. Hughes --- src/corelib/concurrent/qtconcurrentthreadengine.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/corelib/concurrent/qtconcurrentthreadengine.h b/src/corelib/concurrent/qtconcurrentthreadengine.h index 1f359fc0e..2f610defd 100644 --- a/src/corelib/concurrent/qtconcurrentthreadengine.h +++ b/src/corelib/concurrent/qtconcurrentthreadengine.h @@ -238,9 +238,11 @@ protected: template class ThreadEngineStarter : public ThreadEngineStarterBase { + typedef ThreadEngineStarterBase Base; + typedef ThreadEngine TypedThreadEngine; public: - ThreadEngineStarter(ThreadEngine *threadEngine) - :ThreadEngineStarterBase(threadEngine) {} + ThreadEngineStarter(TypedThreadEngine *eng) + : Base(eng) { } T startBlocking() { -- cgit v1.2.3 From 1a81f8d676d7481e58f44dbb380acffe0800d93d Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 27 Jul 2009 16:48:13 +0200 Subject: Make typeToName testcase pass, and add basic test for Math3D classes. Reviewed-by: Trustme --- tests/auto/qvariant/tst_qvariant.cpp | 86 +++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp index 63e47abb4..a9b9afd87 100644 --- a/tests/auto/qvariant/tst_qvariant.cpp +++ b/tests/auto/qvariant/tst_qvariant.cpp @@ -59,9 +59,14 @@ #include #include #include -#include +#include #include #include +#include +#include +#include +#include +#include #include @@ -194,6 +199,12 @@ private slots: void transform(); + void matrix4x4(); + void vector2D(); + void vector3D(); + void vector4D(); + void quaternion(); + void url(); void userType(); @@ -1403,6 +1414,19 @@ void tst_QVariant::matrix() QMetaType::destroy(QVariant::Matrix, mmatrix); } +void tst_QVariant::matrix4x4() +{ + QVariant variant; + QMatrix4x4 matrix = qVariantValue(variant); + QVERIFY(matrix.isIdentity()); + qVariantSetValue(variant, QMatrix4x4().scale(2.0)); + QCOMPARE(QMatrix4x4().scale(2.0), qVariantValue(variant)); + + void *mmatrix = QMetaType::construct(QVariant::Matrix4x4, 0); + QVERIFY(mmatrix); + QMetaType::destroy(QVariant::Matrix4x4, mmatrix); +} + void tst_QVariant::transform() { QVariant variant; @@ -1416,6 +1440,59 @@ void tst_QVariant::transform() QMetaType::destroy(QVariant::Transform, mmatrix); } + +void tst_QVariant::vector2D() +{ + QVariant variant; + QVector2D vector = qVariantValue(variant); + QVERIFY(vector.isNull()); + qVariantSetValue(variant, QVector2D(0.1, 0.2)); + QCOMPARE(QVector2D(0.1, 0.2), qVariantValue(variant)); + + void *pvector = QMetaType::construct(QVariant::Vector2D, 0); + QVERIFY(pvector); + QMetaType::destroy(QVariant::Vector2D, pvector); +} + +void tst_QVariant::vector3D() +{ + QVariant variant; + QVector3D vector = qVariantValue(variant); + QVERIFY(vector.isNull()); + qVariantSetValue(variant, QVector3D(0.1, 0.2, 0.3)); + QCOMPARE(QVector3D(0.1, 0.2, 0.3), qVariantValue(variant)); + + void *pvector = QMetaType::construct(QVariant::Vector3D, 0); + QVERIFY(pvector); + QMetaType::destroy(QVariant::Vector3D, pvector); +} + +void tst_QVariant::vector4D() +{ + QVariant variant; + QVector4D vector = qVariantValue(variant); + QVERIFY(vector.isNull()); + qVariantSetValue(variant, QVector4D(0.1, 0.2, 0.3, 0.4)); + QCOMPARE(QVector4D(0.1, 0.2, 0.3, 0.4), qVariantValue(variant)); + + void *pvector = QMetaType::construct(QVariant::Vector4D, 0); + QVERIFY(pvector); + QMetaType::destroy(QVariant::Vector4D, pvector); +} + +void tst_QVariant::quaternion() +{ + QVariant variant; + QQuaternion quaternion = qVariantValue(variant); + QVERIFY(quaternion.isIdentity()); + qVariantSetValue(variant, QQuaternion(0.1, 0.2, 0.3, 0.4)); + QCOMPARE(QQuaternion(0.1, 0.2, 0.3, 0.4), qVariantValue(variant)); + + void *pquaternion = QMetaType::construct(QVariant::Quaternion, 0); + QVERIFY(pquaternion); + QMetaType::destroy(QVariant::Quaternion, pquaternion); +} + void tst_QVariant::writeToReadFromDataStream_data() { @@ -1955,6 +2032,11 @@ void tst_QVariant::typeName_data() QTest::newRow("45") << int(QVariant::Matrix) << QByteArray("QMatrix"); QTest::newRow("46") << int(QVariant::Transform) << QByteArray("QTransform"); QTest::newRow("47") << int(QVariant::Hash) << QByteArray("QVariantHash"); + QTest::newRow("48") << int(QVariant::Matrix4x4) << QByteArray("QMatrix4x4"); + QTest::newRow("49") << int(QVariant::Vector2D) << QByteArray("QVector2D"); + QTest::newRow("50") << int(QVariant::Vector3D) << QByteArray("QVector3D"); + QTest::newRow("51") << int(QVariant::Vector4D) << QByteArray("QVector4D"); + QTest::newRow("52") << int(QVariant::Quaternion) << QByteArray("QQuaternion"); } void tst_QVariant::typeName() @@ -1972,7 +2054,7 @@ void tst_QVariant::typeToName() QCOMPARE( QVariant::typeToName( v.type() ), (const char*)0 ); // Invalid // assumes that QVariant::Type contains consecutive values - int max = QVariant::Transform; + int max = QVariant::Quaternion; for ( int t = 1; t <= max; t++ ) { const char *n = QVariant::typeToName( (QVariant::Type)t ); if (n) -- cgit v1.2.3 From 4d4d2714aa9e4ee9bec005531b24442d0a1a8665 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Mon, 27 Jul 2009 17:02:42 +0200 Subject: Don't animate widgets on first show in Vista Checkboxes would animate when first shown if they were checked. This is unintentional and looks a bit odd in wizard for instance. To fix this we simply check if the old state was set. Note that this is safe because we will at least require the enabled state flag to be set. Task-number:253075 Reviewed-by: ogoffart --- src/gui/styles/qwindowsvistastyle.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/styles/qwindowsvistastyle.cpp b/src/gui/styles/qwindowsvistastyle.cpp index 298207d7c..6f3017a58 100644 --- a/src/gui/styles/qwindowsvistastyle.cpp +++ b/src/gui/styles/qwindowsvistastyle.cpp @@ -364,7 +364,8 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt w->setProperty("_q_stylestate", (int)option->state); w->setProperty("_q_stylerect", w->rect()); - bool doTransition = ((state & State_Sunken) != (oldState & State_Sunken) || + bool doTransition = oldState && + ((state & State_Sunken) != (oldState & State_Sunken) || (state & State_On) != (oldState & State_On) || (state & State_MouseOver) != (oldState & State_MouseOver)); -- cgit v1.2.3 From e5ef272382b124cf5d051ed7f25324fc804d97f6 Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Mon, 27 Jul 2009 17:20:30 +0200 Subject: Fix build on Solaris Solaris seems to define glXReleaseTexImageEXT rather than let it be resolved as a function pointer. --- src/opengl/qgl_x11.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index a95b7a084..a76059c4a 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1536,11 +1536,14 @@ void QGLExtensions::init() } } - +#if !defined(glXBindTexImageEXT) typedef void (*qt_glXBindTexImageEXT)(Display*, GLXDrawable, int, const int*); -typedef void (*qt_glXReleaseTexImageEXT)(Display*, GLXDrawable, int); static qt_glXBindTexImageEXT glXBindTexImageEXT = 0; +#endif +#if !defined(glXReleaseTexImageEXT) +typedef void (*qt_glXReleaseTexImageEXT)(Display*, GLXDrawable, int); static qt_glXReleaseTexImageEXT glXReleaseTexImageEXT = 0; +#endif static bool qt_resolved_texture_from_pixmap = false; QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qint64 key, bool canInvert) -- cgit v1.2.3 From 2ab5c57b593cb6874c035cb3abee574464ea8f30 Mon Sep 17 00:00:00 2001 From: ck Date: Mon, 27 Jul 2009 17:41:41 +0200 Subject: Assistant: Removed redundancy in index reader classes. Moved common parts of QHelpSearchIndexReader{Default,Clucene} into a new common base class QHelpSearchIndexReader. Reviewed-by: kh --- tools/assistant/lib/lib.pro | 96 +++++++++--------- tools/assistant/lib/qhelpsearchengine.cpp | 14 ++- tools/assistant/lib/qhelpsearchindexreader.cpp | 106 ++++++++++++++++++++ .../lib/qhelpsearchindexreader_clucene.cpp | 60 ++---------- .../lib/qhelpsearchindexreader_clucene_p.h | 36 +------ .../lib/qhelpsearchindexreader_default.cpp | 49 +--------- .../lib/qhelpsearchindexreader_default_p.h | 37 +------ tools/assistant/lib/qhelpsearchindexreader_p.h | 108 +++++++++++++++++++++ 8 files changed, 296 insertions(+), 210 deletions(-) create mode 100644 tools/assistant/lib/qhelpsearchindexreader.cpp create mode 100644 tools/assistant/lib/qhelpsearchindexreader_p.h diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro index bd9ed5370..5d6d43643 100644 --- a/tools/assistant/lib/lib.pro +++ b/tools/assistant/lib/lib.pro @@ -1,65 +1,71 @@ -QT += sql xml network +QT += sql \ + xml \ + network TEMPLATE = lib TARGET = QtHelp -DEFINES += QHELP_LIB QT_CLUCENE_SUPPORT -CONFIG += qt warn_on - +DEFINES += QHELP_LIB \ + QT_CLUCENE_SUPPORT +CONFIG += qt \ + warn_on include(../../../src/qbase.pri) - QMAKE_TARGET_PRODUCT = Help -QMAKE_TARGET_DESCRIPTION = Help application framework. +QMAKE_TARGET_DESCRIPTION = Help \ + application \ + framework. DEFINES -= QT_ASCII_CAST_WARNINGS - qclucene = QtCLucene$${QT_LIBINFIX} -if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { +if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { mac:qclucene = $${qclucene}_debug win32:qclucene = $${qclucene}d } linux-lsb-g++:LIBS += --lsb-shared-libs=$$qclucene -unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork QtSql QtXml +unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \ + QtSql \ + QtXml LIBS += -l$$qclucene -unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork QtSql QtXml - +unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \ + QtSql \ + QtXml RESOURCES += helpsystem.qrc - SOURCES += qhelpenginecore.cpp \ - qhelpengine.cpp \ - qhelpdbreader.cpp \ - qhelpcontentwidget.cpp \ - qhelpindexwidget.cpp \ - qhelpgenerator.cpp \ - qhelpdatainterface.cpp \ - qhelpprojectdata.cpp \ - qhelpcollectionhandler.cpp \ - qhelpsearchengine.cpp \ - qhelpsearchquerywidget.cpp \ - qhelpsearchresultwidget.cpp \ - qhelpsearchindex_default.cpp \ - qhelpsearchindexwriter_default.cpp \ - qhelpsearchindexreader_default.cpp + qhelpengine.cpp \ + qhelpdbreader.cpp \ + qhelpcontentwidget.cpp \ + qhelpindexwidget.cpp \ + qhelpgenerator.cpp \ + qhelpdatainterface.cpp \ + qhelpprojectdata.cpp \ + qhelpcollectionhandler.cpp \ + qhelpsearchengine.cpp \ + qhelpsearchquerywidget.cpp \ + qhelpsearchresultwidget.cpp \ + qhelpsearchindex_default.cpp \ + qhelpsearchindexwriter_default.cpp \ + qhelpsearchindexreader_default.cpp \ + qhelpsearchindexreader.cpp # access to clucene SOURCES += qhelpsearchindexwriter_clucene.cpp \ - qhelpsearchindexreader_clucene.cpp - + qhelpsearchindexreader_clucene.cpp HEADERS += qhelpenginecore.h \ - qhelpengine.h \ - qhelpengine_p.h \ - qhelp_global.h \ - qhelpdbreader_p.h \ - qhelpcontentwidget.h \ - qhelpindexwidget.h \ - qhelpgenerator_p.h \ - qhelpdatainterface_p.h \ - qhelpprojectdata_p.h \ - qhelpcollectionhandler_p.h \ - qhelpsearchengine.h \ - qhelpsearchquerywidget.h \ - qhelpsearchresultwidget.h \ - qhelpsearchindex_default_p.h \ - qhelpsearchindexwriter_default_p.h \ - qhelpsearchindexreader_default_p.h + qhelpengine.h \ + qhelpengine_p.h \ + qhelp_global.h \ + qhelpdbreader_p.h \ + qhelpcontentwidget.h \ + qhelpindexwidget.h \ + qhelpgenerator_p.h \ + qhelpdatainterface_p.h \ + qhelpprojectdata_p.h \ + qhelpcollectionhandler_p.h \ + qhelpsearchengine.h \ + qhelpsearchquerywidget.h \ + qhelpsearchresultwidget.h \ + qhelpsearchindex_default_p.h \ + qhelpsearchindexwriter_default_p.h \ + qhelpsearchindexreader_default_p.h \ + qhelpsearchindexreader_p.h # access to clucene HEADERS += qhelpsearchindexwriter_clucene_p.h \ - qhelpsearchindexreader_clucene_p.h + qhelpsearchindexreader_clucene_p.h diff --git a/tools/assistant/lib/qhelpsearchengine.cpp b/tools/assistant/lib/qhelpsearchengine.cpp index 2a41d0447..94c5f7ee4 100644 --- a/tools/assistant/lib/qhelpsearchengine.cpp +++ b/tools/assistant/lib/qhelpsearchengine.cpp @@ -44,6 +44,7 @@ #include "qhelpsearchquerywidget.h" #include "qhelpsearchresultwidget.h" +#include "qhelpsearchindexreader_p.h" #if defined(QT_CLUCENE_SUPPORT) # include "qhelpsearchindexreader_clucene_p.h" # include "qhelpsearchindexwriter_clucene_p.h" @@ -147,8 +148,11 @@ private: return; if (!indexReader) { - indexReader = new QHelpSearchIndexReader(); - +#if defined(QT_CLUCENE_SUPPORT) + indexReader = new QHelpSearchIndexReaderClucene(); +#else + indexReader = new QHelpSearchIndexReaderDefault(); +#endif // QT_CLUCENE_SUPPORT connect(indexReader, SIGNAL(searchingStarted()), this, SIGNAL(searchingStarted())); connect(indexReader, SIGNAL(searchingFinished(int)), this, SIGNAL(searchingFinished(int))); } @@ -181,7 +185,7 @@ private slots: { #if defined(QT_CLUCENE_SUPPORT) if (indexWriter && !helpEngine.isNull()) { - indexWriter->optimizeIndex(); + indexWriter->optimizeIndex(); } #endif } @@ -192,7 +196,7 @@ private: QHelpSearchQueryWidget *queryWidget; QHelpSearchResultWidget *resultWidget; - QHelpSearchIndexReader *indexReader; + qt::fulltextsearch::QHelpSearchIndexReader *indexReader; QHelpSearchIndexWriter *indexWriter; QPointer helpEngine; @@ -321,7 +325,7 @@ QHelpSearchEngine::QHelpSearchEngine(QHelpEngineCore *helpEngine, QObject *paren : QObject(parent) { d = new QHelpSearchEnginePrivate(helpEngine); - + connect(helpEngine, SIGNAL(setupFinished()), this, SLOT(indexDocumentation())); connect(d, SIGNAL(indexingStarted()), this, SIGNAL(indexingStarted())); diff --git a/tools/assistant/lib/qhelpsearchindexreader.cpp b/tools/assistant/lib/qhelpsearchindexreader.cpp new file mode 100644 index 000000000..a0fcbe5d3 --- /dev/null +++ b/tools/assistant/lib/qhelpsearchindexreader.cpp @@ -0,0 +1,106 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Assistant of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qhelpsearchindexreader_p.h" + +QT_BEGIN_NAMESPACE + +namespace qt { + namespace fulltextsearch { + +QHelpSearchIndexReader::QHelpSearchIndexReader() + : QThread() + , m_cancel(false) +{ + // nothing todo +} + +QHelpSearchIndexReader::~QHelpSearchIndexReader() +{ + mutex.lock(); + this->m_cancel = true; + mutex.unlock(); + + wait(); +} + +void QHelpSearchIndexReader::cancelSearching() +{ + mutex.lock(); + this->m_cancel = true; + mutex.unlock(); +} + +void QHelpSearchIndexReader::search(const QString &collectionFile, const QString &indexFilesFolder, + const QList &queryList) +{ + wait(); + + this->hitList.clear(); + this->m_cancel = false; + this->m_query = queryList; + this->m_collectionFile = collectionFile; + this->m_indexFilesFolder = indexFilesFolder; + + start(QThread::NormalPriority); +} + +int QHelpSearchIndexReader::hitsCount() const +{ + QMutexLocker lock(&mutex); + return hitList.count(); +} + +QList QHelpSearchIndexReader::hits(int start, + int end) const +{ + QList hits; + QMutexLocker lock(&mutex); + for (int i = start; i < end && i < hitList.count(); ++i) + hits.append(hitList.at(i)); + return hits; +} + + + } // namespace fulltextsearch +} // namespace qt + +QT_END_NAMESPACE diff --git a/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp b/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp index 89d60402c..b417078a7 100644 --- a/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp +++ b/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp @@ -59,60 +59,18 @@ namespace qt { namespace fulltextsearch { namespace clucene { -QHelpSearchIndexReader::QHelpSearchIndexReader() - : QThread() - , m_cancel(false) +QHelpSearchIndexReaderClucene::QHelpSearchIndexReaderClucene() + : QHelpSearchIndexReader() { // nothing todo } -QHelpSearchIndexReader::~QHelpSearchIndexReader() +QHelpSearchIndexReaderClucene::~QHelpSearchIndexReaderClucene() { - mutex.lock(); - this->m_cancel = true; - mutex.unlock(); - - wait(); } -void QHelpSearchIndexReader::cancelSearching() -{ - mutex.lock(); - this->m_cancel = true; - mutex.unlock(); -} -void QHelpSearchIndexReader::search(const QString &collectionFile, const QString &indexFilesFolder, - const QList &queryList) -{ - wait(); - - this->hitList.clear(); - this->m_cancel = false; - this->m_query = queryList; - this->m_collectionFile = collectionFile; - this->m_indexFilesFolder = indexFilesFolder; - - start(QThread::NormalPriority); -} - -int QHelpSearchIndexReader::hitsCount() const -{ - QMutexLocker lock(&mutex); - return hitList.count(); -} - -QList QHelpSearchIndexReader::hits(int start, - int end) const -{ - QList hits; - QMutexLocker lock(&mutex); - for (int i = start; i < end && i < hitList.count(); ++i) - hits.append(hitList.at(i)); - return hits; -} - -void QHelpSearchIndexReader::run() +void QHelpSearchIndexReaderClucene::run() { mutex.lock(); @@ -140,7 +98,7 @@ void QHelpSearchIndexReader::run() if(QCLuceneIndexReader::indexExists(indexPath)) { mutex.lock(); if (m_cancel) { - mutex.unlock(); + mutex.unlock(); return; } mutex.unlock(); @@ -227,7 +185,7 @@ void QHelpSearchIndexReader::run() } } -bool QHelpSearchIndexReader::defaultQuery(const QString &term, QCLuceneBooleanQuery &booleanQuery, +bool QHelpSearchIndexReaderClucene::defaultQuery(const QString &term, QCLuceneBooleanQuery &booleanQuery, QCLuceneStandardAnalyzer &analyzer) { const QLatin1String c("content"); @@ -244,7 +202,7 @@ bool QHelpSearchIndexReader::defaultQuery(const QString &term, QCLuceneBooleanQu return false; } -bool QHelpSearchIndexReader::buildQuery(QCLuceneBooleanQuery &booleanQuery, +bool QHelpSearchIndexReaderClucene::buildQuery(QCLuceneBooleanQuery &booleanQuery, const QList &queryList, QCLuceneStandardAnalyzer &analyzer) { foreach (const QHelpSearchQuery query, queryList) { @@ -344,7 +302,7 @@ bool QHelpSearchIndexReader::buildQuery(QCLuceneBooleanQuery &booleanQuery, return true; } -bool QHelpSearchIndexReader::buildTryHarderQuery(QCLuceneBooleanQuery &booleanQuery, +bool QHelpSearchIndexReaderClucene::buildTryHarderQuery(QCLuceneBooleanQuery &booleanQuery, const QList &queryList, QCLuceneStandardAnalyzer &analyzer) { bool retVal = false; @@ -367,7 +325,7 @@ bool QHelpSearchIndexReader::buildTryHarderQuery(QCLuceneBooleanQuery &booleanQu return retVal; } -void QHelpSearchIndexReader::boostSearchHits(const QHelpEngineCore &engine, +void QHelpSearchIndexReaderClucene::boostSearchHits(const QHelpEngineCore &engine, QList &hitList, const QList &queryList) { foreach (const QHelpSearchQuery query, queryList) { diff --git a/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h b/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h index 8876d809b..93ac6a8e4 100644 --- a/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h +++ b/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h @@ -53,44 +53,24 @@ // We mean it. // -#include "qhelpsearchengine.h" +#include "qhelpsearchindexreader_p.h" #include "fulltextsearch/qanalyzer_p.h" #include "fulltextsearch/qquery_p.h" -#include -#include -#include -#include -#include -#include - -class QHelpEngineCore; - QT_BEGIN_NAMESPACE namespace qt { namespace fulltextsearch { namespace clucene { -class QHelpSearchIndexReader : public QThread +class QHelpSearchIndexReaderClucene : public QHelpSearchIndexReader { Q_OBJECT public: - QHelpSearchIndexReader(); - ~QHelpSearchIndexReader(); - - void cancelSearching(); - void search(const QString &collectionFile, - const QString &indexFilesFolder, - const QList &queryList); - int hitsCount() const; - QList hits(int start, int end) const; - -signals: - void searchingStarted(); - void searchingFinished(int hits); + QHelpSearchIndexReaderClucene(); + ~QHelpSearchIndexReaderClucene(); private: void run(); @@ -102,14 +82,6 @@ private: const QList &queryList, QCLuceneStandardAnalyzer &analyzer); void boostSearchHits(const QHelpEngineCore &engine, QList &hitList, const QList &queryList); - -private: - mutable QMutex mutex; - QList hitList; - bool m_cancel; - QString m_collectionFile; - QList m_query; - QString m_indexFilesFolder; }; } // namespace clucene diff --git a/tools/assistant/lib/qhelpsearchindexreader_default.cpp b/tools/assistant/lib/qhelpsearchindexreader_default.cpp index 91af9254e..fbf8a092a 100644 --- a/tools/assistant/lib/qhelpsearchindexreader_default.cpp +++ b/tools/assistant/lib/qhelpsearchindexreader_default.cpp @@ -492,56 +492,17 @@ void Reader::cleanupIndex(EntryTable &entryTable) } -QHelpSearchIndexReader::QHelpSearchIndexReader() - : QThread() - , m_cancel(false) +QHelpSearchIndexReaderDefault::QHelpSearchIndexReaderDefault() + : QHelpSearchIndexReader() { // nothing todo } -QHelpSearchIndexReader::~QHelpSearchIndexReader() +QHelpSearchIndexReaderDefault::~QHelpSearchIndexReaderDefault() { - mutex.lock(); - this->m_cancel = true; - waitCondition.wakeOne(); - mutex.unlock(); - - wait(); -} - -void QHelpSearchIndexReader::cancelSearching() -{ - mutex.lock(); - this->m_cancel = true; - mutex.unlock(); -} - -void QHelpSearchIndexReader::search(const QString &collectionFile, - const QString &indexFilesFolder, - const QList &queryList) -{ - QMutexLocker lock(&mutex); - - this->hitList.clear(); - this->m_cancel = false; - this->m_query = queryList; - this->m_collectionFile = collectionFile; - this->m_indexFilesFolder = indexFilesFolder; - - start(QThread::NormalPriority); -} - -int QHelpSearchIndexReader::hitsCount() const -{ - return hitList.count(); } -QHelpSearchEngine::SearchHit QHelpSearchIndexReader::hit(int index) const -{ - return hitList.at(index); -} - -void QHelpSearchIndexReader::run() +void QHelpSearchIndexReaderDefault::run() { mutex.lock(); @@ -571,7 +532,7 @@ void QHelpSearchIndexReader::run() QHelpEngineCore engine(collectionFile, 0); if (!engine.setupData()) return; - + const QStringList registeredDocs = engine.registeredDocumentations(); const QStringList indexedNamespaces = engine.customValue(key).toString(). split(QLatin1String("|"), QString::SkipEmptyParts); diff --git a/tools/assistant/lib/qhelpsearchindexreader_default_p.h b/tools/assistant/lib/qhelpsearchindexreader_default_p.h index f0e59b460..d21fc0823 100644 --- a/tools/assistant/lib/qhelpsearchindexreader_default_p.h +++ b/tools/assistant/lib/qhelpsearchindexreader_default_p.h @@ -54,19 +54,10 @@ // #include "qhelpsearchindex_default_p.h" -#include "qhelpsearchengine.h" +#include "qhelpsearchindexreader_p.h" #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include QT_BEGIN_NAMESPACE @@ -121,39 +112,19 @@ private: }; -class QHelpSearchIndexReader : public QThread +class QHelpSearchIndexReaderDefault : public QHelpSearchIndexReader { Q_OBJECT public: - QHelpSearchIndexReader(); - ~QHelpSearchIndexReader(); - - void cancelSearching(); - void search(const QString &collectionFile, - const QString &indexFilesFolder, - const QList &queryList); - - int hitsCount() const; - QHelpSearchEngine::SearchHit hit(int index) const; - -signals: - void searchingStarted(); - void searchingFinished(int hits); + QHelpSearchIndexReaderDefault(); + ~QHelpSearchIndexReaderDefault(); private: void run(); private: - QMutex mutex; Reader m_reader; - QWaitCondition waitCondition; - QList hitList; - - bool m_cancel; - QList m_query; - QString m_collectionFile; - QString m_indexFilesFolder; }; } // namespace std diff --git a/tools/assistant/lib/qhelpsearchindexreader_p.h b/tools/assistant/lib/qhelpsearchindexreader_p.h new file mode 100644 index 000000000..c8f2b447a --- /dev/null +++ b/tools/assistant/lib/qhelpsearchindexreader_p.h @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Assistant of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QHELPSEARCHINDEXREADER_H +#define QHELPSEARCHINDEXREADER_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of the help generator tools. This header file may change from version +// to version without notice, or even be removed. +// +// We mean it. +// + +#include "qhelpsearchengine.h" + +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class QHelpEngineCore; + +namespace qt { + namespace fulltextsearch { + +class QHelpSearchIndexReader : public QThread +{ + Q_OBJECT + +public: + QHelpSearchIndexReader(); + ~QHelpSearchIndexReader(); + + void cancelSearching(); + void search(const QString &collectionFile, + const QString &indexFilesFolder, + const QList &queryList); + int hitsCount() const; + QList hits(int start, int end) const; + +signals: + void searchingStarted(); + void searchingFinished(int hits); + +protected: + mutable QMutex mutex; + QList hitList; + bool m_cancel; + QString m_collectionFile; + QList m_query; + QString m_indexFilesFolder; + +private: + virtual void run()=0; +}; + + } // namespace fulltextsearch +} // namespace qt + +QT_END_NAMESPACE + +#endif // QHELPSEARCHINDEXREADER_H -- cgit v1.2.3 From a65a659eee21f451f0bad833c8498cf74158fd18 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 27 Jul 2009 21:20:21 +0200 Subject: Doc: Focus and key-event handling in QGraphicsItem. --- src/gui/graphicsview/qgraphicsitem.cpp | 45 +++++++++++++++++++--------------- src/gui/kernel/qevent.cpp | 20 +++++++++------ 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 242535468..c8e55e3a3 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -2465,10 +2465,10 @@ void QGraphicsItem::setHandlesChildEvents(bool enabled) } /*! - Returns true if this item has keyboard input focus; otherwise, returns - false. + Returns true if this item or its \l{focusProxy()}{focus proxy} has keyboard + input focus; otherwise, returns false. - \sa QGraphicsScene::focusItem(), setFocus(), QGraphicsScene::setFocusItem() + \sa focusItem(), setFocus(), QGraphicsScene::setFocusItem() */ bool QGraphicsItem::hasFocus() const { @@ -2479,8 +2479,8 @@ bool QGraphicsItem::hasFocus() const /*! Gives keyboard input focus to this item. The \a focusReason argument will - be passed into any focus event generated by this function; it is used to - give an explanation of what caused the item to get focus. + be passed into any \l{QFocusEvent}{focus event} generated by this function; + it is used to give an explanation of what caused the item to get focus. Only enabled items that set the ItemIsFocusable flag can accept keyboard focus. @@ -2489,12 +2489,12 @@ bool QGraphicsItem::hasFocus() const gain immediate input focus. However, it will be registered as the preferred focus item for its subtree of items, should it later become visible. - As a result of calling this function, this item will receive a focus in - event with \a focusReason. If another item already has focus, that item - will first receive a focus out event indicating that it has lost input - focus. + As a result of calling this function, this item will receive a + \l{focusInEvent()}{focus in event} with \a focusReason. If another item + already has focus, that item will first receive a \l{focusOutEvent()} + {focus out event} indicating that it has lost input focus. - \sa clearFocus(), hasFocus(), focusItem() + \sa clearFocus(), hasFocus(), focusItem(), focusProxy() */ void QGraphicsItem::setFocus(Qt::FocusReason focusReason) { @@ -2527,13 +2527,13 @@ void QGraphicsItem::setFocus(Qt::FocusReason focusReason) /*! Takes keyboard input focus from the item. - If it has focus, a focus out event is sent to this item to tell it that it - is about to lose the focus. + If it has focus, a \l{focusOutEvent()}{focus out event} is sent to this item + to tell it that it is about to lose the focus. Only items that set the ItemIsFocusable flag, or widgets that set an appropriate focus policy, can accept keyboard focus. - \sa setFocus(), QGraphicsWidget::focusPolicy + \sa setFocus(), hasFocus(), QGraphicsWidget::focusPolicy */ void QGraphicsItem::clearFocus() { @@ -2550,10 +2550,10 @@ void QGraphicsItem::clearFocus() /*! \since 4.6 - Returns this item's focus proxy, or 0 if the item - does not have any focus proxy. + Returns this item's focus proxy, or 0 if this item has no + focus proxy. - \sa setFocusProxy() + \sa setFocusProxy(), ItemAutoDetectsFocusProxy, setFocus(), hasFocus() */ QGraphicsItem *QGraphicsItem::focusProxy() const { @@ -2574,7 +2574,10 @@ QGraphicsItem *QGraphicsItem::focusProxy() const such case, keyboard input will be handled by the outermost focus proxy. - \sa focusProxy() + The focus proxy \a item must belong to the same scene as + this item. + + \sa focusProxy(), ItemAutoDetectsFocusProxy, setFocus(), hasFocus() */ void QGraphicsItem::setFocusProxy(QGraphicsItem *item) { @@ -2608,11 +2611,13 @@ void QGraphicsItem::setFocusProxy(QGraphicsItem *item) } /*! + \since 4.6 + If this item, a child or descendant of this item currently has input focus, this function will return a pointer to that item. If no descendant has input focus, 0 is returned. - \sa QWidget::focusWidget() + \sa hasFocus(), setFocus(), QWidget::focusWidget() */ QGraphicsItem *QGraphicsItem::focusItem() const { @@ -6102,7 +6107,7 @@ void QGraphicsItem::dropEvent(QGraphicsSceneDragDropEvent *event) focus in events for this item. The default implementation calls ensureVisible(). - \sa focusOutEvent(), sceneEvent() + \sa focusOutEvent(), sceneEvent(), setFocus() */ void QGraphicsItem::focusInEvent(QFocusEvent *event) { @@ -6113,7 +6118,7 @@ void QGraphicsItem::focusInEvent(QFocusEvent *event) This event handler, for event \a event, can be reimplemented to receive focus out events for this item. The default implementation does nothing. - \sa focusInEvent(), sceneEvent() + \sa focusInEvent(), sceneEvent(), setFocus() */ void QGraphicsItem::focusOutEvent(QFocusEvent *event) { diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 328ba3d02..bc3633c5e 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -675,8 +675,9 @@ QWheelEvent::QWheelEvent(const QPoint &pos, const QPoint& globalPos, int delta, The QWidget::setEnable() function can be used to enable or disable mouse and keyboard events for a widget. - The event handlers QWidget::keyPressEvent() and - QWidget::keyReleaseEvent() receive key events. + The event handlers QWidget::keyPressEvent(), QWidget::keyReleaseEvent(), + QGraphicsItem::keyPressEvent() and QGraphicsItem::keyReleaseEvent() + receive key events. \sa QFocusEvent, QWidget::grabKeyboard() */ @@ -992,8 +993,9 @@ bool QKeyEvent::matches(QKeySequence::StandardKey matchKey) const The reason for a particular focus event is returned by reason() in the appropriate event handler. - The event handlers QWidget::focusInEvent() and - QWidget::focusOutEvent() receive focus events. + The event handlers QWidget::focusInEvent(), + QWidget::focusOutEvent(), QGraphicsItem::focusInEvent and + QGraphicsItem::focusOutEvent() receive focus events. \sa QWidget::setFocus(), QWidget::setFocusPolicy(), {Keyboard Focus} */ @@ -1611,12 +1613,14 @@ Qt::ButtonState QContextMenuEvent::state() const string is controlled by the widget only). The AttributeType enum describes the different attributes that can be set. - A class implementing QWidget::inputMethodEvent() should at least - understand and honor the \l TextFormat and \l Cursor attributes. + A class implementing QWidget::inputMethodEvent() or + QGraphicsItem::inputMethodEvent() should at least understand and + honor the \l TextFormat and \l Cursor attributes. Since input methods need to be able to query certain properties - from the widget, the widget must also implement - QWidget::inputMethodQuery(). + from the widget or graphics item, subclasses must also implement + QWidget::inputMethodQuery() and QGraphicsItem::inputMethodQuery(), + respectively. When receiving an input method event, the text widget has to performs the following steps: -- cgit v1.2.3 From 6559c780893264b18a74fce42584cc1345363ef8 Mon Sep 17 00:00:00 2001 From: Henrik Hartz Date: Tue, 28 Jul 2009 11:10:07 +1000 Subject: Fixes: Compile on winscw RevBy: Frans Englich Details: QHash::value creates an internal compiler error in this case on Metrowerks, using find instead --- src/xmlpatterns/parser/qmaintainingreader.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/xmlpatterns/parser/qmaintainingreader.cpp b/src/xmlpatterns/parser/qmaintainingreader.cpp index 8569f05ea..292e0fd3a 100644 --- a/src/xmlpatterns/parser/qmaintainingreader.cpp +++ b/src/xmlpatterns/parser/qmaintainingreader.cpp @@ -147,7 +147,8 @@ void MaintainingReader::validateElement(const Looku if(m_elementDescriptions.contains(elementName)) { - const ElementDescription &desc = m_elementDescriptions.value(elementName); + // QHash::value breaks in Metrowerks Compiler + const ElementDescription &desc = *m_elementDescriptions.find(elementName); const int attCount = m_currentAttributes.count(); QSet encounteredXSLTAtts; -- cgit v1.2.3 From e498880396d44c90e46308e2fa5903b51f9f4132 Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Tue, 28 Jul 2009 08:21:32 +0200 Subject: Disable Texture-From-Pixmap on everything other than Linux --- src/opengl/qgl_x11.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index a76059c4a..6381bc215 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1548,6 +1548,9 @@ static bool qt_resolved_texture_from_pixmap = false; QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qint64 key, bool canInvert) { +#if !defined(Q_OS_LINUX) + return 0; +#else Q_Q(QGLContext); if (pm->data_ptr()->classId() != QPixmapData::X11Class) @@ -1562,6 +1565,7 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qi !(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0)) return 0; + if (!qt_resolved_texture_from_pixmap) { qt_resolved_texture_from_pixmap = true; @@ -1647,11 +1651,12 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pm, const qi return texture; #endif //!defined(GLX_VERSION_1_3) || defined(Q_OS_HPUX) +#endif //!defined(Q_OS_LINUX } void QGLTexture::deleteBoundPixmap() { -#if defined(GLX_VERSION_1_3) && !defined(Q_OS_HPUX) +#if defined(GLX_VERSION_1_3) && !defined(Q_OS_HPUX) && defined(Q_OS_LINUX) if (boundPixmap) { glXReleaseTexImageEXT(QX11Info::display(), boundPixmap, GLX_FRONT_LEFT_EXT); glXDestroyPixmap(QX11Info::display(), boundPixmap); -- cgit v1.2.3 From d22d08f3f8a70edfc66c0f6c2fd952688b64fcc2 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 28 Jul 2009 11:38:19 +0200 Subject: Remove tank game example After discussions with product management, it was considered best that this example be removed until it can be improved. There are some bugs an irregularities that should be cleaned up, and the theme should be made less violent. Reviewed-by: Volker Hilsheimer --- doc/src/examples.qdoc | 1 - doc/src/examples/tankgame.qdoc | 117 ------- examples/statemachine/statemachine.pro | 4 +- examples/statemachine/tankgame/gameitem.cpp | 129 -------- examples/statemachine/tankgame/gameitem.h | 66 ---- .../statemachine/tankgame/gameovertransition.cpp | 80 ----- .../statemachine/tankgame/gameovertransition.h | 63 ---- examples/statemachine/tankgame/main.cpp | 53 ---- examples/statemachine/tankgame/mainwindow.cpp | 342 --------------------- examples/statemachine/tankgame/mainwindow.h | 93 ------ examples/statemachine/tankgame/plugin.h | 62 ---- examples/statemachine/tankgame/rocketitem.cpp | 101 ------ examples/statemachine/tankgame/rocketitem.h | 66 ---- examples/statemachine/tankgame/tankgame.pro | 19 -- examples/statemachine/tankgame/tankitem.cpp | 302 ------------------ examples/statemachine/tankgame/tankitem.h | 109 ------- .../tankgameplugins/random_ai/random_ai.pro | 13 - .../tankgameplugins/random_ai/random_ai_plugin.cpp | 78 ----- .../tankgameplugins/random_ai/random_ai_plugin.h | 105 ------- .../tankgameplugins/seek_ai/seek_ai.cpp | 89 ------ .../statemachine/tankgameplugins/seek_ai/seek_ai.h | 249 --------------- .../tankgameplugins/seek_ai/seek_ai.pro | 13 - .../tankgameplugins/spin_ai/spin_ai.cpp | 70 ----- .../statemachine/tankgameplugins/spin_ai/spin_ai.h | 92 ------ .../tankgameplugins/spin_ai/spin_ai.pro | 13 - .../spin_ai_with_error/spin_ai_with_error.cpp | 70 ----- .../spin_ai_with_error/spin_ai_with_error.h | 92 ------ .../spin_ai_with_error/spin_ai_with_error.pro | 13 - .../tankgameplugins/tankgameplugins.pro | 11 - 29 files changed, 1 insertion(+), 2514 deletions(-) delete mode 100644 doc/src/examples/tankgame.qdoc delete mode 100644 examples/statemachine/tankgame/gameitem.cpp delete mode 100644 examples/statemachine/tankgame/gameitem.h delete mode 100644 examples/statemachine/tankgame/gameovertransition.cpp delete mode 100644 examples/statemachine/tankgame/gameovertransition.h delete mode 100644 examples/statemachine/tankgame/main.cpp delete mode 100644 examples/statemachine/tankgame/mainwindow.cpp delete mode 100644 examples/statemachine/tankgame/mainwindow.h delete mode 100644 examples/statemachine/tankgame/plugin.h delete mode 100644 examples/statemachine/tankgame/rocketitem.cpp delete mode 100644 examples/statemachine/tankgame/rocketitem.h delete mode 100644 examples/statemachine/tankgame/tankgame.pro delete mode 100644 examples/statemachine/tankgame/tankitem.cpp delete mode 100644 examples/statemachine/tankgame/tankitem.h delete mode 100644 examples/statemachine/tankgameplugins/random_ai/random_ai.pro delete mode 100644 examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp delete mode 100644 examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.h delete mode 100644 examples/statemachine/tankgameplugins/seek_ai/seek_ai.cpp delete mode 100644 examples/statemachine/tankgameplugins/seek_ai/seek_ai.h delete mode 100644 examples/statemachine/tankgameplugins/seek_ai/seek_ai.pro delete mode 100644 examples/statemachine/tankgameplugins/spin_ai/spin_ai.cpp delete mode 100644 examples/statemachine/tankgameplugins/spin_ai/spin_ai.h delete mode 100644 examples/statemachine/tankgameplugins/spin_ai/spin_ai.pro delete mode 100644 examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.cpp delete mode 100644 examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.h delete mode 100644 examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.pro delete mode 100644 examples/statemachine/tankgameplugins/tankgameplugins.pro diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc index 2861c9020..e85acd134 100644 --- a/doc/src/examples.qdoc +++ b/doc/src/examples.qdoc @@ -324,7 +324,6 @@ \o \l{statemachine/pingpong}{Ping Pong States}\raisedaster \o \l{statemachine/trafficlight}{Traffic Light}\raisedaster \o \l{statemachine/twowaybutton}{Two-way Button}\raisedaster - \o \l{statemachine/tankgame}{Tank Game}\raisedaster \endlist \section1 Threads diff --git a/doc/src/examples/tankgame.qdoc b/doc/src/examples/tankgame.qdoc deleted file mode 100644 index 536e5821d..000000000 --- a/doc/src/examples/tankgame.qdoc +++ /dev/null @@ -1,117 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example statemachine/tankgame - \title Tank Game Example - - The Tank Game example is part of the in \l{The State Machine Framework}. It shows how to use - parallel states to implement artificial intelligence controllers that run in parallel, and error - states to handle run-time errors in parts of the state graph created by external plugins. - - \image tankgame-example.png - - In this example we write a simple game. The application runs a state machine with two main - states: A "stopped" state and a "running" state. The user can load plugins from the disk by - selecting the "Add tank" menu item. - - When the "Add tank" menu item is selected, the "plugins" subdirectory in the example's - directory is searched for compatible plugins. If any are found, they will be listed in a - dialog box created using QInputDialog::getItem(). - - \snippet examples/statemachine/tankgame/mainwindow.cpp 1 - - If the user selects a plugin, the application will construct a TankItem object, which inherits - from QGraphicsItem and QObject, and which implements an agreed-upon interface using the - meta-object mechanism. - - \snippet examples/statemachine/tankgame/tankitem.h 0 - - The tank item will be passed to the plugin's create() function. This will in turn return a - QState object which is expected to implement an artificial intelligence which controls the - tank and attempts to destroy other tanks it detects. - - \snippet examples/statemachine/tankgame/mainwindow.cpp 2 - - Each returned QState object becomes a descendant of a \c region in the "running" state, which is - defined as a parallel state. This means that entering the "running" state will cause each of the - plugged-in QState objects to be entered simultaneously, allowing the tanks to run independently - of each other. - - \snippet examples/statemachine/tankgame/mainwindow.cpp 0 - - The maximum number of tanks on the map is four, and when this number is reached, the - "Add tank" menu item should be disabled. This is implemented by giving the "stopped" state two - children which define whether the map is full or not. - - \snippet examples/statemachine/tankgame/mainwindow.cpp 5 - - To make sure that we go into the correct child state when returning from the "running" state - (if the "Stop game" menu item is selected while the game is running) we also give the "stopped" - state a history state which we make the initial state of "stopped" state. - - \snippet examples/statemachine/tankgame/mainwindow.cpp 3 - - Since part of the state graph is defined by external plugins, we have no way of controlling - whether they contain errors. By default, run-time errors are handled in the state machine by - entering a top level state which prints out an error message and never exits. If we were to - use this default behavior, a run-time error in any of the plugins would cause the "running" - state to exit, and thus all the other tanks to stop running as well. A better solution would - be if the broken plugin was disabled and the rest of the tanks allowed to continue as before. - - This is done by setting the error state of the plugin's top-most state to a special error state - defined specifically for the plugin in question. - - \snippet examples/statemachine/tankgame/mainwindow.cpp 4 - - If a run-time error occurs in \c pluginState or any of its descendants, the state machine will - search the hierarchy of ancestors until it finds a state whose error state is different from - \c null. (Note that if we are worried that a plugin could inadvertedly be overriding our - error state, we could search the descendants of \c pluginState and verify that their error - states are set to \c null before accepting the plugin.) - - The specialized \c errorState sets the "enabled" property of the tank item in question to false, - causing it to be painted with a red cross over it to indicate that it is no longer running. - Since the error state is a child of the same region in the parallel "running" state as - \c pluginState, it will not exit the "running" state, and the other tanks will continue running - without disruption. - -*/ diff --git a/examples/statemachine/statemachine.pro b/examples/statemachine/statemachine.pro index 5074a3ca8..ea3e7a809 100644 --- a/examples/statemachine/statemachine.pro +++ b/examples/statemachine/statemachine.pro @@ -4,9 +4,7 @@ SUBDIRS = \ factorial \ pingpong \ trafficlight \ - twowaybutton \ - tankgame \ - tankgameplugins + twowaybutton # install target.path = $$[QT_INSTALL_EXAMPLES]/statemachine diff --git a/examples/statemachine/tankgame/gameitem.cpp b/examples/statemachine/tankgame/gameitem.cpp deleted file mode 100644 index 94affb45a..000000000 --- a/examples/statemachine/tankgame/gameitem.cpp +++ /dev/null @@ -1,129 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "gameitem.h" - -#include -#include - -GameItem::GameItem(QObject *parent) : QObject(parent) -{ -} - -QPointF GameItem::tryMove(const QPointF &requestedPosition, QLineF *collidedLine, - QGraphicsItem **collidedItem) const -{ - QLineF movementPath(pos(), requestedPosition); - - qreal cannonLength = 0.0; - { - QPointF p1 = boundingRect().center(); - QPointF p2 = QPointF(boundingRect().right() + 10.0, p1.y()); - - cannonLength = QLineF(mapToScene(p1), mapToScene(p2)).length(); - } - - movementPath.setLength(movementPath.length() + cannonLength); - - QRectF boundingRectPath(QPointF(qMin(movementPath.x1(), movementPath.x2()), qMin(movementPath.y1(), movementPath.y2())), - QPointF(qMax(movementPath.x1(), movementPath.x2()), qMax(movementPath.y1(), movementPath.y2()))); - - QList itemsInRect = scene()->items(boundingRectPath, Qt::IntersectsItemBoundingRect); - - QPointF nextPoint = requestedPosition; - QRectF sceneRect = scene()->sceneRect(); - - foreach (QGraphicsItem *item, itemsInRect) { - if (item == static_cast(this)) - continue; - - QPolygonF mappedBoundingRect = item->mapToScene(item->boundingRect()); - for (int i=0; isceneRect().topLeft(), scene()->sceneRect().bottomLeft()); - } - - if (nextPoint.x() > sceneRect.right()) { - nextPoint.rx() = sceneRect.right(); - if (collidedLine != 0) - *collidedLine = QLineF(scene()->sceneRect().topRight(), scene()->sceneRect().bottomRight()); - } - - if (nextPoint.y() < sceneRect.top()) { - nextPoint.ry() = sceneRect.top(); - if (collidedLine != 0) - *collidedLine = QLineF(scene()->sceneRect().topLeft(), scene()->sceneRect().topRight()); - } - - if (nextPoint.y() > sceneRect.bottom()) { - nextPoint.ry() = sceneRect.bottom(); - if (collidedLine != 0) - *collidedLine = QLineF(scene()->sceneRect().bottomLeft(), scene()->sceneRect().bottomRight()); - } - - return nextPoint; -} - diff --git a/examples/statemachine/tankgame/gameitem.h b/examples/statemachine/tankgame/gameitem.h deleted file mode 100644 index af012bb91..000000000 --- a/examples/statemachine/tankgame/gameitem.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef GAMEITEM_H -#define GAMEITEM_H - -#include - -QT_BEGIN_NAMESPACE -class QLineF; -QT_END_NAMESPACE -class GameItem: public QObject, public QGraphicsItem -{ - Q_OBJECT -public: - enum { Type = UserType + 1 }; - int type() const { return Type; } - - GameItem(QObject *parent = 0); - - virtual void idle(qreal elapsed) = 0; - -protected: - QPointF tryMove(const QPointF &requestedPosition, QLineF *collidedLine = 0, - QGraphicsItem **collidedItem = 0) const; -}; - -#endif diff --git a/examples/statemachine/tankgame/gameovertransition.cpp b/examples/statemachine/tankgame/gameovertransition.cpp deleted file mode 100644 index 634fbcef3..000000000 --- a/examples/statemachine/tankgame/gameovertransition.cpp +++ /dev/null @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "gameovertransition.h" -#include "tankitem.h" - -#include -#include - -GameOverTransition::GameOverTransition(QAbstractState *targetState) - : QSignalTransition(new QSignalMapper(), SIGNAL(mapped(QObject*))) -{ - setTargetState(targetState); - - QSignalMapper *mapper = qobject_cast(senderObject()); - mapper->setParent(this); -} - -void GameOverTransition::addTankItem(TankItem *tankItem) -{ - m_tankItems.append(tankItem); - - QSignalMapper *mapper = qobject_cast(senderObject()); - mapper->setMapping(tankItem, tankItem); - connect(tankItem, SIGNAL(aboutToBeDestroyed()), mapper, SLOT(map())); -} - -bool GameOverTransition::eventTest(QEvent *e) -{ - bool ret = QSignalTransition::eventTest(e); - - if (ret) { - QSignalEvent *signalEvent = static_cast(e); - QObject *sender = qvariant_cast(signalEvent->arguments().at(0)); - TankItem *tankItem = qobject_cast(sender); - m_tankItems.removeAll(tankItem); - - return m_tankItems.size() <= 1; - } else { - return false; - } -} diff --git a/examples/statemachine/tankgame/gameovertransition.h b/examples/statemachine/tankgame/gameovertransition.h deleted file mode 100644 index e918359a9..000000000 --- a/examples/statemachine/tankgame/gameovertransition.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef GAMEOVERTRANSITION_H -#define GAMEOVERTRANSITION_H - -#include - -class TankItem; -class GameOverTransition: public QSignalTransition -{ - Q_OBJECT -public: - GameOverTransition(QAbstractState *targetState); - - void addTankItem(TankItem *tankItem); - -protected: - bool eventTest(QEvent *event); - -private: - QList m_tankItems; -}; - -#endif diff --git a/examples/statemachine/tankgame/main.cpp b/examples/statemachine/tankgame/main.cpp deleted file mode 100644 index 85e2747ed..000000000 --- a/examples/statemachine/tankgame/main.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "mainwindow.h" - -int main(int argc, char **argv) -{ - QApplication app(argc, argv); - - MainWindow mainWindow; - mainWindow.show(); - - return app.exec(); -} diff --git a/examples/statemachine/tankgame/mainwindow.cpp b/examples/statemachine/tankgame/mainwindow.cpp deleted file mode 100644 index 596cdfe70..000000000 --- a/examples/statemachine/tankgame/mainwindow.cpp +++ /dev/null @@ -1,342 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "mainwindow.h" -#include "tankitem.h" -#include "rocketitem.h" -#include "plugin.h" -#include "gameovertransition.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent), m_scene(0), m_machine(0), m_runningState(0), m_started(false) -{ - init(); -} - -MainWindow::~MainWindow() -{ -} - -void MainWindow::addWall(const QRectF &wall) -{ - QGraphicsRectItem *item = new QGraphicsRectItem; - item->setRect(wall); - item->setBrush(Qt::darkGreen); - item->setPen(QPen(Qt::black, 0)); - - m_scene->addItem(item); -} - -void MainWindow::init() -{ - setWindowTitle("Pluggable Tank Game"); - - QGraphicsView *view = new QGraphicsView(this); - view->setRenderHints(QPainter::Antialiasing); - setCentralWidget(view); - - m_scene = new QGraphicsScene(this); - view->setScene(m_scene); - - QRectF sceneRect = QRectF(-200.0, -200.0, 400.0, 400.0); - m_scene->setSceneRect(sceneRect); - - { - TankItem *item = new TankItem(this); - - item->setPos(m_scene->sceneRect().topLeft() + QPointF(30.0, 30.0)); - item->setDirection(45.0); - item->setColor(Qt::red); - - m_spawns.append(item); - } - - { - TankItem *item = new TankItem(this); - - item->setPos(m_scene->sceneRect().topRight() + QPointF(-30.0, 30.0)); - item->setDirection(135.0); - item->setColor(Qt::green); - - m_spawns.append(item); - } - - { - TankItem *item = new TankItem(this); - - item->setPos(m_scene->sceneRect().bottomRight() + QPointF(-30.0, -30.0)); - item->setDirection(225.0); - item->setColor(Qt::blue); - - m_spawns.append(item); - } - - { - TankItem *item = new TankItem(this); - - item->setPos(m_scene->sceneRect().bottomLeft() + QPointF(30.0, -30.0)); - item->setDirection(315.0); - item->setColor(Qt::yellow); - - m_spawns.append(item); - } - - QPointF centerOfMap = sceneRect.center(); - - addWall(QRectF(centerOfMap + QPointF(-50.0, -60.0), centerOfMap + QPointF(50.0, -50.0))); - addWall(QRectF(centerOfMap - QPointF(-50.0, -60.0), centerOfMap - QPointF(50.0, -50.0))); - addWall(QRectF(centerOfMap + QPointF(-50.0, -50.0), centerOfMap + QPointF(-40.0, 50.0))); - addWall(QRectF(centerOfMap - QPointF(-50.0, -50.0), centerOfMap - QPointF(-40.0, 50.0))); - - addWall(QRectF(sceneRect.topLeft() + QPointF(sceneRect.width() / 2.0 - 5.0, -10.0), - sceneRect.topLeft() + QPointF(sceneRect.width() / 2.0 + 5.0, 100.0))); - addWall(QRectF(sceneRect.bottomLeft() + QPointF(sceneRect.width() / 2.0 - 5.0, 10.0), - sceneRect.bottomLeft() + QPointF(sceneRect.width() / 2.0 + 5.0, -100.0))); - addWall(QRectF(sceneRect.topLeft() + QPointF(-10.0, sceneRect.height() / 2.0 - 5.0), - sceneRect.topLeft() + QPointF(100.0, sceneRect.height() / 2.0 + 5.0))); - addWall(QRectF(sceneRect.topRight() + QPointF(10.0, sceneRect.height() / 2.0 - 5.0), - sceneRect.topRight() + QPointF(-100.0, sceneRect.height() / 2.0 + 5.0))); - - - QAction *addTankAction = menuBar()->addAction("&Add tank"); - QAction *runGameAction = menuBar()->addAction("&Run game"); - runGameAction->setObjectName("runGameAction"); - QAction *stopGameAction = menuBar()->addAction("&Stop game"); - menuBar()->addSeparator(); - QAction *quitAction = menuBar()->addAction("&Quit"); - - connect(addTankAction, SIGNAL(triggered()), this, SLOT(addTank())); - connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); - - m_machine = new QStateMachine(this); - QState *stoppedState = new QState(m_machine); - stoppedState->setObjectName("stoppedState"); - stoppedState->assignProperty(runGameAction, "enabled", true); - stoppedState->assignProperty(stopGameAction, "enabled", false); - stoppedState->assignProperty(this, "started", false); - m_machine->setInitialState(stoppedState); - -//! [5] - QState *spawnsAvailable = new QState(stoppedState); - spawnsAvailable->assignProperty(addTankAction, "enabled", true); - - QState *noSpawnsAvailable = new QState(stoppedState); - noSpawnsAvailable->assignProperty(addTankAction, "enabled", false); -//! [5] - spawnsAvailable->setObjectName("spawnsAvailable"); - noSpawnsAvailable->setObjectName("noSpawnsAvailable"); - - spawnsAvailable->addTransition(this, SIGNAL(mapFull()), noSpawnsAvailable); - -//! [3] - QHistoryState *hs = new QHistoryState(stoppedState); - hs->setDefaultState(spawnsAvailable); -//! [3] - hs->setObjectName("hs"); - - stoppedState->setInitialState(hs); - -//! [0] - m_runningState = new QState(QState::ParallelStates, m_machine); -//! [0] - m_runningState->setObjectName("runningState"); - m_runningState->assignProperty(addTankAction, "enabled", false); - m_runningState->assignProperty(runGameAction, "enabled", false); - m_runningState->assignProperty(stopGameAction, "enabled", true); - - QState *gameOverState = new QState(m_machine); - gameOverState->setObjectName("gameOverState"); - gameOverState->assignProperty(stopGameAction, "enabled", false); - connect(gameOverState, SIGNAL(entered()), this, SLOT(gameOver())); - - stoppedState->addTransition(runGameAction, SIGNAL(triggered()), m_runningState); - m_runningState->addTransition(stopGameAction, SIGNAL(triggered()), stoppedState); - - m_gameOverTransition = new GameOverTransition(gameOverState); - m_runningState->addTransition(m_gameOverTransition); - - QTimer *timer = new QTimer(this); - timer->setInterval(100); - connect(timer, SIGNAL(timeout()), this, SLOT(runStep())); - connect(m_runningState, SIGNAL(entered()), timer, SLOT(start())); - connect(m_runningState, SIGNAL(exited()), timer, SLOT(stop())); - - m_machine->start(); - m_time.start(); -} - -void MainWindow::runStep() -{ - if (!m_started) { - m_time.restart(); - m_started = true; - } else { - int elapsed = m_time.elapsed(); - if (elapsed > 0) { - m_time.restart(); - qreal elapsedSecs = elapsed / 1000.0; - QList items = m_scene->items(); - foreach (QGraphicsItem *item, items) { - if (GameItem *gameItem = qgraphicsitem_cast(item)) - gameItem->idle(elapsedSecs); - } - } - } -} - -void MainWindow::gameOver() -{ - QList items = m_scene->items(); - - TankItem *lastTankStanding = 0; - foreach (QGraphicsItem *item, items) { - if (GameItem *gameItem = qgraphicsitem_cast(item)) { - if ((lastTankStanding = qobject_cast(gameItem)) != 0) - break; - } - } - - QMessageBox::information(this, "Game over!", - QString::fromLatin1("The tank played by '%1' has won!").arg(lastTankStanding->objectName())); -} - -void MainWindow::addRocket() -{ - TankItem *tankItem = qobject_cast(sender()); - if (tankItem != 0) { - RocketItem *rocketItem = new RocketItem; - - QPointF s = tankItem->mapToScene(QPointF(tankItem->boundingRect().right() + 10.0, - tankItem->boundingRect().center().y())); - rocketItem->setPos(s); - rocketItem->setDirection(tankItem->direction()); - m_scene->addItem(rocketItem); - } -} - -void MainWindow::addTank() -{ - Q_ASSERT(!m_spawns.isEmpty()); - - QDir pluginsDir(qApp->applicationDirPath()); -#if defined(Q_OS_WIN) - if (pluginsDir.dirName().toLower() == "debug" || pluginsDir.dirName().toLower() == "release") - pluginsDir.cdUp(); -#elif defined(Q_OS_MAC) - if (pluginsDir.dirName() == "MacOS") { - pluginsDir.cdUp(); - pluginsDir.cdUp(); - pluginsDir.cdUp(); - } -#endif - - pluginsDir.cd("plugins"); - - QStringList itemNames; - QList items; - foreach (QString fileName, pluginsDir.entryList(QDir::Files)) { - QPluginLoader loader(pluginsDir.absoluteFilePath(fileName)); - QObject *possiblePlugin = loader.instance(); - if (Plugin *plugin = qobject_cast(possiblePlugin)) { - QString objectName = possiblePlugin->objectName(); - if (objectName.isEmpty()) - objectName = fileName; - - itemNames.append(objectName); - items.append(plugin); - } - } - - if (items.isEmpty()) { - QMessageBox::information(this, "No tank types found", "Please build the errorstateplugins directory"); - return; - } - - bool ok; -//! [1] - QString selectedName = QInputDialog::getItem(this, "Select a tank type", "Tank types", - itemNames, 0, false, &ok); -//! [1] - - if (ok && !selectedName.isEmpty()) { - int idx = itemNames.indexOf(selectedName); - if (Plugin *plugin = idx >= 0 ? items.at(idx) : 0) { - TankItem *tankItem = m_spawns.takeLast(); - tankItem->setObjectName(selectedName); - tankItem->setToolTip(selectedName); - m_scene->addItem(tankItem); - connect(tankItem, SIGNAL(cannonFired()), this, SLOT(addRocket())); - if (m_spawns.isEmpty()) - emit mapFull(); - - m_gameOverTransition->addTankItem(tankItem); - - QState *region = new QState(m_runningState); - region->setObjectName(QString::fromLatin1("region%1").arg(m_spawns.size())); -//! [2] - QState *pluginState = plugin->create(region, tankItem); -//! [2] - region->setInitialState(pluginState); - - // If the plugin has an error it is disabled -//! [4] - QState *errorState = new QState(region); - errorState->setObjectName(QString::fromLatin1("errorState%1").arg(m_spawns.size())); - errorState->assignProperty(tankItem, "enabled", false); - pluginState->setErrorState(errorState); -//! [4] - } - } -} - diff --git a/examples/statemachine/tankgame/mainwindow.h b/examples/statemachine/tankgame/mainwindow.h deleted file mode 100644 index d42b7acd0..000000000 --- a/examples/statemachine/tankgame/mainwindow.h +++ /dev/null @@ -1,93 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include -#include - -QT_BEGIN_NAMESPACE -class QGraphicsScene; -class QStateMachine; -class QState; -QT_END_NAMESPACE -class GameOverTransition; -class TankItem; - -class MainWindow: public QMainWindow -{ - Q_OBJECT - Q_PROPERTY(bool started READ started WRITE setStarted) -public: - MainWindow(QWidget *parent = 0); - ~MainWindow(); - - void setStarted(bool b) { m_started = b; } - bool started() const { return m_started; } - -public slots: - void addTank(); - void addRocket(); - void runStep(); - void gameOver(); - -signals: - void mapFull(); - -private: - void init(); - void addWall(const QRectF &wall); - - QGraphicsScene *m_scene; - - QStateMachine *m_machine; - QState *m_runningState; - GameOverTransition *m_gameOverTransition; - - QList m_spawns; - QTime m_time; - - bool m_started : 1; -}; - -#endif - diff --git a/examples/statemachine/tankgame/plugin.h b/examples/statemachine/tankgame/plugin.h deleted file mode 100644 index 97e464064..000000000 --- a/examples/statemachine/tankgame/plugin.h +++ /dev/null @@ -1,62 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef PLUGIN_H -#define PLUGIN_H - -#include - -QT_BEGIN_NAMESPACE -class QState; -QT_END_NAMESPACE -class Plugin -{ -public: - virtual ~Plugin() {} - - virtual QState *create(QState *parentState, QObject *tank) = 0; -}; - -QT_BEGIN_NAMESPACE -Q_DECLARE_INTERFACE(Plugin, "TankPlugin") -QT_END_NAMESPACE - -#endif diff --git a/examples/statemachine/tankgame/rocketitem.cpp b/examples/statemachine/tankgame/rocketitem.cpp deleted file mode 100644 index d286e5d8c..000000000 --- a/examples/statemachine/tankgame/rocketitem.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "rocketitem.h" -#include "tankitem.h" - -#include -#include - -#include - -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - -RocketItem::RocketItem(QObject *parent) - : GameItem(parent), m_direction(0.0), m_distance(300.0) -{ -} - -QRectF RocketItem::boundingRect() const -{ - return QRectF(-1.0, -1.0, 2.0, 2.0); -} - -void RocketItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) -{ - painter->setBrush(Qt::black); - painter->drawEllipse(boundingRect()); -} - -void RocketItem::idle(qreal elapsed) -{ - qreal dist = elapsed * speed(); - - m_distance -= dist; - if (m_distance < 0.0) { - scene()->removeItem(this); - delete this; - return; - } - - qreal a = m_direction * M_PI / 180.0; - - qreal yd = dist * sin(a); - qreal xd = dist * sin(M_PI / 2.0 - a); - - QPointF requestedPosition = pos() + QPointF(xd, yd); - QGraphicsItem *collidedItem = 0; - QPointF nextPosition = tryMove(requestedPosition, 0, &collidedItem); - if (requestedPosition == nextPosition) { - setPos(nextPosition); - } else { - if (GameItem *gameItem = qgraphicsitem_cast(collidedItem)) { - TankItem *tankItem = qobject_cast(gameItem); - if (tankItem != 0) - tankItem->hitByRocket(); - } - - scene()->removeItem(this); - delete this; - } -} diff --git a/examples/statemachine/tankgame/rocketitem.h b/examples/statemachine/tankgame/rocketitem.h deleted file mode 100644 index a485d0393..000000000 --- a/examples/statemachine/tankgame/rocketitem.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef ROCKETITEM_H -#define ROCKETITEM_H - -#include "gameitem.h" - -class RocketItem: public GameItem -{ - Q_OBJECT -public: - RocketItem(QObject *parent = 0); - - virtual void idle(qreal elapsed); - qreal speed() const { return 100.0; } - void setDirection(qreal direction) { m_direction = direction; } - -protected: - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - QRectF boundingRect() const; - -private: - qreal m_direction; - qreal m_distance; -}; - -#endif diff --git a/examples/statemachine/tankgame/tankgame.pro b/examples/statemachine/tankgame/tankgame.pro deleted file mode 100644 index 59415be2f..000000000 --- a/examples/statemachine/tankgame/tankgame.pro +++ /dev/null @@ -1,19 +0,0 @@ -HEADERS += mainwindow.h \ - plugin.h \ - tankitem.h \ - rocketitem.h \ - gameitem.h \ - gameovertransition.h -SOURCES += main.cpp \ - mainwindow.cpp \ - tankitem.cpp \ - rocketitem.cpp \ - gameitem.cpp \ - gameovertransition.cpp -CONFIG += console - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tankgame.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame -INSTALLS += target sources diff --git a/examples/statemachine/tankgame/tankitem.cpp b/examples/statemachine/tankgame/tankitem.cpp deleted file mode 100644 index 192b272d7..000000000 --- a/examples/statemachine/tankgame/tankitem.cpp +++ /dev/null @@ -1,302 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "tankitem.h" - -#include -#include -#include - -#include - -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - -class Action -{ -public: - Action(TankItem *item) : m_item(item) - { - } - - TankItem *item() const { return m_item; } - void setItem(TankItem *item) { m_item = item; } - - virtual bool apply(qreal timeDelta) = 0; - -private: - TankItem *m_item; -}; - -class MoveAction: public Action -{ -public: - MoveAction(TankItem *item, qreal distance) - : Action(item), m_distance(distance) - { - m_reverse = m_distance < 0.0; - } - - bool apply(qreal timeDelta) - { - qreal dist = timeDelta * item()->speed() * (m_reverse ? -1.0 : 1.0); - - bool done = false; - if (qAbs(m_distance) < qAbs(dist)) { - done = true; - dist = m_distance; - } - m_distance -= dist; - - qreal a = item()->direction() * M_PI / 180.0; - - qreal yd = dist * sin(a); - qreal xd = dist * sin(M_PI / 2.0 - a); - - item()->setPos(item()->pos() + QPointF(xd, yd)); - return !done; - } - -private: - qreal m_distance; - bool m_reverse; -}; - -class TurnAction: public Action -{ -public: - TurnAction(TankItem *item, qreal distance) - : Action(item), m_distance(distance) - { - m_reverse = m_distance < 0.0; - } - - bool apply(qreal timeDelta) - { - qreal dist = timeDelta * item()->angularSpeed() * (m_reverse ? -1.0 : 1.0); - bool done = false; - if (qAbs(m_distance) < qAbs(dist)) { - done = true; - dist = m_distance; - } - m_distance -= dist; - - item()->setDirection(item()->direction() + dist); - return !done; - } - -private: - qreal m_distance; - bool m_reverse; -}; - -TankItem::TankItem(QObject *parent) - : GameItem(parent), m_currentAction(0), m_currentDirection(0.0), m_enabled(true) -{ - connect(this, SIGNAL(cannonFired()), this, SIGNAL(actionCompleted())); -} - -void TankItem::idle(qreal elapsed) -{ - if (m_enabled) { - if (m_currentAction != 0) { - if (!m_currentAction->apply(elapsed)) { - setAction(0); - emit actionCompleted(); - } - - QGraphicsItem *item = 0; - qreal distance = distanceToObstacle(&item); - if (TankItem *tankItem = qgraphicsitem_cast(item)) - emit tankSpotted(tankItem->direction(), distance); - } - } -} - -void TankItem::hitByRocket() -{ - emit aboutToBeDestroyed(); - deleteLater(); -} - -void TankItem::setAction(Action *newAction) -{ - if (m_currentAction != 0) - delete m_currentAction; - - m_currentAction = newAction; -} - -void TankItem::fireCannon() -{ - emit cannonFired(); -} - -void TankItem::moveForwards(qreal length) -{ - setAction(new MoveAction(this, length)); -} - -void TankItem::moveBackwards(qreal length) -{ - setAction(new MoveAction(this, -length)); -} - -void TankItem::turn(qreal degrees) -{ - setAction(new TurnAction(this, degrees)); -} - -void TankItem::turnTo(qreal degrees) -{ - setAction(new TurnAction(this, degrees - direction())); -} - -void TankItem::stop() -{ - setAction(0); -} - -QVariant TankItem::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) -{ - if (change == ItemPositionChange && scene()) { - QPointF requestedPosition = value.toPointF(); - QLineF collidedLine; - QPointF nextPoint = tryMove(requestedPosition, &collidedLine); - if (nextPoint != requestedPosition) - emit collision(collidedLine); - return nextPoint; - } else { - return QGraphicsItem::itemChange(change, value); - } -} - - -void TankItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) -{ - QRectF brect = boundingRect(); - - painter->setBrush(m_color); - painter->setPen(Qt::black); - - // body - painter->drawRect(brect.adjusted(0.0, 4.0, -2.0, -4.0)); - - // cannon - QRectF cannonBase = brect.adjusted(10.0, 6.0, -12.0, -6.0); - painter->drawEllipse(cannonBase); - - painter->drawRect(QRectF(QPointF(cannonBase.center().x(), cannonBase.center().y() - 2.0), - QPointF(brect.right(), cannonBase.center().y() + 2.0))); - - // left track - painter->setBrush(QBrush(Qt::black, Qt::VerPattern)); - QRectF leftTrackRect = QRectF(brect.topLeft(), QPointF(brect.right() - 2.0, brect.top() + 4.0)); - painter->fillRect(leftTrackRect, Qt::darkYellow); - painter->drawRect(leftTrackRect); - - // right track - QRectF rightTrackRect = QRectF(QPointF(brect.left(), brect.bottom() - 4.0), - QPointF(brect.right() - 2.0, brect.bottom())); - painter->fillRect(rightTrackRect, Qt::darkYellow); - painter->drawRect(rightTrackRect); - - if (!m_enabled) { - painter->setPen(QPen(Qt::red, 5)); - - painter->drawEllipse(brect); - - QPainterPath path; - path.addEllipse(brect); - painter->setClipPath(path); - painter->drawLine(brect.topRight(), brect.bottomLeft()); - } -} - -QRectF TankItem::boundingRect() const -{ - return QRectF(-20.0, -10.0, 40.0, 20.0); -} - -qreal TankItem::direction() const -{ - return m_currentDirection; -} - -void TankItem::setDirection(qreal newDirection) -{ - int fullRotations = int(newDirection) / 360; - newDirection -= fullRotations * 360.0; - - qreal diff = newDirection - m_currentDirection; - m_currentDirection = newDirection; - rotate(diff); -} - -qreal TankItem::distanceToObstacle(QGraphicsItem **obstacle) const -{ - qreal dist = sqrt(pow(scene()->sceneRect().width(), 2) + pow(scene()->sceneRect().height(), 2)); - - qreal a = m_currentDirection * M_PI / 180.0; - - qreal yd = dist * sin(a); - qreal xd = dist * sin(M_PI / 2.0 - a); - - QPointF requestedPosition = pos() + QPointF(xd, yd); - QGraphicsItem *collidedItem = 0; - QPointF nextPosition = tryMove(requestedPosition, 0, &collidedItem); - if (collidedItem != 0) { - if (obstacle != 0) - *obstacle = collidedItem; - - QPointF d = nextPosition - pos(); - return sqrt(pow(d.x(), 2) + pow(d.y(), 2)); - } else { - return 0.0; - } -} - -qreal TankItem::distanceToObstacle() const -{ - return distanceToObstacle(0); -} - diff --git a/examples/statemachine/tankgame/tankitem.h b/examples/statemachine/tankgame/tankitem.h deleted file mode 100644 index a2f72de09..000000000 --- a/examples/statemachine/tankgame/tankitem.h +++ /dev/null @@ -1,109 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef TANKITEM_H -#define TANKITEM_H - -#include "gameitem.h" - -#include - -class Action; -class TankItem: public GameItem -{ - Q_OBJECT - Q_PROPERTY(bool enabled READ enabled WRITE setEnabled) - Q_PROPERTY(qreal direction READ direction WRITE turnTo) - Q_PROPERTY(qreal distanceToObstacle READ distanceToObstacle) -public: - TankItem(QObject *parent = 0); - - void setColor(const QColor &color) { m_color = color; } - QColor color() const { return m_color; } - - void idle(qreal elapsed); - void setDirection(qreal newDirection); - - qreal speed() const { return 90.0; } - qreal angularSpeed() const { return 90.0; } - - QRectF boundingRect() const; - - void hitByRocket(); - - void setEnabled(bool b) { m_enabled = b; } - bool enabled() const { return m_enabled; } - - qreal direction() const; - qreal distanceToObstacle() const; - qreal distanceToObstacle(QGraphicsItem **item) const; - -//! [0] -signals: - void tankSpotted(qreal direction, qreal distance); - void collision(const QLineF &collidedLine); - void actionCompleted(); - void cannonFired(); - void aboutToBeDestroyed(); - -public slots: - void moveForwards(qreal length = 10.0); - void moveBackwards(qreal length = 10.0); - void turn(qreal degrees = 30.0); - void turnTo(qreal degrees = 0.0); - void stop(); - void fireCannon(); -//! [0] - -protected: - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - QVariant itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value); - -private: - void setAction(Action *newAction); - - Action *m_currentAction; - qreal m_currentDirection; - QColor m_color; - bool m_enabled; -}; - -#endif diff --git a/examples/statemachine/tankgameplugins/random_ai/random_ai.pro b/examples/statemachine/tankgameplugins/random_ai/random_ai.pro deleted file mode 100644 index 5bc0b26a0..000000000 --- a/examples/statemachine/tankgameplugins/random_ai/random_ai.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -INCLUDEPATH += ../.. -HEADERS = random_ai_plugin.h -SOURCES = random_ai_plugin.cpp -TARGET = $$qtLibraryTarget(random_ai) -DESTDIR = ../../tankgame/plugins - -#! [0] -# install -target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame/plugins -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS random_ai.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins/random_ai \ No newline at end of file diff --git a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp b/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp deleted file mode 100644 index ddfd1c5b8..000000000 --- a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "random_ai_plugin.h" - -#include -#include -#include - -QState *RandomAiPlugin::create(QState *parentState, QObject *tank) -{ - qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); - - QState *topLevel = new QState(parentState); - - QState *selectNextActionState = new SelectActionState(topLevel); - topLevel->setInitialState(selectNextActionState); - - QState *fireState = new RandomDistanceState(topLevel); - connect(fireState, SIGNAL(distanceComputed(qreal)), tank, SLOT(fireCannon())); - selectNextActionState->addTransition(selectNextActionState, SIGNAL(fireSelected()), fireState); - - QState *moveForwardsState = new RandomDistanceState(topLevel); - connect(moveForwardsState, SIGNAL(distanceComputed(qreal)), tank, SLOT(moveForwards(qreal))); - selectNextActionState->addTransition(selectNextActionState, SIGNAL(moveForwardsSelected()), moveForwardsState); - - QState *moveBackwardsState = new RandomDistanceState(topLevel); - connect(moveBackwardsState, SIGNAL(distanceComputed(qreal)), tank, SLOT(moveBackwards(qreal))); - selectNextActionState->addTransition(selectNextActionState, SIGNAL(moveBackwardsSelected()), moveBackwardsState); - - QState *turnState = new RandomDistanceState(topLevel); - connect(turnState, SIGNAL(distanceComputed(qreal)), tank, SLOT(turn(qreal))); - selectNextActionState->addTransition(selectNextActionState, SIGNAL(turnSelected()), turnState); - - topLevel->addTransition(tank, SIGNAL(actionCompleted()), selectNextActionState); - - return topLevel; -} - -Q_EXPORT_PLUGIN2(random_ai, RandomAiPlugin) diff --git a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.h b/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.h deleted file mode 100644 index 4c3fc0f7c..000000000 --- a/examples/statemachine/tankgameplugins/random_ai/random_ai_plugin.h +++ /dev/null @@ -1,105 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef RANDOM_AI_PLUGIN_H -#define RANDOM_AI_PLUGIN_H - -#include -#include - -#include - -class SelectActionState: public QState -{ - Q_OBJECT -public: - SelectActionState(QState *parent = 0) : QState(parent) - { - } - -signals: - void fireSelected(); - void moveForwardsSelected(); - void moveBackwardsSelected(); - void turnSelected(); - -protected: - void onEntry(QEvent *) - { - int rand = qrand() % 4; - switch (rand) { - case 0: emit fireSelected(); break; - case 1: emit moveForwardsSelected(); break; - case 2: emit moveBackwardsSelected(); break; - case 3: emit turnSelected(); break; - }; - } -}; - -class RandomDistanceState: public QState -{ - Q_OBJECT -public: - RandomDistanceState(QState *parent = 0) : QState(parent) - { - } - -signals: - void distanceComputed(qreal distance); - -protected: - void onEntry(QEvent *) - { - emit distanceComputed(qreal(qrand() % 180)); - } -}; - -class RandomAiPlugin: public QObject, public Plugin -{ - Q_OBJECT - Q_INTERFACES(Plugin) -public: - RandomAiPlugin() { setObjectName("Random"); } - - virtual QState *create(QState *parentState, QObject *tank); -}; - -#endif // RANDOM_AI_PLUGIN_H diff --git a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.cpp b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.cpp deleted file mode 100644 index 79d7d0cea..000000000 --- a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "seek_ai.h" - -QState *SeekAi::create(QState *parentState, QObject *tank) -{ - QState *topLevel = new QState(parentState); - topLevel->setObjectName("topLevel"); - - QState *seek = new QState(topLevel); - seek->setObjectName("seek"); - topLevel->setInitialState(seek); - - QState *lookForNearestWall = new SearchState(tank, seek); - lookForNearestWall->setObjectName("lookForNearestWall"); - seek->setInitialState(lookForNearestWall); - - QState *driveToFirstObstacle = new QState(seek); - driveToFirstObstacle->setObjectName("driveToFirstObstacle"); - lookForNearestWall->addTransition(lookForNearestWall, SIGNAL(nearestObstacleStraightAhead()), - driveToFirstObstacle); - - QState *drive = new QState(driveToFirstObstacle); - drive->setObjectName("drive"); - driveToFirstObstacle->setInitialState(drive); - connect(drive, SIGNAL(entered()), tank, SLOT(moveForwards())); - connect(drive, SIGNAL(exited()), tank, SLOT(stop())); - - // Go in loop - QState *finishedDriving = new QState(driveToFirstObstacle); - finishedDriving->setObjectName("finishedDriving"); - drive->addTransition(tank, SIGNAL(actionCompleted()), finishedDriving); - finishedDriving->addTransition(drive); - - QState *turnTo = new QState(seek); - turnTo->setObjectName("turnTo"); - driveToFirstObstacle->addTransition(new CollisionTransition(tank, turnTo)); - - turnTo->addTransition(tank, SIGNAL(actionCompleted()), driveToFirstObstacle); - - ChaseState *chase = new ChaseState(tank, topLevel); - chase->setObjectName("chase"); - seek->addTransition(new TankSpottedTransition(tank, chase)); - chase->addTransition(chase, SIGNAL(finished()), driveToFirstObstacle); - chase->addTransition(new TankSpottedTransition(tank, chase)); - - return topLevel; -} - -Q_EXPORT_PLUGIN2(seek_ai, SeekAi) diff --git a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h deleted file mode 100644 index 1bc5b26ce..000000000 --- a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h +++ /dev/null @@ -1,249 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef SEEK_AI_H -#define SEEK_AI_H - -#include - -#include -#include -#include -#include -#include -#include -#include - -class SearchState: public QState -{ - Q_OBJECT -public: - SearchState(QObject *tank, QState *parentState = 0) - : QState(parentState), - m_tank(tank), - m_distanceToTurn(360.0), - m_nearestDistance(-1.0), - m_directionOfNearestObstacle(0.0) - { - } - -public slots: - void turnAlittle() - { - qreal dist = m_tank->property("distanceToObstacle").toDouble(); - - if (m_nearestDistance < 0.0 || dist < m_nearestDistance) { - m_nearestDistance = dist; - m_directionOfNearestObstacle = m_tank->property("direction").toDouble(); - } - - m_distanceToTurn -= 10.0; - if (m_distanceToTurn < 0.0) { - disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(turnAlittle())); - connect(m_tank, SIGNAL(actionCompleted()), this, SIGNAL(nearestObstacleStraightAhead())); - m_tank->setProperty("direction", m_directionOfNearestObstacle); - } - - qreal currentDirection = m_tank->property("direction").toDouble(); - m_tank->setProperty("direction", currentDirection + 10.0); - } - -signals: - void nearestObstacleStraightAhead(); - -protected: - void onEntry(QEvent *) - { - connect(m_tank, SIGNAL(actionCompleted()), this, SLOT(turnAlittle())); - turnAlittle(); - } - - void onExit(QEvent *) - { - disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(turnAlittle())); - disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(nearestObstacleStraightAhead())); - } - -private: - QObject *m_tank; - - qreal m_distanceToTurn; - qreal m_nearestDistance; - qreal m_directionOfNearestObstacle; -}; - -class CollisionTransition: public QSignalTransition -{ -public: - CollisionTransition(QObject *tank, QState *turnTo) - : QSignalTransition(tank, SIGNAL(collision(QLineF))), - m_tank(tank), - m_turnTo(turnTo) - { - setTargetState(turnTo); - } - -protected: - bool eventTest(QEvent *event) - { - bool b = QSignalTransition::eventTest(event); - if (b) { - QSignalEvent *se = static_cast(event); - m_lastLine = se->arguments().at(0).toLineF(); - } - return b; - } - - void onTransition(QEvent *) - { - qreal angleOfWall = m_lastLine.angle(); - - qreal newDirection; - if (qrand() % 2 == 0) - newDirection = angleOfWall; - else - newDirection = angleOfWall - 180.0; - - m_turnTo->assignProperty(m_tank, "direction", newDirection); - } - -private: - QLineF m_lastLine; - QObject *m_tank; - QState *m_turnTo; -}; - -class ChaseState: public QState -{ - class GoToLocationState: public QState - { - public: - GoToLocationState(QObject *tank, QState *parentState = 0) - : QState(parentState), m_tank(tank), m_distance(0.0) - { - } - - void setDistance(qreal distance) { m_distance = distance; } - - protected: - void onEntry() - { - QMetaObject::invokeMethod(m_tank, "moveForwards", Q_ARG(qreal, m_distance)); - } - - private: - QObject *m_tank; - qreal m_distance; - }; - -public: - ChaseState(QObject *tank, QState *parentState = 0) : QState(parentState), m_tank(tank) - { - QState *fireCannon = new QState(this); - fireCannon->setObjectName("fireCannon"); - connect(fireCannon, SIGNAL(entered()), tank, SLOT(fireCannon())); - setInitialState(fireCannon); - - m_goToLocation = new GoToLocationState(tank, this); - m_goToLocation->setObjectName("goToLocation"); - fireCannon->addTransition(tank, SIGNAL(actionCompleted()), m_goToLocation); - - m_turnToDirection = new QState(this); - m_turnToDirection->setObjectName("turnToDirection"); - m_goToLocation->addTransition(tank, SIGNAL(actionCompleted()), m_turnToDirection); - - QFinalState *finalState = new QFinalState(this); - finalState->setObjectName("finalState"); - m_turnToDirection->addTransition(tank, SIGNAL(actionCompleted()), finalState); - } - - void setDirection(qreal direction) - { - m_turnToDirection->assignProperty(m_tank, "direction", direction); - } - - void setDistance(qreal distance) - { - m_goToLocation->setDistance(distance); - } - -private: - QObject *m_tank; - GoToLocationState *m_goToLocation; - QState *m_turnToDirection; - -}; - -class TankSpottedTransition: public QSignalTransition -{ -public: - TankSpottedTransition(QObject *tank, ChaseState *target) : QSignalTransition(tank, SIGNAL(tankSpotted(qreal,qreal))), m_chase(target) - { - setTargetState(target); - } - -protected: - bool eventTest(QEvent *event) - { - bool b = QSignalTransition::eventTest(event); - if (b) { - QSignalEvent *se = static_cast(event); - m_chase->setDirection(se->arguments().at(0).toDouble()); - m_chase->setDistance(se->arguments().at(1).toDouble()); - } - return b; - } - -private: - ChaseState *m_chase; -}; - -class SeekAi: public QObject, public Plugin -{ - Q_OBJECT - Q_INTERFACES(Plugin) -public: - SeekAi() { setObjectName("Seek and destroy"); } - - virtual QState *create(QState *parentState, QObject *tank); -}; - -#endif diff --git a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.pro b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.pro deleted file mode 100644 index 0d8bf2e9a..000000000 --- a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -INCLUDEPATH += ../.. -HEADERS = seek_ai.h -SOURCES = seek_ai.cpp -TARGET = $$qtLibraryTarget(seek_ai) -DESTDIR = ../../tankgame/plugins - -#! [0] -# install -target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame/plugins -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS seek_ai.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins/seek_ai \ No newline at end of file diff --git a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.cpp b/examples/statemachine/tankgameplugins/spin_ai/spin_ai.cpp deleted file mode 100644 index 4e7128533..000000000 --- a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "spin_ai.h" - -#include - -QState *SpinAi::create(QState *parentState, QObject *tank) -{ - QState *topLevel = new QState(parentState); - QState *spinState = new SpinState(tank, topLevel); - topLevel->setInitialState(spinState); - - // When tank is spotted, fire two times and go back to spin state - QState *fireState = new QState(topLevel); - - QState *fireOnce = new QState(fireState); - fireState->setInitialState(fireOnce); - connect(fireOnce, SIGNAL(entered()), tank, SLOT(fireCannon())); - - QState *fireTwice = new QState(fireState); - connect(fireTwice, SIGNAL(entered()), tank, SLOT(fireCannon())); - - fireOnce->addTransition(tank, SIGNAL(actionCompleted()), fireTwice); - fireTwice->addTransition(tank, SIGNAL(actionCompleted()), spinState); - - spinState->addTransition(tank, SIGNAL(tankSpotted(qreal,qreal)), fireState); - - return topLevel; -} - -Q_EXPORT_PLUGIN2(spin_ai, SpinAi) diff --git a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.h b/examples/statemachine/tankgameplugins/spin_ai/spin_ai.h deleted file mode 100644 index a97024d4c..000000000 --- a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.h +++ /dev/null @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef SPIN_AI_H -#define SPIN_AI_H - -#include - -#include -#include -#include - -class SpinState: public QState -{ - Q_OBJECT -public: - SpinState(QObject *tank, QState *parent) : QState(parent), m_tank(tank) - { - } - -public slots: - void spin() - { - m_tank->setProperty("direction", m_tank->property("direction").toDouble() + 90.0); - } - -protected: - void onEntry(QEvent *) - { - connect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin())); - spin(); - } - - void onExit(QEvent *) - { - disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin())); - } - -private: - QObject *m_tank; - -}; - -class SpinAi: public QObject, public Plugin -{ - Q_OBJECT - Q_INTERFACES(Plugin) -public: - SpinAi() { setObjectName("Spin and destroy"); } - - virtual QState *create(QState *parentState, QObject *tank); -}; - -#endif diff --git a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.pro b/examples/statemachine/tankgameplugins/spin_ai/spin_ai.pro deleted file mode 100644 index 8ab4da05f..000000000 --- a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -INCLUDEPATH += ../.. -HEADERS = spin_ai.h -SOURCES = spin_ai.cpp -TARGET = $$qtLibraryTarget(spin_ai) -DESTDIR = ../../tankgame/plugins - -#! [0] -# install -target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame/plugins -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spin_ai.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins/spin_ai \ No newline at end of file diff --git a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.cpp b/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.cpp deleted file mode 100644 index 12a96567d..000000000 --- a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "spin_ai_with_error.h" - -#include - -QState *SpinAiWithError::create(QState *parentState, QObject *tank) -{ - QState *topLevel = new QState(parentState); - QState *spinState = new SpinState(tank, topLevel); - topLevel->setInitialState(spinState); - - // When tank is spotted, fire two times and go back to spin state - // (no initial state set for fireState will lead to run-time error in machine) - QState *fireState = new QState(topLevel); - - QState *fireOnce = new QState(fireState); - connect(fireOnce, SIGNAL(entered()), tank, SLOT(fireCannon())); - - QState *fireTwice = new QState(fireState); - connect(fireTwice, SIGNAL(entered()), tank, SLOT(fireCannon())); - - fireOnce->addTransition(tank, SIGNAL(actionCompleted()), fireTwice); - fireTwice->addTransition(tank, SIGNAL(actionCompleted()), spinState); - - spinState->addTransition(tank, SIGNAL(tankSpotted(qreal,qreal)), fireState); - - return topLevel; -} - -Q_EXPORT_PLUGIN2(spin_ai_with_error, SpinAiWithError) diff --git a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.h b/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.h deleted file mode 100644 index f35da268e..000000000 --- a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.h +++ /dev/null @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef SPIN_AI_WITH_ERROR_H -#define SPIN_AI_WITH_ERROR_H - -#include - -#include -#include -#include - -class SpinState: public QState -{ - Q_OBJECT -public: - SpinState(QObject *tank, QState *parent) : QState(parent), m_tank(tank) - { - } - -public slots: - void spin() - { - m_tank->setProperty("direction", m_tank->property("direction").toDouble() + 90.0); - } - -protected: - void onEntry(QEvent *) - { - connect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin())); - spin(); - } - - void onExit(QEvent *) - { - disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin())); - } - -private: - QObject *m_tank; - -}; - -class SpinAiWithError: public QObject, public Plugin -{ - Q_OBJECT - Q_INTERFACES(Plugin) -public: - SpinAiWithError() { setObjectName("Spin and destroy with runtime error in state machine"); } - - virtual QState *create(QState *parentState, QObject *tank); -}; - -#endif diff --git a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.pro b/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.pro deleted file mode 100644 index 124cf98d1..000000000 --- a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -INCLUDEPATH += ../.. -HEADERS = spin_ai_with_error.h -SOURCES = spin_ai_with_error.cpp -TARGET = $$qtLibraryTarget(spin_ai_with_error) -DESTDIR = ../../tankgame/plugins - -#! [0] -# install -target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame/plugins -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spin_ai_with_error.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins/spin_ai_with_error \ No newline at end of file diff --git a/examples/statemachine/tankgameplugins/tankgameplugins.pro b/examples/statemachine/tankgameplugins/tankgameplugins.pro deleted file mode 100644 index a098e03c8..000000000 --- a/examples/statemachine/tankgameplugins/tankgameplugins.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = random_ai \ - spin_ai_with_error \ - spin_ai \ - seek_ai - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tankgameplugins.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgameplugins -INSTALLS += target sources -- cgit v1.2.3 From a3497fbde4efd0634c8a5ba452e6278cae836b90 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Tue, 28 Jul 2009 12:21:30 +0200 Subject: Fix menubar item size incorrect with icon When you have an icon set we do not show the text label, but the previous code would still use the text for the size hint calculation. Task-number: 218836 Reviewed-by: ogoffart --- src/gui/widgets/qmenubar.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index 1cfb9b31d..a3964f755 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -446,13 +446,12 @@ void QMenuBarPrivate::calcActionRects(int max_width, int start) const continue; //we don't really position these! } else { const QString s = action->text(); - if(!s.isEmpty()) { - sz = fm.size(Qt::TextShowMnemonic, s); - } - QIcon is = action->icon(); + // If an icon is set, only the icon is visible if (!is.isNull()) sz = sz.expandedTo(QSize(icone, icone)); + else if (!s.isEmpty()) + sz = fm.size(Qt::TextShowMnemonic, s); } //let the style modify the above size.. -- cgit v1.2.3 From e1e83e28f66c5cd500ab2961f59840a4e47e80c4 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 28 Jul 2009 12:50:07 +0200 Subject: Fix webkit import from the trunk Exclude more files from the import that are not needed for the Qt build, and include jsc for qtscript debugging. Reviewed-by: Trust me --- util/webkit/mkdist-webkit | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit index a843c833e..f4b36d0f0 100755 --- a/util/webkit/mkdist-webkit +++ b/util/webkit/mkdist-webkit @@ -47,6 +47,7 @@ excluded_directories="$excluded_directories JavaScriptCore/wtf/gtk" excluded_directories="$excluded_directories JavaScriptCore/wtf/mac" excluded_directories="$excluded_directories JavaScriptCore/wtf/win" excluded_directories="$excluded_directories JavaScriptCore/wtf/chromium" +excluded_directories="$excluded_directories JavaScriptCore/wtf/haiku" excluded_directories="$excluded_directories WebCore/WebCore.vcproj" excluded_directories="$excluded_directories WebCore/DerivedSources.make" @@ -68,21 +69,28 @@ excluded_directories="$excluded_directories WebCore/icu" excluded_directories="$excluded_directories WebCore/loader/mac" excluded_directories="$excluded_directories WebCore/loader/win" +excluded_directories="$excluded_directories WebCore/loader/icon/wince" excluded_directories="$excluded_directories WebCore/page/gtk" excluded_directories="$excluded_directories WebCore/page/mac" excluded_directories="$excluded_directories WebCore/page/wx" excluded_directories="$excluded_directories WebCore/page/chromium" +excluded_directories="$excluded_directories WebCore/page/haiku" excluded_directories="$excluded_directories WebCore/history/mac" excluded_directories="$excluded_directories WebCore/editing/mac" excluded_directories="$excluded_directories WebCore/editing/wx" +excluded_directories="$excluded_directories WebCore/editing/haiku" + +excluded_directories="$excluded_directories WebCore/platform/haiku" excluded_directories="$excluded_directories WebCore/platform/text/wx" excluded_directories="$excluded_directories WebCore/platform/text/gtk" excluded_directories="$excluded_directories WebCore/platform/text/chromium" +excluded_directories="$excluded_directories WebCore/platform/text/haiku" +excluded_directories="$excluded_directories WebCore/platform/sql/chromium" excluded_directories="$excluded_directories WebCore/manual-tests" @@ -101,6 +109,7 @@ excluded_directories="$excluded_directories WebCore/platform/graphics/mac" excluded_directories="$excluded_directories WebCore/platform/graphics/win" excluded_directories="$excluded_directories WebCore/platform/graphics/skia" excluded_directories="$excluded_directories WebCore/platform/graphics/chromium" +excluded_directories="$excluded_directories WebCore/platform/graphics/wince" excluded_directories="$excluded_directories WebCore/platform/image-decoders/bmp" excluded_directories="$excluded_directories WebCore/platform/image-decoders/gif" @@ -110,6 +119,7 @@ excluded_directories="$excluded_directories WebCore/platform/image-decoders/ico" excluded_directories="$excluded_directories WebCore/platform/image-decoders/jpeg" excluded_directories="$excluded_directories WebCore/platform/image-decoders/xbm" excluded_directories="$excluded_directories WebCore/platform/image-decoders/skia" +excluded_directories="$excluded_directories WebCore/platform/image-decoders/haiku" excluded_directories="$excluded_directories WebCore/platform/image-encoders/skia" @@ -122,12 +132,16 @@ excluded_directories="$excluded_directories WebCore/accessibility/mac" excluded_directories="$excluded_directories WebCore/accessibility/win" excluded_directories="$excluded_directories WebCore/accessibility/wx" +excluded_directories="$excluded_directories WebCore/storage/wince" +excluded_directories="$excluded_directories WebCore/svg/graphics/wince" + excluded_directories="$excluded_directories WebCore/platform/wx" excluded_directories="$excluded_directories WebKit/gtk" excluded_directories="$excluded_directories WebKit/win" excluded_directories="$excluded_directories WebKit/mac" excluded_directories="$excluded_directories WebKit/wx" excluded_directories="$excluded_directories WebKit/cf" +excluded_directories="$excluded_directories WebKit/haiku" excluded_directories="$excluded_directories WebKit/English.lproj WebKit/WebKit.xcodeproj" excluded_directories="$excluded_directories WebCore/English.lproj" @@ -147,8 +161,6 @@ files_to_remove="$files_to_remove configure.ac" files_to_remove="$files_to_remove WebKit.pro" -files_to_remove="$files_to_remove JavaScriptCore/jsc.pro" - files_to_remove="$files_to_remove WebKit/qt/QtLauncher/QtLauncher.pro" files_to_remove="$files_to_remove WebKit/qt/QtLauncher/main.cpp" -- cgit v1.2.3 From 2d9448d1c9bcf843e36931a9109fd9bd8d42b2be Mon Sep 17 00:00:00 2001 From: ck Date: Tue, 28 Jul 2009 14:44:50 +0200 Subject: Assistant/helpconverter: Remove hard-coded version check in ADP file. The AdpReader checked for a version attribute == 3.2.0. This has been replaced by a check for >= 3.2.0 Task-number: 258551 Reviewed-by: kh --- tools/assistant/tools/qhelpconverter/adpreader.cpp | 20 ++++++++++++++------ tools/assistant/tools/qhelpconverter/adpreader.h | 6 +++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/tools/assistant/tools/qhelpconverter/adpreader.cpp b/tools/assistant/tools/qhelpconverter/adpreader.cpp index 35f8878b6..c42703898 100644 --- a/tools/assistant/tools/qhelpconverter/adpreader.cpp +++ b/tools/assistant/tools/qhelpconverter/adpreader.cpp @@ -39,8 +39,16 @@ ** ****************************************************************************/ +#include + #include "adpreader.h" +static bool versionIsAtLeast320(const QString &version) +{ + return QRegExp("\\d.\\d\\.\\d").exactMatch(version) + && (version[0] > '3' || (version[0] == '3' && version[2] >= '2')); +} + QT_BEGIN_NAMESPACE void AdpReader::readData(const QByteArray &contents) @@ -51,11 +59,11 @@ void AdpReader::readData(const QByteArray &contents) m_properties.clear(); m_files.clear(); addData(contents); - while (!atEnd()) { - readNext(); - if (isStartElement()) { + while (!atEnd()) { + readNext(); + if (isStartElement()) { if (name().toString().toLower() == QLatin1String("assistantconfig") - && attributes().value(QLatin1String("version")) == QLatin1String("3.2.0")) { + && versionIsAtLeast320(attributes().value(QLatin1String("version")).toString())) { readProject(); } else if (name().toString().toLower() == QLatin1String("dcf")) { QString ref = attributes().value(QLatin1String("ref")).toString(); @@ -66,8 +74,8 @@ void AdpReader::readData(const QByteArray &contents) } else { raiseError(); } - } - } + } + } } QList AdpReader::contents() const diff --git a/tools/assistant/tools/qhelpconverter/adpreader.h b/tools/assistant/tools/qhelpconverter/adpreader.h index f2e7509a8..740a4624b 100644 --- a/tools/assistant/tools/qhelpconverter/adpreader.h +++ b/tools/assistant/tools/qhelpconverter/adpreader.h @@ -50,15 +50,15 @@ QT_BEGIN_NAMESPACE struct ContentItem { ContentItem(const QString &t, const QString &r, int d) - : title(t), reference(r), depth(d) {} + : title(t), reference(r), depth(d) {} QString title; QString reference; - int depth; + int depth; }; struct KeywordItem { KeywordItem(const QString &k, const QString &r) - : keyword(k), reference(r) {} + : keyword(k), reference(r) {} QString keyword; QString reference; }; -- cgit v1.2.3 From e61e40d1b89ef13d4cd65853df859945c357af93 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Tue, 28 Jul 2009 15:04:16 +0200 Subject: qdoc: Added superscript obsolete to obsolete links. Only for obsolete links from non-obsolete things. --- tools/qdoc3/htmlgenerator.cpp | 13 +++++++++++-- tools/qdoc3/htmlgenerator.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index ab74f13c9..f92391e0d 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -2881,7 +2881,9 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode, } #endif -void HtmlGenerator::generateLink(const Atom *atom, const Node * /* relative */, CodeMarker *marker) +void HtmlGenerator::generateLink(const Atom* atom, + const Node* /* relative */, + CodeMarker* marker) { static QRegExp camelCase("[A-Z][A-Z][a-z]|[a-z][A-Z0-9]|_"); @@ -3472,6 +3474,7 @@ QString HtmlGenerator::getLink(const Atom *atom, { QString link; *node = 0; + inObsoleteLink = false; if (atom->string().contains(":") && (atom->string().startsWith("file:") @@ -3530,10 +3533,12 @@ QString HtmlGenerator::getLink(const Atom *atom, porting = true; } QString name = marker->plainFullName(relative); - if (!porting && !name.startsWith("Q3")) + if (!porting && !name.startsWith("Q3")) { relative->doc().location().warning(tr("Link to obsolete item '%1' in %2") .arg(atom->string()) .arg(name)); + inObsoleteLink = true; + } #if 0 qDebug() << "Link to Obsolete entity" << (*node)->name(); @@ -3689,10 +3694,14 @@ void HtmlGenerator::endLink() out() << ""; } else { + if (inObsoleteLink) { + out() << "(obsolete)"; + } out() << ""; } } inLink = false; + inObsoleteLink = false; } QT_END_NAMESPACE diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index a7f4009ce..a7632cdfe 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -230,6 +230,7 @@ class HtmlGenerator : public PageGenerator DcfSection dcfQmakeRoot; HelpProjectWriter *helpProjectWriter; bool inLink; + bool inObsoleteLink; bool inContents; bool inSectionHeading; bool inTableHeader; -- cgit v1.2.3 From 8e9921c43ae0b896aee091e1031b4f42c332332b Mon Sep 17 00:00:00 2001 From: Leonardo Sobral Cunha Date: Tue, 28 Jul 2009 15:44:48 +0200 Subject: Fixes doc typos and indentation in abstractitemview & itemselectionmodel Reviewed-by: Trustme --- src/gui/itemviews/qabstractitemview.cpp | 152 +++++++------- src/gui/itemviews/qitemselectionmodel.cpp | 322 +++++++++++++++--------------- 2 files changed, 236 insertions(+), 238 deletions(-) diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index 88879777d..8b6b5cb34 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -851,8 +851,8 @@ QAbstractItemDelegate *QAbstractItemView::itemDelegateForColumn(int column) cons } /*! - Returns the item delegate used by this view and model for - the given \a index. + Returns the item delegate used by this view and model for + the given \a index. */ QAbstractItemDelegate *QAbstractItemView::itemDelegate(const QModelIndex &index) const { @@ -861,14 +861,14 @@ QAbstractItemDelegate *QAbstractItemView::itemDelegate(const QModelIndex &index) } /*! - \property QAbstractItemView::selectionMode - \brief which selection mode the view operates in + \property QAbstractItemView::selectionMode + \brief which selection mode the view operates in - This property controls whether the user can select one or many items - and, in many-item selections, whether the selection must be a - continuous range of items. + This property controls whether the user can select one or many items + and, in many-item selections, whether the selection must be a + continuous range of items. - \sa SelectionMode SelectionBehavior + \sa SelectionMode SelectionBehavior */ void QAbstractItemView::setSelectionMode(SelectionMode mode) { @@ -883,13 +883,13 @@ QAbstractItemView::SelectionMode QAbstractItemView::selectionMode() const } /*! - \property QAbstractItemView::selectionBehavior - \brief which selection behavior the view uses + \property QAbstractItemView::selectionBehavior + \brief which selection behavior the view uses - This property holds whether selections are done - in terms of single items, rows or columns. + This property holds whether selections are done + in terms of single items, rows or columns. - \sa SelectionMode SelectionBehavior + \sa SelectionMode SelectionBehavior */ void QAbstractItemView::setSelectionBehavior(QAbstractItemView::SelectionBehavior behavior) @@ -990,11 +990,11 @@ QModelIndex QAbstractItemView::rootIndex() const } /*! - Selects all item in the view. - This function wil use the selection selection behavior - set on the view when selecting. + Selects all items in the view. + This function will use the selection behavior + set on the view when selecting. - \sa setSelection(), selectedIndexes(), clearSelection() + \sa setSelection(), selectedIndexes(), clearSelection() */ void QAbstractItemView::selectAll() { @@ -1223,10 +1223,10 @@ bool QAbstractItemView::tabKeyNavigation() const #ifndef QT_NO_DRAGANDDROP /*! - \property QAbstractItemView::showDropIndicator - \brief whether the drop indicator is shown when dragging items and dropping. + \property QAbstractItemView::showDropIndicator + \brief whether the drop indicator is shown when dragging items and dropping. - \sa dragEnabled DragDropMode dragDropOverwriteMode acceptDrops + \sa dragEnabled DragDropMode dragDropOverwriteMode acceptDrops */ void QAbstractItemView::setDropIndicatorShown(bool enable) @@ -1242,10 +1242,10 @@ bool QAbstractItemView::showDropIndicator() const } /*! - \property QAbstractItemView::dragEnabled - \brief whether the view supports dragging of its own items + \property QAbstractItemView::dragEnabled + \brief whether the view supports dragging of its own items - \sa showDropIndicator DragDropMode dragDropOverwriteMode acceptDrops + \sa showDropIndicator DragDropMode dragDropOverwriteMode acceptDrops */ void QAbstractItemView::setDragEnabled(bool enable) @@ -1281,11 +1281,11 @@ bool QAbstractItemView::dragEnabled() const */ /*! - \property QAbstractItemView::dragDropMode - \brief the drag and drop event the view will act upon + \property QAbstractItemView::dragDropMode + \brief the drag and drop event the view will act upon - \since 4.2 - \sa showDropIndicator dragDropOverwriteMode + \since 4.2 + \sa showDropIndicator dragDropOverwriteMode */ void QAbstractItemView::setDragDropMode(DragDropMode behavior) { @@ -1321,14 +1321,14 @@ QAbstractItemView::DragDropMode QAbstractItemView::dragDropMode() const #endif // QT_NO_DRAGANDDROP /*! - \property QAbstractItemView::alternatingRowColors - \brief whether to draw the background using alternating colors + \property QAbstractItemView::alternatingRowColors + \brief whether to draw the background using alternating colors - If this property is true, the item background will be drawn using - QPalette::Base and QPalette::AlternateBase; otherwise the background - will be drawn using the QPalette::Base color. + If this property is true, the item background will be drawn using + QPalette::Base and QPalette::AlternateBase; otherwise the background + will be drawn using the QPalette::Base color. - By default, this property is false. + By default, this property is false. */ void QAbstractItemView::setAlternatingRowColors(bool enable) { @@ -2257,8 +2257,8 @@ void QAbstractItemView::inputMethodEvent(QInputMethodEvent *event) \value BelowItem The item will be dropped below the index. \value OnViewport The item will be dropped onto a region of the viewport with -no items. The way each view handles items dropped onto the viewport depends on -the behavior of the underlying model in use. + no items. The way each view handles items dropped onto the viewport depends on + the behavior of the underlying model in use. */ @@ -2275,11 +2275,11 @@ QAbstractItemView::DropIndicatorPosition QAbstractItemView::dropIndicatorPositio #endif /*! - This convenience function returns a list of all selected and - non-hidden item indexes in the view. The list contains no - duplicates, and is not sorted. + This convenience function returns a list of all selected and + non-hidden item indexes in the view. The list contains no + duplicates, and is not sorted. - \sa QItemSelectionModel::selectedIndexes() + \sa QItemSelectionModel::selectedIndexes() */ QModelIndexList QAbstractItemView::selectedIndexes() const { @@ -2361,8 +2361,8 @@ bool QAbstractItemView::edit(const QModelIndex &index, EditTrigger trigger, QEve } /*! - \internal - Updates the data shown in the open editor widgets in the view. + \internal + Updates the data shown in the open editor widgets in the view. */ void QAbstractItemView::updateEditorData() { @@ -2371,8 +2371,8 @@ void QAbstractItemView::updateEditorData() } /*! - \internal - Updates the geometry of the open editor widgets in the view. + \internal + Updates the geometry of the open editor widgets in the view. */ void QAbstractItemView::updateEditorGeometries() { @@ -2421,7 +2421,7 @@ void QAbstractItemView::updateGeometries() } /*! - \internal + \internal */ void QAbstractItemView::verticalScrollbarValueChanged(int value) { @@ -2432,7 +2432,7 @@ void QAbstractItemView::verticalScrollbarValueChanged(int value) } /*! - \internal + \internal */ void QAbstractItemView::horizontalScrollbarValueChanged(int value) { @@ -2534,9 +2534,9 @@ void QAbstractItemView::closeEditor(QWidget *editor, QAbstractItemDelegate::EndE } /*! - Commit the data in the \a editor to the model. + Commit the data in the \a editor to the model. - \sa closeEditor() + \sa closeEditor() */ void QAbstractItemView::commitData(QWidget *editor) { @@ -2555,9 +2555,9 @@ void QAbstractItemView::commitData(QWidget *editor) } /*! - This function is called when the given \a editor has been destroyed. + This function is called when the given \a editor has been destroyed. - \sa closeEditor() + \sa closeEditor() */ void QAbstractItemView::editorDestroyed(QObject *editor) { @@ -2628,12 +2628,12 @@ int QAbstractItemView::verticalStepsPerItem() const } /*! - Moves to and selects the item best matching the string \a search. - If no item is found nothing happens. + Moves to and selects the item best matching the string \a search. + If no item is found nothing happens. - In the default implementation, the search is reset if \a search is empty, or - the time interval since the last search has exceeded - QApplication::keyboardInputInterval(). + In the default implementation, the search is reset if \a search is empty, or + the time interval since the last search has exceeded + QApplication::keyboardInputInterval(). */ void QAbstractItemView::keyboardSearch(const QString &search) { @@ -2687,9 +2687,9 @@ void QAbstractItemView::keyboardSearch(const QString &search) setCurrentIndex(firstMatch); break; } - int row = firstMatch.row() + 1; - if (row >= d->model->rowCount(firstMatch.parent())) - row = 0; + int row = firstMatch.row() + 1; + if (row >= d->model->rowCount(firstMatch.parent())) + row = 0; current = firstMatch.sibling(row, firstMatch.column()); } } while (current != start && firstMatch.isValid()); @@ -2796,9 +2796,9 @@ void QAbstractItemView::openPersistentEditor(const QModelIndex &index) } /*! - Closes the persistent editor for the item at the given \a index. + Closes the persistent editor for the item at the given \a index. - \sa openPersistentEditor() + \sa openPersistentEditor() */ void QAbstractItemView::closePersistentEditor(const QModelIndex &index) { @@ -3333,14 +3333,14 @@ void QAbstractItemView::setDirtyRegion(const QRegion ®ion) } /*! - Prepares the view for scrolling by (\a{dx},\a{dy}) pixels by moving the dirty regions in the - opposite direction. You only need to call this function if you are implementing a scrolling - viewport in your view subclass. + Prepares the view for scrolling by (\a{dx},\a{dy}) pixels by moving the dirty regions in the + opposite direction. You only need to call this function if you are implementing a scrolling + viewport in your view subclass. - If you implement scrollContentsBy() in a subclass of QAbstractItemView, call this function - before you call QWidget::scroll() on the viewport. Alternatively, just call update(). + If you implement scrollContentsBy() in a subclass of QAbstractItemView, call this function + before you call QWidget::scroll() on the viewport. Alternatively, just call update(). - \sa scrollContentsBy(), dirtyRegionOffset(), setDirtyRegion() + \sa scrollContentsBy(), dirtyRegionOffset(), setDirtyRegion() */ void QAbstractItemView::scrollDirtyRegion(int dx, int dy) { @@ -3349,13 +3349,13 @@ void QAbstractItemView::scrollDirtyRegion(int dx, int dy) } /*! - Returns the offset of the dirty regions in the view. + Returns the offset of the dirty regions in the view. - If you use scrollDirtyRegion() and implement a paintEvent() in a subclass of - QAbstractItemView, you should translate the area given by the paint event with - the offset returned from this function. + If you use scrollDirtyRegion() and implement a paintEvent() in a subclass of + QAbstractItemView, you should translate the area given by the paint event with + the offset returned from this function. - \sa scrollDirtyRegion(), setDirtyRegion() + \sa scrollDirtyRegion(), setDirtyRegion() */ QPoint QAbstractItemView::dirtyRegionOffset() const { @@ -3527,7 +3527,7 @@ QItemSelectionModel::SelectionFlags QAbstractItemViewPrivate::extendedSelectionC const bool shiftKeyPressed = modifiers & Qt::ShiftModifier; const bool controlKeyPressed = modifiers & Qt::ControlModifier; if (((index == pressedIndex && selectionModel->isSelected(index)) - || !index.isValid()) && state != QAbstractItemView::DragSelectingState + || !index.isValid()) && state != QAbstractItemView::DragSelectingState && !shiftKeyPressed && !controlKeyPressed && !rightButtonPressed) return QItemSelectionModel::ClearAndSelect|selectionBehaviorFlags(); return QItemSelectionModel::NoUpdate; @@ -3759,7 +3759,7 @@ void QAbstractItemViewPrivate::updateEditorData(const QModelIndex &tl, const QMo but the behavior is view dependant (table just clears the selected indexes for example). Either remove the selected rows or clear them - */ +*/ void QAbstractItemViewPrivate::clearOrRemove() { #ifndef QT_NO_DRAGANDDROP @@ -3795,7 +3795,7 @@ void QAbstractItemViewPrivate::clearOrRemove() When persistent aeditor gets/loses focus, we need to check and setcorrectly the current index. - */ +*/ void QAbstractItemViewPrivate::checkPersistentEditorFocus() { Q_Q(QAbstractItemView); @@ -3882,10 +3882,10 @@ bool QAbstractItemViewPrivate::openEditor(const QModelIndex &index, QEvent *even } /* - \internal + \internal - returns the pair QRect/QModelIndex that should be painted on the viewports's rect - */ + returns the pair QRect/QModelIndex that should be painted on the viewports's rect +*/ QItemViewPaintPairs QAbstractItemViewPrivate::draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const { diff --git a/src/gui/itemviews/qitemselectionmodel.cpp b/src/gui/itemviews/qitemselectionmodel.cpp index 87825d9d4..9dad95f86 100644 --- a/src/gui/itemviews/qitemselectionmodel.cpp +++ b/src/gui/itemviews/qitemselectionmodel.cpp @@ -303,45 +303,44 @@ QModelIndexList QItemSelectionRange::indexes() const } /*! - \class QItemSelection + \class QItemSelection - \brief The QItemSelection class manages information about selected items in a model. + \brief The QItemSelection class manages information about selected items in a model. - \ingroup model-view - - A QItemSelection describes the items in a model that have been - selected by the user. A QItemSelection is basically a list of - selection ranges, see QItemSelectionRange. It provides functions for - creating and manipulating selections, and selecting a range of items - from a model. + \ingroup model-view - The QItemSelection class is one of the \l{Model/View Classes} - and is part of Qt's \l{Model/View Programming}{model/view framework}. + A QItemSelection describes the items in a model that have been + selected by the user. A QItemSelection is basically a list of + selection ranges, see QItemSelectionRange. It provides functions for + creating and manipulating selections, and selecting a range of items + from a model. - An item selection can be constructed and initialized to contain a - range of items from an existing model. The following example constructs - a selection that contains a range of items from the given \c model, - beginning at the \c topLeft, and ending at the \c bottomRight. + The QItemSelection class is one of the \l{Model/View Classes} + and is part of Qt's \l{Model/View Programming}{model/view framework}. - \snippet doc/src/snippets/code/src_gui_itemviews_qitemselectionmodel.cpp 0 + An item selection can be constructed and initialized to contain a + range of items from an existing model. The following example constructs + a selection that contains a range of items from the given \c model, + beginning at the \c topLeft, and ending at the \c bottomRight. - An empty item selection can be constructed, and later populated as - required. So, if the model is going to be unavailable when we construct - the item selection, we can rewrite the above code in the following way: + \snippet doc/src/snippets/code/src_gui_itemviews_qitemselectionmodel.cpp 0 - \snippet doc/src/snippets/code/src_gui_itemviews_qitemselectionmodel.cpp 1 + An empty item selection can be constructed, and later populated as + required. So, if the model is going to be unavailable when we construct + the item selection, we can rewrite the above code in the following way: - QItemSelection saves memory, and avoids unnecessary work, by working with - selection ranges rather than recording the model item index for each - item in the selection. Generally, an instance of this class will contain - a list of non-overlapping selection ranges. + \snippet doc/src/snippets/code/src_gui_itemviews_qitemselectionmodel.cpp 1 - Use merge() to merge one item selection into another without making - overlapping ranges. Use split() to split one selection range into - smaller ranges based on a another selection range. + QItemSelection saves memory, and avoids unnecessary work, by working with + selection ranges rather than recording the model item index for each + item in the selection. Generally, an instance of this class will contain + a list of non-overlapping selection ranges. - \sa {Model/View Programming}, QItemSelectionModel + Use merge() to merge one item selection into another without making + overlapping ranges. Use split() to split one selection range into + smaller ranges based on a another selection range. + \sa {Model/View Programming}, QItemSelectionModel */ /*! @@ -420,14 +419,14 @@ QModelIndexList QItemSelection::indexes() const } /*! - Merges the \a other selection with this QItemSelection using the - \a command given. This method guarantees that no ranges are overlapping. + Merges the \a other selection with this QItemSelection using the + \a command given. This method guarantees that no ranges are overlapping. - Note that only QItemSelectionModel::Select, - QItemSelectionModel::Deselect, and QItemSelectionModel::Toggle are - supported. + Note that only QItemSelectionModel::Select, + QItemSelectionModel::Deselect, and QItemSelectionModel::Toggle are + supported. - \sa split() + \sa split() */ void QItemSelection::merge(const QItemSelection &other, QItemSelectionModel::SelectionFlags command) { @@ -479,10 +478,10 @@ void QItemSelection::merge(const QItemSelection &other, QItemSelectionModel::Sel } /*! - Splits the selection \a range using the selection \a other range. - Removes all items in \a other from \a range and puts the result in \a result. - This can be compared with the semantics of the \e subtract operation of a set. - \sa merge() + Splits the selection \a range using the selection \a other range. + Removes all items in \a other from \a range and puts the result in \a result. + This can be compared with the semantics of the \e subtract operation of a set. + \sa merge() */ void QItemSelection::split(const QItemSelectionRange &range, @@ -529,11 +528,11 @@ void QItemSelection::split(const QItemSelectionRange &range, } /*! - \internal + \internal - returns a QItemSelection where all ranges have been expanded to: - Rows: left: 0 and right: columnCount()-1 - Columns: top: 0 and bottom: rowCount()-1 + returns a QItemSelection where all ranges have been expanded to: + Rows: left: 0 and right: columnCount()-1 + Columns: top: 0 and bottom: rowCount()-1 */ QItemSelection QItemSelectionModelPrivate::expandSelection(const QItemSelection &selection, @@ -568,7 +567,7 @@ QItemSelection QItemSelectionModelPrivate::expandSelection(const QItemSelection } /*! - \internal + \internal */ void QItemSelectionModelPrivate::_q_rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) @@ -599,7 +598,7 @@ void QItemSelectionModelPrivate::_q_rowsAboutToBeRemoved(const QModelIndex &pare } /*! - \internal + \internal */ void QItemSelectionModelPrivate::_q_columnsAboutToBeRemoved(const QModelIndex &parent, int start, int end) @@ -630,9 +629,9 @@ void QItemSelectionModelPrivate::_q_columnsAboutToBeRemoved(const QModelIndex &p } /*! - \internal + \internal - Split selection ranges if columns are about to be inserted in the middle. + Split selection ranges if columns are about to be inserted in the middle. */ void QItemSelectionModelPrivate::_q_columnsAboutToBeInserted(const QModelIndex &parent, int start, int end) @@ -659,9 +658,9 @@ void QItemSelectionModelPrivate::_q_columnsAboutToBeInserted(const QModelIndex & } /*! - \internal + \internal - Split selection ranges if rows are about to be inserted in the middle. + Split selection ranges if rows are about to be inserted in the middle. */ void QItemSelectionModelPrivate::_q_rowsAboutToBeInserted(const QModelIndex &parent, int start, int end) @@ -688,11 +687,11 @@ void QItemSelectionModelPrivate::_q_rowsAboutToBeInserted(const QModelIndex &par } /*! - \internal + \internal - Split selection into individual (persistent) indexes. This is done in - preparation for the layoutChanged() signal, where the indexes can be - merged again. + Split selection into individual (persistent) indexes. This is done in + preparation for the layoutChanged() signal, where the indexes can be + merged again. */ void QItemSelectionModelPrivate::_q_layoutAboutToBeChanged() { @@ -726,10 +725,10 @@ void QItemSelectionModelPrivate::_q_layoutAboutToBeChanged() } /*! - \internal + \internal - Merges \a indexes into an item selection made up of ranges. - Assumes that the indexes are sorted. + Merges \a indexes into an item selection made up of ranges. + Assumes that the indexes are sorted. */ static QItemSelection mergeIndexes(const QList &indexes) { @@ -774,9 +773,9 @@ static QItemSelection mergeIndexes(const QList &indexes) } /*! - \internal + \internal - Merge the selected indexes into selection ranges again. + Merge the selected indexes into selection ranges again. */ void QItemSelectionModelPrivate::_q_layoutChanged() { @@ -818,41 +817,41 @@ void QItemSelectionModelPrivate::_q_layoutChanged() } /*! - \class QItemSelectionModel + \class QItemSelectionModel - \brief The QItemSelectionModel class keeps track of a view's selected items. + \brief The QItemSelectionModel class keeps track of a view's selected items. - \ingroup model-view + \ingroup model-view - A QItemSelectionModel keeps track of the selected items in a view, or - in several views onto the same model. It also keeps track of the - currently selected item in a view. + A QItemSelectionModel keeps track of the selected items in a view, or + in several views onto the same model. It also keeps track of the + currently selected item in a view. - The QItemSelectionModel class is one of the \l{Model/View Classes} - and is part of Qt's \l{Model/View Programming}{model/view framework}. + The QItemSelectionModel class is one of the \l{Model/View Classes} + and is part of Qt's \l{Model/View Programming}{model/view framework}. - The selected items are stored using ranges. Whenever you want to - modify the selected items use select() and provide either a - QItemSelection, or a QModelIndex and a QItemSelectionModel::SelectionFlag. + The selected items are stored using ranges. Whenever you want to + modify the selected items use select() and provide either a + QItemSelection, or a QModelIndex and a QItemSelectionModel::SelectionFlag. - The QItemSelectionModel takes a two layer approach to selection - management, dealing with both selected items that have been committed - and items that are part of the current selection. The current - selected items are part of the current interactive selection (for - example with rubber-band selection or keyboard-shift selections). + The QItemSelectionModel takes a two layer approach to selection + management, dealing with both selected items that have been committed + and items that are part of the current selection. The current + selected items are part of the current interactive selection (for + example with rubber-band selection or keyboard-shift selections). - To update the currently selected items, use the bitwise OR of - QItemSelectionModel::Current and any of the other SelectionFlags. - If you omit the QItemSelectionModel::Current command, a new current - selection will be created, and the previous one added to the whole - selection. All functions operate on both layers; for example, - selectedItems() will return items from both layers. + To update the currently selected items, use the bitwise OR of + QItemSelectionModel::Current and any of the other SelectionFlags. + If you omit the QItemSelectionModel::Current command, a new current + selection will be created, and the previous one added to the whole + selection. All functions operate on both layers; for example, + selectedItems() will return items from both layers. - \sa {Model/View Programming}, QAbstractItemModel, {Chart Example} + \sa {Model/View Programming}, QAbstractItemModel, {Chart Example} */ /*! - Constructs a selection model that operates on the specified item \a model. + Constructs a selection model that operates on the specified item \a model. */ QItemSelectionModel::QItemSelectionModel(QAbstractItemModel *model) : QObject(*new QItemSelectionModelPrivate, model) @@ -875,7 +874,7 @@ QItemSelectionModel::QItemSelectionModel(QAbstractItemModel *model) } /*! - Constructs a selection model that operates on the specified item \a model with \a parent. + Constructs a selection model that operates on the specified item \a model with \a parent. */ QItemSelectionModel::QItemSelectionModel(QAbstractItemModel *model, QObject *parent) : QObject(*new QItemSelectionModelPrivate, parent) @@ -898,7 +897,7 @@ QItemSelectionModel::QItemSelectionModel(QAbstractItemModel *model, QObject *par } /*! - \internal + \internal */ QItemSelectionModel::QItemSelectionModel(QItemSelectionModelPrivate &dd, QAbstractItemModel *model) : QObject(dd, model) @@ -921,7 +920,7 @@ QItemSelectionModel::QItemSelectionModel(QItemSelectionModelPrivate &dd, QAbstra } /*! - Destroys the selection model. + Destroys the selection model. */ QItemSelectionModel::~QItemSelectionModel() { @@ -943,10 +942,10 @@ QItemSelectionModel::~QItemSelectionModel() } /*! - Selects the model item \a index using the specified \a command, and emits - selectionChanged(). + Selects the model item \a index using the specified \a command, and emits + selectionChanged(). - \sa QItemSelectionModel::SelectionFlags + \sa QItemSelectionModel::SelectionFlags */ void QItemSelectionModel::select(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) { @@ -955,37 +954,37 @@ void QItemSelectionModel::select(const QModelIndex &index, QItemSelectionModel:: } /*! - \fn void QItemSelectionModel::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) + \fn void QItemSelectionModel::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) - This signal is emitted whenever the current item changes. The \a previous - model item index is replaced by the \a current index as the selection's - current item. + This signal is emitted whenever the current item changes. The \a previous + model item index is replaced by the \a current index as the selection's + current item. - Note that this signal will not be emitted when the item model is reset. + Note that this signal will not be emitted when the item model is reset. - \sa currentIndex() setCurrentIndex() selectionChanged() + \sa currentIndex() setCurrentIndex() selectionChanged() */ /*! - \fn void QItemSelectionModel::currentColumnChanged(const QModelIndex ¤t, const QModelIndex &previous) + \fn void QItemSelectionModel::currentColumnChanged(const QModelIndex ¤t, const QModelIndex &previous) - This signal is emitted if the \a current item changes and its column is - different to the column of the \a previous current item. + This signal is emitted if the \a current item changes and its column is + different to the column of the \a previous current item. - Note that this signal will not be emitted when the item model is reset. + Note that this signal will not be emitted when the item model is reset. - \sa currentChanged() currentRowChanged() currentIndex() setCurrentIndex() + \sa currentChanged() currentRowChanged() currentIndex() setCurrentIndex() */ /*! - \fn void QItemSelectionModel::currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) + \fn void QItemSelectionModel::currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous) - This signal is emitted if the \a current item changes and its row is - different to the row of the \a previous current item. + This signal is emitted if the \a current item changes and its row is + different to the row of the \a previous current item. - Note that this signal will not be emitted when the item model is reset. + Note that this signal will not be emitted when the item model is reset. - \sa currentChanged() currentColumnChanged() currentIndex() setCurrentIndex() + \sa currentChanged() currentColumnChanged() currentIndex() setCurrentIndex() */ /*! @@ -1002,32 +1001,32 @@ void QItemSelectionModel::select(const QModelIndex &index, QItemSelectionModel:: */ /*! - \enum QItemSelectionModel::SelectionFlag + \enum QItemSelectionModel::SelectionFlag - This enum describes the way the selection model will be updated. + This enum describes the way the selection model will be updated. - \value NoUpdate No selection will be made. - \value Clear The complete selection will be cleared. - \value Select All specified indexes will be selected. - \value Deselect All specified indexes will be deselected. - \value Toggle All specified indexes will be selected or - deselected depending on their current state. - \value Current The current selection will be updated. - \value Rows All indexes will be expanded to span rows. - \value Columns All indexes will be expanded to span columns. - \value SelectCurrent A combination of Select and Current, provided for - convenience. - \value ToggleCurrent A combination of Toggle and Current, provided for - convenience. - \value ClearAndSelect A combination of Clear and Select, provided for - convenience. + \value NoUpdate No selection will be made. + \value Clear The complete selection will be cleared. + \value Select All specified indexes will be selected. + \value Deselect All specified indexes will be deselected. + \value Toggle All specified indexes will be selected or + deselected depending on their current state. + \value Current The current selection will be updated. + \value Rows All indexes will be expanded to span rows. + \value Columns All indexes will be expanded to span columns. + \value SelectCurrent A combination of Select and Current, provided for + convenience. + \value ToggleCurrent A combination of Toggle and Current, provided for + convenience. + \value ClearAndSelect A combination of Clear and Select, provided for + convenience. */ /*! - Selects the item \a selection using the specified \a command, and emits - selectionChanged(). + Selects the item \a selection using the specified \a command, and emits + selectionChanged(). - \sa QItemSelectionModel::SelectionFlag + \sa QItemSelectionModel::SelectionFlag */ void QItemSelectionModel::select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command) { @@ -1067,7 +1066,7 @@ void QItemSelectionModel::select(const QItemSelection &selection, QItemSelection } /*! - Clears the selection model. Emits selectionChanged() and currentChanged(). + Clears the selection model. Emits selectionChanged() and currentChanged(). */ void QItemSelectionModel::clear() { @@ -1083,7 +1082,7 @@ void QItemSelectionModel::clear() } /*! - Clears the selection model. Does not emit any signals. + Clears the selection model. Does not emit any signals. */ void QItemSelectionModel::reset() { @@ -1093,8 +1092,8 @@ void QItemSelectionModel::reset() } /*! - \since 4.2 - Clears the selection in the selection model. Emits selectionChanged(). + \since 4.2 + Clears the selection in the selection model. Emits selectionChanged(). */ void QItemSelectionModel::clearSelection() { @@ -1110,14 +1109,14 @@ void QItemSelectionModel::clearSelection() /*! - Sets the model item \a index to be the current item, and emits - currentChanged(). The current item is used for keyboard navigation and - focus indication; it is independent of any selected items, although a - selected item can also be the current item. + Sets the model item \a index to be the current item, and emits + currentChanged(). The current item is used for keyboard navigation and + focus indication; it is independent of any selected items, although a + selected item can also be the current item. - Depending on the specified \a command, the \a index can also become part - of the current selection. - \sa select() + Depending on the specified \a command, the \a index can also become part + of the current selection. + \sa select() */ void QItemSelectionModel::setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) { @@ -1141,8 +1140,8 @@ void QItemSelectionModel::setCurrentIndex(const QModelIndex &index, QItemSelecti } /*! - Returns the model item index for the current item, or an invalid index - if there is no current item. + Returns the model item index for the current item, or an invalid index + if there is no current item. */ QModelIndex QItemSelectionModel::currentIndex() const { @@ -1150,7 +1149,7 @@ QModelIndex QItemSelectionModel::currentIndex() const } /*! - Returns true if the given model item \a index is selected. + Returns true if the given model item \a index is selected. */ bool QItemSelectionModel::isSelected(const QModelIndex &index) const { @@ -1187,12 +1186,12 @@ bool QItemSelectionModel::isSelected(const QModelIndex &index) const } /*! - Returns true if all items are selected in the \a row with the given - \a parent. + Returns true if all items are selected in the \a row with the given + \a parent. - Note that this function is usually faster than calling isSelected() - on all items in the same row and that unselectable items are - ignored. + Note that this function is usually faster than calling isSelected() + on all items in the same row and that unselectable items are + ignored. */ bool QItemSelectionModel::isRowSelected(int row, const QModelIndex &parent) const { @@ -1247,12 +1246,12 @@ bool QItemSelectionModel::isRowSelected(int row, const QModelIndex &parent) cons } /*! - Returns true if all items are selected in the \a column with the given - \a parent. + Returns true if all items are selected in the \a column with the given + \a parent. - Note that this function is usually faster than calling isSelected() - on all items in the same column and that unselectable items are - ignored. + Note that this function is usually faster than calling isSelected() + on all items in the same column and that unselectable items are + ignored. */ bool QItemSelectionModel::isColumnSelected(int column, const QModelIndex &parent) const { @@ -1307,8 +1306,8 @@ bool QItemSelectionModel::isColumnSelected(int column, const QModelIndex &parent } /*! - Returns true if there are any items selected in the \a row with the given - \a parent. + Returns true if there are any items selected in the \a row with the given + \a parent. */ bool QItemSelectionModel::rowIntersectsSelection(int row, const QModelIndex &parent) const { @@ -1336,8 +1335,8 @@ bool QItemSelectionModel::rowIntersectsSelection(int row, const QModelIndex &par } /*! - Returns true if there are any items selected in the \a column with the given - \a parent. + Returns true if there are any items selected in the \a column with the given + \a parent. */ bool QItemSelectionModel::columnIntersectsSelection(int column, const QModelIndex &parent) const { @@ -1377,15 +1376,14 @@ bool QItemSelectionModel::hasSelection() const QItemSelection sel = d->ranges; sel.merge(d->currentSelection, d->currentCommand); return !sel.isEmpty(); - } - else { + } else { return !(d->ranges.isEmpty() && d->currentSelection.isEmpty()); } } /*! - Returns a list of all selected model item indexes. The list contains no - duplicates, and is not sorted. + Returns a list of all selected model item indexes. The list contains no + duplicates, and is not sorted. */ QModelIndexList QItemSelectionModel::selectedIndexes() const { @@ -1396,10 +1394,10 @@ QModelIndexList QItemSelectionModel::selectedIndexes() const } /*! - \since 4.2 - Returns the indexes in the given \a column for the rows where all columns are selected. + \since 4.2 + Returns the indexes in the given \a column for the rows where all columns are selected. - \sa selectedIndexes(), selectedColumns() + \sa selectedIndexes(), selectedColumns() */ QModelIndexList QItemSelectionModel::selectedRows(int column) const @@ -1460,7 +1458,7 @@ QModelIndexList QItemSelectionModel::selectedColumns(int row) const } /*! - Returns the selection ranges stored in the selection model. + Returns the selection ranges stored in the selection model. */ const QItemSelection QItemSelectionModel::selection() const { @@ -1480,7 +1478,7 @@ const QItemSelection QItemSelectionModel::selection() const } /*! - Returns the item model operated on by the selection model. + Returns the item model operated on by the selection model. */ const QAbstractItemModel *QItemSelectionModel::model() const { @@ -1488,8 +1486,8 @@ const QAbstractItemModel *QItemSelectionModel::model() const } /*! - Compares the two selections \a newSelection and \a oldSelection - and emits selectionChanged() with the deselected and selected items. + Compares the two selections \a newSelection and \a oldSelection + and emits selectionChanged() with the deselected and selected items. */ void QItemSelectionModel::emitSelectionChanged(const QItemSelection &newSelection, const QItemSelection &oldSelection) -- cgit v1.2.3 From 657044cefa87d092213308f2706c3770fb916eb7 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 27 Jul 2009 20:50:05 +0200 Subject: Sun CC 5.9 does not support template friends But I'm told 5.10 does. --- src/corelib/global/qglobal.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 3625f2be3..4ceabeeee 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -662,6 +662,9 @@ namespace QT_NAMESPACE {} // using CC 5.9: Warning: attribute visibility is unsupported and will be skipped.. //# define Q_DECL_EXPORT __attribute__((__visibility__("default"))) # endif +# if __SUNPRO_CC < 0x5a0 +# define Q_NO_TEMPLATE_FRIENDS +# endif # if !defined(_BOOL) # define Q_NO_BOOL_TYPE # endif -- cgit v1.2.3 From 096a0088aa75010c71a2a39dee5f3ee00d23fcf7 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 27 Jul 2009 20:59:23 +0200 Subject: Disable the forwardDeclared1 test with SunCC: it doesn't work I added this test because I thought that the compiler would find the forward-declarations due to the "one definition" rule. In hindsight, it's not a good idea. Sun CC warns about this, gcc doesn't. With Sun CC, the code leaks, with gcc it doesn't. --- tests/auto/qsharedpointer/tst_qsharedpointer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp index dd53e3c81..ae5155ece 100644 --- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp @@ -231,6 +231,9 @@ extern int forwardDeclaredDestructorRunCount; void tst_QSharedPointer::forwardDeclaration1() { +#if defined(Q_CC_SUN) + QSKIP("This type of forward declaration is not valid with this compiler", SkipAll); +#else externalForwardDeclaration(); struct Wrapper { QSharedPointer pointer; }; @@ -242,6 +245,7 @@ void tst_QSharedPointer::forwardDeclaration1() QVERIFY(!w.pointer.isNull()); } QCOMPARE(forwardDeclaredDestructorRunCount, 1); +#endif } #include "forwarddeclared.h" -- cgit v1.2.3 From 745e12297f0133a6bd54e2809540c47370b405a5 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 27 Jul 2009 21:00:58 +0200 Subject: Work around weird issue with Sun CC 5.9: Self was the wrong class. I don't know if this was only the debugging symbols or if the compiler was really wrong. But while debugging, Self was ExternalRefCountWithCustomDeleter, which is wrong at this point. --- src/corelib/tools/qsharedpointer_impl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 630ca4f76..3d7a0e659 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -235,7 +235,6 @@ namespace QtSharedPointer { struct ExternalRefCountWithContiguousData: public ExternalRefCountWithDestroyFn { typedef ExternalRefCountWithDestroyFn Parent; - typedef ExternalRefCountWithContiguousData Self; T data; static void deleter(ExternalRefCountData *self) @@ -248,7 +247,8 @@ namespace QtSharedPointer { static inline ExternalRefCountData *create(T **ptr) { DestroyerFn destroy = &deleter; - Self *d = static_cast(::operator new(sizeof(Self))); + ExternalRefCountWithContiguousData *d = + static_cast(::operator new(sizeof(ExternalRefCountWithContiguousData))); // initialize the d-pointer sub-object // leave d->data uninitialized -- cgit v1.2.3 From 3a0eccfe7237fe69e41580d1fb780342f4c09691 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 28 Jul 2009 10:56:12 +0200 Subject: Fix startDetached: the pipes must be CLOEXEC for them to work. In de05f9a40e41deb79daf5c4935b2645d70d7f322 I removed the fcntl that set FD_CLOEXEC because it was supposed to be set by qt_safe_pipe. Turns out that this code didn't call the wrapper function... Reviewed-by: ossi --- src/corelib/io/qprocess_unix.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index fafce07ef..607b73450 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -1161,10 +1161,10 @@ bool QProcessPrivate::startDetached(const QString &program, const QStringList &a // To catch the startup of the child int startedPipe[2]; - ::pipe(startedPipe); + qt_safe_pipe(startedPipe); // To communicate the pid of the child int pidPipe[2]; - ::pipe(pidPipe); + qt_safe_pipe(pidPipe); pid_t childPid = qt_fork(); if (childPid == 0) { -- cgit v1.2.3 From 9a21c1abb96426b7a9f168b007d05db303a8de65 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 28 Jul 2009 12:49:33 +0200 Subject: Implement a new pointer-tracking mechanism for QSharedPointer. Some compilers don't obey the same rules of "top-of-object" values for casting a pointer from a given class to void *. In any case, that can only work for polymorphic types (with a virtual table). So don't track the pointers by their pointer value, but instead by the d-pointer of the QSharedPointer object. The same cases that were caught before should still be caught. We still won't catch the creating a second QSharedPointer for the same object if the pointer values are different, though (when cast to void*). Reviewed-by: Bradley T. Hughes --- src/corelib/tools/qsharedpointer.cpp | 113 ++++++++++++++++++++++++-------- src/corelib/tools/qsharedpointer_impl.h | 33 +++++----- 2 files changed, 105 insertions(+), 41 deletions(-) diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index 85085c595..59dfffe14 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -803,29 +803,19 @@ # endif # endif -# if !defined(BACKTRACE_SUPPORTED) -// Dummy implementation of the functions. -// Using QHashDummyValue also means that the QHash below is actually a QSet -typedef QT_PREPEND_NAMESPACE(QHashDummyValue) Backtrace; - -static inline Backtrace saveBacktrace() { return Backtrace(); } -static inline void printBacktrace(Backtrace) { } - -# else +# if defined(BACKTRACE_SUPPORTED) # include # include # include # include # include -typedef QT_PREPEND_NAMESPACE(QByteArray) Backtrace; - -static inline Backtrace saveBacktrace() __attribute__((always_inline)); -static inline Backtrace saveBacktrace() +static inline QByteArray saveBacktrace() __attribute__((always_inline)); +static inline QByteArray saveBacktrace() { static const int maxFrames = 32; - Backtrace stacktrace; + QByteArray stacktrace; stacktrace.resize(sizeof(void*) * maxFrames); int stack_size = backtrace((void**)stacktrace.data(), maxFrames); stacktrace.resize(sizeof(void*) * stack_size); @@ -833,7 +823,7 @@ static inline Backtrace saveBacktrace() return stacktrace; } -static void printBacktrace(Backtrace stacktrace) +static void printBacktrace(QByteArray stacktrace) { void *const *stack = (void *const *)stacktrace.constData(); int stack_size = stacktrace.size() / sizeof(void*); @@ -884,11 +874,19 @@ static void printBacktrace(Backtrace stacktrace) namespace { QT_USE_NAMESPACE + struct Data { + const volatile void *pointer; +# ifdef BACKTRACE_SUPPORTED + QByteArray backtrace; +# endif + }; + class KnownPointers { public: QMutex mutex; - QHash values; + QHash dPointers; + QHash dataPointers; }; } @@ -896,38 +894,101 @@ Q_GLOBAL_STATIC(KnownPointers, knownPointers) QT_BEGIN_NAMESPACE +namespace QtSharedPointer { + Q_CORE_EXPORT void internalSafetyCheckAdd(const volatile void *); + Q_CORE_EXPORT void internalSafetyCheckRemove(const volatile void *); +} + +/*! + \internal +*/ +void QtSharedPointer::internalSafetyCheckAdd(const volatile void *) +{ + // Qt 4.5 compatibility + // this function is broken by design, so it was replaced with internalSafetyCheckAdd2 + // + // it's broken because we tracked the pointers added and + // removed from QSharedPointer, converted to void*. + // That is, this is supposed to track the "top-of-object" pointer in + // case of multiple inheritance. + // + // However, it doesn't work well in some compilers: + // if you create an object with a class of type A and the last reference + // is dropped of type B, then the value passed to internalSafetyCheckRemove could + // be different than was added. That would leave dangling addresses. + // + // So instead, we track the pointer by the d-pointer instead. +} + /*! \internal */ -void QtSharedPointer::internalSafetyCheckAdd(const volatile void *ptr) +void QtSharedPointer::internalSafetyCheckRemove(const volatile void *) { + // Qt 4.5 compatibility + // see comments above +} + +/*! + \internal +*/ +void QtSharedPointer::internalSafetyCheckAdd2(const void *d_ptr, const volatile void *ptr) +{ + // see comments above for the rationale for this function KnownPointers *const kp = knownPointers(); if (!kp) return; // end-game: the application is being destroyed already QMutexLocker lock(&kp->mutex); - void *actual = const_cast(ptr); - if (kp->values.contains(actual)) { - printBacktrace(knownPointers()->values.value(actual)); - qFatal("QSharedPointerData: internal self-check failed: pointer %p was already tracked " - "by another QSharedPointerData object", actual); + Q_ASSERT(!kp->dPointers.contains(d_ptr)); + + //qDebug("Adding d=%p value=%p", d_ptr, ptr); + + const void *other_d_ptr = kp->dataPointers.value(ptr, 0); + if (other_d_ptr) { +# ifdef BACKTRACE_SUPPORTED + printBacktrace(knownPointers()->dPointers.value(other_d_ptr).backtrace); +# endif + qFatal("QSharedPointer: internal self-check failed: pointer %p was already tracked " + "by another QSharedPointer object %p", ptr, other_d_ptr); } - kp->values.insert(actual, saveBacktrace()); + Data data; + data.pointer = ptr; +# ifdef BACKTRACE_SUPPORTED + data.backtrace = saveBacktrace(); +# endif + + kp->dPointers.insert(d_ptr, data); + kp->dataPointers.insert(ptr, d_ptr); } /*! \internal */ -void QtSharedPointer::internalSafetyCheckRemove(const volatile void *ptr) +void QtSharedPointer::internalSafetyCheckRemove2(const void *d_ptr) { KnownPointers *const kp = knownPointers(); if (!kp) return; // end-game: the application is being destroyed already QMutexLocker lock(&kp->mutex); - void *actual = const_cast(ptr); - kp->values.remove(actual); + + QHash::iterator it = kp->dPointers.find(d_ptr); + if (it == kp->dPointers.end()) { + qFatal("QSharedPointer: internal self-check inconsistency: pointer %p was not tracked. " + "To use QT_SHAREDPOINTER_TRACK_POINTERS, you have to enable it throughout " + "in your code.", d_ptr); + } + + QHash::iterator it2 = kp->dataPointers.find(it->pointer); + Q_ASSERT(it2 != kp->dataPointers.end()); + + //qDebug("Removing d=%p value=%p", d_ptr, it->pointer); + + // remove entries + kp->dataPointers.erase(it2); + kp->dPointers.erase(it); } QT_END_NAMESPACE diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 3d7a0e659..b8f41391b 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -98,9 +98,9 @@ namespace QtSharedPointer { template QSharedPointer copyAndSetPointer(X * ptr, const QSharedPointer &src); // used in debug mode to verify the reuse of pointers - Q_CORE_EXPORT void internalSafetyCheckAdd(const volatile void *); - Q_CORE_EXPORT void internalSafetyCheckRemove(const volatile void *); - + Q_CORE_EXPORT void internalSafetyCheckAdd2(const void *, const volatile void *); + Q_CORE_EXPORT void internalSafetyCheckRemove2(const void *); + template inline void executeDeleter(T *t, RetVal (Klass:: *memberDeleter)()) { (t->*memberDeleter)(); } @@ -146,17 +146,8 @@ namespace QtSharedPointer { inline void internalConstruct(T *ptr) { -#ifdef QT_SHAREDPOINTER_TRACK_POINTERS - if (ptr) internalSafetyCheckAdd(ptr); -#endif value = ptr; } - inline void internalDestroy() - { -#ifdef QT_SHAREDPOINTER_TRACK_POINTERS - if (value) internalSafetyCheckRemove(value); -#endif - } #if defined(Q_NO_TEMPLATE_FRIENDS) public: @@ -273,8 +264,9 @@ namespace QtSharedPointer { inline void ref() const { d->weakref.ref(); d->strongref.ref(); } inline bool deref() { - if (!d->strongref.deref()) - this->internalDestroy(); + if (!d->strongref.deref()) { + internalDestroy(); + } return d->weakref.deref(); } @@ -284,6 +276,9 @@ namespace QtSharedPointer { Q_ASSERT(!d); if (ptr) d = new Data; +#ifdef QT_SHAREDPOINTER_TRACK_POINTERS + if (ptr) internalSafetyCheckAdd2(d, ptr); +#endif } template @@ -293,6 +288,9 @@ namespace QtSharedPointer { Q_ASSERT(!d); if (ptr) d = ExternalRefCountWithCustomDeleter::create(ptr, deleter); +#ifdef QT_SHAREDPOINTER_TRACK_POINTERS + if (ptr) internalSafetyCheckAdd2(d, ptr); +#endif } inline void internalCreate() @@ -301,6 +299,9 @@ namespace QtSharedPointer { d = ExternalRefCountWithContiguousData::create(&ptr); Basic::internalConstruct(ptr); +#ifdef QT_SHAREDPOINTER_TRACK_POINTERS + if (ptr) internalSafetyCheckAdd2(d, ptr); +#endif } inline ExternalRefCount() : d(0) { } @@ -316,7 +317,9 @@ namespace QtSharedPointer { inline void internalDestroy() { - Basic::internalDestroy(); +#ifdef QT_SHAREDPOINTER_TRACK_POINTERS + internalSafetyCheckRemove2(d); +#endif if (!d->destroy()) delete this->value; } -- cgit v1.2.3 From f4978a5894212dd655a91dbb0db02a89070bb165 Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Mon, 27 Jul 2009 16:44:27 +0200 Subject: Refactor QImage/QPixmap cleanup hooks into a seperate class The new class alows more than one hook to be installed at a time and, for QPixmaps, the hook is told which pixmap is getting deleted. Reviewed-By: Samuel --- src/gui/image/image.pri | 6 +- src/gui/image/qimage.cpp | 17 +--- src/gui/image/qimagepixmapcleanuphooks.cpp | 110 +++++++++++++++++++++ src/gui/image/qimagepixmapcleanuphooks_p.h | 89 +++++++++++++++++ src/gui/image/qpixmap.cpp | 20 +--- src/opengl/qgl.cpp | 25 ++++- src/opengl/qgl_p.h | 3 +- .../gfxdrivers/directfb/qdirectfbpaintengine.cpp | 5 +- 8 files changed, 238 insertions(+), 37 deletions(-) create mode 100644 src/gui/image/qimagepixmapcleanuphooks.cpp create mode 100644 src/gui/image/qimagepixmapcleanuphooks_p.h diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index bf348af24..b9c36dc01 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -25,7 +25,9 @@ HEADERS += \ image/qpixmapcache_p.h \ image/qpixmapdata_p.h \ image/qpixmapdatafactory_p.h \ - image/qpixmapfilter_p.h + image/qpixmapfilter_p.h \ + image/qimagepixmapcleanuphooks_p.h \ + SOURCES += \ image/qbitmap.cpp \ @@ -47,6 +49,8 @@ SOURCES += \ image/qmovie.cpp \ image/qpixmap_raster.cpp \ image/qnativeimage.cpp \ + image/qimagepixmapcleanuphooks.cpp \ + win32 { SOURCES += image/qpixmap_win.cpp diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index dd5676570..f40bc7b48 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -49,6 +49,7 @@ #include "qimagewriter.h" #include "qstringlist.h" #include "qvariant.h" +#include "qimagepixmapcleanuphooks_p.h" #include #include #include @@ -106,14 +107,6 @@ static inline bool checkPixelSize(const QImage::Format format) } -// ### Qt 5: remove -typedef void (*_qt_image_cleanup_hook)(int); -Q_GUI_EXPORT _qt_image_cleanup_hook qt_image_cleanup_hook = 0; - -// ### Qt 5: rename -typedef void (*_qt_image_cleanup_hook_64)(qint64); -Q_GUI_EXPORT _qt_image_cleanup_hook_64 qt_image_cleanup_hook_64 = 0; - static QImage rotated90(const QImage &src); static QImage rotated180(const QImage &src); static QImage rotated270(const QImage &src); @@ -257,8 +250,8 @@ QImageData * QImageData::create(const QSize &size, QImage::Format format, int nu QImageData::~QImageData() { - if (is_cached && qt_image_cleanup_hook_64) - qt_image_cleanup_hook_64((((qint64) ser_no) << 32) | ((qint64) detach_no)); + if (is_cached) + QImagePixmapCleanupHooks::executeImageHooks((((qint64) ser_no) << 32) | ((qint64) detach_no)); delete paintEngine; if (data && own_data) free(data); @@ -1342,8 +1335,8 @@ QImage::operator QVariant() const void QImage::detach() { if (d) { - if (d->is_cached && qt_image_cleanup_hook_64 && d->ref == 1) - qt_image_cleanup_hook_64(cacheKey()); + if (d->is_cached && d->ref == 1) + QImagePixmapCleanupHooks::executeImageHooks(cacheKey()); if (d->ref != 1 || d->ro_data) *this = copy(); diff --git a/src/gui/image/qimagepixmapcleanuphooks.cpp b/src/gui/image/qimagepixmapcleanuphooks.cpp new file mode 100644 index 000000000..7d1c5fbe2 --- /dev/null +++ b/src/gui/image/qimagepixmapcleanuphooks.cpp @@ -0,0 +1,110 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qimagepixmapcleanuphooks_p.h" +#include "qpixmapdata_p.h" + + +// Legacy, single instance hooks: ### Qt 5: remove +typedef void (*_qt_pixmap_cleanup_hook)(int); +typedef void (*_qt_pixmap_cleanup_hook_64)(qint64); +typedef void (*_qt_image_cleanup_hook)(int); +Q_GUI_EXPORT _qt_pixmap_cleanup_hook qt_pixmap_cleanup_hook = 0; +Q_GUI_EXPORT _qt_pixmap_cleanup_hook_64 qt_pixmap_cleanup_hook_64 = 0; +Q_GUI_EXPORT _qt_image_cleanup_hook qt_image_cleanup_hook = 0; +Q_GUI_EXPORT _qt_image_cleanup_hook_64 qt_image_cleanup_hook_64 = 0; + + +QImagePixmapCleanupHooks* qt_image_and_pixmap_cleanup_hooks = 0; + + +QImagePixmapCleanupHooks::QImagePixmapCleanupHooks() +{ + qt_image_and_pixmap_cleanup_hooks = this; +} + +QImagePixmapCleanupHooks *QImagePixmapCleanupHooks::instance() +{ + if (!qt_image_and_pixmap_cleanup_hooks) + qt_image_and_pixmap_cleanup_hooks = new QImagePixmapCleanupHooks; + return qt_image_and_pixmap_cleanup_hooks; +} + +void QImagePixmapCleanupHooks::addPixmapHook(_qt_pixmap_cleanup_hook_pm hook) +{ + pixmapHooks.append(hook); +} + +void QImagePixmapCleanupHooks::addImageHook(_qt_image_cleanup_hook_64 hook) +{ + imageHooks.append(hook); +} + +void QImagePixmapCleanupHooks::removePixmapHook(_qt_pixmap_cleanup_hook_pm hook) +{ + pixmapHooks.removeAll(hook); +} + +void QImagePixmapCleanupHooks::removeImageHook(_qt_image_cleanup_hook_64 hook) +{ + imageHooks.removeAll(hook); +} + + +void QImagePixmapCleanupHooks::executePixmapHooks(QPixmap* pm) +{ + for (int i = 0; i < qt_image_and_pixmap_cleanup_hooks->pixmapHooks.count(); ++i) + qt_image_and_pixmap_cleanup_hooks->pixmapHooks[i](pm); + + if (qt_pixmap_cleanup_hook_64) + qt_pixmap_cleanup_hook_64(pm->cacheKey()); +} + + +void QImagePixmapCleanupHooks::executeImageHooks(qint64 key) +{ + for (int i = 0; i < qt_image_and_pixmap_cleanup_hooks->imageHooks.count(); ++i) + qt_image_and_pixmap_cleanup_hooks->imageHooks[i](key); + + if (qt_image_cleanup_hook_64) + qt_image_cleanup_hook_64(key); +} + diff --git a/src/gui/image/qimagepixmapcleanuphooks_p.h b/src/gui/image/qimagepixmapcleanuphooks_p.h new file mode 100644 index 000000000..e765e697f --- /dev/null +++ b/src/gui/image/qimagepixmapcleanuphooks_p.h @@ -0,0 +1,89 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QIMAGEPIXMAP_CLEANUPHOOKS_P_H +#define QIMAGEPIXMAP_CLEANUPHOOKS_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include + +QT_BEGIN_NAMESPACE + +typedef void (*_qt_image_cleanup_hook_64)(qint64); +typedef void (*_qt_pixmap_cleanup_hook_pm)(QPixmap*); + +class QImagePixmapCleanupHooks; +extern QImagePixmapCleanupHooks* qt_image_and_pixmap_cleanup_hooks; + +class Q_GUI_EXPORT QImagePixmapCleanupHooks +{ +public: + QImagePixmapCleanupHooks(); + + static QImagePixmapCleanupHooks *instance(); + + void addPixmapHook(_qt_pixmap_cleanup_hook_pm); + void addImageHook(_qt_image_cleanup_hook_64); + + void removePixmapHook(_qt_pixmap_cleanup_hook_pm); + void removeImageHook(_qt_image_cleanup_hook_64); + + static void executePixmapHooks(QPixmap*); + static void executeImageHooks(qint64 key); + +private: + QList<_qt_image_cleanup_hook_64> imageHooks; + QList<_qt_pixmap_cleanup_hook_pm> pixmapHooks; +}; + +QT_END_NAMESPACE + +#endif // QIMAGEPIXMAP_CLEANUPHOOKS_P_H diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 18829f4a8..2674cacf3 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -43,6 +43,7 @@ #include "qpixmap.h" #include "qpixmapdata_p.h" +#include "qimagepixmapcleanuphooks_p.h" #include "qbitmap.h" #include "qcolormap.h" @@ -80,14 +81,6 @@ QT_BEGIN_NAMESPACE -// ### Qt 5: remove -typedef void (*_qt_pixmap_cleanup_hook)(int); -Q_GUI_EXPORT _qt_pixmap_cleanup_hook qt_pixmap_cleanup_hook = 0; - -// ### Qt 5: rename -typedef void (*_qt_pixmap_cleanup_hook_64)(qint64); -Q_GUI_EXPORT _qt_pixmap_cleanup_hook_64 qt_pixmap_cleanup_hook_64 = 0; - // ### Qt 5: remove Q_GUI_EXPORT qint64 qt_pixmap_id(const QPixmap &pixmap) { @@ -1357,8 +1350,8 @@ bool QPixmap::isDetached() const void QPixmap::deref() { if (data && !data->ref.deref()) { // Destroy image if last ref - if (data->is_cached && qt_pixmap_cleanup_hook_64) - qt_pixmap_cleanup_hook_64(cacheKey()); + if (data->is_cached) + QImagePixmapCleanupHooks::executePixmapHooks(this); delete data; data = 0; } @@ -1897,9 +1890,6 @@ int QPixmap::defaultDepth() #endif } -typedef void (*_qt_pixmap_cleanup_hook_64)(qint64); -extern _qt_pixmap_cleanup_hook_64 qt_pixmap_cleanup_hook_64; - /*! Detaches the pixmap from shared pixmap data. @@ -1925,8 +1915,8 @@ void QPixmap::detach() rasterData->image.detach(); } - if (data->is_cached && qt_pixmap_cleanup_hook_64 && data->ref == 1) - qt_pixmap_cleanup_hook_64(cacheKey()); + if (data->is_cached && data->ref == 1) + QImagePixmapCleanupHooks::executePixmapHooks(this); #if defined(Q_WS_MAC) QMacPixmapData *macData = id == QPixmapData::MacClass ? static_cast(data) : 0; diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index edda6b6d8..8bb72d59f 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -86,6 +86,7 @@ #include #include #include +#include #include "qcolormap.h" #include "qfile.h" #include "qlibrary.h" @@ -1407,15 +1408,17 @@ QGLTextureCache::QGLTextureCache() { Q_ASSERT(qt_gl_texture_cache == 0); qt_gl_texture_cache = this; - qt_pixmap_cleanup_hook_64 = cleanupHook; - qt_image_cleanup_hook_64 = cleanupHook; + + QImagePixmapCleanupHooks::instance()->addPixmapHook(pixmapCleanupHook); + QImagePixmapCleanupHooks::instance()->addImageHook(imageCleanupHook); } QGLTextureCache::~QGLTextureCache() { qt_gl_texture_cache = 0; - qt_pixmap_cleanup_hook_64 = 0; - qt_image_cleanup_hook_64 = 0; + + QImagePixmapCleanupHooks::instance()->removePixmapHook(pixmapCleanupHook); + QImagePixmapCleanupHooks::instance()->removeImageHook(imageCleanupHook); } void QGLTextureCache::insert(QGLContext* ctx, qint64 key, QGLTexture* texture, int cost) @@ -1471,11 +1474,23 @@ QGLTextureCache* QGLTextureCache::instance() a hook that removes textures from the cache when a pixmap/image is deref'ed */ -void QGLTextureCache::cleanupHook(qint64 cacheKey) +void QGLTextureCache::imageCleanupHook(qint64 cacheKey) +{ + // ### remove when the GL texture cache becomes thread-safe + if (qApp->thread() != QThread::currentThread()) + return; + QGLTexture *texture = instance()->getTexture(cacheKey); + if (texture && texture->clean) + instance()->remove(cacheKey); +} + + +void QGLTextureCache::pixmapCleanupHook(QPixmap* pixmap) { // ### remove when the GL texture cache becomes thread-safe if (qApp->thread() != QThread::currentThread()) return; + const qint64 cacheKey = pixmap->cacheKey(); QGLTexture *texture = instance()->getTexture(cacheKey); if (texture && texture->clean) instance()->remove(cacheKey); diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 85dae0ddf..a83cc63b9 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -458,7 +458,8 @@ public: static QGLTextureCache *instance(); static void deleteIfEmpty(); - static void cleanupHook(qint64 cacheKey); + static void imageCleanupHook(qint64 cacheKey); + static void pixmapCleanupHook(QPixmap* pixmap); private: QCache m_cache; diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index b264ac0ce..2ed890b4d 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -53,6 +53,7 @@ #include #include #include +#include class SurfaceCache; class QDirectFBPaintEnginePrivate : public QRasterPaintEnginePrivate @@ -699,9 +700,7 @@ void QDirectFBPaintEngine::initImageCache(int size) { Q_ASSERT(size >= 0); imageCache.setMaxCost(size); - typedef void (*_qt_image_cleanup_hook_64)(qint64); - extern Q_GUI_EXPORT _qt_image_cleanup_hook_64 qt_image_cleanup_hook_64; - qt_image_cleanup_hook_64 = ::cachedImageCleanupHook; + QImagePixmapCleanupHooks::instance()->addImageHook(cachedImageCleanupHook); } #endif // QT_DIRECTFB_IMAGECACHE -- cgit v1.2.3 From 2094d3c03ba895e4458a0bb6b1b4935abacd4816 Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Tue, 28 Jul 2009 16:32:31 +0200 Subject: Move sub-attaq from examples to demos because sub-attaq is a bit too "advanced". --- demos/demos.pro | 4 +- demos/qtdemo/xml/examples.xml | 2 +- demos/sub-attaq/animationmanager.cpp | 93 ++ demos/sub-attaq/animationmanager.h | 70 + demos/sub-attaq/boat.cpp | 318 +++++ demos/sub-attaq/boat.h | 101 ++ demos/sub-attaq/boat_p.h | 256 ++++ demos/sub-attaq/bomb.cpp | 124 ++ demos/sub-attaq/bomb.h | 75 + demos/sub-attaq/custompropertyanimation.cpp | 108 ++ demos/sub-attaq/custompropertyanimation.h | 114 ++ demos/sub-attaq/data.xml | 39 + demos/sub-attaq/graphicsscene.cpp | 374 +++++ demos/sub-attaq/graphicsscene.h | 131 ++ demos/sub-attaq/main.cpp | 57 + demos/sub-attaq/mainwindow.cpp | 97 ++ demos/sub-attaq/mainwindow.h | 64 + demos/sub-attaq/pics/big/background.png | Bin 0 -> 48858 bytes demos/sub-attaq/pics/big/boat.png | Bin 0 -> 5198 bytes demos/sub-attaq/pics/big/bomb.png | Bin 0 -> 760 bytes demos/sub-attaq/pics/big/explosion/boat/step1.png | Bin 0 -> 5760 bytes demos/sub-attaq/pics/big/explosion/boat/step2.png | Bin 0 -> 9976 bytes demos/sub-attaq/pics/big/explosion/boat/step3.png | Bin 0 -> 12411 bytes demos/sub-attaq/pics/big/explosion/boat/step4.png | Bin 0 -> 15438 bytes .../pics/big/explosion/submarine/step1.png | Bin 0 -> 3354 bytes .../pics/big/explosion/submarine/step2.png | Bin 0 -> 6205 bytes .../pics/big/explosion/submarine/step3.png | Bin 0 -> 6678 bytes .../pics/big/explosion/submarine/step4.png | Bin 0 -> 6666 bytes demos/sub-attaq/pics/big/submarine.png | Bin 0 -> 3202 bytes demos/sub-attaq/pics/big/surface.png | Bin 0 -> 575 bytes demos/sub-attaq/pics/big/torpedo.png | Bin 0 -> 951 bytes demos/sub-attaq/pics/scalable/background-n810.svg | 171 +++ demos/sub-attaq/pics/scalable/background.svg | 171 +++ demos/sub-attaq/pics/scalable/boat.svg | 279 ++++ demos/sub-attaq/pics/scalable/bomb.svg | 138 ++ demos/sub-attaq/pics/scalable/sand.svg | 103 ++ demos/sub-attaq/pics/scalable/see.svg | 44 + demos/sub-attaq/pics/scalable/sky.svg | 45 + demos/sub-attaq/pics/scalable/sub-attaq.svg | 1473 ++++++++++++++++++++ demos/sub-attaq/pics/scalable/submarine.svg | 214 +++ demos/sub-attaq/pics/scalable/surface.svg | 49 + demos/sub-attaq/pics/scalable/torpedo.svg | 127 ++ demos/sub-attaq/pics/small/background.png | Bin 0 -> 34634 bytes demos/sub-attaq/pics/small/boat.png | Bin 0 -> 2394 bytes demos/sub-attaq/pics/small/bomb.png | Bin 0 -> 760 bytes demos/sub-attaq/pics/small/submarine.png | Bin 0 -> 1338 bytes demos/sub-attaq/pics/small/surface.png | Bin 0 -> 502 bytes demos/sub-attaq/pics/small/torpedo.png | Bin 0 -> 951 bytes demos/sub-attaq/pics/welcome/logo-a.png | Bin 0 -> 5972 bytes demos/sub-attaq/pics/welcome/logo-a2.png | Bin 0 -> 5969 bytes demos/sub-attaq/pics/welcome/logo-b.png | Bin 0 -> 6869 bytes demos/sub-attaq/pics/welcome/logo-dash.png | Bin 0 -> 2255 bytes demos/sub-attaq/pics/welcome/logo-excl.png | Bin 0 -> 2740 bytes demos/sub-attaq/pics/welcome/logo-q.png | Bin 0 -> 7016 bytes demos/sub-attaq/pics/welcome/logo-s.png | Bin 0 -> 5817 bytes demos/sub-attaq/pics/welcome/logo-t.png | Bin 0 -> 3717 bytes demos/sub-attaq/pics/welcome/logo-t2.png | Bin 0 -> 3688 bytes demos/sub-attaq/pics/welcome/logo-u.png | Bin 0 -> 5374 bytes demos/sub-attaq/pixmapitem.cpp | 59 + demos/sub-attaq/pixmapitem.h | 63 + demos/sub-attaq/progressitem.cpp | 67 + demos/sub-attaq/progressitem.h | 61 + demos/sub-attaq/qanimationstate.cpp | 150 ++ demos/sub-attaq/qanimationstate.h | 92 ++ demos/sub-attaq/states.cpp | 325 +++++ demos/sub-attaq/states.h | 180 +++ demos/sub-attaq/sub-attaq.pro | 37 + demos/sub-attaq/subattaq.qrc | 39 + demos/sub-attaq/submarine.cpp | 211 +++ demos/sub-attaq/submarine.h | 92 ++ demos/sub-attaq/submarine_p.h | 139 ++ demos/sub-attaq/torpedo.cpp | 120 ++ demos/sub-attaq/torpedo.h | 75 + doc/src/demos/sub-attaq.qdoc | 54 + doc/src/images/sub-attaq-demo.png | Bin 0 -> 51552 bytes examples/animation/animation.pro | 1 - examples/animation/sub-attaq/animationmanager.cpp | 93 -- examples/animation/sub-attaq/animationmanager.h | 70 - examples/animation/sub-attaq/boat.cpp | 318 ----- examples/animation/sub-attaq/boat.h | 101 -- examples/animation/sub-attaq/boat_p.h | 256 ---- examples/animation/sub-attaq/bomb.cpp | 124 -- examples/animation/sub-attaq/bomb.h | 75 - .../sub-attaq/custompropertyanimation.cpp | 108 -- .../animation/sub-attaq/custompropertyanimation.h | 114 -- examples/animation/sub-attaq/data.xml | 15 - examples/animation/sub-attaq/graphicsscene.cpp | 374 ----- examples/animation/sub-attaq/graphicsscene.h | 131 -- examples/animation/sub-attaq/main.cpp | 57 - examples/animation/sub-attaq/mainwindow.cpp | 97 -- examples/animation/sub-attaq/mainwindow.h | 64 - .../animation/sub-attaq/pics/big/background.png | Bin 48858 -> 0 bytes examples/animation/sub-attaq/pics/big/boat.png | Bin 5198 -> 0 bytes examples/animation/sub-attaq/pics/big/bomb.png | Bin 760 -> 0 bytes .../sub-attaq/pics/big/explosion/boat/step1.png | Bin 5760 -> 0 bytes .../sub-attaq/pics/big/explosion/boat/step2.png | Bin 9976 -> 0 bytes .../sub-attaq/pics/big/explosion/boat/step3.png | Bin 12411 -> 0 bytes .../sub-attaq/pics/big/explosion/boat/step4.png | Bin 15438 -> 0 bytes .../pics/big/explosion/submarine/step1.png | Bin 3354 -> 0 bytes .../pics/big/explosion/submarine/step2.png | Bin 6205 -> 0 bytes .../pics/big/explosion/submarine/step3.png | Bin 6678 -> 0 bytes .../pics/big/explosion/submarine/step4.png | Bin 6666 -> 0 bytes .../animation/sub-attaq/pics/big/submarine.png | Bin 3202 -> 0 bytes examples/animation/sub-attaq/pics/big/surface.png | Bin 575 -> 0 bytes examples/animation/sub-attaq/pics/big/torpedo.png | Bin 951 -> 0 bytes .../sub-attaq/pics/scalable/background-n810.svg | 171 --- .../sub-attaq/pics/scalable/background.svg | 171 --- .../animation/sub-attaq/pics/scalable/boat.svg | 279 ---- .../animation/sub-attaq/pics/scalable/bomb.svg | 138 -- .../animation/sub-attaq/pics/scalable/sand.svg | 103 -- examples/animation/sub-attaq/pics/scalable/see.svg | 44 - examples/animation/sub-attaq/pics/scalable/sky.svg | 45 - .../sub-attaq/pics/scalable/sub-attaq.svg | 1473 -------------------- .../sub-attaq/pics/scalable/submarine.svg | 214 --- .../animation/sub-attaq/pics/scalable/surface.svg | 49 - .../animation/sub-attaq/pics/scalable/torpedo.svg | 127 -- .../animation/sub-attaq/pics/small/background.png | Bin 34634 -> 0 bytes examples/animation/sub-attaq/pics/small/boat.png | Bin 2394 -> 0 bytes examples/animation/sub-attaq/pics/small/bomb.png | Bin 760 -> 0 bytes .../animation/sub-attaq/pics/small/submarine.png | Bin 1338 -> 0 bytes .../animation/sub-attaq/pics/small/surface.png | Bin 502 -> 0 bytes .../animation/sub-attaq/pics/small/torpedo.png | Bin 951 -> 0 bytes .../animation/sub-attaq/pics/welcome/logo-a.png | Bin 5972 -> 0 bytes .../animation/sub-attaq/pics/welcome/logo-a2.png | Bin 5969 -> 0 bytes .../animation/sub-attaq/pics/welcome/logo-b.png | Bin 6869 -> 0 bytes .../animation/sub-attaq/pics/welcome/logo-dash.png | Bin 2255 -> 0 bytes .../animation/sub-attaq/pics/welcome/logo-excl.png | Bin 2740 -> 0 bytes .../animation/sub-attaq/pics/welcome/logo-q.png | Bin 7016 -> 0 bytes .../animation/sub-attaq/pics/welcome/logo-s.png | Bin 5817 -> 0 bytes .../animation/sub-attaq/pics/welcome/logo-t.png | Bin 3717 -> 0 bytes .../animation/sub-attaq/pics/welcome/logo-t2.png | Bin 3688 -> 0 bytes .../animation/sub-attaq/pics/welcome/logo-u.png | Bin 5374 -> 0 bytes examples/animation/sub-attaq/pixmapitem.cpp | 59 - examples/animation/sub-attaq/pixmapitem.h | 63 - examples/animation/sub-attaq/progressitem.cpp | 67 - examples/animation/sub-attaq/progressitem.h | 61 - examples/animation/sub-attaq/qanimationstate.cpp | 150 -- examples/animation/sub-attaq/qanimationstate.h | 92 -- examples/animation/sub-attaq/states.cpp | 325 ----- examples/animation/sub-attaq/states.h | 180 --- examples/animation/sub-attaq/sub-attaq.pro | 36 - examples/animation/sub-attaq/subattaq.qrc | 39 - examples/animation/sub-attaq/submarine.cpp | 211 --- examples/animation/sub-attaq/submarine.h | 92 -- examples/animation/sub-attaq/submarine_p.h | 139 -- examples/animation/sub-attaq/torpedo.cpp | 120 -- examples/animation/sub-attaq/torpedo.h | 75 - 147 files changed, 6603 insertions(+), 6523 deletions(-) create mode 100644 demos/sub-attaq/animationmanager.cpp create mode 100644 demos/sub-attaq/animationmanager.h create mode 100644 demos/sub-attaq/boat.cpp create mode 100644 demos/sub-attaq/boat.h create mode 100644 demos/sub-attaq/boat_p.h create mode 100644 demos/sub-attaq/bomb.cpp create mode 100644 demos/sub-attaq/bomb.h create mode 100644 demos/sub-attaq/custompropertyanimation.cpp create mode 100644 demos/sub-attaq/custompropertyanimation.h create mode 100644 demos/sub-attaq/data.xml create mode 100644 demos/sub-attaq/graphicsscene.cpp create mode 100644 demos/sub-attaq/graphicsscene.h create mode 100644 demos/sub-attaq/main.cpp create mode 100644 demos/sub-attaq/mainwindow.cpp create mode 100644 demos/sub-attaq/mainwindow.h create mode 100644 demos/sub-attaq/pics/big/background.png create mode 100644 demos/sub-attaq/pics/big/boat.png create mode 100644 demos/sub-attaq/pics/big/bomb.png create mode 100644 demos/sub-attaq/pics/big/explosion/boat/step1.png create mode 100644 demos/sub-attaq/pics/big/explosion/boat/step2.png create mode 100644 demos/sub-attaq/pics/big/explosion/boat/step3.png create mode 100644 demos/sub-attaq/pics/big/explosion/boat/step4.png create mode 100644 demos/sub-attaq/pics/big/explosion/submarine/step1.png create mode 100644 demos/sub-attaq/pics/big/explosion/submarine/step2.png create mode 100644 demos/sub-attaq/pics/big/explosion/submarine/step3.png create mode 100644 demos/sub-attaq/pics/big/explosion/submarine/step4.png create mode 100644 demos/sub-attaq/pics/big/submarine.png create mode 100644 demos/sub-attaq/pics/big/surface.png create mode 100644 demos/sub-attaq/pics/big/torpedo.png create mode 100644 demos/sub-attaq/pics/scalable/background-n810.svg create mode 100644 demos/sub-attaq/pics/scalable/background.svg create mode 100644 demos/sub-attaq/pics/scalable/boat.svg create mode 100644 demos/sub-attaq/pics/scalable/bomb.svg create mode 100644 demos/sub-attaq/pics/scalable/sand.svg create mode 100644 demos/sub-attaq/pics/scalable/see.svg create mode 100644 demos/sub-attaq/pics/scalable/sky.svg create mode 100644 demos/sub-attaq/pics/scalable/sub-attaq.svg create mode 100644 demos/sub-attaq/pics/scalable/submarine.svg create mode 100644 demos/sub-attaq/pics/scalable/surface.svg create mode 100644 demos/sub-attaq/pics/scalable/torpedo.svg create mode 100644 demos/sub-attaq/pics/small/background.png create mode 100644 demos/sub-attaq/pics/small/boat.png create mode 100644 demos/sub-attaq/pics/small/bomb.png create mode 100644 demos/sub-attaq/pics/small/submarine.png create mode 100644 demos/sub-attaq/pics/small/surface.png create mode 100644 demos/sub-attaq/pics/small/torpedo.png create mode 100644 demos/sub-attaq/pics/welcome/logo-a.png create mode 100644 demos/sub-attaq/pics/welcome/logo-a2.png create mode 100644 demos/sub-attaq/pics/welcome/logo-b.png create mode 100644 demos/sub-attaq/pics/welcome/logo-dash.png create mode 100644 demos/sub-attaq/pics/welcome/logo-excl.png create mode 100644 demos/sub-attaq/pics/welcome/logo-q.png create mode 100644 demos/sub-attaq/pics/welcome/logo-s.png create mode 100644 demos/sub-attaq/pics/welcome/logo-t.png create mode 100644 demos/sub-attaq/pics/welcome/logo-t2.png create mode 100644 demos/sub-attaq/pics/welcome/logo-u.png create mode 100644 demos/sub-attaq/pixmapitem.cpp create mode 100644 demos/sub-attaq/pixmapitem.h create mode 100644 demos/sub-attaq/progressitem.cpp create mode 100644 demos/sub-attaq/progressitem.h create mode 100644 demos/sub-attaq/qanimationstate.cpp create mode 100644 demos/sub-attaq/qanimationstate.h create mode 100644 demos/sub-attaq/states.cpp create mode 100644 demos/sub-attaq/states.h create mode 100644 demos/sub-attaq/sub-attaq.pro create mode 100644 demos/sub-attaq/subattaq.qrc create mode 100644 demos/sub-attaq/submarine.cpp create mode 100644 demos/sub-attaq/submarine.h create mode 100644 demos/sub-attaq/submarine_p.h create mode 100644 demos/sub-attaq/torpedo.cpp create mode 100644 demos/sub-attaq/torpedo.h create mode 100644 doc/src/demos/sub-attaq.qdoc create mode 100644 doc/src/images/sub-attaq-demo.png delete mode 100644 examples/animation/sub-attaq/animationmanager.cpp delete mode 100644 examples/animation/sub-attaq/animationmanager.h delete mode 100644 examples/animation/sub-attaq/boat.cpp delete mode 100644 examples/animation/sub-attaq/boat.h delete mode 100644 examples/animation/sub-attaq/boat_p.h delete mode 100644 examples/animation/sub-attaq/bomb.cpp delete mode 100644 examples/animation/sub-attaq/bomb.h delete mode 100644 examples/animation/sub-attaq/custompropertyanimation.cpp delete mode 100644 examples/animation/sub-attaq/custompropertyanimation.h delete mode 100644 examples/animation/sub-attaq/data.xml delete mode 100644 examples/animation/sub-attaq/graphicsscene.cpp delete mode 100644 examples/animation/sub-attaq/graphicsscene.h delete mode 100644 examples/animation/sub-attaq/main.cpp delete mode 100644 examples/animation/sub-attaq/mainwindow.cpp delete mode 100644 examples/animation/sub-attaq/mainwindow.h delete mode 100644 examples/animation/sub-attaq/pics/big/background.png delete mode 100644 examples/animation/sub-attaq/pics/big/boat.png delete mode 100644 examples/animation/sub-attaq/pics/big/bomb.png delete mode 100644 examples/animation/sub-attaq/pics/big/explosion/boat/step1.png delete mode 100644 examples/animation/sub-attaq/pics/big/explosion/boat/step2.png delete mode 100644 examples/animation/sub-attaq/pics/big/explosion/boat/step3.png delete mode 100644 examples/animation/sub-attaq/pics/big/explosion/boat/step4.png delete mode 100644 examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png delete mode 100644 examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png delete mode 100644 examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png delete mode 100644 examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png delete mode 100644 examples/animation/sub-attaq/pics/big/submarine.png delete mode 100644 examples/animation/sub-attaq/pics/big/surface.png delete mode 100644 examples/animation/sub-attaq/pics/big/torpedo.png delete mode 100644 examples/animation/sub-attaq/pics/scalable/background-n810.svg delete mode 100644 examples/animation/sub-attaq/pics/scalable/background.svg delete mode 100644 examples/animation/sub-attaq/pics/scalable/boat.svg delete mode 100644 examples/animation/sub-attaq/pics/scalable/bomb.svg delete mode 100644 examples/animation/sub-attaq/pics/scalable/sand.svg delete mode 100644 examples/animation/sub-attaq/pics/scalable/see.svg delete mode 100644 examples/animation/sub-attaq/pics/scalable/sky.svg delete mode 100644 examples/animation/sub-attaq/pics/scalable/sub-attaq.svg delete mode 100644 examples/animation/sub-attaq/pics/scalable/submarine.svg delete mode 100644 examples/animation/sub-attaq/pics/scalable/surface.svg delete mode 100644 examples/animation/sub-attaq/pics/scalable/torpedo.svg delete mode 100644 examples/animation/sub-attaq/pics/small/background.png delete mode 100644 examples/animation/sub-attaq/pics/small/boat.png delete mode 100644 examples/animation/sub-attaq/pics/small/bomb.png delete mode 100644 examples/animation/sub-attaq/pics/small/submarine.png delete mode 100644 examples/animation/sub-attaq/pics/small/surface.png delete mode 100644 examples/animation/sub-attaq/pics/small/torpedo.png delete mode 100644 examples/animation/sub-attaq/pics/welcome/logo-a.png delete mode 100644 examples/animation/sub-attaq/pics/welcome/logo-a2.png delete mode 100644 examples/animation/sub-attaq/pics/welcome/logo-b.png delete mode 100644 examples/animation/sub-attaq/pics/welcome/logo-dash.png delete mode 100644 examples/animation/sub-attaq/pics/welcome/logo-excl.png delete mode 100644 examples/animation/sub-attaq/pics/welcome/logo-q.png delete mode 100644 examples/animation/sub-attaq/pics/welcome/logo-s.png delete mode 100644 examples/animation/sub-attaq/pics/welcome/logo-t.png delete mode 100644 examples/animation/sub-attaq/pics/welcome/logo-t2.png delete mode 100644 examples/animation/sub-attaq/pics/welcome/logo-u.png delete mode 100644 examples/animation/sub-attaq/pixmapitem.cpp delete mode 100644 examples/animation/sub-attaq/pixmapitem.h delete mode 100644 examples/animation/sub-attaq/progressitem.cpp delete mode 100644 examples/animation/sub-attaq/progressitem.h delete mode 100644 examples/animation/sub-attaq/qanimationstate.cpp delete mode 100644 examples/animation/sub-attaq/qanimationstate.h delete mode 100644 examples/animation/sub-attaq/states.cpp delete mode 100644 examples/animation/sub-attaq/states.h delete mode 100644 examples/animation/sub-attaq/sub-attaq.pro delete mode 100644 examples/animation/sub-attaq/subattaq.qrc delete mode 100644 examples/animation/sub-attaq/submarine.cpp delete mode 100644 examples/animation/sub-attaq/submarine.h delete mode 100644 examples/animation/sub-attaq/submarine_p.h delete mode 100644 examples/animation/sub-attaq/torpedo.cpp delete mode 100644 examples/animation/sub-attaq/torpedo.h diff --git a/demos/demos.pro b/demos/demos.pro index 60845500f..eda04dc0b 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -13,7 +13,8 @@ SUBDIRS = \ demos_textedit \ demos_chip \ demos_embeddeddialogs \ - demos_undo + demos_undo \ + demos_sub-attaq contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles1cl):!contains(QT_CONFIG, opengles2):{ SUBDIRS += demos_boxes @@ -61,6 +62,7 @@ demos_mediaplayer.subdir = mediaplayer demos_browser.subdir = browser demos_boxes.subdir = boxes +demos_sub-attaq.subdir = sub-attaq #CONFIG += ordered !ordered { diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml index 25608489e..a81eead66 100644 --- a/demos/qtdemo/xml/examples.xml +++ b/demos/qtdemo/xml/examples.xml @@ -18,6 +18,7 @@ + @@ -26,7 +27,6 @@ - diff --git a/demos/sub-attaq/animationmanager.cpp b/demos/sub-attaq/animationmanager.cpp new file mode 100644 index 000000000..13266f991 --- /dev/null +++ b/demos/sub-attaq/animationmanager.cpp @@ -0,0 +1,93 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//Own +#include "animationmanager.h" + +//Qt +#include +#include + +// the universe's only animation manager +AnimationManager *AnimationManager::instance = 0; + +AnimationManager::AnimationManager() +{ +} + +AnimationManager *AnimationManager::self() +{ + if (!instance) + instance = new AnimationManager; + return instance; +} + +void AnimationManager::registerAnimation(QAbstractAnimation *anim) +{ + animations.append(anim); +} + +void AnimationManager::unregisterAnimation(QAbstractAnimation *anim) +{ + animations.removeAll(anim); +} + +void AnimationManager::unregisterAllAnimations() +{ + animations.clear(); +} + +void AnimationManager::pauseAll() +{ + foreach (QAbstractAnimation* animation, animations) + { + if (animation->state() == QAbstractAnimation::Running) + animation->pause(); + } +} +void AnimationManager::resumeAll() +{ + foreach (QAbstractAnimation* animation, animations) + { + if (animation->state() == QAbstractAnimation::Paused) + animation->resume(); + } +} diff --git a/demos/sub-attaq/animationmanager.h b/demos/sub-attaq/animationmanager.h new file mode 100644 index 000000000..63ecae6d0 --- /dev/null +++ b/demos/sub-attaq/animationmanager.h @@ -0,0 +1,70 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef ANIMATIONMANAGER_H +#define ANIMATIONMANAGER_H + +#include + +QT_BEGIN_NAMESPACE +class QAbstractAnimation; +QT_END_NAMESPACE + +class AnimationManager : public QObject +{ +Q_OBJECT +public: + AnimationManager(); + void registerAnimation(QAbstractAnimation *anim); + void unregisterAnimation(QAbstractAnimation *anim); + void unregisterAllAnimations(); + static AnimationManager *self(); + +public slots: + void pauseAll(); + void resumeAll(); + +private: + static AnimationManager *instance; + QList animations; +}; + +#endif // ANIMATIONMANAGER_H diff --git a/demos/sub-attaq/boat.cpp b/demos/sub-attaq/boat.cpp new file mode 100644 index 000000000..68e646e0b --- /dev/null +++ b/demos/sub-attaq/boat.cpp @@ -0,0 +1,318 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//Own +#include "boat.h" +#include "boat_p.h" +#include "bomb.h" +#include "pixmapitem.h" +#include "graphicsscene.h" +#include "animationmanager.h" +#include "custompropertyanimation.h" +#include "qanimationstate.h" + +//Qt +#include +#include +#include +#include +#include +#include + +static QAbstractAnimation *setupDestroyAnimation(Boat *boat) +{ + QSequentialAnimationGroup *group = new QSequentialAnimationGroup(boat); +#if QT_VERSION >=0x040500 + PixmapItem *step1 = new PixmapItem(QString("explosion/boat/step1"),GraphicsScene::Big, boat); + step1->setZValue(6); + PixmapItem *step2 = new PixmapItem(QString("explosion/boat/step2"),GraphicsScene::Big, boat); + step2->setZValue(6); + PixmapItem *step3 = new PixmapItem(QString("explosion/boat/step3"),GraphicsScene::Big, boat); + step3->setZValue(6); + PixmapItem *step4 = new PixmapItem(QString("explosion/boat/step4"),GraphicsScene::Big, boat); + step4->setZValue(6); + step1->setOpacity(0); + step2->setOpacity(0); + step3->setOpacity(0); + step4->setOpacity(0); + CustomPropertyAnimation *anim1 = new CustomPropertyAnimation(boat); + anim1->setMemberFunctions((QGraphicsItem*)step1, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); + anim1->setDuration(100); + anim1->setEndValue(1); + CustomPropertyAnimation *anim2 = new CustomPropertyAnimation(boat); + anim2->setMemberFunctions((QGraphicsItem*)step2, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); + anim2->setDuration(100); + anim2->setEndValue(1); + CustomPropertyAnimation *anim3 = new CustomPropertyAnimation(boat); + anim3->setMemberFunctions((QGraphicsItem*)step3, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); + anim3->setDuration(100); + anim3->setEndValue(1); + CustomPropertyAnimation *anim4 = new CustomPropertyAnimation(boat); + anim4->setMemberFunctions((QGraphicsItem*)step4, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); + anim4->setDuration(100); + anim4->setEndValue(1); + CustomPropertyAnimation *anim5 = new CustomPropertyAnimation(boat); + anim5->setMemberFunctions((QGraphicsItem*)step1, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); + anim5->setDuration(100); + anim5->setEndValue(0); + CustomPropertyAnimation *anim6 = new CustomPropertyAnimation(boat); + anim6->setMemberFunctions((QGraphicsItem*)step2, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); + anim6->setDuration(100); + anim6->setEndValue(0); + CustomPropertyAnimation *anim7 = new CustomPropertyAnimation(boat); + anim7->setMemberFunctions((QGraphicsItem*)step3, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); + anim7->setDuration(100); + anim7->setEndValue(0); + CustomPropertyAnimation *anim8 = new CustomPropertyAnimation(boat); + anim8->setMemberFunctions((QGraphicsItem*)step4, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); + anim8->setDuration(100); + anim8->setEndValue(0); + group->addAnimation(anim1); + group->addAnimation(anim2); + group->addAnimation(anim3); + group->addAnimation(anim4); + group->addAnimation(anim5); + group->addAnimation(anim6); + group->addAnimation(anim7); + group->addAnimation(anim8); +#else + // work around for a bug where we don't transition if the duration is zero. + QtPauseAnimation *anim = new QtPauseAnimation(group); + anim->setDuration(1); + group->addAnimation(anim); +#endif + AnimationManager::self()->registerAnimation(group); + return group; +} + + + +Boat::Boat(QGraphicsItem * parent, Qt::WindowFlags wFlags) + : QGraphicsWidget(parent,wFlags), speed(0), bombsAlreadyLaunched(0), direction(Boat::None), movementAnimation(0) +{ + pixmapItem = new PixmapItem(QString("boat"),GraphicsScene::Big, this); + setZValue(4); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsFocusable); + resize(pixmapItem->boundingRect().size()); + + //The movement animation used to animate the boat + movementAnimation = new QPropertyAnimation(this, "pos"); + + //The movement animation used to animate the boat + destroyAnimation = setupDestroyAnimation(this); + + //We setup the state machien of the boat + machine = new QStateMachine(this); + QState *moving = new QState(machine); + StopState *stopState = new StopState(this, moving); + machine->setInitialState(moving); + moving->setInitialState(stopState); + MoveStateRight *moveStateRight = new MoveStateRight(this, moving); + MoveStateLeft *moveStateLeft = new MoveStateLeft(this, moving); + LaunchStateRight *launchStateRight = new LaunchStateRight(this, machine); + LaunchStateLeft *launchStateLeft = new LaunchStateLeft(this, machine); + + //then setup the transitions for the rightMove state + KeyStopTransition *leftStopRight = new KeyStopTransition(this, QEvent::KeyPress, Qt::Key_Left); + leftStopRight->setTargetState(stopState); + KeyMoveTransition *leftMoveRight = new KeyMoveTransition(this, QEvent::KeyPress, Qt::Key_Left); + leftMoveRight->setTargetState(moveStateRight); + KeyMoveTransition *rightMoveRight = new KeyMoveTransition(this, QEvent::KeyPress, Qt::Key_Right); + rightMoveRight->setTargetState(moveStateRight); + KeyMoveTransition *rightMoveStop = new KeyMoveTransition(this, QEvent::KeyPress, Qt::Key_Right); + rightMoveStop->setTargetState(moveStateRight); + + //then setup the transitions for the leftMove state + KeyStopTransition *rightStopLeft = new KeyStopTransition(this, QEvent::KeyPress, Qt::Key_Right); + rightStopLeft->setTargetState(stopState); + KeyMoveTransition *rightMoveLeft = new KeyMoveTransition(this, QEvent::KeyPress, Qt::Key_Right); + rightMoveLeft->setTargetState(moveStateLeft); + KeyMoveTransition *leftMoveLeft = new KeyMoveTransition(this, QEvent::KeyPress,Qt::Key_Left); + leftMoveLeft->setTargetState(moveStateLeft); + KeyMoveTransition *leftMoveStop = new KeyMoveTransition(this, QEvent::KeyPress,Qt::Key_Left); + leftMoveStop->setTargetState(moveStateLeft); + + //We set up the right move state + moveStateRight->addTransition(leftStopRight); + moveStateRight->addTransition(leftMoveRight); + moveStateRight->addTransition(rightMoveRight); + stopState->addTransition(rightMoveStop); + + //We set up the left move state + moveStateLeft->addTransition(rightStopLeft); + moveStateLeft->addTransition(leftMoveLeft); + moveStateLeft->addTransition(rightMoveLeft); + stopState->addTransition(leftMoveStop); + + //The animation is finished, it means we reached the border of the screen, the boat is stopped so we move to the stop state + moveStateLeft->addTransition(movementAnimation, SIGNAL(finished()), stopState); + moveStateRight->addTransition(movementAnimation, SIGNAL(finished()), stopState); + + //We set up the keys for dropping bombs + KeyLaunchTransition *upFireLeft = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Up); + upFireLeft->setTargetState(launchStateRight); + KeyLaunchTransition *upFireRight = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Up); + upFireRight->setTargetState(launchStateRight); + KeyLaunchTransition *upFireStop = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Up); + upFireStop->setTargetState(launchStateRight); + KeyLaunchTransition *downFireLeft = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Down); + downFireLeft->setTargetState(launchStateLeft); + KeyLaunchTransition *downFireRight = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Down); + downFireRight->setTargetState(launchStateLeft); + KeyLaunchTransition *downFireMove = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Down); + downFireMove->setTargetState(launchStateLeft); + + //We set up transitions for fire up + moveStateRight->addTransition(upFireRight); + moveStateLeft->addTransition(upFireLeft); + stopState->addTransition(upFireStop); + + //We set up transitions for fire down + moveStateRight->addTransition(downFireRight); + moveStateLeft->addTransition(downFireLeft); + stopState->addTransition(downFireMove); + + //Finally the launch state should come back to its original state + QHistoryState *historyState = new QHistoryState(moving); + launchStateLeft->addTransition(historyState); + launchStateRight->addTransition(historyState); + + QFinalState *final = new QFinalState(machine); + + //This state play the destroyed animation + QAnimationState *destroyedState = new QAnimationState(machine); + destroyedState->setAnimation(destroyAnimation); + + //Play a nice animation when the boat is destroyed + moving->addTransition(this, SIGNAL(boatDestroyed()),destroyedState); + + //Transition to final state when the destroyed animation is finished + destroyedState->addTransition(destroyedState, SIGNAL(animationFinished()), final); + + //The machine has finished to be executed, then the boat is dead + connect(machine,SIGNAL(finished()),this, SIGNAL(boatExecutionFinished())); + +} + +void Boat::run() +{ + //We register animations + AnimationManager::self()->registerAnimation(movementAnimation); + AnimationManager::self()->registerAnimation(destroyAnimation); + machine->start(); +} + +void Boat::stop() +{ + movementAnimation->stop(); + machine->stop(); +} + +void Boat::updateBoatMovement() +{ + if (speed == 0 || direction == Boat::None) { + movementAnimation->stop(); + return; + } + + movementAnimation->stop(); + movementAnimation->setStartValue(pos()); + + if (direction == Boat::Left) { + movementAnimation->setEndValue(QPointF(0,y())); + movementAnimation->setDuration(x()/speed*15); + } + else /*if (direction == Boat::Right)*/ { + movementAnimation->setEndValue(QPointF(scene()->width()-size().width(),y())); + movementAnimation->setDuration((scene()->width()-size().width()-x())/speed*15); + } + movementAnimation->start(); +} + +void Boat::destroy() +{ + movementAnimation->stop(); + emit boatDestroyed(); +} + +int Boat::bombsLaunched() const +{ + return bombsAlreadyLaunched; +} + +void Boat::setBombsLaunched(int number) +{ + if (number > MAX_BOMB) { + qWarning("Boat::setBombsLaunched : It impossible to launch that number of bombs"); + return; + } + bombsAlreadyLaunched = number; +} + +int Boat::currentSpeed() const +{ + return speed; +} + +void Boat::setCurrentSpeed(int speed) +{ + if (speed > 3 || speed < 0) { + qWarning("Boat::setCurrentSpeed: The boat can't run on that speed"); + return; + } + this->speed = speed; +} + +enum Boat::Movement Boat::currentDirection() const +{ + return direction; +} + +void Boat::setCurrentDirection(Movement direction) +{ + this->direction = direction; +} + +int Boat::type() const +{ + return Type; +} diff --git a/demos/sub-attaq/boat.h b/demos/sub-attaq/boat.h new file mode 100644 index 000000000..f6b1a9029 --- /dev/null +++ b/demos/sub-attaq/boat.h @@ -0,0 +1,101 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef __BOAT__H__ +#define __BOAT__H__ + +//Qt +#include +#include + +#include + +class PixmapItem; +class Bomb; +QT_BEGIN_NAMESPACE +class QVariantAnimation; +class QAbstractAnimation; +class QStateMachine; +QT_END_NAMESPACE + +class Boat : public QGraphicsWidget +{ +Q_OBJECT +public: + enum Movement { + None = 0, + Left, + Right + }; + enum { Type = UserType + 2 }; + Boat(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); + void destroy(); + void run(); + void stop(); + + int bombsLaunched() const; + void setBombsLaunched(int number); + + int currentSpeed() const; + void setCurrentSpeed(int speed); + + enum Movement currentDirection() const; + void setCurrentDirection(Movement direction); + + void updateBoatMovement(); + + virtual int type() const; + +signals: + void boatDestroyed(); + void boatExecutionFinished(); + +private: + int speed; + int bombsAlreadyLaunched; + Movement direction; + QVariantAnimation *movementAnimation; + QAbstractAnimation *destroyAnimation; + QStateMachine *machine; + PixmapItem *pixmapItem; +}; + +#endif //__BOAT__H__ diff --git a/demos/sub-attaq/boat_p.h b/demos/sub-attaq/boat_p.h new file mode 100644 index 000000000..4e962fc75 --- /dev/null +++ b/demos/sub-attaq/boat_p.h @@ -0,0 +1,256 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef BOAT_P_H +#define BOAT_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +//Own +#include "bomb.h" +#include "graphicsscene.h" + +// Qt +#include + +static const int MAX_BOMB = 5; + + +//These transtion test if we have to stop the boat (i.e current speed is 1) +class KeyStopTransition : public QKeyEventTransition +{ +public: + KeyStopTransition(Boat *boat, QEvent::Type type, int key) + : QKeyEventTransition(boat, type, key) + { + this->boat = boat; + this->key = key; + } +protected: + virtual bool eventTest(QEvent *event) + { + Q_UNUSED(event); + if (!QKeyEventTransition::eventTest(event)) + return false; + if (boat->currentSpeed() == 1) + return true; + else + return false; + } +private: + Boat * boat; + int key; +}; + +//These transtion test if we have to move the boat (i.e current speed was 0 or another value) + class KeyMoveTransition : public QKeyEventTransition +{ +public: + KeyMoveTransition(Boat *boat, QEvent::Type type, int key) + : QKeyEventTransition(boat, type, key) + { + this->boat = boat; + this->key = key; + } +protected: + virtual bool eventTest(QEvent *event) + { + Q_UNUSED(event); + if (!QKeyEventTransition::eventTest(event)) + return false; + if (boat->currentSpeed() >= 0) + return true; + else + return false; + + } + void onTransition(QEvent *) + { + //We decrease the speed if needed + if (key == Qt::Key_Left && boat->currentDirection() == Boat::Right) + boat->setCurrentSpeed(boat->currentSpeed() - 1); + else if (key == Qt::Key_Right && boat->currentDirection() == Boat::Left) + boat->setCurrentSpeed(boat->currentSpeed() - 1); + else if (boat->currentSpeed() < 3) + boat->setCurrentSpeed(boat->currentSpeed() + 1); + boat->updateBoatMovement(); + } +private: + Boat * boat; + int key; +}; + +//This transition trigger the bombs launch + class KeyLaunchTransition : public QKeyEventTransition +{ +public: + KeyLaunchTransition(Boat *boat, QEvent::Type type, int key) + : QKeyEventTransition(boat, type, key) + { + this->boat = boat; + this->key = key; + } +protected: + virtual bool eventTest(QEvent *event) + { + Q_UNUSED(event); + if (!QKeyEventTransition::eventTest(event)) + return false; + //We have enough bomb? + if (boat->bombsLaunched() < MAX_BOMB) + return true; + else + return false; + } +private: + Boat * boat; + int key; +}; + +//This state is describing when the boat is moving right +class MoveStateRight : public QState +{ +public: + MoveStateRight(Boat *boat,QState *parent = 0) : QState(parent) + { + this->boat = boat; + } +protected: + void onEntry(QEvent *) + { + boat->setCurrentDirection(Boat::Right); + boat->updateBoatMovement(); + } +private: + Boat * boat; +}; + + //This state is describing when the boat is moving left +class MoveStateLeft : public QState +{ +public: + MoveStateLeft(Boat *boat,QState *parent = 0) : QState(parent) + { + this->boat = boat; + } +protected: + void onEntry(QEvent *) + { + boat->setCurrentDirection(Boat::Left); + boat->updateBoatMovement(); + } +private: + Boat * boat; +}; + +//This state is describing when the boat is in a stand by position +class StopState : public QState +{ +public: + StopState(Boat *boat,QState *parent = 0) : QState(parent) + { + this->boat = boat; + } +protected: + void onEntry(QEvent *) + { + boat->setCurrentSpeed(0); + boat->setCurrentDirection(Boat::None); + boat->updateBoatMovement(); + } +private: + Boat * boat; +}; + +//This state is describing the launch of the torpedo on the right +class LaunchStateRight : public QState +{ +public: + LaunchStateRight(Boat *boat,QState *parent = 0) : QState(parent) + { + this->boat = boat; + } +protected: + void onEntry(QEvent *) + { + Bomb *b = new Bomb(); + b->setPos(boat->x()+boat->size().width(),boat->y()); + GraphicsScene *scene = static_cast(boat->scene()); + scene->addItem(b); + b->launch(Bomb::Right); + boat->setBombsLaunched(boat->bombsLaunched() + 1); + } +private: + Boat * boat; +}; + +//This state is describing the launch of the torpedo on the left +class LaunchStateLeft : public QState +{ +public: + LaunchStateLeft(Boat *boat,QState *parent = 0) : QState(parent) + { + this->boat = boat; + } +protected: + void onEntry(QEvent *) + { + Bomb *b = new Bomb(); + b->setPos(boat->x() - b->size().width(), boat->y()); + GraphicsScene *scene = static_cast(boat->scene()); + scene->addItem(b); + b->launch(Bomb::Left); + boat->setBombsLaunched(boat->bombsLaunched() + 1); + } +private: + Boat * boat; +}; + +#endif // BOAT_P_H diff --git a/demos/sub-attaq/bomb.cpp b/demos/sub-attaq/bomb.cpp new file mode 100644 index 000000000..e92a72330 --- /dev/null +++ b/demos/sub-attaq/bomb.cpp @@ -0,0 +1,124 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//Own +#include "bomb.h" +#include "submarine.h" +#include "pixmapitem.h" +#include "animationmanager.h" +#include "qanimationstate.h" + +//Qt +#include +#include +#include +#include + +Bomb::Bomb(QGraphicsItem * parent, Qt::WindowFlags wFlags) + : QGraphicsWidget(parent,wFlags), launchAnimation(0) +{ + pixmapItem = new PixmapItem(QString("bomb"),GraphicsScene::Big, this); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + setFlags(QGraphicsItem::ItemIsMovable); + setZValue(2); + resize(pixmapItem->boundingRect().size()); +} + +void Bomb::launch(Bomb::Direction direction) +{ + launchAnimation = new QSequentialAnimationGroup(); + AnimationManager::self()->registerAnimation(launchAnimation); + qreal delta = direction == Right ? 20 : - 20; + QPropertyAnimation *anim = new QPropertyAnimation(this, "pos"); + anim->setEndValue(QPointF(x() + delta,y() - 20)); + anim->setDuration(150); + launchAnimation->addAnimation(anim); + anim = new QPropertyAnimation(this, "pos"); + anim->setEndValue(QPointF(x() + delta*2, y() )); + anim->setDuration(150); + launchAnimation->addAnimation(anim); + anim = new QPropertyAnimation(this, "pos"); + anim->setEndValue(QPointF(x() + delta*2,scene()->height())); + anim->setDuration(y()/2*60); + launchAnimation->addAnimation(anim); + connect(anim,SIGNAL(valueChanged(const QVariant &)),this,SLOT(onAnimationLaunchValueChanged(const QVariant &))); + + //We setup the state machine of the bomb + QStateMachine *machine = new QStateMachine(this); + + //This state is when the launch animation is playing + QAnimationState *launched = new QAnimationState(machine); + launched->setAnimation(launchAnimation); + + //End + QFinalState *final = new QFinalState(machine); + + machine->setInitialState(launched); + + //### Add a nice animation when the bomb is destroyed + launched->addTransition(this, SIGNAL(bombExplosed()),final); + + //If the animation is finished, then we move to the final state + launched->addTransition(launched, SIGNAL(animationFinished()), final); + + //The machine has finished to be executed, then the boat is dead + connect(machine,SIGNAL(finished()),this, SIGNAL(bombExecutionFinished())); + + machine->start(); + +} + +void Bomb::onAnimationLaunchValueChanged(const QVariant &) +{ + foreach (QGraphicsItem * item , collidingItems(Qt::IntersectsItemBoundingRect)) { + if (item->type() == SubMarine::Type) { + SubMarine *s = static_cast(item); + destroy(); + s->destroy(); + } + } +} + +void Bomb::destroy() +{ + launchAnimation->stop(); + emit bombExplosed(); +} diff --git a/demos/sub-attaq/bomb.h b/demos/sub-attaq/bomb.h new file mode 100644 index 000000000..ed6b0f535 --- /dev/null +++ b/demos/sub-attaq/bomb.h @@ -0,0 +1,75 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef __BOMB__H__ +#define __BOMB__H__ + +//Qt +#include +#include + +class PixmapItem; + +class Bomb : public QGraphicsWidget +{ +Q_OBJECT +public: + enum Direction { + Left = 0, + Right + }; + Bomb(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0); + void launch(Direction direction); + void destroy(); + +signals: + void bombExplosed(); + void bombExecutionFinished(); + +private slots: + void onAnimationLaunchValueChanged(const QVariant &); + +private: + QAnimationGroup *launchAnimation; + PixmapItem *pixmapItem; +}; + +#endif //__BOMB__H__ diff --git a/demos/sub-attaq/custompropertyanimation.cpp b/demos/sub-attaq/custompropertyanimation.cpp new file mode 100644 index 000000000..9282f4202 --- /dev/null +++ b/demos/sub-attaq/custompropertyanimation.cpp @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "custompropertyanimation.h" + +// Qt +#include + +CustomPropertyAnimation::CustomPropertyAnimation(QObject *parent) : + QVariantAnimation(parent), animProp(0) +{ +} + +CustomPropertyAnimation::~CustomPropertyAnimation() +{ +} + +void CustomPropertyAnimation::setProperty(AbstractProperty *_animProp) +{ + if (animProp == _animProp) + return; + delete animProp; + animProp = _animProp; +} + +/*! + \reimp + */ +void CustomPropertyAnimation::updateCurrentValue(const QVariant &value) +{ + if (!animProp || state() == QAbstractAnimation::Stopped) + return; + + animProp->write(value); +} + + +/*! + \reimp +*/ +void CustomPropertyAnimation::updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState) +{ + // Initialize start value + if (oldState == QAbstractAnimation::Stopped) { + if (!animProp) + return; + QVariant def = animProp->read(); + if (def.isValid()) { + const int t = def.userType(); + KeyValues values = keyValues(); + //this ensures that all the keyValues are of type t + for (int i = 0; i < values.count(); ++i) { + QVariantAnimation::KeyValue &pair = values[i]; + if (pair.second.userType() != t) + pair.second.convert(static_cast(t)); + } + //let's now update the key values + setKeyValues(values); + } + + if (animProp && !startValue().isValid() && currentTime() == 0 + || (currentTime() == duration() && currentLoop() == (loopCount() - 1))) { + setStartValue(def); + } + } + + QVariantAnimation::updateState(oldState, newState); +} + +#include "moc_custompropertyanimation.cpp" diff --git a/demos/sub-attaq/custompropertyanimation.h b/demos/sub-attaq/custompropertyanimation.h new file mode 100644 index 000000000..a98416336 --- /dev/null +++ b/demos/sub-attaq/custompropertyanimation.h @@ -0,0 +1,114 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef CUSTOMPROPERTYANIMATION_H +#define CUSTOMPROPERTYANIMATION_H + +#include + +QT_BEGIN_NAMESPACE +class QGraphicsItem; +QT_END_NAMESPACE + +struct AbstractProperty +{ + virtual QVariant read() const = 0; + virtual void write(const QVariant &value) = 0; +}; + + +class CustomPropertyAnimation : public QVariantAnimation +{ + Q_OBJECT + + template + class MemberFunctionProperty : public AbstractProperty + { + public: + typedef T (Target::*Getter)(void) const; + typedef void (Target::*Setter)(T2); + + MemberFunctionProperty(Target* target, Getter getter, Setter setter) + : m_target(target), m_getter(getter), m_setter(setter) {} + + virtual void write(const QVariant &value) + { + if (m_setter) (m_target->*m_setter)(qVariantValue(value)); + } + + virtual QVariant read() const + { + if (m_getter) return qVariantFromValue((m_target->*m_getter)()); + return QVariant(); + } + + private: + Target *m_target; + Getter m_getter; + Setter m_setter; + }; + +public: + CustomPropertyAnimation(QObject *parent = 0); + ~CustomPropertyAnimation(); + + template + void setMemberFunctions(Target* target, T (Target::*getter)() const, void (Target::*setter)(const T& )) + { + setProperty(new MemberFunctionProperty(target, getter, setter)); + } + + template + void setMemberFunctions(Target* target, T (Target::*getter)() const, void (Target::*setter)(T)) + { + setProperty(new MemberFunctionProperty(target, getter, setter)); + } + + void updateCurrentValue(const QVariant &value); + void updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState); + void setProperty(AbstractProperty *animProp); + +private: + Q_DISABLE_COPY(CustomPropertyAnimation); + AbstractProperty *animProp; +}; + +#endif // CUSTOMPROPERTYANIMATION_H diff --git a/demos/sub-attaq/data.xml b/demos/sub-attaq/data.xml new file mode 100644 index 000000000..0f30515dd --- /dev/null +++ b/demos/sub-attaq/data.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/sub-attaq/graphicsscene.cpp b/demos/sub-attaq/graphicsscene.cpp new file mode 100644 index 000000000..fcbc1b392 --- /dev/null +++ b/demos/sub-attaq/graphicsscene.cpp @@ -0,0 +1,374 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//Own +#include "graphicsscene.h" +#include "states.h" +#include "boat.h" +#include "submarine.h" +#include "torpedo.h" +#include "bomb.h" +#include "pixmapitem.h" +#include "custompropertyanimation.h" +#include "animationmanager.h" +#include "qanimationstate.h" +#include "progressitem.h" + +//Qt +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//helper function that creates an animation for position and inserts it into group +static CustomPropertyAnimation *addGraphicsItemPosAnimation(QSequentialAnimationGroup *group, + QGraphicsItem *item, const QPointF &endPos) +{ + CustomPropertyAnimation *ret = new CustomPropertyAnimation(group); + ret->setMemberFunctions(item, &QGraphicsItem::pos, &QGraphicsItem::setPos); + ret->setEndValue(endPos); + ret->setDuration(200); + ret->setEasingCurve(QEasingCurve::OutElastic); + group->addPause(50); + return ret; +} + +//helper function that creates an animation for opacity and inserts it into group +static void addGraphicsItemFadeoutAnimation(QAnimationGroup *group, QGraphicsItem *item) +{ +#if QT_VERSION >=0x040500 + CustomPropertyAnimation *anim = new CustomPropertyAnimation(group); + anim->setMemberFunctions(item, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); + anim->setDuration(800); + anim->setEndValue(0); + anim->setEasingCurve(QEasingCurve::OutQuad); +#else + // work around for a bug where we don't transition if the duration is zero. + QtPauseAnimation *anim = new QtPauseAnimation(group); + anim->setDuration(1); +#endif +} + +GraphicsScene::GraphicsScene(int x, int y, int width, int height, Mode mode) + : QGraphicsScene(x,y,width,height), mode(mode), newAction(0), quitAction(0), boat(0) +{ + backgroundItem = new PixmapItem(QString("background"),mode); + backgroundItem->setZValue(1); + backgroundItem->setPos(0,0); + addItem(backgroundItem); + + PixmapItem *surfaceItem = new PixmapItem(QString("surface"),mode); + surfaceItem->setZValue(3); + surfaceItem->setPos(0,sealLevel() - surfaceItem->boundingRect().height()/2); + addItem(surfaceItem); + + //The item that display score and level + progressItem = new ProgressItem(backgroundItem); + + //We create the boat + boat = new Boat(); + addItem(boat); + boat->setPos(this->width()/2, sealLevel() - boat->size().height()); + boat->hide(); + + //parse the xml that contain all data of the game + QXmlStreamReader reader; + QFile file(":data.xml"); + file.open(QIODevice::ReadOnly); + reader.setDevice(&file); + LevelDescription currentLevel; + while (!reader.atEnd()) { + reader.readNext(); + if (reader.tokenType() == QXmlStreamReader::StartElement) { + if (reader.name() == "submarine") + { + SubmarineDescription desc; + desc.name = reader.attributes().value("name").toString(); + desc.points = reader.attributes().value("points").toString().toInt(); + desc.type = reader.attributes().value("type").toString().toInt(); + submarinesData.append(desc); + } + if (reader.name() == "level") + { + currentLevel.id = reader.attributes().value("id").toString().toInt(); + currentLevel.name = reader.attributes().value("name").toString(); + } + if (reader.name() == "subinstance") + { + currentLevel.submarines.append(qMakePair(reader.attributes().value("type").toString().toInt(),reader.attributes().value("nb").toString().toInt())); + } + } + if (reader.tokenType() == QXmlStreamReader::EndElement) { + if (reader.name() == "level") + { + levelsData.insert(currentLevel.id,currentLevel); + currentLevel.submarines.clear(); + } + } + } +} + +qreal GraphicsScene::sealLevel() const +{ + if (mode == Big) + return 220; + else + return 160; +} + +void GraphicsScene::setupScene(const QList &actions) +{ + newAction = actions.at(0); + quitAction = actions.at(1); + + QGraphicsItem *logo_s = addWelcomeItem(QPixmap(":/logo-s")); + QGraphicsItem *logo_u = addWelcomeItem(QPixmap(":/logo-u")); + QGraphicsItem *logo_b = addWelcomeItem(QPixmap(":/logo-b")); + QGraphicsItem *logo_dash = addWelcomeItem(QPixmap(":/logo-dash")); + QGraphicsItem *logo_a = addWelcomeItem(QPixmap(":/logo-a")); + QGraphicsItem *logo_t = addWelcomeItem(QPixmap(":/logo-t")); + QGraphicsItem *logo_t2 = addWelcomeItem(QPixmap(":/logo-t2")); + QGraphicsItem *logo_a2 = addWelcomeItem(QPixmap(":/logo-a2")); + QGraphicsItem *logo_q = addWelcomeItem(QPixmap(":/logo-q")); + QGraphicsItem *logo_excl = addWelcomeItem(QPixmap(":/logo-excl")); + logo_s->setZValue(3); + logo_u->setZValue(4); + logo_b->setZValue(5); + logo_dash->setZValue(6); + logo_a->setZValue(7); + logo_t->setZValue(8); + logo_t2->setZValue(9); + logo_a2->setZValue(10); + logo_q->setZValue(11); + logo_excl->setZValue(12); + logo_s->setPos(QPointF(-1000, -1000)); + logo_u->setPos(QPointF(-800, -1000)); + logo_b->setPos(QPointF(-600, -1000)); + logo_dash->setPos(QPointF(-400, -1000)); + logo_a->setPos(QPointF(1000, 2000)); + logo_t->setPos(QPointF(800, 2000)); + logo_t2->setPos(QPointF(600, 2000)); + logo_a2->setPos(QPointF(400, 2000)); + logo_q->setPos(QPointF(200, 2000)); + logo_excl->setPos(QPointF(0, 2000)); + + QSequentialAnimationGroup * lettersGroupMoving = new QSequentialAnimationGroup(this); + QParallelAnimationGroup * lettersGroupFading = new QParallelAnimationGroup(this); + + //creation of the animations for moving letters + addGraphicsItemPosAnimation(lettersGroupMoving, logo_s, QPointF(300, 150)); + addGraphicsItemPosAnimation(lettersGroupMoving, logo_u, QPointF(350, 150)); + addGraphicsItemPosAnimation(lettersGroupMoving, logo_b, QPointF(400, 120)); + addGraphicsItemPosAnimation(lettersGroupMoving, logo_dash, QPointF(460, 150)); + addGraphicsItemPosAnimation(lettersGroupMoving, logo_a, QPointF(350, 250)); + addGraphicsItemPosAnimation(lettersGroupMoving, logo_t, QPointF(400, 250)); + addGraphicsItemPosAnimation(lettersGroupMoving, logo_t2, QPointF(430, 250)); + addGraphicsItemPosAnimation(lettersGroupMoving, logo_a2, QPointF(465, 250)); + addGraphicsItemPosAnimation(lettersGroupMoving, logo_q, QPointF(510, 250)); + addGraphicsItemPosAnimation(lettersGroupMoving, logo_excl, QPointF(570, 220)); + + //creation of the animations for fading out the letters + addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_s); + addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_u); + addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_b); + addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_dash); + addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_a); + addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_t); + addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_t2); + addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_a2); + addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_q); + addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_excl); + connect(lettersGroupFading, SIGNAL(finished()), this, SLOT(onIntroAnimationFinished())); + + QStateMachine *machine = new QStateMachine(this); + + //This state is when the player is playing + PlayState *gameState = new PlayState(this,machine); + + //Final state + QFinalState *final = new QFinalState(machine); + + //Animation when the player enter in the game + QAnimationState *lettersMovingState = new QAnimationState(machine); + lettersMovingState->setAnimation(lettersGroupMoving); + + //Animation when the welcome screen disappear + QAnimationState *lettersFadingState = new QAnimationState(machine); + lettersFadingState->setAnimation(lettersGroupFading); + + //if new game then we fade out the welcome screen and start playing + lettersMovingState->addTransition(newAction, SIGNAL(triggered()),lettersFadingState); + lettersFadingState->addTransition(lettersFadingState, SIGNAL(animationFinished()),gameState); + + //New Game is triggered then player start playing + gameState->addTransition(newAction, SIGNAL(triggered()),gameState); + + //Wanna quit, then connect to CTRL+Q + gameState->addTransition(quitAction, SIGNAL(triggered()),final); + lettersMovingState->addTransition(quitAction, SIGNAL(triggered()),final); + + //Welcome screen is the initial state + machine->setInitialState(lettersMovingState); + + machine->start(); + + //We reach the final state, then we quit + connect(machine,SIGNAL(finished()),this, SLOT(onQuitGameTriggered())); +} + +void GraphicsScene::addItem(Bomb *bomb) +{ + bombs.insert(bomb); + connect(bomb,SIGNAL(bombExecutionFinished()),this, SLOT(onBombExecutionFinished())); + QGraphicsScene::addItem(bomb); +} + +void GraphicsScene::addItem(Torpedo *torpedo) +{ + torpedos.insert(torpedo); + connect(torpedo,SIGNAL(torpedoExecutionFinished()),this, SLOT(onTorpedoExecutionFinished())); + QGraphicsScene::addItem(torpedo); +} + +void GraphicsScene::addItem(SubMarine *submarine) +{ + submarines.insert(submarine); + connect(submarine,SIGNAL(subMarineExecutionFinished()),this, SLOT(onSubMarineExecutionFinished())); + QGraphicsScene::addItem(submarine); +} + +void GraphicsScene::addItem(QGraphicsItem *item) +{ + QGraphicsScene::addItem(item); +} + +void GraphicsScene::mousePressEvent (QGraphicsSceneMouseEvent * event) +{ + event->ignore(); +} + +void GraphicsScene::onQuitGameTriggered() +{ + qApp->closeAllWindows(); +} + +void GraphicsScene::onBombExecutionFinished() +{ + Bomb *bomb = qobject_cast(sender()); + bombs.remove(bomb); + bomb->deleteLater(); + if (boat) + boat->setBombsLaunched(boat->bombsLaunched() - 1); +} + +void GraphicsScene::onTorpedoExecutionFinished() +{ + Torpedo *torpedo = qobject_cast(sender()); + torpedos.remove(torpedo); + torpedo->deleteLater(); +} + +void GraphicsScene::onSubMarineExecutionFinished() +{ + SubMarine *submarine = qobject_cast(sender()); + submarines.remove(submarine); + if (submarines.count() == 0) { + emit allSubMarineDestroyed(submarine->points()); + } else { + emit subMarineDestroyed(submarine->points()); + } + submarine->deleteLater(); +} + +int GraphicsScene::remainingSubMarines() const +{ + return submarines.count(); +} + +void GraphicsScene::clearScene() +{ + foreach (SubMarine *sub,submarines) { + sub->destroy(); + sub->deleteLater(); + } + + foreach (Torpedo *torpedo,torpedos) { + torpedo->destroy(); + torpedo->deleteLater(); + } + + foreach (Bomb *bomb,bombs) { + bomb->destroy(); + bomb->deleteLater(); + } + + submarines.clear(); + bombs.clear(); + torpedos.clear(); + + AnimationManager::self()->unregisterAllAnimations(); + + boat->stop(); + boat->hide(); +} + +QGraphicsPixmapItem *GraphicsScene::addWelcomeItem(const QPixmap &pm) +{ + QGraphicsPixmapItem *item = addPixmap(pm); + welcomeItems << item; + return item; +} + +void GraphicsScene::onIntroAnimationFinished() +{ + qDeleteAll(welcomeItems); + welcomeItems.clear(); +} + diff --git a/demos/sub-attaq/graphicsscene.h b/demos/sub-attaq/graphicsscene.h new file mode 100644 index 000000000..068ee97ef --- /dev/null +++ b/demos/sub-attaq/graphicsscene.h @@ -0,0 +1,131 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef __GRAPHICSSCENE__H__ +#define __GRAPHICSSCENE__H__ + +//Qt +#include +#include +#include + + +class Boat; +class SubMarine; +class Torpedo; +class Bomb; +class PixmapItem; +class ProgressItem; +QT_BEGIN_NAMESPACE +class QAction; +QT_END_NAMESPACE + +class GraphicsScene : public QGraphicsScene +{ +Q_OBJECT +public: + enum Mode { + Big = 0, + Small + }; + + struct SubmarineDescription { + int type; + int points; + QString name; + }; + + struct LevelDescription { + int id; + QString name; + QList > submarines; + }; + + GraphicsScene(int x, int y, int width, int height, Mode mode = Big); + qreal sealLevel() const; + void setupScene(const QList &actions); + void addItem(Bomb *bomb); + void addItem(Torpedo *torpedo); + void addItem(SubMarine *submarine); + void addItem(QGraphicsItem *item); + int remainingSubMarines() const; + void clearScene(); + QGraphicsPixmapItem *addWelcomeItem(const QPixmap &pm); + +signals: + void subMarineDestroyed(int); + void allSubMarineDestroyed(int); + +protected: + void mousePressEvent (QGraphicsSceneMouseEvent * event); + +private slots: + void onQuitGameTriggered(); + void onBombExecutionFinished(); + void onTorpedoExecutionFinished(); + void onSubMarineExecutionFinished(); + void onIntroAnimationFinished(); + +private: + Mode mode; + PixmapItem *backgroundItem; + ProgressItem *progressItem; + QAction * newAction; + QAction * quitAction; + Boat *boat; + QSet submarines; + QSet bombs; + QSet torpedos; + QVector welcomeItems; + QVector submarinesData; + QHash levelsData; + + friend class PauseState; + friend class PlayState; + friend class LevelState; + friend class LostState; + friend class WinState; + friend class WinTransition; + friend class UpdateScoreTransition; +}; + +#endif //__GRAPHICSSCENE__H__ + diff --git a/demos/sub-attaq/main.cpp b/demos/sub-attaq/main.cpp new file mode 100644 index 000000000..4f6f4f96e --- /dev/null +++ b/demos/sub-attaq/main.cpp @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#include "mainwindow.h" + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + Q_INIT_RESOURCE(subattaq); + + qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); + + MainWindow w; + w.show(); + + return app.exec(); +} diff --git a/demos/sub-attaq/mainwindow.cpp b/demos/sub-attaq/mainwindow.cpp new file mode 100644 index 000000000..bcccd344f --- /dev/null +++ b/demos/sub-attaq/mainwindow.cpp @@ -0,0 +1,97 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//Own +#include "mainwindow.h" +#include "graphicsscene.h" + +//Qt +#include + +#ifdef QT_NO_OPENGL + #include + #include + #include +#else + #include +#endif + +MainWindow::MainWindow() : QMainWindow(0) +{ + QMenuBar *menuBar = new QMenuBar; + QMenu *file = new QMenu(tr("&File"),menuBar); + + QAction *newAction = new QAction(tr("New Game"),file); + newAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_N)); + file->addAction(newAction); + QAction *quitAction = new QAction(tr("Quit"),file); + quitAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Q)); + file->addAction(quitAction); + + menuBar->addMenu(file); + setMenuBar(menuBar); + + QStringList list = QApplication::arguments(); + if (list.contains("-fullscreen")) { + scene = new GraphicsScene(0, 0, 750, 400,GraphicsScene::Small); + setWindowState(Qt::WindowFullScreen); + } else { + scene = new GraphicsScene(0, 0, 880, 630); + layout()->setSizeConstraint(QLayout::SetFixedSize); + } + + view = new QGraphicsView(scene,this); + view->setAlignment(Qt::AlignLeft | Qt::AlignTop); + QList actions; + actions << newAction << quitAction; + scene->setupScene(actions); +#ifndef QT_NO_OPENGL + view->setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers))); +#endif + + setCentralWidget(view); + +} + +MainWindow::~MainWindow() +{ +} + diff --git a/demos/sub-attaq/mainwindow.h b/demos/sub-attaq/mainwindow.h new file mode 100644 index 000000000..08cfcd988 --- /dev/null +++ b/demos/sub-attaq/mainwindow.h @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef __MAINWINDOW__H__ +#define __MAINWINDOW__H__ + +//Qt +#include +class GraphicsScene; +QT_BEGIN_NAMESPACE +class QGraphicsView; +QT_END_NAMESPACE + +class MainWindow : public QMainWindow +{ +Q_OBJECT +public: + MainWindow(); + ~MainWindow(); + +private: + GraphicsScene *scene; + QGraphicsView *view; +}; + +#endif //__MAINWINDOW__H__ diff --git a/demos/sub-attaq/pics/big/background.png b/demos/sub-attaq/pics/big/background.png new file mode 100644 index 000000000..9f581571f Binary files /dev/null and b/demos/sub-attaq/pics/big/background.png differ diff --git a/demos/sub-attaq/pics/big/boat.png b/demos/sub-attaq/pics/big/boat.png new file mode 100644 index 000000000..be82dff62 Binary files /dev/null and b/demos/sub-attaq/pics/big/boat.png differ diff --git a/demos/sub-attaq/pics/big/bomb.png b/demos/sub-attaq/pics/big/bomb.png new file mode 100644 index 000000000..3af5f2f29 Binary files /dev/null and b/demos/sub-attaq/pics/big/bomb.png differ diff --git a/demos/sub-attaq/pics/big/explosion/boat/step1.png b/demos/sub-attaq/pics/big/explosion/boat/step1.png new file mode 100644 index 000000000..c9fd8b098 Binary files /dev/null and b/demos/sub-attaq/pics/big/explosion/boat/step1.png differ diff --git a/demos/sub-attaq/pics/big/explosion/boat/step2.png b/demos/sub-attaq/pics/big/explosion/boat/step2.png new file mode 100644 index 000000000..7528f2d2d Binary files /dev/null and b/demos/sub-attaq/pics/big/explosion/boat/step2.png differ diff --git a/demos/sub-attaq/pics/big/explosion/boat/step3.png b/demos/sub-attaq/pics/big/explosion/boat/step3.png new file mode 100644 index 000000000..aae9c9c18 Binary files /dev/null and b/demos/sub-attaq/pics/big/explosion/boat/step3.png differ diff --git a/demos/sub-attaq/pics/big/explosion/boat/step4.png b/demos/sub-attaq/pics/big/explosion/boat/step4.png new file mode 100644 index 000000000..d697c1bae Binary files /dev/null and b/demos/sub-attaq/pics/big/explosion/boat/step4.png differ diff --git a/demos/sub-attaq/pics/big/explosion/submarine/step1.png b/demos/sub-attaq/pics/big/explosion/submarine/step1.png new file mode 100644 index 000000000..88ca5144b Binary files /dev/null and b/demos/sub-attaq/pics/big/explosion/submarine/step1.png differ diff --git a/demos/sub-attaq/pics/big/explosion/submarine/step2.png b/demos/sub-attaq/pics/big/explosion/submarine/step2.png new file mode 100644 index 000000000..524f5890e Binary files /dev/null and b/demos/sub-attaq/pics/big/explosion/submarine/step2.png differ diff --git a/demos/sub-attaq/pics/big/explosion/submarine/step3.png b/demos/sub-attaq/pics/big/explosion/submarine/step3.png new file mode 100644 index 000000000..2cca1e80f Binary files /dev/null and b/demos/sub-attaq/pics/big/explosion/submarine/step3.png differ diff --git a/demos/sub-attaq/pics/big/explosion/submarine/step4.png b/demos/sub-attaq/pics/big/explosion/submarine/step4.png new file mode 100644 index 000000000..82100a826 Binary files /dev/null and b/demos/sub-attaq/pics/big/explosion/submarine/step4.png differ diff --git a/demos/sub-attaq/pics/big/submarine.png b/demos/sub-attaq/pics/big/submarine.png new file mode 100644 index 000000000..df435dc47 Binary files /dev/null and b/demos/sub-attaq/pics/big/submarine.png differ diff --git a/demos/sub-attaq/pics/big/surface.png b/demos/sub-attaq/pics/big/surface.png new file mode 100644 index 000000000..4eba29e9c Binary files /dev/null and b/demos/sub-attaq/pics/big/surface.png differ diff --git a/demos/sub-attaq/pics/big/torpedo.png b/demos/sub-attaq/pics/big/torpedo.png new file mode 100644 index 000000000..f9c26873f Binary files /dev/null and b/demos/sub-attaq/pics/big/torpedo.png differ diff --git a/demos/sub-attaq/pics/scalable/background-n810.svg b/demos/sub-attaq/pics/scalable/background-n810.svg new file mode 100644 index 000000000..ece9f7aaf --- /dev/null +++ b/demos/sub-attaq/pics/scalable/background-n810.svg @@ -0,0 +1,171 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/sub-attaq/pics/scalable/background.svg b/demos/sub-attaq/pics/scalable/background.svg new file mode 100644 index 000000000..0be268010 --- /dev/null +++ b/demos/sub-attaq/pics/scalable/background.svg @@ -0,0 +1,171 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/sub-attaq/pics/scalable/boat.svg b/demos/sub-attaq/pics/scalable/boat.svg new file mode 100644 index 000000000..5298821ba --- /dev/null +++ b/demos/sub-attaq/pics/scalable/boat.svg @@ -0,0 +1,279 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/sub-attaq/pics/scalable/bomb.svg b/demos/sub-attaq/pics/scalable/bomb.svg new file mode 100644 index 000000000..294771a6d --- /dev/null +++ b/demos/sub-attaq/pics/scalable/bomb.svg @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/sub-attaq/pics/scalable/sand.svg b/demos/sub-attaq/pics/scalable/sand.svg new file mode 100644 index 000000000..8af11b7a6 --- /dev/null +++ b/demos/sub-attaq/pics/scalable/sand.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/sub-attaq/pics/scalable/see.svg b/demos/sub-attaq/pics/scalable/see.svg new file mode 100644 index 000000000..066669121 --- /dev/null +++ b/demos/sub-attaq/pics/scalable/see.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + diff --git a/demos/sub-attaq/pics/scalable/sky.svg b/demos/sub-attaq/pics/scalable/sky.svg new file mode 100644 index 000000000..1546c087a --- /dev/null +++ b/demos/sub-attaq/pics/scalable/sky.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + diff --git a/demos/sub-attaq/pics/scalable/sub-attaq.svg b/demos/sub-attaq/pics/scalable/sub-attaq.svg new file mode 100644 index 000000000..b075179b4 --- /dev/null +++ b/demos/sub-attaq/pics/scalable/sub-attaq.svg @@ -0,0 +1,1473 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/sub-attaq/pics/scalable/submarine.svg b/demos/sub-attaq/pics/scalable/submarine.svg new file mode 100644 index 000000000..8a0ffddbc --- /dev/null +++ b/demos/sub-attaq/pics/scalable/submarine.svg @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/sub-attaq/pics/scalable/surface.svg b/demos/sub-attaq/pics/scalable/surface.svg new file mode 100644 index 000000000..40ed23963 --- /dev/null +++ b/demos/sub-attaq/pics/scalable/surface.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + diff --git a/demos/sub-attaq/pics/scalable/torpedo.svg b/demos/sub-attaq/pics/scalable/torpedo.svg new file mode 100644 index 000000000..48e429d2b --- /dev/null +++ b/demos/sub-attaq/pics/scalable/torpedo.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/sub-attaq/pics/small/background.png b/demos/sub-attaq/pics/small/background.png new file mode 100644 index 000000000..5ad3db660 Binary files /dev/null and b/demos/sub-attaq/pics/small/background.png differ diff --git a/demos/sub-attaq/pics/small/boat.png b/demos/sub-attaq/pics/small/boat.png new file mode 100644 index 000000000..114ccc310 Binary files /dev/null and b/demos/sub-attaq/pics/small/boat.png differ diff --git a/demos/sub-attaq/pics/small/bomb.png b/demos/sub-attaq/pics/small/bomb.png new file mode 100644 index 000000000..3af5f2f29 Binary files /dev/null and b/demos/sub-attaq/pics/small/bomb.png differ diff --git a/demos/sub-attaq/pics/small/submarine.png b/demos/sub-attaq/pics/small/submarine.png new file mode 100644 index 000000000..0c0c35060 Binary files /dev/null and b/demos/sub-attaq/pics/small/submarine.png differ diff --git a/demos/sub-attaq/pics/small/surface.png b/demos/sub-attaq/pics/small/surface.png new file mode 100644 index 000000000..06d0e47a5 Binary files /dev/null and b/demos/sub-attaq/pics/small/surface.png differ diff --git a/demos/sub-attaq/pics/small/torpedo.png b/demos/sub-attaq/pics/small/torpedo.png new file mode 100644 index 000000000..f9c26873f Binary files /dev/null and b/demos/sub-attaq/pics/small/torpedo.png differ diff --git a/demos/sub-attaq/pics/welcome/logo-a.png b/demos/sub-attaq/pics/welcome/logo-a.png new file mode 100644 index 000000000..67dd76dac Binary files /dev/null and b/demos/sub-attaq/pics/welcome/logo-a.png differ diff --git a/demos/sub-attaq/pics/welcome/logo-a2.png b/demos/sub-attaq/pics/welcome/logo-a2.png new file mode 100644 index 000000000..17668b07d Binary files /dev/null and b/demos/sub-attaq/pics/welcome/logo-a2.png differ diff --git a/demos/sub-attaq/pics/welcome/logo-b.png b/demos/sub-attaq/pics/welcome/logo-b.png new file mode 100644 index 000000000..cf6c04560 Binary files /dev/null and b/demos/sub-attaq/pics/welcome/logo-b.png differ diff --git a/demos/sub-attaq/pics/welcome/logo-dash.png b/demos/sub-attaq/pics/welcome/logo-dash.png new file mode 100644 index 000000000..219233ce6 Binary files /dev/null and b/demos/sub-attaq/pics/welcome/logo-dash.png differ diff --git a/demos/sub-attaq/pics/welcome/logo-excl.png b/demos/sub-attaq/pics/welcome/logo-excl.png new file mode 100644 index 000000000..8dd0a2eb8 Binary files /dev/null and b/demos/sub-attaq/pics/welcome/logo-excl.png differ diff --git a/demos/sub-attaq/pics/welcome/logo-q.png b/demos/sub-attaq/pics/welcome/logo-q.png new file mode 100644 index 000000000..86e588d4d Binary files /dev/null and b/demos/sub-attaq/pics/welcome/logo-q.png differ diff --git a/demos/sub-attaq/pics/welcome/logo-s.png b/demos/sub-attaq/pics/welcome/logo-s.png new file mode 100644 index 000000000..7b6a36e93 Binary files /dev/null and b/demos/sub-attaq/pics/welcome/logo-s.png differ diff --git a/demos/sub-attaq/pics/welcome/logo-t.png b/demos/sub-attaq/pics/welcome/logo-t.png new file mode 100644 index 000000000..b2e3526be Binary files /dev/null and b/demos/sub-attaq/pics/welcome/logo-t.png differ diff --git a/demos/sub-attaq/pics/welcome/logo-t2.png b/demos/sub-attaq/pics/welcome/logo-t2.png new file mode 100644 index 000000000..b11a77886 Binary files /dev/null and b/demos/sub-attaq/pics/welcome/logo-t2.png differ diff --git a/demos/sub-attaq/pics/welcome/logo-u.png b/demos/sub-attaq/pics/welcome/logo-u.png new file mode 100644 index 000000000..24eede887 Binary files /dev/null and b/demos/sub-attaq/pics/welcome/logo-u.png differ diff --git a/demos/sub-attaq/pixmapitem.cpp b/demos/sub-attaq/pixmapitem.cpp new file mode 100644 index 000000000..ed0f07552 --- /dev/null +++ b/demos/sub-attaq/pixmapitem.cpp @@ -0,0 +1,59 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//Own +#include "pixmapitem.h" + +//Qt +#include + +PixmapItem::PixmapItem(const QString &fileName,GraphicsScene::Mode mode, QGraphicsItem * parent) : QGraphicsPixmapItem(parent),name(fileName) +{ + loadPixmap(mode); +} + +void PixmapItem::loadPixmap(GraphicsScene::Mode mode) +{ + if (mode == GraphicsScene::Big) + setPixmap(":/big/" + name); + else + setPixmap(":/small/" + name); +} diff --git a/demos/sub-attaq/pixmapitem.h b/demos/sub-attaq/pixmapitem.h new file mode 100644 index 000000000..e32973e1d --- /dev/null +++ b/demos/sub-attaq/pixmapitem.h @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef __PIXMAPITEM__H__ +#define __PIXMAPITEM__H__ + +//Own +#include "graphicsscene.h" + +//Qt +#include + +class PixmapItem : public QGraphicsPixmapItem +{ +public: + PixmapItem(const QString &fileName, GraphicsScene::Mode mode, QGraphicsItem * parent = 0); + +private: + void loadPixmap(GraphicsScene::Mode mode); + + QString name; + QPixmap pixmap; +}; + +#endif //__PIXMAPITEM__H__ diff --git a/demos/sub-attaq/progressitem.cpp b/demos/sub-attaq/progressitem.cpp new file mode 100644 index 000000000..9ccaa72d8 --- /dev/null +++ b/demos/sub-attaq/progressitem.cpp @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "progressitem.h" +#include "pixmapitem.h" + +ProgressItem::ProgressItem (QGraphicsItem * parent) + : QGraphicsTextItem(parent), currentLevel(1), currentScore(0) +{ + setFont(QFont("Comic Sans MS")); + setPos(parentItem()->boundingRect().topRight() - QPointF(180, -5)); +} + +void ProgressItem::setLevel(int level) +{ + currentLevel = level; + updateProgress(); +} + +void ProgressItem::setScore(int score) +{ + currentScore = score; + updateProgress(); +} + +void ProgressItem::updateProgress() +{ + setHtml(QString("Level : %1 Score : %2").arg(currentLevel).arg(currentScore)); +} diff --git a/demos/sub-attaq/progressitem.h b/demos/sub-attaq/progressitem.h new file mode 100644 index 000000000..7be57c9a2 --- /dev/null +++ b/demos/sub-attaq/progressitem.h @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef PROGRESSITEM_H +#define PROGRESSITEM_H + +//Qt +#include + +class ProgressItem : public QGraphicsTextItem +{ +public: + ProgressItem(QGraphicsItem * parent = 0); + void setLevel(int level); + void setScore(int score); + +private: + void updateProgress(); + int currentLevel; + int currentScore; +}; + +#endif // PROGRESSITEM_H diff --git a/demos/sub-attaq/qanimationstate.cpp b/demos/sub-attaq/qanimationstate.cpp new file mode 100644 index 000000000..4e6df565c --- /dev/null +++ b/demos/sub-attaq/qanimationstate.cpp @@ -0,0 +1,150 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qanimationstate.h" + +#include + +QT_BEGIN_NAMESPACE + +/*! +\class QAnimationState + +\brief The QAnimationState class provides state that handle an animation and emit +a signal when this animation is finished. + +\ingroup statemachine + +QAnimationState provides a state that handle an animation. It will start this animation +when the state is entered and stop it when it is leaved. When the animation has finished the +state emit animationFinished signal. +QAnimationState is part of \l{The State Machine Framework}. + +\code +QStateMachine machine; +QAnimationState *s = new QAnimationState(machine->rootState()); +QPropertyAnimation *animation = new QPropertyAnimation(obj, "pos"); +s->setAnimation(animation); +QState *s2 = new QState(machine->rootState()); +s->addTransition(s, SIGNAL(animationFinished()), s2); +machine.start(); +\endcode + +\sa QState, {The Animation Framework} +*/ + + +#ifndef QT_NO_ANIMATION + +/*! + Constructs a new state with the given \a parent state. +*/ +QAnimationState::QAnimationState(QState *parent) + : QState(parent), m_animation(0) +{ +} + +/*! + Destroys the animation state. +*/ +QAnimationState::~QAnimationState() +{ +} + +/*! + Set an \a animation for this QAnimationState. If an animation was previously handle by this + state then it won't emit animationFinished for the old animation. The QAnimationState doesn't + take the ownership of the animation. +*/ +void QAnimationState::setAnimation(QAbstractAnimation *animation) +{ + if (animation == m_animation) + return; + + //Disconnect from the previous animation if exist + if(m_animation) + disconnect(m_animation, SIGNAL(finished()), this, SIGNAL(animationFinished())); + + m_animation = animation; + + if (m_animation) { + //connect the new animation + connect(m_animation, SIGNAL(finished()), this, SIGNAL(animationFinished())); + } +} + +/*! + Returns the animation handle by this animation state, or 0 if there is no animation. +*/ +QAbstractAnimation* QAnimationState::animation() const +{ + return m_animation; +} + +/*! + \reimp +*/ +void QAnimationState::onEntry(QEvent *) +{ + if (m_animation) + m_animation->start(); +} + +/*! + \reimp +*/ +void QAnimationState::onExit(QEvent *) +{ + if (m_animation) + m_animation->stop(); +} + +/*! + \reimp +*/ +bool QAnimationState::event(QEvent *e) +{ + return QState::event(e); +} + +QT_END_NAMESPACE + +#endif diff --git a/demos/sub-attaq/qanimationstate.h b/demos/sub-attaq/qanimationstate.h new file mode 100644 index 000000000..6c5b565f8 --- /dev/null +++ b/demos/sub-attaq/qanimationstate.h @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QANIMATIONSTATE_H +#define QANIMATIONSTATE_H + +#ifndef QT_STATEMACHINE_SOLUTION +# include +# include +#else +# include "qstate.h" +# include "qabstractanimation.h" +#endif + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + +#ifndef QT_NO_ANIMATION + +class QAbstractAnimation; + +class QAnimationState : public QState +{ + Q_OBJECT +public: + QAnimationState(QState *parent = 0); + ~QAnimationState(); + + void setAnimation(QAbstractAnimation *animation); + QAbstractAnimation* animation() const; + +signals: + void animationFinished(); + +protected: + void onEntry(QEvent *); + void onExit(QEvent *); + bool event(QEvent *e); + +private: + Q_DISABLE_COPY(QAnimationState) + QAbstractAnimation *m_animation; +}; + +#endif + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QANIMATIONSTATE_H diff --git a/demos/sub-attaq/states.cpp b/demos/sub-attaq/states.cpp new file mode 100644 index 000000000..d63737f52 --- /dev/null +++ b/demos/sub-attaq/states.cpp @@ -0,0 +1,325 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//Own +#include "states.h" +#include "graphicsscene.h" +#include "boat.h" +#include "submarine.h" +#include "torpedo.h" +#include "animationmanager.h" +#include "progressitem.h" + +//Qt +#include +#include +#include +#include +#include +#include + +PlayState::PlayState(GraphicsScene *scene, QState *parent) + : QState(parent), + scene(scene), + machine(0), + currentLevel(0), + score(0) +{ +} + +PlayState::~PlayState() +{ +} + +void PlayState::onEntry(QEvent *) +{ + //We are now playing? + if (machine) { + machine->stop(); + scene->clearScene(); + currentLevel = 0; + score = 0; + delete machine; + } + + machine = new QStateMachine(this); + + //This state is when player is playing + LevelState *levelState = new LevelState(scene, this, machine); + + //This state is when the player is actually playing but the game is not paused + QState *playingState = new QState(levelState); + levelState->setInitialState(playingState); + + //This state is when the game is paused + PauseState *pauseState = new PauseState(scene, levelState); + + //We have one view, it receive the key press event + QKeyEventTransition *pressPplay = new QKeyEventTransition(scene->views().at(0), QEvent::KeyPress, Qt::Key_P); + pressPplay->setTargetState(pauseState); + QKeyEventTransition *pressPpause = new QKeyEventTransition(scene->views().at(0), QEvent::KeyPress, Qt::Key_P); + pressPpause->setTargetState(playingState); + + //Pause "P" is triggered, the player pause the game + playingState->addTransition(pressPplay); + + //To get back playing when the game has been paused + pauseState->addTransition(pressPpause); + + //This state is when player have lost + LostState *lostState = new LostState(scene, this, machine); + + //This state is when player have won + WinState *winState = new WinState(scene, this, machine); + + //The boat has been destroyed then the game is finished + levelState->addTransition(scene->boat, SIGNAL(boatExecutionFinished()),lostState); + + //This transition check if we won or not + WinTransition *winTransition = new WinTransition(scene, this, winState); + + //The boat has been destroyed then the game is finished + levelState->addTransition(winTransition); + + //This state is an animation when the score changed + UpdateScoreState *scoreState = new UpdateScoreState(this, levelState); + + //This transition update the score when a submarine die + UpdateScoreTransition *scoreTransition = new UpdateScoreTransition(scene, this, levelState); + scoreTransition->setTargetState(scoreState); + + //The boat has been destroyed then the game is finished + playingState->addTransition(scoreTransition); + + //We go back to play state + scoreState->addTransition(playingState); + + //We start playing!!! + machine->setInitialState(levelState); + + //Final state + QFinalState *final = new QFinalState(machine); + + //This transition is triggered when the player press space after completing a level + CustomSpaceTransition *spaceTransition = new CustomSpaceTransition(scene->views().at(0), this, QEvent::KeyPress, Qt::Key_Space); + spaceTransition->setTargetState(levelState); + winState->addTransition(spaceTransition); + + //We lost we should reach the final state + lostState->addTransition(lostState, SIGNAL(finished()), final); + + machine->start(); +} + +LevelState::LevelState(GraphicsScene *scene, PlayState *game, QState *parent) : QState(parent), scene(scene), game(game) +{ +} +void LevelState::onEntry(QEvent *) +{ + initializeLevel(); +} + +void LevelState::initializeLevel() +{ + //we re-init the boat + scene->boat->setPos(scene->width()/2, scene->sealLevel() - scene->boat->size().height()); + scene->boat->setCurrentSpeed(0); + scene->boat->setCurrentDirection(Boat::None); + scene->boat->setBombsLaunched(0); + scene->boat->show(); + scene->setFocusItem(scene->boat,Qt::OtherFocusReason); + scene->boat->run(); + + scene->progressItem->setScore(game->score); + scene->progressItem->setLevel(game->currentLevel + 1); + + GraphicsScene::LevelDescription currentLevelDescription = scene->levelsData.value(game->currentLevel); + + for (int i = 0; i < currentLevelDescription.submarines.size(); ++i ) { + + QPair subContent = currentLevelDescription.submarines.at(i); + GraphicsScene::SubmarineDescription submarineDesc = scene->submarinesData.at(subContent.first); + + for (int j = 0; j < subContent.second; ++j ) { + SubMarine *sub = new SubMarine(submarineDesc.type, submarineDesc.name, submarineDesc.points); + scene->addItem(sub); + int random = (qrand() % 15 + 1); + qreal x = random == 13 || random == 5 ? 0 : scene->width() - sub->size().width(); + qreal y = scene->height() -(qrand() % 150 + 1) - sub->size().height(); + sub->setPos(x,y); + sub->setCurrentDirection(x == 0 ? SubMarine::Right : SubMarine::Left); + sub->setCurrentSpeed(qrand() % 3 + 1); + } + } +} + +/** Pause State */ +PauseState::PauseState(GraphicsScene *scene, QState *parent) : QState(parent),scene(scene) +{ +} +void PauseState::onEntry(QEvent *) +{ + AnimationManager::self()->pauseAll(); + scene->boat->setEnabled(false); +} +void PauseState::onExit(QEvent *) +{ + AnimationManager::self()->resumeAll(); + scene->boat->setEnabled(true); + scene->boat->setFocus(); +} + +/** Lost State */ +LostState::LostState(GraphicsScene *scene, PlayState *game, QState *parent) : QState(parent), scene(scene), game(game) +{ +} + +void LostState::onEntry(QEvent *) +{ + //The message to display + QString message = QString("You lose on level %1. Your score is %2.").arg(game->currentLevel+1).arg(game->score); + + //We set the level back to 0 + game->currentLevel = 0; + + //We set the score back to 0 + game->score = 0; + + //We clear the scene + scene->clearScene(); + + //we have only one view + QMessageBox::information(scene->views().at(0),"You lose",message); +} + +/** Win State */ +WinState::WinState(GraphicsScene *scene, PlayState *game, QState *parent) : QState(parent), scene(scene), game(game) +{ +} + +void WinState::onEntry(QEvent *) +{ + //We clear the scene + scene->clearScene(); + + QString message; + if (scene->levelsData.size() - 1 != game->currentLevel) { + message = QString("You win the level %1. Your score is %2.\nPress Space to continue after closing this dialog.").arg(game->currentLevel+1).arg(game->score); + //We increment the level number + game->currentLevel++; + } else { + message = QString("You finish the game on level %1. Your score is %2.").arg(game->currentLevel+1).arg(game->score); + //We set the level back to 0 + game->currentLevel = 0; + //We set the score back to 0 + game->score = 0; + } + + //we have only one view + QMessageBox::information(scene->views().at(0),"You win",message); +} + +/** UpdateScore State */ +UpdateScoreState::UpdateScoreState(PlayState *game, QState *parent) : QState(parent) +{ + this->game = game; +} +void UpdateScoreState::onEntry(QEvent *e) +{ + QState::onEntry(e); +} + +/** Win transition */ +UpdateScoreTransition::UpdateScoreTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target) + : QSignalTransition(scene,SIGNAL(subMarineDestroyed(int)), QList() << target), + game(game), scene(scene) +{ +} + +bool UpdateScoreTransition::eventTest(QEvent *event) +{ + if (!QSignalTransition::eventTest(event)) + return false; + else { + QSignalEvent *se = static_cast(event); + game->score += se->arguments().at(0).toInt(); + scene->progressItem->setScore(game->score); + return true; + } +} + +/** Win transition */ +WinTransition::WinTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target) + : QSignalTransition(scene,SIGNAL(allSubMarineDestroyed(int)), QList() << target), + game(game), scene(scene) +{ +} + +bool WinTransition::eventTest(QEvent *event) +{ + if (!QSignalTransition::eventTest(event)) + return false; + else { + QSignalEvent *se = static_cast(event); + game->score += se->arguments().at(0).toInt(); + scene->progressItem->setScore(game->score); + return true; + } +} + +/** Space transition */ +CustomSpaceTransition::CustomSpaceTransition(QWidget *widget, PlayState *game, QEvent::Type type, int key) + : QKeyEventTransition(widget, type, key), + game(game) +{ +} + +bool CustomSpaceTransition::eventTest(QEvent *event) +{ + Q_UNUSED(event); + if (!QKeyEventTransition::eventTest(event)) + return false; + if (game->currentLevel != 0) + return true; + else + return false; + +} diff --git a/demos/sub-attaq/states.h b/demos/sub-attaq/states.h new file mode 100644 index 000000000..c3d81e7ab --- /dev/null +++ b/demos/sub-attaq/states.h @@ -0,0 +1,180 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef STATES_H +#define STATES_H + +//Qt +#include +#include +#include +#include +#include + +class GraphicsScene; +class Boat; +class SubMarine; +QT_BEGIN_NAMESPACE +class QStateMachine; +QT_END_NAMESPACE + +class PlayState : public QState +{ +public: + PlayState(GraphicsScene *scene, QState *parent = 0); + ~PlayState(); + + protected: + void onEntry(QEvent *); + +private : + GraphicsScene *scene; + QStateMachine *machine; + int currentLevel; + int score; + QState *parallelChild; + + friend class UpdateScoreState; + friend class UpdateScoreTransition; + friend class WinTransition; + friend class CustomSpaceTransition; + friend class WinState; + friend class LostState; + friend class LevelState; +}; + +class LevelState : public QState +{ +public: + LevelState(GraphicsScene *scene, PlayState *game, QState *parent = 0); +protected: + void onEntry(QEvent *); +private : + void initializeLevel(); + GraphicsScene *scene; + PlayState *game; +}; + +class PauseState : public QState +{ +public: + PauseState(GraphicsScene *scene, QState *parent = 0); + +protected: + void onEntry(QEvent *); + void onExit(QEvent *); +private : + GraphicsScene *scene; + Boat *boat; +}; + +class LostState : public QState +{ +public: + LostState(GraphicsScene *scene, PlayState *game, QState *parent = 0); + +protected: + void onEntry(QEvent *); +private : + GraphicsScene *scene; + PlayState *game; +}; + +class WinState : public QState +{ +public: + WinState(GraphicsScene *scene, PlayState *game, QState *parent = 0); + +protected: + void onEntry(QEvent *); +private : + GraphicsScene *scene; + PlayState *game; +}; + +class UpdateScoreState : public QState +{ +public: + UpdateScoreState(PlayState *game, QState *parent); +protected: + void onEntry(QEvent *); +private: + QPropertyAnimation *scoreAnimation; + PlayState *game; +}; + +//These transtion is used to update the score +class UpdateScoreTransition : public QSignalTransition +{ +public: + UpdateScoreTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target); +protected: + virtual bool eventTest(QEvent *event); +private: + PlayState * game; + GraphicsScene *scene; +}; + +//These transtion test if we have won the game +class WinTransition : public QSignalTransition +{ +public: + WinTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target); +protected: + virtual bool eventTest(QEvent *event); +private: + PlayState * game; + GraphicsScene *scene; +}; + +//These transtion is true if one level has been completed and the player want to continue + class CustomSpaceTransition : public QKeyEventTransition +{ +public: + CustomSpaceTransition(QWidget *widget, PlayState *game, QEvent::Type type, int key); +protected: + virtual bool eventTest(QEvent *event); +private: + PlayState *game; + int key; +}; + +#endif // STATES_H diff --git a/demos/sub-attaq/sub-attaq.pro b/demos/sub-attaq/sub-attaq.pro new file mode 100644 index 000000000..ad1327d50 --- /dev/null +++ b/demos/sub-attaq/sub-attaq.pro @@ -0,0 +1,37 @@ +contains(QT_CONFIG, opengl):QT += opengl + +HEADERS += boat.h \ + bomb.h \ + mainwindow.h \ + submarine.h \ + torpedo.h \ + pixmapitem.h \ + graphicsscene.h \ + animationmanager.h \ + states.h \ + boat_p.h \ + submarine_p.h \ + custompropertyanimation.h \ + qanimationstate.h \ + progressitem.h +SOURCES += boat.cpp \ + bomb.cpp \ + main.cpp \ + mainwindow.cpp \ + submarine.cpp \ + torpedo.cpp \ + pixmapitem.cpp \ + graphicsscene.cpp \ + animationmanager.cpp \ + states.cpp \ + custompropertyanimation.cpp \ + qanimationstate.cpp \ + progressitem.cpp +RESOURCES += subattaq.qrc + +# install +target.path = $$[QT_INSTALL_DEMOS]/animation/sub-attaq +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sub-attaq.pro pics +sources.path = $$[QT_INSTALL_DEMOS]/animation/sub-attaq +INSTALLS += target sources + diff --git a/demos/sub-attaq/subattaq.qrc b/demos/sub-attaq/subattaq.qrc new file mode 100644 index 000000000..80a3af11c --- /dev/null +++ b/demos/sub-attaq/subattaq.qrc @@ -0,0 +1,39 @@ + + + pics/scalable/sub-attaq.svg + pics/scalable/submarine.svg + pics/scalable/boat.svg + pics/scalable/torpedo.svg + pics/welcome/logo-s.png + pics/welcome/logo-u.png + pics/welcome/logo-b.png + pics/welcome/logo-dash.png + pics/welcome/logo-a.png + pics/welcome/logo-t.png + pics/welcome/logo-t2.png + pics/welcome/logo-a2.png + pics/welcome/logo-q.png + pics/welcome/logo-excl.png + pics/big/background.png + pics/big/boat.png + pics/big/bomb.png + pics/big/submarine.png + pics/big/surface.png + pics/big/torpedo.png + pics/small/background.png + pics/small/boat.png + pics/small/bomb.png + pics/small/submarine.png + pics/small/surface.png + pics/small/torpedo.png + pics/big/explosion/boat/step1.png + pics/big/explosion/boat/step2.png + pics/big/explosion/boat/step3.png + pics/big/explosion/boat/step4.png + pics/big/explosion/submarine/step1.png + pics/big/explosion/submarine/step2.png + pics/big/explosion/submarine/step3.png + pics/big/explosion/submarine/step4.png + data.xml + + diff --git a/demos/sub-attaq/submarine.cpp b/demos/sub-attaq/submarine.cpp new file mode 100644 index 000000000..78a953989 --- /dev/null +++ b/demos/sub-attaq/submarine.cpp @@ -0,0 +1,211 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//Own +#include "submarine.h" +#include "submarine_p.h" +#include "torpedo.h" +#include "pixmapitem.h" +#include "graphicsscene.h" +#include "animationmanager.h" +#include "custompropertyanimation.h" +#include "qanimationstate.h" + +#include +#include +#include +#include + +static QAbstractAnimation *setupDestroyAnimation(SubMarine *sub) +{ + QSequentialAnimationGroup *group = new QSequentialAnimationGroup(sub); +#if QT_VERSION >=0x040500 + PixmapItem *step1 = new PixmapItem(QString("explosion/submarine/step1"),GraphicsScene::Big, sub); + step1->setZValue(6); + PixmapItem *step2 = new PixmapItem(QString("explosion/submarine/step2"),GraphicsScene::Big, sub); + step2->setZValue(6); + PixmapItem *step3 = new PixmapItem(QString("explosion/submarine/step3"),GraphicsScene::Big, sub); + step3->setZValue(6); + PixmapItem *step4 = new PixmapItem(QString("explosion/submarine/step4"),GraphicsScene::Big, sub); + step4->setZValue(6); + step1->setOpacity(0); + step2->setOpacity(0); + step3->setOpacity(0); + step4->setOpacity(0); + CustomPropertyAnimation *anim1 = new CustomPropertyAnimation(sub); + anim1->setMemberFunctions((QGraphicsItem*)step1, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); + anim1->setDuration(100); + anim1->setEndValue(1); + CustomPropertyAnimation *anim2 = new CustomPropertyAnimation(sub); + anim2->setMemberFunctions((QGraphicsItem*)step2, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); + anim2->setDuration(100); + anim2->setEndValue(1); + CustomPropertyAnimation *anim3 = new CustomPropertyAnimation(sub); + anim3->setMemberFunctions((QGraphicsItem*)step3, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); + anim3->setDuration(100); + anim3->setEndValue(1); + CustomPropertyAnimation *anim4 = new CustomPropertyAnimation(sub); + anim4->setMemberFunctions((QGraphicsItem*)step4, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); + anim4->setDuration(100); + anim4->setEndValue(1); + group->addAnimation(anim1); + group->addAnimation(anim2); + group->addAnimation(anim3); + group->addAnimation(anim4); +#else + // work around for a bug where we don't transition if the duration is zero. + QtPauseAnimation *anim = new QtPauseAnimation(group); + anim->setDuration(1); + group->addAnimation(anim); +#endif + AnimationManager::self()->registerAnimation(group); + return group; +} + + +SubMarine::SubMarine(int type, const QString &name, int points, QGraphicsItem * parent, Qt::WindowFlags wFlags) + : QGraphicsWidget(parent,wFlags), subType(type), subName(name), subPoints(points), speed(0), direction(SubMarine::None) +{ + pixmapItem = new PixmapItem(QString("submarine"),GraphicsScene::Big, this); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + setZValue(5); + setFlags(QGraphicsItem::ItemIsMovable); + resize(pixmapItem->boundingRect().width(),pixmapItem->boundingRect().height()); + setTransformOrigin(boundingRect().center()); + + //We setup the state machine of the submarine + QStateMachine *machine = new QStateMachine(this); + + //This state is when the boat is moving/rotating + QState *moving = new QState(machine); + + //This state is when the boat is moving from left to right + MovementState *movement = new MovementState(this, moving); + + //This state is when the boat is moving from left to right + ReturnState *rotation = new ReturnState(this, moving); + + //This is the initial state of the moving root state + moving->setInitialState(movement); + + movement->addTransition(this, SIGNAL(subMarineStateChanged()), moving); + + //This is the initial state of the machine + machine->setInitialState(moving); + + //End + QFinalState *final = new QFinalState(machine); + + //If the moving animation is finished we move to the return state + movement->addTransition(movement, SIGNAL(animationFinished()), rotation); + + //If the return animation is finished we move to the moving state + rotation->addTransition(rotation, SIGNAL(animationFinished()), movement); + + //This state play the destroyed animation + QAnimationState *destroyedState = new QAnimationState(machine); + destroyedState->setAnimation(setupDestroyAnimation(this)); + + //Play a nice animation when the submarine is destroyed + moving->addTransition(this, SIGNAL(subMarineDestroyed()), destroyedState); + + //Transition to final state when the destroyed animation is finished + destroyedState->addTransition(destroyedState, SIGNAL(animationFinished()), final); + + //The machine has finished to be executed, then the submarine is dead + connect(machine,SIGNAL(finished()),this, SIGNAL(subMarineExecutionFinished())); + + machine->start(); +} + +int SubMarine::points() +{ + return subPoints; +} + +void SubMarine::setCurrentDirection(SubMarine::Movement direction) +{ + if (this->direction == direction) + return; + if (direction == SubMarine::Right && this->direction == SubMarine::None) { + setYRotation(180); + } + this->direction = direction; +} + +enum SubMarine::Movement SubMarine::currentDirection() const +{ + return direction; +} + +void SubMarine::setCurrentSpeed(int speed) +{ + if (speed < 0 || speed > 3) { + qWarning("SubMarine::setCurrentSpeed : The speed is invalid"); + } + this->speed = speed; + emit subMarineStateChanged(); +} + +int SubMarine::currentSpeed() const +{ + return speed; +} + +void SubMarine::launchTorpedo(int speed) +{ + Torpedo * torp = new Torpedo(); + GraphicsScene *scene = static_cast(this->scene()); + scene->addItem(torp); + torp->setPos(x(), y()); + torp->setCurrentSpeed(speed); + torp->launch(); +} + +void SubMarine::destroy() +{ + emit subMarineDestroyed(); +} + +int SubMarine::type() const +{ + return Type; +} diff --git a/demos/sub-attaq/submarine.h b/demos/sub-attaq/submarine.h new file mode 100644 index 000000000..481e81633 --- /dev/null +++ b/demos/sub-attaq/submarine.h @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef __SUBMARINE__H__ +#define __SUBMARINE__H__ + +//Qt +#include +#include + +class PixmapItem; + +class Torpedo; + +class SubMarine : public QGraphicsWidget +{ +Q_OBJECT +public: + enum Movement { + None = 0, + Left, + Right + }; + enum { Type = UserType + 1 }; + SubMarine(int type, const QString &name, int points, QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0); + + int points(); + + void setCurrentDirection(Movement direction); + enum Movement currentDirection() const; + + void setCurrentSpeed(int speed); + int currentSpeed() const; + + void launchTorpedo(int speed); + void destroy(); + + virtual int type() const; + +signals: + void subMarineDestroyed(); + void subMarineExecutionFinished(); + void subMarineStateChanged(); + +private: + int subType; + QString subName; + int subPoints; + int speed; + Movement direction; + PixmapItem *pixmapItem; +}; + +#endif //__SUBMARINE__H__ diff --git a/demos/sub-attaq/submarine_p.h b/demos/sub-attaq/submarine_p.h new file mode 100644 index 000000000..e8df877e8 --- /dev/null +++ b/demos/sub-attaq/submarine_p.h @@ -0,0 +1,139 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef SUBMARINE_P_H +#define SUBMARINE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +//Own +#include "animationmanager.h" +#include "submarine.h" +#include "qanimationstate.h" + +//Qt +#include +#include + +//This state is describing when the boat is moving right +class MovementState : public QAnimationState +{ +Q_OBJECT +public: + MovementState(SubMarine *submarine, QState *parent = 0) : QAnimationState(parent) + { + movementAnimation = new QPropertyAnimation(submarine, "pos"); + connect(movementAnimation,SIGNAL(valueChanged(const QVariant &)),this,SLOT(onAnimationMovementValueChanged(const QVariant &))); + setAnimation(movementAnimation); + AnimationManager::self()->registerAnimation(movementAnimation); + this->submarine = submarine; + } + +protected slots: + void onAnimationMovementValueChanged(const QVariant &) + { + if (qrand() % 200 + 1 == 3) + submarine->launchTorpedo(qrand() % 3 + 1); + } + +protected: + void onEntry(QEvent *e) + { + if (submarine->currentDirection() == SubMarine::Left) { + movementAnimation->setEndValue(QPointF(0,submarine->y())); + movementAnimation->setDuration(submarine->x()/submarine->currentSpeed()*12); + } + else /*if (submarine->currentDirection() == SubMarine::Right)*/ { + movementAnimation->setEndValue(QPointF(submarine->scene()->width()-submarine->size().width(),submarine->y())); + movementAnimation->setDuration((submarine->scene()->width()-submarine->size().width()-submarine->x())/submarine->currentSpeed()*12); + } + movementAnimation->setStartValue(submarine->pos()); + QAnimationState::onEntry(e); + } + +private: + SubMarine *submarine; + QPropertyAnimation *movementAnimation; +}; + +//This state is describing when the boat is moving right +class ReturnState : public QAnimationState +{ +public: + ReturnState(SubMarine *submarine, QState *parent = 0) : QAnimationState(parent) + { + returnAnimation = new QPropertyAnimation(submarine, "yRotation"); + AnimationManager::self()->registerAnimation(returnAnimation); + setAnimation(returnAnimation); + this->submarine = submarine; + } + +protected: + void onEntry(QEvent *e) + { + returnAnimation->stop(); + returnAnimation->setStartValue(submarine->yRotation()); + returnAnimation->setEndValue(submarine->currentDirection() == SubMarine::Right ? 360. : 180.); + returnAnimation->setDuration(500); + QAnimationState::onEntry(e); + } + + void onExit(QEvent *e) + { + submarine->currentDirection() == SubMarine::Right ? submarine->setCurrentDirection(SubMarine::Left) : submarine->setCurrentDirection(SubMarine::Right); + QAnimationState::onExit(e); + } + +private: + SubMarine *submarine; + QPropertyAnimation *returnAnimation; +}; + +#endif // SUBMARINE_P_H diff --git a/demos/sub-attaq/torpedo.cpp b/demos/sub-attaq/torpedo.cpp new file mode 100644 index 000000000..fe79488c5 --- /dev/null +++ b/demos/sub-attaq/torpedo.cpp @@ -0,0 +1,120 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//Own +#include "torpedo.h" +#include "pixmapitem.h" +#include "boat.h" +#include "graphicsscene.h" +#include "animationmanager.h" +#include "qanimationstate.h" + +#include +#include +#include + +Torpedo::Torpedo(QGraphicsItem * parent, Qt::WindowFlags wFlags) + : QGraphicsWidget(parent,wFlags), currentSpeed(0), launchAnimation(0) +{ + pixmapItem = new PixmapItem(QString::fromLatin1("torpedo"),GraphicsScene::Big, this); + setZValue(2); + setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + setFlags(QGraphicsItem::ItemIsMovable); + resize(pixmapItem->boundingRect().size()); +} + +void Torpedo::launch() +{ + launchAnimation = new QPropertyAnimation(this, "pos"); + AnimationManager::self()->registerAnimation(launchAnimation); + launchAnimation->setEndValue(QPointF(x(),qobject_cast(scene())->sealLevel() - 15)); + launchAnimation->setEasingCurve(QEasingCurve::InQuad); + launchAnimation->setDuration(y()/currentSpeed*10); + connect(launchAnimation,SIGNAL(valueChanged(const QVariant &)),this,SLOT(onAnimationLaunchValueChanged(const QVariant &))); + + //We setup the state machine of the torpedo + QStateMachine *machine = new QStateMachine(this); + + //This state is when the launch animation is playing + QAnimationState *launched = new QAnimationState(machine); + launched->setAnimation(launchAnimation); + + //End + QFinalState *final = new QFinalState(machine); + + machine->setInitialState(launched); + + //### Add a nice animation when the torpedo is destroyed + launched->addTransition(this, SIGNAL(torpedoExplosed()),final); + + //If the animation is finished, then we move to the final state + launched->addTransition(launched, SIGNAL(animationFinished()), final); + + //The machine has finished to be executed, then the boat is dead + connect(machine,SIGNAL(finished()),this, SIGNAL(torpedoExecutionFinished())); + + machine->start(); +} + +void Torpedo::setCurrentSpeed(int speed) +{ + if (speed < 0) { + qWarning("Torpedo::setCurrentSpeed : The speed is invalid"); + return; + } + currentSpeed = speed; +} + +void Torpedo::onAnimationLaunchValueChanged(const QVariant &) +{ + foreach (QGraphicsItem *item , collidingItems(Qt::IntersectsItemBoundingRect)) { + if (item->type() == Boat::Type) { + Boat *b = static_cast(item); + b->destroy(); + } + } +} + +void Torpedo::destroy() +{ + launchAnimation->stop(); + emit torpedoExplosed(); +} diff --git a/demos/sub-attaq/torpedo.h b/demos/sub-attaq/torpedo.h new file mode 100644 index 000000000..c44037fbe --- /dev/null +++ b/demos/sub-attaq/torpedo.h @@ -0,0 +1,75 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef __TORPEDO__H__ +#define __TORPEDO__H__ + +//Qt +#include + +#include +#include + +class PixmapItem; + +class Torpedo : public QGraphicsWidget +{ +Q_OBJECT +public: + Torpedo(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0); + void launch(); + void setCurrentSpeed(int speed); + void destroy(); + +signals: + void torpedoExplosed(); + void torpedoExecutionFinished(); + +private slots: + void onAnimationLaunchValueChanged(const QVariant &); + +private: + int currentSpeed; + PixmapItem *pixmapItem; + QVariantAnimation *launchAnimation; +}; + +#endif //__TORPEDO__H__ diff --git a/doc/src/demos/sub-attaq.qdoc b/doc/src/demos/sub-attaq.qdoc new file mode 100644 index 000000000..6bbf763e2 --- /dev/null +++ b/doc/src/demos/sub-attaq.qdoc @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example demos/sub-attaq + \title Sub-Attaq + + This demo shows Qt's ability to combine \l{The Animation Framework}{the animation framework} + and \l{The State Machine Framework}{the state machine framework} to create a game. + + \image sub-attaq-demo.png + + The purpose of the game is to destroy all submarines to win the current level. + The boat can be controlled using left and right keys. To fire a bomb you can press + up and down keys. +*/ diff --git a/doc/src/images/sub-attaq-demo.png b/doc/src/images/sub-attaq-demo.png new file mode 100644 index 000000000..5a35ec6ee Binary files /dev/null and b/doc/src/images/sub-attaq-demo.png differ diff --git a/examples/animation/animation.pro b/examples/animation/animation.pro index 9a2874b1f..c72c5329e 100644 --- a/examples/animation/animation.pro +++ b/examples/animation/animation.pro @@ -7,7 +7,6 @@ SUBDIRS += \ moveblocks \ states \ stickman \ - sub-attaq # install target.path = $$[QT_INSTALL_EXAMPLES]/animation diff --git a/examples/animation/sub-attaq/animationmanager.cpp b/examples/animation/sub-attaq/animationmanager.cpp deleted file mode 100644 index 13266f991..000000000 --- a/examples/animation/sub-attaq/animationmanager.cpp +++ /dev/null @@ -1,93 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//Own -#include "animationmanager.h" - -//Qt -#include -#include - -// the universe's only animation manager -AnimationManager *AnimationManager::instance = 0; - -AnimationManager::AnimationManager() -{ -} - -AnimationManager *AnimationManager::self() -{ - if (!instance) - instance = new AnimationManager; - return instance; -} - -void AnimationManager::registerAnimation(QAbstractAnimation *anim) -{ - animations.append(anim); -} - -void AnimationManager::unregisterAnimation(QAbstractAnimation *anim) -{ - animations.removeAll(anim); -} - -void AnimationManager::unregisterAllAnimations() -{ - animations.clear(); -} - -void AnimationManager::pauseAll() -{ - foreach (QAbstractAnimation* animation, animations) - { - if (animation->state() == QAbstractAnimation::Running) - animation->pause(); - } -} -void AnimationManager::resumeAll() -{ - foreach (QAbstractAnimation* animation, animations) - { - if (animation->state() == QAbstractAnimation::Paused) - animation->resume(); - } -} diff --git a/examples/animation/sub-attaq/animationmanager.h b/examples/animation/sub-attaq/animationmanager.h deleted file mode 100644 index 63ecae6d0..000000000 --- a/examples/animation/sub-attaq/animationmanager.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef ANIMATIONMANAGER_H -#define ANIMATIONMANAGER_H - -#include - -QT_BEGIN_NAMESPACE -class QAbstractAnimation; -QT_END_NAMESPACE - -class AnimationManager : public QObject -{ -Q_OBJECT -public: - AnimationManager(); - void registerAnimation(QAbstractAnimation *anim); - void unregisterAnimation(QAbstractAnimation *anim); - void unregisterAllAnimations(); - static AnimationManager *self(); - -public slots: - void pauseAll(); - void resumeAll(); - -private: - static AnimationManager *instance; - QList animations; -}; - -#endif // ANIMATIONMANAGER_H diff --git a/examples/animation/sub-attaq/boat.cpp b/examples/animation/sub-attaq/boat.cpp deleted file mode 100644 index 68e646e0b..000000000 --- a/examples/animation/sub-attaq/boat.cpp +++ /dev/null @@ -1,318 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//Own -#include "boat.h" -#include "boat_p.h" -#include "bomb.h" -#include "pixmapitem.h" -#include "graphicsscene.h" -#include "animationmanager.h" -#include "custompropertyanimation.h" -#include "qanimationstate.h" - -//Qt -#include -#include -#include -#include -#include -#include - -static QAbstractAnimation *setupDestroyAnimation(Boat *boat) -{ - QSequentialAnimationGroup *group = new QSequentialAnimationGroup(boat); -#if QT_VERSION >=0x040500 - PixmapItem *step1 = new PixmapItem(QString("explosion/boat/step1"),GraphicsScene::Big, boat); - step1->setZValue(6); - PixmapItem *step2 = new PixmapItem(QString("explosion/boat/step2"),GraphicsScene::Big, boat); - step2->setZValue(6); - PixmapItem *step3 = new PixmapItem(QString("explosion/boat/step3"),GraphicsScene::Big, boat); - step3->setZValue(6); - PixmapItem *step4 = new PixmapItem(QString("explosion/boat/step4"),GraphicsScene::Big, boat); - step4->setZValue(6); - step1->setOpacity(0); - step2->setOpacity(0); - step3->setOpacity(0); - step4->setOpacity(0); - CustomPropertyAnimation *anim1 = new CustomPropertyAnimation(boat); - anim1->setMemberFunctions((QGraphicsItem*)step1, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); - anim1->setDuration(100); - anim1->setEndValue(1); - CustomPropertyAnimation *anim2 = new CustomPropertyAnimation(boat); - anim2->setMemberFunctions((QGraphicsItem*)step2, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); - anim2->setDuration(100); - anim2->setEndValue(1); - CustomPropertyAnimation *anim3 = new CustomPropertyAnimation(boat); - anim3->setMemberFunctions((QGraphicsItem*)step3, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); - anim3->setDuration(100); - anim3->setEndValue(1); - CustomPropertyAnimation *anim4 = new CustomPropertyAnimation(boat); - anim4->setMemberFunctions((QGraphicsItem*)step4, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); - anim4->setDuration(100); - anim4->setEndValue(1); - CustomPropertyAnimation *anim5 = new CustomPropertyAnimation(boat); - anim5->setMemberFunctions((QGraphicsItem*)step1, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); - anim5->setDuration(100); - anim5->setEndValue(0); - CustomPropertyAnimation *anim6 = new CustomPropertyAnimation(boat); - anim6->setMemberFunctions((QGraphicsItem*)step2, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); - anim6->setDuration(100); - anim6->setEndValue(0); - CustomPropertyAnimation *anim7 = new CustomPropertyAnimation(boat); - anim7->setMemberFunctions((QGraphicsItem*)step3, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); - anim7->setDuration(100); - anim7->setEndValue(0); - CustomPropertyAnimation *anim8 = new CustomPropertyAnimation(boat); - anim8->setMemberFunctions((QGraphicsItem*)step4, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); - anim8->setDuration(100); - anim8->setEndValue(0); - group->addAnimation(anim1); - group->addAnimation(anim2); - group->addAnimation(anim3); - group->addAnimation(anim4); - group->addAnimation(anim5); - group->addAnimation(anim6); - group->addAnimation(anim7); - group->addAnimation(anim8); -#else - // work around for a bug where we don't transition if the duration is zero. - QtPauseAnimation *anim = new QtPauseAnimation(group); - anim->setDuration(1); - group->addAnimation(anim); -#endif - AnimationManager::self()->registerAnimation(group); - return group; -} - - - -Boat::Boat(QGraphicsItem * parent, Qt::WindowFlags wFlags) - : QGraphicsWidget(parent,wFlags), speed(0), bombsAlreadyLaunched(0), direction(Boat::None), movementAnimation(0) -{ - pixmapItem = new PixmapItem(QString("boat"),GraphicsScene::Big, this); - setZValue(4); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsFocusable); - resize(pixmapItem->boundingRect().size()); - - //The movement animation used to animate the boat - movementAnimation = new QPropertyAnimation(this, "pos"); - - //The movement animation used to animate the boat - destroyAnimation = setupDestroyAnimation(this); - - //We setup the state machien of the boat - machine = new QStateMachine(this); - QState *moving = new QState(machine); - StopState *stopState = new StopState(this, moving); - machine->setInitialState(moving); - moving->setInitialState(stopState); - MoveStateRight *moveStateRight = new MoveStateRight(this, moving); - MoveStateLeft *moveStateLeft = new MoveStateLeft(this, moving); - LaunchStateRight *launchStateRight = new LaunchStateRight(this, machine); - LaunchStateLeft *launchStateLeft = new LaunchStateLeft(this, machine); - - //then setup the transitions for the rightMove state - KeyStopTransition *leftStopRight = new KeyStopTransition(this, QEvent::KeyPress, Qt::Key_Left); - leftStopRight->setTargetState(stopState); - KeyMoveTransition *leftMoveRight = new KeyMoveTransition(this, QEvent::KeyPress, Qt::Key_Left); - leftMoveRight->setTargetState(moveStateRight); - KeyMoveTransition *rightMoveRight = new KeyMoveTransition(this, QEvent::KeyPress, Qt::Key_Right); - rightMoveRight->setTargetState(moveStateRight); - KeyMoveTransition *rightMoveStop = new KeyMoveTransition(this, QEvent::KeyPress, Qt::Key_Right); - rightMoveStop->setTargetState(moveStateRight); - - //then setup the transitions for the leftMove state - KeyStopTransition *rightStopLeft = new KeyStopTransition(this, QEvent::KeyPress, Qt::Key_Right); - rightStopLeft->setTargetState(stopState); - KeyMoveTransition *rightMoveLeft = new KeyMoveTransition(this, QEvent::KeyPress, Qt::Key_Right); - rightMoveLeft->setTargetState(moveStateLeft); - KeyMoveTransition *leftMoveLeft = new KeyMoveTransition(this, QEvent::KeyPress,Qt::Key_Left); - leftMoveLeft->setTargetState(moveStateLeft); - KeyMoveTransition *leftMoveStop = new KeyMoveTransition(this, QEvent::KeyPress,Qt::Key_Left); - leftMoveStop->setTargetState(moveStateLeft); - - //We set up the right move state - moveStateRight->addTransition(leftStopRight); - moveStateRight->addTransition(leftMoveRight); - moveStateRight->addTransition(rightMoveRight); - stopState->addTransition(rightMoveStop); - - //We set up the left move state - moveStateLeft->addTransition(rightStopLeft); - moveStateLeft->addTransition(leftMoveLeft); - moveStateLeft->addTransition(rightMoveLeft); - stopState->addTransition(leftMoveStop); - - //The animation is finished, it means we reached the border of the screen, the boat is stopped so we move to the stop state - moveStateLeft->addTransition(movementAnimation, SIGNAL(finished()), stopState); - moveStateRight->addTransition(movementAnimation, SIGNAL(finished()), stopState); - - //We set up the keys for dropping bombs - KeyLaunchTransition *upFireLeft = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Up); - upFireLeft->setTargetState(launchStateRight); - KeyLaunchTransition *upFireRight = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Up); - upFireRight->setTargetState(launchStateRight); - KeyLaunchTransition *upFireStop = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Up); - upFireStop->setTargetState(launchStateRight); - KeyLaunchTransition *downFireLeft = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Down); - downFireLeft->setTargetState(launchStateLeft); - KeyLaunchTransition *downFireRight = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Down); - downFireRight->setTargetState(launchStateLeft); - KeyLaunchTransition *downFireMove = new KeyLaunchTransition(this, QEvent::KeyPress, Qt::Key_Down); - downFireMove->setTargetState(launchStateLeft); - - //We set up transitions for fire up - moveStateRight->addTransition(upFireRight); - moveStateLeft->addTransition(upFireLeft); - stopState->addTransition(upFireStop); - - //We set up transitions for fire down - moveStateRight->addTransition(downFireRight); - moveStateLeft->addTransition(downFireLeft); - stopState->addTransition(downFireMove); - - //Finally the launch state should come back to its original state - QHistoryState *historyState = new QHistoryState(moving); - launchStateLeft->addTransition(historyState); - launchStateRight->addTransition(historyState); - - QFinalState *final = new QFinalState(machine); - - //This state play the destroyed animation - QAnimationState *destroyedState = new QAnimationState(machine); - destroyedState->setAnimation(destroyAnimation); - - //Play a nice animation when the boat is destroyed - moving->addTransition(this, SIGNAL(boatDestroyed()),destroyedState); - - //Transition to final state when the destroyed animation is finished - destroyedState->addTransition(destroyedState, SIGNAL(animationFinished()), final); - - //The machine has finished to be executed, then the boat is dead - connect(machine,SIGNAL(finished()),this, SIGNAL(boatExecutionFinished())); - -} - -void Boat::run() -{ - //We register animations - AnimationManager::self()->registerAnimation(movementAnimation); - AnimationManager::self()->registerAnimation(destroyAnimation); - machine->start(); -} - -void Boat::stop() -{ - movementAnimation->stop(); - machine->stop(); -} - -void Boat::updateBoatMovement() -{ - if (speed == 0 || direction == Boat::None) { - movementAnimation->stop(); - return; - } - - movementAnimation->stop(); - movementAnimation->setStartValue(pos()); - - if (direction == Boat::Left) { - movementAnimation->setEndValue(QPointF(0,y())); - movementAnimation->setDuration(x()/speed*15); - } - else /*if (direction == Boat::Right)*/ { - movementAnimation->setEndValue(QPointF(scene()->width()-size().width(),y())); - movementAnimation->setDuration((scene()->width()-size().width()-x())/speed*15); - } - movementAnimation->start(); -} - -void Boat::destroy() -{ - movementAnimation->stop(); - emit boatDestroyed(); -} - -int Boat::bombsLaunched() const -{ - return bombsAlreadyLaunched; -} - -void Boat::setBombsLaunched(int number) -{ - if (number > MAX_BOMB) { - qWarning("Boat::setBombsLaunched : It impossible to launch that number of bombs"); - return; - } - bombsAlreadyLaunched = number; -} - -int Boat::currentSpeed() const -{ - return speed; -} - -void Boat::setCurrentSpeed(int speed) -{ - if (speed > 3 || speed < 0) { - qWarning("Boat::setCurrentSpeed: The boat can't run on that speed"); - return; - } - this->speed = speed; -} - -enum Boat::Movement Boat::currentDirection() const -{ - return direction; -} - -void Boat::setCurrentDirection(Movement direction) -{ - this->direction = direction; -} - -int Boat::type() const -{ - return Type; -} diff --git a/examples/animation/sub-attaq/boat.h b/examples/animation/sub-attaq/boat.h deleted file mode 100644 index f6b1a9029..000000000 --- a/examples/animation/sub-attaq/boat.h +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef __BOAT__H__ -#define __BOAT__H__ - -//Qt -#include -#include - -#include - -class PixmapItem; -class Bomb; -QT_BEGIN_NAMESPACE -class QVariantAnimation; -class QAbstractAnimation; -class QStateMachine; -QT_END_NAMESPACE - -class Boat : public QGraphicsWidget -{ -Q_OBJECT -public: - enum Movement { - None = 0, - Left, - Right - }; - enum { Type = UserType + 2 }; - Boat(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); - void destroy(); - void run(); - void stop(); - - int bombsLaunched() const; - void setBombsLaunched(int number); - - int currentSpeed() const; - void setCurrentSpeed(int speed); - - enum Movement currentDirection() const; - void setCurrentDirection(Movement direction); - - void updateBoatMovement(); - - virtual int type() const; - -signals: - void boatDestroyed(); - void boatExecutionFinished(); - -private: - int speed; - int bombsAlreadyLaunched; - Movement direction; - QVariantAnimation *movementAnimation; - QAbstractAnimation *destroyAnimation; - QStateMachine *machine; - PixmapItem *pixmapItem; -}; - -#endif //__BOAT__H__ diff --git a/examples/animation/sub-attaq/boat_p.h b/examples/animation/sub-attaq/boat_p.h deleted file mode 100644 index 4e962fc75..000000000 --- a/examples/animation/sub-attaq/boat_p.h +++ /dev/null @@ -1,256 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef BOAT_P_H -#define BOAT_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -//Own -#include "bomb.h" -#include "graphicsscene.h" - -// Qt -#include - -static const int MAX_BOMB = 5; - - -//These transtion test if we have to stop the boat (i.e current speed is 1) -class KeyStopTransition : public QKeyEventTransition -{ -public: - KeyStopTransition(Boat *boat, QEvent::Type type, int key) - : QKeyEventTransition(boat, type, key) - { - this->boat = boat; - this->key = key; - } -protected: - virtual bool eventTest(QEvent *event) - { - Q_UNUSED(event); - if (!QKeyEventTransition::eventTest(event)) - return false; - if (boat->currentSpeed() == 1) - return true; - else - return false; - } -private: - Boat * boat; - int key; -}; - -//These transtion test if we have to move the boat (i.e current speed was 0 or another value) - class KeyMoveTransition : public QKeyEventTransition -{ -public: - KeyMoveTransition(Boat *boat, QEvent::Type type, int key) - : QKeyEventTransition(boat, type, key) - { - this->boat = boat; - this->key = key; - } -protected: - virtual bool eventTest(QEvent *event) - { - Q_UNUSED(event); - if (!QKeyEventTransition::eventTest(event)) - return false; - if (boat->currentSpeed() >= 0) - return true; - else - return false; - - } - void onTransition(QEvent *) - { - //We decrease the speed if needed - if (key == Qt::Key_Left && boat->currentDirection() == Boat::Right) - boat->setCurrentSpeed(boat->currentSpeed() - 1); - else if (key == Qt::Key_Right && boat->currentDirection() == Boat::Left) - boat->setCurrentSpeed(boat->currentSpeed() - 1); - else if (boat->currentSpeed() < 3) - boat->setCurrentSpeed(boat->currentSpeed() + 1); - boat->updateBoatMovement(); - } -private: - Boat * boat; - int key; -}; - -//This transition trigger the bombs launch - class KeyLaunchTransition : public QKeyEventTransition -{ -public: - KeyLaunchTransition(Boat *boat, QEvent::Type type, int key) - : QKeyEventTransition(boat, type, key) - { - this->boat = boat; - this->key = key; - } -protected: - virtual bool eventTest(QEvent *event) - { - Q_UNUSED(event); - if (!QKeyEventTransition::eventTest(event)) - return false; - //We have enough bomb? - if (boat->bombsLaunched() < MAX_BOMB) - return true; - else - return false; - } -private: - Boat * boat; - int key; -}; - -//This state is describing when the boat is moving right -class MoveStateRight : public QState -{ -public: - MoveStateRight(Boat *boat,QState *parent = 0) : QState(parent) - { - this->boat = boat; - } -protected: - void onEntry(QEvent *) - { - boat->setCurrentDirection(Boat::Right); - boat->updateBoatMovement(); - } -private: - Boat * boat; -}; - - //This state is describing when the boat is moving left -class MoveStateLeft : public QState -{ -public: - MoveStateLeft(Boat *boat,QState *parent = 0) : QState(parent) - { - this->boat = boat; - } -protected: - void onEntry(QEvent *) - { - boat->setCurrentDirection(Boat::Left); - boat->updateBoatMovement(); - } -private: - Boat * boat; -}; - -//This state is describing when the boat is in a stand by position -class StopState : public QState -{ -public: - StopState(Boat *boat,QState *parent = 0) : QState(parent) - { - this->boat = boat; - } -protected: - void onEntry(QEvent *) - { - boat->setCurrentSpeed(0); - boat->setCurrentDirection(Boat::None); - boat->updateBoatMovement(); - } -private: - Boat * boat; -}; - -//This state is describing the launch of the torpedo on the right -class LaunchStateRight : public QState -{ -public: - LaunchStateRight(Boat *boat,QState *parent = 0) : QState(parent) - { - this->boat = boat; - } -protected: - void onEntry(QEvent *) - { - Bomb *b = new Bomb(); - b->setPos(boat->x()+boat->size().width(),boat->y()); - GraphicsScene *scene = static_cast(boat->scene()); - scene->addItem(b); - b->launch(Bomb::Right); - boat->setBombsLaunched(boat->bombsLaunched() + 1); - } -private: - Boat * boat; -}; - -//This state is describing the launch of the torpedo on the left -class LaunchStateLeft : public QState -{ -public: - LaunchStateLeft(Boat *boat,QState *parent = 0) : QState(parent) - { - this->boat = boat; - } -protected: - void onEntry(QEvent *) - { - Bomb *b = new Bomb(); - b->setPos(boat->x() - b->size().width(), boat->y()); - GraphicsScene *scene = static_cast(boat->scene()); - scene->addItem(b); - b->launch(Bomb::Left); - boat->setBombsLaunched(boat->bombsLaunched() + 1); - } -private: - Boat * boat; -}; - -#endif // BOAT_P_H diff --git a/examples/animation/sub-attaq/bomb.cpp b/examples/animation/sub-attaq/bomb.cpp deleted file mode 100644 index e92a72330..000000000 --- a/examples/animation/sub-attaq/bomb.cpp +++ /dev/null @@ -1,124 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//Own -#include "bomb.h" -#include "submarine.h" -#include "pixmapitem.h" -#include "animationmanager.h" -#include "qanimationstate.h" - -//Qt -#include -#include -#include -#include - -Bomb::Bomb(QGraphicsItem * parent, Qt::WindowFlags wFlags) - : QGraphicsWidget(parent,wFlags), launchAnimation(0) -{ - pixmapItem = new PixmapItem(QString("bomb"),GraphicsScene::Big, this); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - setFlags(QGraphicsItem::ItemIsMovable); - setZValue(2); - resize(pixmapItem->boundingRect().size()); -} - -void Bomb::launch(Bomb::Direction direction) -{ - launchAnimation = new QSequentialAnimationGroup(); - AnimationManager::self()->registerAnimation(launchAnimation); - qreal delta = direction == Right ? 20 : - 20; - QPropertyAnimation *anim = new QPropertyAnimation(this, "pos"); - anim->setEndValue(QPointF(x() + delta,y() - 20)); - anim->setDuration(150); - launchAnimation->addAnimation(anim); - anim = new QPropertyAnimation(this, "pos"); - anim->setEndValue(QPointF(x() + delta*2, y() )); - anim->setDuration(150); - launchAnimation->addAnimation(anim); - anim = new QPropertyAnimation(this, "pos"); - anim->setEndValue(QPointF(x() + delta*2,scene()->height())); - anim->setDuration(y()/2*60); - launchAnimation->addAnimation(anim); - connect(anim,SIGNAL(valueChanged(const QVariant &)),this,SLOT(onAnimationLaunchValueChanged(const QVariant &))); - - //We setup the state machine of the bomb - QStateMachine *machine = new QStateMachine(this); - - //This state is when the launch animation is playing - QAnimationState *launched = new QAnimationState(machine); - launched->setAnimation(launchAnimation); - - //End - QFinalState *final = new QFinalState(machine); - - machine->setInitialState(launched); - - //### Add a nice animation when the bomb is destroyed - launched->addTransition(this, SIGNAL(bombExplosed()),final); - - //If the animation is finished, then we move to the final state - launched->addTransition(launched, SIGNAL(animationFinished()), final); - - //The machine has finished to be executed, then the boat is dead - connect(machine,SIGNAL(finished()),this, SIGNAL(bombExecutionFinished())); - - machine->start(); - -} - -void Bomb::onAnimationLaunchValueChanged(const QVariant &) -{ - foreach (QGraphicsItem * item , collidingItems(Qt::IntersectsItemBoundingRect)) { - if (item->type() == SubMarine::Type) { - SubMarine *s = static_cast(item); - destroy(); - s->destroy(); - } - } -} - -void Bomb::destroy() -{ - launchAnimation->stop(); - emit bombExplosed(); -} diff --git a/examples/animation/sub-attaq/bomb.h b/examples/animation/sub-attaq/bomb.h deleted file mode 100644 index ed6b0f535..000000000 --- a/examples/animation/sub-attaq/bomb.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef __BOMB__H__ -#define __BOMB__H__ - -//Qt -#include -#include - -class PixmapItem; - -class Bomb : public QGraphicsWidget -{ -Q_OBJECT -public: - enum Direction { - Left = 0, - Right - }; - Bomb(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0); - void launch(Direction direction); - void destroy(); - -signals: - void bombExplosed(); - void bombExecutionFinished(); - -private slots: - void onAnimationLaunchValueChanged(const QVariant &); - -private: - QAnimationGroup *launchAnimation; - PixmapItem *pixmapItem; -}; - -#endif //__BOMB__H__ diff --git a/examples/animation/sub-attaq/custompropertyanimation.cpp b/examples/animation/sub-attaq/custompropertyanimation.cpp deleted file mode 100644 index 9282f4202..000000000 --- a/examples/animation/sub-attaq/custompropertyanimation.cpp +++ /dev/null @@ -1,108 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "custompropertyanimation.h" - -// Qt -#include - -CustomPropertyAnimation::CustomPropertyAnimation(QObject *parent) : - QVariantAnimation(parent), animProp(0) -{ -} - -CustomPropertyAnimation::~CustomPropertyAnimation() -{ -} - -void CustomPropertyAnimation::setProperty(AbstractProperty *_animProp) -{ - if (animProp == _animProp) - return; - delete animProp; - animProp = _animProp; -} - -/*! - \reimp - */ -void CustomPropertyAnimation::updateCurrentValue(const QVariant &value) -{ - if (!animProp || state() == QAbstractAnimation::Stopped) - return; - - animProp->write(value); -} - - -/*! - \reimp -*/ -void CustomPropertyAnimation::updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState) -{ - // Initialize start value - if (oldState == QAbstractAnimation::Stopped) { - if (!animProp) - return; - QVariant def = animProp->read(); - if (def.isValid()) { - const int t = def.userType(); - KeyValues values = keyValues(); - //this ensures that all the keyValues are of type t - for (int i = 0; i < values.count(); ++i) { - QVariantAnimation::KeyValue &pair = values[i]; - if (pair.second.userType() != t) - pair.second.convert(static_cast(t)); - } - //let's now update the key values - setKeyValues(values); - } - - if (animProp && !startValue().isValid() && currentTime() == 0 - || (currentTime() == duration() && currentLoop() == (loopCount() - 1))) { - setStartValue(def); - } - } - - QVariantAnimation::updateState(oldState, newState); -} - -#include "moc_custompropertyanimation.cpp" diff --git a/examples/animation/sub-attaq/custompropertyanimation.h b/examples/animation/sub-attaq/custompropertyanimation.h deleted file mode 100644 index a98416336..000000000 --- a/examples/animation/sub-attaq/custompropertyanimation.h +++ /dev/null @@ -1,114 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef CUSTOMPROPERTYANIMATION_H -#define CUSTOMPROPERTYANIMATION_H - -#include - -QT_BEGIN_NAMESPACE -class QGraphicsItem; -QT_END_NAMESPACE - -struct AbstractProperty -{ - virtual QVariant read() const = 0; - virtual void write(const QVariant &value) = 0; -}; - - -class CustomPropertyAnimation : public QVariantAnimation -{ - Q_OBJECT - - template - class MemberFunctionProperty : public AbstractProperty - { - public: - typedef T (Target::*Getter)(void) const; - typedef void (Target::*Setter)(T2); - - MemberFunctionProperty(Target* target, Getter getter, Setter setter) - : m_target(target), m_getter(getter), m_setter(setter) {} - - virtual void write(const QVariant &value) - { - if (m_setter) (m_target->*m_setter)(qVariantValue(value)); - } - - virtual QVariant read() const - { - if (m_getter) return qVariantFromValue((m_target->*m_getter)()); - return QVariant(); - } - - private: - Target *m_target; - Getter m_getter; - Setter m_setter; - }; - -public: - CustomPropertyAnimation(QObject *parent = 0); - ~CustomPropertyAnimation(); - - template - void setMemberFunctions(Target* target, T (Target::*getter)() const, void (Target::*setter)(const T& )) - { - setProperty(new MemberFunctionProperty(target, getter, setter)); - } - - template - void setMemberFunctions(Target* target, T (Target::*getter)() const, void (Target::*setter)(T)) - { - setProperty(new MemberFunctionProperty(target, getter, setter)); - } - - void updateCurrentValue(const QVariant &value); - void updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState); - void setProperty(AbstractProperty *animProp); - -private: - Q_DISABLE_COPY(CustomPropertyAnimation); - AbstractProperty *animProp; -}; - -#endif // CUSTOMPROPERTYANIMATION_H diff --git a/examples/animation/sub-attaq/data.xml b/examples/animation/sub-attaq/data.xml deleted file mode 100644 index 41d475401..000000000 --- a/examples/animation/sub-attaq/data.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/examples/animation/sub-attaq/graphicsscene.cpp b/examples/animation/sub-attaq/graphicsscene.cpp deleted file mode 100644 index fcbc1b392..000000000 --- a/examples/animation/sub-attaq/graphicsscene.cpp +++ /dev/null @@ -1,374 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//Own -#include "graphicsscene.h" -#include "states.h" -#include "boat.h" -#include "submarine.h" -#include "torpedo.h" -#include "bomb.h" -#include "pixmapitem.h" -#include "custompropertyanimation.h" -#include "animationmanager.h" -#include "qanimationstate.h" -#include "progressitem.h" - -//Qt -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -//helper function that creates an animation for position and inserts it into group -static CustomPropertyAnimation *addGraphicsItemPosAnimation(QSequentialAnimationGroup *group, - QGraphicsItem *item, const QPointF &endPos) -{ - CustomPropertyAnimation *ret = new CustomPropertyAnimation(group); - ret->setMemberFunctions(item, &QGraphicsItem::pos, &QGraphicsItem::setPos); - ret->setEndValue(endPos); - ret->setDuration(200); - ret->setEasingCurve(QEasingCurve::OutElastic); - group->addPause(50); - return ret; -} - -//helper function that creates an animation for opacity and inserts it into group -static void addGraphicsItemFadeoutAnimation(QAnimationGroup *group, QGraphicsItem *item) -{ -#if QT_VERSION >=0x040500 - CustomPropertyAnimation *anim = new CustomPropertyAnimation(group); - anim->setMemberFunctions(item, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); - anim->setDuration(800); - anim->setEndValue(0); - anim->setEasingCurve(QEasingCurve::OutQuad); -#else - // work around for a bug where we don't transition if the duration is zero. - QtPauseAnimation *anim = new QtPauseAnimation(group); - anim->setDuration(1); -#endif -} - -GraphicsScene::GraphicsScene(int x, int y, int width, int height, Mode mode) - : QGraphicsScene(x,y,width,height), mode(mode), newAction(0), quitAction(0), boat(0) -{ - backgroundItem = new PixmapItem(QString("background"),mode); - backgroundItem->setZValue(1); - backgroundItem->setPos(0,0); - addItem(backgroundItem); - - PixmapItem *surfaceItem = new PixmapItem(QString("surface"),mode); - surfaceItem->setZValue(3); - surfaceItem->setPos(0,sealLevel() - surfaceItem->boundingRect().height()/2); - addItem(surfaceItem); - - //The item that display score and level - progressItem = new ProgressItem(backgroundItem); - - //We create the boat - boat = new Boat(); - addItem(boat); - boat->setPos(this->width()/2, sealLevel() - boat->size().height()); - boat->hide(); - - //parse the xml that contain all data of the game - QXmlStreamReader reader; - QFile file(":data.xml"); - file.open(QIODevice::ReadOnly); - reader.setDevice(&file); - LevelDescription currentLevel; - while (!reader.atEnd()) { - reader.readNext(); - if (reader.tokenType() == QXmlStreamReader::StartElement) { - if (reader.name() == "submarine") - { - SubmarineDescription desc; - desc.name = reader.attributes().value("name").toString(); - desc.points = reader.attributes().value("points").toString().toInt(); - desc.type = reader.attributes().value("type").toString().toInt(); - submarinesData.append(desc); - } - if (reader.name() == "level") - { - currentLevel.id = reader.attributes().value("id").toString().toInt(); - currentLevel.name = reader.attributes().value("name").toString(); - } - if (reader.name() == "subinstance") - { - currentLevel.submarines.append(qMakePair(reader.attributes().value("type").toString().toInt(),reader.attributes().value("nb").toString().toInt())); - } - } - if (reader.tokenType() == QXmlStreamReader::EndElement) { - if (reader.name() == "level") - { - levelsData.insert(currentLevel.id,currentLevel); - currentLevel.submarines.clear(); - } - } - } -} - -qreal GraphicsScene::sealLevel() const -{ - if (mode == Big) - return 220; - else - return 160; -} - -void GraphicsScene::setupScene(const QList &actions) -{ - newAction = actions.at(0); - quitAction = actions.at(1); - - QGraphicsItem *logo_s = addWelcomeItem(QPixmap(":/logo-s")); - QGraphicsItem *logo_u = addWelcomeItem(QPixmap(":/logo-u")); - QGraphicsItem *logo_b = addWelcomeItem(QPixmap(":/logo-b")); - QGraphicsItem *logo_dash = addWelcomeItem(QPixmap(":/logo-dash")); - QGraphicsItem *logo_a = addWelcomeItem(QPixmap(":/logo-a")); - QGraphicsItem *logo_t = addWelcomeItem(QPixmap(":/logo-t")); - QGraphicsItem *logo_t2 = addWelcomeItem(QPixmap(":/logo-t2")); - QGraphicsItem *logo_a2 = addWelcomeItem(QPixmap(":/logo-a2")); - QGraphicsItem *logo_q = addWelcomeItem(QPixmap(":/logo-q")); - QGraphicsItem *logo_excl = addWelcomeItem(QPixmap(":/logo-excl")); - logo_s->setZValue(3); - logo_u->setZValue(4); - logo_b->setZValue(5); - logo_dash->setZValue(6); - logo_a->setZValue(7); - logo_t->setZValue(8); - logo_t2->setZValue(9); - logo_a2->setZValue(10); - logo_q->setZValue(11); - logo_excl->setZValue(12); - logo_s->setPos(QPointF(-1000, -1000)); - logo_u->setPos(QPointF(-800, -1000)); - logo_b->setPos(QPointF(-600, -1000)); - logo_dash->setPos(QPointF(-400, -1000)); - logo_a->setPos(QPointF(1000, 2000)); - logo_t->setPos(QPointF(800, 2000)); - logo_t2->setPos(QPointF(600, 2000)); - logo_a2->setPos(QPointF(400, 2000)); - logo_q->setPos(QPointF(200, 2000)); - logo_excl->setPos(QPointF(0, 2000)); - - QSequentialAnimationGroup * lettersGroupMoving = new QSequentialAnimationGroup(this); - QParallelAnimationGroup * lettersGroupFading = new QParallelAnimationGroup(this); - - //creation of the animations for moving letters - addGraphicsItemPosAnimation(lettersGroupMoving, logo_s, QPointF(300, 150)); - addGraphicsItemPosAnimation(lettersGroupMoving, logo_u, QPointF(350, 150)); - addGraphicsItemPosAnimation(lettersGroupMoving, logo_b, QPointF(400, 120)); - addGraphicsItemPosAnimation(lettersGroupMoving, logo_dash, QPointF(460, 150)); - addGraphicsItemPosAnimation(lettersGroupMoving, logo_a, QPointF(350, 250)); - addGraphicsItemPosAnimation(lettersGroupMoving, logo_t, QPointF(400, 250)); - addGraphicsItemPosAnimation(lettersGroupMoving, logo_t2, QPointF(430, 250)); - addGraphicsItemPosAnimation(lettersGroupMoving, logo_a2, QPointF(465, 250)); - addGraphicsItemPosAnimation(lettersGroupMoving, logo_q, QPointF(510, 250)); - addGraphicsItemPosAnimation(lettersGroupMoving, logo_excl, QPointF(570, 220)); - - //creation of the animations for fading out the letters - addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_s); - addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_u); - addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_b); - addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_dash); - addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_a); - addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_t); - addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_t2); - addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_a2); - addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_q); - addGraphicsItemFadeoutAnimation(lettersGroupFading, logo_excl); - connect(lettersGroupFading, SIGNAL(finished()), this, SLOT(onIntroAnimationFinished())); - - QStateMachine *machine = new QStateMachine(this); - - //This state is when the player is playing - PlayState *gameState = new PlayState(this,machine); - - //Final state - QFinalState *final = new QFinalState(machine); - - //Animation when the player enter in the game - QAnimationState *lettersMovingState = new QAnimationState(machine); - lettersMovingState->setAnimation(lettersGroupMoving); - - //Animation when the welcome screen disappear - QAnimationState *lettersFadingState = new QAnimationState(machine); - lettersFadingState->setAnimation(lettersGroupFading); - - //if new game then we fade out the welcome screen and start playing - lettersMovingState->addTransition(newAction, SIGNAL(triggered()),lettersFadingState); - lettersFadingState->addTransition(lettersFadingState, SIGNAL(animationFinished()),gameState); - - //New Game is triggered then player start playing - gameState->addTransition(newAction, SIGNAL(triggered()),gameState); - - //Wanna quit, then connect to CTRL+Q - gameState->addTransition(quitAction, SIGNAL(triggered()),final); - lettersMovingState->addTransition(quitAction, SIGNAL(triggered()),final); - - //Welcome screen is the initial state - machine->setInitialState(lettersMovingState); - - machine->start(); - - //We reach the final state, then we quit - connect(machine,SIGNAL(finished()),this, SLOT(onQuitGameTriggered())); -} - -void GraphicsScene::addItem(Bomb *bomb) -{ - bombs.insert(bomb); - connect(bomb,SIGNAL(bombExecutionFinished()),this, SLOT(onBombExecutionFinished())); - QGraphicsScene::addItem(bomb); -} - -void GraphicsScene::addItem(Torpedo *torpedo) -{ - torpedos.insert(torpedo); - connect(torpedo,SIGNAL(torpedoExecutionFinished()),this, SLOT(onTorpedoExecutionFinished())); - QGraphicsScene::addItem(torpedo); -} - -void GraphicsScene::addItem(SubMarine *submarine) -{ - submarines.insert(submarine); - connect(submarine,SIGNAL(subMarineExecutionFinished()),this, SLOT(onSubMarineExecutionFinished())); - QGraphicsScene::addItem(submarine); -} - -void GraphicsScene::addItem(QGraphicsItem *item) -{ - QGraphicsScene::addItem(item); -} - -void GraphicsScene::mousePressEvent (QGraphicsSceneMouseEvent * event) -{ - event->ignore(); -} - -void GraphicsScene::onQuitGameTriggered() -{ - qApp->closeAllWindows(); -} - -void GraphicsScene::onBombExecutionFinished() -{ - Bomb *bomb = qobject_cast(sender()); - bombs.remove(bomb); - bomb->deleteLater(); - if (boat) - boat->setBombsLaunched(boat->bombsLaunched() - 1); -} - -void GraphicsScene::onTorpedoExecutionFinished() -{ - Torpedo *torpedo = qobject_cast(sender()); - torpedos.remove(torpedo); - torpedo->deleteLater(); -} - -void GraphicsScene::onSubMarineExecutionFinished() -{ - SubMarine *submarine = qobject_cast(sender()); - submarines.remove(submarine); - if (submarines.count() == 0) { - emit allSubMarineDestroyed(submarine->points()); - } else { - emit subMarineDestroyed(submarine->points()); - } - submarine->deleteLater(); -} - -int GraphicsScene::remainingSubMarines() const -{ - return submarines.count(); -} - -void GraphicsScene::clearScene() -{ - foreach (SubMarine *sub,submarines) { - sub->destroy(); - sub->deleteLater(); - } - - foreach (Torpedo *torpedo,torpedos) { - torpedo->destroy(); - torpedo->deleteLater(); - } - - foreach (Bomb *bomb,bombs) { - bomb->destroy(); - bomb->deleteLater(); - } - - submarines.clear(); - bombs.clear(); - torpedos.clear(); - - AnimationManager::self()->unregisterAllAnimations(); - - boat->stop(); - boat->hide(); -} - -QGraphicsPixmapItem *GraphicsScene::addWelcomeItem(const QPixmap &pm) -{ - QGraphicsPixmapItem *item = addPixmap(pm); - welcomeItems << item; - return item; -} - -void GraphicsScene::onIntroAnimationFinished() -{ - qDeleteAll(welcomeItems); - welcomeItems.clear(); -} - diff --git a/examples/animation/sub-attaq/graphicsscene.h b/examples/animation/sub-attaq/graphicsscene.h deleted file mode 100644 index 068ee97ef..000000000 --- a/examples/animation/sub-attaq/graphicsscene.h +++ /dev/null @@ -1,131 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef __GRAPHICSSCENE__H__ -#define __GRAPHICSSCENE__H__ - -//Qt -#include -#include -#include - - -class Boat; -class SubMarine; -class Torpedo; -class Bomb; -class PixmapItem; -class ProgressItem; -QT_BEGIN_NAMESPACE -class QAction; -QT_END_NAMESPACE - -class GraphicsScene : public QGraphicsScene -{ -Q_OBJECT -public: - enum Mode { - Big = 0, - Small - }; - - struct SubmarineDescription { - int type; - int points; - QString name; - }; - - struct LevelDescription { - int id; - QString name; - QList > submarines; - }; - - GraphicsScene(int x, int y, int width, int height, Mode mode = Big); - qreal sealLevel() const; - void setupScene(const QList &actions); - void addItem(Bomb *bomb); - void addItem(Torpedo *torpedo); - void addItem(SubMarine *submarine); - void addItem(QGraphicsItem *item); - int remainingSubMarines() const; - void clearScene(); - QGraphicsPixmapItem *addWelcomeItem(const QPixmap &pm); - -signals: - void subMarineDestroyed(int); - void allSubMarineDestroyed(int); - -protected: - void mousePressEvent (QGraphicsSceneMouseEvent * event); - -private slots: - void onQuitGameTriggered(); - void onBombExecutionFinished(); - void onTorpedoExecutionFinished(); - void onSubMarineExecutionFinished(); - void onIntroAnimationFinished(); - -private: - Mode mode; - PixmapItem *backgroundItem; - ProgressItem *progressItem; - QAction * newAction; - QAction * quitAction; - Boat *boat; - QSet submarines; - QSet bombs; - QSet torpedos; - QVector welcomeItems; - QVector submarinesData; - QHash levelsData; - - friend class PauseState; - friend class PlayState; - friend class LevelState; - friend class LostState; - friend class WinState; - friend class WinTransition; - friend class UpdateScoreTransition; -}; - -#endif //__GRAPHICSSCENE__H__ - diff --git a/examples/animation/sub-attaq/main.cpp b/examples/animation/sub-attaq/main.cpp deleted file mode 100644 index 4f6f4f96e..000000000 --- a/examples/animation/sub-attaq/main.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include "mainwindow.h" - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - Q_INIT_RESOURCE(subattaq); - - qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); - - MainWindow w; - w.show(); - - return app.exec(); -} diff --git a/examples/animation/sub-attaq/mainwindow.cpp b/examples/animation/sub-attaq/mainwindow.cpp deleted file mode 100644 index bcccd344f..000000000 --- a/examples/animation/sub-attaq/mainwindow.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//Own -#include "mainwindow.h" -#include "graphicsscene.h" - -//Qt -#include - -#ifdef QT_NO_OPENGL - #include - #include - #include -#else - #include -#endif - -MainWindow::MainWindow() : QMainWindow(0) -{ - QMenuBar *menuBar = new QMenuBar; - QMenu *file = new QMenu(tr("&File"),menuBar); - - QAction *newAction = new QAction(tr("New Game"),file); - newAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_N)); - file->addAction(newAction); - QAction *quitAction = new QAction(tr("Quit"),file); - quitAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Q)); - file->addAction(quitAction); - - menuBar->addMenu(file); - setMenuBar(menuBar); - - QStringList list = QApplication::arguments(); - if (list.contains("-fullscreen")) { - scene = new GraphicsScene(0, 0, 750, 400,GraphicsScene::Small); - setWindowState(Qt::WindowFullScreen); - } else { - scene = new GraphicsScene(0, 0, 880, 630); - layout()->setSizeConstraint(QLayout::SetFixedSize); - } - - view = new QGraphicsView(scene,this); - view->setAlignment(Qt::AlignLeft | Qt::AlignTop); - QList actions; - actions << newAction << quitAction; - scene->setupScene(actions); -#ifndef QT_NO_OPENGL - view->setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers))); -#endif - - setCentralWidget(view); - -} - -MainWindow::~MainWindow() -{ -} - diff --git a/examples/animation/sub-attaq/mainwindow.h b/examples/animation/sub-attaq/mainwindow.h deleted file mode 100644 index 08cfcd988..000000000 --- a/examples/animation/sub-attaq/mainwindow.h +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef __MAINWINDOW__H__ -#define __MAINWINDOW__H__ - -//Qt -#include -class GraphicsScene; -QT_BEGIN_NAMESPACE -class QGraphicsView; -QT_END_NAMESPACE - -class MainWindow : public QMainWindow -{ -Q_OBJECT -public: - MainWindow(); - ~MainWindow(); - -private: - GraphicsScene *scene; - QGraphicsView *view; -}; - -#endif //__MAINWINDOW__H__ diff --git a/examples/animation/sub-attaq/pics/big/background.png b/examples/animation/sub-attaq/pics/big/background.png deleted file mode 100644 index 9f581571f..000000000 Binary files a/examples/animation/sub-attaq/pics/big/background.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/big/boat.png b/examples/animation/sub-attaq/pics/big/boat.png deleted file mode 100644 index be82dff62..000000000 Binary files a/examples/animation/sub-attaq/pics/big/boat.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/big/bomb.png b/examples/animation/sub-attaq/pics/big/bomb.png deleted file mode 100644 index 3af5f2f29..000000000 Binary files a/examples/animation/sub-attaq/pics/big/bomb.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step1.png b/examples/animation/sub-attaq/pics/big/explosion/boat/step1.png deleted file mode 100644 index c9fd8b098..000000000 Binary files a/examples/animation/sub-attaq/pics/big/explosion/boat/step1.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step2.png b/examples/animation/sub-attaq/pics/big/explosion/boat/step2.png deleted file mode 100644 index 7528f2d2d..000000000 Binary files a/examples/animation/sub-attaq/pics/big/explosion/boat/step2.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step3.png b/examples/animation/sub-attaq/pics/big/explosion/boat/step3.png deleted file mode 100644 index aae9c9c18..000000000 Binary files a/examples/animation/sub-attaq/pics/big/explosion/boat/step3.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step4.png b/examples/animation/sub-attaq/pics/big/explosion/boat/step4.png deleted file mode 100644 index d697c1bae..000000000 Binary files a/examples/animation/sub-attaq/pics/big/explosion/boat/step4.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png b/examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png deleted file mode 100644 index 88ca5144b..000000000 Binary files a/examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png b/examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png deleted file mode 100644 index 524f5890e..000000000 Binary files a/examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png b/examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png deleted file mode 100644 index 2cca1e80f..000000000 Binary files a/examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png b/examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png deleted file mode 100644 index 82100a826..000000000 Binary files a/examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/big/submarine.png b/examples/animation/sub-attaq/pics/big/submarine.png deleted file mode 100644 index df435dc47..000000000 Binary files a/examples/animation/sub-attaq/pics/big/submarine.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/big/surface.png b/examples/animation/sub-attaq/pics/big/surface.png deleted file mode 100644 index 4eba29e9c..000000000 Binary files a/examples/animation/sub-attaq/pics/big/surface.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/big/torpedo.png b/examples/animation/sub-attaq/pics/big/torpedo.png deleted file mode 100644 index f9c26873f..000000000 Binary files a/examples/animation/sub-attaq/pics/big/torpedo.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/scalable/background-n810.svg b/examples/animation/sub-attaq/pics/scalable/background-n810.svg deleted file mode 100644 index ece9f7aaf..000000000 --- a/examples/animation/sub-attaq/pics/scalable/background-n810.svg +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/animation/sub-attaq/pics/scalable/background.svg b/examples/animation/sub-attaq/pics/scalable/background.svg deleted file mode 100644 index 0be268010..000000000 --- a/examples/animation/sub-attaq/pics/scalable/background.svg +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/animation/sub-attaq/pics/scalable/boat.svg b/examples/animation/sub-attaq/pics/scalable/boat.svg deleted file mode 100644 index 5298821ba..000000000 --- a/examples/animation/sub-attaq/pics/scalable/boat.svg +++ /dev/null @@ -1,279 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/animation/sub-attaq/pics/scalable/bomb.svg b/examples/animation/sub-attaq/pics/scalable/bomb.svg deleted file mode 100644 index 294771a6d..000000000 --- a/examples/animation/sub-attaq/pics/scalable/bomb.svg +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/animation/sub-attaq/pics/scalable/sand.svg b/examples/animation/sub-attaq/pics/scalable/sand.svg deleted file mode 100644 index 8af11b7a6..000000000 --- a/examples/animation/sub-attaq/pics/scalable/sand.svg +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/animation/sub-attaq/pics/scalable/see.svg b/examples/animation/sub-attaq/pics/scalable/see.svg deleted file mode 100644 index 066669121..000000000 --- a/examples/animation/sub-attaq/pics/scalable/see.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - diff --git a/examples/animation/sub-attaq/pics/scalable/sky.svg b/examples/animation/sub-attaq/pics/scalable/sky.svg deleted file mode 100644 index 1546c087a..000000000 --- a/examples/animation/sub-attaq/pics/scalable/sky.svg +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - diff --git a/examples/animation/sub-attaq/pics/scalable/sub-attaq.svg b/examples/animation/sub-attaq/pics/scalable/sub-attaq.svg deleted file mode 100644 index b075179b4..000000000 --- a/examples/animation/sub-attaq/pics/scalable/sub-attaq.svg +++ /dev/null @@ -1,1473 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/animation/sub-attaq/pics/scalable/submarine.svg b/examples/animation/sub-attaq/pics/scalable/submarine.svg deleted file mode 100644 index 8a0ffddbc..000000000 --- a/examples/animation/sub-attaq/pics/scalable/submarine.svg +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/animation/sub-attaq/pics/scalable/surface.svg b/examples/animation/sub-attaq/pics/scalable/surface.svg deleted file mode 100644 index 40ed23963..000000000 --- a/examples/animation/sub-attaq/pics/scalable/surface.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/examples/animation/sub-attaq/pics/scalable/torpedo.svg b/examples/animation/sub-attaq/pics/scalable/torpedo.svg deleted file mode 100644 index 48e429d2b..000000000 --- a/examples/animation/sub-attaq/pics/scalable/torpedo.svg +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/animation/sub-attaq/pics/small/background.png b/examples/animation/sub-attaq/pics/small/background.png deleted file mode 100644 index 5ad3db660..000000000 Binary files a/examples/animation/sub-attaq/pics/small/background.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/small/boat.png b/examples/animation/sub-attaq/pics/small/boat.png deleted file mode 100644 index 114ccc310..000000000 Binary files a/examples/animation/sub-attaq/pics/small/boat.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/small/bomb.png b/examples/animation/sub-attaq/pics/small/bomb.png deleted file mode 100644 index 3af5f2f29..000000000 Binary files a/examples/animation/sub-attaq/pics/small/bomb.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/small/submarine.png b/examples/animation/sub-attaq/pics/small/submarine.png deleted file mode 100644 index 0c0c35060..000000000 Binary files a/examples/animation/sub-attaq/pics/small/submarine.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/small/surface.png b/examples/animation/sub-attaq/pics/small/surface.png deleted file mode 100644 index 06d0e47a5..000000000 Binary files a/examples/animation/sub-attaq/pics/small/surface.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/small/torpedo.png b/examples/animation/sub-attaq/pics/small/torpedo.png deleted file mode 100644 index f9c26873f..000000000 Binary files a/examples/animation/sub-attaq/pics/small/torpedo.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/welcome/logo-a.png b/examples/animation/sub-attaq/pics/welcome/logo-a.png deleted file mode 100644 index 67dd76dac..000000000 Binary files a/examples/animation/sub-attaq/pics/welcome/logo-a.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/welcome/logo-a2.png b/examples/animation/sub-attaq/pics/welcome/logo-a2.png deleted file mode 100644 index 17668b07d..000000000 Binary files a/examples/animation/sub-attaq/pics/welcome/logo-a2.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/welcome/logo-b.png b/examples/animation/sub-attaq/pics/welcome/logo-b.png deleted file mode 100644 index cf6c04560..000000000 Binary files a/examples/animation/sub-attaq/pics/welcome/logo-b.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/welcome/logo-dash.png b/examples/animation/sub-attaq/pics/welcome/logo-dash.png deleted file mode 100644 index 219233ce6..000000000 Binary files a/examples/animation/sub-attaq/pics/welcome/logo-dash.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/welcome/logo-excl.png b/examples/animation/sub-attaq/pics/welcome/logo-excl.png deleted file mode 100644 index 8dd0a2eb8..000000000 Binary files a/examples/animation/sub-attaq/pics/welcome/logo-excl.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/welcome/logo-q.png b/examples/animation/sub-attaq/pics/welcome/logo-q.png deleted file mode 100644 index 86e588d4d..000000000 Binary files a/examples/animation/sub-attaq/pics/welcome/logo-q.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/welcome/logo-s.png b/examples/animation/sub-attaq/pics/welcome/logo-s.png deleted file mode 100644 index 7b6a36e93..000000000 Binary files a/examples/animation/sub-attaq/pics/welcome/logo-s.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/welcome/logo-t.png b/examples/animation/sub-attaq/pics/welcome/logo-t.png deleted file mode 100644 index b2e3526be..000000000 Binary files a/examples/animation/sub-attaq/pics/welcome/logo-t.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/welcome/logo-t2.png b/examples/animation/sub-attaq/pics/welcome/logo-t2.png deleted file mode 100644 index b11a77886..000000000 Binary files a/examples/animation/sub-attaq/pics/welcome/logo-t2.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pics/welcome/logo-u.png b/examples/animation/sub-attaq/pics/welcome/logo-u.png deleted file mode 100644 index 24eede887..000000000 Binary files a/examples/animation/sub-attaq/pics/welcome/logo-u.png and /dev/null differ diff --git a/examples/animation/sub-attaq/pixmapitem.cpp b/examples/animation/sub-attaq/pixmapitem.cpp deleted file mode 100644 index ed0f07552..000000000 --- a/examples/animation/sub-attaq/pixmapitem.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//Own -#include "pixmapitem.h" - -//Qt -#include - -PixmapItem::PixmapItem(const QString &fileName,GraphicsScene::Mode mode, QGraphicsItem * parent) : QGraphicsPixmapItem(parent),name(fileName) -{ - loadPixmap(mode); -} - -void PixmapItem::loadPixmap(GraphicsScene::Mode mode) -{ - if (mode == GraphicsScene::Big) - setPixmap(":/big/" + name); - else - setPixmap(":/small/" + name); -} diff --git a/examples/animation/sub-attaq/pixmapitem.h b/examples/animation/sub-attaq/pixmapitem.h deleted file mode 100644 index e32973e1d..000000000 --- a/examples/animation/sub-attaq/pixmapitem.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef __PIXMAPITEM__H__ -#define __PIXMAPITEM__H__ - -//Own -#include "graphicsscene.h" - -//Qt -#include - -class PixmapItem : public QGraphicsPixmapItem -{ -public: - PixmapItem(const QString &fileName, GraphicsScene::Mode mode, QGraphicsItem * parent = 0); - -private: - void loadPixmap(GraphicsScene::Mode mode); - - QString name; - QPixmap pixmap; -}; - -#endif //__PIXMAPITEM__H__ diff --git a/examples/animation/sub-attaq/progressitem.cpp b/examples/animation/sub-attaq/progressitem.cpp deleted file mode 100644 index 9ccaa72d8..000000000 --- a/examples/animation/sub-attaq/progressitem.cpp +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "progressitem.h" -#include "pixmapitem.h" - -ProgressItem::ProgressItem (QGraphicsItem * parent) - : QGraphicsTextItem(parent), currentLevel(1), currentScore(0) -{ - setFont(QFont("Comic Sans MS")); - setPos(parentItem()->boundingRect().topRight() - QPointF(180, -5)); -} - -void ProgressItem::setLevel(int level) -{ - currentLevel = level; - updateProgress(); -} - -void ProgressItem::setScore(int score) -{ - currentScore = score; - updateProgress(); -} - -void ProgressItem::updateProgress() -{ - setHtml(QString("Level : %1 Score : %2").arg(currentLevel).arg(currentScore)); -} diff --git a/examples/animation/sub-attaq/progressitem.h b/examples/animation/sub-attaq/progressitem.h deleted file mode 100644 index 7be57c9a2..000000000 --- a/examples/animation/sub-attaq/progressitem.h +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef PROGRESSITEM_H -#define PROGRESSITEM_H - -//Qt -#include - -class ProgressItem : public QGraphicsTextItem -{ -public: - ProgressItem(QGraphicsItem * parent = 0); - void setLevel(int level); - void setScore(int score); - -private: - void updateProgress(); - int currentLevel; - int currentScore; -}; - -#endif // PROGRESSITEM_H diff --git a/examples/animation/sub-attaq/qanimationstate.cpp b/examples/animation/sub-attaq/qanimationstate.cpp deleted file mode 100644 index 4e6df565c..000000000 --- a/examples/animation/sub-attaq/qanimationstate.cpp +++ /dev/null @@ -1,150 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qanimationstate.h" - -#include - -QT_BEGIN_NAMESPACE - -/*! -\class QAnimationState - -\brief The QAnimationState class provides state that handle an animation and emit -a signal when this animation is finished. - -\ingroup statemachine - -QAnimationState provides a state that handle an animation. It will start this animation -when the state is entered and stop it when it is leaved. When the animation has finished the -state emit animationFinished signal. -QAnimationState is part of \l{The State Machine Framework}. - -\code -QStateMachine machine; -QAnimationState *s = new QAnimationState(machine->rootState()); -QPropertyAnimation *animation = new QPropertyAnimation(obj, "pos"); -s->setAnimation(animation); -QState *s2 = new QState(machine->rootState()); -s->addTransition(s, SIGNAL(animationFinished()), s2); -machine.start(); -\endcode - -\sa QState, {The Animation Framework} -*/ - - -#ifndef QT_NO_ANIMATION - -/*! - Constructs a new state with the given \a parent state. -*/ -QAnimationState::QAnimationState(QState *parent) - : QState(parent), m_animation(0) -{ -} - -/*! - Destroys the animation state. -*/ -QAnimationState::~QAnimationState() -{ -} - -/*! - Set an \a animation for this QAnimationState. If an animation was previously handle by this - state then it won't emit animationFinished for the old animation. The QAnimationState doesn't - take the ownership of the animation. -*/ -void QAnimationState::setAnimation(QAbstractAnimation *animation) -{ - if (animation == m_animation) - return; - - //Disconnect from the previous animation if exist - if(m_animation) - disconnect(m_animation, SIGNAL(finished()), this, SIGNAL(animationFinished())); - - m_animation = animation; - - if (m_animation) { - //connect the new animation - connect(m_animation, SIGNAL(finished()), this, SIGNAL(animationFinished())); - } -} - -/*! - Returns the animation handle by this animation state, or 0 if there is no animation. -*/ -QAbstractAnimation* QAnimationState::animation() const -{ - return m_animation; -} - -/*! - \reimp -*/ -void QAnimationState::onEntry(QEvent *) -{ - if (m_animation) - m_animation->start(); -} - -/*! - \reimp -*/ -void QAnimationState::onExit(QEvent *) -{ - if (m_animation) - m_animation->stop(); -} - -/*! - \reimp -*/ -bool QAnimationState::event(QEvent *e) -{ - return QState::event(e); -} - -QT_END_NAMESPACE - -#endif diff --git a/examples/animation/sub-attaq/qanimationstate.h b/examples/animation/sub-attaq/qanimationstate.h deleted file mode 100644 index 6c5b565f8..000000000 --- a/examples/animation/sub-attaq/qanimationstate.h +++ /dev/null @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QANIMATIONSTATE_H -#define QANIMATIONSTATE_H - -#ifndef QT_STATEMACHINE_SOLUTION -# include -# include -#else -# include "qstate.h" -# include "qabstractanimation.h" -#endif - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) - -#ifndef QT_NO_ANIMATION - -class QAbstractAnimation; - -class QAnimationState : public QState -{ - Q_OBJECT -public: - QAnimationState(QState *parent = 0); - ~QAnimationState(); - - void setAnimation(QAbstractAnimation *animation); - QAbstractAnimation* animation() const; - -signals: - void animationFinished(); - -protected: - void onEntry(QEvent *); - void onExit(QEvent *); - bool event(QEvent *e); - -private: - Q_DISABLE_COPY(QAnimationState) - QAbstractAnimation *m_animation; -}; - -#endif - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QANIMATIONSTATE_H diff --git a/examples/animation/sub-attaq/states.cpp b/examples/animation/sub-attaq/states.cpp deleted file mode 100644 index d63737f52..000000000 --- a/examples/animation/sub-attaq/states.cpp +++ /dev/null @@ -1,325 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//Own -#include "states.h" -#include "graphicsscene.h" -#include "boat.h" -#include "submarine.h" -#include "torpedo.h" -#include "animationmanager.h" -#include "progressitem.h" - -//Qt -#include -#include -#include -#include -#include -#include - -PlayState::PlayState(GraphicsScene *scene, QState *parent) - : QState(parent), - scene(scene), - machine(0), - currentLevel(0), - score(0) -{ -} - -PlayState::~PlayState() -{ -} - -void PlayState::onEntry(QEvent *) -{ - //We are now playing? - if (machine) { - machine->stop(); - scene->clearScene(); - currentLevel = 0; - score = 0; - delete machine; - } - - machine = new QStateMachine(this); - - //This state is when player is playing - LevelState *levelState = new LevelState(scene, this, machine); - - //This state is when the player is actually playing but the game is not paused - QState *playingState = new QState(levelState); - levelState->setInitialState(playingState); - - //This state is when the game is paused - PauseState *pauseState = new PauseState(scene, levelState); - - //We have one view, it receive the key press event - QKeyEventTransition *pressPplay = new QKeyEventTransition(scene->views().at(0), QEvent::KeyPress, Qt::Key_P); - pressPplay->setTargetState(pauseState); - QKeyEventTransition *pressPpause = new QKeyEventTransition(scene->views().at(0), QEvent::KeyPress, Qt::Key_P); - pressPpause->setTargetState(playingState); - - //Pause "P" is triggered, the player pause the game - playingState->addTransition(pressPplay); - - //To get back playing when the game has been paused - pauseState->addTransition(pressPpause); - - //This state is when player have lost - LostState *lostState = new LostState(scene, this, machine); - - //This state is when player have won - WinState *winState = new WinState(scene, this, machine); - - //The boat has been destroyed then the game is finished - levelState->addTransition(scene->boat, SIGNAL(boatExecutionFinished()),lostState); - - //This transition check if we won or not - WinTransition *winTransition = new WinTransition(scene, this, winState); - - //The boat has been destroyed then the game is finished - levelState->addTransition(winTransition); - - //This state is an animation when the score changed - UpdateScoreState *scoreState = new UpdateScoreState(this, levelState); - - //This transition update the score when a submarine die - UpdateScoreTransition *scoreTransition = new UpdateScoreTransition(scene, this, levelState); - scoreTransition->setTargetState(scoreState); - - //The boat has been destroyed then the game is finished - playingState->addTransition(scoreTransition); - - //We go back to play state - scoreState->addTransition(playingState); - - //We start playing!!! - machine->setInitialState(levelState); - - //Final state - QFinalState *final = new QFinalState(machine); - - //This transition is triggered when the player press space after completing a level - CustomSpaceTransition *spaceTransition = new CustomSpaceTransition(scene->views().at(0), this, QEvent::KeyPress, Qt::Key_Space); - spaceTransition->setTargetState(levelState); - winState->addTransition(spaceTransition); - - //We lost we should reach the final state - lostState->addTransition(lostState, SIGNAL(finished()), final); - - machine->start(); -} - -LevelState::LevelState(GraphicsScene *scene, PlayState *game, QState *parent) : QState(parent), scene(scene), game(game) -{ -} -void LevelState::onEntry(QEvent *) -{ - initializeLevel(); -} - -void LevelState::initializeLevel() -{ - //we re-init the boat - scene->boat->setPos(scene->width()/2, scene->sealLevel() - scene->boat->size().height()); - scene->boat->setCurrentSpeed(0); - scene->boat->setCurrentDirection(Boat::None); - scene->boat->setBombsLaunched(0); - scene->boat->show(); - scene->setFocusItem(scene->boat,Qt::OtherFocusReason); - scene->boat->run(); - - scene->progressItem->setScore(game->score); - scene->progressItem->setLevel(game->currentLevel + 1); - - GraphicsScene::LevelDescription currentLevelDescription = scene->levelsData.value(game->currentLevel); - - for (int i = 0; i < currentLevelDescription.submarines.size(); ++i ) { - - QPair subContent = currentLevelDescription.submarines.at(i); - GraphicsScene::SubmarineDescription submarineDesc = scene->submarinesData.at(subContent.first); - - for (int j = 0; j < subContent.second; ++j ) { - SubMarine *sub = new SubMarine(submarineDesc.type, submarineDesc.name, submarineDesc.points); - scene->addItem(sub); - int random = (qrand() % 15 + 1); - qreal x = random == 13 || random == 5 ? 0 : scene->width() - sub->size().width(); - qreal y = scene->height() -(qrand() % 150 + 1) - sub->size().height(); - sub->setPos(x,y); - sub->setCurrentDirection(x == 0 ? SubMarine::Right : SubMarine::Left); - sub->setCurrentSpeed(qrand() % 3 + 1); - } - } -} - -/** Pause State */ -PauseState::PauseState(GraphicsScene *scene, QState *parent) : QState(parent),scene(scene) -{ -} -void PauseState::onEntry(QEvent *) -{ - AnimationManager::self()->pauseAll(); - scene->boat->setEnabled(false); -} -void PauseState::onExit(QEvent *) -{ - AnimationManager::self()->resumeAll(); - scene->boat->setEnabled(true); - scene->boat->setFocus(); -} - -/** Lost State */ -LostState::LostState(GraphicsScene *scene, PlayState *game, QState *parent) : QState(parent), scene(scene), game(game) -{ -} - -void LostState::onEntry(QEvent *) -{ - //The message to display - QString message = QString("You lose on level %1. Your score is %2.").arg(game->currentLevel+1).arg(game->score); - - //We set the level back to 0 - game->currentLevel = 0; - - //We set the score back to 0 - game->score = 0; - - //We clear the scene - scene->clearScene(); - - //we have only one view - QMessageBox::information(scene->views().at(0),"You lose",message); -} - -/** Win State */ -WinState::WinState(GraphicsScene *scene, PlayState *game, QState *parent) : QState(parent), scene(scene), game(game) -{ -} - -void WinState::onEntry(QEvent *) -{ - //We clear the scene - scene->clearScene(); - - QString message; - if (scene->levelsData.size() - 1 != game->currentLevel) { - message = QString("You win the level %1. Your score is %2.\nPress Space to continue after closing this dialog.").arg(game->currentLevel+1).arg(game->score); - //We increment the level number - game->currentLevel++; - } else { - message = QString("You finish the game on level %1. Your score is %2.").arg(game->currentLevel+1).arg(game->score); - //We set the level back to 0 - game->currentLevel = 0; - //We set the score back to 0 - game->score = 0; - } - - //we have only one view - QMessageBox::information(scene->views().at(0),"You win",message); -} - -/** UpdateScore State */ -UpdateScoreState::UpdateScoreState(PlayState *game, QState *parent) : QState(parent) -{ - this->game = game; -} -void UpdateScoreState::onEntry(QEvent *e) -{ - QState::onEntry(e); -} - -/** Win transition */ -UpdateScoreTransition::UpdateScoreTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target) - : QSignalTransition(scene,SIGNAL(subMarineDestroyed(int)), QList() << target), - game(game), scene(scene) -{ -} - -bool UpdateScoreTransition::eventTest(QEvent *event) -{ - if (!QSignalTransition::eventTest(event)) - return false; - else { - QSignalEvent *se = static_cast(event); - game->score += se->arguments().at(0).toInt(); - scene->progressItem->setScore(game->score); - return true; - } -} - -/** Win transition */ -WinTransition::WinTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target) - : QSignalTransition(scene,SIGNAL(allSubMarineDestroyed(int)), QList() << target), - game(game), scene(scene) -{ -} - -bool WinTransition::eventTest(QEvent *event) -{ - if (!QSignalTransition::eventTest(event)) - return false; - else { - QSignalEvent *se = static_cast(event); - game->score += se->arguments().at(0).toInt(); - scene->progressItem->setScore(game->score); - return true; - } -} - -/** Space transition */ -CustomSpaceTransition::CustomSpaceTransition(QWidget *widget, PlayState *game, QEvent::Type type, int key) - : QKeyEventTransition(widget, type, key), - game(game) -{ -} - -bool CustomSpaceTransition::eventTest(QEvent *event) -{ - Q_UNUSED(event); - if (!QKeyEventTransition::eventTest(event)) - return false; - if (game->currentLevel != 0) - return true; - else - return false; - -} diff --git a/examples/animation/sub-attaq/states.h b/examples/animation/sub-attaq/states.h deleted file mode 100644 index c3d81e7ab..000000000 --- a/examples/animation/sub-attaq/states.h +++ /dev/null @@ -1,180 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef STATES_H -#define STATES_H - -//Qt -#include -#include -#include -#include -#include - -class GraphicsScene; -class Boat; -class SubMarine; -QT_BEGIN_NAMESPACE -class QStateMachine; -QT_END_NAMESPACE - -class PlayState : public QState -{ -public: - PlayState(GraphicsScene *scene, QState *parent = 0); - ~PlayState(); - - protected: - void onEntry(QEvent *); - -private : - GraphicsScene *scene; - QStateMachine *machine; - int currentLevel; - int score; - QState *parallelChild; - - friend class UpdateScoreState; - friend class UpdateScoreTransition; - friend class WinTransition; - friend class CustomSpaceTransition; - friend class WinState; - friend class LostState; - friend class LevelState; -}; - -class LevelState : public QState -{ -public: - LevelState(GraphicsScene *scene, PlayState *game, QState *parent = 0); -protected: - void onEntry(QEvent *); -private : - void initializeLevel(); - GraphicsScene *scene; - PlayState *game; -}; - -class PauseState : public QState -{ -public: - PauseState(GraphicsScene *scene, QState *parent = 0); - -protected: - void onEntry(QEvent *); - void onExit(QEvent *); -private : - GraphicsScene *scene; - Boat *boat; -}; - -class LostState : public QState -{ -public: - LostState(GraphicsScene *scene, PlayState *game, QState *parent = 0); - -protected: - void onEntry(QEvent *); -private : - GraphicsScene *scene; - PlayState *game; -}; - -class WinState : public QState -{ -public: - WinState(GraphicsScene *scene, PlayState *game, QState *parent = 0); - -protected: - void onEntry(QEvent *); -private : - GraphicsScene *scene; - PlayState *game; -}; - -class UpdateScoreState : public QState -{ -public: - UpdateScoreState(PlayState *game, QState *parent); -protected: - void onEntry(QEvent *); -private: - QPropertyAnimation *scoreAnimation; - PlayState *game; -}; - -//These transtion is used to update the score -class UpdateScoreTransition : public QSignalTransition -{ -public: - UpdateScoreTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target); -protected: - virtual bool eventTest(QEvent *event); -private: - PlayState * game; - GraphicsScene *scene; -}; - -//These transtion test if we have won the game -class WinTransition : public QSignalTransition -{ -public: - WinTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target); -protected: - virtual bool eventTest(QEvent *event); -private: - PlayState * game; - GraphicsScene *scene; -}; - -//These transtion is true if one level has been completed and the player want to continue - class CustomSpaceTransition : public QKeyEventTransition -{ -public: - CustomSpaceTransition(QWidget *widget, PlayState *game, QEvent::Type type, int key); -protected: - virtual bool eventTest(QEvent *event); -private: - PlayState *game; - int key; -}; - -#endif // STATES_H diff --git a/examples/animation/sub-attaq/sub-attaq.pro b/examples/animation/sub-attaq/sub-attaq.pro deleted file mode 100644 index d13a0998b..000000000 --- a/examples/animation/sub-attaq/sub-attaq.pro +++ /dev/null @@ -1,36 +0,0 @@ -contains(QT_CONFIG, opengl):QT += opengl - -HEADERS += boat.h \ - bomb.h \ - mainwindow.h \ - submarine.h \ - torpedo.h \ - pixmapitem.h \ - graphicsscene.h \ - animationmanager.h \ - states.h \ - boat_p.h \ - submarine_p.h \ - custompropertyanimation.h \ - qanimationstate.h \ - progressitem.h -SOURCES += boat.cpp \ - bomb.cpp \ - main.cpp \ - mainwindow.cpp \ - submarine.cpp \ - torpedo.cpp \ - pixmapitem.cpp \ - graphicsscene.cpp \ - animationmanager.cpp \ - states.cpp \ - custompropertyanimation.cpp \ - qanimationstate.cpp \ - progressitem.cpp -RESOURCES += subattaq.qrc - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/animation/sub-attaq -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sub-attaq.pro pics -sources.path = $$[QT_INSTALL_EXAMPLES]/animation/sub-attaq -INSTALLS += target sources diff --git a/examples/animation/sub-attaq/subattaq.qrc b/examples/animation/sub-attaq/subattaq.qrc deleted file mode 100644 index 80a3af11c..000000000 --- a/examples/animation/sub-attaq/subattaq.qrc +++ /dev/null @@ -1,39 +0,0 @@ - - - pics/scalable/sub-attaq.svg - pics/scalable/submarine.svg - pics/scalable/boat.svg - pics/scalable/torpedo.svg - pics/welcome/logo-s.png - pics/welcome/logo-u.png - pics/welcome/logo-b.png - pics/welcome/logo-dash.png - pics/welcome/logo-a.png - pics/welcome/logo-t.png - pics/welcome/logo-t2.png - pics/welcome/logo-a2.png - pics/welcome/logo-q.png - pics/welcome/logo-excl.png - pics/big/background.png - pics/big/boat.png - pics/big/bomb.png - pics/big/submarine.png - pics/big/surface.png - pics/big/torpedo.png - pics/small/background.png - pics/small/boat.png - pics/small/bomb.png - pics/small/submarine.png - pics/small/surface.png - pics/small/torpedo.png - pics/big/explosion/boat/step1.png - pics/big/explosion/boat/step2.png - pics/big/explosion/boat/step3.png - pics/big/explosion/boat/step4.png - pics/big/explosion/submarine/step1.png - pics/big/explosion/submarine/step2.png - pics/big/explosion/submarine/step3.png - pics/big/explosion/submarine/step4.png - data.xml - - diff --git a/examples/animation/sub-attaq/submarine.cpp b/examples/animation/sub-attaq/submarine.cpp deleted file mode 100644 index 78a953989..000000000 --- a/examples/animation/sub-attaq/submarine.cpp +++ /dev/null @@ -1,211 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//Own -#include "submarine.h" -#include "submarine_p.h" -#include "torpedo.h" -#include "pixmapitem.h" -#include "graphicsscene.h" -#include "animationmanager.h" -#include "custompropertyanimation.h" -#include "qanimationstate.h" - -#include -#include -#include -#include - -static QAbstractAnimation *setupDestroyAnimation(SubMarine *sub) -{ - QSequentialAnimationGroup *group = new QSequentialAnimationGroup(sub); -#if QT_VERSION >=0x040500 - PixmapItem *step1 = new PixmapItem(QString("explosion/submarine/step1"),GraphicsScene::Big, sub); - step1->setZValue(6); - PixmapItem *step2 = new PixmapItem(QString("explosion/submarine/step2"),GraphicsScene::Big, sub); - step2->setZValue(6); - PixmapItem *step3 = new PixmapItem(QString("explosion/submarine/step3"),GraphicsScene::Big, sub); - step3->setZValue(6); - PixmapItem *step4 = new PixmapItem(QString("explosion/submarine/step4"),GraphicsScene::Big, sub); - step4->setZValue(6); - step1->setOpacity(0); - step2->setOpacity(0); - step3->setOpacity(0); - step4->setOpacity(0); - CustomPropertyAnimation *anim1 = new CustomPropertyAnimation(sub); - anim1->setMemberFunctions((QGraphicsItem*)step1, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); - anim1->setDuration(100); - anim1->setEndValue(1); - CustomPropertyAnimation *anim2 = new CustomPropertyAnimation(sub); - anim2->setMemberFunctions((QGraphicsItem*)step2, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); - anim2->setDuration(100); - anim2->setEndValue(1); - CustomPropertyAnimation *anim3 = new CustomPropertyAnimation(sub); - anim3->setMemberFunctions((QGraphicsItem*)step3, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); - anim3->setDuration(100); - anim3->setEndValue(1); - CustomPropertyAnimation *anim4 = new CustomPropertyAnimation(sub); - anim4->setMemberFunctions((QGraphicsItem*)step4, &QGraphicsItem::opacity, &QGraphicsItem::setOpacity); - anim4->setDuration(100); - anim4->setEndValue(1); - group->addAnimation(anim1); - group->addAnimation(anim2); - group->addAnimation(anim3); - group->addAnimation(anim4); -#else - // work around for a bug where we don't transition if the duration is zero. - QtPauseAnimation *anim = new QtPauseAnimation(group); - anim->setDuration(1); - group->addAnimation(anim); -#endif - AnimationManager::self()->registerAnimation(group); - return group; -} - - -SubMarine::SubMarine(int type, const QString &name, int points, QGraphicsItem * parent, Qt::WindowFlags wFlags) - : QGraphicsWidget(parent,wFlags), subType(type), subName(name), subPoints(points), speed(0), direction(SubMarine::None) -{ - pixmapItem = new PixmapItem(QString("submarine"),GraphicsScene::Big, this); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - setZValue(5); - setFlags(QGraphicsItem::ItemIsMovable); - resize(pixmapItem->boundingRect().width(),pixmapItem->boundingRect().height()); - setTransformOrigin(boundingRect().center()); - - //We setup the state machine of the submarine - QStateMachine *machine = new QStateMachine(this); - - //This state is when the boat is moving/rotating - QState *moving = new QState(machine); - - //This state is when the boat is moving from left to right - MovementState *movement = new MovementState(this, moving); - - //This state is when the boat is moving from left to right - ReturnState *rotation = new ReturnState(this, moving); - - //This is the initial state of the moving root state - moving->setInitialState(movement); - - movement->addTransition(this, SIGNAL(subMarineStateChanged()), moving); - - //This is the initial state of the machine - machine->setInitialState(moving); - - //End - QFinalState *final = new QFinalState(machine); - - //If the moving animation is finished we move to the return state - movement->addTransition(movement, SIGNAL(animationFinished()), rotation); - - //If the return animation is finished we move to the moving state - rotation->addTransition(rotation, SIGNAL(animationFinished()), movement); - - //This state play the destroyed animation - QAnimationState *destroyedState = new QAnimationState(machine); - destroyedState->setAnimation(setupDestroyAnimation(this)); - - //Play a nice animation when the submarine is destroyed - moving->addTransition(this, SIGNAL(subMarineDestroyed()), destroyedState); - - //Transition to final state when the destroyed animation is finished - destroyedState->addTransition(destroyedState, SIGNAL(animationFinished()), final); - - //The machine has finished to be executed, then the submarine is dead - connect(machine,SIGNAL(finished()),this, SIGNAL(subMarineExecutionFinished())); - - machine->start(); -} - -int SubMarine::points() -{ - return subPoints; -} - -void SubMarine::setCurrentDirection(SubMarine::Movement direction) -{ - if (this->direction == direction) - return; - if (direction == SubMarine::Right && this->direction == SubMarine::None) { - setYRotation(180); - } - this->direction = direction; -} - -enum SubMarine::Movement SubMarine::currentDirection() const -{ - return direction; -} - -void SubMarine::setCurrentSpeed(int speed) -{ - if (speed < 0 || speed > 3) { - qWarning("SubMarine::setCurrentSpeed : The speed is invalid"); - } - this->speed = speed; - emit subMarineStateChanged(); -} - -int SubMarine::currentSpeed() const -{ - return speed; -} - -void SubMarine::launchTorpedo(int speed) -{ - Torpedo * torp = new Torpedo(); - GraphicsScene *scene = static_cast(this->scene()); - scene->addItem(torp); - torp->setPos(x(), y()); - torp->setCurrentSpeed(speed); - torp->launch(); -} - -void SubMarine::destroy() -{ - emit subMarineDestroyed(); -} - -int SubMarine::type() const -{ - return Type; -} diff --git a/examples/animation/sub-attaq/submarine.h b/examples/animation/sub-attaq/submarine.h deleted file mode 100644 index 481e81633..000000000 --- a/examples/animation/sub-attaq/submarine.h +++ /dev/null @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef __SUBMARINE__H__ -#define __SUBMARINE__H__ - -//Qt -#include -#include - -class PixmapItem; - -class Torpedo; - -class SubMarine : public QGraphicsWidget -{ -Q_OBJECT -public: - enum Movement { - None = 0, - Left, - Right - }; - enum { Type = UserType + 1 }; - SubMarine(int type, const QString &name, int points, QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0); - - int points(); - - void setCurrentDirection(Movement direction); - enum Movement currentDirection() const; - - void setCurrentSpeed(int speed); - int currentSpeed() const; - - void launchTorpedo(int speed); - void destroy(); - - virtual int type() const; - -signals: - void subMarineDestroyed(); - void subMarineExecutionFinished(); - void subMarineStateChanged(); - -private: - int subType; - QString subName; - int subPoints; - int speed; - Movement direction; - PixmapItem *pixmapItem; -}; - -#endif //__SUBMARINE__H__ diff --git a/examples/animation/sub-attaq/submarine_p.h b/examples/animation/sub-attaq/submarine_p.h deleted file mode 100644 index e8df877e8..000000000 --- a/examples/animation/sub-attaq/submarine_p.h +++ /dev/null @@ -1,139 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef SUBMARINE_P_H -#define SUBMARINE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -//Own -#include "animationmanager.h" -#include "submarine.h" -#include "qanimationstate.h" - -//Qt -#include -#include - -//This state is describing when the boat is moving right -class MovementState : public QAnimationState -{ -Q_OBJECT -public: - MovementState(SubMarine *submarine, QState *parent = 0) : QAnimationState(parent) - { - movementAnimation = new QPropertyAnimation(submarine, "pos"); - connect(movementAnimation,SIGNAL(valueChanged(const QVariant &)),this,SLOT(onAnimationMovementValueChanged(const QVariant &))); - setAnimation(movementAnimation); - AnimationManager::self()->registerAnimation(movementAnimation); - this->submarine = submarine; - } - -protected slots: - void onAnimationMovementValueChanged(const QVariant &) - { - if (qrand() % 200 + 1 == 3) - submarine->launchTorpedo(qrand() % 3 + 1); - } - -protected: - void onEntry(QEvent *e) - { - if (submarine->currentDirection() == SubMarine::Left) { - movementAnimation->setEndValue(QPointF(0,submarine->y())); - movementAnimation->setDuration(submarine->x()/submarine->currentSpeed()*12); - } - else /*if (submarine->currentDirection() == SubMarine::Right)*/ { - movementAnimation->setEndValue(QPointF(submarine->scene()->width()-submarine->size().width(),submarine->y())); - movementAnimation->setDuration((submarine->scene()->width()-submarine->size().width()-submarine->x())/submarine->currentSpeed()*12); - } - movementAnimation->setStartValue(submarine->pos()); - QAnimationState::onEntry(e); - } - -private: - SubMarine *submarine; - QPropertyAnimation *movementAnimation; -}; - -//This state is describing when the boat is moving right -class ReturnState : public QAnimationState -{ -public: - ReturnState(SubMarine *submarine, QState *parent = 0) : QAnimationState(parent) - { - returnAnimation = new QPropertyAnimation(submarine, "yRotation"); - AnimationManager::self()->registerAnimation(returnAnimation); - setAnimation(returnAnimation); - this->submarine = submarine; - } - -protected: - void onEntry(QEvent *e) - { - returnAnimation->stop(); - returnAnimation->setStartValue(submarine->yRotation()); - returnAnimation->setEndValue(submarine->currentDirection() == SubMarine::Right ? 360. : 180.); - returnAnimation->setDuration(500); - QAnimationState::onEntry(e); - } - - void onExit(QEvent *e) - { - submarine->currentDirection() == SubMarine::Right ? submarine->setCurrentDirection(SubMarine::Left) : submarine->setCurrentDirection(SubMarine::Right); - QAnimationState::onExit(e); - } - -private: - SubMarine *submarine; - QPropertyAnimation *returnAnimation; -}; - -#endif // SUBMARINE_P_H diff --git a/examples/animation/sub-attaq/torpedo.cpp b/examples/animation/sub-attaq/torpedo.cpp deleted file mode 100644 index fe79488c5..000000000 --- a/examples/animation/sub-attaq/torpedo.cpp +++ /dev/null @@ -1,120 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//Own -#include "torpedo.h" -#include "pixmapitem.h" -#include "boat.h" -#include "graphicsscene.h" -#include "animationmanager.h" -#include "qanimationstate.h" - -#include -#include -#include - -Torpedo::Torpedo(QGraphicsItem * parent, Qt::WindowFlags wFlags) - : QGraphicsWidget(parent,wFlags), currentSpeed(0), launchAnimation(0) -{ - pixmapItem = new PixmapItem(QString::fromLatin1("torpedo"),GraphicsScene::Big, this); - setZValue(2); - setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - setFlags(QGraphicsItem::ItemIsMovable); - resize(pixmapItem->boundingRect().size()); -} - -void Torpedo::launch() -{ - launchAnimation = new QPropertyAnimation(this, "pos"); - AnimationManager::self()->registerAnimation(launchAnimation); - launchAnimation->setEndValue(QPointF(x(),qobject_cast(scene())->sealLevel() - 15)); - launchAnimation->setEasingCurve(QEasingCurve::InQuad); - launchAnimation->setDuration(y()/currentSpeed*10); - connect(launchAnimation,SIGNAL(valueChanged(const QVariant &)),this,SLOT(onAnimationLaunchValueChanged(const QVariant &))); - - //We setup the state machine of the torpedo - QStateMachine *machine = new QStateMachine(this); - - //This state is when the launch animation is playing - QAnimationState *launched = new QAnimationState(machine); - launched->setAnimation(launchAnimation); - - //End - QFinalState *final = new QFinalState(machine); - - machine->setInitialState(launched); - - //### Add a nice animation when the torpedo is destroyed - launched->addTransition(this, SIGNAL(torpedoExplosed()),final); - - //If the animation is finished, then we move to the final state - launched->addTransition(launched, SIGNAL(animationFinished()), final); - - //The machine has finished to be executed, then the boat is dead - connect(machine,SIGNAL(finished()),this, SIGNAL(torpedoExecutionFinished())); - - machine->start(); -} - -void Torpedo::setCurrentSpeed(int speed) -{ - if (speed < 0) { - qWarning("Torpedo::setCurrentSpeed : The speed is invalid"); - return; - } - currentSpeed = speed; -} - -void Torpedo::onAnimationLaunchValueChanged(const QVariant &) -{ - foreach (QGraphicsItem *item , collidingItems(Qt::IntersectsItemBoundingRect)) { - if (item->type() == Boat::Type) { - Boat *b = static_cast(item); - b->destroy(); - } - } -} - -void Torpedo::destroy() -{ - launchAnimation->stop(); - emit torpedoExplosed(); -} diff --git a/examples/animation/sub-attaq/torpedo.h b/examples/animation/sub-attaq/torpedo.h deleted file mode 100644 index c44037fbe..000000000 --- a/examples/animation/sub-attaq/torpedo.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef __TORPEDO__H__ -#define __TORPEDO__H__ - -//Qt -#include - -#include -#include - -class PixmapItem; - -class Torpedo : public QGraphicsWidget -{ -Q_OBJECT -public: - Torpedo(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = 0); - void launch(); - void setCurrentSpeed(int speed); - void destroy(); - -signals: - void torpedoExplosed(); - void torpedoExecutionFinished(); - -private slots: - void onAnimationLaunchValueChanged(const QVariant &); - -private: - int currentSpeed; - PixmapItem *pixmapItem; - QVariantAnimation *launchAnimation; -}; - -#endif //__TORPEDO__H__ -- cgit v1.2.3 From e70af37dba3defc0f1b0a08cb5770d3662f3f0ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Wed, 1 Jul 2009 17:25:49 +0200 Subject: Fixed incorrect QGLFramebufferObject documentation. Reviewed-by: Gunnar Sletta --- src/opengl/qglframebufferobject.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index 3685661c7..abec78a19 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -746,8 +746,11 @@ QGLFramebufferObject::~QGLFramebufferObject() The framebuffer can become invalid if the initialization process fails, the user attaches an invalid buffer to the framebuffer - object, or a non-power of 2 width/height is specified as the + object, or a non-power of two width/height is specified as the texture size if the texture target is \c{GL_TEXTURE_2D}. + The non-power of two limitation does not apply if the OpenGL version + is 2.0 or higher, or if the GL_ARB_texture_non_power_of_two extension + is present. */ bool QGLFramebufferObject::isValid() const { -- cgit v1.2.3 From 1d81d6c163bad6ffe2914ee7e7cc71bb25cb5181 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Tue, 28 Jul 2009 11:55:18 +0200 Subject: Added QVectorPath::convertToPainterPath() for future convenience --- src/gui/painting/qpaintengineex.cpp | 34 ++++++++++++++++++++++++++++++++++ src/gui/painting/qvectorpath_p.h | 2 ++ 2 files changed, 36 insertions(+) diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index 797a5ab65..ce4f7fd69 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -91,6 +91,40 @@ QRectF QVectorPath::controlPointRect() const return QRectF(QPointF(m_cp_rect.x1, m_cp_rect.y1), QPointF(m_cp_rect.x2, m_cp_rect.y2)); } +QPainterPath QVectorPath::convertToPainterPath() const +{ + QPainterPath path; + + if (m_count == 0) + return path; + + const QPointF *points = (const QPointF *) m_points; + + if (m_elements) { + for (int i=0; i Date: Tue, 28 Jul 2009 12:00:50 +0200 Subject: Kill QRasterPaintEngine::drawPath() to benefit from QPaintEngEx optims --- src/gui/painting/qpaintengine_raster.cpp | 89 -------------------------------- src/gui/painting/qpaintengine_raster_p.h | 2 - 2 files changed, 91 deletions(-) diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index dfd3e16a2..69e490a5a 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -1672,34 +1672,6 @@ void QRasterPaintEngine::drawRects(const QRectF *rects, int rectCount) QPaintEngineEx::drawRects(rects, rectCount); } -void QRasterPaintEnginePrivate::strokeProjective(const QPainterPath &path) -{ - Q_Q(QRasterPaintEngine); - QRasterPaintEngineState *s = q->state(); - - const QPen &pen = s->lastPen; - QPainterPathStroker pathStroker; - pathStroker.setWidth(pen.width() == 0 ? qreal(1) : pen.width()); - pathStroker.setCapStyle(pen.capStyle()); - pathStroker.setJoinStyle(pen.joinStyle()); - pathStroker.setMiterLimit(pen.miterLimit()); - pathStroker.setDashOffset(pen.dashOffset()); - - if (qpen_style(pen) == Qt::CustomDashLine) - pathStroker.setDashPattern(pen.dashPattern()); - else - pathStroker.setDashPattern(qpen_style(pen)); - - outlineMapper->setMatrix(QTransform()); - const QPainterPath stroke = pen.isCosmetic() - ? pathStroker.createStroke(s->matrix.map(path)) - : s->matrix.map(pathStroker.createStroke(path)); - - rasterize(outlineMapper->convertPath(stroke), s->penData.blend, &s->penData, rasterBuffer); - outlinemapper_xform_dirty = true; -} - - /*! \internal @@ -1969,67 +1941,6 @@ void QRasterPaintEngine::fillRect(const QRectF &r, const QColor &color) fillRect(r, &d->solid_color_filler); } -/*! - \reimp -*/ -void QRasterPaintEngine::drawPath(const QPainterPath &path) -{ -#ifdef QT_DEBUG_DRAW - QRectF bounds = path.boundingRect(); - qDebug(" - QRasterPaintEngine::drawPath(), [%.2f, %.2f, %.2f, %.2f]", - bounds.x(), bounds.y(), bounds.width(), bounds.height()); -#endif - - if (path.isEmpty()) - return; - - // Filling.., - Q_D(QRasterPaintEngine); - QRasterPaintEngineState *s = state(); - - ensureBrush(); - if (s->brushData.blend) { - ensureOutlineMapper(); - fillPath(path, &s->brushData); - } - - // Stroking... - ensurePen(); - if (!s->penData.blend) - return; - { - if (s->matrix.type() >= QTransform::TxProject) { - d->strokeProjective(path); - } else { - Q_ASSERT(s->stroker); - d->outlineMapper->beginOutline(Qt::WindingFill); - qreal txscale = 1; - if (s->pen.isCosmetic() || (qt_scaleForTransform(s->matrix, &txscale) && txscale != 1)) { - const qreal strokeWidth = d->basicStroker.strokeWidth(); - const QRectF clipRect = d->dashStroker ? d->dashStroker->clipRect() : QRectF(); - if (d->dashStroker) - d->dashStroker->setClipRect(d->deviceRect); - d->basicStroker.setStrokeWidth(strokeWidth * txscale); - d->outlineMapper->setMatrix(QTransform()); - s->stroker->strokePath(path, d->outlineMapper, s->matrix); - d->outlinemapper_xform_dirty = true; - d->basicStroker.setStrokeWidth(strokeWidth); - if (d->dashStroker) - d->dashStroker->setClipRect(clipRect); - } else { - ensureOutlineMapper(); - s->stroker->strokePath(path, d->outlineMapper, QTransform()); - } - d->outlineMapper->endOutline(); - - ProcessSpans blend = d->getPenFunc(d->outlineMapper->controlPointRect, - &s->penData); - d->rasterize(d->outlineMapper->outline(), blend, &s->penData, d->rasterBuffer); - } - } - -} - static inline bool isAbove(const QPointF *a, const QPointF *b) { return a->y() < b->y(); diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index 283c44299..3dab49139 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -165,7 +165,6 @@ public: void updateMatrix(const QTransform &matrix); - void drawPath(const QPainterPath &path); void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode); void fillPath(const QPainterPath &path, QSpanData *fillData); @@ -327,7 +326,6 @@ public: inline const QClipData *clip() const; - void strokeProjective(const QPainterPath &path); void initializeRasterizer(QSpanData *data); void recalculateFastImages(); -- cgit v1.2.3 From aff08415dcd108cc4a3dfd9ca0d3d4a9e5f72d84 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Tue, 28 Jul 2009 12:05:30 +0200 Subject: Implement perspective stroking support in QPaintEngineEx::stroke() Reviewed-by: Samuel --- src/gui/painting/qpaintengineex.cpp | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index ce4f7fd69..8ec881ef7 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -42,6 +42,7 @@ #include "qpaintengineex_p.h" #include "qpainter_p.h" #include "qstroker_p.h" +#include "qbezier_p.h" #include #include @@ -484,13 +485,14 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) QVectorPath strokePath(d->strokeHandler->pts.data(), d->strokeHandler->types.size(), d->strokeHandler->types.data(), - QVectorPath::WindingFill); + flags); fill(strokePath, pen.brush()); } else { const qreal strokeWidth = d->stroker.strokeWidth(); d->stroker.setStrokeWidth(strokeWidth * txscale); // For cosmetic pens we need a bit of trickery... We to process xform the input points if (types) { + bool isProject = state()->matrix.type() >= QTransform::TxProject; while (points < lastPoint) { switch (*types) { case QPainterPath::MoveToElement: { @@ -508,10 +510,30 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) break; } case QPainterPath::CurveToElement: { - QPointF c1 = ((QPointF *) points)[0] * state()->matrix; - QPointF c2 = ((QPointF *) points)[1] * state()->matrix; - QPointF e = ((QPointF *) points)[2] * state()->matrix; - d->activeStroker->cubicTo(c1.x(), c1.y(), c2.x(), c2.y(), e.x(), e.y()); + // Convert projective xformed curves to line + // segments so they can be transformed more + // accurately + if (isProject) { + // -1 access here is safe because there is + // always an element prior to the cubicTo, we + // just need the value.. + QPolygonF segment = + QBezier::fromPoints(*(((QPointF *) points) - 1), + *((QPointF *) points), + *(((QPointF *) points) + 1), + *(((QPointF *) points) + 2)).toPolygon(); + + for (QPolygonF::const_iterator it = segment.constBegin(); + it < segment.constEnd(); ++it) { + const QPointF pt = *it * state()->matrix; + d->activeStroker->lineTo(pt.x(), pt.y()); + } + } else { + QPointF c1 = ((QPointF *) points)[0] * state()->matrix; + QPointF c2 = ((QPointF *) points)[1] * state()->matrix; + QPointF e = ((QPointF *) points)[2] * state()->matrix; + d->activeStroker->cubicTo(c1.x(), c1.y(), c2.x(), c2.y(), e.x(), e.y()); + } points += 6; types += 3; flags |= QVectorPath::CurvedShapeHint; @@ -546,7 +568,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) QVectorPath strokePath(d->strokeHandler->pts.data(), d->strokeHandler->types.size(), d->strokeHandler->types.data(), - QVectorPath::WindingFill); + flags); QTransform xform = state()->matrix; state()->matrix = QTransform(); -- cgit v1.2.3 From cb04e54252e69fd794aff1ab7ab5ef6c4fbcafad Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Tue, 28 Jul 2009 15:49:01 +0200 Subject: Implement perspective filling support in the raster engine... Reviewed-by: Samuel --- src/gui/painting/qdatabuffer_p.h | 17 +++++++++++ src/gui/painting/qoutlinemapper.cpp | 59 ++++++++++++++++++++++++------------- 2 files changed, 56 insertions(+), 20 deletions(-) diff --git a/src/gui/painting/qdatabuffer_p.h b/src/gui/painting/qdatabuffer_p.h index 275ec13d7..b568f43ce 100644 --- a/src/gui/painting/qdatabuffer_p.h +++ b/src/gui/painting/qdatabuffer_p.h @@ -114,6 +114,23 @@ public: qSwap(buffer, other.buffer); } + inline void insertBlank(int pos, int count) { + Q_ASSERT(pos >= 0); + Q_ASSERT(pos < siz); + reserve(siz + count); + for (int i = siz - pos - 1; i >= 0; --i) + buffer[pos + count + i] = buffer[pos + i]; + siz += count; + } + + inline void removeAndShift(int pos, int count) { + Q_ASSERT(pos >= 0); + Q_ASSERT(pos < siz); + for (int i=pos; i 3) + m_element_types.insertBlank(t, segment.size() - 3); + else if (segment.size() < 3) + m_element_types.removeAndShift(t, 3 - segment.size()); + + for (QPolygonF::const_iterator it = segment.constBegin(); + it < segment.constEnd(); ++it, ++t) { + m_elements_dev << *it * matrix; + m_element_types.at(t) = QPainterPath::LineToElement; + } i += 2; - break; + } break; default: Q_ASSERT(false); break; } } + element_count = m_elements_dev.size(); } - path = QTransform(m_m11, m_m12, m_m13, m_m21, m_m22, m_m23, m_dx, m_dy, m_m33).map(path); - uint old_txop = m_txop; - m_txop = QTransform::TxNone; - if (path.isEmpty()) - m_valid = false; - else - convertPath(path); - m_txop = old_txop; - return; } elements = m_elements_dev.data(); } if (m_round_coords) { // round coordinates to match outlines drawn with drawLine_midpoint_i - for (int i = 0; i < m_elements.size(); ++i) + for (int i = 0; i < element_count; ++i) elements[i] = QPointF(qFloor(elements[i].x() + aliasedCoordinateDelta), qFloor(elements[i].y() + aliasedCoordinateDelta)); } +#ifdef QT_DEBUG_CONVERT + for (int i=0; i Date: Tue, 28 Jul 2009 16:35:37 +0200 Subject: QPainterPath's vectorpath cache wasn't cleared on detach() Reviewed-by: Samuel --- src/gui/painting/qpainterpath.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index ea86cf590..09972b094 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -3271,6 +3271,8 @@ void QPainterPath::setDirty(bool dirty) { d_func()->dirtyBounds = dirty; d_func()->dirtyControlBounds = dirty; + delete d_func()->pathConverter; + d_func()->pathConverter = 0; } void QPainterPath::computeBoundingRect() const -- cgit v1.2.3 From a4e4c36af926bb00c59f71273b9f8d74e16dea0d Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 28 Jul 2009 14:51:40 +0200 Subject: Doc: Cleaning up. This closes task 235801. --- src/gui/painting/qtransform.cpp | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 45939c155..8a9d6f1e3 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -101,7 +101,7 @@ QT_BEGIN_NAMESPACE allowing perspective transformations. QTransform's toAffine() method allows casting QTransform to QMatrix. If a perspective transformation has been specified on the matrix, then the - conversion to an affine QMatrix will cause loss of data. + conversion will cause loss of data. QTransform is the recommended transformation class in Qt. @@ -125,11 +125,13 @@ QT_BEGIN_NAMESPACE which returns true if the matrix is non-singular (i.e. AB = BA = I). The inverted() function returns an inverted copy of \e this matrix if it is invertible (otherwise it returns the identity - matrix). In addition, QTransform provides the det() function - returning the matrix's determinant. + matrix), and adjoint() returns the matrix's classical adjoint. + In addition, QTransform provides the determinant() function which + returns the matrix's determinant. - Finally, the QTransform class supports matrix multiplication, and - objects of the class can be streamed as well as compared. + Finally, the QTransform class supports matrix multiplication, addition + and subtraction, and objects of the class can be streamed as well + as compared. \tableofcontents @@ -191,7 +193,7 @@ QT_BEGIN_NAMESPACE The various matrix elements can be set when constructing the matrix, or by using the setMatrix() function later on. They can also be manipulated using the translate(), rotate(), scale() and - shear() convenience functions, The currently set values can be + shear() convenience functions. The currently set values can be retrieved using the m11(), m12(), m13(), m21(), m22(), m23(), m31(), m32(), m33(), dx() and dy() functions. @@ -204,9 +206,9 @@ QT_BEGIN_NAMESPACE to 0) mapping a point to itself. Shearing is controlled by \c m12 and \c m21. Setting these elements to values different from zero will twist the coordinate system. Rotation is achieved by - carefully setting both the shearing factors and the scaling - factors. Perspective transformation is achieved by carefully setting - both the projection factors and the scaling factors. + setting both the shearing factors and the scaling factors. Perspective + transformation is achieved by setting both the projection factors and + the scaling factors. Here's the combined transformations example using basic matrix operations: @@ -958,8 +960,8 @@ QTransform & QTransform::operator=(const QTransform &matrix) /*! Resets the matrix to an identity matrix, i.e. all elements are set - to zero, except \c m11 and \c m22 (specifying the scale) which are - set to 1. + to zero, except \c m11 and \c m22 (specifying the scale) and \c m33 + which are set to 1. \sa QTransform(), isIdentity(), {QTransform#Basic Matrix Operations}{Basic Matrix Operations} @@ -2030,8 +2032,9 @@ QTransform::operator QVariant() const /*! \fn qreal QTransform::det() const + \obsolete - Returns the matrix's determinant. + Returns the matrix's determinant. Use determinant() instead. */ -- cgit v1.2.3 From 5e2ecd10ac2ffcd403731bbf47e48a4a4aeb2329 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 28 Jul 2009 17:49:40 +0200 Subject: Doc: typo. --- src/gui/styles/qstyle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp index c86997675..598fe6b76 100644 --- a/src/gui/styles/qstyle.cpp +++ b/src/gui/styles/qstyle.cpp @@ -564,7 +564,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, /*! \enum QStyle::PrimitiveElement - This enum describes that various primitive elements. A + This enum describes the various primitive elements. A primitive element is a common GUI element, such as a checkbox indicator or button bevel. -- cgit v1.2.3 From b5bcc529f67458c98571d3b726c9d173512aac27 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 28 Jul 2009 17:51:34 +0200 Subject: Doc: Document the purpose of the QTextFormat etc enums, and add a few links to respective APIs. --- src/gui/text/qtextformat.cpp | 101 ++++++++++++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 29 deletions(-) diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index 4e434184e..a3dd83eba 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE /*! \fn Type QTextLength::type() const - Returns the type of length. + Returns the type of this length object. \sa QTextLength::Type */ @@ -129,9 +129,15 @@ QT_BEGIN_NAMESPACE /*! \enum QTextLength::Type - \value VariableLength - \value FixedLength - \value PercentageLength + This enum describes the different types a length object can + have. + + \value VariableLength The width of the object is variable + \value FixedLength The width of the object is fixed + \value PercentageLength The width of the object is in + percentage of the maximum width + + \sa type() */ /*! @@ -417,7 +423,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt) more useful, and describe the formatting that is applied to specific parts of the document. - A format has a \c FormatType which specifies the kinds of thing it + A format has a \c FormatType which specifies the kinds of text item it can format; e.g. a block of text, a list, a table, etc. A format also has various properties (some specific to particular format types), as described by the Property enum. Every property has a @@ -447,24 +453,32 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt) /*! \enum QTextFormat::FormatType - \value InvalidFormat - \value BlockFormat - \value CharFormat - \value ListFormat - \value TableFormat - \value FrameFormat + This enum describes the text item a QTextFormat object is formatting. + + \value InvalidFormat An invalid format as created by the default + constructor + \value BlockFormat The object formats a text block + \value CharFormat The object formats a single character + \value ListFormat The object formats a list + \value TableFormat The object formats a table + \value FrameFormat The object formats a frame \value UserFormat + + \sa QTextCharFormat, QTextBlockFormat, QTextListFormat, + QTextTableFormat, type() */ /*! \enum QTextFormat::Property - \value ObjectIndex + This enum describes the different properties a format can have. + + \value ObjectIndex The index of the formatted object. See objectIndex(). Paragraph and character properties - \value CssFloat + \value CssFloat How a frame is located relative to the surrounding text \value LayoutDirection The layout direction of the text in the document (Qt::LayoutDirection). @@ -482,25 +496,25 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt) \value BlockRightMargin \value TextIndent \value TabPositions Specifies the tab positions. The tab positions are structs of QTextOption::Tab which are stored in - a QList (internally, in a QList). + a QList (internally, in a QList). \value BlockIndent \value BlockNonBreakableLines - \value BlockTrailingHorizontalRulerWidth + \value BlockTrailingHorizontalRulerWidth The width of a horizontal ruler element. Character properties \value FontFamily \value FontPointSize + \value FontPixelSize \value FontSizeAdjustment Specifies the change in size given to the fontsize already set using FontPointSize or FontPixelSize. + \value FontFixedPitch \omitvalue FontSizeIncrement \value FontWeight \value FontItalic \value FontUnderline \e{This property has been deprecated.} Use QTextFormat::TextUnderlineStyle instead. \value FontOverline \value FontStrikeOut - \value FontFixedPitch - \value FontPixelSize \value FontCapitalization Specifies the capitalization type that is to be applied to the text. \value FontLetterSpacing Changes the default spacing between individual letters in the font. The value is specified in percentage, with 100 as the default value. @@ -512,7 +526,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt) \omitvalue FirstFontProperty \omitvalue LastFontProperty - + \value TextUnderlineColor \value TextVerticalAlignment \value TextOutline @@ -533,7 +547,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt) \value FrameBorder \value FrameBorderBrush - \value FrameBorderStyle + \value FrameBorderStyle See the \l{QTextFrameFormat::BorderStyle}{BorderStyle} enum. \value FrameBottomMargin \value FrameHeight \value FrameLeftMargin @@ -565,33 +579,46 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt) Selection properties - \value FullWidthSelection When set on the characterFormat of a selection, the whole width of the text will be shown selected + \value FullWidthSelection When set on the characterFormat of a selection, + the whole width of the text will be shown selected. Page break properties - \value PageBreakPolicy + \value PageBreakPolicy Specifies how pages are broken. See the PageBreakFlag enum. \value UserProperty + + \sa property(), setProperty() */ /*! \enum QTextFormat::ObjectTypes + This enum describes what kind of QTextObject this format is associated with. + \value NoObject \value ImageObject \value TableObject \value TableCellObject \value UserObject The first object that can be used for application-specific purposes. + + \sa QTextObject, QTextTable, QTextObject::format() */ /*! \enum QTextFormat::PageBreakFlag \since 4.2 + This enum describes how page breaking is performed when printing. It maps to the + corresponding css properties. + \value PageBreak_Auto The page break is determined automatically depending on the available space on the current page \value PageBreak_AlwaysBefore The page is always broken before the paragraph/table \value PageBreak_AlwaysAfter A new page is always started after the paragraph/table + + \sa QTextBlockFormat::pageBreakPolicy(), QTextFrameFormat::pageBreakPolicy(), + PageBreakPolicy */ /*! @@ -971,6 +998,8 @@ QVector QTextFormat::lengthVectorProperty(int propertyId) const /*! Returns the property specified by the given \a propertyId. + + \sa Property */ QVariant QTextFormat::property(int propertyId) const { @@ -979,6 +1008,8 @@ QVariant QTextFormat::property(int propertyId) const /*! Sets the property specified by the \a propertyId to the given \a value. + + \sa Property */ void QTextFormat::setProperty(int propertyId, const QVariant &value) { @@ -1006,8 +1037,10 @@ void QTextFormat::setProperty(int propertyId, const QVector &value) } /*! - Clears the value of the property given by \a propertyId - */ + Clears the value of the property given by \a propertyId + + \sa Property +*/ void QTextFormat::clearProperty(int propertyId) { if (!d) @@ -1019,14 +1052,18 @@ void QTextFormat::clearProperty(int propertyId) /*! \fn void QTextFormat::setObjectType(int type) - Sets the text format's object \a type. See \c{ObjectTypes}. + Sets the text format's object type to \a type. + + \sa ObjectTypes, objectType() */ /*! \fn int QTextFormat::objectType() const - Returns the text format's object type. See \c{ObjectTypes}. + Returns the text format's object type. + + \sa ObjectTypes, setObjectType() */ @@ -2116,17 +2153,17 @@ QTextListFormat::QTextListFormat(const QTextFormat &fmt) /*! \fn void QTextListFormat::setStyle(Style style) - Sets the list format's \a style. See \c{Style} for the available styles. + Sets the list format's \a style. - \sa style() + \sa style() Style */ /*! \fn Style QTextListFormat::style() const - Returns the list format's style. See \c{Style}. + Returns the list format's style. - \sa setStyle() + \sa setStyle() Style */ @@ -2188,16 +2225,21 @@ QTextListFormat::QTextListFormat(const QTextFormat &fmt) /*! \enum QTextFrameFormat::Position + This enum describes how a frame is located relative to the surrounding text. + \value InFlow \value FloatLeft \value FloatRight + \sa position() CssFloat */ /*! \enum QTextFrameFormat::BorderStyle \since 4.3 + This enum describes different border styles for the text frame. + \value BorderStyle_None \value BorderStyle_Dotted \value BorderStyle_Dashed @@ -2210,6 +2252,7 @@ QTextListFormat::QTextListFormat(const QTextFormat &fmt) \value BorderStyle_Inset \value BorderStyle_Outset + \sa borderStyle() FrameBorderStyle */ /*! -- cgit v1.2.3 From 5c11a736367a854c3c201c31265f96e8153f20f5 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 28 Jul 2009 18:16:36 +0200 Subject: Implement a copy constructor for QXmlParseException to avoid crashes when throwing them. Autotest included. Task: 258081 Reviewed-by: Trustme --- src/xml/sax/qxml.cpp | 18 ++++++++++++++++++ src/xml/sax/qxml.h | 1 + tests/auto/qxml/tst_qxml.cpp | 26 ++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index fe1e74056..3b1726b7d 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -244,6 +244,16 @@ public: class QXmlParseExceptionPrivate { public: + QXmlParseExceptionPrivate() + : column(-1), line(-1) + { + } + QXmlParseExceptionPrivate(const QXmlParseExceptionPrivate &other) + : msg(other.msg), column(other.column), line(other.line), + pub(other.pub), sys(other.sys) + { + } + QString msg; int column; int line; @@ -552,6 +562,14 @@ QXmlParseException::QXmlParseException(const QString& name, int c, int l, d->sys = s; } +/*! + Creates a copy of \a other. +*/ +QXmlParseException::QXmlParseException(const QXmlParseException& other) +{ + d = new QXmlParseExceptionPrivate(*other.d); +} + /*! Destroys the QXmlParseException. */ diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index 8aa7e63d1..6ccd44ea4 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -193,6 +193,7 @@ class Q_XML_EXPORT QXmlParseException public: explicit QXmlParseException(const QString &name = QString(), int c = -1, int l = -1, const QString &p = QString(), const QString &s = QString()); + QXmlParseException(const QXmlParseException &other); ~QXmlParseException(); int columnNumber() const; diff --git a/tests/auto/qxml/tst_qxml.cpp b/tests/auto/qxml/tst_qxml.cpp index 13de82fb3..1bc5ef50a 100644 --- a/tests/auto/qxml/tst_qxml.cpp +++ b/tests/auto/qxml/tst_qxml.cpp @@ -57,6 +57,7 @@ Q_OBJECT private slots: void getSetCheck(); void interpretedAs0D() const; + void exception(); }; class MyXmlEntityResolver : public QXmlEntityResolver @@ -213,5 +214,30 @@ void tst_QXml::interpretedAs0D() const QCOMPARE(myHandler.attrName, QChar(0x010D) + QString::fromLatin1("reated-by")); } +void tst_QXml::exception() +{ +#ifndef QT_NO_EXCEPTIONS + QString message = QString::fromLatin1("message"); + int column = 3; + int line = 2; + QString publicId = QString::fromLatin1("publicId"); + QString systemId = QString::fromLatin1("systemId"); + + try { + QXmlParseException e(message, column, line, publicId, systemId); + throw e; + } + catch (QXmlParseException e) { + QCOMPARE(e.message(), message); + QCOMPARE(e.columnNumber(), column); + QCOMPARE(e.lineNumber(), line); + QCOMPARE(e.publicId(), publicId); + QCOMPARE(e.systemId(), systemId); + } +#else + QSKIP("Exceptions not available", SkipAll); +#endif +} + QTEST_MAIN(tst_QXml) #include "tst_qxml.moc" -- cgit v1.2.3 From 865d5e92b80f8a567746775bb0a1d971af1acf8c Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Tue, 28 Jul 2009 12:40:18 -0700 Subject: Remove a warning in qdirectfbpaintengine These structures are only used in versions after 0.922. Reviewed-by: Donald --- src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index 4b76ef6c3..030e51f7c 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -745,6 +745,7 @@ QPixmapData *QDirectFBScreenPrivate::createPixmapData(QPixmapData::PixelType typ return new QDirectFBPixmapData(type); } +#if (Q_DIRECTFB_VERSION >= 0x000923) #ifdef QT_NO_DEBUG struct FlagDescription; static const FlagDescription *accelerationDescriptions = 0; @@ -802,9 +803,6 @@ static const FlagDescription drawDescriptions[] = { }; #endif - - -#if (Q_DIRECTFB_VERSION >= 0x000923) static const QByteArray flagDescriptions(uint mask, const FlagDescription *flags) { #ifdef QT_NO_DEBUG -- cgit v1.2.3 From d0e8341c9a1549dcf1625381a3681d1dca73e945 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 28 Jul 2009 22:08:25 +0200 Subject: Doc: Re-apply relevant change from 1368c210ef9976f68eb9fb1c3e4dc14f4fa4edd2 Clarified that the format used in QImage::fromData() is the image format, not the pixel format. --- src/gui/image/qimage.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index dd5676570..e8ca7a96f 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -4628,12 +4628,19 @@ bool QImage::loadFromData(const uchar *data, int len, const char *format) binary \a data. The loader attempts to read the image using the specified \a format. If \a format is not specified (which is the default), the loader probes the file for a header to guess the file format. + binary \a data. The loader attempts to read the image, either using the + optional image \a format specified or by determining the image format from + the data. - If the loading of the image failed, this object is a null image. + If \a format is not specified (which is the default), the loader probes the + file for a header to determine the file format. If \a format is specified, + it must be one of the values returned by QImageReader::supportedImageFormats(). + + If the loading of the image fails, the image returned will be a null image. + + \sa load(), save(), {QImage#Reading and Writing Image Files}{Reading and Writing Image Files} + */ - \sa load(), save(), {QImage#Reading and Writing Image - Files}{Reading and Writing Image Files} -*/ QImage QImage::fromData(const uchar *data, int size, const char *format) { QByteArray a = QByteArray::fromRawData(reinterpret_cast(data), size); -- cgit v1.2.3 From ca1060fbc3a949ec3e0f67017efe8ee6c0b7b86e Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 29 Jul 2009 00:27:52 +0200 Subject: Doc: Some final QMatrix cleanups. --- src/gui/graphicsview/qgraphicsitem.cpp | 7 ++++--- src/gui/graphicsview/qgraphicswidget.cpp | 1 + src/gui/painting/qtransform.cpp | 9 ++++++--- src/gui/styles/qstyleoption.cpp | 25 ++++++++++++++++--------- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index c8e55e3a3..06f26a122 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -303,11 +303,12 @@ drop shadow effects and for decoration objects that follow the parent item's geometry without drawing on top of it. - \value ItemUsesExtendedStyleOption The item makes use of either - QStyleOptionGraphicsItem::exposedRect or QStyleOptionGraphicsItem::matrix. + \value ItemUsesExtendedStyleOption The item makes use of either the + exposedRect or matrix member of the QStyleOptionGraphicsItem. Implementers + of QGraphicsItem subclasses should set that flag if this data is required. By default, the exposedRect is initialized to the item's boundingRect and the matrix is untransformed. Enable this flag for more fine-grained values. - Use QStyleOptionGraphicsItem::levelOfDetailFromTransform for a more + Use QStyleOptionGraphicsItem::levelOfDetailFromTransform() for a more fine-grained value. \value ItemHasNoContents The item does not paint anything (i.e., calling diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index 6937584ad..6f56b84f9 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -2286,6 +2286,7 @@ bool QGraphicsWidget::close() #ifdef Q_NO_USING_KEYWORD /*! \fn const QObjectList &QGraphicsWidget::children() const + \internal This function returns the same value as QObject::children(). It's provided to differentiate between the obsolete member diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 8a9d6f1e3..a322fe4de 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -1775,7 +1775,7 @@ bool QTransform::quadToQuad(const QPolygonF &one, Sets the matrix elements to the specified values, \a m11, \a m12, \a m13 \a m21, \a m22, \a m23 \a m31, \a m32 and \a m33. Note that this function replaces the previous values. - QMatrix provides the translate(), rotate(), scale() and shear() + QTransform provides the translate(), rotate(), scale() and shear() convenience functions to manipulate the various matrix elements based on the currently defined coordinate system. @@ -1953,8 +1953,11 @@ void QTransform::map(int x, int y, int *tx, int *ty) const } /*! - Returns the QTransform cast to a QMatrix. - */ + Returns the QTransform as an affine matrix. + + \warning If a perspective transformation has been specified, + then the conversion will cause loss of data. +*/ const QMatrix &QTransform::toAffine() const { return affine; diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp index 7547dda3a..0ff79955d 100644 --- a/src/gui/styles/qstyleoption.cpp +++ b/src/gui/styles/qstyleoption.cpp @@ -5007,11 +5007,6 @@ QStyleOptionGraphicsItem::QStyleOptionGraphicsItem(int version) of the painter used to draw the item. By default, if no transformations are applied, its value is 1. If zoomed out 1:2, the level of detail will be 0.5, and if zoomed in 2:1, its value is 2. - - For more advanced level-of-detail metrics, use - QStyleOptionGraphicsItem::matrix directly. - - \sa QStyleOptionGraphicsItem::matrix */ qreal QStyleOptionGraphicsItem::levelOfDetailFromTransform(const QTransform &worldTransform) { @@ -5038,20 +5033,32 @@ qreal QStyleOptionGraphicsItem::levelOfDetailFromTransform(const QTransform &wor Make use of this rectangle to speed up item drawing when only parts of the item are exposed. If the whole item is exposed, this rectangle will be the same as QGraphicsItem::boundingRect(). + + This member is only initialized for items that have the + QGraphicsItem::ItemUsesExtendedStyleOption flag set. */ /*! \variable QStyleOptionGraphicsItem::matrix \brief the complete transformation matrix for the item + \obsolete - This matrix is the sum of the item's scene matrix and the matrix of the - painter used for drawing the item. It is provided for convenience, + The QMatrix provided through this member does include information about + any perspective transformations applied to the view or item. To get the + correct transformation matrix, use QPainter::transform() on the painter + passed into the QGraphicsItem::paint() implementation. + + This matrix is the combination of the item's scene matrix and the matrix + of the painter used for drawing the item. It is provided for convenience, allowing anvanced level-of-detail metrics that can be used to speed up item drawing. - To find the dimentions of an item in screen coordinates (i.e., pixels), + To find the dimensions of an item in screen coordinates (i.e., pixels), you can use the mapping functions of QMatrix, such as QMatrix::map(). + This member is only initialized for items that have the + QGraphicsItem::ItemUsesExtendedStyleOption flag set. + \sa QStyleOptionGraphicsItem::levelOfDetailFromTransform() */ @@ -5059,7 +5066,7 @@ qreal QStyleOptionGraphicsItem::levelOfDetailFromTransform(const QTransform &wor \variable QStyleOptionGraphicsItem::levelOfDetail \obsolete - Use QStyleOptionGraphicsItem::levelOfDetailFromTransform + Use QStyleOptionGraphicsItem::levelOfDetailFromTransform() together with QPainter::worldTransform() instead. */ -- cgit v1.2.3 From 62d81d9955f39bac327affd703b9df006ee8f6f7 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 28 Jul 2009 16:52:13 +1000 Subject: Added a QVariant testlib toString specialization. If comparing two variants fails, the failure message will now output the type and value of the variants (rather than "Compared values are not the same"). Reviewed-by: Thiago --- src/testlib/qtest.h | 25 +++++++++++++++ tests/auto/selftests/cmptest/tst_cmptest.cpp | 46 ++++++++++++++++++++++++++++ tests/auto/selftests/expected_cmptest.txt | 20 ++++++++++-- 3 files changed, 89 insertions(+), 2 deletions(-) diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 9d6f68d1b..8cdfab0cd 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -53,6 +53,7 @@ #include #include #include +#include #include #include @@ -146,6 +147,30 @@ template<> inline char *toString(const QUrl &uri) return qstrdup(uri.toEncoded().constData()); } +template<> inline char *toString(const QVariant &v) +{ + QByteArray vstring("QVariant("); + if (v.isValid()) { + QByteArray type(v.typeName()); + if (type.isEmpty()) { + type = QByteArray::number(v.userType()); + } + vstring.append(type); + if (!v.isNull()) { + vstring.append(','); + if (v.canConvert(QVariant::String)) { + vstring.append(qVariantValue(v).toLatin1()); + } + else { + vstring.append(""); + } + } + } + vstring.append(')'); + + return qstrdup(vstring.constData()); +} + #ifndef QTEST_NO_SPECIALIZATIONS template<> #endif diff --git a/tests/auto/selftests/cmptest/tst_cmptest.cpp b/tests/auto/selftests/cmptest/tst_cmptest.cpp index 59dd6784e..73952100a 100644 --- a/tests/auto/selftests/cmptest/tst_cmptest.cpp +++ b/tests/auto/selftests/cmptest/tst_cmptest.cpp @@ -50,6 +50,8 @@ class tst_Cmptest: public QObject private slots: void compare_boolfuncs(); void compare_pointerfuncs(); + void compare_tostring(); + void compare_tostring_data(); }; static bool boolfunc() { return true; } @@ -76,6 +78,50 @@ void tst_Cmptest::compare_pointerfuncs() QCOMPARE(&i, intptr()); } +Q_DECLARE_METATYPE(QVariant) + +class PhonyClass +{}; + +void tst_Cmptest::compare_tostring_data() +{ + QTest::addColumn("actual"); + QTest::addColumn("expected"); + + QTest::newRow("int, string") + << QVariant::fromValue(123) + << QVariant::fromValue(QString("hi")) + ; + + QTest::newRow("both invalid") + << QVariant() + << QVariant() + ; + + QTest::newRow("null hash, invalid") + << QVariant(QVariant::Hash) + << QVariant() + ; + + QTest::newRow("string, null user type") + << QVariant::fromValue(QString::fromLatin1("A simple string")) + << QVariant(QVariant::Type(qRegisterMetaType("PhonyClass"))) + ; + + QTest::newRow("both non-null user type") + << QVariant(qRegisterMetaType("PhonyClass"), (const void*)0) + << QVariant(qRegisterMetaType("PhonyClass"), (const void*)0) + ; +} + +void tst_Cmptest::compare_tostring() +{ + QFETCH(QVariant, actual); + QFETCH(QVariant, expected); + + QCOMPARE(actual, expected); +} + QTEST_MAIN(tst_Cmptest) #include "tst_cmptest.moc" diff --git a/tests/auto/selftests/expected_cmptest.txt b/tests/auto/selftests/expected_cmptest.txt index dc89d9d6b..f70eba5ec 100644 --- a/tests/auto/selftests/expected_cmptest.txt +++ b/tests/auto/selftests/expected_cmptest.txt @@ -1,8 +1,24 @@ ********* Start testing of tst_Cmptest ********* -Config: Using QTest library 4.1.0, Qt 4.1.0 +Config: Using QTest library 4.6.0, Qt 4.6.0 PASS : tst_Cmptest::initTestCase() PASS : tst_Cmptest::compare_boolfuncs() PASS : tst_Cmptest::compare_pointerfuncs() +FAIL! : tst_Cmptest::compare_tostring(int, string) Compared values are not the same + Actual (actual): QVariant(int,123) + Expected (expected): QVariant(QString,hi) + Loc: [/home/rmcgover/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)] +FAIL! : tst_Cmptest::compare_tostring(null hash, invalid) Compared values are not the same + Actual (actual): QVariant(QVariantHash) + Expected (expected): QVariant() + Loc: [/home/rmcgover/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)] +FAIL! : tst_Cmptest::compare_tostring(string, null user type) Compared values are not the same + Actual (actual): QVariant(QString,A simple string) + Expected (expected): QVariant(PhonyClass) + Loc: [/home/rmcgover/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)] +FAIL! : tst_Cmptest::compare_tostring(both non-null user type) Compared values are not the same + Actual (actual): QVariant(PhonyClass,) + Expected (expected): QVariant(PhonyClass,) + Loc: [/home/rmcgover/depot/qt/master/tests/auto/selftests/cmptest/tst_cmptest.cpp(122)] PASS : tst_Cmptest::cleanupTestCase() -Totals: 4 passed, 0 failed, 0 skipped +Totals: 4 passed, 4 failed, 0 skipped ********* Finished testing of tst_Cmptest ********* -- cgit v1.2.3 From a6ea9ce6990003856ecadcca8ce9ddf37949363d Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 29 Jul 2009 02:26:43 +0200 Subject: Implement new transformation handling for graphics items. The idea of having separate rotationX/Y/Z, shearX/Y, etc. methods in QGraphicsItem turned out to be not giving us the flexibility we need and wanted. The new code now implements a different scheme, where we keep simple rotate (around z-axis), scale and transformOriginPoint methods, but remove the other ones. Instead we now have an additional list of QGraphicsTransform object. QGraphicsTransform is an abstract class that inherits QObject. Several specializations are provided and can be used to transform (and through property bindings animate) the item. Reviewed-By: Andreas --- demos/sub-attaq/submarine.cpp | 11 +- demos/sub-attaq/submarine.h | 4 + demos/sub-attaq/submarine_p.h | 4 +- src/gui/graphicsview/graphicsview.pri | 4 +- src/gui/graphicsview/qgraphicsitem.cpp | 339 +++++---------- src/gui/graphicsview/qgraphicsitem.h | 42 +- src/gui/graphicsview/qgraphicsitem_p.h | 39 +- src/gui/graphicsview/qgraphicstransform.cpp | 479 +++++++++++++++++++++ src/gui/graphicsview/qgraphicstransform.h | 168 ++++++++ src/gui/graphicsview/qgraphicswidget.cpp | 33 -- src/gui/graphicsview/qgraphicswidget.h | 8 - tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 158 ++----- .../auto/qgraphicstransform/qgraphicstransform.pro | 2 + .../qgraphicstransform/tst_qgraphicstransform.cpp | 162 +++++++ 14 files changed, 998 insertions(+), 455 deletions(-) create mode 100644 src/gui/graphicsview/qgraphicstransform.cpp create mode 100644 src/gui/graphicsview/qgraphicstransform.h create mode 100644 tests/auto/qgraphicstransform/qgraphicstransform.pro create mode 100644 tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp diff --git a/demos/sub-attaq/submarine.cpp b/demos/sub-attaq/submarine.cpp index 78a953989..029e04bd3 100644 --- a/demos/sub-attaq/submarine.cpp +++ b/demos/sub-attaq/submarine.cpp @@ -109,7 +109,14 @@ SubMarine::SubMarine(int type, const QString &name, int points, QGraphicsItem * setZValue(5); setFlags(QGraphicsItem::ItemIsMovable); resize(pixmapItem->boundingRect().width(),pixmapItem->boundingRect().height()); - setTransformOrigin(boundingRect().center()); + setTransformOriginPoint(boundingRect().center()); + + graphicsRotation = new QGraphicsRotation3D(this); + graphicsRotation->setAxis(QVector3D(0, 1, 0)); + graphicsRotation->setOrigin(QPointF(size().width()/2, size().height()/2)); + QList r; + r.append(graphicsRotation); + setTransformations(r); //We setup the state machine of the submarine QStateMachine *machine = new QStateMachine(this); @@ -166,7 +173,7 @@ void SubMarine::setCurrentDirection(SubMarine::Movement direction) if (this->direction == direction) return; if (direction == SubMarine::Right && this->direction == SubMarine::None) { - setYRotation(180); + graphicsRotation->setAngle(180); } this->direction = direction; } diff --git a/demos/sub-attaq/submarine.h b/demos/sub-attaq/submarine.h index 481e81633..564e9c630 100644 --- a/demos/sub-attaq/submarine.h +++ b/demos/sub-attaq/submarine.h @@ -45,6 +45,7 @@ //Qt #include #include +#include class PixmapItem; @@ -75,6 +76,8 @@ public: virtual int type() const; + QGraphicsRotation3D *rotation3d() const { return graphicsRotation; } + signals: void subMarineDestroyed(); void subMarineExecutionFinished(); @@ -87,6 +90,7 @@ private: int speed; Movement direction; PixmapItem *pixmapItem; + QGraphicsRotation3D *graphicsRotation; }; #endif //__SUBMARINE__H__ diff --git a/demos/sub-attaq/submarine_p.h b/demos/sub-attaq/submarine_p.h index e8df877e8..c04b25bf1 100644 --- a/demos/sub-attaq/submarine_p.h +++ b/demos/sub-attaq/submarine_p.h @@ -109,7 +109,7 @@ class ReturnState : public QAnimationState public: ReturnState(SubMarine *submarine, QState *parent = 0) : QAnimationState(parent) { - returnAnimation = new QPropertyAnimation(submarine, "yRotation"); + returnAnimation = new QPropertyAnimation(submarine->rotation3d(), "angle"); AnimationManager::self()->registerAnimation(returnAnimation); setAnimation(returnAnimation); this->submarine = submarine; @@ -119,7 +119,7 @@ protected: void onEntry(QEvent *e) { returnAnimation->stop(); - returnAnimation->setStartValue(submarine->yRotation()); + returnAnimation->setStartValue(submarine->rotation3d()->angle()); returnAnimation->setEndValue(submarine->currentDirection() == SubMarine::Right ? 360. : 180.); returnAnimation->setDuration(500); QAnimationState::onEntry(e); diff --git a/src/gui/graphicsview/graphicsview.pri b/src/gui/graphicsview/graphicsview.pri index 0c0747e50..9d232e451 100644 --- a/src/gui/graphicsview/graphicsview.pri +++ b/src/gui/graphicsview/graphicsview.pri @@ -16,12 +16,13 @@ HEADERS += graphicsview/qgraphicsgridlayout.h \ graphicsview/qgraphicssceneevent.h \ graphicsview/qgraphicssceneindex_p.h \ graphicsview/qgraphicsscenelinearindex_p.h \ + graphicsview/qgraphicstransform.h \ + graphicsview/qgraphicstransform_p.h \ graphicsview/qgraphicsview.h \ graphicsview/qgraphicsview_p.h \ graphicsview/qgraphicswidget.h \ graphicsview/qgraphicswidget_p.h \ graphicsview/qgridlayoutengine_p.h - SOURCES += graphicsview/qgraphicsgridlayout.cpp \ graphicsview/qgraphicsitem.cpp \ graphicsview/qgraphicsitemanimation.cpp \ @@ -36,6 +37,7 @@ SOURCES += graphicsview/qgraphicsgridlayout.cpp \ graphicsview/qgraphicssceneevent.cpp \ graphicsview/qgraphicssceneindex.cpp \ graphicsview/qgraphicsscenelinearindex.cpp \ + graphicsview/qgraphicstransform.cpp \ graphicsview/qgraphicsview.cpp \ graphicsview/qgraphicswidget.cpp \ graphicsview/qgraphicswidget_p.cpp \ diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 06f26a122..67702064e 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1197,6 +1197,13 @@ QGraphicsItem::~QGraphicsItem() else d_ptr->setParentItemHelper(0); + if (d_ptr->transformData) { + for(int i = 0; i < d_ptr->transformData->graphicsTransforms.size(); ++i) { + QGraphicsTransform *t = d_ptr->transformData->graphicsTransforms.at(i); + static_cast(t->d_ptr)->item = 0; + delete t; + } + } delete d_ptr->transformData; delete d_ptr; @@ -2977,81 +2984,6 @@ QTransform QGraphicsItem::transform() const return d_ptr->transformData->transform; } -/*! - \since 4.6 - - Returns the rotation around the X axis. - - The default is 0 - - \warning The value doesn't take in account any rotation set with - the setTransform() method. - - \sa setXRotation(), {Transformations} -*/ -qreal QGraphicsItem::xRotation() const -{ - if (!d_ptr->transformData) - return 0; - return d_ptr->transformData->xRotation; -} - -/*! - \since 4.6 - - Sets the rotation around the X axis to \a angle degrees. - - \warning The value doesn't take in account any rotation set with the setTransform() method. - - \sa xRotation(), setTransformOrigin(), {Transformations} -*/ -void QGraphicsItem::setXRotation(qreal angle) -{ - prepareGeometryChange(); - if (!d_ptr->transformData) - d_ptr->transformData = new QGraphicsItemPrivate::TransformData; - d_ptr->transformData->xRotation = angle; - d_ptr->transformData->onlyTransform = false; - d_ptr->dirtySceneTransform = 1; -} - -/*! - \since 4.6 - - Returns the rotation around the Y axis. - - The default is 0 - - \warning The value doesn't take in account any rotation set with the setTransform() method. - - \sa setYRotation(), {Transformations} -*/ -qreal QGraphicsItem::yRotation() const -{ - if (!d_ptr->transformData) - return 0; - return d_ptr->transformData->yRotation; -} - -/*! - \since 4.6 - - Sets the rotation around the Y axis to \a angle degrees. - - \warning The value doesn't take in account any rotation set with the setTransform() method. - - \sa yRotation(), setTransformOrigin() {Transformations} -*/ -void QGraphicsItem::setYRotation(qreal angle) -{ - prepareGeometryChange(); - if (!d_ptr->transformData) - d_ptr->transformData = new QGraphicsItemPrivate::TransformData; - d_ptr->transformData->yRotation = angle; - d_ptr->transformData->onlyTransform = false; - d_ptr->dirtySceneTransform = 1; -} - /*! \since 4.6 @@ -3061,13 +2993,13 @@ void QGraphicsItem::setYRotation(qreal angle) \warning The value doesn't take in account any rotation set with the setTransform() method. - \sa setZRotation(), {Transformations} + \sa setRotation(), {Transformations} */ -qreal QGraphicsItem::zRotation() const +qreal QGraphicsItem::rotation() const { if (!d_ptr->transformData) return 0; - return d_ptr->transformData->zRotation; + return d_ptr->transformData->rotation; } /*! @@ -3077,224 +3009,107 @@ qreal QGraphicsItem::zRotation() const \warning The value doesn't take in account any rotation set with the setTransform() method. - \sa zRotation(), setTransformOrigin(), {Transformations} + \sa rotation(), setTransformOriginPoint(), {Transformations} */ -void QGraphicsItem::setZRotation(qreal angle) +void QGraphicsItem::setRotation(qreal angle) { prepareGeometryChange(); if (!d_ptr->transformData) d_ptr->transformData = new QGraphicsItemPrivate::TransformData; - d_ptr->transformData->zRotation = angle; + d_ptr->transformData->rotation = angle; d_ptr->transformData->onlyTransform = false; d_ptr->dirtySceneTransform = 1; -} - -/*! - \since 4.6 - This convenience function set the rotation angles around the 3 axes - to \a x, \a y and \a z. - - \sa setXRotation(), setYRotation(), setZRotation(), {Transformations} -*/ -void QGraphicsItem::setRotation(qreal x, qreal y, qreal z) -{ - prepareGeometryChange(); - if (!d_ptr->transformData) - d_ptr->transformData = new QGraphicsItemPrivate::TransformData; - d_ptr->transformData->xRotation = x; - d_ptr->transformData->yRotation = y; - d_ptr->transformData->zRotation = z; - d_ptr->transformData->onlyTransform = false; - d_ptr->dirtySceneTransform = 1; + if (d_ptr->isObject) + emit static_cast(this)->rotationChanged(); } /*! \since 4.6 - Returns the scale factor on the X axis. + Returns the scale factor of the item. The default is 1 \warning The value doesn't take in account any scaling set with the setTransform() method. - \sa setXScale(), {Transformations} + \sa setScale(), {Transformations} */ -qreal QGraphicsItem::xScale() const +qreal QGraphicsItem::scale() const { if (!d_ptr->transformData) - return 1; - return d_ptr->transformData->xScale; + return 1.; + return d_ptr->transformData->scale; } /*! \since 4.6 - Sets the scale factor on the X axis to \a factor. + Sets the scale factor of the item to \a factor. \warning The value doesn't take in account any scaling set with the setTransform() method. - \sa xScale(), setTransformOrigin(), {Transformations} + \sa scale(), setTransformOriginPoint(), {Transformations} */ -void QGraphicsItem::setXScale(qreal factor) +void QGraphicsItem::setScale(qreal factor) { prepareGeometryChange(); if (!d_ptr->transformData) d_ptr->transformData = new QGraphicsItemPrivate::TransformData; - d_ptr->transformData->xScale = factor; + d_ptr->transformData->scale = factor; d_ptr->transformData->onlyTransform = false; d_ptr->dirtySceneTransform = 1; -} - -/*! - \since 4.6 - - Returns the scale factor on the Y axis. - - The default is 1 - - \warning The value doesn't take in account any scaling set with the setTransform() method. - - \sa setYScale(), {Transformations} -*/ -qreal QGraphicsItem::yScale() const -{ - if (!d_ptr->transformData) - return 1; - return d_ptr->transformData->yScale; -} - -/*! - \since 4.6 - - Sets the scale factor on the Y axis to \a factor. - \warning The value doesn't take in account any scaling set with the setTransform() method. - - \sa yScale(), setTransformOrigin(), {Transformations} -*/ -void QGraphicsItem::setYScale(qreal factor) -{ - prepareGeometryChange(); - if (!d_ptr->transformData) - d_ptr->transformData = new QGraphicsItemPrivate::TransformData; - d_ptr->transformData->yScale = factor; - d_ptr->transformData->onlyTransform = false; - d_ptr->dirtySceneTransform = 1; + if (d_ptr->isObject) + emit static_cast(this)->scaleChanged(); } -/*! - \since 4.6 - - This convenience function set the scaling factors on X and Y axis to \a sx and \a sy. - - \warning The value doesn't take in account any scaling set with the setTransform() method. - - \sa setXScale(), setYScale(), {Transformations} -*/ -void QGraphicsItem::setScale(qreal sx, qreal sy) -{ - prepareGeometryChange(); - if (!d_ptr->transformData) - d_ptr->transformData = new QGraphicsItemPrivate::TransformData; - d_ptr->transformData->xScale = sx; - d_ptr->transformData->yScale = sy; - d_ptr->transformData->onlyTransform = false; - d_ptr->dirtySceneTransform = 1; -} /*! \since 4.6 - Returns the horizontal shear. - - The default is 0 - - \warning The value doesn't take in account any shearing set with the setTransform() method. + returns list of graphics transformations on the item. - \sa setHorizontalShear(), {Transformations} + \sa scale(), setTransformOriginPoint(), {Transformations} */ -qreal QGraphicsItem::horizontalShear() const +QList QGraphicsItem::transformations() const { if (!d_ptr->transformData) - return 0; - return d_ptr->transformData->horizontalShear; + return QList(); + return d_ptr->transformData->graphicsTransforms; } /*! \since 4.6 - Sets the horizontal shear to \a shear. - - \warning The value doesn't take in account any shearing set with the setTransform() method. + Sets a list of graphics transformations on the item to \a transformations. - \sa horizontalShear(), {Transformations} + \sa scale(), setTransformOriginPoint(), {Transformations} */ -void QGraphicsItem::setHorizontalShear(qreal shear) +void QGraphicsItem::setTransformations(const QList &transformations) { prepareGeometryChange(); if (!d_ptr->transformData) d_ptr->transformData = new QGraphicsItemPrivate::TransformData; - d_ptr->transformData->horizontalShear = shear; + d_ptr->transformData->graphicsTransforms = transformations; + for (int i = 0; i < transformations.size(); ++i) + transformations.at(i)->d_func()->setItem(this); d_ptr->transformData->onlyTransform = false; d_ptr->dirtySceneTransform = 1; } -/*! - \since 4.6 - - Returns the vertical shear. - - The default is 0 - - \warning The value doesn't take in account any shearing set with the setTransform() method. - \sa setHorizontalShear(), {Transformations} -*/ -qreal QGraphicsItem::verticalShear() const +void QGraphicsItemPrivate::appendGraphicsTransform(QGraphicsTransform *t) { - if (!d_ptr->transformData) - return 0; - return d_ptr->transformData->verticalShear; -} + if (!transformData) + transformData = new QGraphicsItemPrivate::TransformData; + if (!transformData->graphicsTransforms.contains(t)) + transformData->graphicsTransforms.append(t); -/*! - \since 4.6 - - Sets the vertical shear to \a shear. - - \warning The value doesn't take in account any shearing set with the setTransform() method. - - \sa verticalShear(), {Transformations} -*/ -void QGraphicsItem::setVerticalShear(qreal shear) -{ - prepareGeometryChange(); - if (!d_ptr->transformData) - d_ptr->transformData = new QGraphicsItemPrivate::TransformData; - d_ptr->transformData->verticalShear = shear; - d_ptr->transformData->onlyTransform = false; - d_ptr->dirtySceneTransform = 1; -} - -/*! - \since 4.6 - - This convenience function sets the horizontal shear to \a sh and the vertical shear to \a sv. - - \warning The value doesn't take in account any shearing set with the setTransform() method. - - \sa setHorizontalShear(), setVerticalShear() -*/ -void QGraphicsItem::setShear(qreal sh, qreal sv) -{ - prepareGeometryChange(); - if (!d_ptr->transformData) - d_ptr->transformData = new QGraphicsItemPrivate::TransformData; - d_ptr->transformData->horizontalShear = sh; - d_ptr->transformData->verticalShear = sv; - d_ptr->transformData->onlyTransform = false; - d_ptr->dirtySceneTransform = 1; + Q_Q(QGraphicsItem); + t->d_func()->setItem(q); + transformData->onlyTransform = false; + dirtySceneTransform = 1; } /*! @@ -3304,9 +3119,9 @@ void QGraphicsItem::setShear(qreal sh, qreal sv) The default is QPointF(0,0). - \sa setTransformOrigin(), {Transformations} + \sa setTransformOriginPoint(), {Transformations} */ -QPointF QGraphicsItem::transformOrigin() const +QPointF QGraphicsItem::transformOriginPoint() const { if (!d_ptr->transformData) return QPointF(0,0); @@ -3318,9 +3133,9 @@ QPointF QGraphicsItem::transformOrigin() const Sets the \a origin point for the transformation in item coordinates. - \sa transformOrigin(), {Transformations} + \sa transformOriginPoint(), {Transformations} */ -void QGraphicsItem::setTransformOrigin(const QPointF &origin) +void QGraphicsItem::setTransformOriginPoint(const QPointF &origin) { prepareGeometryChange(); if (!d_ptr->transformData) @@ -3332,15 +3147,15 @@ void QGraphicsItem::setTransformOrigin(const QPointF &origin) } /*! - \fn void QGraphicsItem::setTransformOrigin(qreal x, qreal y) + \fn void QGraphicsItem::setTransformOriginPoint(qreal x, qreal y) \since 4.6 \overload Sets the origin point for the transformation in item coordinates. - This is equivalent to calling setTransformOrigin(QPointF(\a x, \a y)). + This is equivalent to calling setTransformOriginPoint(QPointF(\a x, \a y)). - \sa setTransformOrigin(), {Transformations} + \sa setTransformOriginPoint(), {Transformations} */ @@ -3619,7 +3434,7 @@ void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine) \warning using this function doesnt affect the value of the transformation properties - \sa transform(), setRotation(), setScale(), setShear(), setTransformOrigin(), {The Graphics View Coordinate System}, {Transformations} + \sa transform(), setRotation(), setScale(), setTransformOriginPoint(), {The Graphics View Coordinate System}, {Transformations} */ void QGraphicsItem::setTransform(const QTransform &matrix, bool combine) { @@ -3733,7 +3548,7 @@ void QGraphicsItem::shear(qreal sh, qreal sv) /*! \obsolete - Use setPos() or setTransformOrigin() instead. + Use setPos() or setTransformOriginPoint() instead. Translates the current item transformation by (\a dx, \a dy). @@ -6857,6 +6672,41 @@ QGraphicsObject::QGraphicsObject(QGraphicsItemPrivate &dd, QGraphicsItem *parent \sa pos() */ +/*! + \property QGraphicsObject::rotation + This property holds the rotation of the item in degrees. + + This specifies how many degrees to rotate the item around its transformOrigin. + The default rotation is 0 degrees (i.e. not rotated at all). +*/ + +/*! + \fn QGraphicsObject::rotationChanged() + + This signal gets emitted whenever the roation of the item changes. +*/ + +/*! + \property QGraphicsObject::scale + This property holds the scale of the item. + + A scale of less than 1 means the item will be displayed smaller than + normal, and a scale of greater than 1 means the item will be + displayed larger than normal. A negative scale means the item will + be mirrored. + + By default, items are displayed at a scale of 1 (i.e. at their + normal size). + + Scaling is from the item's transformOrigin. +*/ + +/*! + \fn void QGraphicsObject::scaleChanged() + + This signal is emitted when the scale of the item changes. +*/ + /*! \property QGraphicsObject::enabled @@ -6896,6 +6746,15 @@ QGraphicsObject::QGraphicsObject(QGraphicsItemPrivate &dd, QGraphicsItem *parent \sa visible */ +/*! + \property QGraphicsObject::transformOriginPoint + \brief the transformation origin + + This property sets a specific point in the items coordiante system as the + origin for scale and rotation. + + \sa scale, rotation, QGraphicsItem::transformOriginPoint() +*/ /*! diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index 0e21a47f0..945163fc9 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -71,6 +71,7 @@ class QGraphicsSceneHoverEvent; class QGraphicsSceneMouseEvent; class QGraphicsSceneWheelEvent; class QGraphicsScene; +class QGraphicsTransform; class QGraphicsWidget; class QInputMethodEvent; class QKeyEvent; @@ -268,34 +269,19 @@ public: void shear(qreal sh, qreal sv); // ### obsolete void translate(qreal dx, qreal dy); // ### obsolete - qreal xRotation() const; - void setXRotation(qreal angle); + void setRotation(qreal angle); + qreal rotation() const; - qreal yRotation() const; - void setYRotation(qreal angle); + void setScale(qreal scale); + qreal scale() const; - qreal zRotation() const; - void setZRotation(qreal angle); - void setRotation(qreal x, qreal y, qreal z); + QList transformations() const; + void setTransformations(const QList &transformations); - qreal xScale() const; - void setXScale(qreal factor); - - qreal yScale() const; - void setYScale(qreal factor); - void setScale(qreal sx, qreal sy); - - qreal horizontalShear() const; - void setHorizontalShear(qreal shear); - - qreal verticalShear() const; - void setVerticalShear(qreal shear); - void setShear(qreal sh, qreal sv); - - QPointF transformOrigin() const; - void setTransformOrigin(const QPointF &origin); - inline void setTransformOrigin(qreal x, qreal y) - { setTransformOrigin(QPointF(x,y)); } + QPointF transformOriginPoint() const; + void setTransformOriginPoint(const QPointF &origin); + inline void setTransformOriginPoint(qreal x, qreal y) + { setTransformOriginPoint(QPointF(x,y)); } virtual void advance(int phase); @@ -456,6 +442,7 @@ private: friend class QGraphicsSceneIndexPrivate; friend class QGraphicsSceneBspTreeIndex; friend class QGraphicsSceneBspTreeIndexPrivate; + friend class QGraphicsTransformPrivate; friend class ::tst_QGraphicsItem; friend bool qt_closestLeaf(const QGraphicsItem *, const QGraphicsItem *); friend bool qt_closestItemFirst(const QGraphicsItem *, const QGraphicsItem *); @@ -521,6 +508,9 @@ class Q_GUI_EXPORT QGraphicsObject : public QObject, public QGraphicsItem Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged) Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged) Q_PROPERTY(qreal z READ zValue WRITE setZValue NOTIFY zChanged) + Q_PROPERTY(qreal rotation READ rotation WRITE setRotation NOTIFY rotationChanged) + Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged) + Q_PROPERTY(QPointF transformOriginPoint READ transformOriginPoint WRITE setTransformOriginPoint) public: QGraphicsObject(QGraphicsItem *parent = 0); @@ -532,6 +522,8 @@ Q_SIGNALS: void xChanged(); void yChanged(); void zChanged(); + void rotationChanged(); + void scaleChanged(); protected: QGraphicsObject(QGraphicsItemPrivate &dd, QGraphicsItem *parent, QGraphicsScene *scene); diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index c208b9966..b8d98c1b8 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -57,6 +57,8 @@ #include "qset.h" #include "qpixmapcache.h" #include "qgraphicsview_p.h" +#include "qgraphicstransform.h" +#include "qgraphicstransform_p.h" #include @@ -192,7 +194,7 @@ public: void combineTransformToParent(QTransform *x, const QTransform *viewTransform = 0) const; void combineTransformFromParent(QTransform *x, const QTransform *viewTransform = 0) const; - void updateSceneTransformFromParent(); + virtual void updateSceneTransformFromParent(); // ### Qt 5: Remove. Workaround for reimplementation added after Qt 4.4. virtual QVariant inputMethodQueryHelper(Qt::InputMethodQuery query) const; @@ -200,6 +202,7 @@ public: void setPosHelper(const QPointF &pos); void setTransformHelper(const QTransform &transform); + void appendGraphicsTransform(QGraphicsTransform *t); void setVisibleHelper(bool newVisible, bool explicitly, bool update = true); void setEnabledHelper(bool newEnabled, bool explicitly, bool update = true); bool discardUpdateRequest(bool ignoreClipping = false, bool ignoreVisibleBit = false, @@ -467,45 +470,35 @@ public: struct QGraphicsItemPrivate::TransformData { QTransform transform; - qreal xScale; - qreal yScale; - qreal xRotation; - qreal yRotation; - qreal zRotation; - qreal horizontalShear; - qreal verticalShear; + qreal scale; + qreal rotation; qreal xOrigin; qreal yOrigin; + QList graphicsTransforms; bool onlyTransform; TransformData() : - xScale(1.0), yScale(1.0), xRotation(0.0), yRotation(0.0), zRotation(0.0), - horizontalShear(0.0), verticalShear(0.0), xOrigin(0.0), yOrigin(0.0), + scale(1.0), rotation(0.0), + xOrigin(0.0), yOrigin(0.0), onlyTransform(true) {} QTransform computedFullTransform(QTransform *postmultiplyTransform = 0) const { if (onlyTransform) { - if (!postmultiplyTransform) - return transform; - if (postmultiplyTransform->isIdentity()) + if (!postmultiplyTransform || postmultiplyTransform->isIdentity()) return transform; if (transform.isIdentity()) return *postmultiplyTransform; - QTransform x(transform); - x *= *postmultiplyTransform; - return x; + return transform * *postmultiplyTransform; } QTransform x(transform); - if (xOrigin != 0 || yOrigin != 0) - x *= QTransform::fromTranslate(xOrigin, yOrigin); - x.rotate(xRotation, Qt::XAxis); - x.rotate(yRotation, Qt::YAxis); - x.rotate(zRotation, Qt::ZAxis); - x.shear(horizontalShear, verticalShear); - x.scale(xScale, yScale); + for (int i = 0; i < graphicsTransforms.size(); ++i) + graphicsTransforms.at(i)->applyTo(&x); + x.translate(xOrigin, yOrigin); + x.rotate(rotation, Qt::ZAxis); + x.scale(scale, scale); x.translate(-xOrigin, -yOrigin); if (postmultiplyTransform) x *= *postmultiplyTransform; diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp new file mode 100644 index 000000000..f18752aec --- /dev/null +++ b/src/gui/graphicsview/qgraphicstransform.cpp @@ -0,0 +1,479 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qgraphicstransform.h" +#include "qgraphicsitem_p.h" +#include "qgraphicstransform_p.h" +#include + +#include +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + +QT_BEGIN_NAMESPACE + + +void QGraphicsTransformPrivate::setItem(QGraphicsItem *i) +{ + if (item == i) + return; + + if (item) { + Q_Q(QGraphicsTransform); + QGraphicsItemPrivate *d_ptr = item->d_ptr; + + item->prepareGeometryChange(); + Q_ASSERT(d_ptr->transformData); + d_ptr->transformData->graphicsTransforms.remove(q); + d_ptr->dirtySceneTransform = 1; + item = 0; + } + + item = i; +} + +void QGraphicsTransformPrivate::updateItem(QGraphicsItem *item) +{ + item->prepareGeometryChange(); + item->d_ptr->dirtySceneTransform = 1; +} + +void QGraphicsTransform::update() +{ + Q_D(QGraphicsTransform); + if (d->item) + d->updateItem(d->item); +} + +/*! + returns this object as a QTransform. +*/ +QTransform QGraphicsTransform::transform() const +{ + QTransform t; + applyTo(&t); + return t; +} + +/*! + \class QGraphicsTransform + \brief The QGraphicsTransform class is an abstract base class for tranformations on QGraphicsItems. + \since 4.6 + + The classes that inherit QGraphicsTransform express different types of transformations + that can be applied to graphics items. + + A list of these transformations can be applied to any graphics item. These + transformations are then easily modifyable and usable from e.g. within animations. + + QGraphicsTransform is an abstract base class that is implemented by QGraphicsScale, + QGraphicsRotation and QGraphicsRotation3D. Subclasses have to implement the applyTo method. + + \sa QGraphicsItem::transform(), QGraphicsScale, QGraphicsRotation, QGraphicsRotation3D +*/ + +/*! + Constructs a new QGraphicsTransform with \a parent. +*/ +QGraphicsTransform::QGraphicsTransform(QObject *parent) : + QObject(*new QGraphicsTransformPrivate, parent) +{ +} + +/*! + Destructs the graphics transform. +*/ +QGraphicsTransform::~QGraphicsTransform() +{ + Q_D(QGraphicsTransform); + d->setItem(0); +} + +/*! + \internal +*/ +QGraphicsTransform::QGraphicsTransform(QGraphicsTransformPrivate &p, QObject *parent) + : QObject(p, parent) +{ +} + +/*! \fn void QGraphicsTransform::applyTo(QTransform *transform) const + + This pure virtual method has to be reimplemented in derived classes. + + It applies this transformation to \a transform. +*/ + + +/*! + \class QGraphicsScale + \brief The QGraphicsScale class provides a way to scale a graphics item in 2 dimensions. + \since 4.6 + + QGraphicsScale contains an \a origin around which the scaling happens, and two + scale factors, xScale and yScale, the x and one for the y axis. +*/ + +class QGraphicsScalePrivate : public QGraphicsTransformPrivate +{ +public: + QGraphicsScalePrivate() + : xScale(1), yScale(1) {} + QPointF origin; + qreal xScale; + qreal yScale; +}; + +/*! + Constructs a new graphics scale object with \a parent. +*/ +QGraphicsScale::QGraphicsScale(QObject *parent) + : QGraphicsTransform(*new QGraphicsScalePrivate, parent) +{ +} + +/*! + Destroys the object +*/ +QGraphicsScale::~QGraphicsScale() +{ +} + +/*! + \property QGraphicsScale::origin + The origin of the scale. All scaling will be done relative to this point. + + The \a origin is in other words the fixed point for the transformation. +*/ +QPointF QGraphicsScale::origin() const +{ + Q_D(const QGraphicsScale); + return d->origin; +} + +void QGraphicsScale::setOrigin(const QPointF &point) +{ + Q_D(QGraphicsScale); + d->origin = point; + update(); + emit originChanged(); +} + +/*! + \fn QGraphicsScale::originChanged() + + This signal is emitted whenever the origin of the object + changes. +*/ + +/*! + \property QGraphicsScale::xScale + + The scale factor in x direction. The x direction is + in the graphics items logical coordinates. + + \sa yScale +*/ +qreal QGraphicsScale::xScale() const +{ + Q_D(const QGraphicsScale); + return d->xScale; +} + +void QGraphicsScale::setXScale(qreal scale) +{ + Q_D(QGraphicsScale); + if (d->xScale == scale) + return; + d->xScale = scale; + update(); + emit scaleChanged(); +} + +/*! + \property QGraphicsScale::yScale + + The scale factor in y direction. The y direction is + in the graphics items logical coordinates. + + \sa xScale +*/ +qreal QGraphicsScale::yScale() const +{ + Q_D(const QGraphicsScale); + return d->yScale; +} + +void QGraphicsScale::setYScale(qreal scale) +{ + Q_D(QGraphicsScale); + if (d->yScale == scale) + return; + d->yScale = scale; + update(); + emit scaleChanged(); +} + +/*! + \fn QGraphicsScale::scaleChanged() + + This signal is emitted whenever the xScale or yScale of the object + changes. +*/ + +/*! + \reimp +*/ +void QGraphicsScale::applyTo(QTransform *transform) const +{ + Q_D(const QGraphicsScale); + transform->translate(d->origin.x(), d->origin.y()); + transform->scale(d->xScale, d->yScale); + transform->translate(-d->origin.x(), -d->origin.y()); +} + +/*! + \class QGraphicsRotation + \brief The QGraphicsRotation class provides a way to rotate a graphics item in 2 dimensions. + \since 4.6 + + QGraphicsRotation contains an \a origin around which the rotation happens, and one + angle in degrees describing the amount of the rotation. +*/ + +class QGraphicsRotationPrivate : public QGraphicsTransformPrivate +{ +public: + QGraphicsRotationPrivate() + : angle(0) {} + QPointF origin; + qreal originY; + qreal angle; +}; + +/*! + Constructs a new graphics rotation with \a parent. +*/ +QGraphicsRotation::QGraphicsRotation(QObject *parent) + : QGraphicsTransform(*new QGraphicsRotationPrivate, parent) +{ +} + +/*! + \internal +*/ +QGraphicsRotation::QGraphicsRotation(QGraphicsRotationPrivate &p, QObject *parent) + : QGraphicsTransform(p, parent) +{ +} + +/*! + Destructs the object +*/ +QGraphicsRotation::~QGraphicsRotation() +{ +} + +/*! + \property QGraphicsRotation::origin + The origin around which this object will rotate the graphics item. + + The \a origin is in other words the fixed point for the transformation. +*/ +QPointF QGraphicsRotation::origin() const +{ + Q_D(const QGraphicsRotation); + return d->origin; +} + +void QGraphicsRotation::setOrigin(const QPointF &point) +{ + Q_D(QGraphicsRotation); + d->origin = point; + update(); + emit originChanged(); +} + +/*! + \fn QGraphicsRotation::originChanged() + + This signal is emitted whenever the origin of the object + changes. +*/ + +/*! + \property QGraphicsRotation::angle + The angle, in degrees, of the rotation. +*/ +qreal QGraphicsRotation::angle() const +{ + Q_D(const QGraphicsRotation); + return d->angle; +} + +void QGraphicsRotation::setAngle(qreal angle) +{ + Q_D(QGraphicsRotation); + if (d->angle == angle) + return; + d->angle = angle; + update(); + emit angleChanged(); +} + +/*! + \fn void QGraphicsRotation::angleChanged() + + This signal is emitted whenever the angle of the object + changes. +*/ + +/*! + \reimp +*/ +void QGraphicsRotation::applyTo(QTransform *t) const +{ + Q_D(const QGraphicsRotation); + if(d->angle) { + t->translate(d->origin.x(), d->origin.y()); + t->rotate(d->angle); + t->translate(-d->origin.x(), -d->origin.y()); + } +} + + +/*! + \class QGraphicsRotation3D + \brief The QGraphicsRotation3D class provides a way to rotate a graphics item in 3 dimensions. + \since 4.6 + + In addition to the origin and angle of a simple QGraphicsRotation, QGraphicsRotation3D contains + also an axis that describes around which axis in space the rotation is supposed to happen. +*/ + +class QGraphicsRotation3DPrivate : public QGraphicsRotationPrivate +{ +public: + QGraphicsRotation3DPrivate() {} + + QVector3D axis; +}; + +/*! + Constructs a new 3D rotation with \a parent. +*/ +QGraphicsRotation3D::QGraphicsRotation3D(QObject *parent) + : QGraphicsRotation(*new QGraphicsRotation3DPrivate, parent) +{ +} + +/*! + Destroys the object +*/ +QGraphicsRotation3D::~QGraphicsRotation3D() +{ +} + +/*! + \property QGraphicsRotation3D::axis + + A rotation axis is specified by a vector in 3D space. +*/ +QVector3D QGraphicsRotation3D::axis() +{ + Q_D(QGraphicsRotation3D); + return d->axis; +} + +void QGraphicsRotation3D::setAxis(const QVector3D &axis) +{ + Q_D(QGraphicsRotation3D); + d->axis = axis; + update(); +} + +/*! + \fn void QGraphicsRotation3D::axisChanged() + + This signal is emitted whenever the axis of the object + changes. +*/ + +const qreal inv_dist_to_plane = 1. / 1024.; + +/*! + \reimp +*/ +void QGraphicsRotation3D::applyTo(QTransform *t) const +{ + Q_D(const QGraphicsRotation3D); + + if (d->angle == 0. || + (d->axis.z() == 0. && d->axis.y() == 0 && d->axis.x() == 0)) + return; + + qreal rad = d->angle * 2. * M_PI / 360.; + qreal c = ::cos(rad); + qreal s = ::sin(rad); + + qreal x = d->axis.x(); + qreal y = d->axis.y(); + qreal z = d->axis.z(); + + qreal len = x * x + y * y + z * z; + if (len != 1.) { + len = 1./::sqrt(len); + x *= len; + y *= len; + z *= len; + } + + t->translate(d->origin.x(), d->origin.y()); + *t = QTransform(x*x*(1-c)+c, x*y*(1-c)-z*s, x*z*(1-c)+y*s*inv_dist_to_plane, + y*x*(1-c)+z*s, y*y*(1-c)+c, y*z*(1-c)-x*s*inv_dist_to_plane, + 0, 0, 1) * *t; + t->translate(-d->origin.x(), -d->origin.y()); +} + +#include "moc_qgraphicstransform.cpp" + +QT_END_NAMESPACE diff --git a/src/gui/graphicsview/qgraphicstransform.h b/src/gui/graphicsview/qgraphicstransform.h new file mode 100644 index 000000000..adf943815 --- /dev/null +++ b/src/gui/graphicsview/qgraphicstransform.h @@ -0,0 +1,168 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QGRAPHICSTRANSFORM_H +#define QGRAPHICSTRANSFORM_H + +#include +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + +class QGraphicsItem; +class QGraphicsTransformPrivate; + +class Q_GUI_EXPORT QGraphicsTransform : public QObject +{ + Q_OBJECT +public: + QGraphicsTransform(QObject *parent = 0); + ~QGraphicsTransform(); + + QTransform transform() const; + virtual void applyTo(QTransform *transform) const = 0; + +protected slots: + void update(); + +protected: + QGraphicsTransform(QGraphicsTransformPrivate &p, QObject *parent); +private: + friend class QGraphicsItem; + friend class QGraphicsItemPrivate; + Q_DECLARE_PRIVATE(QGraphicsTransform) +}; + +class QGraphicsScalePrivate; + +class Q_GUI_EXPORT QGraphicsScale : public QGraphicsTransform +{ + Q_OBJECT + + Q_PROPERTY(QPointF origin READ origin WRITE setOrigin NOTIFY originChanged) + Q_PROPERTY(qreal xScale READ xScale WRITE setXScale NOTIFY scaleChanged) + Q_PROPERTY(qreal yScale READ yScale WRITE setYScale NOTIFY scaleChanged) +public: + QGraphicsScale(QObject *parent = 0); + ~QGraphicsScale(); + + QPointF origin() const; + void setOrigin(const QPointF &point); + + qreal xScale() const; + void setXScale(qreal); + + qreal yScale() const; + void setYScale(qreal); + + void applyTo(QTransform *transform) const; + +Q_SIGNALS: + void originChanged(); + void scaleChanged(); + +private: + Q_DECLARE_PRIVATE(QGraphicsScale) +}; + +class QGraphicsRotationPrivate; + +class Q_GUI_EXPORT QGraphicsRotation : public QGraphicsTransform +{ + Q_OBJECT + + Q_PROPERTY(QPointF origin READ origin WRITE setOrigin NOTIFY originChanged) + Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged) +public: + QGraphicsRotation(QObject *parent = 0); + ~QGraphicsRotation(); + + QPointF origin() const; + void setOrigin(const QPointF &point); + + qreal angle() const; + void setAngle(qreal); + + void applyTo(QTransform *transform) const; + +Q_SIGNALS: + void originChanged(); + void angleChanged(); + +protected: + QGraphicsRotation(QGraphicsRotationPrivate &p, QObject *parent); +private: + Q_DECLARE_PRIVATE(QGraphicsRotation) +}; + +class QGraphicsRotation3DPrivate; + +class Q_GUI_EXPORT QGraphicsRotation3D : public QGraphicsRotation +{ + Q_OBJECT + + Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged) +public: + QGraphicsRotation3D(QObject *parent = 0); + ~QGraphicsRotation3D(); + + QVector3D axis(); + void setAxis(const QVector3D &axis); + + void applyTo(QTransform *transform) const; + +Q_SIGNALS: + void axisChanged(); + +private: + Q_DECLARE_PRIVATE(QGraphicsRotation3D) +}; + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QFXTRANSFORM_H diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index 6f56b84f9..3ea80cedb 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -1728,39 +1728,6 @@ QGraphicsWidget *QGraphicsWidget::focusWidget() const return 0; } -/*! \property QGraphicsWidget::horizontalShear - \brief This property holds the horizontal shear value for the item. - */ - -/*! \property QGraphicsWidget::transformOrigin - \brief This property holds the origin point used for transformations - in item coordinates. - */ - -/*! \property QGraphicsWidget::verticalShear - \brief This property holds the vertical shear value for the item. - */ - -/*! \property QGraphicsWidget::xRotation - \brief This property holds the value for rotation around the x axis. - */ - -/*! \property QGraphicsWidget::xScale - \brief This property holds the scale factor for the x axis. - */ - -/*! \property QGraphicsWidget::yRotation - \brief This property holds the value for rotation around the y axis. - */ - -/*! \property QGraphicsWidget::yScale - \brief This property holds the scale factor for the y axis. - */ - -/*! \property QGraphicsWidget::zRotation - \brief This property holds the value for rotation around the z axis. - */ - #ifndef QT_NO_SHORTCUT /*! \since 4.5 diff --git a/src/gui/graphicsview/qgraphicswidget.h b/src/gui/graphicsview/qgraphicswidget.h index b72ec9f3a..d03a637b5 100644 --- a/src/gui/graphicsview/qgraphicswidget.h +++ b/src/gui/graphicsview/qgraphicswidget.h @@ -77,14 +77,6 @@ class Q_GUI_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphicsLay Q_PROPERTY(Qt::WindowFlags windowFlags READ windowFlags WRITE setWindowFlags) Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle) Q_PROPERTY(QRectF geometry READ geometry WRITE setGeometry) - Q_PROPERTY(QPointF transformOrigin READ transformOrigin WRITE setTransformOrigin) - Q_PROPERTY(qreal xRotation READ xRotation WRITE setXRotation) - Q_PROPERTY(qreal yRotation READ yRotation WRITE setYRotation) - Q_PROPERTY(qreal zRotation READ zRotation WRITE setZRotation) - Q_PROPERTY(qreal xScale READ xScale WRITE setXScale) - Q_PROPERTY(qreal yScale READ yScale WRITE setYScale) - Q_PROPERTY(qreal horizontalShear READ horizontalShear WRITE setHorizontalShear) - Q_PROPERTY(qreal verticalShear READ verticalShear WRITE setVerticalShear) public: QGraphicsWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); ~QGraphicsWidget(); diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 9f1693dc8..7f6f32226 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -6884,44 +6885,21 @@ void tst_QGraphicsItem::update() void tst_QGraphicsItem::setTransformProperties_data() { QTest::addColumn("origin"); - QTest::addColumn("rotationX"); - QTest::addColumn("rotationY"); - QTest::addColumn("rotationZ"); - QTest::addColumn("scaleX"); - QTest::addColumn("scaleY"); - QTest::addColumn("shearX"); - QTest::addColumn("shearY"); + QTest::addColumn("rotation"); + QTest::addColumn("scale"); - QTest::newRow("nothing") << QPointF() << qreal(0.0) << qreal(0.0) << qreal(0.0) - << qreal(1.0) << qreal(1.0) << qreal(0.0) << qreal(0.0); + QTest::newRow("nothing") << QPointF() << qreal(0.0) << qreal(1.0); - QTest::newRow("rotationZ") << QPointF() << qreal(0.0) << qreal(0.0) << qreal(42.2) - << qreal(1.0) << qreal(1.0) << qreal(0.0) << qreal(0.0); + QTest::newRow("rotation") << QPointF() << qreal(42.2) << qreal(1.0); - QTest::newRow("rotationXY") << QPointF() << qreal(12.5) << qreal(53.6) << qreal(0.0) - << qreal(1.0) << qreal(1.0) << qreal(0.0) << qreal(0.0); + QTest::newRow("rotation dicentred") << QPointF(qreal(22.3), qreal(-56.2)) + << qreal(-2578.2) + << qreal(1.0); - QTest::newRow("rotationXYZ") << QPointF() << qreal(-25) << qreal(12) << qreal(556) - << qreal(1.0) << qreal(1.0) << qreal(0.0) << qreal(0.0); + QTest::newRow("Scale") << QPointF() << qreal(0.0) + << qreal(6); - QTest::newRow("rotationXYZ dicentred") << QPointF(-53, 25.2) - << qreal(-2578.2) << qreal(4565.2) << qreal(56) - << qreal(1.0) << qreal(1.0) << qreal(0.0) << qreal(0.0); - - QTest::newRow("Scale") << QPointF() << qreal(0.0) << qreal(0.0) << qreal(0.0) - << qreal(6) << qreal(0.5) << qreal(0.0) << qreal(0.0); - - QTest::newRow("Shear") << QPointF() << qreal(0.0) << qreal(0.0) << qreal(0.0) - << qreal(1.0) << qreal(1.0) << qreal(2.2) << qreal(0.5); - - QTest::newRow("Scale and Shear") << QPointF() << qreal(0.0) << qreal(0.0) << qreal(0.0) - << qreal(5.2) << qreal(2.1) << qreal(5.2) << qreal(5.5); - - QTest::newRow("Everything") << QPointF() << qreal(41) << qreal(-23) << qreal(0.56) - << qreal(8.2) << qreal(-0.2) << qreal(-12) << qreal(-0.8); - - QTest::newRow("Everything dicentred") << QPointF(qreal(22.3), qreal(-56.2)) << qreal(-175) << qreal(196) << qreal(-1260) - << qreal(4) << qreal(2) << qreal(2.56) << qreal(0.8); + QTest::newRow("Everything dicentred") << QPointF(qreal(22.3), qreal(-56.2)) << qreal(-175) << qreal(196); } /** @@ -6932,92 +6910,61 @@ void tst_QGraphicsItem::setTransformProperties_data() void tst_QGraphicsItem::setTransformProperties() { QFETCH(QPointF,origin); - QFETCH(qreal,rotationX); - QFETCH(qreal,rotationY); - QFETCH(qreal,rotationZ); - QFETCH(qreal,scaleX); - QFETCH(qreal,scaleY); - QFETCH(qreal,shearX); - QFETCH(qreal,shearY); + QFETCH(qreal,rotation); + QFETCH(qreal,scale); QTransform result; result.translate(origin.x(), origin.y()); - result.rotate(rotationX, Qt::XAxis); - result.rotate(rotationY, Qt::YAxis); - result.rotate(rotationZ, Qt::ZAxis); - result.shear(shearX, shearY); - result.scale(scaleX, scaleY); + result.rotate(rotation, Qt::ZAxis); + result.scale(scale, scale); result.translate(-origin.x(), -origin.y()); QGraphicsScene scene; QGraphicsRectItem *item = new QGraphicsRectItem(QRectF(0, 0, 100, 100)); scene.addItem(item); - item->setRotation(rotationX, rotationY, rotationZ); - item->setScale(scaleX, scaleY); - item->setShear(shearX, shearY); - item->setTransformOrigin(origin); + item->setRotation(rotation); + item->setScale(scale); + item->setTransformOriginPoint(origin); - QCOMPARE(item->xRotation(), rotationX); - QCOMPARE(item->yRotation(), rotationY); - QCOMPARE(item->zRotation(), rotationZ); - QCOMPARE(item->xScale(), scaleX); - QCOMPARE(item->yScale(), scaleY); - QCOMPARE(item->horizontalShear(), shearX); - QCOMPARE(item->verticalShear(), shearY); - QCOMPARE(item->transformOrigin(), origin); + QCOMPARE(item->rotation(), rotation); + QCOMPARE(item->scale(), scale); + QCOMPARE(item->transformOriginPoint(), origin); QCOMPARE(QTransform(), item->transform()); QCOMPARE(result, item->sceneTransform()); //----------------------------------------------------------------- //Change the rotation Z - item->setZRotation(45); + item->setRotation(45); QTransform result2; result2.translate(origin.x(), origin.y()); - result2.rotate(rotationX, Qt::XAxis); - result2.rotate(rotationY, Qt::YAxis); - result2.rotate(45, Qt::ZAxis); - result2.shear(shearX, shearY); - result2.scale(scaleX, scaleY); + result2.rotate(45); + result2.scale(scale, scale); result2.translate(-origin.x(), -origin.y()); - QCOMPARE(item->xRotation(), rotationX); - QCOMPARE(item->yRotation(), rotationY); - QCOMPARE(item->zRotation(), 45.0); - QCOMPARE(item->xScale(), scaleX); - QCOMPARE(item->yScale(), scaleY); - QCOMPARE(item->horizontalShear(), shearX); - QCOMPARE(item->verticalShear(), shearY); - QCOMPARE(item->transformOrigin(), origin); + QCOMPARE(item->rotation(), 45.); + QCOMPARE(item->scale(), scale); + QCOMPARE(item->transformOriginPoint(), origin); QCOMPARE(QTransform(), item->transform()); QCOMPARE(result2, item->sceneTransform()); //----------------------------------------------------------------- - // calling setTransform() and setPos shoukld change the sceneTransform + // calling setTransform() and setPos should change the sceneTransform item->setTransform(result); item->setPos(100, -150.5); - QCOMPARE(item->xRotation(), rotationX); - QCOMPARE(item->yRotation(), rotationY); - QCOMPARE(item->zRotation(), 45.0); - QCOMPARE(item->xScale(), scaleX); - QCOMPARE(item->yScale(), scaleY); - QCOMPARE(item->horizontalShear(), shearX); - QCOMPARE(item->verticalShear(), shearY); - QCOMPARE(item->transformOrigin(), origin); + QCOMPARE(item->rotation(), 45.); + QCOMPARE(item->scale(), scale); + QCOMPARE(item->transformOriginPoint(), origin); QCOMPARE(result, item->transform()); - QTransform result3; + QTransform result3(result); result3.translate(origin.x(), origin.y()); - result3 = result * result3; - result3.rotate(rotationX, Qt::XAxis); - result3.rotate(rotationY, Qt::YAxis); - result3.rotate(45, Qt::ZAxis); - result3.shear(shearX, shearY); - result3.scale(scaleX, scaleY); + result3.rotate(45); + result3.scale(scale, scale); result3.translate(-origin.x(), -origin.y()); result3 *= QTransform::fromTranslate(100, -150.5); //the pos; @@ -7034,10 +6981,9 @@ void tst_QGraphicsItem::setTransformProperties() item1->setPos(12.3, -5); item2->setPos(12.3, -5); - item1->setRotation(rotationX, rotationY, rotationZ); - item1->setScale(scaleX, scaleY); - item1->setShear(shearX, shearY); - item1->setTransformOrigin(origin); + item1->setRotation(rotation); + item1->setScale(scale); + item1->setTransformOriginPoint(origin); item2->setTransform(result); @@ -7046,36 +6992,6 @@ void tst_QGraphicsItem::setTransformProperties() QCOMPARE_TRANSFORM(item1->itemTransform(item2), QTransform()); QCOMPARE_TRANSFORM(item2->itemTransform(item1), QTransform()); } - - {//with center origin on the item - QGraphicsRectItem *item1 = new QGraphicsRectItem(QRectF(50.2, -150, 230.5, 119)); - scene.addItem(item1); - QGraphicsRectItem *item2 = new QGraphicsRectItem(QRectF(50.2, -150, 230.5, 119)); - scene.addItem(item2); - - item1->setPos(12.3, -5); - item2->setPos(12.3, -5); - item1->setTransformOrigin(origin); - item2->setTransformOrigin(origin); - - item1->setRotation(rotationX, rotationY, rotationZ); - item1->setScale(scaleX, scaleY); - item1->setShear(shearX, shearY); - - QTransform tr; - tr.rotate(rotationX, Qt::XAxis); - tr.rotate(rotationY, Qt::YAxis); - tr.rotate(rotationZ, Qt::ZAxis); - tr.shear(shearX, shearY); - tr.scale(scaleX, scaleY); - - item2->setTransform(tr); - - QCOMPARE_TRANSFORM(item1->sceneTransform(), item2->sceneTransform()); - - QCOMPARE_TRANSFORM(item1->itemTransform(item2), QTransform()); - QCOMPARE_TRANSFORM(item2->itemTransform(item1), QTransform()); - } } class MyStyleOptionTester : public QGraphicsRectItem diff --git a/tests/auto/qgraphicstransform/qgraphicstransform.pro b/tests/auto/qgraphicstransform/qgraphicstransform.pro new file mode 100644 index 000000000..709cff690 --- /dev/null +++ b/tests/auto/qgraphicstransform/qgraphicstransform.pro @@ -0,0 +1,2 @@ +load(qttest_p4) +SOURCES += tst_qgraphicstransform.cpp diff --git a/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp b/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp new file mode 100644 index 000000000..672b1f15a --- /dev/null +++ b/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp @@ -0,0 +1,162 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include +#include +#include +#include "../../shared/util.h" + +class tst_QGraphicsTransform : public QObject { + Q_OBJECT + +public slots: + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + +private slots: + void scale(); + void rotation(); + void rotation3d(); +}; + + +// This will be called before the first test function is executed. +// It is only called once. +void tst_QGraphicsTransform::initTestCase() +{ +} + +// This will be called after the last test function is executed. +// It is only called once. +void tst_QGraphicsTransform::cleanupTestCase() +{ +} + +// This will be called before each test function is executed. +void tst_QGraphicsTransform::init() +{ +} + +// This will be called after every test function. +void tst_QGraphicsTransform::cleanup() +{ +} + + +void tst_QGraphicsTransform::scale() +{ + QGraphicsScale scale; + scale.setOrigin(QPointF(10, 10)); + + QTransform t; + scale.applyTo(&t); + + QCOMPARE(t, QTransform()); + QCOMPARE(scale.transform(), QTransform()); + + scale.setXScale(10); + scale.setOrigin(QPointF(0, 0)); + + QTransform res; + res.scale(10, 1); + + QCOMPARE(scale.transform(), res); + QCOMPARE(scale.transform().map(QPointF(10, 10)), QPointF(100, 10)); + + scale.setOrigin(QPointF(10, 10)); + QCOMPARE(scale.transform().map(QPointF(10, 10)), QPointF(10, 10)); + QCOMPARE(scale.transform().map(QPointF(11, 10)), QPointF(20, 10)); +} + +void tst_QGraphicsTransform::rotation() +{ + QGraphicsRotation rotation; + rotation.setOrigin(QPointF(10, 10)); + + QTransform t; + rotation.applyTo(&t); + + QCOMPARE(t, QTransform()); + QCOMPARE(rotation.transform(), QTransform()); + + rotation.setAngle(40); + rotation.setOrigin(QPointF(0, 0)); + + QTransform res; + res.rotate(40); + + QCOMPARE(rotation.transform(), res); + + rotation.setOrigin(QPointF(10, 10)); + rotation.setAngle(90); + QCOMPARE(rotation.transform().map(QPointF(10, 10)), QPointF(10, 10)); + QCOMPARE(rotation.transform().map(QPointF(20, 10)), QPointF(10, 20)); +} + +void tst_QGraphicsTransform::rotation3d() +{ + QGraphicsRotation3D rotation; + rotation.setOrigin(QPointF(10, 10)); + + QTransform t; + rotation.applyTo(&t); + + QCOMPARE(t, QTransform()); + QCOMPARE(rotation.transform(), QTransform()); + + rotation.setAngle(180); + + QCOMPARE(t, QTransform()); + QCOMPARE(rotation.transform(), QTransform()); + + rotation.setOrigin(QPointF(0, 0)); + + QCOMPARE(t, QTransform()); + QCOMPARE(rotation.transform(), QTransform()); +} + + +QTEST_MAIN(tst_QGraphicsTransform) +#include "tst_qgraphicstransform.moc" + -- cgit v1.2.3 From e8b1b11731b6cb52985af35d9aaaa680859f99c2 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 29 Jul 2009 03:01:28 +0200 Subject: forgot to add this file in the last commit. --- src/gui/graphicsview/qgraphicstransform_p.h | 73 +++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 src/gui/graphicsview/qgraphicstransform_p.h diff --git a/src/gui/graphicsview/qgraphicstransform_p.h b/src/gui/graphicsview/qgraphicstransform_p.h new file mode 100644 index 000000000..2d36edae2 --- /dev/null +++ b/src/gui/graphicsview/qgraphicstransform_p.h @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QGRAPHICSTRANSFORM_P_H +#define QGRAPHICSTRANSFORM_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp. This header +// file may change from version to version without notice, or even be removed. +// +// We mean it. +// + +#include "private/qobject_p.h" + +class QGraphicsItem; + +class QGraphicsTransformPrivate : public QObjectPrivate { +public: + Q_DECLARE_PUBLIC(QGraphicsTransform) + + QGraphicsTransformPrivate() + : QObjectPrivate(), item(0) {} + + QGraphicsItem *item; + + void setItem(QGraphicsItem *item); + static void updateItem(QGraphicsItem *item); +}; + +#endif // QGRAPHICSTRANSFORM_P_H -- cgit v1.2.3 From 2c9bf5d611cbc293851c80d4df5a46c36eac41f7 Mon Sep 17 00:00:00 2001 From: Bill King Date: Wed, 29 Jul 2009 11:53:50 +1000 Subject: Fixes various db2 autotest issues. --- src/qt3support/sql/q3sqlcursor.cpp | 2 +- src/sql/drivers/db2/qsql_db2.cpp | 4 +++- tests/auto/qsqldatabase/tst_databases.h | 10 +++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/qt3support/sql/q3sqlcursor.cpp b/src/qt3support/sql/q3sqlcursor.cpp index 6b0c69f76..aa6aae2d1 100644 --- a/src/qt3support/sql/q3sqlcursor.cpp +++ b/src/qt3support/sql/q3sqlcursor.cpp @@ -879,7 +879,7 @@ QString Q3SqlCursor::toString(const QString& prefix, QSqlField* field, const QSt { QString f; if (field && driver()) { - f = (prefix.length() > 0 ? prefix + QLatin1Char('.') : QString()) + field->name(); + f = (prefix.length() > 0 ? prefix + QLatin1Char('.') : QString()) + driver()->escapeIdentifier(field->name(), QSqlDriver::FieldName); f += QLatin1Char(' ') + fieldSep + QLatin1Char(' '); if (field->isNull()) { f += QLatin1String("NULL"); diff --git a/src/sql/drivers/db2/qsql_db2.cpp b/src/sql/drivers/db2/qsql_db2.cpp index 474c53dc4..a32b3aac9 100644 --- a/src/sql/drivers/db2/qsql_db2.cpp +++ b/src/sql/drivers/db2/qsql_db2.cpp @@ -868,11 +868,13 @@ bool QDB2Result::fetch(int i) SQL_FETCH_ABSOLUTE, actualIdx); } - if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) { + if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO && r != SQL_NO_DATA) { setLastError(qMakeError(QCoreApplication::translate("QDB2Result", "Unable to fetch record %1").arg(i), QSqlError::StatementError, d)); return false; } + else if (r == SQL_NO_DATA) + return false; setAt(i); return true; } diff --git a/tests/auto/qsqldatabase/tst_databases.h b/tests/auto/qsqldatabase/tst_databases.h index 9c8c313d5..8253541fd 100644 --- a/tests/auto/qsqldatabase/tst_databases.h +++ b/tests/auto/qsqldatabase/tst_databases.h @@ -335,7 +335,7 @@ public: if(table2.compare(table.section('.', -1, -1), Qt::CaseInsensitive) == 0) { table=db.driver()->escapeIdentifier(table2, QSqlDriver::TableName); wasDropped = q.exec( "drop table " + table); - dbtables.removeAll(table); + dbtables.removeAll(table2); } } } @@ -430,8 +430,8 @@ public: return "IDENTITY"; /* if ( db.driverName().startsWith( "QPSQL" ) ) return "SERIAL";*/ - if ( db.driverName().startsWith( "QDB2" ) ) - return "GENERATED BY DEFAULT AS IDENTITY"; +// if ( db.driverName().startsWith( "QDB2" ) ) +// return "GENERATED BY DEFAULT AS IDENTITY"; return QString(); } @@ -483,6 +483,10 @@ public: { return db.driverName().startsWith("QMYSQL") || (db.driverName().startsWith("QODBC") && db.databaseName().contains("MySQL") ); } + static bool isDB2( QSqlDatabase db ) + { + return db.driverName().startsWith("QDB2") || (db.driverName().startsWith("QODBC") && db.databaseName().contains("db2") ); + } // -1 on fail, else Oracle version static int getOraVersion( QSqlDatabase db ) -- cgit v1.2.3 From 509a04338bc2b556c15f494a73947e82e3cdcc62 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Wed, 29 Jul 2009 02:32:48 +0200 Subject: Disambiguate QGraphicsObject::children(). Add using to prefer QObject::children() over the obsolete QGraphicsItem::children() function. Reviewed-by: Henrik Hartz --- src/gui/graphicsview/qgraphicsitem.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index 945163fc9..b94fb970a 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -514,6 +514,13 @@ class Q_GUI_EXPORT QGraphicsObject : public QObject, public QGraphicsItem public: QGraphicsObject(QGraphicsItem *parent = 0); + // ### Qt 5: Disambiguate +#ifdef Q_NO_USING_KEYWORD + const QObjectList &children() const { return QObject::children(); } +#else + using QObject::children; +#endif + Q_SIGNALS: void parentChanged(); void opacityChanged(); -- cgit v1.2.3 From e841cc37bf7fde58e7b0ffc024d31f6a46a83745 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Wed, 29 Jul 2009 03:21:09 +0200 Subject: Fix remaining autotest failures in tst_QGraphicsWidget Change f68fed3 introduced a few regressions in the QGraphicsWidget autotests. It turned out those autotests relied on behavior that this fix "fixed". The exact bugs were 1) that setting focus on a window or a child of a window that isn't active will automatically give that item focus, despite that its window is inactive (in contrast it should just set up subfocus and give the item focus when the window is activated), and 2) that adding a window to a scene that is active did not immediately activate that window. So one fix in the test and one in QGraphicsScene. The autotests were modified so that the respective tests operate on an active scene (by assigning the scene to an active view). The change in QGraphicsScene ensures that the first window that gets added to an active scene that does not have any active windows already, automatically gets activated. Reviewed-by: Michael Brasser --- src/gui/graphicsview/qgraphicsscene.cpp | 4 ++++ tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index f223cbe91..e54efe040 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -2356,6 +2356,10 @@ void QGraphicsScene::addItem(QGraphicsItem *item) // Deliver post-change notification item->itemChange(QGraphicsItem::ItemSceneHasChanged, newSceneVariant); + // Auto-activate the first inactive window if the scene is active. + if (d->activationRefCount > 0 && !d->activeWindow && item->isWindow()) + setActiveWindow(static_cast(item)); + // Ensure that newly added items that have subfocus set, gain // focus automatically if there isn't a focus item already. if (!d->focusItem && item->focusItem()) diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp index 78d13d329..2cfedb145 100644 --- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp @@ -1315,6 +1315,12 @@ void tst_QGraphicsWidget::focusNextPrevChild() void tst_QGraphicsWidget::verifyFocusChain() { QGraphicsScene scene; + QGraphicsView view(&scene); + view.show(); +#ifdef Q_WS_X11 + qt_x11_wait_for_window_manager(&view); +#endif + QTest::qWait(250); { // parent/child focus SubQGraphicsWidget *w = new SubQGraphicsWidget(0, Qt::Window); @@ -1448,6 +1454,11 @@ void tst_QGraphicsWidget::updateFocusChainWhenChildDie() QGraphicsScene scene; QGraphicsView view(&scene); view.show(); +#ifdef Q_WS_X11 + qt_x11_wait_for_window_manager(&view); +#endif + QTest::qWait(250); + // delete item in focus chain with no focus and verify chain SubQGraphicsWidget *parent = new SubQGraphicsWidget(0, Qt::Window); SubQGraphicsWidget *w = new SubQGraphicsWidget(0, Qt::Window); -- cgit v1.2.3 From b51f10492b40b94c25661ec42ccf951268f3a969 Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Wed, 29 Jul 2009 04:51:50 +0200 Subject: Ensure hover enter events are dispatched on mouse press. This change ensures that mouse presses received by the scene when there are no current mouse grabbers trigger hover event delivery. This is useful when the scene only receives presses, and no mouse moves (e.g., disabling mouse tracking on the viewport, or on systems where the mouse press is the first received event). Reviewed-by: Michael Brasser --- src/gui/graphicsview/qgraphicsscene.cpp | 7 +++ tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp | 69 ++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index e54efe040..a846cf680 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -3682,6 +3682,13 @@ void QGraphicsScene::keyReleaseEvent(QKeyEvent *keyEvent) void QGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent) { Q_D(QGraphicsScene); + if (d->mouseGrabberItems.isEmpty()) { + // Dispatch hover events + QGraphicsSceneHoverEvent hover; + _q_hoverFromMouseEvent(&hover, mouseEvent); + d->dispatchHoverEvent(&hover); + } + d->mousePressEventHandler(mouseEvent); } diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp index f7ea4cecc..4ef1cdd80 100644 --- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp @@ -255,6 +255,7 @@ private slots: void sendEvent(); void inputMethod_data(); void inputMethod(); + void dispatchHoverOnPress(); // task specific tests below me void task139710_bspTreeCrash(); @@ -3719,5 +3720,73 @@ void tst_QGraphicsScene::inputMethod() QCOMPARE(item->queryCalls, 0); } +void tst_QGraphicsScene::dispatchHoverOnPress() +{ + QGraphicsScene scene; + EventTester *tester1 = new EventTester; + tester1->setAcceptHoverEvents(true); + EventTester *tester2 = new EventTester; + tester2->setAcceptHoverEvents(true); + tester2->setPos(30, 30); + scene.addItem(tester1); + scene.addItem(tester2); + + tester1->eventTypes.clear(); + tester2->eventTypes.clear(); + + { + QGraphicsSceneMouseEvent me(QEvent::GraphicsSceneMousePress); + me.setButton(Qt::LeftButton); + me.setButtons(Qt::LeftButton); + QGraphicsSceneMouseEvent me2(QEvent::GraphicsSceneMouseRelease); + me2.setButton(Qt::LeftButton); + qApp->sendEvent(&scene, &me); + qApp->sendEvent(&scene, &me2); + QCOMPARE(tester1->eventTypes, QList() + << QEvent::GraphicsSceneHoverEnter + << QEvent::GraphicsSceneHoverMove + << QEvent::GrabMouse + << QEvent::GraphicsSceneMousePress + << QEvent::UngrabMouse); + tester1->eventTypes.clear(); + qApp->sendEvent(&scene, &me); + qApp->sendEvent(&scene, &me2); + QCOMPARE(tester1->eventTypes, QList() + << QEvent::GraphicsSceneHoverMove + << QEvent::GrabMouse + << QEvent::GraphicsSceneMousePress + << QEvent::UngrabMouse); + } + { + QGraphicsSceneMouseEvent me(QEvent::GraphicsSceneMousePress); + me.setScenePos(QPointF(30, 30)); + me.setButton(Qt::LeftButton); + me.setButtons(Qt::LeftButton); + QGraphicsSceneMouseEvent me2(QEvent::GraphicsSceneMouseRelease); + me2.setScenePos(QPointF(30, 30)); + me2.setButton(Qt::LeftButton); + tester1->eventTypes.clear(); + qApp->sendEvent(&scene, &me); + qApp->sendEvent(&scene, &me2); + qDebug() << tester1->eventTypes; + QCOMPARE(tester1->eventTypes, QList() + << QEvent::GraphicsSceneHoverLeave); + QCOMPARE(tester2->eventTypes, QList() + << QEvent::GraphicsSceneHoverEnter + << QEvent::GraphicsSceneHoverMove + << QEvent::GrabMouse + << QEvent::GraphicsSceneMousePress + << QEvent::UngrabMouse); + tester2->eventTypes.clear(); + qApp->sendEvent(&scene, &me); + qApp->sendEvent(&scene, &me2); + QCOMPARE(tester2->eventTypes, QList() + << QEvent::GraphicsSceneHoverMove + << QEvent::GrabMouse + << QEvent::GraphicsSceneMousePress + << QEvent::UngrabMouse); + } +} + QTEST_MAIN(tst_QGraphicsScene) #include "tst_qgraphicsscene.moc" -- cgit v1.2.3 From 188ac02e2fb6cc6437b776f8c5b69a508728fbdb Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 29 Jul 2009 05:20:31 +0200 Subject: fix compilation without 3d support --- src/gui/graphicsview/qgraphicstransform.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp index f18752aec..b55d78e60 100644 --- a/src/gui/graphicsview/qgraphicstransform.cpp +++ b/src/gui/graphicsview/qgraphicstransform.cpp @@ -63,7 +63,7 @@ void QGraphicsTransformPrivate::setItem(QGraphicsItem *i) item->prepareGeometryChange(); Q_ASSERT(d_ptr->transformData); - d_ptr->transformData->graphicsTransforms.remove(q); + d_ptr->transformData->graphicsTransforms.removeAll(q); d_ptr->dirtySceneTransform = 1; item = 0; } -- cgit v1.2.3 From e570225ee8332602c85506ff87e2596173b68ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Wed, 29 Jul 2009 07:14:47 +0200 Subject: Compile on 10.4 Don't use the "for ... in" syntax. This is Objective-C 2, which is only supported on 10.5 and up. --- src/gui/kernel/qt_cocoa_helpers_mac.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index 1c4177e12..ff4cb71ee 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -1211,7 +1211,10 @@ void qt_mac_menu_collapseSeparators(void */*NSMenu **/ theMenu, bool collapse) if (collapse) { bool previousIsSeparator = true; // setting to true kills all the separators placed at the top. NSMenuItem *previousItem = nil; - for (NSMenuItem *item in [menu itemArray]) { + + NSArray *itemArray = [menu itemArray]; + for (unsigned int i = 0; i < [itemArray count]; ++i) { + NSMenuItem *item = reinterpret_cast([itemArray objectAtIndex:i]); if ([item isSeparatorItem]) { [item setHidden:previousIsSeparator]; } -- cgit v1.2.3 From a45fe18569be1fc91e26f6e58d2f16bc8c6958de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Wed, 29 Jul 2009 07:42:30 +0200 Subject: Compile. Remobe another instance of for ... in use. --- src/gui/kernel/qt_cocoa_helpers_mac.mm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index ff4cb71ee..310408335 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -1229,7 +1229,9 @@ void qt_mac_menu_collapseSeparators(void */*NSMenu **/ theMenu, bool collapse) if (previousItem && previousIsSeparator) [previousItem setHidden:YES]; } else { - for (NSMenuItem *item in [menu itemArray]) { + NSArray *itemArray = [menu itemArray]; + for (unsigned int i = 0; i < [itemArray count]; ++i) { + NSMenuItem *item = reinterpret_cast([itemArray objectAtIndex:i]); if (QAction *action = reinterpret_cast([item tag])) [item setHidden:!action->isVisible()]; } -- cgit v1.2.3 From e06e82f843f671ecbb5d10a2262a5866f79da3d9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 29 Jul 2009 08:40:36 +0200 Subject: Updated WebKit to qtwebkit-4.6-snapshot-29072009 Reviewed-by: Trust me (and also trust Pulse :) --- util/webkit/mkdist-webkit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit index f4b36d0f0..c601f76f2 100755 --- a/util/webkit/mkdist-webkit +++ b/util/webkit/mkdist-webkit @@ -5,7 +5,7 @@ die() { exit 1 } -default_tag="qtwebkit-4.6-snapshot-13072009" +default_tag="qtwebkit-4.6-snapshot-29072009" if [ $# -eq 0 ]; then tag="$default_tag" -- cgit v1.2.3 From afce2170aae53a93e8fd3e8cbb24d8bb8148ec11 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 29 Jul 2009 08:43:12 +0200 Subject: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-29072009 ( 07fbaeddfade72be1d0d7e7f2b947e5d3c183f4a ) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes in WebKit since the last update: ++ b/WebKit/qt/ChangeLog 2009-07-28 Simon Hausmann Rubber-stamped by Ariya Hidayat. Fix compilation with the precompiled header. * WebKit_pch.h: Don't include JSDOMBinding.h and MathObject.h, as they include AtomicString.h. AtomicString.cpp needs to enable a #define before including AtomicString.h, which breaks if the PCH forces the inclusion beforehand. 2009-07-28 Ariya Hidayat Reviewed by Simon Hausmann. Added tests to ensure that scroll position can be changed programmatically, even when the scroll bar policy is set to off. * tests/qwebframe/tst_qwebframe.cpp: 2009-07-28 Tor Arne Vestbø Reviewed by Simon Hausmann. Fix a few compilation warnings in the QWebFrame tests. * tests/qwebframe/tst_qwebframe.cpp: 2009-07-28 Andre Pedralho Reviewed by Simon Hausmann. Fixed tst_QWebFrame::hasSetFocus test which was using an undefined resource. https://bugs.webkit.org/show_bug.cgi?id=27512 * tests/qwebframe/tst_qwebframe.cpp: 2009-07-28 Simon Hausmann Reviewed by Ariya Hidayat. Make it possible to pass relative file names to QtLauncher. * QtLauncher/main.cpp: (MainWindow::MainWindow): 2009-07-27 Alexey Proskuryakov Reviewed by Darin Adler. https://bugs.webkit.org/show_bug.cgi?id=27735 Give a helpful name to JSLock constructor argument * Api/qwebframe.cpp: (QWebFrame::addToJavaScriptWindowObject): 2009-07-27 Volker Hilsheimer Reviewed by Simon Hausmann. QWebView's "enabled" parameter should default to true, as with QGraphicsView and QPainter. * Api/qwebview.cpp: Add reference to QPainter::renderHints(). * Api/qwebview.h: Add default for enabled argument. 2009-07-26 Kavindra Palaraja Reviewed by Simon Hausmann. More documentation cleanups in the QWebElement class overview. * Api/qwebelement.cpp: 2009-07-26 Kavindra Palaraja Reviewed by Simon Hausmann. Clean up documentation of QWebElement's findFirst and findAll functions, as well as their QWebFrame counterparts. * Api/qwebelement.cpp: * Api/qwebframe.cpp: 2009-07-26 Kavindra Palaraja Reviewed by Simon Hausmann. Various documentation cleanups * Fixed qdoc warnings * Hide QWebNetworkInterface from the class overview * Mention QWebElement in the module overview * More cleanups * Api/qwebframe.cpp: * Api/qwebnetworkinterface.cpp: * Api/qwebview.cpp: * docs/qtwebkit.qdoc: 2009-07-26 Kavindra Palaraja Reviewed by Simon Hausmann. Added missing class diagram referenced from the docs, taken from the Qt documentation. * docs/qtwebkit.qdocconf: Register the image directory with qdoc. * docs/qwebview-diagram.png: Added. 2009-07-24 Antonio Gomes Reviewed by Adam Treat. As per discussion on IRC, changed originalUrl by requestedUrl. * Api/qwebframe.cpp: (QWebFrame::requestedUrl): * Api/qwebframe.h: * tests/qwebframe/tst_qwebframe.cpp: 2009-07-24 Andre Pedralho Reviewed by Adam Treat. Removed void QWebFrame::renderContents(...) and added the Q_PROPERTY clipRenderToViewport to control whether QWebFrame::render would call FrameView::paintContents rather than FrameView::paint and do not clip the frame content to viewport. * Api/qwebframe.cpp: (QWebFramePrivate::renderPrivate): (QWebFrame::clipRenderToViewport): (QWebFrame::setClipRenderToViewport): * Api/qwebframe.h: * Api/qwebframe_p.h: (QWebFramePrivate::QWebFramePrivate): * tests/qwebframe/tst_qwebframe.cpp: 2009-07-24 Antonio Gomes Reviewed by Simon Hausmann. [QT] Implement originalUrl getter method to the API https://bugs.webkit.org/show_bug.cgi?id=25867 * Api/qwebframe.cpp: (QWebFrame::originalUrl): * Api/qwebframe.h: * tests/qwebframe/qwebframe.qrc: * tests/qwebframe/test1.html: Added. * tests/qwebframe/test2.html: Added. * tests/qwebframe/tst_qwebframe.cpp: 2009-07-24 Kenneth Rohde Christiansen Build fix for Qt. Fix build issue introduced in 46344 ([Bug 22700] ApplicationCache should have size limit) Remove method only added to the Qt ChromeClient. * WebCoreSupport/ChromeClientQt.h: 2009-07-24 Andrei Popescu Reviewed by Anders Carlsson. ApplicationCache should have size limit https://bugs.webkit.org/show_bug.cgi?id=22700 * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::reachedMaxAppCacheSize): Adds empty implementation of the reachedMaxAppCacheSize callback. * WebCoreSupport/ChromeClientQt.h: 2009-07-23 Laszlo Gombos Reviewed by Simon Hausmann. [Qt] Add simple proxy support for QtLauncher https://bugs.webkit.org/show_bug.cgi?id=27495 Picks up proxy settings from the http_proxy environment variable. * QtLauncher/QtLauncher.pro: Add QtNetwork dependency for all platforms. * QtLauncher/main.cpp: (MainWindow::MainWindow): 2009-07-23 Simon Hausmann Reviewed by Holger Freyther. Added a testcase to verify that cached methods in the QOBject bindings remain alife even after garbage collection. * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::protectBindingsRuntimeObjectsFromCollector): 2009-07-23 Zoltan Herczeg Reviewed by Simon Hausmann. Fixing two issues related to QtLauncher - MainWindow objects are not always freed after close - JavaScript window.close() sometimes crashes https://bugs.webkit.org/show_bug.cgi?id=27601 * QtLauncher/main.cpp: (MainWindow::MainWindow): (main): 2009-07-21 Volker Hilsheimer Reviewed by Simon Hausmann. Various improvements to the API documentation. * Updated link to W3c Database spec * Formatting fixes, cleanups * Add missing \since 4.6 tags to QWebPage::frameAt * Extend QWebDatabase and QWebSecurityOrigin docs. * Api/qwebdatabase.cpp: * Api/qwebpage.cpp: * Api/qwebsecurityorigin.cpp: * Api/qwebview.cpp: 2009-07-21 Tor Arne Vestbø Rubber-stamped by Simon Hausmann. Remove preliminary-tag from QWebElement * Api/qwebelement.cpp: 2009-07-20 Kenneth Rohde Christiansen Reviewed by Eric Seidel. Fix Qt code to follow the WebKit Coding Style. * Api/qcookiejar.cpp: (QCookieJar::setCookieJar): (QCookieJar::cookieJar): * Api/qcookiejar.h: * Api/qwebdatabase.cpp: (QWebDatabase::QWebDatabase): (QWebDatabase::removeDatabase): * Api/qwebdatabase.h: * Api/qwebdatabase_p.h: * Api/qwebelement.h: * Api/qwebframe.cpp: (QWebFrame::title): (QWebFrame::print): * Api/qwebframe.h: * Api/qwebframe_p.h: * Api/qwebhistory.cpp: (QWebHistory::clear): * Api/qwebhistory.h: * Api/qwebhistory_p.h: * Api/qwebhistoryinterface.cpp: (gCleanupInterface): (QWebHistoryInterface::setDefaultInterface): (QWebHistoryInterface::defaultInterface): (QWebHistoryInterface::QWebHistoryInterface): * Api/qwebhistoryinterface.h: * Api/qwebnetworkinterface.cpp: (QWebNetworkManager::started): (QWebNetworkManager::finished): (QWebNetworkInterfacePrivate::parseDataUrl): (QWebNetworkInterface::addJob): (WebCoreHttp::onResponseHeaderReceived): (WebCoreHttp::onReadyRead): * Api/qwebnetworkinterface.h: * Api/qwebnetworkinterface_p.h: * Api/qwebpage.cpp: (QWebPagePrivate::editorCommandForWebActions): (QWebPagePrivate::createContextMenu): (QWebPagePrivate::focusInEvent): (QWebPage::fixedContentsSize): (QWebPage::setContentEditable): (QWebPage::swallowContextMenuEvent): (QWebPage::findText): * Api/qwebpage.h: * Api/qwebpage_p.h: * Api/qwebpluginfactory.h: * Api/qwebsecurityorigin.h: * Api/qwebsecurityorigin_p.h: * Api/qwebsettings.cpp: (QWebSettingsPrivate::QWebSettingsPrivate): (QWebSettingsPrivate::apply): (QWebSettings::globalSettings): (QWebSettings::QWebSettings): (QWebSettings::fontSize): (QWebSettings::setUserStyleSheetUrl): (QWebSettings::setDefaultTextEncoding): (QWebSettings::setIconDatabasePath): (QWebSettings::iconDatabasePath): (QWebSettings::iconForUrl): (QWebSettings::setWebGraphic): (QWebSettings::setFontFamily): (QWebSettings::fontFamily): (QWebSettings::testAttribute): (qt_websettings_setLocalStorageDatabasePath): * Api/qwebsettings.h: * Api/qwebview.cpp: (QWebView::setPage): (QWebView::event): * Api/qwebview.h: 2009-07-20 Holger Hans Peter Freyther Reviewed by Simon Hausmann. [Qt] Add test for loading webpages... Performance test for loading webpages. Wait for the loadFinished signal to be fired. This should include a non empty layout. * tests/benchmarks/loading/tst_loading.cpp: Added. (waitForSignal): (tst_Loading::init): (tst_Loading::cleanup): (tst_Loading::load_data): (tst_Loading::load): * tests/benchmarks/loading/tst_loading.pro: Added. * tests/tests.pro: 2009-07-20 Holger Hans Peter Freyther Reviewed by Simon Hausmann. [Qt] Add a test case for drawing a simple viewrect to a QPixmap * tests/benchmarks/painting/tst_painting.cpp: Added. (waitForSignal): (tst_Painting::init): (tst_Painting::cleanup): (tst_Painting::paint_data): (tst_Painting::paint): * tests/benchmarks/painting/tst_painting.pro: Added. * tests/tests.pro: 2009-07-20 Laszlo Gombos Reviewed by Holger Freyther. [Qt] Add an option for QtLauncher to build without QtUiTools dependency https://bugs.webkit.org/show_bug.cgi?id=27438 Based on Norbert Leser's work. * QtLauncher/main.cpp: (WebPage::createPlugin): 2009-07-17 Kenneth Rohde Christiansen Reviewed by Adam Treat. Coding style fixes. * Api/qcookiejar.cpp: (QCookieJarPrivate::QCookieJarPrivate): (qHash): (QCookieJar::cookieJar): * Api/qwebelement.cpp: (QWebElement::functions): (QWebElement::scriptableProperties): * Api/qwebframe.cpp: (QWebFrame::metaData): (QWebFrame::scrollBarValue): (QWebFrame::scroll): (QWebFrame::scrollPosition): (QWebFrame::print): * Api/qwebnetworkinterface.cpp: (decodePercentEncoding): (QWebNetworkRequestPrivate::init): (QWebNetworkRequestPrivate::setURL): (QWebNetworkRequest::QWebNetworkRequest): (QWebNetworkRequest::operator=): (QWebNetworkRequest::setUrl): (QWebNetworkRequest::setHttpHeader): (QWebNetworkRequest::httpHeaderField): (QWebNetworkRequest::setHttpHeaderField): (QWebNetworkRequest::setPostData): (QWebNetworkJob::setResponse): (QWebNetworkJob::frame): (QWebNetworkManager::add): (QWebNetworkManager::cancel): (QWebNetworkManager::started): (QWebNetworkManager::data): (QWebNetworkManager::finished): (QWebNetworkManager::addHttpJob): (QWebNetworkManager::cancelHttpJob): (QWebNetworkManager::httpConnectionClosed): (QWebNetworkInterfacePrivate::sendFileData): (QWebNetworkInterfacePrivate::parseDataUrl): (QWebNetworkManager::doWork): (QWebNetworkInterface::setDefaultInterface): (QWebNetworkInterface::defaultInterface): (QWebNetworkInterface::QWebNetworkInterface): (QWebNetworkInterface::addJob): (QWebNetworkInterface::cancelJob): (WebCoreHttp::WebCoreHttp): (WebCoreHttp::request): (WebCoreHttp::scheduleNextRequest): (WebCoreHttp::getConnection): (WebCoreHttp::onResponseHeaderReceived): (WebCoreHttp::onReadyRead): (WebCoreHttp::onRequestFinished): (WebCoreHttp::onAuthenticationRequired): (WebCoreHttp::onProxyAuthenticationRequired): * Api/qwebpage.cpp: (QWebPagePrivate::QWebPagePrivate): (QWebPagePrivate::mouseReleaseEvent): (QWebPagePrivate::inputMethodEvent): (QWebPagePrivate::shortcutOverrideEvent): (QWebPage::inputMethodQuery): (QWebPage::javaScriptPrompt): (QWebPage::updatePositionDependentActions): (QWebPage::userAgentForUrl): (QWebPagePrivate::_q_onLoadProgressChanged): (QWebPage::totalBytes): (QWebPage::bytesReceived): * Api/qwebsettings.cpp: (QWebSettings::iconForUrl): (QWebSettings::setObjectCacheCapacities): * Api/qwebview.cpp: (QWebView::paintEvent): (QWebView::changeEvent): 2009-07-17 Kenneth Rohde Christiansen Reviewed by Simon Hausmann. Overwrite the plugin directories for the DRT. Part of https://bugs.webkit.org/show_bug.cgi?id=27215 * Api/qwebpage.cpp: (qt_drt_overwritePluginDirectories): Only set the plugin directories to the ones in the QTWEBKIT_PLUGIN_PATH environment variable. 2009-07-16 Xiaomei Ji Reviewed by Dan Bernstein. This is the 2nd part of fixing "RTL: tooltip does not get its directionlity from its element's." https://bugs.webkit.org/show_bug.cgi?id=24187 Add one extra parameter to the callee of HitTestResult::title() due to the signature change. * Api/qwebframe.cpp: (QWebHitTestResultPrivate::QWebHitTestResultPrivate): Add direction as a parameter to the callee of HitTestResult::title(). * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::mouseDidMoveOverElement): Add direction as a parameter to the callee of HitTestResult::title(). 2009-07-16 Benjamin C Meyer Reviewed by Adam Treat. Add new action to qwebpage to reload without cache. * Api/qwebpage.cpp: (QWebPagePrivate::updateAction): (QWebPagePrivate::updateNavigationActions): (QWebPage::triggerAction): * Api/qwebpage.h: 2009-07-16 Xiaomei Ji Reviewed by Darin Adler. Fix tooltip does not get its directionality from its element's directionality. https://bugs.webkit.org/show_bug.cgi?id=24187 Per mitz's suggestion in comment #6, while getting the plain-text title, we also get the directionality of the title. How to handle the directionality is up to clients. Clients could ignore it, or use attribute or unicode control characters to display the title as what they want. * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::setToolTip): Add directionality as 2nd parameter to setToopTip() (without handling it yet). * WebCoreSupport/ChromeClientQt.h: Add directionality as 2nd parameter to setToolTip(). 2009-07-15 Yael Aharon Reviewed by Simon Hausmann. https://bugs.webkit.org/show_bug.cgi?id=27285 When the user clicks a link with a target attribute, the newly created window should be visible. Make new windows created in Qtlauncher visible. * QtLauncher/main.cpp: (WebPage::createWindow): 2009-07-14 Adam Treat Reviewed by Zack Rusin. https://bugs.webkit.org/show_bug.cgi?id=26983 The default constructed values for QSize and WebCore::IntSize are different. The former produces an invalid size whereas the latter produces a size of zero. This was causing a layout to be triggered when constructing a view and an assert to be hit. This patch fixes the crash by taking care not to cause an unnecessary layout triggered by ScrollView::setFixedLayoutSize. * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::transitionToCommittedForNewPage): --- src/3rdparty/webkit/ChangeLog | 101 + src/3rdparty/webkit/JavaScriptCore/API/JSBase.cpp | 2 +- .../webkit/JavaScriptCore/API/JSClassRef.h | 4 +- .../webkit/JavaScriptCore/API/JSContextRef.cpp | 4 +- .../webkit/JavaScriptCore/API/JSObjectRef.cpp | 6 +- src/3rdparty/webkit/JavaScriptCore/ChangeLog | 1287 ++++ .../webkit/JavaScriptCore/JavaScriptCore.pri | 68 +- .../webkit/JavaScriptCore/JavaScriptCore.pro | 2 - .../JavaScriptCore/assembler/ARMAssembler.cpp | 353 + .../webkit/JavaScriptCore/assembler/ARMAssembler.h | 706 ++ .../JavaScriptCore/assembler/ARMv7Assembler.h | 41 +- .../assembler/AbstractMacroAssembler.h | 322 +- .../JavaScriptCore/assembler/AssemblerBuffer.h | 17 +- .../assembler/AssemblerBufferWithConstantPool.h | 305 + .../webkit/JavaScriptCore/assembler/LinkBuffer.h | 195 + .../JavaScriptCore/assembler/MacroAssembler.h | 4 + .../JavaScriptCore/assembler/MacroAssemblerARM.h | 797 +++ .../JavaScriptCore/assembler/MacroAssemblerARMv7.h | 19 + .../assembler/MacroAssemblerCodeRef.h | 10 +- .../JavaScriptCore/assembler/MacroAssemblerX86.h | 18 + .../assembler/MacroAssemblerX86_64.h | 25 + .../JavaScriptCore/assembler/RepatchBuffer.h | 136 + .../webkit/JavaScriptCore/assembler/X86Assembler.h | 44 +- .../webkit/JavaScriptCore/bytecode/CodeBlock.cpp | 6 +- .../webkit/JavaScriptCore/bytecode/CodeBlock.h | 10 +- .../webkit/JavaScriptCore/bytecode/Opcode.h | 2 +- .../webkit/JavaScriptCore/bytecode/SamplingTool.h | 4 +- .../JavaScriptCore/bytecompiler/RegisterID.h | 2 +- .../webkit/JavaScriptCore/generated/Grammar.cpp | 664 +- .../webkit/JavaScriptCore/generated/Grammar.h | 2 +- .../webkit/JavaScriptCore/interpreter/CachedCall.h | 2 +- .../JavaScriptCore/interpreter/Interpreter.cpp | 2 +- .../JavaScriptCore/interpreter/Interpreter.h | 3 +- .../JavaScriptCore/interpreter/RegisterFile.h | 4 +- .../JavaScriptCore/jit/ExecutableAllocator.h | 71 +- src/3rdparty/webkit/JavaScriptCore/jit/JIT.cpp | 56 +- src/3rdparty/webkit/JavaScriptCore/jit/JIT.h | 16 +- src/3rdparty/webkit/JavaScriptCore/jit/JITCode.h | 7 +- .../webkit/JavaScriptCore/jit/JITInlineMethods.h | 4 +- .../JavaScriptCore/jit/JITPropertyAccess.cpp | 37 +- .../webkit/JavaScriptCore/jit/JITStubs.cpp | 69 +- src/3rdparty/webkit/JavaScriptCore/jsc.cpp | 6 +- src/3rdparty/webkit/JavaScriptCore/jsc.pro | 31 + .../webkit/JavaScriptCore/parser/Grammar.y | 10 +- src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h | 2 +- .../webkit/JavaScriptCore/parser/Nodes.cpp | 2 + src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h | 2 +- src/3rdparty/webkit/JavaScriptCore/parser/Parser.h | 2 +- .../webkit/JavaScriptCore/pcre/pcre_exec.cpp | 2 +- .../webkit/JavaScriptCore/profiler/Profiler.h | 2 +- .../webkit/JavaScriptCore/runtime/ArgList.h | 2 +- .../runtime/BatchedTransitionOptimizer.h | 2 +- .../webkit/JavaScriptCore/runtime/Collector.cpp | 42 +- .../webkit/JavaScriptCore/runtime/Collector.h | 2 +- .../JavaScriptCore/runtime/CommonIdentifiers.h | 2 +- .../webkit/JavaScriptCore/runtime/Identifier.cpp | 2 +- .../webkit/JavaScriptCore/runtime/JSCell.h | 2 +- .../webkit/JavaScriptCore/runtime/JSGlobalObject.h | 2 +- .../webkit/JavaScriptCore/runtime/JSLock.cpp | 40 +- .../webkit/JavaScriptCore/runtime/JSLock.h | 28 +- .../webkit/JavaScriptCore/runtime/JSONObject.cpp | 2 +- .../webkit/JavaScriptCore/runtime/SmallStrings.cpp | 2 +- .../webkit/JavaScriptCore/runtime/SmallStrings.h | 2 +- .../webkit/JavaScriptCore/wtf/Assertions.cpp | 22 +- .../webkit/JavaScriptCore/wtf/Assertions.h | 4 +- src/3rdparty/webkit/JavaScriptCore/wtf/ByteArray.h | 4 +- .../JavaScriptCore/wtf/CrossThreadRefCounted.h | 2 +- .../webkit/JavaScriptCore/wtf/DateMath.cpp | 18 +- src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h | 11 +- .../webkit/JavaScriptCore/wtf/FastAllocBase.h | 2 +- .../webkit/JavaScriptCore/wtf/FastMalloc.cpp | 25 +- src/3rdparty/webkit/JavaScriptCore/wtf/GOwnPtr.h | 2 +- src/3rdparty/webkit/JavaScriptCore/wtf/Locker.h | 2 +- .../webkit/JavaScriptCore/wtf/MessageQueue.h | 2 +- .../webkit/JavaScriptCore/wtf/Noncopyable.h | 11 + .../webkit/JavaScriptCore/wtf/OwnArrayPtr.h | 6 +- .../webkit/JavaScriptCore/wtf/OwnFastMallocPtr.h | 2 +- src/3rdparty/webkit/JavaScriptCore/wtf/OwnPtr.h | 2 +- src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h | 84 +- .../webkit/JavaScriptCore/wtf/RandomNumber.cpp | 10 +- .../webkit/JavaScriptCore/wtf/RandomNumberSeed.h | 16 +- .../webkit/JavaScriptCore/wtf/RefCounted.h | 19 +- .../webkit/JavaScriptCore/wtf/ThreadSpecific.h | 2 +- .../webkit/JavaScriptCore/wtf/Threading.cpp | 2 +- src/3rdparty/webkit/JavaScriptCore/wtf/Threading.h | 8 +- .../webkit/JavaScriptCore/wtf/ThreadingWin.cpp | 20 + src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h | 4 +- .../webkit/JavaScriptCore/wtf/unicode/Collator.h | 2 +- .../JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp | 10 +- .../JavaScriptCore/wtf/wince/FastMallocWince.h | 177 + .../JavaScriptCore/wtf/wince/MemoryManager.cpp | 171 + .../JavaScriptCore/wtf/wince/MemoryManager.h | 80 + .../webkit/JavaScriptCore/wtf/wince/mt19937ar.c | 170 + .../webkit/JavaScriptCore/yarr/RegexJIT.cpp | 18 +- .../webkit/JavaScriptCore/yarr/RegexPattern.h | 6 +- src/3rdparty/webkit/VERSION | 4 +- src/3rdparty/webkit/WebCore/ChangeLog | 7331 +++++++++++++++++++- src/3rdparty/webkit/WebCore/DerivedSources.cpp | 7 +- src/3rdparty/webkit/WebCore/WebCore.gypi | 88 +- src/3rdparty/webkit/WebCore/WebCore.pro | 1149 ++- src/3rdparty/webkit/WebCore/WebCorePrefix.h | 20 +- .../WebCore/accessibility/AccessibilityObject.cpp | 362 - .../WebCore/accessibility/AccessibilityObject.h | 158 +- .../accessibility/AccessibilityRenderObject.cpp | 4 + .../bindings/js/CachedScriptSourceProvider.h | 6 +- .../WebCore/bindings/js/DOMObjectWithSVGContext.h | 57 + .../webkit/WebCore/bindings/js/GCController.cpp | 6 +- .../webkit/WebCore/bindings/js/GCController.h | 2 +- .../WebCore/bindings/js/JSAbstractWorkerCustom.cpp | 12 +- .../webkit/WebCore/bindings/js/JSAttrCustom.cpp | 2 +- .../WebCore/bindings/js/JSAudioConstructor.cpp | 27 +- .../WebCore/bindings/js/JSAudioConstructor.h | 8 +- .../WebCore/bindings/js/JSCDATASectionCustom.cpp | 6 +- .../webkit/WebCore/bindings/js/JSCSSRuleCustom.cpp | 23 +- .../WebCore/bindings/js/JSCSSValueCustom.cpp | 14 +- .../bindings/js/JSCustomPositionCallback.cpp | 11 +- .../bindings/js/JSCustomPositionErrorCallback.cpp | 7 +- .../bindings/js/JSCustomSQLStatementCallback.cpp | 7 +- .../js/JSCustomSQLStatementErrorCallback.cpp | 9 +- .../bindings/js/JSCustomSQLTransactionCallback.cpp | 7 +- .../js/JSCustomSQLTransactionErrorCallback.cpp | 5 +- .../WebCore/bindings/js/JSCustomVoidCallback.cpp | 2 +- .../bindings/js/JSCustomXPathNSResolver.cpp | 2 +- .../bindings/js/JSDOMApplicationCacheCustom.cpp | 2 +- .../webkit/WebCore/bindings/js/JSDOMBinding.cpp | 17 +- .../webkit/WebCore/bindings/js/JSDOMBinding.h | 132 +- .../webkit/WebCore/bindings/js/JSDOMGlobalObject.h | 13 +- .../webkit/WebCore/bindings/js/JSDOMWindowBase.cpp | 9 +- .../webkit/WebCore/bindings/js/JSDOMWindowBase.h | 3 + .../WebCore/bindings/js/JSDOMWindowCustom.cpp | 14 +- .../bindings/js/JSDataGridColumnListCustom.cpp | 2 +- .../bindings/js/JSDedicatedWorkerContextCustom.cpp | 50 + .../WebCore/bindings/js/JSDocumentCustom.cpp | 11 +- .../webkit/WebCore/bindings/js/JSElementCustom.cpp | 16 +- .../webkit/WebCore/bindings/js/JSEventCustom.cpp | 42 +- .../webkit/WebCore/bindings/js/JSEventListener.cpp | 54 +- .../webkit/WebCore/bindings/js/JSEventListener.h | 1 + .../webkit/WebCore/bindings/js/JSEventTarget.cpp | 30 +- .../webkit/WebCore/bindings/js/JSEventTarget.h | 3 +- .../WebCore/bindings/js/JSHTMLAllCollection.h | 4 +- .../WebCore/bindings/js/JSHTMLCollectionCustom.cpp | 39 +- .../WebCore/bindings/js/JSHTMLElementCustom.cpp | 6 +- .../bindings/js/JSHTMLFormElementCustom.cpp | 5 +- .../bindings/js/JSHTMLFrameElementCustom.cpp | 2 +- .../bindings/js/JSHTMLIFrameElementCustom.cpp | 2 +- .../bindings/js/JSHTMLOptionsCollectionCustom.cpp | 2 +- .../WebCore/bindings/js/JSImageConstructor.cpp | 27 +- .../WebCore/bindings/js/JSImageConstructor.h | 7 +- .../WebCore/bindings/js/JSImageDataCustom.cpp | 4 +- .../bindings/js/JSInspectorBackendCustom.cpp | 283 + .../bindings/js/JSInspectorControllerCustom.cpp | 298 - .../WebCore/bindings/js/JSLazyEventListener.cpp | 2 +- .../bindings/js/JSMessageChannelConstructor.cpp | 22 +- .../bindings/js/JSMessageChannelConstructor.h | 9 +- .../WebCore/bindings/js/JSMessageChannelCustom.cpp | 2 +- .../WebCore/bindings/js/JSMessagePortCustom.cpp | 2 +- .../WebCore/bindings/js/JSNamedNodesCollection.cpp | 8 +- .../WebCore/bindings/js/JSNamedNodesCollection.h | 4 +- .../webkit/WebCore/bindings/js/JSNodeCustom.cpp | 44 +- .../WebCore/bindings/js/JSNodeFilterCondition.cpp | 6 +- .../WebCore/bindings/js/JSNodeFilterCustom.cpp | 2 +- .../WebCore/bindings/js/JSNodeIteratorCustom.cpp | 2 +- .../WebCore/bindings/js/JSOptionConstructor.cpp | 24 +- .../WebCore/bindings/js/JSOptionConstructor.h | 7 +- .../webkit/WebCore/bindings/js/JSRGBColor.cpp | 87 - .../webkit/WebCore/bindings/js/JSRGBColor.h | 59 - .../bindings/js/JSSVGElementInstanceCustom.cpp | 6 +- .../WebCore/bindings/js/JSSVGMatrixCustom.cpp | 4 +- .../WebCore/bindings/js/JSSVGPathSegCustom.cpp | 42 +- .../WebCore/bindings/js/JSSVGPathSegListCustom.cpp | 12 +- .../WebCore/bindings/js/JSSVGPointListCustom.cpp | 6 +- .../bindings/js/JSSVGTransformListCustom.cpp | 6 +- .../bindings/js/JSSharedWorkerConstructor.cpp | 2 +- .../bindings/js/JSSharedWorkerConstructor.h | 2 +- .../WebCore/bindings/js/JSStyleSheetCustom.cpp | 6 +- .../webkit/WebCore/bindings/js/JSTextCustom.cpp | 4 +- .../WebCore/bindings/js/JSTreeWalkerCustom.cpp | 2 +- .../bindings/js/JSWebKitCSSMatrixConstructor.cpp | 11 +- .../bindings/js/JSWebKitCSSMatrixConstructor.h | 4 +- .../bindings/js/JSWebKitPointConstructor.cpp | 12 +- .../WebCore/bindings/js/JSWebKitPointConstructor.h | 4 +- .../WebCore/bindings/js/JSWorkerConstructor.cpp | 19 +- .../WebCore/bindings/js/JSWorkerConstructor.h | 4 +- .../WebCore/bindings/js/JSWorkerContextBase.cpp | 22 + .../WebCore/bindings/js/JSWorkerContextBase.h | 7 + .../WebCore/bindings/js/JSWorkerContextCustom.cpp | 2 +- .../webkit/WebCore/bindings/js/JSWorkerCustom.cpp | 39 +- .../bindings/js/JSXMLHttpRequestConstructor.cpp | 22 +- .../bindings/js/JSXMLHttpRequestConstructor.h | 7 +- .../bindings/js/JSXSLTProcessorConstructor.cpp | 11 +- .../bindings/js/JSXSLTProcessorConstructor.h | 4 +- .../webkit/WebCore/bindings/js/ScheduledAction.cpp | 2 +- .../webkit/WebCore/bindings/js/ScriptArray.cpp | 107 + .../webkit/WebCore/bindings/js/ScriptArray.h | 59 + .../WebCore/bindings/js/ScriptCachedFrameData.cpp | 6 +- .../WebCore/bindings/js/ScriptController.cpp | 18 +- .../WebCore/bindings/js/ScriptControllerHaiku.cpp | 46 + .../WebCore/bindings/js/ScriptControllerMac.mm | 2 +- .../WebCore/bindings/js/ScriptEventListener.cpp | 5 +- .../WebCore/bindings/js/ScriptFunctionCall.cpp | 12 +- .../webkit/WebCore/bindings/js/ScriptObject.cpp | 31 +- .../webkit/WebCore/bindings/js/ScriptObject.h | 4 +- .../WebCore/bindings/js/ScriptObjectQuarantine.cpp | 23 +- .../webkit/WebCore/bindings/js/ScriptSourceCode.h | 12 +- .../WebCore/bindings/js/ScriptSourceProvider.h | 48 + .../webkit/WebCore/bindings/js/ScriptValue.cpp | 2 +- .../WebCore/bindings/js/StringSourceProvider.h | 5 +- .../WebCore/bindings/js/WorkerScriptController.cpp | 21 +- .../WebCore/bindings/js/WorkerScriptController.h | 2 +- .../WebCore/bindings/scripts/CodeGenerator.pm | 2 +- .../WebCore/bindings/scripts/CodeGeneratorCOM.pm | 24 +- .../WebCore/bindings/scripts/CodeGeneratorJS.pm | 226 +- .../WebCore/bindings/scripts/CodeGeneratorObjC.pm | 17 +- .../WebCore/bindings/scripts/CodeGeneratorV8.pm | 410 +- src/3rdparty/webkit/WebCore/bridge/NP_jsobject.cpp | 20 +- src/3rdparty/webkit/WebCore/bridge/c/c_class.cpp | 6 +- .../webkit/WebCore/bridge/c/c_instance.cpp | 10 +- src/3rdparty/webkit/WebCore/bridge/c/c_runtime.cpp | 4 +- src/3rdparty/webkit/WebCore/bridge/c/c_utility.cpp | 4 +- .../webkit/WebCore/bridge/jni/jni_class.cpp | 6 +- .../webkit/WebCore/bridge/jni/jni_instance.cpp | 2 +- .../webkit/WebCore/bridge/jni/jni_jsobject.mm | 20 +- src/3rdparty/webkit/WebCore/bridge/jni/jni_objc.mm | 4 +- .../webkit/WebCore/bridge/jni/jni_runtime.cpp | 2 +- .../webkit/WebCore/bridge/jni/jni_runtime.h | 8 +- .../webkit/WebCore/bridge/jni/jni_utility.cpp | 2 +- src/3rdparty/webkit/WebCore/bridge/npapi.h | 2 - .../webkit/WebCore/bridge/qt/qt_instance.cpp | 39 +- .../webkit/WebCore/bridge/qt/qt_instance.h | 3 +- .../webkit/WebCore/bridge/qt/qt_runtime.cpp | 12 +- src/3rdparty/webkit/WebCore/bridge/runtime.cpp | 2 +- src/3rdparty/webkit/WebCore/bridge/runtime.h | 6 +- src/3rdparty/webkit/WebCore/config.h | 11 + .../WebCore/css/CSSComputedStyleDeclaration.cpp | 112 +- .../WebCore/css/CSSComputedStyleDeclaration.h | 5 +- .../webkit/WebCore/css/CSSFunctionValue.cpp | 1 + src/3rdparty/webkit/WebCore/css/CSSGrammar.y | 17 +- src/3rdparty/webkit/WebCore/css/CSSHelper.cpp | 2 +- src/3rdparty/webkit/WebCore/css/CSSHelper.h | 15 +- .../WebCore/css/CSSMutableStyleDeclaration.cpp | 4 +- src/3rdparty/webkit/WebCore/css/CSSParser.cpp | 329 +- src/3rdparty/webkit/WebCore/css/CSSParser.h | 2 - .../webkit/WebCore/css/CSSParserValues.cpp | 2 + .../webkit/WebCore/css/CSSPrimitiveValue.cpp | 48 +- .../webkit/WebCore/css/CSSPrimitiveValue.h | 32 +- .../webkit/WebCore/css/CSSPrimitiveValueMappings.h | 31 + .../webkit/WebCore/css/CSSPropertyLonghand.cpp | 4 +- .../webkit/WebCore/css/CSSPropertyNames.in | 4 +- src/3rdparty/webkit/WebCore/css/CSSSelector.cpp | 6 + src/3rdparty/webkit/WebCore/css/CSSSelector.h | 4 +- src/3rdparty/webkit/WebCore/css/CSSSelectorList.h | 2 +- .../webkit/WebCore/css/CSSStyleSelector.cpp | 136 +- src/3rdparty/webkit/WebCore/css/CSSStyleSelector.h | 5 +- .../webkit/WebCore/css/CSSValueKeywords.in | 9 +- src/3rdparty/webkit/WebCore/css/CSSValueList.cpp | 26 + src/3rdparty/webkit/WebCore/css/CSSValueList.h | 2 + .../webkit/WebCore/css/MediaQueryEvaluator.cpp | 33 +- src/3rdparty/webkit/WebCore/css/RGBColor.cpp | 62 + src/3rdparty/webkit/WebCore/css/RGBColor.h | 58 + src/3rdparty/webkit/WebCore/css/RGBColor.idl | 2 - src/3rdparty/webkit/WebCore/css/ShadowValue.cpp | 16 +- src/3rdparty/webkit/WebCore/css/ShadowValue.h | 10 +- .../webkit/WebCore/css/WebKitCSSMatrix.cpp | 2 +- src/3rdparty/webkit/WebCore/css/html.css | 2 + src/3rdparty/webkit/WebCore/css/makeprop.pl | 6 +- src/3rdparty/webkit/WebCore/css/makevalues.pl | 6 +- .../webkit/WebCore/css/mediaControlsQT.css | 4 +- src/3rdparty/webkit/WebCore/css/tokenizer.flex | 1 + src/3rdparty/webkit/WebCore/dom/ClassNames.h | 2 +- src/3rdparty/webkit/WebCore/dom/Document.cpp | 14 +- src/3rdparty/webkit/WebCore/dom/Document.h | 13 + src/3rdparty/webkit/WebCore/dom/Element.cpp | 37 +- src/3rdparty/webkit/WebCore/dom/Element.h | 7 + src/3rdparty/webkit/WebCore/dom/ErrorEvent.cpp | 76 + src/3rdparty/webkit/WebCore/dom/ErrorEvent.h | 74 + src/3rdparty/webkit/WebCore/dom/ErrorEvent.idl | 46 + src/3rdparty/webkit/WebCore/dom/Event.cpp | 7 + src/3rdparty/webkit/WebCore/dom/Event.h | 5 +- src/3rdparty/webkit/WebCore/dom/EventListener.h | 3 + src/3rdparty/webkit/WebCore/dom/EventTarget.cpp | 2 +- src/3rdparty/webkit/WebCore/dom/EventTarget.h | 4 +- src/3rdparty/webkit/WebCore/dom/InputElement.cpp | 2 + .../webkit/WebCore/dom/MessagePortChannel.h | 4 +- src/3rdparty/webkit/WebCore/dom/Position.h | 4 +- .../webkit/WebCore/dom/ProcessingInstruction.cpp | 2 +- src/3rdparty/webkit/WebCore/dom/Range.cpp | 5 +- src/3rdparty/webkit/WebCore/dom/Range.h | 6 +- src/3rdparty/webkit/WebCore/dom/SelectElement.cpp | 72 +- src/3rdparty/webkit/WebCore/dom/StyledElement.cpp | 6 +- src/3rdparty/webkit/WebCore/dom/Text.cpp | 36 +- src/3rdparty/webkit/WebCore/dom/Text.h | 4 - .../webkit/WebCore/dom/XMLTokenizerLibxml2.cpp | 2 +- .../webkit/WebCore/dom/XMLTokenizerScope.h | 2 +- src/3rdparty/webkit/WebCore/dom/make_names.pl | 22 +- .../webkit/WebCore/editing/ApplyStyleCommand.cpp | 93 +- .../webkit/WebCore/editing/ApplyStyleCommand.h | 2 +- .../WebCore/editing/DeleteSelectionCommand.cpp | 8 +- .../webkit/WebCore/editing/EditCommand.cpp | 2 +- src/3rdparty/webkit/WebCore/editing/Editor.cpp | 40 +- src/3rdparty/webkit/WebCore/editing/Editor.h | 1 + .../webkit/WebCore/editing/EditorCommand.cpp | 77 +- .../WebCore/editing/IndentOutdentCommand.cpp | 169 +- .../webkit/WebCore/editing/IndentOutdentCommand.h | 5 +- .../webkit/WebCore/editing/RemoveFormatCommand.cpp | 2 +- .../WebCore/editing/ReplaceSelectionCommand.cpp | 12 +- .../webkit/WebCore/editing/SelectionController.cpp | 46 +- .../webkit/WebCore/editing/SelectionController.h | 2 +- .../webkit/WebCore/editing/TextIterator.cpp | 55 +- .../webkit/WebCore/editing/htmlediting.cpp | 105 +- src/3rdparty/webkit/WebCore/editing/htmlediting.h | 11 +- src/3rdparty/webkit/WebCore/editing/markup.cpp | 88 +- .../webkit/WebCore/editing/visible_units.cpp | 3 - .../webkit/WebCore/generated/CSSGrammar.cpp | 1646 ++--- src/3rdparty/webkit/WebCore/generated/CSSGrammar.h | 57 +- .../webkit/WebCore/generated/CSSPropertyNames.cpp | 1105 +-- .../webkit/WebCore/generated/CSSPropertyNames.h | 538 +- .../webkit/WebCore/generated/CSSValueKeywords.c | 2665 ++++--- .../webkit/WebCore/generated/CSSValueKeywords.h | 579 +- src/3rdparty/webkit/WebCore/generated/Grammar.cpp | 664 +- src/3rdparty/webkit/WebCore/generated/Grammar.h | 2 +- .../webkit/WebCore/generated/HTMLNames.cpp | 14 +- src/3rdparty/webkit/WebCore/generated/HTMLNames.h | 3 + .../webkit/WebCore/generated/JSAbstractWorker.cpp | 227 + .../webkit/WebCore/generated/JSAbstractWorker.h | 96 + src/3rdparty/webkit/WebCore/generated/JSAttr.cpp | 38 +- src/3rdparty/webkit/WebCore/generated/JSAttr.h | 4 +- .../webkit/WebCore/generated/JSBarInfo.cpp | 11 +- src/3rdparty/webkit/WebCore/generated/JSBarInfo.h | 9 +- .../webkit/WebCore/generated/JSCDATASection.cpp | 19 +- .../webkit/WebCore/generated/JSCDATASection.h | 6 +- .../webkit/WebCore/generated/JSCSSCharsetRule.cpp | 22 +- .../webkit/WebCore/generated/JSCSSCharsetRule.h | 4 +- .../webkit/WebCore/generated/JSCSSFontFaceRule.cpp | 24 +- .../webkit/WebCore/generated/JSCSSFontFaceRule.h | 4 +- .../webkit/WebCore/generated/JSCSSImportRule.cpp | 32 +- .../webkit/WebCore/generated/JSCSSImportRule.h | 4 +- .../webkit/WebCore/generated/JSCSSMediaRule.cpp | 29 +- .../webkit/WebCore/generated/JSCSSMediaRule.h | 4 +- .../webkit/WebCore/generated/JSCSSPageRule.cpp | 27 +- .../webkit/WebCore/generated/JSCSSPageRule.h | 4 +- .../WebCore/generated/JSCSSPrimitiveValue.cpp | 29 +- .../webkit/WebCore/generated/JSCSSPrimitiveValue.h | 4 +- .../webkit/WebCore/generated/JSCSSRule.cpp | 35 +- src/3rdparty/webkit/WebCore/generated/JSCSSRule.h | 11 +- .../webkit/WebCore/generated/JSCSSRuleList.cpp | 30 +- .../webkit/WebCore/generated/JSCSSRuleList.h | 11 +- .../WebCore/generated/JSCSSStyleDeclaration.cpp | 36 +- .../WebCore/generated/JSCSSStyleDeclaration.h | 11 +- .../webkit/WebCore/generated/JSCSSStyleRule.cpp | 27 +- .../webkit/WebCore/generated/JSCSSStyleRule.h | 4 +- .../webkit/WebCore/generated/JSCSSStyleSheet.cpp | 34 +- .../webkit/WebCore/generated/JSCSSStyleSheet.h | 4 +- .../webkit/WebCore/generated/JSCSSValue.cpp | 25 +- src/3rdparty/webkit/WebCore/generated/JSCSSValue.h | 11 +- .../webkit/WebCore/generated/JSCSSValueList.cpp | 26 +- .../webkit/WebCore/generated/JSCSSValueList.h | 4 +- .../generated/JSCSSVariablesDeclaration.cpp | 34 +- .../WebCore/generated/JSCSSVariablesDeclaration.h | 11 +- .../WebCore/generated/JSCSSVariablesRule.cpp | 29 +- .../webkit/WebCore/generated/JSCSSVariablesRule.h | 4 +- .../webkit/WebCore/generated/JSCanvasGradient.cpp | 8 +- .../webkit/WebCore/generated/JSCanvasGradient.h | 9 +- .../webkit/WebCore/generated/JSCanvasPattern.cpp | 8 +- .../webkit/WebCore/generated/JSCanvasPattern.h | 9 +- .../generated/JSCanvasRenderingContext2D.cpp | 83 +- .../WebCore/generated/JSCanvasRenderingContext2D.h | 11 +- .../webkit/WebCore/generated/JSCharacterData.cpp | 25 +- .../webkit/WebCore/generated/JSCharacterData.h | 4 +- .../webkit/WebCore/generated/JSClientRect.cpp | 41 +- .../webkit/WebCore/generated/JSClientRect.h | 11 +- .../webkit/WebCore/generated/JSClientRectList.cpp | 30 +- .../webkit/WebCore/generated/JSClientRectList.h | 11 +- .../webkit/WebCore/generated/JSClipboard.cpp | 37 +- .../webkit/WebCore/generated/JSClipboard.h | 11 +- .../webkit/WebCore/generated/JSComment.cpp | 19 +- src/3rdparty/webkit/WebCore/generated/JSComment.h | 4 +- .../webkit/WebCore/generated/JSConsole.cpp | 11 +- src/3rdparty/webkit/WebCore/generated/JSConsole.h | 9 +- .../webkit/WebCore/generated/JSCoordinates.cpp | 29 +- .../webkit/WebCore/generated/JSCoordinates.h | 9 +- .../webkit/WebCore/generated/JSCounter.cpp | 32 +- src/3rdparty/webkit/WebCore/generated/JSCounter.h | 11 +- .../WebCore/generated/JSDOMApplicationCache.cpp | 35 +- .../WebCore/generated/JSDOMApplicationCache.h | 9 +- .../WebCore/generated/JSDOMCoreException.cpp | 32 +- .../webkit/WebCore/generated/JSDOMCoreException.h | 11 +- .../WebCore/generated/JSDOMImplementation.cpp | 31 +- .../webkit/WebCore/generated/JSDOMImplementation.h | 11 +- .../webkit/WebCore/generated/JSDOMParser.cpp | 31 +- .../webkit/WebCore/generated/JSDOMParser.h | 11 +- .../webkit/WebCore/generated/JSDOMSelection.cpp | 51 +- .../webkit/WebCore/generated/JSDOMSelection.h | 9 +- .../webkit/WebCore/generated/JSDOMWindow.cpp | 1585 +++-- .../webkit/WebCore/generated/JSDOMWindow.h | 2 + .../webkit/WebCore/generated/JSDataGridColumn.cpp | 41 +- .../webkit/WebCore/generated/JSDataGridColumn.h | 11 +- .../WebCore/generated/JSDataGridColumnList.cpp | 42 +- .../WebCore/generated/JSDataGridColumnList.h | 11 +- .../webkit/WebCore/generated/JSDatabase.cpp | 11 +- src/3rdparty/webkit/WebCore/generated/JSDatabase.h | 9 +- .../WebCore/generated/JSDedicatedWorkerContext.cpp | 158 + .../WebCore/generated/JSDedicatedWorkerContext.h | 83 + .../webkit/WebCore/generated/JSDocument.cpp | 302 +- src/3rdparty/webkit/WebCore/generated/JSDocument.h | 6 +- .../WebCore/generated/JSDocumentFragment.cpp | 23 +- .../webkit/WebCore/generated/JSDocumentFragment.h | 4 +- .../webkit/WebCore/generated/JSDocumentType.cpp | 41 +- .../webkit/WebCore/generated/JSDocumentType.h | 4 +- .../webkit/WebCore/generated/JSElement.cpp | 225 +- src/3rdparty/webkit/WebCore/generated/JSElement.h | 6 +- src/3rdparty/webkit/WebCore/generated/JSEntity.cpp | 28 +- src/3rdparty/webkit/WebCore/generated/JSEntity.h | 4 +- .../webkit/WebCore/generated/JSEntityReference.cpp | 19 +- .../webkit/WebCore/generated/JSEntityReference.h | 4 +- .../webkit/WebCore/generated/JSErrorEvent.cpp | 203 + .../webkit/WebCore/generated/JSErrorEvent.h | 78 + src/3rdparty/webkit/WebCore/generated/JSEvent.cpp | 58 +- src/3rdparty/webkit/WebCore/generated/JSEvent.h | 11 +- .../webkit/WebCore/generated/JSEventException.cpp | 32 +- .../webkit/WebCore/generated/JSEventException.h | 11 +- src/3rdparty/webkit/WebCore/generated/JSFile.cpp | 29 +- src/3rdparty/webkit/WebCore/generated/JSFile.h | 11 +- .../webkit/WebCore/generated/JSFileList.cpp | 30 +- src/3rdparty/webkit/WebCore/generated/JSFileList.h | 11 +- .../webkit/WebCore/generated/JSGeolocation.cpp | 13 +- .../webkit/WebCore/generated/JSGeolocation.h | 9 +- .../webkit/WebCore/generated/JSGeoposition.cpp | 16 +- .../webkit/WebCore/generated/JSGeoposition.h | 9 +- .../WebCore/generated/JSHTMLAnchorElement.cpp | 121 +- .../webkit/WebCore/generated/JSHTMLAnchorElement.h | 4 +- .../WebCore/generated/JSHTMLAppletElement.cpp | 97 +- .../webkit/WebCore/generated/JSHTMLAppletElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLAreaElement.cpp | 86 +- .../webkit/WebCore/generated/JSHTMLAreaElement.h | 4 +- .../WebCore/generated/JSHTMLAudioElement.cpp | 19 +- .../webkit/WebCore/generated/JSHTMLAudioElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLBRElement.cpp | 27 +- .../webkit/WebCore/generated/JSHTMLBRElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLBaseElement.cpp | 34 +- .../webkit/WebCore/generated/JSHTMLBaseElement.h | 4 +- .../WebCore/generated/JSHTMLBaseFontElement.cpp | 37 +- .../WebCore/generated/JSHTMLBaseFontElement.h | 4 +- .../WebCore/generated/JSHTMLBlockquoteElement.cpp | 27 +- .../WebCore/generated/JSHTMLBlockquoteElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLBodyElement.cpp | 83 +- .../webkit/WebCore/generated/JSHTMLBodyElement.h | 4 +- .../WebCore/generated/JSHTMLButtonElement.cpp | 50 +- .../webkit/WebCore/generated/JSHTMLButtonElement.h | 4 +- .../WebCore/generated/JSHTMLCanvasElement.cpp | 27 +- .../webkit/WebCore/generated/JSHTMLCanvasElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLCollection.cpp | 26 +- .../webkit/WebCore/generated/JSHTMLCollection.h | 11 +- .../WebCore/generated/JSHTMLDListElement.cpp | 22 +- .../webkit/WebCore/generated/JSHTMLDListElement.h | 4 +- .../generated/JSHTMLDataGridCellElement.cpp | 34 +- .../WebCore/generated/JSHTMLDataGridCellElement.h | 4 +- .../WebCore/generated/JSHTMLDataGridColElement.cpp | 34 +- .../WebCore/generated/JSHTMLDataGridColElement.h | 4 +- .../WebCore/generated/JSHTMLDataGridElement.cpp | 36 +- .../WebCore/generated/JSHTMLDataGridElement.h | 4 +- .../WebCore/generated/JSHTMLDataGridRowElement.cpp | 28 +- .../WebCore/generated/JSHTMLDataGridRowElement.h | 4 +- .../WebCore/generated/JSHTMLDirectoryElement.cpp | 22 +- .../WebCore/generated/JSHTMLDirectoryElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLDivElement.cpp | 22 +- .../webkit/WebCore/generated/JSHTMLDivElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLDocument.cpp | 72 +- .../webkit/WebCore/generated/JSHTMLDocument.h | 4 +- .../webkit/WebCore/generated/JSHTMLElement.cpp | 79 +- .../webkit/WebCore/generated/JSHTMLElement.h | 6 +- .../generated/JSHTMLElementWrapperFactory.cpp | 266 +- .../generated/JSHTMLElementWrapperFactory.h | 3 +- .../WebCore/generated/JSHTMLEmbedElement.cpp | 39 +- .../webkit/WebCore/generated/JSHTMLEmbedElement.h | 4 +- .../WebCore/generated/JSHTMLFieldSetElement.cpp | 32 +- .../WebCore/generated/JSHTMLFieldSetElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLFontElement.cpp | 28 +- .../webkit/WebCore/generated/JSHTMLFontElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLFormElement.cpp | 50 +- .../webkit/WebCore/generated/JSHTMLFormElement.h | 4 +- .../WebCore/generated/JSHTMLFrameElement.cpp | 64 +- .../webkit/WebCore/generated/JSHTMLFrameElement.h | 4 +- .../WebCore/generated/JSHTMLFrameSetElement.cpp | 46 +- .../WebCore/generated/JSHTMLFrameSetElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLHRElement.cpp | 31 +- .../webkit/WebCore/generated/JSHTMLHRElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLHeadElement.cpp | 22 +- .../webkit/WebCore/generated/JSHTMLHeadElement.h | 4 +- .../WebCore/generated/JSHTMLHeadingElement.cpp | 22 +- .../WebCore/generated/JSHTMLHeadingElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLHtmlElement.cpp | 22 +- .../webkit/WebCore/generated/JSHTMLHtmlElement.h | 4 +- .../WebCore/generated/JSHTMLIFrameElement.cpp | 61 +- .../webkit/WebCore/generated/JSHTMLIFrameElement.h | 4 +- .../WebCore/generated/JSHTMLImageElement.cpp | 73 +- .../webkit/WebCore/generated/JSHTMLImageElement.h | 4 +- .../WebCore/generated/JSHTMLInputElement.cpp | 140 +- .../webkit/WebCore/generated/JSHTMLInputElement.h | 8 +- .../WebCore/generated/JSHTMLIsIndexElement.cpp | 27 +- .../WebCore/generated/JSHTMLIsIndexElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLLIElement.cpp | 25 +- .../webkit/WebCore/generated/JSHTMLLIElement.h | 4 +- .../WebCore/generated/JSHTMLLabelElement.cpp | 30 +- .../webkit/WebCore/generated/JSHTMLLabelElement.h | 4 +- .../WebCore/generated/JSHTMLLegendElement.cpp | 30 +- .../webkit/WebCore/generated/JSHTMLLegendElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLLinkElement.cpp | 51 +- .../webkit/WebCore/generated/JSHTMLLinkElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLMapElement.cpp | 27 +- .../webkit/WebCore/generated/JSHTMLMapElement.h | 4 +- .../WebCore/generated/JSHTMLMarqueeElement.cpp | 19 +- .../WebCore/generated/JSHTMLMarqueeElement.h | 4 +- .../WebCore/generated/JSHTMLMediaElement.cpp | 96 +- .../webkit/WebCore/generated/JSHTMLMediaElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLMenuElement.cpp | 22 +- .../webkit/WebCore/generated/JSHTMLMenuElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLMetaElement.cpp | 31 +- .../webkit/WebCore/generated/JSHTMLMetaElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLModElement.cpp | 25 +- .../webkit/WebCore/generated/JSHTMLModElement.h | 4 +- .../WebCore/generated/JSHTMLOListElement.cpp | 28 +- .../webkit/WebCore/generated/JSHTMLOListElement.h | 4 +- .../WebCore/generated/JSHTMLObjectElement.cpp | 79 +- .../webkit/WebCore/generated/JSHTMLObjectElement.h | 4 +- .../WebCore/generated/JSHTMLOptGroupElement.cpp | 25 +- .../WebCore/generated/JSHTMLOptGroupElement.h | 4 +- .../WebCore/generated/JSHTMLOptionElement.cpp | 45 +- .../webkit/WebCore/generated/JSHTMLOptionElement.h | 4 +- .../WebCore/generated/JSHTMLOptionsCollection.cpp | 10 +- .../WebCore/generated/JSHTMLOptionsCollection.h | 2 +- .../WebCore/generated/JSHTMLParagraphElement.cpp | 22 +- .../WebCore/generated/JSHTMLParagraphElement.h | 4 +- .../WebCore/generated/JSHTMLParamElement.cpp | 31 +- .../webkit/WebCore/generated/JSHTMLParamElement.h | 4 +- .../webkit/WebCore/generated/JSHTMLPreElement.cpp | 25 +- .../webkit/WebCore/generated/JSHTMLPreElement.h | 4 +- .../WebCore/generated/JSHTMLQuoteElement.cpp | 22 +- .../webkit/WebCore/generated/JSHTMLQuoteElement.h | 4 +- .../WebCore/generated/JSHTMLScriptElement.cpp | 40 +- .../webkit/WebCore/generated/JSHTMLScriptElement.h | 4 +- .../WebCore/generated/JSHTMLSelectElement.cpp | 70 +- .../webkit/WebCore/generated/JSHTMLSelectElement.h | 4 +- .../WebCore/generated/JSHTMLSourceElement.cpp | 28 +- .../webkit/WebCore/generated/JSHTMLSourceElement.h | 4 +- .../WebCore/generated/JSHTMLStyleElement.cpp | 33 +- .../webkit/WebCore/generated/JSHTMLStyleElement.h | 4 +- .../generated/JSHTMLTableCaptionElement.cpp | 22 +- .../WebCore/generated/JSHTMLTableCaptionElement.h | 4 +- .../WebCore/generated/JSHTMLTableCellElement.cpp | 64 +- .../WebCore/generated/JSHTMLTableCellElement.h | 4 +- .../WebCore/generated/JSHTMLTableColElement.cpp | 37 +- .../WebCore/generated/JSHTMLTableColElement.h | 4 +- .../WebCore/generated/JSHTMLTableElement.cpp | 79 +- .../webkit/WebCore/generated/JSHTMLTableElement.h | 4 +- .../WebCore/generated/JSHTMLTableRowElement.cpp | 47 +- .../WebCore/generated/JSHTMLTableRowElement.h | 4 +- .../generated/JSHTMLTableSectionElement.cpp | 38 +- .../WebCore/generated/JSHTMLTableSectionElement.h | 4 +- .../WebCore/generated/JSHTMLTextAreaElement.cpp | 87 +- .../WebCore/generated/JSHTMLTextAreaElement.h | 6 +- .../WebCore/generated/JSHTMLTitleElement.cpp | 22 +- .../webkit/WebCore/generated/JSHTMLTitleElement.h | 4 +- .../WebCore/generated/JSHTMLUListElement.cpp | 25 +- .../webkit/WebCore/generated/JSHTMLUListElement.h | 4 +- .../WebCore/generated/JSHTMLVideoElement.cpp | 34 +- .../webkit/WebCore/generated/JSHTMLVideoElement.h | 4 +- .../webkit/WebCore/generated/JSHistory.cpp | 11 +- src/3rdparty/webkit/WebCore/generated/JSHistory.h | 9 +- .../webkit/WebCore/generated/JSImageData.cpp | 25 +- .../webkit/WebCore/generated/JSImageData.h | 11 +- .../WebCore/generated/JSInspectorBackend.cpp | 773 +++ .../webkit/WebCore/generated/JSInspectorBackend.h | 138 + .../WebCore/generated/JSInspectorController.cpp | 769 -- .../WebCore/generated/JSInspectorController.h | 138 - .../WebCore/generated/JSJavaScriptCallFrame.cpp | 31 +- .../WebCore/generated/JSJavaScriptCallFrame.h | 9 +- .../webkit/WebCore/generated/JSKeyboardEvent.cpp | 40 +- .../webkit/WebCore/generated/JSKeyboardEvent.h | 4 +- .../webkit/WebCore/generated/JSLocation.cpp | 32 +- src/3rdparty/webkit/WebCore/generated/JSLocation.h | 9 +- .../webkit/WebCore/generated/JSMediaError.cpp | 26 +- .../webkit/WebCore/generated/JSMediaError.h | 11 +- .../webkit/WebCore/generated/JSMediaList.cpp | 29 +- .../webkit/WebCore/generated/JSMediaList.h | 11 +- .../webkit/WebCore/generated/JSMessageChannel.cpp | 18 +- .../webkit/WebCore/generated/JSMessageChannel.h | 9 +- .../webkit/WebCore/generated/JSMessageEvent.cpp | 38 +- .../webkit/WebCore/generated/JSMessageEvent.h | 4 +- .../webkit/WebCore/generated/JSMessagePort.cpp | 26 +- .../webkit/WebCore/generated/JSMessagePort.h | 11 +- .../webkit/WebCore/generated/JSMimeType.cpp | 37 +- src/3rdparty/webkit/WebCore/generated/JSMimeType.h | 11 +- .../webkit/WebCore/generated/JSMimeTypeArray.cpp | 32 +- .../webkit/WebCore/generated/JSMimeTypeArray.h | 11 +- .../webkit/WebCore/generated/JSMouseEvent.cpp | 78 +- .../webkit/WebCore/generated/JSMouseEvent.h | 4 +- .../webkit/WebCore/generated/JSMutationEvent.cpp | 36 +- .../webkit/WebCore/generated/JSMutationEvent.h | 4 +- .../webkit/WebCore/generated/JSNamedNodeMap.cpp | 42 +- .../webkit/WebCore/generated/JSNamedNodeMap.h | 11 +- .../webkit/WebCore/generated/JSNavigator.cpp | 54 +- .../webkit/WebCore/generated/JSNavigator.h | 9 +- src/3rdparty/webkit/WebCore/generated/JSNode.cpp | 90 +- src/3rdparty/webkit/WebCore/generated/JSNode.h | 13 +- .../webkit/WebCore/generated/JSNodeFilter.cpp | 23 +- .../webkit/WebCore/generated/JSNodeFilter.h | 11 +- .../webkit/WebCore/generated/JSNodeIterator.cpp | 47 +- .../webkit/WebCore/generated/JSNodeIterator.h | 11 +- .../webkit/WebCore/generated/JSNodeList.cpp | 30 +- src/3rdparty/webkit/WebCore/generated/JSNodeList.h | 11 +- .../webkit/WebCore/generated/JSNotation.cpp | 25 +- src/3rdparty/webkit/WebCore/generated/JSNotation.h | 4 +- .../webkit/WebCore/generated/JSOverflowEvent.cpp | 28 +- .../webkit/WebCore/generated/JSOverflowEvent.h | 4 +- src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp | 41 +- src/3rdparty/webkit/WebCore/generated/JSPlugin.h | 11 +- .../webkit/WebCore/generated/JSPluginArray.cpp | 32 +- .../webkit/WebCore/generated/JSPluginArray.h | 11 +- .../webkit/WebCore/generated/JSPositionError.cpp | 29 +- .../webkit/WebCore/generated/JSPositionError.h | 11 +- .../WebCore/generated/JSProcessingInstruction.cpp | 30 +- .../WebCore/generated/JSProcessingInstruction.h | 4 +- .../webkit/WebCore/generated/JSProgressEvent.cpp | 28 +- .../webkit/WebCore/generated/JSProgressEvent.h | 4 +- .../webkit/WebCore/generated/JSRGBColor.cpp | 178 + src/3rdparty/webkit/WebCore/generated/JSRGBColor.h | 76 + .../webkit/WebCore/generated/JSRGBColor.lut.h | 16 - src/3rdparty/webkit/WebCore/generated/JSRange.cpp | 55 +- src/3rdparty/webkit/WebCore/generated/JSRange.h | 11 +- .../webkit/WebCore/generated/JSRangeException.cpp | 32 +- .../webkit/WebCore/generated/JSRangeException.h | 11 +- src/3rdparty/webkit/WebCore/generated/JSRect.cpp | 43 +- src/3rdparty/webkit/WebCore/generated/JSRect.h | 11 +- .../webkit/WebCore/generated/JSSQLError.cpp | 14 +- src/3rdparty/webkit/WebCore/generated/JSSQLError.h | 9 +- .../webkit/WebCore/generated/JSSQLResultSet.cpp | 19 +- .../webkit/WebCore/generated/JSSQLResultSet.h | 9 +- .../WebCore/generated/JSSQLResultSetRowList.cpp | 11 +- .../WebCore/generated/JSSQLResultSetRowList.h | 9 +- .../webkit/WebCore/generated/JSSQLTransaction.cpp | 8 +- .../webkit/WebCore/generated/JSSQLTransaction.h | 9 +- .../webkit/WebCore/generated/JSSVGAElement.cpp | 75 +- .../webkit/WebCore/generated/JSSVGAElement.h | 2 +- .../WebCore/generated/JSSVGAltGlyphElement.cpp | 15 +- .../WebCore/generated/JSSVGAltGlyphElement.h | 2 +- .../webkit/WebCore/generated/JSSVGAngle.cpp | 36 +- src/3rdparty/webkit/WebCore/generated/JSSVGAngle.h | 15 +- .../WebCore/generated/JSSVGAnimateColorElement.cpp | 4 +- .../WebCore/generated/JSSVGAnimateColorElement.h | 2 +- .../WebCore/generated/JSSVGAnimateElement.cpp | 4 +- .../webkit/WebCore/generated/JSSVGAnimateElement.h | 2 +- .../generated/JSSVGAnimateTransformElement.cpp | 4 +- .../generated/JSSVGAnimateTransformElement.h | 2 +- .../WebCore/generated/JSSVGAnimatedAngle.cpp | 19 +- .../webkit/WebCore/generated/JSSVGAnimatedAngle.h | 13 +- .../WebCore/generated/JSSVGAnimatedBoolean.cpp | 15 +- .../WebCore/generated/JSSVGAnimatedBoolean.h | 13 +- .../WebCore/generated/JSSVGAnimatedEnumeration.cpp | 15 +- .../WebCore/generated/JSSVGAnimatedEnumeration.h | 13 +- .../WebCore/generated/JSSVGAnimatedInteger.cpp | 15 +- .../WebCore/generated/JSSVGAnimatedInteger.h | 13 +- .../WebCore/generated/JSSVGAnimatedLength.cpp | 19 +- .../webkit/WebCore/generated/JSSVGAnimatedLength.h | 13 +- .../WebCore/generated/JSSVGAnimatedLengthList.cpp | 19 +- .../WebCore/generated/JSSVGAnimatedLengthList.h | 13 +- .../WebCore/generated/JSSVGAnimatedNumber.cpp | 15 +- .../webkit/WebCore/generated/JSSVGAnimatedNumber.h | 13 +- .../WebCore/generated/JSSVGAnimatedNumberList.cpp | 19 +- .../WebCore/generated/JSSVGAnimatedNumberList.h | 13 +- .../generated/JSSVGAnimatedPreserveAspectRatio.cpp | 19 +- .../generated/JSSVGAnimatedPreserveAspectRatio.h | 13 +- .../webkit/WebCore/generated/JSSVGAnimatedRect.cpp | 19 +- .../webkit/WebCore/generated/JSSVGAnimatedRect.h | 13 +- .../WebCore/generated/JSSVGAnimatedString.cpp | 15 +- .../webkit/WebCore/generated/JSSVGAnimatedString.h | 13 +- .../generated/JSSVGAnimatedTransformList.cpp | 19 +- .../WebCore/generated/JSSVGAnimatedTransformList.h | 13 +- .../WebCore/generated/JSSVGAnimationElement.cpp | 29 +- .../WebCore/generated/JSSVGAnimationElement.h | 2 +- .../WebCore/generated/JSSVGCircleElement.cpp | 80 +- .../webkit/WebCore/generated/JSSVGCircleElement.h | 2 +- .../WebCore/generated/JSSVGClipPathElement.cpp | 70 +- .../WebCore/generated/JSSVGClipPathElement.h | 2 +- .../webkit/WebCore/generated/JSSVGColor.cpp | 28 +- src/3rdparty/webkit/WebCore/generated/JSSVGColor.h | 4 +- .../JSSVGComponentTransferFunctionElement.cpp | 54 +- .../JSSVGComponentTransferFunctionElement.h | 4 +- .../WebCore/generated/JSSVGCursorElement.cpp | 39 +- .../webkit/WebCore/generated/JSSVGCursorElement.h | 2 +- .../generated/JSSVGDefinitionSrcElement.cpp | 4 +- .../WebCore/generated/JSSVGDefinitionSrcElement.h | 2 +- .../webkit/WebCore/generated/JSSVGDefsElement.cpp | 65 +- .../webkit/WebCore/generated/JSSVGDefsElement.h | 2 +- .../webkit/WebCore/generated/JSSVGDescElement.cpp | 22 +- .../webkit/WebCore/generated/JSSVGDescElement.h | 2 +- .../webkit/WebCore/generated/JSSVGDocument.cpp | 11 +- .../webkit/WebCore/generated/JSSVGDocument.h | 2 +- .../webkit/WebCore/generated/JSSVGElement.cpp | 20 +- .../webkit/WebCore/generated/JSSVGElement.h | 2 +- .../WebCore/generated/JSSVGElementInstance.cpp | 164 +- .../WebCore/generated/JSSVGElementInstance.h | 9 +- .../WebCore/generated/JSSVGElementInstanceList.cpp | 13 +- .../WebCore/generated/JSSVGElementInstanceList.h | 9 +- .../generated/JSSVGElementWrapperFactory.cpp | 200 +- .../WebCore/generated/JSSVGElementWrapperFactory.h | 3 +- .../WebCore/generated/JSSVGEllipseElement.cpp | 85 +- .../webkit/WebCore/generated/JSSVGEllipseElement.h | 2 +- .../webkit/WebCore/generated/JSSVGException.cpp | 33 +- .../webkit/WebCore/generated/JSSVGException.h | 15 +- .../WebCore/generated/JSSVGFEBlendElement.cpp | 71 +- .../webkit/WebCore/generated/JSSVGFEBlendElement.h | 4 +- .../generated/JSSVGFEColorMatrixElement.cpp | 71 +- .../WebCore/generated/JSSVGFEColorMatrixElement.h | 4 +- .../generated/JSSVGFEComponentTransferElement.cpp | 46 +- .../generated/JSSVGFEComponentTransferElement.h | 2 +- .../WebCore/generated/JSSVGFECompositeElement.cpp | 91 +- .../WebCore/generated/JSSVGFECompositeElement.h | 4 +- .../generated/JSSVGFEDiffuseLightingElement.cpp | 66 +- .../generated/JSSVGFEDiffuseLightingElement.h | 2 +- .../generated/JSSVGFEDisplacementMapElement.cpp | 81 +- .../generated/JSSVGFEDisplacementMapElement.h | 4 +- .../generated/JSSVGFEDistantLightElement.cpp | 14 +- .../WebCore/generated/JSSVGFEDistantLightElement.h | 2 +- .../WebCore/generated/JSSVGFEFloodElement.cpp | 61 +- .../webkit/WebCore/generated/JSSVGFEFloodElement.h | 4 +- .../WebCore/generated/JSSVGFEFuncAElement.cpp | 4 +- .../webkit/WebCore/generated/JSSVGFEFuncAElement.h | 2 +- .../WebCore/generated/JSSVGFEFuncBElement.cpp | 4 +- .../webkit/WebCore/generated/JSSVGFEFuncBElement.h | 2 +- .../WebCore/generated/JSSVGFEFuncGElement.cpp | 4 +- .../webkit/WebCore/generated/JSSVGFEFuncGElement.h | 2 +- .../WebCore/generated/JSSVGFEFuncRElement.cpp | 4 +- .../webkit/WebCore/generated/JSSVGFEFuncRElement.h | 2 +- .../generated/JSSVGFEGaussianBlurElement.cpp | 56 +- .../WebCore/generated/JSSVGFEGaussianBlurElement.h | 2 +- .../WebCore/generated/JSSVGFEImageElement.cpp | 57 +- .../webkit/WebCore/generated/JSSVGFEImageElement.h | 2 +- .../WebCore/generated/JSSVGFEMergeElement.cpp | 41 +- .../webkit/WebCore/generated/JSSVGFEMergeElement.h | 2 +- .../WebCore/generated/JSSVGFEMergeNodeElement.cpp | 9 +- .../WebCore/generated/JSSVGFEMergeNodeElement.h | 2 +- .../WebCore/generated/JSSVGFEOffsetElement.cpp | 56 +- .../WebCore/generated/JSSVGFEOffsetElement.h | 2 +- .../WebCore/generated/JSSVGFEPointLightElement.cpp | 19 +- .../WebCore/generated/JSSVGFEPointLightElement.h | 2 +- .../generated/JSSVGFESpecularLightingElement.cpp | 61 +- .../generated/JSSVGFESpecularLightingElement.h | 2 +- .../WebCore/generated/JSSVGFESpotLightElement.cpp | 44 +- .../WebCore/generated/JSSVGFESpotLightElement.h | 2 +- .../WebCore/generated/JSSVGFETileElement.cpp | 46 +- .../webkit/WebCore/generated/JSSVGFETileElement.h | 2 +- .../WebCore/generated/JSSVGFETurbulenceElement.cpp | 86 +- .../WebCore/generated/JSSVGFETurbulenceElement.h | 4 +- .../WebCore/generated/JSSVGFilterElement.cpp | 72 +- .../webkit/WebCore/generated/JSSVGFilterElement.h | 2 +- .../webkit/WebCore/generated/JSSVGFontElement.cpp | 4 +- .../webkit/WebCore/generated/JSSVGFontElement.h | 2 +- .../WebCore/generated/JSSVGFontFaceElement.cpp | 4 +- .../WebCore/generated/JSSVGFontFaceElement.h | 2 +- .../generated/JSSVGFontFaceFormatElement.cpp | 4 +- .../WebCore/generated/JSSVGFontFaceFormatElement.h | 2 +- .../WebCore/generated/JSSVGFontFaceNameElement.cpp | 4 +- .../WebCore/generated/JSSVGFontFaceNameElement.h | 2 +- .../WebCore/generated/JSSVGFontFaceSrcElement.cpp | 4 +- .../WebCore/generated/JSSVGFontFaceSrcElement.h | 2 +- .../WebCore/generated/JSSVGFontFaceUriElement.cpp | 4 +- .../WebCore/generated/JSSVGFontFaceUriElement.h | 2 +- .../generated/JSSVGForeignObjectElement.cpp | 85 +- .../WebCore/generated/JSSVGForeignObjectElement.h | 2 +- .../webkit/WebCore/generated/JSSVGGElement.cpp | 65 +- .../webkit/WebCore/generated/JSSVGGElement.h | 2 +- .../webkit/WebCore/generated/JSSVGGlyphElement.cpp | 4 +- .../webkit/WebCore/generated/JSSVGGlyphElement.h | 2 +- .../WebCore/generated/JSSVGGradientElement.cpp | 56 +- .../WebCore/generated/JSSVGGradientElement.h | 4 +- .../webkit/WebCore/generated/JSSVGHKernElement.cpp | 4 +- .../webkit/WebCore/generated/JSSVGHKernElement.h | 2 +- .../webkit/WebCore/generated/JSSVGImageElement.cpp | 95 +- .../webkit/WebCore/generated/JSSVGImageElement.h | 2 +- .../webkit/WebCore/generated/JSSVGLength.cpp | 36 +- .../webkit/WebCore/generated/JSSVGLength.h | 15 +- .../webkit/WebCore/generated/JSSVGLengthList.cpp | 24 +- .../webkit/WebCore/generated/JSSVGLengthList.h | 13 +- .../webkit/WebCore/generated/JSSVGLineElement.cpp | 85 +- .../webkit/WebCore/generated/JSSVGLineElement.h | 2 +- .../generated/JSSVGLinearGradientElement.cpp | 24 +- .../WebCore/generated/JSSVGLinearGradientElement.h | 2 +- .../WebCore/generated/JSSVGMarkerElement.cpp | 87 +- .../webkit/WebCore/generated/JSSVGMarkerElement.h | 4 +- .../webkit/WebCore/generated/JSSVGMaskElement.cpp | 72 +- .../webkit/WebCore/generated/JSSVGMaskElement.h | 2 +- .../webkit/WebCore/generated/JSSVGMatrix.cpp | 45 +- .../webkit/WebCore/generated/JSSVGMatrix.h | 13 +- .../WebCore/generated/JSSVGMetadataElement.cpp | 4 +- .../WebCore/generated/JSSVGMetadataElement.h | 2 +- .../WebCore/generated/JSSVGMissingGlyphElement.cpp | 4 +- .../WebCore/generated/JSSVGMissingGlyphElement.h | 2 +- .../webkit/WebCore/generated/JSSVGNumber.cpp | 12 +- .../webkit/WebCore/generated/JSSVGNumber.h | 13 +- .../webkit/WebCore/generated/JSSVGNumberList.cpp | 24 +- .../webkit/WebCore/generated/JSSVGNumberList.h | 13 +- .../webkit/WebCore/generated/JSSVGPaint.cpp | 25 +- src/3rdparty/webkit/WebCore/generated/JSSVGPaint.h | 4 +- .../webkit/WebCore/generated/JSSVGPathElement.cpp | 130 +- .../webkit/WebCore/generated/JSSVGPathElement.h | 2 +- .../webkit/WebCore/generated/JSSVGPathSeg.cpp | 26 +- .../webkit/WebCore/generated/JSSVGPathSeg.h | 15 +- .../WebCore/generated/JSSVGPathSegArcAbs.cpp | 25 +- .../webkit/WebCore/generated/JSSVGPathSegArcAbs.h | 2 +- .../WebCore/generated/JSSVGPathSegArcRel.cpp | 25 +- .../webkit/WebCore/generated/JSSVGPathSegArcRel.h | 2 +- .../WebCore/generated/JSSVGPathSegClosePath.cpp | 4 +- .../WebCore/generated/JSSVGPathSegClosePath.h | 2 +- .../generated/JSSVGPathSegCurvetoCubicAbs.cpp | 22 +- .../generated/JSSVGPathSegCurvetoCubicAbs.h | 2 +- .../generated/JSSVGPathSegCurvetoCubicRel.cpp | 22 +- .../generated/JSSVGPathSegCurvetoCubicRel.h | 2 +- .../JSSVGPathSegCurvetoCubicSmoothAbs.cpp | 16 +- .../generated/JSSVGPathSegCurvetoCubicSmoothAbs.h | 2 +- .../JSSVGPathSegCurvetoCubicSmoothRel.cpp | 16 +- .../generated/JSSVGPathSegCurvetoCubicSmoothRel.h | 2 +- .../generated/JSSVGPathSegCurvetoQuadraticAbs.cpp | 16 +- .../generated/JSSVGPathSegCurvetoQuadraticAbs.h | 2 +- .../generated/JSSVGPathSegCurvetoQuadraticRel.cpp | 16 +- .../generated/JSSVGPathSegCurvetoQuadraticRel.h | 2 +- .../JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp | 10 +- .../JSSVGPathSegCurvetoQuadraticSmoothAbs.h | 2 +- .../JSSVGPathSegCurvetoQuadraticSmoothRel.cpp | 10 +- .../JSSVGPathSegCurvetoQuadraticSmoothRel.h | 2 +- .../WebCore/generated/JSSVGPathSegLinetoAbs.cpp | 10 +- .../WebCore/generated/JSSVGPathSegLinetoAbs.h | 2 +- .../generated/JSSVGPathSegLinetoHorizontalAbs.cpp | 7 +- .../generated/JSSVGPathSegLinetoHorizontalAbs.h | 2 +- .../generated/JSSVGPathSegLinetoHorizontalRel.cpp | 7 +- .../generated/JSSVGPathSegLinetoHorizontalRel.h | 2 +- .../WebCore/generated/JSSVGPathSegLinetoRel.cpp | 10 +- .../WebCore/generated/JSSVGPathSegLinetoRel.h | 2 +- .../generated/JSSVGPathSegLinetoVerticalAbs.cpp | 7 +- .../generated/JSSVGPathSegLinetoVerticalAbs.h | 2 +- .../generated/JSSVGPathSegLinetoVerticalRel.cpp | 7 +- .../generated/JSSVGPathSegLinetoVerticalRel.h | 2 +- .../webkit/WebCore/generated/JSSVGPathSegList.cpp | 12 +- .../webkit/WebCore/generated/JSSVGPathSegList.h | 13 +- .../WebCore/generated/JSSVGPathSegMovetoAbs.cpp | 10 +- .../WebCore/generated/JSSVGPathSegMovetoAbs.h | 2 +- .../WebCore/generated/JSSVGPathSegMovetoRel.cpp | 10 +- .../WebCore/generated/JSSVGPathSegMovetoRel.h | 2 +- .../WebCore/generated/JSSVGPatternElement.cpp | 92 +- .../webkit/WebCore/generated/JSSVGPatternElement.h | 2 +- .../webkit/WebCore/generated/JSSVGPoint.cpp | 17 +- src/3rdparty/webkit/WebCore/generated/JSSVGPoint.h | 13 +- .../webkit/WebCore/generated/JSSVGPointList.cpp | 12 +- .../webkit/WebCore/generated/JSSVGPointList.h | 13 +- .../WebCore/generated/JSSVGPolygonElement.cpp | 75 +- .../webkit/WebCore/generated/JSSVGPolygonElement.h | 2 +- .../WebCore/generated/JSSVGPolylineElement.cpp | 75 +- .../WebCore/generated/JSSVGPolylineElement.h | 2 +- .../WebCore/generated/JSSVGPreserveAspectRatio.cpp | 30 +- .../WebCore/generated/JSSVGPreserveAspectRatio.h | 15 +- .../generated/JSSVGRadialGradientElement.cpp | 29 +- .../WebCore/generated/JSSVGRadialGradientElement.h | 2 +- .../webkit/WebCore/generated/JSSVGRect.cpp | 21 +- src/3rdparty/webkit/WebCore/generated/JSSVGRect.h | 13 +- .../webkit/WebCore/generated/JSSVGRectElement.cpp | 95 +- .../webkit/WebCore/generated/JSSVGRectElement.h | 2 +- .../WebCore/generated/JSSVGRenderingIntent.cpp | 24 +- .../WebCore/generated/JSSVGRenderingIntent.h | 15 +- .../webkit/WebCore/generated/JSSVGSVGElement.cpp | 147 +- .../webkit/WebCore/generated/JSSVGSVGElement.h | 2 +- .../WebCore/generated/JSSVGScriptElement.cpp | 17 +- .../webkit/WebCore/generated/JSSVGScriptElement.h | 2 +- .../webkit/WebCore/generated/JSSVGSetElement.cpp | 4 +- .../webkit/WebCore/generated/JSSVGSetElement.h | 2 +- .../webkit/WebCore/generated/JSSVGStopElement.cpp | 21 +- .../webkit/WebCore/generated/JSSVGStopElement.h | 2 +- .../webkit/WebCore/generated/JSSVGStringList.cpp | 12 +- .../webkit/WebCore/generated/JSSVGStringList.h | 13 +- .../webkit/WebCore/generated/JSSVGStyleElement.cpp | 16 +- .../webkit/WebCore/generated/JSSVGStyleElement.h | 2 +- .../WebCore/generated/JSSVGSwitchElement.cpp | 65 +- .../webkit/WebCore/generated/JSSVGSwitchElement.h | 2 +- .../WebCore/generated/JSSVGSymbolElement.cpp | 37 +- .../webkit/WebCore/generated/JSSVGSymbolElement.h | 2 +- .../webkit/WebCore/generated/JSSVGTRefElement.cpp | 9 +- .../webkit/WebCore/generated/JSSVGTRefElement.h | 2 +- .../webkit/WebCore/generated/JSSVGTSpanElement.cpp | 4 +- .../webkit/WebCore/generated/JSSVGTSpanElement.h | 2 +- .../WebCore/generated/JSSVGTextContentElement.cpp | 73 +- .../WebCore/generated/JSSVGTextContentElement.h | 4 +- .../webkit/WebCore/generated/JSSVGTextElement.cpp | 27 +- .../webkit/WebCore/generated/JSSVGTextElement.h | 2 +- .../WebCore/generated/JSSVGTextPathElement.cpp | 39 +- .../WebCore/generated/JSSVGTextPathElement.h | 4 +- .../generated/JSSVGTextPositioningElement.cpp | 29 +- .../generated/JSSVGTextPositioningElement.h | 2 +- .../webkit/WebCore/generated/JSSVGTitleElement.cpp | 22 +- .../webkit/WebCore/generated/JSSVGTitleElement.h | 2 +- .../webkit/WebCore/generated/JSSVGTransform.cpp | 35 +- .../webkit/WebCore/generated/JSSVGTransform.h | 15 +- .../WebCore/generated/JSSVGTransformList.cpp | 16 +- .../webkit/WebCore/generated/JSSVGTransformList.h | 13 +- .../webkit/WebCore/generated/JSSVGUnitTypes.cpp | 24 +- .../webkit/WebCore/generated/JSSVGUnitTypes.h | 15 +- .../webkit/WebCore/generated/JSSVGUseElement.cpp | 100 +- .../webkit/WebCore/generated/JSSVGUseElement.h | 2 +- .../webkit/WebCore/generated/JSSVGViewElement.cpp | 27 +- .../webkit/WebCore/generated/JSSVGViewElement.h | 2 +- .../webkit/WebCore/generated/JSSVGZoomEvent.cpp | 25 +- .../webkit/WebCore/generated/JSSVGZoomEvent.h | 2 +- src/3rdparty/webkit/WebCore/generated/JSScreen.cpp | 32 +- src/3rdparty/webkit/WebCore/generated/JSScreen.h | 9 +- .../webkit/WebCore/generated/JSStorage.cpp | 26 +- src/3rdparty/webkit/WebCore/generated/JSStorage.h | 11 +- .../webkit/WebCore/generated/JSStorageEvent.cpp | 41 +- .../webkit/WebCore/generated/JSStorageEvent.h | 4 +- .../webkit/WebCore/generated/JSStyleSheet.cpp | 46 +- .../webkit/WebCore/generated/JSStyleSheet.h | 11 +- .../webkit/WebCore/generated/JSStyleSheetList.cpp | 30 +- .../webkit/WebCore/generated/JSStyleSheetList.h | 11 +- src/3rdparty/webkit/WebCore/generated/JSText.cpp | 26 +- src/3rdparty/webkit/WebCore/generated/JSText.h | 6 +- .../webkit/WebCore/generated/JSTextEvent.cpp | 22 +- .../webkit/WebCore/generated/JSTextEvent.h | 4 +- .../webkit/WebCore/generated/JSTextMetrics.cpp | 26 +- .../webkit/WebCore/generated/JSTextMetrics.h | 11 +- .../webkit/WebCore/generated/JSTimeRanges.cpp | 11 +- .../webkit/WebCore/generated/JSTimeRanges.h | 9 +- .../webkit/WebCore/generated/JSTreeWalker.cpp | 44 +- .../webkit/WebCore/generated/JSTreeWalker.h | 11 +- .../webkit/WebCore/generated/JSUIEvent.cpp | 48 +- src/3rdparty/webkit/WebCore/generated/JSUIEvent.h | 4 +- .../webkit/WebCore/generated/JSValidityState.cpp | 35 +- .../webkit/WebCore/generated/JSValidityState.h | 9 +- .../webkit/WebCore/generated/JSVoidCallback.cpp | 8 +- .../webkit/WebCore/generated/JSVoidCallback.h | 9 +- .../WebCore/generated/JSWebKitAnimationEvent.cpp | 25 +- .../WebCore/generated/JSWebKitAnimationEvent.h | 4 +- .../WebCore/generated/JSWebKitCSSKeyframeRule.cpp | 27 +- .../WebCore/generated/JSWebKitCSSKeyframeRule.h | 4 +- .../WebCore/generated/JSWebKitCSSKeyframesRule.cpp | 31 +- .../WebCore/generated/JSWebKitCSSKeyframesRule.h | 4 +- .../webkit/WebCore/generated/JSWebKitCSSMatrix.cpp | 86 +- .../webkit/WebCore/generated/JSWebKitCSSMatrix.h | 9 +- .../generated/JSWebKitCSSTransformValue.cpp | 22 +- .../WebCore/generated/JSWebKitCSSTransformValue.h | 4 +- .../webkit/WebCore/generated/JSWebKitPoint.cpp | 14 +- .../webkit/WebCore/generated/JSWebKitPoint.h | 9 +- .../WebCore/generated/JSWebKitTransitionEvent.cpp | 25 +- .../WebCore/generated/JSWebKitTransitionEvent.h | 4 +- .../webkit/WebCore/generated/JSWheelEvent.cpp | 64 +- .../webkit/WebCore/generated/JSWheelEvent.h | 4 +- src/3rdparty/webkit/WebCore/generated/JSWorker.cpp | 92 +- src/3rdparty/webkit/WebCore/generated/JSWorker.h | 31 +- .../webkit/WebCore/generated/JSWorkerContext.cpp | 128 +- .../webkit/WebCore/generated/JSWorkerContext.h | 5 +- .../webkit/WebCore/generated/JSWorkerLocation.cpp | 47 +- .../webkit/WebCore/generated/JSWorkerLocation.h | 11 +- .../webkit/WebCore/generated/JSWorkerNavigator.cpp | 23 +- .../webkit/WebCore/generated/JSWorkerNavigator.h | 9 +- .../webkit/WebCore/generated/JSXMLHttpRequest.cpp | 51 +- .../webkit/WebCore/generated/JSXMLHttpRequest.h | 9 +- .../generated/JSXMLHttpRequestException.cpp | 32 +- .../WebCore/generated/JSXMLHttpRequestException.h | 11 +- .../generated/JSXMLHttpRequestProgressEvent.cpp | 25 +- .../generated/JSXMLHttpRequestProgressEvent.h | 4 +- .../WebCore/generated/JSXMLHttpRequestUpload.cpp | 38 +- .../WebCore/generated/JSXMLHttpRequestUpload.h | 11 +- .../webkit/WebCore/generated/JSXMLSerializer.cpp | 29 +- .../webkit/WebCore/generated/JSXMLSerializer.h | 11 +- .../webkit/WebCore/generated/JSXPathEvaluator.cpp | 35 +- .../webkit/WebCore/generated/JSXPathEvaluator.h | 11 +- .../webkit/WebCore/generated/JSXPathException.cpp | 32 +- .../webkit/WebCore/generated/JSXPathException.h | 11 +- .../webkit/WebCore/generated/JSXPathExpression.cpp | 25 +- .../webkit/WebCore/generated/JSXPathExpression.h | 11 +- .../webkit/WebCore/generated/JSXPathNSResolver.cpp | 8 +- .../webkit/WebCore/generated/JSXPathNSResolver.h | 9 +- .../webkit/WebCore/generated/JSXPathResult.cpp | 50 +- .../webkit/WebCore/generated/JSXPathResult.h | 11 +- .../WebCore/generated/UserAgentStyleSheets.h | 2 +- .../WebCore/generated/UserAgentStyleSheetsData.cpp | 533 +- .../webkit/WebCore/generated/XPathGrammar.cpp | 122 +- .../webkit/WebCore/generated/XPathGrammar.h | 2 +- .../webkit/WebCore/generated/tokenizer.cpp | 2919 ++++---- .../webkit/WebCore/history/BackForwardList.cpp | 7 +- .../webkit/WebCore/history/BackForwardList.h | 2 +- .../webkit/WebCore/history/CachedFrame.cpp | 9 + src/3rdparty/webkit/WebCore/history/CachedFrame.h | 2 + .../webkit/WebCore/history/HistoryItem.cpp | 2 +- src/3rdparty/webkit/WebCore/history/PageCache.cpp | 17 + src/3rdparty/webkit/WebCore/history/PageCache.h | 6 +- .../WebCore/html/CanvasRenderingContext2D.cpp | 19 +- .../webkit/WebCore/html/CanvasRenderingContext2D.h | 2 +- .../webkit/WebCore/html/HTMLAnchorElement.cpp | 124 +- .../webkit/WebCore/html/HTMLAnchorElement.h | 68 +- .../webkit/WebCore/html/HTMLAnchorElement.idl | 24 +- .../webkit/WebCore/html/HTMLAppletElement.cpp | 59 +- .../webkit/WebCore/html/HTMLAppletElement.h | 32 +- .../webkit/WebCore/html/HTMLAppletElement.idl | 24 +- .../webkit/WebCore/html/HTMLAreaElement.cpp | 55 +- src/3rdparty/webkit/WebCore/html/HTMLAreaElement.h | 29 +- .../webkit/WebCore/html/HTMLAreaElement.idl | 14 +- .../webkit/WebCore/html/HTMLAttributeNames.in | 3 + src/3rdparty/webkit/WebCore/html/HTMLBRElement.cpp | 20 +- src/3rdparty/webkit/WebCore/html/HTMLBRElement.h | 13 +- src/3rdparty/webkit/WebCore/html/HTMLBRElement.idl | 4 +- .../webkit/WebCore/html/HTMLBaseElement.cpp | 30 +- src/3rdparty/webkit/WebCore/html/HTMLBaseElement.h | 7 +- .../webkit/WebCore/html/HTMLBaseElement.idl | 6 +- .../webkit/WebCore/html/HTMLBaseFontElement.cpp | 28 +- .../webkit/WebCore/html/HTMLBaseFontElement.h | 20 +- .../webkit/WebCore/html/HTMLBaseFontElement.idl | 6 +- .../webkit/WebCore/html/HTMLBlockquoteElement.cpp | 23 +- .../webkit/WebCore/html/HTMLBlockquoteElement.h | 6 +- .../webkit/WebCore/html/HTMLBlockquoteElement.idl | 4 +- .../webkit/WebCore/html/HTMLBodyElement.cpp | 24 +- src/3rdparty/webkit/WebCore/html/HTMLBodyElement.h | 40 +- .../webkit/WebCore/html/HTMLBodyElement.idl | 18 +- .../webkit/WebCore/html/HTMLButtonElement.h | 1 + src/3rdparty/webkit/WebCore/html/HTMLDocument.cpp | 38 +- src/3rdparty/webkit/WebCore/html/HTMLDocument.h | 14 +- src/3rdparty/webkit/WebCore/html/HTMLElement.cpp | 17 + src/3rdparty/webkit/WebCore/html/HTMLElement.h | 3 + src/3rdparty/webkit/WebCore/html/HTMLElement.idl | 1 + .../webkit/WebCore/html/HTMLEmbedElement.cpp | 4 +- .../webkit/WebCore/html/HTMLFormControlElement.cpp | 10 + .../webkit/WebCore/html/HTMLFormControlElement.h | 7 + .../webkit/WebCore/html/HTMLFormElement.cpp | 2 +- .../webkit/WebCore/html/HTMLFrameElementBase.cpp | 2 +- .../webkit/WebCore/html/HTMLImageElement.cpp | 8 +- .../webkit/WebCore/html/HTMLImageElement.h | 2 + .../webkit/WebCore/html/HTMLImageLoader.cpp | 2 +- .../webkit/WebCore/html/HTMLInputElement.cpp | 158 +- .../webkit/WebCore/html/HTMLInputElement.h | 6 + .../webkit/WebCore/html/HTMLInputElement.idl | 2 + .../webkit/WebCore/html/HTMLLinkElement.cpp | 2 +- .../webkit/WebCore/html/HTMLMediaElement.cpp | 5 + .../webkit/WebCore/html/HTMLMediaElement.h | 6 +- .../webkit/WebCore/html/HTMLObjectElement.cpp | 2 +- src/3rdparty/webkit/WebCore/html/HTMLParser.h | 2 +- .../webkit/WebCore/html/HTMLParserQuirks.h | 2 +- .../webkit/WebCore/html/HTMLSelectElement.h | 2 + .../webkit/WebCore/html/HTMLTableElement.cpp | 2 +- .../webkit/WebCore/html/HTMLTablePartElement.cpp | 2 +- .../webkit/WebCore/html/HTMLTextAreaElement.cpp | 39 +- .../webkit/WebCore/html/HTMLTextAreaElement.h | 5 + .../webkit/WebCore/html/HTMLTextAreaElement.idl | 1 + src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp | 2 +- .../webkit/WebCore/html/PreloadScanner.cpp | 6 +- src/3rdparty/webkit/WebCore/html/PreloadScanner.h | 2 +- src/3rdparty/webkit/WebCore/html/ValidityState.cpp | 1 - src/3rdparty/webkit/WebCore/html/ValidityState.h | 7 +- .../webkit/WebCore/inspector/InspectorBackend.cpp | 363 + .../webkit/WebCore/inspector/InspectorBackend.h | 140 + .../webkit/WebCore/inspector/InspectorBackend.idl | 101 + .../WebCore/inspector/InspectorController.cpp | 232 +- .../webkit/WebCore/inspector/InspectorController.h | 74 +- .../WebCore/inspector/InspectorController.idl | 94 - .../WebCore/inspector/JavaScriptCallFrame.cpp | 2 +- .../WebCore/inspector/JavaScriptDebugServer.cpp | 2 +- .../WebCore/inspector/JavaScriptProfileNode.cpp | 20 +- .../WebCore/inspector/front-end/Breakpoint.js | 23 + .../inspector/front-end/BreakpointsSidebarPane.js | 94 +- .../webkit/WebCore/inspector/front-end/Console.js | 27 +- .../WebCore/inspector/front-end/DatabasesPanel.js | 2 +- .../WebCore/inspector/front-end/ElementsPanel.js | 2 + .../inspector/front-end/ElementsTreeOutline.js | 146 +- .../inspector/front-end/ObjectPropertiesSection.js | 45 +- .../webkit/WebCore/inspector/front-end/Resource.js | 6 - .../WebCore/inspector/front-end/ResourcesPanel.js | 11 + .../WebCore/inspector/front-end/ScriptsPanel.js | 22 +- .../WebCore/inspector/front-end/SourceFrame.js | 41 + .../WebCore/inspector/front-end/SourceView.js | 7 +- .../inspector/front-end/StylesSidebarPane.js | 89 +- .../WebCore/inspector/front-end/inspector.css | 52 + .../WebCore/inspector/front-end/inspector.html | 4 +- .../WebCore/inspector/front-end/inspector.js | 73 +- .../WebCore/inspector/front-end/utilities.js | 6 +- src/3rdparty/webkit/WebCore/loader/Cache.h | 2 +- .../loader/CrossOriginPreflightResultCache.h | 4 +- .../WebCore/loader/DocumentThreadableLoader.cpp | 3 +- src/3rdparty/webkit/WebCore/loader/EmptyClients.h | 11 +- src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp | 57 +- src/3rdparty/webkit/WebCore/loader/FrameLoader.h | 12 +- .../webkit/WebCore/loader/FrameLoaderClient.h | 5 +- .../webkit/WebCore/loader/PlaceholderDocument.cpp | 47 + .../webkit/WebCore/loader/PlaceholderDocument.h | 48 + .../webkit/WebCore/loader/ProgressTracker.h | 2 +- .../webkit/WebCore/loader/ThreadableLoader.h | 2 +- .../WebCore/loader/appcache/ApplicationCache.cpp | 18 +- .../WebCore/loader/appcache/ApplicationCache.h | 7 + .../loader/appcache/ApplicationCacheGroup.cpp | 159 +- .../loader/appcache/ApplicationCacheGroup.h | 11 +- .../loader/appcache/ApplicationCacheResource.cpp | 23 + .../loader/appcache/ApplicationCacheResource.h | 3 + .../loader/appcache/ApplicationCacheStorage.cpp | 249 +- .../loader/appcache/ApplicationCacheStorage.h | 30 +- .../loader/archive/ArchiveResourceCollection.h | 2 +- .../webkit/WebCore/loader/icon/IconDatabase.h | 2 +- .../webkit/WebCore/loader/icon/IconLoader.h | 2 +- .../webkit/WebCore/loader/icon/PageURLRecord.h | 2 +- src/3rdparty/webkit/WebCore/loader/loader.cpp | 7 +- src/3rdparty/webkit/WebCore/loader/loader.h | 2 +- src/3rdparty/webkit/WebCore/page/BarInfo.cpp | 28 +- src/3rdparty/webkit/WebCore/page/Chrome.cpp | 50 +- src/3rdparty/webkit/WebCore/page/ChromeClient.h | 11 +- src/3rdparty/webkit/WebCore/page/Console.cpp | 84 +- .../webkit/WebCore/page/ContextMenuController.h | 2 +- src/3rdparty/webkit/WebCore/page/Coordinates.cpp | 2 +- src/3rdparty/webkit/WebCore/page/DOMSelection.cpp | 14 +- src/3rdparty/webkit/WebCore/page/DOMSelection.h | 2 +- src/3rdparty/webkit/WebCore/page/DOMTimer.cpp | 35 +- src/3rdparty/webkit/WebCore/page/DOMTimer.h | 60 +- src/3rdparty/webkit/WebCore/page/DOMWindow.cpp | 14 +- src/3rdparty/webkit/WebCore/page/DOMWindow.idl | 1 + .../webkit/WebCore/page/DragController.cpp | 212 +- src/3rdparty/webkit/WebCore/page/EventHandler.cpp | 53 +- src/3rdparty/webkit/WebCore/page/EventHandler.h | 9 +- src/3rdparty/webkit/WebCore/page/Frame.cpp | 193 +- src/3rdparty/webkit/WebCore/page/Frame.h | 456 +- src/3rdparty/webkit/WebCore/page/FrameTree.h | 2 +- src/3rdparty/webkit/WebCore/page/FrameView.cpp | 13 + src/3rdparty/webkit/WebCore/page/FrameView.h | 6 +- src/3rdparty/webkit/WebCore/page/NavigatorBase.cpp | 14 + src/3rdparty/webkit/WebCore/page/Page.cpp | 2 +- src/3rdparty/webkit/WebCore/page/Page.h | 4 +- src/3rdparty/webkit/WebCore/page/PageGroup.h | 2 +- .../webkit/WebCore/page/PageGroupLoadDeferrer.h | 2 +- src/3rdparty/webkit/WebCore/page/Settings.cpp | 6 + src/3rdparty/webkit/WebCore/page/Settings.h | 4 + src/3rdparty/webkit/WebCore/page/XSSAuditor.cpp | 69 +- src/3rdparty/webkit/WebCore/page/XSSAuditor.h | 16 +- .../WebCore/page/animation/AnimationBase.cpp | 20 +- .../webkit/WebCore/platform/AutodrainedPool.h | 2 +- src/3rdparty/webkit/WebCore/platform/ContextMenu.h | 2 +- src/3rdparty/webkit/WebCore/platform/EventLoop.h | 2 +- src/3rdparty/webkit/WebCore/platform/HostWindow.h | 2 +- src/3rdparty/webkit/WebCore/platform/Logging.cpp | 79 +- src/3rdparty/webkit/WebCore/platform/Pasteboard.h | 2 +- .../webkit/WebCore/platform/PurgeableBuffer.h | 2 +- .../webkit/WebCore/platform/RunLoopTimer.h | 2 +- .../webkit/WebCore/platform/ScrollView.cpp | 22 + src/3rdparty/webkit/WebCore/platform/ScrollView.h | 1 + .../webkit/WebCore/platform/ThreadGlobalData.h | 2 +- .../webkit/WebCore/platform/ThreadTimers.h | 2 +- src/3rdparty/webkit/WebCore/platform/Timer.h | 2 +- src/3rdparty/webkit/WebCore/platform/TreeShared.h | 2 +- .../webkit/WebCore/platform/graphics/FontData.h | 7 +- .../platform/graphics/GlyphPageTreeNode.cpp | 38 + .../WebCore/platform/graphics/GlyphPageTreeNode.h | 11 + .../WebCore/platform/graphics/GlyphWidthMap.h | 2 +- .../webkit/WebCore/platform/graphics/Gradient.cpp | 13 + .../webkit/WebCore/platform/graphics/Gradient.h | 3 +- .../WebCore/platform/graphics/GraphicsContext.cpp | 22 + .../WebCore/platform/graphics/GraphicsContext.h | 6 +- .../WebCore/platform/graphics/GraphicsLayer.cpp | 25 + .../WebCore/platform/graphics/GraphicsLayer.h | 5 + .../webkit/WebCore/platform/graphics/Image.cpp | 2 +- .../webkit/WebCore/platform/graphics/ImageBuffer.h | 2 +- .../webkit/WebCore/platform/graphics/ImageSource.h | 2 +- .../WebCore/platform/graphics/MediaPlayer.cpp | 7 +- .../webkit/WebCore/platform/graphics/MediaPlayer.h | 3 +- .../WebCore/platform/graphics/MediaPlayerPrivate.h | 3 +- .../webkit/WebCore/platform/graphics/Path.h | 3 + .../platform/graphics/SegmentedFontData.cpp | 8 + .../WebCore/platform/graphics/SegmentedFontData.h | 4 + .../WebCore/platform/graphics/SimpleFontData.cpp | 12 + .../WebCore/platform/graphics/SimpleFontData.h | 4 + .../WebCore/platform/graphics/qt/FontCacheQt.cpp | 230 +- .../platform/graphics/qt/FontFallbackListQt.cpp | 29 +- .../platform/graphics/qt/FontPlatformData.h | 34 +- .../platform/graphics/qt/FontPlatformDataQt.cpp | 18 +- .../webkit/WebCore/platform/graphics/qt/FontQt.cpp | 13 +- .../WebCore/platform/graphics/qt/FontQt43.cpp | 16 +- .../WebCore/platform/graphics/qt/GradientQt.cpp | 2 +- .../platform/graphics/qt/GraphicsContextQt.cpp | 24 +- .../webkit/WebCore/platform/graphics/qt/IconQt.cpp | 5 +- .../platform/graphics/qt/ImageDecoderQt.cpp | 10 +- .../WebCore/platform/graphics/qt/ImageQt.cpp | 11 +- .../WebCore/platform/graphics/qt/ImageSourceQt.cpp | 10 +- .../graphics/qt/MediaPlayerPrivatePhonon.cpp | 14 +- .../webkit/WebCore/platform/graphics/qt/PathQt.cpp | 13 +- .../graphics/qt/TransformationMatrixQt.cpp | 2 +- .../platform/mac/LocalCurrentGraphicsContext.h | 2 +- .../platform/mac/RuntimeApplicationChecks.h | 1 + .../platform/mac/RuntimeApplicationChecks.mm | 6 + .../WebCore/platform/network/FormDataBuilder.h | 2 +- .../WebCore/platform/network/ResourceHandle.h | 6 - .../platform/network/ResourceHandleInternal.h | 2 +- .../webkit/WebCore/platform/qt/ClipboardQt.cpp | 42 +- .../webkit/WebCore/platform/qt/ClipboardQt.h | 12 +- .../WebCore/platform/qt/ContextMenuItemQt.cpp | 4 +- .../webkit/WebCore/platform/qt/CursorQt.cpp | 6 +- .../webkit/WebCore/platform/qt/DragDataQt.cpp | 26 +- .../webkit/WebCore/platform/qt/DragImageQt.cpp | 10 +- .../webkit/WebCore/platform/qt/FileSystemQt.cpp | 4 +- .../webkit/WebCore/platform/qt/Localizations.cpp | 4 +- .../WebCore/platform/qt/MIMETypeRegistryQt.cpp | 2 +- .../webkit/WebCore/platform/qt/PasteboardQt.cpp | 8 +- .../platform/qt/PlatformKeyboardEventQt.cpp | 2 +- .../WebCore/platform/qt/PlatformMouseEventQt.cpp | 4 +- .../webkit/WebCore/platform/qt/PopupMenuQt.cpp | 3 +- .../webkit/WebCore/platform/qt/RenderThemeQt.cpp | 45 +- .../webkit/WebCore/platform/qt/RenderThemeQt.h | 9 +- .../webkit/WebCore/platform/qt/ScreenQt.cpp | 6 +- .../webkit/WebCore/platform/qt/ScrollbarQt.cpp | 4 +- .../WebCore/platform/qt/ScrollbarThemeQt.cpp | 36 +- .../webkit/WebCore/platform/qt/ScrollbarThemeQt.h | 2 +- .../webkit/WebCore/platform/qt/SharedBufferQt.cpp | 2 +- .../WebCore/platform/qt/TemporaryLinkStubs.cpp | 41 +- .../webkit/WebCore/platform/sql/SQLiteDatabase.cpp | 12 + .../webkit/WebCore/platform/sql/SQLiteDatabase.h | 3 + .../webkit/WebCore/platform/text/CharacterNames.h | 12 +- .../webkit/WebCore/platform/text/StringBuffer.h | 2 +- .../webkit/WebCore/platform/text/StringImpl.cpp | 26 +- .../WebCore/platform/text/TextBreakIteratorICU.cpp | 2 +- .../webkit/WebCore/platform/text/TextCodec.h | 2 +- .../webkit/WebCore/platform/text/qt/StringQt.cpp | 2 +- .../WebCore/platform/text/qt/TextBoundaries.cpp | 8 +- .../platform/text/qt/TextBreakIteratorQt.cpp | 40 +- .../webkit/WebCore/plugins/PluginDatabase.cpp | 21 +- .../webkit/WebCore/plugins/PluginDatabase.h | 19 +- .../webkit/WebCore/plugins/PluginDebug.cpp | 168 + src/3rdparty/webkit/WebCore/plugins/PluginDebug.h | 37 +- src/3rdparty/webkit/WebCore/plugins/PluginView.cpp | 65 +- src/3rdparty/webkit/WebCore/plugins/PluginView.h | 2 + .../webkit/WebCore/plugins/mac/PluginViewMac.cpp | 120 +- .../webkit/WebCore/plugins/qt/PluginPackageQt.cpp | 18 +- .../webkit/WebCore/plugins/qt/PluginViewQt.cpp | 18 +- .../WebCore/plugins/win/PluginDatabaseWin.cpp | 46 + .../WebCore/plugins/win/PluginPackageWin.cpp | 13 +- .../webkit/WebCore/plugins/win/PluginViewWin.cpp | 118 +- .../webkit/WebCore/rendering/CounterNode.h | 2 +- .../webkit/WebCore/rendering/HitTestResult.cpp | 44 +- .../webkit/WebCore/rendering/HitTestResult.h | 8 +- .../webkit/WebCore/rendering/InlineFlowBox.cpp | 25 +- .../webkit/WebCore/rendering/InlineFlowBox.h | 2 +- .../webkit/WebCore/rendering/InlineTextBox.cpp | 14 +- .../webkit/WebCore/rendering/LayoutState.h | 2 +- .../WebCore/rendering/MediaControlElements.cpp | 7 +- .../webkit/WebCore/rendering/RenderBlock.cpp | 31 +- .../webkit/WebCore/rendering/RenderBox.cpp | 5 +- .../WebCore/rendering/RenderBoxModelObject.cpp | 296 +- .../WebCore/rendering/RenderBoxModelObject.h | 2 +- .../webkit/WebCore/rendering/RenderButton.cpp | 5 + .../webkit/WebCore/rendering/RenderButton.h | 3 +- .../webkit/WebCore/rendering/RenderFieldset.cpp | 3 +- .../webkit/WebCore/rendering/RenderFlexibleBox.cpp | 12 +- .../webkit/WebCore/rendering/RenderFrameSet.h | 2 +- .../webkit/WebCore/rendering/RenderLayer.cpp | 2 +- .../webkit/WebCore/rendering/RenderObject.cpp | 12 +- .../webkit/WebCore/rendering/RenderReplaced.cpp | 2 +- .../webkit/WebCore/rendering/RenderTable.cpp | 5 +- .../webkit/WebCore/rendering/RenderTableCell.cpp | 6 +- .../webkit/WebCore/rendering/RenderTextControl.cpp | 2 +- .../rendering/RenderTextControlMultiLine.cpp | 13 - .../webkit/WebCore/rendering/RenderTheme.cpp | 2 +- .../webkit/WebCore/rendering/RenderThemeWince.cpp | 667 ++ .../webkit/WebCore/rendering/RenderThemeWince.h | 147 + src/3rdparty/webkit/WebCore/rendering/RenderView.h | 2 +- .../WebCore/rendering/SVGRenderTreeAsText.cpp | 3 +- .../webkit/WebCore/rendering/TransformState.h | 2 +- .../webkit/WebCore/rendering/style/FillLayer.h | 10 +- .../webkit/WebCore/rendering/style/RenderStyle.cpp | 2 + .../webkit/WebCore/rendering/style/RenderStyle.h | 4 +- .../WebCore/rendering/style/RenderStyleConstants.h | 4 + .../WebCore/rendering/style/SVGRenderStyle.cpp | 3 +- .../webkit/WebCore/rendering/style/ShadowData.cpp | 6 +- .../webkit/WebCore/rendering/style/ShadowData.h | 20 +- .../webkit/WebCore/storage/DatabaseTracker.cpp | 7 - .../webkit/WebCore/storage/LocalStorageTask.cpp | 4 + .../webkit/WebCore/storage/LocalStorageTask.h | 2 + src/3rdparty/webkit/WebCore/storage/Storage.cpp | 4 + src/3rdparty/webkit/WebCore/storage/Storage.h | 6 +- .../webkit/WebCore/storage/StorageArea.cpp | 47 - src/3rdparty/webkit/WebCore/storage/StorageArea.h | 19 +- .../webkit/WebCore/storage/StorageAreaImpl.cpp | 7 +- .../webkit/WebCore/storage/StorageAreaImpl.h | 17 +- .../webkit/WebCore/storage/StorageAreaSync.cpp | 9 +- .../webkit/WebCore/storage/StorageAreaSync.h | 13 +- .../webkit/WebCore/storage/StorageEvent.cpp | 14 + src/3rdparty/webkit/WebCore/storage/StorageEvent.h | 15 +- .../webkit/WebCore/storage/StorageNamespace.h | 7 +- .../WebCore/storage/StorageNamespaceImpl.cpp | 10 +- .../webkit/WebCore/storage/StorageNamespaceImpl.h | 10 +- .../webkit/WebCore/storage/StorageSyncManager.cpp | 6 + .../webkit/WebCore/storage/StorageSyncManager.h | 12 +- src/3rdparty/webkit/WebCore/svg/SVGAElement.cpp | 2 +- .../webkit/WebCore/svg/SVGAnimatedProperty.h | 2 +- src/3rdparty/webkit/WebCore/svg/SVGColor.cpp | 5 +- src/3rdparty/webkit/WebCore/svg/SVGColor.h | 4 +- src/3rdparty/webkit/WebCore/svg/SVGImageLoader.cpp | 2 +- src/3rdparty/webkit/WebCore/svg/SVGPolyElement.h | 1 - .../webkit/WebCore/svg/SynchronizableTypeWrapper.h | 2 +- .../webkit/WebCore/svg/graphics/SVGPaintServer.cpp | 11 +- .../webkit/WebCore/svg/graphics/SVGPaintServer.h | 2 +- src/3rdparty/webkit/WebCore/wml/WMLAElement.cpp | 2 +- src/3rdparty/webkit/WebCore/wml/WMLCardElement.cpp | 37 +- src/3rdparty/webkit/WebCore/wml/WMLCardElement.h | 1 - src/3rdparty/webkit/WebCore/wml/WMLDoElement.cpp | 11 + src/3rdparty/webkit/WebCore/wml/WMLDoElement.h | 1 + src/3rdparty/webkit/WebCore/wml/WMLElement.cpp | 5 + src/3rdparty/webkit/WebCore/wml/WMLElement.h | 2 + src/3rdparty/webkit/WebCore/wml/WMLGoElement.cpp | 5 +- src/3rdparty/webkit/WebCore/wml/WMLImageLoader.cpp | 2 +- src/3rdparty/webkit/WebCore/wml/WMLNoopElement.cpp | 7 +- .../webkit/WebCore/wml/WMLOptGroupElement.cpp | 5 - .../webkit/WebCore/wml/WMLOptGroupElement.h | 2 - .../webkit/WebCore/wml/WMLOptionElement.cpp | 8 + src/3rdparty/webkit/WebCore/wml/WMLPageState.cpp | 29 +- src/3rdparty/webkit/WebCore/wml/WMLPageState.h | 4 + .../webkit/WebCore/wml/WMLSelectElement.cpp | 5 - src/3rdparty/webkit/WebCore/wml/WMLSelectElement.h | 2 - .../webkit/WebCore/workers/AbstractWorker.cpp | 24 +- .../webkit/WebCore/workers/AbstractWorker.h | 6 +- .../webkit/WebCore/workers/AbstractWorker.idl | 2 +- .../WebCore/workers/DedicatedWorkerContext.cpp | 101 + .../WebCore/workers/DedicatedWorkerContext.h | 64 + .../WebCore/workers/DedicatedWorkerContext.idl | 48 + src/3rdparty/webkit/WebCore/workers/Worker.cpp | 86 +- src/3rdparty/webkit/WebCore/workers/Worker.h | 29 +- src/3rdparty/webkit/WebCore/workers/Worker.idl | 18 +- .../webkit/WebCore/workers/WorkerContext.cpp | 45 +- .../webkit/WebCore/workers/WorkerContext.h | 23 +- .../webkit/WebCore/workers/WorkerContext.idl | 11 +- .../WebCore/workers/WorkerMessagingProxy.cpp | 14 +- .../webkit/WebCore/workers/WorkerMessagingProxy.h | 3 +- .../webkit/WebCore/workers/WorkerRunLoop.cpp | 2 +- .../webkit/WebCore/workers/WorkerScriptLoader.cpp | 65 +- .../webkit/WebCore/workers/WorkerScriptLoader.h | 20 +- .../webkit/WebCore/workers/WorkerThread.cpp | 6 +- .../webkit/WebCore/xml/XPathExpressionNode.h | 2 +- src/3rdparty/webkit/WebCore/xml/XPathGrammar.y | 4 + src/3rdparty/webkit/WebCore/xml/XPathParser.h | 2 +- src/3rdparty/webkit/WebCore/xml/XPathPredicate.h | 2 +- src/3rdparty/webkit/WebCore/xml/XPathStep.h | 2 +- src/3rdparty/webkit/WebKit.pri | 17 + src/3rdparty/webkit/WebKit/ChangeLog | 142 + src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp | 5 +- src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.h | 5 +- src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase_p.h | 3 +- src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp | 62 +- src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h | 91 +- src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp | 90 +- src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h | 12 +- src/3rdparty/webkit/WebKit/qt/Api/qwebframe_p.h | 18 +- src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp | 2 +- src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h | 11 +- src/3rdparty/webkit/WebKit/qt/Api/qwebhistory_p.h | 6 +- .../webkit/WebKit/qt/Api/qwebhistoryinterface.cpp | 14 +- .../webkit/WebKit/qt/Api/qwebhistoryinterface.h | 3 +- src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 100 +- src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h | 4 +- src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h | 10 +- .../webkit/WebKit/qt/Api/qwebpluginfactory.h | 17 +- .../webkit/WebKit/qt/Api/qwebsecurityorigin.h | 3 +- .../webkit/WebKit/qt/Api/qwebsecurityorigin_p.h | 3 +- src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp | 64 +- src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h | 6 +- src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp | 20 +- src/3rdparty/webkit/WebKit/qt/Api/qwebview.h | 51 +- src/3rdparty/webkit/WebKit/qt/ChangeLog | 519 ++ .../WebKit/qt/WebCoreSupport/ChromeClientQt.cpp | 15 +- .../WebKit/qt/WebCoreSupport/ChromeClientQt.h | 5 +- .../qt/WebCoreSupport/FrameLoaderClientQt.cpp | 2 +- src/3rdparty/webkit/WebKit/qt/WebKit_pch.h | 3 - src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc | 28 +- .../webkit/WebKit/qt/docs/qtwebkit.qdocconf | 1 + .../webkit/WebKit/qt/docs/qwebview-diagram.png | Bin 0 -> 9036 bytes .../qt/tests/benchmarks/loading/tst_loading.cpp | 105 + .../qt/tests/benchmarks/loading/tst_loading.pro | 6 + .../qt/tests/benchmarks/painting/tst_painting.cpp | 109 + .../qt/tests/benchmarks/painting/tst_painting.pro | 6 + .../webkit/WebKit/qt/tests/qwebframe/qwebframe.qrc | 2 + .../webkit/WebKit/qt/tests/qwebframe/test1.html | 1 + .../webkit/WebKit/qt/tests/qwebframe/test2.html | 1 + .../WebKit/qt/tests/qwebframe/tst_qwebframe.cpp | 178 +- .../WebKit/qt/tests/qwebpage/tst_qwebpage.cpp | 26 + src/3rdparty/webkit/WebKit/qt/tests/tests.pro | 1 + 1379 files changed, 41339 insertions(+), 19914 deletions(-) create mode 100644 src/3rdparty/webkit/JavaScriptCore/assembler/ARMAssembler.cpp create mode 100644 src/3rdparty/webkit/JavaScriptCore/assembler/ARMAssembler.h create mode 100644 src/3rdparty/webkit/JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h create mode 100644 src/3rdparty/webkit/JavaScriptCore/assembler/LinkBuffer.h create mode 100644 src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerARM.h create mode 100644 src/3rdparty/webkit/JavaScriptCore/assembler/RepatchBuffer.h create mode 100644 src/3rdparty/webkit/JavaScriptCore/jsc.pro create mode 100644 src/3rdparty/webkit/JavaScriptCore/wtf/wince/FastMallocWince.h create mode 100644 src/3rdparty/webkit/JavaScriptCore/wtf/wince/MemoryManager.cpp create mode 100644 src/3rdparty/webkit/JavaScriptCore/wtf/wince/MemoryManager.h create mode 100644 src/3rdparty/webkit/JavaScriptCore/wtf/wince/mt19937ar.c create mode 100644 src/3rdparty/webkit/WebCore/bindings/js/DOMObjectWithSVGContext.h create mode 100644 src/3rdparty/webkit/WebCore/bindings/js/JSDedicatedWorkerContextCustom.cpp create mode 100644 src/3rdparty/webkit/WebCore/bindings/js/JSInspectorBackendCustom.cpp delete mode 100644 src/3rdparty/webkit/WebCore/bindings/js/JSInspectorControllerCustom.cpp delete mode 100644 src/3rdparty/webkit/WebCore/bindings/js/JSRGBColor.cpp delete mode 100644 src/3rdparty/webkit/WebCore/bindings/js/JSRGBColor.h create mode 100644 src/3rdparty/webkit/WebCore/bindings/js/ScriptArray.cpp create mode 100644 src/3rdparty/webkit/WebCore/bindings/js/ScriptArray.h create mode 100644 src/3rdparty/webkit/WebCore/bindings/js/ScriptControllerHaiku.cpp create mode 100644 src/3rdparty/webkit/WebCore/bindings/js/ScriptSourceProvider.h create mode 100644 src/3rdparty/webkit/WebCore/css/RGBColor.cpp create mode 100644 src/3rdparty/webkit/WebCore/css/RGBColor.h create mode 100644 src/3rdparty/webkit/WebCore/dom/ErrorEvent.cpp create mode 100644 src/3rdparty/webkit/WebCore/dom/ErrorEvent.h create mode 100644 src/3rdparty/webkit/WebCore/dom/ErrorEvent.idl create mode 100644 src/3rdparty/webkit/WebCore/generated/JSAbstractWorker.cpp create mode 100644 src/3rdparty/webkit/WebCore/generated/JSAbstractWorker.h create mode 100644 src/3rdparty/webkit/WebCore/generated/JSDedicatedWorkerContext.cpp create mode 100644 src/3rdparty/webkit/WebCore/generated/JSDedicatedWorkerContext.h create mode 100644 src/3rdparty/webkit/WebCore/generated/JSErrorEvent.cpp create mode 100644 src/3rdparty/webkit/WebCore/generated/JSErrorEvent.h create mode 100644 src/3rdparty/webkit/WebCore/generated/JSInspectorBackend.cpp create mode 100644 src/3rdparty/webkit/WebCore/generated/JSInspectorBackend.h delete mode 100644 src/3rdparty/webkit/WebCore/generated/JSInspectorController.cpp delete mode 100644 src/3rdparty/webkit/WebCore/generated/JSInspectorController.h create mode 100644 src/3rdparty/webkit/WebCore/generated/JSRGBColor.cpp create mode 100644 src/3rdparty/webkit/WebCore/generated/JSRGBColor.h delete mode 100644 src/3rdparty/webkit/WebCore/generated/JSRGBColor.lut.h create mode 100644 src/3rdparty/webkit/WebCore/inspector/InspectorBackend.cpp create mode 100644 src/3rdparty/webkit/WebCore/inspector/InspectorBackend.h create mode 100644 src/3rdparty/webkit/WebCore/inspector/InspectorBackend.idl delete mode 100644 src/3rdparty/webkit/WebCore/inspector/InspectorController.idl create mode 100644 src/3rdparty/webkit/WebCore/loader/PlaceholderDocument.cpp create mode 100644 src/3rdparty/webkit/WebCore/loader/PlaceholderDocument.h create mode 100644 src/3rdparty/webkit/WebCore/plugins/PluginDebug.cpp create mode 100644 src/3rdparty/webkit/WebCore/rendering/RenderThemeWince.cpp create mode 100644 src/3rdparty/webkit/WebCore/rendering/RenderThemeWince.h create mode 100644 src/3rdparty/webkit/WebCore/workers/DedicatedWorkerContext.cpp create mode 100644 src/3rdparty/webkit/WebCore/workers/DedicatedWorkerContext.h create mode 100644 src/3rdparty/webkit/WebCore/workers/DedicatedWorkerContext.idl create mode 100644 src/3rdparty/webkit/WebKit/qt/docs/qwebview-diagram.png create mode 100644 src/3rdparty/webkit/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp create mode 100644 src/3rdparty/webkit/WebKit/qt/tests/benchmarks/loading/tst_loading.pro create mode 100644 src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp create mode 100644 src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/tst_painting.pro create mode 100644 src/3rdparty/webkit/WebKit/qt/tests/qwebframe/test1.html create mode 100644 src/3rdparty/webkit/WebKit/qt/tests/qwebframe/test2.html diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog index fa8e3ff6e..a08a7b485 100644 --- a/src/3rdparty/webkit/ChangeLog +++ b/src/3rdparty/webkit/ChangeLog @@ -1,3 +1,104 @@ +2009-07-28 Xan Lopez + + Reviewed by Gustavo Noronha. + + Use automake 1.11 SILENT_RULES when present, for cleaner build + output. You can disable it by passing --disable-silent-rules to + configure or V=1 to make. + + * autotools/dolt.m4: + * configure.ac: + +2009-07-28 Laszlo Gombos + + Reviewed by Simon Hausmann. + + [Qt] Disable some compiler warnings for the win build + https://bugs.webkit.org/show_bug.cgi?id=27709 + + * WebKit.pri: + +2009-07-28 Xan Lopez + + Reviewed by Gustavo Noronha. + + * configure.ac: bump version for 1.1.12 release. + +2009-07-24 Xan Lopez + + Reviewed by Gustavo Noronha. + + Remove unneeded commas from PKG_CHECK_MODULES. + + * configure.ac: + +2009-07-24 Jan Michael Alonzo + + Reviewed by Xan Lopez. + + Bump pango version requirement to 1.12 which is the version that + came with Gtk 2.10. + + * configure.ac: + +2009-07-21 Roland Steiner + + Reviewed by David Levin. + + Add ENABLE_RUBY to list of build options + https://bugs.webkit.org/show_bug.cgi?id=27324 + + * configure.ac: Added flag ENABLE_RUBY. + +2009-07-20 Laszlo Gombos + + Reviewed by Holger Freyther. + + [Qt] Add an option for QtLauncher to build without QtUiTools dependency + https://bugs.webkit.org/show_bug.cgi?id=27438 + + Based on Norbert Leser's work. + + * WebKit.pri: Symbian does not have UiTools + +2009-07-16 Fumitoshi Ukai + + Reviewed by David Levin. + + Add --web-sockets flag and ENABLE_WEB_SOCKETS define. + https://bugs.webkit.org/show_bug.cgi?id=27206 + + Add --enable-web-sockets in configure.ac + + * configure.ac: + +2009-07-16 Laszlo Gombos + + Reviewed by Simon Hausmann. + + [Qt] Enable GNU compiler extensions to the ARM compiler + for all Qt ports using RVCT + https://bugs.webkit.org/show_bug.cgi?id=27348 + + * WebKit.pri: + +2009-07-15 Tor Arne Vestbø + + Rubber-stamped by Simon Hausmann. + + Fix the Qt/Mac build by disabling TestNetscapePlugin + + We should fix and enable this once we run DRT for Qt/Mac + + * WebKit.pro: + +2009-07-13 Gustavo Noronha Silva + + Unreviewed build fix. Require the correct libsoup version now that + it's released. + + * configure.ac: + 2009-07-13 Laszlo Gombos Reviewed by Tor Arne Vestbø. diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSBase.cpp b/src/3rdparty/webkit/JavaScriptCore/API/JSBase.cpp index fc3d0fe1b..4a32d35bf 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/JSBase.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/API/JSBase.cpp @@ -96,7 +96,7 @@ void JSGarbageCollect(JSContextRef ctx) ExecState* exec = toJS(ctx); JSGlobalData& globalData = exec->globalData(); - JSLock lock(globalData.isSharedInstance); + JSLock lock(globalData.isSharedInstance ? LockForReal : SilenceAssertionsOnly); if (!globalData.heap.isBusy()) globalData.heap.collect(); diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSClassRef.h b/src/3rdparty/webkit/JavaScriptCore/API/JSClassRef.h index 4f6761845..c742d9620 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/JSClassRef.h +++ b/src/3rdparty/webkit/JavaScriptCore/API/JSClassRef.h @@ -34,7 +34,7 @@ #include #include -struct StaticValueEntry { +struct StaticValueEntry : FastAllocBase { StaticValueEntry(JSObjectGetPropertyCallback _getProperty, JSObjectSetPropertyCallback _setProperty, JSPropertyAttributes _attributes) : getProperty(_getProperty), setProperty(_setProperty), attributes(_attributes) { @@ -45,7 +45,7 @@ struct StaticValueEntry { JSPropertyAttributes attributes; }; -struct StaticFunctionEntry { +struct StaticFunctionEntry : FastAllocBase { StaticFunctionEntry(JSObjectCallAsFunctionCallback _callAsFunction, JSPropertyAttributes _attributes) : callAsFunction(_callAsFunction), attributes(_attributes) { diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp b/src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp index a3bdc69ab..c358a8426 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp @@ -70,7 +70,7 @@ JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass) #else { #endif - JSLock lock(true); + JSLock lock(LockForReal); return JSGlobalContextCreateInGroup(toRef(&JSGlobalData::sharedInstance()), globalObjectClass); } #endif // PLATFORM(DARWIN) @@ -82,7 +82,7 @@ JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClass { initializeThreading(); - JSLock lock(true); + JSLock lock(LockForReal); RefPtr globalData = group ? PassRefPtr(toJS(group)) : JSGlobalData::create(); diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSObjectRef.cpp b/src/3rdparty/webkit/JavaScriptCore/API/JSObjectRef.cpp index 50ee6354f..87d36ec4f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/JSObjectRef.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/API/JSObjectRef.cpp @@ -449,7 +449,7 @@ JSObjectRef JSObjectCallAsConstructor(JSContextRef ctx, JSObjectRef object, size return result; } -struct OpaqueJSPropertyNameArray { +struct OpaqueJSPropertyNameArray : FastAllocBase { OpaqueJSPropertyNameArray(JSGlobalData* globalData) : refCount(0) , globalData(globalData) @@ -491,7 +491,7 @@ JSPropertyNameArrayRef JSPropertyNameArrayRetain(JSPropertyNameArrayRef array) void JSPropertyNameArrayRelease(JSPropertyNameArrayRef array) { if (--array->refCount == 0) { - JSLock lock(array->globalData->isSharedInstance); + JSLock lock(array->globalData->isSharedInstance ? LockForReal : SilenceAssertionsOnly); delete array; } } @@ -511,7 +511,7 @@ void JSPropertyNameAccumulatorAddName(JSPropertyNameAccumulatorRef array, JSStri PropertyNameArray* propertyNames = toJS(array); propertyNames->globalData()->heap.registerThread(); - JSLock lock(propertyNames->globalData()->isSharedInstance); + JSLock lock(propertyNames->globalData()->isSharedInstance ? LockForReal : SilenceAssertionsOnly); propertyNames->add(propertyName->identifier(propertyNames->globalData())); } diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog index cd46bf569..24fc7e78d 100644 --- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog +++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog @@ -1,3 +1,1290 @@ +2009-07-28 Xan Lopez + + Add new files, fixes distcheck. + + * GNUmakefile.am: + +2009-07-28 Csaba Osztrogonac + + Reviewed by Simon Hausmann. + + [Qt] Determining whether to use JIT or interpreter + moved from JavaScriptCore.pri to Platform.h + + * JavaScriptCore.pri: + * wtf/Platform.h: + +2009-07-27 Brian Weinstein + + Fix of misuse of sort command. + + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def: + +2009-07-27 Brian Weinstein + + Build fix for Windows. + + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def: + +2009-07-27 Gavin Barraclough + + Rubber stamped by Oliver Hunt. + + Fix tyop in JIT, renamed preverveReturnAddressAfterCall -> preserveReturnAddressAfterCall. + + * jit/JIT.cpp: + (JSC::JIT::privateCompile): + (JSC::JIT::privateCompileCTIMachineTrampolines): + * jit/JIT.h: + * jit/JITInlineMethods.h: + (JSC::JIT::preserveReturnAddressAfterCall): + * jit/JITPropertyAccess.cpp: + (JSC::JIT::privateCompilePutByIdTransition): + +2009-07-27 Alexey Proskuryakov + + Gtk build fix. + + * runtime/JSLock.cpp: (JSC::JSLock::JSLock): Fix "no threading" case. + +2009-07-27 Alexey Proskuryakov + + Release build fix. + + * runtime/JSLock.h: (JSC::JSLock::~JSLock): + +2009-07-27 Alexey Proskuryakov + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=27735 + Give a helpful name to JSLock constructor argument + + * API/JSBase.cpp: + (JSGarbageCollect): + * API/JSContextRef.cpp: + * API/JSObjectRef.cpp: + (JSPropertyNameArrayRelease): + (JSPropertyNameAccumulatorAddName): + * JavaScriptCore.exp: + * jsc.cpp: + (functionGC): + (cleanupGlobalData): + (jscmain): + * runtime/Collector.cpp: + (JSC::Heap::destroy): + * runtime/JSLock.cpp: + (JSC::JSLock::JSLock): + (JSC::JSLock::lock): + (JSC::JSLock::unlock): + (JSC::JSLock::DropAllLocks::DropAllLocks): + (JSC::JSLock::DropAllLocks::~DropAllLocks): + * runtime/JSLock.h: + (JSC::): + (JSC::JSLock::JSLock): + (JSC::JSLock::~JSLock): + +2009-07-25 Zoltan Horvath + + Reviewed by Eric Seidel. + + Allow custom memory allocation control for OpaqueJSPropertyNameArray struct + https://bugs.webkit.org/show_bug.cgi?id=27342 + + Inherits OpaqueJSPropertyNameArray struct from FastAllocBase because it has been + instantiated by 'new' JavaScriptCore/API/JSObjectRef.cpp:473. + + * API/JSObjectRef.cpp: + +2009-07-24 Ada Chan + + In preparation for https://bugs.webkit.org/show_bug.cgi?id=27236: + Remove TCMALLOC_TRACK_DECOMMITED_SPANS. We'll always track decommitted spans. + We have tested this and show it has little impact on performance. + + Reviewed by Mark Rowe. + + * wtf/FastMalloc.cpp: + (WTF::TCMalloc_PageHeap::New): + (WTF::TCMalloc_PageHeap::AllocLarge): + (WTF::propagateDecommittedState): + (WTF::mergeDecommittedStates): + (WTF::TCMalloc_PageHeap::Delete): + (WTF::TCMalloc_PageHeap::IncrementalScavenge): + +2009-07-24 Csaba Osztrogonac + + Reviewed by Darin Adler and Adam Barth. + + Build fix for x86 platforms. + https://bugs.webkit.org/show_bug.cgi?id=27602 + + * jit/JIT.cpp: + +2009-07-23 Kevin Ollivier + + wx build fix, adding missing header. + + * jit/JIT.cpp: + +2009-07-22 Yong Li + + Reviewed by George Staikos. + + Add wince specific memory files into wtf/wince + https://bugs.webkit.org/show_bug.cgi?id=27550 + + * wtf/wince/FastMallocWince.h: Added. + * wtf/wince/MemoryManager.cpp: Added. + * wtf/wince/MemoryManager.h: Added. + +2009-07-23 Norbert Leser + + Reviewed by Simon Hausmann. + + Fix for missing mmap features in Symbian + https://bugs.webkit.org/show_bug.cgi?id=24540 + + Fix, conditionally for PLATFORM(SYMBIAN), as an alternative + to missing support for the MAP_ANON property flag in mmap. + It utilizes Symbian specific memory allocation features. + + * runtime/Collector.cpp + +2009-07-22 Gavin Barraclough + + Reviewed by Sam Weinig. + + With ENABLE(ASSEMBLER_WX_EXCLUSIVE), only change permissions once per repatch event. + ( https://bugs.webkit.org/show_bug.cgi?id=27564 ) + + Currently we change permissions forwards and backwards for each instruction modified, + instead we should only change permissions once per complete repatching event. + + 2.5% progression running with ENABLE(ASSEMBLER_WX_EXCLUSIVE) enabled, + which recoups 1/3 of the penalty of running with this mode enabled. + + * assembler/ARMAssembler.cpp: + (JSC::ARMAssembler::linkBranch): + - Replace usage of MakeWritable with cacheFlush. + + * assembler/ARMAssembler.h: + (JSC::ARMAssembler::patchPointerInternal): + (JSC::ARMAssembler::repatchLoadPtrToLEA): + - Replace usage of MakeWritable with cacheFlush. + + * assembler/ARMv7Assembler.h: + (JSC::ARMv7Assembler::relinkJump): + (JSC::ARMv7Assembler::relinkCall): + (JSC::ARMv7Assembler::repatchInt32): + (JSC::ARMv7Assembler::repatchPointer): + (JSC::ARMv7Assembler::repatchLoadPtrToLEA): + (JSC::ARMv7Assembler::setInt32): + - Replace usage of MakeWritable with cacheFlush. + + * assembler/LinkBuffer.h: + (JSC::LinkBuffer::performFinalization): + - Make explicit call to cacheFlush. + + * assembler/MacroAssemblerCodeRef.h: + (JSC::MacroAssemblerCodeRef::MacroAssemblerCodeRef): + - Make size always available. + + * assembler/RepatchBuffer.h: + (JSC::RepatchBuffer::RepatchBuffer): + (JSC::RepatchBuffer::~RepatchBuffer): + - Add calls to MakeWritable & makeExecutable. + + * assembler/X86Assembler.h: + (JSC::X86Assembler::relinkJump): + (JSC::X86Assembler::relinkCall): + (JSC::X86Assembler::repatchInt32): + (JSC::X86Assembler::repatchPointer): + (JSC::X86Assembler::repatchLoadPtrToLEA): + - Remove usage of MakeWritable. + + * bytecode/CodeBlock.h: + (JSC::CodeBlock::getJITCode): + - Provide access to CodeBlock's JITCode. + + * jit/ExecutableAllocator.h: + (JSC::ExecutableAllocator::makeExecutable): + (JSC::ExecutableAllocator::cacheFlush): + - Remove MakeWritable, make cacheFlush public. + + * jit/JIT.cpp: + (JSC::ctiPatchNearCallByReturnAddress): + (JSC::ctiPatchCallByReturnAddress): + (JSC::JIT::privateCompile): + (JSC::JIT::unlinkCall): + (JSC::JIT::linkCall): + - Add CodeBlock argument to RepatchBuffer. + + * jit/JIT.h: + - Pass CodeBlock argument for use by RepatchBuffer. + + * jit/JITCode.h: + (JSC::JITCode::start): + (JSC::JITCode::size): + - Provide access to code start & size. + + * jit/JITPropertyAccess.cpp: + (JSC::JIT::privateCompilePutByIdTransition): + (JSC::JIT::patchGetByIdSelf): + (JSC::JIT::patchMethodCallProto): + (JSC::JIT::patchPutByIdReplace): + (JSC::JIT::privateCompilePatchGetArrayLength): + (JSC::JIT::privateCompileGetByIdProto): + (JSC::JIT::privateCompileGetByIdSelfList): + (JSC::JIT::privateCompileGetByIdProtoList): + (JSC::JIT::privateCompileGetByIdChainList): + (JSC::JIT::privateCompileGetByIdChain): + - Add CodeBlock argument to RepatchBuffer. + + * jit/JITStubs.cpp: + (JSC::JITThunks::tryCachePutByID): + (JSC::JITThunks::tryCacheGetByID): + (JSC::JITStubs::DEFINE_STUB_FUNCTION): + - Pass CodeBlock argument for use by RepatchBuffer. + +2009-07-21 Zoltan Herczeg + + Reviewed by Gavin Barraclough. + + Cache not only the structure of the method, but the + structure of its prototype as well. + https://bugs.webkit.org/show_bug.cgi?id=27077 + + * bytecode/CodeBlock.cpp: + (JSC::CodeBlock::~CodeBlock): + * bytecode/CodeBlock.h: + (JSC::MethodCallLinkInfo::MethodCallLinkInfo): + * jit/JITPropertyAccess.cpp: + (JSC::JIT::patchMethodCallProto): + +2009-07-21 Gavin Barraclough + + Reviewed by Sam Weinig. + + Move call linking / repatching down from AbstractMacroAssembler into MacroAssemblerARCH classes. + ( https://bugs.webkit.org/show_bug.cgi?id=27527 ) + + This allows the implementation to be defined per architecture. Specifically this addresses the + fact that x86-64 MacroAssembler implements far calls as a load to register, followed by a call + to register. Patching the call actually requires the pointer load to be patched, rather than + the call to be patched. This is implementation detail specific to MacroAssemblerX86_64, and as + such is best handled there. + + * assembler/AbstractMacroAssembler.h: + * assembler/MacroAssemblerARM.h: + (JSC::MacroAssemblerARM::linkCall): + (JSC::MacroAssemblerARM::repatchCall): + * assembler/MacroAssemblerARMv7.h: + (JSC::MacroAssemblerARMv7::linkCall): + (JSC::MacroAssemblerARMv7::repatchCall): + * assembler/MacroAssemblerX86.h: + (JSC::MacroAssemblerX86::linkCall): + (JSC::MacroAssemblerX86::repatchCall): + * assembler/MacroAssemblerX86_64.h: + (JSC::MacroAssemblerX86_64::linkCall): + (JSC::MacroAssemblerX86_64::repatchCall): + +2009-07-21 Adam Treat + + Reviewed by George Staikos. + + Every wtf file includes other wtf files with <> style includes + except this one. Fix the exception. + + * wtf/ByteArray.h: + +2009-07-21 Gavin Barraclough + + Reviewed by Oliver Hunt. + + Move LinkBuffer/RepatchBuffer out of AbstractMacroAssembler. + ( https://bugs.webkit.org/show_bug.cgi?id=27485 ) + + This change is the first step in a process to move code that should be in + the architecture-specific MacroAssembler classes up out of Assmbler and + AbstractMacroAssembler. + + * JavaScriptCore.xcodeproj/project.pbxproj: + - added new files + + * assembler/ARMAssembler.h: + (JSC::ARMAssembler::linkPointer): + - rename patchPointer to bring it in line with the current link/repatch naming scheme + + * assembler/ARMv7Assembler.h: + (JSC::ARMv7Assembler::linkCall): + (JSC::ARMv7Assembler::linkPointer): + (JSC::ARMv7Assembler::relinkCall): + (JSC::ARMv7Assembler::repatchInt32): + (JSC::ARMv7Assembler::repatchPointer): + (JSC::ARMv7Assembler::setInt32): + (JSC::ARMv7Assembler::setPointer): + - rename patchPointer to bring it in line with the current link/repatch naming scheme + + * assembler/AbstractMacroAssembler.h: + (JSC::AbstractMacroAssembler::linkJump): + (JSC::AbstractMacroAssembler::linkCall): + (JSC::AbstractMacroAssembler::linkPointer): + (JSC::AbstractMacroAssembler::getLinkerAddress): + (JSC::AbstractMacroAssembler::getLinkerCallReturnOffset): + (JSC::AbstractMacroAssembler::repatchJump): + (JSC::AbstractMacroAssembler::repatchCall): + (JSC::AbstractMacroAssembler::repatchNearCall): + (JSC::AbstractMacroAssembler::repatchInt32): + (JSC::AbstractMacroAssembler::repatchPointer): + (JSC::AbstractMacroAssembler::repatchLoadPtrToLEA): + - remove the LinkBuffer/RepatchBuffer classes, but leave a set of (private, friended) methods to interface to the Assembler + + * assembler/LinkBuffer.h: Added. + (JSC::LinkBuffer::LinkBuffer): + (JSC::LinkBuffer::~LinkBuffer): + (JSC::LinkBuffer::link): + (JSC::LinkBuffer::patch): + (JSC::LinkBuffer::locationOf): + (JSC::LinkBuffer::locationOfNearCall): + (JSC::LinkBuffer::returnAddressOffset): + (JSC::LinkBuffer::finalizeCode): + (JSC::LinkBuffer::finalizeCodeAddendum): + (JSC::LinkBuffer::code): + (JSC::LinkBuffer::performFinalization): + - new file containing the LinkBuffer class, previously a member of AbstractMacroAssembler + + * assembler/RepatchBuffer.h: Added. + (JSC::RepatchBuffer::RepatchBuffer): + (JSC::RepatchBuffer::relink): + (JSC::RepatchBuffer::repatch): + (JSC::RepatchBuffer::repatchLoadPtrToLEA): + (JSC::RepatchBuffer::relinkCallerToTrampoline): + (JSC::RepatchBuffer::relinkCallerToFunction): + (JSC::RepatchBuffer::relinkNearCallerToTrampoline): + - new file containing the RepatchBuffer class, previously a member of AbstractMacroAssembler + + * assembler/X86Assembler.h: + (JSC::X86Assembler::linkJump): + (JSC::X86Assembler::linkCall): + (JSC::X86Assembler::linkPointerForCall): + (JSC::X86Assembler::linkPointer): + (JSC::X86Assembler::relinkJump): + (JSC::X86Assembler::relinkCall): + (JSC::X86Assembler::repatchInt32): + (JSC::X86Assembler::repatchPointer): + (JSC::X86Assembler::setPointer): + (JSC::X86Assembler::setInt32): + (JSC::X86Assembler::setRel32): + - rename patchPointer to bring it in line with the current link/repatch naming scheme + + * jit/JIT.cpp: + (JSC::ctiPatchNearCallByReturnAddress): + (JSC::ctiPatchCallByReturnAddress): + - include new headers + - remove MacroAssembler:: specification from RepatchBuffer usage + + * jit/JITPropertyAccess.cpp: + * yarr/RegexJIT.cpp: + - include new headers + +2009-07-21 Robert Agoston + + Reviewed by David Levin. + + Fixed #undef typo. + https://bugs.webkit.org/show_bug.cgi?id=27506 + + * bytecode/Opcode.h: + +2009-07-21 Adam Roben + + Roll out r46153, r46154, and r46155 + + These changes were causing build failures and assertion failures on + Windows. + + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def: + * JavaScriptCore.xcodeproj/project.pbxproj: + * runtime/JSArray.cpp: + * runtime/StringPrototype.cpp: + * runtime/UString.cpp: + * runtime/UString.h: + * wtf/FastMalloc.cpp: + * wtf/FastMalloc.h: + * wtf/Platform.h: + * wtf/PossiblyNull.h: Removed. + +2009-07-21 Roland Steiner + + Reviewed by David Levin. + + Add ENABLE_RUBY to list of build options + https://bugs.webkit.org/show_bug.cgi?id=27324 + + * Configurations/FeatureDefines.xcconfig: Added flag ENABLE_RUBY. + +2009-07-20 Oliver Hunt + + Reviewed by NOBODY (Build fix). + + Build fix attempt #2 + + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def: + +2009-07-20 Oliver Hunt + + Reviewed by NOBODY (Build fix). + + Build fix attempt #1 + + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def: + +2009-07-20 Oliver Hunt + + Reviewed by Gavin Barraclough. + + Make it harder to misuse try* allocation routines + https://bugs.webkit.org/show_bug.cgi?id=27469 + + Jump through a few hoops to make it much harder to accidentally + miss null-checking of values returned by the try-* allocation + routines. + + * JavaScriptCore.xcodeproj/project.pbxproj: + * runtime/JSArray.cpp: + (JSC::JSArray::putSlowCase): + (JSC::JSArray::increaseVectorLength): + * runtime/StringPrototype.cpp: + (JSC::stringProtoFuncFontsize): + (JSC::stringProtoFuncLink): + * runtime/UString.cpp: + (JSC::allocChars): + (JSC::reallocChars): + (JSC::expandCapacity): + (JSC::UString::Rep::reserveCapacity): + (JSC::UString::expandPreCapacity): + (JSC::createRep): + (JSC::concatenate): + (JSC::UString::spliceSubstringsWithSeparators): + (JSC::UString::replaceRange): + (JSC::UString::append): + (JSC::UString::operator=): + * runtime/UString.h: + (JSC::UString::Rep::createEmptyBuffer): + * wtf/FastMalloc.cpp: + (WTF::tryFastZeroedMalloc): + (WTF::tryFastMalloc): + (WTF::tryFastCalloc): + (WTF::tryFastRealloc): + (WTF::TCMallocStats::tryFastMalloc): + (WTF::TCMallocStats::tryFastCalloc): + (WTF::TCMallocStats::tryFastRealloc): + * wtf/FastMalloc.h: + (WTF::TryMallocReturnValue::TryMallocReturnValue): + (WTF::TryMallocReturnValue::~TryMallocReturnValue): + (WTF::TryMallocReturnValue::operator Maybe): + (WTF::TryMallocReturnValue::getValue): + * wtf/PossiblyNull.h: + (WTF::PossiblyNull::PossiblyNull): + (WTF::PossiblyNull::~PossiblyNull): + (WTF::PossiblyNull::getValue): + * wtf/Platform.h: + +2009-07-20 Gavin Barraclough + + RS Oliver Hunt. + + Add ARM assembler files to xcodeproj, for convenience editing. + + * JavaScriptCore.xcodeproj/project.pbxproj: + +2009-07-20 Jessie Berlin + + Reviewed by David Levin. + + Fix an incorrect assertion in Vector::remove. + + https://bugs.webkit.org/show_bug.cgi?id=27477 + + * wtf/Vector.h: + (WTF::::remove): + Assert that the position at which to start removing elements + the + length (the number of elements to remove) is less than or equal to the + size of the entire Vector. + +2009-07-20 Peter Kasting + + Reviewed by Mark Rowe. + + https://bugs.webkit.org/show_bug.cgi?id=27468 + Back out r46060, which caused problems for some Apple developers. + + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops: + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj: + * JavaScriptCore.vcproj/WTF/WTFCommon.vsprops: + * JavaScriptCore.vcproj/jsc/jscCommon.vsprops: + * JavaScriptCore.vcproj/testapi/testapiCommon.vsprops: + +2009-07-20 Zoltan Horvath + + Reviewed by Oliver Hunt. + + Allow custom memory allocation control in NewThreadContext + https://bugs.webkit.org/show_bug.cgi?id=27338 + + Inherits NewThreadContext struct from FastAllocBase because it + has been instantiated by 'new' JavaScriptCore/wtf/Threading.cpp:76. + + * wtf/Threading.cpp: + +2009-07-20 Zoltan Horvath + + Reviewed by Oliver Hunt. + + Allow custom memory allocation control in JavaScriptCore's JSClassRef.h + https://bugs.webkit.org/show_bug.cgi?id=27340 + + Inherit StaticValueEntry and StaticFunctionEntry struct from FastAllocBase because these + have been instantiated by 'new' in JavaScriptCore/API/JSClassRef.cpp:153 + and in JavaScriptCore/API/JSClassRef.cpp:166. + + * API/JSClassRef.h: + +2009-07-20 Zoltan Horvath + + Reviewed by Darin Adler. + + Allow custom memory allocation control in JavaScriptCore's RegexPattern.h + https://bugs.webkit.org/show_bug.cgi?id=27343 + + Inherits RegexPattern.h's structs (which have been instantiated by operator new) from FastAllocBase: + + CharacterClass (new call: JavaScriptCore/yarr/RegexCompiler.cpp:144) + PatternAlternative (new call: JavaScriptCore/yarr/RegexPattern.h:221) + PatternDisjunction (new call: JavaScriptCore/yarr/RegexCompiler.cpp:446) + + * yarr/RegexPattern.h: + +2009-07-20 Zoltan Horvath + + Reviewed by Darin Adler. + + Allow custom memory allocation control for JavaScriptCore's MatchFrame struct + https://bugs.webkit.org/show_bug.cgi?id=27344 + + Inherits MatchFrame struct from FastAllocBase because it has + been instantiated by 'new' JavaScriptCore/pcre/pcre_exec.cpp:359. + + * pcre/pcre_exec.cpp: + +2009-07-20 Laszlo Gombos + + Reviewed by Holger Freyther. + + Remove some outdated S60 platform specific code + https://bugs.webkit.org/show_bug.cgi?id=27423 + + * wtf/Platform.h: + +2009-07-20 Csaba Osztrogonac + + Reviewed by Simon Hausmann. + + Qt build fix with MSVC and MinGW. + + * jsc.pro: Make sure jsc is a console application, and turn off + exceptions and stl support to fix the build. + +2009-07-20 Xan Lopez + + Reviewed by Gustavo Noronha. + + Do not use C++-style comments in preprocessor directives. + + GCC does not like this in some configurations, using C-style + comments is safer. + + * wtf/Platform.h: + +2009-07-17 Peter Kasting + + Reviewed by Steve Falkenburg. + + https://bugs.webkit.org/show_bug.cgi?id=27323 + Only add Cygwin to the path when it isn't already there. This avoids + causing problems for people who purposefully have non-Cygwin versions of + executables like svn in front of the Cygwin ones in their paths. + + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops: + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj: + * JavaScriptCore.vcproj/WTF/WTFCommon.vsprops: + * JavaScriptCore.vcproj/jsc/jscCommon.vsprops: + * JavaScriptCore.vcproj/testapi/testapiCommon.vsprops: + +2009-07-17 Gabor Loki + + Reviewed by Gavin Barraclough. + + Add YARR support for generic ARM platforms (disabled by default). + https://bugs.webkit.org/show_bug.cgi?id=24986 + + Add generic ARM port for MacroAssembler. It supports the whole + MacroAssembler functionality except floating point. + + The class JmpSrc is extended with a flag which enables to patch + the jump destination offset during execution. This feature is + required for generic ARM port. + + Signed off by Zoltan Herczeg + Signed off by Gabor Loki + + * JavaScriptCore.pri: + * assembler/ARMAssembler.cpp: Added. + (JSC::ARMAssembler::getLdrImmAddress): + (JSC::ARMAssembler::linkBranch): + (JSC::ARMAssembler::patchConstantPoolLoad): + (JSC::ARMAssembler::getOp2): + (JSC::ARMAssembler::genInt): + (JSC::ARMAssembler::getImm): + (JSC::ARMAssembler::moveImm): + (JSC::ARMAssembler::dataTransfer32): + (JSC::ARMAssembler::baseIndexTransfer32): + (JSC::ARMAssembler::executableCopy): + * assembler/ARMAssembler.h: Added. + (JSC::ARM::): + (JSC::ARMAssembler::ARMAssembler): + (JSC::ARMAssembler::): + (JSC::ARMAssembler::JmpSrc::JmpSrc): + (JSC::ARMAssembler::JmpSrc::enableLatePatch): + (JSC::ARMAssembler::JmpDst::JmpDst): + (JSC::ARMAssembler::JmpDst::isUsed): + (JSC::ARMAssembler::JmpDst::used): + (JSC::ARMAssembler::emitInst): + (JSC::ARMAssembler::and_r): + (JSC::ARMAssembler::ands_r): + (JSC::ARMAssembler::eor_r): + (JSC::ARMAssembler::eors_r): + (JSC::ARMAssembler::sub_r): + (JSC::ARMAssembler::subs_r): + (JSC::ARMAssembler::rsb_r): + (JSC::ARMAssembler::rsbs_r): + (JSC::ARMAssembler::add_r): + (JSC::ARMAssembler::adds_r): + (JSC::ARMAssembler::adc_r): + (JSC::ARMAssembler::adcs_r): + (JSC::ARMAssembler::sbc_r): + (JSC::ARMAssembler::sbcs_r): + (JSC::ARMAssembler::rsc_r): + (JSC::ARMAssembler::rscs_r): + (JSC::ARMAssembler::tst_r): + (JSC::ARMAssembler::teq_r): + (JSC::ARMAssembler::cmp_r): + (JSC::ARMAssembler::orr_r): + (JSC::ARMAssembler::orrs_r): + (JSC::ARMAssembler::mov_r): + (JSC::ARMAssembler::movs_r): + (JSC::ARMAssembler::bic_r): + (JSC::ARMAssembler::bics_r): + (JSC::ARMAssembler::mvn_r): + (JSC::ARMAssembler::mvns_r): + (JSC::ARMAssembler::mul_r): + (JSC::ARMAssembler::muls_r): + (JSC::ARMAssembler::mull_r): + (JSC::ARMAssembler::ldr_imm): + (JSC::ARMAssembler::ldr_un_imm): + (JSC::ARMAssembler::dtr_u): + (JSC::ARMAssembler::dtr_ur): + (JSC::ARMAssembler::dtr_d): + (JSC::ARMAssembler::dtr_dr): + (JSC::ARMAssembler::ldrh_r): + (JSC::ARMAssembler::ldrh_d): + (JSC::ARMAssembler::ldrh_u): + (JSC::ARMAssembler::strh_r): + (JSC::ARMAssembler::push_r): + (JSC::ARMAssembler::pop_r): + (JSC::ARMAssembler::poke_r): + (JSC::ARMAssembler::peek_r): + (JSC::ARMAssembler::clz_r): + (JSC::ARMAssembler::bkpt): + (JSC::ARMAssembler::lsl): + (JSC::ARMAssembler::lsr): + (JSC::ARMAssembler::asr): + (JSC::ARMAssembler::lsl_r): + (JSC::ARMAssembler::lsr_r): + (JSC::ARMAssembler::asr_r): + (JSC::ARMAssembler::size): + (JSC::ARMAssembler::ensureSpace): + (JSC::ARMAssembler::label): + (JSC::ARMAssembler::align): + (JSC::ARMAssembler::jmp): + (JSC::ARMAssembler::patchPointerInternal): + (JSC::ARMAssembler::patchConstantPoolLoad): + (JSC::ARMAssembler::patchPointer): + (JSC::ARMAssembler::repatchInt32): + (JSC::ARMAssembler::repatchPointer): + (JSC::ARMAssembler::repatchLoadPtrToLEA): + (JSC::ARMAssembler::linkJump): + (JSC::ARMAssembler::relinkJump): + (JSC::ARMAssembler::linkCall): + (JSC::ARMAssembler::relinkCall): + (JSC::ARMAssembler::getRelocatedAddress): + (JSC::ARMAssembler::getDifferenceBetweenLabels): + (JSC::ARMAssembler::getCallReturnOffset): + (JSC::ARMAssembler::getOp2Byte): + (JSC::ARMAssembler::placeConstantPoolBarrier): + (JSC::ARMAssembler::RM): + (JSC::ARMAssembler::RS): + (JSC::ARMAssembler::RD): + (JSC::ARMAssembler::RN): + (JSC::ARMAssembler::getConditionalField): + * assembler/ARMv7Assembler.h: + (JSC::ARMv7Assembler::JmpSrc::enableLatePatch): + * assembler/AbstractMacroAssembler.h: + (JSC::AbstractMacroAssembler::Call::enableLatePatch): + (JSC::AbstractMacroAssembler::Jump::enableLatePatch): + * assembler/MacroAssembler.h: + * assembler/MacroAssemblerARM.h: Added. + (JSC::MacroAssemblerARM::): + (JSC::MacroAssemblerARM::add32): + (JSC::MacroAssemblerARM::and32): + (JSC::MacroAssemblerARM::lshift32): + (JSC::MacroAssemblerARM::mul32): + (JSC::MacroAssemblerARM::not32): + (JSC::MacroAssemblerARM::or32): + (JSC::MacroAssemblerARM::rshift32): + (JSC::MacroAssemblerARM::sub32): + (JSC::MacroAssemblerARM::xor32): + (JSC::MacroAssemblerARM::load32): + (JSC::MacroAssemblerARM::load32WithAddressOffsetPatch): + (JSC::MacroAssemblerARM::loadPtrWithPatchToLEA): + (JSC::MacroAssemblerARM::load16): + (JSC::MacroAssemblerARM::store32WithAddressOffsetPatch): + (JSC::MacroAssemblerARM::store32): + (JSC::MacroAssemblerARM::pop): + (JSC::MacroAssemblerARM::push): + (JSC::MacroAssemblerARM::move): + (JSC::MacroAssemblerARM::swap): + (JSC::MacroAssemblerARM::signExtend32ToPtr): + (JSC::MacroAssemblerARM::zeroExtend32ToPtr): + (JSC::MacroAssemblerARM::branch32): + (JSC::MacroAssemblerARM::branch16): + (JSC::MacroAssemblerARM::branchTest32): + (JSC::MacroAssemblerARM::jump): + (JSC::MacroAssemblerARM::branchAdd32): + (JSC::MacroAssemblerARM::mull32): + (JSC::MacroAssemblerARM::branchMul32): + (JSC::MacroAssemblerARM::branchSub32): + (JSC::MacroAssemblerARM::breakpoint): + (JSC::MacroAssemblerARM::nearCall): + (JSC::MacroAssemblerARM::call): + (JSC::MacroAssemblerARM::ret): + (JSC::MacroAssemblerARM::set32): + (JSC::MacroAssemblerARM::setTest32): + (JSC::MacroAssemblerARM::tailRecursiveCall): + (JSC::MacroAssemblerARM::makeTailRecursiveCall): + (JSC::MacroAssemblerARM::moveWithPatch): + (JSC::MacroAssemblerARM::branchPtrWithPatch): + (JSC::MacroAssemblerARM::storePtrWithPatch): + (JSC::MacroAssemblerARM::supportsFloatingPoint): + (JSC::MacroAssemblerARM::supportsFloatingPointTruncate): + (JSC::MacroAssemblerARM::loadDouble): + (JSC::MacroAssemblerARM::storeDouble): + (JSC::MacroAssemblerARM::addDouble): + (JSC::MacroAssemblerARM::subDouble): + (JSC::MacroAssemblerARM::mulDouble): + (JSC::MacroAssemblerARM::convertInt32ToDouble): + (JSC::MacroAssemblerARM::branchDouble): + (JSC::MacroAssemblerARM::branchTruncateDoubleToInt32): + (JSC::MacroAssemblerARM::ARMCondition): + (JSC::MacroAssemblerARM::prepareCall): + (JSC::MacroAssemblerARM::call32): + * assembler/X86Assembler.h: + (JSC::X86Assembler::JmpSrc::enableLatePatch): + * jit/ExecutableAllocator.h: + (JSC::ExecutableAllocator::cacheFlush): + * wtf/Platform.h: + * yarr/RegexJIT.cpp: + (JSC::Yarr::RegexGenerator::generateEnter): + (JSC::Yarr::RegexGenerator::generateReturn): + +2009-07-17 Gabor Loki + + Reviewed by Gavin Barraclough. + + Extend AssemblerBuffer with constant pool handling mechanism. + https://bugs.webkit.org/show_bug.cgi?id=24986 + + Add a platform independed constant pool framework. + This pool can store 32 or 64 bits values which is enough to hold + any integer, pointer or double constant. + + * assembler/AssemblerBuffer.h: + (JSC::AssemblerBuffer::putIntUnchecked): + (JSC::AssemblerBuffer::putInt64Unchecked): + (JSC::AssemblerBuffer::append): + (JSC::AssemblerBuffer::grow): + * assembler/AssemblerBufferWithConstantPool.h: Added. + (JSC::): + +2009-07-17 Eric Roman + + Reviewed by Darin Adler. + + Build fix for non-Darwin. + Add a guard for inclusion of RetainPtr.h which includes CoreFoundation.h + + https://bugs.webkit.org/show_bug.cgi?id=27382 + + * wtf/unicode/icu/CollatorICU.cpp: + +2009-07-17 Alexey Proskuryakov + + Reviewed by John Sullivan. + + Get user default collation order via a CFLocale API when available. + + * wtf/unicode/icu/CollatorICU.cpp: (WTF::Collator::userDefault): + +2009-07-17 Laszlo Gombos + + Reviewed by Simon Hausmann. + + [Qt] Fix the include path for the Symbian port + https://bugs.webkit.org/show_bug.cgi?id=27358 + + * JavaScriptCore.pri: + +2009-07-17 Csaba Osztrogonac + + Reviewed by David Levin. + + Build fix on platforms don't have MMAP. + https://bugs.webkit.org/show_bug.cgi?id=27365 + + * interpreter/RegisterFile.h: Including stdio.h irrespectively of HAVE(MMAP) + +2009-07-16 Fumitoshi Ukai + + Reviewed by David Levin. + + Add --web-sockets flag and ENABLE_WEB_SOCKETS define. + https://bugs.webkit.org/show_bug.cgi?id=27206 + + Add ENABLE_WEB_SOCKETS + + * Configurations/FeatureDefines.xcconfig: add ENABLE_WEB_SOCKETS + +2009-07-16 Maxime Simon + + Reviewed by Eric Seidel. + + Added Haiku-specific files for JavaScriptCore. + https://bugs.webkit.org/show_bug.cgi?id=26620 + + * wtf/haiku/MainThreadHaiku.cpp: Added. + (WTF::initializeMainThreadPlatform): + (WTF::scheduleDispatchFunctionsOnMainThread): + +2009-07-16 Gavin Barraclough + + RS by Oliver Hunt. + + Revert r45969, this fix does not appear to be valid. + https://bugs.webkit.org/show_bug.cgi?id=27077 + + * bytecode/CodeBlock.cpp: + (JSC::CodeBlock::~CodeBlock): + (JSC::CodeBlock::unlinkCallers): + * jit/JIT.cpp: + * jit/JIT.h: + +2009-07-16 Zoltan Horvath + + Reviewed by Oliver Hunt. + + Allow custom memory allocation control in ExceptionInfo and RareData struct + https://bugs.webkit.org/show_bug.cgi?id=27336 + + Inherits ExceptionInfo and RareData struct from FastAllocBase because these + have been instantiated by 'new' in JavaScriptCore/bytecode/CodeBlock.cpp:1289 and + in JavaScriptCore/bytecode/CodeBlock.h:453. + + Remove unnecessary WTF:: namespace from CodeBlock inheritance. + + * bytecode/CodeBlock.h: + +2009-07-16 Mark Rowe + + Rubber-stamped by Geoff Garen. + + Fix FeatureDefines.xcconfig to not be out of sync with the rest of the world. + + * Configurations/FeatureDefines.xcconfig: + +2009-07-16 Yong Li + + Reviewed by George Staikos. + + https://bugs.webkit.org/show_bug.cgi?id=27320 + _countof is only included in CE6; for CE5 we need to define it ourself + + * wtf/Platform.h: + +2009-07-16 Zoltan Herczeg + + Reviewed by Oliver Hunt. + + Workers + garbage collector: weird crashes + https://bugs.webkit.org/show_bug.cgi?id=27077 + + We need to unlink cached method call sites when a function is destroyed. + + * JavaScriptCore.xcodeproj/project.pbxproj: + * bytecode/CodeBlock.cpp: + (JSC::CodeBlock::~CodeBlock): + (JSC::CodeBlock::unlinkCallers): + * jit/JIT.cpp: + (JSC::JIT::unlinkMethodCall): + * jit/JIT.h: + +2009-07-15 Steve Falkenburg + + Windows Build fix. + + Visual Studio reset our intermediate directory on us. + This sets it back. + + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: + * JavaScriptCore.vcproj/testapi/testapi.vcproj: + +2009-07-15 Kwang Yul Seo + + Reviewed by Eric Seidel. + + https://bugs.webkit.org/show_bug.cgi?id=26794 + Make Yacc-generated parsers to use fastMalloc/fastFree. + + Define YYMALLOC and YYFREE to fastMalloc and fastFree + respectively. + + * parser/Grammar.y: + +2009-07-15 Darin Adler + + Fix a build for a particular Apple configuration. + + * wtf/FastAllocBase.h: Change include to use "" style for + including another wtf header. This is the style we use for + including other public headers in the same directory. + +2009-07-15 George Staikos + + Reviewed by Adam Treat. + + https://bugs.webkit.org/show_bug.cgi?id=27303 + Implement createThreadInternal for WinCE. + Contains changes by George Staikos and Joe Mason + + * wtf/ThreadingWin.cpp: + (WTF::createThreadInternal): + +2009-07-15 Joe Mason + + Reviewed by George Staikos. + + https://bugs.webkit.org/show_bug.cgi?id=27298 + Platform defines for WINCE. + Contains changes by Yong Li , + George Staikos and Joe Mason + + * wtf/Platform.h: + +2009-07-15 Yong Li + + Reviewed by Adam Treat. + + https://bugs.webkit.org/show_bug.cgi?id=27306 + Use RegisterClass instead of RegisterClassEx on WinCE. + + * wtf/win/MainThreadWin.cpp: + (WTF::initializeMainThreadPlatform): + +2009-07-15 Yong Li + + Reviewed by George Staikos. + + https://bugs.webkit.org/show_bug.cgi?id=27301 + Use OutputDebugStringW on WinCE since OutputDebugStringA is not supported + Originally written by Yong Li and refactored by + Joe Mason + + * wtf/Assertions.cpp: vprintf_stderr_common + +2009-07-15 Yong Li + + Reviewed by George Staikos. + + https://bugs.webkit.org/show_bug.cgi?id=27020 + msToGregorianDateTime should set utcOffset to 0 when outputIsUTC is false + + * wtf/DateMath.cpp: + (WTF::gregorianDateTimeToMS): + +2009-07-15 Laszlo Gombos + + Reviewed by Simon Hausmann. + + [Qt] Cleanup - Remove obsolete code from the make system + https://bugs.webkit.org/show_bug.cgi?id=27299 + + * JavaScriptCore.pro: + * jsc.pro: + +2009-07-07 Norbert Leser + + Reviewed by Simon Hausmann. + + https://bugs.webkit.org/show_bug.cgi?id=27056 + + Alternate bool operator for codewarrior compiler (WINSCW). + Compiler (latest b482) reports error for UnspecifiedBoolType construct: + "illegal explicit conversion from 'WTF::OwnArrayPtr' to 'bool'" + + Same fix as in r38391. + + * JavaScriptCore/wtf/OwnArrayPtr.h: + +2009-07-15 Norbert Leser + + Reviewed by Darin Adler. + + Qualify include path with wtf to fix compilation + on Symbian. + https://bugs.webkit.org/show_bug.cgi?id=27055 + + * interpreter/Interpreter.h: + +2009-07-15 Laszlo Gombos + + Reviewed by Dave Kilzer. + + Turn off non-portable date manipulations for SYMBIAN + https://bugs.webkit.org/show_bug.cgi?id=27064 + + Introduce HAVE(TM_GMTOFF), HAVE(TM_ZONE) and HAVE(TIMEGM) guards + and place the rules for controlling the guards in Platform.h. + Turn off these newly introduced guards for SYMBIAN. + + * wtf/DateMath.cpp: + (WTF::calculateUTCOffset): + * wtf/DateMath.h: + (WTF::GregorianDateTime::GregorianDateTime): + (WTF::GregorianDateTime::operator tm): + * wtf/Platform.h: + +2009-07-15 Norbert Leser + + Reviewed by Simon Hausmann. + + Undef ASSERT on Symbian, to avoid excessive warnings + https://bugs.webkit.org/show_bug.cgi?id=27052 + + * wtf/Assertions.h: + +2009-07-15 Oliver Hunt + + Reviewed by Simon Hausmann. + + REGRESSION: fast/js/postfix-syntax.html fails with interpreter + https://bugs.webkit.org/show_bug.cgi?id=27294 + + When postfix operators operating on locals assign to the same local + the order of operations has to be to store the incremented value, then + store the unmodified number. Rather than implementing this subtle + semantic in the interpreter I've just made the logic explicit in the + bytecode generator, so x=x++ effectively becomes x=ToNumber(x) (for a + local var x). + + * parser/Nodes.cpp: + (JSC::emitPostIncOrDec): + +2009-07-15 Oliver Hunt + + Reviewed by Simon Hausmann. + + REGRESSION(43559): fast/js/kde/arguments-scope.html fails with interpreter + https://bugs.webkit.org/show_bug.cgi?id=27259 + + The interpreter was incorrectly basing its need to create the arguments object + based on the presence of the callframe's argument reference rather than the local + arguments reference. Based on this it then overrode the local variable reference. + + * interpreter/Interpreter.cpp: + (JSC::Interpreter::privateExecute): + +2009-07-14 Steve Falkenburg + + Reorganize JavaScriptCore headers into: + API: include/JavaScriptCore/ + Private: include/private/JavaScriptCore/ + + Reviewed by Darin Adler. + + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops: + * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make: + * JavaScriptCore.vcproj/testapi/testapi.vcproj: + * JavaScriptCore.vcproj/testapi/testapiCommon.vsprops: + +2009-07-14 Zoltan Horvath + + Reviewed by Darin Adler. + + Change JSCell's superclass to NoncopyableCustomAllocated + https://bugs.webkit.org/show_bug.cgi?id=27248 + + JSCell class customizes operator new, since Noncopyable will be + inherited from FastAllocBase, NoncopyableCustomAllocated has + to be used. + + * runtime/JSCell.h: + +2009-07-14 Zoltan Horvath + + Reviewed by Darin Adler. + + Change all Noncopyable inheriting visibility to public. + https://bugs.webkit.org/show_bug.cgi?id=27225 + + Change all Noncopyable inheriting visibility to public because + it is needed to the custom allocation framework (bug #20422). + + * bytecode/SamplingTool.h: + * bytecompiler/RegisterID.h: + * interpreter/CachedCall.h: + * interpreter/RegisterFile.h: + * parser/Lexer.h: + * parser/Parser.h: + * runtime/ArgList.h: + * runtime/BatchedTransitionOptimizer.h: + * runtime/Collector.h: + * runtime/CommonIdentifiers.h: + * runtime/JSCell.h: + * runtime/JSGlobalObject.h: + * runtime/JSLock.h: + * runtime/JSONObject.cpp: + * runtime/SmallStrings.cpp: + * runtime/SmallStrings.h: + * wtf/CrossThreadRefCounted.h: + * wtf/GOwnPtr.h: + * wtf/Locker.h: + * wtf/MessageQueue.h: + * wtf/OwnArrayPtr.h: + * wtf/OwnFastMallocPtr.h: + * wtf/OwnPtr.h: + * wtf/RefCounted.h: + * wtf/ThreadSpecific.h: + * wtf/Threading.h: + * wtf/Vector.h: + * wtf/unicode/Collator.h: + +2009-07-14 Zoltan Horvath + + Reviewed by Darin Adler. + + Change ParserArenaRefCounted's superclass to RefCountedCustomAllocated + https://bugs.webkit.org/show_bug.cgi?id=27249 + + ParserArenaDeletable customizes operator new, to avoid double inheritance + ParserArenaDeletable's superclass has been changed to RefCountedCustomAllocated. + + * parser/Nodes.h: + +2009-07-14 Zoltan Horvath + + Reviewed by Darin Adler. + + Add RefCountedCustomAllocated to RefCounted.h + https://bugs.webkit.org/show_bug.cgi?id=27232 + + Some class which are inherited from RefCounted customize + operator new, but RefCounted is inherited from Noncopyable + which will be inherited from FastAllocBase. To avoid + conflicts Noncopyable inheriting was moved down to RefCounted + and to avoid double inheritance this class has been added. + + * wtf/RefCounted.h: + (WTF::RefCountedCustomAllocated::deref): + (WTF::RefCountedCustomAllocated::~RefCountedCustomAllocated): + +2009-07-14 Zoltan Horvath + + Reviewed by Darin Adler. + + Add NoncopyableCustomAllocated to Noncopyable.h. + https://bugs.webkit.org/show_bug.cgi?id=27228 + + Some classes which inherited from Noncopyable overrides operator new + since Noncopyable'll be inherited from FastAllocBase, Noncopyable.h + needs to be extended with this new class to support the overriding. + + * wtf/Noncopyable.h: + (WTFNoncopyable::NoncopyableCustomAllocated::NoncopyableCustomAllocated): + (WTFNoncopyable::NoncopyableCustomAllocated::~NoncopyableCustomAllocated): + +2009-07-14 Zoltan Horvath + + Reviewed by Darin Adler. + + Allow custom memory allocation control for JavaScriptCore's IdentifierTable class + https://bugs.webkit.org/show_bug.cgi?id=27260 + + Inherits IdentifierTable class from FastAllocBase because it has been + instantiated by 'new' in JavaScriptCore/runtime/Identifier.cpp:70. + + * runtime/Identifier.cpp: + +2009-07-14 Zoltan Horvath + + Reviewed by Darin Adler. + + Allow custom memory allocation control for JavaScriptCore's Profiler class + https://bugs.webkit.org/show_bug.cgi?id=27253 + + Inherits Profiler class from FastAllocBase because it has been instantiated by + 'new' in JavaScriptCore/profiler/Profiler.cpp:56. + + * profiler/Profiler.h: + +2009-07-06 George Staikos + + Reviewed by Adam Treat. + + Authors: George Staikos , Joe Mason , Makoto Matsumoto , Takuji Nishimura + + https://bugs.webkit.org/show_bug.cgi?id=27030 + Implement custom RNG for WinCE using Mersenne Twister + + * wtf/RandomNumber.cpp: + (WTF::randomNumber): + * wtf/RandomNumberSeed.h: + (WTF::initializeRandomNumberGenerator): + * wtf/wince/mt19937ar.c: Added. + (init_genrand): + (init_by_array): + (genrand_int32): + (genrand_int31): + (genrand_real1): + (genrand_real2): + (genrand_real3): + (genrand_res53): + 2009-07-13 Gustavo Noronha Silva Unreviewed make dist build fix. diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri index dbc467d2b..b43602ea4 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri @@ -9,24 +9,26 @@ CONFIG(debug, debug|release) { OBJECTS_DIR = obj/release } -INCLUDEPATH += $$GENERATED_SOURCES_DIR \ - $$PWD \ - $$PWD/parser \ - $$PWD/bytecompiler \ - $$PWD/debugger \ - $$PWD/runtime \ - $$PWD/wtf \ - $$PWD/wtf/unicode \ - $$PWD/interpreter \ - $$PWD/jit \ - $$PWD/profiler \ - $$PWD/wrec \ - $$PWD/yarr \ - $$PWD/API \ - $$PWD/.. \ - $$PWD/ForwardingHeaders \ - $$PWD/bytecode \ - $$PWD/assembler \ +INCLUDEPATH = \ + $$PWD \ + $$PWD/.. \ + $$PWD/assembler \ + $$PWD/bytecode \ + $$PWD/bytecompiler \ + $$PWD/debugger \ + $$PWD/interpreter \ + $$PWD/jit \ + $$PWD/parser \ + $$PWD/profiler \ + $$PWD/runtime \ + $$PWD/wrec \ + $$PWD/wtf \ + $$PWD/wtf/unicode \ + $$PWD/yarr \ + $$PWD/API \ + $$PWD/ForwardingHeaders \ + $$GENERATED_SOURCES_DIR \ + $$INCLUDEPATH DEFINES += BUILDING_QT__ BUILDING_JavaScriptCore BUILDING_WTF @@ -35,34 +37,17 @@ win32-* { LIBS += -lwinmm } -# Default rules to turn JIT on/off -!contains(DEFINES, ENABLE_JIT=.) { - isEqual(QT_ARCH,i386)|isEqual(QT_ARCH,windows) { - # Require gcc >= 4.1 - CONFIG(release):linux-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) { - DEFINES += ENABLE_JIT=1 - } - win32-msvc* { - DEFINES += ENABLE_JIT=1 - } - } +# In debug mode JIT disabled until crash fixed +win32-* { + CONFIG(debug):!contains(DEFINES, ENABLE_JIT=1): DEFINES+=ENABLE_JIT=0 } -# Rules when JIT enabled -contains(DEFINES, ENABLE_JIT=1) { - !contains(DEFINES, ENABLE_YARR=.): DEFINES += ENABLE_YARR=1 - !contains(DEFINES, ENABLE_YARR_JIT=.): DEFINES += ENABLE_YARR_JIT=1 - !contains(DEFINES, ENABLE_JIT_OPTIMIZE_CALL=.): DEFINES += ENABLE_JIT_OPTIMIZE_CALL=1 - !contains(DEFINES, ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS=.): DEFINES += ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS=1 - !contains(DEFINES, ENABLE_JIT_OPTIMIZE_ARITHMETIC=.): DEFINES += ENABLE_JIT_OPTIMIZE_ARITHMETIC=1 - linux-g++* { - !contains(DEFINES, WTF_USE_JIT_STUB_ARGUMENT_VA_LIST=.): DEFINES += WTF_USE_JIT_STUB_ARGUMENT_VA_LIST=1 +# Rules when JIT enabled (not disabled) +!contains(DEFINES, ENABLE_JIT=0) { + linux-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) { QMAKE_CXXFLAGS += -fno-stack-protector QMAKE_CFLAGS += -fno-stack-protector } - win32-msvc* { - !contains(DEFINES, WTF_USE_JIT_STUB_ARGUMENT_REGISTER=.): DEFINES += WTF_USE_JIT_STUB_ARGUMENT_REGISTER=1 - } } win32-msvc*: INCLUDEPATH += $$PWD/os-win32 @@ -124,6 +109,7 @@ SOURCES += \ bytecode/CodeBlock.cpp \ bytecode/StructureStubInfo.cpp \ bytecode/JumpTable.cpp \ + assembler/ARMAssembler.cpp \ jit/JIT.cpp \ jit/JITCall.cpp \ jit/JITArithmetic.cpp \ diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro index 28f0e6bc4..f881c0560 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro @@ -33,8 +33,6 @@ INCLUDEPATH += $$GENERATED_SOURCES_DIR } } -include($$OUTPUT_DIR/config.pri) - CONFIG -= warn_on *-g++*:QMAKE_CXXFLAGS += -Wreturn-type -fno-strict-aliasing #QMAKE_CXXFLAGS += -Wall -Wno-undef -Wno-unused-parameter diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/ARMAssembler.cpp b/src/3rdparty/webkit/JavaScriptCore/assembler/ARMAssembler.cpp new file mode 100644 index 000000000..dafc482f9 --- /dev/null +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/ARMAssembler.cpp @@ -0,0 +1,353 @@ +/* + * Copyright (C) 2009 University of Szeged + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF SZEGED ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UNIVERSITY OF SZEGED OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" + +#if ENABLE(ASSEMBLER) && PLATFORM(ARM) + +#include "ARMAssembler.h" + +namespace JSC { + +// Patching helpers + +ARMWord* ARMAssembler::getLdrImmAddress(ARMWord* insn, uint32_t* constPool) +{ + // Must be an ldr ..., [pc +/- imm] + ASSERT((*insn & 0x0f7f0000) == 0x051f0000); + + if (constPool && (*insn & 0x1)) + return reinterpret_cast(constPool + ((*insn & SDT_OFFSET_MASK) >> 1)); + + ARMWord addr = reinterpret_cast(insn) + 2 * sizeof(ARMWord); + if (*insn & DT_UP) + return reinterpret_cast(addr + (*insn & SDT_OFFSET_MASK)); + else + return reinterpret_cast(addr - (*insn & SDT_OFFSET_MASK)); +} + +void ARMAssembler::linkBranch(void* code, JmpSrc from, void* to) +{ + ARMWord* insn = reinterpret_cast(code) + (from.m_offset / sizeof(ARMWord)); + + if (!from.m_latePatch) { + int diff = reinterpret_cast(to) - reinterpret_cast(insn + 2); + + if ((diff <= BOFFSET_MAX && diff >= BOFFSET_MIN)) { + *insn = B | getConditionalField(*insn) | (diff & BRANCH_MASK); + ExecutableAllocator::cacheFlush(insn, sizeof(ARMWord)); + return; + } + } + ARMWord* addr = getLdrImmAddress(insn); + *addr = reinterpret_cast(to); + ExecutableAllocator::cacheFlush(addr, sizeof(ARMWord)); +} + +void ARMAssembler::patchConstantPoolLoad(void* loadAddr, void* constPoolAddr) +{ + ARMWord *ldr = reinterpret_cast(loadAddr); + ARMWord diff = reinterpret_cast(constPoolAddr) - ldr; + ARMWord index = (*ldr & 0xfff) >> 1; + + ASSERT(diff >= 1); + if (diff >= 2 || index > 0) { + diff = (diff + index - 2) * sizeof(ARMWord); + ASSERT(diff <= 0xfff); + *ldr = (*ldr & ~0xfff) | diff; + } else + *ldr = (*ldr & ~(0xfff | ARMAssembler::DT_UP)) | sizeof(ARMWord); +} + +// Handle immediates + +ARMWord ARMAssembler::getOp2(ARMWord imm) +{ + int rol; + + if (imm <= 0xff) + return OP2_IMM | imm; + + if ((imm & 0xff000000) == 0) { + imm <<= 8; + rol = 8; + } + else { + imm = (imm << 24) | (imm >> 8); + rol = 0; + } + + if ((imm & 0xff000000) == 0) { + imm <<= 8; + rol += 4; + } + + if ((imm & 0xf0000000) == 0) { + imm <<= 4; + rol += 2; + } + + if ((imm & 0xc0000000) == 0) { + imm <<= 2; + rol += 1; + } + + if ((imm & 0x00ffffff) == 0) + return OP2_IMM | (imm >> 24) | (rol << 8); + + return 0; +} + +int ARMAssembler::genInt(int reg, ARMWord imm, bool positive) +{ + // Step1: Search a non-immediate part + ARMWord mask; + ARMWord imm1; + ARMWord imm2; + int rol; + + mask = 0xff000000; + rol = 8; + while(1) { + if ((imm & mask) == 0) { + imm = (imm << rol) | (imm >> (32 - rol)); + rol = 4 + (rol >> 1); + break; + } + rol += 2; + mask >>= 2; + if (mask & 0x3) { + // rol 8 + imm = (imm << 8) | (imm >> 24); + mask = 0xff00; + rol = 24; + while (1) { + if ((imm & mask) == 0) { + imm = (imm << rol) | (imm >> (32 - rol)); + rol = (rol >> 1) - 8; + break; + } + rol += 2; + mask >>= 2; + if (mask & 0x3) + return 0; + } + break; + } + } + + ASSERT((imm & 0xff) == 0); + + if ((imm & 0xff000000) == 0) { + imm1 = OP2_IMM | ((imm >> 16) & 0xff) | (((rol + 4) & 0xf) << 8); + imm2 = OP2_IMM | ((imm >> 8) & 0xff) | (((rol + 8) & 0xf) << 8); + } else if (imm & 0xc0000000) { + imm1 = OP2_IMM | ((imm >> 24) & 0xff) | ((rol & 0xf) << 8); + imm <<= 8; + rol += 4; + + if ((imm & 0xff000000) == 0) { + imm <<= 8; + rol += 4; + } + + if ((imm & 0xf0000000) == 0) { + imm <<= 4; + rol += 2; + } + + if ((imm & 0xc0000000) == 0) { + imm <<= 2; + rol += 1; + } + + if ((imm & 0x00ffffff) == 0) + imm2 = OP2_IMM | (imm >> 24) | ((rol & 0xf) << 8); + else + return 0; + } else { + if ((imm & 0xf0000000) == 0) { + imm <<= 4; + rol += 2; + } + + if ((imm & 0xc0000000) == 0) { + imm <<= 2; + rol += 1; + } + + imm1 = OP2_IMM | ((imm >> 24) & 0xff) | ((rol & 0xf) << 8); + imm <<= 8; + rol += 4; + + if ((imm & 0xf0000000) == 0) { + imm <<= 4; + rol += 2; + } + + if ((imm & 0xc0000000) == 0) { + imm <<= 2; + rol += 1; + } + + if ((imm & 0x00ffffff) == 0) + imm2 = OP2_IMM | (imm >> 24) | ((rol & 0xf) << 8); + else + return 0; + } + + if (positive) { + mov_r(reg, imm1); + orr_r(reg, reg, imm2); + } else { + mvn_r(reg, imm1); + bic_r(reg, reg, imm2); + } + + return 1; +} + +ARMWord ARMAssembler::getImm(ARMWord imm, int tmpReg, bool invert) +{ + ARMWord tmp; + + // Do it by 1 instruction + tmp = getOp2(imm); + if (tmp) + return tmp; + + tmp = getOp2(~imm); + if (tmp) { + if (invert) + return tmp | OP2_INV_IMM; + mvn_r(tmpReg, tmp); + return tmpReg; + } + + // Do it by 2 instruction + if (genInt(tmpReg, imm, true)) + return tmpReg; + if (genInt(tmpReg, ~imm, false)) + return tmpReg; + + ldr_imm(tmpReg, imm); + return tmpReg; +} + +void ARMAssembler::moveImm(ARMWord imm, int dest) +{ + ARMWord tmp; + + // Do it by 1 instruction + tmp = getOp2(imm); + if (tmp) { + mov_r(dest, tmp); + return; + } + + tmp = getOp2(~imm); + if (tmp) { + mvn_r(dest, tmp); + return; + } + + // Do it by 2 instruction + if (genInt(dest, imm, true)) + return; + if (genInt(dest, ~imm, false)) + return; + + ldr_imm(dest, imm); +} + +// Memory load/store helpers + +void ARMAssembler::dataTransfer32(bool isLoad, RegisterID srcDst, RegisterID base, int32_t offset) +{ + if (offset >= 0) { + if (offset <= 0xfff) + dtr_u(isLoad, srcDst, base, offset); + else if (offset <= 0xfffff) { + add_r(ARM::S0, base, OP2_IMM | (offset >> 12) | (10 << 8)); + dtr_u(isLoad, srcDst, ARM::S0, offset & 0xfff); + } else { + ARMWord reg = getImm(offset, ARM::S0); + dtr_ur(isLoad, srcDst, base, reg); + } + } else { + offset = -offset; + if (offset <= 0xfff) + dtr_d(isLoad, srcDst, base, offset); + else if (offset <= 0xfffff) { + sub_r(ARM::S0, base, OP2_IMM | (offset >> 12) | (10 << 8)); + dtr_d(isLoad, srcDst, ARM::S0, offset & 0xfff); + } else { + ARMWord reg = getImm(offset, ARM::S0); + dtr_dr(isLoad, srcDst, base, reg); + } + } +} + +void ARMAssembler::baseIndexTransfer32(bool isLoad, RegisterID srcDst, RegisterID base, RegisterID index, int scale, int32_t offset) +{ + ARMWord op2; + + ASSERT(scale >= 0 && scale <= 3); + op2 = lsl(index, scale); + + if (offset >= 0 && offset <= 0xfff) { + add_r(ARM::S0, base, op2); + dtr_u(isLoad, srcDst, ARM::S0, offset); + return; + } + if (offset <= 0 && offset >= -0xfff) { + add_r(ARM::S0, base, op2); + dtr_d(isLoad, srcDst, ARM::S0, -offset); + return; + } + + moveImm(offset, ARM::S0); + add_r(ARM::S0, ARM::S0, op2); + dtr_ur(isLoad, srcDst, base, ARM::S0); +} + +void* ARMAssembler::executableCopy(ExecutablePool* allocator) +{ + char* data = reinterpret_cast(m_buffer.executableCopy(allocator)); + + for (Jumps::Iterator iter = m_jumps.begin(); iter != m_jumps.end(); ++iter) { + ARMWord* ldrAddr = reinterpret_cast(data + *iter); + ARMWord* offset = getLdrImmAddress(ldrAddr); + if (*offset != 0xffffffff) + linkBranch(data, JmpSrc(*iter), data + *offset); + } + + return data; +} + +} // namespace JSC + +#endif // ENABLE(ASSEMBLER) && PLATFORM(ARM) diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/ARMAssembler.h b/src/3rdparty/webkit/JavaScriptCore/assembler/ARMAssembler.h new file mode 100644 index 000000000..d6bb43ea2 --- /dev/null +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/ARMAssembler.h @@ -0,0 +1,706 @@ +/* + * Copyright (C) 2009 University of Szeged + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF SZEGED ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UNIVERSITY OF SZEGED OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef ARMAssembler_h +#define ARMAssembler_h + +#include + +#if ENABLE(ASSEMBLER) && PLATFORM(ARM) + +#include "AssemblerBufferWithConstantPool.h" +#include +namespace JSC { + +typedef uint32_t ARMWord; + +namespace ARM { + typedef enum { + r0 = 0, + r1, + r2, + r3, + S0 = r3, + r4, + r5, + r6, + r7, + r8, + S1 = r8, + r9, + r10, + r11, + r12, + r13, + sp = r13, + r14, + lr = r14, + r15, + pc = r15 + } RegisterID; + + typedef enum { + fp0 //FIXME + } FPRegisterID; +} // namespace ARM + + class ARMAssembler { + public: + typedef ARM::RegisterID RegisterID; + typedef ARM::FPRegisterID FPRegisterID; + typedef AssemblerBufferWithConstantPool<2048, 4, 4, ARMAssembler> ARMBuffer; + typedef WTF::SegmentedVector Jumps; + + ARMAssembler() { } + + // ARM conditional constants + typedef enum { + EQ = 0x00000000, // Zero + NE = 0x10000000, // Non-zero + CS = 0x20000000, + CC = 0x30000000, + MI = 0x40000000, + PL = 0x50000000, + VS = 0x60000000, + VC = 0x70000000, + HI = 0x80000000, + LS = 0x90000000, + GE = 0xa0000000, + LT = 0xb0000000, + GT = 0xc0000000, + LE = 0xd0000000, + AL = 0xe0000000 + } Condition; + + // ARM instruction constants + enum { + AND = (0x0 << 21), + EOR = (0x1 << 21), + SUB = (0x2 << 21), + RSB = (0x3 << 21), + ADD = (0x4 << 21), + ADC = (0x5 << 21), + SBC = (0x6 << 21), + RSC = (0x7 << 21), + TST = (0x8 << 21), + TEQ = (0x9 << 21), + CMP = (0xa << 21), + CMN = (0xb << 21), + ORR = (0xc << 21), + MOV = (0xd << 21), + BIC = (0xe << 21), + MVN = (0xf << 21), + MUL = 0x00000090, + MULL = 0x00c00090, + DTR = 0x05000000, + LDRH = 0x00100090, + STRH = 0x00000090, + STMDB = 0x09200000, + LDMIA = 0x08b00000, + B = 0x0a000000, + BL = 0x0b000000, +#if ARM_ARCH_VERSION >= 5 + CLZ = 0x016f0f10, + BKPT = 0xe120070, +#endif + }; + + enum { + OP2_IMM = (1 << 25), + OP2_IMMh = (1 << 22), + OP2_INV_IMM = (1 << 26), + SET_CC = (1 << 20), + OP2_OFSREG = (1 << 25), + DT_UP = (1 << 23), + DT_WB = (1 << 21), + // This flag is inlcuded in LDR and STR + DT_PRE = (1 << 24), + HDT_UH = (1 << 5), + DT_LOAD = (1 << 20), + }; + + // Masks of ARM instructions + enum { + BRANCH_MASK = 0x00ffffff, + NONARM = 0xf0000000, + SDT_MASK = 0x0c000000, + SDT_OFFSET_MASK = 0xfff, + }; + + enum { + BOFFSET_MIN = -0x00800000, + BOFFSET_MAX = 0x007fffff, + SDT = 0x04000000, + }; + + enum { + padForAlign8 = 0x00, + padForAlign16 = 0x0000, + padForAlign32 = 0xee120070, + }; + + class JmpSrc { + friend class ARMAssembler; + public: + JmpSrc() + : m_offset(-1) + , m_latePatch(false) + { + } + + void enableLatePatch() { m_latePatch = true; } + private: + JmpSrc(int offset) + : m_offset(offset) + , m_latePatch(false) + { + } + + int m_offset : 31; + int m_latePatch : 1; + }; + + class JmpDst { + friend class ARMAssembler; + public: + JmpDst() + : m_offset(-1) + , m_used(false) + { + } + + bool isUsed() const { return m_used; } + void used() { m_used = true; } + private: + JmpDst(int offset) + : m_offset(offset) + , m_used(false) + { + ASSERT(m_offset == offset); + } + + int m_offset : 31; + int m_used : 1; + }; + + // Instruction formating + + void emitInst(ARMWord op, int rd, int rn, ARMWord op2) + { + ASSERT ( ((op2 & ~OP2_IMM) <= 0xfff) || (((op2 & ~OP2_IMMh) <= 0xfff)) ); + m_buffer.putInt(op | RN(rn) | RD(rd) | op2); + } + + void and_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | AND, rd, rn, op2); + } + + void ands_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | AND | SET_CC, rd, rn, op2); + } + + void eor_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | EOR, rd, rn, op2); + } + + void eors_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | EOR | SET_CC, rd, rn, op2); + } + + void sub_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | SUB, rd, rn, op2); + } + + void subs_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | SUB | SET_CC, rd, rn, op2); + } + + void rsb_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | RSB, rd, rn, op2); + } + + void rsbs_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | RSB | SET_CC, rd, rn, op2); + } + + void add_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | ADD, rd, rn, op2); + } + + void adds_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | ADD | SET_CC, rd, rn, op2); + } + + void adc_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | ADC, rd, rn, op2); + } + + void adcs_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | ADC | SET_CC, rd, rn, op2); + } + + void sbc_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | SBC, rd, rn, op2); + } + + void sbcs_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | SBC | SET_CC, rd, rn, op2); + } + + void rsc_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | RSC, rd, rn, op2); + } + + void rscs_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | RSC | SET_CC, rd, rn, op2); + } + + void tst_r(int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | TST | SET_CC, 0, rn, op2); + } + + void teq_r(int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | TEQ | SET_CC, 0, rn, op2); + } + + void cmp_r(int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | CMP | SET_CC, 0, rn, op2); + } + + void orr_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | ORR, rd, rn, op2); + } + + void orrs_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | ORR | SET_CC, rd, rn, op2); + } + + void mov_r(int rd, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | MOV, rd, ARM::r0, op2); + } + + void movs_r(int rd, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | MOV | SET_CC, rd, ARM::r0, op2); + } + + void bic_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | BIC, rd, rn, op2); + } + + void bics_r(int rd, int rn, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | BIC | SET_CC, rd, rn, op2); + } + + void mvn_r(int rd, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | MVN, rd, ARM::r0, op2); + } + + void mvns_r(int rd, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | MVN | SET_CC, rd, ARM::r0, op2); + } + + void mul_r(int rd, int rn, int rm, Condition cc = AL) + { + m_buffer.putInt(static_cast(cc) | MUL | RN(rd) | RS(rn) | RM(rm)); + } + + void muls_r(int rd, int rn, int rm, Condition cc = AL) + { + m_buffer.putInt(static_cast(cc) | MUL | SET_CC | RN(rd) | RS(rn) | RM(rm)); + } + + void mull_r(int rdhi, int rdlo, int rn, int rm, Condition cc = AL) + { + m_buffer.putInt(static_cast(cc) | MULL | RN(rdhi) | RD(rdlo) | RS(rn) | RM(rm)); + } + + void ldr_imm(int rd, ARMWord imm, Condition cc = AL) + { + m_buffer.putIntWithConstantInt(static_cast(cc) | DTR | DT_LOAD | DT_UP | RN(ARM::pc) | RD(rd), imm, true); + } + + void ldr_un_imm(int rd, ARMWord imm, Condition cc = AL) + { + m_buffer.putIntWithConstantInt(static_cast(cc) | DTR | DT_LOAD | DT_UP | RN(ARM::pc) | RD(rd), imm); + } + + void dtr_u(bool isLoad, int rd, int rb, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | DTR | (isLoad ? DT_LOAD : 0) | DT_UP, rd, rb, op2); + } + + void dtr_ur(bool isLoad, int rd, int rb, int rm, Condition cc = AL) + { + emitInst(static_cast(cc) | DTR | (isLoad ? DT_LOAD : 0) | DT_UP | OP2_OFSREG, rd, rb, rm); + } + + void dtr_d(bool isLoad, int rd, int rb, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | DTR | (isLoad ? DT_LOAD : 0), rd, rb, op2); + } + + void dtr_dr(bool isLoad, int rd, int rb, int rm, Condition cc = AL) + { + emitInst(static_cast(cc) | DTR | (isLoad ? DT_LOAD : 0) | OP2_OFSREG, rd, rb, rm); + } + + void ldrh_r(int rd, int rn, int rm, Condition cc = AL) + { + emitInst(static_cast(cc) | LDRH | HDT_UH | DT_UP | DT_PRE, rd, rn, rm); + } + + void ldrh_d(int rd, int rb, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | LDRH | HDT_UH | DT_PRE, rd, rb, op2); + } + + void ldrh_u(int rd, int rb, ARMWord op2, Condition cc = AL) + { + emitInst(static_cast(cc) | LDRH | HDT_UH | DT_UP | DT_PRE, rd, rb, op2); + } + + void strh_r(int rn, int rm, int rd, Condition cc = AL) + { + emitInst(static_cast(cc) | STRH | HDT_UH | DT_UP | DT_PRE, rd, rn, rm); + } + + void push_r(int reg, Condition cc = AL) + { + ASSERT(ARMWord(reg) <= 0xf); + m_buffer.putInt(cc | DTR | DT_WB | RN(ARM::sp) | RD(reg) | 0x4); + } + + void pop_r(int reg, Condition cc = AL) + { + ASSERT(ARMWord(reg) <= 0xf); + m_buffer.putInt(cc | (DTR ^ DT_PRE) | DT_LOAD | DT_UP | RN(ARM::sp) | RD(reg) | 0x4); + } + + inline void poke_r(int reg, Condition cc = AL) + { + dtr_d(false, ARM::sp, 0, reg, cc); + } + + inline void peek_r(int reg, Condition cc = AL) + { + dtr_u(true, reg, ARM::sp, 0, cc); + } + +#if ARM_ARCH_VERSION >= 5 + void clz_r(int rd, int rm, Condition cc = AL) + { + m_buffer.putInt(static_cast(cc) | CLZ | RD(rd) | RM(rm)); + } +#endif + + void bkpt(ARMWord value) + { +#if ARM_ARCH_VERSION >= 5 + m_buffer.putInt(BKPT | ((value & 0xff0) << 4) | (value & 0xf)); +#else + // Cannot access to Zero memory address + dtr_dr(true, ARM::S0, ARM::S0, ARM::S0); +#endif + } + + static ARMWord lsl(int reg, ARMWord value) + { + ASSERT(reg <= ARM::pc); + ASSERT(value <= 0x1f); + return reg | (value << 7) | 0x00; + } + + static ARMWord lsr(int reg, ARMWord value) + { + ASSERT(reg <= ARM::pc); + ASSERT(value <= 0x1f); + return reg | (value << 7) | 0x20; + } + + static ARMWord asr(int reg, ARMWord value) + { + ASSERT(reg <= ARM::pc); + ASSERT(value <= 0x1f); + return reg | (value << 7) | 0x40; + } + + static ARMWord lsl_r(int reg, int shiftReg) + { + ASSERT(reg <= ARM::pc); + ASSERT(shiftReg <= ARM::pc); + return reg | (shiftReg << 8) | 0x10; + } + + static ARMWord lsr_r(int reg, int shiftReg) + { + ASSERT(reg <= ARM::pc); + ASSERT(shiftReg <= ARM::pc); + return reg | (shiftReg << 8) | 0x30; + } + + static ARMWord asr_r(int reg, int shiftReg) + { + ASSERT(reg <= ARM::pc); + ASSERT(shiftReg <= ARM::pc); + return reg | (shiftReg << 8) | 0x50; + } + + // General helpers + + int size() + { + return m_buffer.size(); + } + + void ensureSpace(int insnSpace, int constSpace) + { + m_buffer.ensureSpace(insnSpace, constSpace); + } + + JmpDst label() + { + return JmpDst(m_buffer.size()); + } + + JmpDst align(int alignment) + { + while (!m_buffer.isAligned(alignment)) + mov_r(ARM::r0, ARM::r0); + + return label(); + } + + JmpSrc jmp(Condition cc = AL) + { + int s = size(); + ldr_un_imm(ARM::pc, 0xffffffff, cc); + m_jumps.append(s); + return JmpSrc(s); + } + + void* executableCopy(ExecutablePool* allocator); + + // Patching helpers + + static ARMWord* getLdrImmAddress(ARMWord* insn, uint32_t* constPool = 0); + static void linkBranch(void* code, JmpSrc from, void* to); + + static void patchPointerInternal(intptr_t from, void* to) + { + ARMWord* insn = reinterpret_cast(from); + ARMWord* addr = getLdrImmAddress(insn); + *addr = reinterpret_cast(to); + ExecutableAllocator::cacheFlush(addr, sizeof(ARMWord)); + } + + static ARMWord patchConstantPoolLoad(ARMWord load, ARMWord value) + { + value = (value << 1) + 1; + ASSERT(!(value & ~0xfff)); + return (load & ~0xfff) | value; + } + + static void patchConstantPoolLoad(void* loadAddr, void* constPoolAddr); + + // Patch pointers + + static void linkPointer(void* code, JmpDst from, void* to) + { + patchPointerInternal(reinterpret_cast(code) + from.m_offset, to); + } + + static void repatchInt32(void* from, int32_t to) + { + patchPointerInternal(reinterpret_cast(from), reinterpret_cast(to)); + } + + static void repatchPointer(void* from, void* to) + { + patchPointerInternal(reinterpret_cast(from), to); + } + + static void repatchLoadPtrToLEA(void* from) + { + // On arm, this is a patch from LDR to ADD. It is restricted conversion, + // from special case to special case, altough enough for its purpose + ARMWord* insn = reinterpret_cast(from); + ASSERT((*insn & 0x0ff00f00) == 0x05900000); + + *insn = (*insn & 0xf00ff0ff) | 0x02800000; + ExecutableAllocator::cacheFlush(insn, sizeof(ARMWord)); + } + + // Linkers + + void linkJump(JmpSrc from, JmpDst to) + { + ARMWord* insn = reinterpret_cast(m_buffer.data()) + (from.m_offset / sizeof(ARMWord)); + *getLdrImmAddress(insn, m_buffer.poolAddress()) = static_cast(to.m_offset); + } + + static void linkJump(void* code, JmpSrc from, void* to) + { + linkBranch(code, from, to); + } + + static void relinkJump(void* from, void* to) + { + patchPointerInternal(reinterpret_cast(from) - sizeof(ARMWord), to); + } + + static void linkCall(void* code, JmpSrc from, void* to) + { + linkBranch(code, from, to); + } + + static void relinkCall(void* from, void* to) + { + relinkJump(from, to); + } + + // Address operations + + static void* getRelocatedAddress(void* code, JmpSrc jump) + { + return reinterpret_cast(reinterpret_cast(code) + jump.m_offset / sizeof(ARMWord) + 1); + } + + static void* getRelocatedAddress(void* code, JmpDst label) + { + return reinterpret_cast(reinterpret_cast(code) + label.m_offset / sizeof(ARMWord)); + } + + // Address differences + + static int getDifferenceBetweenLabels(JmpDst from, JmpSrc to) + { + return (to.m_offset + sizeof(ARMWord)) - from.m_offset; + } + + static int getDifferenceBetweenLabels(JmpDst from, JmpDst to) + { + return to.m_offset - from.m_offset; + } + + static unsigned getCallReturnOffset(JmpSrc call) + { + return call.m_offset + sizeof(ARMWord); + } + + // Handle immediates + + static ARMWord getOp2Byte(ARMWord imm) + { + ASSERT(imm <= 0xff); + return OP2_IMMh | (imm & 0x0f) | ((imm & 0xf0) << 4) ; + } + + static ARMWord getOp2(ARMWord imm); + ARMWord getImm(ARMWord imm, int tmpReg, bool invert = false); + void moveImm(ARMWord imm, int dest); + + // Memory load/store helpers + + void dataTransfer32(bool isLoad, RegisterID srcDst, RegisterID base, int32_t offset); + void baseIndexTransfer32(bool isLoad, RegisterID srcDst, RegisterID base, RegisterID index, int scale, int32_t offset); + + // Constant pool hnadlers + + static ARMWord placeConstantPoolBarrier(int offset) + { + offset = (offset - sizeof(ARMWord)) >> 2; + ASSERT((offset <= BOFFSET_MAX && offset >= BOFFSET_MIN)); + return AL | B | (offset & BRANCH_MASK); + } + + private: + ARMWord RM(int reg) + { + ASSERT(reg <= ARM::pc); + return reg; + } + + ARMWord RS(int reg) + { + ASSERT(reg <= ARM::pc); + return reg << 8; + } + + ARMWord RD(int reg) + { + ASSERT(reg <= ARM::pc); + return reg << 12; + } + + ARMWord RN(int reg) + { + ASSERT(reg <= ARM::pc); + return reg << 16; + } + + static ARMWord getConditionalField(ARMWord i) + { + return i & 0xf0000000; + } + + int genInt(int reg, ARMWord imm, bool positive); + + ARMBuffer m_buffer; + Jumps m_jumps; + }; + +} // namespace JSC + +#endif // ENABLE(ASSEMBLER) && PLATFORM(ARM) + +#endif // ARMAssembler_h diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/ARMv7Assembler.h b/src/3rdparty/webkit/JavaScriptCore/assembler/ARMv7Assembler.h index 9745d6d57..f7e2fb476 100644 --- a/src/3rdparty/webkit/JavaScriptCore/assembler/ARMv7Assembler.h +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/ARMv7Assembler.h @@ -442,6 +442,7 @@ public: { } + void enableLatePatch() { } private: JmpSrc(int offset) : m_offset(offset) @@ -1528,51 +1529,51 @@ public: ASSERT(from.m_offset != -1); ASSERT(reinterpret_cast(to) & 1); - patchPointer(reinterpret_cast(reinterpret_cast(code) + from.m_offset) - 1, to); + setPointer(reinterpret_cast(reinterpret_cast(code) + from.m_offset) - 1, to); } - static void patchPointer(void* code, JmpDst where, void* value) + static void linkPointer(void* code, JmpDst where, void* value) { - patchPointer(reinterpret_cast(code) + where.m_offset, value); + setPointer(reinterpret_cast(code) + where.m_offset, value); } static void relinkJump(void* from, void* to) { - ExecutableAllocator::MakeWritable unprotect(reinterpret_cast(from) - 2, 2 * sizeof(uint16_t)); - ASSERT(!(reinterpret_cast(from) & 1)); ASSERT(!(reinterpret_cast(to) & 1)); intptr_t relative = reinterpret_cast(to) - reinterpret_cast(from); linkWithOffset(reinterpret_cast(from), relative); + + ExecutableAllocator::cacheFlush(reinterpret_cast(from) - 2, 2 * sizeof(uint16_t)); } static void relinkCall(void* from, void* to) { - ExecutableAllocator::MakeWritable unprotect(reinterpret_cast(from) - 5, 4 * sizeof(uint16_t)); - ASSERT(!(reinterpret_cast(from) & 1)); ASSERT(reinterpret_cast(to) & 1); - patchPointer(reinterpret_cast(from) - 1, to); + setPointer(reinterpret_cast(from) - 1, to); + + ExecutableAllocator::cacheFlush(reinterpret_cast(from) - 5, 4 * sizeof(uint16_t)); } static void repatchInt32(void* where, int32_t value) { - ExecutableAllocator::MakeWritable unprotect(reinterpret_cast(where) - 4, 4 * sizeof(uint16_t)); - ASSERT(!(reinterpret_cast(where) & 1)); - patchInt32(where, value); + setInt32(where, value); + + ExecutableAllocator::cacheFlush(reinterpret_cast(where) - 4, 4 * sizeof(uint16_t)); } static void repatchPointer(void* where, void* value) { - ExecutableAllocator::MakeWritable unprotect(reinterpret_cast(where) - 4, 4 * sizeof(uint16_t)); - ASSERT(!(reinterpret_cast(where) & 1)); - patchPointer(where, value); + setPointer(where, value); + + ExecutableAllocator::cacheFlush(reinterpret_cast(where) - 4, 4 * sizeof(uint16_t)); } static void repatchLoadPtrToLEA(void* where) @@ -1582,8 +1583,8 @@ public: uint16_t* loadOp = reinterpret_cast(where) + 4; ASSERT((*loadOp & 0xfff0) == OP_LDR_reg_T2); - ExecutableAllocator::MakeWritable unprotect(loadOp, sizeof(uint16_t)); *loadOp = OP_ADD_reg_T3 | (*loadOp & 0xf); + ExecutableAllocator::cacheFlush(loadOp, sizeof(uint16_t)); } private: @@ -1610,12 +1611,10 @@ private: m_formatter.vfpOp(0x0b00ed00 | offset | (up << 7) | (isLoad << 4) | doubleRegisterMask(rd, 6, 28) | rn); } - static void patchInt32(void* code, uint32_t value) + static void setInt32(void* code, uint32_t value) { uint16_t* location = reinterpret_cast(code); - ExecutableAllocator::MakeWritable unprotect(location - 4, 4 * sizeof(uint16_t)); - uint16_t lo16 = value; uint16_t hi16 = value >> 16; @@ -1623,11 +1622,13 @@ private: spliceLo11(location - 3, lo16); spliceHi5(location - 2, hi16); spliceLo11(location - 1, hi16); + + ExecutableAllocator::cacheFlush(location - 4, 4 * sizeof(uint16_t)); } - static void patchPointer(void* code, void* value) + static void setPointer(void* code, void* value) { - patchInt32(code, reinterpret_cast(value)); + setInt32(code, reinterpret_cast(value)); } // Linking & patching: diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/AbstractMacroAssembler.h b/src/3rdparty/webkit/JavaScriptCore/assembler/AbstractMacroAssembler.h index cf9467709..95b5afc5d 100644 --- a/src/3rdparty/webkit/JavaScriptCore/assembler/AbstractMacroAssembler.h +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/AbstractMacroAssembler.h @@ -35,22 +35,20 @@ #if ENABLE(ASSEMBLER) -// FIXME: keep transitioning this out into MacroAssemblerX86_64. -#if PLATFORM(X86_64) -#define REPTACH_OFFSET_CALL_R11 3 -#endif - namespace JSC { +class LinkBuffer; +class RepatchBuffer; + template class AbstractMacroAssembler { public: + typedef AssemblerType AssemblerType_T; + typedef MacroAssemblerCodePtr CodePtr; typedef MacroAssemblerCodeRef CodeRef; class Jump; - class LinkBuffer; - class RepatchBuffer; typedef typename AssemblerType::RegisterID RegisterID; typedef typename AssemblerType::FPRegisterID FPRegisterID; @@ -292,7 +290,7 @@ public: class Call { template friend class AbstractMacroAssembler; - friend class LinkBuffer; + public: enum Flags { None = 0x0, @@ -322,8 +320,13 @@ public: return Call(jump.m_jmp, Linkable); } - private: + void enableLatePatch() + { + m_jmp.enableLatePatch(); + } + JmpSrc m_jmp; + private: Flags m_flags; }; @@ -358,6 +361,11 @@ public: masm->m_assembler.linkJump(m_jmp, label.m_label); } + void enableLatePatch() + { + m_jmp.enableLatePatch(); + } + private: JmpSrc m_jmp; }; @@ -406,254 +414,13 @@ public: }; - // Section 3: LinkBuffer - utility to finalize code generation. + // Section 3: Misc admin methods static CodePtr trampolineAt(CodeRef ref, Label label) { return CodePtr(AssemblerType::getRelocatedAddress(ref.m_code.dataLocation(), label.m_label)); } - // LinkBuffer: - // - // This class assists in linking code generated by the macro assembler, once code generation - // has been completed, and the code has been copied to is final location in memory. At this - // time pointers to labels within the code may be resolved, and relative offsets to external - // addresses may be fixed. - // - // Specifically: - // * Jump objects may be linked to external targets, - // * The address of Jump objects may taken, such that it can later be relinked. - // * The return address of a Jump object representing a call may be acquired. - // * The address of a Label pointing into the code may be resolved. - // * The value referenced by a DataLabel may be fixed. - // - // FIXME: distinguish between Calls & Jumps (make a specific call to obtain the return - // address of calls, as opposed to a point that can be used to later relink a Jump - - // possibly wrap the later up in an object that can do just that). - class LinkBuffer : public Noncopyable { - public: - // Note: Initialization sequence is significant, since executablePool is a PassRefPtr. - // First, executablePool is copied into m_executablePool, then the initialization of - // m_code uses m_executablePool, *not* executablePool, since this is no longer valid. - LinkBuffer(AbstractMacroAssembler* masm, PassRefPtr executablePool) - : m_executablePool(executablePool) - , m_code(masm->m_assembler.executableCopy(m_executablePool.get())) - , m_size(masm->m_assembler.size()) -#ifndef NDEBUG - , m_completed(false) -#endif - { - } - - ~LinkBuffer() - { - ASSERT(m_completed); - } - - // These methods are used to link or set values at code generation time. - - void link(Call call, FunctionPtr function) - { - ASSERT(call.isFlagSet(Call::Linkable)); -#if PLATFORM(X86_64) - if (!call.isFlagSet(Call::Near)) { - char* callLocation = reinterpret_cast(AssemblerType::getRelocatedAddress(code(), call.m_jmp)) - REPTACH_OFFSET_CALL_R11; - AssemblerType::patchPointerForCall(callLocation, function.value()); - } else -#endif - AssemblerType::linkCall(code(), call.m_jmp, function.value()); - } - - void link(Jump jump, CodeLocationLabel label) - { - AssemblerType::linkJump(code(), jump.m_jmp, label.dataLocation()); - } - - void link(JumpList list, CodeLocationLabel label) - { - for (unsigned i = 0; i < list.m_jumps.size(); ++i) - AssemblerType::linkJump(code(), list.m_jumps[i].m_jmp, label.dataLocation()); - } - - void patch(DataLabelPtr label, void* value) - { - AssemblerType::patchPointer(code(), label.m_label, value); - } - - void patch(DataLabelPtr label, CodeLocationLabel value) - { - AssemblerType::patchPointer(code(), label.m_label, value.executableAddress()); - } - - // These methods are used to obtain handles to allow the code to be relinked / repatched later. - - CodeLocationCall locationOf(Call call) - { - ASSERT(call.isFlagSet(Call::Linkable)); - ASSERT(!call.isFlagSet(Call::Near)); - return CodeLocationCall(AssemblerType::getRelocatedAddress(code(), call.m_jmp)); - } - - CodeLocationNearCall locationOfNearCall(Call call) - { - ASSERT(call.isFlagSet(Call::Linkable)); - ASSERT(call.isFlagSet(Call::Near)); - return CodeLocationNearCall(AssemblerType::getRelocatedAddress(code(), call.m_jmp)); - } - - CodeLocationLabel locationOf(Label label) - { - return CodeLocationLabel(AssemblerType::getRelocatedAddress(code(), label.m_label)); - } - - CodeLocationDataLabelPtr locationOf(DataLabelPtr label) - { - return CodeLocationDataLabelPtr(AssemblerType::getRelocatedAddress(code(), label.m_label)); - } - - CodeLocationDataLabel32 locationOf(DataLabel32 label) - { - return CodeLocationDataLabel32(AssemblerType::getRelocatedAddress(code(), label.m_label)); - } - - // This method obtains the return address of the call, given as an offset from - // the start of the code. - unsigned returnAddressOffset(Call call) - { - return AssemblerType::getCallReturnOffset(call.m_jmp); - } - - // Upon completion of all patching either 'finalizeCode()' or 'finalizeCodeAddendum()' should be called - // once to complete generation of the code. 'finalizeCode()' is suited to situations - // where the executable pool must also be retained, the lighter-weight 'finalizeCodeAddendum()' is - // suited to adding to an existing allocation. - CodeRef finalizeCode() - { - performFinalization(); - - return CodeRef(m_code, m_executablePool, m_size); - } - CodeLocationLabel finalizeCodeAddendum() - { - performFinalization(); - - return CodeLocationLabel(code()); - } - - private: - // Keep this private! - the underlying code should only be obtained externally via - // finalizeCode() or finalizeCodeAddendum(). - void* code() - { - return m_code; - } - - void performFinalization() - { -#ifndef NDEBUG - ASSERT(!m_completed); - m_completed = true; -#endif - - ExecutableAllocator::makeExecutable(code(), m_size); - } - - RefPtr m_executablePool; - void* m_code; - size_t m_size; -#ifndef NDEBUG - bool m_completed; -#endif - }; - - class RepatchBuffer { - public: - RepatchBuffer() - { - } - - void relink(CodeLocationJump jump, CodeLocationLabel destination) - { - AssemblerType::relinkJump(jump.dataLocation(), destination.dataLocation()); - } - - void relink(CodeLocationCall call, CodeLocationLabel destination) - { -#if PLATFORM(X86_64) - repatch(call.dataLabelPtrAtOffset(-REPTACH_OFFSET_CALL_R11), destination.executableAddress()); -#else - AssemblerType::relinkCall(call.dataLocation(), destination.executableAddress()); -#endif - } - - void relink(CodeLocationCall call, FunctionPtr destination) - { -#if PLATFORM(X86_64) - repatch(call.dataLabelPtrAtOffset(-REPTACH_OFFSET_CALL_R11), destination.executableAddress()); -#else - AssemblerType::relinkCall(call.dataLocation(), destination.executableAddress()); -#endif - } - - void relink(CodeLocationNearCall nearCall, CodePtr destination) - { - AssemblerType::relinkCall(nearCall.dataLocation(), destination.executableAddress()); - } - - void relink(CodeLocationNearCall nearCall, CodeLocationLabel destination) - { - AssemblerType::relinkCall(nearCall.dataLocation(), destination.executableAddress()); - } - - void relink(CodeLocationNearCall nearCall, FunctionPtr destination) - { - AssemblerType::relinkCall(nearCall.dataLocation(), destination.executableAddress()); - } - - void repatch(CodeLocationDataLabel32 dataLabel32, int32_t value) - { - AssemblerType::repatchInt32(dataLabel32.dataLocation(), value); - } - - void repatch(CodeLocationDataLabelPtr dataLabelPtr, void* value) - { - AssemblerType::repatchPointer(dataLabelPtr.dataLocation(), value); - } - - void relinkCallerToTrampoline(ReturnAddressPtr returnAddress, CodeLocationLabel label) - { - relink(CodeLocationCall(CodePtr(returnAddress)), label); - } - - void relinkCallerToTrampoline(ReturnAddressPtr returnAddress, CodePtr newCalleeFunction) - { - relinkCallerToTrampoline(returnAddress, CodeLocationLabel(newCalleeFunction)); - } - - void relinkCallerToFunction(ReturnAddressPtr returnAddress, FunctionPtr function) - { - relink(CodeLocationCall(CodePtr(returnAddress)), function); - } - - void relinkNearCallerToTrampoline(ReturnAddressPtr returnAddress, CodeLocationLabel label) - { - relink(CodeLocationNearCall(CodePtr(returnAddress)), label); - } - - void relinkNearCallerToTrampoline(ReturnAddressPtr returnAddress, CodePtr newCalleeFunction) - { - relinkNearCallerToTrampoline(returnAddress, CodeLocationLabel(newCalleeFunction)); - } - - void repatchLoadPtrToLEA(CodeLocationInstruction instruction) - { - AssemblerType::repatchLoadPtrToLEA(instruction.dataLocation()); - } - }; - - - // Section 4: Misc admin methods - size_t size() { return m_assembler.size(); @@ -712,6 +479,59 @@ public: protected: AssemblerType m_assembler; + + friend class LinkBuffer; + friend class RepatchBuffer; + + static void linkJump(void* code, Jump jump, CodeLocationLabel target) + { + AssemblerType::linkJump(code, jump.m_jmp, target.dataLocation()); + } + + static void linkPointer(void* code, typename AssemblerType::JmpDst label, void* value) + { + AssemblerType::linkPointer(code, label, value); + } + + static void* getLinkerAddress(void* code, typename AssemblerType::JmpSrc label) + { + return AssemblerType::getRelocatedAddress(code, label); + } + + static void* getLinkerAddress(void* code, typename AssemblerType::JmpDst label) + { + return AssemblerType::getRelocatedAddress(code, label); + } + + static unsigned getLinkerCallReturnOffset(Call call) + { + return AssemblerType::getCallReturnOffset(call.m_jmp); + } + + static void repatchJump(CodeLocationJump jump, CodeLocationLabel destination) + { + AssemblerType::relinkJump(jump.dataLocation(), destination.dataLocation()); + } + + static void repatchNearCall(CodeLocationNearCall nearCall, CodeLocationLabel destination) + { + AssemblerType::relinkCall(nearCall.dataLocation(), destination.executableAddress()); + } + + static void repatchInt32(CodeLocationDataLabel32 dataLabel32, int32_t value) + { + AssemblerType::repatchInt32(dataLabel32.dataLocation(), value); + } + + static void repatchPointer(CodeLocationDataLabelPtr dataLabelPtr, void* value) + { + AssemblerType::repatchPointer(dataLabelPtr.dataLocation(), value); + } + + static void repatchLoadPtrToLEA(CodeLocationInstruction instruction) + { + AssemblerType::repatchLoadPtrToLEA(instruction.dataLocation()); + } }; } // namespace JSC diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/AssemblerBuffer.h b/src/3rdparty/webkit/JavaScriptCore/assembler/AssemblerBuffer.h index 7a5a8d322..073906a52 100644 --- a/src/3rdparty/webkit/JavaScriptCore/assembler/AssemblerBuffer.h +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/AssemblerBuffer.h @@ -95,12 +95,14 @@ namespace JSC { void putIntUnchecked(int value) { + ASSERT(!(m_size > m_capacity - 4)); *reinterpret_cast(&m_buffer[m_size]) = value; m_size += 4; } void putInt64Unchecked(int64_t value) { + ASSERT(!(m_size > m_capacity - 8)); *reinterpret_cast(&m_buffer[m_size]) = value; m_size += 8; } @@ -137,10 +139,19 @@ namespace JSC { return memcpy(result, m_buffer, m_size); } - private: - void grow() + protected: + void append(const char* data, int size) + { + if (m_size > m_capacity - size) + grow(size); + + memcpy(m_buffer + m_size, data, size); + m_size += size; + } + + void grow(int extraCapacity = 0) { - m_capacity += m_capacity / 2; + m_capacity += m_capacity / 2 + extraCapacity; if (m_buffer == m_inlineBuffer) { char* newBuffer = static_cast(fastMalloc(m_capacity)); diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h b/src/3rdparty/webkit/JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h new file mode 100644 index 000000000..f15b7f334 --- /dev/null +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h @@ -0,0 +1,305 @@ +/* + * Copyright (C) 2009 University of Szeged + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF SZEGED ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UNIVERSITY OF SZEGED OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef AssemblerBufferWithConstantPool_h +#define AssemblerBufferWithConstantPool_h + +#include + +#if ENABLE(ASSEMBLER) + +#include "AssemblerBuffer.h" +#include + +namespace JSC { + +/* + On a constant pool 4 or 8 bytes data can be stored. The values can be + constants or addresses. The addresses should be 32 or 64 bits. The constants + should be double-precisions float or integer numbers which are hard to be + encoded as few machine instructions. + + TODO: The pool is desinged to handle both 32 and 64 bits values, but + currently only the 4 bytes constants are implemented and tested. + + The AssemblerBuffer can contain multiple constant pools. Each pool is inserted + into the instruction stream - protected by a jump instruction from the + execution flow. + + The flush mechanism is called when no space remain to insert the next instruction + into the pool. Three values are used to determine when the constant pool itself + have to be inserted into the instruction stream (Assembler Buffer): + + - maxPoolSize: size of the constant pool in bytes, this value cannot be + larger than the maximum offset of a PC relative memory load + + - barrierSize: size of jump instruction in bytes which protects the + constant pool from execution + + - maxInstructionSize: maximum length of a machine instruction in bytes + + There are some callbacks which solve the target architecture specific + address handling: + + - TYPE patchConstantPoolLoad(TYPE load, int value): + patch the 'load' instruction with the index of the constant in the + constant pool and return the patched instruction. + + - void patchConstantPoolLoad(void* loadAddr, void* constPoolAddr): + patch the a PC relative load instruction at 'loadAddr' address with the + final relative offset. The offset can be computed with help of + 'constPoolAddr' (the address of the constant pool) and index of the + constant (which is stored previously in the load instruction itself). + + - TYPE placeConstantPoolBarrier(int size): + return with a constant pool barrier instruction which jumps over the + constant pool. + + The 'put*WithConstant*' functions should be used to place a data into the + constant pool. +*/ + +template +class AssemblerBufferWithConstantPool: public AssemblerBuffer { + typedef WTF::SegmentedVector LoadOffsets; +public: + enum { + UniqueConst, + ReusableConst, + UnusedEntry, + }; + + AssemblerBufferWithConstantPool() + : AssemblerBuffer() + , m_numConsts(0) + , m_maxDistance(maxPoolSize) + , m_lastConstDelta(0) + { + m_pool = static_cast(fastMalloc(maxPoolSize)); + m_mask = static_cast(fastMalloc(maxPoolSize / sizeof(uint32_t))); + } + + ~AssemblerBufferWithConstantPool() + { + fastFree(m_mask); + fastFree(m_pool); + } + + void ensureSpace(int space) + { + flushIfNoSpaceFor(space); + AssemblerBuffer::ensureSpace(space); + } + + void ensureSpace(int insnSpace, int constSpace) + { + flushIfNoSpaceFor(insnSpace, constSpace); + AssemblerBuffer::ensureSpace(insnSpace); + } + + bool isAligned(int alignment) + { + flushIfNoSpaceFor(alignment); + return AssemblerBuffer::isAligned(alignment); + } + + void putByteUnchecked(int value) + { + AssemblerBuffer::putByteUnchecked(value); + correctDeltas(1); + } + + void putByte(int value) + { + flushIfNoSpaceFor(1); + AssemblerBuffer::putByte(value); + correctDeltas(1); + } + + void putShortUnchecked(int value) + { + AssemblerBuffer::putShortUnchecked(value); + correctDeltas(2); + } + + void putShort(int value) + { + flushIfNoSpaceFor(2); + AssemblerBuffer::putShort(value); + correctDeltas(2); + } + + void putIntUnchecked(int value) + { + AssemblerBuffer::putIntUnchecked(value); + correctDeltas(4); + } + + void putInt(int value) + { + flushIfNoSpaceFor(4); + AssemblerBuffer::putInt(value); + correctDeltas(4); + } + + void putInt64Unchecked(int64_t value) + { + AssemblerBuffer::putInt64Unchecked(value); + correctDeltas(8); + } + + int size() + { + flushIfNoSpaceFor(maxInstructionSize, sizeof(uint64_t)); + return AssemblerBuffer::size(); + } + + void* executableCopy(ExecutablePool* allocator) + { + flushConstantPool(false); + return AssemblerBuffer::executableCopy(allocator); + } + + void putIntWithConstantInt(uint32_t insn, uint32_t constant, bool isReusable = false) + { + flushIfNoSpaceFor(4, 4); + + m_loadOffsets.append(AssemblerBuffer::size()); + if (isReusable) + for (int i = 0; i < m_numConsts; ++i) { + if (m_mask[i] == ReusableConst && m_pool[i] == constant) { + AssemblerBuffer::putInt(AssemblerType::patchConstantPoolLoad(insn, i)); + correctDeltas(4); + return; + } + } + + m_pool[m_numConsts] = constant; + m_mask[m_numConsts] = static_cast(isReusable ? ReusableConst : UniqueConst); + + AssemblerBuffer::putInt(AssemblerType::patchConstantPoolLoad(insn, m_numConsts)); + ++m_numConsts; + + correctDeltas(4, 4); + } + + // This flushing mechanism can be called after any unconditional jumps. + void flushWithoutBarrier() + { + // Flush if constant pool is more than 60% full to avoid overuse of this function. + if (5 * m_numConsts > 3 * maxPoolSize / sizeof(uint32_t)) + flushConstantPool(false); + } + + uint32_t* poolAddress() + { + return m_pool; + } + +private: + void correctDeltas(int insnSize) + { + m_maxDistance -= insnSize; + m_lastConstDelta -= insnSize; + if (m_lastConstDelta < 0) + m_lastConstDelta = 0; + } + + void correctDeltas(int insnSize, int constSize) + { + correctDeltas(insnSize); + + m_maxDistance -= m_lastConstDelta; + m_lastConstDelta = constSize; + } + + void flushConstantPool(bool useBarrier = true) + { + if (m_numConsts == 0) + return; + int alignPool = (AssemblerBuffer::size() + (useBarrier ? barrierSize : 0)) & (sizeof(uint64_t) - 1); + + if (alignPool) + alignPool = sizeof(uint64_t) - alignPool; + + // Callback to protect the constant pool from execution + if (useBarrier) + AssemblerBuffer::putInt(AssemblerType::placeConstantPoolBarrier(m_numConsts * sizeof(uint32_t) + alignPool)); + + if (alignPool) { + if (alignPool & 1) + AssemblerBuffer::putByte(AssemblerType::padForAlign8); + if (alignPool & 2) + AssemblerBuffer::putShort(AssemblerType::padForAlign16); + if (alignPool & 4) + AssemblerBuffer::putInt(AssemblerType::padForAlign32); + } + + int constPoolOffset = AssemblerBuffer::size(); + append(reinterpret_cast(m_pool), m_numConsts * sizeof(uint32_t)); + + // Patch each PC relative load + for (LoadOffsets::Iterator iter = m_loadOffsets.begin(); iter != m_loadOffsets.end(); ++iter) { + void* loadAddr = reinterpret_cast(m_buffer + *iter); + AssemblerType::patchConstantPoolLoad(loadAddr, reinterpret_cast(m_buffer + constPoolOffset)); + } + + m_loadOffsets.clear(); + m_numConsts = 0; + m_maxDistance = maxPoolSize; + } + + void flushIfNoSpaceFor(int nextInsnSize) + { + if (m_numConsts == 0) + return; + if ((m_maxDistance < nextInsnSize + m_lastConstDelta + barrierSize + (int)sizeof(uint32_t))) + flushConstantPool(); + } + + void flushIfNoSpaceFor(int nextInsnSize, int nextConstSize) + { + if (m_numConsts == 0) + return; + if ((m_maxDistance < nextInsnSize + m_lastConstDelta + barrierSize + (int)sizeof(uint32_t)) || + (m_numConsts + nextConstSize / sizeof(uint32_t) >= maxPoolSize)) + flushConstantPool(); + } + + uint32_t* m_pool; + char* m_mask; + LoadOffsets m_loadOffsets; + + int m_numConsts; + int m_maxDistance; + int m_lastConstDelta; +}; + +} // namespace JSC + +#endif // ENABLE(ASSEMBLER) + +#endif // AssemblerBufferWithConstantPool_h diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/LinkBuffer.h b/src/3rdparty/webkit/JavaScriptCore/assembler/LinkBuffer.h new file mode 100644 index 000000000..6d0811703 --- /dev/null +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/LinkBuffer.h @@ -0,0 +1,195 @@ +/* + * Copyright (C) 2009 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef LinkBuffer_h +#define LinkBuffer_h + +#include + +#if ENABLE(ASSEMBLER) + +#include +#include + +namespace JSC { + +// LinkBuffer: +// +// This class assists in linking code generated by the macro assembler, once code generation +// has been completed, and the code has been copied to is final location in memory. At this +// time pointers to labels within the code may be resolved, and relative offsets to external +// addresses may be fixed. +// +// Specifically: +// * Jump objects may be linked to external targets, +// * The address of Jump objects may taken, such that it can later be relinked. +// * The return address of a Call may be acquired. +// * The address of a Label pointing into the code may be resolved. +// * The value referenced by a DataLabel may be set. +// +class LinkBuffer : public Noncopyable { + typedef MacroAssemblerCodeRef CodeRef; + typedef MacroAssembler::Label Label; + typedef MacroAssembler::Jump Jump; + typedef MacroAssembler::JumpList JumpList; + typedef MacroAssembler::Call Call; + typedef MacroAssembler::DataLabel32 DataLabel32; + typedef MacroAssembler::DataLabelPtr DataLabelPtr; + +public: + // Note: Initialization sequence is significant, since executablePool is a PassRefPtr. + // First, executablePool is copied into m_executablePool, then the initialization of + // m_code uses m_executablePool, *not* executablePool, since this is no longer valid. + LinkBuffer(MacroAssembler* masm, PassRefPtr executablePool) + : m_executablePool(executablePool) + , m_code(masm->m_assembler.executableCopy(m_executablePool.get())) + , m_size(masm->m_assembler.size()) +#ifndef NDEBUG + , m_completed(false) +#endif + { + } + + ~LinkBuffer() + { + ASSERT(m_completed); + } + + // These methods are used to link or set values at code generation time. + + void link(Call call, FunctionPtr function) + { + ASSERT(call.isFlagSet(Call::Linkable)); + MacroAssembler::linkCall(code(), call, function); + } + + void link(Jump jump, CodeLocationLabel label) + { + MacroAssembler::linkJump(code(), jump, label); + } + + void link(JumpList list, CodeLocationLabel label) + { + for (unsigned i = 0; i < list.m_jumps.size(); ++i) + MacroAssembler::linkJump(code(), list.m_jumps[i], label); + } + + void patch(DataLabelPtr label, void* value) + { + MacroAssembler::linkPointer(code(), label.m_label, value); + } + + void patch(DataLabelPtr label, CodeLocationLabel value) + { + MacroAssembler::linkPointer(code(), label.m_label, value.executableAddress()); + } + + // These methods are used to obtain handles to allow the code to be relinked / repatched later. + + CodeLocationCall locationOf(Call call) + { + ASSERT(call.isFlagSet(Call::Linkable)); + ASSERT(!call.isFlagSet(Call::Near)); + return CodeLocationCall(MacroAssembler::getLinkerAddress(code(), call.m_jmp)); + } + + CodeLocationNearCall locationOfNearCall(Call call) + { + ASSERT(call.isFlagSet(Call::Linkable)); + ASSERT(call.isFlagSet(Call::Near)); + return CodeLocationNearCall(MacroAssembler::getLinkerAddress(code(), call.m_jmp)); + } + + CodeLocationLabel locationOf(Label label) + { + return CodeLocationLabel(MacroAssembler::getLinkerAddress(code(), label.m_label)); + } + + CodeLocationDataLabelPtr locationOf(DataLabelPtr label) + { + return CodeLocationDataLabelPtr(MacroAssembler::getLinkerAddress(code(), label.m_label)); + } + + CodeLocationDataLabel32 locationOf(DataLabel32 label) + { + return CodeLocationDataLabel32(MacroAssembler::getLinkerAddress(code(), label.m_label)); + } + + // This method obtains the return address of the call, given as an offset from + // the start of the code. + unsigned returnAddressOffset(Call call) + { + return MacroAssembler::getLinkerCallReturnOffset(call); + } + + // Upon completion of all patching either 'finalizeCode()' or 'finalizeCodeAddendum()' should be called + // once to complete generation of the code. 'finalizeCode()' is suited to situations + // where the executable pool must also be retained, the lighter-weight 'finalizeCodeAddendum()' is + // suited to adding to an existing allocation. + CodeRef finalizeCode() + { + performFinalization(); + + return CodeRef(m_code, m_executablePool, m_size); + } + CodeLocationLabel finalizeCodeAddendum() + { + performFinalization(); + + return CodeLocationLabel(code()); + } + +private: + // Keep this private! - the underlying code should only be obtained externally via + // finalizeCode() or finalizeCodeAddendum(). + void* code() + { + return m_code; + } + + void performFinalization() + { +#ifndef NDEBUG + ASSERT(!m_completed); + m_completed = true; +#endif + + ExecutableAllocator::makeExecutable(code(), m_size); + ExecutableAllocator::cacheFlush(code(), m_size); + } + + RefPtr m_executablePool; + void* m_code; + size_t m_size; +#ifndef NDEBUG + bool m_completed; +#endif +}; + +} // namespace JSC + +#endif // ENABLE(ASSEMBLER) + +#endif // LinkBuffer_h diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssembler.h b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssembler.h index 43d27e7e1..9e1c5d3a4 100644 --- a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssembler.h +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssembler.h @@ -34,6 +34,10 @@ #include "MacroAssemblerARMv7.h" namespace JSC { typedef MacroAssemblerARMv7 MacroAssemblerBase; }; +#elif PLATFORM(ARM) +#include "MacroAssemblerARM.h" +namespace JSC { typedef MacroAssemblerARM MacroAssemblerBase; }; + #elif PLATFORM(X86) #include "MacroAssemblerX86.h" namespace JSC { typedef MacroAssemblerX86 MacroAssemblerBase; }; diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerARM.h b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerARM.h new file mode 100644 index 000000000..27879a956 --- /dev/null +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerARM.h @@ -0,0 +1,797 @@ +/* + * Copyright (C) 2008 Apple Inc. + * Copyright (C) 2009 University of Szeged + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef MacroAssemblerARM_h +#define MacroAssemblerARM_h + +#include + +#if ENABLE(ASSEMBLER) && PLATFORM(ARM) + +#include "ARMAssembler.h" +#include "AbstractMacroAssembler.h" + +namespace JSC { + +class MacroAssemblerARM : public AbstractMacroAssembler { +public: + enum Condition { + Equal = ARMAssembler::EQ, + NotEqual = ARMAssembler::NE, + Above = ARMAssembler::HI, + AboveOrEqual = ARMAssembler::CS, + Below = ARMAssembler::CC, + BelowOrEqual = ARMAssembler::LS, + GreaterThan = ARMAssembler::GT, + GreaterThanOrEqual = ARMAssembler::GE, + LessThan = ARMAssembler::LT, + LessThanOrEqual = ARMAssembler::LE, + Overflow = ARMAssembler::VS, + Signed = ARMAssembler::MI, + Zero = ARMAssembler::EQ, + NonZero = ARMAssembler::NE + }; + + enum DoubleCondition { + DoubleEqual, //FIXME + DoubleNotEqual, //FIXME + DoubleGreaterThan, //FIXME + DoubleGreaterThanOrEqual, //FIXME + DoubleLessThan, //FIXME + DoubleLessThanOrEqual, //FIXME + }; + + static const RegisterID stackPointerRegister = ARM::sp; + + static const Scale ScalePtr = TimesFour; + + void add32(RegisterID src, RegisterID dest) + { + m_assembler.adds_r(dest, dest, src); + } + + void add32(Imm32 imm, Address address) + { + load32(address, ARM::S1); + add32(imm, ARM::S1); + store32(ARM::S1, address); + } + + void add32(Imm32 imm, RegisterID dest) + { + m_assembler.adds_r(dest, dest, m_assembler.getImm(imm.m_value, ARM::S0)); + } + + void add32(Address src, RegisterID dest) + { + load32(src, ARM::S1); + add32(ARM::S1, dest); + } + + void and32(RegisterID src, RegisterID dest) + { + m_assembler.ands_r(dest, dest, src); + } + + void and32(Imm32 imm, RegisterID dest) + { + ARMWord w = m_assembler.getImm(imm.m_value, ARM::S0, true); + if (w & ARMAssembler::OP2_INV_IMM) + m_assembler.bics_r(dest, dest, w & ~ARMAssembler::OP2_INV_IMM); + else + m_assembler.ands_r(dest, dest, w); + } + + void lshift32(Imm32 imm, RegisterID dest) + { + m_assembler.movs_r(dest, m_assembler.lsl(dest, imm.m_value & 0x1f)); + } + + void lshift32(RegisterID shift_amount, RegisterID dest) + { + m_assembler.movs_r(dest, m_assembler.lsl_r(dest, shift_amount)); + } + + void mul32(RegisterID src, RegisterID dest) + { + if (src == dest) { + move(src, ARM::S0); + src = ARM::S0; + } + m_assembler.muls_r(dest, dest, src); + } + + void mul32(Imm32 imm, RegisterID src, RegisterID dest) + { + move(imm, ARM::S0); + m_assembler.muls_r(dest, src, ARM::S0); + } + + void not32(RegisterID dest) + { + m_assembler.mvns_r(dest, dest); + } + + void or32(RegisterID src, RegisterID dest) + { + m_assembler.orrs_r(dest, dest, src); + } + + void or32(Imm32 imm, RegisterID dest) + { + m_assembler.orrs_r(dest, dest, m_assembler.getImm(imm.m_value, ARM::S0)); + } + + void rshift32(RegisterID shift_amount, RegisterID dest) + { + m_assembler.movs_r(dest, m_assembler.asr_r(dest, shift_amount)); + } + + void rshift32(Imm32 imm, RegisterID dest) + { + m_assembler.movs_r(dest, m_assembler.asr(dest, imm.m_value & 0x1f)); + } + + void sub32(RegisterID src, RegisterID dest) + { + m_assembler.subs_r(dest, dest, src); + } + + void sub32(Imm32 imm, RegisterID dest) + { + m_assembler.subs_r(dest, dest, m_assembler.getImm(imm.m_value, ARM::S0)); + } + + void sub32(Imm32 imm, Address address) + { + load32(address, ARM::S1); + sub32(imm, ARM::S1); + store32(ARM::S1, address); + } + + void sub32(Address src, RegisterID dest) + { + load32(src, ARM::S1); + sub32(ARM::S1, dest); + } + + void xor32(RegisterID src, RegisterID dest) + { + m_assembler.eors_r(dest, dest, src); + } + + void xor32(Imm32 imm, RegisterID dest) + { + m_assembler.eors_r(dest, dest, m_assembler.getImm(imm.m_value, ARM::S0)); + } + + void load32(ImplicitAddress address, RegisterID dest) + { + m_assembler.dataTransfer32(true, dest, address.base, address.offset); + } + + void load32(BaseIndex address, RegisterID dest) + { + m_assembler.baseIndexTransfer32(true, dest, address.base, address.index, static_cast(address.scale), address.offset); + } + + DataLabel32 load32WithAddressOffsetPatch(Address address, RegisterID dest) + { + DataLabel32 dataLabel(this); + m_assembler.ldr_un_imm(ARM::S0, 0); + m_assembler.dtr_ur(true, dest, address.base, ARM::S0); + return dataLabel; + } + + Label loadPtrWithPatchToLEA(Address address, RegisterID dest) + { + Label label(this); + load32(address, dest); + return label; + } + + void load16(BaseIndex address, RegisterID dest) + { + m_assembler.add_r(ARM::S0, address.base, m_assembler.lsl(address.index, address.scale)); + if (address.offset>=0) + m_assembler.ldrh_u(dest, ARM::S0, ARMAssembler::getOp2Byte(address.offset)); + else + m_assembler.ldrh_d(dest, ARM::S0, ARMAssembler::getOp2Byte(-address.offset)); + } + + DataLabel32 store32WithAddressOffsetPatch(RegisterID src, Address address) + { + DataLabel32 dataLabel(this); + m_assembler.ldr_un_imm(ARM::S0, 0); + m_assembler.dtr_ur(false, src, address.base, ARM::S0); + return dataLabel; + } + + void store32(RegisterID src, ImplicitAddress address) + { + m_assembler.dataTransfer32(false, src, address.base, address.offset); + } + + void store32(RegisterID src, BaseIndex address) + { + m_assembler.baseIndexTransfer32(false, src, address.base, address.index, static_cast(address.scale), address.offset); + } + + void store32(Imm32 imm, ImplicitAddress address) + { + move(imm, ARM::S1); + store32(ARM::S1, address); + } + + void store32(RegisterID src, void* address) + { + m_assembler.moveImm(reinterpret_cast(address), ARM::S0); + m_assembler.dtr_u(false, src, ARM::S0, 0); + } + + void store32(Imm32 imm, void* address) + { + m_assembler.moveImm(reinterpret_cast(address), ARM::S0); + m_assembler.moveImm(imm.m_value, ARM::S1); + m_assembler.dtr_u(false, ARM::S1, ARM::S0, 0); + } + + void pop(RegisterID dest) + { + m_assembler.pop_r(dest); + } + + void push(RegisterID src) + { + m_assembler.push_r(src); + } + + void push(Address address) + { + load32(address, ARM::S1); + push(ARM::S1); + } + + void push(Imm32 imm) + { + move(imm, ARM::S0); + push(ARM::S0); + } + + void move(Imm32 imm, RegisterID dest) + { + m_assembler.moveImm(imm.m_value, dest); + } + + void move(RegisterID src, RegisterID dest) + { + m_assembler.mov_r(dest, src); + } + + void move(ImmPtr imm, RegisterID dest) + { + m_assembler.mov_r(dest, m_assembler.getImm(reinterpret_cast(imm.m_value), ARM::S0)); + } + + void swap(RegisterID reg1, RegisterID reg2) + { + m_assembler.mov_r(ARM::S0, reg1); + m_assembler.mov_r(reg1, reg2); + m_assembler.mov_r(reg2, ARM::S0); + } + + void signExtend32ToPtr(RegisterID src, RegisterID dest) + { + if (src != dest) + move(src, dest); + } + + void zeroExtend32ToPtr(RegisterID src, RegisterID dest) + { + if (src != dest) + move(src, dest); + } + + Jump branch32(Condition cond, RegisterID left, RegisterID right) + { + m_assembler.cmp_r(left, right); + return Jump(m_assembler.jmp(ARMCondition(cond))); + } + + Jump branch32(Condition cond, RegisterID left, Imm32 right) + { + m_assembler.cmp_r(left, m_assembler.getImm(right.m_value, ARM::S0)); + return Jump(m_assembler.jmp(ARMCondition(cond))); + } + + Jump branch32(Condition cond, RegisterID left, Address right) + { + load32(right, ARM::S1); + return branch32(cond, left, ARM::S1); + } + + Jump branch32(Condition cond, Address left, RegisterID right) + { + load32(left, ARM::S1); + return branch32(cond, ARM::S1, right); + } + + Jump branch32(Condition cond, Address left, Imm32 right) + { + load32(left, ARM::S1); + return branch32(cond, ARM::S1, right); + } + + Jump branch32(Condition cond, BaseIndex left, Imm32 right) + { + load32(left, ARM::S1); + return branch32(cond, ARM::S1, right); + } + + Jump branch16(Condition cond, BaseIndex left, RegisterID right) + { + UNUSED_PARAM(cond); + UNUSED_PARAM(left); + UNUSED_PARAM(right); + ASSERT_NOT_REACHED(); + return jump(); + } + + Jump branch16(Condition cond, BaseIndex left, Imm32 right) + { + load16(left, ARM::S0); + move(right, ARM::S1); + m_assembler.cmp_r(ARM::S0, ARM::S1); + return m_assembler.jmp(ARMCondition(cond)); + } + + Jump branchTest32(Condition cond, RegisterID reg, RegisterID mask) + { + ASSERT((cond == Zero) || (cond == NonZero)); + m_assembler.tst_r(reg, mask); + return Jump(m_assembler.jmp(ARMCondition(cond))); + } + + Jump branchTest32(Condition cond, RegisterID reg, Imm32 mask = Imm32(-1)) + { + ASSERT((cond == Zero) || (cond == NonZero)); + ARMWord w = m_assembler.getImm(mask.m_value, ARM::S0, true); + if (w & ARMAssembler::OP2_INV_IMM) + m_assembler.bics_r(ARM::S0, reg, w & ~ARMAssembler::OP2_INV_IMM); + else + m_assembler.tst_r(reg, w); + return Jump(m_assembler.jmp(ARMCondition(cond))); + } + + Jump branchTest32(Condition cond, Address address, Imm32 mask = Imm32(-1)) + { + load32(address, ARM::S1); + return branchTest32(cond, ARM::S1, mask); + } + + Jump branchTest32(Condition cond, BaseIndex address, Imm32 mask = Imm32(-1)) + { + load32(address, ARM::S1); + return branchTest32(cond, ARM::S1, mask); + } + + Jump jump() + { + return Jump(m_assembler.jmp()); + } + + void jump(RegisterID target) + { + move(target, ARM::pc); + } + + void jump(Address address) + { + load32(address, ARM::pc); + } + + Jump branchAdd32(Condition cond, RegisterID src, RegisterID dest) + { + ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); + add32(src, dest); + return Jump(m_assembler.jmp(ARMCondition(cond))); + } + + Jump branchAdd32(Condition cond, Imm32 imm, RegisterID dest) + { + ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); + add32(imm, dest); + return Jump(m_assembler.jmp(ARMCondition(cond))); + } + + void mull32(RegisterID src1, RegisterID src2, RegisterID dest) + { + if (src1 == dest) { + move(src1, ARM::S0); + src1 = ARM::S0; + } + m_assembler.mull_r(ARM::S1, dest, src2, src1); + m_assembler.cmp_r(ARM::S1, m_assembler.asr(dest, 31)); + } + + Jump branchMul32(Condition cond, RegisterID src, RegisterID dest) + { + ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); + if (cond == Overflow) { + mull32(src, dest, dest); + cond = NonZero; + } + else + mul32(src, dest); + return Jump(m_assembler.jmp(ARMCondition(cond))); + } + + Jump branchMul32(Condition cond, Imm32 imm, RegisterID src, RegisterID dest) + { + ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); + if (cond == Overflow) { + move(imm, ARM::S0); + mull32(ARM::S0, src, dest); + cond = NonZero; + } + else + mul32(imm, src, dest); + return Jump(m_assembler.jmp(ARMCondition(cond))); + } + + Jump branchSub32(Condition cond, RegisterID src, RegisterID dest) + { + ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); + sub32(src, dest); + return Jump(m_assembler.jmp(ARMCondition(cond))); + } + + Jump branchSub32(Condition cond, Imm32 imm, RegisterID dest) + { + ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); + sub32(imm, dest); + return Jump(m_assembler.jmp(ARMCondition(cond))); + } + + void breakpoint() + { + m_assembler.bkpt(0); + } + + Call nearCall() + { + prepareCall(); + return Call(m_assembler.jmp(), Call::LinkableNear); + } + + Call call(RegisterID target) + { + prepareCall(); + move(ARM::pc, target); + JmpSrc jmpSrc; + return Call(jmpSrc, Call::None); + } + + void call(Address address) + { + call32(address.base, address.offset); + } + + void ret() + { + pop(ARM::pc); + } + + void set32(Condition cond, RegisterID left, RegisterID right, RegisterID dest) + { + m_assembler.cmp_r(left, right); + m_assembler.mov_r(dest, ARMAssembler::getOp2(0)); + m_assembler.mov_r(dest, ARMAssembler::getOp2(1), ARMCondition(cond)); + } + + void set32(Condition cond, RegisterID left, Imm32 right, RegisterID dest) + { + m_assembler.cmp_r(left, m_assembler.getImm(right.m_value, ARM::S0)); + m_assembler.mov_r(dest, ARMAssembler::getOp2(0)); + m_assembler.mov_r(dest, ARMAssembler::getOp2(1), ARMCondition(cond)); + } + + void setTest32(Condition cond, Address address, Imm32 mask, RegisterID dest) + { + load32(address, ARM::S1); + if (mask.m_value == -1) + m_assembler.cmp_r(0, ARM::S1); + else + m_assembler.tst_r(ARM::S1, m_assembler.getImm(mask.m_value, ARM::S0)); + m_assembler.mov_r(dest, ARMAssembler::getOp2(0)); + m_assembler.mov_r(dest, ARMAssembler::getOp2(1), ARMCondition(cond)); + } + + void add32(Imm32 imm, RegisterID src, RegisterID dest) + { + m_assembler.add_r(dest, src, m_assembler.getImm(imm.m_value, ARM::S0)); + } + + void add32(Imm32 imm, AbsoluteAddress address) + { + m_assembler.moveImm(reinterpret_cast(address.m_ptr), ARM::S1); + m_assembler.dtr_u(true, ARM::S1, ARM::S1, 0); + add32(imm, ARM::S1); + m_assembler.moveImm(reinterpret_cast(address.m_ptr), ARM::S0); + m_assembler.dtr_u(false, ARM::S1, ARM::S0, 0); + } + + void sub32(Imm32 imm, AbsoluteAddress address) + { + m_assembler.moveImm(reinterpret_cast(address.m_ptr), ARM::S1); + m_assembler.dtr_u(true, ARM::S1, ARM::S1, 0); + sub32(imm, ARM::S1); + m_assembler.moveImm(reinterpret_cast(address.m_ptr), ARM::S0); + m_assembler.dtr_u(false, ARM::S1, ARM::S0, 0); + } + + void load32(void* address, RegisterID dest) + { + m_assembler.moveImm(reinterpret_cast(address), ARM::S0); + m_assembler.dtr_u(true, dest, ARM::S0, 0); + } + + Jump branch32(Condition cond, AbsoluteAddress left, RegisterID right) + { + load32(left.m_ptr, ARM::S1); + return branch32(cond, ARM::S1, right); + } + + Jump branch32(Condition cond, AbsoluteAddress left, Imm32 right) + { + load32(left.m_ptr, ARM::S1); + return branch32(cond, ARM::S1, right); + } + + Call call() + { + prepareCall(); + return Call(m_assembler.jmp(), Call::Linkable); + } + + Call tailRecursiveCall() + { + return Call::fromTailJump(jump()); + } + + Call makeTailRecursiveCall(Jump oldJump) + { + return Call::fromTailJump(oldJump); + } + + DataLabelPtr moveWithPatch(ImmPtr initialValue, RegisterID dest) + { + DataLabelPtr dataLabel(this); + m_assembler.ldr_un_imm(dest, reinterpret_cast(initialValue.m_value)); + return dataLabel; + } + + Jump branchPtrWithPatch(Condition cond, RegisterID left, DataLabelPtr& dataLabel, ImmPtr initialRightValue = ImmPtr(0)) + { + dataLabel = moveWithPatch(initialRightValue, ARM::S1); + Jump jump = branch32(cond, left, ARM::S1); + jump.enableLatePatch(); + return jump; + } + + Jump branchPtrWithPatch(Condition cond, Address left, DataLabelPtr& dataLabel, ImmPtr initialRightValue = ImmPtr(0)) + { + load32(left, ARM::S1); + dataLabel = moveWithPatch(initialRightValue, ARM::S0); + Jump jump = branch32(cond, ARM::S0, ARM::S1); + jump.enableLatePatch(); + return jump; + } + + DataLabelPtr storePtrWithPatch(ImmPtr initialValue, ImplicitAddress address) + { + DataLabelPtr dataLabel = moveWithPatch(initialValue, ARM::S1); + store32(ARM::S1, address); + return dataLabel; + } + + DataLabelPtr storePtrWithPatch(ImplicitAddress address) + { + return storePtrWithPatch(ImmPtr(0), address); + } + + // Floating point operators + bool supportsFloatingPoint() const + { + return false; + } + + bool supportsFloatingPointTruncate() const + { + return false; + } + + void loadDouble(ImplicitAddress address, FPRegisterID dest) + { + UNUSED_PARAM(address); + UNUSED_PARAM(dest); + ASSERT_NOT_REACHED(); + } + + void storeDouble(FPRegisterID src, ImplicitAddress address) + { + UNUSED_PARAM(src); + UNUSED_PARAM(address); + ASSERT_NOT_REACHED(); + } + + void addDouble(FPRegisterID src, FPRegisterID dest) + { + UNUSED_PARAM(src); + UNUSED_PARAM(dest); + ASSERT_NOT_REACHED(); + } + + void addDouble(Address src, FPRegisterID dest) + { + UNUSED_PARAM(src); + UNUSED_PARAM(dest); + ASSERT_NOT_REACHED(); + } + + void subDouble(FPRegisterID src, FPRegisterID dest) + { + UNUSED_PARAM(src); + UNUSED_PARAM(dest); + ASSERT_NOT_REACHED(); + } + + void subDouble(Address src, FPRegisterID dest) + { + UNUSED_PARAM(src); + UNUSED_PARAM(dest); + ASSERT_NOT_REACHED(); + } + + void mulDouble(FPRegisterID src, FPRegisterID dest) + { + UNUSED_PARAM(src); + UNUSED_PARAM(dest); + ASSERT_NOT_REACHED(); + } + + void mulDouble(Address src, FPRegisterID dest) + { + UNUSED_PARAM(src); + UNUSED_PARAM(dest); + ASSERT_NOT_REACHED(); + } + + void convertInt32ToDouble(RegisterID src, FPRegisterID dest) + { + UNUSED_PARAM(src); + UNUSED_PARAM(dest); + ASSERT_NOT_REACHED(); + } + + Jump branchDouble(DoubleCondition cond, FPRegisterID left, FPRegisterID right) + { + UNUSED_PARAM(cond); + UNUSED_PARAM(left); + UNUSED_PARAM(right); + ASSERT_NOT_REACHED(); + return jump(); + } + + // Truncates 'src' to an integer, and places the resulting 'dest'. + // If the result is not representable as a 32 bit value, branch. + // May also branch for some values that are representable in 32 bits + // (specifically, in this case, INT_MIN). + Jump branchTruncateDoubleToInt32(FPRegisterID src, RegisterID dest) + { + UNUSED_PARAM(src); + UNUSED_PARAM(dest); + ASSERT_NOT_REACHED(); + return jump(); + } + +protected: + ARMAssembler::Condition ARMCondition(Condition cond) + { + return static_cast(cond); + } + + void prepareCall() + { + m_assembler.ensureSpace(3 * sizeof(ARMWord), sizeof(ARMWord)); + + // S0 might be used for parameter passing + m_assembler.add_r(ARM::S1, ARM::pc, ARMAssembler::OP2_IMM | 0x4); + m_assembler.push_r(ARM::S1); + } + + void call32(RegisterID base, int32_t offset) + { + if (base == ARM::sp) + offset += 4; + + if (offset >= 0) { + if (offset <= 0xfff) { + prepareCall(); + m_assembler.dtr_u(true, ARM::pc, base, offset); + } else if (offset <= 0xfffff) { + m_assembler.add_r(ARM::S0, base, ARMAssembler::OP2_IMM | (offset >> 12) | (10 << 8)); + prepareCall(); + m_assembler.dtr_u(true, ARM::pc, ARM::S0, offset & 0xfff); + } else { + ARMWord reg = m_assembler.getImm(offset, ARM::S0); + prepareCall(); + m_assembler.dtr_ur(true, ARM::pc, base, reg); + } + } else { + offset = -offset; + if (offset <= 0xfff) { + prepareCall(); + m_assembler.dtr_d(true, ARM::pc, base, offset); + } else if (offset <= 0xfffff) { + m_assembler.sub_r(ARM::S0, base, ARMAssembler::OP2_IMM | (offset >> 12) | (10 << 8)); + prepareCall(); + m_assembler.dtr_d(true, ARM::pc, ARM::S0, offset & 0xfff); + } else { + ARMWord reg = m_assembler.getImm(offset, ARM::S0); + prepareCall(); + m_assembler.dtr_dr(true, ARM::pc, base, reg); + } + } + } + +private: + friend class LinkBuffer; + friend class RepatchBuffer; + + static void linkCall(void* code, Call call, FunctionPtr function) + { + ARMAssembler::linkCall(code, call.m_jmp, function.value()); + } + + static void repatchCall(CodeLocationCall call, CodeLocationLabel destination) + { + ARMAssembler::relinkCall(call.dataLocation(), destination.executableAddress()); + } + + static void repatchCall(CodeLocationCall call, FunctionPtr destination) + { + ARMAssembler::relinkCall(call.dataLocation(), destination.executableAddress()); + } + +}; + +} + +#endif + +#endif // MacroAssemblerARM_h diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerARMv7.h b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerARMv7.h index bd83c6036..f7a84027f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerARMv7.h +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerARMv7.h @@ -1054,6 +1054,25 @@ protected: { return static_cast(cond); } + +private: + friend class LinkBuffer; + friend class RepatchBuffer; + + static void linkCall(void* code, Call call, FunctionPtr function) + { + ARMv7Assembler::linkCall(code, call.m_jmp, function.value()); + } + + static void repatchCall(CodeLocationCall call, CodeLocationLabel destination) + { + ARMv7Assembler::relinkCall(call.dataLocation(), destination.executableAddress()); + } + + static void repatchCall(CodeLocationCall call, FunctionPtr destination) + { + ARMv7Assembler::relinkCall(call.dataLocation(), destination.executableAddress()); + } }; } // namespace JSC diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerCodeRef.h b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerCodeRef.h index 50fca5bd2..341a7ff33 100644 --- a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerCodeRef.h +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerCodeRef.h @@ -165,28 +165,20 @@ private: class MacroAssemblerCodeRef { public: MacroAssemblerCodeRef() -#ifndef NDEBUG : m_size(0) -#endif { } MacroAssemblerCodeRef(void* code, PassRefPtr executablePool, size_t size) : m_code(code) , m_executablePool(executablePool) + , m_size(size) { -#ifndef NDEBUG - m_size = size; -#else - UNUSED_PARAM(size); -#endif } MacroAssemblerCodePtr m_code; RefPtr m_executablePool; -#ifndef NDEBUG size_t m_size; -#endif }; } // namespace JSC diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerX86.h b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerX86.h index aaf98fdf2..0b9ff35d8 100644 --- a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerX86.h +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerX86.h @@ -164,6 +164,24 @@ public: private: const bool m_isSSE2Present; + + friend class LinkBuffer; + friend class RepatchBuffer; + + static void linkCall(void* code, Call call, FunctionPtr function) + { + X86Assembler::linkCall(code, call.m_jmp, function.value()); + } + + static void repatchCall(CodeLocationCall call, CodeLocationLabel destination) + { + X86Assembler::relinkCall(call.dataLocation(), destination.executableAddress()); + } + + static void repatchCall(CodeLocationCall call, FunctionPtr destination) + { + X86Assembler::relinkCall(call.dataLocation(), destination.executableAddress()); + } }; } // namespace JSC diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerX86_64.h b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerX86_64.h index ffdca7c50..df0090ac5 100644 --- a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerX86_64.h +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerX86_64.h @@ -32,6 +32,8 @@ #include "MacroAssemblerX86Common.h" +#define REPTACH_OFFSET_CALL_R11 3 + namespace JSC { class MacroAssemblerX86_64 : public MacroAssemblerX86Common { @@ -446,6 +448,29 @@ public: bool supportsFloatingPoint() const { return true; } // See comment on MacroAssemblerARMv7::supportsFloatingPointTruncate() bool supportsFloatingPointTruncate() const { return true; } + +private: + friend class LinkBuffer; + friend class RepatchBuffer; + + static void linkCall(void* code, Call call, FunctionPtr function) + { + if (!call.isFlagSet(Call::Near)) + X86Assembler::linkPointer(code, X86Assembler::labelFor(call.m_jmp, -REPTACH_OFFSET_CALL_R11), function.value()); + else + X86Assembler::linkCall(code, call.m_jmp, function.value()); + } + + static void repatchCall(CodeLocationCall call, CodeLocationLabel destination) + { + X86Assembler::repatchPointer(call.dataLabelPtrAtOffset(-REPTACH_OFFSET_CALL_R11).dataLocation(), destination.executableAddress()); + } + + static void repatchCall(CodeLocationCall call, FunctionPtr destination) + { + X86Assembler::repatchPointer(call.dataLabelPtrAtOffset(-REPTACH_OFFSET_CALL_R11).dataLocation(), destination.executableAddress()); + } + }; } // namespace JSC diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/RepatchBuffer.h b/src/3rdparty/webkit/JavaScriptCore/assembler/RepatchBuffer.h new file mode 100644 index 000000000..89cbf06d1 --- /dev/null +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/RepatchBuffer.h @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2009 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef RepatchBuffer_h +#define RepatchBuffer_h + +#include + +#if ENABLE(ASSEMBLER) + +#include +#include + +namespace JSC { + +// RepatchBuffer: +// +// This class is used to modify code after code generation has been completed, +// and after the code has potentially already been executed. This mechanism is +// used to apply optimizations to the code. +// +class RepatchBuffer { + typedef MacroAssemblerCodePtr CodePtr; + +public: + RepatchBuffer(CodeBlock* codeBlock) + { + JITCode& code = codeBlock->getJITCode(); + m_start = code.start(); + m_size = code.size(); + + ExecutableAllocator::makeWritable(m_start, m_size); + } + + ~RepatchBuffer() + { + ExecutableAllocator::makeExecutable(m_start, m_size); + } + + void relink(CodeLocationJump jump, CodeLocationLabel destination) + { + MacroAssembler::repatchJump(jump, destination); + } + + void relink(CodeLocationCall call, CodeLocationLabel destination) + { + MacroAssembler::repatchCall(call, destination); + } + + void relink(CodeLocationCall call, FunctionPtr destination) + { + MacroAssembler::repatchCall(call, destination); + } + + void relink(CodeLocationNearCall nearCall, CodePtr destination) + { + MacroAssembler::repatchNearCall(nearCall, CodeLocationLabel(destination)); + } + + void relink(CodeLocationNearCall nearCall, CodeLocationLabel destination) + { + MacroAssembler::repatchNearCall(nearCall, destination); + } + + void repatch(CodeLocationDataLabel32 dataLabel32, int32_t value) + { + MacroAssembler::repatchInt32(dataLabel32, value); + } + + void repatch(CodeLocationDataLabelPtr dataLabelPtr, void* value) + { + MacroAssembler::repatchPointer(dataLabelPtr, value); + } + + void repatchLoadPtrToLEA(CodeLocationInstruction instruction) + { + MacroAssembler::repatchLoadPtrToLEA(instruction); + } + + void relinkCallerToTrampoline(ReturnAddressPtr returnAddress, CodeLocationLabel label) + { + relink(CodeLocationCall(CodePtr(returnAddress)), label); + } + + void relinkCallerToTrampoline(ReturnAddressPtr returnAddress, CodePtr newCalleeFunction) + { + relinkCallerToTrampoline(returnAddress, CodeLocationLabel(newCalleeFunction)); + } + + void relinkCallerToFunction(ReturnAddressPtr returnAddress, FunctionPtr function) + { + relink(CodeLocationCall(CodePtr(returnAddress)), function); + } + + void relinkNearCallerToTrampoline(ReturnAddressPtr returnAddress, CodeLocationLabel label) + { + relink(CodeLocationNearCall(CodePtr(returnAddress)), label); + } + + void relinkNearCallerToTrampoline(ReturnAddressPtr returnAddress, CodePtr newCalleeFunction) + { + relinkNearCallerToTrampoline(returnAddress, CodeLocationLabel(newCalleeFunction)); + } + +private: + void* m_start; + size_t m_size; +}; + +} // namespace JSC + +#endif // ENABLE(ASSEMBLER) + +#endif // RepatchBuffer_h diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/X86Assembler.h b/src/3rdparty/webkit/JavaScriptCore/assembler/X86Assembler.h index 7a8b58da9..745bc60a7 100644 --- a/src/3rdparty/webkit/JavaScriptCore/assembler/X86Assembler.h +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/X86Assembler.h @@ -226,6 +226,7 @@ public: { } + void enableLatePatch() { } private: JmpSrc(int offset) : m_offset(offset) @@ -1344,6 +1345,11 @@ public: return JmpDst(m_formatter.size()); } + static JmpDst labelFor(JmpSrc jump, intptr_t offset = 0) + { + return JmpDst(jump.m_offset + offset); + } + JmpDst align(int alignment) { while (!m_formatter.isAligned(alignment)) @@ -1366,59 +1372,48 @@ public: ASSERT(to.m_offset != -1); char* code = reinterpret_cast(m_formatter.data()); - patchRel32(code + from.m_offset, code + to.m_offset); + setRel32(code + from.m_offset, code + to.m_offset); } static void linkJump(void* code, JmpSrc from, void* to) { ASSERT(from.m_offset != -1); - patchRel32(reinterpret_cast(code) + from.m_offset, to); + setRel32(reinterpret_cast(code) + from.m_offset, to); } static void linkCall(void* code, JmpSrc from, void* to) { ASSERT(from.m_offset != -1); - patchRel32(reinterpret_cast(code) + from.m_offset, to); + setRel32(reinterpret_cast(code) + from.m_offset, to); } -#if PLATFORM(X86_64) - static void patchPointerForCall(void* where, void* value) - { - reinterpret_cast(where)[-1] = value; - } -#endif - - static void patchPointer(void* code, JmpDst where, void* value) + static void linkPointer(void* code, JmpDst where, void* value) { ASSERT(where.m_offset != -1); - patchPointer(reinterpret_cast(code) + where.m_offset, value); + setPointer(reinterpret_cast(code) + where.m_offset, value); } static void relinkJump(void* from, void* to) { - ExecutableAllocator::MakeWritable unprotect(reinterpret_cast(from) - sizeof(int32_t), sizeof(int32_t)); - patchRel32(from, to); + setRel32(from, to); } static void relinkCall(void* from, void* to) { - ExecutableAllocator::MakeWritable unprotect(reinterpret_cast(from) - sizeof(int32_t), sizeof(int32_t)); - patchRel32(from, to); + setRel32(from, to); } static void repatchInt32(void* where, int32_t value) { - ExecutableAllocator::MakeWritable unprotect(reinterpret_cast(where) - sizeof(int32_t), sizeof(int32_t)); - patchInt32(where, value); + setInt32(where, value); } static void repatchPointer(void* where, void* value) { - ExecutableAllocator::MakeWritable unprotect(reinterpret_cast(where) - sizeof(void*), sizeof(void*)); - patchPointer(where, value); + setPointer(where, value); } static void repatchLoadPtrToLEA(void* where) @@ -1428,7 +1423,6 @@ public: // Skip over the prefix byte. where = reinterpret_cast(where) + 1; #endif - ExecutableAllocator::MakeWritable unprotect(where, 1); *reinterpret_cast(where) = static_cast(OP_LEA); } @@ -1476,22 +1470,22 @@ public: private: - static void patchPointer(void* where, void* value) + static void setPointer(void* where, void* value) { reinterpret_cast(where)[-1] = value; } - static void patchInt32(void* where, int32_t value) + static void setInt32(void* where, int32_t value) { reinterpret_cast(where)[-1] = value; } - static void patchRel32(void* from, void* to) + static void setRel32(void* from, void* to) { intptr_t offset = reinterpret_cast(to) - reinterpret_cast(from); ASSERT(offset == static_cast(offset)); - patchInt32(from, offset); + setInt32(from, offset); } class X86InstructionFormatter { diff --git a/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp b/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp index 5dae9523d..0cb381331 100644 --- a/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp @@ -1319,8 +1319,12 @@ CodeBlock::~CodeBlock() } for (size_t size = m_methodCallLinkInfos.size(), i = 0; i < size; ++i) { - if (Structure* structure = m_methodCallLinkInfos[i].cachedStructure) + if (Structure* structure = m_methodCallLinkInfos[i].cachedStructure) { structure->deref(); + // Both members must be filled at the same time + ASSERT(m_methodCallLinkInfos[i].cachedPrototypeStructure); + m_methodCallLinkInfos[i].cachedPrototypeStructure->deref(); + } } unlinkCallers(); diff --git a/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.h b/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.h index 64b6c9858..e9f2697ec 100644 --- a/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.h +++ b/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.h @@ -105,6 +105,7 @@ namespace JSC { CodeLocationNearCall callReturnLocation; CodeLocationDataLabelPtr hotPathBegin; CodeLocationNearCall hotPathOther; + CodeBlock* ownerCodeBlock; CodeBlock* callee; unsigned position; @@ -115,12 +116,14 @@ namespace JSC { struct MethodCallLinkInfo { MethodCallLinkInfo() : cachedStructure(0) + , cachedPrototypeStructure(0) { } CodeLocationCall callReturnLocation; CodeLocationDataLabelPtr structureLabel; Structure* cachedStructure; + Structure* cachedPrototypeStructure; }; struct FunctionRegisterInfo { @@ -221,7 +224,7 @@ namespace JSC { } #endif - class CodeBlock : public WTF::FastAllocBase { + class CodeBlock : public FastAllocBase { friend class JIT; public: CodeBlock(ScopeNode* ownerNode); @@ -317,6 +320,7 @@ namespace JSC { #endif #if ENABLE(JIT) + JITCode& getJITCode() { return ownerNode()->generatedJITCode(); } void setJITCode(JITCode); ExecutablePool* executablePool() { return ownerNode()->getExecutablePool(); } #endif @@ -493,7 +497,7 @@ namespace JSC { SymbolTable m_symbolTable; - struct ExceptionInfo { + struct ExceptionInfo : FastAllocBase { Vector m_expressionInfo; Vector m_lineInfo; Vector m_getByIdExceptionInfo; @@ -504,7 +508,7 @@ namespace JSC { }; OwnPtr m_exceptionInfo; - struct RareData { + struct RareData : FastAllocBase { Vector m_exceptionHandlers; // Rare Constants diff --git a/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h b/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h index 27b016eeb..2d1ca981b 100644 --- a/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h +++ b/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h @@ -181,7 +181,7 @@ namespace JSC { #define OPCODE_ID_LENGTHS(id, length) const int id##_length = length; FOR_EACH_OPCODE_ID(OPCODE_ID_LENGTHS); - #undef OPCODE_ID_SIZES + #undef OPCODE_ID_LENGTHS #define OPCODE_LENGTH(opcode) opcode##_length diff --git a/src/3rdparty/webkit/JavaScriptCore/bytecode/SamplingTool.h b/src/3rdparty/webkit/JavaScriptCore/bytecode/SamplingTool.h index 7d7dc9c95..fa95603a0 100644 --- a/src/3rdparty/webkit/JavaScriptCore/bytecode/SamplingTool.h +++ b/src/3rdparty/webkit/JavaScriptCore/bytecode/SamplingTool.h @@ -140,7 +140,7 @@ namespace JSC { friend class HostCallRecord; #if ENABLE(OPCODE_SAMPLING) - class CallRecord : Noncopyable { + class CallRecord : public Noncopyable { public: CallRecord(SamplingTool* samplingTool) : m_samplingTool(samplingTool) @@ -170,7 +170,7 @@ namespace JSC { } }; #else - class CallRecord : Noncopyable { + class CallRecord : public Noncopyable { public: CallRecord(SamplingTool*) { diff --git a/src/3rdparty/webkit/JavaScriptCore/bytecompiler/RegisterID.h b/src/3rdparty/webkit/JavaScriptCore/bytecompiler/RegisterID.h index 0223c2a13..3532ad802 100644 --- a/src/3rdparty/webkit/JavaScriptCore/bytecompiler/RegisterID.h +++ b/src/3rdparty/webkit/JavaScriptCore/bytecompiler/RegisterID.h @@ -35,7 +35,7 @@ namespace JSC { - class RegisterID : Noncopyable { + class RegisterID : public Noncopyable { public: RegisterID() : m_refCount(0) diff --git a/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp b/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp index 4e16e259a..94b96544a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp @@ -113,8 +113,12 @@ #include "CommonIdentifiers.h" #include "NodeInfo.h" #include "Parser.h" +#include #include +#define YYMALLOC fastMalloc +#define YYFREE fastFree + #define YYMAXDEPTH 10000 #define YYENABLE_NLS 0 @@ -165,12 +169,6 @@ static ExpressionNode* combineCommaNodes(void*, ExpressionNode* list, Expression #pragma warning(disable: 4244) #pragma warning(disable: 4702) -// At least some of the time, the declarations of malloc and free that bison -// generates are causing warnings. A way to avoid this is to explicitly define -// the macros so that bison doesn't try to declare malloc and free. -#define YYMALLOC malloc -#define YYFREE free - #endif #define YYPARSE_PARAM globalPtr @@ -232,7 +230,7 @@ static inline void appendToVarDeclarationList(void* globalPtr, ParserArenaData(new (GLOBAL_DATA) NullNode(GLOBAL_DATA), 0, 1); ;} break; case 3: /* Line 1455 of yacc.c */ -#line 291 "../parser/Grammar.y" +#line 289 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BooleanNode(GLOBAL_DATA, true), 0, 1); ;} break; case 4: /* Line 1455 of yacc.c */ -#line 292 "../parser/Grammar.y" +#line 290 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BooleanNode(GLOBAL_DATA, false), 0, 1); ;} break; case 5: /* Line 1455 of yacc.c */ -#line 293 "../parser/Grammar.y" +#line 291 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeNumberNode(GLOBAL_DATA, (yyvsp[(1) - (1)].doubleValue)), 0, 1); ;} break; case 6: /* Line 1455 of yacc.c */ -#line 294 "../parser/Grammar.y" +#line 292 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) StringNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident)), 0, 1); ;} break; case 7: /* Line 1455 of yacc.c */ -#line 295 "../parser/Grammar.y" +#line 293 "../parser/Grammar.y" { Lexer& l = *LEXER; if (!l.scanRegExp()) @@ -3020,7 +3018,7 @@ yyreduce: case 8: /* Line 1455 of yacc.c */ -#line 304 "../parser/Grammar.y" +#line 302 "../parser/Grammar.y" { Lexer& l = *LEXER; if (!l.scanRegExp()) @@ -3035,35 +3033,35 @@ yyreduce: case 9: /* Line 1455 of yacc.c */ -#line 316 "../parser/Grammar.y" +#line 314 "../parser/Grammar.y" { (yyval.propertyNode) = createNodeInfo(new (GLOBAL_DATA) PropertyNode(GLOBAL_DATA, *(yyvsp[(1) - (3)].ident), (yyvsp[(3) - (3)].expressionNode).m_node, PropertyNode::Constant), (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 10: /* Line 1455 of yacc.c */ -#line 317 "../parser/Grammar.y" +#line 315 "../parser/Grammar.y" { (yyval.propertyNode) = createNodeInfo(new (GLOBAL_DATA) PropertyNode(GLOBAL_DATA, *(yyvsp[(1) - (3)].ident), (yyvsp[(3) - (3)].expressionNode).m_node, PropertyNode::Constant), (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 11: /* Line 1455 of yacc.c */ -#line 318 "../parser/Grammar.y" +#line 316 "../parser/Grammar.y" { (yyval.propertyNode) = createNodeInfo(new (GLOBAL_DATA) PropertyNode(GLOBAL_DATA, Identifier(GLOBAL_DATA, UString::from((yyvsp[(1) - (3)].doubleValue))), (yyvsp[(3) - (3)].expressionNode).m_node, PropertyNode::Constant), (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 12: /* Line 1455 of yacc.c */ -#line 319 "../parser/Grammar.y" +#line 317 "../parser/Grammar.y" { (yyval.propertyNode) = createNodeInfo(makeGetterOrSetterPropertyNode(globalPtr, *(yyvsp[(1) - (7)].ident), *(yyvsp[(2) - (7)].ident), 0, (yyvsp[(6) - (7)].functionBodyNode), LEXER->sourceCode((yyvsp[(5) - (7)].intValue), (yyvsp[(7) - (7)].intValue), (yylsp[(5) - (7)]).first_line)), ClosureFeature, 0); DBG((yyvsp[(6) - (7)].functionBodyNode), (yylsp[(5) - (7)]), (yylsp[(7) - (7)])); if (!(yyval.propertyNode).m_node) YYABORT; ;} break; case 13: /* Line 1455 of yacc.c */ -#line 321 "../parser/Grammar.y" +#line 319 "../parser/Grammar.y" { (yyval.propertyNode) = createNodeInfo(makeGetterOrSetterPropertyNode(globalPtr, *(yyvsp[(1) - (8)].ident), *(yyvsp[(2) - (8)].ident), (yyvsp[(4) - (8)].parameterList).m_node.head, (yyvsp[(7) - (8)].functionBodyNode), LEXER->sourceCode((yyvsp[(6) - (8)].intValue), (yyvsp[(8) - (8)].intValue), (yylsp[(6) - (8)]).first_line)), (yyvsp[(4) - (8)].parameterList).m_features | ClosureFeature, 0); if ((yyvsp[(4) - (8)].parameterList).m_features & ArgumentsFeature) @@ -3077,7 +3075,7 @@ yyreduce: case 14: /* Line 1455 of yacc.c */ -#line 332 "../parser/Grammar.y" +#line 330 "../parser/Grammar.y" { (yyval.propertyList).m_node.head = new (GLOBAL_DATA) PropertyListNode(GLOBAL_DATA, (yyvsp[(1) - (1)].propertyNode).m_node); (yyval.propertyList).m_node.tail = (yyval.propertyList).m_node.head; (yyval.propertyList).m_features = (yyvsp[(1) - (1)].propertyNode).m_features; @@ -3087,7 +3085,7 @@ yyreduce: case 15: /* Line 1455 of yacc.c */ -#line 336 "../parser/Grammar.y" +#line 334 "../parser/Grammar.y" { (yyval.propertyList).m_node.head = (yyvsp[(1) - (3)].propertyList).m_node.head; (yyval.propertyList).m_node.tail = new (GLOBAL_DATA) PropertyListNode(GLOBAL_DATA, (yyvsp[(3) - (3)].propertyNode).m_node, (yyvsp[(1) - (3)].propertyList).m_node.tail); (yyval.propertyList).m_features = (yyvsp[(1) - (3)].propertyList).m_features | (yyvsp[(3) - (3)].propertyNode).m_features; @@ -3097,70 +3095,70 @@ yyreduce: case 17: /* Line 1455 of yacc.c */ -#line 344 "../parser/Grammar.y" +#line 342 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ObjectLiteralNode(GLOBAL_DATA), 0, 0); ;} break; case 18: /* Line 1455 of yacc.c */ -#line 345 "../parser/Grammar.y" +#line 343 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ObjectLiteralNode(GLOBAL_DATA, (yyvsp[(2) - (3)].propertyList).m_node.head), (yyvsp[(2) - (3)].propertyList).m_features, (yyvsp[(2) - (3)].propertyList).m_numConstants); ;} break; case 19: /* Line 1455 of yacc.c */ -#line 347 "../parser/Grammar.y" +#line 345 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ObjectLiteralNode(GLOBAL_DATA, (yyvsp[(2) - (4)].propertyList).m_node.head), (yyvsp[(2) - (4)].propertyList).m_features, (yyvsp[(2) - (4)].propertyList).m_numConstants); ;} break; case 20: /* Line 1455 of yacc.c */ -#line 351 "../parser/Grammar.y" +#line 349 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ThisNode(GLOBAL_DATA), ThisFeature, 0); ;} break; case 23: /* Line 1455 of yacc.c */ -#line 354 "../parser/Grammar.y" +#line 352 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ResolveNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident), (yylsp[(1) - (1)]).first_column), (*(yyvsp[(1) - (1)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0, 0); ;} break; case 24: /* Line 1455 of yacc.c */ -#line 355 "../parser/Grammar.y" +#line 353 "../parser/Grammar.y" { (yyval.expressionNode) = (yyvsp[(2) - (3)].expressionNode); ;} break; case 25: /* Line 1455 of yacc.c */ -#line 359 "../parser/Grammar.y" +#line 357 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ArrayNode(GLOBAL_DATA, (yyvsp[(2) - (3)].intValue)), 0, (yyvsp[(2) - (3)].intValue) ? 1 : 0); ;} break; case 26: /* Line 1455 of yacc.c */ -#line 360 "../parser/Grammar.y" +#line 358 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ArrayNode(GLOBAL_DATA, (yyvsp[(2) - (3)].elementList).m_node.head), (yyvsp[(2) - (3)].elementList).m_features, (yyvsp[(2) - (3)].elementList).m_numConstants); ;} break; case 27: /* Line 1455 of yacc.c */ -#line 361 "../parser/Grammar.y" +#line 359 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ArrayNode(GLOBAL_DATA, (yyvsp[(4) - (5)].intValue), (yyvsp[(2) - (5)].elementList).m_node.head), (yyvsp[(2) - (5)].elementList).m_features, (yyvsp[(4) - (5)].intValue) ? (yyvsp[(2) - (5)].elementList).m_numConstants + 1 : (yyvsp[(2) - (5)].elementList).m_numConstants); ;} break; case 28: /* Line 1455 of yacc.c */ -#line 365 "../parser/Grammar.y" +#line 363 "../parser/Grammar.y" { (yyval.elementList).m_node.head = new (GLOBAL_DATA) ElementNode(GLOBAL_DATA, (yyvsp[(1) - (2)].intValue), (yyvsp[(2) - (2)].expressionNode).m_node); (yyval.elementList).m_node.tail = (yyval.elementList).m_node.head; (yyval.elementList).m_features = (yyvsp[(2) - (2)].expressionNode).m_features; @@ -3170,7 +3168,7 @@ yyreduce: case 29: /* Line 1455 of yacc.c */ -#line 370 "../parser/Grammar.y" +#line 368 "../parser/Grammar.y" { (yyval.elementList).m_node.head = (yyvsp[(1) - (4)].elementList).m_node.head; (yyval.elementList).m_node.tail = new (GLOBAL_DATA) ElementNode(GLOBAL_DATA, (yyvsp[(1) - (4)].elementList).m_node.tail, (yyvsp[(3) - (4)].intValue), (yyvsp[(4) - (4)].expressionNode).m_node); (yyval.elementList).m_features = (yyvsp[(1) - (4)].elementList).m_features | (yyvsp[(4) - (4)].expressionNode).m_features; @@ -3180,35 +3178,35 @@ yyreduce: case 30: /* Line 1455 of yacc.c */ -#line 377 "../parser/Grammar.y" +#line 375 "../parser/Grammar.y" { (yyval.intValue) = 0; ;} break; case 32: /* Line 1455 of yacc.c */ -#line 382 "../parser/Grammar.y" +#line 380 "../parser/Grammar.y" { (yyval.intValue) = 1; ;} break; case 33: /* Line 1455 of yacc.c */ -#line 383 "../parser/Grammar.y" +#line 381 "../parser/Grammar.y" { (yyval.intValue) = (yyvsp[(1) - (2)].intValue) + 1; ;} break; case 35: /* Line 1455 of yacc.c */ -#line 388 "../parser/Grammar.y" +#line 386 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo((yyvsp[(1) - (1)].funcExprNode).m_node, (yyvsp[(1) - (1)].funcExprNode).m_features, (yyvsp[(1) - (1)].funcExprNode).m_numConstants); ;} break; case 36: /* Line 1455 of yacc.c */ -#line 389 "../parser/Grammar.y" +#line 387 "../parser/Grammar.y" { BracketAccessorNode* node = new (GLOBAL_DATA) BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (4)]).first_column, (yylsp[(1) - (4)]).last_column, (yylsp[(4) - (4)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (4)].expressionNode).m_features | (yyvsp[(3) - (4)].expressionNode).m_features, (yyvsp[(1) - (4)].expressionNode).m_numConstants + (yyvsp[(3) - (4)].expressionNode).m_numConstants); @@ -3218,7 +3216,7 @@ yyreduce: case 37: /* Line 1455 of yacc.c */ -#line 393 "../parser/Grammar.y" +#line 391 "../parser/Grammar.y" { DotAccessorNode* node = new (GLOBAL_DATA) DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(1) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants); @@ -3228,7 +3226,7 @@ yyreduce: case 38: /* Line 1455 of yacc.c */ -#line 397 "../parser/Grammar.y" +#line 395 "../parser/Grammar.y" { NewExprNode* node = new (GLOBAL_DATA) NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].argumentsNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(2) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].argumentsNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].argumentsNode).m_numConstants); @@ -3238,7 +3236,7 @@ yyreduce: case 40: /* Line 1455 of yacc.c */ -#line 405 "../parser/Grammar.y" +#line 403 "../parser/Grammar.y" { BracketAccessorNode* node = new (GLOBAL_DATA) BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (4)]).first_column, (yylsp[(1) - (4)]).last_column, (yylsp[(4) - (4)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (4)].expressionNode).m_features | (yyvsp[(3) - (4)].expressionNode).m_features, (yyvsp[(1) - (4)].expressionNode).m_numConstants + (yyvsp[(3) - (4)].expressionNode).m_numConstants); @@ -3248,7 +3246,7 @@ yyreduce: case 41: /* Line 1455 of yacc.c */ -#line 409 "../parser/Grammar.y" +#line 407 "../parser/Grammar.y" { DotAccessorNode* node = new (GLOBAL_DATA) DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(1) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants); @@ -3258,7 +3256,7 @@ yyreduce: case 42: /* Line 1455 of yacc.c */ -#line 413 "../parser/Grammar.y" +#line 411 "../parser/Grammar.y" { NewExprNode* node = new (GLOBAL_DATA) NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].argumentsNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(2) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].argumentsNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].argumentsNode).m_numConstants); @@ -3268,7 +3266,7 @@ yyreduce: case 44: /* Line 1455 of yacc.c */ -#line 421 "../parser/Grammar.y" +#line 419 "../parser/Grammar.y" { NewExprNode* node = new (GLOBAL_DATA) NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); @@ -3278,7 +3276,7 @@ yyreduce: case 46: /* Line 1455 of yacc.c */ -#line 429 "../parser/Grammar.y" +#line 427 "../parser/Grammar.y" { NewExprNode* node = new (GLOBAL_DATA) NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); @@ -3288,21 +3286,21 @@ yyreduce: case 47: /* Line 1455 of yacc.c */ -#line 436 "../parser/Grammar.y" +#line 434 "../parser/Grammar.y" { (yyval.expressionNode) = makeFunctionCallNode(globalPtr, (yyvsp[(1) - (2)].expressionNode), (yyvsp[(2) - (2)].argumentsNode), (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); ;} break; case 48: /* Line 1455 of yacc.c */ -#line 437 "../parser/Grammar.y" +#line 435 "../parser/Grammar.y" { (yyval.expressionNode) = makeFunctionCallNode(globalPtr, (yyvsp[(1) - (2)].expressionNode), (yyvsp[(2) - (2)].argumentsNode), (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); ;} break; case 49: /* Line 1455 of yacc.c */ -#line 438 "../parser/Grammar.y" +#line 436 "../parser/Grammar.y" { BracketAccessorNode* node = new (GLOBAL_DATA) BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (4)]).first_column, (yylsp[(1) - (4)]).last_column, (yylsp[(4) - (4)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (4)].expressionNode).m_features | (yyvsp[(3) - (4)].expressionNode).m_features, (yyvsp[(1) - (4)].expressionNode).m_numConstants + (yyvsp[(3) - (4)].expressionNode).m_numConstants); @@ -3312,7 +3310,7 @@ yyreduce: case 50: /* Line 1455 of yacc.c */ -#line 442 "../parser/Grammar.y" +#line 440 "../parser/Grammar.y" { DotAccessorNode* node = new (GLOBAL_DATA) DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(1) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants); ;} @@ -3321,21 +3319,21 @@ yyreduce: case 51: /* Line 1455 of yacc.c */ -#line 448 "../parser/Grammar.y" +#line 446 "../parser/Grammar.y" { (yyval.expressionNode) = makeFunctionCallNode(globalPtr, (yyvsp[(1) - (2)].expressionNode), (yyvsp[(2) - (2)].argumentsNode), (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); ;} break; case 52: /* Line 1455 of yacc.c */ -#line 449 "../parser/Grammar.y" +#line 447 "../parser/Grammar.y" { (yyval.expressionNode) = makeFunctionCallNode(globalPtr, (yyvsp[(1) - (2)].expressionNode), (yyvsp[(2) - (2)].argumentsNode), (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); ;} break; case 53: /* Line 1455 of yacc.c */ -#line 450 "../parser/Grammar.y" +#line 448 "../parser/Grammar.y" { BracketAccessorNode* node = new (GLOBAL_DATA) BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (4)]).first_column, (yylsp[(1) - (4)]).last_column, (yylsp[(4) - (4)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (4)].expressionNode).m_features | (yyvsp[(3) - (4)].expressionNode).m_features, (yyvsp[(1) - (4)].expressionNode).m_numConstants + (yyvsp[(3) - (4)].expressionNode).m_numConstants); @@ -3345,7 +3343,7 @@ yyreduce: case 54: /* Line 1455 of yacc.c */ -#line 454 "../parser/Grammar.y" +#line 452 "../parser/Grammar.y" { DotAccessorNode* node = new (GLOBAL_DATA) DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(1) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants); @@ -3355,21 +3353,21 @@ yyreduce: case 55: /* Line 1455 of yacc.c */ -#line 461 "../parser/Grammar.y" +#line 459 "../parser/Grammar.y" { (yyval.argumentsNode) = createNodeInfo(new (GLOBAL_DATA) ArgumentsNode(GLOBAL_DATA), 0, 0); ;} break; case 56: /* Line 1455 of yacc.c */ -#line 462 "../parser/Grammar.y" +#line 460 "../parser/Grammar.y" { (yyval.argumentsNode) = createNodeInfo(new (GLOBAL_DATA) ArgumentsNode(GLOBAL_DATA, (yyvsp[(2) - (3)].argumentList).m_node.head), (yyvsp[(2) - (3)].argumentList).m_features, (yyvsp[(2) - (3)].argumentList).m_numConstants); ;} break; case 57: /* Line 1455 of yacc.c */ -#line 466 "../parser/Grammar.y" +#line 464 "../parser/Grammar.y" { (yyval.argumentList).m_node.head = new (GLOBAL_DATA) ArgumentListNode(GLOBAL_DATA, (yyvsp[(1) - (1)].expressionNode).m_node); (yyval.argumentList).m_node.tail = (yyval.argumentList).m_node.head; (yyval.argumentList).m_features = (yyvsp[(1) - (1)].expressionNode).m_features; @@ -3379,7 +3377,7 @@ yyreduce: case 58: /* Line 1455 of yacc.c */ -#line 470 "../parser/Grammar.y" +#line 468 "../parser/Grammar.y" { (yyval.argumentList).m_node.head = (yyvsp[(1) - (3)].argumentList).m_node.head; (yyval.argumentList).m_node.tail = new (GLOBAL_DATA) ArgumentListNode(GLOBAL_DATA, (yyvsp[(1) - (3)].argumentList).m_node.tail, (yyvsp[(3) - (3)].expressionNode).m_node); (yyval.argumentList).m_features = (yyvsp[(1) - (3)].argumentList).m_features | (yyvsp[(3) - (3)].expressionNode).m_features; @@ -3389,252 +3387,252 @@ yyreduce: case 64: /* Line 1455 of yacc.c */ -#line 488 "../parser/Grammar.y" +#line 486 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePostfixNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node, OpPlusPlus, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(1) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (2)].expressionNode).m_numConstants); ;} break; case 65: /* Line 1455 of yacc.c */ -#line 489 "../parser/Grammar.y" +#line 487 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePostfixNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node, OpMinusMinus, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(1) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (2)].expressionNode).m_numConstants); ;} break; case 67: /* Line 1455 of yacc.c */ -#line 494 "../parser/Grammar.y" +#line 492 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePostfixNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node, OpPlusPlus, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(1) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (2)].expressionNode).m_numConstants); ;} break; case 68: /* Line 1455 of yacc.c */ -#line 495 "../parser/Grammar.y" +#line 493 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePostfixNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node, OpMinusMinus, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(1) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (2)].expressionNode).m_numConstants); ;} break; case 69: /* Line 1455 of yacc.c */ -#line 499 "../parser/Grammar.y" +#line 497 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeDeleteNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 70: /* Line 1455 of yacc.c */ -#line 500 "../parser/Grammar.y" +#line 498 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) VoidNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants + 1); ;} break; case 71: /* Line 1455 of yacc.c */ -#line 501 "../parser/Grammar.y" +#line 499 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeTypeOfNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 72: /* Line 1455 of yacc.c */ -#line 502 "../parser/Grammar.y" +#line 500 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePrefixNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, OpPlusPlus, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 73: /* Line 1455 of yacc.c */ -#line 503 "../parser/Grammar.y" +#line 501 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePrefixNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, OpPlusPlus, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 74: /* Line 1455 of yacc.c */ -#line 504 "../parser/Grammar.y" +#line 502 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePrefixNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, OpMinusMinus, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 75: /* Line 1455 of yacc.c */ -#line 505 "../parser/Grammar.y" +#line 503 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePrefixNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, OpMinusMinus, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 76: /* Line 1455 of yacc.c */ -#line 506 "../parser/Grammar.y" +#line 504 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) UnaryPlusNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 77: /* Line 1455 of yacc.c */ -#line 507 "../parser/Grammar.y" +#line 505 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeNegateNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 78: /* Line 1455 of yacc.c */ -#line 508 "../parser/Grammar.y" +#line 506 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeBitwiseNotNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 79: /* Line 1455 of yacc.c */ -#line 509 "../parser/Grammar.y" +#line 507 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalNotNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 85: /* Line 1455 of yacc.c */ -#line 523 "../parser/Grammar.y" +#line 521 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeMultNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 86: /* Line 1455 of yacc.c */ -#line 524 "../parser/Grammar.y" +#line 522 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeDivNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 87: /* Line 1455 of yacc.c */ -#line 525 "../parser/Grammar.y" +#line 523 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ModNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 89: /* Line 1455 of yacc.c */ -#line 531 "../parser/Grammar.y" +#line 529 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeMultNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 90: /* Line 1455 of yacc.c */ -#line 533 "../parser/Grammar.y" +#line 531 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeDivNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 91: /* Line 1455 of yacc.c */ -#line 535 "../parser/Grammar.y" +#line 533 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ModNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 93: /* Line 1455 of yacc.c */ -#line 540 "../parser/Grammar.y" +#line 538 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeAddNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 94: /* Line 1455 of yacc.c */ -#line 541 "../parser/Grammar.y" +#line 539 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeSubNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 96: /* Line 1455 of yacc.c */ -#line 547 "../parser/Grammar.y" +#line 545 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeAddNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 97: /* Line 1455 of yacc.c */ -#line 549 "../parser/Grammar.y" +#line 547 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeSubNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 99: /* Line 1455 of yacc.c */ -#line 554 "../parser/Grammar.y" +#line 552 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeLeftShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 100: /* Line 1455 of yacc.c */ -#line 555 "../parser/Grammar.y" +#line 553 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 101: /* Line 1455 of yacc.c */ -#line 556 "../parser/Grammar.y" +#line 554 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) UnsignedRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 103: /* Line 1455 of yacc.c */ -#line 561 "../parser/Grammar.y" +#line 559 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeLeftShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 104: /* Line 1455 of yacc.c */ -#line 562 "../parser/Grammar.y" +#line 560 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 105: /* Line 1455 of yacc.c */ -#line 563 "../parser/Grammar.y" +#line 561 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) UnsignedRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 107: /* Line 1455 of yacc.c */ -#line 568 "../parser/Grammar.y" +#line 566 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LessNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 108: /* Line 1455 of yacc.c */ -#line 569 "../parser/Grammar.y" +#line 567 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) GreaterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 109: /* Line 1455 of yacc.c */ -#line 570 "../parser/Grammar.y" +#line 568 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LessEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 110: /* Line 1455 of yacc.c */ -#line 571 "../parser/Grammar.y" +#line 569 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) GreaterEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 111: /* Line 1455 of yacc.c */ -#line 572 "../parser/Grammar.y" +#line 570 "../parser/Grammar.y" { InstanceOfNode* node = new (GLOBAL_DATA) InstanceOfNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3643,7 +3641,7 @@ yyreduce: case 112: /* Line 1455 of yacc.c */ -#line 575 "../parser/Grammar.y" +#line 573 "../parser/Grammar.y" { InNode* node = new (GLOBAL_DATA) InNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3652,35 +3650,35 @@ yyreduce: case 114: /* Line 1455 of yacc.c */ -#line 582 "../parser/Grammar.y" +#line 580 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LessNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 115: /* Line 1455 of yacc.c */ -#line 583 "../parser/Grammar.y" +#line 581 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) GreaterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 116: /* Line 1455 of yacc.c */ -#line 584 "../parser/Grammar.y" +#line 582 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LessEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 117: /* Line 1455 of yacc.c */ -#line 585 "../parser/Grammar.y" +#line 583 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) GreaterEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 118: /* Line 1455 of yacc.c */ -#line 587 "../parser/Grammar.y" +#line 585 "../parser/Grammar.y" { InstanceOfNode* node = new (GLOBAL_DATA) InstanceOfNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3689,35 +3687,35 @@ yyreduce: case 120: /* Line 1455 of yacc.c */ -#line 594 "../parser/Grammar.y" +#line 592 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LessNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 121: /* Line 1455 of yacc.c */ -#line 595 "../parser/Grammar.y" +#line 593 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) GreaterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 122: /* Line 1455 of yacc.c */ -#line 596 "../parser/Grammar.y" +#line 594 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LessEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 123: /* Line 1455 of yacc.c */ -#line 597 "../parser/Grammar.y" +#line 595 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) GreaterEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 124: /* Line 1455 of yacc.c */ -#line 599 "../parser/Grammar.y" +#line 597 "../parser/Grammar.y" { InstanceOfNode* node = new (GLOBAL_DATA) InstanceOfNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3726,7 +3724,7 @@ yyreduce: case 125: /* Line 1455 of yacc.c */ -#line 603 "../parser/Grammar.y" +#line 601 "../parser/Grammar.y" { InNode* node = new (GLOBAL_DATA) InNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3735,217 +3733,217 @@ yyreduce: case 127: /* Line 1455 of yacc.c */ -#line 610 "../parser/Grammar.y" +#line 608 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) EqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 128: /* Line 1455 of yacc.c */ -#line 611 "../parser/Grammar.y" +#line 609 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) NotEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 129: /* Line 1455 of yacc.c */ -#line 612 "../parser/Grammar.y" +#line 610 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) StrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 130: /* Line 1455 of yacc.c */ -#line 613 "../parser/Grammar.y" +#line 611 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) NotStrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 132: /* Line 1455 of yacc.c */ -#line 619 "../parser/Grammar.y" +#line 617 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) EqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 133: /* Line 1455 of yacc.c */ -#line 621 "../parser/Grammar.y" +#line 619 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) NotEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 134: /* Line 1455 of yacc.c */ -#line 623 "../parser/Grammar.y" +#line 621 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) StrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 135: /* Line 1455 of yacc.c */ -#line 625 "../parser/Grammar.y" +#line 623 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) NotStrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 137: /* Line 1455 of yacc.c */ -#line 631 "../parser/Grammar.y" +#line 629 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) EqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 138: /* Line 1455 of yacc.c */ -#line 632 "../parser/Grammar.y" +#line 630 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) NotEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 139: /* Line 1455 of yacc.c */ -#line 634 "../parser/Grammar.y" +#line 632 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) StrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 140: /* Line 1455 of yacc.c */ -#line 636 "../parser/Grammar.y" +#line 634 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) NotStrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 142: /* Line 1455 of yacc.c */ -#line 641 "../parser/Grammar.y" +#line 639 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitAndNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 144: /* Line 1455 of yacc.c */ -#line 647 "../parser/Grammar.y" +#line 645 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitAndNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 146: /* Line 1455 of yacc.c */ -#line 652 "../parser/Grammar.y" +#line 650 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitAndNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 148: /* Line 1455 of yacc.c */ -#line 657 "../parser/Grammar.y" +#line 655 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitXOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 150: /* Line 1455 of yacc.c */ -#line 663 "../parser/Grammar.y" +#line 661 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitXOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 152: /* Line 1455 of yacc.c */ -#line 669 "../parser/Grammar.y" +#line 667 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitXOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 154: /* Line 1455 of yacc.c */ -#line 674 "../parser/Grammar.y" +#line 672 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 156: /* Line 1455 of yacc.c */ -#line 680 "../parser/Grammar.y" +#line 678 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 158: /* Line 1455 of yacc.c */ -#line 686 "../parser/Grammar.y" +#line 684 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 160: /* Line 1455 of yacc.c */ -#line 691 "../parser/Grammar.y" +#line 689 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalAnd), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 162: /* Line 1455 of yacc.c */ -#line 697 "../parser/Grammar.y" +#line 695 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalAnd), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 164: /* Line 1455 of yacc.c */ -#line 703 "../parser/Grammar.y" +#line 701 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalAnd), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 166: /* Line 1455 of yacc.c */ -#line 708 "../parser/Grammar.y" +#line 706 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalOr), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 168: /* Line 1455 of yacc.c */ -#line 714 "../parser/Grammar.y" +#line 712 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalOr), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 170: /* Line 1455 of yacc.c */ -#line 719 "../parser/Grammar.y" +#line 717 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalOr), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 172: /* Line 1455 of yacc.c */ -#line 725 "../parser/Grammar.y" +#line 723 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ConditionalNode(GLOBAL_DATA, (yyvsp[(1) - (5)].expressionNode).m_node, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].expressionNode).m_node), (yyvsp[(1) - (5)].expressionNode).m_features | (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].expressionNode).m_features, (yyvsp[(1) - (5)].expressionNode).m_numConstants + (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].expressionNode).m_numConstants); ;} break; case 174: /* Line 1455 of yacc.c */ -#line 731 "../parser/Grammar.y" +#line 729 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ConditionalNode(GLOBAL_DATA, (yyvsp[(1) - (5)].expressionNode).m_node, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].expressionNode).m_node), (yyvsp[(1) - (5)].expressionNode).m_features | (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].expressionNode).m_features, (yyvsp[(1) - (5)].expressionNode).m_numConstants + (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].expressionNode).m_numConstants); ;} break; case 176: /* Line 1455 of yacc.c */ -#line 737 "../parser/Grammar.y" +#line 735 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ConditionalNode(GLOBAL_DATA, (yyvsp[(1) - (5)].expressionNode).m_node, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].expressionNode).m_node), (yyvsp[(1) - (5)].expressionNode).m_features | (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].expressionNode).m_features, (yyvsp[(1) - (5)].expressionNode).m_numConstants + (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].expressionNode).m_numConstants); ;} break; case 178: /* Line 1455 of yacc.c */ -#line 743 "../parser/Grammar.y" +#line 741 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeAssignNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(2) - (3)].op), (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(1) - (3)].expressionNode).m_features & AssignFeature, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).first_column + 1, (yylsp[(3) - (3)]).last_column), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3954,7 +3952,7 @@ yyreduce: case 180: /* Line 1455 of yacc.c */ -#line 751 "../parser/Grammar.y" +#line 749 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeAssignNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(2) - (3)].op), (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(1) - (3)].expressionNode).m_features & AssignFeature, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).first_column + 1, (yylsp[(3) - (3)]).last_column), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3963,7 +3961,7 @@ yyreduce: case 182: /* Line 1455 of yacc.c */ -#line 759 "../parser/Grammar.y" +#line 757 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeAssignNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(2) - (3)].op), (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(1) - (3)].expressionNode).m_features & AssignFeature, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).first_column + 1, (yylsp[(3) - (3)]).last_column), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3972,112 +3970,112 @@ yyreduce: case 183: /* Line 1455 of yacc.c */ -#line 765 "../parser/Grammar.y" +#line 763 "../parser/Grammar.y" { (yyval.op) = OpEqual; ;} break; case 184: /* Line 1455 of yacc.c */ -#line 766 "../parser/Grammar.y" +#line 764 "../parser/Grammar.y" { (yyval.op) = OpPlusEq; ;} break; case 185: /* Line 1455 of yacc.c */ -#line 767 "../parser/Grammar.y" +#line 765 "../parser/Grammar.y" { (yyval.op) = OpMinusEq; ;} break; case 186: /* Line 1455 of yacc.c */ -#line 768 "../parser/Grammar.y" +#line 766 "../parser/Grammar.y" { (yyval.op) = OpMultEq; ;} break; case 187: /* Line 1455 of yacc.c */ -#line 769 "../parser/Grammar.y" +#line 767 "../parser/Grammar.y" { (yyval.op) = OpDivEq; ;} break; case 188: /* Line 1455 of yacc.c */ -#line 770 "../parser/Grammar.y" +#line 768 "../parser/Grammar.y" { (yyval.op) = OpLShift; ;} break; case 189: /* Line 1455 of yacc.c */ -#line 771 "../parser/Grammar.y" +#line 769 "../parser/Grammar.y" { (yyval.op) = OpRShift; ;} break; case 190: /* Line 1455 of yacc.c */ -#line 772 "../parser/Grammar.y" +#line 770 "../parser/Grammar.y" { (yyval.op) = OpURShift; ;} break; case 191: /* Line 1455 of yacc.c */ -#line 773 "../parser/Grammar.y" +#line 771 "../parser/Grammar.y" { (yyval.op) = OpAndEq; ;} break; case 192: /* Line 1455 of yacc.c */ -#line 774 "../parser/Grammar.y" +#line 772 "../parser/Grammar.y" { (yyval.op) = OpXOrEq; ;} break; case 193: /* Line 1455 of yacc.c */ -#line 775 "../parser/Grammar.y" +#line 773 "../parser/Grammar.y" { (yyval.op) = OpOrEq; ;} break; case 194: /* Line 1455 of yacc.c */ -#line 776 "../parser/Grammar.y" +#line 774 "../parser/Grammar.y" { (yyval.op) = OpModEq; ;} break; case 196: /* Line 1455 of yacc.c */ -#line 781 "../parser/Grammar.y" +#line 779 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(combineCommaNodes(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 198: /* Line 1455 of yacc.c */ -#line 786 "../parser/Grammar.y" +#line 784 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(combineCommaNodes(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 200: /* Line 1455 of yacc.c */ -#line 791 "../parser/Grammar.y" +#line 789 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(combineCommaNodes(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 218: /* Line 1455 of yacc.c */ -#line 815 "../parser/Grammar.y" +#line 813 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) BlockNode(GLOBAL_DATA, 0), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} break; @@ -4085,7 +4083,7 @@ yyreduce: case 219: /* Line 1455 of yacc.c */ -#line 817 "../parser/Grammar.y" +#line 815 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) BlockNode(GLOBAL_DATA, (yyvsp[(2) - (3)].sourceElements).m_node), (yyvsp[(2) - (3)].sourceElements).m_varDeclarations, (yyvsp[(2) - (3)].sourceElements).m_funcDeclarations, (yyvsp[(2) - (3)].sourceElements).m_features, (yyvsp[(2) - (3)].sourceElements).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} break; @@ -4093,7 +4091,7 @@ yyreduce: case 220: /* Line 1455 of yacc.c */ -#line 822 "../parser/Grammar.y" +#line 820 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(makeVarStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].varDeclList).m_node), (yyvsp[(2) - (3)].varDeclList).m_varDeclarations, (yyvsp[(2) - (3)].varDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].varDeclList).m_features, (yyvsp[(2) - (3)].varDeclList).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} break; @@ -4101,7 +4099,7 @@ yyreduce: case 221: /* Line 1455 of yacc.c */ -#line 824 "../parser/Grammar.y" +#line 822 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(makeVarStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].varDeclList).m_node), (yyvsp[(2) - (3)].varDeclList).m_varDeclarations, (yyvsp[(2) - (3)].varDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].varDeclList).m_features, (yyvsp[(2) - (3)].varDeclList).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} @@ -4110,7 +4108,7 @@ yyreduce: case 222: /* Line 1455 of yacc.c */ -#line 830 "../parser/Grammar.y" +#line 828 "../parser/Grammar.y" { (yyval.varDeclList).m_node = 0; (yyval.varDeclList).m_varDeclarations = new (GLOBAL_DATA) ParserArenaData; appendToVarDeclarationList(GLOBAL_DATA, (yyval.varDeclList).m_varDeclarations, *(yyvsp[(1) - (1)].ident), 0); @@ -4123,7 +4121,7 @@ yyreduce: case 223: /* Line 1455 of yacc.c */ -#line 837 "../parser/Grammar.y" +#line 835 "../parser/Grammar.y" { AssignResolveNode* node = new (GLOBAL_DATA) AssignResolveNode(GLOBAL_DATA, *(yyvsp[(1) - (2)].ident), (yyvsp[(2) - (2)].expressionNode).m_node, (yyvsp[(2) - (2)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column); (yyval.varDeclList).m_node = node; @@ -4138,7 +4136,7 @@ yyreduce: case 224: /* Line 1455 of yacc.c */ -#line 847 "../parser/Grammar.y" +#line 845 "../parser/Grammar.y" { (yyval.varDeclList).m_node = (yyvsp[(1) - (3)].varDeclList).m_node; (yyval.varDeclList).m_varDeclarations = (yyvsp[(1) - (3)].varDeclList).m_varDeclarations; appendToVarDeclarationList(GLOBAL_DATA, (yyval.varDeclList).m_varDeclarations, *(yyvsp[(3) - (3)].ident), 0); @@ -4151,7 +4149,7 @@ yyreduce: case 225: /* Line 1455 of yacc.c */ -#line 855 "../parser/Grammar.y" +#line 853 "../parser/Grammar.y" { AssignResolveNode* node = new (GLOBAL_DATA) AssignResolveNode(GLOBAL_DATA, *(yyvsp[(3) - (4)].ident), (yyvsp[(4) - (4)].expressionNode).m_node, (yyvsp[(4) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(3) - (4)]).first_column, (yylsp[(4) - (4)]).first_column + 1, (yylsp[(4) - (4)]).last_column); (yyval.varDeclList).m_node = combineCommaNodes(GLOBAL_DATA, (yyvsp[(1) - (4)].varDeclList).m_node, node); @@ -4166,7 +4164,7 @@ yyreduce: case 226: /* Line 1455 of yacc.c */ -#line 867 "../parser/Grammar.y" +#line 865 "../parser/Grammar.y" { (yyval.varDeclList).m_node = 0; (yyval.varDeclList).m_varDeclarations = new (GLOBAL_DATA) ParserArenaData; appendToVarDeclarationList(GLOBAL_DATA, (yyval.varDeclList).m_varDeclarations, *(yyvsp[(1) - (1)].ident), 0); @@ -4179,7 +4177,7 @@ yyreduce: case 227: /* Line 1455 of yacc.c */ -#line 874 "../parser/Grammar.y" +#line 872 "../parser/Grammar.y" { AssignResolveNode* node = new (GLOBAL_DATA) AssignResolveNode(GLOBAL_DATA, *(yyvsp[(1) - (2)].ident), (yyvsp[(2) - (2)].expressionNode).m_node, (yyvsp[(2) - (2)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column); (yyval.varDeclList).m_node = node; @@ -4194,7 +4192,7 @@ yyreduce: case 228: /* Line 1455 of yacc.c */ -#line 884 "../parser/Grammar.y" +#line 882 "../parser/Grammar.y" { (yyval.varDeclList).m_node = (yyvsp[(1) - (3)].varDeclList).m_node; (yyval.varDeclList).m_varDeclarations = (yyvsp[(1) - (3)].varDeclList).m_varDeclarations; appendToVarDeclarationList(GLOBAL_DATA, (yyval.varDeclList).m_varDeclarations, *(yyvsp[(3) - (3)].ident), 0); @@ -4207,7 +4205,7 @@ yyreduce: case 229: /* Line 1455 of yacc.c */ -#line 892 "../parser/Grammar.y" +#line 890 "../parser/Grammar.y" { AssignResolveNode* node = new (GLOBAL_DATA) AssignResolveNode(GLOBAL_DATA, *(yyvsp[(3) - (4)].ident), (yyvsp[(4) - (4)].expressionNode).m_node, (yyvsp[(4) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(3) - (4)]).first_column, (yylsp[(4) - (4)]).first_column + 1, (yylsp[(4) - (4)]).last_column); (yyval.varDeclList).m_node = combineCommaNodes(GLOBAL_DATA, (yyvsp[(1) - (4)].varDeclList).m_node, node); @@ -4222,7 +4220,7 @@ yyreduce: case 230: /* Line 1455 of yacc.c */ -#line 904 "../parser/Grammar.y" +#line 902 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) ConstStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].constDeclList).m_node.head), (yyvsp[(2) - (3)].constDeclList).m_varDeclarations, (yyvsp[(2) - (3)].constDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].constDeclList).m_features, (yyvsp[(2) - (3)].constDeclList).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} break; @@ -4230,7 +4228,7 @@ yyreduce: case 231: /* Line 1455 of yacc.c */ -#line 907 "../parser/Grammar.y" +#line 905 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) ConstStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].constDeclList).m_node.head), (yyvsp[(2) - (3)].constDeclList).m_varDeclarations, (yyvsp[(2) - (3)].constDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].constDeclList).m_features, (yyvsp[(2) - (3)].constDeclList).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} break; @@ -4238,7 +4236,7 @@ yyreduce: case 232: /* Line 1455 of yacc.c */ -#line 912 "../parser/Grammar.y" +#line 910 "../parser/Grammar.y" { (yyval.constDeclList).m_node.head = (yyvsp[(1) - (1)].constDeclNode).m_node; (yyval.constDeclList).m_node.tail = (yyval.constDeclList).m_node.head; (yyval.constDeclList).m_varDeclarations = new (GLOBAL_DATA) ParserArenaData; @@ -4252,7 +4250,7 @@ yyreduce: case 233: /* Line 1455 of yacc.c */ -#line 921 "../parser/Grammar.y" +#line 919 "../parser/Grammar.y" { (yyval.constDeclList).m_node.head = (yyvsp[(1) - (3)].constDeclList).m_node.head; (yyvsp[(1) - (3)].constDeclList).m_node.tail->m_next = (yyvsp[(3) - (3)].constDeclNode).m_node; (yyval.constDeclList).m_node.tail = (yyvsp[(3) - (3)].constDeclNode).m_node; @@ -4266,42 +4264,42 @@ yyreduce: case 234: /* Line 1455 of yacc.c */ -#line 932 "../parser/Grammar.y" +#line 930 "../parser/Grammar.y" { (yyval.constDeclNode) = createNodeInfo(new (GLOBAL_DATA) ConstDeclNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident), 0), (*(yyvsp[(1) - (1)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0, 0); ;} break; case 235: /* Line 1455 of yacc.c */ -#line 933 "../parser/Grammar.y" +#line 931 "../parser/Grammar.y" { (yyval.constDeclNode) = createNodeInfo(new (GLOBAL_DATA) ConstDeclNode(GLOBAL_DATA, *(yyvsp[(1) - (2)].ident), (yyvsp[(2) - (2)].expressionNode).m_node), ((*(yyvsp[(1) - (2)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 236: /* Line 1455 of yacc.c */ -#line 937 "../parser/Grammar.y" +#line 935 "../parser/Grammar.y" { (yyval.expressionNode) = (yyvsp[(2) - (2)].expressionNode); ;} break; case 237: /* Line 1455 of yacc.c */ -#line 941 "../parser/Grammar.y" +#line 939 "../parser/Grammar.y" { (yyval.expressionNode) = (yyvsp[(2) - (2)].expressionNode); ;} break; case 238: /* Line 1455 of yacc.c */ -#line 945 "../parser/Grammar.y" +#line 943 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) EmptyStatementNode(GLOBAL_DATA), 0, 0, 0, 0); ;} break; case 239: /* Line 1455 of yacc.c */ -#line 949 "../parser/Grammar.y" +#line 947 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) ExprStatementNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node), 0, 0, (yyvsp[(1) - (2)].expressionNode).m_features, (yyvsp[(1) - (2)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} break; @@ -4309,7 +4307,7 @@ yyreduce: case 240: /* Line 1455 of yacc.c */ -#line 951 "../parser/Grammar.y" +#line 949 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) ExprStatementNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node), 0, 0, (yyvsp[(1) - (2)].expressionNode).m_features, (yyvsp[(1) - (2)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} break; @@ -4317,7 +4315,7 @@ yyreduce: case 241: /* Line 1455 of yacc.c */ -#line 957 "../parser/Grammar.y" +#line 955 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) IfNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].statementNode).m_node), (yyvsp[(5) - (5)].statementNode).m_varDeclarations, (yyvsp[(5) - (5)].statementNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].statementNode).m_features, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].statementNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (5)]), (yylsp[(4) - (5)])); ;} break; @@ -4325,7 +4323,7 @@ yyreduce: case 242: /* Line 1455 of yacc.c */ -#line 960 "../parser/Grammar.y" +#line 958 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) IfElseNode(GLOBAL_DATA, (yyvsp[(3) - (7)].expressionNode).m_node, (yyvsp[(5) - (7)].statementNode).m_node, (yyvsp[(7) - (7)].statementNode).m_node), mergeDeclarationLists((yyvsp[(5) - (7)].statementNode).m_varDeclarations, (yyvsp[(7) - (7)].statementNode).m_varDeclarations), mergeDeclarationLists((yyvsp[(5) - (7)].statementNode).m_funcDeclarations, (yyvsp[(7) - (7)].statementNode).m_funcDeclarations), @@ -4337,7 +4335,7 @@ yyreduce: case 243: /* Line 1455 of yacc.c */ -#line 969 "../parser/Grammar.y" +#line 967 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) DoWhileNode(GLOBAL_DATA, (yyvsp[(2) - (7)].statementNode).m_node, (yyvsp[(5) - (7)].expressionNode).m_node), (yyvsp[(2) - (7)].statementNode).m_varDeclarations, (yyvsp[(2) - (7)].statementNode).m_funcDeclarations, (yyvsp[(2) - (7)].statementNode).m_features | (yyvsp[(5) - (7)].expressionNode).m_features, (yyvsp[(2) - (7)].statementNode).m_numConstants + (yyvsp[(5) - (7)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (7)]), (yylsp[(3) - (7)])); ;} break; @@ -4345,7 +4343,7 @@ yyreduce: case 244: /* Line 1455 of yacc.c */ -#line 971 "../parser/Grammar.y" +#line 969 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) DoWhileNode(GLOBAL_DATA, (yyvsp[(2) - (7)].statementNode).m_node, (yyvsp[(5) - (7)].expressionNode).m_node), (yyvsp[(2) - (7)].statementNode).m_varDeclarations, (yyvsp[(2) - (7)].statementNode).m_funcDeclarations, (yyvsp[(2) - (7)].statementNode).m_features | (yyvsp[(5) - (7)].expressionNode).m_features, (yyvsp[(2) - (7)].statementNode).m_numConstants + (yyvsp[(5) - (7)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (7)]), (yylsp[(3) - (7)])); ;} break; @@ -4353,7 +4351,7 @@ yyreduce: case 245: /* Line 1455 of yacc.c */ -#line 973 "../parser/Grammar.y" +#line 971 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) WhileNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].statementNode).m_node), (yyvsp[(5) - (5)].statementNode).m_varDeclarations, (yyvsp[(5) - (5)].statementNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].statementNode).m_features, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].statementNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (5)]), (yylsp[(4) - (5)])); ;} break; @@ -4361,7 +4359,7 @@ yyreduce: case 246: /* Line 1455 of yacc.c */ -#line 976 "../parser/Grammar.y" +#line 974 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) ForNode(GLOBAL_DATA, (yyvsp[(3) - (9)].expressionNode).m_node, (yyvsp[(5) - (9)].expressionNode).m_node, (yyvsp[(7) - (9)].expressionNode).m_node, (yyvsp[(9) - (9)].statementNode).m_node, false), (yyvsp[(9) - (9)].statementNode).m_varDeclarations, (yyvsp[(9) - (9)].statementNode).m_funcDeclarations, (yyvsp[(3) - (9)].expressionNode).m_features | (yyvsp[(5) - (9)].expressionNode).m_features | (yyvsp[(7) - (9)].expressionNode).m_features | (yyvsp[(9) - (9)].statementNode).m_features, (yyvsp[(3) - (9)].expressionNode).m_numConstants + (yyvsp[(5) - (9)].expressionNode).m_numConstants + (yyvsp[(7) - (9)].expressionNode).m_numConstants + (yyvsp[(9) - (9)].statementNode).m_numConstants); @@ -4372,7 +4370,7 @@ yyreduce: case 247: /* Line 1455 of yacc.c */ -#line 982 "../parser/Grammar.y" +#line 980 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) ForNode(GLOBAL_DATA, (yyvsp[(4) - (10)].varDeclList).m_node, (yyvsp[(6) - (10)].expressionNode).m_node, (yyvsp[(8) - (10)].expressionNode).m_node, (yyvsp[(10) - (10)].statementNode).m_node, true), mergeDeclarationLists((yyvsp[(4) - (10)].varDeclList).m_varDeclarations, (yyvsp[(10) - (10)].statementNode).m_varDeclarations), mergeDeclarationLists((yyvsp[(4) - (10)].varDeclList).m_funcDeclarations, (yyvsp[(10) - (10)].statementNode).m_funcDeclarations), @@ -4384,7 +4382,7 @@ yyreduce: case 248: /* Line 1455 of yacc.c */ -#line 989 "../parser/Grammar.y" +#line 987 "../parser/Grammar.y" { ForInNode* node = new (GLOBAL_DATA) ForInNode(GLOBAL_DATA, (yyvsp[(3) - (7)].expressionNode).m_node, (yyvsp[(5) - (7)].expressionNode).m_node, (yyvsp[(7) - (7)].statementNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(3) - (7)]).first_column, (yylsp[(3) - (7)]).last_column, (yylsp[(5) - (7)]).last_column); @@ -4398,7 +4396,7 @@ yyreduce: case 249: /* Line 1455 of yacc.c */ -#line 998 "../parser/Grammar.y" +#line 996 "../parser/Grammar.y" { ForInNode *forIn = new (GLOBAL_DATA) ForInNode(GLOBAL_DATA, *(yyvsp[(4) - (8)].ident), 0, (yyvsp[(6) - (8)].expressionNode).m_node, (yyvsp[(8) - (8)].statementNode).m_node, (yylsp[(5) - (8)]).first_column, (yylsp[(5) - (8)]).first_column - (yylsp[(4) - (8)]).first_column, (yylsp[(6) - (8)]).last_column - (yylsp[(5) - (8)]).first_column); SET_EXCEPTION_LOCATION(forIn, (yylsp[(4) - (8)]).first_column, (yylsp[(5) - (8)]).first_column + 1, (yylsp[(6) - (8)]).last_column); appendToVarDeclarationList(GLOBAL_DATA, (yyvsp[(8) - (8)].statementNode).m_varDeclarations, *(yyvsp[(4) - (8)].ident), DeclarationStacks::HasInitializer); @@ -4409,7 +4407,7 @@ yyreduce: case 250: /* Line 1455 of yacc.c */ -#line 1004 "../parser/Grammar.y" +#line 1002 "../parser/Grammar.y" { ForInNode *forIn = new (GLOBAL_DATA) ForInNode(GLOBAL_DATA, *(yyvsp[(4) - (9)].ident), (yyvsp[(5) - (9)].expressionNode).m_node, (yyvsp[(7) - (9)].expressionNode).m_node, (yyvsp[(9) - (9)].statementNode).m_node, (yylsp[(5) - (9)]).first_column, (yylsp[(5) - (9)]).first_column - (yylsp[(4) - (9)]).first_column, (yylsp[(5) - (9)]).last_column - (yylsp[(5) - (9)]).first_column); SET_EXCEPTION_LOCATION(forIn, (yylsp[(4) - (9)]).first_column, (yylsp[(6) - (9)]).first_column + 1, (yylsp[(7) - (9)]).last_column); appendToVarDeclarationList(GLOBAL_DATA, (yyvsp[(9) - (9)].statementNode).m_varDeclarations, *(yyvsp[(4) - (9)].ident), DeclarationStacks::HasInitializer); @@ -4422,21 +4420,21 @@ yyreduce: case 251: /* Line 1455 of yacc.c */ -#line 1014 "../parser/Grammar.y" +#line 1012 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(0, 0, 0); ;} break; case 253: /* Line 1455 of yacc.c */ -#line 1019 "../parser/Grammar.y" +#line 1017 "../parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(0, 0, 0); ;} break; case 255: /* Line 1455 of yacc.c */ -#line 1024 "../parser/Grammar.y" +#line 1022 "../parser/Grammar.y" { ContinueNode* node = new (GLOBAL_DATA) ContinueNode(GLOBAL_DATA); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); @@ -4446,7 +4444,7 @@ yyreduce: case 256: /* Line 1455 of yacc.c */ -#line 1028 "../parser/Grammar.y" +#line 1026 "../parser/Grammar.y" { ContinueNode* node = new (GLOBAL_DATA) ContinueNode(GLOBAL_DATA); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); @@ -4456,7 +4454,7 @@ yyreduce: case 257: /* Line 1455 of yacc.c */ -#line 1032 "../parser/Grammar.y" +#line 1030 "../parser/Grammar.y" { ContinueNode* node = new (GLOBAL_DATA) ContinueNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); @@ -4466,7 +4464,7 @@ yyreduce: case 258: /* Line 1455 of yacc.c */ -#line 1036 "../parser/Grammar.y" +#line 1034 "../parser/Grammar.y" { ContinueNode* node = new (GLOBAL_DATA) ContinueNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); @@ -4476,7 +4474,7 @@ yyreduce: case 259: /* Line 1455 of yacc.c */ -#line 1043 "../parser/Grammar.y" +#line 1041 "../parser/Grammar.y" { BreakNode* node = new (GLOBAL_DATA) BreakNode(GLOBAL_DATA); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} @@ -4485,7 +4483,7 @@ yyreduce: case 260: /* Line 1455 of yacc.c */ -#line 1046 "../parser/Grammar.y" +#line 1044 "../parser/Grammar.y" { BreakNode* node = new (GLOBAL_DATA) BreakNode(GLOBAL_DATA); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) BreakNode(GLOBAL_DATA), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} @@ -4494,7 +4492,7 @@ yyreduce: case 261: /* Line 1455 of yacc.c */ -#line 1049 "../parser/Grammar.y" +#line 1047 "../parser/Grammar.y" { BreakNode* node = new (GLOBAL_DATA) BreakNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} @@ -4503,7 +4501,7 @@ yyreduce: case 262: /* Line 1455 of yacc.c */ -#line 1052 "../parser/Grammar.y" +#line 1050 "../parser/Grammar.y" { BreakNode* node = new (GLOBAL_DATA) BreakNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) BreakNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} @@ -4512,7 +4510,7 @@ yyreduce: case 263: /* Line 1455 of yacc.c */ -#line 1058 "../parser/Grammar.y" +#line 1056 "../parser/Grammar.y" { ReturnNode* node = new (GLOBAL_DATA) ReturnNode(GLOBAL_DATA, 0); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} @@ -4521,7 +4519,7 @@ yyreduce: case 264: /* Line 1455 of yacc.c */ -#line 1061 "../parser/Grammar.y" +#line 1059 "../parser/Grammar.y" { ReturnNode* node = new (GLOBAL_DATA) ReturnNode(GLOBAL_DATA, 0); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} @@ -4530,7 +4528,7 @@ yyreduce: case 265: /* Line 1455 of yacc.c */ -#line 1064 "../parser/Grammar.y" +#line 1062 "../parser/Grammar.y" { ReturnNode* node = new (GLOBAL_DATA) ReturnNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} @@ -4539,7 +4537,7 @@ yyreduce: case 266: /* Line 1455 of yacc.c */ -#line 1067 "../parser/Grammar.y" +#line 1065 "../parser/Grammar.y" { ReturnNode* node = new (GLOBAL_DATA) ReturnNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} @@ -4548,7 +4546,7 @@ yyreduce: case 267: /* Line 1455 of yacc.c */ -#line 1073 "../parser/Grammar.y" +#line 1071 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) WithNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].statementNode).m_node, (yylsp[(3) - (5)]).last_column, (yylsp[(3) - (5)]).last_column - (yylsp[(3) - (5)]).first_column), (yyvsp[(5) - (5)].statementNode).m_varDeclarations, (yyvsp[(5) - (5)].statementNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].statementNode).m_features | WithFeature, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].statementNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (5)]), (yylsp[(4) - (5)])); ;} @@ -4557,7 +4555,7 @@ yyreduce: case 268: /* Line 1455 of yacc.c */ -#line 1079 "../parser/Grammar.y" +#line 1077 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) SwitchNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].caseBlockNode).m_node), (yyvsp[(5) - (5)].caseBlockNode).m_varDeclarations, (yyvsp[(5) - (5)].caseBlockNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].caseBlockNode).m_features, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].caseBlockNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (5)]), (yylsp[(4) - (5)])); ;} @@ -4566,14 +4564,14 @@ yyreduce: case 269: /* Line 1455 of yacc.c */ -#line 1085 "../parser/Grammar.y" +#line 1083 "../parser/Grammar.y" { (yyval.caseBlockNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) CaseBlockNode(GLOBAL_DATA, (yyvsp[(2) - (3)].clauseList).m_node.head, 0, 0), (yyvsp[(2) - (3)].clauseList).m_varDeclarations, (yyvsp[(2) - (3)].clauseList).m_funcDeclarations, (yyvsp[(2) - (3)].clauseList).m_features, (yyvsp[(2) - (3)].clauseList).m_numConstants); ;} break; case 270: /* Line 1455 of yacc.c */ -#line 1087 "../parser/Grammar.y" +#line 1085 "../parser/Grammar.y" { (yyval.caseBlockNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) CaseBlockNode(GLOBAL_DATA, (yyvsp[(2) - (5)].clauseList).m_node.head, (yyvsp[(3) - (5)].caseClauseNode).m_node, (yyvsp[(4) - (5)].clauseList).m_node.head), mergeDeclarationLists(mergeDeclarationLists((yyvsp[(2) - (5)].clauseList).m_varDeclarations, (yyvsp[(3) - (5)].caseClauseNode).m_varDeclarations), (yyvsp[(4) - (5)].clauseList).m_varDeclarations), mergeDeclarationLists(mergeDeclarationLists((yyvsp[(2) - (5)].clauseList).m_funcDeclarations, (yyvsp[(3) - (5)].caseClauseNode).m_funcDeclarations), (yyvsp[(4) - (5)].clauseList).m_funcDeclarations), @@ -4584,14 +4582,14 @@ yyreduce: case 271: /* Line 1455 of yacc.c */ -#line 1095 "../parser/Grammar.y" +#line 1093 "../parser/Grammar.y" { (yyval.clauseList).m_node.head = 0; (yyval.clauseList).m_node.tail = 0; (yyval.clauseList).m_varDeclarations = 0; (yyval.clauseList).m_funcDeclarations = 0; (yyval.clauseList).m_features = 0; (yyval.clauseList).m_numConstants = 0; ;} break; case 273: /* Line 1455 of yacc.c */ -#line 1100 "../parser/Grammar.y" +#line 1098 "../parser/Grammar.y" { (yyval.clauseList).m_node.head = new (GLOBAL_DATA) ClauseListNode(GLOBAL_DATA, (yyvsp[(1) - (1)].caseClauseNode).m_node); (yyval.clauseList).m_node.tail = (yyval.clauseList).m_node.head; (yyval.clauseList).m_varDeclarations = (yyvsp[(1) - (1)].caseClauseNode).m_varDeclarations; @@ -4603,7 +4601,7 @@ yyreduce: case 274: /* Line 1455 of yacc.c */ -#line 1106 "../parser/Grammar.y" +#line 1104 "../parser/Grammar.y" { (yyval.clauseList).m_node.head = (yyvsp[(1) - (2)].clauseList).m_node.head; (yyval.clauseList).m_node.tail = new (GLOBAL_DATA) ClauseListNode(GLOBAL_DATA, (yyvsp[(1) - (2)].clauseList).m_node.tail, (yyvsp[(2) - (2)].caseClauseNode).m_node); (yyval.clauseList).m_varDeclarations = mergeDeclarationLists((yyvsp[(1) - (2)].clauseList).m_varDeclarations, (yyvsp[(2) - (2)].caseClauseNode).m_varDeclarations); @@ -4616,35 +4614,35 @@ yyreduce: case 275: /* Line 1455 of yacc.c */ -#line 1116 "../parser/Grammar.y" +#line 1114 "../parser/Grammar.y" { (yyval.caseClauseNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) CaseClauseNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node), 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); ;} break; case 276: /* Line 1455 of yacc.c */ -#line 1117 "../parser/Grammar.y" +#line 1115 "../parser/Grammar.y" { (yyval.caseClauseNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) CaseClauseNode(GLOBAL_DATA, (yyvsp[(2) - (4)].expressionNode).m_node, (yyvsp[(4) - (4)].sourceElements).m_node), (yyvsp[(4) - (4)].sourceElements).m_varDeclarations, (yyvsp[(4) - (4)].sourceElements).m_funcDeclarations, (yyvsp[(2) - (4)].expressionNode).m_features | (yyvsp[(4) - (4)].sourceElements).m_features, (yyvsp[(2) - (4)].expressionNode).m_numConstants + (yyvsp[(4) - (4)].sourceElements).m_numConstants); ;} break; case 277: /* Line 1455 of yacc.c */ -#line 1121 "../parser/Grammar.y" +#line 1119 "../parser/Grammar.y" { (yyval.caseClauseNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) CaseClauseNode(GLOBAL_DATA, 0), 0, 0, 0, 0); ;} break; case 278: /* Line 1455 of yacc.c */ -#line 1122 "../parser/Grammar.y" +#line 1120 "../parser/Grammar.y" { (yyval.caseClauseNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) CaseClauseNode(GLOBAL_DATA, 0, (yyvsp[(3) - (3)].sourceElements).m_node), (yyvsp[(3) - (3)].sourceElements).m_varDeclarations, (yyvsp[(3) - (3)].sourceElements).m_funcDeclarations, (yyvsp[(3) - (3)].sourceElements).m_features, (yyvsp[(3) - (3)].sourceElements).m_numConstants); ;} break; case 279: /* Line 1455 of yacc.c */ -#line 1126 "../parser/Grammar.y" +#line 1124 "../parser/Grammar.y" { LabelNode* node = new (GLOBAL_DATA) LabelNode(GLOBAL_DATA, *(yyvsp[(1) - (3)].ident), (yyvsp[(3) - (3)].statementNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, (yyvsp[(3) - (3)].statementNode).m_varDeclarations, (yyvsp[(3) - (3)].statementNode).m_funcDeclarations, (yyvsp[(3) - (3)].statementNode).m_features, (yyvsp[(3) - (3)].statementNode).m_numConstants); ;} @@ -4653,7 +4651,7 @@ yyreduce: case 280: /* Line 1455 of yacc.c */ -#line 1132 "../parser/Grammar.y" +#line 1130 "../parser/Grammar.y" { ThrowNode* node = new (GLOBAL_DATA) ThrowNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); @@ -4663,7 +4661,7 @@ yyreduce: case 281: /* Line 1455 of yacc.c */ -#line 1136 "../parser/Grammar.y" +#line 1134 "../parser/Grammar.y" { ThrowNode* node = new (GLOBAL_DATA) ThrowNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; @@ -4673,7 +4671,7 @@ yyreduce: case 282: /* Line 1455 of yacc.c */ -#line 1143 "../parser/Grammar.y" +#line 1141 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) TryNode(GLOBAL_DATA, (yyvsp[(2) - (4)].statementNode).m_node, GLOBAL_DATA->propertyNames->nullIdentifier, false, 0, (yyvsp[(4) - (4)].statementNode).m_node), mergeDeclarationLists((yyvsp[(2) - (4)].statementNode).m_varDeclarations, (yyvsp[(4) - (4)].statementNode).m_varDeclarations), mergeDeclarationLists((yyvsp[(2) - (4)].statementNode).m_funcDeclarations, (yyvsp[(4) - (4)].statementNode).m_funcDeclarations), @@ -4685,7 +4683,7 @@ yyreduce: case 283: /* Line 1455 of yacc.c */ -#line 1149 "../parser/Grammar.y" +#line 1147 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) TryNode(GLOBAL_DATA, (yyvsp[(2) - (7)].statementNode).m_node, *(yyvsp[(5) - (7)].ident), ((yyvsp[(7) - (7)].statementNode).m_features & EvalFeature) != 0, (yyvsp[(7) - (7)].statementNode).m_node, 0), mergeDeclarationLists((yyvsp[(2) - (7)].statementNode).m_varDeclarations, (yyvsp[(7) - (7)].statementNode).m_varDeclarations), mergeDeclarationLists((yyvsp[(2) - (7)].statementNode).m_funcDeclarations, (yyvsp[(7) - (7)].statementNode).m_funcDeclarations), @@ -4697,7 +4695,7 @@ yyreduce: case 284: /* Line 1455 of yacc.c */ -#line 1156 "../parser/Grammar.y" +#line 1154 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) TryNode(GLOBAL_DATA, (yyvsp[(2) - (9)].statementNode).m_node, *(yyvsp[(5) - (9)].ident), ((yyvsp[(7) - (9)].statementNode).m_features & EvalFeature) != 0, (yyvsp[(7) - (9)].statementNode).m_node, (yyvsp[(9) - (9)].statementNode).m_node), mergeDeclarationLists(mergeDeclarationLists((yyvsp[(2) - (9)].statementNode).m_varDeclarations, (yyvsp[(7) - (9)].statementNode).m_varDeclarations), (yyvsp[(9) - (9)].statementNode).m_varDeclarations), mergeDeclarationLists(mergeDeclarationLists((yyvsp[(2) - (9)].statementNode).m_funcDeclarations, (yyvsp[(7) - (9)].statementNode).m_funcDeclarations), (yyvsp[(9) - (9)].statementNode).m_funcDeclarations), @@ -4709,7 +4707,7 @@ yyreduce: case 285: /* Line 1455 of yacc.c */ -#line 1165 "../parser/Grammar.y" +#line 1163 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) DebuggerStatementNode(GLOBAL_DATA), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} break; @@ -4717,7 +4715,7 @@ yyreduce: case 286: /* Line 1455 of yacc.c */ -#line 1167 "../parser/Grammar.y" +#line 1165 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) DebuggerStatementNode(GLOBAL_DATA), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} break; @@ -4725,14 +4723,14 @@ yyreduce: case 287: /* Line 1455 of yacc.c */ -#line 1172 "../parser/Grammar.y" +#line 1170 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new FuncDeclNode(GLOBAL_DATA, *(yyvsp[(2) - (7)].ident), (yyvsp[(6) - (7)].functionBodyNode), LEXER->sourceCode((yyvsp[(5) - (7)].intValue), (yyvsp[(7) - (7)].intValue), (yylsp[(5) - (7)]).first_line)), 0, new (GLOBAL_DATA) ParserArenaData, ((*(yyvsp[(2) - (7)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | ClosureFeature, 0); DBG((yyvsp[(6) - (7)].functionBodyNode), (yylsp[(5) - (7)]), (yylsp[(7) - (7)])); (yyval.statementNode).m_funcDeclarations->data.append(static_cast((yyval.statementNode).m_node)); ;} break; case 288: /* Line 1455 of yacc.c */ -#line 1174 "../parser/Grammar.y" +#line 1172 "../parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new FuncDeclNode(GLOBAL_DATA, *(yyvsp[(2) - (8)].ident), (yyvsp[(7) - (8)].functionBodyNode), LEXER->sourceCode((yyvsp[(6) - (8)].intValue), (yyvsp[(8) - (8)].intValue), (yylsp[(6) - (8)]).first_line), (yyvsp[(4) - (8)].parameterList).m_node.head), 0, new (GLOBAL_DATA) ParserArenaData, ((*(yyvsp[(2) - (8)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | (yyvsp[(4) - (8)].parameterList).m_features | ClosureFeature, 0); if ((yyvsp[(4) - (8)].parameterList).m_features & ArgumentsFeature) @@ -4745,14 +4743,14 @@ yyreduce: case 289: /* Line 1455 of yacc.c */ -#line 1184 "../parser/Grammar.y" +#line 1182 "../parser/Grammar.y" { (yyval.funcExprNode) = createNodeInfo(new FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->nullIdentifier, (yyvsp[(5) - (6)].functionBodyNode), LEXER->sourceCode((yyvsp[(4) - (6)].intValue), (yyvsp[(6) - (6)].intValue), (yylsp[(4) - (6)]).first_line)), ClosureFeature, 0); DBG((yyvsp[(5) - (6)].functionBodyNode), (yylsp[(4) - (6)]), (yylsp[(6) - (6)])); ;} break; case 290: /* Line 1455 of yacc.c */ -#line 1186 "../parser/Grammar.y" +#line 1184 "../parser/Grammar.y" { (yyval.funcExprNode) = createNodeInfo(new FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->nullIdentifier, (yyvsp[(6) - (7)].functionBodyNode), LEXER->sourceCode((yyvsp[(5) - (7)].intValue), (yyvsp[(7) - (7)].intValue), (yylsp[(5) - (7)]).first_line), (yyvsp[(3) - (7)].parameterList).m_node.head), (yyvsp[(3) - (7)].parameterList).m_features | ClosureFeature, 0); if ((yyvsp[(3) - (7)].parameterList).m_features & ArgumentsFeature) @@ -4764,14 +4762,14 @@ yyreduce: case 291: /* Line 1455 of yacc.c */ -#line 1192 "../parser/Grammar.y" +#line 1190 "../parser/Grammar.y" { (yyval.funcExprNode) = createNodeInfo(new FuncExprNode(GLOBAL_DATA, *(yyvsp[(2) - (7)].ident), (yyvsp[(6) - (7)].functionBodyNode), LEXER->sourceCode((yyvsp[(5) - (7)].intValue), (yyvsp[(7) - (7)].intValue), (yylsp[(5) - (7)]).first_line)), ClosureFeature, 0); DBG((yyvsp[(6) - (7)].functionBodyNode), (yylsp[(5) - (7)]), (yylsp[(7) - (7)])); ;} break; case 292: /* Line 1455 of yacc.c */ -#line 1194 "../parser/Grammar.y" +#line 1192 "../parser/Grammar.y" { (yyval.funcExprNode) = createNodeInfo(new FuncExprNode(GLOBAL_DATA, *(yyvsp[(2) - (8)].ident), (yyvsp[(7) - (8)].functionBodyNode), LEXER->sourceCode((yyvsp[(6) - (8)].intValue), (yyvsp[(8) - (8)].intValue), (yylsp[(6) - (8)]).first_line), (yyvsp[(4) - (8)].parameterList).m_node.head), (yyvsp[(4) - (8)].parameterList).m_features | ClosureFeature, 0); if ((yyvsp[(4) - (8)].parameterList).m_features & ArgumentsFeature) @@ -4783,7 +4781,7 @@ yyreduce: case 293: /* Line 1455 of yacc.c */ -#line 1203 "../parser/Grammar.y" +#line 1201 "../parser/Grammar.y" { (yyval.parameterList).m_node.head = new (GLOBAL_DATA) ParameterNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident)); (yyval.parameterList).m_features = (*(yyvsp[(1) - (1)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0; (yyval.parameterList).m_node.tail = (yyval.parameterList).m_node.head; ;} @@ -4792,7 +4790,7 @@ yyreduce: case 294: /* Line 1455 of yacc.c */ -#line 1206 "../parser/Grammar.y" +#line 1204 "../parser/Grammar.y" { (yyval.parameterList).m_node.head = (yyvsp[(1) - (3)].parameterList).m_node.head; (yyval.parameterList).m_features = (yyvsp[(1) - (3)].parameterList).m_features | ((*(yyvsp[(3) - (3)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0); (yyval.parameterList).m_node.tail = new (GLOBAL_DATA) ParameterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].parameterList).m_node.tail, *(yyvsp[(3) - (3)].ident)); ;} @@ -4801,28 +4799,28 @@ yyreduce: case 295: /* Line 1455 of yacc.c */ -#line 1212 "../parser/Grammar.y" +#line 1210 "../parser/Grammar.y" { (yyval.functionBodyNode) = FunctionBodyNode::create(GLOBAL_DATA); ;} break; case 296: /* Line 1455 of yacc.c */ -#line 1213 "../parser/Grammar.y" +#line 1211 "../parser/Grammar.y" { (yyval.functionBodyNode) = FunctionBodyNode::create(GLOBAL_DATA); ;} break; case 297: /* Line 1455 of yacc.c */ -#line 1217 "../parser/Grammar.y" +#line 1215 "../parser/Grammar.y" { GLOBAL_DATA->parser->didFinishParsing(new (GLOBAL_DATA) SourceElements(GLOBAL_DATA), 0, 0, NoFeatures, (yylsp[(0) - (0)]).last_line, 0); ;} break; case 298: /* Line 1455 of yacc.c */ -#line 1218 "../parser/Grammar.y" +#line 1216 "../parser/Grammar.y" { GLOBAL_DATA->parser->didFinishParsing((yyvsp[(1) - (1)].sourceElements).m_node, (yyvsp[(1) - (1)].sourceElements).m_varDeclarations, (yyvsp[(1) - (1)].sourceElements).m_funcDeclarations, (yyvsp[(1) - (1)].sourceElements).m_features, (yylsp[(1) - (1)]).last_line, (yyvsp[(1) - (1)].sourceElements).m_numConstants); ;} break; @@ -4830,7 +4828,7 @@ yyreduce: case 299: /* Line 1455 of yacc.c */ -#line 1223 "../parser/Grammar.y" +#line 1221 "../parser/Grammar.y" { (yyval.sourceElements).m_node = new (GLOBAL_DATA) SourceElements(GLOBAL_DATA); (yyval.sourceElements).m_node->append((yyvsp[(1) - (1)].statementNode).m_node); (yyval.sourceElements).m_varDeclarations = (yyvsp[(1) - (1)].statementNode).m_varDeclarations; @@ -4843,7 +4841,7 @@ yyreduce: case 300: /* Line 1455 of yacc.c */ -#line 1230 "../parser/Grammar.y" +#line 1228 "../parser/Grammar.y" { (yyval.sourceElements).m_node->append((yyvsp[(2) - (2)].statementNode).m_node); (yyval.sourceElements).m_varDeclarations = mergeDeclarationLists((yyvsp[(1) - (2)].sourceElements).m_varDeclarations, (yyvsp[(2) - (2)].statementNode).m_varDeclarations); (yyval.sourceElements).m_funcDeclarations = mergeDeclarationLists((yyvsp[(1) - (2)].sourceElements).m_funcDeclarations, (yyvsp[(2) - (2)].statementNode).m_funcDeclarations); @@ -4855,259 +4853,259 @@ yyreduce: case 304: /* Line 1455 of yacc.c */ -#line 1244 "../parser/Grammar.y" +#line 1242 "../parser/Grammar.y" { ;} break; case 305: /* Line 1455 of yacc.c */ -#line 1245 "../parser/Grammar.y" +#line 1243 "../parser/Grammar.y" { ;} break; case 306: /* Line 1455 of yacc.c */ -#line 1246 "../parser/Grammar.y" +#line 1244 "../parser/Grammar.y" { Lexer& l = *LEXER; if (!l.scanRegExp()) YYABORT; ;} break; case 307: /* Line 1455 of yacc.c */ -#line 1247 "../parser/Grammar.y" +#line 1245 "../parser/Grammar.y" { Lexer& l = *LEXER; if (!l.scanRegExp()) YYABORT; ;} break; case 308: /* Line 1455 of yacc.c */ -#line 1251 "../parser/Grammar.y" +#line 1249 "../parser/Grammar.y" { ;} break; case 309: /* Line 1455 of yacc.c */ -#line 1252 "../parser/Grammar.y" +#line 1250 "../parser/Grammar.y" { ;} break; case 310: /* Line 1455 of yacc.c */ -#line 1253 "../parser/Grammar.y" +#line 1251 "../parser/Grammar.y" { ;} break; case 311: /* Line 1455 of yacc.c */ -#line 1254 "../parser/Grammar.y" +#line 1252 "../parser/Grammar.y" { if (*(yyvsp[(1) - (7)].ident) != "get" && *(yyvsp[(1) - (7)].ident) != "set") YYABORT; ;} break; case 312: /* Line 1455 of yacc.c */ -#line 1255 "../parser/Grammar.y" +#line 1253 "../parser/Grammar.y" { if (*(yyvsp[(1) - (8)].ident) != "get" && *(yyvsp[(1) - (8)].ident) != "set") YYABORT; ;} break; case 316: /* Line 1455 of yacc.c */ -#line 1265 "../parser/Grammar.y" +#line 1263 "../parser/Grammar.y" { ;} break; case 317: /* Line 1455 of yacc.c */ -#line 1266 "../parser/Grammar.y" +#line 1264 "../parser/Grammar.y" { ;} break; case 318: /* Line 1455 of yacc.c */ -#line 1268 "../parser/Grammar.y" +#line 1266 "../parser/Grammar.y" { ;} break; case 322: /* Line 1455 of yacc.c */ -#line 1275 "../parser/Grammar.y" +#line 1273 "../parser/Grammar.y" { ;} break; case 517: /* Line 1455 of yacc.c */ -#line 1643 "../parser/Grammar.y" +#line 1641 "../parser/Grammar.y" { ;} break; case 518: /* Line 1455 of yacc.c */ -#line 1644 "../parser/Grammar.y" +#line 1642 "../parser/Grammar.y" { ;} break; case 520: /* Line 1455 of yacc.c */ -#line 1649 "../parser/Grammar.y" +#line 1647 "../parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 521: /* Line 1455 of yacc.c */ -#line 1653 "../parser/Grammar.y" +#line 1651 "../parser/Grammar.y" { ;} break; case 522: /* Line 1455 of yacc.c */ -#line 1654 "../parser/Grammar.y" +#line 1652 "../parser/Grammar.y" { ;} break; case 525: /* Line 1455 of yacc.c */ -#line 1660 "../parser/Grammar.y" +#line 1658 "../parser/Grammar.y" { ;} break; case 526: /* Line 1455 of yacc.c */ -#line 1661 "../parser/Grammar.y" +#line 1659 "../parser/Grammar.y" { ;} break; case 530: /* Line 1455 of yacc.c */ -#line 1668 "../parser/Grammar.y" +#line 1666 "../parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 533: /* Line 1455 of yacc.c */ -#line 1677 "../parser/Grammar.y" +#line 1675 "../parser/Grammar.y" { ;} break; case 534: /* Line 1455 of yacc.c */ -#line 1678 "../parser/Grammar.y" +#line 1676 "../parser/Grammar.y" { ;} break; case 539: /* Line 1455 of yacc.c */ -#line 1695 "../parser/Grammar.y" +#line 1693 "../parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 555: /* Line 1455 of yacc.c */ -#line 1726 "../parser/Grammar.y" +#line 1724 "../parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 557: /* Line 1455 of yacc.c */ -#line 1728 "../parser/Grammar.y" +#line 1726 "../parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 559: /* Line 1455 of yacc.c */ -#line 1733 "../parser/Grammar.y" +#line 1731 "../parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 561: /* Line 1455 of yacc.c */ -#line 1735 "../parser/Grammar.y" +#line 1733 "../parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 563: /* Line 1455 of yacc.c */ -#line 1740 "../parser/Grammar.y" +#line 1738 "../parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 565: /* Line 1455 of yacc.c */ -#line 1742 "../parser/Grammar.y" +#line 1740 "../parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 568: /* Line 1455 of yacc.c */ -#line 1754 "../parser/Grammar.y" +#line 1752 "../parser/Grammar.y" { ;} break; case 569: /* Line 1455 of yacc.c */ -#line 1755 "../parser/Grammar.y" +#line 1753 "../parser/Grammar.y" { ;} break; case 578: /* Line 1455 of yacc.c */ -#line 1779 "../parser/Grammar.y" +#line 1777 "../parser/Grammar.y" { ;} break; case 580: /* Line 1455 of yacc.c */ -#line 1784 "../parser/Grammar.y" +#line 1782 "../parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 585: /* Line 1455 of yacc.c */ -#line 1795 "../parser/Grammar.y" +#line 1793 "../parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 592: /* Line 1455 of yacc.c */ -#line 1811 "../parser/Grammar.y" +#line 1809 "../parser/Grammar.y" { ;} break; /* Line 1455 of yacc.c */ -#line 5111 "JavaScriptCore/tmp/../generated/Grammar.tab.c" +#line 5109 "JavaScriptCore/tmp/../generated/Grammar.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -5326,7 +5324,7 @@ yyreturn: /* Line 1675 of yacc.c */ -#line 1827 "../parser/Grammar.y" +#line 1825 "../parser/Grammar.y" static ExpressionNode* makeAssignNode(void* globalPtr, ExpressionNode* loc, Operator op, ExpressionNode* expr, bool locHasAssignments, bool exprHasAssignments, int start, int divot, int end) diff --git a/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h b/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h index c7d383782..847624f47 100644 --- a/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h +++ b/src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h @@ -112,7 +112,7 @@ typedef union YYSTYPE { /* Line 1676 of yacc.c */ -#line 157 "../parser/Grammar.y" +#line 155 "../parser/Grammar.y" int intValue; double doubleValue; diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/CachedCall.h b/src/3rdparty/webkit/JavaScriptCore/interpreter/CachedCall.h index f48f4f4ca..767c262ac 100644 --- a/src/3rdparty/webkit/JavaScriptCore/interpreter/CachedCall.h +++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/CachedCall.h @@ -32,7 +32,7 @@ #include "Interpreter.h" namespace JSC { - class CachedCall : Noncopyable { + class CachedCall : public Noncopyable { public: CachedCall(CallFrame* callFrame, JSFunction* function, int argCount, JSValue* exception) : m_valid(false) diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp index ed7e1ee21..e4eebb202 100644 --- a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp @@ -3402,7 +3402,7 @@ JSValue Interpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFi register, if it has not already been initialised. */ - if (!callFrame->optionalCalleeArguments()) { + if (!callFrame->r(RegisterFile::ArgumentsRegister).jsValue()) { Arguments* arguments = new (globalData) Arguments(callFrame); callFrame->setCalleeArguments(arguments); callFrame->r(RegisterFile::ArgumentsRegister) = arguments; diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.h b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.h index fa6f7db20..5331d929f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.h +++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.h @@ -31,13 +31,14 @@ #include "ArgList.h" #include "FastAllocBase.h" -#include "HashMap.h" #include "JSCell.h" #include "JSValue.h" #include "JSObject.h" #include "Opcode.h" #include "RegisterFile.h" +#include + namespace JSC { class CodeBlock; diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.h b/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.h index 3a6e63b9e..d46bdc918 100644 --- a/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.h +++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/RegisterFile.h @@ -32,12 +32,12 @@ #include "Collector.h" #include "ExecutableAllocator.h" #include "Register.h" +#include #include #include #if HAVE(MMAP) #include -#include #include #endif @@ -92,7 +92,7 @@ namespace JSC { class JSGlobalObject; - class RegisterFile : Noncopyable { + class RegisterFile : public Noncopyable { friend class JIT; public: enum CallFrameHeaderEntry { diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/ExecutableAllocator.h b/src/3rdparty/webkit/JavaScriptCore/jit/ExecutableAllocator.h index 0de4f791c..4ed47e3f4 100644 --- a/src/3rdparty/webkit/JavaScriptCore/jit/ExecutableAllocator.h +++ b/src/3rdparty/webkit/JavaScriptCore/jit/ExecutableAllocator.h @@ -156,7 +156,7 @@ public: return pool.release(); } -#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) || !(PLATFORM(X86) || PLATFORM(X86_64)) +#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) static void makeWritable(void* start, size_t size) { reprotectRegion(start, size, Writable); @@ -165,58 +165,47 @@ public: static void makeExecutable(void* start, size_t size) { reprotectRegion(start, size, Executable); - cacheFlush(start, size); } - - // If ASSEMBLER_WX_EXCLUSIVE protection is turned on, or on non-x86 platforms, - // we need to track start & size so we can makeExecutable/cacheFlush at the end. - class MakeWritable { - public: - MakeWritable(void* start, size_t size) - : m_start(start) - , m_size(size) - { - makeWritable(start, size); - } - - ~MakeWritable() - { - makeExecutable(m_start, m_size); - } - - private: - void* m_start; - size_t m_size; - }; #else static void makeWritable(void*, size_t) {} static void makeExecutable(void*, size_t) {} - - // On x86, without ASSEMBLER_WX_EXCLUSIVE, there is nothing to do here. - class MakeWritable { public: MakeWritable(void*, size_t) {} }; #endif -private: - -#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) || !(PLATFORM(X86) || PLATFORM(X86_64)) -#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) - static void reprotectRegion(void*, size_t, ProtectionSeting); -#else - static void reprotectRegion(void*, size_t, ProtectionSeting) {} -#endif - static void cacheFlush(void* code, size_t size) - { #if PLATFORM(X86) || PLATFORM(X86_64) - UNUSED_PARAM(code); - UNUSED_PARAM(size); + static void cacheFlush(void*, size_t) + { + } #elif PLATFORM_ARM_ARCH(7) && PLATFORM(IPHONE) + static void cacheFlush(void* code, size_t size) + { sys_dcache_flush(code, size); sys_icache_invalidate(code, size); -#else -#error "ExecutableAllocator::cacheFlush not implemented on this platform." -#endif } +#elif PLATFORM(ARM) + static void cacheFlush(void* code, size_t size) + { + #if COMPILER(GCC) && (GCC_VERSION >= 30406) + __clear_cache(reinterpret_cast(code), reinterpret_cast(code) + size); + #else + const int syscall = 0xf0002; + __asm __volatile ( + "mov r0, %0\n" + "mov r1, %1\n" + "mov r7, %2\n" + "mov r2, #0x0\n" + "swi 0x00000000\n" + : + : "r" (code), "r" (reinterpret_cast(code) + size), "r" (syscall) + : "r0", "r1", "r7"); + #endif // COMPILER(GCC) && (GCC_VERSION >= 30406) + } +#endif + +private: + +#if ENABLE(ASSEMBLER_WX_EXCLUSIVE) + static void reprotectRegion(void*, size_t, ProtectionSeting); #endif RefPtr m_smallAllocationPool; diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JIT.cpp b/src/3rdparty/webkit/JavaScriptCore/jit/JIT.cpp index f1b22c0fb..a0e462b61 100644 --- a/src/3rdparty/webkit/JavaScriptCore/jit/JIT.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/jit/JIT.cpp @@ -26,6 +26,12 @@ #include "config.h" #include "JIT.h" +// This probably does not belong here; adding here for now as a quick Windows build fix. +#if ENABLE(ASSEMBLER) && PLATFORM(X86) && !PLATFORM(MAC) +#include "MacroAssembler.h" +JSC::MacroAssemblerX86Common::SSE2CheckState JSC::MacroAssemblerX86Common::s_sse2CheckState = NotCheckedSSE2; +#endif + #if ENABLE(JIT) #include "CodeBlock.h" @@ -34,6 +40,8 @@ #include "JITStubCall.h" #include "JSArray.h" #include "JSFunction.h" +#include "LinkBuffer.h" +#include "RepatchBuffer.h" #include "ResultType.h" #include "SamplingTool.h" @@ -45,21 +53,21 @@ using namespace std; namespace JSC { -void ctiPatchNearCallByReturnAddress(ReturnAddressPtr returnAddress, MacroAssemblerCodePtr newCalleeFunction) +void ctiPatchNearCallByReturnAddress(CodeBlock* codeblock, ReturnAddressPtr returnAddress, MacroAssemblerCodePtr newCalleeFunction) { - MacroAssembler::RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(codeblock); repatchBuffer.relinkNearCallerToTrampoline(returnAddress, newCalleeFunction); } -void ctiPatchCallByReturnAddress(ReturnAddressPtr returnAddress, MacroAssemblerCodePtr newCalleeFunction) +void ctiPatchCallByReturnAddress(CodeBlock* codeblock, ReturnAddressPtr returnAddress, MacroAssemblerCodePtr newCalleeFunction) { - MacroAssembler::RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(codeblock); repatchBuffer.relinkCallerToTrampoline(returnAddress, newCalleeFunction); } -void ctiPatchCallByReturnAddress(ReturnAddressPtr returnAddress, FunctionPtr newCalleeFunction) +void ctiPatchCallByReturnAddress(CodeBlock* codeblock, ReturnAddressPtr returnAddress, FunctionPtr newCalleeFunction) { - MacroAssembler::RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(codeblock); repatchBuffer.relinkCallerToFunction(returnAddress, newCalleeFunction); } @@ -396,7 +404,7 @@ void JIT::privateCompile() #endif // Could use a pop_m, but would need to offset the following instruction if so. - preverveReturnAddressAfterCall(regT2); + preserveReturnAddressAfterCall(regT2); emitPutToCallFrameHeader(regT2, RegisterFile::ReturnPC); Jump slowRegisterFileCheck; @@ -488,6 +496,7 @@ void JIT::privateCompile() #if ENABLE(JIT_OPTIMIZE_CALL) for (unsigned i = 0; i < m_codeBlock->numberOfCallLinkInfos(); ++i) { CallLinkInfo& info = m_codeBlock->callLinkInfo(i); + info.ownerCodeBlock = m_codeBlock; info.callReturnLocation = patchBuffer.locationOfNearCall(m_callStructureStubCompilationInfo[i].callReturnLocation); info.hotPathBegin = patchBuffer.locationOf(m_callStructureStubCompilationInfo[i].hotPathBegin); info.hotPathOther = patchBuffer.locationOfNearCall(m_callStructureStubCompilationInfo[i].hotPathOther); @@ -553,7 +562,7 @@ void JIT::privateCompileCTIMachineTrampolines(RefPtr* executable loadPtr(Address(regT2, OBJECT_OFFSETOF(JSFunction, m_body)), regT3); loadPtr(Address(regT3, OBJECT_OFFSETOF(FunctionBodyNode, m_code)), regT0); Jump hasCodeBlock1 = branchTestPtr(NonZero, regT0); - preverveReturnAddressAfterCall(regT3); + preserveReturnAddressAfterCall(regT3); restoreArgumentReference(); Call callJSFunction1 = call(); emitGetJITStubArg(1, regT2); @@ -565,7 +574,7 @@ void JIT::privateCompileCTIMachineTrampolines(RefPtr* executable // Check argCount matches callee arity. Jump arityCheckOkay1 = branch32(Equal, Address(regT0, OBJECT_OFFSETOF(CodeBlock, m_numParameters)), regT1); - preverveReturnAddressAfterCall(regT3); + preserveReturnAddressAfterCall(regT3); emitPutJITStubArg(regT3, 2); emitPutJITStubArg(regT0, 4); restoreArgumentReference(); @@ -579,7 +588,7 @@ void JIT::privateCompileCTIMachineTrampolines(RefPtr* executable compileOpCallInitializeCallFrame(); - preverveReturnAddressAfterCall(regT3); + preserveReturnAddressAfterCall(regT3); emitPutJITStubArg(regT3, 2); restoreArgumentReference(); Call callDontLazyLinkCall = call(); @@ -594,7 +603,7 @@ void JIT::privateCompileCTIMachineTrampolines(RefPtr* executable loadPtr(Address(regT2, OBJECT_OFFSETOF(JSFunction, m_body)), regT3); loadPtr(Address(regT3, OBJECT_OFFSETOF(FunctionBodyNode, m_code)), regT0); Jump hasCodeBlock2 = branchTestPtr(NonZero, regT0); - preverveReturnAddressAfterCall(regT3); + preserveReturnAddressAfterCall(regT3); restoreArgumentReference(); Call callJSFunction2 = call(); emitGetJITStubArg(1, regT2); @@ -606,7 +615,7 @@ void JIT::privateCompileCTIMachineTrampolines(RefPtr* executable // Check argCount matches callee arity. Jump arityCheckOkay2 = branch32(Equal, Address(regT0, OBJECT_OFFSETOF(CodeBlock, m_numParameters)), regT1); - preverveReturnAddressAfterCall(regT3); + preserveReturnAddressAfterCall(regT3); emitPutJITStubArg(regT3, 2); emitPutJITStubArg(regT0, 4); restoreArgumentReference(); @@ -620,7 +629,7 @@ void JIT::privateCompileCTIMachineTrampolines(RefPtr* executable compileOpCallInitializeCallFrame(); - preverveReturnAddressAfterCall(regT3); + preserveReturnAddressAfterCall(regT3); emitPutJITStubArg(regT3, 2); restoreArgumentReference(); Call callLazyLinkCall = call(); @@ -634,7 +643,7 @@ void JIT::privateCompileCTIMachineTrampolines(RefPtr* executable loadPtr(Address(regT2, OBJECT_OFFSETOF(JSFunction, m_body)), regT3); loadPtr(Address(regT3, OBJECT_OFFSETOF(FunctionBodyNode, m_code)), regT0); Jump hasCodeBlock3 = branchTestPtr(NonZero, regT0); - preverveReturnAddressAfterCall(regT3); + preserveReturnAddressAfterCall(regT3); restoreArgumentReference(); Call callJSFunction3 = call(); emitGetJITStubArg(1, regT2); @@ -647,7 +656,7 @@ void JIT::privateCompileCTIMachineTrampolines(RefPtr* executable // Check argCount matches callee arity. Jump arityCheckOkay3 = branch32(Equal, Address(regT0, OBJECT_OFFSETOF(CodeBlock, m_numParameters)), regT1); - preverveReturnAddressAfterCall(regT3); + preserveReturnAddressAfterCall(regT3); emitPutJITStubArg(regT3, 2); emitPutJITStubArg(regT0, 4); restoreArgumentReference(); @@ -668,7 +677,7 @@ void JIT::privateCompileCTIMachineTrampolines(RefPtr* executable Label nativeCallThunk = align(); - preverveReturnAddressAfterCall(regT0); + preserveReturnAddressAfterCall(regT0); emitPutToCallFrameHeader(regT0, RegisterFile::ReturnPC); // Push return address // Load caller frame's scope chain into this callframe so that whatever we call can @@ -903,14 +912,14 @@ void JIT::unlinkCall(CallLinkInfo* callLinkInfo) // When the JSFunction is deleted the pointer embedded in the instruction stream will no longer be valid // (and, if a new JSFunction happened to be constructed at the same location, we could get a false positive // match). Reset the check so it no longer matches. - RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(callLinkInfo->ownerCodeBlock); repatchBuffer.repatch(callLinkInfo->hotPathBegin, JSValue::encode(JSValue())); } -void JIT::linkCall(JSFunction* callee, CodeBlock* calleeCodeBlock, JITCode& code, CallLinkInfo* callLinkInfo, int callerArgCount, JSGlobalData* globalData) +void JIT::linkCall(JSFunction* callee, CodeBlock* callerCodeBlock, CodeBlock* calleeCodeBlock, JITCode& code, CallLinkInfo* callLinkInfo, int callerArgCount, JSGlobalData* globalData) { ASSERT(calleeCodeBlock); - RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(callerCodeBlock); // Currently we only link calls with the exact number of arguments. // If this is a native call calleeCodeBlock is null so the number of parameters is unimportant @@ -931,12 +940,3 @@ void JIT::linkCall(JSFunction* callee, CodeBlock* calleeCodeBlock, JITCode& code } // namespace JSC #endif // ENABLE(JIT) - -// This probably does not belong here; adding here for now as a quick Windows build fix. -#if ENABLE(ASSEMBLER) - -#if PLATFORM(X86) && !PLATFORM(MAC) -JSC::MacroAssemblerX86Common::SSE2CheckState JSC::MacroAssemblerX86Common::s_sse2CheckState = NotCheckedSSE2; -#endif - -#endif diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JIT.h b/src/3rdparty/webkit/JavaScriptCore/jit/JIT.h index db3f38a2b..ceffe59b3 100644 --- a/src/3rdparty/webkit/JavaScriptCore/jit/JIT.h +++ b/src/3rdparty/webkit/JavaScriptCore/jit/JIT.h @@ -171,9 +171,9 @@ namespace JSC { }; // Near calls can only be patched to other JIT code, regular calls can be patched to JIT code or relinked to stub functions. - void ctiPatchNearCallByReturnAddress(ReturnAddressPtr returnAddress, MacroAssemblerCodePtr newCalleeFunction); - void ctiPatchCallByReturnAddress(ReturnAddressPtr returnAddress, MacroAssemblerCodePtr newCalleeFunction); - void ctiPatchCallByReturnAddress(ReturnAddressPtr returnAddress, FunctionPtr newCalleeFunction); + void ctiPatchNearCallByReturnAddress(CodeBlock* codeblock, ReturnAddressPtr returnAddress, MacroAssemblerCodePtr newCalleeFunction); + void ctiPatchCallByReturnAddress(CodeBlock* codeblock, ReturnAddressPtr returnAddress, MacroAssemblerCodePtr newCalleeFunction); + void ctiPatchCallByReturnAddress(CodeBlock* codeblock, ReturnAddressPtr returnAddress, FunctionPtr newCalleeFunction); class JIT : private MacroAssembler { friend class JITStubCall; @@ -379,9 +379,9 @@ namespace JSC { jit.privateCompileCTIMachineTrampolines(executablePool, globalData, ctiArrayLengthTrampoline, ctiStringLengthTrampoline, ctiVirtualCallPreLink, ctiVirtualCallLink, ctiVirtualCall, ctiNativeCallThunk); } - static void patchGetByIdSelf(StructureStubInfo*, Structure*, size_t cachedOffset, ReturnAddressPtr returnAddress); - static void patchPutByIdReplace(StructureStubInfo*, Structure*, size_t cachedOffset, ReturnAddressPtr returnAddress); - static void patchMethodCallProto(MethodCallLinkInfo&, JSFunction*, Structure*, JSObject*); + static void patchGetByIdSelf(CodeBlock* codeblock, StructureStubInfo*, Structure*, size_t cachedOffset, ReturnAddressPtr returnAddress); + static void patchPutByIdReplace(CodeBlock* codeblock, StructureStubInfo*, Structure*, size_t cachedOffset, ReturnAddressPtr returnAddress); + static void patchMethodCallProto(CodeBlock* codeblock, MethodCallLinkInfo&, JSFunction*, Structure*, JSObject*); static void compilePatchGetArrayLength(JSGlobalData* globalData, CodeBlock* codeBlock, ReturnAddressPtr returnAddress) { @@ -389,7 +389,7 @@ namespace JSC { return jit.privateCompilePatchGetArrayLength(returnAddress); } - static void linkCall(JSFunction* callee, CodeBlock* calleeCodeBlock, JITCode&, CallLinkInfo*, int callerArgCount, JSGlobalData*); + static void linkCall(JSFunction* callee, CodeBlock* callerCodeBlock, CodeBlock* calleeCodeBlock, JITCode&, CallLinkInfo*, int callerArgCount, JSGlobalData*); static void unlinkCall(CallLinkInfo*); private: @@ -663,7 +663,7 @@ namespace JSC { void restoreArgumentReferenceForTrampoline(); Call emitNakedCall(CodePtr function = CodePtr()); - void preverveReturnAddressAfterCall(RegisterID); + void preserveReturnAddressAfterCall(RegisterID); void restoreReturnAddressBeforeReturn(RegisterID); void restoreReturnAddressBeforeReturn(Address); diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JITCode.h b/src/3rdparty/webkit/JavaScriptCore/jit/JITCode.h index 7ee644bee..b502c8a67 100644 --- a/src/3rdparty/webkit/JavaScriptCore/jit/JITCode.h +++ b/src/3rdparty/webkit/JavaScriptCore/jit/JITCode.h @@ -83,13 +83,16 @@ namespace JSC { m_ref.m_code.executableAddress(), registerFile, callFrame, exception, Profiler::enabledProfilerReference(), globalData)); } -#ifndef NDEBUG + void* start() + { + return m_ref.m_code.dataLocation(); + } + size_t size() { ASSERT(m_ref.m_code.executableAddress()); return m_ref.m_size; } -#endif ExecutablePool* getExecutablePool() { diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JITInlineMethods.h b/src/3rdparty/webkit/JavaScriptCore/jit/JITInlineMethods.h index deca0d1c2..f03d63579 100644 --- a/src/3rdparty/webkit/JavaScriptCore/jit/JITInlineMethods.h +++ b/src/3rdparty/webkit/JavaScriptCore/jit/JITInlineMethods.h @@ -179,7 +179,7 @@ ALWAYS_INLINE JIT::Call JIT::emitNakedCall(CodePtr function) #if PLATFORM(X86) || PLATFORM(X86_64) -ALWAYS_INLINE void JIT::preverveReturnAddressAfterCall(RegisterID reg) +ALWAYS_INLINE void JIT::preserveReturnAddressAfterCall(RegisterID reg) { pop(reg); } @@ -196,7 +196,7 @@ ALWAYS_INLINE void JIT::restoreReturnAddressBeforeReturn(Address address) #elif PLATFORM_ARM_ARCH(7) -ALWAYS_INLINE void JIT::preverveReturnAddressAfterCall(RegisterID reg) +ALWAYS_INLINE void JIT::preserveReturnAddressAfterCall(RegisterID reg) { move(linkRegister, reg); } diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JITPropertyAccess.cpp b/src/3rdparty/webkit/JavaScriptCore/jit/JITPropertyAccess.cpp index ed8f48f1d..c1e5c29dd 100644 --- a/src/3rdparty/webkit/JavaScriptCore/jit/JITPropertyAccess.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/jit/JITPropertyAccess.cpp @@ -34,6 +34,8 @@ #include "JSArray.h" #include "JSFunction.h" #include "Interpreter.h" +#include "LinkBuffer.h" +#include "RepatchBuffer.h" #include "ResultType.h" #include "SamplingTool.h" @@ -461,7 +463,7 @@ void JIT::privateCompilePutByIdTransition(StructureStubInfo* stubInfo, Structure if (willNeedStorageRealloc) { // This trampoline was called to like a JIT stub; before we can can call again we need to // remove the return address from the stack, to prevent the stack from becoming misaligned. - preverveReturnAddressAfterCall(regT3); + preserveReturnAddressAfterCall(regT3); JITStubCall stubCall(this, JITStubs::cti_op_put_by_id_transition_realloc); stubCall.addArgument(regT0); @@ -501,13 +503,13 @@ void JIT::privateCompilePutByIdTransition(StructureStubInfo* stubInfo, Structure CodeLocationLabel entryLabel = patchBuffer.finalizeCodeAddendum(); stubInfo->stubRoutine = entryLabel; - RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(m_codeBlock); repatchBuffer.relinkCallerToTrampoline(returnAddress, entryLabel); } -void JIT::patchGetByIdSelf(StructureStubInfo* stubInfo, Structure* structure, size_t cachedOffset, ReturnAddressPtr returnAddress) +void JIT::patchGetByIdSelf(CodeBlock* codeBlock, StructureStubInfo* stubInfo, Structure* structure, size_t cachedOffset, ReturnAddressPtr returnAddress) { - RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(codeBlock); // We don't want to patch more than once - in future go to cti_op_get_by_id_generic. // Should probably go to JITStubs::cti_op_get_by_id_fail, but that doesn't do anything interesting right now. @@ -525,23 +527,28 @@ void JIT::patchGetByIdSelf(StructureStubInfo* stubInfo, Structure* structure, si repatchBuffer.repatch(stubInfo->hotPathBegin.dataLabel32AtOffset(patchOffsetGetByIdPropertyMapOffset), offset); } -void JIT::patchMethodCallProto(MethodCallLinkInfo& methodCallLinkInfo, JSFunction* callee, Structure* structure, JSObject* proto) +void JIT::patchMethodCallProto(CodeBlock* codeBlock, MethodCallLinkInfo& methodCallLinkInfo, JSFunction* callee, Structure* structure, JSObject* proto) { - RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(codeBlock); ASSERT(!methodCallLinkInfo.cachedStructure); methodCallLinkInfo.cachedStructure = structure; structure->ref(); + Structure* prototypeStructure = proto->structure(); + ASSERT(!methodCallLinkInfo.cachedPrototypeStructure); + methodCallLinkInfo.cachedPrototypeStructure = prototypeStructure; + prototypeStructure->ref(); + repatchBuffer.repatch(methodCallLinkInfo.structureLabel, structure); repatchBuffer.repatch(methodCallLinkInfo.structureLabel.dataLabelPtrAtOffset(patchOffsetMethodCheckProtoObj), proto); - repatchBuffer.repatch(methodCallLinkInfo.structureLabel.dataLabelPtrAtOffset(patchOffsetMethodCheckProtoStruct), proto->structure()); + repatchBuffer.repatch(methodCallLinkInfo.structureLabel.dataLabelPtrAtOffset(patchOffsetMethodCheckProtoStruct), prototypeStructure); repatchBuffer.repatch(methodCallLinkInfo.structureLabel.dataLabelPtrAtOffset(patchOffsetMethodCheckPutFunction), callee); } -void JIT::patchPutByIdReplace(StructureStubInfo* stubInfo, Structure* structure, size_t cachedOffset, ReturnAddressPtr returnAddress) +void JIT::patchPutByIdReplace(CodeBlock* codeBlock, StructureStubInfo* stubInfo, Structure* structure, size_t cachedOffset, ReturnAddressPtr returnAddress) { - RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(codeBlock); // We don't want to patch more than once - in future go to cti_op_put_by_id_generic. // Should probably go to JITStubs::cti_op_put_by_id_fail, but that doesn't do anything interesting right now. @@ -591,7 +598,7 @@ void JIT::privateCompilePatchGetArrayLength(ReturnAddressPtr returnAddress) // Finally patch the jump to slow case back in the hot path to jump here instead. CodeLocationJump jumpLocation = stubInfo->hotPathBegin.jumpAtOffset(patchOffsetGetByIdBranchToSlowCase); - RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(m_codeBlock); repatchBuffer.relink(jumpLocation, entryLabel); // We don't want to patch more than once - in future go to cti_op_put_by_id_generic. @@ -637,7 +644,7 @@ void JIT::privateCompileGetByIdProto(StructureStubInfo* stubInfo, Structure* str // Finally patch the jump to slow case back in the hot path to jump here instead. CodeLocationJump jumpLocation = stubInfo->hotPathBegin.jumpAtOffset(patchOffsetGetByIdBranchToSlowCase); - RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(m_codeBlock); repatchBuffer.relink(jumpLocation, entryLabel); // We don't want to patch more than once - in future go to cti_op_put_by_id_generic. @@ -669,7 +676,7 @@ void JIT::privateCompileGetByIdSelfList(StructureStubInfo* stubInfo, Polymorphic // Finally patch the jump to slow case back in the hot path to jump here instead. CodeLocationJump jumpLocation = stubInfo->hotPathBegin.jumpAtOffset(patchOffsetGetByIdBranchToSlowCase); - RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(m_codeBlock); repatchBuffer.relink(jumpLocation, entryLabel); } @@ -714,7 +721,7 @@ void JIT::privateCompileGetByIdProtoList(StructureStubInfo* stubInfo, Polymorphi // Finally patch the jump to slow case back in the hot path to jump here instead. CodeLocationJump jumpLocation = stubInfo->hotPathBegin.jumpAtOffset(patchOffsetGetByIdBranchToSlowCase); - RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(m_codeBlock); repatchBuffer.relink(jumpLocation, entryLabel); } @@ -768,7 +775,7 @@ void JIT::privateCompileGetByIdChainList(StructureStubInfo* stubInfo, Polymorphi // Finally patch the jump to slow case back in the hot path to jump here instead. CodeLocationJump jumpLocation = stubInfo->hotPathBegin.jumpAtOffset(patchOffsetGetByIdBranchToSlowCase); - RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(m_codeBlock); repatchBuffer.relink(jumpLocation, entryLabel); } @@ -816,7 +823,7 @@ void JIT::privateCompileGetByIdChain(StructureStubInfo* stubInfo, Structure* str // Finally patch the jump to slow case back in the hot path to jump here instead. CodeLocationJump jumpLocation = stubInfo->hotPathBegin.jumpAtOffset(patchOffsetGetByIdBranchToSlowCase); - RepatchBuffer repatchBuffer; + RepatchBuffer repatchBuffer(m_codeBlock); repatchBuffer.relink(jumpLocation, entryLabel); // We don't want to patch more than once - in future go to cti_op_put_by_id_generic. diff --git a/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp index 02bf7c0d7..5049477cd 100644 --- a/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/jit/JITStubs.cpp @@ -358,7 +358,7 @@ NEVER_INLINE void JITThunks::tryCachePutByID(CallFrame* callFrame, CodeBlock* co // Uncacheable: give up. if (!slot.isCacheable()) { - ctiPatchCallByReturnAddress(returnAddress, FunctionPtr(JITStubs::cti_op_put_by_id_generic)); + ctiPatchCallByReturnAddress(codeBlock, returnAddress, FunctionPtr(JITStubs::cti_op_put_by_id_generic)); return; } @@ -366,13 +366,13 @@ NEVER_INLINE void JITThunks::tryCachePutByID(CallFrame* callFrame, CodeBlock* co Structure* structure = baseCell->structure(); if (structure->isDictionary()) { - ctiPatchCallByReturnAddress(returnAddress, FunctionPtr(JITStubs::cti_op_put_by_id_generic)); + ctiPatchCallByReturnAddress(codeBlock, returnAddress, FunctionPtr(JITStubs::cti_op_put_by_id_generic)); return; } // If baseCell != base, then baseCell must be a proxy for another object. if (baseCell != slot.base()) { - ctiPatchCallByReturnAddress(returnAddress, FunctionPtr(JITStubs::cti_op_put_by_id_generic)); + ctiPatchCallByReturnAddress(codeBlock, returnAddress, FunctionPtr(JITStubs::cti_op_put_by_id_generic)); return; } @@ -384,7 +384,7 @@ NEVER_INLINE void JITThunks::tryCachePutByID(CallFrame* callFrame, CodeBlock* co if (slot.type() == PutPropertySlot::NewProperty) { StructureChain* prototypeChain = structure->prototypeChain(callFrame); if (!prototypeChain->isCacheable()) { - ctiPatchCallByReturnAddress(returnAddress, FunctionPtr(JITStubs::cti_op_put_by_id_generic)); + ctiPatchCallByReturnAddress(codeBlock, returnAddress, FunctionPtr(JITStubs::cti_op_put_by_id_generic)); return; } stubInfo->initPutByIdTransition(structure->previousID(), structure, prototypeChain); @@ -394,7 +394,7 @@ NEVER_INLINE void JITThunks::tryCachePutByID(CallFrame* callFrame, CodeBlock* co stubInfo->initPutByIdReplace(structure); - JIT::patchPutByIdReplace(stubInfo, structure, slot.cachedOffset(), returnAddress); + JIT::patchPutByIdReplace(codeBlock, stubInfo, structure, slot.cachedOffset(), returnAddress); } NEVER_INLINE void JITThunks::tryCacheGetByID(CallFrame* callFrame, CodeBlock* codeBlock, ReturnAddressPtr returnAddress, JSValue baseValue, const Identifier& propertyName, const PropertySlot& slot) @@ -404,7 +404,7 @@ NEVER_INLINE void JITThunks::tryCacheGetByID(CallFrame* callFrame, CodeBlock* co // FIXME: Cache property access for immediates. if (!baseValue.isCell()) { - ctiPatchCallByReturnAddress(returnAddress, FunctionPtr(JITStubs::cti_op_get_by_id_generic)); + ctiPatchCallByReturnAddress(codeBlock, returnAddress, FunctionPtr(JITStubs::cti_op_get_by_id_generic)); return; } @@ -418,13 +418,13 @@ NEVER_INLINE void JITThunks::tryCacheGetByID(CallFrame* callFrame, CodeBlock* co if (isJSString(globalData, baseValue) && propertyName == callFrame->propertyNames().length) { // The tradeoff of compiling an patched inline string length access routine does not seem // to pay off, so we currently only do this for arrays. - ctiPatchCallByReturnAddress(returnAddress, globalData->jitStubs.ctiStringLengthTrampoline()); + ctiPatchCallByReturnAddress(codeBlock, returnAddress, globalData->jitStubs.ctiStringLengthTrampoline()); return; } // Uncacheable: give up. if (!slot.isCacheable()) { - ctiPatchCallByReturnAddress(returnAddress, FunctionPtr(JITStubs::cti_op_get_by_id_generic)); + ctiPatchCallByReturnAddress(codeBlock, returnAddress, FunctionPtr(JITStubs::cti_op_get_by_id_generic)); return; } @@ -432,7 +432,7 @@ NEVER_INLINE void JITThunks::tryCacheGetByID(CallFrame* callFrame, CodeBlock* co Structure* structure = baseCell->structure(); if (structure->isDictionary()) { - ctiPatchCallByReturnAddress(returnAddress, FunctionPtr(JITStubs::cti_op_get_by_id_generic)); + ctiPatchCallByReturnAddress(codeBlock, returnAddress, FunctionPtr(JITStubs::cti_op_get_by_id_generic)); return; } @@ -447,7 +447,7 @@ NEVER_INLINE void JITThunks::tryCacheGetByID(CallFrame* callFrame, CodeBlock* co // set this up, so derefStructures can do it's job. stubInfo->initGetByIdSelf(structure); - JIT::patchGetByIdSelf(stubInfo, structure, slot.cachedOffset(), returnAddress); + JIT::patchGetByIdSelf(codeBlock, stubInfo, structure, slot.cachedOffset(), returnAddress); return; } @@ -475,7 +475,7 @@ NEVER_INLINE void JITThunks::tryCacheGetByID(CallFrame* callFrame, CodeBlock* co StructureChain* prototypeChain = structure->prototypeChain(callFrame); if (!prototypeChain->isCacheable()) { - ctiPatchCallByReturnAddress(returnAddress, FunctionPtr(JITStubs::cti_op_get_by_id_generic)); + ctiPatchCallByReturnAddress(codeBlock, returnAddress, FunctionPtr(JITStubs::cti_op_get_by_id_generic)); return; } stubInfo->initGetByIdChain(structure, prototypeChain); @@ -777,7 +777,7 @@ DEFINE_STUB_FUNCTION(void, op_put_by_id) PutPropertySlot slot; stackFrame.args[0].jsValue().put(callFrame, ident, stackFrame.args[2].jsValue(), slot); - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_put_by_id_second)); + ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_put_by_id_second)); CHECK_FOR_EXCEPTION_AT_END(); } @@ -831,7 +831,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id) PropertySlot slot(baseValue); JSValue result = baseValue.get(callFrame, ident, slot); - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_second)); + ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_second)); CHECK_FOR_EXCEPTION_AT_END(); return JSValue::encode(result); @@ -848,7 +848,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_method_check) PropertySlot slot(baseValue); JSValue result = baseValue.get(callFrame, ident, slot); - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_method_check_second)); + ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_method_check_second)); CHECK_FOR_EXCEPTION_AT_END(); return JSValue::encode(result); @@ -900,7 +900,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_method_check_second) // Check to see if the function is on the object's prototype. Patch up the code to optimize. if (slot.slotBase() == structure->prototypeForLookup(callFrame)) - JIT::patchMethodCallProto(methodCallLinkInfo, callee, structure, slotBaseObject); + JIT::patchMethodCallProto(callFrame->codeBlock(), methodCallLinkInfo, callee, structure, slotBaseObject); // Check to see if the function is on the object itself. // Since we generate the method-check to check both the structure and a prototype-structure (since this // is the common case) we have a problem - we need to patch the prototype structure check to do something @@ -908,13 +908,13 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_method_check_second) // for now. For now it performs a check on a special object on the global object only used for this // purpose. The object is in no way exposed, and as such the check will always pass. else if (slot.slotBase() == baseValue) - JIT::patchMethodCallProto(methodCallLinkInfo, callee, structure, callFrame->scopeChain()->globalObject()->methodCallDummy()); + JIT::patchMethodCallProto(callFrame->codeBlock(), methodCallLinkInfo, callee, structure, callFrame->scopeChain()->globalObject()->methodCallDummy()); // For now let any other case be cached as a normal get_by_id. } // Revert the get_by_id op back to being a regular get_by_id - allow it to cache like normal, if it needs to. - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id)); + ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id)); return JSValue::encode(result); } @@ -975,10 +975,9 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_self_fail) JIT::compileGetByIdSelfList(callFrame->scopeChain()->globalData, codeBlock, stubInfo, polymorphicStructureList, listIndex, asCell(baseValue)->structure(), slot.cachedOffset()); if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1)) - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_generic)); - } else { - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_generic)); - } + ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_generic)); + } else + ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_generic)); return JSValue::encode(result); } @@ -1024,7 +1023,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_proto_list) CHECK_FOR_EXCEPTION(); if (!baseValue.isCell() || !slot.isCacheable() || asCell(baseValue)->structure()->isDictionary()) { - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_fail)); + ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_fail)); return JSValue::encode(result); } @@ -1036,7 +1035,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_proto_list) JSObject* slotBaseObject = asObject(slot.slotBase()); if (slot.slotBase() == baseValue) - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_fail)); + ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_fail)); else if (slot.slotBase() == asCell(baseValue)->structure()->prototypeForLookup(callFrame)) { // Since we're accessing a prototype in a loop, it's a good bet that it // should not be treated as a dictionary. @@ -1049,11 +1048,11 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_proto_list) JIT::compileGetByIdProtoList(callFrame->scopeChain()->globalData, callFrame, codeBlock, stubInfo, prototypeStructureList, listIndex, structure, slotBaseObject->structure(), slot.cachedOffset()); if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1)) - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_list_full)); + ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_list_full)); } else if (size_t count = countPrototypeChainEntriesAndCheckForProxies(callFrame, baseValue, slot)) { StructureChain* protoChain = structure->prototypeChain(callFrame); if (!protoChain->isCacheable()) { - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_fail)); + ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_fail)); return JSValue::encode(result); } @@ -1062,9 +1061,9 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_proto_list) JIT::compileGetByIdChainList(callFrame->scopeChain()->globalData, callFrame, codeBlock, stubInfo, prototypeStructureList, listIndex, structure, protoChain, count, slot.cachedOffset()); if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1)) - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_list_full)); + ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_list_full)); } else - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_fail)); + ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_fail)); return JSValue::encode(result); } @@ -1271,7 +1270,7 @@ DEFINE_STUB_FUNCTION(void*, vm_dontLazyLinkCall) JSGlobalData* globalData = stackFrame.globalData; JSFunction* callee = asFunction(stackFrame.args[0].jsValue()); - ctiPatchNearCallByReturnAddress(stackFrame.args[1].returnAddress(), globalData->jitStubs.ctiVirtualCallLink()); + ctiPatchNearCallByReturnAddress(stackFrame.callFrame->callerFrame()->codeBlock(), stackFrame.args[1].returnAddress(), globalData->jitStubs.ctiVirtualCallLink()); return callee->body()->generatedJITCode().addressForCall().executableAddress(); } @@ -1290,7 +1289,7 @@ DEFINE_STUB_FUNCTION(void*, vm_lazyLinkCall) codeBlock = &callee->body()->generatedBytecode(); CallLinkInfo* callLinkInfo = &stackFrame.callFrame->callerFrame()->codeBlock()->getCallLinkInfo(stackFrame.args[1].returnAddress()); - JIT::linkCall(callee, codeBlock, jitCode, callLinkInfo, stackFrame.args[2].int32(), stackFrame.globalData); + JIT::linkCall(callee, stackFrame.callFrame->callerFrame()->codeBlock(), codeBlock, jitCode, callLinkInfo, stackFrame.args[2].int32(), stackFrame.globalData); return jitCode.addressForCall().executableAddress(); } @@ -1530,11 +1529,11 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_val) result = jsArray->JSArray::get(callFrame, i); } else if (isJSString(globalData, baseValue) && asString(baseValue)->canGetIndex(i)) { // All fast byte array accesses are safe from exceptions so return immediately to avoid exception checks. - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_val_string)); + ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_val_string)); result = asString(baseValue)->getIndex(stackFrame.globalData, i); } else if (isJSByteArray(globalData, baseValue) && asByteArray(baseValue)->canAccessIndex(i)) { // All fast byte array accesses are safe from exceptions so return immediately to avoid exception checks. - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_val_byte_array)); + ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_val_byte_array)); return JSValue::encode(asByteArray(baseValue)->getIndex(callFrame, i)); } else result = baseValue.get(callFrame, i); @@ -1566,7 +1565,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_val_string) else { result = baseValue.get(callFrame, i); if (!isJSString(globalData, baseValue)) - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_val)); + ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_val)); } } else { Identifier property(callFrame, subscript.toString(callFrame)); @@ -1599,7 +1598,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_val_byte_array) result = baseValue.get(callFrame, i); if (!isJSByteArray(globalData, baseValue)) - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_val)); + ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_val)); } else { Identifier property(callFrame, subscript.toString(callFrame)); result = baseValue.get(callFrame, property); @@ -1692,7 +1691,7 @@ DEFINE_STUB_FUNCTION(void, op_put_by_val) jsArray->JSArray::put(callFrame, i, value); } else if (isJSByteArray(globalData, baseValue) && asByteArray(baseValue)->canAccessIndex(i)) { JSByteArray* jsByteArray = asByteArray(baseValue); - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_put_by_val_byte_array)); + ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_put_by_val_byte_array)); // All fast byte array accesses are safe from exceptions so return immediately to avoid exception checks. if (value.isInt32Fast()) { jsByteArray->setIndex(i, value.getInt32Fast()); @@ -1776,7 +1775,7 @@ DEFINE_STUB_FUNCTION(void, op_put_by_val_byte_array) } if (!isJSByteArray(globalData, baseValue)) - ctiPatchCallByReturnAddress(STUB_RETURN_ADDRESS, FunctionPtr(cti_op_put_by_val)); + ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_put_by_val)); baseValue.put(callFrame, i, value); } else { Identifier property(callFrame, subscript.toString(callFrame)); diff --git a/src/3rdparty/webkit/JavaScriptCore/jsc.cpp b/src/3rdparty/webkit/JavaScriptCore/jsc.cpp index 769169b9e..190deff3d 100644 --- a/src/3rdparty/webkit/JavaScriptCore/jsc.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/jsc.cpp @@ -221,7 +221,7 @@ JSValue JSC_HOST_CALL functionDebug(ExecState* exec, JSObject*, JSValue, const A JSValue JSC_HOST_CALL functionGC(ExecState* exec, JSObject*, JSValue, const ArgList&) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); exec->heap()->collect(); return jsUndefined(); } @@ -375,7 +375,7 @@ int main(int argc, char** argv) static void cleanupGlobalData(JSGlobalData* globalData) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); globalData->heap.destroy(); globalData->deref(); } @@ -550,7 +550,7 @@ static void parseArguments(int argc, char** argv, Options& options, JSGlobalData int jscmain(int argc, char** argv, JSGlobalData* globalData) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); Options options; parseArguments(argc, argv, options, globalData); diff --git a/src/3rdparty/webkit/JavaScriptCore/jsc.pro b/src/3rdparty/webkit/JavaScriptCore/jsc.pro new file mode 100644 index 000000000..ba880ffbd --- /dev/null +++ b/src/3rdparty/webkit/JavaScriptCore/jsc.pro @@ -0,0 +1,31 @@ +TEMPLATE = app +TARGET = jsc +DESTDIR = . +SOURCES = jsc.cpp +QT -= gui +CONFIG -= app_bundle +CONFIG += building-libs +win32-*: CONFIG += console +win32-msvc*: CONFIG += exceptions_off stl_off + +include($$PWD/../WebKit.pri) + +CONFIG += link_pkgconfig + +QMAKE_RPATHDIR += $$OUTPUT_DIR/lib + +isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/.. +CONFIG(debug, debug|release) { + OBJECTS_DIR = obj/debug +} else { # Release + OBJECTS_DIR = obj/release +} +OBJECTS_DIR_WTR = $$OBJECTS_DIR$${QMAKE_DIR_SEP} +include($$PWD/JavaScriptCore.pri) + +lessThan(QT_MINOR_VERSION, 4) { + DEFINES += QT_BEGIN_NAMESPACE="" QT_END_NAMESPACE="" +} + +*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2 +*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3 diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Grammar.y b/src/3rdparty/webkit/JavaScriptCore/parser/Grammar.y index c5ca4250a..354c78630 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Grammar.y +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Grammar.y @@ -36,8 +36,12 @@ #include "CommonIdentifiers.h" #include "NodeInfo.h" #include "Parser.h" +#include #include +#define YYMALLOC fastMalloc +#define YYFREE fastFree + #define YYMAXDEPTH 10000 #define YYENABLE_NLS 0 @@ -88,12 +92,6 @@ static ExpressionNode* combineCommaNodes(void*, ExpressionNode* list, Expression #pragma warning(disable: 4244) #pragma warning(disable: 4702) -// At least some of the time, the declarations of malloc and free that bison -// generates are causing warnings. A way to avoid this is to explicitly define -// the macros so that bison doesn't try to declare malloc and free. -#define YYMALLOC malloc -#define YYFREE free - #endif #define YYPARSE_PARAM globalPtr diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h b/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h index 0e1b6188e..25831628d 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h @@ -33,7 +33,7 @@ namespace JSC { class RegExp; - class Lexer : Noncopyable { + class Lexer : public Noncopyable { public: // Character manipulation functions. static bool isWhiteSpace(int character); diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.cpp b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.cpp index 105ceaf45..6c0d1af0c 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.cpp @@ -495,6 +495,8 @@ static RegisterID* emitPreIncOrDec(BytecodeGenerator& generator, RegisterID* src static RegisterID* emitPostIncOrDec(BytecodeGenerator& generator, RegisterID* dst, RegisterID* srcDst, Operator oper) { + if (srcDst == dst) + return generator.emitToJSNumber(dst, srcDst); return (oper == OpPlusPlus) ? generator.emitPostInc(dst, srcDst) : generator.emitPostDec(dst, srcDst); } diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h index 34b44975c..84e8b958a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h @@ -113,7 +113,7 @@ namespace JSC { void operator delete(void*); }; - class ParserArenaRefCounted : public RefCounted { + class ParserArenaRefCounted : public RefCountedCustomAllocated { protected: ParserArenaRefCounted(JSGlobalData*); diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Parser.h b/src/3rdparty/webkit/JavaScriptCore/parser/Parser.h index 6f4c2b7d4..373dc0008 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Parser.h +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Parser.h @@ -39,7 +39,7 @@ namespace JSC { template struct ParserArenaData : ParserArenaDeletable { T data; }; - class Parser : Noncopyable { + class Parser : public Noncopyable { public: template PassRefPtr parse(ExecState*, Debugger*, const SourceCode&, int* errLine = 0, UString* errMsg = 0); template PassRefPtr reparse(JSGlobalData*, ParsedNode*); diff --git a/src/3rdparty/webkit/JavaScriptCore/pcre/pcre_exec.cpp b/src/3rdparty/webkit/JavaScriptCore/pcre/pcre_exec.cpp index af770f38a..16619d427 100644 --- a/src/3rdparty/webkit/JavaScriptCore/pcre/pcre_exec.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/pcre/pcre_exec.cpp @@ -112,7 +112,7 @@ struct BracketChainNode { const UChar* bracketStart; }; -struct MatchFrame { +struct MatchFrame : FastAllocBase { ReturnLocation returnLocation; struct MatchFrame* previousFrame; diff --git a/src/3rdparty/webkit/JavaScriptCore/profiler/Profiler.h b/src/3rdparty/webkit/JavaScriptCore/profiler/Profiler.h index b37f61356..869f4192c 100644 --- a/src/3rdparty/webkit/JavaScriptCore/profiler/Profiler.h +++ b/src/3rdparty/webkit/JavaScriptCore/profiler/Profiler.h @@ -44,7 +44,7 @@ namespace JSC { class ProfileGenerator; class UString; - class Profiler { + class Profiler : public FastAllocBase { public: static Profiler** enabledProfilerReference() { diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/ArgList.h b/src/3rdparty/webkit/JavaScriptCore/runtime/ArgList.h index 4d571fcfe..0899e8518 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/ArgList.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/ArgList.h @@ -31,7 +31,7 @@ namespace JSC { - class MarkedArgumentBuffer : Noncopyable { + class MarkedArgumentBuffer : public Noncopyable { private: static const unsigned inlineCapacity = 8; typedef Vector VectorType; diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/BatchedTransitionOptimizer.h b/src/3rdparty/webkit/JavaScriptCore/runtime/BatchedTransitionOptimizer.h index 13dd95c2e..b9f738f9b 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/BatchedTransitionOptimizer.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/BatchedTransitionOptimizer.h @@ -32,7 +32,7 @@ namespace JSC { - class BatchedTransitionOptimizer : Noncopyable { + class BatchedTransitionOptimizer : public Noncopyable { public: BatchedTransitionOptimizer(JSObject* object) : m_object(object) diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp index 0ff97b8c7..30ffb5bc0 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp @@ -48,6 +48,11 @@ #include #include +#elif PLATFORM(SYMBIAN) +#include +#include +#include + #elif PLATFORM(WIN_OS) #include @@ -103,6 +108,11 @@ const size_t ALLOCATIONS_PER_COLLECTION = 4000; // a PIC branch in Mach-O binaries, see . #define MIN_ARRAY_SIZE (static_cast(14)) +#if PLATFORM(SYMBIAN) +const size_t MAX_NUM_BLOCKS = 256; // Max size of collector heap set to 16 MB +static RHeap* userChunk = 0; +#endif + static void freeHeap(CollectorHeap*); #if ENABLE(JSC_MULTIPLE_THREADS) @@ -144,6 +154,26 @@ Heap::Heap(JSGlobalData* globalData) { ASSERT(globalData); +#if PLATFORM(SYMBIAN) + // Symbian OpenC supports mmap but currently not the MAP_ANON flag. + // Using fastMalloc() does not properly align blocks on 64k boundaries + // and previous implementation was flawed/incomplete. + // UserHeap::ChunkHeap allows allocation of continuous memory and specification + // of alignment value for (symbian) cells within that heap. + // + // Clarification and mapping of terminology: + // RHeap (created by UserHeap::ChunkHeap below) is continuos memory chunk, + // which can dynamically grow up to 8 MB, + // that holds all CollectorBlocks of this session (static). + // Each symbian cell within RHeap maps to a 64kb aligned CollectorBlock. + // JSCell objects are maintained as usual within CollectorBlocks. + if (!userChunk) { + userChunk = UserHeap::ChunkHeap(0, 0, MAX_NUM_BLOCKS * BLOCK_SIZE, BLOCK_SIZE, BLOCK_SIZE); + if (!userChunk) + CRASH(); + } +#endif // PLATFORM(SYMBIAN) + memset(&primaryHeap, 0, sizeof(CollectorHeap)); memset(&numberHeap, 0, sizeof(CollectorHeap)); } @@ -156,7 +186,7 @@ Heap::~Heap() void Heap::destroy() { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); if (!m_globalData) return; @@ -201,8 +231,12 @@ static NEVER_INLINE CollectorBlock* allocateBlock() // FIXME: tag the region as a JavaScriptCore heap when we get a registered VM tag: . vm_map(current_task(), &address, BLOCK_SIZE, BLOCK_OFFSET_MASK, VM_FLAGS_ANYWHERE | VM_TAG_FOR_COLLECTOR_MEMORY, MEMORY_OBJECT_NULL, 0, FALSE, VM_PROT_DEFAULT, VM_PROT_DEFAULT, VM_INHERIT_DEFAULT); #elif PLATFORM(SYMBIAN) - // no memory map in symbian, need to hack with fastMalloc - void* address = fastMalloc(BLOCK_SIZE); + // Allocate a 64 kb aligned CollectorBlock + unsigned char* mask = reinterpret_cast(userChunk->Alloc(BLOCK_SIZE)); + if (!mask) + CRASH(); + uintptr_t address = reinterpret_cast(mask); + memset(reinterpret_cast(address), 0, BLOCK_SIZE); #elif PLATFORM(WIN_OS) // windows virtual address granularity is naturally 64k @@ -247,7 +281,7 @@ static void freeBlock(CollectorBlock* block) #if PLATFORM(DARWIN) vm_deallocate(current_task(), reinterpret_cast(block), BLOCK_SIZE); #elif PLATFORM(SYMBIAN) - fastFree(block); + userChunk->Free(reinterpret_cast(block)); #elif PLATFORM(WIN_OS) VirtualFree(block, 0, MEM_RELEASE); #elif HAVE(POSIX_MEMALIGN) diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.h b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.h index 23f9f158e..852ac59e0 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.h @@ -63,7 +63,7 @@ namespace JSC { OperationInProgress operationInProgress; }; - class Heap : Noncopyable { + class Heap : public Noncopyable { public: class Thread; typedef CollectorHeapIterator iterator; diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/CommonIdentifiers.h b/src/3rdparty/webkit/JavaScriptCore/runtime/CommonIdentifiers.h index 408d81903..7b275bd09 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/CommonIdentifiers.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/CommonIdentifiers.h @@ -70,7 +70,7 @@ namespace JSC { - class CommonIdentifiers : Noncopyable { + class CommonIdentifiers : public Noncopyable { private: CommonIdentifiers(JSGlobalData*); friend class JSGlobalData; diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/Identifier.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/Identifier.cpp index 040c123e5..7db723b82 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/Identifier.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Identifier.cpp @@ -32,7 +32,7 @@ namespace JSC { typedef HashMap, PtrHash > LiteralIdentifierTable; -class IdentifierTable { +class IdentifierTable : public FastAllocBase { public: ~IdentifierTable() { diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.h index e0a9b4d5f..32aa22b2c 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.h @@ -31,7 +31,7 @@ namespace JSC { - class JSCell : Noncopyable { + class JSCell : public NoncopyableCustomAllocated { friend class GetterSetter; friend class Heap; friend class JIT; diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h index 983274b80..7ab759ddd 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h @@ -391,7 +391,7 @@ namespace JSC { return globalData().dynamicGlobalObject; } - class DynamicGlobalObjectScope : Noncopyable { + class DynamicGlobalObjectScope : public Noncopyable { public: DynamicGlobalObjectScope(CallFrame* callFrame, JSGlobalObject* dynamicGlobalObject) : m_dynamicGlobalObjectSlot(callFrame->globalData().dynamicGlobalObject) diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSLock.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSLock.cpp index 7ece5da3d..8f056c817 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSLock.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSLock.cpp @@ -60,23 +60,23 @@ static void setLockCount(intptr_t count) } JSLock::JSLock(ExecState* exec) - : m_lockingForReal(exec->globalData().isSharedInstance) + : m_lockBehavior(exec->globalData().isSharedInstance ? LockForReal : SilenceAssertionsOnly) { - lock(m_lockingForReal); + lock(m_lockBehavior); } -void JSLock::lock(bool lockForReal) +void JSLock::lock(JSLockBehavior lockBehavior) { #ifdef NDEBUG // Locking "not for real" is a debug-only feature. - if (!lockForReal) + if (lockBehavior == SilenceAssertionsOnly) return; #endif pthread_once(&createJSLockCountOnce, createJSLockCount); intptr_t currentLockCount = lockCount(); - if (!currentLockCount && lockForReal) { + if (!currentLockCount && lockBehavior == LockForReal) { int result; result = pthread_mutex_lock(&JSMutex); ASSERT(!result); @@ -84,19 +84,19 @@ void JSLock::lock(bool lockForReal) setLockCount(currentLockCount + 1); } -void JSLock::unlock(bool lockForReal) +void JSLock::unlock(JSLockBehavior lockBehavior) { ASSERT(lockCount()); #ifdef NDEBUG // Locking "not for real" is a debug-only feature. - if (!lockForReal) + if (lockBehavior == SilenceAssertionsOnly) return; #endif intptr_t newLockCount = lockCount() - 1; setLockCount(newLockCount); - if (!newLockCount && lockForReal) { + if (!newLockCount && lockBehavior == LockForReal) { int result; result = pthread_mutex_unlock(&JSMutex); ASSERT(!result); @@ -105,12 +105,12 @@ void JSLock::unlock(bool lockForReal) void JSLock::lock(ExecState* exec) { - lock(exec->globalData().isSharedInstance); + lock(exec->globalData().isSharedInstance ? LockForReal : SilenceAssertionsOnly); } void JSLock::unlock(ExecState* exec) { - unlock(exec->globalData().isSharedInstance); + unlock(exec->globalData().isSharedInstance ? LockForReal : SilenceAssertionsOnly); } bool JSLock::currentThreadIsHoldingLock() @@ -162,7 +162,7 @@ bool JSLock::currentThreadIsHoldingLock() static unsigned lockDropDepth = 0; JSLock::DropAllLocks::DropAllLocks(ExecState* exec) - : m_lockingForReal(exec->globalData().isSharedInstance) + : m_lockBehavior(exec->globalData().isSharedInstance ? LockForReal : SilenceAssertionsOnly) { pthread_once(&createJSLockCountOnce, createJSLockCount); @@ -173,11 +173,11 @@ JSLock::DropAllLocks::DropAllLocks(ExecState* exec) m_lockCount = JSLock::lockCount(); for (intptr_t i = 0; i < m_lockCount; i++) - JSLock::unlock(m_lockingForReal); + JSLock::unlock(m_lockBehavior); } -JSLock::DropAllLocks::DropAllLocks(bool lockingForReal) - : m_lockingForReal(lockingForReal) +JSLock::DropAllLocks::DropAllLocks(JSLockBehavior JSLockBehavior) + : m_lockBehavior(JSLockBehavior) { pthread_once(&createJSLockCountOnce, createJSLockCount); @@ -191,13 +191,13 @@ JSLock::DropAllLocks::DropAllLocks(bool lockingForReal) m_lockCount = JSLock::lockCount(); for (intptr_t i = 0; i < m_lockCount; i++) - JSLock::unlock(m_lockingForReal); + JSLock::unlock(m_lockBehavior); } JSLock::DropAllLocks::~DropAllLocks() { for (intptr_t i = 0; i < m_lockCount; i++) - JSLock::lock(m_lockingForReal); + JSLock::lock(m_lockBehavior); --lockDropDepth; } @@ -205,7 +205,7 @@ JSLock::DropAllLocks::~DropAllLocks() #else JSLock::JSLock(ExecState*) - : m_lockingForReal(false) + : m_lockBehavior(SilenceAssertionsOnly) { } @@ -221,11 +221,11 @@ bool JSLock::currentThreadIsHoldingLock() return true; } -void JSLock::lock(bool) +void JSLock::lock(JSLockBehavior) { } -void JSLock::unlock(bool) +void JSLock::unlock(JSLockBehavior) { } @@ -241,7 +241,7 @@ JSLock::DropAllLocks::DropAllLocks(ExecState*) { } -JSLock::DropAllLocks::DropAllLocks(bool) +JSLock::DropAllLocks::DropAllLocks(JSLockBehavior) { } diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSLock.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSLock.h index 3dde35894..8b015c4c8 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSLock.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSLock.h @@ -50,50 +50,52 @@ namespace JSC { class ExecState; - class JSLock : Noncopyable { + enum JSLockBehavior { SilenceAssertionsOnly, LockForReal }; + + class JSLock : public Noncopyable { public: JSLock(ExecState*); - JSLock(bool lockingForReal) - : m_lockingForReal(lockingForReal) + JSLock(JSLockBehavior lockBehavior) + : m_lockBehavior(lockBehavior) { #ifdef NDEBUG // Locking "not for real" is a debug-only feature. - if (!lockingForReal) + if (lockBehavior == SilenceAssertionsOnly) return; #endif - lock(lockingForReal); + lock(lockBehavior); } ~JSLock() { #ifdef NDEBUG // Locking "not for real" is a debug-only feature. - if (!m_lockingForReal) + if (m_lockBehavior == SilenceAssertionsOnly) return; #endif - unlock(m_lockingForReal); + unlock(m_lockBehavior); } - static void lock(bool); - static void unlock(bool); + static void lock(JSLockBehavior); + static void unlock(JSLockBehavior); static void lock(ExecState*); static void unlock(ExecState*); static intptr_t lockCount(); static bool currentThreadIsHoldingLock(); - bool m_lockingForReal; + JSLockBehavior m_lockBehavior; - class DropAllLocks : Noncopyable { + class DropAllLocks : public Noncopyable { public: DropAllLocks(ExecState* exec); - DropAllLocks(bool); + DropAllLocks(JSLockBehavior); ~DropAllLocks(); private: intptr_t m_lockCount; - bool m_lockingForReal; + JSLockBehavior m_lockBehavior; }; }; diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.cpp index 4a89c55c3..2f02b1d45 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.cpp @@ -61,7 +61,7 @@ private: mutable JSValue m_value; }; -class Stringifier : Noncopyable { +class Stringifier : public Noncopyable { public: Stringifier(ExecState*, JSValue replacer, JSValue space); ~Stringifier(); diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/SmallStrings.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/SmallStrings.cpp index 87b49f05a..9d1f01a76 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/SmallStrings.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/SmallStrings.cpp @@ -34,7 +34,7 @@ namespace JSC { static const unsigned numCharactersToStore = 0x100; -class SmallStringsStorage : Noncopyable { +class SmallStringsStorage : public Noncopyable { public: SmallStringsStorage(); diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/SmallStrings.h b/src/3rdparty/webkit/JavaScriptCore/runtime/SmallStrings.h index e7f11704b..f0dd8df5f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/SmallStrings.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/SmallStrings.h @@ -36,7 +36,7 @@ namespace JSC { class SmallStringsStorage; - class SmallStrings : Noncopyable { + class SmallStrings : public Noncopyable { public: SmallStrings(); ~SmallStrings(); diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.cpp index 098186e64..819ed9a15 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. + * Copyright (C) 2007-2009 Torch Mobile, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -45,6 +46,10 @@ #include #endif +#if PLATFORM(WINCE) +#include +#endif + extern "C" { WTF_ATTRIBUTE_PRINTF(1, 0) @@ -66,7 +71,7 @@ static void vprintf_stderr_common(const char* format, va_list args) CFRelease(str); CFRelease(cfFormat); } else -#elif COMPILER(MSVC) && !PLATFORM(WINCE) +#elif COMPILER(MSVC) && !defined(WINCEBASIC) if (IsDebuggerPresent()) { size_t size = 1024; @@ -77,7 +82,20 @@ static void vprintf_stderr_common(const char* format, va_list args) break; if (_vsnprintf(buffer, size, format, args) != -1) { +#if PLATFORM(WINCE) + // WinCE only supports wide chars + wchar_t* wideBuffer = (wchar_t*)malloc(size * sizeof(wchar_t)); + if (wideBuffer == NULL) + break; + for (unsigned int i = 0; i < size; ++i) { + if (!(wideBuffer[i] = buffer[i])) + break; + } + OutputDebugStringW(wideBuffer); + free(wideBuffer); +#else OutputDebugStringA(buffer); +#endif free(buffer); break; } @@ -101,7 +119,7 @@ static void printf_stderr_common(const char* format, ...) static void printCallSite(const char* file, int line, const char* function) { -#if PLATFORM(WIN) && defined _DEBUG +#if PLATFORM(WIN) && !PLATFORM(WINCE) && defined _DEBUG _CrtDbgReport(_CRT_WARN, file, line, NULL, "%s\n", function); #else printf_stderr_common("(%s:%d %s)\n", file, line, function); diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h index ad66d067e..59efd8421 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h @@ -136,8 +136,8 @@ void WTFLogVerbose(const char* file, int line, const char* function, WTFLogChann #undef ERROR #endif -#if PLATFORM(WIN_OS) -/* FIXME: Change to use something other than ASSERT to avoid this conflict with win32. */ +#if PLATFORM(WIN_OS) || PLATFORM(SYMBIAN) +/* FIXME: Change to use something other than ASSERT to avoid this conflict with the underlying platform */ #undef ASSERT #endif diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/ByteArray.h b/src/3rdparty/webkit/JavaScriptCore/wtf/ByteArray.h index 33f0877f0..96e9cc20f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/ByteArray.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/ByteArray.h @@ -26,8 +26,8 @@ #ifndef ByteArray_h #define ByteArray_h -#include "wtf/PassRefPtr.h" -#include "wtf/RefCounted.h" +#include +#include namespace WTF { class ByteArray : public RefCountedBase { diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/CrossThreadRefCounted.h b/src/3rdparty/webkit/JavaScriptCore/wtf/CrossThreadRefCounted.h index 281dfa606..6a0521121 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/CrossThreadRefCounted.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/CrossThreadRefCounted.h @@ -51,7 +51,7 @@ namespace WTF { // with respect to the original and any other copies. The underlying m_data is jointly // owned by the original instance and all copies. template - class CrossThreadRefCounted : Noncopyable { + class CrossThreadRefCounted : public Noncopyable { public: static PassRefPtr > create(T* data) { diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp index 47c9d4415..648dc7061 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp @@ -2,6 +2,7 @@ * Copyright (C) 1999-2000 Harri Porten (porten@kde.org) * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. * Copyright (C) 2009 Google Inc. All rights reserved. + * Copyright (C) 2007-2009 Torch Mobile, Inc. * * The Original Code is Mozilla Communicator client code, released * March 31, 1998. @@ -375,14 +376,19 @@ static int32_t calculateUTCOffset() localt.tm_wday = 0; localt.tm_yday = 0; localt.tm_isdst = 0; -#if PLATFORM(WIN_OS) || PLATFORM(SOLARIS) || COMPILER(RVCT) +#if HAVE(TM_GMTOFF) + localt.tm_gmtoff = 0; +#endif +#if HAVE(TM_ZONE) + localt.tm_zone = 0; +#endif + +#if HAVE(TIMEGM) + time_t utcOffset = timegm(&localt) - mktime(&localt); +#else // Using a canned date of 01/01/2009 on platforms with weaker date-handling foo. localt.tm_year = 109; time_t utcOffset = 1230768000 - mktime(&localt); -#else - localt.tm_zone = 0; - localt.tm_gmtoff = 0; - time_t utcOffset = timegm(&localt) - mktime(&localt); #endif return static_cast(utcOffset * 1000); @@ -512,7 +518,7 @@ void msToGregorianDateTime(double ms, bool outputIsUTC, GregorianDateTime& tm) tm.year = year - 1900; tm.isDST = dstOff != 0.0; - tm.utcOffset = static_cast((dstOff + utcOff) / msPerSecond); + tm.utcOffset = outputIsUTC ? 0 : static_cast((dstOff + utcOff) / msPerSecond); tm.timeZone = NULL; } diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h b/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h index 8690a4981..6110f766a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h @@ -109,14 +109,17 @@ struct GregorianDateTime : Noncopyable { , year(inTm.tm_year) , isDST(inTm.tm_isdst) { -#if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !COMPILER(RVCT) +#if HAVE(TM_GMTOFF) utcOffset = static_cast(inTm.tm_gmtoff); +#else + utcOffset = static_cast(getUTCOffset() / msPerSecond + (isDST ? secondsPerHour : 0)); +#endif +#if HAVE(TM_ZONE) int inZoneSize = strlen(inTm.tm_zone) + 1; timeZone = new char[inZoneSize]; strncpy(timeZone, inTm.tm_zone, inZoneSize); #else - utcOffset = static_cast(getUTCOffset() / msPerSecond + (isDST ? secondsPerHour : 0)); timeZone = 0; #endif } @@ -136,8 +139,10 @@ struct GregorianDateTime : Noncopyable { ret.tm_year = year; ret.tm_isdst = isDST; -#if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !COMPILER(RVCT) +#if HAVE(TM_GMTOFF) ret.tm_gmtoff = static_cast(utcOffset); +#endif +#if HAVE(TM_ZONE) ret.tm_zone = timeZone; #endif diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/FastAllocBase.h b/src/3rdparty/webkit/JavaScriptCore/wtf/FastAllocBase.h index 1c8185677..9fcbbc1c4 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastAllocBase.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastAllocBase.h @@ -79,9 +79,9 @@ #include #include #include +#include "Assertions.h" #include "FastMalloc.h" #include "TypeTraits.h" -#include namespace WTF { diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp index d6850e6fc..c855a41a4 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp @@ -95,8 +95,6 @@ #define FORCE_SYSTEM_MALLOC 1 #endif -#define TCMALLOC_TRACK_DECOMMITED_SPANS (HAVE(VIRTUALALLOC) || HAVE(MADV_FREE_REUSE)) - #ifndef NDEBUG namespace WTF { @@ -1043,11 +1041,7 @@ struct Span { #endif }; -#if TCMALLOC_TRACK_DECOMMITED_SPANS #define ASSERT_SPAN_COMMITTED(span) ASSERT(!span->decommitted) -#else -#define ASSERT_SPAN_COMMITTED(span) -#endif #ifdef SPAN_HISTORY void Event(Span* span, char op, int v = 0) { @@ -1369,12 +1363,10 @@ inline Span* TCMalloc_PageHeap::New(Length n) { Span* result = ll->next; Carve(result, n, released); -#if TCMALLOC_TRACK_DECOMMITED_SPANS if (result->decommitted) { TCMalloc_SystemCommit(reinterpret_cast(result->start << kPageShift), static_cast(n << kPageShift)); result->decommitted = false; } -#endif ASSERT(Check()); free_pages_ -= n; return result; @@ -1431,12 +1423,10 @@ Span* TCMalloc_PageHeap::AllocLarge(Length n) { if (best != NULL) { Carve(best, n, from_released); -#if TCMALLOC_TRACK_DECOMMITED_SPANS if (best->decommitted) { TCMalloc_SystemCommit(reinterpret_cast(best->start << kPageShift), static_cast(n << kPageShift)); best->decommitted = false; } -#endif ASSERT(Check()); free_pages_ -= n; return best; @@ -1461,14 +1451,10 @@ Span* TCMalloc_PageHeap::Split(Span* span, Length n) { return leftover; } -#if !TCMALLOC_TRACK_DECOMMITED_SPANS -static ALWAYS_INLINE void propagateDecommittedState(Span*, Span*) { } -#else static ALWAYS_INLINE void propagateDecommittedState(Span* destination, Span* source) { destination->decommitted = source->decommitted; } -#endif inline void TCMalloc_PageHeap::Carve(Span* span, Length n, bool released) { ASSERT(n > 0); @@ -1495,9 +1481,6 @@ inline void TCMalloc_PageHeap::Carve(Span* span, Length n, bool released) { } } -#if !TCMALLOC_TRACK_DECOMMITED_SPANS -static ALWAYS_INLINE void mergeDecommittedStates(Span*, Span*) { } -#else static ALWAYS_INLINE void mergeDecommittedStates(Span* destination, Span* other) { if (destination->decommitted && !other->decommitted) { @@ -1509,7 +1492,6 @@ static ALWAYS_INLINE void mergeDecommittedStates(Span* destination, Span* other) destination->decommitted = true; } } -#endif inline void TCMalloc_PageHeap::Delete(Span* span) { ASSERT(Check()); @@ -1556,15 +1538,12 @@ inline void TCMalloc_PageHeap::Delete(Span* span) { Event(span, 'D', span->length); span->free = 1; -#if TCMALLOC_TRACK_DECOMMITED_SPANS if (span->decommitted) { if (span->length < kMaxPages) DLL_Prepend(&free_[span->length].returned, span); else DLL_Prepend(&large_.returned, span); - } else -#endif - { + } else { if (span->length < kMaxPages) DLL_Prepend(&free_[span->length].normal, span); else @@ -1596,9 +1575,7 @@ void TCMalloc_PageHeap::IncrementalScavenge(Length n) { DLL_Remove(s); TCMalloc_SystemRelease(reinterpret_cast(s->start << kPageShift), static_cast(s->length << kPageShift)); -#if TCMALLOC_TRACK_DECOMMITED_SPANS s->decommitted = true; -#endif DLL_Prepend(&slist->returned, s); scavenge_counter_ = std::max(64UL, std::min(kDefaultReleaseDelay, kDefaultReleaseDelay - (free_pages_ / kDefaultReleaseDelay))); diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/GOwnPtr.h b/src/3rdparty/webkit/JavaScriptCore/wtf/GOwnPtr.h index 8d03ff224..499334852 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/GOwnPtr.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/GOwnPtr.h @@ -37,7 +37,7 @@ namespace WTF { template<> void freeOwnedGPtr(GDir*); template<> void freeOwnedGPtr(GHashTable*); - template class GOwnPtr : Noncopyable { + template class GOwnPtr : public Noncopyable { public: explicit GOwnPtr(T* ptr = 0) : m_ptr(ptr) { } ~GOwnPtr() { freeOwnedGPtr(m_ptr); } diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Locker.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Locker.h index 9feec1f3f..41813d3f9 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Locker.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Locker.h @@ -32,7 +32,7 @@ namespace WTF { -template class Locker : Noncopyable { +template class Locker : public Noncopyable { public: Locker(T& lockable) : m_lockable(lockable) { m_lockable.lock(); } ~Locker() { m_lockable.unlock(); } diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/MessageQueue.h b/src/3rdparty/webkit/JavaScriptCore/wtf/MessageQueue.h index 7721dba51..12291cc31 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/MessageQueue.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/MessageQueue.h @@ -45,7 +45,7 @@ namespace WTF { }; template - class MessageQueue : Noncopyable { + class MessageQueue : public Noncopyable { public: MessageQueue() : m_killed(false) { } diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Noncopyable.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Noncopyable.h index f241c7c98..c50c9d8d5 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Noncopyable.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Noncopyable.h @@ -24,6 +24,8 @@ // We don't want argument-dependent lookup to pull in everything from the WTF // namespace when you use Noncopyable, so put it in its own namespace. +#include "FastAllocBase.h" + namespace WTFNoncopyable { class Noncopyable { @@ -34,8 +36,17 @@ namespace WTFNoncopyable { ~Noncopyable() { } }; + class NoncopyableCustomAllocated { + NoncopyableCustomAllocated(const NoncopyableCustomAllocated&); + NoncopyableCustomAllocated& operator=(const NoncopyableCustomAllocated&); + protected: + NoncopyableCustomAllocated() { } + ~NoncopyableCustomAllocated() { } + }; + } // namespace WTFNoncopyable using WTFNoncopyable::Noncopyable; +using WTFNoncopyable::NoncopyableCustomAllocated; #endif // WTF_Noncopyable_h diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/OwnArrayPtr.h b/src/3rdparty/webkit/JavaScriptCore/wtf/OwnArrayPtr.h index 344f813f2..61375c769 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/OwnArrayPtr.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/OwnArrayPtr.h @@ -27,7 +27,7 @@ namespace WTF { - template class OwnArrayPtr : Noncopyable { + template class OwnArrayPtr : public Noncopyable { public: explicit OwnArrayPtr(T* ptr = 0) : m_ptr(ptr) { } ~OwnArrayPtr() { safeDelete(); } @@ -46,8 +46,12 @@ namespace WTF { bool operator!() const { return !m_ptr; } // This conversion operator allows implicit conversion to bool but not to other integer types. +#if COMPILER(WINSCW) + operator bool() const { return m_ptr; } +#else typedef T* OwnArrayPtr::*UnspecifiedBoolType; operator UnspecifiedBoolType() const { return m_ptr ? &OwnArrayPtr::m_ptr : 0; } +#endif void swap(OwnArrayPtr& o) { std::swap(m_ptr, o.m_ptr); } diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/OwnFastMallocPtr.h b/src/3rdparty/webkit/JavaScriptCore/wtf/OwnFastMallocPtr.h index 5c0d0647b..c88235a8a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/OwnFastMallocPtr.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/OwnFastMallocPtr.h @@ -27,7 +27,7 @@ namespace WTF { - template class OwnFastMallocPtr : Noncopyable { + template class OwnFastMallocPtr : public Noncopyable { public: explicit OwnFastMallocPtr(T* ptr) : m_ptr(ptr) { diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/OwnPtr.h b/src/3rdparty/webkit/JavaScriptCore/wtf/OwnPtr.h index 9e4bd32ae..b7e62b1ea 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/OwnPtr.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/OwnPtr.h @@ -34,7 +34,7 @@ namespace WTF { template class PassOwnPtr; - template class OwnPtr : Noncopyable { + template class OwnPtr : public Noncopyable { public: typedef typename RemovePointer::Type ValueType; typedef ValueType* PtrType; diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h index 5e37e09b6..5b43d1795 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. + * Copyright (C) 2007-2009 Torch Mobile, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -93,12 +94,10 @@ #define WTF_PLATFORM_SOLARIS 1 #endif -#if defined (__S60__) || defined (__SYMBIAN32__) +#if defined (__SYMBIAN32__) /* we are cross-compiling, it is not really windows */ #undef WTF_PLATFORM_WIN_OS #undef WTF_PLATFORM_WIN -#undef WTF_PLATFORM_CAIRO -#define WTF_PLATFORM_S60 1 #define WTF_PLATFORM_SYMBIAN 1 #endif @@ -115,7 +114,7 @@ /* should be used regardless of operating environment */ #if PLATFORM(DARWIN) \ || PLATFORM(FREEBSD) \ - || PLATFORM(S60) \ + || PLATFORM(SYMBIAN) \ || PLATFORM(NETBSD) \ || defined(unix) \ || defined(__unix) \ @@ -191,7 +190,7 @@ /* Makes PLATFORM(WIN) default to PLATFORM(CAIRO) */ /* FIXME: This should be changed from a blacklist to a whitelist */ -#if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) +#if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !PLATFORM(WINCE) #define WTF_PLATFORM_CAIRO 1 #endif @@ -311,6 +310,7 @@ /* --gnu option of the RVCT compiler also defines __GNUC__ */ #if defined(__GNUC__) && !COMPILER(RVCT) #define WTF_COMPILER_GCC 1 +#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) #endif /* COMPILER(MINGW) */ @@ -339,11 +339,36 @@ #define ENABLE_JSC_MULTIPLE_THREADS 1 #endif +#if PLATFORM(WINCE) && !PLATFORM(QT) +#undef ENABLE_JSC_MULTIPLE_THREADS +#define ENABLE_JSC_MULTIPLE_THREADS 0 +#define USE_SYSTEM_MALLOC 0 +#define ENABLE_ICONDATABASE 0 +#define ENABLE_JAVASCRIPT_DEBUGGER 0 +#define ENABLE_FTPDIR 0 +#define ENABLE_PAN_SCROLLING 0 +#define ENABLE_WML 1 +#define HAVE_ACCESSIBILITY 0 + +#define NOMINMAX // Windows min and max conflict with standard macros +#define NOSHLWAPI // shlwapi.h not available on WinCe + +// MSDN documentation says these functions are provided with uspce.lib. But we cannot find this file. +#define __usp10__ // disable "usp10.h" + +#define _INC_ASSERT // disable "assert.h" +#define assert(x) + +// _countof is only included in CE6; for CE5 we need to define it ourself +#ifndef _countof +#define _countof(x) (sizeof(x) / sizeof((x)[0])) +#endif + +#endif /* PLATFORM(WINCE) && !PLATFORM(QT) */ + /* for Unicode, KDE uses Qt */ #if PLATFORM(KDE) || PLATFORM(QT) #define WTF_USE_QT4_UNICODE 1 -#elif PLATFORM(SYMBIAN) -#define WTF_USE_SYMBIAN_UNICODE 1 #elif PLATFORM(GTK) /* The GTK+ Unicode backend is configurable */ #else @@ -406,6 +431,12 @@ #define HAVE_SIGNAL_H 1 #endif +#if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !PLATFORM(SYMBIAN) && !COMPILER(RVCT) +#define HAVE_TM_GMTOFF 1 +#define HAVE_TM_ZONE 1 +#define HAVE_TIMEGM 1 +#endif + #if PLATFORM(DARWIN) #define HAVE_ERRNO_H 1 @@ -536,6 +567,7 @@ #endif #if !defined(ENABLE_JIT) + /* The JIT is tested & working on x86_64 Mac */ #if PLATFORM(X86_64) && PLATFORM(MAC) #define ENABLE_JIT 1 @@ -551,7 +583,21 @@ #elif PLATFORM(X86) && PLATFORM(WIN) #define ENABLE_JIT 1 #endif + +#if PLATFORM(X86) && PLATFORM(QT) +#if PLATFORM(WIN_OS) && COMPILER(MINGW) && GCC_VERSION >= 40100 + #define ENABLE_JIT 1 + #define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1 +#elif PLATFORM(WIN_OS) && COMPILER(MSVC) + #define ENABLE_JIT 1 + #define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1 +#elif PLATFORM(LINUX) && GCC_VERSION >= 40100 + #define ENABLE_JIT 1 + #define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1 #endif +#endif /* PLATFORM(QT) && PLATFORM(X86) */ + +#endif /* !defined(ENABLE_JIT) */ #if ENABLE(JIT) #ifndef ENABLE_JIT_OPTIMIZE_CALL @@ -590,15 +636,29 @@ #endif /* Yet Another Regex Runtime. */ +#if !defined(ENABLE_YARR_JIT) + /* YARR supports x86 & x86-64, and has been tested on Mac and Windows. */ -#if (!defined(ENABLE_YARR_JIT) && PLATFORM(X86) && PLATFORM(MAC)) \ - || (!defined(ENABLE_YARR_JIT) && PLATFORM(X86_64) && PLATFORM(MAC)) \ +#if (PLATFORM(X86) && PLATFORM(MAC)) \ + || (PLATFORM(X86_64) && PLATFORM(MAC)) \ /* Under development, temporarily disabled until 16Mb link range limit in assembler is fixed. */ \ - || (!defined(ENABLE_YARR_JIT) && PLATFORM_ARM_ARCH(7) && PLATFORM(IPHONE) && 0) \ - || (!defined(ENABLE_YARR_JIT) && PLATFORM(X86) && PLATFORM(WIN)) + || (PLATFORM_ARM_ARCH(7) && PLATFORM(IPHONE) && 0) \ + || (PLATFORM(X86) && PLATFORM(WIN)) +#define ENABLE_YARR 1 +#define ENABLE_YARR_JIT 1 +#endif + +#if PLATFORM(X86) && PLATFORM(QT) +#if (PLATFORM(WIN_OS) && COMPILER(MINGW) && GCC_VERSION >= 40100) \ + || (PLATFORM(WIN_OS) && COMPILER(MSVC)) \ + || (PLATFORM(LINUX) && GCC_VERSION >= 40100) #define ENABLE_YARR 1 #define ENABLE_YARR_JIT 1 #endif +#endif + +#endif /* !defined(ENABLE_YARR_JIT) */ + /* Sanity Check */ #if ENABLE(YARR_JIT) && !ENABLE(YARR) #error "YARR_JIT requires YARR" @@ -609,7 +669,7 @@ #endif /* Setting this flag prevents the assembler from using RWX memory; this may improve security but currectly comes at a significant performance cost. */ -#if PLATFORM_ARM_ARCH(7) && PLATFORM(IPHONE) +#if PLATFORM(ARM) #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1 #else #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0 diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/RandomNumber.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/RandomNumber.cpp index c94d5a4b9..0e6e20830 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/RandomNumber.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/RandomNumber.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. - * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) + * (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -34,6 +34,12 @@ #include #include +#if PLATFORM(WINCE) +extern "C" { +#include "wince/mt19937ar.c" +} +#endif + namespace WTF { double weakRandomNumber() @@ -74,6 +80,8 @@ double randomNumber() // Mask off the low 53bits fullRandom &= (1LL << 53) - 1; return static_cast(fullRandom)/static_cast(1LL << 53); +#elif PLATFORM(WINCE) + return genrand_res53(); #else uint32_t part1 = rand() & (RAND_MAX - 1); uint32_t part2 = rand() & (RAND_MAX - 1); diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/RandomNumberSeed.h b/src/3rdparty/webkit/JavaScriptCore/wtf/RandomNumberSeed.h index 32291ddfb..1c2d364ed 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/RandomNumberSeed.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/RandomNumberSeed.h @@ -39,6 +39,9 @@ #endif #if PLATFORM(WINCE) +extern "C" { +void init_by_array(unsigned long init_key[],int key_length); +} #include #endif @@ -49,8 +52,19 @@ inline void initializeRandomNumberGenerator() { #if PLATFORM(DARWIN) // On Darwin we use arc4random which initialises itself. +#elif PLATFORM(WINCE) + // initialize rand() + srand(static_cast(time(0))); + + // use rand() to initialize the real RNG + unsigned long initializationBuffer[4]; + initializationBuffer[0] = (rand() << 16) | rand(); + initializationBuffer[1] = (rand() << 16) | rand(); + initializationBuffer[2] = (rand() << 16) | rand(); + initializationBuffer[3] = (rand() << 16) | rand(); + init_by_array(initializationBuffer, 4); #elif COMPILER(MSVC) && defined(_CRT_RAND_S) - // On Windows we use rand_s which intialises itself + // On Windows we use rand_s which initialises itself #elif PLATFORM(UNIX) // srandomdev is not guaranteed to exist on linux so we use this poor seed, this should be improved timeval time; diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/RefCounted.h b/src/3rdparty/webkit/JavaScriptCore/wtf/RefCounted.h index c174145dc..761a8566f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/RefCounted.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/RefCounted.h @@ -29,7 +29,7 @@ namespace WTF { // This base class holds the non-template methods and attributes. // The RefCounted class inherits from it reducing the template bloat // generated by the compiler (technique called template hoisting). -class RefCountedBase : Noncopyable { +class RefCountedBase { public: void ref() { @@ -101,7 +101,7 @@ private: }; -template class RefCounted : public RefCountedBase { +template class RefCounted : public RefCountedBase, public Noncopyable { public: void deref() { @@ -115,8 +115,23 @@ protected: } }; +template class RefCountedCustomAllocated : public RefCountedBase, public NoncopyableCustomAllocated { +public: + void deref() + { + if (derefBase()) + delete static_cast(this); + } + +protected: + ~RefCountedCustomAllocated() + { + } +}; + } // namespace WTF using WTF::RefCounted; +using WTF::RefCountedCustomAllocated; #endif // RefCounted_h diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/ThreadSpecific.h b/src/3rdparty/webkit/JavaScriptCore/wtf/ThreadSpecific.h index b07a9a21e..4d5d2f751 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/ThreadSpecific.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/ThreadSpecific.h @@ -59,7 +59,7 @@ namespace WTF { void ThreadSpecificThreadExit(); #endif -template class ThreadSpecific : Noncopyable { +template class ThreadSpecific : public Noncopyable { public: ThreadSpecific(); T* operator->(); diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Threading.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/Threading.cpp index bd25ee749..56bf43814 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Threading.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Threading.cpp @@ -30,7 +30,7 @@ namespace WTF { -struct NewThreadContext { +struct NewThreadContext : FastAllocBase { NewThreadContext(ThreadFunction entryPoint, void* data, const char* name) : entryPoint(entryPoint) , data(data) diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Threading.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Threading.h index b12f41fa7..65781516f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Threading.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Threading.h @@ -159,7 +159,7 @@ typedef void* PlatformReadWriteLock; typedef void* PlatformCondition; #endif -class Mutex : Noncopyable { +class Mutex : public Noncopyable { public: Mutex(); ~Mutex(); @@ -176,7 +176,7 @@ private: typedef Locker MutexLocker; -class ReadWriteLock : Noncopyable { +class ReadWriteLock : public Noncopyable { public: ReadWriteLock(); ~ReadWriteLock(); @@ -193,7 +193,7 @@ private: PlatformReadWriteLock m_readWriteLock; }; -class ThreadCondition : Noncopyable { +class ThreadCondition : public Noncopyable { public: ThreadCondition(); ~ThreadCondition(); @@ -234,7 +234,7 @@ inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_ #endif -class ThreadSafeSharedBase : Noncopyable { +class ThreadSafeSharedBase : public Noncopyable { public: ThreadSafeSharedBase(int initialRefCount = 1) : m_refCount(initialRefCount) diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/ThreadingWin.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/ThreadingWin.cpp index ea186564b..cccbda14e 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/ThreadingWin.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/ThreadingWin.cpp @@ -1,6 +1,7 @@ /* * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. * Copyright (C) 2009 Google Inc. All rights reserved. + * Copyright (C) 2009 Torch Mobile, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -89,7 +90,14 @@ #if !USE(PTHREADS) && PLATFORM(WIN_OS) #include "ThreadSpecific.h" #endif +#if !PLATFORM(WINCE) #include +#endif +#if HAVE(ERRNO_H) +#include +#else +#define NO_ERRNO +#endif #include #include #include @@ -210,9 +218,21 @@ ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, con unsigned threadIdentifier = 0; ThreadIdentifier threadID = 0; ThreadFunctionInvocation* invocation = new ThreadFunctionInvocation(entryPoint, data); +#if PLATFORM(WINCE) + // This is safe on WINCE, since CRT is in the core and innately multithreaded. + // On desktop Windows, need to use _beginthreadex (not available on WinCE) if using any CRT functions + HANDLE threadHandle = CreateThread(0, 0, (LPTHREAD_START_ROUTINE)wtfThreadEntryPoint, invocation, 0, (LPDWORD)&threadIdentifier); +#else HANDLE threadHandle = reinterpret_cast(_beginthreadex(0, 0, wtfThreadEntryPoint, invocation, 0, &threadIdentifier)); +#endif if (!threadHandle) { +#if PLATFORM(WINCE) + LOG_ERROR("Failed to create thread at entry point %p with data %p: %ld", entryPoint, data, ::GetLastError()); +#elif defined(NO_ERRNO) + LOG_ERROR("Failed to create thread at entry point %p with data %p.", entryPoint, data); +#else LOG_ERROR("Failed to create thread at entry point %p with data %p: %ld", entryPoint, data, errno); +#endif return 0; } diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h index c378fd058..7cba4e48a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Vector.h @@ -268,7 +268,7 @@ namespace WTF { }; template - class VectorBufferBase : Noncopyable { + class VectorBufferBase : public Noncopyable { public: void allocateBuffer(size_t newCapacity) { @@ -934,7 +934,7 @@ namespace WTF { inline void Vector::remove(size_t position, size_t length) { ASSERT(position < size()); - ASSERT(position + length < size()); + ASSERT(position + length <= size()); T* beginSpot = begin() + position; T* endSpot = beginSpot + length; TypeOperations::destruct(beginSpot, endSpot); diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/Collator.h b/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/Collator.h index f04779dd7..51e8a063f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/Collator.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/Collator.h @@ -39,7 +39,7 @@ struct UCollator; namespace WTF { - class Collator : Noncopyable { + class Collator : public Noncopyable { public: enum Result { Equal = 0, Greater = 1, Less = -1 }; diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp index 79dec79d2..6376bb31f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp @@ -37,6 +37,7 @@ #include #if PLATFORM(DARWIN) +#include "RetainPtr.h" #include #endif @@ -60,11 +61,16 @@ std::auto_ptr Collator::userDefault() { #if PLATFORM(DARWIN) && PLATFORM(CF) // Mac OS X doesn't set UNIX locale to match user-selected one, so ICU default doesn't work. - CFStringRef collationOrder = (CFStringRef)CFPreferencesCopyValue(CFSTR("AppleCollationOrder"), kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost); +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !PLATFORM(IPHONE) + RetainPtr currentLocale(AdoptCF, CFLocaleCopyCurrent()); + CFStringRef collationOrder = (CFStringRef)CFLocaleGetValue(currentLocale.get(), kCFLocaleCollatorIdentifier); +#else + RetainPtr collationOrderRetainer(AdoptCF, (CFStringRef)CFPreferencesCopyValue(CFSTR("AppleCollationOrder"), kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost)); + CFStringRef collationOrder = collationOrderRetainer.get(); +#endif char buf[256]; if (collationOrder) { CFStringGetCString(collationOrder, buf, sizeof(buf), kCFStringEncodingASCII); - CFRelease(collationOrder); return std::auto_ptr(new Collator(buf)); } else return std::auto_ptr(new Collator("")); diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/wince/FastMallocWince.h b/src/3rdparty/webkit/JavaScriptCore/wtf/wince/FastMallocWince.h new file mode 100644 index 000000000..93d9f7595 --- /dev/null +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/wince/FastMallocWince.h @@ -0,0 +1,177 @@ +/* + * This file is part of the KDE libraries + * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2007-2009 Torch Mobile, Inc. All rights reserved + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ + +#ifndef FastMallocWince_h +#define FastMallocWince_h + +#include + +#ifdef __cplusplus +#include +#include "MemoryManager.h" +extern "C" { +#endif + +void* fastMalloc(size_t n); +void* fastCalloc(size_t n_elements, size_t element_size); +void fastFree(void* p); +void* fastRealloc(void* p, size_t n); +void* fastZeroedMalloc(size_t n); +// These functions return 0 if an allocation fails. +void* tryFastMalloc(size_t n); +void* tryFastZeroedMalloc(size_t n); +void* tryFastCalloc(size_t n_elements, size_t element_size); +void* tryFastRealloc(void* p, size_t n); +char* fastStrDup(const char*); + +#ifndef NDEBUG +void fastMallocForbid(); +void fastMallocAllow(); +#endif + +#if !defined(USE_SYSTEM_MALLOC) || !USE_SYSTEM_MALLOC + +#define malloc(n) fastMalloc(n) +#define calloc(n_elements, element_size) fastCalloc(n_elements, element_size) +#define realloc(p, n) fastRealloc(p, n) +#define free(p) fastFree(p) +#define strdup(p) fastStrDup(p) + +#else + +#define strdup(p) _strdup(p) + +#endif + +#ifdef __cplusplus +} +#endif + +#ifdef __cplusplus +#if !defined(USE_SYSTEM_MALLOC) || !USE_SYSTEM_MALLOC +static inline void* __cdecl operator new(size_t s) { return fastMalloc(s); } +static inline void __cdecl operator delete(void* p) { fastFree(p); } +static inline void* __cdecl operator new[](size_t s) { return fastMalloc(s); } +static inline void __cdecl operator delete[](void* p) { fastFree(p); } +static inline void* operator new(size_t s, const std::nothrow_t&) throw() { return fastMalloc(s); } +static inline void operator delete(void* p, const std::nothrow_t&) throw() { fastFree(p); } +static inline void* operator new[](size_t s, const std::nothrow_t&) throw() { return fastMalloc(s); } +static inline void operator delete[](void* p, const std::nothrow_t&) throw() { fastFree(p); } +#endif + +namespace WTF { + // This defines a type which holds an unsigned integer and is the same + // size as the minimally aligned memory allocation. + typedef unsigned long long AllocAlignmentInteger; + + namespace Internal { + enum AllocType { // Start with an unusual number instead of zero, because zero is common. + AllocTypeMalloc = 0x375d6750, // Encompasses fastMalloc, fastZeroedMalloc, fastCalloc, fastRealloc. + AllocTypeClassNew, // Encompasses class operator new from FastAllocBase. + AllocTypeClassNewArray, // Encompasses class operator new[] from FastAllocBase. + AllocTypeFastNew, // Encompasses fastNew. + AllocTypeFastNewArray, // Encompasses fastNewArray. + AllocTypeNew, // Encompasses global operator new. + AllocTypeNewArray // Encompasses global operator new[]. + }; + } + + +#if ENABLE(FAST_MALLOC_MATCH_VALIDATION) + + // Malloc validation is a scheme whereby a tag is attached to an + // allocation which identifies how it was originally allocated. + // This allows us to verify that the freeing operation matches the + // allocation operation. If memory is allocated with operator new[] + // but freed with free or delete, this system would detect that. + // In the implementation here, the tag is an integer prepended to + // the allocation memory which is assigned one of the AllocType + // enumeration values. An alternative implementation of this + // scheme could store the tag somewhere else or ignore it. + // Users of FastMalloc don't need to know or care how this tagging + // is implemented. + + namespace Internal { + + // Return the AllocType tag associated with the allocated block p. + inline AllocType fastMallocMatchValidationType(const void* p) + { + const AllocAlignmentInteger* type = static_cast(p) - 1; + return static_cast(*type); + } + + // Return the address of the AllocType tag associated with the allocated block p. + inline AllocAlignmentInteger* fastMallocMatchValidationValue(void* p) + { + return reinterpret_cast(static_cast(p) - sizeof(AllocAlignmentInteger)); + } + + // Set the AllocType tag to be associaged with the allocated block p. + inline void setFastMallocMatchValidationType(void* p, AllocType allocType) + { + AllocAlignmentInteger* type = static_cast(p) - 1; + *type = static_cast(allocType); + } + + // Handle a detected alloc/free mismatch. By default this calls CRASH(). + void fastMallocMatchFailed(void* p); + + } // namespace Internal + + // This is a higher level function which is used by FastMalloc-using code. + inline void fastMallocMatchValidateMalloc(void* p, Internal::AllocType allocType) + { + if (!p) + return; + + Internal::setFastMallocMatchValidationType(p, allocType); + } + + // This is a higher level function which is used by FastMalloc-using code. + inline void fastMallocMatchValidateFree(void* p, Internal::AllocType allocType) + { + if (!p) + return; + + if (Internal::fastMallocMatchValidationType(p) != allocType) + Internal::fastMallocMatchFailed(p); + Internal::setFastMallocMatchValidationType(p, Internal::AllocTypeMalloc); // Set it to this so that fastFree thinks it's OK. + } + +#else + + inline void fastMallocMatchValidateMalloc(void*, Internal::AllocType) + { + } + + inline void fastMallocMatchValidateFree(void*, Internal::AllocType) + { + } + +#endif + +} // namespace WTF + +#endif + +#endif // FastMallocWince_h + diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/wince/MemoryManager.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/wince/MemoryManager.cpp new file mode 100644 index 000000000..b65b36823 --- /dev/null +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/wince/MemoryManager.cpp @@ -0,0 +1,171 @@ +/* + * Copyright (C) 2008-2009 Torch Mobile Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include "MemoryManager.h" + +#undef malloc +#undef calloc +#undef realloc +#undef free +#undef strdup +#undef _strdup +#undef VirtualAlloc +#undef VirtualFree + +#include +#include + +namespace WTF { + +MemoryManager* memoryManager() +{ + static MemoryManager mm; + return &mm; +} + +MemoryManager::MemoryManager() +: m_allocationCanFail(false) +{ +} + +MemoryManager::~MemoryManager() +{ +} + +HBITMAP MemoryManager::createCompatibleBitmap(HDC hdc, int width, int height) +{ + return ::CreateCompatibleBitmap(hdc, width, height); +} + +HBITMAP MemoryManager::createDIBSection(const BITMAPINFO* pbmi, void** ppvBits) +{ + return ::CreateDIBSection(0, pbmi, DIB_RGB_COLORS, ppvBits, 0, 0); +} + +void* MemoryManager::m_malloc(size_t size) +{ + return malloc(size); +} + +void* MemoryManager::m_calloc(size_t num, size_t size) +{ + return calloc(num, size); +} + +void* MemoryManager::m_realloc(void* p, size_t size) +{ + return realloc(p, size); +} + +void MemoryManager::m_free(void* p) +{ + return free(p); +} + +bool MemoryManager::resizeMemory(void*, size_t) +{ + return false; +} + +void* MemoryManager::allocate64kBlock() +{ + return VirtualAlloc(0, 65536, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); +} + +void MemoryManager::free64kBlock(void* p) +{ + VirtualFree(p, 65536, MEM_RELEASE); +} + +bool MemoryManager::onIdle(DWORD& timeLimitMs) +{ + return false; +} + +LPVOID MemoryManager::virtualAlloc(LPVOID lpAddress, DWORD dwSize, DWORD flAllocationType, DWORD flProtect) +{ + return ::VirtualAlloc(lpAddress, dwSize, flAllocationType, flProtect); +} + +BOOL MemoryManager::virtualFree(LPVOID lpAddress, DWORD dwSize, DWORD dwFreeType) +{ + return ::VirtualFree(lpAddress, dwSize, dwFreeType); +} + + +#if defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC + +void *fastMalloc(size_t n) { return malloc(n); } +void *fastCalloc(size_t n_elements, size_t element_size) { return calloc(n_elements, element_size); } +void fastFree(void* p) { return free(p); } +void *fastRealloc(void* p, size_t n) { return realloc(p, n); } + +#else + +void *fastMalloc(size_t n) { return MemoryManager::m_malloc(n); } +void *fastCalloc(size_t n_elements, size_t element_size) { return MemoryManager::m_calloc(n_elements, element_size); } +void fastFree(void* p) { return MemoryManager::m_free(p); } +void *fastRealloc(void* p, size_t n) { return MemoryManager::m_realloc(p, n); } + +#endif + +#ifndef NDEBUG +void fastMallocForbid() {} +void fastMallocAllow() {} +#endif + +void* fastZeroedMalloc(size_t n) +{ + void* p = fastMalloc(n); + if (p) + memset(p, 0, n); + return p; +} + +void* tryFastMalloc(size_t n) +{ + MemoryAllocationCanFail canFail; + return fastMalloc(n); +} + +void* tryFastZeroedMalloc(size_t n) +{ + MemoryAllocationCanFail canFail; + return fastZeroedMalloc(n); +} + +void* tryFastCalloc(size_t n_elements, size_t element_size) +{ + MemoryAllocationCanFail canFail; + return fastCalloc(n_elements, element_size); +} + +void* tryFastRealloc(void* p, size_t n) +{ + MemoryAllocationCanFail canFail; + return fastRealloc(p, n); +} + +char* fastStrDup(const char* str) +{ + return _strdup(str); +} + +} \ No newline at end of file diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/wince/MemoryManager.h b/src/3rdparty/webkit/JavaScriptCore/wtf/wince/MemoryManager.h new file mode 100644 index 000000000..f405612df --- /dev/null +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/wince/MemoryManager.h @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2008-2009 Torch Mobile Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#pragma once + +#include + +typedef struct HBITMAP__* HBITMAP; +typedef struct HDC__* HDC; +typedef void *HANDLE; +typedef struct tagBITMAPINFO BITMAPINFO; + +namespace WTF { + + class MemoryManager { + public: + MemoryManager(); + ~MemoryManager(); + + bool allocationCanFail() const { return m_allocationCanFail; } + void setAllocationCanFail(bool c) { m_allocationCanFail = c; } + + static HBITMAP createCompatibleBitmap(HDC hdc, int width, int height); + static HBITMAP createDIBSection(const BITMAPINFO* pbmi, void** ppvBits); + static void* m_malloc(size_t size); + static void* m_calloc(size_t num, size_t size); + static void* m_realloc(void* p, size_t size); + static void m_free(void*); + static bool resizeMemory(void* p, size_t newSize); + static void* allocate64kBlock(); + static void free64kBlock(void*); + static bool onIdle(DWORD& timeLimitMs); + static LPVOID virtualAlloc(LPVOID lpAddress, DWORD dwSize, DWORD flAllocationType, DWORD flProtect); + static BOOL virtualFree(LPVOID lpAddress, DWORD dwSize, DWORD dwFreeType); + + private: + friend MemoryManager* memoryManager(); + + bool m_allocationCanFail; + }; + + MemoryManager* memoryManager(); + + class MemoryAllocationCanFail { + public: + MemoryAllocationCanFail() : m_old(memoryManager()->allocationCanFail()) { memoryManager()->setAllocationCanFail(true); } + ~MemoryAllocationCanFail() { memoryManager()->setAllocationCanFail(m_old); } + private: + bool m_old; + }; + + class MemoryAllocationCannotFail { + public: + MemoryAllocationCannotFail() : m_old(memoryManager()->allocationCanFail()) { memoryManager()->setAllocationCanFail(false); } + ~MemoryAllocationCannotFail() { memoryManager()->setAllocationCanFail(m_old); } + private: + bool m_old; + }; +} + +using WTF::MemoryManager; +using WTF::memoryManager; +using WTF::MemoryAllocationCanFail; +using WTF::MemoryAllocationCannotFail; diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/wince/mt19937ar.c b/src/3rdparty/webkit/JavaScriptCore/wtf/wince/mt19937ar.c new file mode 100644 index 000000000..4715958d1 --- /dev/null +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/wince/mt19937ar.c @@ -0,0 +1,170 @@ +/* + A C-program for MT19937, with initialization improved 2002/1/26. + Coded by Takuji Nishimura and Makoto Matsumoto. + + Before using, initialize the state by using init_genrand(seed) + or init_by_array(init_key, key_length). + + Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. The names of its contributors may not be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + Any feedback is very welcome. + http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html + email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space) +*/ + +#include + +/* Period parameters */ +#define N 624 +#define M 397 +#define MATRIX_A 0x9908b0dfUL /* constant vector a */ +#define UPPER_MASK 0x80000000UL /* most significant w-r bits */ +#define LOWER_MASK 0x7fffffffUL /* least significant r bits */ + +static unsigned long mt[N]; /* the array for the state vector */ +static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */ + +/* initializes mt[N] with a seed */ +void init_genrand(unsigned long s) +{ + mt[0]= s & 0xffffffffUL; + for (mti=1; mti> 30)) + mti); + /* See Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier. */ + /* In the previous versions, MSBs of the seed affect */ + /* only MSBs of the array mt[]. */ + /* 2002/01/09 modified by Makoto Matsumoto */ + mt[mti] &= 0xffffffffUL; + /* for >32 bit machines */ + } +} + +/* initialize by an array with array-length */ +/* init_key is the array for initializing keys */ +/* key_length is its length */ +/* slight change for C++, 2004/2/26 */ +void init_by_array(unsigned long init_key[],int key_length) +{ + int i, j, k; + init_genrand(19650218UL); + i=1; j=0; + k = (N>key_length ? N : key_length); + for (; k; k--) { + mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1664525UL)) + + init_key[j] + j; /* non linear */ + mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */ + i++; j++; + if (i>=N) { mt[0] = mt[N-1]; i=1; } + if (j>=key_length) j=0; + } + for (k=N-1; k; k--) { + mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1566083941UL)) + - i; /* non linear */ + mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */ + i++; + if (i>=N) { mt[0] = mt[N-1]; i=1; } + } + + mt[0] = 0x80000000UL; /* MSB is 1; assuring non-zero initial array */ +} + +/* generates a random number on [0,0xffffffff]-interval */ +unsigned long genrand_int32(void) +{ + unsigned long y; + static unsigned long mag01[2]={0x0UL, MATRIX_A}; + /* mag01[x] = x * MATRIX_A for x=0,1 */ + + if (mti >= N) { /* generate N words at one time */ + int kk; + + if (mti == N+1) /* if init_genrand() has not been called, */ + init_genrand(5489UL); /* a default initial seed is used */ + + for (kk=0;kk> 1) ^ mag01[y & 0x1UL]; + } + for (;kk> 1) ^ mag01[y & 0x1UL]; + } + y = (mt[N-1]&UPPER_MASK)|(mt[0]&LOWER_MASK); + mt[N-1] = mt[M-1] ^ (y >> 1) ^ mag01[y & 0x1UL]; + + mti = 0; + } + + y = mt[mti++]; + + /* Tempering */ + y ^= (y >> 11); + y ^= (y << 7) & 0x9d2c5680UL; + y ^= (y << 15) & 0xefc60000UL; + y ^= (y >> 18); + + return y; +} + +/* generates a random number on [0,0x7fffffff]-interval */ +long genrand_int31(void) +{ + return (long)(genrand_int32()>>1); +} + +/* generates a random number on [0,1]-real-interval */ +double genrand_real1(void) +{ + return genrand_int32()*(1.0/4294967295.0); + /* divided by 2^32-1 */ +} + +/* generates a random number on [0,1)-real-interval */ +double genrand_real2(void) +{ + return genrand_int32()*(1.0/4294967296.0); + /* divided by 2^32 */ +} + +/* generates a random number on (0,1)-real-interval */ +double genrand_real3(void) +{ + return (((double)genrand_int32()) + 0.5)*(1.0/4294967296.0); + /* divided by 2^32 */ +} + +/* generates a random number on [0,1) with 53-bit resolution*/ +double genrand_res53(void) +{ + unsigned long a=genrand_int32()>>5, b=genrand_int32()>>6; + return(a*67108864.0+b)*(1.0/9007199254740992.0); +} diff --git a/src/3rdparty/webkit/JavaScriptCore/yarr/RegexJIT.cpp b/src/3rdparty/webkit/JavaScriptCore/yarr/RegexJIT.cpp index 65c53cf2a..663a52437 100644 --- a/src/3rdparty/webkit/JavaScriptCore/yarr/RegexJIT.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/yarr/RegexJIT.cpp @@ -28,6 +28,7 @@ #include "ASCIICType.h" #include "JSGlobalData.h" +#include "LinkBuffer.h" #include "MacroAssembler.h" #include "RegexCompiler.h" @@ -43,18 +44,17 @@ namespace JSC { namespace Yarr { class RegexGenerator : private MacroAssembler { friend void jitCompileRegex(JSGlobalData* globalData, RegexCodeBlock& jitObject, const UString& pattern, unsigned& numSubpatterns, const char*& error, bool ignoreCase, bool multiline); -#if PLATFORM_ARM_ARCH(7) +#if PLATFORM(ARM) static const RegisterID input = ARM::r0; static const RegisterID index = ARM::r1; static const RegisterID length = ARM::r2; - static const RegisterID output = ARM::r4; + static const RegisterID regT0 = ARM::r5; static const RegisterID regT1 = ARM::r6; static const RegisterID returnRegister = ARM::r0; -#endif -#if PLATFORM(X86) +#elif PLATFORM(X86) static const RegisterID input = X86::eax; static const RegisterID index = X86::edx; static const RegisterID length = X86::ecx; @@ -64,8 +64,7 @@ class RegexGenerator : private MacroAssembler { static const RegisterID regT1 = X86::esi; static const RegisterID returnRegister = X86::eax; -#endif -#if PLATFORM(X86_64) +#elif PLATFORM(X86_64) static const RegisterID input = X86::edi; static const RegisterID index = X86::esi; static const RegisterID length = X86::edx; @@ -1309,7 +1308,10 @@ class RegexGenerator : private MacroAssembler { #else loadPtr(Address(X86::ebp, 2 * sizeof(void*)), output); #endif -#elif PLATFORM_ARM_ARCH(7) +#elif PLATFORM(ARM) +#if !PLATFORM_ARM_ARCH(7) + push(ARM::lr); +#endif push(ARM::r4); push(ARM::r5); push(ARM::r6); @@ -1327,7 +1329,7 @@ class RegexGenerator : private MacroAssembler { pop(X86::edi); pop(X86::ebx); pop(X86::ebp); -#elif PLATFORM_ARM_ARCH(7) +#elif PLATFORM(ARM) pop(ARM::r6); pop(ARM::r5); pop(ARM::r4); diff --git a/src/3rdparty/webkit/JavaScriptCore/yarr/RegexPattern.h b/src/3rdparty/webkit/JavaScriptCore/yarr/RegexPattern.h index fb1b0ab81..a4511318b 100644 --- a/src/3rdparty/webkit/JavaScriptCore/yarr/RegexPattern.h +++ b/src/3rdparty/webkit/JavaScriptCore/yarr/RegexPattern.h @@ -57,7 +57,7 @@ struct CharacterRange { } }; -struct CharacterClass { +struct CharacterClass : FastAllocBase { Vector m_matches; Vector m_ranges; Vector m_matchesUnicode; @@ -181,7 +181,7 @@ struct PatternTerm { } }; -struct PatternAlternative { +struct PatternAlternative : FastAllocBase { PatternAlternative(PatternDisjunction* disjunction) : m_parent(disjunction) { @@ -205,7 +205,7 @@ struct PatternAlternative { bool m_hasFixedSize; }; -struct PatternDisjunction { +struct PatternDisjunction : FastAllocBase { PatternDisjunction(PatternAlternative* parent = 0) : m_parent(parent) { diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index fc32632de..683413405 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,8 +4,8 @@ This is a snapshot of the Qt port of WebKit from The commit imported was from the - qtwebkit-4.6-snapshot-13072009 branch/tag + qtwebkit-4.6-snapshot-29072009 branch/tag and has the sha1 checksum - b2abc0c271880b8135507861056af497f895adf5 + 07fbaeddfade72be1d0d7e7f2b947e5d3c183f4a diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 35640c58e..7fc69b45b 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,7330 @@ +2009-07-28 Tor Arne Vestbø + + Reviewed by Steve Falkenburg. + + Add output directory for VS pre-build steps to enable out-of-tree builds + + https://bugs.webkit.org/show_bug.cgi?id=27700 + + The tmp.obj file is now placed in the intermediate build directory. + + * WebCore.vcproj/WebCoreCommon.vsprops: + +2009-07-28 Pavel Feldman + + Reviewed by Timothy Hatcher. + + Web Inspector: Add inspected node using public console API. + + https://bugs.webkit.org/show_bug.cgi?id=27758 + + * inspector/front-end/Console.js: + (WebInspector.Console.prototype.addInspectedNode): + * inspector/front-end/ElementsPanel.js: + (WebInspector.ElementsPanel.this.treeOutline.focusedNodeChanged): + (WebInspector.ElementsPanel): + +2009-07-28 Nikolas Zimmermann + + Reviewed by George Staikos. + + [WML] elements with a task shouldn't be exposed to the user + https://bugs.webkit.org/show_bug.cgi?id=27724 + + Fix WMLNoopElement to disable it's parent WMLDoElement, as required by the spec. + Moved manual-tests/wml/task-noop-in-do.wml to LayoutTests/fast/wml/task-noop-in-do.wml. + + * manual-tests/wml/task-noop-in-do.wml: Removed. + * wml/WMLNoopElement.cpp: + (WebCore::WMLNoopElement::insertedIntoDocument): + +2009-07-28 Laszlo Gombos + + Reviewed by Simon Hausmann. + + [Qt] Disable some compiler warnings for the win build + https://bugs.webkit.org/show_bug.cgi?id=27709 + + * WebCore.pro: Move the msvc options to WebKit.pri + +2009-07-28 Gustavo Noronha Silva + + Reviewed by Tor Arne Vestbø + + Make equality checks for logging channel names ignore casing. + + * platform/Logging.cpp: + (WebCore::getChannelFromName): + +2009-07-28 Jan Michael Alonzo + + Reviewed by Xan Lopez. + + [Gtk] Refactor ResourceHandleSoup - make start* functions static + https://bugs.webkit.org/show_bug.cgi?id=27687 + + * platform/network/ResourceHandle.h: + * platform/network/soup/ResourceHandleSoup.cpp: + (WebCore::startData): + (WebCore::startHttp): + (WebCore::): + +2009-07-28 Xan Lopez + + Reviewed by Gustavo Noronha. + + https://bugs.webkit.org/show_bug.cgi?id=25415 + [GTK][ATK] Please implement support for get_text_at_offset + + Do not cache the pango layout in the object, since the layout of + the page can change between calls. + + * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: + +2009-07-23 Anton Muhin + + Reviewed by Adam Barth. + + Simplify management of Nodes in weak handles callbacks. + https://bugs.webkit.org/show_bug.cgi?id=27628 + + * bindings/v8/V8DOMMap.cpp: + (WebCore::weakNodeCallback): + +2009-07-28 Brian Weinstein + + Rubber-stamped by David Levin. + + Fix error handling of GetIconInfo (returns a bool). + + * platform/win/DragImageWin.cpp: + (WebCore::createDragImageIconForCachedImage): + +2009-07-27 Brian Weinstein + + Reviewed by Jon Honeycutt. + + Fix of Drag Icon is not produced for over sized images. + + Implemented the createDragImageIconForCachedImage function by using the Windows + SHFILEINFO structure. + + * platform/win/DragImageWin.cpp: + (WebCore::createDragImageIconForCachedImage): + +2009-07-25 Adam Barth + + Reviewed by David Levin. + + [V8] Split up V8DOMMap.cpp by class + https://bugs.webkit.org/show_bug.cgi?id=27685 + + No behavior change. Just copy-and-paste. + + * WebCore.gypi: + * bindings/v8/ChildThreadDOMData.cpp: Added. + (WebCore::ChildThreadDOMData::ChildThreadDOMData): + (WebCore::ChildThreadDOMData::getStore): + * bindings/v8/ChildThreadDOMData.h: Added. + * bindings/v8/DOMData.cpp: Added. + (WebCore::DOMData::DOMData): + (WebCore::DOMData::getCurrent): + (WebCore::DOMData::getCurrentMainThread): + (WebCore::DOMData::handleWeakObject): + (WebCore::DOMData::ensureDeref): + (WebCore::DOMData::derefObject): + (WebCore::DOMData::derefDelayedObjects): + (WebCore::DOMData::derefDelayedObjectsInCurrentThread): + (WebCore::DOMData::removeObjectsFromWrapperMap): + * bindings/v8/DOMData.h: Added. + (WebCore::): + * bindings/v8/DOMDataStore.cpp: Added. + (WebCore::DOMDataStore::DOMDataStore): + (WebCore::DOMDataStore::~DOMDataStore): + (WebCore::DOMDataStore::allStores): + (WebCore::DOMDataStore::allStoresMutex): + (WebCore::DOMDataStore::getDOMWrapperMap): + (WebCore::forget): + (WebCore::DOMDataStore::weakDOMObjectCallback): + (WebCore::DOMDataStore::weakActiveDOMObjectCallback): + (WebCore::DOMDataStore::weakNodeCallback): + (WebCore::DOMDataStore::weakSVGElementInstanceCallback): + (WebCore::DOMDataStore::weakSVGObjectWithContextCallback): + * bindings/v8/DOMDataStore.h: Added. + (WebCore::DOMDataStore::): + (WebCore::DOMDataStore::InternalDOMWrapperMap::InternalDOMWrapperMap): + (WebCore::DOMDataStore::InternalDOMWrapperMap::forgetOnly): + (WebCore::DOMDataStore::domData): + (WebCore::DOMDataStore::domNodeMap): + (WebCore::DOMDataStore::domObjectMap): + (WebCore::DOMDataStore::activeDomObjectMap): + (WebCore::DOMDataStore::domSvgElementInstanceMap): + (WebCore::DOMDataStore::domSvgObjectWithContextMap): + * bindings/v8/MainThreadDOMData.cpp: Added. + (WebCore::MainThreadDOMData::MainThreadDOMData): + (WebCore::MainThreadDOMData::getStore): + * bindings/v8/MainThreadDOMData.h: Added. + * bindings/v8/ScopedDOMDataStore.cpp: Added. + (WebCore::ScopedDOMDataStore::ScopedDOMDataStore): + (WebCore::ScopedDOMDataStore::~ScopedDOMDataStore): + * bindings/v8/ScopedDOMDataStore.h: Added. + * bindings/v8/StaticDOMDataStore.cpp: Added. + (WebCore::StaticDOMDataStore::StaticDOMDataStore): + * bindings/v8/StaticDOMDataStore.h: Added. + * bindings/v8/V8DOMMap.cpp: + +2009-07-27 Mark Rowe + + Reviewed by Darin Adler. + + REGRESSION: Microsoft Messenger crashes during file send/receive due to use of WebKit on non-main thread + + Add a method for detecting if we're being used within Microsoft Messenger. + + * WebCore.base.exp: Export applicationIsMicrosoftMessenger and sort existing entries. + * platform/mac/RuntimeApplicationChecks.h: + * platform/mac/RuntimeApplicationChecks.mm: + (WebCore::applicationIsMicrosoftMessenger): + +2009-07-27 Jian Li + + Reviewed by David Levin. + + [V8] Implement EventListener::reportError for V8 event listeners in worker context. + https://bugs.webkit.org/show_bug.cgi?id=27731 + + * bindings/v8/V8WorkerContextEventListener.cpp: + (WebCore::V8WorkerContextEventListener::reportError): + * bindings/v8/V8WorkerContextEventListener.h: + +2009-07-27 Stephen White + + Reviewed by Eric Seidel and David Levin. + + Re-apply chromium/skia border fix (originally landed in r46157, + reverted in r46363), since it was not the cause of the reliability + failures in Chromium. + + http://bugs.webkit.org/show_bug.cgi?id=27388 + + * platform/graphics/skia/GraphicsContextSkia.cpp: + (WebCore::GraphicsContext::drawLine): + * platform/graphics/skia/PlatformContextSkia.cpp: + (PlatformContextSkia::setupPaintForStroking): + +2009-07-27 Ryosuke Niwa + + Reviewed by Justin Garcia. + + createMarkup does not handle CSS properly + https://bugs.webkit.org/show_bug.cgi?id=27660 + + This patch isolates code that creates markup for styles in addStyleMarkup + It also makes all presentational elements (u, s, strike, i, em, b, strong) special ancestor in createMarkup + so that we can assume no text decoration style is passed to addStyleMarkup. + + * editing/markup.cpp: + (WebCore::propertyMissingOrEqualToNone): Changed the first argument from CSSMutableStyleDecleration to CSSStyleDeclaration + (WebCore::isElementPresentational): Used to be elementHasTextDecorationProperty, now supports presentational tags + (WebCore::addStyleMarkup): Adds markup for style span and div + (WebCore::createMarkup): Uses isElementPresentational and addStyleMarkup + +2009-07-27 Eric Seidel + + Reviewed by Adam Barth. + + fix more obvious global object lookups + https://bugs.webkit.org/show_bug.cgi?id=27745 + + No new tests for these changes. I believe in many cases + testing to be impossible. Lack of testing justification next to + each change below. The remaining pieces of bug 27634 will all + need tests. + + * bindings/js/JSDOMWindowBase.cpp: + (WebCore::JSDOMWindowBase::updateDocument): not testable. + * bindings/js/JSDataGridColumnListCustom.cpp: + (WebCore::JSDataGridColumnList::nameGetter): no testing for this incomplete feature. + * bindings/js/JSEventListener.cpp: + (WebCore::JSEventListener::handleEvent): would require outer frame to trigger an event in the inner frame + * bindings/js/JSEventTarget.cpp: + (WebCore::toJS): covered by other tests, always correct to pass the globalObject through. + * bindings/js/JSHTMLElementCustom.cpp: + (WebCore::JSHTMLElement::pushEventHandlerScope): unclear when this could be triggered. + * bindings/js/JSHTMLOptionsCollectionCustom.cpp: + (WebCore::JSHTMLOptionsCollection::remove): toJS seems superfluous here to begin with. + * bindings/js/JSLazyEventListener.cpp: + (WebCore::JSLazyEventListener::parseCode): would require outer frame to trigger inner frame event. + * bindings/js/ScriptController.cpp: + (WebCore::ScriptController::jsObjectForPluginElement): only used for NPAPI binding, unclear how to test. + * bindings/js/ScriptEventListener.cpp: + (WebCore::createAttributeEventListener): unclear how to test. + * bindings/js/ScriptObject.cpp: + (WebCore::ScriptGlobalObject::set): unclear how to test/inspector only. + * bindings/js/ScriptObjectQuarantine.cpp: + (WebCore::getQuarantinedScriptObject): unclear how to test. + * bindings/objc/DOMInternal.mm: + (-[WebScriptObject _initializeScriptDOMNodeImp]): unclear how to test. + +2009-07-27 Nikolas Zimmermann + + Reviewed by George Staikos. + + [WML] 'title' attribute handling not correct for / elements + https://bugs.webkit.org/show_bug.cgi?id=27720 + + Unify title() implementation in WMLElement instead of several copies of the same logic. + We forgot WMLAnchorElement/WMLAElement, that lead to bugs. Fixes hovering links in the + WML manual-test suite. + + * wml/WMLCardElement.cpp: + * wml/WMLCardElement.h: + * wml/WMLElement.cpp: + (WebCore::WMLElement::title): + * wml/WMLElement.h: + * wml/WMLOptGroupElement.cpp: + * wml/WMLOptGroupElement.h: + * wml/WMLSelectElement.cpp: + * wml/WMLSelectElement.h: + +2009-07-27 Adam Treat + + Speculative build fix for Windows and WinCE. + + * plugins/win/PluginPackageWin.cpp: + (WebCore::PluginPackage::load): + +2009-07-27 Ojan Vafai + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=27474 + Fixes crashes due to renderer getting destroyed in updateLayout. + We need to call updateLayout before we call into the renderer. + Removed the updateLayout call from RenderTextControl and moved it + into the calling sites. + + Also changes updateLayout to updateLayoutIgnorePendingStylesheets so + this works with pending stylesheets. Unfortunately, this seems to be + untestable. Loading an external stylesheet and then having an inline + script hit this code did not result in an pending stylesheets. + + The are other cases of this bug in the rendering code. I'll file a + followup bug to audit the calls to updateLayout. + + Test: fast/dom/text-control-crash-on-select.html + + * dom/Document.h: + (WebCore::Document::inStyleRecalc): Added so the ASSERTs in updateFocusAppearance + and setSelectionRange could deal with cases of reentrancy into updateLayout + calls. This happens in a couple layout tests. + * dom/InputElement.cpp: + (WebCore::InputElement::updateSelectionRange): + * html/HTMLInputElement.cpp: + (WebCore::isTextFieldWithRendererAfterUpdateLayout): + (WebCore::HTMLInputElement::setSelectionStart): + (WebCore::HTMLInputElement::setSelectionEnd): + (WebCore::HTMLInputElement::select): + * html/HTMLTextAreaElement.cpp: + (WebCore::rendererAfterUpdateLayout): + (WebCore::HTMLTextAreaElement::setSelectionStart): + (WebCore::HTMLTextAreaElement::setSelectionEnd): + (WebCore::HTMLTextAreaElement::select): + (WebCore::HTMLTextAreaElement::setSelectionRange): + (WebCore::HTMLTextAreaElement::updateFocusAppearance): + * rendering/RenderTextControl.cpp: + (WebCore::RenderTextControl::setSelectionRange): + +2009-07-27 Dimitri Glazkov + + Reviewed by Dave Levin. + + [V8] Remove parameterless frame/window retrieval methods from V8Proxy. + https://bugs.webkit.org/show_bug.cgi?id=27737 + + Refactoring, no new behavior, covered by existing tests. + + * bindings/v8/ScriptCallStack.cpp: + (WebCore::ScriptCallStack::ScriptCallStack): + * bindings/v8/V8NPUtils.cpp: + (convertV8ObjectToNPVariant): Ditto. + * bindings/v8/V8Proxy.cpp: + (WebCore::V8Proxy::retrieve): Ditto. + (WebCore::V8Proxy::canAccessPrivate): Ditto. + * bindings/v8/V8Proxy.h: Removed parameterless retrieveWindow/retrieveProxy decls. + * bindings/v8/custom/V8DatabaseCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): Changed to use V8Proxy::retrieveFrameForCurrentContext(). + * bindings/v8/custom/V8HTMLAudioElementConstructor.cpp: + (WebCore::CALLBACK_FUNC_DECL): Ditto. + * bindings/v8/custom/V8HTMLImageElementConstructor.cpp: + (WebCore::CALLBACK_FUNC_DECL): Ditto. + * bindings/v8/custom/V8HTMLOptionElementConstructor.cpp: + (WebCore::CALLBACK_FUNC_DECL): Ditto. + * bindings/v8/custom/V8MessageChannelConstructor.cpp: + (WebCore::CALLBACK_FUNC_DECL): Ditto. + * bindings/v8/custom/V8SQLTransactionCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): Ditto. + * bindings/v8/custom/V8WorkerCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): Ditto. + * bindings/v8/custom/V8XMLHttpRequestConstructor.cpp: + (WebCore::CALLBACK_FUNC_DECL): Ditto. + +2009-07-27 Nikolas Zimmermann + + Reviewed by George Staikos. + + [WML] 'onpick' intrinsic event handling missing + https://bugs.webkit.org/show_bug.cgi?id=27723 + + Trigger 'onpick' intrinsic events from WMLOptionElement::setSelectedState(). + All was in place, just forgot to enable the relevant code. + + Fixes manual-tests/wml/select-onpick-event.wml + Test: wml/option-element-onpick.html + + * wml/WMLOptionElement.cpp: + (WebCore::WMLOptionElement::setSelectedState): + +2009-07-27 Alexey Proskuryakov + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=27735 + Give a helpful name to JSLock constructor argument + + * bindings/js/GCController.cpp: + (WebCore::collect): + (WebCore::GCController::gcTimerFired): + (WebCore::GCController::garbageCollectNow): + * bindings/js/JSCustomPositionCallback.cpp: + (WebCore::JSCustomPositionCallback::handleEvent): + * bindings/js/JSCustomPositionErrorCallback.cpp: + (WebCore::JSCustomPositionErrorCallback::handleEvent): + * bindings/js/JSCustomSQLStatementCallback.cpp: + (WebCore::JSCustomSQLStatementCallback::handleEvent): + * bindings/js/JSCustomSQLStatementErrorCallback.cpp: + (WebCore::JSCustomSQLStatementErrorCallback::handleEvent): + * bindings/js/JSCustomSQLTransactionCallback.cpp: + (WebCore::JSCustomSQLTransactionCallback::handleEvent): + * bindings/js/JSCustomSQLTransactionErrorCallback.cpp: + (WebCore::JSCustomSQLTransactionErrorCallback::handleEvent): + * bindings/js/JSCustomVoidCallback.cpp: + (WebCore::JSCustomVoidCallback::handleEvent): + * bindings/js/JSCustomXPathNSResolver.cpp: + (WebCore::JSCustomXPathNSResolver::lookupNamespaceURI): + * bindings/js/JSEventCustom.cpp: + (WebCore::toJS): + * bindings/js/JSEventListener.cpp: + (WebCore::JSEventListener::handleEvent): + * bindings/js/JSInspectorBackendCustom.cpp: + (WebCore::JSInspectorBackend::currentCallFrame): + (WebCore::JSInspectorBackend::profiles): + * bindings/js/JSNodeFilterCondition.cpp: + (WebCore::JSNodeFilterCondition::acceptNode): + * bindings/js/ScheduledAction.cpp: + (WebCore::ScheduledAction::executeFunctionInContext): + * bindings/js/ScriptArray.cpp: + (WebCore::ScriptArray::set): + (WebCore::ScriptArray::createNew): + * bindings/js/ScriptCachedFrameData.cpp: + (WebCore::ScriptCachedFrameData::ScriptCachedFrameData): + (WebCore::ScriptCachedFrameData::restore): + (WebCore::ScriptCachedFrameData::clear): + * bindings/js/ScriptController.cpp: + (WebCore::ScriptController::evaluate): + (WebCore::ScriptController::clearWindowShell): + (WebCore::ScriptController::initScript): + (WebCore::ScriptController::updateDocument): + (WebCore::ScriptController::bindingRootObject): + (WebCore::ScriptController::windowScriptNPObject): + (WebCore::ScriptController::jsObjectForPluginElement): + (WebCore::ScriptController::clearScriptObjects): + * bindings/js/ScriptControllerMac.mm: + (WebCore::ScriptController::windowScriptObject): + * bindings/js/ScriptEventListener.cpp: + (WebCore::createAttributeEventListener): + * bindings/js/ScriptFunctionCall.cpp: + (WebCore::ScriptFunctionCall::appendArgument): + (WebCore::ScriptFunctionCall::call): + (WebCore::ScriptFunctionCall::construct): + * bindings/js/ScriptObject.cpp: + (WebCore::ScriptObject::set): + (WebCore::ScriptObject::createNew): + (WebCore::ScriptGlobalObject::set): + (WebCore::ScriptGlobalObject::get): + (WebCore::ScriptGlobalObject::remove): + * bindings/js/ScriptObjectQuarantine.cpp: + (WebCore::quarantineValue): + (WebCore::getQuarantinedScriptObject): + * bindings/js/ScriptValue.cpp: + (WebCore::ScriptValue::getString): + * bindings/js/WorkerScriptController.cpp: + (WebCore::WorkerScriptController::initScript): + (WebCore::WorkerScriptController::evaluate): + * bindings/objc/WebScriptObject.mm: + (-[WebScriptObject callWebScriptMethod:withArguments:]): + (-[WebScriptObject evaluateWebScript:]): + (-[WebScriptObject setValue:forKey:]): + (-[WebScriptObject valueForKey:]): + (-[WebScriptObject removeWebScriptKey:]): + (-[WebScriptObject stringRepresentation]): + (-[WebScriptObject webScriptValueAtIndex:]): + (-[WebScriptObject setWebScriptValueAtIndex:value:]): + (+[WebScriptObject _convertValueToObjcValue:originRootObject:rootObject:]): + * bridge/NP_jsobject.cpp: + (_NPN_InvokeDefault): + (_NPN_Invoke): + (_NPN_Evaluate): + (_NPN_GetProperty): + (_NPN_SetProperty): + (_NPN_RemoveProperty): + (_NPN_HasProperty): + (_NPN_HasMethod): + (_NPN_Enumerate): + (_NPN_Construct): + * bridge/c/c_class.cpp: + (JSC::Bindings::CClass::~CClass): + (JSC::Bindings::CClass::methodsNamed): + (JSC::Bindings::CClass::fieldNamed): + * bridge/c/c_instance.cpp: + (JSC::Bindings::CInstance::moveGlobalExceptionToExecState): + (JSC::Bindings::CInstance::invokeMethod): + (JSC::Bindings::CInstance::invokeDefaultMethod): + (JSC::Bindings::CInstance::invokeConstruct): + (JSC::Bindings::CInstance::getPropertyNames): + * bridge/c/c_runtime.cpp: + (JSC::Bindings::CField::valueFromInstance): + (JSC::Bindings::CField::setValueToInstance): + * bridge/c/c_utility.cpp: + (JSC::Bindings::convertValueToNPVariant): + (JSC::Bindings::convertNPVariantToValue): + * bridge/jni/jni_class.cpp: + (JavaClass::JavaClass): + (JavaClass::~JavaClass): + * bridge/jni/jni_instance.cpp: + (JavaInstance::stringValue): + * bridge/jni/jni_jsobject.mm: + (JavaJSObject::call): + (JavaJSObject::eval): + (JavaJSObject::getMember): + (JavaJSObject::setMember): + (JavaJSObject::removeMember): + (JavaJSObject::getSlot): + (JavaJSObject::setSlot): + (JavaJSObject::toString): + (JavaJSObject::convertValueToJObject): + (JavaJSObject::convertJObjectToValue): + * bridge/jni/jni_objc.mm: + (JSC::Bindings::dispatchJNICall): + * bridge/jni/jni_runtime.cpp: + (JavaMethod::signature): + * bridge/jni/jni_runtime.h: + (JSC::Bindings::JavaString::JavaString): + (JSC::Bindings::JavaString::_commonInit): + (JSC::Bindings::JavaString::~JavaString): + (JSC::Bindings::JavaString::UTF8String): + * bridge/jni/jni_utility.cpp: + (JSC::Bindings::convertValueToJValue): + * bridge/objc/objc_instance.mm: + (ObjcInstance::moveGlobalExceptionToExecState): + (ObjcInstance::invokeMethod): + (ObjcInstance::invokeDefaultMethod): + (ObjcInstance::setValueOfUndefinedField): + (ObjcInstance::getValueOfUndefinedField): + * bridge/objc/objc_runtime.mm: + (JSC::Bindings::ObjcField::valueFromInstance): + (JSC::Bindings::ObjcField::setValueToInstance): + * bridge/objc/objc_utility.mm: + (JSC::Bindings::convertValueToObjcValue): + (JSC::Bindings::convertNSStringToString): + (JSC::Bindings::convertObjcValueToValue): + * bridge/qt/qt_instance.cpp: + (JSC::Bindings::QtRuntimeObjectImp::removeFromCache): + (JSC::Bindings::QtInstance::~QtInstance): + (JSC::Bindings::QtInstance::getQtInstance): + (JSC::Bindings::QtInstance::createRuntimeObject): + * bridge/qt/qt_runtime.cpp: + (JSC::Bindings::convertValueToQVariant): + (JSC::Bindings::convertQVariantToValue): + (JSC::Bindings::QtRuntimeMetaMethod::call): + (JSC::Bindings::QtRuntimeConnectionMethod::call): + (JSC::Bindings::QtConnectionObject::execute): + * bridge/runtime.cpp: + (JSC::Bindings::Instance::createRuntimeObject): + * inspector/InspectorController.cpp: + (WebCore::InspectorController::addScriptProfile): + * inspector/JavaScriptCallFrame.cpp: + (WebCore::JavaScriptCallFrame::evaluate): + * inspector/JavaScriptDebugServer.cpp: + (WebCore::JavaScriptDebugServer::recompileAllJSFunctions): + * inspector/JavaScriptProfileNode.cpp: + (WebCore::getTotalTime): + (WebCore::getSelfTime): + (WebCore::getTotalPercent): + (WebCore::getSelfPercent): + (WebCore::getNumberOfCalls): + (WebCore::getChildren): + (WebCore::getParent): + (WebCore::getHead): + (WebCore::getVisible): + (WebCore::getCallUID): + * plugins/PluginView.cpp: + (WebCore::PluginView::start): + (WebCore::getString): + (WebCore::PluginView::performRequest): + (WebCore::PluginView::bindingInstance): + * plugins/gtk/PluginViewGtk.cpp: + (WebCore::PluginView::dispatchNPEvent): + (WebCore::PluginView::handleKeyboardEvent): + (WebCore::PluginView::handleMouseEvent): + (WebCore::PluginView::setNPWindowIfNeeded): + (WebCore::PluginView::stop): + (WebCore::PluginView::init): + * plugins/mac/PluginViewMac.cpp: + (WebCore::PluginView::stop): + (WebCore::PluginView::setNPWindowIfNeeded): + (WebCore::PluginView::dispatchNPEvent): + * plugins/qt/PluginViewQt.cpp: + (WebCore::PluginView::setNPWindowIfNeeded): + (WebCore::PluginView::stop): + (WebCore::PluginView::init): + * plugins/win/PluginViewWin.cpp: + (WebCore::PluginView::dispatchNPEvent): + (WebCore::PluginView::handleKeyboardEvent): + (WebCore::PluginView::handleMouseEvent): + (WebCore::PluginView::setNPWindowRect): + (WebCore::PluginView::stop): + +2009-07-27 Yong Li + + Reviewed by George Staikos. + + WINCE PORT: Make plugin work for WINCE + https://bugs.webkit.org/show_bug.cgi?id=27713 + + * plugins/win/PluginDatabaseWin.cpp: + (SHGetValue): + (PathRemoveFileSpec): + (WebCore::addWindowsMediaPlayerPluginDirectory): + (WebCore::addMacromediaPluginDirectories): + * plugins/win/PluginPackageWin.cpp: + (WebCore::PluginPackage::load): + * plugins/win/PluginViewWin.cpp: + (WebCore::registerPluginView): + (WebCore::PluginView::wndProc): + (WebCore::PluginView::updatePluginWidget): + (WebCore::PluginView::paintWindowedPluginIntoContext): + (WebCore::PluginView::paint): + (WebCore::PluginView::handleMouseEvent): + (WebCore::PluginView::setParent): + (WebCore::PluginView::setNPWindowRect): + (WebCore::PluginView::stop): + (WebCore::PluginView::init): + +2009-07-27 Joseph Pecoraro + + Inspector: Tab Through Element Attributes and CSS Properties When Editing + + https://bugs.webkit.org/show_bug.cgi?id=27673 + + Reviewed by Timothy Hatcher. + + * inspector/front-end/ElementsTreeOutline.js: + (WebInspector.ElementsTreeElement): + (WebInspector.ElementsTreeElement.prototype._startEditing): refactored parameter + (WebInspector.ElementsTreeElement.prototype._addNewAttribute): refactored to remove excess + (WebInspector.ElementsTreeElement.prototype._triggerEditAttribute): provide an attribute name and this will start editing it + (WebInspector.ElementsTreeElement.prototype._attributeEditingCommitted.moveToNextAttributeIfNeeded): move between attributes + (WebInspector.ElementsTreeElement.prototype._attributeEditingCommitted): + * inspector/front-end/StylesSidebarPane.js: + (WebInspector.StylePropertiesSection.prototype.onpopulate): + (WebInspector.StylePropertiesSection.prototype.findTreeElementWithName): search through treeElements for a style property name + (WebInspector.StylePropertiesSection.prototype.addNewBlankProperty): initialize a blank property for adding new properties + (WebInspector.StylePropertyTreeElement.prototype.updateTitle): add references to the name and value elements + (WebInspector.StylePropertyTreeElement.prototype.): + (WebInspector.StylePropertyTreeElement.prototype): + * inspector/front-end/inspector.js: + (WebInspector.startEditing.editingCommitted): include the move direction as a parameter to the commit callback + (WebInspector.startEditing.element.handleKeyEvent): handle the tab key to specify the move direction + (WebInspector.startEditing): + +2009-07-27 Mike Fenton + + Reviewed by Adam Treat. + + Add mapping FontWeight to QFont::Weight values as requested via FIXME. + https://bugs.webkit.org/show_bug.cgi?id=27663 + + * platform/graphics/qt/FontCacheQt.cpp: + (WebCore::FontPlatformDataCacheKey::FontPlatformDataCacheKey): + * platform/graphics/qt/FontPlatformData.h: + (WebCore::FontPlatformData::toQFontWeight): + * platform/graphics/qt/FontPlatformDataQt.cpp: + (WebCore::FontPlatformData::FontPlatformData): + +2009-07-27 Jakub Wieczorek + + Reviewed by Adam Treat. + + When clearing the plugin database, clear also the timestamp map. + + https://bugs.webkit.org/show_bug.cgi?id=27651 + + Currently, if we clear the database, it will still think that it is up + to date with the plugin directories so refreshing the database again + after changing the search paths may not work. + + * plugins/PluginDatabase.cpp: + (WebCore::PluginDatabase::clear): + +2009-07-27 Albert J. Wong + + Reviewed by David Levin. + + Add in trivial implementation of FontPlatformData::description() for + linux to fix build bustage in chromium. + + Fix chromium linux build by adding missing function implementation. + https://bugs.webkit.org/show_bug.cgi?id=27732 + + Tested with a build of chromium on linux. + + * platform/graphics/chromium/FontPlatformDataLinux.cpp: + (WebCore::FontPlatformData::description): + * platform/graphics/chromium/FontPlatformDataLinux.h: + +2009-07-27 Brent Fulgham + + Build correct, no review. + + Final correction for WinCairo builds. + CoreServices only exists in Apple builds, but + some of its internal includes (e.g., ) are needed + for other Windows targets. + + * WebCorePrefix.h: When building for WinCairo, make sure + to include , , and + +2009-07-27 Michelangelo De Simone + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=25552 + Added new "pattern" attribute to HTMLInputElement and validation code + (validity.patternMismatch) as per HTML5 specs. + http://www.whatwg.org/specs/web-apps/current-work/multipage/forms.html#attr-input-pattern + + Tests: fast/forms/ValidityState-002.html + fast/forms/ValidityState-patternMismatch-001.html + fast/forms/ValidityState-patternMismatch-002.html + fast/forms/ValidityState-patternMismatch-003.html + fast/forms/ValidityState-patternMismatch-004.html + fast/forms/ValidityState-patternMismatch-005.html + fast/forms/ValidityState-patternMismatch-006.html + fast/forms/ValidityState-patternMismatch-007.html + fast/forms/pattern-attribute-001.html + fast/forms/pattern-attribute-002.html + fast/forms/pattern-attribute-003.html + + * html/HTMLAttributeNames.in: pattern attribute + * html/HTMLFormControlElement.h: + (WebCore::HTMLFormControlElement::patternMismatch): method definition + * html/HTMLInputElement.cpp: + (WebCore::HTMLInputElement::patternMismatch): validation method + * html/HTMLInputElement.h: + * html/HTMLInputElement.idl: + * html/ValidityState.h: + (WebCore::ValidityState::patternMismatch): validation flag + +2009-07-27 Nikolas Zimmermann + + Reviewed by George Staikos. + + [WML] Manual WML tests aren't properly working + https://bugs.webkit.org/show_bug.cgi?id=27718 + + Fix file paths in the manual WML layout tests, remove unneeded tests (already covered by DRT tests). + Add missing resources directory and test image. Reformat all testcases to a common style. + Add new StartTests.wml file, which should be used as starting point to crawl through the manual tests. + + Filing bugs soon for all tests exposing bugs (7 in total). + + * manual-tests/wml/StartTests.wml: Added. + * manual-tests/wml/a-br-element.wml: + * manual-tests/wml/a-element.wml: + * manual-tests/wml/a-img-element.wml: + * manual-tests/wml/access-target.wml: + * manual-tests/wml/anchor-br-element.wml: + * manual-tests/wml/anchor-element.wml: + * manual-tests/wml/anchor-img-element.wml: + * manual-tests/wml/card-newcontext-attr.wml: + * manual-tests/wml/card-onenterbackward.wml: + * manual-tests/wml/card-onenterforward.wml: + * manual-tests/wml/card-ontimer.wml: + * manual-tests/wml/card-title-attr.wml: Removed. + * manual-tests/wml/deck-access-control.wml: + * manual-tests/wml/go-element.wml: Removed. + * manual-tests/wml/input-emptyok.wml: Removed. + * manual-tests/wml/input-format.wml: + * manual-tests/wml/onevent-go.wml: + * manual-tests/wml/onevent-noop.wml: + * manual-tests/wml/onevent-prev.wml: + * manual-tests/wml/onevent-refresh.wml: + * manual-tests/wml/onevent-shadow.wml: + * manual-tests/wml/postfield-get.wml: Removed. + * manual-tests/wml/postfield-post.wml: Removed. + * manual-tests/wml/resources: Added. + * manual-tests/wml/resources/smiley.png: Added. + * manual-tests/wml/select-element.wml: + * manual-tests/wml/select-onpick-event.wml: + * manual-tests/wml/setvar-element.wml: + * manual-tests/wml/targetdeck.wml: + * manual-tests/wml/task-go-in-anchor.wml: + * manual-tests/wml/task-noop-in-do.wml: + * manual-tests/wml/task-noop-in-onevent.wml: Removed. + * manual-tests/wml/task-prev-in-anchor.wml: + * manual-tests/wml/task-refresh-in-anchor.wml: + * manual-tests/wml/template-go.wml: + * manual-tests/wml/template-onevent.wml: Removed. + * manual-tests/wml/template-ontimer.wml: + * manual-tests/wml/timer.wml: + * manual-tests/wml/variable-substitution.wml: + +2009-07-27 Nate Chapin + + Reviewed by Dimitri Glazkov. + + Fix a regression introduced in r42671, which caused the js event + object to be hidden (some websites depend on being able to access it). + + https://bugs.webkit.org/show_bug.cgi?id=27719 + + * bindings/v8/V8AbstractEventListener.cpp: + (WebCore::V8AbstractEventListener::invokeEventHandler): Make the event object visible to javascript, instead of hidden. + +2009-07-27 Dumitru Daniliuc + + Reviewed by Dimitri Glazkov. + + Removing a no-op block of code in DatabaseTracker.cpp that + should've been removed in the patch for bug 26054. + + https://bugs.webkit.org/show_bug.cgi?id=27666 + + All tests in WebCore/storage pass. + + * storage/DatabaseTracker.cpp: + (WebCore::DatabaseTracker::fullPathForDatabase): Removed a no-op + block of code that was moved to SQLiteFileSystem.cpp and should + have been removed from DatabaseTracker.cpp + +2009-07-27 Jian Li + + Reviewed by David Levin. + + Fix error handling in dedicated worker and worker context. + https://bugs.webkit.org/show_bug.cgi?id=27525 + + The following problems have been fixed: + 1) The uncaught runtime script error is not reported using the + WorkerGlobalScope object's onerror attribute. + 2) If the error is still not handled afterwards (onerror attribute + is not defined as a function or it returns true), the error should + be reported back to the associated Worker object by firing an + ErrorEvent. + 3) If the error is still not handled by the associated Worker + object, the error should be reported to the user. + + Test: fast/workers/worker-script-error.html + + * bindings/js/JSEventListener.cpp: + (WebCore::JSEventListener::reportError): + * bindings/js/JSEventListener.h: + * dom/EventListener.h: + (WebCore::EventListener::reportError): adds a function to call + EventListener as a function with 3 arguments to report an error. + * workers/AbstractWorker.cpp: + (WebCore::AbstractWorker::dispatchScriptErrorEvent): + * workers/AbstractWorker.h: + * workers/DedicatedWorkerContext.cpp: + (WebCore::DedicatedWorkerContext::reportException): + * workers/WorkerContext.cpp: + (WebCore::WorkerContext::reportException): + * workers/WorkerContext.h: + * workers/WorkerMessagingProxy.cpp: + (WebCore::WorkerExceptionTask::performTask): + * workers/WorkerMessagingProxy.h: + +2009-07-27 Nikolas Zimmermann + + Reviewed by George Staikos. + + [WML] History handling / page cache / loading is buggy and depends on several hacks + https://bugs.webkit.org/show_bug.cgi?id=27707 + + Redesign WML history/loading handling. In detail: + + - Remove FrameLoader::setForceReloadWmlDeck(). WML used to force a special loading behaviour + by calling this method from WMLGoElement & friends - instead teach FrameLoader to detect + WML content itself. + + WML content is usually a standalone WML document (isWMLDocument()=true) or as special case + an XHTML document which embeds a WML document (that's the way the WML layout tests work). + Force WML loading behaviour even for XHTML document which embed WML documents. This only + applies to our layout tests, not for any real world site. Though it gives us a perfect + way to test the WML loading code even when we're not operating on a standalone WML document. + + Whenever a WMLCardElement is inserted into the document it will check wheter it's inserted + in a standalone WML document or wheter the main frame document is different. If it differs + the main frame documents' "containsWMLContent" property is set to true. + + -> Make FrameLoader::shouldReload() use the new frameContainsWMLContent() method, which + checks if the associated frame document is a WML document or wheter it contains WML content. + + - Change FrameLoader::loadItem() to use the new frameContainsWMLContent() method for 'shouldScroll' + detection. WML documents (or those containing WML content) always want new loads even for in-page + navigation. No "scroll to anchor" mechanism should apply. + + - Modify FrameLoader::canCachePageContainingThisFrame() to check for !frameContainsWMLContent(). + WML pages should never be cached, potential security problem due the use of variables (per spec). + + Add two new WML tests which were broken before, testing onenterforward/onenterbackward event handling + and history navigation ( task). + + Tests: wml/enter-card-with-events.html + wml/enter-first-card-with-events.html + + * dom/Document.cpp: Initialize new 'm_containsWMLContent' property. + (WebCore::Document::Document): + * dom/Document.h: Add new helper methods and 'm_containsWMLContent" variable (explained above). + (WebCore::Document::setContainsWMLContent): + (WebCore::Document::containsWMLContent): + * history/BackForwardList.cpp: + (WebCore::BackForwardList::clearWMLPageHistory): Renamed from clearWmlPageHistory() & slight cleanup. + * history/BackForwardList.h: + * loader/FrameLoader.cpp: Rework WML loading behaviour (explained above). + (WebCore::FrameLoader::FrameLoader): + (WebCore::frameContainsWMLContent): + (WebCore::FrameLoader::canCachePageContainingThisFrame): + (WebCore::FrameLoader::shouldReload): + (WebCore::FrameLoader::loadItem): + * loader/FrameLoader.h: + * wml/WMLCardElement.cpp: + (WebCore::WMLCardElement::handleIntrinsicEventIfNeeded): No need anymore to manually track history length. + (WebCore::WMLCardElement::insertedIntoDocument): Handle setting containsWMLContent on the main frame document. + * wml/WMLGoElement.cpp: + (WebCore::WMLGoElement::executeTask): Remove call to FrameLoader::setForceReloadWmlDeck() + * wml/WMLPageState.cpp: Remove 'm_historyLength' - no need anymore to track history length on our own. + (WebCore::WMLPageState::WMLPageState): + (WebCore::WMLPageState::dump): + (WebCore::WMLPageState::reset): + * wml/WMLPageState.h: + +2009-07-27 Pavel Feldman + + Reviewed by Adam Roben. + + Fix Chromium build breakage introduced in 46388. + + https://bugs.webkit.org/show_bug.cgi?id=27705 + + * platform/graphics/chromium/FontPlatformDataChromiumWin.cpp: + (WebCore::FontPlatformData::description): + * platform/graphics/chromium/FontPlatformDataChromiumWin.h: + +2009-07-27 Tor Arne Vestbø + + Reviewed by Simon Hausmann. + + Add some more debug logging to PluginViewMac. + + * plugins/mac/PluginViewMac.cpp: + +2009-07-27 Tor Arne Vestbø + + Reviewed by Jan Michael Alonzo. + + Remove dead code from the GTK NPAPI implementation. + + * plugins/gtk/PluginViewGtk.cpp: + +2009-07-27 Csaba Osztrogonac + + Reviewed by Simon Hausmann. + + [Qt] Buildfix on Windows. + https://bugs.webkit.org/show_bug.cgi?id=27702 + + * plugins/win/PluginViewWin.cpp: + (WebCore::PluginView::hookedEndPaint): + Constraint of (*endPaint) operand modified from "g" to "m" (memory) in inline + assembly, because with "g" constraint, wrong assembly code generated. + +2009-07-27 Pavel Feldman + + Reviewed by Timothy Hatcher. + + WebCore bindings: Implement ScriptArray bindings. + + https://bugs.webkit.org/show_bug.cgi?id=27691 + + * GNUmakefile.am: + * WebCore.gypi: + * WebCore.pro: + * WebCore.vcproj/WebCore.vcproj: + * WebCore.xcodeproj/project.pbxproj: + * bindings/js/ScriptArray.cpp: Added. + (WebCore::ScriptArray::ScriptArray): + (WebCore::handleException): + (WebCore::ScriptArray::set): + (WebCore::length): + (WebCore::ScriptArray::createNew): + * bindings/js/ScriptArray.h: Added. + (WebCore::ScriptArray::ScriptArray): + (WebCore::ScriptArray::jsArray): + * bindings/v8/ScriptArray.cpp: Added. + (WebCore::ScriptArray::ScriptArray): + (WebCore::ScriptArray::set): + (WebCore::ScriptArray::length): + (WebCore::ScriptArray::createNew): + * bindings/v8/ScriptArray.h: Added. + (WebCore::ScriptArray::ScriptArray): + (WebCore::ScriptArray::~ScriptArray): + +2009-07-27 Brent Fulgham + + Build correct, no review. + + Change in r46407 broke Apple Windows build. + Switch to WinCairo-only test, to avoid any + other platform break. + + * WebCorePrefix.h: + +2009-07-26 Brent Fulgham + + Build correct, no review. + + Change in r46407 broke Apple Windows build. + + * WebCorePrefix.h: Use WTF_PLATFORM_CG to decide if + CoreServices.h should be included. + +2009-07-26 Brent Fulgham + + Build correction, no review. + + Change in r46195 broke WinCairo build. + + * WebCorePrefix.h: CoreServices should be ignored + for non-Apple build. + +2009-07-26 Pavel Feldman + + Reviewed by Timothy Hatcher. + + Web Inspector: Implement the breakpoints sidebar pane. + This change adds simple UI support into the existing + BreakpointSidebarPane. + + https://bugs.webkit.org/show_bug.cgi?id=11175 + + * inspector/front-end/Breakpoint.js: + (WebInspector.Breakpoint.prototype.set enabled): + (WebInspector.Breakpoint.prototype.get label): + (WebInspector.Breakpoint.prototype.get id): + * inspector/front-end/BreakpointsSidebarPane.js: + (WebInspector.BreakpointsSidebarPane): + (WebInspector.BreakpointsSidebarPane.prototype.addBreakpoint): + (WebInspector.BreakpointsSidebarPane.prototype._appendBreakpointElement): + (WebInspector.BreakpointsSidebarPane.prototype._appendBreakpointElement.labelClicked): + (WebInspector.BreakpointsSidebarPane.prototype.removeBreakpoint): + (WebInspector.BreakpointsSidebarPane.prototype._breakpointEnableChanged): + * inspector/front-end/ScriptsPanel.js: + (WebInspector.ScriptsPanel): + (WebInspector.ScriptsPanel.prototype.scriptOrResourceForID): + * inspector/front-end/inspector.css: + +2009-07-16 Shinichiro Hamaji + + Reviewed by Oliver Hunt. + + Canvas: rotation of 'no-repeat' pattern still has small error + https://bugs.webkit.org/show_bug.cgi?id=26749 + + Use 1<<22 as steps of no-repeat pattern to make the error less + than 0.5. The previous value may cause 1 pixel errors. + + Add another test to show this bug clearly. + Also add png expected image which was missing in the previous patch. + + Test: fast/canvas/image-pattern-rotate.html + + * platform/graphics/cg/PatternCG.cpp: + (WebCore::Pattern::createPlatformPattern): + +2009-07-25 Kwang Yul Seo + + Reviewed by Darin Adler. + + Windows build break due to warning C4819 + https://bugs.webkit.org/show_bug.cgi?id=27416 + + Disable C4819 warning to fix build. + + * WebCore.vcproj/QTMovieWin.vcproj: + * WebCore.vcproj/WebCore.vcproj: + +2009-07-25 Joseph Pecoraro + + Reviewed by Kevin McCullough. + + Inspector: Keyboard Shortcuts to Switch Panels + https://bugs.webkit.org/show_bug.cgi?id=27286 + + * inspector/front-end/inspector.js: + (WebInspector.loaded): save a list of the order of the panels + (WebInspector.documentKeyDown): handle the keyboard shortcuts to traverse the panels + +2009-07-25 Laszlo Gombos + + Reviewed by George Staikos. + + [Qt] Fix build break after r46369 + https://bugs.webkit.org/show_bug.cgi?id=27680 + + * WebCore.pro: + +2009-07-25 Nikolas Zimmermann + + Reviewed by George Staikos. + + [WML] Variable substitution is buggy + https://bugs.webkit.org/show_bug.cgi?id=27677 + + Substitute variables upon attach() time instead of insertedIntoDocument(). Otherwhise variable substitution + won't work during inter-deck jumps (same URL, different fragment). Covered by new test fast/wml/newcontext-same-deck.html. + + * dom/Text.cpp: + (WebCore::Text::attach): + * dom/Text.h: + +2009-07-25 Nikolas Zimmermann + + Reviewed by George Staikos. + + [WML] WMLDoElement doesn't update its RenderButton object upon attach() + https://bugs.webkit.org/show_bug.cgi?id=27676 + + WMLDoElement needs to implement attach() and call updateFromElement() on its associated RenderButton. + Mimics HTMLButtonElement/HTMLFormControlElement behaviour and fixes several painting/styling issues covered by existing tests in fast/wml. + + * wml/WMLDoElement.cpp: + (WebCore::WMLDoElement::attach): + * wml/WMLDoElement.h: + +2009-07-25 Pavel Feldman + + Fix Windows build breakage introduced in 46390. + + * WebCore.vcproj/WebCore.vcproj: + +2009-07-24 Joseph Pecoraro + + Reviewed by Oliver Hunt. + + Inspector: Properties Should be Sorted more Naturally + https://bugs.webkit.org/show_bug.cgi?id=27329 + + * inspector/front-end/ObjectPropertiesSection.js: + (WebInspector.ObjectPropertiesSection.prototype.update): use the displaySort when showing properties + (WebInspector.ObjectPropertiesSection.prototype._displaySort): alphaNumerical sort + (WebInspector.ObjectPropertyTreeElement.prototype.onpopulate): use the displaySort when showing properties + * inspector/front-end/utilities.js: + (Object.sortedProperties): allow for an optional sorting function in Object.sortedProperties + +2009-07-24 Pavel Feldman + + Reviewed by Timothy Hatcher. + + Web Inspector: Split InspectorController into InspectorController + and InspectorBackend. Everything frontend needs from InspectorController + will slowly migrate into the InspectorBackend. + + https://bugs.webkit.org/show_bug.cgi?id=27541 + + * DerivedSources.make: + * GNUmakefile.am: + * WebCore.gypi: + * WebCore.pro: + * WebCore.xcodeproj/project.pbxproj: + * WebCoreSources.bkl: + * bindings/js/JSInspectorBackendCustom.cpp: Added. + (WebCore::JSInspectorBackend::highlightDOMNode): + (WebCore::JSInspectorBackend::search): + (WebCore::JSInspectorBackend::databaseTableNames): + (WebCore::JSInspectorBackend::inspectedWindow): + (WebCore::JSInspectorBackend::setting): + (WebCore::JSInspectorBackend::setSetting): + (WebCore::JSInspectorBackend::wrapCallback): + (WebCore::JSInspectorBackend::currentCallFrame): + (WebCore::JSInspectorBackend::profiles): + * bindings/v8/custom/V8InspectorBackendCustom.cpp: Added. + (WebCore::CALLBACK_FUNC_DECL): + * bindings/js/JSInspectorControllerCustom.cpp: Removed. + * bindings/js/ScriptObject.cpp: + (WebCore::ScriptGlobalObject::set): + * bindings/js/ScriptObject.h: + * bindings/v8/DOMObjectsInclude.h: + * bindings/v8/DerivedSourcesAllInOne.cpp: + * bindings/v8/ScriptObject.cpp: + (WebCore::ScriptGlobalObject::set): + * bindings/v8/ScriptObject.h: + * bindings/v8/V8Index.cpp: + * bindings/v8/V8Index.h: + * bindings/v8/custom/V8CustomBinding.h: + * bindings/v8/custom/V8InspectorControllerCustom.cpp: Removed. + * inspector/InspectorController.cpp: + (WebCore::InspectorController::InspectorController): + (WebCore::InspectorController::windowScriptObjectAvailable): + * inspector/InspectorController.h: + (WebCore::InspectorController::inspectorBackend): + * inspector/InspectorBackend.cpp: Added. + * inspector/InspectorBackend.h: Added. + (WebCore::InspectorBackend::create): + (WebCore::InspectorBackend::inspectorController): + * inspector/InspectorBackend.idl: Added. + * inspector/InspectorController.idl: Removed. + * inspector/front-end/Resource.js: + * page/Page.cpp: + (WebCore::Page::Page): + * page/Page.h: + +2009-07-25 Mike Fenton + + Reviewed by George Staikos. + + Update WebCore/page/Frame.cpp/h to conform to WebKit + Style Guidelines as identified by cpplint.py. + https://bugs.webkit.org/show_bug.cgi?id=27654 + + * page/Frame.cpp: + (WebCore::Frame::Frame): + (WebCore::Frame::~Frame): + (WebCore::Frame::setDocument): + (WebCore::Frame::firstRectForRange): + (WebCore::createRegExpForLabels): + (WebCore::Frame::searchForLabelsBeforeElement): + (WebCore::Frame::matchLabelsAgainstElement): + (WebCore::Frame::selectionLayoutChanged): + (WebCore::Frame::setZoomFactor): + (WebCore::Frame::reapplyStyles): + (WebCore::Frame::isContentEditable): + (WebCore::Frame::computeAndSetTypingStyle): + (WebCore::Frame::selectionStartStylePropertyValue): + (WebCore::Frame::selectionComputedStyle): + (WebCore::Frame::applyEditingStyleToBodyElement): + (WebCore::Frame::removeEditingStyleFromBodyElement): + (WebCore::Frame::applyEditingStyleToElement): + (WebCore::Frame::selectionBounds): + (WebCore::Frame::currentForm): + (WebCore::Frame::revealSelection): + (WebCore::Frame::styleForSelectionStart): + (WebCore::Frame::setSelectionFromNone): + (WebCore::Frame::findString): + (WebCore::Frame::markAllMatchesForText): + (WebCore::Frame::setMarkedTextMatchesAreHighlighted): + (WebCore::Frame::clearFormerDOMWindow): + (WebCore::Frame::unfocusWindow): + (WebCore::Frame::respondToChangedSelection): + (WebCore::Frame::documentAtPoint): + * page/Frame.h: + (WebCore::Frame::create): + (WebCore::Frame::displayStringModifiedByEncoding): + (WebCore::Frame::pageZoomFactor): + (WebCore::Frame::textZoomFactor): + +2009-07-24 Dan Bernstein + + Reviewed by Darin Adler. + + Add functions to print the glyph page trees for debugging + https://bugs.webkit.org/show_bug.cgi?id=27671 + + * platform/graphics/FontData.h: Defined a description() method. + + * platform/graphics/GlyphPageTreeNode.cpp: + (WebCore::GlyphPageTreeNode::showSubtree): Added. Prints the node and + its descendants. + (showGlyphPageTrees): Added. Prints all glyph page trees. + (showGlyphPageTree): Added. Prints the glyph page tree for a given page. + * platform/graphics/GlyphPageTreeNode.h: + + * platform/graphics/SegmentedFontData.cpp: + (WebCore::SegmentedFontData::description): Added. + + * platform/graphics/SegmentedFontData.h: + * platform/graphics/SimpleFontData.cpp: + (WebCore::SimpleFontData::description): Added. Uses the platform data + as the description for non-svg, non-custom fonts. + * platform/graphics/SimpleFontData.h: + + * platform/graphics/gtk/FontPlatformData.h: + * platform/graphics/gtk/FontPlatformDataGtk.cpp: + (WebCore::FontPlatformData::description): Added. Returns a null string. + * platform/graphics/gtk/FontPlatformDataPango.cpp: + (WebCore::FontPlatformData::description): Added. Returns a null string. + + * platform/graphics/mac/FontPlatformData.h: + * platform/graphics/mac/FontPlatformDataMac.mm: + (WebCore::FontPlatformData::description): Added. Returns the + description of the CGFont, the size and the synthetic style flags, + if set. + + * platform/graphics/qt/FontPlatformData.h: + * platform/graphics/qt/FontPlatformDataQt.cpp: + (WebCore::FontPlatformData::description): Added. Returns a null string. + + * platform/graphics/win/FontPlatformData.h: + * platform/graphics/win/FontPlatformDataWin.cpp: + (WebCore::FontPlatformData::description): Added. Returns a null string. + + * platform/graphics/wince/FontPlatformData.cpp: + (WebCore::FontPlatformData::description): Added. Returns a null string. + * platform/graphics/wince/FontPlatformData.h: + + * platform/graphics/wx/FontPlatformData.h: + * platform/graphics/wx/FontPlatformDataWx.cpp: + (WebCore::FontPlatformData::description): Added. Returns a null string. + +2009-07-24 Mads Ager + + Reviewed by Adam Barth. + + SVG and XPath memory leaks in V8 bindings + https://bugs.webkit.org/show_bug.cgi?id=27488 + + Add proper 'create' methods to SVGPodTypeWrappers and + XPathNSResolvers in the V8 bindings to avoid memory leaks. + + Introduce convertToV8Object methods that accept PassRefPtrs and + clean up the use of get() and release() on RefPtrs. + + * bindings/scripts/CodeGeneratorV8.pm: + * bindings/v8/V8DOMWrapper.h: + (WebCore::V8DOMWrapper::convertNodeToV8Object): + (WebCore::V8DOMWrapper::convertEventToV8Object): + (WebCore::V8DOMWrapper::convertEventTargetToV8Object): + (WebCore::V8DOMWrapper::convertEventListenerToV8Object): + * bindings/v8/V8SVGPODTypeWrapper.h: + (WebCore::V8SVGPODTypeWrapperCreatorForList::create): + (WebCore::V8SVGPODTypeWrapperCreatorForList::V8SVGPODTypeWrapperCreatorForList): + (WebCore::V8SVGStaticPODTypeWrapper::create): + (WebCore::V8SVGStaticPODTypeWrapper::V8SVGStaticPODTypeWrapper): + (WebCore::V8SVGStaticPODTypeWrapperWithPODTypeParent::create): + (WebCore::V8SVGStaticPODTypeWrapperWithPODTypeParent::V8SVGStaticPODTypeWrapperWithPODTypeParent): + (WebCore::V8SVGStaticPODTypeWrapperWithParent::create): + (WebCore::V8SVGStaticPODTypeWrapperWithParent::V8SVGStaticPODTypeWrapperWithParent): + (WebCore::V8SVGDynamicPODTypeWrapper::create): + (WebCore::V8SVGDynamicPODTypeWrapper::V8SVGDynamicPODTypeWrapper): + (WebCore::V8SVGDynamicPODTypeWrapperCache::lookupOrCreateWrapper): + * bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8ClientRectListCustom.cpp: + (WebCore::INDEXED_PROPERTY_GETTER): + * bindings/v8/custom/V8CustomXPathNSResolver.cpp: + (WebCore::V8CustomXPathNSResolver::create): + * bindings/v8/custom/V8CustomXPathNSResolver.h: + * bindings/v8/custom/V8DOMWindowCustom.cpp: + (WebCore::NAMED_PROPERTY_GETTER): + * bindings/v8/custom/V8DocumentCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8ElementCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8HTMLCollectionCustom.cpp: + (WebCore::getNamedItems): + (WebCore::getItem): + * bindings/v8/custom/V8HTMLDocumentCustom.cpp: + (WebCore::NAMED_PROPERTY_GETTER): + (WebCore::ACCESSOR_GETTER): + * bindings/v8/custom/V8HTMLFormElementCustom.cpp: + (WebCore::INDEXED_PROPERTY_GETTER): + (WebCore::NAMED_PROPERTY_GETTER): + * bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp: + (WebCore::INDEXED_PROPERTY_GETTER): + * bindings/v8/custom/V8HTMLSelectElementCollectionCustom.cpp: + (WebCore::NAMED_PROPERTY_GETTER): + * bindings/v8/custom/V8InspectorControllerCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8NamedNodeMapCustom.cpp: + (WebCore::INDEXED_PROPERTY_GETTER): + (WebCore::NAMED_PROPERTY_GETTER): + * bindings/v8/custom/V8NodeIteratorCustom.cpp: + (WebCore::toV8): + * bindings/v8/custom/V8NodeListCustom.cpp: + (WebCore::NAMED_PROPERTY_GETTER): + * bindings/v8/custom/V8SVGMatrixCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8TreeWalkerCustom.cpp: + (WebCore::toV8): + * bindings/v8/custom/V8XSLTProcessorCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + +2009-07-24 Brian Weinstein + + Reviewed by Jon Honeycutt. + + Fix of Middle-click panning should be springloaded while dragging + https://bugs.webkit.org/show_bug.cgi?id=21794 + + Create two new booleans to determine whether we have done a springloaded pan scroll, and update + the name of setPanScrollCursor to updatePanScrollState to more accurately describe what the function + does. + + * page/EventHandler.cpp: + (WebCore::EventHandler::EventHandler): Initialized two new booleans. + (WebCore::EventHandler::autoscrollTimerFired): + (WebCore::EventHandler::updatePanScrollState): Renamed from setPanScrollCursor. + (WebCore::EventHandler::stopAutoscrollTimer): Clear the pan scrolling in progress flag. + (WebCore::EventHandler::handleMouseReleaseEvent): Clear the pan scrolling button pressed flag. + * page/EventHandler.h: + +2009-07-24 Yong Li + + Reviewed by George Staikos. + + https://bugs.webkit.org/show_bug.cgi?id=27657 + Add more wince port files to WebCore + + Written by Yong Li and Lyon Chen + + * loader/icon/wince/IconDatabaseWince.cpp: Added. + * rendering/RenderThemeWince.cpp: Added. + * rendering/RenderThemeWince.h: Added. + * storage/wince/DatabaseThreadWince.cpp: Added. + * storage/wince/DatabaseThreadWince.h: Added. + * storage/wince/LocalStorageThreadWince.cpp: Added. + * storage/wince/LocalStorageThreadWince.h: Added. + * svg/graphics/wince/SVGResourceFilterWince.cpp: Added. + +2009-07-24 Ryosuke Niwa + + Reviewed by Justin Garcia. + + execCommand('underline') can modify DOM outside of the contentEditable area + https://bugs.webkit.org/show_bug.cgi?id=24333 + + highestAncestorWithTextDecoration stops at the closest unsplittable element so that if text-decoration is applied + outside of it, we don't accidently modify the style attribute. + + Tests: editing/style/textdecoration-outside-of-rooteditable.html + editing/style/textdecoration-outside-of-unsplittable-element.html + + * editing/ApplyStyleCommand.cpp: + (WebCore::StyleChange::init): + (WebCore::highestAncestorWithTextDecoration): + +2009-07-24 Daniel Bates + + Reviewed by Adam Barth. + + https://bugs.webkit.org/show_bug.cgi?id=27639 + + Fixes false positives when evaluating certain strings that only contain + non-canonical characters. + + Test: http/tests/security/xssAuditor/script-tag-safe.html + + * page/XSSAuditor.cpp: + (WebCore::isNonCanonicalCharacter): + (WebCore::XSSAuditor::findInRequest): + +2009-07-24 Drew Wilson + + Reviewed by David Levin. + + Changed WorkerContext destructor to not access possibly-freed WorkerThread. + + Failed assertion in WorkerContext::~WorkerContext(). + https://bugs.webkit.org/show_bug.cgi?id=27665 + + * workers/DedicatedWorkerContext.cpp: + (WebCore::DedicatedWorkerContext::~DedicatedWorkerContext): + * workers/WorkerContext.cpp: + (WebCore::WorkerContext::~WorkerContext): + Removed assertion that relies on WorkerThread still being alive (moved to DedicatedWorkerContext destructor). + +2009-07-24 Drew Wilson + + Reviewed by Adam Barth. + + Updated code generator to properly generate bindings for WorkerContext exposed functions. + + Storing a reference to WorkerContext.postMessage() and calling it later yields a TypeError + https://bugs.webkit.org/show_bug.cgi?id=27419 + + Test: fast/workers/worker-call.html + + * bindings/js/JSWorkerContextBase.cpp: + (WebCore::toJSDedicatedWorkerContext): + (WebCore::toJSWorkerContext): + Functions that convert from JSValue to the appropriate WorkerContext/DedicatedWorkerContext object. + * bindings/js/JSWorkerContextBase.h: + Added toJS*WorkerContext APIs. + * bindings/scripts/CodeGeneratorJS.pm: + Added code to appropriately check the passed-in this object when invoking functions at global scope. + +2009-07-24 Drew Wilson + + Reviewed by Adam Barth. + + Refactor WorkerContext to move DedicatedWorker-specific APIs into DedicatedWorkerContext + https://bugs.webkit.org/show_bug.cgi?id=27420 + + No new tests as the existing tests already provide sufficient coverage (this is just a refactoring with no new functionality). + + * DerivedSources.cpp: + Added JSDerivedWorkerContext.cpp + * DerivedSources.make: + Added DerivedWorkerContext files + * GNUmakefile.am: + Added DerivedWorkerContext files + * WebCore.gypi: + Added DerivedWorkerContext files + * WebCore.pro: + Added DerivedWorkerContext files + * WebCore.vcproj/WebCore.vcproj: + Added DerivedWorkerContext files + * WebCore.xcodeproj/project.pbxproj: + Added DerivedWorkerContext files + * bindings/js/JSDedicatedWorkerContextCustom.cpp: Added. + (WebCore::JSDedicatedWorkerContext::mark): + Custom mark function for onmessage event handler. + * bindings/js/JSEventTarget.cpp: + (WebCore::toJS): + Supports conversion to JSDedicatedWorkerContext. + (WebCore::toEventTarget): + * bindings/js/JSWorkerContextCustom.cpp: + (WebCore::JSWorkerContext::mark): + Moved onmessage mark handling into DedicatedWorkerContext. + * bindings/js/WorkerScriptController.cpp: + Added appropriate casts to DedicatedWorkerContext for postMessage(). + (WebCore::WorkerScriptController::initScript): + Manually sets up the prototype chain for the worker context. + * bindings/scripts/CodeGeneratorJS.pm: + Changed special case code for WorkerContext to be triggered by new IsWorkerContext attribute. + * bindings/scripts/CodeGeneratorV8.pm: + Changed hard-coded tests for WorkerContext to support DedicatedWorkerContext. + * bindings/v8/DOMObjectsInclude.h: + Added DedicatedWorkerContext.h + * bindings/v8/DerivedSourcesAllInOne.cpp: + Added V8DedicatedWorkerContext.cpp + * bindings/v8/V8DOMWrapper.cpp: + (WebCore::V8DOMWrapper::getTemplate): + Added code to reserve extra fields for V8DedicatedWorkerContext. + * bindings/v8/V8Index.cpp: + Now includes V8DedicatedWorkerContext.h in addition to V8WorkerContext.h + * bindings/v8/V8Index.h: + Added DedicatedWorkerContext as a non-node wrapper type. + Removed WORKERCONTEXT as a valid template type. + * bindings/v8/WorkerContextExecutionProxy.cpp: + (WebCore::WorkerContextExecutionProxy::initContextIfNeeded): + Creates DedicatedWorkerContext instead of WorkerContext. + (WebCore::WorkerContextExecutionProxy::EventTargetToV8Object): + Returns DedicatedWorkerContext instead of WorkerContext. + (WebCore::WorkerContextExecutionProxy::retrieve): + Refactored to deal with DedicatedWorkerContext. + * bindings/v8/custom/V8AbstractWorkerCustom.cpp: + * bindings/v8/custom/V8CustomBinding.h: + * bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp: Added. + Moved onmessage code from V8WorkerContextCustom.cpp + (WebCore::ACCESSOR_GETTER): + (WebCore::ACCESSOR_SETTER): + * bindings/v8/custom/V8WorkerContextCustom.cpp: + Moved onmessage code to V8DedicatedWorkerContextCustom.cpp + * dom/EventTarget.cpp: + (WebCore::EventTarget::toDedicatedWorkerContext): + * dom/EventTarget.h: + * workers/DedicatedWorkerContext.cpp: Added. + Moved DedicatedWorker-only APIs from WorkerContext. + (WebCore::DedicatedWorkerContext::DedicatedWorkerContext): + (WebCore::DedicatedWorkerContext::~DedicatedWorkerContext): + (WebCore::DedicatedWorkerContext::reportException): + (WebCore::DedicatedWorkerContext::postMessage): + (WebCore::DedicatedWorkerContext::dispatchMessage): + * workers/DedicatedWorkerContext.h: Added. + Moved DedicatedWorker-only APIs from WorkerContext. + (WebCore::DedicatedWorkerContext::create): + (WebCore::DedicatedWorkerContext::toDedicatedWorkerContext): + (WebCore::DedicatedWorkerContext::setOnmessage): + (WebCore::DedicatedWorkerContext::onmessage): + * workers/DedicatedWorkerContext.idl: Added. + * workers/WorkerContext.cpp: + (WebCore::WorkerContext::~WorkerContext): + Moved code that notifies parent that worker is closing down into DedicatedWorkerContext. + * workers/WorkerContext.h: + (WebCore::WorkerContext::isClosing): + Exposed closing flag as an API so derived classes can access it. + * workers/WorkerContext.idl: + * workers/WorkerMessagingProxy.cpp: + (WebCore::MessageWorkerContextTask::performTask): + Calls into DedicatedWorkerContext to handle message. + * workers/WorkerThread.cpp: + (WebCore::WorkerThread::workerThread): + Creates a DedicatedWorkerContext when the thread starts up. + +2009-07-24 Eric Seidel + + Reviewed by Adam Barth. + + Move more callers to using 3 argument toJS + https://bugs.webkit.org/show_bug.cgi?id=27661 + + No functional changes, thus no tests. + These are all the places where we can't yet pass the + correct globalObject because we don't have or don't know the right one. + + * bindings/js/JSCustomPositionCallback.cpp: + (WebCore::JSCustomPositionCallback::handleEvent): + * bindings/js/JSCustomPositionErrorCallback.cpp: + (WebCore::JSCustomPositionErrorCallback::handleEvent): + * bindings/js/JSCustomSQLStatementCallback.cpp: + (WebCore::JSCustomSQLStatementCallback::handleEvent): + * bindings/js/JSCustomSQLStatementErrorCallback.cpp: + (WebCore::JSCustomSQLStatementErrorCallback::handleEvent): + * bindings/js/JSCustomSQLTransactionCallback.cpp: + (WebCore::JSCustomSQLTransactionCallback::handleEvent): + * bindings/js/JSCustomSQLTransactionErrorCallback.cpp: + (WebCore::JSCustomSQLTransactionErrorCallback::handleEvent): + * bindings/js/JSNodeFilterCondition.cpp: + (WebCore::JSNodeFilterCondition::acceptNode): + +2009-07-24 Eric Seidel + + Reviewed by Adam Barth. + + Fix the last of the x-frame constructor calls to have the right prototype chains + https://bugs.webkit.org/show_bug.cgi?id=27645 + + Fix the last few constructors to use their stored globalObject pointer when + constructing objects instead of the lexicalGlobalObject(). + + * bindings/js/JSAudioConstructor.cpp: + (WebCore::constructAudio): + * bindings/js/JSImageConstructor.cpp: + (WebCore::constructImage): + * bindings/js/JSMessageChannelConstructor.cpp: + (WebCore::JSMessageChannelConstructor::construct): + * bindings/js/JSOptionConstructor.cpp: + (WebCore::constructHTMLOptionElement): + * bindings/js/JSWebKitPointConstructor.cpp: + (WebCore::constructWebKitPoint): + * bindings/js/JSWorkerConstructor.cpp: + (WebCore::constructWorker): + +2009-07-24 Jian Li + + Reviewed by Adam Barth. + + [V8] Cleanup exception handling in worker evaluation code. + https://bugs.webkit.org/show_bug.cgi?id=27282 + + * bindings/v8/WorkerContextExecutionProxy.cpp: + (WebCore::WorkerContextExecutionProxy::evaluate): + * bindings/v8/WorkerContextExecutionProxy.h: + (WebCore::WorkerContextExecutionState::WorkerContextExecutionState): + * bindings/v8/WorkerScriptController.cpp: + (WebCore::WorkerScriptController::evaluate): + (WebCore::WorkerScriptController::setException): + +2009-07-24 Stephen White + + Reviewed by David Levin. + + Reverting r46157, since it may be causing problems with Chromium + reliability (see http://crbug.com/17569). + + https://bugs.webkit.org/show_bug.cgi?id=27388 + + * platform/graphics/skia/GraphicsContextSkia.cpp: + (WebCore::GraphicsContext::drawLine): + * platform/graphics/skia/PlatformContextSkia.cpp: + (PlatformContextSkia::setupPaintForStroking): + +2009-07-24 Joseph Pecoraro + + Reviewed by Timothy Hatcher. + + REGRESSION: inspector seems broken in ToT WebKit + https://bugs.webkit.org/show_bug.cgi?id=27646 + + * inspector/front-end/Console.js: + (WebInspector.Console.prototype._ensureCommandLineAPIInstalled): + +2009-07-24 Dan Bernstein + + Reviewed by Anders Carlsson. + + Add the shadow style member to the ShadowData constructor and == + operator + + * rendering/style/ShadowData.cpp: + (WebCore::ShadowData::ShadowData): + (WebCore::ShadowData::operator==): + +2009-07-24 Jian Li + + Reviewed by Eric Seidel. + + [V8] More V8 bindings changes to use ErrorEvent. + https://bugs.webkit.org/show_bug.cgi?id=27630 + + * bindings/v8/DOMObjectsInclude.h: + * bindings/v8/DerivedSourcesAllInOne.cpp: + * bindings/v8/V8DOMWrapper.cpp: + (WebCore::V8DOMWrapper::convertEventToV8Object): + * bindings/v8/V8Index.cpp: + * bindings/v8/V8Index.h: + +2009-07-24 Brent Fulgham + + Reviewed by Dave Hyatt. + + Clean up dependencies on Apple support libraries for non-Apple build. + http://bugs.webkit.org/show_bug.cgi?id=27532. + + * platform/graphics/win/SimpleFontDataWin.cpp: Conditionalize references + to ApplicationServices.h and WebKitSystemInterface.h + +2009-07-24 Dan Bernstein + + Another attempted build fix + + * bindings/js/JSAbstractWorkerCustom.cpp: + +2009-07-24 Dan Bernstein + + Attempted build fix + + * bindings/js/JSAbstractWorkerCustom.cpp: + (WebCore::toJS): + +2009-07-24 Kenneth Rohde Christiansen + + Build fix for 64 bit Linux. + + int64_t is long on Linux 64 bit and not long long, thus + getFileSize with a int64_t out value fails to build. + + Use a temporary to work around the problem. + + * loader/appcache/ApplicationCacheStorage.cpp: + (WebCore::ApplicationCacheStorage::spaceNeeded): + +2009-07-24 Eric Seidel + + Reviewed by Adam Barth. + + Update all CREATE_DOM_*_WRAPPER callers to pass globalObject + https://bugs.webkit.org/show_bug.cgi?id=27644 + + This is another attempt at making the change for bug 27634 smaller. + I included the changes to make_names.pl as well as any file which + used CREATE_DOM_*_WRAPPER macros. + + The changes to the construct* functions are what fix the cases in + fast/dom/constructed-objects-prototypes.html + + The changes to passing globalObject through CREATE_* are what fix + fast/dom/prototype-inheritance-2.html + + * bindings/js/JSCDATASectionCustom.cpp: + (WebCore::toJSNewlyCreated): pass globalObject. + * bindings/js/JSCSSRuleCustom.cpp: + (WebCore::toJS): pass globalObject. + * bindings/js/JSCSSValueCustom.cpp: + (WebCore::toJS): pass globalObject. + * bindings/js/JSDOMBinding.h: updated macros to pass globalObject. + * bindings/js/JSDocumentCustom.cpp: + (WebCore::toJS): pass globalObject. + * bindings/js/JSElementCustom.cpp: + (WebCore::JSElement::setAttributeNode): use globalObject() for wrapping return value. + (WebCore::JSElement::setAttributeNodeNS): use globalObject() for wrapping return value. + (WebCore::toJSNewlyCreated): pass globalObject. + * bindings/js/JSEventCustom.cpp: + (WebCore::JSEvent::clipboardData): pass globalObject. + (WebCore::toJS): pass globalObject. + * bindings/js/JSHTMLCollectionCustom.cpp: + (WebCore::getNamedItems): use globalObject() for wrapping returned collection items. + (WebCore::callHTMLCollection): use globalObject() for wrapping returned collection items. + (WebCore::JSHTMLCollection::item): use globalObject() for wrapping returned collection items. + (WebCore::toJS): pass globalObject. + * bindings/js/JSImageDataCustom.cpp: + (WebCore::toJS): pass globalObject. + * bindings/js/JSNodeCustom.cpp: + (WebCore::createWrapper): pass globalObject. + * bindings/js/JSSVGPathSegCustom.cpp: + (WebCore::toJS): pass globalObject. + * bindings/js/JSStyleSheetCustom.cpp: + (WebCore::toJS): pass globalObject. + * bindings/js/JSTextCustom.cpp: + (WebCore::toJSNewlyCreated): pass globalObject. + * bindings/js/JSWebKitCSSMatrixConstructor.cpp: + (WebCore::constructWebKitCSSMatrix): use constructors globalObject when constructing + * bindings/js/JSXMLHttpRequestConstructor.cpp: + (WebCore::constructXMLHttpRequest): use constructors globalObject when constructing + * bindings/js/JSXSLTProcessorConstructor.cpp: + (WebCore::constructXSLTProcessor): use constructors globalObject when constructing + * dom/make_names.pl: + Pass globalObject through CREATE_* macros and various support functions. + +2009-07-24 Eric Seidel + + Reviewed by Adam Barth. + + Update CodeGeneratorJS.pm to support passing JSDOMGlobalObject* to toJS calls + https://bugs.webkit.org/show_bug.cgi?id=27643 + + This is an attempt to make this change as small as possible. + I started by including all changes to CodeGeneratorJS.pm from bug 27634, + and then made the minimal amount of other changes needed to support that change. + + Most toJS implementations ignore their passed JSDOMGlobalObject. + There are stub 2-argument toJS, toJSNewlyCreated implementations to help compiling. + All places where it is not clear what we should pass as the global object + (or where the global object is simply not available, like for some SVG bindings) + we pass deprecatedGlobalObjectForPrototype instead. + + * bindings/js/JSCDATASectionCustom.cpp: + (WebCore::toJSNewlyCreated): add ignored JSDOMGlobalObject* + * bindings/js/JSCSSRuleCustom.cpp: + (WebCore::toJS): add ignored JSDOMGlobalObject* + * bindings/js/JSCSSValueCustom.cpp: + (WebCore::toJS): add ignored JSDOMGlobalObject* + * bindings/js/JSDOMBinding.cpp: + (WebCore::setDOMException): pass the wrong globalObject for now + * bindings/js/JSDOMBinding.h: + Pass the wrong global object to the CREATE_ macros for now. + In the next change we'll come back and pass the correct one. + That will require changes to make_names.pl. + (WebCore::DOMObjectWithGlobalPointer::scriptExecutionContext): + (WebCore::DOMObjectWithGlobalPointer::DOMObjectWithGlobalPointer): + (WebCore::DOMObjectWithGlobalPointer::~DOMObjectWithGlobalPointer): + (WebCore::createDOMObjectWrapper): + (WebCore::getDOMObjectWrapper): + (WebCore::createDOMNodeWrapper): + (WebCore::getDOMNodeWrapper): + (WebCore::toJS): added to convert 2 arg calls to 3 arg calls to limit the scope of this change. + (WebCore::toJSNewlyCreated): + * bindings/js/JSDOMWindowBase.cpp: + (WebCore::toJS): DOMWindow always uses its own prototype chain. + * bindings/js/JSDOMWindowBase.h: + * bindings/js/JSDocumentCustom.cpp: + (WebCore::toJS): add ignored JSDOMGlobalObject* + * bindings/js/JSElementCustom.cpp: + (WebCore::toJSNewlyCreated): add ignored JSDOMGlobalObject* + * bindings/js/JSEventCustom.cpp: + (WebCore::toJS): add ignored JSDOMGlobalObject* + * bindings/js/JSEventTarget.cpp: + (WebCore::toJS): add ignored JSDOMGlobalObject* + * bindings/js/JSEventTarget.h: + * bindings/js/JSHTMLCollectionCustom.cpp: + (WebCore::toJS): add ignored JSDOMGlobalObject* + * bindings/js/JSImageDataCustom.cpp: + (WebCore::toJS): add ignored JSDOMGlobalObject* + * bindings/js/JSNodeCustom.cpp: + (WebCore::createWrapper): pass globalObject to toJS(Document*) to avoid recursion + (WebCore::toJSNewlyCreated): add ignored JSDOMGlobalObject* + (WebCore::toJS): add ignored JSDOMGlobalObject* + * bindings/js/JSSVGElementInstanceCustom.cpp: + (WebCore::toJS): pass globalObject along + * bindings/js/JSSVGMatrixCustom.cpp: + (WebCore::JSSVGMatrix::inverse): pass wrong globalObject for now. + (WebCore::JSSVGMatrix::rotateFromVector): pass wrong globalObject for now. + * bindings/js/JSSVGPathSegCustom.cpp: + (WebCore::toJS): + * bindings/js/JSSVGPathSegListCustom.cpp: + All of these methods need a globalObject, but most SVG binding don't have + space for one, so we just pass the lexicalGlobalObject for now. + (WebCore::JSSVGPathSegList::initialize): + (WebCore::JSSVGPathSegList::getItem): + (WebCore::JSSVGPathSegList::insertItemBefore): + (WebCore::JSSVGPathSegList::replaceItem): + (WebCore::JSSVGPathSegList::removeItem): + (WebCore::JSSVGPathSegList::appendItem): + * bindings/js/JSSVGPointListCustom.cpp: + (WebCore::finishGetter): pass wrong globalObject for now. + (WebCore::finishSetter): + (WebCore::finishSetterReadOnlyResult): + * bindings/js/JSSVGTransformListCustom.cpp: + (WebCore::finishGetter): pass wrong globalObject for now. + (WebCore::finishSetter): + (WebCore::finishSetterReadOnlyResult): + * bindings/js/JSStyleSheetCustom.cpp: + (WebCore::toJS): add ignored JSDOMGlobalObject* + * bindings/js/JSTextCustom.cpp: + (WebCore::toJSNewlyCreated): add ignored JSDOMGlobalObject* + * bindings/js/JSWorkerContextBase.cpp: + (WebCore::toJS): WorkerContext always uses its own prototype chain since it's a GlobalObject subclass. + * bindings/js/JSWorkerContextBase.h: + * bindings/scripts/CodeGeneratorJS.pm: + All generated toJS calls now pass a globalObject. + All generated toJS implementations now expect a globalObject. + Simplified all the slot casts by using a "castedThis" local. + SVG bindings which don't have a globalObject() accessor pass the deprecated lexicalGlobalObject instead. + Simplified printing of constructor objects using a $constructorClassName variable. + All generated constructor functions follow the construct$className form to match the custom constructors. + +2009-07-24 Joseph Pecoraro + + Reviewed by Timothy Hatcher. + + typing "document.__proto__" in inspector throws exception + https://bugs.webkit.org/show_bug.cgi?id=27169 + + * inspector/front-end/utilities.js: + (Object.type): + +2009-07-24 Andrei Popescu + + Reviewed by Anders Carlsson. + + ApplicationCache should have size limit + https://bugs.webkit.org/show_bug.cgi?id=22700 + + https://lists.webkit.org/pipermail/webkit-dev/2009-May/007560.html + + This change implements a mechanism for limiting the maximum size of + the application cache file. When this size is reached, a ChromeClient + callback is invoked asynchronously and the saving of the last (failed) + cache is retried automatically. + + This change also extends the ApplicationCacheStorage API by allowing + a client to query or modify the application cache without having to + load any resources into memory. + + Test: http/tests/appcache/max-size.html + + * WebCore.base.exp: + Exports the symbols required by the DumpRenderTree test application. + * loader/EmptyClients.h: + Adds empty implementation of the new ChromeClient methods. + * loader/appcache/ApplicationCache.cpp: + * loader/appcache/ApplicationCache.h: + Adds the ability to calculate the approximate size of an ApplicationCache object. + * loader/appcache/ApplicationCacheGroup.cpp: + * loader/appcache/ApplicationCacheGroup.h: + Invokes the ChromeClient callback when the storage layer runs out of space. + After the callback is invoked, we re-attempt to store the newest cache, + in case the ChromeClient has freed some space. + * loader/appcache/ApplicationCacheResource.cpp: + * loader/appcache/ApplicationCacheResource.h: + Adds the ability to calculate the approximate size of an ApplicationCacheResource object. + * loader/appcache/ApplicationCacheStorage.cpp: + * loader/appcache/ApplicationCacheStorage.h: + Enforces a maximum size for the application cache file. + * page/ChromeClient.h: + Adds a new callback, invoked when the ApplicationCacheStorage reports that it has + reached the maximum size for its database file. + * platform/sql/SQLiteDatabase.cpp: + * platform/sql/SQLiteDatabase.h: + Adds a new method that allows querying for the amount of unused space inside the + application cache database file. + +2009-07-24 Xan Lopez + + Reviewed by Jan Alonzo. + + https://bugs.webkit.org/show_bug.cgi?id=25415 + [GTK][ATK] Please implement support for get_text_at_offset + + Use TextEncoding facilities to convert between UTF16 and UTF8 + instead of rolling our own solution. + + * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: + (convertUniCharToUTF8): + +2009-07-24 Xan Lopez + + Reviewed by Jan Alonzo. + + https://bugs.webkit.org/show_bug.cgi?id=25415 + [GTK][ATK] Please implement support for get_text_at_offset + + Fix confusion in g_substr between length in bytes and length in + characters. Was causing crashes in some situations when dealing + with non-ASCII text encoded as UTF8. + + * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: + (g_substr): + +2009-07-24 Joseph Pecoraro + + Reviewed by Timothy Hatcher. + + Inspector: Impossible to add an attribute to a node without attributes + https://bugs.webkit.org/show_bug.cgi?id=21108 + + * inspector/front-end/ElementsTreeOutline.js: + (WebInspector.ElementsTreeElement): + (WebInspector.ElementsTreeElement.prototype.set hovered): + (WebInspector.ElementsTreeElement.prototype.toggleNewButton): + (WebInspector.ElementsTreeElement.prototype.ondblclick): + (WebInspector.ElementsTreeElement.prototype._startEditing): + (WebInspector.ElementsTreeElement.prototype._addNewAttribute): + (WebInspector.ElementsTreeElement.prototype._attributeEditingCommitted): + * inspector/front-end/inspector.css: + +2009-07-24 Keishi Hattori + + Reviewed by Timothy Hatcher. + + Web Inspector: Adds support for Firebug's magic $0 variable to access inspected node + https://bugs.webkit.org/show_bug.cgi?id=17907 + + * inspector/front-end/Console.js: + (WebInspector.Console.prototype._ensureCommandLineAPIInstalled): Added _inspectorCommandLineAPI.{ + _inspectedNodes, _addInspectedNode, $0, $1, $n} + * inspector/front-end/ElementsPanel.js: + (WebInspector.ElementsPanel.this.treeOutline.focusedNodeChanged): Stores the inspected node history + in _inspectorCommandLineAPI._inspectedNodes + (WebInspector.ElementsPanel): + +2009-07-24 Joseph Pecoraro + + Reviewed by Timothy Hatcher. + + Dragging a resource in the sidebar should drag it's URL + https://bugs.webkit.org/show_bug.cgi?id=14410 + + * inspector/front-end/ResourcesPanel.js: + (WebInspector.ResourceSidebarTreeElement.prototype.onattach): + +2009-07-24 Joseph Pecoraro + + Reviewed by Timothy Hatcher. + + Double click on a resource in the sidebar should open that resource in Safari + https://bugs.webkit.org/show_bug.cgi?id=14409 + + * inspector/front-end/ResourcesPanel.js: + (WebInspector.ResourceSidebarTreeElement.prototype.ondblclick): open a resource url + +2009-07-24 Jan Michael Alonzo + + Reviewed by Xan Lopez. + + Bump pango version requirement to 1.12 and remove unnecessary #ifdefs. + + * platform/graphics/gtk/FontGtk.cpp: + (WebCore::getDefaultPangoLayout): + * platform/graphics/gtk/FontPlatformDataPango.cpp: + (WebCore::FontPlatformData::FontPlatformData): + * platform/gtk/Language.cpp: + +2009-07-24 Joseph Pecoraro + + Reviewed by Timothy Hatcher. + + Inspector: Missing UIString and other localizedString.js fixes + https://bugs.webkit.org/show_bug.cgi?id=27288 + + * English.lproj/localizedStrings.js: + +2009-07-24 Joseph Pecoraro + + Reviewed by Timothy Hatcher. + + Inspector: Should Syntax Highlight JSON + https://bugs.webkit.org/show_bug.cgi?id=27503 + + * inspector/front-end/SourceView.js: + (WebInspector.SourceView.prototype._contentLoaded): + +2009-07-24 Mike Fenton + + Reviewed by Eric Seidel. + + Update WebCore/page/DOMTimer.cpp/h to conform to WebKit + Style Guidelines as identified by cpplint.py. + https://bugs.webkit.org/show_bug.cgi?id=27624 + + * page/DragController.cpp: + (WebCore::DragController::~DragController): + (WebCore::documentFragmentFromDragData): + (WebCore::DragController::dragEnded): + (WebCore::DragController::dragEntered): + (WebCore::DragController::dragExited): + (WebCore::DragController::dragUpdated): + (WebCore::DragController::performDrag): + (WebCore::asFileInput): + (WebCore::DragController::tryDocumentDrag): + (WebCore::DragController::delegateDragSourceAction): + (WebCore::DragController::concludeEditDrag): + (WebCore::DragController::canProcessDrag): + (WebCore::DragController::tryDHTMLDrag): + (WebCore::DragController::mayStartDragAtEventLocation): + (WebCore::getCachedImage): + (WebCore::getImage): + (WebCore::prepareClipboardForImageDrag): + (WebCore::dragLocForDHTMLDrag): + (WebCore::DragController::startDrag): + (WebCore::DragController::doImageDrag): + (WebCore::DragController::doSystemDrag): + (WebCore::DragController::placeDragCaret): + +2009-07-24 Mike Fenton + + Reviewed by Eric Seidel. + + Update WebCore/page/Chrome.cpp to conform to WebKit + Style Guidelines as identified by cpplint.py. + https://bugs.webkit.org/show_bug.cgi?id=27608 + + * page/Chrome.cpp: + (WebCore::Chrome::runBeforeUnloadConfirmPanel): + (WebCore::Chrome::runJavaScriptAlert): + (WebCore::Chrome::runJavaScriptConfirm): + (WebCore::Chrome::runJavaScriptPrompt): + (WebCore::Chrome::shouldInterruptJavaScript): + (WebCore::Chrome::setToolTip): + (WebCore::Chrome::requestGeolocationPermissionForFrame): + (WebCore::ChromeClient::generateReplacementFile): + (WebCore::ChromeClient::paintCustomScrollbar): + +2009-07-24 Mike Fenton + + Reviewed by Eric Seidel. + + Update WebCore/page/Coordinates.cpp to conform to WebKit + Style Guidelines as identified by cpplint.py. + https://bugs.webkit.org/show_bug.cgi?id=27614 + + * page/Coordinates.cpp: + (WebCore::Coordinates::toString): + +2009-07-24 Mike Fenton + + Reviewed by Eric Seidel. + + Update WebCore/page/DOMSelection.cpp/h to conform to WebKit + Style Guidelines as identified by cpplint.py. + https://bugs.webkit.org/show_bug.cgi?id=27614 + + * page/DOMSelection.cpp: + (WebCore::DOMSelection::setBaseAndExtent): + (WebCore::DOMSelection::modify): + (WebCore::DOMSelection::addRange): + (WebCore::DOMSelection::deleteFromDocument): + * page/DOMSelection.h: + +2009-07-24 Mike Fenton + + Reviewed by Eric Seidel. + + Update WebCore/page/DOMTimer.cpp/h to conform to WebKit + Style Guidelines as identified by cpplint.py. + https://bugs.webkit.org/show_bug.cgi?id=27618 + + * page/DOMTimer.cpp: + (WebCore::DOMTimer::DOMTimer): + (WebCore::DOMTimer::~DOMTimer): + (WebCore::DOMTimer::fired): + (WebCore::DOMTimer::suspend): + (WebCore::DOMTimer::resume): + (WebCore::DOMTimer::canSuspend): + * page/DOMTimer.h: + (WebCore::DOMTimer::minTimerInterval): + (WebCore::DOMTimer::setMinTimerInterval): + +2009-07-24 Eric Seidel + + Reviewed by Adam Barth. + + Classes call DOMObject::mark() explicitly, should call DOMObjectWithGlobal::mark() instead + https://bugs.webkit.org/show_bug.cgi?id=27641 + + Nothing uses globalObject() yet, but this was causing crashes + in the patch for bug 27634. This is covered by fast/dom/gc-6.html. + + I decided to change these to Base:: instead of DOMObjectWithGlobal:: + for future-proofing. All autogenerated classes use a typedef Base + to avoid bugs like these. Sadly C++ does not have a built-in super:: we could use. + + * WebCore.xcodeproj/project.pbxproj: + * bindings/js/JSAbstractWorkerCustom.cpp: + (WebCore::JSAbstractWorker::mark): + * bindings/js/JSDOMApplicationCacheCustom.cpp: + (WebCore::JSDOMApplicationCache::mark): + * bindings/js/JSMessageChannelCustom.cpp: + (WebCore::JSMessageChannel::mark): + * bindings/js/JSMessagePortCustom.cpp: + (WebCore::JSMessagePort::mark): + * bindings/js/JSNamedNodesCollection.cpp: + (WebCore::JSNamedNodesCollection::getOwnPropertySlot): + * bindings/js/JSNodeCustom.cpp: + (WebCore::JSNode::mark): + * bindings/js/JSNodeFilterCustom.cpp: + (WebCore::JSNodeFilter::mark): + * bindings/js/JSNodeIteratorCustom.cpp: + (WebCore::JSNodeIterator::mark): + * bindings/js/JSSVGElementInstanceCustom.cpp: + (WebCore::JSSVGElementInstance::mark): + * bindings/js/JSTreeWalkerCustom.cpp: + (WebCore::JSTreeWalker::mark): + +2009-07-22 Eric Seidel + + Reviewed by Adam Barth. + + Make most DOMObjects hold onto a JSDOMGlobalObject* + https://bugs.webkit.org/show_bug.cgi?id=27588 + + This change is almost entirely plumbing. Only one functional + change as part of this all (window.document.constructor has the correct prototype) + Changes are detailed below. + + inner.document.constructor is fixed because all properties on the window + object are created with the correct globalObject (instead of the lexical one). + Since all objects now carry a globalObject pointer, when document creates + HTMLDocumentConstructor it now has the right globalObject to use. + + Tests: + fast/dom/prototype-inheritance.html + fast/dom/prototype-inheritance-2.html + + * bindings/js/DOMObjectWithSVGContext.h: + (WebCore::DOMObjectWithSVGContext::DOMObjectWithSVGContext): + Update the comment and add an ignored globalObject argument. + * bindings/js/JSDOMBinding.h: + Pass a globalObject to all DOMObjects during creation. Currently it's the wrong global object. + Once toJS is passed a globalObject it will be the right one. + (WebCore::createDOMObjectWrapper): + (WebCore::createDOMNodeWrapper): + * bindings/js/JSDOMGlobalObject.h: + (WebCore::JSDOMGlobalObject::globalObject): Makes binding generation easier. + * bindings/js/JSDOMWindowCustom.cpp: + (WebCore::JSDOMWindow::history): JSHistory is now passed a globalObject, but since it has no custom constructor it doesn't use it. + (WebCore::JSDOMWindow::location): JSLocation is now passed a globalObject, but since it has no custom constructor it doesn't use it. + * bindings/js/JSDocumentCustom.cpp: + (WebCore::JSDocument::location): JSLocation is now passed a globalObject, but since it has no custom constructor it doesn't use it. + * bindings/js/JSHTMLAllCollection.h: + (WebCore::JSHTMLAllCollection::JSHTMLAllCollection): + * bindings/js/JSHTMLCollectionCustom.cpp: Re-factoring needed to pass globalObject to JSNamedNodesCollection constructor. + (WebCore::getNamedItems): + (WebCore::callHTMLCollection): + (WebCore::JSHTMLCollection::canGetItemsForName): + (WebCore::JSHTMLCollection::nameGetter): + (WebCore::JSHTMLCollection::item): + (WebCore::JSHTMLCollection::namedItem): + * bindings/js/JSHTMLFormElementCustom.cpp: + (WebCore::JSHTMLFormElement::nameGetter): + * bindings/js/JSNamedNodesCollection.cpp: + Now passed globalObject. This is tested by inner.document.forms.testForm. + The passed globalObject is still wrong until toJS is fixed. + (WebCore::JSNamedNodesCollection::JSNamedNodesCollection): + * bindings/js/JSNamedNodesCollection.h: + * bindings/js/JSSharedWorkerConstructor.cpp: + Add DOMConstructorObject missed by http://trac.webkit.org/changeset/45938 + This class is not compiled by default, so not testable. + (WebCore::JSSharedWorkerConstructor::JSSharedWorkerConstructor): + * bindings/js/JSSharedWorkerConstructor.h: + * bindings/scripts/CodeGeneratorJS.pm: + Make all bindings objects carry a globalObject pointer using DOMObjectWithGlobalPointer. + SVG bindings which need a context() pointer do not have enough space for globalObject() too. + WorkerContext does not need a globalObject (it is one), so special case it. + Make all .constructor calls use the stored globalObject(). This is what fixes window.document.constructor. + Make all constructors inherit from DOMConstructorObject for consistency. Since the auto-bound constructors + override createStructure anyway, there is no functional change here. Just completing work started in r45938. + +2009-07-23 Brady Eidson + + Reviewed by Geoff Garen. + + WebCore has a few places that don't gracefully handle a null request returned from willSendRequest. + https://bugs.webkit.org/show_bug.cgi?id=27595 + + Test: http/tests/misc/will-send-request-returns-null-on-redirect.html + + * inspector/InspectorController.cpp: + (WebCore::InspectorController::removeResource): Null-check the request URL. + + * platform/network/cf/ResourceHandleCFNet.cpp: Ditto, and return null instead of creating an empty one. + (WebCore::willSendRequest): + +2009-07-23 Chris Fleizach + + Reviewed by Darin Adler. + + Bug 27633 - AXLoadComplete can be fired off to frequently + https://bugs.webkit.org/show_bug.cgi?id=27633 + + An integration issue left out some curly braces. + + * dom/Document.cpp: + (WebCore::Document::implicitClose): + +2009-07-23 Darin Adler + + Reviewed by Brady Eidson. + + URL appears in back/forward button menu instead of title for items with custom representation + https://bugs.webkit.org/show_bug.cgi?id=27586 + rdar://problem/5060337 + + * WebCore.base.exp: Exported DocumentLoader::setTitle for use by Mac WebKit. + * loader/FrameLoader.cpp: + (WebCore::FrameLoader::didChangeTitle): Tightened code to check if the document + loader is the correct one; previously this would never happen because we'd + commit the load before any title changes could be registered, but now we can + encounter a case where we get a title during a provisional load. + +2009-07-23 Dan Bernstein + + Reviewed by Dave Hyatt. + + [CSS3 Backgrounds and Borders] Add support for inset box shadows + https://bugs.webkit.org/show_bug.cgi?id=27582 + + Test: fast/box-shadow/inset.html + + * css/CSSComputedStyleDeclaration.cpp: + (WebCore::valueForShadow): Set the ShadowValue’s shadow style to 'inset' + as needed. + + * css/CSSParser.cpp: + (WebCore::ShadowParseContext::ShadowParseContext): Added style and allowStyle + members. Initialize the allowStyle member. + (WebCore::ShadowParseContext::commitValue): Pass the style value to the + ShadowValue constructor. Reset allowStyle. + (WebCore::ShadowParseContext::commitLength): Update allowStyle. + (WebCore::ShadowParseContext::commitColor): Ditto. + (WebCore::ShadowParseContext::commitStyle): Added. Sets the style member and + updates the state. + (WebCore::CSSParser::parseShadow): Parse the 'inset' keyword. + + * css/CSSStyleSelector.cpp: + (WebCore::CSSStyleSelector::applyProperty): Get the style value from the + shadow value and pass it to the ShadowData constructor. + + * css/ShadowValue.cpp: + (WebCore::ShadowValue::ShadowValue): Added style. + (WebCore::ShadowValue::cssText): Added style. + + * css/ShadowValue.h: + (WebCore::ShadowValue::create): Added style. + + * page/animation/AnimationBase.cpp: + (WebCore::blendFunc): Added a blend function for shadow styles. When blending + between normal and inset shadows, all intermediate values map to normal. + (WebCore::PropertyWrapperShadow::blend): Added normal style to the default + shadow. + + * rendering/InlineFlowBox.cpp: + (WebCore::InlineFlowBox::paintBoxShadow): Added a shadow style parameter, + which is passed through to RenderBoxModelObject::paintBoxShadow(). + + (WebCore::InlineFlowBox::paintBoxDecorations): Paint inset shadows on top of + the background. + + * rendering/InlineFlowBox.h: + + * rendering/RenderBox.cpp: + (WebCore::RenderBox::paintBoxDecorations): Paint inset shadows on top of the + background. + + * rendering/RenderBoxModelObject.cpp: + (WebCore::RenderBoxModelObject::paintBoxShadow): Added a shadow style + parameter, and code to paint inset shadows. + + * rendering/RenderBoxModelObject.h: + + * rendering/RenderFieldset.cpp: + (WebCore::RenderFieldset::paintBoxDecorations): Paint inset shadows on top of + the background. + + * rendering/RenderTable.cpp: + (WebCore::RenderTable::paintBoxDecorations): Ditto. + + * rendering/RenderTableCell.cpp: + (WebCore::RenderTableCell::paintBoxDecorations): Ditto. + + * rendering/style/ShadowData.h: + Added a ShadowStyle enum. + (WebCore::ShadowData::ShadowData): Add and initialize a style member. + +2009-07-23 Simon Fraser + + Fix the build with UNUSED_PARAM(frame) for when ENABLE(3D_RENDERING) is not defined. + + * css/MediaQueryEvaluator.cpp: + (WebCore::transform_3dMediaFeatureEval): + +2009-07-23 Simon Fraser + + Reviewed by Adele Peterson. + + 3d-transforms media query needs to look check that accelerated compositing is enabled + https://bugs.webkit.org/show_bug.cgi?id=27621 + + When evaluating a media query with '-webkit-transform-3d', we need to check the + runtime switch that toggles accererated compositing, and therefore 3D. + + No test because we can't disable the pref dynamically in DRT. + + * css/MediaQueryEvaluator.cpp: + (WebCore::transform_3dMediaFeatureEval): + +2009-07-22 Ryosuke Niwa + + Reviewed by Eric Seidel. + + execCommand('underline') can't remove underlines + https://bugs.webkit.org/show_bug.cgi?id=20215 + + This patch adds support for u, s, and strike to implicitlyStyledElementShouldBeRemovedWhenApplyingStyle so that + WebKit can remove those presentational tags when necessary. + It also modifies StyleChange::init not to add "text-decoration: none". Not only is this style meaningless + (does not override inherited styles) but it was also causing WebKit to generate extra spans with this style. + + * css/CSSValueList.cpp: + (WebCore::CSSValueList::hasValue): True if the property contains the specified value + * css/CSSValueList.h: Updated prototype + * editing/ApplyStyleCommand.cpp: + (WebCore::StyleChange::init): No longer adds "text-decoration: none" + (WebCore::ApplyStyleCommand::implicitlyStyledElementShouldBeRemovedWhenApplyingStyle): Supports text-decoration-related elements + +2009-07-23 Jessie Berlin + + Reviewed by Dan Bernstein. + + https://bugs.webkit.org/show_bug.cgi?id=27554 + Expose the value of text-overflow in getComputedStyle. + + Test: fast/css/getComputedStyle/getComputedStyle-text-overflow.html + + * css/CSSComputedStyleDeclaration.cpp: + (WebCore::): + Add text-overflow to the list of computedProperties. + (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): + Return the value of the text-overflow property. + +2009-07-23 Yongjun Zhang + + Reviewed by Simon Hausmann. + + https://bugs.webkit.org/show_bug.cgi?id=27510 + + [S60 QtWebKit] Don't put some intermediate generated files into the final mmp project + file for linking. This is a temporary workaround for qmake bug in Symbian port, should + be reverted after qmake is fixed. + + * WebCore.pro: + +2009-07-23 Jian Li + + Reviewed by David Levin. + + [V8] Fix an assert in running workers in Chrome. + https://bugs.webkit.org/show_bug.cgi?id=27620 + + The fix is to change V8DOMMap::removeAllDOMObjectsInCurrentThreadHelper + to do not call removeObjectsFromWrapperMap for certain types of DOM + objects that exist only in main thread. + + * bindings/v8/V8DOMMap.cpp: + (WebCore::removeAllDOMObjectsInCurrentThreadHelper): + +2009-07-23 David Hyatt + + Reviewed by Dan Bernstein. + + https://bugs.webkit.org/show_bug.cgi?id=27572 + Implement support for background-attachment:local. + + Added new test fast/overflow/overflow-with-local-attachment.html. + + * css/CSSComputedStyleDeclaration.cpp: + (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): + * css/CSSParser.cpp: + (WebCore::CSSParser::parseFillProperty): + * css/CSSPrimitiveValueMappings.h: + (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): + (WebCore::CSSPrimitiveValue::operator EFillAttachment): + * css/CSSStyleSelector.cpp: + (WebCore::CSSStyleSelector::mapFillAttachment): + * css/CSSValueKeywords.in: + * rendering/RenderBoxModelObject.cpp: + (WebCore::RenderBoxModelObject::paintFillLayerExtended): + (WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry): + * rendering/style/FillLayer.h: + (WebCore::FillLayer::attachment): + (WebCore::FillLayer::setAttachment): + (WebCore::FillLayer::hasFixedImage): + (WebCore::FillLayer::initialFillAttachment): + * rendering/style/RenderStyle.h: + (WebCore::InheritedFlags::backgroundAttachment): + (WebCore::InheritedFlags::maskAttachment): + * rendering/style/RenderStyleConstants.h: + (WebCore::): + +2009-07-23 Ryosuke Niwa + + Reviewed by Eric Seidel. + + copyInheritableProperties and removeComputedInheritablePropertiesFrom should be deprecated + https://bugs.webkit.org/show_bug.cgi?id=27325 + + This patch deprecates copyInheritableProperties because it has been used for two different purposes: + 1. Calculating the typing style. + 2. Moving HTML subtrees and seeking to remove redundant styles. + These tasks should be broken out into two separate functions. New code should not use this function. + + It deletes removeComputedInheritablePropertiesFrom because it hasn't been used anywhere. + + There is no test since the patch does not change any behavior. + + * css/CSSComputedStyleDeclaration.cpp: removeComputedInheritablePropertiesFrom has been removed + (WebCore::CSSComputedStyleDeclaration::deprecatedCopyInheritableProperties): has been renamed from copyInheritableProperties + * css/CSSComputedStyleDeclaration.h: ditto + * editing/DeleteSelectionCommand.cpp: ditto + (WebCore::removeEnclosingAnchorStyle): ditto + (WebCore::DeleteSelectionCommand::saveTypingStyleState): ditto + * editing/EditCommand.cpp: ditto + (WebCore::EditCommand::styleAtPosition): ditto + * editing/RemoveFormatCommand.cpp: ditto + (WebCore::RemoveFormatCommand::doApply): ditto + * editing/ReplaceSelectionCommand.cpp: ditto + (WebCore::handleStyleSpansBeforeInsertion): ditto + (WebCore::ReplaceSelectionCommand::handleStyleSpans): ditto + * editing/markup.cpp: ditto + (WebCore::removeEnclosingMailBlockquoteStyle): ditto + (WebCore::removeDefaultStyles): ditto + (WebCore::createMarkup): ditto + +2009-07-22 Pierre d'Herbemont + + Reviewed by Simon Fraser. + + Audio element at default width shouldn't have time field. + https://bugs.webkit.org/show_bug.cgi?id=27589 + + * rendering/MediaControlElements.cpp: + (WebCore::MediaControlTimeDisplayElement::setVisible): Make sure we don't + forget to remember the visibility if there is no renderer. + +2009-07-23 Beth Dakin + + Reviewed by Darin Adler. + + Fix for https://bugs.webkit.org/show_bug.cgi?id=27598 Clean up the + AccessibilityObject class + + Mostly this is just moving empty stubs into the header rather than + muddying the cpp file with them. A few functions were made pure + virtual. + + * accessibility/AccessibilityObject.cpp: + (WebCore::AccessibilityObject::isARIAControl): + (WebCore::AccessibilityObject::clickPoint): + (WebCore::AccessibilityObject::documentFrameView): + (WebCore::AccessibilityObject::actionVerb): + * accessibility/AccessibilityObject.h: + (WebCore::AccessibilityObject::intValue): + (WebCore::AccessibilityObject::layoutCount): + (WebCore::AccessibilityObject::doAccessibilityHitTest): + (WebCore::AccessibilityObject::focusedUIElement): + (WebCore::AccessibilityObject::firstChild): + (WebCore::AccessibilityObject::lastChild): + (WebCore::AccessibilityObject::previousSibling): + (WebCore::AccessibilityObject::nextSibling): + (WebCore::AccessibilityObject::parentObjectIfExists): + (WebCore::AccessibilityObject::observableObject): + (WebCore::AccessibilityObject::linkedUIElements): + (WebCore::AccessibilityObject::titleUIElement): + (WebCore::AccessibilityObject::ariaRoleAttribute): + (WebCore::AccessibilityObject::isPresentationalChildOfAriaRole): + (WebCore::AccessibilityObject::ariaRoleHasPresentationalChildren): + (WebCore::AccessibilityObject::roleValue): + (WebCore::AccessibilityObject::ariaAccessiblityName): + (WebCore::AccessibilityObject::ariaLabeledByAttribute): + (WebCore::AccessibilityObject::ariaDescribedByAttribute): + (WebCore::AccessibilityObject::accessibilityDescription): + (WebCore::AccessibilityObject::ariaSelectedTextDOMRange): + (WebCore::AccessibilityObject::axObjectCache): + (WebCore::AccessibilityObject::axObjectID): + (WebCore::AccessibilityObject::setAXObjectID): + (WebCore::AccessibilityObject::anchorElement): + (WebCore::AccessibilityObject::actionElement): + (WebCore::AccessibilityObject::boundingBoxRect): + (WebCore::AccessibilityObject::selectedTextRange): + (WebCore::AccessibilityObject::selectionStart): + (WebCore::AccessibilityObject::selectionEnd): + (WebCore::AccessibilityObject::url): + (WebCore::AccessibilityObject::selection): + (WebCore::AccessibilityObject::stringValue): + (WebCore::AccessibilityObject::title): + (WebCore::AccessibilityObject::helpText): + (WebCore::AccessibilityObject::textUnderElement): + (WebCore::AccessibilityObject::text): + (WebCore::AccessibilityObject::textLength): + (WebCore::AccessibilityObject::selectedText): + (WebCore::AccessibilityObject::accessKey): + (WebCore::AccessibilityObject::widget): + (WebCore::AccessibilityObject::widgetForAttachmentView): + (WebCore::AccessibilityObject::setFocused): + (WebCore::AccessibilityObject::setSelectedText): + (WebCore::AccessibilityObject::setSelectedTextRange): + (WebCore::AccessibilityObject::setValue): + (WebCore::AccessibilityObject::setSelected): + (WebCore::AccessibilityObject::makeRangeVisible): + (WebCore::AccessibilityObject::childrenChanged): + (WebCore::AccessibilityObject::addChildren): + (WebCore::AccessibilityObject::hasChildren): + (WebCore::AccessibilityObject::selectedChildren): + (WebCore::AccessibilityObject::visibleChildren): + (WebCore::AccessibilityObject::visiblePositionRange): + (WebCore::AccessibilityObject::visiblePositionRangeForLine): + (WebCore::AccessibilityObject::boundsForVisiblePositionRange): + (WebCore::AccessibilityObject::setSelectedVisiblePositionRange): + (WebCore::AccessibilityObject::visiblePositionForPoint): + (WebCore::AccessibilityObject::nextVisiblePosition): + (WebCore::AccessibilityObject::previousVisiblePosition): + (WebCore::AccessibilityObject::visiblePositionForIndex): + (WebCore::AccessibilityObject::indexForVisiblePosition): + (WebCore::AccessibilityObject::index): + (WebCore::AccessibilityObject::doAXRangeForLine): + (WebCore::AccessibilityObject::doAXRangeForIndex): + (WebCore::AccessibilityObject::doAXStringForRange): + (WebCore::AccessibilityObject::doAXBoundsForRange): + (WebCore::AccessibilityObject::updateBackingStore): + +2009-07-23 Brian Weinstein + + Reviewed by David Hyatt. + + Fix of Dragging from the area between the horizontal/vertical scrollbars when status bar is showing starts a selection and autoscroll. + + * page/EventHandler.cpp: + (WebCore::EventHandler::handleMousePressEvent): + * platform/ScrollView.cpp: + (WebCore::ScrollView::wheelEvent): + * platform/ScrollView.h: + +2009-07-23 David Hyatt + + Reviewed by Dan Bernstein. + + https://bugs.webkit.org/show_bug.cgi?id=27581 + Drop the prefix from the box-shadow property. + + * css/CSSComputedStyleDeclaration.cpp: + (WebCore::): + (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): + * css/CSSParser.cpp: + (WebCore::CSSParser::parseValue): + (WebCore::ShadowParseContext::commitLength): + (WebCore::cssPropertyID): + * css/CSSPropertyNames.in: + * css/CSSStyleSelector.cpp: + (WebCore::CSSStyleSelector::applyProperty): + * page/animation/AnimationBase.cpp: + (WebCore::ensurePropertyMap): + +2009-07-22 Viet-Trung Luu + + Reviewed by David Hyatt. + + https://bugs.webkit.org/show_bug.cgi?id=27289 + When a mouse click occurs on a scrollbar without a preceding mouse move + onto it, the release isn't handled correctly (since + EventHandler::m_lastScrollbarUnderMouse isn't set on mouse down, but + only on mouse move). (Side comment: That scrollbar-handling code + in EventHandler is ugly. It should be fixed properly.) + + Tests: scrollbars/scrollbar-miss-mousemove.html + scrollbars/scrollbar-miss-mousemove-disabled.html + + * page/EventHandler.cpp: + (WebCore::EventHandler::handleMousePressEvent): + (WebCore::EventHandler::handleMouseMoveEvent): + (WebCore::EventHandler::updateLastScrollbarUnderMouse): + * page/EventHandler.h: + +2009-07-23 Mike Fenton + + Reviewed by David Levin. + + Update WebCore/page/BarInfo.cpp to conform to WebKit + Style Guidelines as identified by cpplint.py. + https://bugs.webkit.org/show_bug.cgi?id=27606 + + * page/BarInfo.cpp: + (WebCore::BarInfo::visible): + +2009-07-23 Mike Fenton + + Reviewed by David Levin. + + Update WebCore/page/Console.cpp to conform to WebKit + Style Guidelines as identified by cpplint.py. + https://bugs.webkit.org/show_bug.cgi?id=27606 + + * page/Console.cpp: + (WebCore::printMessageSourceAndLevelPrefix): + (WebCore::Console::profile): + (WebCore::Console::time): + +2009-07-23 Simon Hausmann + + Reviewed by Holger Freyther. + + Fix crashes with the QObject bindings after garbage collection. + + There is one QtInstance per wrapped QObject, and that QtInstance keeps + references to cached JSObjects for slots. When those objects get + deleted due to GC, then they becoming dangling pointers. + + When a cached member dies, it is now removed from the QtInstance's + cache. + + As we cannot track the lifetime of the children, we have to remove + them from QtInstance alltogether. They are not cached and were + only used for mark(), but we _want_ them to be subject to gc. + + * bridge/qt/qt_instance.cpp: + (JSC::Bindings::QtInstance::~QtInstance): Minor coding style cleanup, + use qDeleteAll(). + (JSC::Bindings::QtInstance::removeCachedMethod): New function, to + clean m_methods and m_defaultMethod. + (JSC::Bindings::QtInstance::mark): Avoid marking already marked objects. + (JSC::Bindings::QtField::valueFromInstance): Don't save children for + marking. + * bridge/qt/qt_instance.h: Declare removeCachedMethod. + * bridge/qt/qt_runtime.cpp: + (JSC::Bindings::QtRuntimeMethod::~QtRuntimeMethod): Call removeCachedMethod + with this on the instance. + +2009-07-23 Xan Lopez + + Reviewed by Mark Rowe. + + https://bugs.webkit.org/show_bug.cgi?id=27599 + 'const unsigned' in return value + + Remove const modifier from unsigned return value, as it does not + make sense. + + * dom/ErrorEvent.h: + +2009-07-22 Jens Alfke + + Reviewed by David Levin. + + Bug 22784: Improve keyboard navigation of Select elements. + Home/End and PageUp/PageDn buttons do not do anything in drop down lists, + on non-Mac platforms. + https://bugs.webkit.org/show_bug.cgi?id=22784 + http://code.google.com/p/chromium/issues/detail?id=4576 + + New test: LayoutTests/fast/forms/select-popup-pagekeys.html + + * dom/SelectElement.cpp: + (WebCore::nextValidIndex): + New utility fn for traversing items of a select's list. + (WebCore::SelectElement::menuListDefaultEventHandler): + Added code to handle Home/End and PageUp/PageDn when ARROW_KEYS_POP_MENU is false. + +2009-07-23 Xan Lopez + + Reviewed by Mark Rowe. + + Fix a couple of compiler warnings. + + * platform/graphics/cairo/ImageBufferCairo.cpp: + (copySurface): + * platform/graphics/gtk/SimpleFontDataGtk.cpp: + (WebCore::SimpleFontData::containsCharacters): + +2009-07-22 Simon Hausmann + + Rubber-stamped by David Levin. + + Enable HTML5 Datagrid defines for the Qt build. + + * WebCore.pro: + +2009-07-22 Adam Barth + + Reviewed by David Levin. + + [V8] Make Node wrappers go fast + https://bugs.webkit.org/show_bug.cgi?id=27597 + + Profiles indicate we're spending a lot of time asking whether we're on + the main thread when looking up DOM wrappers for Nodes, but there isn't + much point in doing that work because Nodes only exist on the main + thread. I've also added an assert to keep us honest in this regard. + + * bindings/v8/V8DOMMap.cpp: + (WebCore::): + (WebCore::getDOMNodeMap): + (WebCore::DOMData::getCurrent): + (WebCore::DOMData::getCurrentMainThread): + +2009-07-22 Adam Barth + + Reviewed by Alexey Proskuryakov. + + Remove unneeded virtual destructor from ScriptSourceProvider + https://bugs.webkit.org/show_bug.cgi?id=27563 + + * bindings/js/ScriptSourceProvider.h: + +2009-07-22 Ryosuke Niwa + + Reviewed by Eric Seidel. + + execCommand('underline' / 'strikeThrough') doesn't work properly with multiple styles in text-decoration + https://bugs.webkit.org/show_bug.cgi?id=27476 + + executeStrikethrough and executeUnderline were toggling between "line-through" / "underline" and "none". + This patch adds executeToggleStyleInList that toggles a style in CSSValueList instead of toggling the entire value. + It modifies CSSComputedStyleDeclaration to return CSSValueList instead of CSSPrimitiveValue for text decorations, + and adds removeAll member function to CSSValueList. + + Tests: editing/execCommand/toggle-text-decorations.html + fast/css/getComputedStyle/getComputedStyle-text-decoration.html + + * css/CSSComputedStyleDeclaration.cpp: + (WebCore::renderTextDecorationFlagsToCSSValue): Creates a CSSValueList + (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): Returns a CSSValueList instead of CSSValue + * css/CSSParser.cpp: + (WebCore::CSSParser::parseValue): Text decorations are space separated instead of comma separated + * css/CSSValueList.cpp: + (WebCore::CSSValueList::removeAll): Removes all values that match the specified value + * css/CSSValueList.h: + * editing/EditorCommand.cpp: + (WebCore::applyCommandToFrame): Apply style to a frame using specified command + (WebCore::executeApplyStyle): Uses applyCommandToFrame + (WebCore::executeToggleStyleInList): Uses applyCommandToFrame + (WebCore::executeToggleStyle): Toggles a style in CSSValueList + (WebCore::executeStrikethrough): Uses executeToggleStyleInList + (WebCore::executeUnderline): Uses executeToggleStyleInList + +2009-07-22 Daniel Bates + + Reviewed by Adam Barth. + + https://bugs.webkit.org/show_bug.cgi?id=27174 + And + https://bugs.webkit.org/show_bug.cgi?id=26938 + + Code cleanup. Implements support for detecting attacks transformed by + PHP Magic Quotes/PHP addslashes(). + + Tests: http/tests/security/xssAuditor/script-tag-addslashes-backslash.html + http/tests/security/xssAuditor/script-tag-addslashes-double-quote.html + http/tests/security/xssAuditor/script-tag-addslashes-null-char.html + http/tests/security/xssAuditor/script-tag-addslashes-single-quote.html + + * page/XSSAuditor.cpp: + (WebCore::isInvalidCharacter): + (WebCore::XSSAuditor::canEvaluate): + (WebCore::XSSAuditor::canEvaluateJavaScriptURL): + (WebCore::XSSAuditor::canLoadObject): + (WebCore::XSSAuditor::normalize): Decodes HTML entities, removes backslashes, + and removes control characters that could otherwise cause a discrepancy between + the source code of a script and the outgoing HTTP parameters. + (WebCore::XSSAuditor::decodeURL): + (WebCore::XSSAuditor::decodeHTMLEntities): + (WebCore::XSSAuditor::findInRequest): + * page/XSSAuditor.h: + +2009-07-22 Oliver Hunt + + Reviewed by Adele Peterson. + + Null deref in JSObject::mark due to null xhr wrapper + https://bugs.webkit.org/show_bug.cgi?id=27565 + + Make event target binding for appcache and xhr behave in the same way as + it does for all other events. + + No test as I couldn't make a testcase which was remotely reliable. + + * bindings/js/JSEventTarget.cpp: + (WebCore::toJS): + +2009-07-22 Mads Ager + + Reviewed by David Levin. + + Inform V8 of the amount of WebCore string memory it is keeping alive. + https://bugs.webkit.org/show_bug.cgi?id=27537 + + V8 uses external strings that are backed by WebCore strings. Since + the external strings themselves are small, V8 has no way of + knowing how much memory it is actually holding on to. With this + change, we inform V8 of the amount of WebCore string data it is + holding on to with external strings. + + * bindings/v8/V8Binding.cpp: + (WebCore::WebCoreStringResource::WebCoreStringResource): + (WebCore::WebCoreStringResource::~WebCoreStringResource): + +2009-07-22 David Hyatt + + Reviewed by Beth Dakin. + + https://bugs.webkit.org/show_bug.cgi?id=27562 + Add the finalized versions of background-clip and background-origin. Remove background-clip from + the background shorthand and have it be auto-set based off background-origin's value. + + Three new tests added in fast/backgrounds/size + + * css/CSSComputedStyleDeclaration.cpp: + (WebCore::): + (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): + * css/CSSMutableStyleDeclaration.cpp: + (WebCore::CSSMutableStyleDeclaration::getPropertyValue): + * css/CSSParser.cpp: + (WebCore::CSSParser::parseValue): + (WebCore::CSSParser::parseFillShorthand): + (WebCore::CSSParser::parseFillProperty): + * css/CSSPropertyLonghand.cpp: + (WebCore::initShorthandMap): + * css/CSSPropertyNames.in: + * css/CSSStyleSelector.cpp: + (WebCore::CSSStyleSelector::applyProperty): + * css/CSSValueKeywords.in: + +2009-07-22 Jens Alfke + + Reviewed by Darin Fisher. + + Hook up V8 bindings for DataGrid elements. + https://bugs.webkit.org/show_bug.cgi?id=27383 + http://code.google.com/p/chromium/issues/detail?id=16730 + + Tests: Enhanced LayoutTests/fast/dom/HTMLDataGridElement/* + to handle exceptions, check appropriate JS prototypes, and + test column-list's item() method as well as array-indexing. + + * WebCore.gypi: Added new source files. + * bindings/scripts/CodeGeneratorV8.pm: Made GenerateBatchedAttributeData put #if's around conditional attributes. + * bindings/v8/DOMObjectsInclude.h: #include DataGrid headers. + * bindings/v8/V8DOMWrapper.cpp: Add bindings from HTML tags to datagrid templates. + (WebCore::V8DOMWrapper::getTemplate): Customize datagrid template. + * bindings/v8/V8DataGridDataSource.cpp: Added. (Based on JSDataGridDataSource) + (WebCore::V8DataGridDataSource::V8DataGridDataSource): + (WebCore::V8DataGridDataSource::~V8DataGridDataSource): + * bindings/v8/V8DataGridDataSource.h: Added. (Based on JSDataGridDataSource) + (WebCore::V8DataGridDataSource::create): + (WebCore::V8DataGridDataSource::isJSDataGridDataSource): + (WebCore::V8DataGridDataSource::jsDataSource): + (WebCore::asV8DataGridDataSource): + * bindings/v8/V8GCController.h: Added new handle type "DATASOURCE". + * bindings/v8/V8Index.h: Conditionalize datagrid stuff. + * bindings/v8/custom/V8CustomBinding.h: Declare more accessors. Conditionalize. + * bindings/v8/custom/V8DataGridColumnListCustom.cpp: Added. + * bindings/v8/custom/V8HTMLDataGridElementCustom.cpp: Fill in dataSource accessors. + (WebCore::ACCESSOR_GETTER): + (WebCore::ACCESSOR_SETTER): + +2009-07-22 Ryosuke Niwa + + Reviewed by Eric Seidel. + + pushDownTextDecorationStyleAroundNode needs clean up + https://bugs.webkit.org/show_bug.cgi?id=27556 + + Cleaned up. pushDownTextDecorationStyleAroundNode traverses tree vertically from highestAncestor to targetNode + While traversing, it will apply the specified style to all nodes but targetNode. + i.e. the style is applies to all ancestor nodes and their siblings of targetNode. + + * editing/ApplyStyleCommand.cpp: + (WebCore::ApplyStyleCommand::pushDownTextDecorationStyleAroundNode): Cleaned up and added comments + * editing/ApplyStyleCommand.h: Updated prototype + +2009-07-22 Peter Kasting + + Reviewed by David Kilzer. + + https://bugs.webkit.org/show_bug.cgi?id=27323 + Handle any type of line endings in WebCore/css/*CSSPropertyNames.in. + + * DerivedSources.make: + * css/makeprop.pl: + * css/makevalues.pl: + +2009-07-22 Paul Godavari + + Reviewed by Darin Fisher. + + Chromium has a build break after removal of JSRGBColor bindings + https://bugs.webkit.org/show_bug.cgi?id=27548 + + Fix a build break in Chromium V8 after the JSRGBColor bindings change: + https://bugs.webkit.org/show_bug.cgi?id=27242 + + * bindings/scripts/CodeGeneratorV8.pm: + +2009-07-22 Adam Langley + + Reviewed by Darin Fisher. + + Chromium Linux: add static functions to FontPlatformData which allow + for setting the global font rendering preferences. + + https://bugs.webkit.org/show_bug.cgi?id=27513 + http://code.google.com/p/chromium/issues/detail?id=12179 + + This should not affect any layout tests. + + * platform/graphics/chromium/FontPlatformDataLinux.cpp: + (WebCore::FontPlatformData::setHinting): + (WebCore::FontPlatformData::setAntiAlias): + (WebCore::FontPlatformData::setSubpixelGlyphs): + (WebCore::FontPlatformData::setupPaint): + * platform/graphics/chromium/FontPlatformDataLinux.h: + +2009-07-22 Mikhail Naganov + + Reviewed by Timothy Hatcher. + + Move Inspector panels creation into a function to make possible introducing + custom panels. + + * inspector/front-end/inspector.js: + (WebInspector._createPanels): + (WebInspector.loaded): + +2009-07-22 Pavel Feldman + + Reviewed by Timothy Hatcher. + + WebInspector: Print console command message upon evaluate + selection request; Handle errors in evaluation request + properly. + + https://bugs.webkit.org/show_bug.cgi?id=27535 + + * inspector/front-end/ScriptsPanel.js: + (WebInspector.ScriptsPanel.prototype.evaluateInSelectedCallFrame): + * inspector/front-end/SourceFrame.js: + (WebInspector.SourceFrame.prototype._evalSelectionInCallFrame): + +2009-07-22 Xan Lopez + + Attempt to fix the GTK+ build. + + * GNUmakefile.am: + +2009-07-21 Simon Hausmann + + Fix the Qt build. + + * WebCore.pro: Add RGBColor.cpp to the build, remove JSRGBColor. + +2009-07-21 Daniel Bates + + Reviewed by Adam Barth. + + https://bugs.webkit.org/show_bug.cgi?id=27494 + + Fixes an issue that can cause a crash or unexpected behavior when calling + WebCore::ScriptSourceCode::source on a cached script. + + * GNUmakefile.am: + * WebCore.gypi: + * WebCore.pro: + * WebCore.vcproj/WebCore.vcproj: + * WebCore.xcodeproj/project.pbxproj: + * bindings/js/CachedScriptSourceProvider.h: Modified to inherit from + WebCore::ScriptSourceCode. + (WebCore::CachedScriptSourceProvider::source): + (WebCore::CachedScriptSourceProvider::CachedScriptSourceProvider): + * bindings/js/ScriptSourceCode.h: + (WebCore::ScriptSourceCode::ScriptSourceCode): Separated out source provider and + rewrote to use WebCore::ScriptSourceProvider. + (WebCore::ScriptSourceCode::source): + * bindings/js/ScriptSourceProvider.h: Added. + (WebCore::ScriptSourceProvider::ScriptSourceProvider): + (WebCore::ScriptSourceProvider::~ScriptSourceProvider): + * bindings/js/StringSourceProvider.h: Modified to inherit from + WebCore::ScriptSourceCode. + (WebCore::StringSourceProvider::StringSourceProvider): + +2009-07-21 Sam Weinig + + Another attempt to fix the Windows build. + + * WebCore.vcproj/WebCore.vcproj: + +2009-07-21 Sam Weinig + + Attempt to fix the Windows build. + + * DerivedSources.cpp: + +2009-07-21 Sam Weinig + + Attempt to fix the GTK build. + + * GNUmakefile.am: + +2009-07-21 Sam Weinig + + Reviewed by Dan Bernstein. + + Autogenerate Objective-C binding implementation for RGBColor. + + No functionality change. + + * WebCore.xcodeproj/project.pbxproj: + * bindings/objc/DOMRGBColor.mm: Removed. + * bindings/scripts/CodeGeneratorObjC.pm: Add logic to convert from + WebCore::Color to NSColor*. + * css/RGBColor.idl: + +2009-07-21 Sam Weinig + + Reviewed by Dan Bernstein. + + Fix for https://bugs.webkit.org/show_bug.cgi?id=27242 + JSC bindings should use an auto-bound RGBColor class instead of hand-rolled JSRGBColor + + Move the JSC and Objective-C bindings onto using the RGBColor object instead + of just an unsigned int. The JSC bindings are now completely autogenerated for + this class. (Also removes the last lut from WebCore). + + * DerivedSources.make: + * GNUmakefile.am: + * WebCore.pro: + * WebCore.vcproj/WebCore.vcproj: + * WebCore.xcodeproj/project.pbxproj: + * WebCoreSources.bkl: + * bindings/js/JSRGBColor.cpp: Removed. + * bindings/js/JSRGBColor.h: Removed. + * bindings/objc/DOM.mm: + (-[DOMRGBColor _color]): + * bindings/objc/DOMRGBColor.mm: + (-[DOMRGBColor dealloc]): + (-[DOMRGBColor finalize]): + (-[DOMRGBColor red]): + (-[DOMRGBColor green]): + (-[DOMRGBColor blue]): + (-[DOMRGBColor alpha]): + (-[DOMRGBColor color]): + * bindings/scripts/CodeGenerator.pm: + * bindings/scripts/CodeGeneratorJS.pm: + * bindings/scripts/CodeGeneratorObjC.pm: + * css/CSSParser.cpp: + (WebCore::CSSParser::parseColor): + * css/CSSPrimitiveValue.cpp: + (WebCore::CSSPrimitiveValue::getRGBColorValue): + * css/CSSPrimitiveValue.h: + (WebCore::CSSPrimitiveValue::getRGBA32Value): + * css/CSSStyleSelector.cpp: + (WebCore::CSSStyleSelector::getColorFromPrimitiveValue): + * css/RGBColor.cpp: + (WebCore::RGBColor::alpha): + * css/RGBColor.h: + (WebCore::RGBColor::color): + (WebCore::RGBColor::RGBColor): + * css/RGBColor.idl: + * page/DOMWindow.idl: + * svg/SVGColor.cpp: + (WebCore::SVGColor::rgbColor): + * svg/SVGColor.h: + +2009-07-21 Jian Li + + Reviewed by David Levin. + + Implement AbstractWorker::dispatchScriptErrorEvent by generating an ErrorEvent. + https://bugs.webkit.org/show_bug.cgi?id=27515 + + * workers/AbstractWorker.cpp: + (WebCore::AbstractWorker::dispatchScriptErrorEvent): + +2009-07-21 Eric Seidel + + Reviewed by Adam Barth. + + Move m_context out of generator into a superclass + https://bugs.webkit.org/show_bug.cgi?id=27521 + + Mostly this is removing code from CodeGeneratorJS + and instead using a DOMObjectWithSVGContext superclass in JSDOMBinding.h. + + DOMObjectWithSVGContext.h is its own file so that WebKit doesn't need to + know about SVGElement.h (WebKit includes JSDOMBinding.h for some reason). + + I also removed context pointer from SVGZoomEvent since it was never used. + + * WebCore.gypi: + * WebCore.pro: + * WebCore.vcproj/WebCore.vcproj: + * WebCore.xcodeproj/project.pbxproj: + * bindings/js/DOMObjectWithSVGContext.h: Added. + (WebCore::DOMObjectWithSVGContext::context): + (WebCore::DOMObjectWithSVGContext::DOMObjectWithSVGContext): + * bindings/js/JSDOMBinding.h: + * bindings/js/JSEventCustom.cpp: + (WebCore::toJS): + * bindings/scripts/CodeGeneratorJS.pm: + +2009-07-21 Ryosuke Niwa + + Reviewed by Eric Seidel. + + REGRESSION (r46142): editing/execCommand/19087.html & editing/execCommand/19653-1.html fail in Windows build + https://bugs.webkit.org/show_bug.cgi?id=27480 + + Because m_anchorType : 2 is treated as a signed integer by cl.exe, anchorType() wasn't returning the correct value. + We made m_anchorType unsigned so that anchorType() returns the correct value. + + * dom/Position.h: + (WebCore::Position::anchorType): statically cast to AnchorType + +2009-07-21 Jian Li + + Reviewed by David Levin. + + [V8] Add V8 bindings for onerror in WorkerContext. + https://bugs.webkit.org/show_bug.cgi?id=27518 + + * bindings/v8/custom/V8CustomBinding.h: + * bindings/v8/custom/V8WorkerContextCustom.cpp: + (WebCore::ACCESSOR_GETTER): + (WebCore::ACCESSOR_SETTER): + +2009-07-21 Jian Li + + Fix the incorrect patch being landed for bug 27516 that has already been reviewed. + https://bugs.webkit.org/show_bug.cgi?id=27516 + + * workers/WorkerContext.h: + (WebCore::WorkerContext::setOnerror): + (WebCore::WorkerContext::onerror): + * workers/WorkerContext.idl: + +2009-07-21 Jian Li + + Reviewed by David Levin. + + Add onerror to WorkerContext. + https://bugs.webkit.org/show_bug.cgi?id=27516 + + * bindings/js/JSWorkerContextCustom.cpp: + (WebCore::JSWorkerContext::mark): + * workers/WorkerContext.h: + (WebCore::WorkerContext::setOnerror): + (WebCore::WorkerContext::onerror): + * workers/WorkerContext.idl: + +2009-07-21 Yong Li + + Reviewed by George Staikos. + + https://bugs.webkit.org/show_bug.cgi?id=27509 + Add font-related files for the WinCE port. + + Written by Yong Li + + * platform/graphics/wince/FontCacheWince.cpp: Added. + * platform/graphics/wince/FontCustomPlatformData.cpp: Added. + * platform/graphics/wince/FontCustomPlatformData.h: Added. + * platform/graphics/wince/FontPlatformData.cpp: Added. + * platform/graphics/wince/FontPlatformData.h: Added. + * platform/graphics/wince/FontWince.cpp: Added. + * platform/graphics/wince/GlyphPageTreeNodeWince.cpp: Added. + * platform/graphics/wince/SimpleFontDataWince.cpp: Added. + +2009-07-21 Kevin Ollivier + + Fix the Windows build, and update the comment on top now that wx uses WebCorePrefix.h too. + + * WebCorePrefix.h: + +2009-07-21 Kevin Ollivier + + WebCorePrefix.h build fixes for non-Mac and wx / CURL builds. + + * WebCorePrefix.h: + +2009-07-21 Eric Seidel + + Reviewed by Adam Barth. + + All DOMConstructorObjects should hold a pointer to the JSDOMGlobalObject + https://bugs.webkit.org/show_bug.cgi?id=27478 + + This is just moving code. + I've added two new classes: DOMObjectWithGlobalPointer and DOMConstructorWithDocument. + + DOMObjectWithGlobalPointer is a new baseclass for DOMConstructorObject. + (It's a baseclass because eventually all DOMObjects will have a global pointer, but + I'll be moving them onto DOMObjectWithGlobalPointer in stages.) + + DOMConstructorWithDocument is a new baseclass for the 3 constructor objects + which require a backpointer to the Document to function. I made this a subclass of + DOMConstructorObject to make clear that most constructors can hold no-such assumptions + about having a back-pointer to the Document (since many constructors can be used from Workers). + + * bindings/js/JSAudioConstructor.cpp: + (WebCore::JSAudioConstructor::JSAudioConstructor): + * bindings/js/JSAudioConstructor.h: + * bindings/js/JSDOMBinding.h: + (WebCore::DOMObjectWithGlobalPointer::globalObject): + (WebCore::DOMObjectWithGlobalPointer::scriptExecutionContext): + (WebCore::DOMObjectWithGlobalPointer::DOMObjectWithGlobalPointer): + (WebCore::DOMObjectWithGlobalPointer::mark): + (WebCore::DOMConstructorObject::DOMConstructorObject): + (WebCore::DOMConstructorWithDocument::document): + (WebCore::DOMConstructorWithDocument::DOMConstructorWithDocument): + * bindings/js/JSImageConstructor.cpp: + (WebCore::JSImageConstructor::JSImageConstructor): + * bindings/js/JSImageConstructor.h: + * bindings/js/JSMessageChannelConstructor.cpp: + (WebCore::JSMessageChannelConstructor::JSMessageChannelConstructor): + * bindings/js/JSMessageChannelConstructor.h: + * bindings/js/JSOptionConstructor.cpp: + (WebCore::JSOptionConstructor::JSOptionConstructor): + * bindings/js/JSOptionConstructor.h: + * bindings/js/JSWebKitCSSMatrixConstructor.cpp: + (WebCore::JSWebKitCSSMatrixConstructor::JSWebKitCSSMatrixConstructor): + * bindings/js/JSWebKitPointConstructor.cpp: + (WebCore::JSWebKitPointConstructor::JSWebKitPointConstructor): + * bindings/js/JSWorkerConstructor.cpp: + (WebCore::JSWorkerConstructor::JSWorkerConstructor): + * bindings/js/JSXMLHttpRequestConstructor.cpp: + (WebCore::JSXMLHttpRequestConstructor::JSXMLHttpRequestConstructor): + * bindings/js/JSXMLHttpRequestConstructor.h: + * bindings/js/JSXSLTProcessorConstructor.cpp: + (WebCore::JSXSLTProcessorConstructor::JSXSLTProcessorConstructor): + +2009-07-21 James Hawkins + + Reviewed by David Hyatt. + + https://bugs.webkit.org/show_bug.cgi?id=27453 + Initialize isInt when creating a CSSParserValue for a function. + + No change in behavior, so no tests. + + * css/CSSFunctionValue.cpp: + (WebCore::CSSFunctionValue::parserValue): + +2009-07-20 Jens Alfke + + Reviewed by David Levin. + + Bug 27448: [Chromium] On Mac, arrow keys should cause Select to pop up its menu. + Mac build of Chromium doesn't follow Mac HI guidelines to pop up the menu when + an arrow key is pressed. + https://bugs.webkit.org/show_bug.cgi?id=27448 + + No new tests; affects only control response to user input. + + * dom/SelectElement.cpp: + Changed definition of ARROW_KEYS_POP_MENU to make it true in Mac Chromium, + so it will behave compatibly with Mac HI guidelines on pop-up menus. + It's not possible to have PLATFORM(MAC) be true in the Mac build of Chromium. + +2009-07-21 Paul Godavari + + Reviewed by Eric Seidel. + + [Chromium] popup menus can crash when the selected index is -1 + https://bugs.webkit.org/show_bug.cgi?id=27275 + + Crash reports from users indicate a crash can occur when PopupListBox::isSelectableItem + is passed an index of less than 0 (which is possible under certain circumstances). This + change prevents such a value from causing a crash by enforcing valid index values passed + by all callers of isSelectableItem. isSelectableItem is now a private method of + PopupListBox, as there are no external callers. + + Also cleaned up a small amount of code for style and grammar errors. + + No automatic test is provided since we cannot send events to the child window used by + the popup menu. + + * platform/chromium/PopupMenuChromium.cpp: + (WebCore::PopupListBox::acceptIndex): + (WebCore::PopupListBox::selectIndex): + (WebCore::PopupListBox::isSelectableItem): + (WebCore::PopupListBox::selectPreviousRow): + +2009-07-21 Kevin Ollivier + + wx build fix. Don't include winsock2.h on wx, it conflicts with wx's inclusion of winsock. + + * platform/network/curl/ResourceHandleManager.h: + +2009-07-21 Adam Roben + + Roll out r46153, r46154, and r46155 + + These changes were causing build failures and assertion failures on + Windows. + + * ForwardingHeaders/wtf/PossiblyNull.h: Removed. + * platform/graphics/cg/ImageBufferCG.cpp: + +2009-07-21 Jian Li + + Reviewed by Eric Seidel. + + Implement ErrorEvent API. + https://bugs.webkit.org/show_bug.cgi?id=27387 + + * DerivedSources.cpp: + * DerivedSources.make: + * GNUmakefile.am: + * WebCore.gypi: + * WebCore.pro: + * WebCore.vcproj/WebCore.vcproj: + * WebCore.xcodeproj/project.pbxproj: + * WebCoreSources.bkl: + * bindings/js/JSEventCustom.cpp: + (WebCore::toJS): + * dom/ErrorEvent.cpp: Added. + * dom/ErrorEvent.h: Added. + * dom/ErrorEvent.idl: Added. + * dom/Event.cpp: + (WebCore::Event::isErrorEvent): + * dom/Event.h: + +2009-07-21 Priit Laes + + Reviewed by Gustavo Noronha. + + [Gtk] Searching in thepiratebay.org doesn't work with more than 1 word + https://bugs.webkit.org/show_bug.cgi?id=24602 + + Remove workaround required for <=libsoup-2.26.1 + + * platform/network/soup/ResourceHandleSoup.cpp: + (WebCore::restartedCallback): + +2009-07-21 Adam Barth + + Reviewed by David Levin. + + V8IsolatedWorld keeps a handle to a disposed context + https://bugs.webkit.org/show_bug.cgi?id=27397 + + Make a copy of the context handle before making it weak. We don't want + to make the original handle weak because we want it to survive for the + length of the V8IsolatedWorld::evaluate method. + + * bindings/v8/V8IsolatedWorld.cpp: + (WebCore::V8IsolatedWorld::V8IsolatedWorld): + +2009-07-21 Pavel Feldman + + Reviewed by Timothy Hatcher. + + Web Inspector: Add ability to evaluate selection while on break point. + + https://bugs.webkit.org/show_bug.cgi?id=27502 + + * inspector/front-end/SourceFrame.js: + (WebInspector.SourceFrame.prototype._loaded): + (WebInspector.SourceFrame.prototype._documentKeyDown): + +2009-07-21 Pavel Feldman + + Reviewed by Timothy Hatcher. + + WebInspector: Special case ConsolePanel opening since + it is a 'fast view'. + + https://bugs.webkit.org/show_bug.cgi?id=27493 + + * inspector/InspectorController.cpp: + (WebCore::InspectorController::setWindowVisible): + +2009-07-20 Kenneth Rohde Christiansen + + Reviewed by Eric Seidel. + + Fix Qt code to follow the WebKit Coding Style. + + * platform/graphics/qt/FontQt.cpp: + (WebCore::qstring): + (WebCore::fixSpacing): + * platform/graphics/qt/FontQt43.cpp: + (WebCore::generateComponents): + (WebCore::Font::offsetForPositionForComplexText): + (WebCore::cursorToX): + * platform/graphics/qt/GradientQt.cpp: + (WebCore::Gradient::platformGradient): + * platform/graphics/qt/GraphicsContextQt.cpp: + (WebCore::toQtFillRule): + (WebCore::GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate): + (WebCore::GraphicsContext::~GraphicsContext): + (WebCore::GraphicsContext::getCTM): + (WebCore::GraphicsContext::concatCTM): + (WebCore::GraphicsContext::getWindowsContext): + * platform/graphics/qt/IconQt.cpp: + (WebCore::Icon::paint): + * platform/graphics/qt/ImageDecoderQt.cpp: + (WebCore::ImageDecoderQt::ReadContext::read): + (WebCore::ImageDecoderQt::ReadContext::readImageLines): + (WebCore::ImageDecoderQt::setData): + * platform/graphics/qt/ImageQt.cpp: + (WebCore::Image::drawPattern): + (WebCore::BitmapImage::draw): + * platform/graphics/qt/ImageSourceQt.cpp: + (WebCore::ImageSource::frameDurationAtIndex): + (WebCore::ImageSource::frameHasAlphaAtIndex): + (WebCore::ImageSource::frameIsCompleteAtIndex): + * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp: + (WebCore::MediaPlayerPrivate::MediaPlayerPrivate): + (WebCore::MediaPlayerPrivate::create): + (WebCore::MediaPlayerPrivate::bytesLoaded): + (WebCore::MediaPlayerPrivate::updateStates): + * platform/graphics/qt/PathQt.cpp: + (WebCore::Path::addArcTo): + (WebCore::Path::isEmpty): + * platform/graphics/qt/TransformationMatrixQt.cpp: + (WebCore::TransformationMatrix::operator QTransform): + * platform/qt/ClipboardQt.cpp: + (WebCore::ClipboardQt::ClipboardQt): + (WebCore::ClipboardQt::clearData): + (WebCore::ClipboardQt::clearAllData): + (WebCore::ClipboardQt::getData): + (WebCore::ClipboardQt::setData): + (WebCore::ClipboardQt::setDragImage): + (WebCore::getCachedImage): + (WebCore::ClipboardQt::declareAndWriteDragImage): + (WebCore::ClipboardQt::writeURL): + (WebCore::ClipboardQt::writeRange): + (WebCore::ClipboardQt::hasData): + * platform/qt/ClipboardQt.h: + * platform/qt/ContextMenuItemQt.cpp: + (WebCore::ContextMenuItem::action): + (WebCore::ContextMenuItem::title): + * platform/qt/CursorQt.cpp: + (WebCore::westPanningCursor): + (WebCore::notAllowedCursor): + * platform/qt/DragDataQt.cpp: + (WebCore::DragData::containsFiles): + (WebCore::DragData::asFilenames): + (WebCore::DragData::asPlainText): + (WebCore::DragData::asFragment): + * platform/qt/DragImageQt.cpp: + (WebCore::createDragImageIconForCachedImage): + * platform/qt/FileSystemQt.cpp: + (WebCore::getFileSize): + (WebCore::unloadModule): + * platform/qt/Localizations.cpp: + (WebCore::contextMenuItemTagShowSpellingPanel): + * platform/qt/MIMETypeRegistryQt.cpp: + (WebCore::): + * platform/qt/PasteboardQt.cpp: + (WebCore::Pasteboard::Pasteboard): + (WebCore::Pasteboard::writeSelection): + (WebCore::Pasteboard::plainText): + * platform/qt/PlatformKeyboardEventQt.cpp: + (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent): + * platform/qt/PlatformMouseEventQt.cpp: + (WebCore::PlatformMouseEvent::PlatformMouseEvent): + * platform/qt/PopupMenuQt.cpp: + (WebCore::PopupMenu::populate): + * platform/qt/RenderThemeQt.cpp: + (WebCore::RenderThemeQt::fallbackStyle): + (WebCore::inflateButtonRect): + (WebCore::RenderThemeQt::computeSizeBasedOnStyle): + (WebCore::RenderThemeQt::paintButton): + (WebCore::RenderThemeQt::paintMenuList): + (WebCore::RenderThemeQt::applyTheme): + (WebCore::WorldMatrixTransformer::WorldMatrixTransformer): + (WebCore::RenderThemeQt::paintMediaBackground): + (WebCore::RenderThemeQt::paintMediaFullscreenButton): + * platform/qt/RenderThemeQt.h: + * platform/qt/ScreenQt.cpp: + (WebCore::screenRect): + (WebCore::usableScreenRect): + * platform/qt/ScrollbarQt.cpp: + (WebCore::Scrollbar::contextMenu): + * platform/qt/ScrollbarThemeQt.cpp: + (WebCore::scPart): + (WebCore::scrollbarPart): + * platform/qt/ScrollbarThemeQt.h: + * platform/qt/SharedBufferQt.cpp: + (WebCore::SharedBuffer::createWithContentsOfFile): + * platform/qt/TemporaryLinkStubs.cpp: + (PluginDatabase::defaultPluginDirectories): + (PluginDatabase::getPluginPathsInDirectories): + (PluginDatabase::isPreferredPluginDirectory): + (WebCore::getSupportedKeySizes): + (WebCore::signedPublicKeyAndChallengeString): + (WebCore::userIdleTime): + (WebCore::prefetchDNS): + * platform/text/qt/StringQt.cpp: + (WebCore::String::String): + * platform/text/qt/TextBoundaries.cpp: + * platform/text/qt/TextBreakIteratorQt.cpp: + (WebCore::TextBreakIterator::following): + (WebCore::TextBreakIterator::preceding): + (WebCore::WordBreakIteratorQt::first): + (WebCore::WordBreakIteratorQt::next): + (WebCore::WordBreakIteratorQt::previous): + (WebCore::CharBreakIteratorQt::first): + (WebCore::CharBreakIteratorQt::next): + (WebCore::CharBreakIteratorQt::previous): + (WebCore::characterBreakIterator): + * plugins/qt/PluginPackageQt.cpp: + (WebCore::PluginPackage::fetchInfo): + * plugins/qt/PluginViewQt.cpp: + (WebCore::PluginView::userAgentStatic): + (WebCore::PluginView::handlePostReadFile): + (WebCore::PluginView::init): + +2009-07-21 Maxime Simon + + Reviewed by David Levin. + + Added a first bunch of Haiku-specific files for WebCore. + https://bugs.webkit.org/show_bug.cgi?id=26988 + + * platform/haiku/ClipboardHaiku.cpp: Added. + (WebCore::ClipboardHaiku::ClipboardHaiku): + (WebCore::ClipboardHaiku::clearData): + (WebCore::ClipboardHaiku::clearAllData): + (WebCore::ClipboardHaiku::getData): + (WebCore::ClipboardHaiku::setData): + (WebCore::ClipboardHaiku::types): + (WebCore::ClipboardHaiku::files): + (WebCore::ClipboardHaiku::dragLocation): + (WebCore::ClipboardHaiku::dragImage): + (WebCore::ClipboardHaiku::setDragImage): + (WebCore::ClipboardHaiku::dragImageElement): + (WebCore::ClipboardHaiku::setDragImageElement): + (WebCore::ClipboardHaiku::createDragImage): + (WebCore::ClipboardHaiku::declareAndWriteDragImage): + (WebCore::ClipboardHaiku::writeURL): + (WebCore::ClipboardHaiku::writeRange): + (WebCore::ClipboardHaiku::hasData): + * platform/haiku/ClipboardHaiku.h: Added. + (WebCore::ClipboardHaiku::create): + (WebCore::ClipboardHaiku::~ClipboardHaiku): + * platform/haiku/CookieJarHaiku.cpp: Added. + (WebCore::setCookies): + (WebCore::cookies): + (WebCore::cookiesEnabled): + * platform/haiku/CursorHaiku.cpp: Added. + (WebCore::Cursor::Cursor): + (WebCore::Cursor::~Cursor): + (WebCore::Cursor::operator=): + (WebCore::pointerCursor): + (WebCore::moveCursor): + (WebCore::crossCursor): + (WebCore::handCursor): + (WebCore::iBeamCursor): + (WebCore::waitCursor): + (WebCore::helpCursor): + (WebCore::eastResizeCursor): + (WebCore::northResizeCursor): + (WebCore::northEastResizeCursor): + (WebCore::northWestResizeCursor): + (WebCore::southResizeCursor): + (WebCore::southEastResizeCursor): + (WebCore::southWestResizeCursor): + (WebCore::westResizeCursor): + (WebCore::northSouthResizeCursor): + (WebCore::eastWestResizeCursor): + (WebCore::northEastSouthWestResizeCursor): + (WebCore::northWestSouthEastResizeCursor): + (WebCore::columnResizeCursor): + (WebCore::rowResizeCursor): + (WebCore::verticalTextCursor): + (WebCore::cellCursor): + (WebCore::contextMenuCursor): + (WebCore::noDropCursor): + (WebCore::copyCursor): + (WebCore::progressCursor): + (WebCore::aliasCursor): + (WebCore::noneCursor): + (WebCore::notAllowedCursor): + (WebCore::zoomInCursor): + (WebCore::zoomOutCursor): + (WebCore::grabCursor): + (WebCore::grabbingCursor): + +2009-07-21 Albert Astals Cid + + Reviewed by Tor Arne Vestbø. + + Change #error line not to have a ' (single quote) + + * DerivedSources.cpp: + +2009-07-21 Roland Steiner + + Reviewed by David Levin. + + Add ENABLE_RUBY to list of build options + https://bugs.webkit.org/show_bug.cgi?id=27324 + + Added flag ENABLE_RUBY: + + * Configurations/FeatureDefines.xcconfig: + * DerivedSources.make: + * GNUmakefile.am: + * WebCore.pro: + * WebCore.vcproj/WebCoreCommon.vsprops: + * WebCore.vcproj/build-generated-files.sh: + +2009-07-21 James Hawkins + + Reviewed by Eric Seidel. + + https://bugs.webkit.org/show_bug.cgi?id=27467 + Return an empty path in PlatformContextSkia::currentPathInLocalCoordinates + if matrix.invert() fails. This prevents the use of an uninitialized + value in inverseMatrix. + + No new tests added. Run + LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-markerHeight-attr.html + under valgrind and notice there are no errors. + + * platform/graphics/skia/PlatformContextSkia.cpp: + (PlatformContextSkia::currentPathInLocalCoordinates): + +2009-07-21 Stephen White + + Reviewed by Eric Seidel. + + https://bugs.webkit.org/show_bug.cgi?id=27388 + + Fix dotted and dashed borders on Chromium/skia. This follows + the logic in the Cg path, so results are much closer to Safari now + (some tests won't be exactly the same due to font layout differences). + + * platform/graphics/skia/GraphicsContextSkia.cpp: + (WebCore::GraphicsContext::drawLine): + * platform/graphics/skia/PlatformContextSkia.cpp: + (PlatformContextSkia::setupPaintForStroking): + +2009-07-20 Oliver Hunt + + Reviewed by Gavin Barraclough. + + Make it harder to misuse try* allocation routines + https://bugs.webkit.org/show_bug.cgi?id=27469 + + Add forwarding header for PossiblyNull type, and add missing null check + to ImageBuffer creation. + + * ForwardingHeaders/wtf/PossiblyNull.h: Added. + * platform/graphics/cg/ImageBufferCG.cpp: + (WebCore::ImageBuffer::ImageBuffer): + +2009-07-20 Adam Langley + + Reviewed by Eric Seidel. + + Guard access to installedMediaEngines()[0]. + + https://bugs.webkit.org/show_bug.cgi?id=27479 + http://code.google.com/p/chromium/issues/detail?id=16541 + + Else where in the file, installedMediaEngines is always checked for + being empty because access. This patch adds a case which missed that + check. + + This triggered a crash in Chromium: + http://www.yakeze.com/chat/example-chromium-crash/ + + * platform/graphics/MediaPlayer.cpp: + (WebCore::MediaPlayer::load): + +2009-07-20 Adam Langley + + Reviewed by Eric Seidel. + + Allow search entries to render with a CSS border if the RenderTheme + doesn't paint them. + + https://bugs.webkit.org/show_bug.cgi?id=27466 + http://code.google.com/p/chromium/issues/detail?id=16958 + + is very much like a text entry except that, + currently, if the RenderTheme doesn't deal with it, nothing is + rendered. With this patch, the default CSS border is rendered if the + RenderTheme requests it. + + This will affect many layout tests, but only for Chromium Linux and + those results are not currently in the WebKit tree. + + * rendering/RenderTheme.cpp: + (WebCore::RenderTheme::paintBorderOnly): + +2009-07-17 Anton Muhin + + Reviewed by Adam Barth. + + Switch to faster methods to access internal fields. + https://bugs.webkit.org/show_bug.cgi?id=27372 + + Minor refactoring. + + * bindings/scripts/CodeGeneratorV8.pm: + * bindings/v8/V8DOMWrapper.cpp: + (WebCore::V8DOMWrapper::convertToSVGPODTypeImpl): + (WebCore::V8DOMWrapper::setDOMWrapper): + * bindings/v8/V8DOMWrapper.h: + (WebCore::V8DOMWrapper::convertDOMWrapperToNative): + (WebCore::V8DOMWrapper::convertDOMWrapperToNode): + (WebCore::V8DOMWrapper::convertToNativeObject): + (WebCore::V8DOMWrapper::convertToNativeEvent): + * bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8ClipboardCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8DocumentCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8ElementCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8HTMLCanvasElementCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8HTMLSelectElementCustom.cpp: + (WebCore::removeElement): + * bindings/v8/custom/V8InspectorControllerCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8NodeCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8XSLTProcessorCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + +2009-07-20 Adam Langley + + Reviewed by Eric Seidel. + + Chromium Linux: cache Harfbuzz faces. + + https://bugs.webkit.org/show_bug.cgi?id=27473 + + Previously, we recreated the Harfbuzz face for each script-run. With + this patch, we keep the Harfbuzz face in the FontPlatformData (created + as needed) and so they will persist for the duration of the + FontPlatformData. + + Shouldn't affect any layout tests. Results in a significant win on the + intl2 page cycler time. + + * platform/graphics/chromium/FontLinux.cpp: + (WebCore::TextRunWalker::~TextRunWalker): + (WebCore::TextRunWalker::setupFontForScriptRun): + * platform/graphics/chromium/FontPlatformDataLinux.cpp: + (WebCore::FontPlatformData::RefCountedHarfbuzzFace::~RefCountedHarfbuzzFace): + (WebCore::FontPlatformData::FontPlatformData): + (WebCore::FontPlatformData::harfbuzzFace): + * platform/graphics/chromium/FontPlatformDataLinux.h: + (WebCore::FontPlatformData::RefCountedHarfbuzzFace::create): + (WebCore::FontPlatformData::RefCountedHarfbuzzFace::face): + (WebCore::FontPlatformData::RefCountedHarfbuzzFace::RefCountedHarfbuzzFace): + * platform/graphics/chromium/HarfbuzzSkia.h: Added. + +2009-07-20 Ryosuke Niwa + + Reviewed by Simon Fraser. + + REGRESSION (r46142): Need to remove showTreeThisForThis + https://bugs.webkit.org/show_bug.cgi?id=27475 + + Removes showTreeThisForThis + + * editing/IndentOutdentCommand.cpp: + (WebCore::IndentOutdentCommand::appendParagraphIntoNode): + +2009-07-19 Ryosuke Niwa + + Reviewed by Eric Seidel. + + Refactoring of indentRegion to fix bugs 26816 and 25317 + https://bugs.webkit.org/show_bug.cgi?id=26816 + https://bugs.webkit.org/show_bug.cgi?id=25317 + https://bugs.webkit.org/show_bug.cgi?id=23995 (partially) + + This patch implements appendParagraphIntoNode, a simpler specialized version of moveParagraph + and replaces all calls inside indentRegion. The following is the new behavior of indentRegion. + + 1. We try to indent as many wrapping nodes as possible. + e.g. when indenting "hello" in
hello
, we try to indent div as well. + 2. We do not delete any wrapping elements + With moveParagraph, we used to remove all wrapping nodes, and replaced with a blockquote. + This was causing https://bugs.webkit.org/show_bug.cgi?id=23995 for indentation. + With appendParagraphIntoNode, we can preserve all wrapping nodes. + 3. We only split the tree until the closest block node instead of until the root editable node. + This behavioral change fixes the bug 25317. + 4. When multiple paragraphs are indented, we indent the highest common ancestor within the selection. + e.g. when a list is a child node of a div, and the entire div is intended, + we enclose the div by a single blockquote. + + Note that new behavior is more consistent with that of Internet Explorer and Firefox. + To demonstrate this, the following tests are added. + + Tests: editing/execCommand/indent-div-inside-list.html + editing/execCommand/indent-nested-blockquotes.html + editing/execCommand/indent-nested-div.html + editing/execCommand/indent-second-paragraph-in-blockquote.html + + * editing/IndentOutdentCommand.cpp: prepareBlockquoteLevelForInsertion is removed + (WebCore::IndentOutdentCommand::tryIndentingAsListItem): uses appendParagraphIntoNode now + (WebCore::IndentOutdentCommand::indentIntoBlockquote): uses appendParagraphIntoNode now + (WebCore::IndentOutdentCommand::appendParagraphIntoNode): removes a paragraph and appends it to a new node + (WebCore::IndentOutdentCommand::removeUnnecessaryLineBreakAt): removes a break element at the specified position + (WebCore::IndentOutdentCommand::indentRegion): exhibits the described behavior + * editing/IndentOutdentCommand.h: updated prototype + +2009-07-20 Dan Bernstein + + Try to fix release builds after r46136 + + * dom/Element.cpp: + +2009-07-17 Pierre d'Herbemont + + Reviewed by Eric Seidel. + + Media Controls: We are specifying the text height, where it is unneeded and the slider is 2px off. + https://bugs.webkit.org/show_bug.cgi?id=27380 + + Adjust the margin of the slider and remove useless height specification to fix alignement of the media controls. + + * css/mediaControlsQT.css: + +2009-07-20 Peter Kasting + + Reviewed by Mark Rowe. + + https://bugs.webkit.org/show_bug.cgi?id=27468 + Back out r46060, which caused problems for some Apple developers. + + * WebCore.vcproj/QTMovieWin.vcproj: + * WebCore.vcproj/WebCoreCommon.vsprops: + * WebCore.vcproj/WebCoreGenerated.vcproj: + +2009-07-20 Dan Bernstein + + Reviewed by Anders Carlsson. + + When loading a custom view into a frame, the old document is still + around + + + Safari fires onload before PDF is loaded into the browser + + + Test: fast/loader/non-html-load-event.html + + * GNUmakefile.am: Added PlaceholderDocument.{cpp,h} + * WebCore.gypi: Ditto. + * WebCore.pro: Ditto. + * WebCore.vcproj/WebCore.vcproj: Ditto. + * WebCore.xcodeproj/project.pbxproj: Ditto. + * WebCoreSources.bkl: Ditto. + * dom/Document.h: + (WebCore::Document::setStyleSelector): Added this protected accessor for + PlaceholderDocument to use. + * dom/Element.cpp: + (WebCore::Element::clientWidth): Check whether the document has a + renderer. + (WebCore::Element::clientHeight): Ditto. + * loader/FrameLoader.cpp: + (WebCore::FrameLoader::begin): Create a PlaceholderDocument for frames + that do not use an HTML view. Do not nullify the content size in + that case. + (WebCore::FrameLoader::transitionToCommitted): For frames that do not + use an HTML view, call receivedFirstData(), which sets up the + frame with a new PlaceHolderDocument. + * loader/PlaceholderDocument.cpp: Added. + (WebCore::PlaceholderDocument::attach): Sets up the style selector but + does not create a RenderView. + * loader/PlaceholderDocument.h: Added. + (WebCore::PlaceholderDocument::create): + (WebCore::PlaceholderDocument::PlaceholderDocument): + +2009-07-20 Chris Marrin + + Reviewed by Simon Fraser. + + Handle opacity and opacity animations on transform layers in Leopard + https://bugs.webkit.org/show_bug.cgi?id=27398 + + This makes two changes, and only for Leopard. + + First, whenever opacity is changed on a layer I propagate the + change into the content layer and all the children if the layer + on which opacity is set is a transform layer (preserve3D is true). + The opacity set is the accumulated opacity from this layer + and all its direct ancestor transform layers. Second, I turn off all + hardware opacity animation. + + * platform/graphics/GraphicsLayer.cpp: + (WebCore::GraphicsLayer::accumulatedOpacity): + (WebCore::GraphicsLayer::distributeOpacity): + * platform/graphics/GraphicsLayer.h: + (WebCore::GraphicsLayer::setOpacityInternal): + * platform/graphics/mac/GraphicsLayerCA.h: + * platform/graphics/mac/GraphicsLayerCA.mm: + (WebCore::GraphicsLayerCA::setPreserves3D): + (WebCore::GraphicsLayerCA::setOpacity): + (WebCore::GraphicsLayerCA::animateFloat): + (WebCore::GraphicsLayerCA::swapFromOrToTiledLayer): + (WebCore::GraphicsLayerCA::setOpacityInternal): + (WebCore::GraphicsLayerCA::updateOpacityOnLayer): + +2009-07-20 Yong Li + + Reviewed by Adam Roben. + + https://bugs.webkit.org/show_bug.cgi?id=27349 + Add GraphicsContext implementation for the WinCE port. + + Written by Yong Li , George Staikos and Lyon Chen + with trivial style fixes by Adam Treat + + * platform/graphics/wince/GraphicsContextWince.cpp: Added. + +2009-07-20 Dumitru Daniliuc + + Reviewed by Dimitri Glazkov. + + Adding the Win SQLite VFS implementation for Chromium, and stubs + for the Mac and Linux VFSs. + + https://bugs.webkit.org/show_bug.cgi?id=26940 + + * WebCore.gypi: + * platform/chromium/ChromiumBridge.h: + * platform/sql/chromium/SQLiteFileSystemChromium.cpp: Added. + * platform/sql/chromium/SQLiteFileSystemChromiumLinux.cpp: Added. + * platform/sql/chromium/SQLiteFileSystemChromiumMac.cpp: Added. + * platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp: Added. + +2009-07-20 Xan Lopez + + Reviewed by Gustavo Noronha. + + https://bugs.webkit.org/show_bug.cgi?id=27097 + [Gtk] Segfault when examining an object of ROLE_TABLE via at-spi + + Check that an object is a RenderObject before trying to access its + renderer and related node. + + * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: + (webkit_accessible_get_role): + +2009-07-20 Balazs Kelemen + + Reviewed by Simon Hausmann. + + [Qt] font cache reworking + https://bugs.webkit.org/show_bug.cgi?id=27265 + + Reimplemented Qt's FontCache in a way that follows the shared one. + Now we can release its elements when those became inactive. + FontFallbackList had been changed to be able to hold WebCore fonts in its list and to be able to release a FontData what is in the cache. + + No change in behavior, so no tests. + + * platform/graphics/qt/FontCacheQt.cpp: + (WebCore::FontPlatformDataCacheKey::FontPlatformDataCacheKey): + (WebCore::FontPlatformDataCacheKey::isHashTableDeletedValue): + (WebCore::FontPlatformDataCacheKey::): Key type for the cache of FontPlatformData objects. + It can be constructed from a FontPlatformData or from a FontDescription. The keys have to be consistent + with FontPlatformData::FontPlatformData(const FontDescription&) - if we create the same + FontPlatformData from two FontDescription then we have to create the same key from them, and vica versa. + (WebCore::FontPlatformDataCacheKey::operator==): + (WebCore::FontPlatformDataCacheKey::hash): + (WebCore::FontPlatformDataCacheKey::computeHash): + (WebCore::FontPlatformDataCacheKey::hashTableDeletedSize): + (WebCore::FontPlatformDataCacheKeyHash::hash): + (WebCore::FontPlatformDataCacheKeyHash::equal): + (WebCore::FontPlatformDataCacheKeyTraits::emptyValue): + (WebCore::FontPlatformDataCacheKeyTraits::constructDeletedValue): + (WebCore::FontPlatformDataCacheKeyTraits::isDeletedValue): + (WebCore::FontCache::getCachedFontPlatformData): Get a FontDescription and returns a FontPlatformData. + (WebCore::FontCache::getCachedFontData): Get a FontPlatformData and returns a SimpleFontData. + (WebCore::FontCache::releaseFontData): Get a SimpleFontData and releases it from the cache. Also releases the appropriate FontPlatformData. + (WebCore::FontCache::purgeInactiveFontData): Frees inactive elements. + (WebCore::FontCache::invalidate): Frees all inactive elements (call purgeInactiveFontData with default argument) + * platform/graphics/qt/FontFallbackListQt.cpp: + (WebCore::FontFallbackList::releaseFontData): + (WebCore::FontFallbackList::fontDataAt): + * platform/graphics/qt/FontPlatformData.h: + (WebCore::FontPlatformData::family): Getter. It is needed for FontPlatformDataCacheKey. + (WebCore::FontPlatformData::bold): Ditto. + (WebCore::FontPlatformData::italic): Ditto. + (WebCore::FontPlatformData::smallCaps): Ditto. + (WebCore::FontPlatformData::pixelSize): Ditto. + * platform/graphics/qt/FontPlatformDataQt.cpp: + (WebCore::FontPlatformData::FontPlatformData): Set m_bold. + +2009-07-20 Xan Lopez + + Reviewed by Holger Freyther. + + https://bugs.webkit.org/show_bug.cgi?id=26716 + [Gtk] Each XMLHttpRequest leaks memory. + + Free the SoupURI we create to check the URI. Fix suggested by John + Kjellberg. + + * platform/network/soup/ResourceHandleSoup.cpp: + (WebCore::): + +2009-07-20 Laszlo Gombos + + Reviewed by Holger Freyther. + + [Qt] On Symbian link against system sqlite3 + https://bugs.webkit.org/show_bug.cgi?id=27368 + + Add an option to force linking against system sqlite3 + by adding system-sqlite to the CONFIG variable. + + The Symbian specific part of this patch is contributed by + Norbert Leser. + + * WebCore.pro: + +2009-07-20 Xan Lopez + + Reviewed by Gustavo Noronha. + + Change the glib version check to check for the first unstable + release with g_mapped_file_unref. Otherwise this would be useless + until 2.22 is released, a few months from now. + + * platform/network/soup/ResourceHandleSoup.cpp: + (WebCore::ResourceHandle::startHttp): + +2009-07-20 Simon Hausmann + + Reviewed by and done with Tor Arne Vestbø. + + Fix fast/css/pseudo-required-optional-*.html in the Qt build + after r46062. + + These tests triggered a bug in RenderThemeQt where we did not fall back + to the unstyled painting of text areas and input fields when they have + a styled background. + + Our re-implementation of isControlStyled incorrectly only checked the + border for determining whether to style or not. The base-implementation + performs the same check, but also includes the background. Removing + our implementation fixes the appearance. + + * platform/qt/RenderThemeQt.cpp: Removed isControlStyled reimplementation. + * platform/qt/RenderThemeQt.h: Ditto. + +2009-07-20 Simon Hausmann + + Rubber-stamped by Tor Arne Vestbø. + + Add missing (sorted) header files to the HEADERS variable in the qmake + .pro file for improved completion in IDEs. + + * WebCore.pro: + +2009-07-19 Adam Barth + + Reviewed by David Levin. + + [V8] Factor V8ConsoleMessage out of V8Proxy + https://bugs.webkit.org/show_bug.cgi?id=27421 + + No behavior change. + + * WebCore.gypi: + * bindings/v8/V8ConsoleMessage.cpp: Added. + (WebCore::V8ConsoleMessage::V8ConsoleMessage): + (WebCore::V8ConsoleMessage::dispatchNow): + (WebCore::V8ConsoleMessage::dispatchLater): + (WebCore::V8ConsoleMessage::processDelayed): + (WebCore::V8ConsoleMessage::handler): + * bindings/v8/V8ConsoleMessage.h: Added. + (WebCore::V8ConsoleMessage::Scope::Scope): + (WebCore::V8ConsoleMessage::Scope::~Scope): + * bindings/v8/V8Proxy.cpp: + (WebCore::logInfo): + (WebCore::reportUnsafeAccessTo): + (WebCore::V8Proxy::runScript): + (WebCore::V8Proxy::callFunction): + (WebCore::V8Proxy::newInstance): + (WebCore::V8Proxy::initContextIfNeeded): + (WebCore::V8Proxy::processConsoleMessages): + +2009-07-19 Rob Buis + + Reviewed by Adam Barth. + + Remove unused member variable. + + * svg/SVGPolyElement.h: + +2009-07-19 Eric Carlson + + Reviewed by Dan Bernstein. + + HTMLAudioElement: constructor should set "autobuffer" attribute + https://bugs.webkit.org/show_bug.cgi?id=27422 + + Test: media/audio-constructor-autobuffer.html + + * bindings/js/JSAudioConstructor.cpp: + (WebCore::constructAudio): + Set 'autobuffer' attribute. + +2009-07-19 Thierry Bastian + + Reviewed by Simon Hausmann. + + Fix the Qt build with mingw. + + * WebCore.pro: Don't use MSVC commandline options to disable warnings + with mingw. + +2009-07-19 Adam Barth + + Reviewed by David Levin. + + [V8] Phase 2: Remove event listener methods from V8Proxy + https://bugs.webkit.org/show_bug.cgi?id=27415 + + No behavior change. + + * bindings/v8/V8ObjectEventListener.cpp: + (WebCore::weakObjectEventListenerCallback): + (WebCore::V8ObjectEventListener::~V8ObjectEventListener): + * bindings/v8/V8Proxy.cpp: + (WebCore::V8Proxy::disconnectEventListeners): + * bindings/v8/V8Proxy.h: + (WebCore::V8Proxy::eventListeners): + (WebCore::V8Proxy::objectListeners): + * bindings/v8/custom/V8AbstractWorkerCustom.cpp: + (WebCore::getEventListener): + * bindings/v8/custom/V8CustomEventListener.cpp: + (WebCore::V8EventListener::~V8EventListener): + * bindings/v8/custom/V8DOMWindowCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + (WebCore::ACCESSOR_SETTER): + * bindings/v8/custom/V8ElementCustom.cpp: + (WebCore::ACCESSOR_SETTER): + * bindings/v8/custom/V8MessagePortCustom.cpp: + (WebCore::ACCESSOR_SETTER): + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8NodeCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8SVGElementInstanceCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8WorkerCustom.cpp: + (WebCore::getEventListener): + * bindings/v8/custom/V8XMLHttpRequestCustom.cpp: + (WebCore::getEventListener): + * bindings/v8/custom/V8XMLHttpRequestUploadCustom.cpp: + (WebCore::ACCESSOR_SETTER): + (WebCore::CALLBACK_FUNC_DECL): + +2009-07-18 Jan Michael Alonzo + + Reviewed by Gustavo Noronha. + + [Gtk] soup/ResourceHandleSoup.cpp:533: error: 'g_mapped_file_free' was not declared in this scope + https://bugs.webkit.org/show_bug.cgi?id=27230 + + Use g_mapped_file_unref for GLIB version 2.22 onwards. + + * platform/network/soup/ResourceHandleSoup.cpp: + (WebCore::ResourceHandle::startHttp): + +2009-07-18 Dan Bernstein + + Reviewed by Anders Carlsson. + + Add spread radius support to -webkit-box-shadow + https://bugs.webkit.org/show_bug.cgi?id=27417 + rdar://problem/7072267 + + Test: fast/box-shadow/spread.html + + * css/CSSComputedStyleDeclaration.cpp: + (WebCore::valueForShadow): Added a property ID parameter and used it to + include the spread length for box-shadow but not for text-shadow. + (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): + Pass the property ID to valueForShadow(). + + * css/CSSParser.cpp: + (WebCore::ShadowParseContext::ShadowParseContext): Added property, + spread, and allowSpread members. Added a property ID parameter to + the constructor. Initialize the property and allowSpread members. + (WebCore::ShadowParseContext::allowLength): Added allowSpread. + (WebCore::ShadowParseContext::commitValue): Pass the spread value to + the ShadowValue constructor. Reset allowSpread. + (WebCore::ShadowParseContext::commitLength): Allow spread after blur + for the box-shadow property. + (WebCore::ShadowParseContext::commitColor): Reset allowSpread. + (WebCore::CSSParser::parseShadow): Pass the property ID to + ShadowParseContext(). + + * css/CSSStyleSelector.cpp: + (WebCore::CSSStyleSelector::applyProperty): Get the spread value from + the shadow value and pass it to the ShadowData constructor. + + * css/ShadowValue.cpp: + (WebCore::ShadowValue::ShadowValue): Added spread. + (WebCore::ShadowValue::cssText): Added spread. + + * css/ShadowValue.h: + (WebCore::ShadowValue::create): Added spread. + + * page/animation/AnimationBase.cpp: + (WebCore::blendFunc): Blend the spread value. + (WebCore::PropertyWrapperShadow::blend): Added 0 spread to the default + shadow. + + * rendering/InlineFlowBox.cpp: + (WebCore::InlineFlowBox::placeBoxesHorizontally): Account for spread in + the visual overflow calculations. + (WebCore::InlineFlowBox::placeBoxesVertically): Ditto. + (WebCore::InlineFlowBox::paint): Ditto. + + * rendering/RenderBlock.cpp: + (WebCore::RenderBlock::overflowHeight): Ditto. + (WebCore::RenderBlock::overflowWidth): Ditto. + (WebCore::RenderBlock::overflowLeft): Ditto. + (WebCore::RenderBlock::overflowTop): Ditto. + (WebCore::RenderBlock::overflowRect): Ditto. + (WebCore::RenderBlock::layoutBlock): Ditto. + + * rendering/RenderBoxModelObject.cpp: + (WebCore::RenderBoxModelObject::paintBoxShadow): Inflate the shadow- + casting rect by the shadow spread value. Adjust border radii if + necessary. + + * rendering/RenderFlexibleBox.cpp: + (WebCore::RenderFlexibleBox::layoutBlock): Account for spread in the + visual overflow calculations. + * rendering/RenderLayer.cpp: + (WebCore::RenderLayer::calculateRects): Ditto. + + * rendering/RenderObject.cpp: + (WebCore::RenderObject::repaintAfterLayoutIfNeeded): Account for spread. + (WebCore::RenderObject::adjustRectForOutlineAndShadow): Ditto. + + * rendering/RenderReplaced.cpp: + (WebCore::RenderReplaced::adjustOverflowForBoxShadowAndReflect): Ditto. + + * rendering/style/RenderStyle.cpp: + (WebCore::RenderStyle::setTextShadow): Assert that text shadows do not + have spread. + + * rendering/style/ShadowData.cpp: + (WebCore::ShadowData::ShadowData): Added spread. + (WebCore::ShadowData::operator==): Compare spread. + * rendering/style/ShadowData.h: + (WebCore::ShadowData::ShadowData): Added spread. + +2009-07-18 Adam Barth + + Reviewed by Jan Alonzo. + + Minor FrameLoader.cpp cleanup + https://bugs.webkit.org/show_bug.cgi?id=27406 + + No behavior change. + + * loader/FrameLoader.cpp: + (WebCore::FrameLoader::executeIfJavaScriptURL): + +2009-07-18 Adam Barth + + Reviewed by Darin Fisher. + + [V8] Move event listener methods from V8Proxy to V8EventListenerList + https://bugs.webkit.org/show_bug.cgi?id=27408 + + Move some event listener code out of V8Proxy and into the event + listener list. + + I'd like to remove these methods from V8Proxy entirely and just expose + getters for the lists themselves, but I'll do that in a follow up + patch. + + * bindings/v8/V8EventListenerList.cpp: + (WebCore::V8EventListenerList::findWrapper): + * bindings/v8/V8EventListenerList.h: + (WebCore::V8EventListenerList::findOrCreateWrapper): + * bindings/v8/V8ObjectEventListener.cpp: + * bindings/v8/V8Proxy.cpp: + (WebCore::V8Proxy::findV8EventListener): + (WebCore::V8Proxy::findOrCreateV8EventListener): + (WebCore::V8Proxy::removeV8EventListener): + (WebCore::V8Proxy::findObjectEventListener): + (WebCore::V8Proxy::findOrCreateObjectEventListener): + (WebCore::V8Proxy::removeObjectEventListener): + * bindings/v8/V8Proxy.h: + +2009-07-18 Jeremy Orlow + + Rubber stamped by Adam Barth. + + Revert https://bugs.webkit.org/show_bug.cgi?id=27383 + https://bugs.webkit.org/show_bug.cgi?id=27407 + + Revert Jens' patch. I believe he forgot to include a file. + + * WebCore.gypi: + * bindings/scripts/CodeGeneratorV8.pm: + * bindings/v8/DOMObjectsInclude.h: + * bindings/v8/V8DOMWrapper.cpp: + (WebCore::V8DOMWrapper::getTemplate): + * bindings/v8/V8DataGridDataSource.cpp: Removed. + * bindings/v8/V8DataGridDataSource.h: Removed. + * bindings/v8/V8GCController.h: + * bindings/v8/V8Index.h: + * bindings/v8/custom/V8CustomBinding.h: + * bindings/v8/custom/V8HTMLDataGridElementCustom.cpp: + (WebCore::ACCESSOR_GETTER): + (WebCore::ACCESSOR_SETTER): + +2009-07-17 Daniel Bates + + Reviewed by Adam Barth. + + https://bugs.webkit.org/show_bug.cgi?id=27405 + + Fixes an issue when decoding HTML entities with an unknown named entity that + caused null-characters to be inserted into the decoded result. + + Test: http/tests/security/xssAuditor/link-onclick-ampersand.html + http/tests/security/xssAuditor/javascript-link-ampersand.html + + * page/XSSAuditor.cpp: + (WebCore::XSSAuditor::decodeHTMLEntities): Added check to conditional so that + non-zero entity values are not inserted during decoding process. + +2009-07-17 Jan Michael Alonzo + + [GTK] Combo boxes cannot be opened pressing space + + Reviewed by Holger Freyther. + + Add Gtk to platforms that want to open the menulist using the + spacebar. + + * dom/SelectElement.cpp: + (WebCore::SelectElement::menuListDefaultEventHandler): + +2009-07-17 Mario Sanchez Prada + + Reviewed by Jan Alonzo. + + https://bugs.webkit.org/show_bug.cgi?id=25523 + [GTK] The text displayed by push buttons is not exposed to assistive technologies + + Add new public method text() to RenderButton and use it from + AccessibilityRenderObject::stringValue(). + + * accessibility/AccessibilityRenderObject.cpp: + (WebCore::AccessibilityRenderObject::stringValue): + * rendering/RenderButton.cpp: + (WebCore::RenderButton::text): + * rendering/RenderButton.h: + +2009-07-17 Anton Muhin + + Reviewed by Dimitri Glazkov. + + Restore proxy retrieval + https://bugs.webkit.org/show_bug.cgi?id=27369 + + No new tests are needed. + + * bindings/v8/V8DOMWrapper.cpp: + (WebCore::V8DOMWrapper::instantiateV8Object): + +2009-07-17 Yael Aharon + + Reviewed by George Staikos. + + https://bugs.webkit.org/show_bug.cgi?id=27351 + Added platform "Symbian" to WEBCORE_NAVIGATOR_PLATFORM + Use uname to find the correct platform for Linux. + + * page/NavigatorBase.cpp: + (WebCore::NavigatorBase::platform): + +2009-07-17 Jens Alfke + + Reviewed by Dimitri Glazkov. + + Hook up V8 bindings for DataGrid elements. + https://bugs.webkit.org/show_bug.cgi?id=27383 + http://code.google.com/p/chromium/issues/detail?id=16730 + + Tests: Enhanced LayoutTests/fast/dom/HTMLDataGridElement/* + to handle exceptions, check appropriate JS prototypes, and + test column-list's item() method as well as array-indexing. + + * WebCore.gypi: Added new source files. + * bindings/scripts/CodeGeneratorV8.pm: Made GenerateBatchedAttributeData put #if's around conditional attributes. + * bindings/v8/DOMObjectsInclude.h: #include DataGrid headers. + * bindings/v8/V8DOMWrapper.cpp: Add bindings from HTML tags to datagrid templates. + (WebCore::V8DOMWrapper::getTemplate): Customize datagrid template. + * bindings/v8/V8DataGridDataSource.cpp: Added. (Based on JSDataGridDataSource) + (WebCore::V8DataGridDataSource::V8DataGridDataSource): + (WebCore::V8DataGridDataSource::~V8DataGridDataSource): + * bindings/v8/V8DataGridDataSource.h: Added. (Based on JSDataGridDataSource) + (WebCore::V8DataGridDataSource::create): + (WebCore::V8DataGridDataSource::isJSDataGridDataSource): + (WebCore::V8DataGridDataSource::jsDataSource): + (WebCore::asV8DataGridDataSource): + * bindings/v8/V8GCController.h: Added new handle type "DATASOURCE". + * bindings/v8/V8Index.h: Conditionalize datagrid stuff. + * bindings/v8/custom/V8CustomBinding.h: Declare more accessors. Conditionalize. + * bindings/v8/custom/V8HTMLDataGridElementCustom.cpp: Fill in dataSource accessors. + (WebCore::ACCESSOR_GETTER): + (WebCore::ACCESSOR_SETTER): + +2009-07-17 Jeremy Orlow + + Reviewed by Darin Fisher. + + StorageArea should only contain methods we intend to proxy. + https://bugs.webkit.org/show_bug.cgi?id=27181 + + Right now, StorageAreaSync takes in a StorageArea* and calls methods + like importItem. Really, StorageAreaSync should be operating directly + on StorageAreaImpl* and those methods should be removed from StorageArea + since StorageAreaSync should never be attached to anything other than a + StorageAreaImpl. + + This was pointed out in the review for + https://bugs.webkit.org/show_bug.cgi?id=27072 + + Also clean up StorageNamespaceImpl to operate directly on + StorageAreaImpl. Also, get rid of the factory for StorageArea + since nothing should ever create a StorageArea directly. + + * GNUmakefile.am: + * WebCore.vcproj/WebCore.vcproj: + * WebCore.xcodeproj/project.pbxproj: + * WebCoreSources.bkl: + * storage/StorageArea.cpp: Removed. + * storage/StorageArea.h: + (WebCore::StorageArea::~StorageArea): + * storage/StorageAreaImpl.cpp: + (WebCore::StorageAreaImpl::copy): + * storage/StorageAreaImpl.h: + * storage/StorageAreaSync.cpp: + (WebCore::StorageAreaSync::create): + (WebCore::StorageAreaSync::StorageAreaSync): + * storage/StorageAreaSync.h: + * storage/StorageNamespaceImpl.cpp: + (WebCore::StorageNamespaceImpl::copy): + (WebCore::StorageNamespaceImpl::storageArea): + * storage/StorageNamespaceImpl.h: + +2009-07-17 Jeremy Orlow + + Reviewed by Dimitri Glazkov. + + Add v8 implementation for DOM Storage ScriptObjectQuarantine. + https://bugs.webkit.org/show_bug.cgi?id=27327 + + Wrap the storage object with a generic object as is done elsewhere in + the file (but continue to hit a NOTIMPLEMENTED if DOM_STORAGE is not + enabled. + + * bindings/v8/ScriptObjectQuarantine.cpp: + (WebCore::getQuarantinedScriptObject): + +2009-07-17 Mads Ager + + Reviewed by Dimitri Glazkov. + + https://bugs.webkit.org/show_bug.cgi?id=27394 + Fix access to global object wrappers after navigation of their + frame in the V8 bindings. This fixes selenium test failures. + + * bindings/v8/V8Proxy.cpp: + (WebCore::V8Proxy::updateDocument): + +2009-07-17 Mark Rowe + + Fix the 32-bit build by removing implicit float <-> double conversions. + + * inspector/InspectorController.cpp: + (WebCore::constrainedAttachedWindowHeight): + +2009-07-17 Brian Weinstein + + Reviewed by Adam Roben. + + Fix of Win: Cannot change the height of the docked Web Inspector (14272) + https://bugs.webkit.org/show_bug.cgi?id=14272 + + Moved preference setting for attached inspector height and inspector height calculation from + WebInspectorClient.mm into InspectorController.cpp, to make this code cross-platform and enable + Windows resizing of attached inspector. + + * inspector/InspectorController.cpp: + * inspector/InspectorController.h: + +2009-07-17 Dan Bernstein + + Another attempt at fixing the build after r46063 + + * WebCore.xcodeproj/project.pbxproj: Made ExceptionCode.h a private + header, because it is now included from htmlediting.h, which is + a private header. + +2009-07-17 Alexey Proskuryakov + + Reviewed by Dan Bernstein. + + https://bugs.webkit.org/show_bug.cgi?id=27396 + Moving cursor in Thai text sometimes jumps over two characters + + Test: editing/text-iterator/thai-cursor-movement.html + + * platform/text/TextBreakIteratorICU.cpp: (WebCore::cursorMovementIterator): Added a special + case for five Thai characters, matching ICU/CLDR changes. + +2009-07-14 Eric Seidel + + Reviewed by Adam Barth. + + Some constructor objects exposed on Window have the wrong prototype chain + https://bugs.webkit.org/show_bug.cgi?id=27276 + + Several Constructor classes were already being passed a global object + during construction, but they were ignoring it for prototype lookup. + I've fixed those to use the passed global object instead. + + Most of these Constructor classes should just be auto-generated, but I + refrained from changing them over to auto-gen in this patch. + + Fixed CodeGeneratorJS to pass a global object to getDOMConstructor when + available, otherwise default to deprecatedGlobalObjectForPrototype(exec) + to match existing behavior. + + Test: fast/dom/prototype-inheritance.html + + * bindings/js/JSAudioConstructor.cpp: + (WebCore::JSAudioConstructor::JSAudioConstructor): use the existing globalObject pointer for prototype lookup + * bindings/js/JSDOMBinding.h: + (WebCore::deprecatedGlobalObjectForPrototype): Make it easy to detect where the wrong global object is being used. + (WebCore::deprecatedGetDOMStructure): + * bindings/js/JSDOMGlobalObject.h: remove error-prone getDOMConstructor, require passing JSDOMGlobalObject* + * bindings/js/JSDOMWindowCustom.cpp: + (WebCore::JSDOMWindow::webKitPoint): pass "this" for the global object. + (WebCore::JSDOMWindow::webKitCSSMatrix): pass "this" for the global object. + (WebCore::JSDOMWindow::xsltProcessor): pass "this" for the global object. + (WebCore::JSDOMWindow::worker): pass "this" for the global object. + * bindings/js/JSImageConstructor.cpp: + (WebCore::JSImageConstructor::JSImageConstructor): use the existing globalObject pointer for prototype lookup + * bindings/js/JSMessageChannelConstructor.cpp: + (WebCore::JSMessageChannelConstructor::JSMessageChannelConstructor): use the existing globalObject pointer for prototype lookup + * bindings/js/JSOptionConstructor.cpp: + (WebCore::JSOptionConstructor::JSOptionConstructor): use the existing globalObject pointer for prototype lookup + * bindings/js/JSWebKitCSSMatrixConstructor.cpp: + (WebCore::JSWebKitCSSMatrixConstructor::JSWebKitCSSMatrixConstructor): add new globalObject parameter and use it + * bindings/js/JSWebKitCSSMatrixConstructor.h: + * bindings/js/JSWebKitPointConstructor.cpp: + (WebCore::JSWebKitPointConstructor::JSWebKitPointConstructor): add new globalObject parameter and use it + * bindings/js/JSWebKitPointConstructor.h: + * bindings/js/JSWorkerConstructor.cpp: + (WebCore::JSWorkerConstructor::JSWorkerConstructor): add new globalObject parameter and use it + * bindings/js/JSWorkerConstructor.h: + * bindings/js/JSXMLHttpRequestConstructor.cpp: + (WebCore::JSXMLHttpRequestConstructor::JSXMLHttpRequestConstructor): use the existing globalObject pointer for prototype lookup + -- XMLHttpRequest constructor was also missing a length. Added one. + * bindings/js/JSXSLTProcessorConstructor.cpp: + (WebCore::JSXSLTProcessorConstructor::JSXSLTProcessorConstructor): + * bindings/js/JSXSLTProcessorConstructor.h: + * bindings/scripts/CodeGeneratorJS.pm: + +2009-07-17 Dan Bernstein + + Build fix + + * editing/htmlediting.cpp: + (WebCore::visiblePositionBeforeNode): + (WebCore::visiblePositionAfterNode): + +2009-07-17 Jan Michael Alonzo + + Gtk build fix for symbol lookup error. + + Move AbstractWorker from SHARED_WORKERS to WORKERS as Worker derives from it now + Changed in http://trac.webkit.org/changeset/46048 + + * GNUmakefile.am: + +2009-07-17 Ryosuke Niwa + + Reviewed by Eric Seidel. + + htmlediting.cpp needs more utility functions to fix the bug 26816 + https://bugs.webkit.org/show_bug.cgi?id=27038 + + In order to fix the bug 26816, we need several utility functions be added to htmlediting.cpp + + No tests because functions haven't been used anywhere yet. + + * dom/Range.cpp: + (WebCore::Range::create): + (WebCore::Range::comparePoint): added const qualifier + (WebCore::Range::compareNode): added const qualifier + * dom/Range.h: + * editing/htmlediting.cpp: + (WebCore::unsplittableElementForPosition): find the enclosing unsplittable element (editing root & table cell) + (WebCore::positionBeforeNode): added ASSERT(node) + (WebCore::positionAfterNode): added ASSERT(node) + (WebCore::visiblePositionBeforeNode): + (WebCore::visiblePositionAfterNode): + (WebCore::createRange): create a range object from two visible positions + (WebCore::extendRangeToWrappingNodes): extend range to include nodes that starts and ends at the boundaries + (WebCore::canMergeLists): typo + (WebCore::indexForVisiblePosition): added const qualifier + (WebCore::isVisiblyAdjacent): typo + (WebCore::isNodeVisiblyContainedWithin): determine if a node is inside a range or within the visible boundaries of the range + * editing/htmlediting.h: + +2009-07-17 Michelangelo De Simone + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=25551 + Added support for the "required" attribute, the valueMissing flag + to the ValidityState object and :required/:optional CSS pseudoclasses. + Part of HTML5 sec. Forms specs. + http://www.whatwg.org/specs/web-apps/current-work/multipage/forms.html#attr-input-required + + Tests: fast/css/pseudo-required-optional-001.html + fast/css/pseudo-required-optional-002.html + fast/css/pseudo-required-optional-003.html + fast/css/pseudo-required-optional-004.html + fast/css/pseudo-required-optional-005.html + fast/css/pseudo-required-optional-006.html + fast/forms/ValidityState-valueMissing-001.html + fast/forms/ValidityState-valueMissing-002.html + fast/forms/ValidityState-valueMissing-003.html + fast/forms/ValidityState-valueMissing-004.html + fast/forms/ValidityState-valueMissing-005.html + fast/forms/ValidityState-valueMissing-006.html + fast/forms/ValidityState-valueMissing-007.html + fast/forms/ValidityState-valueMissing-008.html + fast/forms/ValidityState-valueMissing-009.html + fast/forms/required-attribute-001.html + fast/forms/required-attribute-002.html + + * css/CSSSelector.cpp: + (WebCore::CSSSelector::extractPseudoType): pseudoRequired/pseudoOptional + * css/CSSSelector.h: + (WebCore::CSSSelector::): ditto + * css/CSSStyleSelector.cpp: + (WebCore::CSSStyleSelector::SelectorChecker::checkOneSelector): ditto + * dom/Element.h: + (WebCore::Element::isOptionalFormControl): check for optional controls + (WebCore::Element::isRequiredFormControl): check for required controls + * html/HTMLAttributeNames.in: required attribute + * html/HTMLButtonElement.h: + (WebCore::HTMLButtonElement::isOptionalFormControl): ditto + * html/HTMLFormControlElement.cpp: + (WebCore::HTMLFormControlElement::required): requiredAttr getter + (WebCore::HTMLFormControlElement::setRequired): requiredAttr setter + * html/HTMLFormControlElement.h: + (WebCore::HTMLFormControlElement::valueMissing): method definition + * html/HTMLInputElement.cpp: + (WebCore::HTMLInputElement::valueMissing): validation code + (WebCore::HTMLInputElement::isRequiredFormControl): ditto + * html/HTMLInputElement.h: + (WebCore::HTMLInputElement::isOptionalFormControl): ditto + * html/HTMLInputElement.idl: required DOM attribute + * html/HTMLSelectElement.h: + (WebCore::HTMLSelectElement::isOptionalFormControl): ditto + * html/HTMLTextAreaElement.h: + (WebCore::HTMLTextAreaElement::valueMissing): validation code + (WebCore::HTMLTextAreaElement::isOptionalFormControl): ditto + (WebCore::HTMLTextAreaElement::isRequiredFormControl): ditto + * html/HTMLTextAreaElement.idl: required DOM attribute + * html/ValidityState.cpp: + * html/ValidityState.h: + (WebCore::ValidityState::valueMissing): validation flag + +2009-07-17 Beth Dakin + + Reviewed by Darin Adler. + + Fix for https://bugs.webkit.org/show_bug.cgi?id=27390 CSS custom + cursor hotspots should work in quirks mode + - and corresponding + + Enable hotspots in quirks mode. + * css/CSSParser.cpp: + (WebCore::CSSParser::parseValue): + + Update this manual test to reflect the fact that hotspots are now + expected to work in quirks mode. + * manual-tests/css3-cursor-fallback-quirks.html: + +2009-07-17 Peter Kasting + + Reviewed by Steve Falkenburg. + + https://bugs.webkit.org/show_bug.cgi?id=27323 + Only add Cygwin to the path when it isn't already there. This avoids + causing problems for people who purposefully have non-Cygwin versions of + executables like svn in front of the Cygwin ones in their paths. + + * WebCore.vcproj/QTMovieWin.vcproj: + * WebCore.vcproj/WebCoreCommon.vsprops: + * WebCore.vcproj/WebCoreGenerated.vcproj: + +2009-07-17 Alexey Proskuryakov + + Reviewed by David Levin. + + https://bugs.webkit.org/show_bug.cgi?id=27384 + Random crashes in appcache/update-cache.html test + + * loader/appcache/ApplicationCacheGroup.cpp: + (WebCore::ApplicationCacheGroup::didReceiveResponse): Reorder code to avoid using a handle + after canceling it. + +2009-07-17 Drew Wilson + + Reviewed by David Levin. + + Need to refactor Worker to derive from AbstractWorker + https://bugs.webkit.org/show_bug.cgi?id=26948 + + Changed Worker to derive from AbstractWorker, which involved moving + AbstractWorker files from being wrapped by ENABLE_SHARED_WORKERS to + ENABLE_WORKERS. + + Removed obsolete functionality from the JS/V8 bindings that is now + inherited from AbstractWorker. + + * WebCore.pro: + Moved AbstractWorker files out of SHARED_WORKERS section and into WORKERS. + * bindings/js/JSAbstractWorkerCustom.cpp: + Changed to be wrapped by ENABLE(WORKERS), not ENABLE(SHARED_WORKERS). + * bindings/js/JSWorkerCustom.cpp: + Removed obsolete event listener code (now in base class) + (WebCore::JSWorker::mark): + No longer need to explicitly mark event listeners (handled by base class). + * bindings/v8/V8Index.h: + Moved AbstractWorker lines out of SHARED_WORKERS section and into WORKERS. + * bindings/v8/custom/V8AbstractWorkerCustom.cpp: + Changed to be wrapped by ENABLE(WORKERS), not ENABLE(SHARED_WORKERS). + * bindings/v8/custom/V8CustomBinding.h: + Moved AbstractWorker lines out of SHARED_WORKERS section and into WORKERS. + * bindings/v8/custom/V8WorkerCustom.cpp: + Removed obsolete event listener code that now lives in the base class. + (WebCore::V8WorkerConstructor): Cleaned up legacy style nits. + * workers/AbstractWorker.cpp: + Changed to be wrapped by ENABLE(WORKERS), not ENABLE(SHARED_WORKERS). + * workers/AbstractWorker.h: + Changed to be wrapped by ENABLE(WORKERS), not ENABLE(SHARED_WORKERS). + * workers/Worker.cpp: + Removed event listener code (now in base class). + (WebCore::Worker::Worker): Now derives from AbstractWorker. + (WebCore::Worker::notifyFinished): Calls dispatchLoadErrorEvent on base class. + * workers/Worker.h: + Removed APIs that now live in the base class. + * workers/Worker.idl: + Now derives from AbstractWorker. + Removed APIs that live in the base class, and added a GenerateToJS flag. + +2009-07-17 David Hyatt + + Reviewed by Dan Bernstein. + + https://bugs.webkit.org/show_bug.cgi?id=27379 + Absolutely-positioned elements with a scrollbar wrap prematurely. Make sure to include + the vertical scrollbar width for overflow:scroll elements. + + Added fast/css/positioned-overflow-scroll.html + + * rendering/RenderBlock.cpp: + (WebCore::RenderBlock::calcPrefWidths): + * rendering/RenderFlexibleBox.cpp: + (WebCore::RenderFlexibleBox::calcPrefWidths): + +2009-07-17 Jeremy Orlow + + Reviewed by Dimitri Glazkov. + + Need a DOM_STORAGE guard in DerivedSroucesAllInOne.cpp + https://bugs.webkit.org/show_bug.cgi?id=27375 + + In https://bugs.webkit.org/show_bug.cgi?id=27360 I added Storage.cpp + and StorageEvent.cpp. Unfortunately, until later this afternoon, + DOM_STORAGE is not turned on by default in Chromium, and so these two + files are never generated. This breaks the compile. + + There are no other instances of guards in the file, which puzzles me... + but I think adding guards is the right way to go about this. + + * bindings/v8/DerivedSourcesAllInOne.cpp: Added the guard. + +2009-07-17 Brady Eidson + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=26496 + + Let WebCore always enforce the connection-per-host limit itself. + + * loader/loader.cpp: + (WebCore::Loader::Host::servePendingRequests): + +2009-07-17 Chris Marrin + + Reviewed by David Hyatt. + + Some transitions don't work correctly on Leopard + https://bugs.webkit.org/show_bug.cgi?id=27356 + + We only have code to do component animation using valueFunction. + So on Leopard we always need to do matrix animation in hardware. + This fix ensures that. + + This is currently not testable because it appears only in the + hardware animation and we can't yet do pixel tests while + hardware animating. + + * platform/graphics/mac/GraphicsLayerCA.mm: + (WebCore::GraphicsLayerCA::animateTransform): + +2009-07-17 Holger Hans Peter Freyther + + Reviewed by Gustavo Noronha. + + [GTK+] Crash in screenAvailable due a null Widget* + + JSDOMWindow::open called screenAvailableRect(0). The other + Screen methods can be called with a null widget as well, fix the + crashing test by checking for null. + + In screenRect and screenAvailableRect it is not tried to use + a default screen as the existing implementation didn't try either + in case of not having a toplevel widget. + + LayoutTests/fast/frames/crash-removed-iframe.html caused a crash. + + * platform/gtk/PlatformScreenGtk.cpp: + (WebCore::getVisual): New method to get a visual or return zero. + (WebCore::screenDepth): Use getVisual. + (WebCore::screenDepthPerComponent): Use getVisual. + (WebCore::screenIsMonochrome): Use screenDepth which will do the null checking + (WebCore::screenRect): Check for !widget. + (WebCore::screenAvailableRect): Check for !widget. + +2009-07-17 Laszlo Gombos + + Reviewed by Simon Hausmann. + + [Qt] Fix the include path for the Symbian port + https://bugs.webkit.org/show_bug.cgi?id=27358 + + * WebCore.pro: + +2009-07-17 Kenneth Rohde Christiansen + + Reviewed by Simon Hausmann. + + Make it possible to set the plugin directories from the DRT. + Part of https://bugs.webkit.org/show_bug.cgi?id=27215 + + * plugins/PluginDatabase.cpp: + (WebCore::PluginDatabase::installedPlugins): Now optionally takes + a populate argument, so we can avoid loading system plugins from the + DRT and thus avoid their strerr errors that can make tests fail. + (WebCore::PluginDatabase::clear): Make it possible to clear the + database. Called from setPluginDirectories. + * plugins/PluginDatabase.h: + (WebCore::PluginDatabase::setPluginDirectories): Make public + +2009-07-17 Tor Arne Vestbø + + Reviewed by Simon Hausmann. + + PluginViewMac: Stop the plugin when loading fails + + Also, prevent event propagation when in the stopped state + + * plugins/mac/PluginViewMac.cpp: + +2009-07-17 Tor Arne Vestbø + + Reviewed by Simon Hausmann. + + PluginViewMac: Allow query and set of drawing and event models + + We now support querying and setting of the drawing and event model, + but we still only support the CoreGraphics drawing model, and the + Carbon event model. + + If unsupported drawing or event models are detected we show the + missing-plugin icon. + + * plugins/PluginView.cpp: + * plugins/PluginView.h: + * plugins/mac/PluginViewMac.cpp: + +2009-07-17 Tor Arne Vestbø + + Reviewed by Simon Hausmann. + + Initialize two PluginView members using memset + + m_npWindow is used on all platforms, not just for XP_UNIX, + so always initialize it. m_npCgContext on the other hand + is only used for XP_MACOSX. + + * plugins/PluginView.cpp: + +2009-07-17 Tor Arne Vestbø + + Reviewed by Simon Hausmann. + + Add more debug logging in PluginView + + * plugins/PluginView.cpp: Add debug for setValue + * plugins/gtk/PluginViewGtk.cpp: Add debug for getValue + * plugins/mac/PluginViewMac.cpp: Add debug for getValue and more + * plugins/qt/PluginViewQt.cpp: Add debug for getValue + * plugins/win/PluginViewWin.cpp: Add debug for getValue + +2009-07-17 Tor Arne Vestbø + + Reviewed by Holger Freyther. + + Use same license in PluginDebug.cpp as in the original PluginDebug.h + + * plugins/PluginDebug.cpp: Use license from PluginDebug.h + +2009-07-17 Tor Arne Vestbø + + Reviewed by Simon Hausmann. + + Add more debugging functionality for the WebCore NPAPI layer + + * GNUmakefile.am: Add PluginDebug.cpp + * WebCore.gypi: Add PluginDebug.cpp + * WebCore.pro: Add PluginDebug.cpp + * WebCore.vcproj/WebCore.vcproj: Add PluginDebug.cpp + * WebCoreSources.bkl: Add PluginDebug.cpp + * plugins/PluginDebug.h: Move errorStrings to PluginDebug.cpp + * plugins/PluginDebug.cpp: New file + +2009-07-17 Jeremy Orlow + + Reviewed by David Levin. + + Fix Chromium build with DOM_STORAGE enabled. + https://bugs.webkit.org/show_bug.cgi?id=27360 + + 2 minor changes as noted below: + + * bindings/v8/DerivedSourcesAllInOne.cpp: Add the generated .cpp files. + * storage/StorageAreaImpl.cpp: #include "DOMWindow.h" + +2009-07-16 Fumitoshi Ukai + + Reviewed by David Levin. + + Add --web-sockets flag and ENABLE_WEB_SOCKETS define. + https://bugs.webkit.org/show_bug.cgi?id=27206 + + Add ENABLE_WEB_SOCKETS + + * Configurations/FeatureDefines.xcconfig: add ENABLE_WEB_SOCKETS + * GNUmakefile.am: add ENABLE_WEB_SOCKETS + * WebCore.vcproj/WebCoreCommon.vsprops: add ENABLE_WEB_SOCKETS + * WebCore.vcproj/build-generated-files.sh: add ENABLE_WEB_SOCKETS + +2009-07-16 Maxime Simon + + Reviewed by Oliver Hunt. + + Added a third bunch of Haiku-specific files for WebCore. + https://bugs.webkit.org/show_bug.cgi?id=26952 + + Adding five files, EventLoopHaiku.cpp, FileChooserHaiku.cpp, + FileSystemHaiku.cpp, KeyboardCodes.h and MIMETypeRegistryHaiku.cpp + + * platform/haiku/EventLoopHaiku.cpp: Added. + (WebCore::EventLoop::cycle): + * platform/haiku/FileChooserHaiku.cpp: Added. + (WebCore::FileChooser::FileChooser): + (WebCore::FileChooser::basenameForWidth): + * platform/haiku/FileSystemHaiku.cpp: Added. + (WebCore::fileSystemRepresentation): + (WebCore::homeDirectoryPath): + (WebCore::openTemporaryFile): + (WebCore::closeFile): + (WebCore::writeToFile): + (WebCore::unloadModule): + (WebCore::listDirectory): + * platform/haiku/KeyboardCodes.h: Added. + * platform/haiku/MIMETypeRegistryHaiku.cpp: Added. + (WebCore::): + (WebCore::MIMETypeRegistry::getMIMETypeForExtension): + +2009-07-16 Maxime Simon + + Reviewed by Oliver Hunt. + + Added a second bunch of Haiku-specific files for WebCore. + https://bugs.webkit.org/show_bug.cgi?id=26952 + + Adding four files, ContextMenuHaiku.cpp, ContextMenuItemHaiku.cpp, + DragDataHaiku.cpp and DragImageHaiku.cpp + + * platform/haiku/ContextMenuHaiku.cpp: Added. + (WebCore::ContextMenuReceiver::ContextMenuReceiver): + (WebCore::ContextMenuReceiver::HandleMessage): + (WebCore::ContextMenuReceiver::Result): + (WebCore::ContextMenu::ContextMenu): + (WebCore::ContextMenu::~ContextMenu): + (WebCore::ContextMenu::appendItem): + (WebCore::ContextMenu::itemCount): + (WebCore::ContextMenu::insertItem): + (WebCore::ContextMenu::platformDescription): + (WebCore::ContextMenu::setPlatformDescription): + * platform/haiku/ContextMenuItemHaiku.cpp: Added. + (ContextMenuItem::ContextMenuItem): + (ContextMenuItem::~ContextMenuItem): + (ContextMenuItem::releasePlatformDescription): + (ContextMenuItem::type): + (ContextMenuItem::setType): + (ContextMenuItem::action): + (ContextMenuItem::setAction): + (ContextMenuItem::title): + (ContextMenuItem::setTitle): + (ContextMenuItem::platformSubMenu): + (ContextMenuItem::setSubMenu): + (ContextMenuItem::setChecked): + (ContextMenuItem::setEnabled): + (ContextMenuItem::enabled): + * platform/haiku/DragDataHaiku.cpp: Added. + (WebCore::DragData::canSmartReplace): + (WebCore::DragData::containsColor): + (WebCore::DragData::containsFiles): + (WebCore::DragData::asFilenames): + (WebCore::DragData::containsPlainText): + (WebCore::DragData::asPlainText): + (WebCore::DragData::asColor): + (WebCore::DragData::createClipboard): + (WebCore::DragData::containsCompatibleContent): + (WebCore::DragData::containsURL): + (WebCore::DragData::asURL): + (WebCore::DragData::asFragment): + * platform/haiku/DragImageHaiku.cpp: Added. + (WebCore::dragImageSize): + (WebCore::deleteDragImage): + (WebCore::scaleDragImage): + (WebCore::dissolveDragImageToFraction): + (WebCore::createDragImageFromImage): + (WebCore::createDragImageIconForCachedImage): + +2009-07-16 Stephen White + + Reviewed by Darin Fisher and Brett Wilson. + + Refactor Skia implementation of gradients and patterns. + + http://bugs.webkit.org/show_bug.cgi?id=26618 + + The following layout tests were breaking on Chromium/Linux: + + LayoutTests/svg/custom/js-late-gradient-creation.svg (bad baseline PNG) + LayoutTests/svg/custom/js-late-gradient-and-object.creation.svg + LayoutTests/svg/custom/js-late-pattern-creation.svg (bad baseline PNG) + LayoutTests/svg/custom/js-late-pattern-and-object-creation.svg + + I could've fixed these the easy way, by copying the same 5 + lines of code we use everywhere we need patterns or gradients, but + I decided to fix it the hard way: by refactoring the code so that + PlatformContextSkia::setupPaintForFilling() and + PlatformContextSkia::setupPaintForStroking() do the right thing, + and also handle gradients and patterns. + + This required pushing the gradients and patterns set in + (generic) GraphicsContext::setFillPattern() and friends down into + PlatformContextSkia. For this, I followed the setPlatformXXX() + pattern used elsewhere in GraphicsContext, and stubbed them out on + the other platforms with #if !PLATFORM(SKIA). This also required + pushing changes to the gradientSpaceTransform from the Gradient into + GradientSkia. + + Since it's a Skia context, I decided to cache the values as + SkShaders. There were existing m_pattern and m_gradient SkShaders, + but they were unused, and whose use was ambiguous, so I + replaced them with one SkShader each for filling and stroking. + + * platform/graphics/Gradient.cpp: + (WebCore::Gradient::setGradientSpaceTransform): + (WebCore::Gradient::setPlatformGradientSpaceTransform): + * platform/graphics/Gradient.h: + * platform/graphics/GraphicsContext.cpp: + (WebCore::GraphicsContext::setStrokePattern): + (WebCore::GraphicsContext::setFillPattern): + (WebCore::GraphicsContext::setStrokeGradient): + (WebCore::GraphicsContext::setFillGradient): + (WebCore::GraphicsContext::setPlatformFillGradient): + (WebCore::GraphicsContext::setPlatformFillPattern): + (WebCore::GraphicsContext::setPlatformStrokeGradient): + (WebCore::GraphicsContext::setPlatformStrokePattern): + * platform/graphics/GraphicsContext.h: + * platform/graphics/skia/GradientSkia.cpp: + (WebCore::Gradient::setPlatformGradientSpaceTransform): + * platform/graphics/skia/GraphicsContextSkia.cpp: + (WebCore::GraphicsContext::fillPath): + (WebCore::GraphicsContext::fillRect): + (WebCore::GraphicsContext::setPlatformFillGradient): + (WebCore::GraphicsContext::setPlatformFillPattern): + (WebCore::GraphicsContext::setPlatformStrokeGradient): + (WebCore::GraphicsContext::setPlatformStrokePattern): + (WebCore::GraphicsContext::strokePath): + (WebCore::GraphicsContext::strokeRect): + * platform/graphics/skia/PlatformContextSkia.cpp: + (PlatformContextSkia::State::State): + (PlatformContextSkia::State::~State): + (PlatformContextSkia::drawRect): + (PlatformContextSkia::setupPaintCommon): + (PlatformContextSkia::setupPaintForFilling): + (PlatformContextSkia::setupPaintForStroking): + (PlatformContextSkia::setFillColor): + (PlatformContextSkia::setStrokeColor): + (PlatformContextSkia::setStrokeShader): + (PlatformContextSkia::setFillShader): + * platform/graphics/skia/PlatformContextSkia.h: + * platform/graphics/skia/SkiaFontWin.cpp: + (WebCore::skiaDrawText): + (WebCore::paintSkiaText): + * svg/graphics/SVGPaintServer.cpp: + (WebCore::SVGPaintServer::teardown): + +2009-07-16 Maxime Simon + + Reviewed by Oliver Hunt. + + Added Haiku-specific files for WebCore/platform/image-decoders/. + https://bugs.webkit.org/show_bug.cgi?id=26949 + + Adding a new file, ImageDecoderHaiku.cpp. + + * platform/image-decoders/haiku/ImageDecoderHaiku.cpp: Added. + (WebCore::RGBA32Buffer::RGBA32Buffer): + (WebCore::RGBA32Buffer::clear): + (WebCore::RGBA32Buffer::zeroFill): + (WebCore::RGBA32Buffer::copyBitmapData): + (WebCore::RGBA32Buffer::setSize): + (WebCore::RGBA32Buffer::asNewNativeImage): + (WebCore::RGBA32Buffer::hasAlpha): + (WebCore::RGBA32Buffer::setHasAlpha): + (WebCore::RGBA32Buffer::setStatus): + (WebCore::RGBA32Buffer::operator=): + (WebCore::RGBA32Buffer::width): + (WebCore::RGBA32Buffer::height): + +2009-07-16 Maxime Simon + + Reviewed by Eric Seidel. + + Added Haiku-specific files for WebCore/page/. + https://bugs.webkit.org/show_bug.cgi?id=26949 + + Adding three new files, DragControllerHaiku.cpp, EventHandlerHaiku.cpp + and FrameHaiku.cpp + + * page/haiku/DragControllerHaiku.cpp: Added. + (WebCore::DragController::isCopyKeyDown): + (WebCore::DragController::dragOperation): + (WebCore::DragController::maxDragImageSize): + (WebCore::DragController::cleanupAfterSystemDrag): + * page/haiku/EventHandlerHaiku.cpp: Added. + (WebCore::isKeyboardOptionTab): + (WebCore::EventHandler::invertSenseOfTabsToLinks): + (WebCore::EventHandler::tabsToAllControls): + (WebCore::EventHandler::focusDocumentView): + (WebCore::EventHandler::passWidgetMouseDownEventToWidget): + (WebCore::EventHandler::passMouseDownEventToWidget): + (WebCore::EventHandler::eventActivatedView): + (WebCore::EventHandler::passSubframeEventToSubframe): + (WebCore::EventHandler::passWheelEventToWidget): + (WebCore::EventHandler::createDraggingClipboard): + (WebCore::EventHandler::passMousePressEventToSubframe): + (WebCore::EventHandler::passMouseMoveEventToSubframe): + (WebCore::EventHandler::passMouseReleaseEventToSubframe): + (WebCore::EventHandler::accessKeyModifiers): + * page/haiku/FrameHaiku.cpp: Added. + (WebCore::Frame::dragImageForSelection): + +2009-07-16 Maxime Simon + + Reviewed by Eric Seidel. + + Added Haiku-specific files for WebCore/editing/. + https://bugs.webkit.org/show_bug.cgi?id=26949 + + Adding one new file, EditorHaiku.cpp + + * editing/haiku/EditorHaiku.cpp: Added. + (WebCore::Editor::newGeneralClipboard): + +2009-07-16 Maxime Simon + + Reviewed by Eric Seidel. + + Added Haiku-specific files for WebCore/bindings/js/. + https://bugs.webkit.org/show_bug.cgi?id=26949 + + Adding a new file, ScriptControllerHaiku.cpp + + * bindings/js/ScriptControllerHaiku.cpp: Added. + (WebCore::ScriptController::createScriptInstanceForWidget): + +2009-07-16 Maxime Simon + + Reviewed by Eric Seidel. + + Added Haiku-specific files for WebCore/platform/text/. + https://bugs.webkit.org/show_bug.cgi?id=26949 + + Adding two new files, StringHaiku.cpp + and TextBreakIteratorInternalICUHaiku.cpp + + * platform/text/haiku/StringHaiku.cpp: Added. + (WebCore::String::String): + (WebCore::String::operator BString): + * platform/text/haiku/TextBreakIteratorInternalICUHaiku.cpp: Added. + (WebCore::currentTextBreakLocaleID): + +2009-07-16 Kent Tamura + + Reviewed by Eric Seidel. + + Sends the basename of a selected file for non-multipart form submission. + + + Test: fast/forms/get-file-upload.html + + * html/HTMLInputElement.cpp: + (WebCore::HTMLInputElement::appendFormData): + +2009-07-16 Adam Barth + + Reviewed by David Levin. + + [V8] Centralize hidden property names + https://bugs.webkit.org/show_bug.cgi?id=27359 + + No behavior change. Just moving these names to a central location. + I'll move the rest of our hidden property names as I sweep though the + bindings. + + * WebCore.gypi: + * bindings/v8/V8HiddenPropertyName.cpp: Added. + (WebCore::V8HiddenPropertyName::objectPrototype): + (WebCore::V8HiddenPropertyName::isolatedWorld): + * bindings/v8/V8HiddenPropertyName.h: Added. + * bindings/v8/V8IsolatedWorld.cpp: + (WebCore::V8IsolatedWorld::V8IsolatedWorld): + (WebCore::V8IsolatedWorld::getEntered): + * bindings/v8/V8Proxy.cpp: + (WebCore::V8Proxy::getHiddenObjectPrototype): + (WebCore::V8Proxy::installHiddenObjectPrototype): + +2009-07-16 Dan Bernstein + + Reviewed by Simon Fraser. + + REGRESSION (r41238) Repainted portion of a scaled image does not line up with full image + https://bugs.webkit.org/show_bug.cgi?id=26747 + rdar://problem/7009243 + + Test: fast/repaint/background-misaligned.html + + * platform/graphics/Image.cpp: + (WebCore::Image::drawTiled): Moved a variable definition closer to where + it is used. + * platform/graphics/cg/ImageCG.cpp: + (WebCore::BitmapImage::draw): In the subimage code path, compute a + pixel-aligned source rect, because the subiamge is always pixel-aligned + in source space, and adjust the destination rect to preserve the + source -> destination mapping. Clip to the (original) destination rect + to prevent bleeding out. + +2009-07-16 Jeremy Orlow + + Reviewed by Adam Barth. + + Add a sessionStorageEnabled setting to the settings class. + https://bugs.webkit.org/show_bug.cgi?id=27318 + + Allow LocalStorage to be enabled without enabling SessionStorage at + runtime. There is a settings class setting for localStorage, but not + for sessionStorage. We want to be able to test one of these features + without necessarily enabling the other. + + SessionStorage defaults to true so as to not change behavior and + because there really aren't any security concerns around SessionStorage + (unlike LocalsStorage). The flag is needed in Chromium only because + we want to enable the compile time flag in the default build, but don't + want it on by default until it's been thoroughly tested. + + * page/DOMWindow.cpp: + (WebCore::DOMWindow::sessionStorage): Check the new flag + (WebCore::DOMWindow::localStorage): A bit of cleanup + * page/Settings.cpp: + (WebCore::Settings::Settings): Default the flag to true + (WebCore::Settings::setSessionStorageEnabled): Add the new flag + * page/Settings.h: + (WebCore::Settings::sessionStorageEnabled): Get the new flag + +2009-07-16 Adam Barth + + Unreviewed. + + Revert 45987. Tests did not pass on Windows. + + * html/HTMLInputElement.cpp: + (WebCore::HTMLInputElement::appendFormData): + +2009-07-16 Drew Wilson + + Reviewed by David Levin. + + Added SHARED_WORKER flag to Windows build files, as well as associated .ccp/.h files. + Added missing V8 bindings to the AllInOne file + + https://bugs.webkit.org/show_bug.cgi?id=27321 + + * WebCore.vcproj/WebCore.vcproj: + Added missing files to build. + * bindings/v8/DerivedSourcesAllInOne.cpp: + Added missing V8 bindings (V8AbstractWorker.cpp and V8SharedWorker.cpp) + * DerivedSources.cpp + Added missing JS bindings (JSAbstractWorker.cpp and JSSharedWorker.cpp) + +2009-07-16 John Abd-El-Malek + + Reviewed by David Levin. + + Add a getter in MessagePortChannel for the PlatformMessagePortChannel. + + https://bugs.webkit.org/show_bug.cgi?id=27337 + + * dom/MessagePortChannel.h: + (WebCore::MessagePortChannel::channel): + +2009-07-16 Xiaomei Ji + + Reviewed by Darin Adler. + + Fix tooltip does not get its directionality from its element's directionality. + https://bugs.webkit.org/show_bug.cgi?id=24187 + + Per mitz's suggestion in comment #6, while getting the plain-text + title, we also get the directionality of the title. How to handle + the directionality is up to clients. Clients could ignore it, + or use attribute or unicode control characters to display the title + as what they want. + + WARNING: NO TEST CASES ADDED OR CHANGED + + * WebCore.base.exp: Replace 2 names due to signature change. + * loader/EmptyClients.h: + (WebCore::EmptyChromeClient::setToolTip): Add direction as 2nd parameter. + * page/Chrome.cpp: + (WebCore::Chrome::setToolTip): Calculate tooltip direction as well and pass it to client to take care when display tooltip. + * page/ChromeClient.h: Add direction as 2nd parameter to pure virtual function setToolTip(). + * page/chromium/ChromeClientChromium.h: + (WebCore::ChromeClientChromium::setToolTip): Add setToolTip() + temprarily to make chromium compile after pick up this webkit patch. + * rendering/HitTestResult.cpp: + (WebCore::HitTestResult::spellingToolTip): Besides getting the + spelling tooltip, get its directionality as well. + (WebCore::HitTestResult::title): Besides getting the title, + get its directionality as well. + * rendering/HitTestResult.h: Add 2 more methods. + +2009-07-16 Shinichiro Hamaji + + Reviewed by Oliver Hunt. + + [CAIRO] pattern of a canvas-element changes after modifications on canvas-element + https://bugs.webkit.org/show_bug.cgi?id=20578 + + Copy pixel image in ImageBuffer::image() just like CG and Skia glue. + + Test: fast/canvas/canvas-pattern-modify.html + + * platform/graphics/cairo/ImageBufferCairo.cpp: + (copySurface): + (WebCore::ImageBuffer::image): + +2009-07-16 David Hyatt + + Reviewed by Beth Dakin. + + https://bugs.webkit.org/show_bug.cgi?id=27353 + Images mispositioned because of bug in percentage-based relative positioning. + + Added fast/css/nested-floating-relative-position-percentages.html + + * rendering/RenderBoxModelObject.cpp: + (WebCore::RenderBoxModelObject::relativePositionOffsetX): + +2009-07-16 Kent Tamura + + Reviewed by Eric Seidel. + + Sends the basename of a selected file for non-multipart form submission. + + + Test: fast/forms/get-file-upload.html + + * html/HTMLInputElement.cpp: + (WebCore::HTMLInputElement::appendFormData): + +2009-07-16 Simon Fraser + + Reviewed by Darin Adler. + + Video size sometimes jumps just after the video starts loading + https://bugs.webkit.org/show_bug.cgi?id=27352 + + Ensure that the media player is at or after the 'HaveMetadata' state so that + the instrinsic size is known before we create the layer for video. This avoids + a flash caused by computing the video rect using the default intrinsic size, and then + re-computing it when that size changes. + + * platform/graphics/mac/MediaPlayerPrivateQTKit.h: + * platform/graphics/mac/MediaPlayerPrivateQTKit.mm: + (WebCore::MediaPlayerPrivate::isReadyForRendering): + (WebCore::MediaPlayerPrivate::updateStates): + (WebCore::MediaPlayerPrivate::supportsAcceleratedRendering): + +2009-07-16 Brady Eidson + + Reviewed by Antti Koivisto. + Patch by Brady Eidson and Alexey Proskuryakov. + + https://bugs.webkit.org/show_bug.cgi?id=26496 + Microsoft Outlook Web Access fails because XHR stream connection blocks script loading/revalidation + + After refreshing a page and when all CachedResources on that page are in validation mode, they got an exemption + from the connection-per-host limit. Removing that exemption makes the test case load smoothly after reloads. + + * loader/loader.cpp: + (WebCore::Loader::Host::servePendingRequests): Remove the resourceIsCacheValidator exemption to the connection-per-host limit. + +2009-07-16 Adam Barth + + Reviewed by Dimitri Glazkov. + + [V8] V8IsolatedWorld::evaluate needs to call didCreateIsolatedScriptContext + https://bugs.webkit.org/show_bug.cgi?id=27335 + + evaluateInNewContext makes this delegate call. evaluateInNewWorld + needs to make the same call. This does not appear to be testable with + our current technology. + + * bindings/v8/V8IsolatedWorld.cpp: + (WebCore::V8IsolatedWorld::evaluate): + +2009-07-15 Jakub Wieczorek + + Reviewed by Simon Hausmann. + + Fix a typo: application/atom=xml -> application/atom+xml. + + * dom/ProcessingInstruction.cpp: + (WebCore::ProcessingInstruction::checkStyleSheet): + +2009-07-16 Dean McNamee + + Reviewed by Oliver Hunt. + + https://bugs.webkit.org/show_bug.cgi?id=27292 + Improve handling of path operations on an empty path. + Implement Skia's Path::hasCurrentPoint(). + + * html/CanvasRenderingContext2D.cpp: + (WebCore::CanvasRenderingContext2D::lineTo): + (WebCore::CanvasRenderingContext2D::quadraticCurveTo): + (WebCore::CanvasRenderingContext2D::bezierCurveTo): + * platform/graphics/skia/PathSkia.cpp: + (WebCore::Path::hasCurrentPoint): + +2009-07-15 Shinichiro Hamaji + + Reviewed by Eric Seidel. + + Setting white-space and word-wrap via CSS in textarea doesn't override the wrap attribute + https://bugs.webkit.org/show_bug.cgi?id=26254 + + Make it so that setting white-space and word-wrap via CSS + overrides the wrap attribute. + + This involves having the shadow div in the textarea inherit + the CSS from its parent instead of hard-coding it in + RenderTextControlMultiline. + + Committer note: Earlier I reverted this change because I did it incorrectly + by leaving out css/html.css. In the patch, the filename was the old name + css/html4.css and that led to my error. + + * css/html.css: + * html/HTMLTextAreaElement.cpp: + (WebCore::HTMLTextAreaElement::parseMappedAttribute): + * rendering/RenderTextControlMultiLine.cpp: + (WebCore::RenderTextControlMultiLine::createInnerTextStyle): + +2009-07-15 James Hawkins + + Reviewed by Adam Barth. + + [V8] Remove a local variable that is shadowing a function parameter. + https://bugs.webkit.org/show_bug.cgi?id=27309 + + No test required as this modification does not change the current behavior. + + * bindings/v8/V8DOMWrapper.cpp: + (WebCore::V8DOMWrapper::instantiateV8Object): + +2009-07-15 Adam Langley + + No review: reverting previous change. + + Revert r45959: + + 2009-07-15 Dumitru Daniliuc + Reviewed by Dimitri Glazkov. + + Adding the Win SQLite VFS implementation for Chromium. + + https://bugs.webkit.org/show_bug.cgi?id=26940 + + + The Chromium side of this patch was landed in 20839, but broke the build. It + was reverted in r20840. Thus, I'm reverting this side of the patch too. + + * WebCore.gypi: + * platform/chromium/ChromiumBridge.h: + * platform/sql/chromium/SQLiteFileSystemChromium.cpp: Removed. + * platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp: Removed. + +2009-07-15 David Levin + + Layout test fix, reverting previous change. + + Reverting r45962 as it caused several layout test failures. + + * html/HTMLTextAreaElement.cpp: + (WebCore::HTMLTextAreaElement::parseMappedAttribute): + * rendering/RenderTextControlMultiLine.cpp: + (WebCore::RenderTextControlMultiLine::createInnerTextStyle): + +2009-06-08 Shinichiro Hamaji + + Reviewed by Eric Seidel. + + Setting white-space and word-wrap via CSS in textarea doesn't override the wrap attribute + https://bugs.webkit.org/show_bug.cgi?id=26254 + + Make it so that setting white-space and word-wrap via CSS + overrides the wrap attribute. + + This involves having the shadow div in the textarea inherit + the CSS from its parent instead of hard-coding it in + RenderTextControlMultiline. + + * css/html4.css: + * html/HTMLTextAreaElement.cpp: + (WebCore::HTMLTextAreaElement::parseMappedAttribute): + * rendering/RenderTextControlMultiLine.cpp: + (WebCore::RenderTextControlMultiLine::createInnerTextStyle): + +2009-07-15 Dumitru Daniliuc + + Reviewed by Dimitri Glazkov. + + Adding the Win SQLite VFS implementation for Chromium. + + https://bugs.webkit.org/show_bug.cgi?id=26940 + + * platform/chromium/ChromiumBridge.h: + * platform/sql/chromium: Added. + * platform/sql/chromium/SQLiteFileSystemChromium.cpp: Added. + * platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp: Added. + +2009-07-15 Jian Li + + Reviewed by David Levin. + + Bug 25151 - workers that fail to load scripts not firing error event. + https://bugs.webkit.org/show_bug.cgi?id=25151 + + This fixes the problem that an error event is not fired when the worker + script fails to load. Some reasons this may occur are an invalid URL for + the worker script or a cross-origin redirect. + + We also moves the code to complete the URL and check its origin from + Worker constructor to WorkerScriptLoader loading functions in order to + move the exception throwing logic out of the scope of Worker constructor. + Due to this change, we also remove the output ExceptionCode parameter + in the worker constructor. Corresponding JS/V8 binding codes have been + updated to reflect this change. + + * bindings/js/JSWorkerConstructor.cpp: + (WebCore::constructWorker): + * bindings/v8/custom/V8WorkerCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * workers/Worker.cpp: + (WebCore::Worker::Worker): + (WebCore::Worker::notifyFinished): + * workers/Worker.h: + (WebCore::Worker::create): + * workers/WorkerContext.cpp: + (WebCore::WorkerContext::importScripts): + * workers/WorkerScriptLoader.cpp: + (WebCore::toCrossOriginRedirectPolicy): + (WebCore::WorkerScriptLoader::loadSynchronously): + (WebCore::WorkerScriptLoader::loadAsynchronously): + (WebCore::notifyLoadErrorTask): + (WebCore::WorkerScriptLoader::createResourceRequest): + (WebCore::WorkerScriptLoader::didFail): + (WebCore::WorkerScriptLoader::didFailRedirectCheck): + (WebCore::WorkerScriptLoader::didReceiveAuthenticationCancellation): + (WebCore::WorkerScriptLoader::notifyError): + * workers/WorkerScriptLoader.h: + (WebCore::): + (WebCore::WorkerScriptLoader::url): + +2009-07-15 Dan Bernstein + + Reviewed by Dave Hyatt. + + text-shadow is not drawn for text with transparent colour + https://bugs.webkit.org/show_bug.cgi?id=21374 + + Test: fast/text/shadow-translucent-fill.html + + * rendering/InlineTextBox.cpp: + (WebCore::paintTextWithShadows): If the text fill color is not opaque, + paint all shadows separately from the text, by casting them from + clipped-out opaque text. + +2009-07-15 Adam Treat + + Fix the Qt build. + + * html/HTMLAreaElement.cpp: + +2009-07-15 Jeremy Orlow + + Reviewed by Darin Fisher. + + Cleanup DOM Storage dependencies. + https://bugs.webkit.org/show_bug.cgi?id=27180 + + DOM Storage had several unnecessary (and probably unintended) + dependencies. This patch replaces many includes of header files with + forward declaration of classes, making some destructors explicit, and + taking some factories out of the header files. + + This will allow things like StorageAreaSync to take a StorageAreaImpl* + (as it should) rather than a StorageArea* which previously weren't + possible because the dependencies were such a tangled mess. + + * storage/LocalStorageTask.cpp: + (WebCore::LocalStorageTask::~LocalStorageTask): + * storage/LocalStorageTask.h: + * storage/Storage.cpp: + (WebCore::Storage::~Storage): + * storage/Storage.h: + * storage/StorageArea.cpp: + * storage/StorageArea.h: + * storage/StorageAreaImpl.cpp: + * storage/StorageAreaImpl.h: + * storage/StorageAreaSync.cpp: + (WebCore::StorageAreaSync::~StorageAreaSync): + * storage/StorageAreaSync.h: + * storage/StorageEvent.cpp: + (WebCore::StorageEvent::create): + (WebCore::StorageEvent::StorageEvent): + * storage/StorageEvent.h: + * storage/StorageNamespace.h: + * storage/StorageNamespaceImpl.cpp: + * storage/StorageNamespaceImpl.h: + * storage/StorageSyncManager.cpp: + (WebCore::StorageSyncManager::~StorageSyncManager): + * storage/StorageSyncManager.h: + +2009-07-15 Chris Marrin + + Reviewed by Simon Fraser. + + Incorrect animation when trying to duplicate effect of transform-origin + https://bugs.webkit.org/show_bug.cgi?id=27310 + + The bug is that matrix animation is being used when animating + a list of transform functions that match in the from and to states. + This sometimes works. But because of the way CA does matrix animation + function lists like the one shown in the testcase animate incorrectly. + + This fixes the bug by always doing component animation + as long as the function lists match. This allows CA + to animate the components and then recompose the result + into the correct matrix. + + Test: animations/transform-origin-vs-functions.html + + * platform/graphics/mac/GraphicsLayerCA.mm: + (WebCore::GraphicsLayerCA::animateTransform): + +2009-07-15 Albert J. Wong + + Reviewed by David Levin. + + Upstream the V8NPObject and NPV8Object build changes for WebCore.gypi. + + Add upstreamed V8 bindings files into WebCore.gypi so they can be seen + downstream + https://bugs.webkit.org/show_bug.cgi?id=27274 + + Changes the build file for chromium. Test built the chromium tree + to verify. + + * WebCore.gypi: + +2009-07-15 Mark Rowe + + I like it when the code compiles. + + * WebCore.base.exp: + +2009-07-15 Darin Adler + + Reviewed by Sam Weinig. + + Renamed parseURL to deprecatedParseURL. + + * bindings/js/JSAttrCustom.cpp: + (WebCore::JSAttr::setValue): Renamed. + * bindings/js/JSElementCustom.cpp: + (WebCore::allowSettingSrcToJavascriptURL): Renamed. + * bindings/js/JSHTMLFrameElementCustom.cpp: + (WebCore::allowSettingJavascriptURL): Renamed. + * bindings/js/JSHTMLIFrameElementCustom.cpp: + (WebCore::JSHTMLIFrameElement::setSrc): Renamed. + * bindings/objc/DOM.mm: + (-[DOMElement _getURLAttribute:]): Renamed. + * bindings/objc/DOMHTML.mm: + (-[DOMHTMLDocument _createDocumentFragmentWithMarkupString:baseURLString:]): Renamed. + * bindings/v8/custom/V8CustomBinding.cpp: + (WebCore::allowSettingFrameSrcToJavascriptUrl): Renamed. + * css/CSSHelper.cpp: + (WebCore::deprecatedParseURL): Renamed. + * css/CSSHelper.h: Renamed and updated comment. + * html/HTMLAnchorElement.cpp: + (WebCore::HTMLAnchorElement::defaultEventHandler): Renamed. + (WebCore::HTMLAnchorElement::parseMappedAttribute): Renamed. + * html/HTMLBaseElement.cpp: + (WebCore::HTMLBaseElement::parseMappedAttribute): Renamed. + * html/HTMLBodyElement.cpp: + (WebCore::HTMLBodyElement::parseMappedAttribute): Renamed. + * html/HTMLEmbedElement.cpp: + (WebCore::HTMLEmbedElement::parseMappedAttribute): Renamed. + * html/HTMLFormElement.cpp: + (WebCore::HTMLFormElement::parseMappedAttribute): Renamed. + * html/HTMLFrameElementBase.cpp: + (WebCore::HTMLFrameElementBase::parseMappedAttribute): Renamed. + * html/HTMLImageElement.cpp: + (WebCore::HTMLImageElement::parseMappedAttribute): Renamed. + * html/HTMLImageLoader.cpp: + (WebCore::HTMLImageLoader::sourceURI): Renamed. + * html/HTMLLinkElement.cpp: + (WebCore::HTMLLinkElement::parseMappedAttribute): Renamed. + * html/HTMLObjectElement.cpp: + (WebCore::HTMLObjectElement::parseMappedAttribute): Renamed. + * html/HTMLTableElement.cpp: + (WebCore::HTMLTableElement::parseMappedAttribute): Renamed. + * html/HTMLTablePartElement.cpp: + (WebCore::HTMLTablePartElement::parseMappedAttribute): Renamed. + * html/HTMLTokenizer.cpp: + (WebCore::HTMLTokenizer::parseTag): Renamed. + * html/PreloadScanner.cpp: + (WebCore::PreloadScanner::processAttribute): Renamed. + (WebCore::PreloadScanner::emitCSSRule): Renamed. + * platform/chromium/ClipboardChromium.cpp: + (WebCore::ClipboardChromium::declareAndWriteDragImage): Renamed. + * platform/chromium/PasteboardChromium.cpp: + (WebCore::Pasteboard::writeImage): Renamed. + * platform/qt/ClipboardQt.cpp: + (WebCore::ClipboardQt::declareAndWriteDragImage): Renamed. + * platform/win/ClipboardWin.cpp: + (WebCore::ClipboardWin::declareAndWriteDragImage): Renamed. + * rendering/HitTestResult.cpp: + (WebCore::HitTestResult::absoluteImageURL): Renamed. + (WebCore::HitTestResult::absoluteMediaURL): Renamed. + (WebCore::HitTestResult::absoluteLinkURL): Renamed. + * svg/SVGAElement.cpp: + (WebCore::SVGAElement::defaultEventHandler): Renamed. + * svg/SVGImageLoader.cpp: + (WebCore::SVGImageLoader::sourceURI): Renamed. + * wml/WMLAElement.cpp: + (WebCore::WMLAElement::defaultEventHandler): Renamed. + * wml/WMLImageLoader.cpp: + (WebCore::WMLImageLoader::sourceURI): Renamed. + +2009-07-15 Darin Adler + + Reviewed by Dan Bernstein. + + CSSHelper.h's parseURL is a function that no one should ever call + Part 1: Eliminate callers in the CSS parser. + https://bugs.webkit.org/show_bug.cgi?id=26599 + + Test: fast/css/uri-token-parsing.html + + * css/CSSHelper.h: Added a comment explaining why nobody should ever call this + function. A FIXME suggests a next step, which would be to rename it deprecatedParseURL. + + * css/CSSParser.cpp: + (WebCore::CSSParser::parseValue): Removed unneeded call to parseURL; + CSSParser::text already takes care of parsing the URI token syntax, and the + parseURL function does no good. + (WebCore::CSSParser::parseContent): Ditto. + (WebCore::CSSParser::parseFillImage): Ditto. + (WebCore::CSSParser::parseFontFaceSrc): Ditto. + (WebCore::CSSParser::parseBorderImage): Ditto. + (WebCore::isCSSWhitespace): Added. Helper function that makes the text function + easier to read. + (WebCore::CSSParser::text): Tweak logic so that leading and trailing whitespace + are both trimmed before removing the quote marks. Changed to use the + isCSSWhitespace, isASCIIHexDigit, and toASCIIHexValue functions for clarity. + + * css/CSSParser.h: Removed stray "public:" in this header. + + * platform/text/StringImpl.cpp: + (WebCore::StringImpl::substring): Optimized the case where the substring covers + the entire string, so we just share the StringImpl instead of making a new one. + This case came up in earlier versions of the CSS parser changes above. + (WebCore::StringImpl::substringCopy): Streamlined the logic here and made it + not call substring any more. Before, this was relying on the substring function + always making a copy of any non-empty substring. + +2009-07-15 Darin Adler + + Reviewed by John Sullivan. + + After double-clicking a word, using Shift-arrow to select behaves unpredictably + https://bugs.webkit.org/show_bug.cgi?id=27177 + rdar://problem/7034324 + + Test: editing/selection/extend-selection-after-double-click.html + + The bug was due to the m_lastChangeWasHorizontalExtension flag, which was not + being cleared in many cases where it should have been. + + * editing/SelectionController.cpp: + (WebCore::SelectionController::setSelection): Set m_lastChangeWasHorizontalExtension + to false. This catches all sorts of cases that don't flow through the modify function. + Before, the flag would reflect the last call to the modify function, which was not + necessarily the last selection change. + (WebCore::SelectionController::willBeModified): Rearrange function for clarity. + Remove code that sets m_lastChangeWasHorizontalExtension; that is now handled elsewhere. + (WebCore::SelectionController::modify): Call setLastChangeWasHorizontalExtension after + setSelection when setting up a trial selection controller, since setSelection now + clears that flag. Also changed both trial selection controller cases to set the flag, + although it's not strictly necessary in both cases. Added code to set + m_lastChangeWasHorizontalExtension when extending the selection, which used to be + handled in willBeModified. Now we need to do it after the selection change. + +2009-07-15 Jeremy Orlow + + Reviewed by Dimitri Glazkov. + + Need to update DOM Storage files in GYPI file. + https://bugs.webkit.org/show_bug.cgi?id=27317 + + Need to update DOM Storage files in the GYPI file. They're pretty out + of date and we're on the path towards enabling them for everyone! + + * WebCore.gypi: + +2009-07-15 Kwang Yul Seo + + Reviewed by Eric Seidel. + + https://bugs.webkit.org/show_bug.cgi?id=26794 + Make Yacc-generated parsers to use fastMalloc/fastFree. + + Define YYMALLOC and YYFREE to fastMalloc and fastFree + respectively. + + * css/CSSGrammar.y: + * xml/XPathGrammar.y: + +2009-07-15 David Hyatt + + Reviewed by Adam Roben. + + https://bugs.webkit.org/show_bug.cgi?id=27193 + Don't run in to anonymous blocks. No other browsers do this, and our implementation of run-in + is effectively broken as a result. + + No new tests. Changed fast/runin/001.html and fast/runin/generated.html to match new behavior. + + * rendering/RenderBlock.cpp: + (WebCore::RenderBlock::handleRunInChild): + +2009-07-15 Yuzo Fujishima + + Reviewed by Darin Adler. + + Test: fast/js/instanceof-operator.html + + Fix for: Bug 25205 - XMLHttpRequest instance is not an instanceof XMLHttpRequest + https://bugs.webkit.org/show_bug.cgi?id=25205 + + In addition to for XMLHttpRequest, this also fixes for: + - Audio + - Image + - MessageChannel + - Option + - WebKitCSSMatrix + - WebKitPoint + - Worker + - XSLTProcessor + + * bindings/js/JSAudioConstructor.cpp: + (WebCore::JSAudioConstructor::JSAudioConstructor): + * bindings/js/JSAudioConstructor.h: + * bindings/js/JSDOMBinding.h: + (WebCore::DOMConstructorObject::createStructure): + (WebCore::DOMConstructorObject::DOMConstructorObject): + * bindings/js/JSImageConstructor.cpp: + (WebCore::JSImageConstructor::JSImageConstructor): + * bindings/js/JSImageConstructor.h: + * bindings/js/JSMessageChannelConstructor.cpp: + (WebCore::JSMessageChannelConstructor::JSMessageChannelConstructor): + * bindings/js/JSMessageChannelConstructor.h: + * bindings/js/JSOptionConstructor.cpp: + (WebCore::JSOptionConstructor::JSOptionConstructor): + * bindings/js/JSOptionConstructor.h: + * bindings/js/JSWebKitCSSMatrixConstructor.cpp: + (WebCore::JSWebKitCSSMatrixConstructor::JSWebKitCSSMatrixConstructor): + * bindings/js/JSWebKitCSSMatrixConstructor.h: + * bindings/js/JSWebKitPointConstructor.cpp: + (WebCore::JSWebKitPointConstructor::JSWebKitPointConstructor): + * bindings/js/JSWebKitPointConstructor.h: + * bindings/js/JSWorkerConstructor.cpp: + (WebCore::JSWorkerConstructor::JSWorkerConstructor): + * bindings/js/JSWorkerConstructor.h: + * bindings/js/JSXMLHttpRequestConstructor.cpp: + (WebCore::JSXMLHttpRequestConstructor::JSXMLHttpRequestConstructor): + * bindings/js/JSXMLHttpRequestConstructor.h: + * bindings/js/JSXSLTProcessorConstructor.cpp: + (WebCore::JSXSLTProcessorConstructor::JSXSLTProcessorConstructor): + * bindings/js/JSXSLTProcessorConstructor.h: + +2009-07-15 Kai Br�ning + + Reviewed by Dave Hyatt. + + CSS21 attribute selectors not dynamic for xml. + https://bugs.webkit.org/show_bug.cgi?id=25072 + + Moved the relevant test in StyledElement::attributeChanged() + to a new function Element::recalcStyleIfNeededAfterAttributeChanged() + so it can be called from both StyledElement::attributeChanged() + and Element::attributeChanged(). + Refactored Element::attributeChanged() into + Element::updateAfterAttributeChanged() and + Element::recalcStyleIfNeededAfterAttributeChanged(), which are called + separately from StyledElement::attributeChanged(). + + Test: fast/css/attribute-selector-dynamic.xml + + * dom/Element.cpp: + (WebCore::Element::attributeChanged): + (WebCore::Element::updateAfterAttributeChanged): + (WebCore::Element::recalcStyleIfNeededAfterAttributeChanged): + * dom/Element.h: + * dom/StyledElement.cpp: + (WebCore::StyledElement::attributeChanged): + +2009-07-15 Alpha Lam + + Reviewed by David Levin. + + [V8] Layout test failures for drawImage in Canvas + https://bugs.webkit.org/show_bug.cgi?id=27311 + + Fixing several canvas layout tests failures due to a + missing return statement in CanvasRenderingContext2DDrawImage() which + was accidentally removed in r45929. + + * bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp: + +2009-07-15 Robert Hogan + + Reviewed by Eric Seidel. + + https://bugs.webkit.org/show_bug.cgi?id=26969 + + If the httpMethod() of the request passed to SubresourceLoader::create is not + supported by the client we must expect to call didFail() while m_loader is still null. + + * loader/DocumentThreadableLoader.cpp: + (DocumentThreadableLoader::didFail):Changed. + +2009-07-15 Mark Rowe + + Fix the Mac build. + + * WebCore.base.exp: + * css/MediaQueryEvaluator.cpp: + * rendering/SVGRenderTreeAsText.cpp: + * rendering/style/SVGRenderStyle.cpp: + * svg/graphics/SVGPaintServer.cpp: + +2009-07-07 Alpha Lam + + Reviewed by Dimitri Glazkov. + + [V8] drawImage method of HTMLCanvasElement to accept HTMLVideoElement as argument + https://bugs.webkit.org/show_bug.cgi?id=27170 + + Changed CanvasRenderingContext2DDrawImage() to accept HTMLVideoElement + as a parameter of drawImage() for HTMLCanvasElement. + + * bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp: + +2009-07-15 Adam Barth + + Reviewed by Dimitri Glazkov. + + [V8] Fix isolated world constructors + https://bugs.webkit.org/show_bug.cgi?id=27287 + + Don't enter V8Proxy::m_context before creating DOM constructors. + Instead, use getWrapperContext to get the right context. + + After this patch, all my tests pass. I'll enable the feature + downstream and land the tests. + + * bindings/scripts/CodeGeneratorV8.pm: + * bindings/v8/V8DOMWrapper.cpp: + (WebCore::V8DOMWrapper::getConstructor): + (WebCore::V8DOMWrapper::lookupDOMWrapper): + * bindings/v8/V8DOMWrapper.h: + * bindings/v8/V8IsolatedWorld.cpp: + (WebCore::V8IsolatedWorld::evaluate): + * bindings/v8/V8Proxy.cpp: + (WebCore::V8Proxy::createWrapperFromCache): + (WebCore::V8Proxy::isContextInitialized): + (WebCore::V8Proxy::disposeContextHandles): + (WebCore::V8Proxy::installDOMWindow): + (WebCore::V8Proxy::initContextIfNeeded): + (WebCore::V8Proxy::getHiddenObjectPrototype): + (WebCore::V8Proxy::installHiddenObjectPrototype): + * bindings/v8/V8Proxy.h: + +2009-07-15 Antonio Gomes + + Reviewed by Darin Adler. + + useless null-check statement in visible_units.cpp@logicalStartOfLine + https://bugs.webkit.org/show_bug.cgi?id=27154 + + Simple fix. + + * editing/visible_units.cpp: + (WebCore::logicalStartOfLine): Doubled honorEditableBoundaryAtOrAfter() call removed. + +2009-07-15 Brady Eidson + + Reviewed by Dan Bernstein. + + https://bugs.webkit.org/show_bug.cgi?id=27304 + WebKit should provide usage and eligibility information about the page cache. + + * WebCore.base.exp: + + * history/CachedFrame.cpp: + (WebCore::CachedFrame::childFrameCount): + * history/CachedFrame.h: + + * history/PageCache.cpp: + (WebCore::PageCache::frameCount): + (WebCore::PageCache::autoreleasedPageCount): + * history/PageCache.h: + (WebCore::PageCache::pageCount): + +2009-07-15 Shinichiro Hamaji + + Reviewed by David Levin. + + Chromium's canvas forgets its context after fillText again + https://bugs.webkit.org/show_bug.cgi?id=27293 + + No new tests because the test for this was already added in + https://bugs.webkit.org/show_bug.cgi?id=26436 + + * platform/graphics/chromium/TransparencyWin.cpp: + (WebCore::TransparencyWin::compositeTextComposite): + +2009-07-14 David Hyatt + + Reviewed by Simon Fraser. + + https://bugs.webkit.org/show_bug.cgi?id=27283 + + Implement the new 'rem' unit from CSS3. + + Added some rem-* tests in fast/css. + + * css/CSSGrammar.y: + * css/CSSParser.cpp: + (WebCore::CSSParser::validUnit): + (WebCore::unitFromString): + (WebCore::CSSParser::parseValue): + (WebCore::CSSParser::lex): + * css/CSSParserValues.cpp: + (WebCore::CSSParserValue::createCSSValue): + * css/CSSPrimitiveValue.cpp: + (WebCore::CSSPrimitiveValue::computeLengthInt): + (WebCore::CSSPrimitiveValue::computeLengthIntForLength): + (WebCore::CSSPrimitiveValue::computeLengthShort): + (WebCore::CSSPrimitiveValue::computeLengthFloat): + (WebCore::CSSPrimitiveValue::computeLengthDouble): + (WebCore::CSSPrimitiveValue::cssText): + (WebCore::CSSPrimitiveValue::parserValue): + * css/CSSPrimitiveValue.h: + (WebCore::CSSPrimitiveValue::): + (WebCore::CSSPrimitiveValue::isUnitTypeLength): + * css/CSSStyleSelector.cpp: + (WebCore::CSSStyleSelector::initForStyleResolve): + (WebCore::convertToLength): + (WebCore::CSSStyleSelector::applyProperty): + (WebCore::CSSStyleSelector::mapFillSize): + (WebCore::CSSStyleSelector::mapFillXPosition): + (WebCore::CSSStyleSelector::mapFillYPosition): + (WebCore::CSSStyleSelector::createTransformOperations): + * css/CSSStyleSelector.h: + * css/MediaQueryEvaluator.cpp: + (WebCore::device_heightMediaFeatureEval): + (WebCore::device_widthMediaFeatureEval): + (WebCore::heightMediaFeatureEval): + (WebCore::widthMediaFeatureEval): + * css/WebKitCSSMatrix.cpp: + (WebCore::WebKitCSSMatrix::setMatrixValue): + * css/tokenizer.flex: + * dom/Document.cpp: + (WebCore::Document::Document): + * dom/Document.h: + (WebCore::Document::usesRemUnits): + (WebCore::Document::setUsesRemUnits): + * dom/Element.cpp: + (WebCore::Element::recalcStyle): + * rendering/SVGRenderTreeAsText.cpp: + (WebCore::writeStyle): + * rendering/style/SVGRenderStyle.cpp: + (WebCore::SVGRenderStyle::cssPrimitiveToLength): + * svg/graphics/SVGPaintServer.cpp: + (WebCore::applyStrokeStyleToContext): + (WebCore::dashArrayFromRenderingStyle): + * svg/graphics/SVGPaintServer.h: + +2009-07-15 Dimitri Glazkov + + Unreviewed, build fix. + + Remove extraneous qualifier, accidentally added in http://trac.webkit.org/changeset/45884. + + * bindings/v8/V8DOMWrapper.h: Removed extraneous qualifier. + +2009-07-15 Dimitri Glazkov + + Reviewed by Darin Fisher. + + [V8] Update bindings for ValiditeState patch. + https://bugs.webkit.org/show_bug.cgi?id=19562 + + * bindings/v8/DOMObjectsInclude.h: + * bindings/v8/DerivedSourcesAllInOne.cpp: + * bindings/v8/V8Index.cpp: + * bindings/v8/V8Index.h: + +2009-07-15 Laszlo Gombos + + Reviewed by Simon Hausmann. + + [Qt] Cleanup - Remove obsolete code from the make system + https://bugs.webkit.org/show_bug.cgi?id=27299 + + * WebCore.pro: + +2009-07-15 Simon Hausmann + + Reviewed by Ariya Hidayat. + + Fix the build without media elements. + + * rendering/HitTestResult.cpp: + (WebCore::HitTestResult::absoluteMediaURL): Add #if ENABLE(VIDEO) + markers around the body of the method. + +2009-07-14 Pavel Feldman + + Reviewed by Timothy Hatcher. + + WebInspector: Move storeLastActivePanel out of the + ifdef ENABLE_JAVASCRIPT_DEBUGGER section in IDL; + Add default panel for the first opening of the + WebInspector. + + https://bugs.webkit.org/show_bug.cgi?id=27263 + + * inspector/InspectorController.cpp: + (InspectorController::setWindowVisible): + * inspector/InspectorController.idl: + +2009-07-14 Darin Adler + + Try to fix Windows build. + + * bindings/scripts/CodeGeneratorCOM.pm: Add Reflect and ReflectURL support. + +2009-07-14 Pierre d'Herbemont + + Reviewed by Oliver Hunt. + + HTMLMediaElement::supportsFullscreen() should return false + https://bugs.webkit.org/show_bug.cgi?id=27284 + + (Reverting a part of 45875) + + HTMLVideoElement::supportsFullscreen() will properly do the + job, and check if the backend supports fullscreen. + + HTMLVideoElement is the only subclass to support fullscreen + (conditionnaly). HTMLAudioElement fullscreen is not supported + and is a different kind of fullscreen, if it comes to be wanted. + + No test can be done currently given that none of the media + backends support fullscreen. + + * html/HTMLMediaElement.cpp: + * html/HTMLMediaElement.h: + (WebCore::HTMLMediaElement::supportsFullscreen): + +2009-07-14 Darin Adler + + Reviewed by Dimitri Glazkov. + + Next step in making DOM attribute getter/setters consistently use AtomicString + https://bugs.webkit.org/show_bug.cgi?id=25425 + + This covers eight DOM classes, and for each one of the classes: + + - Changes the IDL to use the Reflect syntax for all simple cases. + - Removes unused functions in the classes, mainly newly unused ones that were + used for reflection before. + - Removes unneeded explicitly defined destructors. + - Explicitly declares destructors as virtual. + - Removes unneeded includes. + - Makes members protected or private rather than public where possible. + - Renames "doc" to "document". + - Tweaks formatting to match our latest style in a few places. + - Improves some FIXME comments. + + Over time we'll want to do this for all HTML DOM classes. + + * html/HTMLAnchorElement.cpp: + (WebCore::HTMLAnchorElement::HTMLAnchorElement): + * html/HTMLAnchorElement.h: + (WebCore::HTMLAnchorElement::endTagRequirement): + (WebCore::HTMLAnchorElement::tagPriority): + * html/HTMLAnchorElement.idl: + * html/HTMLAppletElement.cpp: + * html/HTMLAppletElement.h: + * html/HTMLAppletElement.idl: + * html/HTMLAreaElement.cpp: + (WebCore::HTMLAreaElement::parseMappedAttribute): + * html/HTMLAreaElement.h: + (WebCore::HTMLAreaElement::endTagRequirement): + (WebCore::HTMLAreaElement::tagPriority): + * html/HTMLAreaElement.idl: + * html/HTMLBRElement.cpp: + (WebCore::HTMLBRElement::parseMappedAttribute): + * html/HTMLBRElement.h: + * html/HTMLBRElement.idl: + * html/HTMLBaseElement.cpp: + (WebCore::HTMLBaseElement::HTMLBaseElement): + (WebCore::HTMLBaseElement::removedFromDocument): + (WebCore::HTMLBaseElement::process): + * html/HTMLBaseElement.h: + * html/HTMLBaseElement.idl: + * html/HTMLBaseFontElement.cpp: + (WebCore::HTMLBaseFontElement::HTMLBaseFontElement): + * html/HTMLBaseFontElement.h: + (WebCore::HTMLBaseFontElement::endTagRequirement): + (WebCore::HTMLBaseFontElement::tagPriority): + * html/HTMLBaseFontElement.idl: + * html/HTMLBlockquoteElement.cpp: + (WebCore::HTMLBlockquoteElement::HTMLBlockquoteElement): + * html/HTMLBlockquoteElement.h: + (WebCore::HTMLBlockquoteElement::tagPriority): + * html/HTMLBlockquoteElement.idl: + * html/HTMLBodyElement.cpp: + (WebCore::HTMLBodyElement::HTMLBodyElement): + (WebCore::HTMLBodyElement::addSubresourceAttributeURLs): + * html/HTMLBodyElement.h: + (WebCore::HTMLBodyElement::endTagRequirement): + (WebCore::HTMLBodyElement::tagPriority): + * html/HTMLBodyElement.idl: + Made changes as described above. + + * loader/FrameLoader.cpp: Removed unneeded include of HTMLAnchorElement.h. + +2009-07-14 Steve Falkenburg + + Reorganize JavaScriptCore headers into: + API: include/JavaScriptCore/ + Private: include/private/JavaScriptCore/ + + Reviewed by Darin Adler. + + * WebCore.vcproj/QTMovieWin.vcproj: + * WebCore.vcproj/WebCoreCommon.vsprops: + * WebCore.vcproj/build-generated-files.sh: + +2009-07-14 Zoltan Horvath + + Reviewed by Darin Adler. + + Change all Noncopyable inheriting visibility to public. + https://bugs.webkit.org/show_bug.cgi?id=27225 + + Change all Noncopyable inheriting visibility to public because + it is needed to the custom allocation framework (bug #20422). + + * bindings/js/GCController.h: + * bindings/js/WorkerScriptController.h: + * bindings/v8/V8DOMMap.cpp: + (WebCore::): + * bridge/runtime.h: + * css/CSSSelector.h: + * css/CSSSelectorList.h: + * css/CSSStyleSelector.h: + * dom/ClassNames.h: + * dom/MessagePortChannel.h: + * dom/XMLTokenizerLibxml2.cpp: + * dom/XMLTokenizerScope.h: + * editing/ReplaceSelectionCommand.cpp: + * editing/SelectionController.h: + * editing/TextIterator.cpp: + * history/PageCache.h: + * html/CanvasRenderingContext2D.h: + * html/HTMLParser.h: + * html/HTMLParserQuirks.h: + * html/PreloadScanner.h: + * loader/Cache.h: + * loader/CrossOriginPreflightResultCache.h: + * loader/FrameLoader.h: + * loader/ProgressTracker.h: + * loader/ThreadableLoader.h: + * loader/appcache/ApplicationCacheGroup.h: + * loader/archive/ArchiveResourceCollection.h: + * loader/icon/IconDatabase.h: + * loader/icon/IconLoader.h: + * loader/icon/PageURLRecord.h: + * loader/loader.h: + * page/ContextMenuController.h: + * page/EventHandler.h: + * page/FrameTree.h: + * page/Page.h: + * page/PageGroup.h: + * page/PageGroupLoadDeferrer.h: + * page/mac/EventHandlerMac.mm: + * platform/AutodrainedPool.h: + * platform/ContextMenu.h: + * platform/EventLoop.h: + * platform/HostWindow.h: + * platform/Pasteboard.h: + * platform/PurgeableBuffer.h: + * platform/RunLoopTimer.h: + * platform/ThreadGlobalData.h: + * platform/ThreadTimers.h: + * platform/Timer.h: + * platform/TreeShared.h: + * platform/graphics/FontData.h: + * platform/graphics/GlyphWidthMap.h: + * platform/graphics/GraphicsContext.h: + * platform/graphics/ImageBuffer.h: + * platform/graphics/ImageSource.h: + * platform/graphics/MediaPlayer.h: + * platform/graphics/skia/GraphicsContextPlatformPrivate.h: + * platform/graphics/skia/PlatformContextSkia.h: + * platform/graphics/win/QTMovieWin.cpp: + * platform/mac/LocalCurrentGraphicsContext.h: + * platform/network/FormDataBuilder.h: + * platform/network/ResourceHandleInternal.h: + * platform/network/soup/ResourceHandleSoup.cpp: + * platform/text/StringBuffer.h: + * platform/text/TextCodec.h: + * platform/win/WindowMessageBroadcaster.h: + * rendering/CounterNode.h: + * rendering/LayoutState.h: + * rendering/RenderFrameSet.h: + * rendering/RenderView.h: + * rendering/TransformState.h: + * svg/SVGAnimatedProperty.h: + * svg/SynchronizableTypeWrapper.h: + * workers/WorkerMessagingProxy.h: + * workers/WorkerRunLoop.cpp: + * xml/XPathExpressionNode.h: + * xml/XPathParser.h: + * xml/XPathPredicate.h: + * xml/XPathStep.h: + +2009-07-14 Darin Fisher + + Reviewed by Darin Adler. + + Fails to save document state when navigating away from a page with a + reference fragment. + https://bugs.webkit.org/show_bug.cgi?id=27281 + + Test: fast/history/saves-state-after-fragment-nav.html + + * history/HistoryItem.cpp: + (WebCore::HistoryItem::isCurrentDocument): Use equalIgnoringRef + to compare URLs. + +2009-07-14 Joseph Pecoraro + + Reviewed by Sam Weinig. + + Inspector: Remove Unintended Global Variables + https://bugs.webkit.org/show_bug.cgi?id=27203 + + * inspector/front-end/Console.js: + (WebInspector.Console.prototype._ensureCommandLineAPIInstalled): + * inspector/front-end/DatabasesPanel.js: + (WebInspector.DatabasesPanel.prototype.dataGridForDOMStorage): + * inspector/front-end/ObjectPropertiesSection.js: + (WebInspector.ObjectPropertyTreeElement.prototype.update): + * inspector/front-end/inspector.js: + (WebInspector.animateStyle): + +2009-07-14 Michelangelo De Simone + + Reviewed by Adele Peterson. + + https://bugs.webkit.org/show_bug.cgi?id=19562 + Added build stuff and stub for the ValidityState class, part of HTML5 + section Forms: + http://www.whatwg.org/specs/web-apps/current-work/multipage/forms.html#validitystate + + Test: fast/forms/ValidityState-001.html + + * DerivedSources.cpp: Inclusion of ValidityState files + * DerivedSources.make: ditto + * GNUmakefile.am: ditto + * WebCore.gypi: ditto + * WebCore.pro: ditto + * WebCore.vcproj/WebCore.vcproj: ditto + * WebCore.xcodeproj/project.pbxproj: ditto + * WebCoreSources.bkl: ditto + * html/HTMLButtonElement.idl: validity attribute + * html/HTMLFieldSetElement.idl: ditto + * html/HTMLFormControlElement.cpp: + (WebCore::HTMLFormControlElement::validity): ValidityState getter + * html/HTMLFormControlElement.h: ditto + * html/HTMLInputElement.idl: validity attribute + * html/HTMLSelectElement.idl: ditto + * html/HTMLTextAreaElement.idl: ditto + * html/ValidityState.cpp: Added. + (WebCore::ValidityState::ValidityState): + (WebCore::ValidityState::valid): validation flag + * html/ValidityState.h: Added. + (WebCore::ValidityState::create): validation flag + (WebCore::ValidityState::control): ditto + (WebCore::ValidityState::valueMissing): ditto + (WebCore::ValidityState::typeMismatch): ditto + (WebCore::ValidityState::patternMismatch): ditto + (WebCore::ValidityState::tooLong): ditto + (WebCore::ValidityState::rangeUnderflow): ditto + (WebCore::ValidityState::rangeOverflow): ditto + (WebCore::ValidityState::stepMismatch): ditto + (WebCore::ValidityState::customError): ditto + * html/ValidityState.idl: Added. + +2009-07-14 Ryosuke Niwa + + Reviewed by Eric Seidel. + + Outdenting a line inside a blockquote tag does nothing + https://bugs.webkit.org/show_bug.cgi?id=25316 + + The bug was caused by the code checking whether the blockquote is created by WebKit or not. + We simply remove this code to be consistent with Firefox and Internet Explorer. + Also, enclosingBlockFlow == enclosingNode in outdentParagraph isn't a sufficient condition to insert + the placeholder before the enclosingNode because there could be contents before the current paragraph. + Instead, we should split the enclosingNode (which is a blockquote) at the starting position of outdentation. + It turned out that this solves the bug 25315 also: https://bugs.webkit.org/show_bug.cgi?id=25315 + + Test: editing/execCommand/outdent-regular-blockquote.html + + * editing/IndentOutdentCommand.cpp: + (WebCore::isIndentBlockquote): no longer checks whether a blockquote is created by WebKit or not. + (WebCore::IndentOutdentCommand::outdentParagraph): takes care of the case enclosingBlockFlow == enclosingNode + +2009-07-14 Adam Barth + + Reviewed by Dimitri Glazkov. + + [V8] Fix isolated world wrappers for Node prototypes + https://bugs.webkit.org/show_bug.cgi?id=27277 + + This change does two things: + + 1) We bypass the wrapper cache in the isolated world. This is because + the wrapper template cache has prototypes that lead to the main + world. We can add a template cache for the isolated world if + performance warrants. + + 2) We introduce a smarter way to grab the wrapper context for a frame + that is aware that proxy <-> context do not stand in one-to-one + correspondence. This generalizes our solution for the node wrapper + case to prototypes. + + The net result is that Node wrappers get the right prototypes. As + before, tests to follow. + + * bindings/v8/V8DOMWrapper.cpp: + (WebCore::V8DOMWrapper::setHiddenWindowReference): + (WebCore::V8DOMWrapper::instantiateV8Object): + (WebCore::V8DOMWrapper::convertNodeToV8Object): + (WebCore::V8DOMWrapper::convertWindowToV8Object): + (WebCore::V8DOMWrapper::getWrapperContext): + * bindings/v8/V8DOMWrapper.h: + +2009-07-14 Adam Barth + + Reviewed by Dimitri Glazkov. + + [V8] Fix isolated world wrappers for Nodes + https://bugs.webkit.org/show_bug.cgi?id=27271 + + Previously, we keepy a pointer to the DOMMap on V8Proxy, but this + caused us to miss the branch in V8DOMMap.cpp for isolated worlds. + + I have tests, but I can't land them until I get this feature under + control. + + * bindings/v8/V8DOMWrapper.cpp: + (WebCore::V8DOMWrapper::convertNodeToV8Object): + * bindings/v8/V8Proxy.h: + (WebCore::V8Proxy::V8Proxy): + +2009-07-14 Adam Barth + + Reviewed by Dimitri Glazkov. + + [V8] Fix isolated world crash on getting window.location + https://bugs.webkit.org/show_bug.cgi?id=27268 + + I have a test for this locally, but it requires a compile-time hack to + run. Once I get the feature's stability under control, we can turn the + feature on and add the tests. + + * bindings/v8/V8DOMWrapper.cpp: + (WebCore::V8DOMWrapper::setHiddenWindowReference): + * bindings/v8/V8IsolatedWorld.h: + (WebCore::V8IsolatedWorld::context): + +2009-07-14 Brent Fulgham + + Correct failing tests after r45875. The original patch did not + test the m_player member for null, causing crashes. This will + happen fairly frequently in real use. Was this original patch + ever tested? + https://bugs.webkit.org/show_bug.cgi?id=27246 + + Test via existing media tests. + + * html/HTMLMediaElement.cpp: + (WebCore::HTMLMediaElement::supportsFullscreen): Check for null pointer. + (WebCore::HTMLMediaElement::supportsSave): Check for null pointer. + +2009-07-14 Avi Drissman + + Reviewed by Darin Fisher. + + Explicitly mark the HTML generated for the Mac as being UTF-8 encoded. + The Windows clipboard format is explicitly documented as being UTF-8, + and all Linux apps assume UTF-8. On the Mac, though, unless otherwise + indicated, Windows-1252 is assumed, which is wrong. + + Bug: https://bugs.webkit.org/show_bug.cgi?id=27262 + + No new tests. + + * platform/chromium/ClipboardChromium.cpp: + (WebCore::ClipboardChromium::writeRange): + * platform/chromium/PasteboardChromium.cpp: + (WebCore::Pasteboard::writeSelection): + +2009-07-14 Albert J. Wong + + Reviewed by Dimitri Glazkov. + + Upstream V8NPObject.h and V8NPObject.cpp. + https://bugs.webkit.org/show_bug.cgi?id=27103 + + This just upstreams the files from the chromium code base. Only + minor changes to formatting and similar were done, so no testing + is required because nothing really changed. Code verified to compile. + + * bindings/v8/ScriptController.cpp: + (WebCore::ScriptController::bindToWindowObject): + (WebCore::ScriptController::createScriptInstanceForWidget): + * bindings/v8/V8NPObject.cpp: Added. + (npObjectInvokeImpl): + (npObjectMethodHandler): + (npObjectInvokeDefaultHandler): + (weakTemplateCallback): + (npObjectGetProperty): + (npObjectNamedPropertyGetter): + (npObjectIndexedPropertyGetter): + (npObjectGetNamedProperty): + (npObjectGetIndexedProperty): + (npObjectSetProperty): + (npObjectNamedPropertySetter): + (npObjectIndexedPropertySetter): + (npObjectSetNamedProperty): + (npObjectSetIndexedProperty): + (weakNPObjectCallback): + (createV8ObjectForNPObject): + (forgetV8ObjectForNPObject): + * bindings/v8/V8NPObject.h: Added. + * bindings/v8/custom/V8HTMLPlugInElementCustom.cpp: + (WebCore::NAMED_PROPERTY_GETTER): + (WebCore::NAMED_PROPERTY_SETTER): + (WebCore::CALLBACK_FUNC_DECL): + (WebCore::INDEXED_PROPERTY_GETTER): + (WebCore::INDEXED_PROPERTY_SETTER): + + +2009-07-14 Albert J. Wong + + Reviewed by Darin Adler. + + Add HTMLMediaElement::supportSave() and a + HitTestResult::absoluteMediaURL() functions + https://bugs.webkit.org/show_bug.cgi?id=27246 + + Added an implementation of supportsSave() into HTMLMediaElement + that delegates to MediaPlayerPrivateImpl so that the media engine + is able to signal whether or not a media source supports saving. + + Also added a function to HitTestResult that allows for retrieval + of the currentSrc associated with the "hit" media element. + + These functions are just pipeing with no visible UI change so there + are no related layout test changes. + + * html/HTMLMediaElement.cpp: + (WebCore::HTMLMediaElement::supportsFullscreen): + (WebCore::HTMLMediaElement::supportsSave): + * html/HTMLMediaElement.h: + * platform/graphics/MediaPlayer.cpp: + (WebCore::MediaPlayer::supportsSave): + * platform/graphics/MediaPlayer.h: + * platform/graphics/MediaPlayerPrivate.h: + (WebCore::MediaPlayerPrivateInterface::supportsFullscreen): + (WebCore::MediaPlayerPrivateInterface::supportsSave): + * rendering/HitTestResult.cpp: + (WebCore::HitTestResult::altDisplayString): + (WebCore::HitTestResult::absoluteMediaURL): + * rendering/HitTestResult.h: + +2009-07-14 Dimitri Glazkov + + Reviewed by Adam Barth. + + [V8] Implement Reflect and ReflectURL attribute support. + https://bugs.webkit.org/show_bug.cgi?id=27273 + + * bindings/scripts/CodeGeneratorV8.pm: Added support for Reflect and ReflectURL attributes. + +2009-07-14 Dmitry Titov + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=27266 + Add hasCurrentPoint() to WebCore::Path. + This fixes Skia-based Chromium regression caused by the fix for + https://bugs.webkit.org/show_bug.cgi?id=27187. + For Skia, the new method always returns 'true', pending actual implementation. + This means Chromium still will differ from Gecko behavior, but at least its Canvas + will not be completely broken. + + Existing Canvas Layout Tests should pass in Chromium after this change. + + * html/CanvasRenderingContext2D.cpp: + (WebCore::CanvasRenderingContext2D::lineTo): insteand of Path::isEmpty() test for hasCurrentPoint(). + (WebCore::CanvasRenderingContext2D::quadraticCurveTo): ditto. + (WebCore::CanvasRenderingContext2D::bezierCurveTo): ditto. + + * platform/graphics/Path.h: + * platform/graphics/cairo/PathCairo.cpp: + (WebCore::Path::hasCurrentPoint): + * platform/graphics/cg/PathCG.cpp: + (WebCore::Path::isEmpty): + (WebCore::Path::hasCurrentPoint): + * platform/graphics/qt/PathQt.cpp: + (WebCore::Path::hasCurrentPoint): + * platform/graphics/skia/PathSkia.cpp: + (WebCore::Path::hasCurrentPoint): + * platform/graphics/wx/PathWx.cpp: + (WebCore::Path::hasCurrentPoint): + All these files add a Path::hasCurrentPoint() for various platforms. + +2009-07-14 Nate Chapin + + Reviewed by Sam Weinig. + + Upstream RGBColor from src.chromium.org. + + https://bugs.webkit.org/show_bug.cgi?id=27133 + + * WebCore.gypi: Add RGBColor + * css/RGBColor.cpp: Added. + (WebCore::RGBColor::create): + (WebCore::RGBColor::red): + (WebCore::RGBColor::green): + (WebCore::RGBColor::blue): + * css/RGBColor.h: Added. + (WebCore::RGBColor::RGBColor): + +2009-07-10 Matt Perry + + Reviewed by Darin Fisher. + + [V8] Rename the didCreate/DestroyScriptContext calls to make it + clear that that those refer to the frame's contxt. Add another + similar call for when creating contexts via evaluateInNewContext. + https://bugs.webkit.org/show_bug.cgi?id=27104 + + * bindings/v8/V8Proxy.cpp: + (WebCore::V8Proxy::evaluateInNewContext): + (WebCore::V8Proxy::disposeContextHandles): + (WebCore::V8Proxy::initContextIfNeeded): + * loader/EmptyClients.h: + (WebCore::EmptyFrameLoaderClient::didCreateScriptContextForFrame): + (WebCore::EmptyFrameLoaderClient::didDestroyScriptContextForFrame): + (WebCore::EmptyFrameLoaderClient::didCreateIsolatedScriptContext): + * loader/FrameLoaderClient.h: + +2009-07-14 Brent Fulgham + + Revert http://trac.webkit.org/changeset/45864 after + breaking of Windows build. + + * storage/LocalStorageTask.cpp: + * storage/LocalStorageTask.h: + * storage/Storage.cpp: + * storage/Storage.h: + * storage/StorageArea.cpp: + * storage/StorageArea.h: + * storage/StorageAreaImpl.cpp: + * storage/StorageAreaImpl.h: + * storage/StorageAreaSync.cpp: + * storage/StorageAreaSync.h: + * storage/StorageEvent.cpp: + * storage/StorageEvent.h: + (WebCore::StorageEvent::create): + (WebCore::StorageEvent::StorageEvent): + * storage/StorageNamespace.h: + * storage/StorageNamespaceImpl.cpp: + * storage/StorageNamespaceImpl.h: + * storage/StorageSyncManager.cpp: + * storage/StorageSyncManager.h: + +2009-07-11 Jeremy Orlow + + Reviewed by Darin Adler. + + Cleanup DOM Storage dependencies. + https://bugs.webkit.org/show_bug.cgi?id=27180 + + DOM Storage had several unnecessary (and probably unintended) + dependencies. This patch replaces many includes of header files with + forward declaration of classes, making some destructors explicit, and + taking some factories out of the header files. + + This will allow things like StorageAreaSync to take a StorageAreaImpl* + (as it should) rather than a StorageArea* which previously weren't + possible because the dependencies were such a tangled mess. + + * storage/LocalStorageTask.cpp: + (WebCore::LocalStorageTask::~LocalStorageTask): + * storage/LocalStorageTask.h: + * storage/Storage.cpp: + (WebCore::Storage::~Storage): + * storage/Storage.h: + * storage/StorageArea.cpp: + * storage/StorageArea.h: + * storage/StorageAreaImpl.cpp: + * storage/StorageAreaImpl.h: + * storage/StorageAreaSync.cpp: + (WebCore::StorageAreaSync::~StorageAreaSync): + * storage/StorageAreaSync.h: + * storage/StorageEvent.cpp: + (WebCore::StorageEvent::create): + (WebCore::StorageEvent::StorageEvent): + * storage/StorageEvent.h: + * storage/StorageNamespace.h: + * storage/StorageNamespaceImpl.cpp: + * storage/StorageNamespaceImpl.h: + * storage/StorageSyncManager.cpp: + (WebCore::StorageSyncManager::~StorageSyncManager): + * storage/StorageSyncManager.h: + + +2009-07-14 Adam Treat + + Reviewed by David Hyatt. + + https://bugs.webkit.org/show_bug.cgi?id=26983 + + Check to make sure the view is attached to a frame() in the visibleContentsResized() + method as it can be triggered before the view is attached by Frame::createView(...) + setting various values such as setScrollBarModes(...) for example. An ASSERT is + triggered when a view is layout before being attached to a frame(). + + * page/FrameView.cpp: + (WebCore::FrameView::visibleContentsResized): + * page/FrameView.h: + +2009-07-14 Pavel Feldman + + Reviewed by Timothy Hatcher. + + WebInspector: show last opened panel when invoking inspector. + + https://bugs.webkit.org/show_bug.cgi?id=27263 + + * inspector/InspectorController.cpp: + (WebCore::InspectorController::InspectorController): + (WebCore::InspectorController::setWindowVisible): + (WebCore::InspectorController::storeLastActivePanel): + (WebCore::InspectorController::specialPanelForJSName): + * inspector/InspectorController.h: + (WebCore::InspectorController::Setting::Setting): + * inspector/InspectorController.idl: + * inspector/front-end/inspector.js: + (WebInspector.set currentPanel): + (WebInspector.loaded): + +2009-07-14 Anton Muhin + + Reviewed by Dimitri Glazkov. + + Speed up access to NodeList length. + https://bugs.webkit.org/show_bug.cgi?id=27264 + + That's a minimal alternation of the code. + + * bindings/v8/custom/V8NodeListCustom.cpp: + (WebCore::NAMED_PROPERTY_GETTER): 1) use AtomicString for comparison, 2) use + v8::Integer::New instead of v8::Number::New. + +2009-07-14 Anton Muhin + + Reviewed by Dimitri Glazkov. + + Do not do unnecessary conversions from v8::Handle to + v8::Handle and accompanying changes. + https://bugs.webkit.org/show_bug.cgi?id=26953 + + Three things: + + 1) do not cast from v8::Value to v8::Object if unnecessary---casts are cheap, + but are not free (they check for emptiness of handle); + 2) inline conversion from wrapper to node; + 3) simplify case to an ASSERT. + + This is just a refactoring, so no new tests are needed. + + * bindings/scripts/CodeGeneratorV8.pm: + * bindings/v8/V8Proxy.cpp: + (WebCore::V8Proxy::evaluateInNewContext): + (WebCore::V8Proxy::convertToSVGPODTypeImpl): + * bindings/v8/V8Proxy.h: + (WebCore::V8Proxy::convertDOMWrapperToNative): + (WebCore::V8Proxy::convertToNativeObject): + (WebCore::V8Proxy::convertToNativeEvent): + * bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp: + (WebCore::toCanvasStyle): + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8CustomBinding.cpp: + (WebCore::V8Custom::GetTargetFrame): + * bindings/v8/custom/V8DOMWindowCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + (WebCore::V8Custom::ClearTimeoutImpl): + (WebCore::NAMED_ACCESS_CHECK): + (WebCore::INDEXED_ACCESS_CHECK): + * bindings/v8/custom/V8DocumentCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + * bindings/v8/custom/V8LocationCustom.cpp: + (WebCore::CALLBACK_FUNC_DECL): + +2009-07-14 Darin Adler + + Reviewed by Dan Bernstein. + + Straight quotes should match fancy quotes in in-page search + https://bugs.webkit.org/show_bug.cgi?id=27217 + + Tests: fast/text/find-quotes.html + + * editing/TextIterator.cpp: + (WebCore::foldQuoteMark): Added. + (WebCore::foldQuoteMarks): Added. + (WebCore::SearchBuffer::SearchBuffer): Call foldQuoteMarks on the target string. + (WebCore::SearchBuffer::append): Call foldQuoteMarks on characters as they are + added to the search buffer. + + * platform/text/CharacterNames.h: Added more quotation mark character names. + Sorted character names with the sort tool. + +2009-07-13 Pavel Feldman + + Reviewed by Timothy Hatcher. + + WebInspector: handle debugger shortcuts while on source frame or on + script file selector. + + https://bugs.webkit.org/show_bug.cgi?id=27224 + + * inspector/front-end/ScriptsPanel.js: + (WebInspector.ScriptsPanel): + * inspector/front-end/SourceFrame.js: + (WebInspector.SourceFrame.prototype._loaded): + +2009-07-13 Sam Weinig + + Reviewed by Darin Adler. + + Use standard HashCountedSet instead of a hand rolled one + in HTMLDocument. + + * html/HTMLDocument.cpp: + (WebCore::addItemToMap): + (WebCore::removeItemFromMap): + * html/HTMLDocument.h: + +2009-07-13 Erik Arvidsson + + Reviewed by Darin Adler and Maciej Stachowiak. + + Implement HTML5 draggable + https://bugs.webkit.org/show_bug.cgi?id=26262 + + This adds support for the HTML5 draggable attribute and its DOM binding. It maps the draggable property + to the CSS properties -webkit-user-drag and -webkit-user-select respectively. + + Spec: http://www.whatwg.org/specs/web-apps/current-work/multipage/editing.html#the-draggable-attribute + + Test: fast/html/draggable.html + + * css/html.css: + * html/HTMLAnchorElement.cpp: + (WebCore::HTMLAnchorElement::draggable): + * html/HTMLAnchorElement.h: + * html/HTMLAttributeNames.in: + * html/HTMLElement.cpp: + (WebCore::HTMLElement::draggable): + (WebCore::HTMLElement::setDraggable): + * html/HTMLElement.h: + * html/HTMLElement.idl: + * html/HTMLImageElement.cpp: + (WebCore::HTMLImageElement::draggable): + * html/HTMLImageElement.h: + +2009-07-13 Simon Fraser + + Reviewed by Dan Bernstein. + + Image rendered as layer contents looks different from image rendered via CG. + + + Fix a visible color profile difference between between images rendered via Core Graphics + and those rendered via a compositing layer, by assigning the GenericRGB profile to + untagged images (which come through as having the DeviceRGB profile) when they are set + as layer contents. + + Test: compositing/color-matching/image-color-matching.html + + * platform/graphics/mac/GraphicsLayerCA.mm: + (WebCore::GraphicsLayerCA::setContentsToImage): + +2009-07-13 Darin Adler + + Reviewed by Oliver Hunt. + + https://bugs.webkit.org/show_bug.cgi?id=27220 + Assertion failure in createSearcher() (usearch_open() status is U_USING_DEFAULT_WARNING) + + * editing/TextIterator.cpp: + (WebCore::createSearcher): Add U_USING_DEFAULT_WARNING as a possible status code + in the assertion. Affects only the assertion. + +2009-07-13 Alexey Proskuryakov + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=26925 + URL Fragment Breaks Application Cache Loads + + Test: http/tests/appcache/main-resource-hash.html + + * loader/appcache/ApplicationCache.cpp: + (WebCore::ApplicationCache::resourceForURL): + (WebCore::ApplicationCache::resourceForRequest): + * loader/appcache/ApplicationCacheGroup.cpp: + (WebCore::ApplicationCacheGroup::cacheForMainRequest): + (WebCore::ApplicationCacheGroup::fallbackCacheForMainRequest): + (WebCore::ApplicationCacheGroup::selectCache): + (WebCore::ApplicationCacheGroup::finishedLoadingMainResource): + (WebCore::ApplicationCacheGroup::didReceiveResponse): + (WebCore::ApplicationCacheGroup::didFail): + (WebCore::ApplicationCacheGroup::addEntry): + Remove URL fragment at appcache code borders. + + * loader/appcache/ApplicationCacheResource.h: + (WebCore::ApplicationCacheResource::create): + * loader/appcache/ApplicationCacheStorage.cpp: + (WebCore::ApplicationCacheStorage::findOrCreateCacheGroup): + (WebCore::ApplicationCacheStorage::cacheGroupForURL): + (WebCore::ApplicationCacheStorage::fallbackCacheGroupForURL): + Assert that there is no URL fragment in URL at key points in appcache code. + +2009-07-13 Darin Adler + + Reviewed by Dan Bernstein. + + https://bugs.webkit.org/show_bug.cgi?id=27166 + rdar://problem/7015857 + Find for strings composed entirely of spaces doesn't work + + Test: fast/text/find-spaces.html + + * editing/TextIterator.cpp: + (WebCore::findPlainText): Removed unneeded special case. + The empty string case already works correctly. + +2009-07-13 Anders Carlsson + + Reviewed by Kevin Decker. + + Remove NPPVpluginPrivateModeBool, it was removed from the spec. + + * bridge/npapi.h: + +2009-07-13 Feng Qian + + Reviewed by Dimitri Glazkov. + + Fix for https://bugs.webkit.org/show_bug.cgi?id=27237 + + Make V8DOMMap.h compiling with gcc option -Werror=non=virtual-dtor. + + * bindings/v8/V8DOMMap.h: + (WebCore::WeakReferenceMap::WeakReferenceMap): + (WebCore::WeakReferenceMap::~WeakReferenceMap): + +2009-07-13 Dimitri Glazkov + + Reviewed by Darin Fisher. + + Remove an accidental add of bidi.(cpp|h) to WebCore.gypi. + + * WebCore.gypi: Removed bidi.cpp and bidi.h + +2009-07-13 Dimitri Glazkov + + Reviewed by Darin Fisher. + + Update WebCore.gyp in preparation to hooking it up. + + * WebCore.gypi: Added files that were mid-stream while switching over. + +2009-07-13 Dmitry Titov + + Not reviewed, another small fix for Chromium build. + + * bindings/v8/ScriptController.cpp: + (WebCore::ScriptController::evaluate): + +2009-07-13 Dmitry Titov + + Not reviewed, fix Chromium build bustage. + + * bindings/v8/ScriptController.cpp: + (WebCore::ScriptController::evaluate): + * bindings/v8/V8Proxy.cpp: + (WebCore::JavaScriptConsoleMessage::addToPage): + * bindings/v8/WorkerContextExecutionProxy.cpp: + (WebCore::handleConsoleMessage): + +2009-07-13 Sam Weinig + + Reviewed by Darin Adler. + + Fix for https://bugs.webkit.org/show_bug.cgi?id=27234 + + + Add null page check in HTMLDocument::hasFocus. + + Test: fast/dom/HTMLDocument/hasFocus-frameless-crash.html + + * html/HTMLDocument.cpp: + (WebCore::HTMLDocument::hasFocus): Add page null check. + (WebCore::HTMLDocument::createTokenizer): Cleanup page null check. + +2009-07-13 Dan Bernstein + + Reviewed by Darin Adler. + + Disable continuous spell checking in the inspector + https://bugs.webkit.org/show_bug.cgi?id=27131 + + * inspector/front-end/inspector.html: Added spellcheck="false" to the + main-panels and console-prompt containers. + +2009-07-13 Adam Langley + + Reviewed by Eric Seidel. + + Chromium Linux: fix assertion when rendering google.com.kh + + https://bugs.webkit.org/show_bug.cgi?id=26924 + + Some shapers (i.e. Khmer) will produce cluster logs which report that + /no/ code points contributed to certain glyphs. Because of this, we + take any code point which contributed to the glyph in question, or any + subsequent glyph. If we run off the end, then we take the last code + point. + + Added LayoutTests/fast/text/international/khmar-selection.html + + * platform/graphics/chromium/FontLinux.cpp: + (WebCore::Font::offsetForPositionForComplexText): + +2009-07-13 Dan Bernstein + + Reviewed by Darin Adler. + + spellcheck="false" is ignored + + + * editing/Editor.cpp: + (WebCore::markMisspellingsOrBadGrammar): Moved code to check the + spellcheck attribute from here... + (WebCore::Editor::spellCheckingEnabledInFocusedNode): ...to here. + (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges): Bail out + if spell chcking is disabled by the spellcheck attribute. + * editing/Editor.h: + +2009-07-13 Brent Fulgham + + Reviewed by Adam Roben. + + Add new configuration flag for redistributable Windows build. + https://bugs.webkit.org/show_bug.cgi=27087 + + * WebCore.vcproj/WebCore.vcproj: Add new WinCairo.vsprops to + Debug_Cairo and Release_Cairo builds. + * config.h: Check for presence of WIN_CAIRO and select appropriate + configuration. Defaults to standard Apple build. + +2009-07-13 Peter Kasting + + https://bugs.webkit.org/show_bug.cgi?id=19562 + Back out previous patch for this bug (too many problems). + + * DerivedSources.cpp: + * DerivedSources.make: + * GNUmakefile.am: + * WebCore.gypi: + * WebCore.pro: + * WebCore.vcproj/WebCore.vcproj: + * WebCore.xcodeproj/project.pbxproj: + * WebCoreSources.bkl: + * html/HTMLButtonElement.idl: + * html/HTMLFieldSetElement.idl: + * html/HTMLFormControlElement.cpp: + * html/HTMLFormControlElement.h: + (WebCore::HTMLFormControlElement::form): + * html/HTMLInputElement.idl: + * html/HTMLSelectElement.idl: + * html/HTMLTextAreaElement.idl: + * html/ValidityState.cpp: Removed. + * html/ValidityState.h: Removed. + * html/ValidityState.idl: Removed. + +2009-07-13 Nate Chapin + + Reviewed by Dimitri Glazkov. + + Add HTMLAllCollection to WebCore.gypi. + + https://bugs.webkit.org/show_bug.cgi?id=27223 + + * WebCore.gypi: Add HTMLAllCollection. + +2009-07-13 Dimitri Glazkov + + Reviewed by Darin Fisher. + + [V8] Add a missing check for constructor call in WebKitCSSMatrixConstructor. + https://bugs.webkit.org/show_bug.cgi?id=27218 + + Test: fast/css/matrix-as-function-crash.html + + * bindings/v8/custom/V8WebKitCSSMatrixConstructor.cpp: + (WebCore::CALLBACK_FUNC_DECL): Added a check for constructor call. + 2009-07-13 Gustavo Noronha Silva Unreviewed make dist build fix. @@ -2973,7 +10300,7 @@ (WebCore::RenderView::setMaximalOutlineSize): Add comment indicating that this could be optimized. -2009-07-07 Anton Muhin +2009-07-14 Anton Muhin Reviewed by Darin Fisher. @@ -7413,7 +14740,7 @@ (WebCore::DOMDataStore::~DOMDataStore): (WebCore::DOMDataStoreHandle::DOMDataStoreHandle): (WebCore::DOMDataStoreHandle::~DOMDataStoreHandle): - (WebCore::::forget): + (WebCore::forget): (WebCore::getDOMNodeMap): (WebCore::getDOMObjectMap): (WebCore::getActiveDOMObjectMap): diff --git a/src/3rdparty/webkit/WebCore/DerivedSources.cpp b/src/3rdparty/webkit/WebCore/DerivedSources.cpp index 69cc3e36d..145506069 100644 --- a/src/3rdparty/webkit/WebCore/DerivedSources.cpp +++ b/src/3rdparty/webkit/WebCore/DerivedSources.cpp @@ -25,6 +25,7 @@ // This all-in-one cpp file cuts down on template bloat to allow us to build our Windows release build. +#include "JSAbstractWorker.cpp" #include "JSAttr.cpp" #include "JSBarInfo.cpp" #include "JSCanvasGradient.cpp" @@ -56,6 +57,7 @@ #include "JSDatabase.cpp" #include "JSDataGridColumn.cpp" #include "JSDataGridColumnList.cpp" +#include "JSDedicatedWorkerContext.cpp" #include "JSDocument.cpp" #include "JSDocumentFragment.cpp" #include "JSDocumentType.cpp" @@ -68,6 +70,7 @@ #include "JSElement.cpp" #include "JSEntity.cpp" #include "JSEntityReference.cpp" +#include "JSErrorEvent.cpp" #include "JSEvent.cpp" #include "JSEventException.cpp" #include "JSFile.cpp" @@ -170,7 +173,9 @@ #include "JSRange.cpp" #include "JSRangeException.cpp" #include "JSRect.cpp" +#include "JSRGBColor.cpp" #include "JSScreen.cpp" +#include "JSSharedWorker.cpp" #include "JSSQLError.cpp" #include "JSSQLResultSet.cpp" #include "JSSQLResultSetRowList.cpp" @@ -350,5 +355,5 @@ // want StaticConstructors.h to "pollute" all the source files we #include here // accidentally, so we'll throw an error whenever any file includes it. #ifdef StaticConstructors_h -#error Don't include any file in DerivedSources.cpp that includes StaticConstructors.h +#error Do not include any file in DerivedSources.cpp that includes StaticConstructors.h #endif diff --git a/src/3rdparty/webkit/WebCore/WebCore.gypi b/src/3rdparty/webkit/WebCore/WebCore.gypi index d96da8671..d6f248779 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.gypi +++ b/src/3rdparty/webkit/WebCore/WebCore.gypi @@ -44,10 +44,12 @@ 'dom/Element.idl', 'dom/Entity.idl', 'dom/EntityReference.idl', + 'dom/ErrorEvent.idl', 'dom/Event.idl', 'dom/EventException.idl', 'dom/EventListener.idl', 'dom/EventTarget.idl', + 'dom/HTMLAllCollection.idl', 'dom/KeyboardEvent.idl', 'dom/MessageChannel.idl', 'dom/MessageEvent.idl', @@ -154,7 +156,7 @@ 'html/TimeRanges.idl', 'html/ValidityState.idl', 'html/VoidCallback.idl', - 'inspector/InspectorController.idl', + 'inspector/InspectorBackend.idl', 'inspector/JavaScriptCallFrame.idl', 'loader/appcache/DOMApplicationCache.idl', 'page/AbstractView.idl', @@ -332,6 +334,7 @@ 'svg/SVGZoomAndPan.idl', 'svg/SVGZoomEvent.idl', 'workers/AbstractWorker.idl', + 'workers/DedicatedWorkerContext.idl', 'workers/SharedWorker.idl', 'workers/Worker.idl', 'workers/WorkerContext.idl', @@ -397,6 +400,7 @@ 'accessibility/win/AccessibilityObjectWrapperWin.h', 'accessibility/wx/AccessibilityObjectWx.cpp', 'bindings/js/CachedScriptSourceProvider.h', + 'bindings/js/DOMObjectWithSVGContext.h', 'bindings/js/GCController.cpp', 'bindings/js/GCController.h', 'bindings/js/JSAttrCustom.cpp', @@ -431,6 +435,7 @@ 'bindings/js/JSDataGridColumnListCustom.cpp', 'bindings/js/JSDataGridDataSource.cpp', 'bindings/js/JSDataGridDataSource.h', + 'bindings/js/JSDedicatedWorkerContextCustom.cpp', 'bindings/js/JSDocumentCustom.cpp', 'bindings/js/JSDocumentFragmentCustom.cpp', 'bindings/js/JSDOMApplicationCacheCustom.cpp', @@ -481,7 +486,7 @@ 'bindings/js/JSInspectedObjectWrapper.h', 'bindings/js/JSInspectorCallbackWrapper.cpp', 'bindings/js/JSInspectorCallbackWrapper.h', - 'bindings/js/JSInspectorControllerCustom.cpp', + 'bindings/js/JSInspectorBackendCustom.cpp', 'bindings/js/JSJavaScriptCallFrameCustom.cpp', 'bindings/js/JSLazyEventListener.cpp', 'bindings/js/JSLazyEventListener.h', @@ -547,6 +552,8 @@ 'bindings/js/JSXSLTProcessorCustom.cpp', 'bindings/js/ScheduledAction.cpp', 'bindings/js/ScheduledAction.h', + 'bindings/js/ScriptArray.cpp', + 'bindings/js/ScriptArray.h', 'bindings/js/ScriptCachedFrameData.cpp', 'bindings/js/ScriptCachedFrameData.h', 'bindings/js/ScriptCallFrame.cpp', @@ -570,6 +577,7 @@ 'bindings/js/ScriptObjectQuarantine.cpp', 'bindings/js/ScriptObjectQuarantine.h', 'bindings/js/ScriptSourceCode.h', + 'bindings/js/ScriptSourceProvider.h', 'bindings/js/ScriptState.cpp', 'bindings/js/ScriptState.h', 'bindings/js/ScriptString.h', @@ -578,6 +586,8 @@ 'bindings/js/StringSourceProvider.h', 'bindings/js/WorkerScriptController.cpp', 'bindings/js/WorkerScriptController.h', + 'bindings/v8/ChildThreadDOMData.cpp', + 'bindings/v8/ChildThreadDOMData.h', 'bindings/v8/custom/V8AbstractWorkerCustom.cpp', 'bindings/v8/custom/V8AttrCustom.cpp', 'bindings/v8/custom/V8CanvasPixelArrayCustom.cpp', @@ -602,6 +612,8 @@ 'bindings/v8/custom/V8CustomXPathNSResolver.cpp', 'bindings/v8/custom/V8CustomXPathNSResolver.h', 'bindings/v8/custom/V8DatabaseCustom.cpp', + 'bindings/v8/custom/V8DataGridColumnListCustom.cpp', + 'bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp', 'bindings/v8/custom/V8DocumentLocationCustom.cpp', 'bindings/v8/custom/V8DOMParserConstructor.cpp', 'bindings/v8/custom/V8DOMWindowCustom.cpp', @@ -625,7 +637,7 @@ 'bindings/v8/custom/V8HTMLSelectElementCollectionCustom.cpp', 'bindings/v8/custom/V8HTMLSelectElementCustom.cpp', 'bindings/v8/custom/V8HTMLSelectElementCustom.h', - 'bindings/v8/custom/V8InspectorControllerCustom.cpp', + 'bindings/v8/custom/V8InspectorBackendCustom.cpp', 'bindings/v8/custom/V8LocationCustom.cpp', 'bindings/v8/custom/V8MessageChannelConstructor.cpp', 'bindings/v8/custom/V8MessagePortCustom.cpp', @@ -637,6 +649,7 @@ 'bindings/v8/custom/V8NodeFilterCustom.cpp', 'bindings/v8/custom/V8NodeIteratorCustom.cpp', 'bindings/v8/custom/V8NodeListCustom.cpp', + 'bindings/v8/custom/V8StorageCustom.cpp', 'bindings/v8/custom/V8SQLResultSetRowListCustom.cpp', 'bindings/v8/custom/V8SQLTransactionCustom.cpp', 'bindings/v8/custom/V8SVGElementInstanceCustom.cpp', @@ -655,8 +668,21 @@ 'bindings/v8/custom/V8XMLSerializerConstructor.cpp', 'bindings/v8/custom/V8XPathEvaluatorConstructor.cpp', 'bindings/v8/custom/V8XSLTProcessorCustom.cpp', + 'bindings/v8/DOMData.cpp', + 'bindings/v8/DOMData.h', + 'bindings/v8/DOMDataStore.cpp', + 'bindings/v8/DOMDataStore.h', + 'bindings/v8/DOMObjectsInclude.h', + 'bindings/v8/MainThreadDOMData.cpp', + 'bindings/v8/MainThreadDOMData.h', + 'bindings/v8/NPV8Object.cpp', + 'bindings/v8/NPV8Object.h', 'bindings/v8/ScheduledAction.cpp', 'bindings/v8/ScheduledAction.h', + 'bindings/v8/ScopedDOMDataStore.cpp', + 'bindings/v8/ScopedDOMDataStore.h', + 'bindings/v8/ScriptArray.cpp', + 'bindings/v8/ScriptArray.h', 'bindings/v8/ScriptCachedFrameData.h', 'bindings/v8/ScriptCallFrame.cpp', 'bindings/v8/ScriptCallFrame.h', @@ -682,24 +708,40 @@ 'bindings/v8/ScriptString.h', 'bindings/v8/ScriptValue.cpp', 'bindings/v8/ScriptValue.h', + 'bindings/v8/StaticDOMDataStore.cpp', + 'bindings/v8/StaticDOMDataStore.h', 'bindings/v8/V8AbstractEventListener.cpp', 'bindings/v8/V8AbstractEventListener.h', 'bindings/v8/V8Binding.cpp', 'bindings/v8/V8Binding.h', 'bindings/v8/V8Collection.cpp', 'bindings/v8/V8Collection.h', + 'bindings/v8/V8ConsoleMessage.cpp', + 'bindings/v8/V8ConsoleMessage.h', + 'bindings/v8/V8DataGridDataSource.cpp', + 'bindings/v8/V8DataGridDataSource.h', 'bindings/v8/V8DOMMap.cpp', 'bindings/v8/V8DOMMap.h', + 'bindings/v8/V8DOMWrapper.cpp', + 'bindings/v8/V8DOMWrapper.h', 'bindings/v8/V8EventListenerList.cpp', 'bindings/v8/V8EventListenerList.h', + 'bindings/v8/V8GCController.cpp', + 'bindings/v8/V8GCController.h', 'bindings/v8/V8Helpers.cpp', 'bindings/v8/V8Helpers.h', + 'bindings/v8/V8HiddenPropertyName.cpp', + 'bindings/v8/V8HiddenPropertyName.h', 'bindings/v8/V8Index.cpp', 'bindings/v8/V8Index.h', 'bindings/v8/V8IsolatedWorld.cpp', 'bindings/v8/V8IsolatedWorld.h', 'bindings/v8/V8LazyEventListener.cpp', 'bindings/v8/V8LazyEventListener.h', + 'bindings/v8/V8NPObject.cpp', + 'bindings/v8/V8NPObject.h', + 'bindings/v8/V8NPUtils.cpp', + 'bindings/v8/V8NPUtils.h', 'bindings/v8/V8NodeFilterCondition.cpp', 'bindings/v8/V8NodeFilterCondition.h', 'bindings/v8/V8ObjectEventListener.cpp', @@ -717,6 +759,10 @@ 'bindings/v8/WorkerContextExecutionProxy.cpp', 'bindings/v8/WorkerScriptController.h', 'bindings/v8/WorkerScriptController.cpp', + 'bindings/v8/npruntime.cpp', + 'bindings/v8/npruntime_impl.h', + 'bindings/v8/npruntime_internal.h', + 'bindings/v8/npruntime_priv.h', 'css/CSSBorderImageValue.cpp', 'css/CSSBorderImageValue.h', 'css/CSSCanvasValue.cpp', @@ -825,6 +871,8 @@ 'css/MediaQueryExp.h', 'css/Pair.h', 'css/Rect.h', + 'css/RGBColor.cpp', + 'css/RGBColor.h', 'css/SVGCSSComputedStyleDeclaration.cpp', 'css/SVGCSSParser.cpp', 'css/SVGCSSStyleSelector.cpp', @@ -908,6 +956,8 @@ 'dom/Entity.h', 'dom/EntityReference.cpp', 'dom/EntityReference.h', + 'dom/ErrorEvent.cpp', + 'dom/ErrorEvent.h', 'dom/Event.cpp', 'dom/Event.h', 'dom/EventException.h', @@ -1349,6 +1399,8 @@ 'inspector/InspectorClient.h', 'inspector/ConsoleMessage.cpp', 'inspector/ConsoleMessage.h', + 'inspector/InspectorBackend.cpp', + 'inspector/InspectorBackend.h', 'inspector/InspectorController.cpp', 'inspector/InspectorController.h', 'inspector/InspectorDatabaseResource.cpp', @@ -1465,6 +1517,8 @@ 'loader/NavigationAction.h', 'loader/NetscapePlugInStreamLoader.cpp', 'loader/NetscapePlugInStreamLoader.h', + 'loader/PlaceholderDocument.cpp', + 'loader/PlaceholderDocument.h', 'loader/PluginDocument.cpp', 'loader/PluginDocument.h', 'loader/ProgressTracker.cpp', @@ -2293,12 +2347,16 @@ 'platform/sql/SQLiteAuthorizer.cpp', 'platform/sql/SQLiteDatabase.cpp', 'platform/sql/SQLiteDatabase.h', - 'platform/sql/SQLiteFileSystem.h', 'platform/sql/SQLiteFileSystem.cpp', + 'platform/sql/SQLiteFileSystem.h', 'platform/sql/SQLiteStatement.cpp', 'platform/sql/SQLiteStatement.h', 'platform/sql/SQLiteTransaction.cpp', 'platform/sql/SQLiteTransaction.h', + 'platform/sql/chromium/SQLiteFileSystemChromium.cpp', + 'platform/sql/chromium/SQLiteFileSystemChromiumLinux.cpp', + 'platform/sql/chromium/SQLiteFileSystemChromiumMac.cpp', + 'platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp', 'platform/symbian/FloatPointSymbian.cpp', 'platform/symbian/FloatRectSymbian.cpp', 'platform/symbian/IntPointSymbian.cpp', @@ -2581,6 +2639,7 @@ 'plugins/PluginData.h', 'plugins/PluginDatabase.cpp', 'plugins/PluginDatabase.h', + 'plugins/PluginDebug.cpp', 'plugins/PluginDebug.h', 'plugins/PluginInfoStore.cpp', 'plugins/PluginInfoStore.h', @@ -2871,10 +2930,6 @@ 'storage/DatabaseTracker.cpp', 'storage/DatabaseTracker.h', 'storage/DatabaseTrackerClient.h', - 'storage/LocalStorage.cpp', - 'storage/LocalStorage.h', - 'storage/LocalStorageArea.cpp', - 'storage/LocalStorageArea.h', 'storage/LocalStorageTask.cpp', 'storage/LocalStorageTask.h', 'storage/LocalStorageThread.cpp', @@ -2896,18 +2951,23 @@ 'storage/SQLTransaction.h', 'storage/SQLTransactionCallback.h', 'storage/SQLTransactionErrorCallback.h', - 'storage/SessionStorage.cpp', - 'storage/SessionStorage.h', - 'storage/SessionStorageArea.cpp', - 'storage/SessionStorageArea.h', 'storage/Storage.cpp', 'storage/Storage.h', - 'storage/StorageArea.cpp', 'storage/StorageArea.h', + 'storage/StorageAreaImpl.cpp', + 'storage/StorageAreaImpl.h', + 'storage/StorageAreaSync.cpp', + 'storage/StorageAreaSync.h', 'storage/StorageEvent.cpp', 'storage/StorageEvent.h', 'storage/StorageMap.cpp', 'storage/StorageMap.h', + 'storage/StorageNamespace.cpp', + 'storage/StorageNamespace.h', + 'storage/StorageNamespaceImpl.cpp', + 'storage/StorageNamespaceImpl.h', + 'storage/StorageSyncManager.cpp', + 'storage/StorageSyncManager.h', 'svg/animation/SMILTime.cpp', 'svg/animation/SMILTime.h', 'svg/animation/SMILTimeContainer.cpp', @@ -3255,6 +3315,8 @@ 'svg/SynchronizableTypeWrapper.h', 'workers/AbstractWorker.cpp', 'workers/AbstractWorker.h', + 'workers/DedicatedWorkerContext.cpp', + 'workers/DedicatedWorkerContext.h', 'workers/GenericWorkerTask.h', 'workers/SharedWorker.cpp', 'workers/SharedWorker.h', diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index b0b0290b2..e49ab1344 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -34,15 +34,9 @@ unix { lessThan(QT_MINOR_VERSION, 4): QMAKE_PKGCONFIG_REQUIRES += QtXml } -include($$OUTPUT_DIR/config.pri) - CONFIG -= warn_on *-g++*:QMAKE_CXXFLAGS += -Wreturn-type -fno-strict-aliasing -# Disable a few warnings on Windows. The warnings are also -# disabled in WebKitLibraries/win/tools/vsprops/common.vsprops -!win32-g++:win32-*: QMAKE_CXXFLAGS += -wd4291 -wd4344 - unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections @@ -82,6 +76,9 @@ win32-g++ { QMAKE_LIBDIR_POST += $$split(TMPPATH,";") } +# Assume that symbian OS always comes with sqlite +symbian:!CONFIG(QTDIR_build): CONFIG += system-sqlite + # Try to locate sqlite3 source CONFIG(QTDIR_build) { SQLITE3SRCDIR = $$QT_SOURCE_TREE/src/3rdparty/sqlite/ @@ -126,6 +123,7 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) { !contains(DEFINES, ENABLE_SHARED_WORKERS=.): DEFINES += ENABLE_SHARED_WORKERS=0 !contains(DEFINES, ENABLE_WORKERS=.): DEFINES += ENABLE_WORKERS=1 !contains(DEFINES, ENABLE_XHTMLMP=.): DEFINES += ENABLE_XHTMLMP=0 +!contains(DEFINES, ENABLE_DATAGRID=.): DEFINES += ENABLE_DATAGRID=1 # SVG support !contains(DEFINES, ENABLE_SVG=0) { @@ -139,6 +137,9 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) { DEFINES += ENABLE_SVG_FONTS=0 ENABLE_SVG_FOREIGN_OBJECT=0 ENABLE_SVG_ANIMATION=0 ENABLE_SVG_AS_IMAGE=0 ENABLE_SVG_USE=0 } +# HTML5 ruby support +!contains(DEFINES, ENABLE_RUBY=.): DEFINES += ENABLE_RUBY=1 + # HTML5 media support !contains(DEFINES, ENABLE_VIDEO=.) { contains(QT_CONFIG, phonon):DEFINES += ENABLE_VIDEO=1 @@ -162,65 +163,62 @@ CONFIG(compute_defaults) { error("Done computing defaults") } -# Ensure that we pick up WebCore's config.h over JavaScriptCore's -INCLUDEPATH = $$PWD $$INCLUDEPATH - -include($$PWD/../JavaScriptCore/JavaScriptCore.pri) - RESOURCES += \ $$PWD/../WebCore/inspector/front-end/WebKit.qrc \ $$PWD/../WebCore/WebCore.qrc -INCLUDEPATH += \ - $$PWD/platform/qt \ - $$PWD/platform/network/qt \ + +include($$PWD/../JavaScriptCore/JavaScriptCore.pri) + +INCLUDEPATH = \ + $$PWD \ + $$PWD/accessibility \ + $$PWD/bindings/js \ + $$PWD/bridge \ + $$PWD/bridge/c \ + $$PWD/css \ + $$PWD/dom \ + $$PWD/dom/default \ + $$PWD/editing \ + $$PWD/history \ + $$PWD/html \ + $$PWD/inspector \ + $$PWD/loader \ + $$PWD/loader/appcache \ + $$PWD/loader/archive \ + $$PWD/loader/icon \ + $$PWD/page \ + $$PWD/page/animation \ + $$PWD/platform \ + $$PWD/platform/animation \ + $$PWD/platform/graphics \ $$PWD/platform/graphics/filters \ $$PWD/platform/graphics/transforms \ - $$PWD/platform/graphics/qt \ + $$PWD/platform/image-decoders \ + $$PWD/platform/network \ + $$PWD/platform/sql \ + $$PWD/platform/text \ + $$PWD/plugins \ + $$PWD/rendering \ + $$PWD/rendering/style \ + $$PWD/storage \ + $$PWD/svg \ + $$PWD/svg/animation \ + $$PWD/svg/graphics \ + $$PWD/svg/graphics/filters \ + $$PWD/wml \ + $$PWD/workers \ + $$PWD/xml \ + $$GENERATED_SOURCES_DIR \ + $$INCLUDEPATH + +INCLUDEPATH = \ + $$PWD/bridge/qt \ $$PWD/page/qt \ + $$PWD/platform/graphics/qt \ + $$PWD/platform/network/qt \ + $$PWD/platform/qt \ $$PWD/../WebKit/qt/WebCoreSupport \ - -# Make sure storage/ appears before JavaScriptCore/. Both provide LocalStorage.h -# but the header from the former include path is included across directories while -# LocalStorage.h is included only from files within the same directory -INCLUDEPATH = $$PWD/storage $$INCLUDEPATH - -INCLUDEPATH += $$PWD/accessibility \ - $$PWD/ForwardingHeaders \ - $$PWD/platform \ - $$PWD/platform/animation \ - $$PWD/platform/network \ - $$PWD/platform/graphics \ - $$PWD/svg/animation \ - $$PWD/svg/graphics \ - $$PWD/svg/graphics/filters \ - $$PWD/platform/sql \ - $$PWD/platform/text \ - $$PWD/loader \ - $$PWD/loader/appcache \ - $$PWD/loader/archive \ - $$PWD/loader/icon \ - $$PWD/css \ - $$PWD/dom \ - $$PWD/dom/default \ - $$PWD/page \ - $$PWD/page/animation \ - $$PWD/editing \ - $$PWD/rendering \ - $$PWD/rendering/style \ - $$PWD/history \ - $$PWD/inspector \ - $$PWD/xml \ - $$PWD/html \ - $$PWD/wml \ - $$PWD/workers \ - $$PWD/bindings/js \ - $$PWD/svg \ - $$PWD/platform/image-decoders \ - $$PWD/plugins \ - $$PWD/bridge \ - $$PWD/bridge/c \ - $$PWD/bridge/qt -INCLUDEPATH *= $$GENERATED_SOURCES_DIR + $$INCLUDEPATH QT += network lessThan(QT_MINOR_VERSION, 4): QT += xml @@ -263,7 +261,6 @@ STYLESHEETS_EMBED = \ DOMLUT_FILES += \ bindings/js/JSDOMWindowBase.cpp \ - bindings/js/JSRGBColor.cpp \ bindings/js/JSWorkerContextBase.cpp IDL_BINDINGS += \ @@ -284,6 +281,7 @@ IDL_BINDINGS += \ css/CSSVariablesDeclaration.idl \ css/CSSVariablesRule.idl \ css/MediaList.idl \ + css/RGBColor.idl \ css/Rect.idl \ css/StyleSheet.idl \ css/StyleSheetList.idl \ @@ -306,6 +304,7 @@ IDL_BINDINGS += \ dom/Element.idl \ dom/Entity.idl \ dom/EntityReference.idl \ + dom/ErrorEvent.idl \ dom/Event.idl \ dom/EventException.idl \ # dom/EventListener.idl \ @@ -414,7 +413,7 @@ IDL_BINDINGS += \ html/TextMetrics.idl \ html/ValidityState.idl \ html/VoidCallback.idl \ - inspector/InspectorController.idl \ + inspector/InspectorBackend.idl \ page/BarInfo.idl \ page/Console.idl \ page/Coordinates.idl \ @@ -501,8 +500,8 @@ SOURCES += \ bindings/js/JSImageConstructor.cpp \ bindings/js/JSImageDataCustom.cpp \ bindings/js/JSInspectedObjectWrapper.cpp \ + bindings/js/JSInspectorBackendCustom.cpp \ bindings/js/JSInspectorCallbackWrapper.cpp \ - bindings/js/JSInspectorControllerCustom.cpp \ bindings/js/JSLocationCustom.cpp \ bindings/js/JSNamedNodeMapCustom.cpp \ bindings/js/JSNamedNodesCollection.cpp \ @@ -514,7 +513,6 @@ SOURCES += \ bindings/js/JSNodeListCustom.cpp \ bindings/js/JSOptionConstructor.cpp \ bindings/js/JSQuarantinedObjectWrapper.cpp \ - bindings/js/JSRGBColor.cpp \ bindings/js/JSStyleSheetCustom.cpp \ bindings/js/JSStyleSheetListCustom.cpp \ bindings/js/JSTextCustom.cpp \ @@ -534,6 +532,7 @@ SOURCES += \ bindings/js/JSEventListener.cpp \ bindings/js/JSLazyEventListener.cpp \ bindings/js/JSPluginElementFunctions.cpp \ + bindings/js/ScriptArray.cpp \ bindings/js/ScriptCachedFrameData.cpp \ bindings/js/ScriptCallFrame.cpp \ bindings/js/ScriptCallStack.cpp \ @@ -606,6 +605,7 @@ SOURCES += \ css/MediaQuery.cpp \ css/MediaQueryEvaluator.cpp \ css/MediaQueryExp.cpp \ + css/RGBColor.cpp \ css/ShadowValue.cpp \ css/StyleBase.cpp \ css/StyleList.cpp \ @@ -642,6 +642,7 @@ SOURCES += \ dom/Element.cpp \ dom/Entity.cpp \ dom/EntityReference.cpp \ + dom/ErrorEvent.cpp \ dom/Event.cpp \ dom/EventNames.cpp \ dom/EventTarget.cpp \ @@ -845,6 +846,7 @@ SOURCES += \ html/PreloadScanner.cpp \ html/ValidityState.cpp \ inspector/ConsoleMessage.cpp \ + inspector/InspectorBackend.cpp \ inspector/InspectorDatabaseResource.cpp \ inspector/InspectorDOMStorageResource.cpp \ inspector/InspectorController.cpp \ @@ -881,6 +883,7 @@ SOURCES += \ loader/MediaDocument.cpp \ loader/NavigationAction.cpp \ loader/NetscapePlugInStreamLoader.cpp \ + loader/PlaceholderDocument.cpp \ loader/PluginDocument.cpp \ loader/ProgressTracker.cpp \ loader/Request.cpp \ @@ -998,7 +1001,6 @@ SOURCES += \ platform/Scrollbar.cpp \ platform/ScrollbarThemeComposite.cpp \ platform/ScrollView.cpp \ -# platform/SearchPopupMenu.cpp \ platform/text/SegmentedString.cpp \ platform/SharedBuffer.cpp \ platform/text/String.cpp \ @@ -1018,6 +1020,7 @@ SOURCES += \ platform/text/UnicodeRange.cpp \ platform/Widget.cpp \ plugins/PluginDatabase.cpp \ + plugins/PluginDebug.cpp \ plugins/PluginInfoStore.cpp \ plugins/PluginPackage.cpp \ plugins/PluginStream.cpp \ @@ -1115,17 +1118,953 @@ SOURCES += \ xml/XMLSerializer.cpp HEADERS += \ - $$PWD/platform/graphics/qt/StillImageQt.h \ - $$PWD/platform/qt/QWebPopup.h \ + accessibility/AccessibilityARIAGridCell.h \ + accessibility/AccessibilityARIAGrid.h \ + accessibility/AccessibilityARIAGridRow.h \ + accessibility/AccessibilityImageMapLink.h \ + accessibility/AccessibilityListBox.h \ + accessibility/AccessibilityListBoxOption.h \ + accessibility/AccessibilityList.h \ + accessibility/AccessibilityObject.h \ + accessibility/AccessibilityRenderObject.h \ + accessibility/AccessibilityTableCell.h \ + accessibility/AccessibilityTableColumn.h \ + accessibility/AccessibilityTable.h \ + accessibility/AccessibilityTableHeaderContainer.h \ + accessibility/AccessibilityTableRow.h \ + accessibility/AXObjectCache.h \ + bindings/js/CachedScriptSourceProvider.h \ + bindings/js/DOMObjectWithSVGContext.h \ + bindings/js/GCController.h \ + bindings/js/JSAudioConstructor.h \ + bindings/js/JSCSSStyleDeclarationCustom.h \ + bindings/js/JSCustomPositionCallback.h \ + bindings/js/JSCustomPositionErrorCallback.h \ + bindings/js/JSCustomSQLStatementCallback.h \ + bindings/js/JSCustomSQLStatementErrorCallback.h \ + bindings/js/JSCustomSQLTransactionCallback.h \ + bindings/js/JSCustomSQLTransactionErrorCallback.h \ + bindings/js/JSCustomVoidCallback.h \ + bindings/js/JSCustomXPathNSResolver.h \ + bindings/js/JSDataGridDataSource.h \ + bindings/js/JSDOMBinding.h \ + bindings/js/JSDOMGlobalObject.h \ + bindings/js/JSDOMWindowBase.h \ + bindings/js/JSDOMWindowBase.h \ + bindings/js/JSDOMWindowCustom.h \ + bindings/js/JSDOMWindowShell.h \ + bindings/js/JSEventListener.h \ + bindings/js/JSEventTarget.h \ + bindings/js/JSHistoryCustom.h \ + bindings/js/JSHTMLAllCollection.h \ + bindings/js/JSHTMLAppletElementCustom.h \ + bindings/js/JSHTMLEmbedElementCustom.h \ + bindings/js/JSHTMLInputElementCustom.h \ + bindings/js/JSHTMLObjectElementCustom.h \ + bindings/js/JSHTMLSelectElementCustom.h \ + bindings/js/JSImageConstructor.h \ + bindings/js/JSInspectedObjectWrapper.h \ + bindings/js/JSInspectorCallbackWrapper.h \ + bindings/js/JSLazyEventListener.h \ + bindings/js/JSLocationCustom.h \ + bindings/js/JSMessageChannelConstructor.h \ + bindings/js/JSNamedNodesCollection.h \ + bindings/js/JSNodeFilterCondition.h \ + bindings/js/JSOptionConstructor.h \ + bindings/js/JSPluginElementFunctions.h \ + bindings/js/JSQuarantinedObjectWrapper.h \ + bindings/js/JSSharedWorkerConstructor.h \ + bindings/js/JSStorageCustom.h \ + bindings/js/JSWebKitCSSMatrixConstructor.h \ + bindings/js/JSWebKitPointConstructor.h \ + bindings/js/JSWorkerConstructor.h \ + bindings/js/JSWorkerContextBase.h \ + bindings/js/JSWorkerContextBase.h \ + bindings/js/JSXMLHttpRequestConstructor.h \ + bindings/js/JSXSLTProcessorConstructor.h \ + bindings/js/ScheduledAction.h \ + bindings/js/ScriptArray.h \ + bindings/js/ScriptCachedFrameData.h \ + bindings/js/ScriptCallFrame.h \ + bindings/js/ScriptCallStack.h \ + bindings/js/ScriptController.h \ + bindings/js/ScriptEventListener.h \ + bindings/js/ScriptFunctionCall.h \ + bindings/js/ScriptObject.h \ + bindings/js/ScriptObjectQuarantine.h \ + bindings/js/ScriptSourceCode.h \ + bindings/js/ScriptSourceProvider.h \ + bindings/js/ScriptState.h \ + bindings/js/ScriptValue.h \ + bindings/js/StringSourceProvider.h \ + bindings/js/WorkerScriptController.h \ + bridge/c/c_class.h \ + bridge/c/c_instance.h \ + bridge/c/c_runtime.h \ + bridge/c/c_utility.h \ + bridge/IdentifierRep.h \ + bridge/NP_jsobject.h \ + bridge/npruntime.h \ + bridge/qt/qt_class.h \ + bridge/qt/qt_instance.h \ + bridge/qt/qt_runtime.h \ + bridge/runtime_array.h \ + bridge/runtime.h \ + bridge/runtime_method.h \ + bridge/runtime_object.h \ + bridge/runtime_root.h \ + css/CSSBorderImageValue.h \ + css/CSSCanvasValue.h \ + css/CSSCharsetRule.h \ + css/CSSComputedStyleDeclaration.h \ + css/CSSCursorImageValue.h \ + css/CSSFontFace.h \ + css/CSSFontFaceRule.h \ + css/CSSFontFaceSource.h \ + css/CSSFontFaceSrcValue.h \ + css/CSSFontSelector.h \ + css/CSSFunctionValue.h \ + css/CSSGradientValue.h \ + css/CSSHelper.h \ + css/CSSImageGeneratorValue.h \ + css/CSSImageValue.h \ + css/CSSImportRule.h \ + css/CSSInheritedValue.h \ + css/CSSInitialValue.h \ + css/CSSMediaRule.h \ + css/CSSMutableStyleDeclaration.h \ + css/CSSPageRule.h \ + css/CSSParser.h \ + css/CSSParserValues.h \ + css/CSSPrimitiveValue.h \ + css/CSSProperty.h \ + css/CSSPropertyLonghand.h \ + css/CSSReflectValue.h \ + css/CSSRule.h \ + css/CSSRuleList.h \ + css/CSSSegmentedFontFace.h \ + css/CSSSelector.h \ + css/CSSSelectorList.h \ + css/CSSStyleDeclaration.h \ + css/CSSStyleRule.h \ + css/CSSStyleSelector.h \ + css/CSSStyleSheet.h \ + css/CSSTimingFunctionValue.h \ + css/CSSUnicodeRangeValue.h \ + css/CSSValueList.h \ + css/CSSVariableDependentValue.h \ + css/CSSVariablesDeclaration.h \ + css/CSSVariablesRule.h \ + css/FontFamilyValue.h \ + css/FontValue.h \ + css/MediaFeatureNames.h \ + css/MediaList.h \ + css/MediaQueryEvaluator.h \ + css/MediaQueryExp.h \ + css/MediaQuery.h \ + css/RGBColor.h \ + css/ShadowValue.h \ + css/StyleBase.h \ + css/StyleList.h \ + css/StyleSheet.h \ + css/StyleSheetList.h \ + css/WebKitCSSKeyframeRule.h \ + css/WebKitCSSKeyframesRule.h \ + css/WebKitCSSMatrix.h \ + css/WebKitCSSTransformValue.h \ + dom/ActiveDOMObject.h \ + dom/Attr.h \ + dom/Attribute.h \ + dom/BeforeTextInsertedEvent.h \ + dom/BeforeUnloadEvent.h \ + dom/CDATASection.h \ + dom/CharacterData.h \ + dom/CheckedRadioButtons.h \ + dom/ChildNodeList.h \ + dom/ClassNames.h \ + dom/ClassNodeList.h \ + dom/ClientRect.h \ + dom/ClientRectList.h \ + dom/ClipboardEvent.h \ + dom/Clipboard.h \ + dom/Comment.h \ + dom/ContainerNode.h \ + dom/CSSMappedAttributeDeclaration.h \ + dom/default/PlatformMessagePortChannel.h \ + dom/DocumentFragment.h \ + dom/Document.h \ + dom/DocumentType.h \ + dom/DOMImplementation.h \ + dom/DynamicNodeList.h \ + dom/EditingText.h \ + dom/Element.h \ + dom/Entity.h \ + dom/EntityReference.h \ + dom/Event.h \ + dom/EventNames.h \ + dom/EventTarget.h \ + dom/ExceptionBase.h \ + dom/ExceptionCode.h \ + dom/InputElement.h \ + dom/KeyboardEvent.h \ + dom/MappedAttribute.h \ + dom/MessageChannel.h \ + dom/MessageEvent.h \ + dom/MessagePortChannel.h \ + dom/MessagePort.h \ + dom/MouseEvent.h \ + dom/MouseRelatedEvent.h \ + dom/MutationEvent.h \ + dom/NamedAttrMap.h \ + dom/NamedMappedAttrMap.h \ + dom/NameNodeList.h \ + dom/NodeFilterCondition.h \ + dom/NodeFilter.h \ + dom/Node.h \ + dom/NodeIterator.h \ + dom/Notation.h \ + dom/OptionElement.h \ + dom/OptionGroupElement.h \ + dom/OverflowEvent.h \ + dom/Position.h \ + dom/PositionIterator.h \ + dom/ProcessingInstruction.h \ + dom/ProgressEvent.h \ + dom/QualifiedName.h \ + dom/Range.h \ + dom/RegisteredEventListener.h \ + dom/ScriptElement.h \ + dom/ScriptExecutionContext.h \ + dom/SelectElement.h \ + dom/SelectorNodeList.h \ + dom/StaticNodeList.h \ + dom/StyledElement.h \ + dom/StyleElement.h \ + dom/TagNodeList.h \ + dom/TextEvent.h \ + dom/Text.h \ + dom/Traversal.h \ + dom/TreeWalker.h \ + dom/UIEvent.h \ + dom/UIEventWithKeyState.h \ + dom/WebKitAnimationEvent.h \ + dom/WebKitTransitionEvent.h \ + dom/WheelEvent.h \ + dom/XMLTokenizer.h \ + dom/XMLTokenizerScope.h \ + editing/AppendNodeCommand.h \ + editing/ApplyStyleCommand.h \ + editing/BreakBlockquoteCommand.h \ + editing/CompositeEditCommand.h \ + editing/CreateLinkCommand.h \ + editing/DeleteButtonController.h \ + editing/DeleteButton.h \ + editing/DeleteFromTextNodeCommand.h \ + editing/DeleteSelectionCommand.h \ + editing/EditCommand.h \ + editing/Editor.h \ + editing/FormatBlockCommand.h \ + editing/htmlediting.h \ + editing/HTMLInterchange.h \ + editing/IndentOutdentCommand.h \ + editing/InsertIntoTextNodeCommand.h \ + editing/InsertLineBreakCommand.h \ + editing/InsertListCommand.h \ + editing/InsertNodeBeforeCommand.h \ + editing/InsertParagraphSeparatorCommand.h \ + editing/InsertTextCommand.h \ + editing/JoinTextNodesCommand.h \ + editing/markup.h \ + editing/MergeIdenticalElementsCommand.h \ + editing/ModifySelectionListLevel.h \ + editing/MoveSelectionCommand.h \ + editing/RemoveCSSPropertyCommand.h \ + editing/RemoveFormatCommand.h \ + editing/RemoveNodeCommand.h \ + editing/RemoveNodePreservingChildrenCommand.h \ + editing/ReplaceNodeWithSpanCommand.h \ + editing/ReplaceSelectionCommand.h \ + editing/SelectionController.h \ + editing/SetNodeAttributeCommand.h \ + editing/SmartReplace.h \ + editing/SplitElementCommand.h \ + editing/SplitTextNodeCommand.h \ + editing/SplitTextNodeContainingElementCommand.h \ + editing/TextIterator.h \ + editing/TypingCommand.h \ + editing/UnlinkCommand.h \ + editing/VisiblePosition.h \ + editing/VisibleSelection.h \ + editing/visible_units.h \ + editing/WrapContentsInDummySpanCommand.h \ + history/BackForwardList.h \ + history/CachedFrame.h \ + history/CachedPage.h \ + history/HistoryItem.h \ + history/PageCache.h \ + html/CanvasGradient.h \ + html/CanvasPattern.h \ + html/CanvasPixelArray.h \ + html/CanvasRenderingContext2D.h \ + html/CanvasStyle.h \ + html/CollectionCache.h \ + html/DataGridColumn.h \ + html/DataGridColumnList.h \ + html/DOMDataGridDataSource.h \ + html/File.h \ + html/FileList.h \ + html/FormDataList.h \ + html/HTMLAnchorElement.h \ + html/HTMLAppletElement.h \ + html/HTMLAreaElement.h \ + html/HTMLAudioElement.h \ + html/HTMLBaseElement.h \ + html/HTMLBaseFontElement.h \ + html/HTMLBlockquoteElement.h \ + html/HTMLBodyElement.h \ + html/HTMLBRElement.h \ + html/HTMLButtonElement.h \ + html/HTMLCanvasElement.h \ + html/HTMLCollection.h \ + html/HTMLDataGridCellElement.h \ + html/HTMLDataGridColElement.h \ + html/HTMLDataGridElement.h \ + html/HTMLDataGridRowElement.h \ + html/HTMLDirectoryElement.h \ + html/HTMLDivElement.h \ + html/HTMLDListElement.h \ + html/HTMLDocument.h \ + html/HTMLElement.h \ + html/HTMLEmbedElement.h \ + html/HTMLFieldSetElement.h \ + html/HTMLFontElement.h \ + html/HTMLFormCollection.h \ + html/HTMLFormControlElement.h \ + html/HTMLFormElement.h \ + html/HTMLFrameElementBase.h \ + html/HTMLFrameElement.h \ + html/HTMLFrameOwnerElement.h \ + html/HTMLFrameSetElement.h \ + html/HTMLHeadElement.h \ + html/HTMLHeadingElement.h \ + html/HTMLHRElement.h \ + html/HTMLHtmlElement.h \ + html/HTMLIFrameElement.h \ + html/HTMLImageElement.h \ + html/HTMLImageLoader.h \ + html/HTMLInputElement.h \ + html/HTMLIsIndexElement.h \ + html/HTMLKeygenElement.h \ + html/HTMLLabelElement.h \ + html/HTMLLegendElement.h \ + html/HTMLLIElement.h \ + html/HTMLLinkElement.h \ + html/HTMLMapElement.h \ + html/HTMLMarqueeElement.h \ + html/HTMLMediaElement.h \ + html/HTMLMenuElement.h \ + html/HTMLMetaElement.h \ + html/HTMLModElement.h \ + html/HTMLNameCollection.h \ + html/HTMLNoScriptElement.h \ + html/HTMLObjectElement.h \ + html/HTMLOListElement.h \ + html/HTMLOptGroupElement.h \ + html/HTMLOptionElement.h \ + html/HTMLOptionsCollection.h \ + html/HTMLParagraphElement.h \ + html/HTMLParamElement.h \ + html/HTMLParserErrorCodes.h \ + html/HTMLParser.h \ + html/HTMLPlugInElement.h \ + html/HTMLPlugInImageElement.h \ + html/HTMLPreElement.h \ + html/HTMLQuoteElement.h \ + html/HTMLScriptElement.h \ + html/HTMLSelectElement.h \ + html/HTMLSourceElement.h \ + html/HTMLStyleElement.h \ + html/HTMLTableCaptionElement.h \ + html/HTMLTableCellElement.h \ + html/HTMLTableColElement.h \ + html/HTMLTableElement.h \ + html/HTMLTablePartElement.h \ + html/HTMLTableRowElement.h \ + html/HTMLTableRowsCollection.h \ + html/HTMLTableSectionElement.h \ + html/HTMLTextAreaElement.h \ + html/HTMLTitleElement.h \ + html/HTMLTokenizer.h \ + html/HTMLUListElement.h \ + html/HTMLVideoElement.h \ + html/HTMLViewSourceDocument.h \ + html/ImageData.h \ + html/PreloadScanner.h \ + html/TimeRanges.h \ + html/ValidityState.h \ + inspector/ConsoleMessage.h \ + inspector/InspectorBackend.h \ + inspector/InspectorController.h \ + inspector/InspectorDatabaseResource.h \ + inspector/InspectorDOMStorageResource.h \ + inspector/InspectorFrontend.h \ + inspector/InspectorJSONObject.h \ + inspector/InspectorResource.h \ + inspector/JavaScriptCallFrame.h \ + inspector/JavaScriptDebugServer.h \ + inspector/JavaScriptProfile.h \ + inspector/JavaScriptProfileNode.h \ + loader/appcache/ApplicationCacheGroup.h \ + loader/appcache/ApplicationCache.h \ + loader/appcache/ApplicationCacheResource.h \ + loader/appcache/ApplicationCacheStorage.h \ + loader/appcache/DOMApplicationCache.h \ + loader/appcache/ManifestParser.h \ + loader/archive/ArchiveFactory.h \ + loader/archive/ArchiveResourceCollection.h \ + loader/archive/ArchiveResource.h \ + loader/CachedCSSStyleSheet.h \ + loader/CachedFont.h \ + loader/CachedImage.h \ + loader/CachedResourceClientWalker.h \ + loader/CachedResource.h \ + loader/CachedResourceHandle.h \ + loader/CachedScript.h \ + loader/CachedXSLStyleSheet.h \ + loader/Cache.h \ + loader/CrossOriginAccessControl.h \ + loader/CrossOriginPreflightResultCache.h \ + loader/DocLoader.h \ + loader/DocumentLoader.h \ + loader/DocumentThreadableLoader.h \ + loader/FormState.h \ + loader/FrameLoader.h \ + loader/FTPDirectoryDocument.h \ + loader/FTPDirectoryParser.h \ + loader/icon/IconDatabase.h \ + loader/icon/IconLoader.h \ + loader/icon/IconRecord.h \ + loader/icon/PageURLRecord.h \ + loader/ImageDocument.h \ + loader/ImageLoader.h \ + loader/loader.h \ + loader/MainResourceLoader.h \ + loader/MediaDocument.h \ + loader/NavigationAction.h \ + loader/NetscapePlugInStreamLoader.h \ + loader/PlaceholderDocument.h \ + loader/PluginDocument.h \ + loader/ProgressTracker.h \ + loader/Request.h \ + loader/ResourceLoader.h \ + loader/SubresourceLoader.h \ + loader/TextDocument.h \ + loader/TextResourceDecoder.h \ + loader/ThreadableLoader.h \ + loader/UserStyleSheetLoader.h \ + loader/WorkerThreadableLoader.h \ + page/animation/AnimationBase.h \ + page/animation/AnimationController.h \ + page/animation/CompositeAnimation.h \ + page/animation/ImplicitAnimation.h \ + page/animation/KeyframeAnimation.h \ + page/BarInfo.h \ + page/Chrome.h \ + page/Console.h \ + page/ContextMenuController.h \ + page/Coordinates.h \ + page/DOMSelection.h \ + page/DOMTimer.h \ + page/DOMWindow.h \ + page/DragController.h \ + page/EventHandler.h \ + page/FocusController.h \ + page/Frame.h \ + page/FrameTree.h \ + page/FrameView.h \ + page/Geolocation.h \ + page/Geoposition.h \ + page/History.h \ + page/Location.h \ + page/MouseEventWithHitTestResults.h \ + page/NavigatorBase.h \ + page/Navigator.h \ + page/PageGroup.h \ + page/PageGroupLoadDeferrer.h \ + page/Page.h \ + page/PrintContext.h \ + page/Screen.h \ + page/SecurityOrigin.h \ + page/Settings.h \ + page/WindowFeatures.h \ + page/WorkerNavigator.h \ + page/XSSAuditor.h \ + platform/animation/Animation.h \ + platform/animation/AnimationList.h \ + platform/Arena.h \ + platform/ContentType.h \ + platform/ContextMenu.h \ + platform/CrossThreadCopier.h \ + platform/DeprecatedPtrListImpl.h \ + platform/DragData.h \ + platform/DragImage.h \ + platform/FileChooser.h \ + platform/GeolocationService.h \ + platform/graphics/BitmapImage.h \ + platform/graphics/Color.h \ + platform/graphics/filters/FEBlend.h \ + platform/graphics/filters/FEColorMatrix.h \ + platform/graphics/filters/FEComponentTransfer.h \ + platform/graphics/filters/FEComposite.h \ + platform/graphics/filters/FilterEffect.h \ + platform/graphics/filters/SourceAlpha.h \ + platform/graphics/filters/SourceGraphic.h \ + platform/graphics/FloatPoint3D.h \ + platform/graphics/FloatPoint.h \ + platform/graphics/FloatQuad.h \ + platform/graphics/FloatRect.h \ + platform/graphics/FloatSize.h \ + platform/graphics/FontData.h \ + platform/graphics/FontDescription.h \ + platform/graphics/FontFamily.h \ + platform/graphics/Font.h \ + platform/graphics/GeneratedImage.h \ + platform/graphics/Gradient.h \ + platform/graphics/GraphicsContext.h \ + platform/graphics/GraphicsTypes.h \ + platform/graphics/Image.h \ + platform/graphics/IntRect.h \ + platform/graphics/MediaPlayer.h \ + platform/graphics/Path.h \ + platform/graphics/PathTraversalState.h \ + platform/graphics/Pattern.h \ + platform/graphics/Pen.h \ + platform/graphics/qt/FontCustomPlatformData.h \ + platform/graphics/qt/ImageDecoderQt.h \ + platform/graphics/qt/StillImageQt.h \ + platform/graphics/SegmentedFontData.h \ + platform/graphics/SimpleFontData.h \ + platform/graphics/transforms/Matrix3DTransformOperation.h \ + platform/graphics/transforms/MatrixTransformOperation.h \ + platform/graphics/transforms/PerspectiveTransformOperation.h \ + platform/graphics/transforms/RotateTransformOperation.h \ + platform/graphics/transforms/ScaleTransformOperation.h \ + platform/graphics/transforms/SkewTransformOperation.h \ + platform/graphics/transforms/TransformationMatrix.h \ + platform/graphics/transforms/TransformOperations.h \ + platform/graphics/transforms/TranslateTransformOperation.h \ + platform/KURL.h \ + platform/Length.h \ + platform/LinkHash.h \ + platform/Logging.h \ + platform/MIMETypeRegistry.h \ + platform/network/AuthenticationChallengeBase.h \ + platform/network/Credential.h \ + platform/network/FormDataBuilder.h \ + platform/network/FormData.h \ + platform/network/HTTPHeaderMap.h \ + platform/network/HTTPParsers.h \ + platform/network/NetworkStateNotifier.h \ + platform/network/ProtectionSpace.h \ + platform/network/qt/QNetworkReplyHandler.h \ + platform/network/ResourceErrorBase.h \ + platform/network/ResourceHandle.h \ + platform/network/ResourceRequestBase.h \ + platform/network/ResourceResponseBase.h \ + platform/qt/ClipboardQt.h \ + platform/qt/QWebPopup.h \ + platform/qt/RenderThemeQt.h \ + platform/qt/ScrollbarThemeQt.h \ + platform/Scrollbar.h \ + platform/ScrollbarThemeComposite.h \ + platform/ScrollView.h \ + platform/SharedBuffer.h \ + platform/sql/SQLiteDatabase.h \ + platform/sql/SQLiteFileSystem.h \ + platform/sql/SQLiteStatement.h \ + platform/sql/SQLiteTransaction.h \ + platform/sql/SQLValue.h \ + platform/text/AtomicString.h \ + platform/text/Base64.h \ + platform/text/BidiContext.h \ + platform/text/CString.h \ + platform/text/qt/TextCodecQt.h \ + platform/text/RegularExpression.h \ + platform/text/SegmentedString.h \ + platform/text/StringBuilder.h \ + platform/text/StringImpl.h \ + platform/text/TextCodec.h \ + platform/text/TextCodecLatin1.h \ + platform/text/TextCodecUserDefined.h \ + platform/text/TextCodecUTF16.h \ + platform/text/TextEncoding.h \ + platform/text/TextEncodingRegistry.h \ + platform/text/TextStream.h \ + platform/text/UnicodeRange.h \ + platform/ThreadGlobalData.h \ + platform/ThreadTimers.h \ + platform/Timer.h \ + platform/Widget.h \ + plugins/MimeTypeArray.h \ + plugins/MimeType.h \ + plugins/PluginArray.h \ + plugins/PluginDatabase.h \ + plugins/PluginData.h \ + plugins/PluginDebug.h \ + plugins/Plugin.h \ + plugins/PluginInfoStore.h \ + plugins/PluginMainThreadScheduler.h \ + plugins/PluginPackage.h \ + plugins/PluginStream.h \ + plugins/PluginView.h \ + plugins/win/PluginMessageThrottlerWin.h \ + rendering/AutoTableLayout.h \ + rendering/break_lines.h \ + rendering/CounterNode.h \ + rendering/EllipsisBox.h \ + rendering/FixedTableLayout.h \ + rendering/HitTestResult.h \ + rendering/InlineBox.h \ + rendering/InlineFlowBox.h \ + rendering/InlineTextBox.h \ + rendering/LayoutState.h \ + rendering/MediaControlElements.h \ + rendering/PointerEventsHitRules.h \ + rendering/RenderApplet.h \ + rendering/RenderArena.h \ + rendering/RenderBlock.h \ + rendering/RenderBox.h \ + rendering/RenderBoxModelObject.h \ + rendering/RenderBR.h \ + rendering/RenderButton.h \ + rendering/RenderCounter.h \ + rendering/RenderDataGrid.h \ + rendering/RenderFieldset.h \ + rendering/RenderFileUploadControl.h \ + rendering/RenderFlexibleBox.h \ + rendering/RenderForeignObject.h \ + rendering/RenderFrame.h \ + rendering/RenderFrameSet.h \ + rendering/RenderHTMLCanvas.h \ + rendering/RenderImageGeneratedContent.h \ + rendering/RenderImage.h \ + rendering/RenderInline.h \ + rendering/RenderLayer.h \ + rendering/RenderLineBoxList.h \ + rendering/RenderListBox.h \ + rendering/RenderListItem.h \ + rendering/RenderListMarker.h \ + rendering/RenderMarquee.h \ + rendering/RenderMedia.h \ + rendering/RenderMenuList.h \ + rendering/RenderObjectChildList.h \ + rendering/RenderObject.h \ + rendering/RenderPart.h \ + rendering/RenderPartObject.h \ + rendering/RenderPath.h \ + rendering/RenderReplaced.h \ + rendering/RenderReplica.h \ + rendering/RenderScrollbar.h \ + rendering/RenderScrollbarPart.h \ + rendering/RenderScrollbarTheme.h \ + rendering/RenderSlider.h \ + rendering/RenderSVGBlock.h \ + rendering/RenderSVGContainer.h \ + rendering/RenderSVGGradientStop.h \ + rendering/RenderSVGHiddenContainer.h \ + rendering/RenderSVGImage.h \ + rendering/RenderSVGInline.h \ + rendering/RenderSVGInlineText.h \ + rendering/RenderSVGModelObject.h \ + rendering/RenderSVGRoot.h \ + rendering/RenderSVGText.h \ + rendering/RenderSVGTextPath.h \ + rendering/RenderSVGTransformableContainer.h \ + rendering/RenderSVGTSpan.h \ + rendering/RenderSVGViewportContainer.h \ + rendering/RenderTableCell.h \ + rendering/RenderTableCol.h \ + rendering/RenderTable.h \ + rendering/RenderTableRow.h \ + rendering/RenderTableSection.h \ + rendering/RenderTextControl.h \ + rendering/RenderTextControlMultiLine.h \ + rendering/RenderTextControlSingleLine.h \ + rendering/RenderTextFragment.h \ + rendering/RenderText.h \ + rendering/RenderTheme.h \ + rendering/RenderTreeAsText.h \ + rendering/RenderVideo.h \ + rendering/RenderView.h \ + rendering/RenderWidget.h \ + rendering/RenderWordBreak.h \ + rendering/RootInlineBox.h \ + rendering/ScrollBehavior.h \ + rendering/style/BindingURI.h \ + rendering/style/ContentData.h \ + rendering/style/CounterDirectives.h \ + rendering/style/CursorData.h \ + rendering/style/CursorList.h \ + rendering/style/FillLayer.h \ + rendering/style/KeyframeList.h \ + rendering/style/NinePieceImage.h \ + rendering/style/RenderStyle.h \ + rendering/style/ShadowData.h \ + rendering/style/StyleBackgroundData.h \ + rendering/style/StyleBoxData.h \ + rendering/style/StyleCachedImage.h \ + rendering/style/StyleFlexibleBoxData.h \ + rendering/style/StyleGeneratedImage.h \ + rendering/style/StyleInheritedData.h \ + rendering/style/StyleMarqueeData.h \ + rendering/style/StyleMultiColData.h \ + rendering/style/StyleRareInheritedData.h \ + rendering/style/StyleRareNonInheritedData.h \ + rendering/style/StyleReflection.h \ + rendering/style/StyleSurroundData.h \ + rendering/style/StyleTransformData.h \ + rendering/style/StyleVisualData.h \ + rendering/style/SVGRenderStyleDefs.h \ + rendering/style/SVGRenderStyle.h \ + rendering/SVGCharacterLayoutInfo.h \ + rendering/SVGInlineFlowBox.h \ + rendering/SVGInlineTextBox.h \ + rendering/SVGRenderSupport.h \ + rendering/SVGRenderTreeAsText.h \ + rendering/SVGRootInlineBox.h \ + rendering/TextControlInnerElements.h \ + rendering/TransformState.h \ + svg/animation/SMILTimeContainer.h \ + svg/animation/SMILTime.h \ + svg/animation/SVGSMILElement.h \ + svg/ColorDistance.h \ + svg/graphics/filters/SVGFEConvolveMatrix.h \ + svg/graphics/filters/SVGFEDiffuseLighting.h \ + svg/graphics/filters/SVGFEDisplacementMap.h \ + svg/graphics/filters/SVGFEFlood.h \ + svg/graphics/filters/SVGFEGaussianBlur.h \ + svg/graphics/filters/SVGFEImage.h \ + svg/graphics/filters/SVGFEMerge.h \ + svg/graphics/filters/SVGFEMorphology.h \ + svg/graphics/filters/SVGFEOffset.h \ + svg/graphics/filters/SVGFESpecularLighting.h \ + svg/graphics/filters/SVGFETile.h \ + svg/graphics/filters/SVGFETurbulence.h \ + svg/graphics/filters/SVGFilterBuilder.h \ + svg/graphics/filters/SVGFilter.h \ + svg/graphics/filters/SVGLightSource.h \ + svg/graphics/SVGImage.h \ + svg/graphics/SVGPaintServerGradient.h \ + svg/graphics/SVGPaintServer.h \ + svg/graphics/SVGPaintServerLinearGradient.h \ + svg/graphics/SVGPaintServerPattern.h \ + svg/graphics/SVGPaintServerRadialGradient.h \ + svg/graphics/SVGPaintServerSolid.h \ + svg/graphics/SVGResourceClipper.h \ + svg/graphics/SVGResourceFilter.h \ + svg/graphics/SVGResource.h \ + svg/graphics/SVGResourceMarker.h \ + svg/graphics/SVGResourceMasker.h \ + svg/SVGAElement.h \ + svg/SVGAltGlyphElement.h \ + svg/SVGAngle.h \ + svg/SVGAnimateColorElement.h \ + svg/SVGAnimatedPathData.h \ + svg/SVGAnimatedPoints.h \ + svg/SVGAnimateElement.h \ + svg/SVGAnimateMotionElement.h \ + svg/SVGAnimateTransformElement.h \ + svg/SVGAnimationElement.h \ + svg/SVGCircleElement.h \ + svg/SVGClipPathElement.h \ + svg/SVGColor.h \ + svg/SVGComponentTransferFunctionElement.h \ + svg/SVGCursorElement.h \ + svg/SVGDefinitionSrcElement.h \ + svg/SVGDefsElement.h \ + svg/SVGDescElement.h \ + svg/SVGDocumentExtensions.h \ + svg/SVGDocument.h \ + svg/SVGElement.h \ + svg/SVGElementInstance.h \ + svg/SVGElementInstanceList.h \ + svg/SVGEllipseElement.h \ + svg/SVGExternalResourcesRequired.h \ + svg/SVGFEBlendElement.h \ + svg/SVGFEColorMatrixElement.h \ + svg/SVGFEComponentTransferElement.h \ + svg/SVGFECompositeElement.h \ + svg/SVGFEDiffuseLightingElement.h \ + svg/SVGFEDisplacementMapElement.h \ + svg/SVGFEDistantLightElement.h \ + svg/SVGFEFloodElement.h \ + svg/SVGFEFuncAElement.h \ + svg/SVGFEFuncBElement.h \ + svg/SVGFEFuncGElement.h \ + svg/SVGFEFuncRElement.h \ + svg/SVGFEGaussianBlurElement.h \ + svg/SVGFEImageElement.h \ + svg/SVGFELightElement.h \ + svg/SVGFEMergeElement.h \ + svg/SVGFEMergeNodeElement.h \ + svg/SVGFEOffsetElement.h \ + svg/SVGFEPointLightElement.h \ + svg/SVGFESpecularLightingElement.h \ + svg/SVGFESpotLightElement.h \ + svg/SVGFETileElement.h \ + svg/SVGFETurbulenceElement.h \ + svg/SVGFilterElement.h \ + svg/SVGFilterPrimitiveStandardAttributes.h \ + svg/SVGFitToViewBox.h \ + svg/SVGFontData.h \ + svg/SVGFontElement.h \ + svg/SVGFontFaceElement.h \ + svg/SVGFontFaceFormatElement.h \ + svg/SVGFontFaceNameElement.h \ + svg/SVGFontFaceSrcElement.h \ + svg/SVGFontFaceUriElement.h \ + svg/SVGForeignObjectElement.h \ + svg/SVGGElement.h \ + svg/SVGGlyphElement.h \ + svg/SVGGradientElement.h \ + svg/SVGHKernElement.h \ + svg/SVGImageElement.h \ + svg/SVGImageLoader.h \ + svg/SVGLangSpace.h \ + svg/SVGLength.h \ + svg/SVGLengthList.h \ + svg/SVGLinearGradientElement.h \ + svg/SVGLineElement.h \ + svg/SVGLocatable.h \ + svg/SVGMarkerElement.h \ + svg/SVGMaskElement.h \ + svg/SVGMetadataElement.h \ + svg/SVGMissingGlyphElement.h \ + svg/SVGMPathElement.h \ + svg/SVGNumberList.h \ + svg/SVGPaint.h \ + svg/SVGParserUtilities.h \ + svg/SVGPathElement.h \ + svg/SVGPathSegArc.h \ + svg/SVGPathSegClosePath.h \ + svg/SVGPathSegCurvetoCubic.h \ + svg/SVGPathSegCurvetoCubicSmooth.h \ + svg/SVGPathSegCurvetoQuadratic.h \ + svg/SVGPathSegCurvetoQuadraticSmooth.h \ + svg/SVGPathSegLineto.h \ + svg/SVGPathSegLinetoHorizontal.h \ + svg/SVGPathSegLinetoVertical.h \ + svg/SVGPathSegList.h \ + svg/SVGPathSegMoveto.h \ + svg/SVGPatternElement.h \ + svg/SVGPointList.h \ + svg/SVGPolyElement.h \ + svg/SVGPolygonElement.h \ + svg/SVGPolylineElement.h \ + svg/SVGPreserveAspectRatio.h \ + svg/SVGRadialGradientElement.h \ + svg/SVGRectElement.h \ + svg/SVGScriptElement.h \ + svg/SVGSetElement.h \ + svg/SVGStopElement.h \ + svg/SVGStringList.h \ + svg/SVGStylable.h \ + svg/SVGStyledElement.h \ + svg/SVGStyledLocatableElement.h \ + svg/SVGStyledTransformableElement.h \ + svg/SVGStyleElement.h \ + svg/SVGSVGElement.h \ + svg/SVGSwitchElement.h \ + svg/SVGSymbolElement.h \ + svg/SVGTests.h \ + svg/SVGTextContentElement.h \ + svg/SVGTextElement.h \ + svg/SVGTextPathElement.h \ + svg/SVGTextPositioningElement.h \ + svg/SVGTitleElement.h \ + svg/SVGTransformable.h \ + svg/SVGTransformDistance.h \ + svg/SVGTransform.h \ + svg/SVGTransformList.h \ + svg/SVGTRefElement.h \ + svg/SVGTSpanElement.h \ + svg/SVGURIReference.h \ + svg/SVGUseElement.h \ + svg/SVGViewElement.h \ + svg/SVGViewSpec.h \ + svg/SVGZoomAndPan.h \ + svg/SVGZoomEvent.h \ + wml/WMLAccessElement.h \ + wml/WMLAElement.h \ + wml/WMLAnchorElement.h \ + wml/WMLBRElement.h \ + wml/WMLCardElement.h \ + wml/WMLDocument.h \ + wml/WMLDoElement.h \ + wml/WMLElement.h \ + wml/WMLErrorHandling.h \ + wml/WMLEventHandlingElement.h \ + wml/WMLFieldSetElement.h \ + wml/WMLFormControlElement.h \ + wml/WMLGoElement.h \ + wml/WMLImageElement.h \ + wml/WMLImageLoader.h \ + wml/WMLInputElement.h \ + wml/WMLInsertedLegendElement.h \ + wml/WMLIntrinsicEvent.h \ + wml/WMLIntrinsicEventHandler.h \ + wml/WMLMetaElement.h \ + wml/WMLNoopElement.h \ + wml/WMLOnEventElement.h \ + wml/WMLOptGroupElement.h \ + wml/WMLOptionElement.h \ + wml/WMLPageState.h \ + wml/WMLPElement.h \ + wml/WMLPostfieldElement.h \ + wml/WMLPrevElement.h \ + wml/WMLRefreshElement.h \ + wml/WMLSelectElement.h \ + wml/WMLSetvarElement.h \ + wml/WMLTableElement.h \ + wml/WMLTaskElement.h \ + wml/WMLTemplateElement.h \ + wml/WMLTimerElement.h \ + wml/WMLVariables.h \ + workers/AbstractWorker.h \ + workers/SharedWorker.h \ + workers/WorkerContext.h \ + workers/Worker.h \ + workers/WorkerLocation.h \ + workers/WorkerMessagingProxy.h \ + workers/WorkerRunLoop.h \ + workers/WorkerScriptLoader.h \ + workers/WorkerThread.h \ + xml/DOMParser.h \ + xml/NativeXPathNSResolver.h \ + xml/XMLHttpRequest.h \ + xml/XMLHttpRequestUpload.h \ + xml/XMLSerializer.h \ + xml/XPathEvaluator.h \ + xml/XPathExpression.h \ + xml/XPathExpressionNode.h \ + xml/XPathFunctions.h \ + xml/XPathNamespace.h \ + xml/XPathNodeSet.h \ + xml/XPathNSResolver.h \ + xml/XPathParser.h \ + xml/XPathPath.h \ + xml/XPathPredicate.h \ + xml/XPathResult.h \ + xml/XPathStep.h \ + xml/XPathUtil.h \ + xml/XPathValue.h \ + xml/XPathVariableReference.h \ + xml/XSLImportRule.h \ + xml/XSLStyleSheet.h \ + xml/XSLTExtensions.h \ + xml/XSLTProcessor.h \ + xml/XSLTUnicodeSort.h \ $$PWD/../WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h \ - $$PWD/platform/network/qt/QNetworkReplyHandler.h \ - $$PWD/rendering/style/CursorData.h \ - $$PWD/rendering/style/CursorList.h \ - $$PWD/rendering/style/StyleInheritedData.h \ - $$PWD/rendering/style/StyleRareInheritedData.h \ - $$PWD/rendering/style/StyleRareNonInheritedData.h \ - $$PWD/rendering/style/StyleReflection.h - SOURCES += \ accessibility/qt/AccessibilityObjectQt.cpp \ @@ -1309,25 +2248,28 @@ contains(DEFINES, ENABLE_DASHBOARD_SUPPORT=0) { DASHBOARDSUPPORTCSSPROPERTIES -= $$PWD/css/DashboardSupportCSSPropertyNames.in } +contains(DEFINES, ENABLE_DATAGRID=1) { + FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATAGRID=1 +} + contains(DEFINES, ENABLE_SQLITE=1) { - # somewhat copied from src/plugins/sqldrivers/sqlite/sqlite.pro - CONFIG(QTDIR_build):system-sqlite { - LIBS *= $$QT_LFLAGS_SQLITE - QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE - } else { - exists( $${SQLITE3SRCDIR}/sqlite3.c ) { - # we have source - use it - CONFIG(release, debug|release):DEFINES *= NDEBUG - DEFINES += SQLITE_CORE SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE - contains(DEFINES, ENABLE_SINGLE_THREADED=1) { - DEFINES+=SQLITE_THREADSAFE=0 - } + !system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) { + # Build sqlite3 into WebCore from source + # somewhat copied from $$QT_SOURCE_TREE/src/plugins/sqldrivers/sqlite/sqlite.pro INCLUDEPATH += $${SQLITE3SRCDIR} SOURCES += $${SQLITE3SRCDIR}/sqlite3.c + DEFINES += SQLITE_CORE SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE + CONFIG(release, debug|release): DEFINES *= NDEBUG + contains(DEFINES, ENABLE_SINGLE_THREADED=1): DEFINES += SQLITE_THREADSAFE=0 + } else { + # Use sqlite3 from the underlying OS + CONFIG(QTDIR_build) { + QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE + LIBS *= $$QT_LFLAGS_SQLITE } else { - # fall back to platform library - INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/ - LIBS += -lsqlite3 + INCLUDEPATH += $${SQLITE3SRCDIR} + symbian: LIBS += -lsqlite3.lib + else: LIBS += -lsqlite3 } } @@ -1377,13 +2319,25 @@ contains(DEFINES, ENABLE_DOM_STORAGE=1) { FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE=1 HEADERS += \ + storage/ChangeVersionWrapper.h \ + storage/DatabaseAuthorizer.h \ + storage/Database.h \ + storage/DatabaseTask.h \ + storage/DatabaseThread.h \ + storage/DatabaseTracker.h \ storage/LocalStorageTask.h \ storage/LocalStorageThread.h \ - storage/Storage.h \ + storage/OriginQuotaManager.h \ + storage/OriginUsageRecord.h \ + storage/SQLResultSet.h \ + storage/SQLResultSetRowList.h \ + storage/SQLStatement.h \ + storage/SQLTransaction.h \ storage/StorageArea.h \ storage/StorageAreaImpl.h \ storage/StorageAreaSync.h \ storage/StorageEvent.h \ + storage/Storage.h \ storage/StorageMap.h \ storage/StorageNamespace.h \ storage/StorageNamespaceImpl.h \ @@ -1423,11 +2377,15 @@ contains(DEFINES, ENABLE_WORKERS=1) { IDL_BINDINGS += \ page/WorkerNavigator.idl \ + workers/AbstractWorker.idl \ + workers/DedicatedWorkerContext.idl \ workers/Worker.idl \ workers/WorkerContext.idl \ workers/WorkerLocation.idl SOURCES += \ + bindings/js/JSAbstractWorkerCustom.cpp \ + bindings/js/JSDedicatedWorkerContextCustom.cpp \ bindings/js/JSWorkerConstructor.cpp \ bindings/js/JSWorkerContextBase.cpp \ bindings/js/JSWorkerContextCustom.cpp \ @@ -1435,6 +2393,8 @@ contains(DEFINES, ENABLE_WORKERS=1) { bindings/js/WorkerScriptController.cpp \ loader/WorkerThreadableLoader.cpp \ page/WorkerNavigator.cpp \ + workers/AbstractWorker.cpp \ + workers/DedicatedWorkerContext.cpp \ workers/Worker.cpp \ workers/WorkerContext.cpp \ workers/WorkerLocation.cpp \ @@ -1448,14 +2408,11 @@ contains(DEFINES, SHARED_WORKERS=1) { FEATURE_DEFINES_JAVASCRIPT += ENABLE_SHARED_WORKERS=1 IDL_BINDINGS += \ - workers/AbstractWorker.idl \ workers/SharedWorker.idl SOURCES += \ - bindings/js/JSAbstractWorkerCustom.cpp \ bindings/js/JSSharedWorkerConstructor.cpp \ bindings/js/JSSharedWorkerCustom.cpp \ - workers/AbstractWorker.cpp \ workers/SharedWorker.cpp } @@ -2020,6 +2977,7 @@ contains(DEFINES, ENABLE_SVG=1) { cssprops.input = WALDOCSSPROPS cssprops.commands = perl -ne \"print lc\" ${QMAKE_FILE_NAME} $$DASHBOARDSUPPORTCSSPROPERTIES $$SVGCSSPROPERTIES > $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.in && cd $$GENERATED_SOURCES_DIR && perl $$PWD/css/makeprop.pl && $(DEL_FILE) ${QMAKE_FILE_BASE}.strip ${QMAKE_FILE_BASE}.in ${QMAKE_FILE_BASE}.gperf cssprops.CONFIG = target_predeps no_link + cssprops.variable_out = cssprops.depend = ${QMAKE_FILE_NAME} DASHBOARDSUPPORTCSSPROPERTIES SVGCSSPROPERTIES addExtraCompilerWithHeader(cssprops) @@ -2028,6 +2986,7 @@ contains(DEFINES, ENABLE_SVG=1) { cssvalues.input = WALDOCSSVALUES cssvalues.commands = perl -ne \"print lc\" ${QMAKE_FILE_NAME} $$SVGCSSVALUES > $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.in && cd $$GENERATED_SOURCES_DIR && perl $$PWD/css/makevalues.pl && $(DEL_FILE) ${QMAKE_FILE_BASE}.in ${QMAKE_FILE_BASE}.strip ${QMAKE_FILE_BASE}.gperf cssvalues.CONFIG = target_predeps no_link + cssvalues.variable_out = cssvalues.depend = ${QMAKE_FILE_NAME} SVGCSSVALUES addExtraCompilerWithHeader(cssvalues) } else { @@ -2036,6 +2995,7 @@ contains(DEFINES, ENABLE_SVG=1) { cssprops.input = WALDOCSSPROPS cssprops.commands = perl -ne \"print lc\" ${QMAKE_FILE_NAME} $$DASHBOARDSUPPORTCSSPROPERTIES > $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.in && cd $$GENERATED_SOURCES_DIR && perl $$PWD/css/makeprop.pl && $(DEL_FILE) ${QMAKE_FILE_BASE}.strip ${QMAKE_FILE_BASE}.in ${QMAKE_FILE_BASE}.gperf cssprops.CONFIG = target_predeps no_link + cssprops.variable_out = cssprops.depend = ${QMAKE_FILE_NAME} DASHBOARDSUPPORTCSSPROPERTIES addExtraCompilerWithHeader(cssprops) @@ -2044,6 +3004,7 @@ contains(DEFINES, ENABLE_SVG=1) { cssvalues.input = WALDOCSSVALUES cssvalues.commands = perl -ne \"print lc\" ${QMAKE_FILE_NAME} > $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.in && cd $$GENERATED_SOURCES_DIR && perl $$PWD/css/makevalues.pl && $(DEL_FILE) ${QMAKE_FILE_BASE}.in ${QMAKE_FILE_BASE}.strip ${QMAKE_FILE_BASE}.gperf cssvalues.CONFIG = target_predeps no_link + cssvalues.variable_out = cssvalues.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_GENERATED_SOURCES_DIR_SLASH}${QMAKE_FILE_BASE}.h addExtraCompiler(cssvalues) } @@ -2100,6 +3061,7 @@ tokenizer.commands = flex -t < ${QMAKE_FILE_NAME} | perl $$PWD/css/maketokenizer tokenizer.dependency_type = TYPE_C tokenizer.input = TOKENIZER tokenizer.CONFIG += target_predeps no_link +tokenizer.variable_out = addExtraCompiler(tokenizer) # GENERATOR 4: CSS grammar @@ -2154,6 +3116,7 @@ entities.commands = gperf -a -L ANSI-C -C -G -c -o -t --key-positions="*" -N fin entities.input = ENTITIES_GPERF entities.dependency_type = TYPE_C entities.CONFIG = target_predeps no_link +entities.variable_out = entities.clean = ${QMAKE_FILE_OUT} addExtraCompiler(entities) @@ -2163,6 +3126,7 @@ doctypestrings.input = DOCTYPESTRINGS doctypestrings.commands = perl -e \"print \'$${LITERAL_HASH}include \';\" > ${QMAKE_FILE_OUT} && echo // bogus >> ${QMAKE_FILE_OUT} && gperf -CEot -L ANSI-C --key-positions="*" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards < ${QMAKE_FILE_NAME} >> ${QMAKE_FILE_OUT} doctypestrings.dependency_type = TYPE_C doctypestrings.CONFIG += target_predeps no_link +doctypestrings.variable_out = doctypestrings.clean = ${QMAKE_FILE_OUT} addExtraCompiler(doctypestrings) @@ -2171,6 +3135,7 @@ colordata.output = $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}ColorData.c colordata.commands = perl -e \"print \'$${LITERAL_HASH}include \';\" > ${QMAKE_FILE_OUT} && echo // bogus >> ${QMAKE_FILE_OUT} && gperf -CDEot -L ANSI-C --key-positions="*" -N findColor -D -s 2 < ${QMAKE_FILE_NAME} >> ${QMAKE_FILE_OUT} colordata.input = COLORDAT_GPERF colordata.CONFIG = target_predeps no_link +colordata.variable_out = addExtraCompiler(colordata) # GENERATOR 9: diff --git a/src/3rdparty/webkit/WebCore/WebCorePrefix.h b/src/3rdparty/webkit/WebCore/WebCorePrefix.h index e857ecc82..c0d1e7090 100644 --- a/src/3rdparty/webkit/WebCore/WebCorePrefix.h +++ b/src/3rdparty/webkit/WebCore/WebCorePrefix.h @@ -18,8 +18,8 @@ * */ -/* This prefix file is for use on Mac OS X and Windows only. It should contain only: - * 1) files to precompile on Mac OS X and Windows for faster builds +/* This prefix file should contain only: + * 1) files to precompile for faster builds * 2) in one case at least: OS-X-specific performance bug workarounds * 3) the special trick to catch us using new or delete without including "config.h" * The project should be able to build without this header, although we rarely test that. @@ -45,9 +45,11 @@ #define WINVER 0x0500 #endif +#ifndef WTF_USE_CURL #ifndef _WINSOCKAPI_ #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h #endif +#endif // If we don't define these, they get defined in windef.h. // We want to use std::min and std::max @@ -65,7 +67,13 @@ #if defined(__APPLE__) #include #endif + +// On Linux this causes conflicts with libpng because there are two impls. of +// longjmp - see here: https://bugs.launchpad.net/ubuntu/+source/libpng/+bug/218409 +#ifndef BUILDING_WX__ #include +#endif + #include #include #include @@ -97,8 +105,16 @@ #include +#ifndef BUILDING_WX__ #include +#ifdef WIN_CAIRO +#include +#include +#include +#else #include +#endif +#endif #ifdef __OBJC__ #import diff --git a/src/3rdparty/webkit/WebCore/accessibility/AccessibilityObject.cpp b/src/3rdparty/webkit/WebCore/accessibility/AccessibilityObject.cpp index a6cd62d95..f1d829c80 100644 --- a/src/3rdparty/webkit/WebCore/accessibility/AccessibilityObject.cpp +++ b/src/3rdparty/webkit/WebCore/accessibility/AccessibilityObject.cpp @@ -80,31 +80,6 @@ void AccessibilityObject::detach() #endif } -AccessibilityObject* AccessibilityObject::firstChild() const -{ - return 0; -} - -AccessibilityObject* AccessibilityObject::lastChild() const -{ - return 0; -} - -AccessibilityObject* AccessibilityObject::previousSibling() const -{ - return 0; -} - -AccessibilityObject* AccessibilityObject::nextSibling() const -{ - return 0; -} - -AccessibilityObject* AccessibilityObject::parentObject() const -{ - return 0; -} - AccessibilityObject* AccessibilityObject::parentObjectUnignored() const { AccessibilityObject* parent; @@ -113,31 +88,6 @@ AccessibilityObject* AccessibilityObject::parentObjectUnignored() const return parent; } -AccessibilityObject* AccessibilityObject::parentObjectIfExists() const -{ - return 0; -} - -int AccessibilityObject::layoutCount() const -{ - return 0; -} - -String AccessibilityObject::text() const -{ - return String(); -} - -String AccessibilityObject::helpText() const -{ - return String(); -} - -String AccessibilityObject::textUnderElement() const -{ - return String(); -} - bool AccessibilityObject::isARIAInput(AccessibilityRole ariaRole) { return ariaRole == RadioButtonRole || ariaRole == CheckBoxRole || ariaRole == TextFieldRole; @@ -148,145 +98,12 @@ bool AccessibilityObject::isARIAControl(AccessibilityRole ariaRole) return isARIAInput(ariaRole) || ariaRole == TextAreaRole || ariaRole == ButtonRole || ariaRole == ComboBoxRole || ariaRole == SliderRole; } - -int AccessibilityObject::intValue() const -{ - return 0; -} - -String AccessibilityObject::stringValue() const -{ - return String(); -} - -String AccessibilityObject::ariaAccessiblityName(const String&) const -{ - return String(); -} - -String AccessibilityObject::ariaLabeledByAttribute() const -{ - return String(); -} - -String AccessibilityObject::title() const -{ - return String(); -} - -String AccessibilityObject::ariaDescribedByAttribute() const -{ - return String(); -} - -String AccessibilityObject::accessibilityDescription() const -{ - return String(); -} - -IntRect AccessibilityObject::boundingBoxRect() const -{ - return IntRect(); -} - -IntRect AccessibilityObject::elementRect() const -{ - return IntRect(); -} - -IntSize AccessibilityObject::size() const -{ - return IntSize(); -} IntPoint AccessibilityObject::clickPoint() const { IntRect rect = elementRect(); return IntPoint(rect.x() + rect.width() / 2, rect.y() + rect.height() / 2); } - -void AccessibilityObject::linkedUIElements(AccessibilityChildrenVector&) const -{ - return; -} - -AccessibilityObject* AccessibilityObject::titleUIElement() const -{ - return 0; -} - -int AccessibilityObject::textLength() const -{ - return 0; -} - -PassRefPtr AccessibilityObject::ariaSelectedTextDOMRange() const -{ - return 0; -} - -String AccessibilityObject::selectedText() const -{ - return String(); -} - -const AtomicString& AccessibilityObject::accessKey() const -{ - return nullAtom; -} - -VisibleSelection AccessibilityObject::selection() const -{ - return VisibleSelection(); -} - -PlainTextRange AccessibilityObject::selectedTextRange() const -{ - return PlainTextRange(); -} - -unsigned AccessibilityObject::selectionStart() const -{ - return selectedTextRange().start; -} - -unsigned AccessibilityObject::selectionEnd() const -{ - return selectedTextRange().length; -} - -void AccessibilityObject::setSelectedText(const String&) -{ - // TODO: set selected text (ReplaceSelectionCommand). - notImplemented(); -} - -void AccessibilityObject::setSelectedTextRange(const PlainTextRange&) -{ -} - -void AccessibilityObject::makeRangeVisible(const PlainTextRange&) -{ - // TODO: make range visible (scrollRectToVisible). - notImplemented(); -} - -KURL AccessibilityObject::url() const -{ - return KURL(); -} - -void AccessibilityObject::setFocused(bool) -{ -} - -void AccessibilityObject::setValue(const String&) -{ -} - -void AccessibilityObject::setSelected(bool) -{ -} bool AccessibilityObject::press() const { @@ -314,53 +131,6 @@ String AccessibilityObject::language() const return parent->language(); } -AXObjectCache* AccessibilityObject::axObjectCache() const -{ - return 0; -} - -Widget* AccessibilityObject::widget() const -{ - return 0; -} - -Widget* AccessibilityObject::widgetForAttachmentView() const -{ - return 0; -} - -Element* AccessibilityObject::anchorElement() const -{ - return 0; -} - -Element* AccessibilityObject::actionElement() const -{ - return 0; -} - -// This function is like a cross-platform version of - (WebCoreTextMarkerRange*)textMarkerRange. It returns -// a Range that we can convert to a WebCoreRange in the Obj-C file -VisiblePositionRange AccessibilityObject::visiblePositionRange() const -{ - return VisiblePositionRange(); -} - -VisiblePositionRange AccessibilityObject::visiblePositionRangeForLine(unsigned) const -{ - return VisiblePositionRange(); -} - -VisiblePosition AccessibilityObject::visiblePositionForIndex(int) const -{ - return VisiblePosition(); -} - -int AccessibilityObject::indexForVisiblePosition(const VisiblePosition&) const -{ - return 0; -} - VisiblePositionRange AccessibilityObject::visiblePositionRangeForUnorderedPositions(const VisiblePosition& visiblePos1, const VisiblePosition& visiblePos2) const { if (visiblePos1.isNull() || visiblePos2.isNull()) @@ -619,11 +389,6 @@ String AccessibilityObject::stringForVisiblePositionRange(const VisiblePositionR return String::adopt(resultVector); } -IntRect AccessibilityObject::boundsForVisiblePositionRange(const VisiblePositionRange&) const -{ - return IntRect(); -} - int AccessibilityObject::lengthForVisiblePositionRange(const VisiblePositionRange& visiblePositionRange) const { // FIXME: Multi-byte support @@ -651,25 +416,6 @@ int AccessibilityObject::lengthForVisiblePositionRange(const VisiblePositionRang return length; } -void AccessibilityObject::setSelectedVisiblePositionRange(const VisiblePositionRange&) const -{ -} - -VisiblePosition AccessibilityObject::visiblePositionForPoint(const IntPoint&) const -{ - return VisiblePosition(); -} - -VisiblePosition AccessibilityObject::nextVisiblePosition(const VisiblePosition& visiblePos) const -{ - return visiblePos.next(); -} - -VisiblePosition AccessibilityObject::previousVisiblePosition(const VisiblePosition& visiblePos) const -{ - return visiblePos.previous(); -} - VisiblePosition AccessibilityObject::nextWordEnd(const VisiblePosition& visiblePos) const { if (visiblePos.isNull()) @@ -818,12 +564,6 @@ VisiblePosition AccessibilityObject::previousParagraphStartPosition(const Visibl return startOfParagraph(previousPos); } -// NOTE: Consider providing this utility method as AX API -VisiblePosition AccessibilityObject::visiblePositionForIndex(unsigned, bool) const -{ - return VisiblePosition(); -} - AccessibilityObject* AccessibilityObject::accessibilityObjectForPosition(const VisiblePosition& visiblePos) const { if (visiblePos.isNull()) @@ -869,19 +609,6 @@ PlainTextRange AccessibilityObject::plainTextRangeForVisiblePositionRange(const return PlainTextRange(index1, index2 - index1); } -// NOTE: Consider providing this utility method as AX API -int AccessibilityObject::index(const VisiblePosition&) const -{ - return -1; -} - -// Given a line number, the range of characters of the text associated with this accessibility -// object that contains the line number. -PlainTextRange AccessibilityObject::doAXRangeForLine(unsigned) const -{ - return PlainTextRange(); -} - // The composed character range in the text associated with this accessibility object that // is specified by the given screen coordinates. This parameterized attribute returns the // complete range of characters (including surrogate pairs of multi-byte glyphs) at the given @@ -897,14 +624,6 @@ PlainTextRange AccessibilityObject::doAXRangeForPosition(const IntPoint& point) return PlainTextRange(i, 1); } -// The composed character range in the text associated with this accessibility object that -// is specified by the given index value. This parameterized attribute returns the complete -// range of characters (including surrogate pairs of multi-byte glyphs) at the given index. -PlainTextRange AccessibilityObject::doAXRangeForIndex(unsigned) const -{ - return PlainTextRange(); -} - // Given a character index, the range of text associated with this accessibility object // over which the style in effect at that character index applies. PlainTextRange AccessibilityObject::doAXStyleRangeForIndex(unsigned index) const @@ -913,21 +632,6 @@ PlainTextRange AccessibilityObject::doAXStyleRangeForIndex(unsigned index) const return plainTextRangeForVisiblePositionRange(range); } -// A substring of the text associated with this accessibility object that is -// specified by the given character range. -String AccessibilityObject::doAXStringForRange(const PlainTextRange&) const -{ - return String(); -} - -// The bounding rectangle of the text associated with this accessibility object that is -// specified by the given range. This is the bounding rectangle a sighted user would see -// on the display screen, in pixels. -IntRect AccessibilityObject::doAXBoundsForRange(const PlainTextRange&) const -{ - return IntRect(); -} - // Given an indexed character, the line number of the text associated with this accessibility // object that contains the character. unsigned AccessibilityObject::doAXLineForIndex(unsigned index) @@ -945,41 +649,6 @@ FrameView* AccessibilityObject::documentFrameView() const return 0; return object->documentFrameView(); -} - -AccessibilityObject* AccessibilityObject::doAccessibilityHitTest(const IntPoint&) const -{ - return 0; -} - -AccessibilityObject* AccessibilityObject::focusedUIElement() const -{ - return 0; -} - -AccessibilityObject* AccessibilityObject::observableObject() const -{ - return 0; -} - -AccessibilityRole AccessibilityObject::roleValue() const -{ - return UnknownRole; -} - -AccessibilityRole AccessibilityObject::ariaRoleAttribute() const -{ - return UnknownRole; -} - -bool AccessibilityObject::isPresentationalChildOfAriaRole() const -{ - return false; -} - -bool AccessibilityObject::ariaRoleHasPresentationalChildren() const -{ - return false; } void AccessibilityObject::clearChildren() @@ -988,33 +657,6 @@ void AccessibilityObject::clearChildren() m_children.clear(); } -void AccessibilityObject::childrenChanged() -{ - return; -} - -void AccessibilityObject::addChildren() -{ -} - -void AccessibilityObject::selectedChildren(AccessibilityChildrenVector&) -{ -} - -void AccessibilityObject::visibleChildren(AccessibilityChildrenVector&) -{ -} - -unsigned AccessibilityObject::axObjectID() const -{ - return m_id; -} - -void AccessibilityObject::setAXObjectID(unsigned axObjectID) -{ - m_id = axObjectID; -} - const String& AccessibilityObject::actionVerb() const { // FIXME: Need to add verbs for select elements. @@ -1043,9 +685,5 @@ const String& AccessibilityObject::actionVerb() const return noAction; } } - -void AccessibilityObject::updateBackingStore() -{ -} } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/accessibility/AccessibilityObject.h b/src/3rdparty/webkit/WebCore/accessibility/AccessibilityObject.h index 22a7f994b..319ace9bb 100644 --- a/src/3rdparty/webkit/WebCore/accessibility/AccessibilityObject.h +++ b/src/3rdparty/webkit/WebCore/accessibility/AccessibilityObject.h @@ -30,7 +30,10 @@ #ifndef AccessibilityObject_h #define AccessibilityObject_h +#include "IntRect.h" +#include "Range.h" #include "VisiblePosition.h" +#include "VisibleSelection.h" #include #include #include @@ -193,6 +196,7 @@ protected: AccessibilityObject(); public: virtual ~AccessibilityObject(); + virtual void detach(); typedef Vector > AccessibilityChildrenVector; @@ -252,93 +256,96 @@ public: bool accessibilityShouldUseUniqueId() const { return true; }; virtual bool accessibilityIsIgnored() const { return true; }; - virtual int intValue() const; + virtual int intValue() const { return 0; } virtual float valueForRange() const { return 0.0f; } virtual float maxValueForRange() const { return 0.0f; } virtual float minValueForRange() const { return 0.0f; } - virtual int layoutCount() const; + virtual int layoutCount() const { return 0; } static bool isARIAControl(AccessibilityRole); static bool isARIAInput(AccessibilityRole); - unsigned axObjectID() const; - virtual AccessibilityObject* doAccessibilityHitTest(const IntPoint&) const; - virtual AccessibilityObject* focusedUIElement() const; - virtual AccessibilityObject* firstChild() const; - virtual AccessibilityObject* lastChild() const; - virtual AccessibilityObject* previousSibling() const; - virtual AccessibilityObject* nextSibling() const; - virtual AccessibilityObject* parentObject() const; + virtual AccessibilityObject* doAccessibilityHitTest(const IntPoint&) const { return 0; } + virtual AccessibilityObject* focusedUIElement() const { return 0; } + + virtual AccessibilityObject* firstChild() const { return 0; } + virtual AccessibilityObject* lastChild() const { return 0; } + virtual AccessibilityObject* previousSibling() const { return 0; } + virtual AccessibilityObject* nextSibling() const { return 0; } + virtual AccessibilityObject* parentObject() const = 0; virtual AccessibilityObject* parentObjectUnignored() const; - virtual AccessibilityObject* parentObjectIfExists() const; - virtual AccessibilityObject* observableObject() const; - virtual void linkedUIElements(AccessibilityChildrenVector&) const; - virtual AccessibilityObject* titleUIElement() const; + virtual AccessibilityObject* parentObjectIfExists() const { return 0; } + + virtual AccessibilityObject* observableObject() const { return 0; } + virtual void linkedUIElements(AccessibilityChildrenVector&) const { } + virtual AccessibilityObject* titleUIElement() const { return 0; } virtual bool exposesTitleUIElement() const { return true; } - virtual AccessibilityRole ariaRoleAttribute() const; - virtual bool isPresentationalChildOfAriaRole() const; - virtual bool ariaRoleHasPresentationalChildren() const; - virtual AccessibilityRole roleValue() const; - virtual AXObjectCache* axObjectCache() const; + virtual AccessibilityRole ariaRoleAttribute() const { return UnknownRole; } + virtual bool isPresentationalChildOfAriaRole() const { return false; } + virtual bool ariaRoleHasPresentationalChildren() const { return false; } + virtual AccessibilityRole roleValue() const { return UnknownRole; } + virtual String ariaAccessiblityName(const String&) const { return String(); } + virtual String ariaLabeledByAttribute() const { return String(); } + virtual String ariaDescribedByAttribute() const { return String(); } + virtual String accessibilityDescription() const { return String(); } + virtual PassRefPtr ariaSelectedTextDOMRange() const { return 0; } + + virtual AXObjectCache* axObjectCache() const { return 0; } + unsigned axObjectID() const { return m_id; } + void setAXObjectID(unsigned axObjectID) { m_id = axObjectID; } - virtual Element* anchorElement() const; - virtual Element* actionElement() const; - virtual IntRect boundingBoxRect() const; - virtual IntRect elementRect() const; - virtual IntSize size() const; + virtual Element* anchorElement() const { return 0; } + virtual Element* actionElement() const { return 0; } + virtual IntRect boundingBoxRect() const { return IntRect(); } + virtual IntRect elementRect() const = 0; + virtual IntSize size() const = 0; virtual IntPoint clickPoint() const; + + virtual PlainTextRange selectedTextRange() const { return PlainTextRange(); } + unsigned selectionStart() const { return selectedTextRange().start; } + unsigned selectionEnd() const { return selectedTextRange().length; } - virtual KURL url() const; - virtual PlainTextRange selectedTextRange() const; - virtual VisibleSelection selection() const; - unsigned selectionStart() const; - unsigned selectionEnd() const; - virtual String stringValue() const; - virtual String ariaAccessiblityName(const String&) const; - virtual String ariaLabeledByAttribute() const; - virtual String title() const; - virtual String ariaDescribedByAttribute() const; - virtual String accessibilityDescription() const; - virtual String helpText() const; - virtual String textUnderElement() const; - virtual String text() const; - virtual int textLength() const; - virtual PassRefPtr ariaSelectedTextDOMRange() const; - virtual String selectedText() const; - virtual const AtomicString& accessKey() const; + virtual KURL url() const { return KURL(); } + virtual VisibleSelection selection() const { return VisibleSelection(); } + virtual String stringValue() const { return String(); } + virtual String title() const { return String(); } + virtual String helpText() const { return String(); } + virtual String textUnderElement() const { return String(); } + virtual String text() const { return String(); } + virtual int textLength() const { return 0; } + virtual String selectedText() const { return String(); } + virtual const AtomicString& accessKey() const { return nullAtom; } const String& actionVerb() const; - virtual Widget* widget() const; - virtual Widget* widgetForAttachmentView() const; + virtual Widget* widget() const { return 0; } + virtual Widget* widgetForAttachmentView() const { return 0; } virtual Document* document() const { return 0; } virtual FrameView* topDocumentFrameView() const { return 0; } virtual FrameView* documentFrameView() const; virtual String language() const; - - void setAXObjectID(unsigned); - virtual void setFocused(bool); - virtual void setSelectedText(const String&); - virtual void setSelectedTextRange(const PlainTextRange&); - virtual void setValue(const String&); - virtual void setSelected(bool); - - virtual void detach(); - virtual void makeRangeVisible(const PlainTextRange&); + + virtual void setFocused(bool) { } + virtual void setSelectedText(const String&) { } + virtual void setSelectedTextRange(const PlainTextRange&) { } + virtual void setValue(const String&) { } + virtual void setSelected(bool) { } + + virtual void makeRangeVisible(const PlainTextRange&) { } virtual bool press() const; bool performDefaultAction() const { return press(); } - virtual void childrenChanged(); + virtual void childrenChanged() { } virtual const AccessibilityChildrenVector& children() { return m_children; } - virtual void addChildren(); + virtual void addChildren() { } virtual bool canHaveChildren() const { return true; } - virtual bool hasChildren() const { return m_haveChildren; }; - virtual void selectedChildren(AccessibilityChildrenVector&); - virtual void visibleChildren(AccessibilityChildrenVector&); + virtual bool hasChildren() const { return m_haveChildren; } + virtual void selectedChildren(AccessibilityChildrenVector&) { } + virtual void visibleChildren(AccessibilityChildrenVector&) { } virtual bool shouldFocusActiveDescendant() const { return false; } virtual AccessibilityObject* activeDescendant() const { return 0; } virtual void handleActiveDescendantChanged() { } - virtual VisiblePositionRange visiblePositionRange() const; - virtual VisiblePositionRange visiblePositionRangeForLine(unsigned) const; + virtual VisiblePositionRange visiblePositionRange() const { return VisiblePositionRange(); } + virtual VisiblePositionRange visiblePositionRangeForLine(unsigned) const { return VisiblePositionRange(); } VisiblePositionRange visiblePositionRangeForUnorderedPositions(const VisiblePosition&, const VisiblePosition&) const; VisiblePositionRange positionOfLeftWord(const VisiblePosition&) const; @@ -351,13 +358,13 @@ public: VisiblePositionRange visiblePositionRangeForRange(const PlainTextRange&) const; String stringForVisiblePositionRange(const VisiblePositionRange&) const; - virtual IntRect boundsForVisiblePositionRange(const VisiblePositionRange&) const; + virtual IntRect boundsForVisiblePositionRange(const VisiblePositionRange&) const { return IntRect(); } int lengthForVisiblePositionRange(const VisiblePositionRange&) const; - virtual void setSelectedVisiblePositionRange(const VisiblePositionRange&) const; + virtual void setSelectedVisiblePositionRange(const VisiblePositionRange&) const { } - virtual VisiblePosition visiblePositionForPoint(const IntPoint&) const; - VisiblePosition nextVisiblePosition(const VisiblePosition&) const; - VisiblePosition previousVisiblePosition(const VisiblePosition&) const; + virtual VisiblePosition visiblePositionForPoint(const IntPoint&) const { return VisiblePosition(); } + VisiblePosition nextVisiblePosition(const VisiblePosition& visiblePos) const { return visiblePos.next(); } + VisiblePosition previousVisiblePosition(const VisiblePosition& visiblePos) const { return visiblePos.previous(); } VisiblePosition nextWordEnd(const VisiblePosition&) const; VisiblePosition previousWordStart(const VisiblePosition&) const; VisiblePosition nextLineEndPosition(const VisiblePosition&) const; @@ -366,23 +373,24 @@ public: VisiblePosition previousSentenceStartPosition(const VisiblePosition&) const; VisiblePosition nextParagraphEndPosition(const VisiblePosition&) const; VisiblePosition previousParagraphStartPosition(const VisiblePosition&) const; - virtual VisiblePosition visiblePositionForIndex(unsigned indexValue, bool lastIndexOK) const; + virtual VisiblePosition visiblePositionForIndex(unsigned, bool /* +lastIndexOK */) const { return VisiblePosition(); } - virtual VisiblePosition visiblePositionForIndex(int) const; - virtual int indexForVisiblePosition(const VisiblePosition&) const; + virtual VisiblePosition visiblePositionForIndex(int) const { return VisiblePosition(); } + virtual int indexForVisiblePosition(const VisiblePosition&) const { return 0; } AccessibilityObject* accessibilityObjectForPosition(const VisiblePosition&) const; int lineForPosition(const VisiblePosition&) const; PlainTextRange plainTextRangeForVisiblePositionRange(const VisiblePositionRange&) const; - virtual int index(const VisiblePosition&) const; + virtual int index(const VisiblePosition&) const { return -1; } - virtual PlainTextRange doAXRangeForLine(unsigned) const; + virtual PlainTextRange doAXRangeForLine(unsigned) const { return PlainTextRange(); } PlainTextRange doAXRangeForPosition(const IntPoint&) const; - virtual PlainTextRange doAXRangeForIndex(unsigned) const; + virtual PlainTextRange doAXRangeForIndex(unsigned) const { return PlainTextRange(); } PlainTextRange doAXStyleRangeForIndex(unsigned) const; - virtual String doAXStringForRange(const PlainTextRange&) const; - virtual IntRect doAXBoundsForRange(const PlainTextRange&) const; + virtual String doAXStringForRange(const PlainTextRange&) const { return String(); } + virtual IntRect doAXBoundsForRange(const PlainTextRange&) const { return IntRect(); } unsigned doAXLineForIndex(unsigned); @@ -408,7 +416,7 @@ public: // allows for an AccessibilityObject to update its render tree or perform // other operations update type operations - virtual void updateBackingStore(); + virtual void updateBackingStore() { } protected: unsigned m_id; diff --git a/src/3rdparty/webkit/WebCore/accessibility/AccessibilityRenderObject.cpp b/src/3rdparty/webkit/WebCore/accessibility/AccessibilityRenderObject.cpp index 7d2ddc5a1..65a1a7d8e 100644 --- a/src/3rdparty/webkit/WebCore/accessibility/AccessibilityRenderObject.cpp +++ b/src/3rdparty/webkit/WebCore/accessibility/AccessibilityRenderObject.cpp @@ -55,6 +55,7 @@ #include "LocalizedStrings.h" #include "NodeList.h" #include "Page.h" +#include "RenderButton.h" #include "RenderFieldset.h" #include "RenderFileUploadControl.h" #include "RenderHTMLCanvas.h" @@ -773,6 +774,9 @@ String AccessibilityRenderObject::stringValue() const if (m_renderer->isListMarker()) return static_cast(m_renderer)->text(); + if (m_renderer->isRenderButton()) + return static_cast(m_renderer)->text(); + if (isWebArea()) { if (m_renderer->document()->frame()) return String(); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/CachedScriptSourceProvider.h b/src/3rdparty/webkit/WebCore/bindings/js/CachedScriptSourceProvider.h index e943fa5b1..1cdd8aa2c 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/CachedScriptSourceProvider.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/CachedScriptSourceProvider.h @@ -29,11 +29,12 @@ #include "CachedResourceClient.h" #include "CachedResourceHandle.h" #include "CachedScript.h" +#include "ScriptSourceProvider.h" #include namespace WebCore { - class CachedScriptSourceProvider : public JSC::SourceProvider, public CachedResourceClient { + class CachedScriptSourceProvider : public ScriptSourceProvider, public CachedResourceClient { public: static PassRefPtr create(CachedScript* cachedScript) { return adoptRef(new CachedScriptSourceProvider(cachedScript)); } @@ -45,10 +46,11 @@ namespace WebCore { JSC::UString getRange(int start, int end) const { return JSC::UString(m_cachedScript->script().characters() + start, end - start); } const UChar* data() const { return m_cachedScript->script().characters(); } int length() const { return m_cachedScript->script().length(); } + const String& source() const { return m_cachedScript->script(); } private: CachedScriptSourceProvider(CachedScript* cachedScript) - : SourceProvider(cachedScript->url()) + : ScriptSourceProvider(cachedScript->url()) , m_cachedScript(cachedScript) { m_cachedScript->addClient(this); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/DOMObjectWithSVGContext.h b/src/3rdparty/webkit/WebCore/bindings/js/DOMObjectWithSVGContext.h new file mode 100644 index 000000000..570548dc2 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/bindings/js/DOMObjectWithSVGContext.h @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2009 Google, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef DOMObjectWithSVGContext_h +#define DOMObjectWithSVGContext_h + +#if ENABLE(SVG) + +#include "JSDOMBinding.h" +#include "SVGElement.h" + +namespace WebCore { + + // FIXME: This class (and file) should be removed once all SVG bindings + // have moved context() onto the various impl() pointers. + class DOMObjectWithSVGContext : public DOMObject { + public: + SVGElement* context() const { return m_context.get(); } + + protected: + DOMObjectWithSVGContext(PassRefPtr structure, JSDOMGlobalObject*, SVGElement* context) + : DOMObject(structure) + , m_context(context) + { + // No space to store the JSDOMGlobalObject w/o hitting the CELL_SIZE limit. + } + + protected: // FIXME: Many custom bindings use m_context directly. Making this protected to temporariliy reduce code churn. + RefPtr m_context; + }; + +} // namespace WebCore + +#endif // ENABLE(SVG) +#endif // DOMObjectWithSVGContext_h diff --git a/src/3rdparty/webkit/WebCore/bindings/js/GCController.cpp b/src/3rdparty/webkit/WebCore/bindings/js/GCController.cpp index db295c2b8..59bcfa372 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/GCController.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/GCController.cpp @@ -44,7 +44,7 @@ namespace WebCore { static void* collect(void*) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSDOMWindow::commonJSGlobalData()->heap.collect(); return 0; } @@ -70,13 +70,13 @@ void GCController::garbageCollectSoon() void GCController::gcTimerFired(Timer*) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSDOMWindow::commonJSGlobalData()->heap.collect(); } void GCController::garbageCollectNow() { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSDOMWindow::commonJSGlobalData()->heap.collect(); } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/GCController.h b/src/3rdparty/webkit/WebCore/bindings/js/GCController.h index 452019af6..4c2540787 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/GCController.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/GCController.h @@ -31,7 +31,7 @@ namespace WebCore { - class GCController : Noncopyable { + class GCController : public Noncopyable { friend GCController& gcController(); public: diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSAbstractWorkerCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSAbstractWorkerCustom.cpp index 82e06e3a4..314641344 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSAbstractWorkerCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSAbstractWorkerCustom.cpp @@ -30,7 +30,7 @@ #include "config.h" -#if ENABLE(SHARED_WORKERS) +#if ENABLE(WORKERS) #include "JSAbstractWorker.h" @@ -45,7 +45,7 @@ namespace WebCore { void JSAbstractWorker::mark() { - DOMObject::mark(); + Base::mark(); markIfNotNull(m_impl->onerror()); @@ -82,12 +82,6 @@ JSValue JSAbstractWorker::removeEventListener(ExecState* exec, const ArgList& ar return jsUndefined(); } -JSValue toJS(ExecState* exec, AbstractWorker* baseObject) -{ - // Just call the JSEventTarget implementation of toJS(), which already differentiates between the different implementations. - return toJS(exec, static_cast(baseObject)); -} - } // namespace WebCore -#endif // ENABLE(SHARED_WORKERS) +#endif // ENABLE(WORKERS) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSAttrCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSAttrCustom.cpp index 4f3c8ee10..abd5ad5fc 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSAttrCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSAttrCustom.cpp @@ -47,7 +47,7 @@ void JSAttr::setValue(ExecState* exec, JSValue value) Element* ownerElement = imp->ownerElement(); if (ownerElement && (ownerElement->hasTagName(iframeTag) || ownerElement->hasTagName(frameTag))) { - if (equalIgnoringCase(imp->name(), "src") && protocolIsJavaScript(parseURL(attrValue))) { + if (equalIgnoringCase(imp->name(), "src") && protocolIsJavaScript(deprecatedParseURL(attrValue))) { if (!checkNodeSecurity(exec, static_cast(ownerElement)->contentDocument())) return; } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSAudioConstructor.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSAudioConstructor.cpp index 74bcad5ec..87a388073 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSAudioConstructor.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSAudioConstructor.cpp @@ -42,35 +42,27 @@ namespace WebCore { const ClassInfo JSAudioConstructor::s_info = { "AudioConstructor", 0, 0, 0 }; JSAudioConstructor::JSAudioConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) - : DOMObject(JSAudioConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) - , m_globalObject(globalObject) + : DOMConstructorWithDocument(JSAudioConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - ASSERT(globalObject->scriptExecutionContext()); - ASSERT(globalObject->scriptExecutionContext()->isDocument()); - - putDirect(exec->propertyNames().prototype, JSHTMLAudioElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLAudioElementPrototype::self(exec, globalObject), None); putDirect(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly|DontDelete|DontEnum); } -Document* JSAudioConstructor::document() const -{ - return static_cast(m_globalObject->scriptExecutionContext()); -} - static JSObject* constructAudio(ExecState* exec, JSObject* constructor, const ArgList& args) { + JSAudioConstructor* jsAudio = static_cast(constructor); // FIXME: Why doesn't this need the call toJS on the document like JSImageConstructor? - - Document* document = static_cast(constructor)->document(); + Document* document = jsAudio->document(); if (!document) return throwError(exec, ReferenceError, "Audio constructor associated document is unavailable"); RefPtr audio = new HTMLAudioElement(HTMLNames::audioTag, document); + audio->setAutobuffer(true); if (args.size() > 0) { audio->setSrc(args.at(0).toString(exec)); audio->scheduleLoad(); } - return asObject(toJS(exec, audio.release())); + return asObject(toJS(exec, jsAudio->globalObject(), audio.release())); } ConstructType JSAudioConstructor::getConstructData(ConstructData& constructData) @@ -79,13 +71,6 @@ ConstructType JSAudioConstructor::getConstructData(ConstructData& constructData) return ConstructTypeHost; } -void JSAudioConstructor::mark() -{ - DOMObject::mark(); - if (!m_globalObject->marked()) - m_globalObject->mark(); -} - } // namespace WebCore #endif // ENABLE(VIDEO) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSAudioConstructor.h b/src/3rdparty/webkit/WebCore/bindings/js/JSAudioConstructor.h index 0a3a7ea00..3496897a2 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSAudioConstructor.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSAudioConstructor.h @@ -34,21 +34,15 @@ namespace WebCore { - class JSAudioConstructor : public DOMObject { + class JSAudioConstructor : public DOMConstructorWithDocument { public: JSAudioConstructor(JSC::ExecState*, JSDOMGlobalObject*); - Document* document() const; - static const JSC::ClassInfo s_info; - - virtual void mark(); private: virtual JSC::ConstructType getConstructData(JSC::ConstructData&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } - - JSDOMGlobalObject* m_globalObject; }; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSCDATASectionCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSCDATASectionCustom.cpp index 44a8957bd..c2738cc52 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSCDATASectionCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSCDATASectionCustom.cpp @@ -32,12 +32,12 @@ using namespace JSC; namespace WebCore { -JSValue toJSNewlyCreated(ExecState* exec, CDATASection* section) +JSValue toJSNewlyCreated(ExecState* exec, JSDOMGlobalObject* globalObject, CDATASection* section) { if (!section) return jsNull(); - - return CREATE_DOM_NODE_WRAPPER(exec, CDATASection, section); + + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, CDATASection, section); } } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSCSSRuleCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSCSSRuleCustom.cpp index 2c204315d..1b96c0627 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSCSSRuleCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSCSSRuleCustom.cpp @@ -49,46 +49,45 @@ using namespace JSC; namespace WebCore { -JSValue toJS(ExecState* exec, CSSRule* rule) +JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, CSSRule* rule) { if (!rule) return jsNull(); DOMObject* wrapper = getCachedDOMObjectWrapper(exec->globalData(), rule); - if (wrapper) return wrapper; switch (rule->type()) { case CSSRule::STYLE_RULE: - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, CSSStyleRule, rule); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSStyleRule, rule); break; case CSSRule::MEDIA_RULE: - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, CSSMediaRule, rule); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSMediaRule, rule); break; case CSSRule::FONT_FACE_RULE: - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, CSSFontFaceRule, rule); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSFontFaceRule, rule); break; case CSSRule::PAGE_RULE: - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, CSSPageRule, rule); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSPageRule, rule); break; case CSSRule::IMPORT_RULE: - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, CSSImportRule, rule); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSImportRule, rule); break; case CSSRule::CHARSET_RULE: - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, CSSCharsetRule, rule); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSCharsetRule, rule); break; case CSSRule::VARIABLES_RULE: - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, CSSVariablesRule, rule); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSVariablesRule, rule); break; case CSSRule::WEBKIT_KEYFRAME_RULE: - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, WebKitCSSKeyframeRule, rule); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, WebKitCSSKeyframeRule, rule); break; case CSSRule::WEBKIT_KEYFRAMES_RULE: - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, WebKitCSSKeyframesRule, rule); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, WebKitCSSKeyframesRule, rule); break; default: - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, CSSRule, rule); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSRule, rule); } return wrapper; diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSCSSValueCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSCSSValueCustom.cpp index ad0cee1cd..87a576025 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSCSSValueCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSCSSValueCustom.cpp @@ -44,7 +44,7 @@ using namespace JSC; namespace WebCore { -JSValue toJS(ExecState* exec, CSSValue* value) +JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, CSSValue* value) { if (!value) return jsNull(); @@ -55,19 +55,19 @@ JSValue toJS(ExecState* exec, CSSValue* value) return wrapper; if (value->isWebKitCSSTransformValue()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, WebKitCSSTransformValue, value); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, WebKitCSSTransformValue, value); else if (value->isValueList()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, CSSValueList, value); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSValueList, value); #if ENABLE(SVG) else if (value->isSVGPaint()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, SVGPaint, value); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, SVGPaint, value); else if (value->isSVGColor()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, SVGColor, value); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, SVGColor, value); #endif else if (value->isPrimitiveValue()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, CSSPrimitiveValue, value); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSPrimitiveValue, value); else - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, CSSValue, value); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSValue, value); return wrapper; } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomPositionCallback.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomPositionCallback.cpp index 6f9efd9f9..6abed9901 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomPositionCallback.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomPositionCallback.cpp @@ -48,11 +48,12 @@ void JSCustomPositionCallback::handleEvent(Geoposition* geoposition, bool& raise if (!m_frame->script()->isEnabled()) return; - + + // FIXME: This is likely the wrong globalObject (for prototype chains at least) JSGlobalObject* globalObject = m_frame->script()->globalObject(); ExecState* exec = globalObject->globalExec(); - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); JSValue function = m_callback->get(exec, Identifier(exec, "handleEvent")); CallData callData; @@ -67,10 +68,10 @@ void JSCustomPositionCallback::handleEvent(Geoposition* geoposition, bool& raise } RefPtr protect(this); - + MarkedArgumentBuffer args; - args.append(toJS(exec, geoposition)); - + args.append(toJS(exec, deprecatedGlobalObjectForPrototype(exec), geoposition)); + globalObject->globalData()->timeoutChecker.start(); call(exec, function, callType, callData, m_callback, args); globalObject->globalData()->timeoutChecker.stop(); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomPositionErrorCallback.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomPositionErrorCallback.cpp index cc6cd5563..cda5738f6 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomPositionErrorCallback.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomPositionErrorCallback.cpp @@ -48,11 +48,12 @@ void JSCustomPositionErrorCallback::handleEvent(PositionError* positionError) if (!m_frame->script()->isEnabled()) return; - + + // FIXME: This is likely the wrong globalObject (for prototype chains at least) JSGlobalObject* globalObject = m_frame->script()->globalObject(); ExecState* exec = globalObject->globalExec(); - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); JSValue function = m_callback->get(exec, Identifier(exec, "handleEvent")); CallData callData; @@ -69,7 +70,7 @@ void JSCustomPositionErrorCallback::handleEvent(PositionError* positionError) RefPtr protect(this); MarkedArgumentBuffer args; - args.append(toJS(exec, positionError)); + args.append(toJS(exec, deprecatedGlobalObjectForPrototype(exec), positionError)); globalObject->globalData()->timeoutChecker.start(); call(exec, function, callType, callData, m_callback, args); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLStatementCallback.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLStatementCallback.cpp index 107a49118..d0943dede 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLStatementCallback.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLStatementCallback.cpp @@ -54,10 +54,11 @@ void JSCustomSQLStatementCallback::handleEvent(SQLTransaction* transaction, SQLR if (!m_frame->script()->isEnabled()) return; + // FIXME: This is likely the wrong globalObject (for prototype chains at least) JSGlobalObject* globalObject = m_frame->script()->globalObject(); ExecState* exec = globalObject->globalExec(); - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); JSValue function = m_callback->get(exec, Identifier(exec, "handleEvent")); CallData callData; @@ -74,8 +75,8 @@ void JSCustomSQLStatementCallback::handleEvent(SQLTransaction* transaction, SQLR RefPtr protect(this); MarkedArgumentBuffer args; - args.append(toJS(exec, transaction)); - args.append(toJS(exec, resultSet)); + args.append(toJS(exec, deprecatedGlobalObjectForPrototype(exec), transaction)); + args.append(toJS(exec, deprecatedGlobalObjectForPrototype(exec), resultSet)); globalObject->globalData()->timeoutChecker.start(); call(exec, function, callType, callData, m_callback, args); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp index 018dabdf1..6c831accc 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp @@ -54,11 +54,12 @@ bool JSCustomSQLStatementErrorCallback::handleEvent(SQLTransaction* transaction, if (!m_frame->script()->isEnabled()) return true; - + + // FIXME: This is likely the wrong globalObject (for prototype chains at least) JSGlobalObject* globalObject = m_frame->script()->globalObject(); ExecState* exec = globalObject->globalExec(); - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); JSValue handleEventFunction = m_callback->get(exec, Identifier(exec, "handleEvent")); CallData handleEventCallData; @@ -77,8 +78,8 @@ bool JSCustomSQLStatementErrorCallback::handleEvent(SQLTransaction* transaction, RefPtr protect(this); MarkedArgumentBuffer args; - args.append(toJS(exec, transaction)); - args.append(toJS(exec, error)); + args.append(toJS(exec, deprecatedGlobalObjectForPrototype(exec), transaction)); + args.append(toJS(exec, deprecatedGlobalObjectForPrototype(exec), error)); JSValue result; globalObject->globalData()->timeoutChecker.start(); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp index a41ac7879..3d42f814f 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp @@ -94,11 +94,12 @@ void JSCustomSQLTransactionCallback::handleEvent(SQLTransaction* transaction, bo if (!m_data->frame()->script()->isEnabled()) return; - + + // FIXME: This is likely the wrong globalObject (for prototype chains at least) JSGlobalObject* globalObject = m_data->frame()->script()->globalObject(); ExecState* exec = globalObject->globalExec(); - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); JSValue handleEventFunction = m_data->callback()->get(exec, Identifier(exec, "handleEvent")); CallData handleEventCallData; @@ -117,7 +118,7 @@ void JSCustomSQLTransactionCallback::handleEvent(SQLTransaction* transaction, bo RefPtr protect(this); MarkedArgumentBuffer args; - args.append(toJS(exec, transaction)); + args.append(toJS(exec, deprecatedGlobalObjectForPrototype(exec), transaction)); globalObject->globalData()->timeoutChecker.start(); if (handleEventCallType != CallTypeNone) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp index 324e2bb6f..2d41bb824 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp @@ -54,10 +54,11 @@ void JSCustomSQLTransactionErrorCallback::handleEvent(SQLError* error) if (!m_frame->script()->isEnabled()) return; + // FIXME: This is likely the wrong globalObject (for prototype chains at least) JSGlobalObject* globalObject = m_frame->script()->globalObject(); ExecState* exec = globalObject->globalExec(); - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); JSValue function = m_callback->get(exec, Identifier(exec, "handleEvent")); CallData callData; @@ -74,7 +75,7 @@ void JSCustomSQLTransactionErrorCallback::handleEvent(SQLError* error) RefPtr protect(this); MarkedArgumentBuffer args; - args.append(toJS(exec, error)); + args.append(toJS(exec, deprecatedGlobalObjectForPrototype(exec), error)); globalObject->globalData()->timeoutChecker.start(); call(exec, function, callType, callData, m_callback, args); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomVoidCallback.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomVoidCallback.cpp index f3f76c428..b4e525b98 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomVoidCallback.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomVoidCallback.cpp @@ -55,7 +55,7 @@ void JSCustomVoidCallback::handleEvent() JSGlobalObject* globalObject = m_frame->script()->globalObject(); ExecState* exec = globalObject->globalExec(); - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); JSValue function = m_callback->get(exec, Identifier(exec, "handleEvent")); CallData callData; diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomXPathNSResolver.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomXPathNSResolver.cpp index ffe8cf52a..4476be583 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomXPathNSResolver.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomXPathNSResolver.cpp @@ -72,7 +72,7 @@ String JSCustomXPathNSResolver::lookupNamespaceURI(const String& prefix) if (!m_frame->script()->isEnabled()) return String(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSGlobalObject* globalObject = m_frame->script()->globalObject(); ExecState* exec = globalObject->globalExec(); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp index 7e8d9ce63..a7fae788e 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp @@ -44,7 +44,7 @@ namespace WebCore { void JSDOMApplicationCache::mark() { - DOMObject::mark(); + Base::mark(); markIfNotNull(m_impl->onchecking()); markIfNotNull(m_impl->onerror()); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.cpp index 81d59fbca..910da12b8 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.cpp @@ -455,31 +455,36 @@ void setDOMException(ExecState* exec, ExceptionCode ec) if (!ec || exec->hadException()) return; + // FIXME: All callers to setDOMException need to pass in the right global object + // for now, we're going to assume the lexicalGlobalObject. Which is wrong in cases like this: + // frames[0].document.createElement(null, null); // throws an exception which should have the subframes prototypes. + JSDOMGlobalObject* globalObject = deprecatedGlobalObjectForPrototype(exec); + ExceptionCodeDescription description; getExceptionCodeDescription(ec, description); JSValue errorObject; switch (description.type) { case DOMExceptionType: - errorObject = toJS(exec, DOMCoreException::create(description)); + errorObject = toJS(exec, globalObject, DOMCoreException::create(description)); break; case RangeExceptionType: - errorObject = toJS(exec, RangeException::create(description)); + errorObject = toJS(exec, globalObject, RangeException::create(description)); break; case EventExceptionType: - errorObject = toJS(exec, EventException::create(description)); + errorObject = toJS(exec, globalObject, EventException::create(description)); break; case XMLHttpRequestExceptionType: - errorObject = toJS(exec, XMLHttpRequestException::create(description)); + errorObject = toJS(exec, globalObject, XMLHttpRequestException::create(description)); break; #if ENABLE(SVG) case SVGExceptionType: - errorObject = toJS(exec, SVGException::create(description).get(), 0); + errorObject = toJS(exec, globalObject, SVGException::create(description).get(), 0); break; #endif #if ENABLE(XPATH) case XPathExceptionType: - errorObject = toJS(exec, XPathException::create(description)); + errorObject = toJS(exec, globalObject, XPathException::create(description)); break; #endif } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h index e3fd41733..3975940e1 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h @@ -2,6 +2,7 @@ * Copyright (C) 1999-2001 Harri Porten (porten@kde.org) * Copyright (C) 2003, 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. * Copyright (C) 2007 Samuel Weinig + * Copyright (C) 2009 Google, Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,7 @@ #define JSDOMBinding_h #include "JSDOMGlobalObject.h" +#include "Document.h" // For DOMConstructorWithDocument #include #include #include @@ -59,6 +61,73 @@ namespace WebCore { #endif }; + // FIXME: This class should colapse into DOMObject once all DOMObjects are + // updated to store a globalObject pointer. + class DOMObjectWithGlobalPointer : public DOMObject { + public: + JSDOMGlobalObject* globalObject() const { return m_globalObject; } + + ScriptExecutionContext* scriptExecutionContext() const + { + // FIXME: Should never be 0, but can be due to bug 27640. + return m_globalObject->scriptExecutionContext(); + } + + protected: + DOMObjectWithGlobalPointer(PassRefPtr structure, JSDOMGlobalObject* globalObject) + : DOMObject(structure) + , m_globalObject(globalObject) + { + // FIXME: This ASSERT is valid, but fires in fast/dom/gc-6.html when trying to create + // new JavaScript objects on detached windows due to DOMWindow::document() + // needing to reach through the frame to get to the Document*. See bug 27640. + // ASSERT(globalObject->scriptExecutionContext()); + } + virtual ~DOMObjectWithGlobalPointer() {} + + void mark() + { + DOMObject::mark(); + if (!m_globalObject->marked()) + m_globalObject->mark(); + } + + private: + JSDOMGlobalObject* m_globalObject; + }; + + // Base class for all constructor objects in the JSC bindings. + class DOMConstructorObject : public DOMObjectWithGlobalPointer { + public: + static PassRefPtr createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, JSC::HasStandardGetOwnPropertySlot | JSC::ImplementsHasInstance)); + } + + protected: + DOMConstructorObject(PassRefPtr structure, JSDOMGlobalObject* globalObject) + : DOMObjectWithGlobalPointer(structure, globalObject) + { + } + }; + + // Constructors using this base class depend on being in a Document and + // can never be used from a WorkerContext. + class DOMConstructorWithDocument : public DOMConstructorObject { + public: + Document* document() const + { + return static_cast(scriptExecutionContext()); + } + + protected: + DOMConstructorWithDocument(PassRefPtr structure, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(structure, globalObject) + { + ASSERT(globalObject->scriptExecutionContext()->isDocument()); + } + }; + DOMObject* getCachedDOMObjectWrapper(JSC::JSGlobalData&, void* objectHandle); void cacheDOMObjectWrapper(JSC::JSGlobalData&, void* objectHandle, DOMObject* wrapper); void forgetDOMObject(JSC::JSGlobalData&, void* objectHandle); @@ -80,6 +149,14 @@ namespace WebCore { JSC::JSObject* getCachedDOMConstructor(JSC::ExecState*, const JSC::ClassInfo*); void cacheDOMConstructor(JSC::ExecState*, const JSC::ClassInfo*, JSC::JSObject* constructor); + inline JSDOMGlobalObject* deprecatedGlobalObjectForPrototype(JSC::ExecState* exec) + { + // FIXME: Callers to this function should be using the global object + // from which the object is being created, instead of assuming the lexical one. + // e.g. subframe.document.body should use the subframe's global object, not the lexical one. + return static_cast(exec->lexicalGlobalObject()); + } + template inline JSC::Structure* getDOMStructure(JSC::ExecState* exec, JSDOMGlobalObject* globalObject) { if (JSC::Structure* structure = getCachedDOMStructure(globalObject, &WrapperClass::s_info)) @@ -89,69 +166,69 @@ namespace WebCore { template inline JSC::Structure* deprecatedGetDOMStructure(JSC::ExecState* exec) { // FIXME: This function is wrong. It uses the wrong global object for creating the prototype structure. - return getDOMStructure(exec, static_cast(exec->lexicalGlobalObject())); + return getDOMStructure(exec, deprecatedGlobalObjectForPrototype(exec)); } template inline JSC::JSObject* getDOMPrototype(JSC::ExecState* exec, JSC::JSGlobalObject* globalObject) { return static_cast(asObject(getDOMStructure(exec, static_cast(globalObject))->storedPrototype())); } - #define CREATE_DOM_OBJECT_WRAPPER(exec, className, object) createDOMObjectWrapper(exec, static_cast(object)) - template inline DOMObject* createDOMObjectWrapper(JSC::ExecState* exec, DOMClass* object) + #define CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, className, object) createDOMObjectWrapper(exec, globalObject, static_cast(object)) + template inline DOMObject* createDOMObjectWrapper(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, DOMClass* object) { ASSERT(object); ASSERT(!getCachedDOMObjectWrapper(exec->globalData(), object)); // FIXME: new (exec) could use a different globalData than the globalData this wrapper is cached on. - WrapperClass* wrapper = new (exec) WrapperClass(deprecatedGetDOMStructure(exec), object); + WrapperClass* wrapper = new (exec) WrapperClass(getDOMStructure(exec, globalObject), globalObject, object); cacheDOMObjectWrapper(exec->globalData(), object, wrapper); return wrapper; } - template inline JSC::JSValue getDOMObjectWrapper(JSC::ExecState* exec, DOMClass* object) + template inline JSC::JSValue getDOMObjectWrapper(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, DOMClass* object) { if (!object) return JSC::jsNull(); if (DOMObject* wrapper = getCachedDOMObjectWrapper(exec->globalData(), object)) return wrapper; - return createDOMObjectWrapper(exec, object); + return createDOMObjectWrapper(exec, globalObject, object); } #if ENABLE(SVG) - #define CREATE_SVG_OBJECT_WRAPPER(exec, className, object, context) createDOMObjectWrapper(exec, static_cast(object), context) - template inline DOMObject* createDOMObjectWrapper(JSC::ExecState* exec, DOMClass* object, SVGElement* context) + #define CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, className, object, context) createDOMObjectWrapper(exec, globalObject, static_cast(object), context) + template inline DOMObject* createDOMObjectWrapper(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, DOMClass* object, SVGElement* context) { ASSERT(object); ASSERT(!getCachedDOMObjectWrapper(exec->globalData(), object)); - WrapperClass* wrapper = new (exec) WrapperClass(deprecatedGetDOMStructure(exec), object, context); + WrapperClass* wrapper = new (exec) WrapperClass(getDOMStructure(exec, globalObject), globalObject, object, context); cacheDOMObjectWrapper(exec->globalData(), object, wrapper); return wrapper; } - template inline JSC::JSValue getDOMObjectWrapper(JSC::ExecState* exec, DOMClass* object, SVGElement* context) + template inline JSC::JSValue getDOMObjectWrapper(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, DOMClass* object, SVGElement* context) { if (!object) return JSC::jsNull(); if (DOMObject* wrapper = getCachedDOMObjectWrapper(exec->globalData(), object)) return wrapper; - return createDOMObjectWrapper(exec, object, context); + return createDOMObjectWrapper(exec, globalObject, object, context); } #endif - #define CREATE_DOM_NODE_WRAPPER(exec, className, object) createDOMNodeWrapper(exec, static_cast(object)) - template inline JSNode* createDOMNodeWrapper(JSC::ExecState* exec, DOMClass* node) + #define CREATE_DOM_NODE_WRAPPER(exec, globalObject, className, object) createDOMNodeWrapper(exec, globalObject, static_cast(object)) + template inline JSNode* createDOMNodeWrapper(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, DOMClass* node) { ASSERT(node); ASSERT(!getCachedDOMNodeWrapper(node->document(), node)); - WrapperClass* wrapper = new (exec) WrapperClass(deprecatedGetDOMStructure(exec), node); + WrapperClass* wrapper = new (exec) WrapperClass(getDOMStructure(exec, globalObject), globalObject, node); // FIXME: The entire function can be removed, once we fix caching. // This function is a one-off hack to make Nodes cache in the right global object. cacheDOMNodeWrapper(node->document(), node, wrapper); return wrapper; } - template inline JSC::JSValue getDOMNodeWrapper(JSC::ExecState* exec, DOMClass* node) + template inline JSC::JSValue getDOMNodeWrapper(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, DOMClass* node) { if (!node) return JSC::jsNull(); if (JSNode* wrapper = getCachedDOMNodeWrapper(node->document(), node)) return wrapper; - return createDOMNodeWrapper(exec, node); + return createDOMNodeWrapper(exec, globalObject, node); } const JSC::HashTable* getHashTableForGlobalData(JSC::JSGlobalData&, const JSC::HashTable* staticTable); @@ -178,7 +255,28 @@ namespace WebCore { JSC::UString valueToStringWithNullCheck(JSC::ExecState*, JSC::JSValue); // null if the value is null JSC::UString valueToStringWithUndefinedOrNullCheck(JSC::ExecState*, JSC::JSValue); // null if the value is null or undefined - template inline JSC::JSValue toJS(JSC::ExecState* exec, PassRefPtr ptr) { return toJS(exec, ptr.get()); } + // FIXME: These are a stop-gap until all toJS calls can be converted to pass a globalObject + template + inline JSC::JSValue toJS(JSC::ExecState* exec, T* ptr) + { + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), ptr); + } + template + inline JSC::JSValue toJS(JSC::ExecState* exec, PassRefPtr ptr) + { + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), ptr.get()); + } + template + inline JSC::JSValue toJSNewlyCreated(JSC::ExecState* exec, T* ptr) + { + return toJSNewlyCreated(exec, deprecatedGlobalObjectForPrototype(exec), ptr); + } + + template + inline JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr ptr) + { + return toJS(exec, globalObject, ptr.get()); + } bool checkNodeSecurity(JSC::ExecState*, Node*); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMGlobalObject.h b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMGlobalObject.h index 8e4e8203b..bc6c1f2d2 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMGlobalObject.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMGlobalObject.h @@ -67,6 +67,9 @@ namespace WebCore { JSListenersMap& jsEventListeners(); + // Make binding code generation easier. + JSDOMGlobalObject* globalObject() { return this; } + void setCurrentEvent(Event*); Event* currentEvent() const; @@ -88,16 +91,6 @@ namespace WebCore { JSDOMGlobalObjectData* d() const { return static_cast(JSC::JSVariableObject::d); } }; - template - inline JSC::JSObject* getDOMConstructor(JSC::ExecState* exec) - { - if (JSC::JSObject* constructor = getCachedDOMConstructor(exec, &ConstructorClass::s_info)) - return constructor; - JSC::JSObject* constructor = new (exec) ConstructorClass(exec); - cacheDOMConstructor(exec, &ConstructorClass::s_info, constructor); - return constructor; - } - template inline JSC::JSObject* getDOMConstructor(JSC::ExecState* exec, const JSDOMGlobalObject* globalObject) { diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowBase.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowBase.cpp index 0f419ba2e..df6068a52 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowBase.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowBase.cpp @@ -63,7 +63,7 @@ void JSDOMWindowBase::updateDocument() { ASSERT(d()->impl->document()); ExecState* exec = globalExec(); - symbolTablePutWithAttributes(Identifier(exec, "document"), toJS(exec, d()->impl->document()), DontDelete | ReadOnly); + symbolTablePutWithAttributes(Identifier(exec, "document"), toJS(exec, this, d()->impl->document()), DontDelete | ReadOnly); } ScriptExecutionContext* JSDOMWindowBase::scriptExecutionContext() const @@ -172,6 +172,13 @@ JSGlobalData* JSDOMWindowBase::commonJSGlobalData() return globalData; } +// JSDOMGlobalObject* is ignored, accesing a window in any context will +// use that DOMWindow's prototype chain. +JSValue toJS(ExecState* exec, JSDOMGlobalObject*, DOMWindow* domWindow) +{ + return toJS(exec, domWindow); +} + JSValue toJS(ExecState*, DOMWindow* domWindow) { if (!domWindow) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowBase.h b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowBase.h index 113344f46..84cc81f46 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowBase.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowBase.h @@ -89,6 +89,9 @@ namespace WebCore { }; // Returns a JSDOMWindow or jsNull() + // JSDOMGlobalObject* is ignored, accesing a window in any context will + // use that DOMWindow's prototype chain. + JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, DOMWindow*); JSC::JSValue toJS(JSC::ExecState*, DOMWindow*); // Returns JSDOMWindow or 0 diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowCustom.cpp index c095bf2f1..33ac7bbfd 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowCustom.cpp @@ -359,7 +359,8 @@ JSValue JSDOMWindow::history(ExecState* exec) const if (DOMObject* wrapper = getCachedDOMObjectWrapper(exec->globalData(), history)) return wrapper; - JSHistory* jsHistory = new (exec) JSHistory(getDOMStructure(exec, const_cast(this)), history); + JSDOMWindow* window = const_cast(this); + JSHistory* jsHistory = new (exec) JSHistory(getDOMStructure(exec, window), window, history); cacheDOMObjectWrapper(exec->globalData(), history, jsHistory); return jsHistory; } @@ -370,7 +371,8 @@ JSValue JSDOMWindow::location(ExecState* exec) const if (DOMObject* wrapper = getCachedDOMObjectWrapper(exec->globalData(), location)) return wrapper; - JSLocation* jsLocation = new (exec) JSLocation(getDOMStructure(exec, const_cast(this)), location); + JSDOMWindow* window = const_cast(this); + JSLocation* jsLocation = new (exec) JSLocation(getDOMStructure(exec, window), window, location); cacheDOMObjectWrapper(exec->globalData(), location, jsLocation); return jsLocation; } @@ -443,12 +445,12 @@ JSValue JSDOMWindow::audio(ExecState* exec) const JSValue JSDOMWindow::webKitPoint(ExecState* exec) const { - return getDOMConstructor(exec); + return getDOMConstructor(exec, this); } JSValue JSDOMWindow::webKitCSSMatrix(ExecState* exec) const { - return getDOMConstructor(exec); + return getDOMConstructor(exec, this); } JSValue JSDOMWindow::xmlHttpRequest(ExecState* exec) const @@ -459,7 +461,7 @@ JSValue JSDOMWindow::xmlHttpRequest(ExecState* exec) const #if ENABLE(XSLT) JSValue JSDOMWindow::xsltProcessor(ExecState* exec) const { - return getDOMConstructor(exec); + return getDOMConstructor(exec, this); } #endif @@ -473,7 +475,7 @@ JSValue JSDOMWindow::messageChannel(ExecState* exec) const #if ENABLE(WORKERS) JSValue JSDOMWindow::worker(ExecState* exec) const { - return getDOMConstructor(exec); + return getDOMConstructor(exec, this); } #endif diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSDataGridColumnListCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSDataGridColumnListCustom.cpp index c7ffcde23..91b3d1546 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSDataGridColumnListCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSDataGridColumnListCustom.cpp @@ -46,7 +46,7 @@ bool JSDataGridColumnList::canGetItemsForName(ExecState*, DataGridColumnList* im JSValue JSDataGridColumnList::nameGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) { JSDataGridColumnList* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, thisObj->impl()->itemWithName(propertyName)); + return toJS(exec, thisObj->globalObject(), thisObj->impl()->itemWithName(propertyName)); } } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSDedicatedWorkerContextCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSDedicatedWorkerContextCustom.cpp new file mode 100644 index 000000000..c45a6a34a --- /dev/null +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSDedicatedWorkerContextCustom.cpp @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" + +#if ENABLE(WORKERS) + +#include "JSDedicatedWorkerContext.h" + +using namespace JSC; + +namespace WebCore { + +void JSDedicatedWorkerContext::mark() +{ + Base::mark(); + + markIfNotNull(impl()->onmessage()); +} + +} // namespace WebCore + +#endif // ENABLE(WORKERS) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSDocumentCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSDocumentCustom.cpp index 956327a3e..493aaeaa8 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSDocumentCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSDocumentCustom.cpp @@ -56,8 +56,7 @@ JSValue JSDocument::location(ExecState* exec) const if (DOMObject* wrapper = getCachedDOMObjectWrapper(exec->globalData(), location)) return wrapper; - JSDOMWindow* window = static_cast(exec->lexicalGlobalObject()); - JSLocation* jsLocation = new (exec) JSLocation(getDOMStructure(exec, window), location); + JSLocation* jsLocation = new (exec) JSLocation(getDOMStructure(exec, globalObject()), globalObject(), location); cacheDOMObjectWrapper(exec->globalData(), location, jsLocation); return jsLocation; } @@ -80,7 +79,7 @@ void JSDocument::setLocation(ExecState* exec, JSValue value) frame->loader()->scheduleLocationChange(str, activeFrame->loader()->outgoingReferrer(), !activeFrame->script()->anyPageIsProcessingUserGesture(), false, userGesture); } -JSValue toJS(ExecState* exec, Document* document) +JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, Document* document) { if (!document) return jsNull(); @@ -90,13 +89,13 @@ JSValue toJS(ExecState* exec, Document* document) return wrapper; if (document->isHTMLDocument()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, HTMLDocument, document); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, HTMLDocument, document); #if ENABLE(SVG) else if (document->isSVGDocument()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, SVGDocument, document); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, SVGDocument, document); #endif else - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, Document, document); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, Document, document); // Make sure the document is kept around by the window object, and works right with the // back/forward cache. diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSElementCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSElementCustom.cpp index b12c185cc..47793d0a8 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSElementCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSElementCustom.cpp @@ -53,7 +53,7 @@ using namespace HTMLNames; static inline bool allowSettingSrcToJavascriptURL(ExecState* exec, Element* element, const String& name, const String& value) { - if ((element->hasTagName(iframeTag) || element->hasTagName(frameTag)) && equalIgnoringCase(name, "src") && protocolIsJavaScript(parseURL(value))) { + if ((element->hasTagName(iframeTag) || element->hasTagName(frameTag)) && equalIgnoringCase(name, "src") && protocolIsJavaScript(deprecatedParseURL(value))) { HTMLFrameElementBase* frame = static_cast(element); if (!checkNodeSecurity(exec, frame->contentDocument())) return false; @@ -89,7 +89,7 @@ JSValue JSElement::setAttributeNode(ExecState* exec, const ArgList& args) if (!allowSettingSrcToJavascriptURL(exec, imp, newAttr->name(), newAttr->value())) return jsUndefined(); - JSValue result = toJS(exec, WTF::getPtr(imp->setAttributeNode(newAttr, ec))); + JSValue result = toJS(exec, globalObject(), WTF::getPtr(imp->setAttributeNode(newAttr, ec))); setDOMException(exec, ec); return result; } @@ -123,12 +123,12 @@ JSValue JSElement::setAttributeNodeNS(ExecState* exec, const ArgList& args) if (!allowSettingSrcToJavascriptURL(exec, imp, newAttr->name(), newAttr->value())) return jsUndefined(); - JSValue result = toJS(exec, WTF::getPtr(imp->setAttributeNodeNS(newAttr, ec))); + JSValue result = toJS(exec, globalObject(), WTF::getPtr(imp->setAttributeNodeNS(newAttr, ec))); setDOMException(exec, ec); return result; } -JSValue toJSNewlyCreated(ExecState* exec, Element* element) +JSValue toJSNewlyCreated(ExecState* exec, JSDOMGlobalObject* globalObject, Element* element) { if (!element) return jsNull(); @@ -137,15 +137,15 @@ JSValue toJSNewlyCreated(ExecState* exec, Element* element) JSNode* wrapper; if (element->isHTMLElement()) - wrapper = createJSHTMLWrapper(exec, static_cast(element)); + wrapper = createJSHTMLWrapper(exec, globalObject, static_cast(element)); #if ENABLE(SVG) else if (element->isSVGElement()) - wrapper = createJSSVGWrapper(exec, static_cast(element)); + wrapper = createJSSVGWrapper(exec, globalObject, static_cast(element)); #endif else - wrapper = CREATE_DOM_NODE_WRAPPER(exec, Element, element); + wrapper = CREATE_DOM_NODE_WRAPPER(exec, globalObject, Element, element); return wrapper; } - + } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSEventCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSEventCustom.cpp index 03b97d8c8..257c25928 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSEventCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSEventCustom.cpp @@ -32,6 +32,7 @@ #include "Clipboard.h" #include "Event.h" #include "JSClipboard.h" +#include "JSErrorEvent.h" #include "JSKeyboardEvent.h" #include "JSMessageEvent.h" #include "JSMouseEvent.h" @@ -44,6 +45,7 @@ #include "JSWebKitTransitionEvent.h" #include "JSWheelEvent.h" #include "JSXMLHttpRequestProgressEvent.h" +#include "ErrorEvent.h" #include "KeyboardEvent.h" #include "MessageEvent.h" #include "MouseEvent.h" @@ -74,12 +76,12 @@ namespace WebCore { JSValue JSEvent::clipboardData(ExecState* exec) const { - return impl()->isClipboardEvent() ? toJS(exec, impl()->clipboardData()) : jsUndefined(); + return impl()->isClipboardEvent() ? toJS(exec, globalObject(), impl()->clipboardData()) : jsUndefined(); } -JSValue toJS(ExecState* exec, Event* event) +JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, Event* event) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); if (!event) return jsNull(); @@ -90,41 +92,45 @@ JSValue toJS(ExecState* exec, Event* event) if (event->isUIEvent()) { if (event->isKeyboardEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, KeyboardEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, KeyboardEvent, event); else if (event->isTextEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, TextEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, TextEvent, event); else if (event->isMouseEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, MouseEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, MouseEvent, event); else if (event->isWheelEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, WheelEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, WheelEvent, event); #if ENABLE(SVG) else if (event->isSVGZoomEvent()) - wrapper = CREATE_SVG_OBJECT_WRAPPER(exec, SVGZoomEvent, event, 0); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, SVGZoomEvent, event); #endif else - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, UIEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, UIEvent, event); } else if (event->isMutationEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, MutationEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, MutationEvent, event); else if (event->isOverflowEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, OverflowEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, OverflowEvent, event); else if (event->isMessageEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, MessageEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, MessageEvent, event); else if (event->isProgressEvent()) { if (event->isXMLHttpRequestProgressEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, XMLHttpRequestProgressEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, XMLHttpRequestProgressEvent, event); else - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, ProgressEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, ProgressEvent, event); } #if ENABLE(DOM_STORAGE) else if (event->isStorageEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, StorageEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, StorageEvent, event); #endif else if (event->isWebKitAnimationEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, WebKitAnimationEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, WebKitAnimationEvent, event); else if (event->isWebKitTransitionEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, WebKitTransitionEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, WebKitTransitionEvent, event); +#if ENABLE(WORKERS) + else if (event->isErrorEvent()) + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, ErrorEvent, event); +#endif else - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, Event, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, Event, event); return wrapper; } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSEventListener.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSEventListener.cpp index b9ed685a6..a659d3e36 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSEventListener.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSEventListener.cpp @@ -61,7 +61,7 @@ void JSEventListener::markJSFunction() void JSEventListener::handleEvent(Event* event, bool isWindowEvent) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSObject* jsFunction = this->jsFunction(); if (!jsFunction) @@ -71,6 +71,7 @@ void JSEventListener::handleEvent(Event* event, bool isWindowEvent) // Null check as clearGlobalObject() can clear this and we still get called back by // xmlhttprequest objects. See http://bugs.webkit.org/show_bug.cgi?id=13275 // FIXME: Is this check still necessary? Requests are supposed to be stopped before clearGlobalObject() is called. + ASSERT(globalObject); if (!globalObject) return; @@ -107,7 +108,7 @@ void JSEventListener::handleEvent(Event* event, bool isWindowEvent) ref(); MarkedArgumentBuffer args; - args.append(toJS(exec, event)); + args.append(toJS(exec, globalObject, event)); Event* savedEvent = globalObject->currentEvent(); globalObject->setCurrentEvent(event); @@ -127,7 +128,7 @@ void JSEventListener::handleEvent(Event* event, bool isWindowEvent) if (isWindowEvent) thisValue = globalObject->toThisObject(exec); else - thisValue = toJS(exec, event->currentTarget()); + thisValue = toJS(exec, globalObject, event->currentTarget()); globalObject->globalData()->timeoutChecker.start(); retval = call(exec, jsFunction, callType, callData, thisValue, args); } @@ -153,6 +154,53 @@ void JSEventListener::handleEvent(Event* event, bool isWindowEvent) } } +bool JSEventListener::reportError(const String& message, const String& url, int lineNumber) +{ + JSLock lock(SilenceAssertionsOnly); + + JSObject* jsFunction = this->jsFunction(); + if (!jsFunction) + return false; + + JSDOMGlobalObject* globalObject = m_globalObject; + if (!globalObject) + return false; + + ExecState* exec = globalObject->globalExec(); + + CallData callData; + CallType callType = jsFunction->getCallData(callData); + + if (callType == CallTypeNone) + return false; + + MarkedArgumentBuffer args; + args.append(jsString(exec, message)); + args.append(jsString(exec, url)); + args.append(jsNumber(exec, lineNumber)); + + // If this event handler is the first JavaScript to execute, then the + // dynamic global object should be set to the global object of the + // window in which the event occurred. + JSGlobalData* globalData = globalObject->globalData(); + DynamicGlobalObjectScope globalObjectScope(exec, globalData->dynamicGlobalObject ? globalData->dynamicGlobalObject : globalObject); + + JSValue thisValue = globalObject->toThisObject(exec); + + globalObject->globalData()->timeoutChecker.start(); + JSValue returnValue = call(exec, jsFunction, callType, callData, thisValue, args); + globalObject->globalData()->timeoutChecker.stop(); + + // If an error occurs while handling the script error, it should be bubbled up. + if (exec->hadException()) { + exec->clearException(); + return false; + } + + bool bubbleEvent; + return returnValue.getBoolean(bubbleEvent) && !bubbleEvent; +} + bool JSEventListener::virtualisAttribute() const { return m_isAttribute; diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSEventListener.h b/src/3rdparty/webkit/WebCore/bindings/js/JSEventListener.h index ce34832ea..24977502e 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSEventListener.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSEventListener.h @@ -45,6 +45,7 @@ namespace WebCore { private: virtual void markJSFunction(); virtual void handleEvent(Event*, bool isWindowEvent); + virtual bool reportError(const String& message, const String& url, int lineNumber); virtual bool virtualisAttribute() const; void clearJSFunctionInline(); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSEventTarget.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSEventTarget.cpp index 875e904ad..b75cccf6a 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSEventTarget.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSEventTarget.cpp @@ -50,10 +50,10 @@ #endif #if ENABLE(WORKERS) +#include "DedicatedWorkerContext.h" +#include "JSDedicatedWorkerContext.h" #include "JSWorker.h" -#include "JSWorkerContext.h" #include "Worker.h" -#include "WorkerContext.h" #endif #if ENABLE(SHARED_WORKERS) @@ -65,7 +65,7 @@ using namespace JSC; namespace WebCore { -JSValue toJS(ExecState* exec, EventTarget* target) +JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, EventTarget* target) { if (!target) return jsNull(); @@ -73,42 +73,40 @@ JSValue toJS(ExecState* exec, EventTarget* target) #if ENABLE(SVG) // SVGElementInstance supports both toSVGElementInstance and toNode since so much mouse handling code depends on toNode returning a valid node. if (SVGElementInstance* instance = target->toSVGElementInstance()) - return toJS(exec, instance); + return toJS(exec, globalObject, instance); #endif if (Node* node = target->toNode()) - return toJS(exec, node); + return toJS(exec, globalObject, node); if (DOMWindow* domWindow = target->toDOMWindow()) - return toJS(exec, domWindow); + return toJS(exec, globalObject, domWindow); if (XMLHttpRequest* xhr = target->toXMLHttpRequest()) - // XMLHttpRequest is always created via JS, so we don't need to use cacheDOMObject() here. - return getCachedDOMObjectWrapper(exec->globalData(), xhr); + return toJS(exec, globalObject, xhr); if (XMLHttpRequestUpload* upload = target->toXMLHttpRequestUpload()) - return toJS(exec, upload); + return toJS(exec, globalObject, upload); #if ENABLE(OFFLINE_WEB_APPLICATIONS) if (DOMApplicationCache* cache = target->toDOMApplicationCache()) - // DOMApplicationCache is always created via JS, so we don't need to use cacheDOMObject() here. - return getCachedDOMObjectWrapper(exec->globalData(), cache); + return toJS(exec, globalObject, cache); #endif if (MessagePort* messagePort = target->toMessagePort()) - return toJS(exec, messagePort); + return toJS(exec, globalObject, messagePort); #if ENABLE(WORKERS) if (Worker* worker = target->toWorker()) - return toJS(exec, worker); + return toJS(exec, globalObject, worker); - if (WorkerContext* workerContext = target->toWorkerContext()) + if (DedicatedWorkerContext* workerContext = target->toDedicatedWorkerContext()) return toJSDOMGlobalObject(workerContext); #endif #if ENABLE(SHARED_WORKERS) if (SharedWorker* sharedWorker = target->toSharedWorker()) - return toJS(exec, sharedWorker); + return toJS(exec, globalObject, sharedWorker); #endif ASSERT_NOT_REACHED(); @@ -139,7 +137,7 @@ EventTarget* toEventTarget(JSC::JSValue value) #if ENABLE(WORKERS) CONVERT_TO_EVENT_TARGET(Worker) - CONVERT_TO_EVENT_TARGET(WorkerContext) + CONVERT_TO_EVENT_TARGET(DedicatedWorkerContext) #endif #if ENABLE(SHARED_WORKERS) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSEventTarget.h b/src/3rdparty/webkit/WebCore/bindings/js/JSEventTarget.h index 05df0568d..ddd823241 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSEventTarget.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSEventTarget.h @@ -35,8 +35,9 @@ namespace JSC { namespace WebCore { class EventTarget; + class JSDOMGlobalObject; - JSC::JSValue toJS(JSC::ExecState*, EventTarget*); + JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, EventTarget*); EventTarget* toEventTarget(JSC::JSValue); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLAllCollection.h b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLAllCollection.h index d559d3b76..7363e5ce2 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLAllCollection.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLAllCollection.h @@ -35,8 +35,8 @@ namespace WebCore { class JSHTMLAllCollection : public JSHTMLCollection { public: - JSHTMLAllCollection(PassRefPtr structure, PassRefPtr collection) - : JSHTMLCollection(structure, collection) + JSHTMLAllCollection(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr collection) + : JSHTMLCollection(structure, globalObject, collection) { } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLCollectionCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLCollectionCustom.cpp index 410046899..dd9af749b 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLCollectionCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLCollectionCustom.cpp @@ -35,18 +35,18 @@ using namespace JSC; namespace WebCore { -static JSValue getNamedItems(ExecState* exec, HTMLCollection* impl, const Identifier& propertyName) +static JSValue getNamedItems(ExecState* exec, JSHTMLCollection* collection, const Identifier& propertyName) { Vector > namedItems; - impl->namedItems(propertyName, namedItems); + collection->impl()->namedItems(propertyName, namedItems); if (namedItems.isEmpty()) return jsUndefined(); if (namedItems.size() == 1) - return toJS(exec, namedItems[0].get()); + return toJS(exec, collection->globalObject(), namedItems[0].get()); - return new (exec) JSNamedNodesCollection(exec, namedItems); + return new (exec) JSNamedNodesCollection(exec, collection->globalObject(), namedItems); } // HTMLCollections are strange objects, they support both get and call, @@ -57,7 +57,8 @@ static JSValue JSC_HOST_CALL callHTMLCollection(ExecState* exec, JSObject* funct return jsUndefined(); // Do not use thisObj here. It can be the JSHTMLDocument, in the document.forms(i) case. - HTMLCollection* collection = static_cast(function)->impl(); + JSHTMLCollection* jsCollection = static_cast(function); + HTMLCollection* collection = jsCollection->impl(); // Also, do we need the TypeError test here ? @@ -67,10 +68,10 @@ static JSValue JSC_HOST_CALL callHTMLCollection(ExecState* exec, JSObject* funct UString string = args.at(0).toString(exec); unsigned index = string.toUInt32(&ok, false); if (ok) - return toJS(exec, collection->item(index)); + return toJS(exec, jsCollection->globalObject(), collection->item(index)); // Support for document.images('') etc. - return getNamedItems(exec, collection, Identifier(exec, string)); + return getNamedItems(exec, jsCollection, Identifier(exec, string)); } // The second arg, if set, is the index of the item we want @@ -82,7 +83,7 @@ static JSValue JSC_HOST_CALL callHTMLCollection(ExecState* exec, JSObject* funct Node* node = collection->namedItem(pstr); while (node) { if (!index) - return toJS(exec, node); + return toJS(exec, jsCollection->globalObject(), node); node = collection->nextNamedItem(pstr); --index; } @@ -97,15 +98,17 @@ CallType JSHTMLCollection::getCallData(CallData& callData) return CallTypeHost; } -bool JSHTMLCollection::canGetItemsForName(ExecState* exec, HTMLCollection* thisObj, const Identifier& propertyName) +bool JSHTMLCollection::canGetItemsForName(ExecState*, HTMLCollection* collection, const Identifier& propertyName) { - return !getNamedItems(exec, thisObj, propertyName).isUndefined(); + Vector > namedItems; + collection->namedItems(propertyName, namedItems); + return !namedItems.isEmpty(); } JSValue JSHTMLCollection::nameGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) { JSHTMLCollection* thisObj = static_cast(asObject(slot.slotBase())); - return getNamedItems(exec, thisObj->impl(), propertyName); + return getNamedItems(exec, thisObj, propertyName); } JSValue JSHTMLCollection::item(ExecState* exec, const ArgList& args) @@ -113,16 +116,16 @@ JSValue JSHTMLCollection::item(ExecState* exec, const ArgList& args) bool ok; uint32_t index = args.at(0).toString(exec).toUInt32(&ok, false); if (ok) - return toJS(exec, impl()->item(index)); - return getNamedItems(exec, impl(), Identifier(exec, args.at(0).toString(exec))); + return toJS(exec, globalObject(), impl()->item(index)); + return getNamedItems(exec, this, Identifier(exec, args.at(0).toString(exec))); } JSValue JSHTMLCollection::namedItem(ExecState* exec, const ArgList& args) { - return getNamedItems(exec, impl(), Identifier(exec, args.at(0).toString(exec))); + return getNamedItems(exec, this, Identifier(exec, args.at(0).toString(exec))); } -JSValue toJS(ExecState* exec, HTMLCollection* collection) +JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, HTMLCollection* collection) { if (!collection) return jsNull(); @@ -134,14 +137,14 @@ JSValue toJS(ExecState* exec, HTMLCollection* collection) switch (collection->type()) { case SelectOptions: - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, HTMLOptionsCollection, collection); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, HTMLOptionsCollection, collection); break; case DocAll: typedef HTMLCollection HTMLAllCollection; - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, HTMLAllCollection, collection); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, HTMLAllCollection, collection); break; default: - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, HTMLCollection, collection); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, HTMLCollection, collection); break; } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLElementCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLElementCustom.cpp index 3345764f3..419465721 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLElementCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLElementCustom.cpp @@ -38,14 +38,14 @@ void JSHTMLElement::pushEventHandlerScope(ExecState* exec, ScopeChain& scope) co HTMLElement* element = impl(); // The document is put on first, fall back to searching it only after the element and form. - scope.push(asObject(toJS(exec, element->ownerDocument()))); + scope.push(asObject(toJS(exec, globalObject(), element->ownerDocument()))); // The form is next, searched before the document, but after the element itself. if (HTMLFormElement* form = element->form()) - scope.push(asObject(toJS(exec, form))); + scope.push(asObject(toJS(exec, globalObject(), form))); // The element is on top, searched first. - scope.push(asObject(toJS(exec, element))); + scope.push(asObject(toJS(exec, globalObject(), element))); } } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLFormElementCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLFormElementCustom.cpp index e5b428a53..ffa2d5779 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLFormElementCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLFormElementCustom.cpp @@ -45,7 +45,8 @@ bool JSHTMLFormElement::canGetItemsForName(ExecState*, HTMLFormElement* form, co JSValue JSHTMLFormElement::nameGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) { - HTMLFormElement* form = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + JSHTMLElement* jsForm = static_cast(asObject(slot.slotBase())); + HTMLFormElement* form = static_cast(jsForm->impl()); Vector > namedItems; form->getNamedElements(propertyName, namedItems); @@ -53,7 +54,7 @@ JSValue JSHTMLFormElement::nameGetter(ExecState* exec, const Identifier& propert if (namedItems.size() == 1) return toJS(exec, namedItems[0].get()); if (namedItems.size() > 1) - return new (exec) JSNamedNodesCollection(exec, namedItems); + return new (exec) JSNamedNodesCollection(exec, jsForm->globalObject(), namedItems); return jsUndefined(); } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp index 0a5d1f14b..c8aea9fea 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp @@ -40,7 +40,7 @@ namespace WebCore { static inline bool allowSettingJavascriptURL(ExecState* exec, HTMLFrameElement* imp, const String& value) { - if (protocolIsJavaScript(parseURL(value))) { + if (protocolIsJavaScript(deprecatedParseURL(value))) { if (!checkNodeSecurity(exec, imp->contentDocument())) return false; } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLIFrameElementCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLIFrameElementCustom.cpp index afff977de..8e32381bc 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLIFrameElementCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLIFrameElementCustom.cpp @@ -44,7 +44,7 @@ void JSHTMLIFrameElement::setSrc(ExecState* exec, JSValue value) String srcValue = valueToStringWithNullCheck(exec, value); - if (protocolIsJavaScript(parseURL(srcValue))) { + if (protocolIsJavaScript(deprecatedParseURL(srcValue))) { if (!checkNodeSecurity(exec, imp->contentDocument())) return; } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp index 460ba084a..7bca2db6b 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp @@ -91,7 +91,7 @@ JSValue JSHTMLOptionsCollection::add(ExecState* exec, const ArgList& args) JSValue JSHTMLOptionsCollection::remove(ExecState* exec, const ArgList& args) { HTMLOptionsCollection* imp = static_cast(impl()); - JSHTMLSelectElement* base = static_cast(asObject(toJS(exec, imp->base()))); + JSHTMLSelectElement* base = static_cast(asObject(toJS(exec, globalObject(), imp->base()))); return base->remove(exec, args); } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSImageConstructor.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSImageConstructor.cpp index 4a27bb4a2..faaaf41ed 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSImageConstructor.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSImageConstructor.cpp @@ -35,18 +35,9 @@ ASSERT_CLASS_FITS_IN_CELL(JSImageConstructor); const ClassInfo JSImageConstructor::s_info = { "ImageConstructor", 0, 0, 0 }; JSImageConstructor::JSImageConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) - : DOMObject(JSImageConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) - , m_globalObject(globalObject) + : DOMConstructorWithDocument(JSImageConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - ASSERT(globalObject->scriptExecutionContext()); - ASSERT(globalObject->scriptExecutionContext()->isDocument()); - - putDirect(exec->propertyNames().prototype, JSHTMLImageElementPrototype::self(exec, exec->lexicalGlobalObject()), None); -} - -Document* JSImageConstructor::document() const -{ - return static_cast(m_globalObject->scriptExecutionContext()); + putDirect(exec->propertyNames().prototype, JSHTMLImageElementPrototype::self(exec, globalObject), None); } static JSObject* constructImage(ExecState* exec, JSObject* constructor, const ArgList& args) @@ -64,21 +55,22 @@ static JSObject* constructImage(ExecState* exec, JSObject* constructor, const Ar height = args.at(1).toInt32(exec); } - Document* document = static_cast(constructor)->document(); + JSImageConstructor* jsConstructor = static_cast(constructor); + Document* document = jsConstructor->document(); if (!document) return throwError(exec, ReferenceError, "Image constructor associated document is unavailable"); // Calling toJS on the document causes the JS document wrapper to be // added to the window object. This is done to ensure that JSDocument::mark // will be called (which will cause the image element to be marked if necessary). - toJS(exec, document); + toJS(exec, jsConstructor->globalObject(), document); RefPtr image = new HTMLImageElement(HTMLNames::imgTag, document); if (widthSet) image->setWidth(width); if (heightSet) image->setHeight(height); - return asObject(toJS(exec, image.release())); + return asObject(toJS(exec, jsConstructor->globalObject(), image.release())); } ConstructType JSImageConstructor::getConstructData(ConstructData& constructData) @@ -87,11 +79,4 @@ ConstructType JSImageConstructor::getConstructData(ConstructData& constructData) return ConstructTypeHost; } -void JSImageConstructor::mark() -{ - DOMObject::mark(); - if (!m_globalObject->marked()) - m_globalObject->mark(); -} - } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSImageConstructor.h b/src/3rdparty/webkit/WebCore/bindings/js/JSImageConstructor.h index 8dc7add2a..0525f5eac 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSImageConstructor.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSImageConstructor.h @@ -25,19 +25,14 @@ namespace WebCore { - class JSImageConstructor : public DOMObject { + class JSImageConstructor : public DOMConstructorWithDocument { public: JSImageConstructor(JSC::ExecState*, JSDOMGlobalObject*); - Document* document() const; static const JSC::ClassInfo s_info; - - virtual void mark(); private: virtual JSC::ConstructType getConstructData(JSC::ConstructData&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } - - JSDOMGlobalObject* m_globalObject; }; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSImageDataCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSImageDataCustom.cpp index 32fe58bcf..fa3b1d5c0 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSImageDataCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSImageDataCustom.cpp @@ -36,7 +36,7 @@ using namespace JSC; namespace WebCore { -JSValue toJS(ExecState* exec, ImageData* imageData) +JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, ImageData* imageData) { if (!imageData) return jsNull(); @@ -45,7 +45,7 @@ JSValue toJS(ExecState* exec, ImageData* imageData) if (wrapper) return wrapper; - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, ImageData, imageData); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, ImageData, imageData); Identifier dataName(exec, "data"); DEFINE_STATIC_LOCAL(RefPtr, cpaStructure, (JSByteArray::createStructure(jsNull()))); static const ClassInfo cpaClassInfo = { "CanvasPixelArray", 0, 0, 0 }; diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSInspectorBackendCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSInspectorBackendCustom.cpp new file mode 100644 index 000000000..b2eb2d17c --- /dev/null +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSInspectorBackendCustom.cpp @@ -0,0 +1,283 @@ +/* + * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2008 Matt Lilek + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "JSInspectorBackend.h" + +#include "Console.h" +#if ENABLE(DATABASE) +#include "Database.h" +#include "JSDatabase.h" +#endif +#include "ExceptionCode.h" +#include "Frame.h" +#include "FrameLoader.h" +#include "InspectorBackend.h" +#include "InspectorController.h" +#include "InspectorResource.h" +#include "JSDOMWindow.h" +#include "JSInspectedObjectWrapper.h" +#include "JSInspectorCallbackWrapper.h" +#include "JSNode.h" +#include "JSRange.h" +#include "Node.h" +#include "Page.h" +#include "TextIterator.h" +#include "VisiblePosition.h" +#include +#include +#include + +#if ENABLE(JAVASCRIPT_DEBUGGER) +#include "JavaScriptCallFrame.h" +#include "JavaScriptDebugServer.h" +#include "JavaScriptProfile.h" +#include "JSJavaScriptCallFrame.h" +#include +#include +#endif + +using namespace JSC; + +namespace WebCore { + +JSValue JSInspectorBackend::highlightDOMNode(JSC::ExecState*, const JSC::ArgList& args) +{ + if (args.size() < 1) + return jsUndefined(); + + JSQuarantinedObjectWrapper* wrapper = JSQuarantinedObjectWrapper::asWrapper(args.at(0)); + if (!wrapper) + return jsUndefined(); + + Node* node = toNode(wrapper->unwrappedObject()); + if (!node) + return jsUndefined(); + + impl()->highlight(node); + + return jsUndefined(); +} + +JSValue JSInspectorBackend::search(ExecState* exec, const ArgList& args) +{ + if (args.size() < 2) + return jsUndefined(); + + Node* node = toNode(args.at(0)); + if (!node) + return jsUndefined(); + + String target = args.at(1).toString(exec); + if (exec->hadException()) + return jsUndefined(); + + MarkedArgumentBuffer result; + RefPtr searchRange(rangeOfContents(node)); + + ExceptionCode ec = 0; + do { + RefPtr resultRange(findPlainText(searchRange.get(), target, true, false)); + if (resultRange->collapsed(ec)) + break; + + // A non-collapsed result range can in some funky whitespace cases still not + // advance the range's start position (4509328). Break to avoid infinite loop. + VisiblePosition newStart = endVisiblePosition(resultRange.get(), DOWNSTREAM); + if (newStart == startVisiblePosition(searchRange.get(), DOWNSTREAM)) + break; + + result.append(toJS(exec, resultRange.get())); + + setStart(searchRange.get(), newStart); + } while (true); + + return constructArray(exec, result); +} + +#if ENABLE(DATABASE) +JSValue JSInspectorBackend::databaseTableNames(ExecState* exec, const ArgList& args) +{ + if (args.size() < 1) + return jsUndefined(); + + JSQuarantinedObjectWrapper* wrapper = JSQuarantinedObjectWrapper::asWrapper(args.at(0)); + if (!wrapper) + return jsUndefined(); + + Database* database = toDatabase(wrapper->unwrappedObject()); + if (!database) + return jsUndefined(); + + MarkedArgumentBuffer result; + + Vector tableNames = database->tableNames(); + unsigned length = tableNames.size(); + for (unsigned i = 0; i < length; ++i) + result.append(jsString(exec, tableNames[i])); + + return constructArray(exec, result); +} +#endif + +JSValue JSInspectorBackend::inspectedWindow(ExecState*, const ArgList&) +{ + InspectorController* ic = impl()->inspectorController(); + if (!ic) + return jsUndefined(); + JSDOMWindow* inspectedWindow = toJSDOMWindow(ic->inspectedPage()->mainFrame()); + return JSInspectedObjectWrapper::wrap(inspectedWindow->globalExec(), inspectedWindow); +} + +JSValue JSInspectorBackend::setting(ExecState* exec, const ArgList& args) +{ + if (args.size() < 1) + return jsUndefined(); + + String key = args.at(0).toString(exec); + if (exec->hadException()) + return jsUndefined(); + + InspectorController* ic = impl()->inspectorController(); + if (!ic) + return jsUndefined(); + const InspectorController::Setting& setting = ic->setting(key); + + switch (setting.type()) { + default: + case InspectorController::Setting::NoType: + return jsUndefined(); + case InspectorController::Setting::StringType: + return jsString(exec, setting.string()); + case InspectorController::Setting::DoubleType: + return jsNumber(exec, setting.doubleValue()); + case InspectorController::Setting::IntegerType: + return jsNumber(exec, setting.integerValue()); + case InspectorController::Setting::BooleanType: + return jsBoolean(setting.booleanValue()); + case InspectorController::Setting::StringVectorType: { + MarkedArgumentBuffer stringsArray; + const Vector& strings = setting.stringVector(); + const unsigned length = strings.size(); + for (unsigned i = 0; i < length; ++i) + stringsArray.append(jsString(exec, strings[i])); + return constructArray(exec, stringsArray); + } + } +} + +JSValue JSInspectorBackend::setSetting(ExecState* exec, const ArgList& args) +{ + if (args.size() < 2) + return jsUndefined(); + + String key = args.at(0).toString(exec); + if (exec->hadException()) + return jsUndefined(); + + InspectorController::Setting setting; + + JSValue value = args.at(1); + if (value.isUndefined() || value.isNull()) { + // Do nothing. The setting is already NoType. + ASSERT(setting.type() == InspectorController::Setting::NoType); + } else if (value.isString()) + setting.set(value.toString(exec)); + else if (value.isNumber()) + setting.set(value.toNumber(exec)); + else if (value.isBoolean()) + setting.set(value.toBoolean(exec)); + else { + JSArray* jsArray = asArray(value); + if (!jsArray) + return jsUndefined(); + Vector strings; + for (unsigned i = 0; i < jsArray->length(); ++i) { + String item = jsArray->get(exec, i).toString(exec); + if (exec->hadException()) + return jsUndefined(); + strings.append(item); + } + setting.set(strings); + } + + if (exec->hadException()) + return jsUndefined(); + + InspectorController* ic = impl()->inspectorController(); + if (ic) + ic->setSetting(key, setting); + + return jsUndefined(); +} + +JSValue JSInspectorBackend::wrapCallback(ExecState* exec, const ArgList& args) +{ + if (args.size() < 1) + return jsUndefined(); + + return JSInspectorCallbackWrapper::wrap(exec, args.at(0)); +} + +#if ENABLE(JAVASCRIPT_DEBUGGER) + +JSValue JSInspectorBackend::currentCallFrame(ExecState* exec, const ArgList&) +{ + JavaScriptCallFrame* callFrame = impl()->currentCallFrame(); + if (!callFrame || !callFrame->isValid()) + return jsUndefined(); + + // FIXME: I am not sure if this is actually needed. Can we just use exec? + ExecState* globalExec = callFrame->scopeChain()->globalObject()->globalExec(); + + JSLock lock(SilenceAssertionsOnly); + return JSInspectedObjectWrapper::wrap(globalExec, toJS(exec, callFrame)); +} + +JSValue JSInspectorBackend::profiles(JSC::ExecState* exec, const JSC::ArgList&) +{ + JSLock lock(SilenceAssertionsOnly); + MarkedArgumentBuffer result; + InspectorController* ic = impl()->inspectorController(); + if (!ic) + return jsUndefined(); + const Vector >& profiles = ic->profiles(); + + for (size_t i = 0; i < profiles.size(); ++i) + result.append(toJS(exec, profiles[i].get())); + + return constructArray(exec, result); +} + +#endif + +} // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSInspectorControllerCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSInspectorControllerCustom.cpp deleted file mode 100644 index b06c9e980..000000000 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSInspectorControllerCustom.cpp +++ /dev/null @@ -1,298 +0,0 @@ -/* - * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. - * Copyright (C) 2008 Matt Lilek - * Copyright (C) 2009 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "JSInspectorController.h" - -#include "Console.h" -#if ENABLE(DATABASE) -#include "Database.h" -#include "JSDatabase.h" -#endif -#include "ExceptionCode.h" -#include "Frame.h" -#include "FrameLoader.h" -#include "InspectorController.h" -#include "InspectorResource.h" -#include "JSDOMWindow.h" -#include "JSInspectedObjectWrapper.h" -#include "JSInspectorCallbackWrapper.h" -#include "JSNode.h" -#include "JSRange.h" -#include "Node.h" -#include "Page.h" -#include "TextIterator.h" -#include "VisiblePosition.h" -#include -#include -#include - -#if ENABLE(JAVASCRIPT_DEBUGGER) -#include "JavaScriptCallFrame.h" -#include "JavaScriptDebugServer.h" -#include "JavaScriptProfile.h" -#include "JSJavaScriptCallFrame.h" -#include -#include -#endif - -using namespace JSC; - -namespace WebCore { - -JSValue JSInspectorController::highlightDOMNode(JSC::ExecState*, const JSC::ArgList& args) -{ - if (args.size() < 1) - return jsUndefined(); - - JSQuarantinedObjectWrapper* wrapper = JSQuarantinedObjectWrapper::asWrapper(args.at(0)); - if (!wrapper) - return jsUndefined(); - - Node* node = toNode(wrapper->unwrappedObject()); - if (!node) - return jsUndefined(); - - impl()->highlight(node); - - return jsUndefined(); -} - -JSValue JSInspectorController::getResourceDocumentNode(ExecState* exec, const ArgList& args) -{ - if (args.size() < 1) - return jsUndefined(); - - bool ok = false; - unsigned identifier = args.at(0).toUInt32(exec, ok); - if (!ok) - return jsUndefined(); - - RefPtr resource = impl()->resources().get(identifier); - ASSERT(resource); - if (!resource) - return jsUndefined(); - - Frame* frame = resource->frame(); - Document* document = frame->document(); - - if (document->isPluginDocument() || document->isImageDocument() || document->isMediaDocument()) - return jsUndefined(); - - ExecState* resourceExec = toJSDOMWindowShell(frame)->window()->globalExec(); - - JSLock lock(false); - return JSInspectedObjectWrapper::wrap(resourceExec, toJS(resourceExec, document)); -} - -JSValue JSInspectorController::search(ExecState* exec, const ArgList& args) -{ - if (args.size() < 2) - return jsUndefined(); - - Node* node = toNode(args.at(0)); - if (!node) - return jsUndefined(); - - String target = args.at(1).toString(exec); - if (exec->hadException()) - return jsUndefined(); - - MarkedArgumentBuffer result; - RefPtr searchRange(rangeOfContents(node)); - - ExceptionCode ec = 0; - do { - RefPtr resultRange(findPlainText(searchRange.get(), target, true, false)); - if (resultRange->collapsed(ec)) - break; - - // A non-collapsed result range can in some funky whitespace cases still not - // advance the range's start position (4509328). Break to avoid infinite loop. - VisiblePosition newStart = endVisiblePosition(resultRange.get(), DOWNSTREAM); - if (newStart == startVisiblePosition(searchRange.get(), DOWNSTREAM)) - break; - - result.append(toJS(exec, resultRange.get())); - - setStart(searchRange.get(), newStart); - } while (true); - - return constructArray(exec, result); -} - -#if ENABLE(DATABASE) -JSValue JSInspectorController::databaseTableNames(ExecState* exec, const ArgList& args) -{ - if (args.size() < 1) - return jsUndefined(); - - JSQuarantinedObjectWrapper* wrapper = JSQuarantinedObjectWrapper::asWrapper(args.at(0)); - if (!wrapper) - return jsUndefined(); - - Database* database = toDatabase(wrapper->unwrappedObject()); - if (!database) - return jsUndefined(); - - MarkedArgumentBuffer result; - - Vector tableNames = database->tableNames(); - unsigned length = tableNames.size(); - for (unsigned i = 0; i < length; ++i) - result.append(jsString(exec, tableNames[i])); - - return constructArray(exec, result); -} -#endif - -JSValue JSInspectorController::inspectedWindow(ExecState*, const ArgList&) -{ - JSDOMWindow* inspectedWindow = toJSDOMWindow(impl()->inspectedPage()->mainFrame()); - return JSInspectedObjectWrapper::wrap(inspectedWindow->globalExec(), inspectedWindow); -} - -JSValue JSInspectorController::setting(ExecState* exec, const ArgList& args) -{ - if (args.size() < 1) - return jsUndefined(); - - String key = args.at(0).toString(exec); - if (exec->hadException()) - return jsUndefined(); - - const InspectorController::Setting& setting = impl()->setting(key); - - switch (setting.type()) { - default: - case InspectorController::Setting::NoType: - return jsUndefined(); - case InspectorController::Setting::StringType: - return jsString(exec, setting.string()); - case InspectorController::Setting::DoubleType: - return jsNumber(exec, setting.doubleValue()); - case InspectorController::Setting::IntegerType: - return jsNumber(exec, setting.integerValue()); - case InspectorController::Setting::BooleanType: - return jsBoolean(setting.booleanValue()); - case InspectorController::Setting::StringVectorType: { - MarkedArgumentBuffer stringsArray; - const Vector& strings = setting.stringVector(); - const unsigned length = strings.size(); - for (unsigned i = 0; i < length; ++i) - stringsArray.append(jsString(exec, strings[i])); - return constructArray(exec, stringsArray); - } - } -} - -JSValue JSInspectorController::setSetting(ExecState* exec, const ArgList& args) -{ - if (args.size() < 2) - return jsUndefined(); - - String key = args.at(0).toString(exec); - if (exec->hadException()) - return jsUndefined(); - - InspectorController::Setting setting; - - JSValue value = args.at(1); - if (value.isUndefined() || value.isNull()) { - // Do nothing. The setting is already NoType. - ASSERT(setting.type() == InspectorController::Setting::NoType); - } else if (value.isString()) - setting.set(value.toString(exec)); - else if (value.isNumber()) - setting.set(value.toNumber(exec)); - else if (value.isBoolean()) - setting.set(value.toBoolean(exec)); - else { - JSArray* jsArray = asArray(value); - if (!jsArray) - return jsUndefined(); - Vector strings; - for (unsigned i = 0; i < jsArray->length(); ++i) { - String item = jsArray->get(exec, i).toString(exec); - if (exec->hadException()) - return jsUndefined(); - strings.append(item); - } - setting.set(strings); - } - - if (exec->hadException()) - return jsUndefined(); - - impl()->setSetting(key, setting); - - return jsUndefined(); -} - -JSValue JSInspectorController::wrapCallback(ExecState* exec, const ArgList& args) -{ - if (args.size() < 1) - return jsUndefined(); - - return JSInspectorCallbackWrapper::wrap(exec, args.at(0)); -} - -#if ENABLE(JAVASCRIPT_DEBUGGER) - -JSValue JSInspectorController::currentCallFrame(ExecState* exec, const ArgList&) -{ - JavaScriptCallFrame* callFrame = impl()->currentCallFrame(); - if (!callFrame || !callFrame->isValid()) - return jsUndefined(); - - // FIXME: I am not sure if this is actually needed. Can we just use exec? - ExecState* globalExec = callFrame->scopeChain()->globalObject()->globalExec(); - - JSLock lock(false); - return JSInspectedObjectWrapper::wrap(globalExec, toJS(exec, callFrame)); -} - -JSValue JSInspectorController::profiles(JSC::ExecState* exec, const JSC::ArgList&) -{ - JSLock lock(false); - MarkedArgumentBuffer result; - const Vector >& profiles = impl()->profiles(); - - for (size_t i = 0; i < profiles.size(); ++i) - result.append(toJS(exec, profiles[i].get())); - - return constructArray(exec, result); -} - -#endif - -} // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSLazyEventListener.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSLazyEventListener.cpp index 891324395..7caff2b23 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSLazyEventListener.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSLazyEventListener.cpp @@ -117,7 +117,7 @@ void JSLazyEventListener::parseCode() const // (and the document, and the form - see JSHTMLElement::eventHandlerScope) ScopeChain scope = listenerAsFunction->scope(); - JSValue thisObj = toJS(exec, m_originalNode); + JSValue thisObj = toJS(exec, m_globalObject, m_originalNode); if (thisObj.isObject()) { static_cast(asObject(thisObj))->pushEventHandlerScope(exec, scope); listenerAsFunction->setScope(scope); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelConstructor.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelConstructor.cpp index 495bd53a1..25a5cb2e8 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelConstructor.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelConstructor.cpp @@ -38,21 +38,15 @@ namespace WebCore { const ClassInfo JSMessageChannelConstructor::s_info = { "MessageChannelConstructor", 0, 0, 0 }; JSMessageChannelConstructor::JSMessageChannelConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) - : DOMObject(JSMessageChannelConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) - , m_globalObject(globalObject) + : DOMConstructorObject(JSMessageChannelConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSMessageChannelPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSMessageChannelPrototype::self(exec, globalObject), None); } JSMessageChannelConstructor::~JSMessageChannelConstructor() { } -ScriptExecutionContext* JSMessageChannelConstructor::scriptExecutionContext() const -{ - return m_globalObject->scriptExecutionContext(); -} - ConstructType JSMessageChannelConstructor::getConstructData(ConstructData& constructData) { constructData.native.function = construct; @@ -61,18 +55,12 @@ ConstructType JSMessageChannelConstructor::getConstructData(ConstructData& const JSObject* JSMessageChannelConstructor::construct(ExecState* exec, JSObject* constructor, const ArgList&) { - ScriptExecutionContext* context = static_cast(constructor)->scriptExecutionContext(); + JSMessageChannelConstructor* jsConstructor = static_cast(constructor); + ScriptExecutionContext* context = jsConstructor->scriptExecutionContext(); if (!context) return throwError(exec, ReferenceError, "MessageChannel constructor associated document is unavailable"); - return asObject(toJS(exec, MessageChannel::create(context))); -} - -void JSMessageChannelConstructor::mark() -{ - DOMObject::mark(); - if (!m_globalObject->marked()) - m_globalObject->mark(); + return asObject(toJS(exec, jsConstructor->globalObject(), MessageChannel::create(context))); } } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelConstructor.h b/src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelConstructor.h index 90c29a3c1..d95876047 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelConstructor.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelConstructor.h @@ -30,23 +30,16 @@ namespace WebCore { - class JSMessageChannelConstructor : public DOMObject { + class JSMessageChannelConstructor : public DOMConstructorObject { public: JSMessageChannelConstructor(JSC::ExecState*, JSDOMGlobalObject*); virtual ~JSMessageChannelConstructor(); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; - ScriptExecutionContext* scriptExecutionContext() const; - virtual bool implementsHasInstance() const { return true; } static JSC::JSObject* construct(JSC::ExecState*, JSC::JSObject*, const JSC::ArgList&); virtual JSC::ConstructType getConstructData(JSC::ConstructData&); - - virtual void mark(); - - private: - JSDOMGlobalObject* m_globalObject; }; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelCustom.cpp index 70329e2c8..d3b58789a 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelCustom.cpp @@ -34,7 +34,7 @@ namespace WebCore { void JSMessageChannel::mark() { - DOMObject::mark(); + Base::mark(); if (MessagePort* port = m_impl->port1()) { DOMObject* wrapper = getCachedDOMObjectWrapper(*Heap::heap(this)->globalData(), port); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSMessagePortCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSMessagePortCustom.cpp index bfac37536..71472d5b7 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSMessagePortCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSMessagePortCustom.cpp @@ -40,7 +40,7 @@ namespace WebCore { void JSMessagePort::mark() { - DOMObject::mark(); + Base::mark(); markIfNotNull(m_impl->onmessage()); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSNamedNodesCollection.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSNamedNodesCollection.cpp index af1995bb3..f36a7d6a1 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSNamedNodesCollection.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSNamedNodesCollection.cpp @@ -42,10 +42,8 @@ const ClassInfo JSNamedNodesCollection::s_info = { "Collection", 0, 0, 0 }; // Such a collection is usually very short-lived, it only exists // for constructs like document.forms.[1], // so it shouldn't be a problem that it's storing all the nodes (with the same name). (David) -JSNamedNodesCollection::JSNamedNodesCollection(ExecState* exec, const Vector >& nodes) - // FIXME: deprecatedGetDOMStructure uses the prototype off of the wrong global object - // we should use the global object from the nodes. - : DOMObject(deprecatedGetDOMStructure(exec)) +JSNamedNodesCollection::JSNamedNodesCollection(ExecState* exec, JSDOMGlobalObject* globalObject, const Vector >& nodes) + : DOMObjectWithGlobalPointer(getDOMStructure(exec, globalObject), globalObject) , m_nodes(new Vector >(nodes)) { } @@ -88,7 +86,7 @@ bool JSNamedNodesCollection::getOwnPropertySlot(ExecState* exec, const Identifie } } - return DOMObject::getOwnPropertySlot(exec, propertyName, slot); + return DOMObjectWithGlobalPointer::getOwnPropertySlot(exec, propertyName, slot); } } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSNamedNodesCollection.h b/src/3rdparty/webkit/WebCore/bindings/js/JSNamedNodesCollection.h index 3bbc102b9..cd6c2cb9f 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSNamedNodesCollection.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSNamedNodesCollection.h @@ -35,9 +35,9 @@ namespace WebCore { // Internal class, used for the collection return by e.g. document.forms.myinput // when multiple nodes have the same name. - class JSNamedNodesCollection : public DOMObject { + class JSNamedNodesCollection : public DOMObjectWithGlobalPointer { public: - JSNamedNodesCollection(JSC::ExecState*, const Vector >&); + JSNamedNodesCollection(JSC::ExecState*, JSDOMGlobalObject*, const Vector >&); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSNodeCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSNodeCustom.cpp index 79ac6b78c..2f080b8f9 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSNodeCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSNodeCustom.cpp @@ -146,7 +146,7 @@ void JSNode::mark() // the document, we need to mark the document, but we don't need to explicitly // mark any other nodes. if (node->inDocument()) { - DOMObject::mark(); + Base::mark(); markEventListeners(node->eventListeners()); if (Document* doc = node->ownerDocument()) if (DOMObject* docWrapper = getCachedDOMObjectWrapper(*Heap::heap(this)->globalData(), doc)) @@ -164,7 +164,7 @@ void JSNode::mark() // Nodes in a subtree are marked by the tree's root, so, if the root is already // marking the tree, we don't need to explicitly mark any other nodes. if (root->inSubtreeMark()) { - DOMObject::mark(); + Base::mark(); markEventListeners(node->eventListeners()); return; } @@ -192,7 +192,7 @@ void JSNode::mark() ASSERT(marked()); } -static ALWAYS_INLINE JSValue createWrapper(ExecState* exec, Node* node) +static ALWAYS_INLINE JSValue createWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, Node* node) { ASSERT(node); ASSERT(!getCachedDOMNodeWrapper(node->document(), node)); @@ -201,63 +201,63 @@ static ALWAYS_INLINE JSValue createWrapper(ExecState* exec, Node* node) switch (node->nodeType()) { case Node::ELEMENT_NODE: if (node->isHTMLElement()) - wrapper = createJSHTMLWrapper(exec, static_cast(node)); + wrapper = createJSHTMLWrapper(exec, globalObject, static_cast(node)); #if ENABLE(SVG) else if (node->isSVGElement()) - wrapper = createJSSVGWrapper(exec, static_cast(node)); + wrapper = createJSSVGWrapper(exec, globalObject, static_cast(node)); #endif else - wrapper = CREATE_DOM_NODE_WRAPPER(exec, Element, node); + wrapper = CREATE_DOM_NODE_WRAPPER(exec, globalObject, Element, node); break; case Node::ATTRIBUTE_NODE: - wrapper = CREATE_DOM_NODE_WRAPPER(exec, Attr, node); + wrapper = CREATE_DOM_NODE_WRAPPER(exec, globalObject, Attr, node); break; case Node::TEXT_NODE: - wrapper = CREATE_DOM_NODE_WRAPPER(exec, Text, node); + wrapper = CREATE_DOM_NODE_WRAPPER(exec, globalObject, Text, node); break; case Node::CDATA_SECTION_NODE: - wrapper = CREATE_DOM_NODE_WRAPPER(exec, CDATASection, node); + wrapper = CREATE_DOM_NODE_WRAPPER(exec, globalObject, CDATASection, node); break; case Node::ENTITY_NODE: - wrapper = CREATE_DOM_NODE_WRAPPER(exec, Entity, node); + wrapper = CREATE_DOM_NODE_WRAPPER(exec, globalObject, Entity, node); break; case Node::PROCESSING_INSTRUCTION_NODE: - wrapper = CREATE_DOM_NODE_WRAPPER(exec, ProcessingInstruction, node); + wrapper = CREATE_DOM_NODE_WRAPPER(exec, globalObject, ProcessingInstruction, node); break; case Node::COMMENT_NODE: - wrapper = CREATE_DOM_NODE_WRAPPER(exec, Comment, node); + wrapper = CREATE_DOM_NODE_WRAPPER(exec, globalObject, Comment, node); break; case Node::DOCUMENT_NODE: // we don't want to cache the document itself in the per-document dictionary - return toJS(exec, static_cast(node)); + return toJS(exec, globalObject, static_cast(node)); case Node::DOCUMENT_TYPE_NODE: - wrapper = CREATE_DOM_NODE_WRAPPER(exec, DocumentType, node); + wrapper = CREATE_DOM_NODE_WRAPPER(exec, globalObject, DocumentType, node); break; case Node::NOTATION_NODE: - wrapper = CREATE_DOM_NODE_WRAPPER(exec, Notation, node); + wrapper = CREATE_DOM_NODE_WRAPPER(exec, globalObject, Notation, node); break; case Node::DOCUMENT_FRAGMENT_NODE: - wrapper = CREATE_DOM_NODE_WRAPPER(exec, DocumentFragment, node); + wrapper = CREATE_DOM_NODE_WRAPPER(exec, globalObject, DocumentFragment, node); break; case Node::ENTITY_REFERENCE_NODE: - wrapper = CREATE_DOM_NODE_WRAPPER(exec, EntityReference, node); + wrapper = CREATE_DOM_NODE_WRAPPER(exec, globalObject, EntityReference, node); break; default: - wrapper = CREATE_DOM_NODE_WRAPPER(exec, Node, node); + wrapper = CREATE_DOM_NODE_WRAPPER(exec, globalObject, Node, node); } return wrapper; } -JSValue toJSNewlyCreated(ExecState* exec, Node* node) +JSValue toJSNewlyCreated(ExecState* exec, JSDOMGlobalObject* globalObject, Node* node) { if (!node) return jsNull(); - return createWrapper(exec, node); + return createWrapper(exec, globalObject, node); } -JSValue toJS(ExecState* exec, Node* node) +JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, Node* node) { if (!node) return jsNull(); @@ -266,7 +266,7 @@ JSValue toJS(ExecState* exec, Node* node) if (wrapper) return wrapper; - return createWrapper(exec, node); + return createWrapper(exec, globalObject, node); } } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSNodeFilterCondition.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSNodeFilterCondition.cpp index f5d4d5c36..2595af587 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSNodeFilterCondition.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSNodeFilterCondition.cpp @@ -44,7 +44,7 @@ void JSNodeFilterCondition::mark() short JSNodeFilterCondition::acceptNode(JSC::ExecState* exec, Node* filterNode) const { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); CallData callData; CallType callType = m_filter.getCallData(callData); @@ -61,7 +61,9 @@ short JSNodeFilterCondition::acceptNode(JSC::ExecState* exec, Node* filterNode) return NodeFilter::FILTER_REJECT; MarkedArgumentBuffer args; - args.append(toJS(exec, filterNode)); + // FIXME: The node should have the prototype chain that came from its document, not + // whatever prototype chain might be on the window this filter came from. Bug 27662 + args.append(toJS(exec, deprecatedGlobalObjectForPrototype(exec), filterNode)); if (exec->hadException()) return NodeFilter::FILTER_REJECT; diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSNodeFilterCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSNodeFilterCustom.cpp index ecc12d55f..a48a59d65 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSNodeFilterCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSNodeFilterCustom.cpp @@ -38,7 +38,7 @@ namespace WebCore { void JSNodeFilter::mark() { impl()->mark(); - DOMObject::mark(); + Base::mark(); } JSValue JSNodeFilter::acceptNode(ExecState* exec, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSNodeIteratorCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSNodeIteratorCustom.cpp index 8fff82ea7..a2b96586b 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSNodeIteratorCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSNodeIteratorCustom.cpp @@ -34,7 +34,7 @@ void JSNodeIterator::mark() if (NodeFilter* filter = m_impl->filter()) filter->mark(); - DOMObject::mark(); + Base::mark(); } JSValue JSNodeIterator::nextNode(ExecState* exec, const ArgList&) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSOptionConstructor.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSOptionConstructor.cpp index 9e818ff68..2b8bd5d97 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSOptionConstructor.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSOptionConstructor.cpp @@ -35,24 +35,16 @@ ASSERT_CLASS_FITS_IN_CELL(JSOptionConstructor); const ClassInfo JSOptionConstructor::s_info = { "OptionConstructor", 0, 0, 0 }; JSOptionConstructor::JSOptionConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) - : DOMObject(JSOptionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) - , m_globalObject(globalObject) + : DOMConstructorWithDocument(JSOptionConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - ASSERT(globalObject->scriptExecutionContext()); - ASSERT(globalObject->scriptExecutionContext()->isDocument()); - - putDirect(exec->propertyNames().prototype, JSHTMLOptionElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLOptionElementPrototype::self(exec, globalObject), None); putDirect(exec->propertyNames().length, jsNumber(exec, 4), ReadOnly|DontDelete|DontEnum); } -Document* JSOptionConstructor::document() const -{ - return static_cast(m_globalObject->scriptExecutionContext()); -} - static JSObject* constructHTMLOptionElement(ExecState* exec, JSObject* constructor, const ArgList& args) { - Document* document = static_cast(constructor)->document(); + JSOptionConstructor* jsConstructor = static_cast(constructor); + Document* document = jsConstructor->document(); if (!document) return throwError(exec, ReferenceError, "Option constructor associated document is unavailable"); @@ -76,7 +68,7 @@ static JSObject* constructHTMLOptionElement(ExecState* exec, JSObject* construct return 0; } - return asObject(toJS(exec, element.release())); + return asObject(toJS(exec, jsConstructor->globalObject(), element.release())); } ConstructType JSOptionConstructor::getConstructData(ConstructData& constructData) @@ -85,11 +77,5 @@ ConstructType JSOptionConstructor::getConstructData(ConstructData& constructData return ConstructTypeHost; } -void JSOptionConstructor::mark() -{ - DOMObject::mark(); - if (!m_globalObject->marked()) - m_globalObject->mark(); -} } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSOptionConstructor.h b/src/3rdparty/webkit/WebCore/bindings/js/JSOptionConstructor.h index 3c87c28f1..246e7fa6c 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSOptionConstructor.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSOptionConstructor.h @@ -26,19 +26,14 @@ namespace WebCore { - class JSOptionConstructor : public DOMObject { + class JSOptionConstructor : public DOMConstructorWithDocument { public: JSOptionConstructor(JSC::ExecState*, JSDOMGlobalObject*); - Document* document() const; static const JSC::ClassInfo s_info; - - virtual void mark(); private: virtual JSC::ConstructType getConstructData(JSC::ConstructData&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } - - JSDOMGlobalObject* m_globalObject; }; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSRGBColor.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSRGBColor.cpp deleted file mode 100644 index c430d5fb1..000000000 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSRGBColor.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (C) 2000 Harri Porten (porten@kde.org) - * Copyright (C) 2001 Peter Kelly (pmk@post.com) - * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. - * Copyright (C) 2006 James G. Speth (speth@end.com) - * Copyright (C) 2006 Samuel Weinig (sam@webkit.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "config.h" -#include "JSRGBColor.h" - -#include "CSSPrimitiveValue.h" -#include "JSCSSPrimitiveValue.h" - -using namespace JSC; - -static JSValue jsRGBColorRed(ExecState*, const Identifier&, const PropertySlot&); -static JSValue jsRGBColorGreen(ExecState*, const Identifier&, const PropertySlot&); -static JSValue jsRGBColorBlue(ExecState*, const Identifier&, const PropertySlot&); - -/* -@begin JSRGBColorTable - red jsRGBColorRed DontDelete|ReadOnly - green jsRGBColorGreen DontDelete|ReadOnly - blue jsRGBColorBlue DontDelete|ReadOnly -@end -*/ - -#include "JSRGBColor.lut.h" - -namespace WebCore { - -ASSERT_CLASS_FITS_IN_CELL(JSRGBColor); - -const ClassInfo JSRGBColor::s_info = { "RGBColor", 0, &JSRGBColorTable, 0 }; - -JSRGBColor::JSRGBColor(ExecState* exec, unsigned color) - // FIXME: deprecatedGetDOMStructure uses the prototype off of the wrong global object - // This will be fixed when JSRGBColor wraps css/RGBColor instead of being custom. - : DOMObject(deprecatedGetDOMStructure(exec)) - , m_color(color) -{ -} - -bool JSRGBColor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) -{ - return getStaticValueSlot(exec, &JSRGBColorTable, this, propertyName, slot); -} - -JSValue getJSRGBColor(ExecState* exec, unsigned color) -{ - return new (exec) JSRGBColor(exec, color); -} - -} // namespace WebCore - -using namespace WebCore; - -JSValue jsRGBColorRed(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - return toJS(exec, CSSPrimitiveValue::create((static_cast(asObject(slot.slotBase()))->impl() >> 16) & 0xFF, CSSPrimitiveValue::CSS_NUMBER)); -} - -JSValue jsRGBColorGreen(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - return toJS(exec, CSSPrimitiveValue::create((static_cast(asObject(slot.slotBase()))->impl() >> 8) & 0xFF, CSSPrimitiveValue::CSS_NUMBER)); -} - -JSValue jsRGBColorBlue(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - return toJS(exec, CSSPrimitiveValue::create(static_cast(asObject(slot.slotBase()))->impl() & 0xFF, CSSPrimitiveValue::CSS_NUMBER)); -} - diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSRGBColor.h b/src/3rdparty/webkit/WebCore/bindings/js/JSRGBColor.h deleted file mode 100644 index cc2870f91..000000000 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSRGBColor.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2000 Harri Porten (porten@kde.org) - * Copyright (C) 2001 Peter Kelly (pmk@post.com) - * Copyright (C) 2004, 2006, 2007, 2008 Apple Inc. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef JSRGBColor_h -#define JSRGBColor_h - -#include "Color.h" -#include "JSDOMBinding.h" - -namespace WebCore { - - // FIXME: JSRGBColor should have a proper prototype and a constructor. - class JSRGBColor : public DOMObject { - public: - JSRGBColor(JSC::ExecState*, unsigned color); - - virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - - virtual const JSC::ClassInfo* classInfo() const { return &s_info; } - static const JSC::ClassInfo s_info; - - unsigned impl() const { return m_color; } - - static JSC::ObjectPrototype* createPrototype(JSC::ExecState*, JSC::JSGlobalObject* globalObject) - { - return globalObject->objectPrototype(); - } - - static PassRefPtr createStructure(JSC::JSValue prototype) - { - return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); - } - - private: - unsigned m_color; - }; - - JSC::JSValue getJSRGBColor(JSC::ExecState*, unsigned color); - -} // namespace WebCore - -#endif // JSRGBColor_h diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp index 2922740a5..055368e3a 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp @@ -39,7 +39,7 @@ namespace WebCore { void JSSVGElementInstance::mark() { - DOMObject::mark(); + Base::mark(); // Mark the wrapper for our corresponding element, so it can mark its event handlers. JSNode* correspondingWrapper = getCachedDOMNodeWrapper(impl()->correspondingElement()->document(), impl()->correspondingElement()); @@ -75,9 +75,9 @@ void JSSVGElementInstance::pushEventHandlerScope(ExecState*, ScopeChain&) const { } -JSC::JSValue toJS(JSC::ExecState* exec, SVGElementInstance* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGElementInstance* object) { - JSValue result = getDOMObjectWrapper(exec, object); + JSValue result = getDOMObjectWrapper(exec, globalObject, object); // Ensure that our corresponding element has a JavaScript wrapper to keep its event handlers alive. if (object) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSSVGMatrixCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSSVGMatrixCustom.cpp index fc1e26612..35390b229 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSSVGMatrixCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSSVGMatrixCustom.cpp @@ -32,7 +32,7 @@ namespace WebCore { JSValue JSSVGMatrix::inverse(ExecState* exec, const ArgList&) { TransformationMatrix imp(*impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp.inverse()).get(), m_context.get()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp.inverse()).get(), m_context.get()); if (!imp.isInvertible()) setDOMException(exec, SVGException::SVG_MATRIX_NOT_INVERTABLE); @@ -47,7 +47,7 @@ JSValue JSSVGMatrix::rotateFromVector(ExecState* exec, const ArgList& args) float x = args.at(0).toFloat(exec); float y = args.at(1).toFloat(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp.rotateFromVector(x, y)).get(), m_context.get()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp.rotateFromVector(x, y)).get(), m_context.get()); if (x == 0.0 || y == 0.0) setDOMException(exec, SVGException::SVG_INVALID_VALUE_ERR); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSSVGPathSegCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSSVGPathSegCustom.cpp index cb4687c83..42fa878fe 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSSVGPathSegCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSSVGPathSegCustom.cpp @@ -59,7 +59,7 @@ using namespace JSC; namespace WebCore { -JSValue toJS(ExecState* exec, SVGPathSeg* object, SVGElement* context) +JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, SVGPathSeg* object, SVGElement* context) { if (!object) return jsNull(); @@ -69,46 +69,46 @@ JSValue toJS(ExecState* exec, SVGPathSeg* object, SVGElement* context) switch (object->pathSegType()) { case SVGPathSeg::PATHSEG_CLOSEPATH: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegClosePath, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegClosePath, object, context); case SVGPathSeg::PATHSEG_MOVETO_ABS: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegMovetoAbs, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegMovetoAbs, object, context); case SVGPathSeg::PATHSEG_MOVETO_REL: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegMovetoRel, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegMovetoRel, object, context); case SVGPathSeg::PATHSEG_LINETO_ABS: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegLinetoAbs, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegLinetoAbs, object, context); case SVGPathSeg::PATHSEG_LINETO_REL: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegLinetoRel, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegLinetoRel, object, context); case SVGPathSeg::PATHSEG_CURVETO_CUBIC_ABS: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegCurvetoCubicAbs, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegCurvetoCubicAbs, object, context); case SVGPathSeg::PATHSEG_CURVETO_CUBIC_REL: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegCurvetoCubicRel, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegCurvetoCubicRel, object, context); case SVGPathSeg::PATHSEG_CURVETO_QUADRATIC_ABS: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegCurvetoQuadraticAbs, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegCurvetoQuadraticAbs, object, context); case SVGPathSeg::PATHSEG_CURVETO_QUADRATIC_REL: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegCurvetoQuadraticRel, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegCurvetoQuadraticRel, object, context); case SVGPathSeg::PATHSEG_ARC_ABS: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegArcAbs, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegArcAbs, object, context); case SVGPathSeg::PATHSEG_ARC_REL: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegArcRel, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegArcRel, object, context); case SVGPathSeg::PATHSEG_LINETO_HORIZONTAL_ABS: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegLinetoHorizontalAbs, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegLinetoHorizontalAbs, object, context); case SVGPathSeg::PATHSEG_LINETO_HORIZONTAL_REL: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegLinetoHorizontalRel, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegLinetoHorizontalRel, object, context); case SVGPathSeg::PATHSEG_LINETO_VERTICAL_ABS: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegLinetoVerticalAbs, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegLinetoVerticalAbs, object, context); case SVGPathSeg::PATHSEG_LINETO_VERTICAL_REL: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegLinetoVerticalRel, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegLinetoVerticalRel, object, context); case SVGPathSeg::PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegCurvetoCubicSmoothAbs, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegCurvetoCubicSmoothAbs, object, context); case SVGPathSeg::PATHSEG_CURVETO_CUBIC_SMOOTH_REL: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegCurvetoCubicSmoothRel, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegCurvetoCubicSmoothRel, object, context); case SVGPathSeg::PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegCurvetoQuadraticSmoothAbs, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegCurvetoQuadraticSmoothAbs, object, context); case SVGPathSeg::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSegCurvetoQuadraticSmoothRel, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSegCurvetoQuadraticSmoothRel, object, context); case SVGPathSeg::PATHSEG_UNKNOWN: default: - return CREATE_SVG_OBJECT_WRAPPER(exec, SVGPathSeg, object, context); + return CREATE_SVG_OBJECT_WRAPPER(exec, globalObject, SVGPathSeg, object, context); } } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSSVGPathSegListCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSSVGPathSegListCustom.cpp index b6fc1166b..b71f3a641 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSSVGPathSegListCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSSVGPathSegListCustom.cpp @@ -57,7 +57,7 @@ JSValue JSSVGPathSegList::initialize(ExecState* exec, const ArgList& args) SVGPathSeg* obj = WTF::getPtr(imp->initialize(newItem, ec)); - JSC::JSValue result = toJS(exec, obj, m_context.get()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), obj, m_context.get()); setDOMException(exec, ec); m_context->svgAttributeChanged(imp->associatedAttributeName()); @@ -78,7 +78,7 @@ JSValue JSSVGPathSegList::getItem(ExecState* exec, const ArgList& args) SVGPathSegList* imp = static_cast(impl()); SVGPathSeg* obj = WTF::getPtr(imp->getItem(index, ec)); - JSC::JSValue result = toJS(exec, obj, m_context.get()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), obj, m_context.get()); setDOMException(exec, ec); return result; } @@ -97,7 +97,7 @@ JSValue JSSVGPathSegList::insertItemBefore(ExecState* exec, const ArgList& args) SVGPathSegList* imp = static_cast(impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->insertItemBefore(newItem, index, ec)), m_context.get()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), WTF::getPtr(imp->insertItemBefore(newItem, index, ec)), m_context.get()); setDOMException(exec, ec); m_context->svgAttributeChanged(imp->associatedAttributeName()); @@ -118,7 +118,7 @@ JSValue JSSVGPathSegList::replaceItem(ExecState* exec, const ArgList& args) SVGPathSegList* imp = static_cast(impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->replaceItem(newItem, index, ec)), m_context.get()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), WTF::getPtr(imp->replaceItem(newItem, index, ec)), m_context.get()); setDOMException(exec, ec); m_context->svgAttributeChanged(imp->associatedAttributeName()); @@ -140,7 +140,7 @@ JSValue JSSVGPathSegList::removeItem(ExecState* exec, const ArgList& args) RefPtr obj(imp->removeItem(index, ec)); - JSC::JSValue result = toJS(exec, obj.get(), m_context.get()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), obj.get(), m_context.get()); setDOMException(exec, ec); m_context->svgAttributeChanged(imp->associatedAttributeName()); @@ -154,7 +154,7 @@ JSValue JSSVGPathSegList::appendItem(ExecState* exec, const ArgList& args) SVGPathSegList* imp = static_cast(impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->appendItem(newItem, ec)), m_context.get()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), WTF::getPtr(imp->appendItem(newItem, ec)), m_context.get()); setDOMException(exec, ec); m_context->svgAttributeChanged(imp->associatedAttributeName()); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSSVGPointListCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSSVGPointListCustom.cpp index a18c2a269..1969fe284 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSSVGPointListCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSSVGPointListCustom.cpp @@ -39,7 +39,7 @@ static JSValue finishGetter(ExecState* exec, ExceptionCode& ec, SVGElement* cont setDOMException(exec, ec); return jsUndefined(); } - return toJS(exec, JSSVGPODTypeWrapperCreatorForList::create(item.get(), list->associatedAttributeName()).get(), context); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGPODTypeWrapperCreatorForList::create(item.get(), list->associatedAttributeName()).get(), context); } static JSValue finishSetter(ExecState* exec, ExceptionCode& ec, SVGElement* context, SVGPointList* list, PassRefPtr item) @@ -50,7 +50,7 @@ static JSValue finishSetter(ExecState* exec, ExceptionCode& ec, SVGElement* cont } const QualifiedName& attributeName = list->associatedAttributeName(); context->svgAttributeChanged(attributeName); - return toJS(exec, JSSVGPODTypeWrapperCreatorForList::create(item.get(), attributeName).get(), context); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGPODTypeWrapperCreatorForList::create(item.get(), attributeName).get(), context); } static JSValue finishSetterReadOnlyResult(ExecState* exec, ExceptionCode& ec, SVGElement* context, SVGPointList* list, PassRefPtr item) @@ -60,7 +60,7 @@ static JSValue finishSetterReadOnlyResult(ExecState* exec, ExceptionCode& ec, SV return jsUndefined(); } context->svgAttributeChanged(list->associatedAttributeName()); - return toJS(exec, JSSVGStaticPODTypeWrapper::create(*item).get(), context); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(*item).get(), context); } JSValue JSSVGPointList::clear(ExecState* exec, const ArgList&) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSSVGTransformListCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSSVGTransformListCustom.cpp index 58b25ad0a..1a9110a9a 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSSVGTransformListCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSSVGTransformListCustom.cpp @@ -39,7 +39,7 @@ static JSValue finishGetter(ExecState* exec, ExceptionCode& ec, SVGElement* cont setDOMException(exec, ec); return jsUndefined(); } - return toJS(exec, JSSVGPODTypeWrapperCreatorForList::create(item.get(), list->associatedAttributeName()).get(), context); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGPODTypeWrapperCreatorForList::create(item.get(), list->associatedAttributeName()).get(), context); } static JSValue finishSetter(ExecState* exec, ExceptionCode& ec, SVGElement* context, SVGTransformList* list, PassRefPtr item) @@ -50,7 +50,7 @@ static JSValue finishSetter(ExecState* exec, ExceptionCode& ec, SVGElement* cont } const QualifiedName& attributeName = list->associatedAttributeName(); context->svgAttributeChanged(attributeName); - return toJS(exec, JSSVGPODTypeWrapperCreatorForList::create(item.get(), attributeName).get(), context); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGPODTypeWrapperCreatorForList::create(item.get(), attributeName).get(), context); } static JSValue finishSetterReadOnlyResult(ExecState* exec, ExceptionCode& ec, SVGElement* context, SVGTransformList* list, PassRefPtr item) @@ -60,7 +60,7 @@ static JSValue finishSetterReadOnlyResult(ExecState* exec, ExceptionCode& ec, SV return jsUndefined(); } context->svgAttributeChanged(list->associatedAttributeName()); - return toJS(exec, JSSVGStaticPODTypeWrapper::create(*item).get(), context); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(*item).get(), context); } JSValue JSSVGTransformList::clear(ExecState* exec, const ArgList&) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSSharedWorkerConstructor.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSSharedWorkerConstructor.cpp index ead17ddeb..a3122258d 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSSharedWorkerConstructor.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSSharedWorkerConstructor.cpp @@ -45,7 +45,7 @@ namespace WebCore { const ClassInfo JSSharedWorkerConstructor::s_info = { "SharedWorkerConstructor", 0, 0, 0 }; JSSharedWorkerConstructor::JSSharedWorkerConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) - : DOMObject(JSSharedWorkerConstructor::createStructure(globalObject->objectPrototype())) + : DOMConstructorObject(JSSharedWorkerConstructor::createStructure(globalObject->objectPrototype())) { putDirect(exec->propertyNames().prototype, JSSharedWorkerPrototype::self(exec, globalObject), None); // Host functions have a length property describing the number of expected arguments. diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSSharedWorkerConstructor.h b/src/3rdparty/webkit/WebCore/bindings/js/JSSharedWorkerConstructor.h index be8b2b447..87baa388c 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSSharedWorkerConstructor.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSSharedWorkerConstructor.h @@ -37,7 +37,7 @@ namespace WebCore { - class JSSharedWorkerConstructor : public DOMObject { + class JSSharedWorkerConstructor : public DOMConstructorObject { public: JSSharedWorkerConstructor(JSC::ExecState*, JSDOMGlobalObject*); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSStyleSheetCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSStyleSheetCustom.cpp index f8146bdd5..00dacee1b 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSStyleSheetCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSStyleSheetCustom.cpp @@ -35,7 +35,7 @@ using namespace JSC; namespace WebCore { -JSValue toJS(ExecState* exec, StyleSheet* styleSheet) +JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, StyleSheet* styleSheet) { if (!styleSheet) return jsNull(); @@ -45,9 +45,9 @@ JSValue toJS(ExecState* exec, StyleSheet* styleSheet) return wrapper; if (styleSheet->isCSSStyleSheet()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, CSSStyleSheet, styleSheet); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CSSStyleSheet, styleSheet); else - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, StyleSheet, styleSheet); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, StyleSheet, styleSheet); return wrapper; } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSTextCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSTextCustom.cpp index 9e66826cb..2dc886ded 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSTextCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSTextCustom.cpp @@ -32,12 +32,12 @@ using namespace JSC; namespace WebCore { -JSValue toJSNewlyCreated(ExecState* exec, Text* text) +JSValue toJSNewlyCreated(ExecState* exec, JSDOMGlobalObject* globalObject, Text* text) { if (!text) return jsNull(); - return CREATE_DOM_NODE_WRAPPER(exec, Text, text); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, Text, text); } } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSTreeWalkerCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSTreeWalkerCustom.cpp index 636901769..58eea7252 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSTreeWalkerCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSTreeWalkerCustom.cpp @@ -34,7 +34,7 @@ void JSTreeWalker::mark() if (NodeFilter* filter = m_impl->filter()) filter->mark(); - DOMObject::mark(); + Base::mark(); } JSValue JSTreeWalker::parentNode(ExecState* exec, const ArgList&) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitCSSMatrixConstructor.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitCSSMatrixConstructor.cpp index c7fe4a5c0..bc05250df 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitCSSMatrixConstructor.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitCSSMatrixConstructor.cpp @@ -35,15 +35,16 @@ namespace WebCore { const ClassInfo JSWebKitCSSMatrixConstructor::s_info = { "WebKitCSSMatrixConstructor", 0, 0, 0 }; -JSWebKitCSSMatrixConstructor::JSWebKitCSSMatrixConstructor(ExecState* exec) - : DOMObject(JSWebKitCSSMatrixConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) +JSWebKitCSSMatrixConstructor::JSWebKitCSSMatrixConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSWebKitCSSMatrixConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSWebKitCSSMatrixPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSWebKitCSSMatrixPrototype::self(exec, globalObject), None); putDirect(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly|DontDelete|DontEnum); } -static JSObject* constructWebKitCSSMatrix(ExecState* exec, JSObject*, const ArgList& args) +static JSObject* constructWebKitCSSMatrix(ExecState* exec, JSObject* constructor, const ArgList& args) { + JSWebKitCSSMatrixConstructor* jsConstructor = static_cast(constructor); String s; if (args.size() >= 1) s = args.at(0).toString(exec); @@ -51,7 +52,7 @@ static JSObject* constructWebKitCSSMatrix(ExecState* exec, JSObject*, const ArgL ExceptionCode ec = 0; RefPtr matrix = WebKitCSSMatrix::create(s, ec); setDOMException(exec, ec); - return CREATE_DOM_OBJECT_WRAPPER(exec, WebKitCSSMatrix, matrix.get()); + return CREATE_DOM_OBJECT_WRAPPER(exec, jsConstructor->globalObject(), WebKitCSSMatrix, matrix.get()); } ConstructType JSWebKitCSSMatrixConstructor::getConstructData(ConstructData& constructData) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitCSSMatrixConstructor.h b/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitCSSMatrixConstructor.h index d0e0bd1be..65b9050c3 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitCSSMatrixConstructor.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitCSSMatrixConstructor.h @@ -31,9 +31,9 @@ namespace WebCore { -class JSWebKitCSSMatrixConstructor : public DOMObject { +class JSWebKitCSSMatrixConstructor : public DOMConstructorObject { public: - JSWebKitCSSMatrixConstructor(JSC::ExecState*); + JSWebKitCSSMatrixConstructor(JSC::ExecState*, JSDOMGlobalObject*); static const JSC::ClassInfo s_info; private: diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitPointConstructor.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitPointConstructor.cpp index c7d4e360c..27cc1db83 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitPointConstructor.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitPointConstructor.cpp @@ -36,15 +36,17 @@ using namespace JSC; const ClassInfo JSWebKitPointConstructor::s_info = { "WebKitPointConstructor", 0, 0, 0 }; -JSWebKitPointConstructor::JSWebKitPointConstructor(ExecState* exec) - : DOMObject(JSWebKitPointConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) +JSWebKitPointConstructor::JSWebKitPointConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSWebKitPointConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSWebKitPointPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSWebKitPointPrototype::self(exec, globalObject), None); putDirect(exec->propertyNames().length, jsNumber(exec, 2), ReadOnly|DontDelete|DontEnum); } -static JSObject* constructWebKitPoint(ExecState* exec, JSObject*, const ArgList& args) +static JSObject* constructWebKitPoint(ExecState* exec, JSObject* constructor, const ArgList& args) { + JSWebKitPointConstructor* jsConstructor = static_cast(constructor); + float x = 0; float y = 0; if (args.size() >= 2) { @@ -55,7 +57,7 @@ static JSObject* constructWebKitPoint(ExecState* exec, JSObject*, const ArgList& if (isnan(y)) y = 0; } - return asObject(toJS(exec, WebKitPoint::create(x, y))); + return asObject(toJS(exec, jsConstructor->globalObject(), WebKitPoint::create(x, y))); } JSC::ConstructType JSWebKitPointConstructor::getConstructData(JSC::ConstructData& constructData) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitPointConstructor.h b/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitPointConstructor.h index a5bb5c1b4..44c253d03 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitPointConstructor.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSWebKitPointConstructor.h @@ -31,9 +31,9 @@ namespace WebCore { -class JSWebKitPointConstructor : public DOMObject { +class JSWebKitPointConstructor : public DOMConstructorObject { public: - JSWebKitPointConstructor(JSC::ExecState*); + JSWebKitPointConstructor(JSC::ExecState*, JSDOMGlobalObject*); static const JSC::ClassInfo s_info; private: diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerConstructor.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerConstructor.cpp index 8ea671830..e1686f787 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerConstructor.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerConstructor.cpp @@ -41,15 +41,17 @@ namespace WebCore { const ClassInfo JSWorkerConstructor::s_info = { "WorkerConstructor", 0, 0, 0 }; -JSWorkerConstructor::JSWorkerConstructor(ExecState* exec) - : DOMObject(JSWorkerConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) +JSWorkerConstructor::JSWorkerConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSWorkerConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSWorkerPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSWorkerPrototype::self(exec, globalObject), None); putDirect(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly|DontDelete|DontEnum); } -static JSObject* constructWorker(ExecState* exec, JSObject*, const ArgList& args) +static JSObject* constructWorker(ExecState* exec, JSObject* constructor, const ArgList& args) { + JSWorkerConstructor* jsConstructor = static_cast(constructor); + if (args.size() == 0) return throwError(exec, SyntaxError, "Not enough arguments"); @@ -57,13 +59,12 @@ static JSObject* constructWorker(ExecState* exec, JSObject*, const ArgList& args if (exec->hadException()) return 0; + // See section 4.8.2 step 14 of WebWorkers for why this is the lexicalGlobalObject. DOMWindow* window = asJSDOMWindow(exec->lexicalGlobalObject())->impl(); - - ExceptionCode ec = 0; - RefPtr worker = Worker::create(scriptURL, window->document(), ec); - setDOMException(exec, ec); - return asObject(toJS(exec, worker.release())); + RefPtr worker = Worker::create(scriptURL, window->document()); + + return asObject(toJS(exec, jsConstructor->globalObject(), worker.release())); } ConstructType JSWorkerConstructor::getConstructData(ConstructData& constructData) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerConstructor.h b/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerConstructor.h index d1df7eb94..c845fa628 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerConstructor.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerConstructor.h @@ -32,9 +32,9 @@ namespace WebCore { - class JSWorkerConstructor : public DOMObject { + class JSWorkerConstructor : public DOMConstructorObject { public: - JSWorkerConstructor(JSC::ExecState*); + JSWorkerConstructor(JSC::ExecState*, JSDOMGlobalObject*); static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerContextBase.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerContextBase.cpp index c71f45bd4..622da7056 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerContextBase.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerContextBase.cpp @@ -31,6 +31,7 @@ #include "JSWorkerContextBase.h" +#include "JSDedicatedWorkerContext.h" #include "JSWorkerContext.h" #include "WorkerContext.h" @@ -57,6 +58,11 @@ ScriptExecutionContext* JSWorkerContextBase::scriptExecutionContext() const return m_impl.get(); } +JSValue toJS(ExecState* exec, JSDOMGlobalObject*, WorkerContext* workerContext) +{ + return toJS(exec, workerContext); +} + JSValue toJS(ExecState*, WorkerContext* workerContext) { if (!workerContext) @@ -67,6 +73,22 @@ JSValue toJS(ExecState*, WorkerContext* workerContext) return script->workerContextWrapper(); } +JSDedicatedWorkerContext* toJSDedicatedWorkerContext(JSValue value) +{ + if (!value.isObject()) + return 0; + const ClassInfo* classInfo = asObject(value)->classInfo(); + if (classInfo == &JSDedicatedWorkerContext::s_info) + return static_cast(asObject(value)); + return 0; +} + +JSWorkerContext* toJSWorkerContext(JSValue value) +{ + // When we support shared workers, we'll add code to test for SharedWorkerContext too. + return toJSDedicatedWorkerContext(value); +} + } // namespace WebCore #endif // ENABLE(WORKERS) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerContextBase.h b/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerContextBase.h index dcbc5c3ba..f7ad17f77 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerContextBase.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerContextBase.h @@ -33,6 +33,8 @@ namespace WebCore { + class JSDedicatedWorkerContext; + class JSWorkerContext; class WorkerContext; class JSWorkerContextBase : public JSDOMGlobalObject { @@ -52,8 +54,13 @@ namespace WebCore { }; // Returns a JSWorkerContext or jsNull() + // Always ignores the execState and passed globalObject, WorkerContext is itself a globalObject and will always use its own prototype chain. + JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, WorkerContext*); JSC::JSValue toJS(JSC::ExecState*, WorkerContext*); + JSDedicatedWorkerContext* toJSDedicatedWorkerContext(JSC::JSValue); + JSWorkerContext* toJSWorkerContext(JSC::JSValue); + } // namespace WebCore #endif // ENABLE(WORKERS) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerContextCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerContextCustom.cpp index 06475f91d..6a7602d3d 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerContextCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerContextCustom.cpp @@ -58,7 +58,7 @@ void JSWorkerContext::mark() markDOMObjectWrapper(globalData, impl()->optionalLocation()); markDOMObjectWrapper(globalData, impl()->optionalNavigator()); - markIfNotNull(impl()->onmessage()); + markIfNotNull(impl()->onerror()); typedef WorkerContext::EventListenersMap EventListenersMap; typedef WorkerContext::ListenerVector ListenerVector; diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerCustom.cpp index 970751990..6010f8398 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerCustom.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSWorkerCustom.cpp @@ -30,8 +30,6 @@ #include "JSWorker.h" #include "JSDOMGlobalObject.h" -#include "JSEventListener.h" -#include "JSMessagePort.h" #include "Worker.h" using namespace JSC; @@ -40,42 +38,9 @@ namespace WebCore { void JSWorker::mark() { - DOMObject::mark(); + Base::mark(); - markIfNotNull(m_impl->onmessage()); - markIfNotNull(m_impl->onerror()); - - typedef Worker::EventListenersMap EventListenersMap; - typedef Worker::ListenerVector ListenerVector; - EventListenersMap& eventListeners = m_impl->eventListeners(); - for (EventListenersMap::iterator mapIter = eventListeners.begin(); mapIter != eventListeners.end(); ++mapIter) { - for (ListenerVector::iterator vecIter = mapIter->second.begin(); vecIter != mapIter->second.end(); ++vecIter) - (*vecIter)->markJSFunction(); - } -} - -JSValue JSWorker::addEventListener(ExecState* exec, const ArgList& args) -{ - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(impl()->scriptExecutionContext()); - if (!globalObject) - return jsUndefined(); - RefPtr listener = globalObject->findOrCreateJSEventListener(args.at(1)); - if (!listener) - return jsUndefined(); - impl()->addEventListener(args.at(0).toString(exec), listener.release(), args.at(2).toBoolean(exec)); - return jsUndefined(); -} - -JSValue JSWorker::removeEventListener(ExecState* exec, const ArgList& args) -{ - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(impl()->scriptExecutionContext()); - if (!globalObject) - return jsUndefined(); - JSEventListener* listener = globalObject->findJSEventListener(args.at(1)); - if (!listener) - return jsUndefined(); - impl()->removeEventListener(args.at(0).toString(exec), listener, args.at(2).toBoolean(exec)); - return jsUndefined(); + markIfNotNull(static_cast(impl())->onmessage()); } } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSXMLHttpRequestConstructor.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSXMLHttpRequestConstructor.cpp index 65cdfc226..a644c9e8e 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSXMLHttpRequestConstructor.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSXMLHttpRequestConstructor.cpp @@ -33,25 +33,20 @@ ASSERT_CLASS_FITS_IN_CELL(JSXMLHttpRequestConstructor); const ClassInfo JSXMLHttpRequestConstructor::s_info = { "XMLHttpRequestConstructor", 0, 0, 0 }; JSXMLHttpRequestConstructor::JSXMLHttpRequestConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) - : DOMObject(JSXMLHttpRequestConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) - , m_globalObject(globalObject) + : DOMConstructorObject(JSXMLHttpRequestConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSXMLHttpRequestPrototype::self(exec, exec->lexicalGlobalObject()), None); -} - -ScriptExecutionContext* JSXMLHttpRequestConstructor::scriptExecutionContext() const -{ - return m_globalObject->scriptExecutionContext(); + putDirect(exec->propertyNames().prototype, JSXMLHttpRequestPrototype::self(exec, globalObject), None); } static JSObject* constructXMLHttpRequest(ExecState* exec, JSObject* constructor, const ArgList&) { - ScriptExecutionContext* context = static_cast(constructor)->scriptExecutionContext(); + JSXMLHttpRequestConstructor* jsConstructor = static_cast(constructor); + ScriptExecutionContext* context = jsConstructor->scriptExecutionContext(); if (!context) return throwError(exec, ReferenceError, "XMLHttpRequest constructor associated document is unavailable"); RefPtr xmlHttpRequest = XMLHttpRequest::create(context); - return CREATE_DOM_OBJECT_WRAPPER(exec, XMLHttpRequest, xmlHttpRequest.get()); + return CREATE_DOM_OBJECT_WRAPPER(exec, jsConstructor->globalObject(), XMLHttpRequest, xmlHttpRequest.get()); } ConstructType JSXMLHttpRequestConstructor::getConstructData(ConstructData& constructData) @@ -60,11 +55,4 @@ ConstructType JSXMLHttpRequestConstructor::getConstructData(ConstructData& const return ConstructTypeHost; } -void JSXMLHttpRequestConstructor::mark() -{ - DOMObject::mark(); - if (!m_globalObject->marked()) - m_globalObject->mark(); -} - } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSXMLHttpRequestConstructor.h b/src/3rdparty/webkit/WebCore/bindings/js/JSXMLHttpRequestConstructor.h index 978a9f056..2cc4fcf8e 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSXMLHttpRequestConstructor.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSXMLHttpRequestConstructor.h @@ -24,18 +24,13 @@ namespace WebCore { -class JSXMLHttpRequestConstructor : public DOMObject { +class JSXMLHttpRequestConstructor : public DOMConstructorObject { public: JSXMLHttpRequestConstructor(JSC::ExecState*, JSDOMGlobalObject*); - ScriptExecutionContext* scriptExecutionContext() const; static const JSC::ClassInfo s_info; - - virtual void mark(); private: virtual JSC::ConstructType getConstructData(JSC::ConstructData&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } - - JSDOMGlobalObject* m_globalObject; }; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSXSLTProcessorConstructor.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSXSLTProcessorConstructor.cpp index 807b017b3..07fec7226 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSXSLTProcessorConstructor.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSXSLTProcessorConstructor.cpp @@ -41,15 +41,16 @@ ASSERT_CLASS_FITS_IN_CELL(JSXSLTProcessorConstructor); const ClassInfo JSXSLTProcessorConstructor::s_info = { "XSLTProcessorConsructor", 0, 0, 0 }; -JSXSLTProcessorConstructor::JSXSLTProcessorConstructor(ExecState* exec) - : DOMObject(JSXSLTProcessorConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) +JSXSLTProcessorConstructor::JSXSLTProcessorConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSXSLTProcessorConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSXSLTProcessorPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSXSLTProcessorPrototype::self(exec, globalObject), None); } -static JSObject* constructXSLTProcessor(ExecState* exec, JSObject*, const ArgList&) +static JSObject* constructXSLTProcessor(ExecState* exec, JSObject* constructor, const ArgList&) { - return CREATE_DOM_OBJECT_WRAPPER(exec, XSLTProcessor, XSLTProcessor::create().get()); + JSXSLTProcessorConstructor* jsConstructor = static_cast(constructor); + return CREATE_DOM_OBJECT_WRAPPER(exec, jsConstructor->globalObject(), XSLTProcessor, XSLTProcessor::create().get()); } ConstructType JSXSLTProcessorConstructor::getConstructData(ConstructData& constructData) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSXSLTProcessorConstructor.h b/src/3rdparty/webkit/WebCore/bindings/js/JSXSLTProcessorConstructor.h index 64ef9442b..96fa60722 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSXSLTProcessorConstructor.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSXSLTProcessorConstructor.h @@ -32,9 +32,9 @@ namespace WebCore { - class JSXSLTProcessorConstructor : public DOMObject { + class JSXSLTProcessorConstructor : public DOMConstructorObject { public: - JSXSLTProcessorConstructor(JSC::ExecState*); + JSXSLTProcessorConstructor(JSC::ExecState*, JSDOMGlobalObject*); static const JSC::ClassInfo s_info; private: diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScheduledAction.cpp b/src/3rdparty/webkit/WebCore/bindings/js/ScheduledAction.cpp index 91bece71b..9e64bceb9 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/ScheduledAction.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScheduledAction.cpp @@ -87,7 +87,7 @@ void ScheduledAction::execute(ScriptExecutionContext* context) void ScheduledAction::executeFunctionInContext(JSGlobalObject* globalObject, JSValue thisValue) { ASSERT(m_function); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); CallData callData; CallType callType = m_function.get().getCallData(callData); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptArray.cpp b/src/3rdparty/webkit/WebCore/bindings/js/ScriptArray.cpp new file mode 100644 index 000000000..016c7a702 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptArray.cpp @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "ScriptArray.h" + +#include + +using namespace JSC; + +namespace WebCore { + +ScriptArray::ScriptArray(JSArray* object) + : ScriptObject(object) +{ +} + +static bool handleException(ScriptState* scriptState) +{ + if (!scriptState->hadException()) + return true; + + reportException(scriptState, scriptState->exception()); + return false; +} + +bool ScriptArray::set(ScriptState* scriptState, unsigned index, const ScriptObject& value) +{ + JSLock lock(SilenceAssertionsOnly); + jsArray()->put(scriptState, index, value.jsObject()); + return handleException(scriptState); +} + +bool ScriptArray::set(ScriptState* scriptState, unsigned index, const String& value) +{ + JSLock lock(SilenceAssertionsOnly); + jsArray()->put(scriptState, index, jsString(scriptState, value)); + return handleException(scriptState); +} + +bool ScriptArray::set(ScriptState* scriptState, unsigned index, double value) +{ + JSLock lock(SilenceAssertionsOnly); + jsArray()->put(scriptState, index, jsNumber(scriptState, value)); + return handleException(scriptState); +} + +bool ScriptArray::set(ScriptState* scriptState, unsigned index, long long value) +{ + JSLock lock(SilenceAssertionsOnly); + jsArray()->put(scriptState, index, jsNumber(scriptState, value)); + return handleException(scriptState); +} + +bool ScriptArray::set(ScriptState* scriptState, unsigned index, int value) +{ + JSLock lock(SilenceAssertionsOnly); + jsArray()->put(scriptState, index, jsNumber(scriptState, value)); + return handleException(scriptState); +} + +bool ScriptArray::set(ScriptState* scriptState, unsigned index, bool value) +{ + JSLock lock(SilenceAssertionsOnly); + jsArray()->put(scriptState, index, jsBoolean(value)); + return handleException(scriptState); +} + +unsigned ScriptArray::length(ScriptState*) +{ + return jsArray()->length(); +} + +ScriptArray ScriptArray::createNew(ScriptState* scriptState) +{ + JSLock lock(SilenceAssertionsOnly); + return ScriptArray(constructEmptyArray(scriptState)); +} + +} // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptArray.h b/src/3rdparty/webkit/WebCore/bindings/js/ScriptArray.h new file mode 100644 index 000000000..2ba307f2e --- /dev/null +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptArray.h @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef ScriptArray_h +#define ScriptArray_h + +#include "ScriptObject.h" +#include "ScriptState.h" + +#include + +namespace WebCore { + + class ScriptArray : public ScriptObject { + public: + ScriptArray(JSC::JSArray*); + ScriptArray() {} + JSC::JSArray* jsArray() const { return asArray(jsValue()); } + + bool set(ScriptState*, unsigned index, const ScriptObject&); + bool set(ScriptState*, unsigned index, const String&); + bool set(ScriptState*, unsigned index, double); + bool set(ScriptState*, unsigned index, long long); + bool set(ScriptState*, unsigned index, int); + bool set(ScriptState*, unsigned index, bool); + unsigned length(ScriptState*); + + static ScriptArray createNew(ScriptState*); + }; +} + +#endif // ScriptArray_h diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptCachedFrameData.cpp b/src/3rdparty/webkit/WebCore/bindings/js/ScriptCachedFrameData.cpp index 213c70893..885261124 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/ScriptCachedFrameData.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptCachedFrameData.cpp @@ -45,7 +45,7 @@ namespace WebCore { ScriptCachedFrameData::ScriptCachedFrameData(Frame* frame) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); ScriptController* scriptController = frame->script(); if (scriptController->haveWindowShell()) { @@ -67,7 +67,7 @@ void ScriptCachedFrameData::restore(Frame* frame) { Page* page = frame->page(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); ScriptController* scriptController = frame->script(); if (scriptController->haveWindowShell()) { @@ -84,7 +84,7 @@ void ScriptCachedFrameData::restore(Frame* frame) void ScriptCachedFrameData::clear() { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); if (!m_window) { m_window = 0; diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptController.cpp b/src/3rdparty/webkit/WebCore/bindings/js/ScriptController.cpp index 442205e2f..a1c43764d 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/ScriptController.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptController.cpp @@ -106,7 +106,7 @@ ScriptValue ScriptController::evaluate(const ScriptSourceCode& sourceCode) const String* savedSourceURL = m_sourceURL; m_sourceURL = &sourceURL; - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); RefPtr protect = m_frame; @@ -135,7 +135,7 @@ void ScriptController::clearWindowShell() if (!m_windowShell) return; - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); // Clear the debugger from the current window before setting the new window. attachDebugger(0); @@ -157,7 +157,7 @@ void ScriptController::initScript() if (m_windowShell) return; - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); m_windowShell = new JSDOMWindowShell(m_frame->domWindow()); m_windowShell->window()->updateDocument(); @@ -249,7 +249,7 @@ void ScriptController::updateDocument() if (!m_frame->document()) return; - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); if (m_windowShell) m_windowShell->window()->updateDocument(); } @@ -265,7 +265,7 @@ Bindings::RootObject* ScriptController::bindingRootObject() return 0; if (!m_bindingRootObject) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); m_bindingRootObject = Bindings::RootObject::create(0, globalObject()); } return m_bindingRootObject.get(); @@ -291,7 +291,7 @@ NPObject* ScriptController::windowScriptNPObject() if (isEnabled()) { // JavaScript is enabled, so there is a JavaScript window object. // Return an NPObject bound to the window object. - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); JSObject* win = windowShell()->window(); ASSERT(win); Bindings::RootObject* root = bindingRootObject(); @@ -325,9 +325,9 @@ JSObject* ScriptController::jsObjectForPluginElement(HTMLPlugInElement* plugin) return 0; // Create a JSObject bound to this element - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); ExecState* exec = globalObject()->globalExec(); - JSValue jsElementValue = toJS(exec, plugin); + JSValue jsElementValue = toJS(exec, globalObject(), plugin); if (!jsElementValue || !jsElementValue.isObject()) return 0; @@ -359,7 +359,7 @@ void ScriptController::cleanupScriptObjectsForPlugin(void* nativeHandle) void ScriptController::clearScriptObjects() { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); RootObjectMap::const_iterator end = m_rootObjects.end(); for (RootObjectMap::const_iterator it = m_rootObjects.begin(); it != end; ++it) diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptControllerHaiku.cpp b/src/3rdparty/webkit/WebCore/bindings/js/ScriptControllerHaiku.cpp new file mode 100644 index 000000000..b573b97e6 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptControllerHaiku.cpp @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2008 Apple Computer, Inc. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "ScriptController.h" + +#include "PluginView.h" +#include "runtime_root.h" +#include "runtime.h" + + +namespace WebCore { + +PassRefPtr ScriptController::createScriptInstanceForWidget(Widget* widget) +{ + if (!widget->isPluginView()) + return 0; + + return static_cast(widget)->bindingInstance(); +} + +} // namespace WebCore + diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptControllerMac.mm b/src/3rdparty/webkit/WebCore/bindings/js/ScriptControllerMac.mm index 502a504b9..e6a654f06 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/ScriptControllerMac.mm +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptControllerMac.mm @@ -112,7 +112,7 @@ WebScriptObject* ScriptController::windowScriptObject() return 0; if (!m_windowScriptObject) { - JSC::JSLock lock(false); + JSC::JSLock lock(JSC::SilenceAssertionsOnly); JSC::Bindings::RootObject* root = bindingRootObject(); m_windowScriptObject = [WebScriptObject scriptObjectForJSObject:toRef(windowShell()) originRootObject:root rootObject:root]; } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptEventListener.cpp b/src/3rdparty/webkit/WebCore/bindings/js/ScriptEventListener.cpp index e5be1d6f6..878c5353f 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/ScriptEventListener.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptEventListener.cpp @@ -71,8 +71,9 @@ PassRefPtr createAttributeEventListener(Node* node, Attribu // Ensure that 'node' has a JavaScript wrapper to mark the event listener we're creating. { - JSLock lock(false); - toJS(globalObject->globalExec(), node); + JSLock lock(SilenceAssertionsOnly); + // FIXME: Should pass the global object associated with the node + toJS(globalObject->globalExec(), globalObject, node); } return JSLazyEventListener::create(attr->localName().string(), eventParameterName(node->isSVGElement()), attr->value(), globalObject, node, scriptController->eventHandlerLineNumber()); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptFunctionCall.cpp b/src/3rdparty/webkit/WebCore/bindings/js/ScriptFunctionCall.cpp index 1122931ad..ca6b03a9d 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/ScriptFunctionCall.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptFunctionCall.cpp @@ -66,7 +66,7 @@ void ScriptFunctionCall::appendArgument(const ScriptValue& argument) void ScriptFunctionCall::appendArgument(const String& argument) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); m_arguments.append(jsString(m_exec, argument)); } @@ -82,19 +82,19 @@ void ScriptFunctionCall::appendArgument(JSC::JSValue argument) void ScriptFunctionCall::appendArgument(long long argument) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); m_arguments.append(jsNumber(m_exec, argument)); } void ScriptFunctionCall::appendArgument(unsigned int argument) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); m_arguments.append(jsNumber(m_exec, argument)); } void ScriptFunctionCall::appendArgument(int argument) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); m_arguments.append(jsNumber(m_exec, argument)); } @@ -107,7 +107,7 @@ ScriptValue ScriptFunctionCall::call(bool& hadException, bool reportExceptions) { JSObject* thisObject = m_thisObject.jsObject(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSValue function = thisObject->get(m_exec, Identifier(m_exec, m_name)); if (m_exec->hadException()) { @@ -145,7 +145,7 @@ ScriptObject ScriptFunctionCall::construct(bool& hadException, bool reportExcept { JSObject* thisObject = m_thisObject.jsObject(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSObject* constructor = asObject(thisObject->get(m_exec, Identifier(m_exec, m_name))); if (m_exec->hadException()) { diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptObject.cpp b/src/3rdparty/webkit/WebCore/bindings/js/ScriptObject.cpp index 7f6391dae..e66464532 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/ScriptObject.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptObject.cpp @@ -32,7 +32,7 @@ #include "ScriptObject.h" #include "JSDOMBinding.h" -#include "JSInspectorController.h" +#include "JSInspectorBackend.h" #include @@ -56,7 +56,7 @@ static bool handleException(ScriptState* scriptState) bool ScriptObject::set(ScriptState* scriptState, const String& name, const String& value) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); PutPropertySlot slot; jsObject()->put(scriptState, Identifier(scriptState, name), jsString(scriptState, value), slot); return handleException(scriptState); @@ -64,7 +64,7 @@ bool ScriptObject::set(ScriptState* scriptState, const String& name, const Strin bool ScriptObject::set(ScriptState* scriptState, const char* name, const ScriptObject& value) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); PutPropertySlot slot; jsObject()->put(scriptState, Identifier(scriptState, name), value.jsObject(), slot); return handleException(scriptState); @@ -72,7 +72,7 @@ bool ScriptObject::set(ScriptState* scriptState, const char* name, const ScriptO bool ScriptObject::set(ScriptState* scriptState, const char* name, const String& value) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); PutPropertySlot slot; jsObject()->put(scriptState, Identifier(scriptState, name), jsString(scriptState, value), slot); return handleException(scriptState); @@ -80,7 +80,7 @@ bool ScriptObject::set(ScriptState* scriptState, const char* name, const String& bool ScriptObject::set(ScriptState* scriptState, const char* name, double value) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); PutPropertySlot slot; jsObject()->put(scriptState, Identifier(scriptState, name), jsNumber(scriptState, value), slot); return handleException(scriptState); @@ -88,7 +88,7 @@ bool ScriptObject::set(ScriptState* scriptState, const char* name, double value) bool ScriptObject::set(ScriptState* scriptState, const char* name, long long value) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); PutPropertySlot slot; jsObject()->put(scriptState, Identifier(scriptState, name), jsNumber(scriptState, value), slot); return handleException(scriptState); @@ -96,7 +96,7 @@ bool ScriptObject::set(ScriptState* scriptState, const char* name, long long val bool ScriptObject::set(ScriptState* scriptState, const char* name, int value) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); PutPropertySlot slot; jsObject()->put(scriptState, Identifier(scriptState, name), jsNumber(scriptState, value), slot); return handleException(scriptState); @@ -104,7 +104,7 @@ bool ScriptObject::set(ScriptState* scriptState, const char* name, int value) bool ScriptObject::set(ScriptState* scriptState, const char* name, bool value) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); PutPropertySlot slot; jsObject()->put(scriptState, Identifier(scriptState, name), jsBoolean(value), slot); return handleException(scriptState); @@ -112,27 +112,28 @@ bool ScriptObject::set(ScriptState* scriptState, const char* name, bool value) ScriptObject ScriptObject::createNew(ScriptState* scriptState) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); return ScriptObject(constructEmptyObject(scriptState)); } bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const ScriptObject& value) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); scriptState->lexicalGlobalObject()->putDirect(Identifier(scriptState, name), value.jsObject()); return handleException(scriptState); } -bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorController* value) +bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorBackend* value) { - JSLock lock(false); - scriptState->lexicalGlobalObject()->putDirect(Identifier(scriptState, name), toJS(scriptState, value)); + JSLock lock(SilenceAssertionsOnly); + JSDOMGlobalObject* globalObject = static_cast(scriptState->lexicalGlobalObject()); + globalObject->putDirect(Identifier(scriptState, name), toJS(scriptState, globalObject, value)); return handleException(scriptState); } bool ScriptGlobalObject::get(ScriptState* scriptState, const char* name, ScriptObject& value) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSValue jsValue = scriptState->lexicalGlobalObject()->get(scriptState, Identifier(scriptState, name)); if (!jsValue) return false; @@ -146,7 +147,7 @@ bool ScriptGlobalObject::get(ScriptState* scriptState, const char* name, ScriptO bool ScriptGlobalObject::remove(ScriptState* scriptState, const char* name) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); scriptState->lexicalGlobalObject()->deleteProperty(scriptState, Identifier(scriptState, name)); return handleException(scriptState); } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptObject.h b/src/3rdparty/webkit/WebCore/bindings/js/ScriptObject.h index ed8665957..97022da09 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/ScriptObject.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptObject.h @@ -38,7 +38,7 @@ #include namespace WebCore { - class InspectorController; + class InspectorBackend; class ScriptObject : public ScriptValue { public: @@ -60,7 +60,7 @@ namespace WebCore { class ScriptGlobalObject { public: static bool set(ScriptState*, const char* name, const ScriptObject&); - static bool set(ScriptState*, const char* name, InspectorController*); + static bool set(ScriptState*, const char* name, InspectorBackend*); static bool get(ScriptState*, const char* name, ScriptObject&); static bool remove(ScriptState*, const char* name); private: diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptObjectQuarantine.cpp b/src/3rdparty/webkit/WebCore/bindings/js/ScriptObjectQuarantine.cpp index ab392bcc4..171883aa7 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/ScriptObjectQuarantine.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptObjectQuarantine.cpp @@ -56,7 +56,7 @@ namespace WebCore { ScriptValue quarantineValue(ScriptState* scriptState, const ScriptValue& value) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); return ScriptValue(JSInspectedObjectWrapper::wrap(scriptState, value.jsValue())); } @@ -69,10 +69,11 @@ bool getQuarantinedScriptObject(Database* database, ScriptObject& quarantinedObj if (!frame) return false; - ExecState* exec = toJSDOMWindow(frame)->globalExec(); + JSDOMGlobalObject* globalObject = toJSDOMWindow(frame); + ExecState* exec = globalObject->globalExec(); - JSLock lock(false); - quarantinedObject = ScriptObject(asObject(JSInspectedObjectWrapper::wrap(exec, toJS(exec, database)))); + JSLock lock(SilenceAssertionsOnly); + quarantinedObject = ScriptObject(asObject(JSInspectedObjectWrapper::wrap(exec, toJS(exec, globalObject, database)))); return true; } @@ -84,10 +85,11 @@ bool getQuarantinedScriptObject(Frame* frame, Storage* storage, ScriptObject& qu ASSERT(frame); ASSERT(storage); - ExecState* exec = toJSDOMWindow(frame)->globalExec(); + JSDOMGlobalObject* globalObject = toJSDOMWindow(frame); + ExecState* exec = globalObject->globalExec(); - JSLock lock(false); - quarantinedObject = ScriptObject(asObject(JSInspectedObjectWrapper::wrap(exec, toJS(exec, storage)))); + JSLock lock(SilenceAssertionsOnly); + quarantinedObject = ScriptObject(asObject(JSInspectedObjectWrapper::wrap(exec, toJS(exec, globalObject, storage)))); return true; } @@ -99,8 +101,9 @@ bool getQuarantinedScriptObject(Node* node, ScriptObject& quarantinedObject) if (!exec) return false; - JSLock lock(false); - quarantinedObject = ScriptObject(asObject(JSInspectedObjectWrapper::wrap(exec, toJS(exec, node)))); + JSLock lock(SilenceAssertionsOnly); + // FIXME: Should use some sort of globalObjectFromNode() + quarantinedObject = ScriptObject(asObject(JSInspectedObjectWrapper::wrap(exec, toJS(exec, deprecatedGlobalObjectForPrototype(exec), node)))); return true; } @@ -112,7 +115,7 @@ bool getQuarantinedScriptObject(DOMWindow* domWindow, ScriptObject& quarantinedO JSDOMWindow* window = toJSDOMWindow(domWindow->frame()); ExecState* exec = window->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); quarantinedObject = ScriptObject(asObject(JSInspectedObjectWrapper::wrap(exec, window))); return true; diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptSourceCode.h b/src/3rdparty/webkit/WebCore/bindings/js/ScriptSourceCode.h index 0a16265ff..1b05dedb6 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/ScriptSourceCode.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptSourceCode.h @@ -32,20 +32,24 @@ #define ScriptSourceCode_h #include "CachedScriptSourceProvider.h" +#include "ScriptSourceProvider.h" #include "StringSourceProvider.h" #include "KURL.h" +#include namespace WebCore { class ScriptSourceCode { public: ScriptSourceCode(const String& source, const KURL& url = KURL(), int startLine = 1) - : m_code(makeSource(source, url.isNull() ? String() : url.string(), startLine)) + : m_provider(StringSourceProvider::create(source, url.isNull() ? String() : url.string())) + , m_code(m_provider, startLine) { } ScriptSourceCode(CachedScript* cs) - : m_code(makeSource(cs)) + : m_provider(CachedScriptSourceProvider::create(cs)) + , m_code(m_provider) { } @@ -53,9 +57,11 @@ public: const JSC::SourceCode& jsSourceCode() const { return m_code; } - const String& source() const { return static_cast(m_code.provider())->source(); } + const String& source() const { return m_provider->source(); } private: + RefPtr m_provider; + JSC::SourceCode m_code; }; diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptSourceProvider.h b/src/3rdparty/webkit/WebCore/bindings/js/ScriptSourceProvider.h new file mode 100644 index 000000000..3fe3584e2 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptSourceProvider.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2009 Daniel Bates (dbates@intudata.com) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef ScriptSourceProvider_h +#define ScriptSourceProvider_h + +#include + +namespace WebCore { + + class String; + + class ScriptSourceProvider : public JSC::SourceProvider { + public: + ScriptSourceProvider(const JSC::UString& url, JSC::SourceBOMPresence hasBOMs = JSC::SourceCouldHaveBOMs) + : SourceProvider(url, hasBOMs) + { + } + + virtual const String& source() const = 0; + }; + +} // namespace WebCore + +#endif // ScriptSourceProvider_h diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptValue.cpp b/src/3rdparty/webkit/WebCore/bindings/js/ScriptValue.cpp index dfb46dabb..d427ceee2 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/ScriptValue.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptValue.cpp @@ -44,7 +44,7 @@ bool ScriptValue::getString(String& result) const { if (!m_value) return false; - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); UString ustring; if (!m_value.get().getString(ustring)) return false; diff --git a/src/3rdparty/webkit/WebCore/bindings/js/StringSourceProvider.h b/src/3rdparty/webkit/WebCore/bindings/js/StringSourceProvider.h index 89dfa6785..770c4fc74 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/StringSourceProvider.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/StringSourceProvider.h @@ -29,11 +29,12 @@ #ifndef StringSourceProvider_h #define StringSourceProvider_h +#include "ScriptSourceProvider.h" #include namespace WebCore { - class StringSourceProvider : public JSC::SourceProvider { + class StringSourceProvider : public ScriptSourceProvider { public: static PassRefPtr create(const String& source, const String& url) { return adoptRef(new StringSourceProvider(source, url)); } @@ -44,7 +45,7 @@ namespace WebCore { private: StringSourceProvider(const String& source, const String& url) - : SourceProvider(url) + : ScriptSourceProvider(url) , m_source(source) { } diff --git a/src/3rdparty/webkit/WebCore/bindings/js/WorkerScriptController.cpp b/src/3rdparty/webkit/WebCore/bindings/js/WorkerScriptController.cpp index bcf107ba2..fc3de3c96 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/WorkerScriptController.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/WorkerScriptController.cpp @@ -31,10 +31,9 @@ #include "WorkerScriptController.h" #include "JSDOMBinding.h" -#include "JSWorkerContext.h" +#include "JSDedicatedWorkerContext.h" #include "ScriptSourceCode.h" #include "ScriptValue.h" -#include "WorkerContext.h" #include "WorkerObjectProxy.h" #include "WorkerThread.h" #include @@ -66,16 +65,20 @@ void WorkerScriptController::initScript() { ASSERT(!m_workerContextWrapper); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); // Explicitly protect the global object's prototype so it isn't collected // when we allocate the global object. (Once the global object is fully // constructed, it can mark its own prototype.) - RefPtr prototypeStructure = JSWorkerContextPrototype::createStructure(jsNull()); - ProtectedPtr prototype = new (m_globalData.get()) JSWorkerContextPrototype(prototypeStructure.release()); + RefPtr workerContextPrototypeStructure = JSWorkerContextPrototype::createStructure(jsNull()); + ProtectedPtr workerContextPrototype = new (m_globalData.get()) JSWorkerContextPrototype(workerContextPrototypeStructure.release()); - RefPtr structure = JSWorkerContext::createStructure(prototype); - m_workerContextWrapper = new (m_globalData.get()) JSWorkerContext(structure.release(), m_workerContext); + // FIXME: When we add SharedWorkerContext, generate the correct wrapper here. + RefPtr dedicatedContextPrototypeStructure = JSDedicatedWorkerContextPrototype::createStructure(workerContextPrototype); + ProtectedPtr dedicatedContextPrototype = new (m_globalData.get()) JSDedicatedWorkerContextPrototype(dedicatedContextPrototypeStructure.release()); + RefPtr structure = JSDedicatedWorkerContext::createStructure(dedicatedContextPrototype); + + m_workerContextWrapper = new (m_globalData.get()) JSDedicatedWorkerContext(structure.release(), static_cast(m_workerContext)); } ScriptValue WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode) @@ -88,7 +91,7 @@ ScriptValue WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode) ScriptValue exception; ScriptValue result = evaluate(sourceCode, &exception); if (exception.jsValue()) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); reportException(m_workerContextWrapper->globalExec(), exception.jsValue()); } return result; @@ -103,7 +106,7 @@ ScriptValue WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode, } initScriptIfNeeded(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); ExecState* exec = m_workerContextWrapper->globalExec(); m_workerContextWrapper->globalData()->timeoutChecker.start(); diff --git a/src/3rdparty/webkit/WebCore/bindings/js/WorkerScriptController.h b/src/3rdparty/webkit/WebCore/bindings/js/WorkerScriptController.h index 045472156..bb33f6082 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/WorkerScriptController.h +++ b/src/3rdparty/webkit/WebCore/bindings/js/WorkerScriptController.h @@ -45,7 +45,7 @@ namespace WebCore { class String; class WorkerContext; - class WorkerScriptController : Noncopyable { + class WorkerScriptController : public Noncopyable { public: WorkerScriptController(WorkerContext*); ~WorkerScriptController(); diff --git a/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGenerator.pm b/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGenerator.pm index fe145f4ec..341c60798 100644 --- a/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGenerator.pm +++ b/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGenerator.pm @@ -40,7 +40,7 @@ my %primitiveTypeHash = ("int" => 1, "short" => 1, "long" => 1, "long long" => 1 "float" => 1, "double" => 1, "boolean" => 1, "void" => 1); -my %podTypeHash = ("RGBColor" => 1, "SVGNumber" => 1, "SVGTransform" => 1); +my %podTypeHash = ("SVGNumber" => 1, "SVGTransform" => 1); my %podTypesWithWritablePropertiesHash = ("SVGLength" => 1, "SVGMatrix" => 1, "SVGPoint" => 1, "SVGRect" => 1); my %stringTypeHash = ("DOMString" => 1, "AtomicString" => 1); diff --git a/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorCOM.pm b/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorCOM.pm index 7e80a17a6..6641305a3 100644 --- a/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorCOM.pm +++ b/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorCOM.pm @@ -596,9 +596,15 @@ sub GenerateCPPAttribute # FIXME: CHECK EXCEPTION AND DO SOMETHING WITH IT - my $setterCall = " impl${implementationClassWithoutNamespace}()->${setterName}(" . join(", ", @setterParams) . ");\n"; - - push(@setterImplementation, $setterCall); + my $reflect = $attribute->signature->extendedAttributes->{"Reflect"}; + my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"}; + if ($reflect || $reflectURL) { + $CPPImplementationWebCoreIncludes{"HTMLNames.h"} = 1; + my $contentAttributeName = (($reflect || $reflectURL) eq "1") ? $attributeName : ($reflect || $reflectURL); + push(@setterImplementation, " impl${implementationClassWithoutNamespace}()->setAttribute(WebCore::HTMLNames::${contentAttributeName}Attr, " . join(", ", @setterParams) . ");\n"); + } else { + push(@setterImplementation, " impl${implementationClassWithoutNamespace}()->${setterName}(" . join(", ", @setterParams) . ");\n"); + } push(@setterImplementation, " return S_OK;\n"); push(@setterImplementation, "}\n\n"); @@ -611,7 +617,17 @@ sub GenerateCPPAttribute push(@getterImplementation, " if (!result)\n"); push(@getterImplementation, " return E_POINTER;\n\n"); - my $implementationGetter = "impl${implementationClassWithoutNamespace}()->" . $codeGenerator->WK_lcfirst($attributeName) . "(" . ($hasGetterException ? "ec" : ""). ")"; + my $implementationGetter; + my $reflect = $attribute->signature->extendedAttributes->{"Reflect"}; + my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"}; + if ($reflect || $reflectURL) { + $implIncludes{"HTMLNames.h"} = 1; + my $contentAttributeName = (($reflect || $reflectURL) eq "1") ? $attributeName : ($reflect || $reflectURL); + my $getAttributeFunctionName = $reflectURL ? "getURLAttribute" : "getAttribute"; + $implementationGetter = "impl${implementationClassWithoutNamespace}()->${getAttributeFunctionName}(WebCore::HTMLNames::${contentAttributeName}Attr)"; + } else { + $implementationGetter = "impl${implementationClassWithoutNamespace}()->" . $codeGenerator->WK_lcfirst($attributeName) . "(" . ($hasGetterException ? "ec" : ""). ")"; + } push(@getterImplementation, " WebCore::ExceptionCode ec = 0;\n") if $hasGetterException; diff --git a/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorJS.pm b/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorJS.pm index dbcfffffe..26cf3f596 100644 --- a/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorJS.pm +++ b/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorJS.pm @@ -119,7 +119,15 @@ sub GetParentClassName my $dataNode = shift; return $dataNode->extendedAttributes->{"LegacyParent"} if $dataNode->extendedAttributes->{"LegacyParent"}; - return "DOMObject" if @{$dataNode->parents} eq 0; + if (@{$dataNode->parents} eq 0) { + # FIXME: SVG types requiring a context() pointer do not have enough + # space to hold a globalObject pointer as well w/o hitting the CELL_SIZE limit. + # This could be fixed by moving context() into the various impl() classes. + # Until then, we special case these SVG bindings and allow them to return + # the wrong prototypes and constructors during x-frame access. See bug 27088. + return "DOMObjectWithSVGContext" if IsSVGTypeNeedingContextParameter($dataNode->name); + return "DOMObjectWithGlobalPointer"; + } return "JS" . $codeGenerator->StripModule($dataNode->parents(0)); } @@ -165,7 +173,7 @@ sub AddIncludesForType # When we're finished with the one-file-per-class # reorganization, we won't need these special cases. if ($codeGenerator->IsPrimitiveType($type) or AvoidInclusionOfType($type) - or $type eq "DOMString" or $type eq "DOMObject" or $type eq "RGBColor" or $type eq "Array") { + or $type eq "DOMString" or $type eq "DOMObject" or $type eq "Array") { } elsif ($type =~ /SVGPathSeg/) { $joinedName = $type; $joinedName =~ s/Abs|Rel//; @@ -219,11 +227,13 @@ sub IsSVGTypeNeedingContextParameter { my $implClassName = shift; - if ($implClassName =~ /SVG/ and not $implClassName =~ /Element/) { - return 1 unless $implClassName =~ /SVGPaint/ or $implClassName =~ /SVGColor/ or $implClassName =~ /SVGDocument/; + return 0 unless $implClassName =~ /SVG/; + return 0 if $implClassName =~ /Element/; + my @noContextNeeded = ("SVGPaint", "SVGColor", "SVGDocument", "SVGZoomEvent"); + foreach (@noContextNeeded) { + return 0 if $implClassName eq $_; } - - return 0; + return 1; } sub HashValueForClassAndName @@ -358,6 +368,7 @@ sub GenerateHeader my $hasParent = $hasLegacyParent || $hasRealParent; my $parentClassName = GetParentClassName($dataNode); my $conditional = $dataNode->extendedAttributes->{"Conditional"}; + my $needsSVGContext = IsSVGTypeNeedingContextParameter($interfaceName); # - Add default header template @headerContentHeader = split("\r", $headerTemplate); @@ -375,7 +386,8 @@ sub GenerateHeader if ($hasParent) { $headerIncludes{"$parentClassName.h"} = 1; } else { - $headerIncludes{"JSDOMBinding.h"} = 1; + $headerIncludes{"DOMObjectWithSVGContext.h"} = $needsSVGContext; + $headerIncludes{"JSDOMBinding.h"} = !$needsSVGContext; $headerIncludes{""} = 1; $headerIncludes{""} = 1; } @@ -420,10 +432,12 @@ sub GenerateHeader # Constructor if ($interfaceName eq "DOMWindow") { push(@headerContent, " $className(PassRefPtr, PassRefPtr<$implType>, JSDOMWindowShell*);\n"); + } elsif ($dataNode->extendedAttributes->{"IsWorkerContext"}) { + push(@headerContent, " $className(PassRefPtr, PassRefPtr<$implType>);\n"); } elsif (IsSVGTypeNeedingContextParameter($implClassName)) { - push(@headerContent, " $className(PassRefPtr, PassRefPtr<$implType>, SVGElement* context);\n"); + push(@headerContent, " $className(PassRefPtr, JSDOMGlobalObject*, PassRefPtr<$implType>, SVGElement* context);\n"); } else { - push(@headerContent, " $className(PassRefPtr, PassRefPtr<$implType>);\n"); + push(@headerContent, " $className(PassRefPtr, JSDOMGlobalObject*, PassRefPtr<$implType>);\n"); } # Destructor @@ -520,7 +534,7 @@ sub GenerateHeader push(@headerContent, " virtual JSC::JSValue lookupSetter(JSC::ExecState*, const JSC::Identifier& propertyName);\n") if $dataNode->extendedAttributes->{"CustomLookupSetter"}; # Constructor object getter - push(@headerContent, " static JSC::JSValue getConstructor(JSC::ExecState*);\n") if $dataNode->extendedAttributes->{"GenerateConstructor"}; + push(@headerContent, " static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);\n") if $dataNode->extendedAttributes->{"GenerateConstructor"}; my $numCustomFunctions = 0; my $numCustomAttributes = 0; @@ -569,23 +583,11 @@ sub GenerateHeader } if (!$hasParent) { - if ($podType) { - push(@headerContent, " JSSVGPODTypeWrapper<$podType>* impl() const { return m_impl.get(); }\n"); - push(@headerContent, " SVGElement* context() const { return m_context.get(); }\n\n"); - push(@headerContent, "private:\n"); - push(@headerContent, " RefPtr m_context;\n"); - push(@headerContent, " RefPtr > m_impl;\n"); - } elsif (IsSVGTypeNeedingContextParameter($implClassName)) { - push(@headerContent, " $implClassName* impl() const { return m_impl.get(); }\n"); - push(@headerContent, " SVGElement* context() const { return m_context.get(); }\n\n"); - push(@headerContent, "private:\n"); - push(@headerContent, " RefPtr m_context;\n"); - push(@headerContent, " RefPtr<$implClassName > m_impl;\n"); - } else { - push(@headerContent, " $implClassName* impl() const { return m_impl.get(); }\n\n"); - push(@headerContent, "private:\n"); - push(@headerContent, " RefPtr<$implClassName> m_impl;\n"); - } + # Extra space after JSSVGPODTypeWrapper<> to make RefPtr > compile. + my $implType = $podType ? "JSSVGPODTypeWrapper<$podType> " : $implClassName; + push(@headerContent, " $implType* impl() const { return m_impl.get(); }\n\n"); + push(@headerContent, "private:\n"); + push(@headerContent, " RefPtr<$implType> m_impl;\n"); } elsif ($dataNode->extendedAttributes->{"GenerateNativeConverter"}) { push(@headerContent, " $implClassName* impl() const\n"); push(@headerContent, " {\n"); @@ -623,11 +625,11 @@ sub GenerateHeader if (!$hasParent || $dataNode->extendedAttributes->{"GenerateToJS"} || $dataNode->extendedAttributes->{"CustomToJS"}) { if ($podType) { - push(@headerContent, "JSC::JSValue toJS(JSC::ExecState*, JSSVGPODTypeWrapper<$podType>*, SVGElement* context);\n"); + push(@headerContent, "JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, JSSVGPODTypeWrapper<$podType>*, SVGElement* context);\n"); } elsif (IsSVGTypeNeedingContextParameter($implClassName)) { - push(@headerContent, "JSC::JSValue toJS(JSC::ExecState*, $implType*, SVGElement* context);\n"); + push(@headerContent, "JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, $implType*, SVGElement* context);\n"); } else { - push(@headerContent, "JSC::JSValue toJS(JSC::ExecState*, $implType*);\n"); + push(@headerContent, "JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, $implType*);\n"); } } if (!$hasParent || $dataNode->extendedAttributes->{"GenerateNativeConverter"}) { @@ -640,7 +642,7 @@ sub GenerateHeader } } if ($interfaceName eq "Node" or $interfaceName eq "Element" or $interfaceName eq "Text" or $interfaceName eq "CDATASection") { - push(@headerContent, "JSC::JSValue toJSNewlyCreated(JSC::ExecState*, $interfaceName*);\n"); + push(@headerContent, "JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject*, $interfaceName*);\n"); } push(@headerContent, "\n"); @@ -651,7 +653,7 @@ sub GenerateHeader push(@headerContent, "public:\n"); if ($interfaceName eq "DOMWindow") { push(@headerContent, " void* operator new(size_t);\n"); - } elsif ($interfaceName eq "WorkerContext") { + } elsif ($dataNode->extendedAttributes->{"IsWorkerContext"}) { push(@headerContent, " void* operator new(size_t, JSC::JSGlobalData*);\n"); } else { push(@headerContent, " static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*);\n"); @@ -901,7 +903,7 @@ sub GenerateImplementation push(@implContent, "{\n"); push(@implContent, " return JSDOMWindow::commonJSGlobalData()->heap.allocate(size);\n"); push(@implContent, "}\n\n"); - } elsif ($interfaceName eq "WorkerContext") { + } elsif ($dataNode->extendedAttributes->{"IsWorkerContext"}) { push(@implContent, "void* ${className}Prototype::operator new(size_t size, JSGlobalData* globalData)\n"); push(@implContent, "{\n"); push(@implContent, " return globalData->heap.allocate(size);\n"); @@ -980,22 +982,18 @@ sub GenerateImplementation AddIncludesForType("JSDOMWindowShell"); push(@implContent, "${className}::$className(PassRefPtr structure, PassRefPtr<$implType> impl, JSDOMWindowShell* shell)\n"); push(@implContent, " : $parentClassName(structure, impl, shell)\n"); + } elsif ($dataNode->extendedAttributes->{"IsWorkerContext"}) { + AddIncludesForType($interfaceName); + push(@implContent, "${className}::$className(PassRefPtr structure, PassRefPtr<$implType> impl)\n"); + push(@implContent, " : $parentClassName(structure, impl)\n"); } else { - my $contextArg = ""; - if ($needsSVGContext) { - if ($hasParent && !$parentNeedsSVGContext) { - $contextArg = ", SVGElement*"; - } else { - $contextArg = ", SVGElement* context"; - } - } - push(@implContent, "${className}::$className(PassRefPtr structure, PassRefPtr<$implType> impl$contextArg)\n"); + my $contextArg = $needsSVGContext ? ", SVGElement* context" : ""; + push(@implContent, "${className}::$className(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr<$implType> impl$contextArg)\n"); if ($hasParent) { - push(@implContent, " : $parentClassName(structure, impl" . ($parentNeedsSVGContext ? ", context" : "") . ")\n"); + push(@implContent, " : $parentClassName(structure, globalObject, impl" . ($parentNeedsSVGContext ? ", context" : "") . ")\n"); } else { - push(@implContent, " : $parentClassName(structure)\n"); - push(@implContent, " , m_context(context)\n") if $needsSVGContext; - push(@implContent, " , m_impl(impl)\n"); + push(@implContent, " : $parentClassName(structure, globalObject" . ($needsSVGContext ? ", context" : "") . ")\n"); + push(@implContent, " , m_impl(impl)\n"); } } push(@implContent, "{\n"); @@ -1096,6 +1094,7 @@ sub GenerateImplementation push(@implContent, "JSValue ${getFunctionName}(ExecState* exec, const Identifier&, const PropertySlot& slot)\n"); push(@implContent, "{\n"); + push(@implContent, " ${className}* castedThis = static_cast<$className*>(asObject(slot.slotBase()));\n"); my $implClassNameForValueConversion = ""; if (!$podType and ($codeGenerator->IsSVGAnimatedType($implClassName) or $attribute->type !~ /^readonly/)) { @@ -1105,25 +1104,25 @@ sub GenerateImplementation if ($dataNode->extendedAttributes->{"CheckDomainSecurity"} && !$attribute->signature->extendedAttributes->{"DoNotCheckDomainSecurity"} && !$attribute->signature->extendedAttributes->{"DoNotCheckDomainSecurityOnGet"}) { - push(@implContent, " if (!static_cast<$className*>(asObject(slot.slotBase()))->allowsAccessFrom(exec))\n"); + push(@implContent, " if (!castedThis->allowsAccessFrom(exec))\n"); push(@implContent, " return jsUndefined();\n"); } if ($attribute->signature->extendedAttributes->{"Custom"} || $attribute->signature->extendedAttributes->{"JSCCustom"} || $attribute->signature->extendedAttributes->{"CustomGetter"} || $attribute->signature->extendedAttributes->{"JSCCustomGetter"}) { - push(@implContent, " return static_cast<$className*>(asObject(slot.slotBase()))->$implGetterFunctionName(exec);\n"); + push(@implContent, " return castedThis->$implGetterFunctionName(exec);\n"); } elsif ($attribute->signature->extendedAttributes->{"CheckNodeSecurity"}) { $implIncludes{"JSDOMBinding.h"} = 1; - push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(static_cast<$className*>(asObject(slot.slotBase()))->impl());\n"); - push(@implContent, " return checkNodeSecurity(exec, imp->$implGetterFunctionName()) ? " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$implGetterFunctionName()", "static_cast<$className*>(asObject(slot.slotBase()))") . " : jsUndefined();\n"); + push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(castedThis->impl());\n"); + push(@implContent, " return checkNodeSecurity(exec, imp->$implGetterFunctionName()) ? " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$implGetterFunctionName()", "castedThis") . " : jsUndefined();\n"); } elsif ($attribute->signature->extendedAttributes->{"CheckFrameSecurity"}) { $implIncludes{"Document.h"} = 1; $implIncludes{"JSDOMBinding.h"} = 1; - push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(static_cast<$className*>(asObject(slot.slotBase()))->impl());\n"); - push(@implContent, " return checkNodeSecurity(exec, imp->contentDocument()) ? " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$implGetterFunctionName()", "static_cast<$className*>(asObject(slot.slotBase()))") . " : jsUndefined();\n"); + push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(castedThis->impl());\n"); + push(@implContent, " return checkNodeSecurity(exec, imp->contentDocument()) ? " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$implGetterFunctionName()", "castedThis") . " : jsUndefined();\n"); } elsif ($type eq "EventListener") { $implIncludes{"EventListener.h"} = 1; push(@implContent, " UNUSED_PARAM(exec);\n"); - push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(static_cast<$className*>(asObject(slot.slotBase()))->impl());\n"); + push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(castedThis->impl());\n"); push(@implContent, " if (EventListener* listener = imp->$implGetterFunctionName()) {\n"); push(@implContent, " if (JSObject* jsFunction = listener->jsFunction())\n"); push(@implContent, " return jsFunction;\n"); @@ -1132,19 +1131,20 @@ sub GenerateImplementation } elsif ($attribute->signature->type =~ /Constructor$/) { my $constructorType = $codeGenerator->StripModule($attribute->signature->type); $constructorType =~ s/Constructor$//; - push(@implContent, " UNUSED_PARAM(slot);\n"); - push(@implContent, " return JS" . $constructorType . "::getConstructor(exec);\n"); + # Constructor attribute is only used by DOMWindow.idl, so it's correct to pass castedThis as the global object + # Once DOMObjects have a back-pointer to the globalObject we can pass castedThis->globalObject() + push(@implContent, " return JS" . $constructorType . "::getConstructor(exec, castedThis);\n"); } elsif (!@{$attribute->getterExceptions}) { push(@implContent, " UNUSED_PARAM(exec);\n"); if ($podType) { - push(@implContent, " $podType imp(*static_cast<$className*>(asObject(slot.slotBase()))->impl());\n"); + push(@implContent, " $podType imp(*castedThis->impl());\n"); if ($podType eq "float") { # Special case for JSSVGNumber - push(@implContent, " return " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp", "static_cast<$className*>(asObject(slot.slotBase()))") . ";\n"); + push(@implContent, " return " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp", "castedThis") . ";\n"); } else { - push(@implContent, " return " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp.$implGetterFunctionName()", "static_cast<$className*>(asObject(slot.slotBase()))") . ";\n"); + push(@implContent, " return " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp.$implGetterFunctionName()", "castedThis") . ";\n"); } } else { - push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(static_cast<$className*>(asObject(slot.slotBase()))->impl());\n"); + push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(castedThis->impl());\n"); my $value; my $reflect = $attribute->signature->extendedAttributes->{"Reflect"}; my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"}; @@ -1156,23 +1156,22 @@ sub GenerateImplementation } else { $value = "imp->$implGetterFunctionName()"; } - my $jsType = NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, $value, "static_cast<$className*>(asObject(slot.slotBase()))"); + my $jsType = NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, $value, "castedThis"); if ($codeGenerator->IsSVGAnimatedType($type)) { push(@implContent, " RefPtr<$type> obj = $jsType;\n"); - push(@implContent, " return toJS(exec, obj.get(), imp);\n"); + push(@implContent, " return toJS(exec, castedThis->globalObject(), obj.get(), imp);\n"); } else { push(@implContent, " return $jsType;\n"); } } } else { - push(@implContent, " ExceptionCode ec = 0;\n"); - + push(@implContent, " ExceptionCode ec = 0;\n"); if ($podType) { - push(@implContent, " $podType imp(*static_cast<$className*>(asObject(slot.slotBase()))->impl());\n"); - push(@implContent, " JSC::JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp.$implGetterFunctionName(ec)", "static_cast<$className*>(asObject(slot.slotBase()))") . ";\n"); + push(@implContent, " $podType imp(*castedThis->impl());\n"); + push(@implContent, " JSC::JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, "", "imp.$implGetterFunctionName(ec)", "castedThis") . ";\n"); } else { - push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(static_cast<$className*>(asObject(slot.slotBase()))->impl());\n"); - push(@implContent, " JSC::JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$implGetterFunctionName(ec)", "static_cast<$className*>(asObject(slot.slotBase()))") . ";\n"); + push(@implContent, " $implClassName* imp = static_cast<$implClassName*>(castedThis->impl());\n"); + push(@implContent, " JSC::JSValue result = " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$implGetterFunctionName(ec)", "castedThis") . ";\n"); } push(@implContent, " setDOMException(exec, ec);\n"); @@ -1193,7 +1192,15 @@ sub GenerateImplementation push(@implContent, "JSValue ${constructorFunctionName}(ExecState* exec, const Identifier&, const PropertySlot& slot)\n"); push(@implContent, "{\n"); - push(@implContent, " return static_cast<$className*>(asObject(slot.slotBase()))->getConstructor(exec);\n"); + if (IsSVGTypeNeedingContextParameter($interfaceName)) { + # FIXME: SVG bindings with a context pointer have no space to store a globalObject + # so we use deprecatedGlobalObjectForPrototype instead. + push(@implContent, " UNUSED_PARAM(slot);\n"); + push(@implContent, " return ${className}::getConstructor(exec, deprecatedGlobalObjectForPrototype(exec));\n"); + } else { + push(@implContent, " ${className}* domObject = static_cast<$className*>(asObject(slot.slotBase()));\n"); + push(@implContent, " return ${className}::getConstructor(exec, domObject->globalObject());\n"); + } push(@implContent, "}\n"); } } @@ -1338,8 +1345,8 @@ sub GenerateImplementation } if ($dataNode->extendedAttributes->{"GenerateConstructor"}) { - push(@implContent, "JSValue ${className}::getConstructor(ExecState* exec)\n{\n"); - push(@implContent, " return getDOMConstructor<${className}Constructor>(exec);\n"); + push(@implContent, "JSValue ${className}::getConstructor(ExecState* exec, JSGlobalObject* globalObject)\n{\n"); + push(@implContent, " return getDOMConstructor<${className}Constructor>(exec, static_cast(globalObject));\n"); push(@implContent, "}\n\n"); } @@ -1361,6 +1368,10 @@ sub GenerateImplementation push(@implContent, " $className* castedThisObj = toJSDOMWindow(thisValue.toThisObject(exec));\n"); push(@implContent, " if (!castedThisObj)\n"); push(@implContent, " return throwError(exec, TypeError);\n"); + } elsif ($dataNode->extendedAttributes->{"IsWorkerContext"}) { + push(@implContent, " $className* castedThisObj = to${className}(thisValue.toThisObject(exec));\n"); + push(@implContent, " if (!castedThisObj)\n"); + push(@implContent, " return throwError(exec, TypeError);\n"); } else { push(@implContent, " if (!thisValue.isObject(&${className}::s_info))\n"); push(@implContent, " return throwError(exec, TypeError);\n"); @@ -1488,7 +1499,7 @@ sub GenerateImplementation $implIncludes{"KURL.h"} = 1; push(@implContent, " return jsStringOrNull(exec, thisObj->impl()->item(slot.index()));\n"); } else { - push(@implContent, " return toJS(exec, static_cast<$implClassName*>(thisObj->impl())->item(slot.index()));\n"); + push(@implContent, " return toJS(exec, thisObj->globalObject(), static_cast<$implClassName*>(thisObj->impl())->item(slot.index()));\n"); } push(@implContent, "}\n"); if ($interfaceName eq "HTMLCollection") { @@ -1499,20 +1510,20 @@ sub GenerateImplementation if ((!$hasParent or $dataNode->extendedAttributes->{"GenerateToJS"}) and !$dataNode->extendedAttributes->{"CustomToJS"}) { if ($podType) { - push(@implContent, "JSC::JSValue toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper<$podType>* object, SVGElement* context)\n"); + push(@implContent, "JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, JSSVGPODTypeWrapper<$podType>* object, SVGElement* context)\n"); } elsif (IsSVGTypeNeedingContextParameter($implClassName)) { - push(@implContent, "JSC::JSValue toJS(JSC::ExecState* exec, $implType* object, SVGElement* context)\n"); + push(@implContent, "JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, $implType* object, SVGElement* context)\n"); } else { - push(@implContent, "JSC::JSValue toJS(JSC::ExecState* exec, $implType* object)\n"); + push(@implContent, "JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, $implType* object)\n"); } push(@implContent, "{\n"); if ($podType) { - push(@implContent, " return getDOMObjectWrapper<$className, JSSVGPODTypeWrapper<$podType> >(exec, object, context);\n"); + push(@implContent, " return getDOMObjectWrapper<$className, JSSVGPODTypeWrapper<$podType> >(exec, globalObject, object, context);\n"); } elsif (IsSVGTypeNeedingContextParameter($implClassName)) { - push(@implContent, " return getDOMObjectWrapper<$className>(exec, object, context);\n"); + push(@implContent, " return getDOMObjectWrapper<$className>(exec, globalObject, object, context);\n"); } else { - push(@implContent, " return getDOMObjectWrapper<$className>(exec, object);\n"); + push(@implContent, " return getDOMObjectWrapper<$className>(exec, globalObject, object);\n"); } push(@implContent, "}\n"); } @@ -1688,11 +1699,9 @@ sub NativeToJSValue $implIncludes{""} = 1; return "jsString(exec, $value)"; } - - if ($type eq "RGBColor") { - $implIncludes{"JS$type.h"} = 1; - return "getJSRGBColor(exec, $value)"; - } + + # Some SVG bindings don't have space to store a globalObject pointer, for those, we use the deprecatedGlobalObjectForPrototype hack for now. + my $globalObject = IsSVGTypeNeedingContextParameter($implClassName) ? "deprecatedGlobalObjectForPrototype(exec)" : "$thisValue->globalObject()"; if ($codeGenerator->IsPodType($type)) { $implIncludes{"JS$type.h"} = 1; @@ -1711,24 +1720,25 @@ sub NativeToJSValue and $codeGenerator->IsPodTypeWithWriteableProperties($type) and not defined $signature->extendedAttributes->{"Immutable"}) { if ($codeGenerator->IsPodType($implClassName)) { - return "toJS(exec, JSSVGStaticPODTypeWrapperWithPODTypeParent<$nativeType, $implClassName>::create($value, $thisValue->impl()).get(), $thisValue->context())"; + return "toJS(exec, $globalObject, JSSVGStaticPODTypeWrapperWithPODTypeParent<$nativeType, $implClassName>::create($value, $thisValue->impl()).get(), $thisValue->context())"; } else { - return "toJS(exec, JSSVGStaticPODTypeWrapperWithParent<$nativeType, $implClassName>::create(imp, &${implClassName}::$getter, &${implClassName}::$setter).get(), imp)"; + return "toJS(exec, $globalObject, JSSVGStaticPODTypeWrapperWithParent<$nativeType, $implClassName>::create(imp, &${implClassName}::$getter, &${implClassName}::$setter).get(), imp)"; } } if ($implClassNameForValueConversion eq "") { - if (IsSVGTypeNeedingContextParameter($implClassName)) { - return "toJS(exec, JSSVGStaticPODTypeWrapper<$nativeType>::create($value).get(), castedThisObj->context())" if $inFunctionCall eq 1; + # SVGZoomEvent has no context() pointer, and is also not an SVGElement. + # This is not a problem, because SVGZoomEvent has no read/write properties. + return "toJS(exec, $globalObject, JSSVGStaticPODTypeWrapper<$nativeType>::create($value).get(), 0)" if $implClassName eq "SVGZoomEvent"; - # Special case: SVGZoomEvent - it doesn't have a context, but it's no problem, as there are no readwrite props - return "toJS(exec, JSSVGStaticPODTypeWrapper<$nativeType>::create($value).get(), 0)" if $implClassName eq "SVGZoomEvent"; - return "toJS(exec, JSSVGStaticPODTypeWrapper<$nativeType>::create($value).get(), $thisValue->context())"; + if (IsSVGTypeNeedingContextParameter($implClassName)) { + return "toJS(exec, $globalObject, JSSVGStaticPODTypeWrapper<$nativeType>::create($value).get(), castedThisObj->context())" if $inFunctionCall; + return "toJS(exec, $globalObject, JSSVGStaticPODTypeWrapper<$nativeType>::create($value).get(), $thisValue->context())"; } else { - return "toJS(exec, JSSVGStaticPODTypeWrapper<$nativeType>::create($value).get(), imp)"; + return "toJS(exec, $globalObject, JSSVGStaticPODTypeWrapper<$nativeType>::create($value).get(), imp)"; } } else { # These classes, always have a m_context pointer! - return "toJS(exec, JSSVGDynamicPODTypeWrapperCache<$nativeType, $implClassNameForValueConversion>::lookupOrCreateWrapper(imp, &${implClassNameForValueConversion}::$getter, &${implClassNameForValueConversion}::$setter).get(), $thisValue->context())"; + return "toJS(exec, $globalObject, JSSVGDynamicPODTypeWrapperCache<$nativeType, $implClassNameForValueConversion>::lookupOrCreateWrapper(imp, &${implClassNameForValueConversion}::$getter, &${implClassNameForValueConversion}::$setter).get(), $thisValue->context())"; } } @@ -1761,18 +1771,15 @@ sub NativeToJSValue return $value if $codeGenerator->IsSVGAnimatedType($type); if (IsSVGTypeNeedingContextParameter($type)) { - if (IsSVGTypeNeedingContextParameter($implClassName)) { - return "toJS(exec, WTF::getPtr($value), $thisValue->context())"; - } else { - return "toJS(exec, WTF::getPtr($value), imp)"; - } + my $contextPtr = IsSVGTypeNeedingContextParameter($implClassName) ? "$thisValue->context()" : "imp"; + return "toJS(exec, $globalObject, WTF::getPtr($value), $contextPtr)"; } if ($signature->extendedAttributes->{"ReturnsNew"}) { - return "toJSNewlyCreated(exec, WTF::getPtr($value))"; + return "toJSNewlyCreated(exec, $globalObject, WTF::getPtr($value))"; } - return "toJS(exec, WTF::getPtr($value))"; + return "toJS(exec, $globalObject, WTF::getPtr($value))"; } sub ceilingToPowerOf2 @@ -2023,14 +2030,15 @@ sub constructorFor my $interfaceName = shift; my $visibleClassName = shift; my $canConstruct = shift; + my $constructorClassName = "${className}Constructor"; my $implContent = << "EOF"; -class ${className}Constructor : public DOMObject { +class ${constructorClassName} : public DOMConstructorObject { public: - ${className}Constructor(ExecState* exec) - : DOMObject(${className}Constructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + ${constructorClassName}(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(${constructorClassName}::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, ${protoClassName}::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, ${protoClassName}::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -2044,13 +2052,13 @@ EOF if ($canConstruct) { $implContent .= << "EOF"; - static JSObject* construct(ExecState* exec, JSObject*, const ArgList&) + static JSObject* construct${interfaceName}(ExecState* exec, JSObject* constructor, const ArgList&) { - return asObject(toJS(exec, ${interfaceName}::create())); + return asObject(toJS(exec, static_cast<${constructorClassName}*>(constructor)->globalObject(), ${interfaceName}::create())); } virtual ConstructType getConstructData(ConstructData& constructData) { - constructData.native.function = construct; + constructData.native.function = construct${interfaceName}; return ConstructTypeHost; } EOF @@ -2059,16 +2067,16 @@ EOF $implContent .= << "EOF"; }; -const ClassInfo ${className}Constructor::s_info = { "${visibleClassName}Constructor", 0, &${className}ConstructorTable, 0 }; +const ClassInfo ${constructorClassName}::s_info = { "${visibleClassName}Constructor", 0, &${constructorClassName}Table, 0 }; -bool ${className}Constructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +bool ${constructorClassName}::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { - return getStaticValueSlot<${className}Constructor, DOMObject>(exec, &${className}ConstructorTable, this, propertyName, slot); + return getStaticValueSlot<${constructorClassName}, DOMObject>(exec, &${constructorClassName}Table, this, propertyName, slot); } EOF - $implJSCInclude{"JSNumberCell.h"} = 1; + $implJSCInclude{"JSNumberCell.h"} = 1; # FIXME: What is this for? return $implContent; } diff --git a/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorObjC.pm b/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorObjC.pm index 10628b464..d46d88a72 100644 --- a/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorObjC.pm +++ b/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorObjC.pm @@ -515,15 +515,17 @@ sub AddIncludesForType { my $type = $codeGenerator->StripModule(shift); - return if $codeGenerator->IsNonPointerType($type) or IsNativeObjCType($type); + return if $codeGenerator->IsNonPointerType($type); - if ($codeGenerator->IsStringType($type)) { - $implIncludes{"KURL.h"} = 1; + if (IsNativeObjCType($type)) { + if ($type eq "Color") { + $implIncludes{"ColorMac.h"} = 1; + } return; } - if ($type eq "RGBColor") { - $implIncludes{"DOMRGBColorInternal.h"} = 1; + if ($codeGenerator->IsStringType($type)) { + $implIncludes{"KURL.h"} = 1; return; } @@ -924,8 +926,6 @@ sub GenerateHeader if ($codeGenerator->IsSVGAnimatedType($interfaceName)) { push(@internalHeaderContent, "#import \n\n"); - } elsif ($interfaceName eq "RGBColor") { - push(@internalHeaderContent, "#import \n\n"); } else { push(@internalHeaderContent, "namespace WebCore {\n"); $startedNamespace = 1; @@ -1198,6 +1198,9 @@ sub GenerateImplementation } elsif (IsProtocolType($idlType) and $idlType ne "EventTarget") { $getterContentHead = "kit($getterContentHead"; $getterContentTail .= ")"; + } elsif ($idlType eq "Color") { + $getterContentHead = "WebCore::nsColor($getterContentHead"; + $getterContentTail .= ")"; } elsif (ConversionNeeded($attribute->signature->type)) { $getterContentHead = "kit(WTF::getPtr($getterContentHead"; $getterContentTail .= "))"; diff --git a/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorV8.pm b/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorV8.pm index cdadf8178..862649fb1 100644 --- a/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorV8.pm +++ b/src/3rdparty/webkit/WebCore/bindings/scripts/CodeGeneratorV8.pm @@ -113,7 +113,6 @@ sub WK_lcfirst sub IsPodType { my $type = shift; - return 0 if $type eq "RGBColor"; return $codeGenerator->IsPodType($type); } @@ -243,6 +242,18 @@ sub GetImplementationFileName return "${iface}.h"; } +# If the node has a [Conditional=XXX] attribute, returns an "ENABLE(XXX)" string for use in an #if. +sub GenerateConditionalString +{ + my $node = shift; + my $conditional = $node->extendedAttributes->{"Conditional"}; + if ($conditional) { + return "ENABLE(" . join(") && ENABLE(", split(/&/, $conditional)) . ")"; + } else { + return ""; + } +} + sub GenerateHeader { my $object = shift; @@ -257,17 +268,12 @@ sub GenerateHeader $codeGenerator->AddMethodsConstantsAndAttributesFromParentClasses($dataNode); my $hasLegacyParent = $dataNode->extendedAttributes->{"LegacyParent"}; - my $conditional = $dataNode->extendedAttributes->{"Conditional"}; + my $conditionalString = GenerateConditionalString($dataNode); # - Add default header template @headerContent = split("\r", $headerTemplate); - my $conditionalString; - if ($conditional) { - $conditionalString = "ENABLE(" . join(") && ENABLE(", split(/&/, $conditional)) . ")"; - push(@headerContent, "\n#if ${conditionalString}\n\n"); - } - + push(@headerContent, "\n#if ${conditionalString}\n\n") if $conditionalString; push(@headerContent, "\n#ifndef $className" . "_H"); push(@headerContent, "\n#define $className" . "_H\n\n"); @@ -310,7 +316,7 @@ END push(@headerContent, "}\n\n"); push(@headerContent, "#endif // $className" . "_H\n"); - push(@headerContent, "#endif // ${conditionalString}\n\n") if $conditional; + push(@headerContent, "#endif // ${conditionalString}\n\n") if $conditionalString; } @@ -422,17 +428,12 @@ END if ($classIndex eq "DOMWINDOW") { push(@implContentDecls, <(V8ClassIndex::DOMWINDOW, info.Holder()); - Frame* frame = window->frame(); - if (frame) { - // Get the proxy corresponding to the DOMWindow if possible to - // make sure that the constructor function is constructed in the - // context of the DOMWindow and not in the context of the caller. - return V8Proxy::retrieve(frame)->getConstructor(type); - } + // Get the proxy corresponding to the DOMWindow if possible to + // make sure that the constructor function is constructed in the + // context of the DOMWindow and not in the context of the caller. + return V8DOMWrapper::getConstructor(type, window); END - } - - if ($classIndex eq "WORKERCONTEXT") { + } elsif ($classIndex eq "DEDICATEDWORKERCONTEXT" or $classIndex eq "WORKERCONTEXT") { $implIncludes{"WorkerContextExecutionProxy.h"} = 1; push(@implContentDecls, <GetConstructor(type); @@ -547,54 +548,60 @@ END my $getterString; if ($getterStringUsesImp) { - $getterString = "imp->$getterFunc("; - $getterString .= "ec" if $useExceptions; - $getterString .= ")"; - if (IsRefPtrType($returnType)) { - $implIncludes{"wtf/GetPtr.h"} = 1; - $getterString = "WTF::getPtr(" . $getterString . ")"; - } - if ($nativeType eq "int" and - $attribute->signature->extendedAttributes->{"ConvertFromString"}) { - $getterString .= ".toInt()"; - } + my $reflect = $attribute->signature->extendedAttributes->{"Reflect"}; + my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"}; + if ($reflect || $reflectURL) { + $implIncludes{"HTMLNames.h"} = 1; + my $contentAttributeName = ($reflect || $reflectURL) eq "1" ? $attrName : ($reflect || $reflectURL); + my $getAttributeFunctionName = $reflectURL ? "getURLAttribute" : "getAttribute"; + $getterString = "imp->$getAttributeFunctionName(HTMLNames::${contentAttributeName}Attr"; } else { - $getterString = "imp_instance"; + $getterString = "imp->$getterFunc("; } - if ($nativeType eq "String") { - $getterString = "toString($getterString)"; + $getterString .= "ec" if $useExceptions; + $getterString .= ")"; + if ($nativeType eq "int" and $attribute->signature->extendedAttributes->{"ConvertFromString"}) { + $getterString .= ".toInt()"; } + } else { + $getterString = "imp_instance"; + } - my $result; - my $wrapper; + if ($nativeType eq "String") { + $getterString = "toString($getterString)"; + } - if ($attrIsPodType) { - $implIncludes{"V8SVGPODTypeWrapper.h"} = 1; + my $result; + my $wrapper; + + if ($attrIsPodType) { + $implIncludes{"V8SVGPODTypeWrapper.h"} = 1; - my $getter = $getterString; - $getter =~ s/imp->//; - $getter =~ s/\(\)//; - my $setter = "set" . WK_ucfirst($getter); + my $getter = $getterString; + $getter =~ s/imp->//; + $getter =~ s/\(\)//; + my $setter = "set" . WK_ucfirst($getter); - my $implClassIsAnimatedType = $codeGenerator->IsSVGAnimatedType($implClassName); - if (not $implClassIsAnimatedType - and $codeGenerator->IsPodTypeWithWriteableProperties($attrType) - and not defined $attribute->signature->extendedAttributes->{"Immutable"}) { + my $implClassIsAnimatedType = $codeGenerator->IsSVGAnimatedType($implClassName); + if (not $implClassIsAnimatedType and $codeGenerator->IsPodTypeWithWriteableProperties($attrType) and not defined $attribute->signature->extendedAttributes->{"Immutable"}) { if (IsPodType($implClassName)) { - $wrapper = "new V8SVGStaticPODTypeWrapperWithPODTypeParent<$nativeType, $implClassName>($getterString, imp_wrapper)"; + my $wrapper = "V8SVGStaticPODTypeWrapperWithPODTypeParent<$nativeType, $implClassName>::create($getterString, imp_wrapper)"; + push(@implContentDecls, " RefPtr > wrapper = $wrapper;\n"); } else { - $wrapper = "new V8SVGStaticPODTypeWrapperWithParent<$nativeType, $implClassName>(imp, &${implClassName}::$getter, &${implClassName}::$setter)"; + my $wrapper = "V8SVGStaticPODTypeWrapperWithParent<$nativeType, $implClassName>::create(imp, &${implClassName}::$getter, &${implClassName}::$setter)"; + push(@implContentDecls, " RefPtr > wrapper = $wrapper;\n"); } } else { if ($implClassIsAnimatedType) { - $wrapper = "V8SVGDynamicPODTypeWrapperCache<$nativeType, $implClassName>::lookupOrCreateWrapper(imp, &${implClassName}::$getter, &${implClassName}::$setter)"; + my $wrapper = "V8SVGDynamicPODTypeWrapperCache<$nativeType, $implClassName>::lookupOrCreateWrapper(imp, &${implClassName}::$getter, &${implClassName}::$setter)"; + push(@implContentDecls, " RefPtr > wrapper = $wrapper;\n"); } else { - $wrapper = GenerateSVGStaticPodTypeWrapper($returnType, $getterString); + my $wrapper = GenerateSVGStaticPodTypeWrapper($returnType, $getterString); + push(@implContentDecls, " RefPtr > wrapper = $wrapper;\n"); } } - push(@implContentDecls, " void* wrapper = $wrapper;\n"); - } elsif ($nativeType ne "RGBColor") { + } else { push(@implContentDecls, " $nativeType v = "); push(@implContentDecls, "$getterString;\n"); @@ -604,28 +611,22 @@ END } $result = "v"; - if (IsRefPtrType($returnType)) { - $result = "WTF::getPtr(" . $result . ")"; - } - } else { - # Special case: RGBColor is noncopyable - $result = $getterString; } - if (IsSVGTypeNeedingContextParameter($attrType) && !$skipContext) { my $resultObject = $result; if ($attrIsPodType) { $resultObject = "wrapper"; } - + $resultObject = "WTF::getPtr(" . $resultObject . ")"; push(@implContentDecls, GenerateSVGContextAssignment($implClassName, $resultObject, " ")); } if ($attrIsPodType) { my $classIndex = uc($attrType); - push(@implContentDecls, " return V8DOMWrapper::convertToV8Object(V8ClassIndex::$classIndex, wrapper);\n"); + push(@implContentDecls, " return V8DOMWrapper::convertToV8Object(V8ClassIndex::$classIndex, wrapper.release());\n"); } else { + $result .= ".release()" if (IsRefPtrType($attrType)); push(@implContentDecls, " " . ReturnNativeToJSValue($attribute->signature, $result, " ").";\n"); } @@ -718,7 +719,16 @@ END if ($implClassName eq "double") { push(@implContentDecls, " *imp = $result;\n"); } else { - push(@implContentDecls, " imp->set" . WK_ucfirst($attrName) . "(" . $result); + my $implSetterFunctionName = WK_ucfirst($attrName); + my $reflect = $attribute->signature->extendedAttributes->{"Reflect"}; + my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"}; + if ($reflect || $reflectURL) { + $implIncludes{"HTMLNames.h"} = 1; + my $contentAttributeName = ($reflect || $reflectURL) eq "1" ? $attrName : ($reflect || $reflectURL); + push(@implContentDecls, " imp->setAttribute(HTMLNames::${contentAttributeName}Attr, $result"); + } else { + push(@implContentDecls, " imp->set$implSetterFunctionName(" . $result); + } push(@implContentDecls, ", ec") if $useExceptions; push(@implContentDecls, ");\n"); } @@ -800,7 +810,7 @@ sub GenerateFunctionCallback push(@implContentDecls, " $nativeClassName* imp = &imp_instance;\n"); } else { push(@implContentDecls, < holder = args.Holder(); + v8::Handle holder = args.Holder(); END HolderToNative($dataNode, $implClassName, $classIndex); } @@ -892,134 +902,138 @@ sub GenerateBatchedAttributeData $accessControl = "v8::ALL_CAN_WRITE"; } elsif ($attrExt->{"DoNotCheckDomainSecurity"}) { $accessControl = "v8::ALL_CAN_READ"; - if (!($attribute->type =~ /^readonly/) && !($attrExt->{"V8ReadOnly"})) { - $accessControl .= "|v8::ALL_CAN_WRITE"; + if (!($attribute->type =~ /^readonly/) && !($attrExt->{"V8ReadOnly"})) { + $accessControl .= "|v8::ALL_CAN_WRITE"; + } } - } - if ($attrExt->{"V8DisallowShadowing"}) { - $accessControl .= "|v8::PROHIBITS_OVERWRITING"; - } - $accessControl = "static_cast(" . $accessControl . ")"; - - my $customAccessor = - $attrExt->{"Custom"} || - $attrExt->{"CustomSetter"} || - $attrExt->{"CustomGetter"} || - $attrExt->{"V8Custom"} || - $attrExt->{"V8CustomSetter"} || - $attrExt->{"V8CustomGetter"} || - ""; - if ($customAccessor eq 1) { - # use the naming convension, interface + (capitalize) attr name - $customAccessor = $interfaceName . WK_ucfirst($attrName); - } - - my $getter; - my $setter; - my $propAttr = "v8::None"; - my $hasCustomSetter = 0; - - # Check attributes. - if ($attrExt->{"DontEnum"}) { - $propAttr .= "|v8::DontEnum"; - } - if ($attrExt->{"V8DisallowShadowing"}) { - $propAttr .= "|v8::DontDelete"; - } - - my $on_proto = "0 /* on instance */"; - my $data = "V8ClassIndex::INVALID_CLASS_INDEX /* no data */"; - - # Constructor - if ($attribute->signature->type =~ /Constructor$/) { - my $constructorType = $codeGenerator->StripModule($attribute->signature->type); - $constructorType =~ s/Constructor$//; - my $constructorIndex = uc($constructorType); - $data = "V8ClassIndex::${constructorIndex}"; - $getter = "${interfaceName}Internal::${interfaceName}ConstructorGetter"; - $setter = "0"; - $propAttr = "v8::ReadOnly"; - - # EventListeners - } elsif ($attribute->signature->type eq "EventListener") { - if ($interfaceName eq "DOMWindow") { - $getter = "V8Custom::v8DOMWindowEventHandlerAccessorGetter"; - $setter = "V8Custom::v8DOMWindowEventHandlerAccessorSetter"; - } elsif ($interfaceName eq "Element" || $interfaceName eq "Document" || $interfaceName eq "HTMLBodyElement" || $interfaceName eq "SVGElementInstance" || $interfaceName eq "HTMLFrameSetElement") { - $getter = "V8Custom::v8ElementEventHandlerAccessorGetter"; - $setter = "V8Custom::v8ElementEventHandlerAccessorSetter"; - } else { + if ($attrExt->{"V8DisallowShadowing"}) { + $accessControl .= "|v8::PROHIBITS_OVERWRITING"; + } + $accessControl = "static_cast(" . $accessControl . ")"; + + my $customAccessor = + $attrExt->{"Custom"} || + $attrExt->{"CustomSetter"} || + $attrExt->{"CustomGetter"} || + $attrExt->{"V8Custom"} || + $attrExt->{"V8CustomSetter"} || + $attrExt->{"V8CustomGetter"} || + ""; + if ($customAccessor eq 1) { + # use the naming convension, interface + (capitalize) attr name + $customAccessor = $interfaceName . WK_ucfirst($attrName); + } + + my $getter; + my $setter; + my $propAttr = "v8::None"; + my $hasCustomSetter = 0; + + # Check attributes. + if ($attrExt->{"DontEnum"}) { + $propAttr .= "|v8::DontEnum"; + } + if ($attrExt->{"V8DisallowShadowing"}) { + $propAttr .= "|v8::DontDelete"; + } + + my $on_proto = "0 /* on instance */"; + my $data = "V8ClassIndex::INVALID_CLASS_INDEX /* no data */"; + + # Constructor + if ($attribute->signature->type =~ /Constructor$/) { + my $constructorType = $codeGenerator->StripModule($attribute->signature->type); + $constructorType =~ s/Constructor$//; + my $constructorIndex = uc($constructorType); + $data = "V8ClassIndex::${constructorIndex}"; + $getter = "${interfaceName}Internal::${interfaceName}ConstructorGetter"; + $setter = "0"; + $propAttr = "v8::ReadOnly"; + + # EventListeners + } elsif ($attribute->signature->type eq "EventListener") { + if ($interfaceName eq "DOMWindow") { + $getter = "V8Custom::v8DOMWindowEventHandlerAccessorGetter"; + $setter = "V8Custom::v8DOMWindowEventHandlerAccessorSetter"; + } elsif ($interfaceName eq "Element" || $interfaceName eq "Document" || $interfaceName eq "HTMLBodyElement" || $interfaceName eq "SVGElementInstance" || $interfaceName eq "HTMLFrameSetElement") { + $getter = "V8Custom::v8ElementEventHandlerAccessorGetter"; + $setter = "V8Custom::v8ElementEventHandlerAccessorSetter"; + } else { + $getter = "V8Custom::v8${customAccessor}AccessorGetter"; + if ($interfaceName eq "WorkerContext" and $attrName eq "self") { + $setter = "0"; + $propAttr = "v8::ReadOnly"; + } else { + $setter = "V8Custom::v8${customAccessor}AccessorSetter"; + } + } + + # Custom Getter and Setter + } elsif ($attrExt->{"Custom"} || $attrExt->{"V8Custom"}) { $getter = "V8Custom::v8${customAccessor}AccessorGetter"; if ($interfaceName eq "WorkerContext" and $attrName eq "self") { $setter = "0"; $propAttr = "v8::ReadOnly"; } else { + $hasCustomSetter = 1; $setter = "V8Custom::v8${customAccessor}AccessorSetter"; } - } - # Custom Getter and Setter - } elsif ($attrExt->{"Custom"} || $attrExt->{"V8Custom"}) { - $getter = "V8Custom::v8${customAccessor}AccessorGetter"; - if ($interfaceName eq "WorkerContext" and $attrName eq "self") { - $setter = "0"; - $propAttr = "v8::ReadOnly"; - } else { + # Custom Setter + } elsif ($attrExt->{"CustomSetter"} || $attrExt->{"V8CustomSetter"}) { $hasCustomSetter = 1; + $getter = "${interfaceName}Internal::${attrName}AttrGetter"; $setter = "V8Custom::v8${customAccessor}AccessorSetter"; + + # Custom Getter + } elsif ($attrExt->{"CustomGetter"}) { + $getter = "V8Custom::v8${customAccessor}AccessorGetter"; + $setter = "${interfaceName}Internal::${attrName}AttrSetter"; + + # Replaceable + } elsif ($attrExt->{"Replaceable"}) { + # Replaceable accessor is put on instance template with ReadOnly attribute. + $getter = "${interfaceName}Internal::${attrName}AttrGetter"; + $setter = "0"; + + # Mark to avoid duplicate v8::ReadOnly flags in output. + $hasCustomSetter = 1; + + # Handle the special case of window.top being marked upstream as Replaceable. + # FIXME: Investigate why [Replaceable] is not marked as ReadOnly + # upstream and reach parity. + if (!($interfaceName eq "DOMWindow" and $attrName eq "top")) { + $propAttr .= "|v8::ReadOnly"; + } + + # Normal + } else { + $getter = "${interfaceName}Internal::${attrName}AttrGetter"; + $setter = "${interfaceName}Internal::${attrName}AttrSetter"; } - # Custom Setter - } elsif ($attrExt->{"CustomSetter"} || $attrExt->{"V8CustomSetter"}) { - $hasCustomSetter = 1; - $getter = "${interfaceName}Internal::${attrName}AttrGetter"; - $setter = "V8Custom::v8${customAccessor}AccessorSetter"; - - # Custom Getter - } elsif ($attrExt->{"CustomGetter"}) { - $getter = "V8Custom::v8${customAccessor}AccessorGetter"; - $setter = "${interfaceName}Internal::${attrName}AttrSetter"; - - # Replaceable - } elsif ($attrExt->{"Replaceable"}) { - # Replaceable accessor is put on instance template with ReadOnly attribute. - $getter = "${interfaceName}Internal::${attrName}AttrGetter"; - $setter = "0"; - - # Mark to avoid duplicate v8::ReadOnly flags in output. - $hasCustomSetter = 1; - - # Handle the special case of window.top being marked upstream as Replaceable. - # FIXME: Investigate why [Replaceable] is not marked as ReadOnly - # upstream and reach parity. - if (!($interfaceName eq "DOMWindow" and $attrName eq "top")) { + if ($attrExt->{"Replaceable"} && !$hasCustomSetter) { + $setter = "0"; $propAttr .= "|v8::ReadOnly"; } - # Normal - } else { - $getter = "${interfaceName}Internal::${attrName}AttrGetter"; - $setter = "${interfaceName}Internal::${attrName}AttrSetter"; - } - - if ($attrExt->{"Replaceable"} && !$hasCustomSetter) { - $setter = "0"; - $propAttr .= "|v8::ReadOnly"; - } + # Read only attributes + if ($attribute->type =~ /^readonly/ || $attrExt->{"V8ReadOnly"}) { + $setter = "0"; + } - # Read only attributes - if ($attribute->type =~ /^readonly/ || $attrExt->{"V8ReadOnly"}) { - $setter = "0"; - } + # An accessor can be installed on the proto + if ($attrExt->{"v8OnProto"}) { + $on_proto = "1 /* on proto */"; + } - # An accessor can be installed on the proto - if ($attrExt->{"v8OnProto"}) { - $on_proto = "1 /* on proto */"; - } + my $commentInfo = "Attribute '$attrName' (Type: '" . $attribute->type . + "' ExtAttr: '" . join(' ', keys(%{$attrExt})) . "')"; + + my $conditionalString = GenerateConditionalString($attribute->signature); + push(@implContent, "\n#if ${conditionalString}\n") if $conditionalString; - my $commentInfo = "Attribute '$attrName' (Type: '" . $attribute->type . - "' ExtAttr: '" . join(' ', keys(%{$attrExt})) . "')"; - push(@implContent, <($propAttr), $on_proto }, END + push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString; } } @@ -1043,7 +1058,7 @@ sub GenerateImplementation my $classIndex = uc($codeGenerator->StripModule($interfaceName)); my $hasLegacyParent = $dataNode->extendedAttributes->{"LegacyParent"}; - my $conditional = $dataNode->extendedAttributes->{"Conditional"}; + my $conditionalString = GenerateConditionalString($dataNode); @allParents = $codeGenerator->FindParentsRecursively($dataNode); @@ -1056,11 +1071,7 @@ sub GenerateImplementation "#include \"V8Binding.h\"\n\n" . "#undef LOG\n\n"); - my $conditionalString; - if ($conditional) { - $conditionalString = "ENABLE(" . join(") && ENABLE(", split(/&/, $conditional)) . ")"; - push(@implFixedHeader, "\n#if ${conditionalString}\n\n"); - } + push(@implFixedHeader, "\n#if ${conditionalString}\n\n") if $conditionalString; if ($className =~ /^V8SVGAnimated/) { AddIncludesForSVGAnimatedType($interfaceName); @@ -1376,7 +1387,7 @@ END } // namespace WebCore END - push(@implContent, "\n#endif // ${conditionalString}\n") if $conditional; + push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString; } @@ -1466,13 +1477,6 @@ sub GenerateFunctionCallString() } $functionString .= ")"; - if ((IsRefPtrType($returnType) || $returnsListItemPodType) && !$nodeToReturn) { - # We don't use getPtr when $nodeToReturn because that situation is - # special-cased below to return a bool. - $implIncludes{"wtf/GetPtr.h"} = 1; - $functionString = "WTF::getPtr(" . $functionString . ")"; - } - if ($nodeToReturn) { # Special case for insertBefore, replaceChild, removeChild and # appendChild functions from Node. @@ -1502,18 +1506,14 @@ sub GenerateFunctionCallString() } my $return = "result"; - if (IsRefPtrType($returnType) || $returnsListItemPodType) { - $implIncludes{"wtf/GetPtr.h"} = 1; - $return = "WTF::getPtr(" . $return . ")"; - } # If the return type is a POD type, separate out the wrapper generation if ($returnsListItemPodType) { - $result .= $indent . "V8SVGPODTypeWrapper<" . $nativeReturnType . ">* wrapper = new "; - $result .= "V8SVGPODTypeWrapperCreatorForList<" . $nativeReturnType . ">($return, imp->associatedAttributeName());\n"; + $result .= $indent . "RefPtr > wrapper = "; + $result .= "V8SVGPODTypeWrapperCreatorForList<" . $nativeReturnType . ">::create($return, imp->associatedAttributeName());\n"; $return = "wrapper"; } elsif ($returnsPodType) { - $result .= $indent . "V8SVGPODTypeWrapper<" . $nativeReturnType . ">* wrapper = "; + $result .= $indent . "RefPtr > wrapper = "; $result .= GenerateSVGStaticPodTypeWrapper($returnType, $return) . ";\n"; $return = "wrapper"; } @@ -1521,7 +1521,7 @@ sub GenerateFunctionCallString() my $generatedSVGContextRetrieval = 0; # If the return type needs an SVG context, output it if (IsSVGTypeNeedingContextParameter($returnType)) { - $result .= GenerateSVGContextAssignment($implClassName, $return, $indent); + $result .= GenerateSVGContextAssignment($implClassName, $return . ".get()", $indent); $generatedSVGContextRetrieval = 1; } @@ -1547,8 +1547,9 @@ sub GenerateFunctionCallString() if ($returnsPodType) { my $classIndex = uc($returnType); - $result .= $indent . "return V8DOMWrapper::convertToV8Object(V8ClassIndex::$classIndex, wrapper);\n"; + $result .= $indent . "return V8DOMWrapper::convertToV8Object(V8ClassIndex::$classIndex, wrapper.release());\n"; } else { + $return .= ".release()" if (IsRefPtrType($returnType)); $result .= $indent . ReturnNativeToJSValue($function->signature, $return, $indent) . ";\n"; } @@ -1688,7 +1689,6 @@ sub GetNativeType return "SVGPaint::SVGPaintType" if $type eq "SVGPaintType"; return "DOMTimeStamp" if $type eq "DOMTimeStamp"; return "unsigned" if $type eq "unsigned int"; - return "unsigned" if $type eq "RGBColor"; return "Node*" if $type eq "EventTarget" and $isParameter; return "String" if $type eq "DOMUserData"; # FIXME: Temporary hack? @@ -1828,7 +1828,7 @@ sub JSValueToNative $implIncludes{"V8Node.h"} = 1; # EventTarget is not in DOM hierarchy, but all Nodes are EventTarget. - return "V8Node::HasInstance($value) ? V8DOMWrapper::convertDOMWrapperToNode($value) : 0"; + return "V8Node::HasInstance($value) ? V8DOMWrapper::convertDOMWrapperToNode(v8::Handle::Cast($value)) : 0"; } AddIncludesForType($type); @@ -1839,7 +1839,7 @@ sub JSValueToNative # Perform type checks on the parameter, if it is expected Node type, # return NULL. - return "V8${type}::HasInstance($value) ? V8DOMWrapper::convertDOMWrapperToNode<${type}>($value) : 0"; + return "V8${type}::HasInstance($value) ? V8DOMWrapper::convertDOMWrapperToNode<${type}>(v8::Handle::Cast($value)) : 0"; } else { # TODO: Temporary to avoid Window name conflict. my $classIndex = uc($type); @@ -1858,7 +1858,7 @@ sub JSValueToNative # Perform type checks on the parameter, if it is expected Node type, # return NULL. - return "V8${type}::HasInstance($value) ? V8DOMWrapper::convertToNativeObject<${implClassName}>(V8ClassIndex::${classIndex}, $value) : 0"; + return "V8${type}::HasInstance($value) ? V8DOMWrapper::convertToNativeObject<${implClassName}>(V8ClassIndex::${classIndex}, v8::Handle::Cast($value)) : 0"; } } @@ -2028,13 +2028,12 @@ sub ReturnNativeToJSValue return "return V8DOMWrapper::convertEventListenerToV8Object($value)"; } - if ($type eq "RGBColor") { - my $construct = "RefPtr rgbcolor = RGBColor::create($value);\n"; - my $convert = "V8DOMWrapper::convertToV8Object(V8ClassIndex::RGBCOLOR, WTF::getPtr(rgbcolor))"; - return $construct . $indent . "return " . $convert; + if ($type eq "DedicatedWorkerContext" or $type eq "WorkerContext") { + $implIncludes{"WorkerContextExecutionProxy.h"} = 1; + return "return WorkerContextExecutionProxy::WorkerContextToV8Object($value)"; } - if ($type eq "WorkerContext" or $type eq "WorkerLocation" or $type eq "WorkerNavigator") { + if ($type eq "WorkerLocation" or $type eq "WorkerNavigator") { $implIncludes{"WorkerContextExecutionProxy.h"} = 1; my $classIndex = uc($type); @@ -2044,6 +2043,7 @@ sub ReturnNativeToJSValue else { $implIncludes{"wtf/RefCounted.h"} = 1; $implIncludes{"wtf/RefPtr.h"} = 1; + $implIncludes{"wtf/GetPtr.h"} = 1; my $classIndex = uc($type); if (IsPodType($type)) { @@ -2062,7 +2062,7 @@ sub GenerateSVGStaticPodTypeWrapper { $implIncludes{"V8SVGPODTypeWrapper.h"} = 1; my $nativeType = GetNativeType($type); - return "new V8SVGStaticPODTypeWrapper<$nativeType>($value)"; + return "V8SVGStaticPODTypeWrapper<$nativeType>::create($value)"; } # Internal helper @@ -2122,7 +2122,7 @@ sub GenerateSVGContextAssignment my $indent = shift; $result = GenerateSVGContextRetrieval($srcType, $indent); - $result .= $indent . "V8Proxy::setSVGContext($value, context);\n"; + $result .= $indent . "V8Proxy::setSVGContext($value, context);\n"; return $result; } diff --git a/src/3rdparty/webkit/WebCore/bridge/NP_jsobject.cpp b/src/3rdparty/webkit/WebCore/bridge/NP_jsobject.cpp index 3258c54d6..006f17f3a 100644 --- a/src/3rdparty/webkit/WebCore/bridge/NP_jsobject.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/NP_jsobject.cpp @@ -110,7 +110,7 @@ bool _NPN_InvokeDefault(NPP, NPObject* o, const NPVariant* args, uint32_t argCou return false; ExecState* exec = rootObject->globalObject()->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); // Call the function object. JSValue function = obj->imp; @@ -161,7 +161,7 @@ bool _NPN_Invoke(NPP npp, NPObject* o, NPIdentifier methodName, const NPVariant* if (!rootObject || !rootObject->isValid()) return false; ExecState* exec = rootObject->globalObject()->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSValue function = obj->imp->get(exec, identifierFromNPIdentifier(i->string())); CallData callData; CallType callType = function.getCallData(callData); @@ -199,7 +199,7 @@ bool _NPN_Evaluate(NPP, NPObject* o, NPString* s, NPVariant* variant) return false; ExecState* exec = rootObject->globalObject()->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); String scriptString = convertNPStringToUTF16(s); ProtectedPtr globalObject = rootObject->globalObject(); globalObject->globalData()->timeoutChecker.start(); @@ -236,7 +236,7 @@ bool _NPN_GetProperty(NPP, NPObject* o, NPIdentifier propertyName, NPVariant* va ExecState* exec = rootObject->globalObject()->globalExec(); IdentifierRep* i = static_cast(propertyName); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSValue result; if (i->isString()) result = obj->imp->get(exec, identifierFromNPIdentifier(i->string())); @@ -268,7 +268,7 @@ bool _NPN_SetProperty(NPP, NPObject* o, NPIdentifier propertyName, const NPVaria return false; ExecState* exec = rootObject->globalObject()->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); IdentifierRep* i = static_cast(propertyName); if (i->isString()) { @@ -309,7 +309,7 @@ bool _NPN_RemoveProperty(NPP, NPObject* o, NPIdentifier propertyName) } } - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); if (i->isString()) obj->imp->deleteProperty(exec, identifierFromNPIdentifier(i->string())); else @@ -332,7 +332,7 @@ bool _NPN_HasProperty(NPP, NPObject* o, NPIdentifier propertyName) ExecState* exec = rootObject->globalObject()->globalExec(); IdentifierRep* i = static_cast(propertyName); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); if (i->isString()) { bool result = obj->imp->hasProperty(exec, identifierFromNPIdentifier(i->string())); exec->clearException(); @@ -364,7 +364,7 @@ bool _NPN_HasMethod(NPP, NPObject* o, NPIdentifier methodName) return false; ExecState* exec = rootObject->globalObject()->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSValue func = obj->imp->get(exec, identifierFromNPIdentifier(i->string())); exec->clearException(); return !func.isUndefined(); @@ -393,7 +393,7 @@ bool _NPN_Enumerate(NPP, NPObject* o, NPIdentifier** identifier, uint32_t* count return false; ExecState* exec = rootObject->globalObject()->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); PropertyNameArray propertyNames(exec); obj->imp->getPropertyNames(exec, propertyNames); @@ -430,7 +430,7 @@ bool _NPN_Construct(NPP, NPObject* o, const NPVariant* args, uint32_t argCount, return false; ExecState* exec = rootObject->globalObject()->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); // Call the constructor object. JSValue constructor = obj->imp; diff --git a/src/3rdparty/webkit/WebCore/bridge/c/c_class.cpp b/src/3rdparty/webkit/WebCore/bridge/c/c_class.cpp index 7ce9927fb..e8499cbb6 100644 --- a/src/3rdparty/webkit/WebCore/bridge/c/c_class.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/c/c_class.cpp @@ -44,7 +44,7 @@ CClass::CClass(NPClass* aClass) CClass::~CClass() { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); deleteAllValues(_methods); _methods.clear(); @@ -86,7 +86,7 @@ MethodList CClass::methodsNamed(const Identifier& identifier, Instance* instance if (_isa->hasMethod && _isa->hasMethod(obj, ident)){ Method* aMethod = new CMethod(ident); // deleted in the CClass destructor { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); _methods.set(identifier.ustring().rep(), aMethod); } methodList.append(aMethod); @@ -107,7 +107,7 @@ Field* CClass::fieldNamed(const Identifier& identifier, Instance* instance) cons if (_isa->hasProperty && _isa->hasProperty(obj, ident)){ aField = new CField(ident); // deleted in the CClass destructor { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); _fields.set(identifier.ustring().rep(), aField); } } diff --git a/src/3rdparty/webkit/WebCore/bridge/c/c_instance.cpp b/src/3rdparty/webkit/WebCore/bridge/c/c_instance.cpp index 71f6c2ff8..fcdd16623 100644 --- a/src/3rdparty/webkit/WebCore/bridge/c/c_instance.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/c/c_instance.cpp @@ -70,7 +70,7 @@ void CInstance::moveGlobalExceptionToExecState(ExecState* exec) return; { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); throwError(exec, GeneralError, globalExceptionString()); } @@ -125,7 +125,7 @@ JSValue CInstance::invokeMethod(ExecState* exec, const MethodList& methodList, c VOID_TO_NPVARIANT(resultVariant); { - JSLock::DropAllLocks dropAllLocks(false); + JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); ASSERT(globalExceptionString().isNull()); _object->_class->invoke(_object, ident, cArgs.data(), count, &resultVariant); moveGlobalExceptionToExecState(exec); @@ -156,7 +156,7 @@ JSValue CInstance::invokeDefaultMethod(ExecState* exec, const ArgList& args) NPVariant resultVariant; VOID_TO_NPVARIANT(resultVariant); { - JSLock::DropAllLocks dropAllLocks(false); + JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); ASSERT(globalExceptionString().isNull()); _object->_class->invokeDefault(_object, cArgs.data(), count, &resultVariant); moveGlobalExceptionToExecState(exec); @@ -191,7 +191,7 @@ JSValue CInstance::invokeConstruct(ExecState* exec, const ArgList& args) NPVariant resultVariant; VOID_TO_NPVARIANT(resultVariant); { - JSLock::DropAllLocks dropAllLocks(false); + JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); ASSERT(globalExceptionString().isNull()); _object->_class->construct(_object, cArgs.data(), count, &resultVariant); moveGlobalExceptionToExecState(exec); @@ -247,7 +247,7 @@ void CInstance::getPropertyNames(ExecState* exec, PropertyNameArray& nameArray) NPIdentifier* identifiers; { - JSLock::DropAllLocks dropAllLocks(false); + JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); ASSERT(globalExceptionString().isNull()); bool ok = _object->_class->enumerate(_object, &identifiers, &count); moveGlobalExceptionToExecState(exec); diff --git a/src/3rdparty/webkit/WebCore/bridge/c/c_runtime.cpp b/src/3rdparty/webkit/WebCore/bridge/c/c_runtime.cpp index 6beb86c6b..e9a7bb644 100644 --- a/src/3rdparty/webkit/WebCore/bridge/c/c_runtime.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/c/c_runtime.cpp @@ -47,7 +47,7 @@ JSValue CField::valueFromInstance(ExecState* exec, const Instance* inst) const bool result; { - JSLock::DropAllLocks dropAllLocks(false); + JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); result = obj->_class->getProperty(obj, _fieldIdentifier, &property); } if (result) { @@ -68,7 +68,7 @@ void CField::setValueToInstance(ExecState *exec, const Instance *inst, JSValue a convertValueToNPVariant(exec, aValue, &variant); { - JSLock::DropAllLocks dropAllLocks(false); + JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); obj->_class->setProperty(obj, _fieldIdentifier, &variant); } diff --git a/src/3rdparty/webkit/WebCore/bridge/c/c_utility.cpp b/src/3rdparty/webkit/WebCore/bridge/c/c_utility.cpp index 77b5de20b..7ff77e73d 100644 --- a/src/3rdparty/webkit/WebCore/bridge/c/c_utility.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/c/c_utility.cpp @@ -68,7 +68,7 @@ static String convertUTF8ToUTF16WithLatin1Fallback(const NPUTF8* UTF8Chars, int // Variant value must be released with NPReleaseVariantValue() void convertValueToNPVariant(ExecState* exec, JSValue value, NPVariant* result) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); VOID_TO_NPVARIANT(*result); @@ -107,7 +107,7 @@ void convertValueToNPVariant(ExecState* exec, JSValue value, NPVariant* result) JSValue convertNPVariantToValue(ExecState* exec, const NPVariant* variant, RootObject* rootObject) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); NPVariantType type = variant->type; diff --git a/src/3rdparty/webkit/WebCore/bridge/jni/jni_class.cpp b/src/3rdparty/webkit/WebCore/bridge/jni/jni_class.cpp index 87750aa2a..012b0476d 100644 --- a/src/3rdparty/webkit/WebCore/bridge/jni/jni_class.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/jni/jni_class.cpp @@ -60,7 +60,7 @@ JavaClass::JavaClass(jobject anInstance) jobject aJField = env->GetObjectArrayElement((jobjectArray)fields, i); JavaField *aField = new JavaField(env, aJField); // deleted in the JavaClass destructor { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); _fields.set(aField->name(), aField); } env->DeleteLocalRef(aJField); @@ -74,7 +74,7 @@ JavaClass::JavaClass(jobject anInstance) JavaMethod *aMethod = new JavaMethod(env, aJMethod); // deleted in the JavaClass destructor MethodList* methodList; { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); methodList = _methods.get(aMethod->name()); if (!methodList) { @@ -90,7 +90,7 @@ JavaClass::JavaClass(jobject anInstance) JavaClass::~JavaClass() { free((void *)_name); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); deleteAllValues(_fields); _fields.clear(); diff --git a/src/3rdparty/webkit/WebCore/bridge/jni/jni_instance.cpp b/src/3rdparty/webkit/WebCore/bridge/jni/jni_instance.cpp index 88d79efcb..2ef0c1da9 100644 --- a/src/3rdparty/webkit/WebCore/bridge/jni/jni_instance.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/jni/jni_instance.cpp @@ -82,7 +82,7 @@ Class *JavaInstance::getClass() const JSValue JavaInstance::stringValue(ExecState* exec) const { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); jstring stringValue = (jstring)callJNIMethod(_instance->_instance, "toString", "()Ljava/lang/String;"); JNIEnv *env = getJNIEnv(); diff --git a/src/3rdparty/webkit/WebCore/bridge/jni/jni_jsobject.mm b/src/3rdparty/webkit/WebCore/bridge/jni/jni_jsobject.mm index 32d7b0d25..c9af8b0cd 100644 --- a/src/3rdparty/webkit/WebCore/bridge/jni/jni_jsobject.mm +++ b/src/3rdparty/webkit/WebCore/bridge/jni/jni_jsobject.mm @@ -290,7 +290,7 @@ jobject JavaJSObject::call(jstring methodName, jobjectArray args) const // Lookup the function object. ExecState* exec = rootObject->globalObject()->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); Identifier identifier(exec, JavaString(methodName)); JSValue function = _imp->get(exec, identifier); @@ -315,7 +315,7 @@ jobject JavaJSObject::eval(jstring script) const JSValue result; - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); RootObject* rootObject = this->rootObject(); if (!rootObject) @@ -346,7 +346,7 @@ jobject JavaJSObject::getMember(jstring memberName) const ExecState* exec = rootObject->globalObject()->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSValue result = _imp->get(exec, Identifier(exec, JavaString(memberName))); return convertValueToJObject(result); @@ -362,7 +362,7 @@ void JavaJSObject::setMember(jstring memberName, jobject value) const ExecState* exec = rootObject->globalObject()->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); PutPropertySlot slot; _imp->put(exec, Identifier(exec, JavaString(memberName)), convertJObjectToValue(exec, value), slot); } @@ -377,7 +377,7 @@ void JavaJSObject::removeMember(jstring memberName) const return; ExecState* exec = rootObject->globalObject()->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); _imp->deleteProperty(exec, Identifier(exec, JavaString(memberName))); } @@ -396,7 +396,7 @@ jobject JavaJSObject::getSlot(jint index) const ExecState* exec = rootObject->globalObject()->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSValue result = _imp->get(exec, index); return convertValueToJObject(result); @@ -416,7 +416,7 @@ void JavaJSObject::setSlot(jint index, jobject value) const return; ExecState* exec = rootObject->globalObject()->globalExec(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); _imp->put(exec, (unsigned)index, convertJObjectToValue(exec, value)); } @@ -429,7 +429,7 @@ jstring JavaJSObject::toString() const if (!rootObject) return 0; - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSObject *thisObj = const_cast(_imp); ExecState* exec = rootObject->globalObject()->globalExec(); @@ -487,7 +487,7 @@ jlong JavaJSObject::createNative(jlong nativeHandle) jobject JavaJSObject::convertValueToJObject(JSValue value) const { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); RootObject* rootObject = this->rootObject(); if (!rootObject) @@ -600,7 +600,7 @@ JSValue JavaJSObject::convertJObjectToValue(ExecState* exec, jobject theObject) return imp; } - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); return JavaInstance::create(theObject, _rootObject)->createRuntimeObject(exec); } diff --git a/src/3rdparty/webkit/WebCore/bridge/jni/jni_objc.mm b/src/3rdparty/webkit/WebCore/bridge/jni/jni_objc.mm index 7c194423d..0306bfd11 100644 --- a/src/3rdparty/webkit/WebCore/bridge/jni/jni_objc.mm +++ b/src/3rdparty/webkit/WebCore/bridge/jni/jni_objc.mm @@ -61,7 +61,7 @@ bool JSC::Bindings::dispatchJNICall(ExecState* exec, const void* targetAppletVie // implemented in WebCore will guarantee that only appropriate JavaScript // can reference the applet. { - JSLock::DropAllLocks dropAllLocks(false); + JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); result = [view webPlugInCallJava:obj isStatic:isStatic returnType:returnType method:methodID arguments:args callingURL:nil exceptionDescription:&_exceptionDescription]; } @@ -71,7 +71,7 @@ bool JSC::Bindings::dispatchJNICall(ExecState* exec, const void* targetAppletVie return true; } else if ([view respondsToSelector:@selector(webPlugInCallJava:method:returnType:arguments:)]) { - JSLock::DropAllLocks dropAllLocks(false); + JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly); result = [view webPlugInCallJava:obj method:methodID returnType:returnType arguments:args]; return true; } diff --git a/src/3rdparty/webkit/WebCore/bridge/jni/jni_runtime.cpp b/src/3rdparty/webkit/WebCore/bridge/jni/jni_runtime.cpp index 3cbe8cfdb..cc4803741 100644 --- a/src/3rdparty/webkit/WebCore/bridge/jni/jni_runtime.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/jni/jni_runtime.cpp @@ -316,7 +316,7 @@ static void appendClassName(UString& aString, const char* className) const char *JavaMethod::signature() const { if (!_signature) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); UString signatureBuilder("("); for (int i = 0; i < _numParameters; i++) { diff --git a/src/3rdparty/webkit/WebCore/bridge/jni/jni_runtime.h b/src/3rdparty/webkit/WebCore/bridge/jni/jni_runtime.h index f3cbf2bce..81484ff37 100644 --- a/src/3rdparty/webkit/WebCore/bridge/jni/jni_runtime.h +++ b/src/3rdparty/webkit/WebCore/bridge/jni/jni_runtime.h @@ -46,7 +46,7 @@ class JavaString public: JavaString() { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); _rep = UString().rep(); } @@ -55,7 +55,7 @@ public: int _size = e->GetStringLength (s); const jchar *uc = getUCharactersFromJStringInEnv (e, s); { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); _rep = UString(reinterpret_cast(uc), _size).rep(); } releaseUCharactersForJStringInEnv (e, s, uc); @@ -71,13 +71,13 @@ public: ~JavaString() { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); _rep = 0; } const char *UTF8String() const { if (_utf8String.c_str() == 0) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); _utf8String = UString(_rep).UTF8String(); } return _utf8String.c_str(); diff --git a/src/3rdparty/webkit/WebCore/bridge/jni/jni_utility.cpp b/src/3rdparty/webkit/WebCore/bridge/jni/jni_utility.cpp index f8a27893a..86075c933 100644 --- a/src/3rdparty/webkit/WebCore/bridge/jni/jni_utility.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/jni/jni_utility.cpp @@ -470,7 +470,7 @@ static jobject convertArrayInstanceToJavaArray(ExecState* exec, JSArray* jsArray jvalue convertValueToJValue(ExecState* exec, JSValue value, JNIType _JNIType, const char* javaClassName) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); jvalue result; diff --git a/src/3rdparty/webkit/WebCore/bridge/npapi.h b/src/3rdparty/webkit/WebCore/bridge/npapi.h index 1904a8709..003e67a57 100644 --- a/src/3rdparty/webkit/WebCore/bridge/npapi.h +++ b/src/3rdparty/webkit/WebCore/bridge/npapi.h @@ -341,8 +341,6 @@ typedef enum { */ NPPVpluginWantsAllNetworkStreams = 18, - NPPVpluginPrivateModeBool = 19, - /* Checks to see if the plug-in would like the browser to load the "src" attribute. */ NPPVpluginCancelSrcStream = 20, diff --git a/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp b/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp index 3ea8bcfda..506697a5a 100644 --- a/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp @@ -91,7 +91,7 @@ void QtRuntimeObjectImp::invalidate() void QtRuntimeObjectImp::removeFromCache() { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); QtInstance* key = cachedObjects.key(this); if (key) cachedObjects.remove(key); @@ -110,7 +110,7 @@ QtInstance::QtInstance(QObject* o, PassRefPtr rootObject, QScriptEng QtInstance::~QtInstance() { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); cachedObjects.remove(this); cachedInstances.remove(m_hashkey); @@ -118,9 +118,7 @@ QtInstance::~QtInstance() // clean up (unprotect from gc) the JSValues we've created m_methods.clear(); - foreach(QtField* f, m_fields.values()) { - delete f; - } + qDeleteAll(m_fields); m_fields.clear(); if (m_object) { @@ -140,7 +138,7 @@ QtInstance::~QtInstance() PassRefPtr QtInstance::getQtInstance(QObject* o, PassRefPtr rootObject, QScriptEngine::ValueOwnership ownership) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); foreach(QtInstance* instance, cachedInstances.values(o)) { if (instance->rootObject() == rootObject) @@ -163,6 +161,19 @@ void QtInstance::put(JSObject* object, ExecState* exec, const Identifier& proper object->JSObject::put(exec, propertyName, value, slot); } +void QtInstance::removeCachedMethod(JSObject* method) +{ + if (m_defaultMethod == method) + m_defaultMethod = 0; + + for(QHash::Iterator it = m_methods.begin(), + end = m_methods.end(); it != end; ++it) + if (it.value() == method) { + m_methods.erase(it); + return; + } +} + QtInstance* QtInstance::getInstance(JSObject* object) { if (!object) @@ -181,7 +192,7 @@ Class* QtInstance::getClass() const RuntimeObjectImp* QtInstance::createRuntimeObject(ExecState* exec) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); RuntimeObjectImp* ret = static_cast(cachedObjects.value(this)); if (!ret) { ret = new (exec) QtRuntimeObjectImp(exec, this); @@ -193,16 +204,12 @@ RuntimeObjectImp* QtInstance::createRuntimeObject(ExecState* exec) void QtInstance::mark() { - if (m_defaultMethod) + if (m_defaultMethod && !m_defaultMethod->marked()) m_defaultMethod->mark(); foreach(JSObject* val, m_methods.values()) { if (val && !val->marked()) val->mark(); } - foreach(JSValue val, m_children.values()) { - if (val && !val.marked()) - val.mark(); - } } void QtInstance::begin() @@ -355,13 +362,7 @@ JSValue QtField::valueFromInstance(ExecState* exec, const Instance* inst) const else if (m_type == DynamicProperty) val = obj->property(m_dynamicProperty); - JSValue ret = convertQVariantToValue(exec, inst->rootObject(), val); - - // Need to save children so we can mark them - if (m_type == ChildObject) - instance->m_children.insert(ret); - - return ret; + return convertQVariantToValue(exec, inst->rootObject(), val); } else { QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg(QLatin1String(name())); return throwError(exec, GeneralError, msg.toLatin1().constData()); diff --git a/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h b/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h index 590fadfd3..23766b138 100644 --- a/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h +++ b/src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h @@ -65,6 +65,8 @@ public: virtual bool getOwnPropertySlot(JSObject*, ExecState*, const Identifier&, PropertySlot&); virtual void put(JSObject*, ExecState*, const Identifier&, JSValue, PutPropertySlot&); + void removeCachedMethod(JSObject*); + static QtInstance* getInstance(JSObject*); private: @@ -81,7 +83,6 @@ private: QObject* m_hashkey; mutable QHash m_methods; mutable QHash m_fields; - mutable QSet m_children; mutable QtRuntimeMetaMethod* m_defaultMethod; QScriptEngine::ValueOwnership m_ownership; }; diff --git a/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp b/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp index aabd67704..6be119ced 100644 --- a/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp @@ -167,7 +167,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type return QVariant(); } - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSRealType type = valueRealType(exec, value); if (hint == QMetaType::Void) { switch(type) { @@ -770,7 +770,7 @@ JSValue convertQVariantToValue(ExecState* exec, PassRefPtr root, con return jsNull(); } - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); if (type == QMetaType::Bool) return jsBoolean(variant.toBool()); @@ -916,6 +916,8 @@ QtRuntimeMethod::QtRuntimeMethod(QtRuntimeMethodData* dd, ExecState* exec, const QtRuntimeMethod::~QtRuntimeMethod() { + QW_D(QtRuntimeMethod); + d->m_instance->removeCachedMethod(this); delete d_ptr; } @@ -1345,7 +1347,7 @@ JSValue QtRuntimeMetaMethod::call(ExecState* exec, JSObject* functionObject, JSV return jsUndefined(); // We have to pick a method that matches.. - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); QObject *obj = d->m_instance->getObject(); if (obj) { @@ -1438,7 +1440,7 @@ JSValue QtRuntimeConnectionMethod::call(ExecState* exec, JSObject* functionObjec { QtRuntimeConnectionMethodData* d = static_cast(functionObject)->d_func(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); QObject* sender = d->m_instance->getObject(); @@ -1668,7 +1670,7 @@ void QtConnectionObject::execute(void **argv) int argc = parameterTypes.count(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); // ### Should the Interpreter/ExecState come from somewhere else? RefPtr ro = m_instance->rootObject(); diff --git a/src/3rdparty/webkit/WebCore/bridge/runtime.cpp b/src/3rdparty/webkit/WebCore/bridge/runtime.cpp index d6b69621a..693440664 100644 --- a/src/3rdparty/webkit/WebCore/bridge/runtime.cpp +++ b/src/3rdparty/webkit/WebCore/bridge/runtime.cpp @@ -80,7 +80,7 @@ void Instance::end() RuntimeObjectImp* Instance::createRuntimeObject(ExecState* exec) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); return new (exec) RuntimeObjectImp(exec, this); } diff --git a/src/3rdparty/webkit/WebCore/bridge/runtime.h b/src/3rdparty/webkit/WebCore/bridge/runtime.h index 72736d4f3..2f74a4e03 100644 --- a/src/3rdparty/webkit/WebCore/bridge/runtime.h +++ b/src/3rdparty/webkit/WebCore/bridge/runtime.h @@ -55,14 +55,14 @@ public: virtual ~Field() { } }; -class Method : Noncopyable { +class Method : public Noncopyable { public: virtual int numParameters() const = 0; virtual ~Method() { } }; -class Class : Noncopyable { +class Class : public Noncopyable { public: virtual MethodList methodsNamed(const Identifier&, Instance*) const = 0; virtual Field* fieldNamed(const Identifier&, Instance*) const = 0; @@ -120,7 +120,7 @@ protected: RefPtr _rootObject; }; -class Array : Noncopyable { +class Array : public Noncopyable { public: Array(PassRefPtr); virtual ~Array(); diff --git a/src/3rdparty/webkit/WebCore/config.h b/src/3rdparty/webkit/WebCore/config.h index 0700adfa6..411ddb10d 100644 --- a/src/3rdparty/webkit/WebCore/config.h +++ b/src/3rdparty/webkit/WebCore/config.h @@ -107,9 +107,20 @@ #endif #if PLATFORM(WIN) +#if defined(WIN_CAIRO) +#undef WTF_PLATFORM_CG +#define WTF_PLATFORM_CAIRO 1 +#undef WTF_USE_CFNETWORK +#define WTF_USE_CURL 1 +#ifndef _WINSOCKAPI_ +#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h +#endif +#else #define WTF_PLATFORM_CG 1 #undef WTF_PLATFORM_CAIRO #define WTF_USE_CFNETWORK 1 +#undef WTF_USE_CURL +#endif #undef WTF_USE_WININET #define WTF_PLATFORM_CF 1 #define WTF_USE_PTHREADS 0 diff --git a/src/3rdparty/webkit/WebCore/css/CSSComputedStyleDeclaration.cpp b/src/3rdparty/webkit/WebCore/css/CSSComputedStyleDeclaration.cpp index b721f7015..476ed1e50 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSComputedStyleDeclaration.cpp +++ b/src/3rdparty/webkit/WebCore/css/CSSComputedStyleDeclaration.cpp @@ -52,8 +52,10 @@ namespace WebCore { // List of all properties we know how to compute, omitting shorthands. static const int computedProperties[] = { CSSPropertyBackgroundAttachment, + CSSPropertyBackgroundClip, CSSPropertyBackgroundColor, CSSPropertyBackgroundImage, + CSSPropertyBackgroundOrigin, CSSPropertyBackgroundPosition, // more-specific background-position-x/y are non-standard CSSPropertyBackgroundRepeat, CSSPropertyBorderBottomColor, @@ -70,6 +72,7 @@ static const int computedProperties[] = { CSSPropertyBorderTopStyle, CSSPropertyBorderTopWidth, CSSPropertyBottom, + CSSPropertyBoxShadow, CSSPropertyCaptionSide, CSSPropertyClear, CSSPropertyClip, @@ -122,6 +125,7 @@ static const int computedProperties[] = { CSSPropertyTextDecoration, CSSPropertyTextIndent, CSSPropertyTextShadow, + CSSPropertyTextOverflow, CSSPropertyTextTransform, CSSPropertyTop, CSSPropertyUnicodeBidi, @@ -165,7 +169,6 @@ static const int computedProperties[] = { CSSPropertyWebkitBoxOrient, CSSPropertyWebkitBoxPack, CSSPropertyWebkitBoxReflect, - CSSPropertyWebkitBoxShadow, CSSPropertyWebkitBoxSizing, CSSPropertyWebkitColumnBreakAfter, CSSPropertyWebkitColumnBreakBefore, @@ -261,7 +264,7 @@ static const int computedProperties[] = { const unsigned numComputedProperties = sizeof(computedProperties) / sizeof(computedProperties[0]); -static PassRefPtr valueForShadow(const ShadowData* shadow) +static PassRefPtr valueForShadow(const ShadowData* shadow, CSSPropertyID propertyID) { if (!shadow) return CSSPrimitiveValue::createIdentifier(CSSValueNone); @@ -271,8 +274,10 @@ static PassRefPtr valueForShadow(const ShadowData* shadow) RefPtr x = CSSPrimitiveValue::create(s->x, CSSPrimitiveValue::CSS_PX); RefPtr y = CSSPrimitiveValue::create(s->y, CSSPrimitiveValue::CSS_PX); RefPtr blur = CSSPrimitiveValue::create(s->blur, CSSPrimitiveValue::CSS_PX); + RefPtr spread = propertyID == CSSPropertyTextShadow ? 0 : CSSPrimitiveValue::create(s->spread, CSSPrimitiveValue::CSS_PX); + RefPtr style = propertyID == CSSPropertyTextShadow || s->style == Normal ? 0 : CSSPrimitiveValue::createIdentifier(CSSValueInset); RefPtr color = CSSPrimitiveValue::createColor(s->color.rgb()); - list->prepend(ShadowValue::create(x.release(), y.release(), blur.release(), color.release())); + list->prepend(ShadowValue::create(x.release(), y.release(), blur.release(), spread.release(), style.release(), color.release())); } return list.release(); } @@ -596,6 +601,23 @@ static PassRefPtr valueForFamily(const AtomicString& family) return CSSPrimitiveValue::create(family.string(), CSSPrimitiveValue::CSS_STRING); } +static PassRefPtr renderTextDecorationFlagsToCSSValue(int textDecoration) +{ + RefPtr list = CSSValueList::createSpaceSeparated(); + if (textDecoration & UNDERLINE) + list->append(CSSPrimitiveValue::createIdentifier(CSSValueUnderline)); + if (textDecoration & OVERLINE) + list->append(CSSPrimitiveValue::createIdentifier(CSSValueOverline)); + if (textDecoration & LINE_THROUGH) + list->append(CSSPrimitiveValue::createIdentifier(CSSValueLineThrough)); + if (textDecoration & BLINK) + list->append(CSSPrimitiveValue::createIdentifier(CSSValueBlink)); + + if (!list->length()) + return CSSPrimitiveValue::createIdentifier(CSSValueNone); + return list; +} + PassRefPtr CSSComputedStyleDeclaration::getPropertyCSSValue(int propertyID, EUpdateLayout updateLayout) const { Node* node = m_node.get(); @@ -637,12 +659,12 @@ PassRefPtr CSSComputedStyleDeclaration::getPropertyCSSValue(int proper case CSSPropertyWebkitBackgroundComposite: return CSSPrimitiveValue::create(style->backgroundComposite()); case CSSPropertyBackgroundAttachment: - if (style->backgroundAttachment()) - return CSSPrimitiveValue::createIdentifier(CSSValueScroll); - return CSSPrimitiveValue::createIdentifier(CSSValueFixed); + return CSSPrimitiveValue::create(style->backgroundAttachment()); + case CSSPropertyBackgroundClip: + case CSSPropertyBackgroundOrigin: case CSSPropertyWebkitBackgroundClip: case CSSPropertyWebkitBackgroundOrigin: { - EFillBox box = (propertyID == CSSPropertyWebkitBackgroundClip ? style->backgroundClip() : style->backgroundOrigin()); + EFillBox box = (propertyID == CSSPropertyWebkitBackgroundClip || propertyID == CSSPropertyBackgroundClip) ? style->backgroundClip() : style->backgroundOrigin(); return CSSPrimitiveValue::create(box); } case CSSPropertyBackgroundPosition: { @@ -721,8 +743,8 @@ PassRefPtr CSSComputedStyleDeclaration::getPropertyCSSValue(int proper } case CSSPropertyWebkitBoxReflect: return valueForReflection(style->boxReflect()); - case CSSPropertyWebkitBoxShadow: - return valueForShadow(style->boxShadow()); + case CSSPropertyBoxShadow: + return valueForShadow(style->boxShadow(), static_cast(propertyID)); case CSSPropertyCaptionSide: return CSSPrimitiveValue::create(style->captionSide()); case CSSPropertyClear: @@ -905,9 +927,7 @@ PassRefPtr CSSComputedStyleDeclaration::getPropertyCSSValue(int proper case CSSPropertyWebkitMaskRepeat: return CSSPrimitiveValue::create(style->maskRepeat()); case CSSPropertyWebkitMaskAttachment: - if (style->maskAttachment()) - return CSSPrimitiveValue::createIdentifier(CSSValueScroll); - return CSSPrimitiveValue::createIdentifier(CSSValueFixed); + return CSSPrimitiveValue::create(style->maskAttachment()); case CSSPropertyWebkitMaskComposite: return CSSPrimitiveValue::create(style->maskComposite()); case CSSPropertyWebkitMaskClip: @@ -998,58 +1018,20 @@ PassRefPtr CSSComputedStyleDeclaration::getPropertyCSSValue(int proper return CSSPrimitiveValue::create(style->tableLayout()); case CSSPropertyTextAlign: return CSSPrimitiveValue::create(style->textAlign()); - case CSSPropertyTextDecoration: { - String string; - if (style->textDecoration() & UNDERLINE) - string += "underline"; - if (style->textDecoration() & OVERLINE) { - if (string.length()) - string += " "; - string += "overline"; - } - if (style->textDecoration() & LINE_THROUGH) { - if (string.length()) - string += " "; - string += "line-through"; - } - if (style->textDecoration() & BLINK) { - if (string.length()) - string += " "; - string += "blink"; - } - if (!string.length()) - return CSSPrimitiveValue::createIdentifier(CSSValueNone); - return CSSPrimitiveValue::create(string, CSSPrimitiveValue::CSS_STRING); - } - case CSSPropertyWebkitTextDecorationsInEffect: { - String string; - if (style->textDecorationsInEffect() & UNDERLINE) - string += "underline"; - if (style->textDecorationsInEffect() & OVERLINE) { - if (string.length()) - string += " "; - string += "overline"; - } - if (style->textDecorationsInEffect() & LINE_THROUGH) { - if (string.length()) - string += " "; - string += "line-through"; - } - if (style->textDecorationsInEffect() & BLINK) { - if (string.length()) - string += " "; - string += "blink"; - } - if (!string.length()) - return CSSPrimitiveValue::createIdentifier(CSSValueNone); - return CSSPrimitiveValue::create(string, CSSPrimitiveValue::CSS_STRING); - } + case CSSPropertyTextDecoration: + return renderTextDecorationFlagsToCSSValue(style->textDecoration()); + case CSSPropertyWebkitTextDecorationsInEffect: + return renderTextDecorationFlagsToCSSValue(style->textDecorationsInEffect()); case CSSPropertyWebkitTextFillColor: return currentColorOrValidColor(style.get(), style->textFillColor()); case CSSPropertyTextIndent: return CSSPrimitiveValue::create(style->textIndent()); case CSSPropertyTextShadow: - return valueForShadow(style->textShadow()); + return valueForShadow(style->textShadow(), static_cast(propertyID)); + case CSSPropertyTextOverflow: + if (style->textOverflow()) + return CSSPrimitiveValue::createIdentifier(CSSValueEllipsis); + return CSSPrimitiveValue::createIdentifier(CSSValueClip); case CSSPropertyWebkitTextSecurity: return CSSPrimitiveValue::create(style->textSecurity()); case CSSPropertyWebkitTextSizeAdjust: @@ -1331,7 +1313,6 @@ PassRefPtr CSSComputedStyleDeclaration::getPropertyCSSValue(int proper case CSSPropertyTextLineThroughMode: case CSSPropertyTextLineThroughStyle: case CSSPropertyTextLineThroughWidth: - case CSSPropertyTextOverflow: case CSSPropertyTextOverline: case CSSPropertyTextOverlineColor: case CSSPropertyTextOverlineMode: @@ -1471,11 +1452,6 @@ static const int inheritableProperties[] = { static const unsigned numInheritableProperties = sizeof(inheritableProperties) / sizeof(inheritableProperties[0]); -void CSSComputedStyleDeclaration::removeComputedInheritablePropertiesFrom(CSSMutableStyleDeclaration* declaration) -{ - declaration->removePropertiesInSet(inheritableProperties, numInheritableProperties); -} - bool CSSComputedStyleDeclaration::cssPropertyMatches(const CSSProperty* property) const { if (property->id() == CSSPropertyFontSize && property->value()->isPrimitiveValue() && m_node) { @@ -1492,7 +1468,11 @@ bool CSSComputedStyleDeclaration::cssPropertyMatches(const CSSProperty* property return CSSStyleDeclaration::cssPropertyMatches(property); } -PassRefPtr CSSComputedStyleDeclaration::copyInheritableProperties() const +// FIXME: deprecatedCopyInheritableProperties is used for two purposes: +// 1. Calculating the typing style. +// 2. Moving HTML subtrees and seeking to remove redundant styles. +// These tasks should be broken out into two separate functions. New code should not use this function. +PassRefPtr CSSComputedStyleDeclaration::deprecatedCopyInheritableProperties() const { RefPtr style = copyPropertiesInSet(inheritableProperties, numInheritableProperties); if (style && m_node && m_node->computedStyle()) { diff --git a/src/3rdparty/webkit/WebCore/css/CSSComputedStyleDeclaration.h b/src/3rdparty/webkit/WebCore/css/CSSComputedStyleDeclaration.h index 6f81b0ebd..5d3ccc198 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSComputedStyleDeclaration.h +++ b/src/3rdparty/webkit/WebCore/css/CSSComputedStyleDeclaration.h @@ -55,10 +55,7 @@ public: PassRefPtr getSVGPropertyCSSValue(int propertyID, EUpdateLayout) const; #endif - PassRefPtr copyInheritableProperties() const; - - static void removeComputedInheritablePropertiesFrom(CSSMutableStyleDeclaration*); - + PassRefPtr deprecatedCopyInheritableProperties() const; protected: virtual bool cssPropertyMatches(const CSSProperty*) const; diff --git a/src/3rdparty/webkit/WebCore/css/CSSFunctionValue.cpp b/src/3rdparty/webkit/WebCore/css/CSSFunctionValue.cpp index cb938ed25..0fc260dbb 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSFunctionValue.cpp +++ b/src/3rdparty/webkit/WebCore/css/CSSFunctionValue.cpp @@ -53,6 +53,7 @@ CSSParserValue CSSFunctionValue::parserValue() const { CSSParserValue val; val.id = 0; + val.isInt = false; val.unit = CSSParserValue::Function; val.function = new CSSParserFunction; val.function->name.characters = const_cast(m_name.characters()); diff --git a/src/3rdparty/webkit/WebCore/css/CSSGrammar.y b/src/3rdparty/webkit/WebCore/css/CSSGrammar.y index 4706521aa..22c7014c4 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSGrammar.y +++ b/src/3rdparty/webkit/WebCore/css/CSSGrammar.y @@ -36,12 +36,16 @@ #include "MediaList.h" #include "WebKitCSSKeyframeRule.h" #include "WebKitCSSKeyframesRule.h" +#include #include #include using namespace WebCore; using namespace HTMLNames; +#define YYMALLOC fastMalloc +#define YYFREE fastFree + #define YYENABLE_NLS 0 #define YYLTYPE_IS_TRIVIAL 1 #define YYMAXDEPTH 10000 @@ -93,7 +97,7 @@ static int cssyylex(YYSTYPE* yylval, void* parser) %} -%expect 49 +%expect 50 %nonassoc LOWEST_PREC @@ -145,6 +149,7 @@ static int cssyylex(YYSTYPE* yylval, void* parser) %token MEDIA_NOT %token MEDIA_AND +%token REMS %token QEMS %token EMS %token EXS @@ -1407,7 +1412,15 @@ unary_term: | EMS maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_EMS; } | QEMS maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSParserValue::Q_EMS; } | EXS maybe_space { $$.id = 0; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_EXS; } - ; + | REMS maybe_space { + $$.id = 0; + $$.fValue = $1; + $$.unit = CSSPrimitiveValue::CSS_REMS; + CSSParser* p = static_cast(parser); + if (Document* doc = p->document()) + doc->setUsesRemUnits(true); + } + ; variable_reference: VARCALL { diff --git a/src/3rdparty/webkit/WebCore/css/CSSHelper.cpp b/src/3rdparty/webkit/WebCore/css/CSSHelper.cpp index aa1186cca..8e6f3a0df 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSHelper.cpp +++ b/src/3rdparty/webkit/WebCore/css/CSSHelper.cpp @@ -27,7 +27,7 @@ namespace WebCore { -String parseURL(const String& url) +String deprecatedParseURL(const String& url) { StringImpl* i = url.impl(); if (!i) diff --git a/src/3rdparty/webkit/WebCore/css/CSSHelper.h b/src/3rdparty/webkit/WebCore/css/CSSHelper.h index 7f32d88f3..2e3337720 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSHelper.h +++ b/src/3rdparty/webkit/WebCore/css/CSSHelper.h @@ -1,7 +1,6 @@ /* - * This file is part of the CSS implementation for KDE. - * * Copyright (C) 1999 Lars Knoll (knoll@kde.org) + * Copyright (C) 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -27,15 +26,17 @@ namespace WebCore { class String; - /* - * mostly just removes the url("...") brace - */ - String parseURL(const String& url); + // Used in many inappropriate contexts throughout WebCore. We'll have to examine and test + // each call site to find out whether it needs the various things this function does. That + // includes trimming leading and trailing control characters (including whitespace), removing + // url() or URL() if it surrounds the entire string, removing matching quote marks if present, + // and stripping all characters in the range U+0000-U+000C. Probably no caller needs this. + String deprecatedParseURL(const String&); // We always assume 96 CSS pixels in a CSS inch. This is the cold hard truth of the Web. // At high DPI, we may scale a CSS pixel, but the ratio of the CSS pixel to the so-called // "absolute" CSS length units like inch and pt is always fixed and never changes. - const float cssPixelsPerInch = 96.0f; + const float cssPixelsPerInch = 96; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/css/CSSMutableStyleDeclaration.cpp b/src/3rdparty/webkit/WebCore/css/CSSMutableStyleDeclaration.cpp index 67b7da177..8ff5300d4 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSMutableStyleDeclaration.cpp +++ b/src/3rdparty/webkit/WebCore/css/CSSMutableStyleDeclaration.cpp @@ -116,8 +116,8 @@ String CSSMutableStyleDeclaration::getPropertyValue(int propertyID) const } case CSSPropertyBackground: { const int properties[7] = { CSSPropertyBackgroundImage, CSSPropertyBackgroundRepeat, - CSSPropertyBackgroundAttachment, CSSPropertyBackgroundPosition, CSSPropertyWebkitBackgroundClip, - CSSPropertyWebkitBackgroundOrigin, CSSPropertyBackgroundColor }; + CSSPropertyBackgroundAttachment, CSSPropertyBackgroundPosition, CSSPropertyBackgroundClip, + CSSPropertyBackgroundOrigin, CSSPropertyBackgroundColor }; return getLayeredShorthandValue(properties, 7); } case CSSPropertyBorder: { diff --git a/src/3rdparty/webkit/WebCore/css/CSSParser.cpp b/src/3rdparty/webkit/WebCore/css/CSSParser.cpp index b49b64641..411379e1c 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSParser.cpp +++ b/src/3rdparty/webkit/WebCore/css/CSSParser.cpp @@ -1,7 +1,7 @@ /* * Copyright (C) 2003 Lars Knoll (knoll@kde.org) * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) - * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. * Copyright (C) 2007 Nicholas Shanks * Copyright (C) 2008 Eric Seidel * @@ -283,7 +283,7 @@ bool CSSParser::parseColor(RGBA32& color, const String& string, bool strict) CSSValue* value = parser.m_parsedProperties[0]->value(); if (value->cssValueType() == CSSValue::CSS_PRIMITIVE_VALUE) { CSSPrimitiveValue* primitiveValue = static_cast(value); - color = primitiveValue->getRGBColorValue(); + color = primitiveValue->getRGBA32Value(); } } else return false; @@ -424,6 +424,7 @@ bool CSSParser::validUnit(CSSParserValue* value, Units unitflags, bool strict) break; case CSSParserValue::Q_EMS: case CSSPrimitiveValue::CSS_EMS: + case CSSPrimitiveValue::CSS_REMS: case CSSPrimitiveValue::CSS_EXS: case CSSPrimitiveValue::CSS_PX: case CSSPrimitiveValue::CSS_CM: @@ -459,6 +460,8 @@ static int unitFromString(CSSParserValue* value) if (equal(value->string, "em")) return CSSPrimitiveValue::CSS_EMS; + if (equal(value->string, "rem")) + return CSSPrimitiveValue::CSS_REMS; if (equal(value->string, "ex")) return CSSPrimitiveValue::CSS_EXS; if (equal(value->string, "px")) @@ -810,7 +813,7 @@ bool CSSParser::parseValue(int propId, bool important) while (value && value->unit == CSSPrimitiveValue::CSS_URI) { if (!list) list = CSSValueList::createCommaSeparated(); - String uri = parseURL(value->string); + String uri = value->string; Vector coords; value = m_valueList->next(); while (value && value->unit == CSSPrimitiveValue::CSS_NUMBER) { @@ -819,15 +822,17 @@ bool CSSParser::parseValue(int propId, bool important) } IntPoint hotspot; int nrcoords = coords.size(); - if (nrcoords > 0 && nrcoords != 2) { - if (m_strict) // only support hotspot pairs in strict mode - return false; - } else if (m_strict && nrcoords == 2) + if (nrcoords > 0 && nrcoords != 2) + return false; + if (nrcoords == 2) hotspot = IntPoint(coords[0], coords[1]); - if (m_strict || coords.size() == 0) { - if (!uri.isNull() && m_styleSheet) - list->append(CSSCursorImageValue::create(m_styleSheet->completeURL(uri), hotspot)); + + if (!uri.isNull() && m_styleSheet) { + // FIXME: The completeURL call should be done when using the CSSCursorImageValue, + // not when creating it. + list->append(CSSCursorImageValue::create(m_styleSheet->completeURL(uri), hotspot)); } + if ((m_strict && !value) || (value && !(value->unit == CSSParserValue::Operator && value->iValue == ','))) return false; value = m_valueList->next(); // comma @@ -854,9 +859,11 @@ bool CSSParser::parseValue(int propId, bool important) } case CSSPropertyBackgroundAttachment: + case CSSPropertyBackgroundClip: case CSSPropertyWebkitBackgroundClip: case CSSPropertyWebkitBackgroundComposite: case CSSPropertyBackgroundImage: + case CSSPropertyBackgroundOrigin: case CSSPropertyWebkitBackgroundOrigin: case CSSPropertyBackgroundPosition: case CSSPropertyBackgroundPositionX: @@ -889,10 +896,10 @@ bool CSSParser::parseValue(int propId, bool important) parsedValue = CSSImageValue::create(); m_valueList->next(); } else if (value->unit == CSSPrimitiveValue::CSS_URI) { - // ### allow string in non strict mode? - String uri = parseURL(value->string); - if (!uri.isNull() && m_styleSheet) { - parsedValue = CSSImageValue::create(m_styleSheet->completeURL(uri)); + if (m_styleSheet) { + // FIXME: The completeURL call should be done when using the CSSImageValue, + // not when creating it. + parsedValue = CSSImageValue::create(m_styleSheet->completeURL(value->string)); m_valueList->next(); } } else if (value->unit == CSSParserValue::Function && equalIgnoringCase(value->function->name, "-webkit-gradient(")) { @@ -1047,7 +1054,7 @@ bool CSSParser::parseValue(int propId, bool important) if (id == CSSValueNone) { valid_primitive = true; } else { - RefPtr list = CSSValueList::createCommaSeparated(); + RefPtr list = CSSValueList::createSpaceSeparated(); bool is_valid = true; while (is_valid && value) { switch (value->id) { @@ -1104,8 +1111,9 @@ bool CSSParser::parseValue(int propId, bool important) RefPtr parsedValue; while ((val = m_valueList->current())) { if (val->unit == CSSPrimitiveValue::CSS_URI && m_styleSheet) { - String value = parseURL(val->string); - parsedValue = CSSPrimitiveValue::create(m_styleSheet->completeURL(value), CSSPrimitiveValue::CSS_URI); + // FIXME: The completeURL call should be done when using the CSSPrimitiveValue, + // not when creating it. + parsedValue = CSSPrimitiveValue::create(m_styleSheet->completeURL(val->string), CSSPrimitiveValue::CSS_URI); } if (!parsedValue) break; @@ -1177,7 +1185,7 @@ bool CSSParser::parseValue(int propId, bool important) valid_primitive = validUnit(value, FLength, m_strict); break; case CSSPropertyTextShadow: // CSS2 property, dropped in CSS2.1, back in CSS3, so treat as CSS3 - case CSSPropertyWebkitBoxShadow: + case CSSPropertyBoxShadow: if (id == CSSValueNone) valid_primitive = true; else @@ -1501,15 +1509,15 @@ bool CSSParser::parseValue(int propId, bool important) // in quirks mode but it's usually the X coordinate of a position. // FIXME: Add CSSPropertyWebkitBackgroundSize to the shorthand. const int properties[] = { CSSPropertyBackgroundImage, CSSPropertyBackgroundRepeat, - CSSPropertyBackgroundAttachment, CSSPropertyBackgroundPosition, CSSPropertyWebkitBackgroundClip, - CSSPropertyWebkitBackgroundOrigin, CSSPropertyBackgroundColor }; - return parseFillShorthand(propId, properties, 7, important); + CSSPropertyBackgroundAttachment, CSSPropertyBackgroundPosition, CSSPropertyBackgroundOrigin, + CSSPropertyBackgroundColor }; + return parseFillShorthand(propId, properties, 6, important); } case CSSPropertyWebkitMask: { const int properties[] = { CSSPropertyWebkitMaskImage, CSSPropertyWebkitMaskRepeat, - CSSPropertyWebkitMaskAttachment, CSSPropertyWebkitMaskPosition, CSSPropertyWebkitMaskClip, + CSSPropertyWebkitMaskAttachment, CSSPropertyWebkitMaskPosition, CSSPropertyWebkitMaskOrigin }; - return parseFillShorthand(propId, properties, 6, important); + return parseFillShorthand(propId, properties, 5, important); } case CSSPropertyBorder: // [ 'border-width' || 'border-style' || ] | inherit @@ -1641,6 +1649,8 @@ bool CSSParser::parseValue(int propId, bool important) parsedValue = CSSPrimitiveValue::create(value->string, (CSSPrimitiveValue::UnitTypes) value->unit); else if (value->unit >= CSSPrimitiveValue::CSS_NUMBER && value->unit <= CSSPrimitiveValue::CSS_KHZ) parsedValue = CSSPrimitiveValue::create(value->fValue, (CSSPrimitiveValue::UnitTypes) value->unit); + else if (value->unit >= CSSPrimitiveValue::CSS_TURN && value->unit <= CSSPrimitiveValue::CSS_REMS) + parsedValue = CSSPrimitiveValue::create(value->fValue, (CSSPrimitiveValue::UnitTypes) value->unit); else if (value->unit >= CSSParserValue::Q_EMS) parsedValue = CSSQuirkPrimitiveValue::create(value->fValue, CSSPrimitiveValue::CSS_EMS); m_valueList->next(); @@ -1683,6 +1693,7 @@ bool CSSParser::parseFillShorthand(int propId, const int* properties, int numPro bool parsedProperty[cMaxFillProperties] = { false }; RefPtr values[cMaxFillProperties]; + RefPtr clipValue; RefPtr positionYValue; int i; @@ -1701,6 +1712,10 @@ bool CSSParser::parseFillShorthand(int propId, const int* properties, int numPro addFillValue(values[i], CSSInitialValue::createImplicit()); if (properties[i] == CSSPropertyBackgroundPosition || properties[i] == CSSPropertyWebkitMaskPosition) addFillValue(positionYValue, CSSInitialValue::createImplicit()); + if ((properties[i] == CSSPropertyBackgroundOrigin || properties[i] == CSSPropertyWebkitMaskOrigin) && !parsedProperty[i]) { + // If background-origin wasn't present, then reset background-clip also. + addFillValue(clipValue, CSSInitialValue::createImplicit()); + } } parsedProperty[i] = false; } @@ -1719,6 +1734,13 @@ bool CSSParser::parseFillShorthand(int propId, const int* properties, int numPro addFillValue(values[i], val1.release()); if (properties[i] == CSSPropertyBackgroundPosition || properties[i] == CSSPropertyWebkitMaskPosition) addFillValue(positionYValue, val2.release()); + if (properties[i] == CSSPropertyBackgroundOrigin || properties[i] == CSSPropertyWebkitMaskOrigin) { + // Reparse the value as a clip, and see if we succeed. + if (parseFillProperty(CSSPropertyBackgroundClip, propId1, propId2, val1, val2)) + addFillValue(clipValue, val1.release()); // The property parsed successfully. + else + addFillValue(clipValue, CSSInitialValue::createImplicit()); // Some value was used for origin that is not supported by clip. Just reset clip instead. + } } } } @@ -1735,6 +1757,10 @@ bool CSSParser::parseFillShorthand(int propId, const int* properties, int numPro addFillValue(values[i], CSSInitialValue::createImplicit()); if (properties[i] == CSSPropertyBackgroundPosition || properties[i] == CSSPropertyWebkitMaskPosition) addFillValue(positionYValue, CSSInitialValue::createImplicit()); + if ((properties[i] == CSSPropertyBackgroundOrigin || properties[i] == CSSPropertyWebkitMaskOrigin) && !parsedProperty[i]) { + // If background-origin wasn't present, then reset background-clip also. + addFillValue(clipValue, CSSInitialValue::createImplicit()); + } } } @@ -1750,8 +1776,14 @@ bool CSSParser::parseFillShorthand(int propId, const int* properties, int numPro addProperty(CSSPropertyWebkitMaskPositionY, positionYValue.release(), important); } else addProperty(properties[i], values[i].release(), important); + + // Add in clip values when we hit the corresponding origin property. + if (properties[i] == CSSPropertyBackgroundOrigin) + addProperty(CSSPropertyBackgroundClip, clipValue.release(), important); + else if (properties[i] == CSSPropertyWebkitMaskOrigin) + addProperty(CSSPropertyWebkitMaskClip, clipValue.release(), important); } - + return true; } @@ -2000,8 +2032,9 @@ bool CSSParser::parseContent(int propId, bool important) RefPtr parsedValue; if (val->unit == CSSPrimitiveValue::CSS_URI && m_styleSheet) { // url - String value = parseURL(val->string); - parsedValue = CSSImageValue::create(m_styleSheet->completeURL(value)); + // FIXME: The completeURL call should be done when using the CSSImageValue, + // not when creating it. + parsedValue = CSSImageValue::create(m_styleSheet->completeURL(val->string)); } else if (val->unit == CSSParserValue::Function) { // attr(X) | counter(X [,Y]) | counters(X, Y, [,Z]) | -webkit-gradient(...) CSSParserValueList* args = val->function->args; @@ -2090,9 +2123,10 @@ bool CSSParser::parseFillImage(RefPtr& value) return true; } if (m_valueList->current()->unit == CSSPrimitiveValue::CSS_URI) { - String uri = parseURL(m_valueList->current()->string); - if (!uri.isNull() && m_styleSheet) - value = CSSImageValue::create(m_styleSheet->completeURL(uri)); + // FIXME: The completeURL call should be done when using the CSSImageValue, + // not when creating it. + if (m_styleSheet) + value = CSSImageValue::create(m_styleSheet->completeURL(m_valueList->current()->string)); return true; } @@ -2102,6 +2136,7 @@ bool CSSParser::parseFillImage(RefPtr& value) if (equalIgnoringCase(m_valueList->current()->function->name, "-webkit-canvas(")) return parseCanvas(value); } + return false; } @@ -2246,7 +2281,7 @@ bool CSSParser::parseFillProperty(int propId, int& propId1, int& propId2, break; case CSSPropertyBackgroundAttachment: case CSSPropertyWebkitMaskAttachment: - if (val->id == CSSValueScroll || val->id == CSSValueFixed) { + if (val->id == CSSValueScroll || val->id == CSSValueFixed || val->id == CSSValueLocal) { currValue = CSSPrimitiveValue::createIdentifier(val->id); m_valueList->next(); } @@ -2260,10 +2295,24 @@ bool CSSParser::parseFillProperty(int propId, int& propId1, int& propId2, case CSSPropertyWebkitBackgroundOrigin: case CSSPropertyWebkitMaskClip: case CSSPropertyWebkitMaskOrigin: - // The first three values here are deprecated and should not be allowed to apply when we drop the -webkit- - // from the property names. + // The first three values here are deprecated and do not apply to the version of the property that has + // the -webkit- prefix removed. if (val->id == CSSValueBorder || val->id == CSSValuePadding || val->id == CSSValueContent || - val->id == CSSValueBorderBox || val->id == CSSValuePaddingBox || val->id == CSSValueContentBox || val->id == CSSValueText) { + val->id == CSSValueBorderBox || val->id == CSSValuePaddingBox || val->id == CSSValueContentBox || + ((propId == CSSPropertyWebkitBackgroundClip || propId == CSSPropertyWebkitMaskClip) && + (val->id == CSSValueText || val->id == CSSValueWebkitText))) { + currValue = CSSPrimitiveValue::createIdentifier(val->id); + m_valueList->next(); + } + break; + case CSSPropertyBackgroundClip: + if (val->id == CSSValueBorderBox || val->id == CSSValuePaddingBox || val->id == CSSValueWebkitText) { + currValue = CSSPrimitiveValue::createIdentifier(val->id); + m_valueList->next(); + } + break; + case CSSPropertyBackgroundOrigin: + if (val->id == CSSValueBorderBox || val->id == CSSValuePaddingBox || val->id == CSSValueContentBox) { currValue = CSSPrimitiveValue::createIdentifier(val->id); m_valueList->next(); } @@ -3143,8 +3192,9 @@ bool CSSParser::parseFontFaceSrc() while ((val = m_valueList->current())) { RefPtr parsedValue; if (val->unit == CSSPrimitiveValue::CSS_URI && !expectComma && m_styleSheet) { - String value = parseURL(val->string); - parsedValue = CSSFontFaceSrcValue::create(m_styleSheet->completeURL(value)); + // FIXME: The completeURL call should be done when using the CSSFontFaceSrcValue, + // not when creating it. + parsedValue = CSSFontFaceSrcValue::create(m_styleSheet->completeURL(val->string)); uriValue = parsedValue; allowFormat = true; expectComma = true; @@ -3429,31 +3479,46 @@ bool CSSParser::parseColorFromValue(CSSParserValue* value, RGBA32& c, bool svg) // This class tracks parsing state for shadow values. If it goes out of scope (e.g., due to an early return) // without the allowBreak bit being set, then it will clean up all of the objects and destroy them. struct ShadowParseContext { - ShadowParseContext() - : allowX(true) - , allowY(false) - , allowBlur(false) - , allowColor(true) - , allowBreak(true) - {} + ShadowParseContext(CSSPropertyID prop) + : property(prop) + , allowX(true) + , allowY(false) + , allowBlur(false) + , allowSpread(false) + , allowColor(true) + , allowStyle(prop == CSSPropertyBoxShadow) + , allowBreak(true) + { + } - bool allowLength() { return allowX || allowY || allowBlur; } + bool allowLength() { return allowX || allowY || allowBlur || allowSpread; } void commitValue() { // Handle the ,, case gracefully by doing nothing. - if (x || y || blur || color) { + if (x || y || blur || spread || color || style) { if (!values) values = CSSValueList::createCommaSeparated(); - + // Construct the current shadow value and add it to the list. - values->append(ShadowValue::create(x.release(), y.release(), blur.release(), color.release())); + values->append(ShadowValue::create(x.release(), y.release(), blur.release(), spread.release(), style.release(), color.release())); } - + // Now reset for the next shadow value. - x = y = blur = color = 0; - allowX = allowColor = allowBreak = true; - allowY = allowBlur = false; + x = 0; + y = 0; + blur = 0; + spread = 0; + style = 0; + color = 0; + + allowX = true; + allowColor = true; + allowBreak = true; + allowY = false; + allowBlur = false; + allowSpread = false; + allowStyle = property == CSSPropertyBoxShadow; } void commitLength(CSSParserValue* v) @@ -3462,15 +3527,25 @@ struct ShadowParseContext { if (allowX) { x = val.release(); - allowX = false; allowY = true; allowColor = false; allowBreak = false; - } - else if (allowY) { + allowX = false; + allowY = true; + allowColor = false; + allowStyle = false; + allowBreak = false; + } else if (allowY) { y = val.release(); - allowY = false; allowBlur = true; allowColor = true; allowBreak = true; - } - else if (allowBlur) { + allowY = false; + allowBlur = true; + allowColor = true; + allowStyle = property == CSSPropertyBoxShadow; + allowBreak = true; + } else if (allowBlur) { blur = val.release(); allowBlur = false; + allowSpread = property == CSSPropertyBoxShadow; + } else if (allowSpread) { + spread = val.release(); + allowSpread = false; } } @@ -3478,28 +3553,51 @@ struct ShadowParseContext { { color = val; allowColor = false; + if (allowX) { + allowStyle = false; + allowBreak = false; + } else { + allowBlur = false; + allowSpread = false; + allowStyle = property == CSSPropertyBoxShadow; + } + } + + void commitStyle(CSSParserValue* v) + { + style = CSSPrimitiveValue::createIdentifier(v->id); + allowStyle = false; if (allowX) allowBreak = false; - else + else { allowBlur = false; + allowSpread = false; + allowColor = false; + } } - + + CSSPropertyID property; + RefPtr values; RefPtr x; RefPtr y; RefPtr blur; + RefPtr spread; + RefPtr style; RefPtr color; bool allowX; bool allowY; bool allowBlur; + bool allowSpread; bool allowColor; + bool allowStyle; bool allowBreak; }; bool CSSParser::parseShadow(int propId, bool important) { - ShadowParseContext context; + ShadowParseContext context(static_cast(propId)); CSSParserValue* val; while ((val = m_valueList->current())) { // Check for a comma break first. @@ -3511,17 +3609,19 @@ bool CSSParser::parseShadow(int propId, bool important) // The value is good. Commit it. context.commitValue(); - } - // Check to see if we're a length. - else if (validUnit(val, FLength, true)) { + } else if (validUnit(val, FLength, true)) { // We required a length and didn't get one. Invalid. if (!context.allowLength()) return false; // A length is allowed here. Construct the value and add it. context.commitLength(val); - } - else { + } else if (val->id == CSSValueInset) { + if (!context.allowStyle) + return false; + + context.commitStyle(val); + } else { // The only other type of value that's ok is a color value. RefPtr parsedColor; bool isColor = ((val->id >= CSSValueAqua && val->id <= CSSValueWindowtext) || val->id == CSSValueMenu || @@ -3542,7 +3642,7 @@ bool CSSParser::parseShadow(int propId, bool important) context.commitColor(parsedColor.release()); } - + m_valueList->next(); } @@ -3554,7 +3654,7 @@ bool CSSParser::parseShadow(int propId, bool important) return true; } } - + return false; } @@ -3749,11 +3849,10 @@ bool CSSParser::parseBorderImage(int propId, bool important, RefPtr& r // Look for an image initially. If the first value is not a URI, then we're done. BorderImageParseContext context; CSSParserValue* val = m_valueList->current(); - if (val->unit == CSSPrimitiveValue::CSS_URI && m_styleSheet) { - String uri = parseURL(val->string); - if (uri.isNull()) - return false; - context.commitImage(CSSImageValue::create(m_styleSheet->completeURL(uri))); + if (val->unit == CSSPrimitiveValue::CSS_URI && m_styleSheet) { + // FIXME: The completeURL call should be done when using the CSSImageValue, + // not when creating it. + context.commitImage(CSSImageValue::create(m_styleSheet->completeURL(val->string))); } else if (val->unit == CSSParserValue::Function) { RefPtr value; if ((equalIgnoringCase(val->function->name, "-webkit-gradient(") && parseGradient(value)) || @@ -4339,6 +4438,7 @@ int CSSParser::lex(void* yylvalWithoutType) case DEGS: case RADS: case KHERZ: + case REMS: length--; case MSECS: case HERZ: @@ -4366,15 +4466,9 @@ int CSSParser::lex(void* yylvalWithoutType) return token; } -static inline int toHex(char c) +static inline bool isCSSWhitespace(UChar c) { - if ('0' <= c && c <= '9') - return c - '0'; - if ('a' <= c && c <= 'f') - return c - 'a' + 10; - if ('A' <= c && c<= 'F') - return c - 'A' + 10; - return 0; + return c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\f'; } UChar* CSSParser::text(int *length) @@ -4393,27 +4487,21 @@ UChar* CSSParser::text(int *length) case URI: // "url("{w}{string}{w}")" // "url("{w}{url}{w}")" - // strip "url(" and ")" start += 4; l -= 5; // strip {w} - while (l && - (*start == ' ' || *start == '\t' || *start == '\r' || - *start == '\n' || *start == '\f')) { - start++; l--; - } - if (*start == '"' || *start == '\'') { - start++; l--; + while (l && isCSSWhitespace(*start)) { + ++start; + --l; } - while (l && - (start[l-1] == ' ' || start[l-1] == '\t' || start[l-1] == '\r' || - start[l-1] == '\n' || start[l-1] == '\f')) { - l--; + while (l && isCSSWhitespace(start[l - 1])) + --l; + if (l && (*start == '"' || *start == '\'')) { + ASSERT(l >= 2 && start[l - 1] == *start); + ++start; + l -= 2; } - if (l && (start[l-1] == '\"' || start[l-1] == '\'')) - l--; - break; case VARCALL: // "-webkit-var("{w}{ident}{w}")" @@ -4421,16 +4509,13 @@ UChar* CSSParser::text(int *length) start += 12; l -= 13; // strip {w} - while (l && - (*start == ' ' || *start == '\t' || *start == '\r' || - *start == '\n' || *start == '\f')) { - start++; l--; - } - while (l && - (start[l-1] == ' ' || start[l-1] == '\t' || start[l-1] == '\r' || - start[l-1] == '\n' || start[l-1] == '\f')) { - l--; + while (l && isCSSWhitespace(*start)) { + ++start; + --l; } + while (l && isCSSWhitespace(start[l - 1])) + --l; + break; default: break; } @@ -4442,9 +4527,7 @@ UChar* CSSParser::text(int *length) for (int i = 0; i < l; i++) { UChar* current = start + i; if (escape == current - 1) { - if ((*current >= '0' && *current <= '9') || - (*current >= 'a' && *current <= 'f') || - (*current >= 'A' && *current <= 'F')) + if (isASCIIHexDigit(*current)) continue; if (yyTok == STRING && (*current == '\n' || *current == '\r' || *current == '\f')) { @@ -4464,10 +4547,7 @@ UChar* CSSParser::text(int *length) escape = 0; continue; } - if (escape > current - 7 && - ((*current >= '0' && *current <= '9') || - (*current >= 'a' && *current <= 'f') || - (*current >= 'A' && *current <= 'F'))) + if (escape > current - 7 && isASCIIHexDigit(*current)) continue; if (escape) { // add escaped char @@ -4475,7 +4555,7 @@ UChar* CSSParser::text(int *length) escape++; while (escape < current) { uc *= 16; - uc += toHex(*escape); + uc += toASCIIHexValue(*escape); escape++; } // can't handle chars outside ucs2 @@ -4483,11 +4563,7 @@ UChar* CSSParser::text(int *length) uc = 0xfffd; *out++ = uc; escape = 0; - if (*current == ' ' || - *current == '\t' || - *current == '\r' || - *current == '\n' || - *current == '\f') + if (isCSSWhitespace(*current)) continue; } if (!escape && *current == '\\') { @@ -4502,7 +4578,7 @@ UChar* CSSParser::text(int *length) escape++; while (escape < start+l) { uc *= 16; - uc += toHex(*escape); + uc += toASCIIHexValue(*escape); escape++; } // can't handle chars outside ucs2 @@ -4900,12 +4976,19 @@ static int cssPropertyID(const UChar* propertyName, unsigned length) ++length; } - // Honor -webkit-opacity as a synonym for opacity. - // This was the only syntax that worked in Safari 1.1, and may be in use on some websites and widgets. - if (strcmp(buffer, "-webkit-opacity") == 0) { - const char * const opacity = "opacity"; - name = opacity; - length = strlen(opacity); + if (hasPrefix(buffer, length, "-webkit")) { + if (strcmp(buffer, "-webkit-opacity") == 0) { + // Honor -webkit-opacity as a synonym for opacity. + // This was the only syntax that worked in Safari 1.1, and may be in use on some websites and widgets. + const char* const opacity = "opacity"; + name = opacity; + length = strlen(opacity); + } else if (strcmp(buffer, "-webkit-box-shadow") == 0) { + // CSS Backgrounds/Borders. -webkit-box-shadow worked in Safari 4 and earlier. + const char* const boxShadow = "box-shadow"; + name = boxShadow; + length = strlen(boxShadow); + } } } diff --git a/src/3rdparty/webkit/WebCore/css/CSSParser.h b/src/3rdparty/webkit/WebCore/css/CSSParser.h index d47720fa3..d4b92f52c 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSParser.h +++ b/src/3rdparty/webkit/WebCore/css/CSSParser.h @@ -191,7 +191,6 @@ namespace WebCore { Vector* reusableSelectorVector() { return &m_reusableSelectorVector; } - public: bool m_strict; bool m_important; int m_id; @@ -217,7 +216,6 @@ namespace WebCore { AtomicString m_defaultNamespace; // tokenizer methods and data - public: int lex(void* yylval); int token() { return yyTok; } UChar* text(int* length); diff --git a/src/3rdparty/webkit/WebCore/css/CSSParserValues.cpp b/src/3rdparty/webkit/WebCore/css/CSSParserValues.cpp index dbfae7839..55ecb7fdf 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSParserValues.cpp +++ b/src/3rdparty/webkit/WebCore/css/CSSParserValues.cpp @@ -73,6 +73,8 @@ PassRefPtr CSSParserValue::createCSSValue() parsedValue = CSSPrimitiveValue::create(string, (CSSPrimitiveValue::UnitTypes)unit); else if (unit >= CSSPrimitiveValue::CSS_NUMBER && unit <= CSSPrimitiveValue::CSS_KHZ) parsedValue = CSSPrimitiveValue::create(fValue, (CSSPrimitiveValue::UnitTypes)unit); + else if (unit >= CSSPrimitiveValue::CSS_TURN && unit <= CSSPrimitiveValue::CSS_REMS) // CSS3 Values and Units + parsedValue = CSSPrimitiveValue::create(fValue, (CSSPrimitiveValue::UnitTypes)unit); else if (unit >= CSSParserValue::Q_EMS) parsedValue = CSSQuirkPrimitiveValue::create(fValue, CSSPrimitiveValue::CSS_EMS); return parsedValue; diff --git a/src/3rdparty/webkit/WebCore/css/CSSPrimitiveValue.cpp b/src/3rdparty/webkit/WebCore/css/CSSPrimitiveValue.cpp index 15c5a014d..6343dac75 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSPrimitiveValue.cpp +++ b/src/3rdparty/webkit/WebCore/css/CSSPrimitiveValue.cpp @@ -30,6 +30,7 @@ #include "ExceptionCode.h" #include "Node.h" #include "Pair.h" +#include "RGBColor.h" #include "Rect.h" #include "RenderStyle.h" #include @@ -318,9 +319,9 @@ void CSSPrimitiveValue::cleanup() m_type = 0; } -int CSSPrimitiveValue::computeLengthInt(RenderStyle* style) +int CSSPrimitiveValue::computeLengthInt(RenderStyle* style, RenderStyle* rootStyle) { - double result = computeLengthDouble(style); + double result = computeLengthDouble(style, rootStyle); // This conversion is imprecise, often resulting in values of, e.g., 44.99998. We // need to go ahead and round if we're really close to the next integer value. @@ -331,9 +332,9 @@ int CSSPrimitiveValue::computeLengthInt(RenderStyle* style) return static_cast(result); } -int CSSPrimitiveValue::computeLengthInt(RenderStyle* style, double multiplier) +int CSSPrimitiveValue::computeLengthInt(RenderStyle* style, RenderStyle* rootStyle, double multiplier) { - double result = computeLengthDouble(style, multiplier); + double result = computeLengthDouble(style, rootStyle, multiplier); // This conversion is imprecise, often resulting in values of, e.g., 44.99998. We // need to go ahead and round if we're really close to the next integer value. @@ -348,9 +349,9 @@ const int intMaxForLength = 0x7ffffff; // max value for a 28-bit int const int intMinForLength = (-0x7ffffff - 1); // min value for a 28-bit int // Lengths expect an int that is only 28-bits, so we have to check for a different overflow. -int CSSPrimitiveValue::computeLengthIntForLength(RenderStyle* style) +int CSSPrimitiveValue::computeLengthIntForLength(RenderStyle* style, RenderStyle* rootStyle) { - double result = computeLengthDouble(style); + double result = computeLengthDouble(style, rootStyle); // This conversion is imprecise, often resulting in values of, e.g., 44.99998. We // need to go ahead and round if we're really close to the next integer value. @@ -362,9 +363,9 @@ int CSSPrimitiveValue::computeLengthIntForLength(RenderStyle* style) } // Lengths expect an int that is only 28-bits, so we have to check for a different overflow. -int CSSPrimitiveValue::computeLengthIntForLength(RenderStyle* style, double multiplier) +int CSSPrimitiveValue::computeLengthIntForLength(RenderStyle* style, RenderStyle* rootStyle, double multiplier) { - double result = computeLengthDouble(style, multiplier); + double result = computeLengthDouble(style, rootStyle, multiplier); // This conversion is imprecise, often resulting in values of, e.g., 44.99998. We // need to go ahead and round if we're really close to the next integer value. @@ -375,9 +376,9 @@ int CSSPrimitiveValue::computeLengthIntForLength(RenderStyle* style, double mult return static_cast(result); } -short CSSPrimitiveValue::computeLengthShort(RenderStyle* style) +short CSSPrimitiveValue::computeLengthShort(RenderStyle* style, RenderStyle* rootStyle) { - double result = computeLengthDouble(style); + double result = computeLengthDouble(style, rootStyle); // This conversion is imprecise, often resulting in values of, e.g., 44.99998. We // need to go ahead and round if we're really close to the next integer value. @@ -388,9 +389,9 @@ short CSSPrimitiveValue::computeLengthShort(RenderStyle* style) return static_cast(result); } -short CSSPrimitiveValue::computeLengthShort(RenderStyle* style, double multiplier) +short CSSPrimitiveValue::computeLengthShort(RenderStyle* style, RenderStyle* rootStyle, double multiplier) { - double result = computeLengthDouble(style, multiplier); + double result = computeLengthDouble(style, rootStyle, multiplier); // This conversion is imprecise, often resulting in values of, e.g., 44.99998. We // need to go ahead and round if we're really close to the next integer value. @@ -401,17 +402,17 @@ short CSSPrimitiveValue::computeLengthShort(RenderStyle* style, double multiplie return static_cast(result); } -float CSSPrimitiveValue::computeLengthFloat(RenderStyle* style, bool computingFontSize) +float CSSPrimitiveValue::computeLengthFloat(RenderStyle* style, RenderStyle* rootStyle, bool computingFontSize) { - return static_cast(computeLengthDouble(style, 1.0, computingFontSize)); + return static_cast(computeLengthDouble(style, rootStyle, 1.0, computingFontSize)); } -float CSSPrimitiveValue::computeLengthFloat(RenderStyle* style, double multiplier, bool computingFontSize) +float CSSPrimitiveValue::computeLengthFloat(RenderStyle* style, RenderStyle* rootStyle, double multiplier, bool computingFontSize) { - return static_cast(computeLengthDouble(style, multiplier, computingFontSize)); + return static_cast(computeLengthDouble(style, rootStyle, multiplier, computingFontSize)); } -double CSSPrimitiveValue::computeLengthDouble(RenderStyle* style, double multiplier, bool computingFontSize) +double CSSPrimitiveValue::computeLengthDouble(RenderStyle* style, RenderStyle* rootStyle, double multiplier, bool computingFontSize) { unsigned short type = primitiveType(); @@ -434,6 +435,10 @@ double CSSPrimitiveValue::computeLengthDouble(RenderStyle* style, double multipl applyZoomMultiplier = false; factor = style->font().xHeight(); break; + case CSS_REMS: + applyZoomMultiplier = false; + factor = computingFontSize ? rootStyle->fontDescription().specifiedSize() : rootStyle->fontDescription().computedSize(); + break; case CSS_PX: break; case CSS_CM: @@ -638,7 +643,7 @@ Rect* CSSPrimitiveValue::getRectValue(ExceptionCode& ec) const return m_value.rect; } -unsigned CSSPrimitiveValue::getRGBColorValue(ExceptionCode& ec) const +RGBColor* CSSPrimitiveValue::getRGBColorValue(ExceptionCode& ec) const { ec = 0; if (m_type != CSS_RGBCOLOR) { @@ -646,7 +651,8 @@ unsigned CSSPrimitiveValue::getRGBColorValue(ExceptionCode& ec) const return 0; } - return m_value.rgbcolor; + // FIMXE: This should not return a new object for each invocation. + return RGBColor::create(m_value.rgbcolor).releaseRef(); } Pair* CSSPrimitiveValue::getPairValue(ExceptionCode& ec) const @@ -700,6 +706,9 @@ String CSSPrimitiveValue::cssText() const case CSS_EXS: text = String::format("%.6lgex", m_value.num); break; + case CSS_REMS: + text = String::format("%.6lgrem", m_value.num); + break; case CSS_PX: text = String::format("%.6lgpx", m_value.num); break; @@ -892,6 +901,7 @@ CSSParserValue CSSPrimitiveValue::parserValue() const case CSS_PERCENTAGE: case CSS_EMS: case CSS_EXS: + case CSS_REMS: case CSS_PX: case CSS_CM: case CSS_MM: diff --git a/src/3rdparty/webkit/WebCore/css/CSSPrimitiveValue.h b/src/3rdparty/webkit/WebCore/css/CSSPrimitiveValue.h index 8abeb4d37..85a0ba339 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSPrimitiveValue.h +++ b/src/3rdparty/webkit/WebCore/css/CSSPrimitiveValue.h @@ -23,6 +23,7 @@ #define CSSPrimitiveValue_h #include "CSSValue.h" +#include "Color.h" #include namespace WebCore { @@ -30,6 +31,7 @@ namespace WebCore { class Counter; class DashboardRegion; class Pair; +class RGBColor; class Rect; class RenderStyle; class StringImpl; @@ -78,11 +80,13 @@ public: // This is used internally for unknown identifiers CSS_PARSER_IDENTIFIER = 107, - // This unit is in CSS 3, but that isn't a finished standard yet - CSS_TURN = 108 + // These are from CSS3 Values and Units, but that isn't a finished standard yet + CSS_TURN = 108, + CSS_REMS = 109 }; - static bool isUnitTypeLength(int type) { return type > CSSPrimitiveValue::CSS_PERCENTAGE && type < CSSPrimitiveValue::CSS_DEG; } + static bool isUnitTypeLength(int type) { return (type > CSSPrimitiveValue::CSS_PERCENTAGE && type < CSSPrimitiveValue::CSS_DEG) || + type == CSSPrimitiveValue::CSS_REMS; } static PassRefPtr createIdentifier(int ident); static PassRefPtr createColor(unsigned rgbValue); @@ -112,15 +116,15 @@ public: * this is screen/printer dependent, so we probably need a config option for this, * and some tool to calibrate. */ - int computeLengthInt(RenderStyle*); - int computeLengthInt(RenderStyle*, double multiplier); - int computeLengthIntForLength(RenderStyle*); - int computeLengthIntForLength(RenderStyle*, double multiplier); - short computeLengthShort(RenderStyle*); - short computeLengthShort(RenderStyle*, double multiplier); - float computeLengthFloat(RenderStyle*, bool computingFontSize = false); - float computeLengthFloat(RenderStyle*, double multiplier, bool computingFontSize = false); - double computeLengthDouble(RenderStyle*, double multiplier = 1.0, bool computingFontSize = false); + int computeLengthInt(RenderStyle* currStyle, RenderStyle* rootStyle); + int computeLengthInt(RenderStyle* currStyle, RenderStyle* rootStyle, double multiplier); + int computeLengthIntForLength(RenderStyle* currStyle, RenderStyle* rootStyle); + int computeLengthIntForLength(RenderStyle* currStyle, RenderStyle* rootStyle, double multiplier); + short computeLengthShort(RenderStyle* currStyle, RenderStyle* rootStyle); + short computeLengthShort(RenderStyle* currStyle, RenderStyle* rootStyle, double multiplier); + float computeLengthFloat(RenderStyle* currStyle, RenderStyle* rootStyle, bool computingFontSize = false); + float computeLengthFloat(RenderStyle* currStyle, RenderStyle* rootStyle, double multiplier, bool computingFontSize = false); + double computeLengthDouble(RenderStyle* currentStyle, RenderStyle* rootStyle, double multiplier = 1.0, bool computingFontSize = false); // use with care!!! void setPrimitiveType(unsigned short type) { m_type = type; } @@ -148,8 +152,8 @@ public: Rect* getRectValue(ExceptionCode&) const; Rect* getRectValue() const { return m_type != CSS_RECT ? 0 : m_value.rect; } - unsigned getRGBColorValue(ExceptionCode&) const; - unsigned getRGBColorValue() const { return m_type != CSS_RGBCOLOR ? 0 : m_value.rgbcolor; } + RGBColor* getRGBColorValue(ExceptionCode&) const; + RGBA32 getRGBA32Value() const { return m_type != CSS_RGBCOLOR ? 0 : m_value.rgbcolor; } Pair* getPairValue(ExceptionCode&) const; Pair* getPairValue() const { return m_type != CSS_PAIR ? 0 : m_value.pair; } diff --git a/src/3rdparty/webkit/WebCore/css/CSSPrimitiveValueMappings.h b/src/3rdparty/webkit/WebCore/css/CSSPrimitiveValueMappings.h index 1dd2a2d78..69cfbb1ce 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSPrimitiveValueMappings.h +++ b/src/3rdparty/webkit/WebCore/css/CSSPrimitiveValueMappings.h @@ -298,6 +298,37 @@ template<> inline CSSPrimitiveValue::operator ControlPart() const return ControlPart(m_value.ident - CSSValueCheckbox + 1); } +template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFillAttachment e) + : m_type(CSS_IDENT) +{ + switch (e) { + case ScrollBackgroundAttachment: + m_value.ident = CSSValueScroll; + break; + case LocalBackgroundAttachment: + m_value.ident = CSSValueLocal; + break; + case FixedBackgroundAttachment: + m_value.ident = CSSValueFixed; + break; + } +} + +template<> inline CSSPrimitiveValue::operator EFillAttachment() const +{ + switch (m_value.ident) { + case CSSValueScroll: + return ScrollBackgroundAttachment; + case CSSValueLocal: + return LocalBackgroundAttachment; + case CSSValueFixed: + return FixedBackgroundAttachment; + default: + ASSERT_NOT_REACHED(); + return ScrollBackgroundAttachment; + } +} + template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFillBox e) : m_type(CSS_IDENT) { diff --git a/src/3rdparty/webkit/WebCore/css/CSSPropertyLonghand.cpp b/src/3rdparty/webkit/WebCore/css/CSSPropertyLonghand.cpp index 310f90e6f..a90723582 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSPropertyLonghand.cpp +++ b/src/3rdparty/webkit/WebCore/css/CSSPropertyLonghand.cpp @@ -128,10 +128,10 @@ static void initShorthandMap(ShorthandMap& shorthandMap) static const int backgroundProperties[] = { CSSPropertyBackgroundAttachment, - CSSPropertyWebkitBackgroundClip, + CSSPropertyBackgroundClip, CSSPropertyBackgroundColor, CSSPropertyBackgroundImage, - CSSPropertyWebkitBackgroundOrigin, + CSSPropertyBackgroundOrigin, CSSPropertyBackgroundPositionX, CSSPropertyBackgroundPositionY, CSSPropertyBackgroundRepeat, diff --git a/src/3rdparty/webkit/WebCore/css/CSSPropertyNames.in b/src/3rdparty/webkit/WebCore/css/CSSPropertyNames.in index df17d975a..49b2c3c71 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSPropertyNames.in +++ b/src/3rdparty/webkit/WebCore/css/CSSPropertyNames.in @@ -10,8 +10,10 @@ background background-attachment +background-clip background-color background-image +background-origin background-position background-position-x background-position-y @@ -39,6 +41,7 @@ border-top-style border-top-width border-width bottom +box-shadow caption-side clear clip @@ -168,7 +171,6 @@ zoom -webkit-box-orient -webkit-box-pack -webkit-box-reflect --webkit-box-shadow -webkit-box-sizing -webkit-column-break-after -webkit-column-break-before diff --git a/src/3rdparty/webkit/WebCore/css/CSSSelector.cpp b/src/3rdparty/webkit/WebCore/css/CSSSelector.cpp index 5429c16f4..80910a773 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSSelector.cpp +++ b/src/3rdparty/webkit/WebCore/css/CSSSelector.cpp @@ -117,6 +117,8 @@ void CSSSelector::extractPseudoType() const DEFINE_STATIC_LOCAL(AtomicString, notStr, ("not(")); DEFINE_STATIC_LOCAL(AtomicString, onlyChild, ("only-child")); DEFINE_STATIC_LOCAL(AtomicString, onlyOfType, ("only-of-type")); + DEFINE_STATIC_LOCAL(AtomicString, optional, ("optional")); + DEFINE_STATIC_LOCAL(AtomicString, required, ("required")); DEFINE_STATIC_LOCAL(AtomicString, resizer, ("-webkit-resizer")); DEFINE_STATIC_LOCAL(AtomicString, root, ("root")); DEFINE_STATIC_LOCAL(AtomicString, scrollbar, ("-webkit-scrollbar")); @@ -286,6 +288,10 @@ void CSSSelector::extractPseudoType() const m_pseudoType = PseudoSingleButton; else if (m_value == noButton) m_pseudoType = PseudoNoButton; + else if (m_value == optional) + m_pseudoType = PseudoOptional; + else if (m_value == required) + m_pseudoType = PseudoRequired; else if (m_value == scrollbarCorner) { element = true; m_pseudoType = PseudoScrollbarCorner; diff --git a/src/3rdparty/webkit/WebCore/css/CSSSelector.h b/src/3rdparty/webkit/WebCore/css/CSSSelector.h index b24f057e8..18251fd4b 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSSelector.h +++ b/src/3rdparty/webkit/WebCore/css/CSSSelector.h @@ -31,7 +31,7 @@ namespace WebCore { // this class represents a selector for a StyleRule - class CSSSelector : Noncopyable { + class CSSSelector : public Noncopyable { public: CSSSelector() : m_tag(anyQName()) @@ -128,6 +128,8 @@ namespace WebCore { PseudoFullPageMedia, PseudoDisabled, PseudoInputPlaceholder, + PseudoOptional, + PseudoRequired, PseudoReadOnly, PseudoReadWrite, PseudoIndeterminate, diff --git a/src/3rdparty/webkit/WebCore/css/CSSSelectorList.h b/src/3rdparty/webkit/WebCore/css/CSSSelectorList.h index 7a41fcf09..351813979 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSSelectorList.h +++ b/src/3rdparty/webkit/WebCore/css/CSSSelectorList.h @@ -31,7 +31,7 @@ namespace WebCore { - class CSSSelectorList : Noncopyable { + class CSSSelectorList : public Noncopyable { public: CSSSelectorList() : m_selectorArray(0) { } ~CSSSelectorList(); diff --git a/src/3rdparty/webkit/WebCore/css/CSSStyleSelector.cpp b/src/3rdparty/webkit/WebCore/css/CSSStyleSelector.cpp index d782d389f..49e2c3614 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSStyleSelector.cpp +++ b/src/3rdparty/webkit/WebCore/css/CSSStyleSelector.cpp @@ -2,7 +2,7 @@ * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) - * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. * Copyright (C) 2007 Alexey Proskuryakov * Copyright (C) 2007, 2008 Eric Seidel * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) @@ -822,6 +822,10 @@ void CSSStyleSelector::initForStyleResolve(Element* e, RenderStyle* parentStyle, else m_parentStyle = m_parentNode ? m_parentNode->renderStyle() : 0; + Node* docElement = e ? e->document()->documentElement() : 0; + RenderStyle* docStyle = m_checker.m_document->renderStyle(); + m_rootElementStyle = docElement && e != docElement ? docElement->renderStyle() : docStyle; + m_style = 0; m_matchedDecls.clear(); @@ -2371,6 +2375,10 @@ bool CSSStyleSelector::SelectorChecker::checkOneSelector(CSSSelector* sel, Eleme return false; return e->isTextFormControl() && !e->isReadOnlyFormControl(); } + case CSSSelector::PseudoOptional: + return e && e->isOptionalFormControl(); + case CSSSelector::PseudoRequired: + return e && e->isRequiredFormControl(); case CSSSelector::PseudoChecked: { if (!e || !e->isFormControlElement()) break; @@ -2753,7 +2761,7 @@ void CSSRuleSet::addRulesFromSheet(CSSStyleSheet* sheet, const MediaQueryEvaluat // ------------------------------------------------------------------------------------- // this is mostly boring stuff on how to apply a certain rule to the renderstyle... -static Length convertToLength(CSSPrimitiveValue *primitiveValue, RenderStyle *style, double multiplier = 1, bool *ok = 0) +static Length convertToLength(CSSPrimitiveValue* primitiveValue, RenderStyle* style, RenderStyle* rootStyle, double multiplier = 1, bool *ok = 0) { // This function is tolerant of a null style value. The only place style is used is in // length measurements, like 'ems' and 'px'. And in those cases style is only used @@ -2765,11 +2773,11 @@ static Length convertToLength(CSSPrimitiveValue *primitiveValue, RenderStyle *st } else { int type = primitiveValue->primitiveType(); - if (!style && (type == CSSPrimitiveValue::CSS_EMS || type == CSSPrimitiveValue::CSS_EXS)) { + if (!style && (type == CSSPrimitiveValue::CSS_EMS || type == CSSPrimitiveValue::CSS_EXS || type == CSSPrimitiveValue::CSS_REMS)) { if (ok) *ok = false; } else if (CSSPrimitiveValue::isUnitTypeLength(type)) - l = Length(primitiveValue->computeLengthIntForLength(style, multiplier), Fixed); + l = Length(primitiveValue->computeLengthIntForLength(style, rootStyle, multiplier), Fixed); else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) l = Length(primitiveValue->getDoubleValue(), Percent); else if (type == CSSPrimitiveValue::CSS_NUMBER) @@ -2896,12 +2904,14 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) case CSSPropertyBackgroundAttachment: HANDLE_BACKGROUND_VALUE(attachment, Attachment, value) return; + case CSSPropertyBackgroundClip: case CSSPropertyWebkitBackgroundClip: HANDLE_BACKGROUND_VALUE(clip, Clip, value) return; case CSSPropertyWebkitBackgroundComposite: HANDLE_BACKGROUND_VALUE(composite, Composite, value) return; + case CSSPropertyBackgroundOrigin: case CSSPropertyWebkitBackgroundOrigin: HANDLE_BACKGROUND_VALUE(origin, Origin, value) return; @@ -3207,7 +3217,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) HANDLE_INHERIT_AND_INITIAL(horizontalBorderSpacing, HorizontalBorderSpacing) if (!primitiveValue) return; - short spacing = primitiveValue->computeLengthShort(style(), zoomFactor); + short spacing = primitiveValue->computeLengthShort(style(), m_rootElementStyle, zoomFactor); m_style->setHorizontalBorderSpacing(spacing); return; } @@ -3215,7 +3225,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) HANDLE_INHERIT_AND_INITIAL(verticalBorderSpacing, VerticalBorderSpacing) if (!primitiveValue) return; - short spacing = primitiveValue->computeLengthShort(style(), zoomFactor); + short spacing = primitiveValue->computeLengthShort(style(), m_rootElementStyle, zoomFactor); m_style->setVerticalBorderSpacing(spacing); return; } @@ -3390,7 +3400,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) width = 5; break; case CSSValueInvalid: - width = primitiveValue->computeLengthShort(style(), zoomFactor); + width = primitiveValue->computeLengthShort(style(), m_rootElementStyle, zoomFactor); break; default: return; @@ -3443,7 +3453,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) } else { if (!primitiveValue) return; - width = primitiveValue->computeLengthInt(style(), zoomFactor); + width = primitiveValue->computeLengthInt(style(), m_rootElementStyle, zoomFactor); } switch (id) { case CSSPropertyLetterSpacing: @@ -3570,7 +3580,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) int type = primitiveValue->primitiveType(); if (CSSPrimitiveValue::isUnitTypeLength(type)) // Handle our quirky margin units if we have them. - l = Length(primitiveValue->computeLengthIntForLength(style(), zoomFactor), Fixed, + l = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed, primitiveValue->isQuirkValue()); else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) l = Length(primitiveValue->getDoubleValue(), Percent); @@ -3670,7 +3680,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) if (primitiveValue && !apply) { unsigned short type = primitiveValue->primitiveType(); if (CSSPrimitiveValue::isUnitTypeLength(type)) - l = Length(primitiveValue->computeLengthIntForLength(style(), zoomFactor), Fixed); + l = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed); else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) l = Length(primitiveValue->getDoubleValue(), Percent); else @@ -3726,7 +3736,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) int type = primitiveValue->primitiveType(); Length l; if (CSSPrimitiveValue::isUnitTypeLength(type)) - l = Length(primitiveValue->computeLengthIntForLength(style(), zoomFactor), Fixed); + l = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed); else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) l = Length(primitiveValue->getDoubleValue(), Percent); @@ -3788,9 +3798,10 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) fontDescription.setIsAbsoluteSize(parentIsAbsoluteSize || (type != CSSPrimitiveValue::CSS_PERCENTAGE && type != CSSPrimitiveValue::CSS_EMS && - type != CSSPrimitiveValue::CSS_EXS)); + type != CSSPrimitiveValue::CSS_EXS && + type != CSSPrimitiveValue::CSS_REMS)); if (CSSPrimitiveValue::isUnitTypeLength(type)) - size = primitiveValue->computeLengthFloat(m_parentStyle, true); + size = primitiveValue->computeLengthFloat(m_parentStyle, m_rootElementStyle, true); else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) size = (primitiveValue->getFloatValue() * oldSize) / 100.0f; else @@ -3856,7 +3867,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) double multiplier = m_style->effectiveZoom(); if (m_style->textSizeAdjust() && m_checker.m_document->frame() && m_checker.m_document->frame()->shouldApplyTextZoom()) multiplier *= m_checker.m_document->frame()->textZoomFactor(); - lineHeight = Length(primitiveValue->computeLengthIntForLength(style(), multiplier), Fixed); + lineHeight = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, multiplier), Fixed); } else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) lineHeight = Length((m_style->fontSize() * primitiveValue->getIntValue()) / 100, Fixed); else if (type == CSSPrimitiveValue::CSS_NUMBER) @@ -3910,10 +3921,10 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) Rect* rect = primitiveValue->getRectValue(); if (!rect) return; - top = convertToLength(rect->top(), style(), zoomFactor); - right = convertToLength(rect->right(), style(), zoomFactor); - bottom = convertToLength(rect->bottom(), style(), zoomFactor); - left = convertToLength(rect->left(), style(), zoomFactor); + top = convertToLength(rect->top(), style(), m_rootElementStyle, zoomFactor); + right = convertToLength(rect->right(), style(), m_rootElementStyle, zoomFactor); + bottom = convertToLength(rect->bottom(), style(), m_rootElementStyle, zoomFactor); + left = convertToLength(rect->left(), style(), m_rootElementStyle, zoomFactor); } else if (primitiveValue->getIdent() != CSSValueAuto) { return; } @@ -4474,8 +4485,8 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) if (!pair) return; - int width = pair->first()->computeLengthInt(style(), zoomFactor); - int height = pair->second()->computeLengthInt(style(), zoomFactor); + int width = pair->first()->computeLengthInt(style(), m_rootElementStyle, zoomFactor); + int height = pair->second()->computeLengthInt(style(), m_rootElementStyle, zoomFactor); if (width < 0 || height < 0) return; @@ -4507,11 +4518,11 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) case CSSPropertyOutlineOffset: HANDLE_INHERIT_AND_INITIAL(outlineOffset, OutlineOffset) - m_style->setOutlineOffset(primitiveValue->computeLengthInt(style(), zoomFactor)); + m_style->setOutlineOffset(primitiveValue->computeLengthInt(style(), m_rootElementStyle, zoomFactor)); return; case CSSPropertyTextShadow: - case CSSPropertyWebkitBoxShadow: { + case CSSPropertyBoxShadow: { if (isInherit) { if (id == CSSPropertyTextShadow) return m_style->setTextShadow(m_parentStyle->textShadow() ? new ShadowData(*m_parentStyle->textShadow()) : 0); @@ -4527,13 +4538,15 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) int len = list->length(); for (int i = 0; i < len; i++) { ShadowValue* item = static_cast(list->itemWithoutBoundsCheck(i)); - int x = item->x->computeLengthInt(style(), zoomFactor); - int y = item->y->computeLengthInt(style(), zoomFactor); - int blur = item->blur ? item->blur->computeLengthInt(style(), zoomFactor) : 0; + int x = item->x->computeLengthInt(style(), m_rootElementStyle, zoomFactor); + int y = item->y->computeLengthInt(style(), m_rootElementStyle, zoomFactor); + int blur = item->blur ? item->blur->computeLengthInt(style(), m_rootElementStyle, zoomFactor) : 0; + int spread = item->spread ? item->spread->computeLengthInt(style(), m_rootElementStyle, zoomFactor) : 0; + ShadowStyle shadowStyle = item->style && item->style->getIdent() == CSSValueInset ? Inset : Normal; Color color; if (item->color) color = getColorFromPrimitiveValue(item->color.get()); - ShadowData* shadowData = new ShadowData(x, y, blur, color.isValid() ? color : Color::transparent); + ShadowData* shadowData = new ShadowData(x, y, blur, spread, shadowStyle, color.isValid() ? color : Color::transparent); if (id == CSSPropertyTextShadow) m_style->setTextShadow(shadowData, i != 0); else @@ -4555,7 +4568,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) if (type == CSSPrimitiveValue::CSS_PERCENTAGE) reflection->setOffset(Length(reflectValue->offset()->getDoubleValue(), Percent)); else - reflection->setOffset(Length(reflectValue->offset()->computeLengthIntForLength(style(), zoomFactor), Fixed)); + reflection->setOffset(Length(reflectValue->offset()->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed)); } NinePieceImage mask; mapNinePieceImage(reflectValue->mask(), mask); @@ -4661,7 +4674,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) m_style->setHasNormalColumnGap(); return; } - m_style->setColumnGap(primitiveValue->computeLengthFloat(style(), zoomFactor)); + m_style->setColumnGap(primitiveValue->computeLengthFloat(style(), m_rootElementStyle, zoomFactor)); return; } case CSSPropertyWebkitColumnWidth: { @@ -4675,7 +4688,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) m_style->setHasAutoColumnWidth(); return; } - m_style->setColumnWidth(primitiveValue->computeLengthFloat(style(), zoomFactor)); + m_style->setColumnWidth(primitiveValue->computeLengthFloat(style(), m_rootElementStyle, zoomFactor)); return; } case CSSPropertyWebkitColumnRuleStyle: @@ -4777,7 +4790,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) } else { bool ok = true; - Length l = convertToLength(primitiveValue, style(), 1, &ok); + Length l = convertToLength(primitiveValue, style(), m_rootElementStyle, 1, &ok); if (ok) m_style->setMarqueeIncrement(l); } @@ -4879,10 +4892,10 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) DashboardRegion *first = region; while (region) { - Length top = convertToLength(region->top(), style()); - Length right = convertToLength(region->right(), style()); - Length bottom = convertToLength(region->bottom(), style()); - Length left = convertToLength(region->left(), style()); + Length top = convertToLength(region->top(), style(), m_rootElementStyle); + Length right = convertToLength(region->right(), style(), m_rootElementStyle); + Length bottom = convertToLength(region->bottom(), style(), m_rootElementStyle); + Length left = convertToLength(region->left(), style(), m_rootElementStyle); if (region->m_isCircle) m_style->setDashboardRegion(StyleDashboardRegion::Circle, region->m_label, top, right, bottom, left, region == first ? false : true); else if (region->m_isRectangle) @@ -4913,11 +4926,11 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) result *= 3; else if (primitiveValue->getIdent() == CSSValueThick) result *= 5; - width = CSSPrimitiveValue::create(result, CSSPrimitiveValue::CSS_EMS)->computeLengthFloat(style(), zoomFactor); + width = CSSPrimitiveValue::create(result, CSSPrimitiveValue::CSS_EMS)->computeLengthFloat(style(), m_rootElementStyle, zoomFactor); break; } default: - width = primitiveValue->computeLengthFloat(style(), zoomFactor); + width = primitiveValue->computeLengthFloat(style(), m_rootElementStyle, zoomFactor); break; } m_style->setTextStrokeWidth(width); @@ -4926,7 +4939,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) case CSSPropertyWebkitTransform: { HANDLE_INHERIT_AND_INITIAL(transform, Transform); TransformOperations operations; - createTransformOperations(value, style(), operations); + createTransformOperations(value, style(), m_rootElementStyle, operations); m_style->setTransform(operations); return; } @@ -4941,7 +4954,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) Length l; int type = primitiveValue->primitiveType(); if (CSSPrimitiveValue::isUnitTypeLength(type)) - l = Length(primitiveValue->computeLengthIntForLength(style(), zoomFactor), Fixed); + l = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed); else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) l = Length(primitiveValue->getDoubleValue(), Percent); else @@ -4955,7 +4968,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) Length l; int type = primitiveValue->primitiveType(); if (CSSPrimitiveValue::isUnitTypeLength(type)) - l = Length(primitiveValue->computeLengthIntForLength(style(), zoomFactor), Fixed); + l = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed); else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) l = Length(primitiveValue->getDoubleValue(), Percent); else @@ -4969,7 +4982,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) float f; int type = primitiveValue->primitiveType(); if (CSSPrimitiveValue::isUnitTypeLength(type)) - f = static_cast(primitiveValue->computeLengthIntForLength(style())); + f = static_cast(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle)); else return; m_style->setTransformOriginZ(f); @@ -4990,10 +5003,10 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) float perspectiveValue; int type = primitiveValue->primitiveType(); if (CSSPrimitiveValue::isUnitTypeLength(type)) - perspectiveValue = static_cast(primitiveValue->computeLengthIntForLength(style(), zoomFactor)); + perspectiveValue = static_cast(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor)); else if (type == CSSPrimitiveValue::CSS_NUMBER) { // For backward compatibility, treat valueless numbers as px. - perspectiveValue = CSSPrimitiveValue::create(primitiveValue->getDoubleValue(), CSSPrimitiveValue::CSS_PX)->computeLengthFloat(style(), zoomFactor); + perspectiveValue = CSSPrimitiveValue::create(primitiveValue->getDoubleValue(), CSSPrimitiveValue::CSS_PX)->computeLengthFloat(style(), m_rootElementStyle, zoomFactor); } else return; @@ -5011,7 +5024,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) Length l; int type = primitiveValue->primitiveType(); if (CSSPrimitiveValue::isUnitTypeLength(type)) - l = Length(primitiveValue->computeLengthIntForLength(style(), zoomFactor), Fixed); + l = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed); else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) l = Length(primitiveValue->getDoubleValue(), Percent); else @@ -5025,7 +5038,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) Length l; int type = primitiveValue->primitiveType(); if (CSSPrimitiveValue::isUnitTypeLength(type)) - l = Length(primitiveValue->computeLengthIntForLength(style(), zoomFactor), Fixed); + l = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed); else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) l = Length(primitiveValue->getDoubleValue(), Percent); else @@ -5139,10 +5152,13 @@ void CSSStyleSelector::mapFillAttachment(FillLayer* layer, CSSValue* value) CSSPrimitiveValue* primitiveValue = static_cast(value); switch (primitiveValue->getIdent()) { case CSSValueFixed: - layer->setAttachment(false); + layer->setAttachment(FixedBackgroundAttachment); break; case CSSValueScroll: - layer->setAttachment(true); + layer->setAttachment(ScrollBackgroundAttachment); + break; + case CSSValueLocal: + layer->setAttachment(LocalBackgroundAttachment); break; default: return; @@ -5256,7 +5272,7 @@ void CSSStyleSelector::mapFillSize(FillLayer* layer, CSSValue* value) if (firstType == CSSPrimitiveValue::CSS_UNKNOWN) firstLength = Length(Auto); else if (CSSPrimitiveValue::isUnitTypeLength(firstType)) - firstLength = Length(first->computeLengthIntForLength(style(), zoomFactor), Fixed); + firstLength = Length(first->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed); else if (firstType == CSSPrimitiveValue::CSS_PERCENTAGE) firstLength = Length(first->getDoubleValue(), Percent); else @@ -5265,7 +5281,7 @@ void CSSStyleSelector::mapFillSize(FillLayer* layer, CSSValue* value) if (secondType == CSSPrimitiveValue::CSS_UNKNOWN) secondLength = Length(Auto); else if (CSSPrimitiveValue::isUnitTypeLength(secondType)) - secondLength = Length(second->computeLengthIntForLength(style(), zoomFactor), Fixed); + secondLength = Length(second->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed); else if (secondType == CSSPrimitiveValue::CSS_PERCENTAGE) secondLength = Length(second->getDoubleValue(), Percent); else @@ -5292,7 +5308,7 @@ void CSSStyleSelector::mapFillXPosition(FillLayer* layer, CSSValue* value) Length l; int type = primitiveValue->primitiveType(); if (CSSPrimitiveValue::isUnitTypeLength(type)) - l = Length(primitiveValue->computeLengthIntForLength(style(), zoomFactor), Fixed); + l = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed); else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) l = Length(primitiveValue->getDoubleValue(), Percent); else @@ -5316,7 +5332,7 @@ void CSSStyleSelector::mapFillYPosition(FillLayer* layer, CSSValue* value) Length l; int type = primitiveValue->primitiveType(); if (CSSPrimitiveValue::isUnitTypeLength(type)) - l = Length(primitiveValue->computeLengthIntForLength(style(), zoomFactor), Fixed); + l = Length(primitiveValue->computeLengthIntForLength(style(), m_rootElementStyle, zoomFactor), Fixed); else if (type == CSSPrimitiveValue::CSS_PERCENTAGE) l = Length(primitiveValue->getDoubleValue(), Percent); else @@ -5756,7 +5772,7 @@ Color CSSStyleSelector::getColorFromPrimitiveValue(CSSPrimitiveValue* primitiveV else col = colorForCSSValue(ident); } else if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_RGBCOLOR) - col.setRGB(primitiveValue->getRGBColorValue()); + col.setRGB(primitiveValue->getRGBA32Value()); return col; } @@ -5830,7 +5846,7 @@ static TransformOperation::OperationType getTransformOperationType(WebKitCSSTran return TransformOperation::NONE; } -bool CSSStyleSelector::createTransformOperations(CSSValue* inValue, RenderStyle* style, TransformOperations& outOperations) +bool CSSStyleSelector::createTransformOperations(CSSValue* inValue, RenderStyle* style, RenderStyle* rootStyle, TransformOperations& outOperations) { float zoomFactor = style ? style->effectiveZoom() : 1; @@ -5897,13 +5913,13 @@ bool CSSStyleSelector::createTransformOperations(CSSValue* inValue, RenderStyle* Length tx = Length(0, Fixed); Length ty = Length(0, Fixed); if (val->operationType() == WebKitCSSTransformValue::TranslateYTransformOperation) - ty = convertToLength(firstValue, style, zoomFactor, &ok); + ty = convertToLength(firstValue, style, rootStyle, zoomFactor, &ok); else { - tx = convertToLength(firstValue, style, zoomFactor, &ok); + tx = convertToLength(firstValue, style, rootStyle, zoomFactor, &ok); if (val->operationType() != WebKitCSSTransformValue::TranslateXTransformOperation) { if (val->length() > 1) { CSSPrimitiveValue* secondValue = static_cast(val->itemWithoutBoundsCheck(1)); - ty = convertToLength(secondValue, style, zoomFactor, &ok); + ty = convertToLength(secondValue, style, rootStyle, zoomFactor, &ok); } } } @@ -5921,19 +5937,19 @@ bool CSSStyleSelector::createTransformOperations(CSSValue* inValue, RenderStyle* Length ty = Length(0, Fixed); Length tz = Length(0, Fixed); if (val->operationType() == WebKitCSSTransformValue::TranslateZTransformOperation) - tz = convertToLength(firstValue, style, zoomFactor, &ok); + tz = convertToLength(firstValue, style, rootStyle, zoomFactor, &ok); else if (val->operationType() == WebKitCSSTransformValue::TranslateYTransformOperation) - ty = convertToLength(firstValue, style, zoomFactor, &ok); + ty = convertToLength(firstValue, style, rootStyle, zoomFactor, &ok); else { - tx = convertToLength(firstValue, style, zoomFactor, &ok); + tx = convertToLength(firstValue, style, rootStyle, zoomFactor, &ok); if (val->operationType() != WebKitCSSTransformValue::TranslateXTransformOperation) { if (val->length() > 2) { CSSPrimitiveValue* thirdValue = static_cast(val->itemWithoutBoundsCheck(2)); - tz = convertToLength(thirdValue, style, zoomFactor, &ok); + tz = convertToLength(thirdValue, style, rootStyle, zoomFactor, &ok); } if (val->length() > 1) { CSSPrimitiveValue* secondValue = static_cast(val->itemWithoutBoundsCheck(1)); - ty = convertToLength(secondValue, style, zoomFactor, &ok); + ty = convertToLength(secondValue, style, rootStyle, zoomFactor, &ok); } } } diff --git a/src/3rdparty/webkit/WebCore/css/CSSStyleSelector.h b/src/3rdparty/webkit/WebCore/css/CSSStyleSelector.h index c9df8765d..d86dd8c8c 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSStyleSelector.h +++ b/src/3rdparty/webkit/WebCore/css/CSSStyleSelector.h @@ -78,7 +78,7 @@ public: }; // This class selects a RenderStyle for a given element based on a collection of stylesheets. - class CSSStyleSelector : Noncopyable { + class CSSStyleSelector : public Noncopyable { public: CSSStyleSelector(Document*, const String& userStyleSheet, StyleSheetList*, CSSStyleSheet*, bool strictParsing, bool matchAuthorAndUserStyles); ~CSSStyleSelector(); @@ -152,7 +152,7 @@ public: void addKeyframeStyle(PassRefPtr rule); - static bool createTransformOperations(CSSValue* inValue, RenderStyle* inStyle, TransformOperations& outOperations); + static bool createTransformOperations(CSSValue* inValue, RenderStyle* inStyle, RenderStyle* rootStyle, TransformOperations& outOperations); private: enum SelectorMatch { SelectorMatches, SelectorFailsLocally, SelectorFailsCompletely }; @@ -266,6 +266,7 @@ public: RefPtr m_style; RenderStyle* m_parentStyle; + RenderStyle* m_rootElementStyle; Element* m_element; StyledElement* m_styledElement; Node* m_parentNode; diff --git a/src/3rdparty/webkit/WebCore/css/CSSValueKeywords.in b/src/3rdparty/webkit/WebCore/css/CSSValueKeywords.in index dac7567fa..c0b52f21d 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSValueKeywords.in +++ b/src/3rdparty/webkit/WebCore/css/CSSValueKeywords.in @@ -341,6 +341,7 @@ invert landscape level line-through +local loud lower -webkit-marquee @@ -543,16 +544,12 @@ round # border-box/content-box/padding-box should be used instead. # border +border-box content +content-box padding padding-box -# -# CSS_PROP_BOX_SIZING -# -border-box -content-box - # # CSS_PROP__KHTML_RTL_ORDERING # diff --git a/src/3rdparty/webkit/WebCore/css/CSSValueList.cpp b/src/3rdparty/webkit/WebCore/css/CSSValueList.cpp index b547768ce..4928026d8 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSValueList.cpp +++ b/src/3rdparty/webkit/WebCore/css/CSSValueList.cpp @@ -70,6 +70,32 @@ void CSSValueList::prepend(PassRefPtr val) m_values.prepend(val); } +bool CSSValueList::removeAll(CSSValue* val) +{ + bool found = false; + // FIXME: we should be implementing operator== to CSSValue and its derived classes + // to make comparison more flexible and fast. + for (size_t index = 0; index < m_values.size(); index++) { + if (m_values.at(index)->cssText() == val->cssText()) { + m_values.remove(index); + found = true; + } + } + + return found; +} + +bool CSSValueList::hasValue(CSSValue* val) +{ + // FIXME: we should be implementing operator== to CSSValue and its derived classes + // to make comparison more flexible and fast. + for (size_t index = 0; index < m_values.size(); index++) { + if (m_values.at(index)->cssText() == val->cssText()) + return true; + } + return false; +} + String CSSValueList::cssText() const { String result = ""; diff --git a/src/3rdparty/webkit/WebCore/css/CSSValueList.h b/src/3rdparty/webkit/WebCore/css/CSSValueList.h index d34f4451f..0d531de74 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSValueList.h +++ b/src/3rdparty/webkit/WebCore/css/CSSValueList.h @@ -52,6 +52,8 @@ public: void append(PassRefPtr); void prepend(PassRefPtr); + bool removeAll(CSSValue*); + bool hasValue(CSSValue*); virtual String cssText() const; diff --git a/src/3rdparty/webkit/WebCore/css/MediaQueryEvaluator.cpp b/src/3rdparty/webkit/WebCore/css/MediaQueryEvaluator.cpp index 16af9812e..4963ed4ed 100644 --- a/src/3rdparty/webkit/WebCore/css/MediaQueryEvaluator.cpp +++ b/src/3rdparty/webkit/WebCore/css/MediaQueryEvaluator.cpp @@ -40,11 +40,17 @@ #include "MediaList.h" #include "MediaQuery.h" #include "MediaQueryExp.h" +#include "NodeRenderStyle.h" #include "Page.h" +#include "RenderView.h" #include "RenderStyle.h" #include "PlatformScreen.h" #include +#if ENABLE(3D_RENDERING) +#include "RenderLayerCompositor.h" +#endif + namespace WebCore { using namespace MediaFeatureNames; @@ -300,7 +306,8 @@ static bool device_heightMediaFeatureEval(CSSValue* value, RenderStyle* style, F { if (value) { FloatRect sg = screenRect(frame->page()->mainFrame()->view()); - return value->isPrimitiveValue() && compareValue(static_cast(sg.height()), static_cast(value)->computeLengthInt(style), op); + RenderStyle* rootStyle = frame->document()->documentElement()->renderStyle(); + return value->isPrimitiveValue() && compareValue(static_cast(sg.height()), static_cast(value)->computeLengthInt(style, rootStyle), op); } // ({,min-,max-}device-height) // assume if we have a device, assume non-zero @@ -311,7 +318,8 @@ static bool device_widthMediaFeatureEval(CSSValue* value, RenderStyle* style, Fr { if (value) { FloatRect sg = screenRect(frame->page()->mainFrame()->view()); - return value->isPrimitiveValue() && compareValue(static_cast(sg.width()), static_cast(value)->computeLengthInt(style), op); + RenderStyle* rootStyle = frame->document()->documentElement()->renderStyle(); + return value->isPrimitiveValue() && compareValue(static_cast(sg.width()), static_cast(value)->computeLengthInt(style, rootStyle), op); } // ({,min-,max-}device-width) // assume if we have a device, assume non-zero @@ -321,9 +329,10 @@ static bool device_widthMediaFeatureEval(CSSValue* value, RenderStyle* style, Fr static bool heightMediaFeatureEval(CSSValue* value, RenderStyle* style, Frame* frame, MediaFeaturePrefix op) { FrameView* view = frame->view(); - + RenderStyle* rootStyle = frame->document()->documentElement()->renderStyle(); + if (value) - return value->isPrimitiveValue() && compareValue(view->layoutHeight(), static_cast(value)->computeLengthInt(style), op); + return value->isPrimitiveValue() && compareValue(view->layoutHeight(), static_cast(value)->computeLengthInt(style, rootStyle), op); return view->layoutHeight() != 0; } @@ -331,9 +340,10 @@ static bool heightMediaFeatureEval(CSSValue* value, RenderStyle* style, Frame* f static bool widthMediaFeatureEval(CSSValue* value, RenderStyle* style, Frame* frame, MediaFeaturePrefix op) { FrameView* view = frame->view(); - + RenderStyle* rootStyle = frame->document()->documentElement()->renderStyle(); + if (value) - return value->isPrimitiveValue() && compareValue(view->layoutWidth(), static_cast(value)->computeLengthInt(style), op); + return value->isPrimitiveValue() && compareValue(view->layoutWidth(), static_cast(value)->computeLengthInt(style, rootStyle), op); return view->layoutWidth() != 0; } @@ -457,15 +467,20 @@ static bool transform_2dMediaFeatureEval(CSSValue* value, RenderStyle*, Frame*, return true; } -static bool transform_3dMediaFeatureEval(CSSValue* value, RenderStyle*, Frame*, MediaFeaturePrefix op) +static bool transform_3dMediaFeatureEval(CSSValue* value, RenderStyle*, Frame* frame, MediaFeaturePrefix op) { bool returnValueIfNoParameter; int have3dRendering; #if ENABLE(3D_RENDERING) - returnValueIfNoParameter = true; - have3dRendering = 1; + bool threeDEnabled = false; + if (RenderView* view = frame->contentRenderer()) + threeDEnabled = view->compositor()->hasAcceleratedCompositing(); + + returnValueIfNoParameter = threeDEnabled; + have3dRendering = threeDEnabled ? 1 : 0; #else + UNUSED_PARAM(frame); returnValueIfNoParameter = false; have3dRendering = 0; #endif diff --git a/src/3rdparty/webkit/WebCore/css/RGBColor.cpp b/src/3rdparty/webkit/WebCore/css/RGBColor.cpp new file mode 100644 index 000000000..5c8c104e7 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/css/RGBColor.cpp @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2008, 2009 Google, Inc. All rights reserved. + * Copyright (C) 2009 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "RGBColor.h" + +namespace WebCore { + +PassRefPtr RGBColor::create(unsigned rgbColor) +{ + return adoptRef(new RGBColor(rgbColor)); +} + +PassRefPtr RGBColor::red() +{ + unsigned value = (m_rgbColor >> 16) & 0xFF; + return CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER); +} + +PassRefPtr RGBColor::green() +{ + unsigned value = (m_rgbColor >> 8) & 0xFF; + return CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER); +} + +PassRefPtr RGBColor::blue() +{ + unsigned value = m_rgbColor & 0xFF; + return CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER); +} + +PassRefPtr RGBColor::alpha() +{ + float value = static_cast((m_rgbColor >> 24) & 0xFF) / 0xFF; + return WebCore::CSSPrimitiveValue::create(value, WebCore::CSSPrimitiveValue::CSS_NUMBER); +} + +} // namespace WebCore + diff --git a/src/3rdparty/webkit/WebCore/css/RGBColor.h b/src/3rdparty/webkit/WebCore/css/RGBColor.h new file mode 100644 index 000000000..7937a08c8 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/css/RGBColor.h @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2006, 2007, 2008, 2009 Google, Inc. All rights reserved. + * Copyright (C) 2009 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef RGBColor_h +#define RGBColor_h + +#include "CSSPrimitiveValue.h" +#include "Color.h" +#include + +namespace WebCore { + + class RGBColor : public RefCounted { + public: + static PassRefPtr create(unsigned rgbColor); + + PassRefPtr red(); + PassRefPtr green(); + PassRefPtr blue(); + PassRefPtr alpha(); + + Color color() const { return Color(m_rgbColor); } + + private: + RGBColor(unsigned rgbColor) + : m_rgbColor(rgbColor) + { + } + + RGBA32 m_rgbColor; + }; + +} // namespace WebCore + +#endif // RGBColor_h diff --git a/src/3rdparty/webkit/WebCore/css/RGBColor.idl b/src/3rdparty/webkit/WebCore/css/RGBColor.idl index f76b6a253..d29f8114b 100644 --- a/src/3rdparty/webkit/WebCore/css/RGBColor.idl +++ b/src/3rdparty/webkit/WebCore/css/RGBColor.idl @@ -22,9 +22,7 @@ module css { // Introduced in DOM Level 2: interface [ - ObjCCustomImplementation, GenerateConstructor, - PODType=RGBA32, InterfaceUUID=2e3b1501-2cf7-4a4a-bbf7-d8843d1c3be7, ImplementationUUID=cf779953-4898-4800-aa31-6c9e3f4711be ] RGBColor { diff --git a/src/3rdparty/webkit/WebCore/css/ShadowValue.cpp b/src/3rdparty/webkit/WebCore/css/ShadowValue.cpp index 579440528..27be86c11 100644 --- a/src/3rdparty/webkit/WebCore/css/ShadowValue.cpp +++ b/src/3rdparty/webkit/WebCore/css/ShadowValue.cpp @@ -2,7 +2,7 @@ * This file is part of the DOM implementation for KDE. * * (C) 1999-2003 Lars Knoll (knoll@kde.org) - * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. + * Copyright (C) 2004, 2005, 2006, 2009 Apple Computer, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -31,10 +31,14 @@ namespace WebCore { ShadowValue::ShadowValue(PassRefPtr _x, PassRefPtr _y, PassRefPtr _blur, + PassRefPtr _spread, + PassRefPtr _style, PassRefPtr _color) : x(_x) , y(_y) , blur(_blur) + , spread(_spread) + , style(_style) , color(_color) { } @@ -60,6 +64,16 @@ String ShadowValue::cssText() const text += " "; text += blur->cssText(); } + if (spread) { + if (!text.isEmpty()) + text += " "; + text += spread->cssText(); + } + if (style) { + if (!text.isEmpty()) + text += " "; + text += style->cssText(); + } return text; } diff --git a/src/3rdparty/webkit/WebCore/css/ShadowValue.h b/src/3rdparty/webkit/WebCore/css/ShadowValue.h index 179531ecc..a88a0e784 100644 --- a/src/3rdparty/webkit/WebCore/css/ShadowValue.h +++ b/src/3rdparty/webkit/WebCore/css/ShadowValue.h @@ -1,6 +1,6 @@ /* * (C) 1999-2003 Lars Knoll (knoll@kde.org) - * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2005, 2006, 2008, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -35,9 +35,11 @@ public: static PassRefPtr create(PassRefPtr x, PassRefPtr y, PassRefPtr blur, + PassRefPtr spread, + PassRefPtr style, PassRefPtr color) { - return adoptRef(new ShadowValue(x, y, blur, color)); + return adoptRef(new ShadowValue(x, y, blur, spread, style, color)); } virtual String cssText() const; @@ -45,12 +47,16 @@ public: RefPtr x; RefPtr y; RefPtr blur; + RefPtr spread; + RefPtr style; RefPtr color; private: ShadowValue(PassRefPtr x, PassRefPtr y, PassRefPtr blur, + PassRefPtr spread, + PassRefPtr style, PassRefPtr color); }; diff --git a/src/3rdparty/webkit/WebCore/css/WebKitCSSMatrix.cpp b/src/3rdparty/webkit/WebCore/css/WebKitCSSMatrix.cpp index 574a01a89..aaf5c3d6a 100644 --- a/src/3rdparty/webkit/WebCore/css/WebKitCSSMatrix.cpp +++ b/src/3rdparty/webkit/WebCore/css/WebKitCSSMatrix.cpp @@ -72,7 +72,7 @@ void WebKitCSSMatrix::setMatrixValue(const String& string, ExceptionCode& ec) // requires style (i.e., param uses 'ems' or 'exs') PassRefPtr val = styleDeclaration->getPropertyCSSValue(CSSPropertyWebkitTransform); TransformOperations operations; - if (!CSSStyleSelector::createTransformOperations(val.get(), 0, operations)) { + if (!CSSStyleSelector::createTransformOperations(val.get(), 0, 0, operations)) { ec = SYNTAX_ERR; return; } diff --git a/src/3rdparty/webkit/WebCore/css/html.css b/src/3rdparty/webkit/WebCore/css/html.css index 8dad349b2..6b03390ed 100644 --- a/src/3rdparty/webkit/WebCore/css/html.css +++ b/src/3rdparty/webkit/WebCore/css/html.css @@ -360,6 +360,8 @@ textarea { resize: auto; cursor: auto; padding: 2px; + white-space: pre-wrap; + word-wrap: break-word; } input::-webkit-input-placeholder, isindex::-webkit-input-placeholder { diff --git a/src/3rdparty/webkit/WebCore/css/makeprop.pl b/src/3rdparty/webkit/WebCore/css/makeprop.pl index bc979f9b6..115969f62 100644 --- a/src/3rdparty/webkit/WebCore/css/makeprop.pl +++ b/src/3rdparty/webkit/WebCore/css/makeprop.pl @@ -26,9 +26,9 @@ use warnings; open NAMES, ") { - next if (m/#/); - chomp $_; - next if ($_ eq ""); + next if (m/(^#)|(^\s*$)/); + # Input may use a different EOL sequence than $/, so avoid chomp. + $_ =~ s/[\r\n]+$//g; push @names, $_; } close(NAMES); diff --git a/src/3rdparty/webkit/WebCore/css/makevalues.pl b/src/3rdparty/webkit/WebCore/css/makevalues.pl index 5d4e8ac29..3f52e6404 100644 --- a/src/3rdparty/webkit/WebCore/css/makevalues.pl +++ b/src/3rdparty/webkit/WebCore/css/makevalues.pl @@ -26,9 +26,9 @@ use warnings; open NAMES, ") { - next if (m/#/); - chomp $_; - next if ($_ eq ""); + next if (m/(^#)|(^\s*$)/); + # Input may use a different EOL sequence than $/, so avoid chomp. + $_ =~ s/[\r\n]+$//g; push @names, $_; } close(NAMES); diff --git a/src/3rdparty/webkit/WebCore/css/mediaControlsQT.css b/src/3rdparty/webkit/WebCore/css/mediaControlsQT.css index a9b7a5f3b..5cf48ae63 100644 --- a/src/3rdparty/webkit/WebCore/css/mediaControlsQT.css +++ b/src/3rdparty/webkit/WebCore/css/mediaControlsQT.css @@ -74,7 +74,6 @@ audio::-webkit-media-controls-current-time-display, video::-webkit-media-control font: -webkit-small-control; font-size: 9px; overflow: hidden; - height: 13px; width: 45px; color: white; text-shadow: black 0px 1px 1px; @@ -97,7 +96,6 @@ audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-contr font: -webkit-small-control; font-size: 9px; overflow: hidden; - height: 13px; width: 45px; color: white; text-shadow: black 0px 1px 1px; @@ -116,7 +114,7 @@ audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline { height: 13px; padding: 0px; margin: 0px; - margin-top: 4px; + margin-top: 2px; } audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button { diff --git a/src/3rdparty/webkit/WebCore/css/tokenizer.flex b/src/3rdparty/webkit/WebCore/css/tokenizer.flex index e800bae03..1569ee205 100644 --- a/src/3rdparty/webkit/WebCore/css/tokenizer.flex +++ b/src/3rdparty/webkit/WebCore/css/tokenizer.flex @@ -73,6 +73,7 @@ nth (-?[0-9]*n[\+-][0-9]+)|(-?[0-9]*n) "!"{w}"important" {yyTok = IMPORTANT_SYM; return yyTok;} {num}em {yyTok = EMS; return yyTok;} +{num}rem {yyTok = REMS; return yyTok;} {num}__qem {yyTok = QEMS; return yyTok;} /* quirky ems */ {num}ex {yyTok = EXS; return yyTok;} {num}px {yyTok = PXS; return yyTok;} diff --git a/src/3rdparty/webkit/WebCore/dom/ClassNames.h b/src/3rdparty/webkit/WebCore/dom/ClassNames.h index 8f4852f0b..a836606b6 100644 --- a/src/3rdparty/webkit/WebCore/dom/ClassNames.h +++ b/src/3rdparty/webkit/WebCore/dom/ClassNames.h @@ -27,7 +27,7 @@ namespace WebCore { - class ClassNamesData : Noncopyable { + class ClassNamesData : public Noncopyable { public: ClassNamesData(const String& string, bool shouldFoldCase) : m_string(string), m_shouldFoldCase(shouldFoldCase), m_createdVector(false) diff --git a/src/3rdparty/webkit/WebCore/dom/Document.cpp b/src/3rdparty/webkit/WebCore/dom/Document.cpp index 3ee00adb5..228cfded2 100644 --- a/src/3rdparty/webkit/WebCore/dom/Document.cpp +++ b/src/3rdparty/webkit/WebCore/dom/Document.cpp @@ -335,6 +335,9 @@ Document::Document(Frame* frame, bool isXHTML) , m_hasOpenDatabases(false) #endif , m_usingGeolocation(false) +#if ENABLE(WML) + , m_containsWMLContent(false) +#endif { m_document.resetSkippingRef(this); @@ -361,11 +364,14 @@ Document::Document(Frame* frame, bool isXHTML) m_inDocument = true; m_inStyleRecalc = false; m_closeAfterStyleRecalc = false; + m_usesDescendantRules = false; m_usesSiblingRules = false; m_usesFirstLineRules = false; m_usesFirstLetterRules = false; m_usesBeforeAfterRules = false; + m_usesRemUnits = false; + m_gotoAnchorNeededAfterStylesheetsLoad = false; m_styleSelector = 0; @@ -1132,6 +1138,11 @@ void Document::styleRecalcTimerFired(Timer*) updateStyleIfNeeded(); } +bool Document::childNeedsAndNotInStyleRecalc() +{ + return childNeedsStyleRecalc() && !m_inStyleRecalc; +} + void Document::recalcStyle(StyleChange change) { // we should not enter style recalc while painting @@ -1678,13 +1689,14 @@ void Document::implicitClose() } #if PLATFORM(MAC) - if (f && renderObject && this == topDocument() && AXObjectCache::accessibilityEnabled()) + if (f && renderObject && this == topDocument() && AXObjectCache::accessibilityEnabled()) { // The AX cache may have been cleared at this point, but we need to make sure it contains an // AX object to send the notification to. getOrCreate will make sure that an valid AX object // exists in the cache (we ignore the return value because we don't need it here). This is // only safe to call when a layout is not in progress, so it can not be used in postNotification. axObjectCache()->getOrCreate(renderObject); axObjectCache()->postNotification(renderObject, "AXLoadComplete", true); + } #endif #if ENABLE(SVG) diff --git a/src/3rdparty/webkit/WebCore/dom/Document.h b/src/3rdparty/webkit/WebCore/dom/Document.h index 82f0455e4..6655d9b7e 100644 --- a/src/3rdparty/webkit/WebCore/dom/Document.h +++ b/src/3rdparty/webkit/WebCore/dom/Document.h @@ -377,6 +377,8 @@ public: void setUsesFirstLetterRules(bool b) { m_usesFirstLetterRules = b; } bool usesBeforeAfterRules() const { return m_usesBeforeAfterRules; } void setUsesBeforeAfterRules(bool b) { m_usesBeforeAfterRules = b; } + bool usesRemUnits() const { return m_usesRemUnits; } + void setUsesRemUnits(bool b) { m_usesRemUnits = b; } // Machinery for saving and restoring state when you leave and then go back to a page. void registerFormElementWithState(Element* e) { m_formElementsWithState.add(e); } @@ -404,6 +406,7 @@ public: PassRefPtr createEditingTextNode(const String&); virtual void recalcStyle(StyleChange = NoChange); + bool childNeedsAndNotInStyleRecalc(); virtual void updateStyleIfNeeded(); void updateLayout(); void updateLayoutIgnorePendingStylesheets(); @@ -795,6 +798,8 @@ public: protected: Document(Frame*, bool isXHTML); + void setStyleSelector(CSSStyleSelector* styleSelector) { m_styleSelector = styleSelector; } + private: virtual void refScriptExecutionContext() { ref(); } virtual void derefScriptExecutionContext() { deref(); } @@ -903,6 +908,7 @@ private: bool m_usesFirstLineRules; bool m_usesFirstLetterRules; bool m_usesBeforeAfterRules; + bool m_usesRemUnits; bool m_gotoAnchorNeededAfterStylesheetsLoad; bool m_isDNSPrefetchEnabled; bool m_haveExplicitlyDisabledDNSPrefetch; @@ -1029,6 +1035,9 @@ public: bool usingGeolocation() const { return m_usingGeolocation; }; #if ENABLE(WML) + void setContainsWMLContent(bool value) { m_containsWMLContent = value; } + bool containsWMLContent() const { return m_containsWMLContent; } + void resetWMLPageState(); void initializeWMLPageState(); #endif @@ -1111,6 +1120,10 @@ private: #endif bool m_usingGeolocation; + +#if ENABLE(WML) + bool m_containsWMLContent; +#endif }; inline bool Document::hasElementWithId(AtomicStringImpl* id) const diff --git a/src/3rdparty/webkit/WebCore/dom/Element.cpp b/src/3rdparty/webkit/WebCore/dom/Element.cpp index 0e6c2450c..1956be446 100644 --- a/src/3rdparty/webkit/WebCore/dom/Element.cpp +++ b/src/3rdparty/webkit/WebCore/dom/Element.cpp @@ -33,7 +33,6 @@ #include "ClientRect.h" #include "ClientRectList.h" #include "Document.h" -#include "Editor.h" #include "ElementRareData.h" #include "ExceptionCode.h" #include "FocusController.h" @@ -45,9 +44,7 @@ #include "NodeList.h" #include "NodeRenderStyle.h" #include "Page.h" -#include "PlatformString.h" -#include "RenderBlock.h" -#include "SelectionController.h" +#include "RenderView.h" #include "TextIterator.h" #include "XMLNames.h" @@ -382,8 +379,10 @@ int Element::clientWidth() bool inCompatMode = document()->inCompatMode(); if ((!inCompatMode && document()->documentElement() == this) || (inCompatMode && isHTMLElement() && document()->body() == this)) { - if (FrameView* view = document()->view()) - return adjustForAbsoluteZoom(view->layoutWidth(), document()->renderer()); + if (FrameView* view = document()->view()) { + if (RenderView* renderView = document()->renderView()) + return adjustForAbsoluteZoom(view->layoutWidth(), renderView); + } } if (RenderBox* rend = renderBox()) @@ -401,8 +400,10 @@ int Element::clientHeight() if ((!inCompatMode && document()->documentElement() == this) || (inCompatMode && isHTMLElement() && document()->body() == this)) { - if (FrameView* view = document()->view()) - return adjustForAbsoluteZoom(view->layoutHeight(), document()->renderer()); + if (FrameView* view = document()->view()) { + if (RenderView* renderView = document()->renderView()) + return adjustForAbsoluteZoom(view->layoutHeight(), renderView); + } } if (RenderBox* rend = renderBox()) @@ -589,6 +590,12 @@ PassRefPtr Element::createAttribute(const QualifiedName& name, const } void Element::attributeChanged(Attribute* attr, bool) +{ + recalcStyleIfNeededAfterAttributeChanged(attr); + updateAfterAttributeChanged(attr); +} + +void Element::updateAfterAttributeChanged(Attribute* attr) { if (!document()->axObjectCache()->accessibilityEnabled()) return; @@ -602,7 +609,13 @@ void Element::attributeChanged(Attribute* attr, bool) document()->axObjectCache()->handleAriaRoleChanged(renderer()); } } - + +void Element::recalcStyleIfNeededAfterAttributeChanged(Attribute* attr) +{ + if (document()->attached() && document()->styleSelector()->hasSelectorForAttribute(attr->name().localName())) + setNeedsStyleRecalc(); +} + void Element::setAttributeMap(PassRefPtr list) { document()->incDOMTreeVersion(); @@ -854,7 +867,11 @@ void Element::recalcStyle(StyleChange change) setRenderStyle(newStyle); if (change != Force) { - if ((document()->usesDescendantRules() || hasPositionalRules) && styleChangeType() >= FullStyleChange) + // If "rem" units are used anywhere in the document, and if the document element's font size changes, then go ahead and force font updating + // all the way down the tree. This is simpler than having to maintain a cache of objects (and such font size changes should be rare anyway). + if (document()->usesRemUnits() && ch != NoChange && currentStyle && newStyle && currentStyle->fontSize() != newStyle->fontSize() && document()->documentElement() == this) + change = Force; + else if ((document()->usesDescendantRules() || hasPositionalRules) && styleChangeType() >= FullStyleChange) change = Force; else change = ch; diff --git a/src/3rdparty/webkit/WebCore/dom/Element.h b/src/3rdparty/webkit/WebCore/dom/Element.h index b0bbeb352..0ff2ed148 100644 --- a/src/3rdparty/webkit/WebCore/dom/Element.h +++ b/src/3rdparty/webkit/WebCore/dom/Element.h @@ -136,6 +136,11 @@ public: // This method is called whenever an attribute is added, changed or removed. virtual void attributeChanged(Attribute*, bool preserveDecls = false); + // The implementation of Element::attributeChanged() calls the following two functions. + // They are separated to allow a different flow of control in StyledElement::attributeChanged(). + void recalcStyleIfNeededAfterAttributeChanged(Attribute*); + void updateAfterAttributeChanged(Attribute*); + // not part of the DOM void setAttributeMap(PassRefPtr); @@ -207,6 +212,8 @@ public: virtual bool isEnabledFormControl() const { return true; } virtual bool isReadOnlyFormControl() const { return false; } virtual bool isTextFormControl() const { return false; } + virtual bool isOptionalFormControl() const { return false; } + virtual bool isRequiredFormControl() const { return false; } virtual bool formControlValueMatchesRenderer() const { return false; } virtual void setFormControlValueMatchesRenderer(bool) { } diff --git a/src/3rdparty/webkit/WebCore/dom/ErrorEvent.cpp b/src/3rdparty/webkit/WebCore/dom/ErrorEvent.cpp new file mode 100644 index 000000000..2627d0154 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/dom/ErrorEvent.cpp @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" + +#if ENABLE(WORKERS) + +#include "ErrorEvent.h" + +#include "EventNames.h" + +namespace WebCore { + +ErrorEvent::ErrorEvent() +{ +} + +ErrorEvent::ErrorEvent(const String& message, const String& fileName, unsigned lineNumber) + : Event(eventNames().errorEvent, false, true) + , m_message(message) + , m_fileName(fileName) + , m_lineNumber(lineNumber) +{ +} + +ErrorEvent::~ErrorEvent() +{ +} + +void ErrorEvent::initErrorEvent(const AtomicString& type, bool canBubble, bool cancelable, const String& message, const String& fileName, unsigned lineNumber) +{ + if (dispatched()) + return; + + initEvent(type, canBubble, cancelable); + + m_message = message; + m_fileName = fileName; + m_lineNumber = lineNumber; +} + +bool ErrorEvent::isErrorEvent() const +{ + return true; +} + +} // namespace WebCore + +#endif // ENABLE(WORKERS) diff --git a/src/3rdparty/webkit/WebCore/dom/ErrorEvent.h b/src/3rdparty/webkit/WebCore/dom/ErrorEvent.h new file mode 100644 index 000000000..f81530aee --- /dev/null +++ b/src/3rdparty/webkit/WebCore/dom/ErrorEvent.h @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef ErrorEvent_h +#define ErrorEvent_h + +#if ENABLE(WORKERS) + +#include "Event.h" +#include "PlatformString.h" + +namespace WebCore { + + class ErrorEvent : public Event { + public: + static PassRefPtr create() + { + return adoptRef(new ErrorEvent); + } + static PassRefPtr create(const String& message, const String& fileName, unsigned lineNumber) + { + return adoptRef(new ErrorEvent(message, fileName, lineNumber)); + } + virtual ~ErrorEvent(); + + void initErrorEvent(const AtomicString& type, bool canBubble, bool cancelable, const String& message, const String& fileName, unsigned lineNumber); + + const String& message() const { return m_message; } + const String& filename() const { return m_fileName; } + unsigned lineno() const { return m_lineNumber; } + + virtual bool isErrorEvent() const; + + private: + ErrorEvent(); + ErrorEvent(const String& message, const String& fileName, unsigned lineNumber); + + String m_message; + String m_fileName; + unsigned m_lineNumber; + }; + +} // namespace WebCore + +#endif // ENABLE(WORKERS) + +#endif // ErrorEvent_h diff --git a/src/3rdparty/webkit/WebCore/dom/ErrorEvent.idl b/src/3rdparty/webkit/WebCore/dom/ErrorEvent.idl new file mode 100644 index 000000000..6125e1ed0 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/dom/ErrorEvent.idl @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +module events { + + interface [ + Conditional=WORKERS, + GenerateConstructor, + NoStaticTables + ] ErrorEvent : Event { + + readonly attribute DOMString message; + readonly attribute DOMString filename; + readonly attribute unsigned long lineno; + + void initErrorEvent(in DOMString typeArg, in boolean canBubbleArg, in boolean cancelableArg, in DOMString messageArg, in DOMString filenameArg, in unsigned long linenoArg); + }; + +} diff --git a/src/3rdparty/webkit/WebCore/dom/Event.cpp b/src/3rdparty/webkit/WebCore/dom/Event.cpp index b4b87edbc..9d1d07995 100644 --- a/src/3rdparty/webkit/WebCore/dom/Event.cpp +++ b/src/3rdparty/webkit/WebCore/dom/Event.cpp @@ -158,6 +158,13 @@ bool Event::isStorageEvent() const } #endif +#if ENABLE(WORKERS) +bool Event::isErrorEvent() const +{ + return false; +} +#endif + bool Event::storesResultAsString() const { return false; diff --git a/src/3rdparty/webkit/WebCore/dom/Event.h b/src/3rdparty/webkit/WebCore/dom/Event.h index 69842153c..823ff2015 100644 --- a/src/3rdparty/webkit/WebCore/dom/Event.h +++ b/src/3rdparty/webkit/WebCore/dom/Event.h @@ -119,7 +119,10 @@ namespace WebCore { #if ENABLE(DOM_STORAGE) virtual bool isStorageEvent() const; #endif - +#if ENABLE(WORKERS) + virtual bool isErrorEvent() const; +#endif + bool propagationStopped() const { return m_propagationStopped; } bool defaultPrevented() const { return m_defaultPrevented; } diff --git a/src/3rdparty/webkit/WebCore/dom/EventListener.h b/src/3rdparty/webkit/WebCore/dom/EventListener.h index dbc41b225..d288c8d65 100644 --- a/src/3rdparty/webkit/WebCore/dom/EventListener.h +++ b/src/3rdparty/webkit/WebCore/dom/EventListener.h @@ -21,6 +21,7 @@ #ifndef EventListener_h #define EventListener_h +#include "PlatformString.h" #include namespace JSC { @@ -35,6 +36,8 @@ namespace WebCore { public: virtual ~EventListener() { } virtual void handleEvent(Event*, bool isWindowEvent = false) = 0; + // Return true to indicate that the error is handled. + virtual bool reportError(const String& /*message*/, const String& /*url*/, int /*lineNumber*/) { return false; } virtual bool wasCreatedFromMarkup() const { return false; } #if USE(JSC) diff --git a/src/3rdparty/webkit/WebCore/dom/EventTarget.cpp b/src/3rdparty/webkit/WebCore/dom/EventTarget.cpp index 437f5ba2f..42668e3e2 100644 --- a/src/3rdparty/webkit/WebCore/dom/EventTarget.cpp +++ b/src/3rdparty/webkit/WebCore/dom/EventTarget.cpp @@ -89,7 +89,7 @@ Worker* EventTarget::toWorker() return 0; } -WorkerContext* EventTarget::toWorkerContext() +DedicatedWorkerContext* EventTarget::toDedicatedWorkerContext() { return 0; } diff --git a/src/3rdparty/webkit/WebCore/dom/EventTarget.h b/src/3rdparty/webkit/WebCore/dom/EventTarget.h index 73a32e3f9..f0c794fb3 100644 --- a/src/3rdparty/webkit/WebCore/dom/EventTarget.h +++ b/src/3rdparty/webkit/WebCore/dom/EventTarget.h @@ -38,6 +38,7 @@ namespace WebCore { class AbstractWorker; class AtomicString; + class DedicatedWorkerContext; class DOMApplicationCache; class DOMWindow; class Event; @@ -48,7 +49,6 @@ namespace WebCore { class ScriptExecutionContext; class SharedWorker; class Worker; - class WorkerContext; class XMLHttpRequest; class XMLHttpRequestUpload; @@ -69,7 +69,7 @@ namespace WebCore { #endif #if ENABLE(WORKERS) virtual Worker* toWorker(); - virtual WorkerContext* toWorkerContext(); + virtual DedicatedWorkerContext* toDedicatedWorkerContext(); #endif #if ENABLE(SHARED_WORKERS) diff --git a/src/3rdparty/webkit/WebCore/dom/InputElement.cpp b/src/3rdparty/webkit/WebCore/dom/InputElement.cpp index 108d17e83..b25cd5ca2 100644 --- a/src/3rdparty/webkit/WebCore/dom/InputElement.cpp +++ b/src/3rdparty/webkit/WebCore/dom/InputElement.cpp @@ -116,6 +116,8 @@ void InputElement::updateSelectionRange(InputElement* inputElement, Element* ele if (!inputElement->isTextField()) return; + element->document()->updateLayoutIgnorePendingStylesheets(); + if (RenderTextControl* renderer = toRenderTextControl(element->renderer())) renderer->setSelectionRange(start, end); } diff --git a/src/3rdparty/webkit/WebCore/dom/MessagePortChannel.h b/src/3rdparty/webkit/WebCore/dom/MessagePortChannel.h index 384102030..93b224b56 100644 --- a/src/3rdparty/webkit/WebCore/dom/MessagePortChannel.h +++ b/src/3rdparty/webkit/WebCore/dom/MessagePortChannel.h @@ -48,7 +48,7 @@ namespace WebCore { // MessagePortChannel is a platform-independent interface to the remote side of a message channel. // It acts as a wrapper around the platform-dependent PlatformMessagePortChannel implementation which ensures that the platform-dependent close() method is invoked before destruction. - class MessagePortChannel : Noncopyable { + class MessagePortChannel : public Noncopyable { public: static void createChannel(PassRefPtr, PassRefPtr); @@ -95,6 +95,8 @@ namespace WebCore { ~MessagePortChannel(); + PlatformMessagePortChannel* channel() const { return m_channel.get(); } + private: MessagePortChannel(PassRefPtr); RefPtr m_channel; diff --git a/src/3rdparty/webkit/WebCore/dom/Position.h b/src/3rdparty/webkit/WebCore/dom/Position.h index 57f73ec8a..b434ec990 100644 --- a/src/3rdparty/webkit/WebCore/dom/Position.h +++ b/src/3rdparty/webkit/WebCore/dom/Position.h @@ -70,7 +70,7 @@ public: // For creating offset positions: Position(PassRefPtr anchorNode, int offset, AnchorType); - AnchorType anchorType() const { return m_anchorType; } + AnchorType anchorType() const { return static_cast(m_anchorType); } void clear() { m_anchorNode.clear(); m_offset = 0; m_anchorType = PositionIsOffsetInAnchor; m_isLegacyEditingPosition = false; } @@ -172,7 +172,7 @@ private: // returns true, then other places in editing will treat m_offset == 0 as "before the anchor" // and m_offset > 0 as "after the anchor node". See rangeCompliantEquivalent for more info. int m_offset; - AnchorType m_anchorType : 2; + unsigned m_anchorType : 2; bool m_isLegacyEditingPosition : 1; }; diff --git a/src/3rdparty/webkit/WebCore/dom/ProcessingInstruction.cpp b/src/3rdparty/webkit/WebCore/dom/ProcessingInstruction.cpp index 879bf625b..806bf9211 100644 --- a/src/3rdparty/webkit/WebCore/dom/ProcessingInstruction.cpp +++ b/src/3rdparty/webkit/WebCore/dom/ProcessingInstruction.cpp @@ -123,7 +123,7 @@ void ProcessingInstruction::checkStyleSheet() bool isCSS = type.isEmpty() || type == "text/css"; #if ENABLE(XSLT) m_isXSL = (type == "text/xml" || type == "text/xsl" || type == "application/xml" || - type == "application/xhtml+xml" || type == "application/rss+xml" || type == "application/atom=xml"); + type == "application/xhtml+xml" || type == "application/rss+xml" || type == "application/atom+xml"); if (!isCSS && !m_isXSL) #else if (!isCSS) diff --git a/src/3rdparty/webkit/WebCore/dom/Range.cpp b/src/3rdparty/webkit/WebCore/dom/Range.cpp index e7fd8a230..edee30507 100644 --- a/src/3rdparty/webkit/WebCore/dom/Range.cpp +++ b/src/3rdparty/webkit/WebCore/dom/Range.cpp @@ -90,6 +90,7 @@ PassRefPtr Range::create(PassRefPtr ownerDocument, PassRefPtr Range::create(PassRefPtr ownerDocument, const Position& start, const Position& end) { + // FIXME: we shouldn't be using deprecatedEditingOffset here return adoptRef(new Range(ownerDocument, start.node(), start.deprecatedEditingOffset(), end.node(), end.deprecatedEditingOffset())); } @@ -294,7 +295,7 @@ bool Range::isPointInRange(Node* refNode, int offset, ExceptionCode& ec) && compareBoundaryPoints(refNode, offset, m_end.container(), m_end.offset()) <= 0; } -short Range::comparePoint(Node* refNode, int offset, ExceptionCode& ec) +short Range::comparePoint(Node* refNode, int offset, ExceptionCode& ec) const { // http://developer.mozilla.org/en/docs/DOM:range.comparePoint // This method returns -1, 0 or 1 depending on if the point described by the @@ -332,7 +333,7 @@ short Range::comparePoint(Node* refNode, int offset, ExceptionCode& ec) return 0; } -Range::CompareResults Range::compareNode(Node* refNode, ExceptionCode& ec) +Range::CompareResults Range::compareNode(Node* refNode, ExceptionCode& ec) const { // http://developer.mozilla.org/en/docs/DOM:range.compareNode // This method returns 0, 1, 2, or 3 based on if the node is before, after, diff --git a/src/3rdparty/webkit/WebCore/dom/Range.h b/src/3rdparty/webkit/WebCore/dom/Range.h index 115f44258..1487a7cc7 100644 --- a/src/3rdparty/webkit/WebCore/dom/Range.h +++ b/src/3rdparty/webkit/WebCore/dom/Range.h @@ -59,10 +59,10 @@ public: void setStart(PassRefPtr container, int offset, ExceptionCode&); void setEnd(PassRefPtr container, int offset, ExceptionCode&); void collapse(bool toStart, ExceptionCode&); - bool isPointInRange(Node* refNode, int offset, ExceptionCode& ec); - short comparePoint(Node* refNode, int offset, ExceptionCode& ec); + bool isPointInRange(Node* refNode, int offset, ExceptionCode&); + short comparePoint(Node* refNode, int offset, ExceptionCode&) const; enum CompareResults { NODE_BEFORE, NODE_AFTER, NODE_BEFORE_AND_AFTER, NODE_INSIDE }; - CompareResults compareNode(Node* refNode, ExceptionCode&); + CompareResults compareNode(Node* refNode, ExceptionCode&) const; enum CompareHow { START_TO_START, START_TO_END, END_TO_END, END_TO_START }; short compareBoundaryPoints(CompareHow, const Range* sourceRange, ExceptionCode&) const; static short compareBoundaryPoints(Node* containerA, int offsetA, Node* containerB, int offsetB); diff --git a/src/3rdparty/webkit/WebCore/dom/SelectElement.cpp b/src/3rdparty/webkit/WebCore/dom/SelectElement.cpp index 7552c5638..45f3bd879 100644 --- a/src/3rdparty/webkit/WebCore/dom/SelectElement.cpp +++ b/src/3rdparty/webkit/WebCore/dom/SelectElement.cpp @@ -47,10 +47,17 @@ #include "WMLSelectElement.h" #endif -#if PLATFORM(MAC) +// Configure platform-specific behavior when focused pop-up receives arrow/space/return keystroke. +// (PLATFORM(MAC) is always false in Chromium, hence the extra test.) +#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && PLATFORM(DARWIN)) #define ARROW_KEYS_POP_MENU 1 +#define SPACE_OR_RETURN_POP_MENU 0 +#elif PLATFORM(GTK) +#define ARROW_KEYS_POP_MENU 0 +#define SPACE_OR_RETURN_POP_MENU 1 #else #define ARROW_KEYS_POP_MENU 0 +#define SPACE_OR_RETURN_POP_MENU 0 #endif using std::min; @@ -509,6 +516,29 @@ void SelectElement::reset(SelectElementData& data, Element* element) element->setNeedsStyleRecalc(); } + +#if !ARROW_KEYS_POP_MENU +enum SkipDirection { + SkipBackwards = -1, + SkipForwards = 1 +}; + +// Returns the index of the next valid list item |skip| items past |listIndex| in direction |direction|. +static int nextValidIndex(const Vector& listItems, int listIndex, SkipDirection direction, int skip) +{ + int lastGoodIndex = listIndex; + int size = listItems.size(); + for (listIndex += direction; listIndex >= 0 && listIndex < size; listIndex += direction) { + --skip; + if (!listItems[listIndex]->disabled() && isOptionElement(listItems[listIndex])) { + lastGoodIndex = listIndex; + if (skip <= 0) + break; + } + } + return lastGoodIndex; +} +#endif void SelectElement::menuListDefaultEventHandler(SelectElementData& data, Element* element, Event* event, HTMLFormElement* htmlForm) { @@ -535,24 +565,30 @@ void SelectElement::menuListDefaultEventHandler(SelectElementData& data, Element } #else const Vector& listItems = data.listItems(element); - int size = listItems.size(); int listIndex = optionToListIndex(data, element, selectedIndex(data, element)); if (keyIdentifier == "Down" || keyIdentifier == "Right") { - for (listIndex += 1; - listIndex >= 0 && listIndex < size && (listItems[listIndex]->disabled() || !isOptionElement(listItems[listIndex])); - ++listIndex) { } - if (listIndex >= 0 && listIndex < size) - setSelectedIndex(data, element, listToOptionIndex(data, element, listIndex)); + listIndex = nextValidIndex(listItems, listIndex, SkipForwards, 1); handled = true; } else if (keyIdentifier == "Up" || keyIdentifier == "Left") { - for (listIndex -= 1; - listIndex >= 0 && listIndex < size && (listItems[listIndex]->disabled() || !isOptionElement(listItems[listIndex])); - --listIndex) { } - if (listIndex >= 0 && listIndex < size) - setSelectedIndex(data, element, listToOptionIndex(data, element, listIndex)); + listIndex = nextValidIndex(listItems, listIndex, SkipBackwards, 1); + handled = true; + } else if (keyIdentifier == "PageDown") { + listIndex = nextValidIndex(listItems, listIndex, SkipForwards, 3); + handled = true; + } else if (keyIdentifier == "PageUp") { + listIndex = nextValidIndex(listItems, listIndex, SkipBackwards, 3); + handled = true; + } else if (keyIdentifier == "Home") { + listIndex = nextValidIndex(listItems, -1, SkipForwards, 1); + handled = true; + } else if (keyIdentifier == "End") { + listIndex = nextValidIndex(listItems, listItems.size(), SkipBackwards, 1); handled = true; } + + if (handled && listIndex >= 0 && listIndex < listItems.size()) + setSelectedIndex(data, element, listToOptionIndex(data, element, listIndex)); #endif if (handled) event->setDefaultHandled(); @@ -567,7 +603,17 @@ void SelectElement::menuListDefaultEventHandler(SelectElementData& data, Element int keyCode = static_cast(event)->keyCode(); bool handled = false; -#if ARROW_KEYS_POP_MENU +#if SPACE_OR_RETURN_POP_MENU + if (keyCode == ' ' || keyCode == '\r') { + element->focus(); + // Save the selection so it can be compared to the new selection when dispatching change events during setSelectedIndex, + // which gets called from RenderMenuList::valueChanged, which gets called after the user makes a selection from the menu. + saveLastSelection(data, element); + if (RenderMenuList* menuList = static_cast(element->renderer())) + menuList->showPopup(); + handled = true; + } +#elif ARROW_KEYS_POP_MENU if (keyCode == ' ') { element->focus(); // Save the selection so it can be compared to the new selection when dispatching change events during setSelectedIndex, diff --git a/src/3rdparty/webkit/WebCore/dom/StyledElement.cpp b/src/3rdparty/webkit/WebCore/dom/StyledElement.cpp index c22ecf933..456cc520b 100644 --- a/src/3rdparty/webkit/WebCore/dom/StyledElement.cpp +++ b/src/3rdparty/webkit/WebCore/dom/StyledElement.cpp @@ -194,8 +194,8 @@ void StyledElement::attributeChanged(Attribute* attr, bool preserveDecls) if (needToParse) parseMappedAttribute(mappedAttr); - if (entry == eNone && ownerDocument()->attached() && ownerDocument()->styleSelector()->hasSelectorForAttribute(attr->name().localName())) - setNeedsStyleRecalc(); + if (entry == eNone) + recalcStyleIfNeededAfterAttributeChanged(attr); if (checkDecl && mappedAttr->decl()) { // Add the decl to the table in the appropriate spot. @@ -206,7 +206,7 @@ void StyledElement::attributeChanged(Attribute* attr, bool preserveDecls) if (namedAttrMap) mappedAttributes()->declAdded(); } - Element::attributeChanged(attr, preserveDecls); + updateAfterAttributeChanged(attr); } bool StyledElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const diff --git a/src/3rdparty/webkit/WebCore/dom/Text.cpp b/src/3rdparty/webkit/WebCore/dom/Text.cpp index 04e499afb..bbd926bed 100644 --- a/src/3rdparty/webkit/WebCore/dom/Text.cpp +++ b/src/3rdparty/webkit/WebCore/dom/Text.cpp @@ -260,6 +260,19 @@ RenderObject *Text::createRenderer(RenderArena* arena, RenderStyle*) void Text::attach() { +#if ENABLE(WML) + if (document()->isWMLDocument() && !containsOnlyWhitespace()) { + String text = m_data; + ASSERT(!text.isEmpty()); + + text = substituteVariableReferences(text, document()); + + ExceptionCode code = 0; + setData(text, code); + ASSERT(!code); + } +#endif + createRendererIfNeeded(); CharacterData::attach(); } @@ -319,29 +332,6 @@ PassRefPtr Text::createWithLengthLimit(Document* doc, const String& text, return new Text(doc, nodeText); } -#if ENABLE(WML) -void Text::insertedIntoDocument() -{ - CharacterData::insertedIntoDocument(); - - if (!parentNode()->isWMLElement() || !length()) - return; - - WMLPageState* pageState = wmlPageStateForDocument(document()); - if (!pageState->hasVariables()) - return; - - String text = data(); - if (!text.impl() || text.impl()->containsOnlyWhitespace()) - return; - - text = substituteVariableReferences(text, document()); - - ExceptionCode ec; - setData(text, ec); -} -#endif - #ifndef NDEBUG void Text::formatForDebugger(char *buffer, unsigned length) const { diff --git a/src/3rdparty/webkit/WebCore/dom/Text.h b/src/3rdparty/webkit/WebCore/dom/Text.h index 5e711d02c..e5a6e69e3 100644 --- a/src/3rdparty/webkit/WebCore/dom/Text.h +++ b/src/3rdparty/webkit/WebCore/dom/Text.h @@ -59,10 +59,6 @@ public: static PassRefPtr createWithLengthLimit(Document*, const String&, unsigned& charsLeft, unsigned maxChars = cTextNodeLengthLimit); -#if ENABLE(WML) - virtual void insertedIntoDocument(); -#endif - #ifndef NDEBUG virtual void formatForDebugger(char* buffer, unsigned length) const; #endif diff --git a/src/3rdparty/webkit/WebCore/dom/XMLTokenizerLibxml2.cpp b/src/3rdparty/webkit/WebCore/dom/XMLTokenizerLibxml2.cpp index 95f63e909..4387a66a7 100644 --- a/src/3rdparty/webkit/WebCore/dom/XMLTokenizerLibxml2.cpp +++ b/src/3rdparty/webkit/WebCore/dom/XMLTokenizerLibxml2.cpp @@ -72,7 +72,7 @@ using namespace std; namespace WebCore { -class PendingCallbacks : Noncopyable { +class PendingCallbacks : public Noncopyable { public: ~PendingCallbacks() { diff --git a/src/3rdparty/webkit/WebCore/dom/XMLTokenizerScope.h b/src/3rdparty/webkit/WebCore/dom/XMLTokenizerScope.h index a3c1188b4..c29b79604 100644 --- a/src/3rdparty/webkit/WebCore/dom/XMLTokenizerScope.h +++ b/src/3rdparty/webkit/WebCore/dom/XMLTokenizerScope.h @@ -36,7 +36,7 @@ namespace WebCore { class DocLoader; - class XMLTokenizerScope : Noncopyable { + class XMLTokenizerScope : public Noncopyable { public: XMLTokenizerScope(DocLoader* docLoader); ~XMLTokenizerScope(); diff --git a/src/3rdparty/webkit/WebCore/dom/make_names.pl b/src/3rdparty/webkit/WebCore/dom/make_names.pl index 12f0ec7f6..e6d59a01e 100755 --- a/src/3rdparty/webkit/WebCore/dom/make_names.pl +++ b/src/3rdparty/webkit/WebCore/dom/make_names.pl @@ -875,22 +875,23 @@ sub printWrapperFunctions } # Hack for the media tags + # FIXME: This should have been done via a CustomWrapper attribute and a separate *Custom file. if ($tags{$tagName}{"wrapperOnlyIfMediaIsAvailable"}) { print F < element) +static JSNode* create${JSInterfaceName}Wrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{'namespace'}Element> element) { if (!MediaPlayer::isAvailable()) - return CREATE_DOM_NODE_WRAPPER(exec, $parameters{'namespace'}Element, element.get()); - return CREATE_DOM_NODE_WRAPPER(exec, ${JSInterfaceName}, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, $parameters{'namespace'}Element, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, ${JSInterfaceName}, element.get()); } END ; } else { print F < element) +static JSNode* create${JSInterfaceName}Wrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{'namespace'}Element> element) { - return CREATE_DOM_NODE_WRAPPER(exec, ${JSInterfaceName}, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, ${JSInterfaceName}, element.get()); } END @@ -931,7 +932,7 @@ namespace WebCore { using namespace $parameters{'namespace'}Names; -typedef JSNode* (*Create$parameters{'namespace'}ElementWrapperFunction)(ExecState*, PassRefPtr<$parameters{'namespace'}Element>); +typedef JSNode* (*Create$parameters{'namespace'}ElementWrapperFunction)(ExecState*, JSDOMGlobalObject*, PassRefPtr<$parameters{'namespace'}Element>); END ; @@ -939,7 +940,7 @@ END printWrapperFunctions($F); print F < element) +JSNode* createJS$parameters{'namespace'}Wrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{'namespace'}Element> element) { typedef HashMap FunctionMap; DEFINE_STATIC_LOCAL(FunctionMap, map, ()); @@ -969,8 +970,8 @@ END } Create$parameters{'namespace'}ElementWrapperFunction createWrapperFunction = map.get(element->localName().impl()); if (createWrapperFunction) - return createWrapperFunction(exec, element); - return CREATE_DOM_NODE_WRAPPER(exec, $parameters{'namespace'}Element, element.get()); + return createWrapperFunction(exec, globalObject, element); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, $parameters{'namespace'}Element, element.get()); } } @@ -1006,9 +1007,10 @@ namespace JSC { namespace WebCore { class JSNode; + class JSDOMGlobalObject; class $parameters{'namespace'}Element; - JSNode* createJS$parameters{'namespace'}Wrapper(JSC::ExecState*, PassRefPtr<$parameters{'namespace'}Element>); + JSNode* createJS$parameters{'namespace'}Wrapper(JSC::ExecState*, JSDOMGlobalObject*, PassRefPtr<$parameters{'namespace'}Element>); } diff --git a/src/3rdparty/webkit/WebCore/editing/ApplyStyleCommand.cpp b/src/3rdparty/webkit/WebCore/editing/ApplyStyleCommand.cpp index 998a1e2df..36cd82315 100644 --- a/src/3rdparty/webkit/WebCore/editing/ApplyStyleCommand.cpp +++ b/src/3rdparty/webkit/WebCore/editing/ApplyStyleCommand.cpp @@ -98,13 +98,12 @@ void StyleChange::init(PassRefPtr style, const Position& po Document* document = position.node() ? position.node()->document() : 0; if (!document || !document->frame()) return; - + bool useHTMLFormattingTags = !document->frame()->editor()->shouldStyleWithCSS(); - RefPtr mutableStyle = style->makeMutable(); - + // We shouldn't have both text-decoration and -webkit-text-decorations-in-effect because that wouldn't make sense. + ASSERT(!mutableStyle->getPropertyCSSValue(CSSPropertyTextDecoration) || !mutableStyle->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect)); String styleText(""); - bool addedDirection = false; CSSMutableStyleDeclaration::const_iterator end = mutableStyle->end(); for (CSSMutableStyleDeclaration::const_iterator it = mutableStyle->begin(); it != end; ++it) { @@ -130,12 +129,12 @@ void StyleChange::init(PassRefPtr style, const Position& po } // Add this property - - if (property->id() == CSSPropertyWebkitTextDecorationsInEffect) { - // we have to special-case text decorations - // FIXME: Why? + if (property->id() == CSSPropertyTextDecoration || property->id() == CSSPropertyWebkitTextDecorationsInEffect) { + // Always use text-decoration because -webkit-text-decoration-in-effect is internal. CSSProperty alteredProperty(CSSPropertyTextDecoration, property->value(), property->isImportant()); - styleText += alteredProperty.cssText(); + // We don't add "text-decoration: none" because it doesn't override the existing text decorations; i.e. redundant + if (!equalIgnoringCase(alteredProperty.value()->cssText(), "none")) + styleText += alteredProperty.cssText(); } else styleText += property->cssText(); @@ -962,6 +961,25 @@ bool ApplyStyleCommand::implicitlyStyledElementShouldBeRemovedWhenApplyingStyle( if (elem->hasLocalName(iTag) || elem->hasLocalName(emTag)) return true; break; + case CSSPropertyTextDecoration: + case CSSPropertyWebkitTextDecorationsInEffect: + ASSERT(property.value()); + if (property.value()->isValueList()) { + CSSValueList* valueList = static_cast(property.value()); + DEFINE_STATIC_LOCAL(RefPtr, underline, (CSSPrimitiveValue::createIdentifier(CSSValueUnderline))); + DEFINE_STATIC_LOCAL(RefPtr, lineThrough, (CSSPrimitiveValue::createIdentifier(CSSValueLineThrough))); + // Because style is new style to be applied, we delete element only if the element is not used in style. + if (!valueList->hasValue(underline.get()) && elem->hasLocalName(uTag)) + return true; + if (!valueList->hasValue(lineThrough.get()) && (elem->hasLocalName(strikeTag) || elem->hasLocalName(sTag))) + return true; + } else { + // If the value is NOT a list, then it must be "none", in which case we should remove all text decorations. + ASSERT(property.value()->cssText() == "none"); + if (elem->hasLocalName(uTag) || elem->hasLocalName(strikeTag) || elem->hasLocalName(sTag)) + return true; + } + break; } } return false; @@ -1075,11 +1093,17 @@ static bool hasTextDecorationProperty(Node *node) static Node* highestAncestorWithTextDecoration(Node *node) { - Node *result = NULL; + ASSERT(node); + Node* result = 0; + Node* unsplittableElement = unsplittableElementForPosition(Position(node, 0)); for (Node *n = node; n; n = n->parentNode()) { if (hasTextDecorationProperty(n)) result = n; + // Should stop at the editable root (cannot cross editing boundary) and + // also stop at the unsplittable element to be consistent with other UAs + if (n == unsplittableElement) + break; } return result; @@ -1162,32 +1186,35 @@ void ApplyStyleCommand::applyTextDecorationStyle(Node *node, CSSMutableStyleDecl } } -void ApplyStyleCommand::pushDownTextDecorationStyleAroundNode(Node* node, bool force) +void ApplyStyleCommand::pushDownTextDecorationStyleAroundNode(Node* targetNode, bool forceNegate) { - Node *highestAncestor = highestAncestorWithTextDecoration(node); - - if (highestAncestor) { - Node *nextCurrent; - Node *nextChild; - for (Node *current = highestAncestor; current != node; current = nextCurrent) { - ASSERT(current); - - nextCurrent = NULL; - - RefPtr decoration = force ? extractAndNegateTextDecorationStyle(current) : extractTextDecorationStyle(current); + ASSERT(targetNode); + Node* highestAncestor = highestAncestorWithTextDecoration(targetNode); + if (!highestAncestor) + return; - for (Node *child = current->firstChild(); child; child = nextChild) { - nextChild = child->nextSibling(); + // The outer loop is traversing the tree vertically from highestAncestor to targetNode + Node* current = highestAncestor; + while (current != targetNode) { + ASSERT(current); + ASSERT(current->contains(targetNode)); + RefPtr decoration = forceNegate ? extractAndNegateTextDecorationStyle(current) : extractTextDecorationStyle(current); + + // The inner loop will go through children on each level + Node* child = current->firstChild(); + while (child) { + Node* nextChild = child->nextSibling(); + + // Apply text decoration to all nodes containing targetNode and their siblings but NOT to targetNode + if (child != targetNode) + applyTextDecorationStyle(child, decoration.get()); + + // We found the next node for the outer loop (contains targetNode) + // When reached targetNode, stop the outer loop upon the completion of the current inner loop + if (child == targetNode || child->contains(targetNode)) + current = child; - if (node == child) { - nextCurrent = child; - } else if (node->isDescendantOf(child)) { - applyTextDecorationStyle(child, decoration.get()); - nextCurrent = child; - } else { - applyTextDecorationStyle(child, decoration.get()); - } - } + child = nextChild; } } } diff --git a/src/3rdparty/webkit/WebCore/editing/ApplyStyleCommand.h b/src/3rdparty/webkit/WebCore/editing/ApplyStyleCommand.h index 74fe605ef..61213d86b 100644 --- a/src/3rdparty/webkit/WebCore/editing/ApplyStyleCommand.h +++ b/src/3rdparty/webkit/WebCore/editing/ApplyStyleCommand.h @@ -73,7 +73,7 @@ private: PassRefPtr extractTextDecorationStyle(Node*); PassRefPtr extractAndNegateTextDecorationStyle(Node*); void applyTextDecorationStyle(Node*, CSSMutableStyleDeclaration *style); - void pushDownTextDecorationStyleAroundNode(Node*, bool force); + void pushDownTextDecorationStyleAroundNode(Node*, bool forceNegate); void pushDownTextDecorationStyleAtBoundaries(const Position& start, const Position& end); // style-application helpers diff --git a/src/3rdparty/webkit/WebCore/editing/DeleteSelectionCommand.cpp b/src/3rdparty/webkit/WebCore/editing/DeleteSelectionCommand.cpp index 284f073ed..d3ac34147 100644 --- a/src/3rdparty/webkit/WebCore/editing/DeleteSelectionCommand.cpp +++ b/src/3rdparty/webkit/WebCore/editing/DeleteSelectionCommand.cpp @@ -260,8 +260,8 @@ static void removeEnclosingAnchorStyle(CSSMutableStyleDeclaration* style, const if (!enclosingAnchor || !enclosingAnchor->parentNode()) return; - RefPtr parentStyle = Position(enclosingAnchor->parentNode(), 0).computedStyle()->copyInheritableProperties(); - RefPtr anchorStyle = Position(enclosingAnchor, 0).computedStyle()->copyInheritableProperties(); + RefPtr parentStyle = Position(enclosingAnchor->parentNode(), 0).computedStyle()->deprecatedCopyInheritableProperties(); + RefPtr anchorStyle = Position(enclosingAnchor, 0).computedStyle()->deprecatedCopyInheritableProperties(); parentStyle->diff(anchorStyle.get()); anchorStyle->diff(style); } @@ -280,7 +280,7 @@ void DeleteSelectionCommand::saveTypingStyleState() // Figure out the typing style in effect before the delete is done. RefPtr computedStyle = positionBeforeTabSpan(m_selectionToDelete.start()).computedStyle(); - m_typingStyle = computedStyle->copyInheritableProperties(); + m_typingStyle = computedStyle->deprecatedCopyInheritableProperties(); removeEnclosingAnchorStyle(m_typingStyle.get(), m_selectionToDelete.start()); @@ -288,7 +288,7 @@ void DeleteSelectionCommand::saveTypingStyleState() // We'll use this later in computeTypingStyleAfterDelete if we end up outside of a Mail blockquote if (nearestMailBlockquote(m_selectionToDelete.start().node())) { computedStyle = m_selectionToDelete.end().computedStyle(); - m_deleteIntoBlockquoteStyle = computedStyle->copyInheritableProperties(); + m_deleteIntoBlockquoteStyle = computedStyle->deprecatedCopyInheritableProperties(); } else m_deleteIntoBlockquoteStyle = 0; } diff --git a/src/3rdparty/webkit/WebCore/editing/EditCommand.cpp b/src/3rdparty/webkit/WebCore/editing/EditCommand.cpp index fefe658da..d82623155 100644 --- a/src/3rdparty/webkit/WebCore/editing/EditCommand.cpp +++ b/src/3rdparty/webkit/WebCore/editing/EditCommand.cpp @@ -197,7 +197,7 @@ bool EditCommand::isTypingCommand() const PassRefPtr EditCommand::styleAtPosition(const Position &pos) { - RefPtr style = positionBeforeTabSpan(pos).computedStyle()->copyInheritableProperties(); + RefPtr style = positionBeforeTabSpan(pos).computedStyle()->deprecatedCopyInheritableProperties(); // FIXME: It seems misleading to also include the typing style when returning the style at some arbitrary // position in the document. diff --git a/src/3rdparty/webkit/WebCore/editing/Editor.cpp b/src/3rdparty/webkit/WebCore/editing/Editor.cpp index b62ded749..0b150d3b1 100644 --- a/src/3rdparty/webkit/WebCore/editing/Editor.cpp +++ b/src/3rdparty/webkit/WebCore/editing/Editor.cpp @@ -2258,20 +2258,9 @@ static void markMisspellingsOrBadGrammar(Editor* editor, const VisibleSelection& Node* editableNode = searchRange->startContainer(); if (!editableNode || !editableNode->isContentEditable()) return; - - // Ascend the DOM tree to find a "spellcheck" attribute. - // When we find a "spellcheck" attribute, retrieve its value and exit if its value is "false". - const Node* node = editor->frame()->document()->focusedNode(); - while (node) { - if (node->isElementNode()) { - const WebCore::AtomicString& value = static_cast(node)->getAttribute(spellcheckAttr); - if (equalIgnoringCase(value, "true")) - break; - if (equalIgnoringCase(value, "false")) - return; - } - node = node->parent(); - } + + if (!editor->spellCheckingEnabledInFocusedNode()) + return; // Get the spell checker if it is available if (!editor->client()) @@ -2289,6 +2278,24 @@ static void markMisspellingsOrBadGrammar(Editor* editor, const VisibleSelection& } } +bool Editor::spellCheckingEnabledInFocusedNode() const +{ + // Ascend the DOM tree to find a "spellcheck" attribute. + // When we find a "spellcheck" attribute, retrieve its value and return false if its value is "false". + const Node* node = frame()->document()->focusedNode(); + while (node) { + if (node->isElementNode()) { + const WebCore::AtomicString& value = static_cast(node)->getAttribute(spellcheckAttr); + if (equalIgnoringCase(value, "true")) + return true; + if (equalIgnoringCase(value, "false")) + return false; + } + node = node->parent(); + } + return true; +} + void Editor::markMisspellings(const VisibleSelection& selection, RefPtr& firstMisspellingRange) { markMisspellingsOrBadGrammar(this, selection, true, firstMisspellingRange); @@ -2325,7 +2332,10 @@ void Editor::markAllMisspellingsAndBadGrammarInRanges(bool markSpelling, Range* Node* editableNode = spellingRange->startContainer(); if (!editableNode || !editableNode->isContentEditable()) return; - + + if (!spellCheckingEnabledInFocusedNode()) + return; + // Expand the range to encompass entire paragraphs, since text checking needs that much context. int spellingRangeStartOffset = 0; int spellingRangeEndOffset = 0; diff --git a/src/3rdparty/webkit/WebCore/editing/Editor.h b/src/3rdparty/webkit/WebCore/editing/Editor.h index 67a4b5973..5b0cc9c9d 100644 --- a/src/3rdparty/webkit/WebCore/editing/Editor.h +++ b/src/3rdparty/webkit/WebCore/editing/Editor.h @@ -196,6 +196,7 @@ public: Vector guessesForMisspelledSelection(); Vector guessesForUngrammaticalSelection(); Vector guessesForMisspelledOrUngrammaticalSelection(bool& misspelled, bool& ungrammatical); + bool spellCheckingEnabledInFocusedNode() const; void markMisspellingsAfterTypingToPosition(const VisiblePosition&); void markMisspellings(const VisibleSelection&, RefPtr& firstMisspellingRange); void markBadGrammar(const VisibleSelection&); diff --git a/src/3rdparty/webkit/WebCore/editing/EditorCommand.cpp b/src/3rdparty/webkit/WebCore/editing/EditorCommand.cpp index 5a189d4d8..e4d94c2e6 100644 --- a/src/3rdparty/webkit/WebCore/editing/EditorCommand.cpp +++ b/src/3rdparty/webkit/WebCore/editing/EditorCommand.cpp @@ -27,6 +27,7 @@ #include "config.h" #include "AtomicString.h" +#include "CSSComputedStyleDeclaration.h" #include "CSSMutableStyleDeclaration.h" #include "CSSPropertyNames.h" #include "CSSValueKeywords.h" @@ -89,64 +90,71 @@ static Frame* targetFrame(Frame* frame, Event* event) return node->document()->frame(); } -static bool executeApplyStyle(Frame* frame, EditorCommandSource source, EditAction action, int propertyID, const String& propertyValue) +static bool applyCommandToFrame(Frame* frame, EditorCommandSource source, EditAction action, CSSMutableStyleDeclaration* style) { - RefPtr style = CSSMutableStyleDeclaration::create(); - style->setProperty(propertyID, propertyValue); // FIXME: We don't call shouldApplyStyle when the source is DOM; is there a good reason for that? switch (source) { case CommandFromMenuOrKeyBinding: - frame->editor()->applyStyleToSelection(style.get(), action); + frame->editor()->applyStyleToSelection(style, action); return true; case CommandFromDOM: case CommandFromDOMWithUserInterface: - frame->editor()->applyStyle(style.get()); + frame->editor()->applyStyle(style); return true; } ASSERT_NOT_REACHED(); return false; } -static bool executeApplyStyle(Frame* frame, EditorCommandSource source, EditAction action, int propertyID, const char* propertyValue) +static bool executeApplyStyle(Frame* frame, EditorCommandSource source, EditAction action, int propertyID, const String& propertyValue) { - return executeApplyStyle(frame, source, action, propertyID, String(propertyValue)); + RefPtr style = CSSMutableStyleDeclaration::create(); + style->setProperty(propertyID, propertyValue); + return applyCommandToFrame(frame, source, action, style.get()); } static bool executeApplyStyle(Frame* frame, EditorCommandSource source, EditAction action, int propertyID, int propertyValue) { RefPtr style = CSSMutableStyleDeclaration::create(); style->setProperty(propertyID, propertyValue); - // FIXME: We don't call shouldApplyStyle when the source is DOM; is there a good reason for that? - switch (source) { - case CommandFromMenuOrKeyBinding: - frame->editor()->applyStyleToSelection(style.get(), action); - return true; - case CommandFromDOM: - case CommandFromDOMWithUserInterface: - frame->editor()->applyStyle(style.get()); - return true; - } - ASSERT_NOT_REACHED(); - return false; + return applyCommandToFrame(frame, source, action, style.get()); } +static bool executeToggleStyleInList(Frame* frame, EditorCommandSource source, EditAction action, int propertyID, CSSValue* value) +{ + ExceptionCode ec = 0; + Node* nodeToRemove = 0; + RefPtr selectionStyle = frame->selectionComputedStyle(nodeToRemove); + RefPtr selectedCSSValue = selectionStyle->getPropertyCSSValue(propertyID); + String newStyle = "none"; + if (selectedCSSValue->isValueList()) { + RefPtr selectedCSSValueList = static_cast(selectedCSSValue.get()); + if (!selectedCSSValueList->removeAll(value)) + selectedCSSValueList->append(value); + if (selectedCSSValueList->length()) + newStyle = selectedCSSValueList->cssText(); + + } else if (selectedCSSValue->cssText() == "none") + newStyle = value->cssText(); + + ASSERT(ec == 0); + if (nodeToRemove) { + nodeToRemove->remove(ec); + ASSERT(ec == 0); + } + + // FIXME: We shouldn't be having to convert new style into text. We should have setPropertyCSSValue. + RefPtr newMutableStyle = CSSMutableStyleDeclaration::create(); + newMutableStyle->setProperty(propertyID, newStyle,ec); + return applyCommandToFrame(frame, source, action, newMutableStyle.get()); +} + static bool executeToggleStyle(Frame* frame, EditorCommandSource source, EditAction action, int propertyID, const char* offValue, const char* onValue) { RefPtr style = CSSMutableStyleDeclaration::create(); style->setProperty(propertyID, onValue); style->setProperty(propertyID, frame->editor()->selectionStartHasStyle(style.get()) ? offValue : onValue); - // FIXME: We don't call shouldApplyStyle when the source is DOM; is there a good reason for that? - switch (source) { - case CommandFromMenuOrKeyBinding: - frame->editor()->applyStyleToSelection(style.get(), action); - return true; - case CommandFromDOM: - case CommandFromDOMWithUserInterface: - frame->editor()->applyStyle(style.get()); - return true; - } - ASSERT_NOT_REACHED(); - return false; + return applyCommandToFrame(frame, source, action, style.get()); } static bool executeApplyParagraphStyle(Frame* frame, EditorCommandSource source, EditAction action, int propertyID, const String& propertyValue) @@ -937,7 +945,8 @@ static bool executeSetMark(Frame* frame, Event*, EditorCommandSource, const Stri static bool executeStrikethrough(Frame* frame, Event*, EditorCommandSource source, const String&) { - return executeToggleStyle(frame, source, EditActionChangeAttributes, CSSPropertyWebkitTextDecorationsInEffect, "none", "line-through"); + RefPtr lineThrough = CSSPrimitiveValue::createIdentifier(CSSValueLineThrough); + return executeToggleStyleInList(frame, source, EditActionUnderline, CSSPropertyWebkitTextDecorationsInEffect, lineThrough.get()); } static bool executeStyleWithCSS(Frame* frame, Event*, EditorCommandSource, const String& value) @@ -990,8 +999,8 @@ static bool executeTranspose(Frame* frame, Event*, EditorCommandSource, const St static bool executeUnderline(Frame* frame, Event*, EditorCommandSource source, const String&) { - // FIXME: This currently clears overline, line-through, and blink as an unwanted side effect. - return executeToggleStyle(frame, source, EditActionUnderline, CSSPropertyWebkitTextDecorationsInEffect, "none", "underline"); + RefPtr underline = CSSPrimitiveValue::createIdentifier(CSSValueUnderline); + return executeToggleStyleInList(frame, source, EditActionUnderline, CSSPropertyWebkitTextDecorationsInEffect, underline.get()); } static bool executeUndo(Frame* frame, Event*, EditorCommandSource, const String&) diff --git a/src/3rdparty/webkit/WebCore/editing/IndentOutdentCommand.cpp b/src/3rdparty/webkit/WebCore/editing/IndentOutdentCommand.cpp index 890cff233..42dd515fb 100644 --- a/src/3rdparty/webkit/WebCore/editing/IndentOutdentCommand.cpp +++ b/src/3rdparty/webkit/WebCore/editing/IndentOutdentCommand.cpp @@ -33,6 +33,7 @@ #include "InsertLineBreakCommand.h" #include "InsertListCommand.h" #include "Range.h" +#include "DocumentFragment.h" #include "SplitElementCommand.h" #include "TextIterator.h" #include "htmlediting.h" @@ -57,18 +58,9 @@ static PassRefPtr createIndentBlockquoteElement(Document* return element.release(); } -static bool isIndentBlockquote(const Node* node) -{ - if (!node || !node->hasTagName(blockquoteTag) || !node->isElementNode()) - return false; - - const Element* elem = static_cast(node); - return elem->getAttribute(classAttr) == indentBlockquoteString(); -} - static bool isListOrIndentBlockquote(const Node* node) { - return node && (node->hasTagName(ulTag) || node->hasTagName(olTag) || isIndentBlockquote(node)); + return node && (node->hasTagName(ulTag) || node->hasTagName(olTag) || node->hasTagName(blockquoteTag)); } IndentOutdentCommand::IndentOutdentCommand(Document* document, EIndentType typeOfAction, int marginInPixels) @@ -76,37 +68,6 @@ IndentOutdentCommand::IndentOutdentCommand(Document* document, EIndentType typeO { } -// This function is a workaround for moveParagraph's tendency to strip blockquotes. It updates lastBlockquote to point to the -// correct level for the current paragraph, and returns a pointer to a placeholder br where the insertion should be performed. -PassRefPtr IndentOutdentCommand::prepareBlockquoteLevelForInsertion(const VisiblePosition& currentParagraph, RefPtr& lastBlockquote) -{ - int currentBlockquoteLevel = 0; - int lastBlockquoteLevel = 0; - Node* node = currentParagraph.deepEquivalent().node(); - while ((node = enclosingNodeOfType(Position(node->parentNode(), 0), &isIndentBlockquote))) - currentBlockquoteLevel++; - node = lastBlockquote.get(); - while ((node = enclosingNodeOfType(Position(node->parentNode(), 0), &isIndentBlockquote))) - lastBlockquoteLevel++; - while (currentBlockquoteLevel > lastBlockquoteLevel) { - RefPtr newBlockquote = createIndentBlockquoteElement(document()); - appendNode(newBlockquote, lastBlockquote); - lastBlockquote = newBlockquote; - lastBlockquoteLevel++; - } - while (currentBlockquoteLevel < lastBlockquoteLevel) { - lastBlockquote = static_cast(enclosingNodeOfType(Position(lastBlockquote->parentNode(), 0), isIndentBlockquote)); - lastBlockquoteLevel--; - } - RefPtr placeholder = createBreakElement(document()); - appendNode(placeholder, lastBlockquote); - // Add another br before the placeholder if it collapsed. - VisiblePosition visiblePos(Position(placeholder.get(), 0)); - if (!isStartOfParagraph(visiblePos)) - insertNodeBefore(createBreakElement(document()), placeholder); - return placeholder.release(); -} - bool IndentOutdentCommand::tryIndentingAsListItem(const VisiblePosition& endOfCurrentParagraph) { // If our selection is not inside a list, bail out. @@ -115,20 +76,19 @@ bool IndentOutdentCommand::tryIndentingAsListItem(const VisiblePosition& endOfCu if (!listNode) return false; - HTMLElement* selectedListItem = enclosingListChild(lastNodeInSelectedParagraph); + // Find the list item enclosing the current paragraph + Element* selectedListItem = static_cast(enclosingBlock(endOfCurrentParagraph.deepEquivalent().node())); + // FIXME: we need to deal with the case where there is no li (malformed HTML) + if (!selectedListItem->hasTagName(liTag)) + return false; // FIXME: previousElementSibling does not ignore non-rendered content like . Should we? Element* previousList = selectedListItem->previousElementSibling(); Element* nextList = selectedListItem->nextElementSibling(); RefPtr newList = document()->createElement(listNode->tagQName(), false); - RefPtr newListItem = selectedListItem->cloneElementWithoutChildren(); - RefPtr placeholder = createBreakElement(document()); insertNodeBefore(newList, selectedListItem); - appendNode(newListItem, newList); - appendNode(placeholder, newListItem); - - moveParagraph(startOfParagraph(endOfCurrentParagraph), endOfCurrentParagraph, VisiblePosition(Position(placeholder, 0)), true); + appendParagraphIntoNode(visiblePositionBeforeNode(selectedListItem), visiblePositionAfterNode(selectedListItem), newList.get()); if (canMergeLists(previousList, newList.get())) mergeIdenticalElements(previousList, newList); @@ -138,29 +98,27 @@ bool IndentOutdentCommand::tryIndentingAsListItem(const VisiblePosition& endOfCu return true; } -void IndentOutdentCommand::indentIntoBlockquote(const VisiblePosition& endOfCurrentParagraph, const VisiblePosition& endOfNextParagraph, RefPtr& targetBlockquote) +void IndentOutdentCommand::indentIntoBlockquote(const VisiblePosition& startOfCurrentParagraph, const VisiblePosition& endOfCurrentParagraph, RefPtr& targetBlockquote, Node* nodeToSplitTo) { Node* enclosingCell = 0; if (!targetBlockquote) { - // Create a new blockquote and insert it as a child of the root editable element. We accomplish + // Create a new blockquote and insert it as a child of the enclosing block element. We accomplish // this by splitting all parents of the current paragraph up to that point. targetBlockquote = createIndentBlockquoteElement(document()); - Position start = startOfParagraph(endOfCurrentParagraph).deepEquivalent(); - enclosingCell = enclosingNodeOfType(start, &isTableCell); - Node* nodeToSplitTo = enclosingCell ? enclosingCell : editableRootForPosition(start); - RefPtr startOfNewBlock = splitTreeToNode(start.node(), nodeToSplitTo); + if (isTableCell(nodeToSplitTo)) + enclosingCell = nodeToSplitTo; + RefPtr startOfNewBlock = splitTreeToNode(startOfCurrentParagraph.deepEquivalent().node(), nodeToSplitTo); insertNodeBefore(targetBlockquote, startOfNewBlock); } - RefPtr insertionPoint = prepareBlockquoteLevelForInsertion(endOfCurrentParagraph, targetBlockquote); + VisiblePosition endOfNextParagraph = endOfParagraph(endOfCurrentParagraph.next()); + appendParagraphIntoNode(startOfCurrentParagraph, endOfCurrentParagraph, targetBlockquote.get()); // Don't put the next paragraph in the blockquote we just created for this paragraph unless // the next paragraph is in the same cell. if (enclosingCell && enclosingCell != enclosingNodeOfType(endOfNextParagraph.deepEquivalent(), &isTableCell)) targetBlockquote = 0; - - moveParagraph(startOfParagraph(endOfCurrentParagraph), endOfCurrentParagraph, VisiblePosition(Position(insertionPoint, 0)), true); } bool IndentOutdentCommand::isAtUnsplittableElement(const Position& pos) const @@ -169,13 +127,64 @@ bool IndentOutdentCommand::isAtUnsplittableElement(const Position& pos) const return node == editableRootForPosition(pos) || node == enclosingNodeOfType(pos, &isTableCell); } +// Enclose all nodes between start and end by newParent, which is a sibling node of nodes between start and end +// FIXME: moveParagraph is overly complicated. We need to clean up moveParagraph so that it uses appendParagraphIntoNode +// or prepare more specialized functions and delete moveParagraph +void IndentOutdentCommand::appendParagraphIntoNode(const VisiblePosition& start, const VisiblePosition& end, Node* newParent) +{ + ASSERT(newParent); + ASSERT(newParent->isContentEditable()); + ASSERT(isStartOfParagraph(start) && isEndOfParagraph(end)); + + Position endOfParagraph = end.deepEquivalent().downstream(); + Node* insertionPoint = newParent->lastChild();// Remember the place to put br later + // Look for the beginning of the last paragraph in newParent + Node* startOfLastParagraph = startOfParagraph(Position(newParent, newParent->childNodeCount())).deepEquivalent().node(); + if (startOfLastParagraph && !startOfLastParagraph->isDescendantOf(newParent)) + startOfLastParagraph = 0; + + // Extend the range so that we can append wrapping nodes as well if they're containd within the paragraph + ExceptionCode ec = 0; + RefPtr selectedRange = createRange(document(), start, end, ec); + RefPtr extendedRange = extendRangeToWrappingNodes(selectedRange, selectedRange.get(), newParent->parentNode()); + newParent->appendChild(extendedRange->extractContents(ec), ec); + + // If the start of paragraph didn't change by appending nodes, we should insert br to seperate the paragraphs. + Node* startOfNewParagraph = startOfParagraph(Position(newParent, newParent->childNodeCount())).deepEquivalent().node(); + if (startOfNewParagraph == startOfLastParagraph) { + if (insertionPoint) + newParent->insertBefore(createBreakElement(document()), insertionPoint->nextSibling(), ec); + else + newParent->appendChild(createBreakElement(document()), ec); + } + + // Remove unnecessary br from the place where we moved the paragraph from + removeUnnecessaryLineBreakAt(endOfParagraph); +} + +void IndentOutdentCommand::removeUnnecessaryLineBreakAt(const Position& endOfParagraph) +{ + // If there is something in this paragraph, then don't remove br. + if (!isStartOfParagraph(endOfParagraph) || !isEndOfParagraph(endOfParagraph)) + return; + + // We only care about br at the end of paragraph + Node* br = endOfParagraph.node(); + Node* parentNode = br->parentNode(); + + // If the node isn't br or the parent node is empty, then don't remove. + if (!br->hasTagName(brTag) || isVisiblyAdjacent(positionBeforeNode(parentNode), positionAfterNode(parentNode))) + return; + + removeNodeAndPruneAncestors(br); +} + void IndentOutdentCommand::indentRegion() { VisibleSelection selection = selectionForParagraphIteration(endingSelection()); VisiblePosition startOfSelection = selection.visibleStart(); VisiblePosition endOfSelection = selection.visibleEnd(); - int startIndex = indexForVisiblePosition(startOfSelection); - int endIndex = indexForVisiblePosition(endOfSelection); + RefPtr selectedRange = selection.firstRange(); ASSERT(!startOfSelection.isNull()); ASSERT(!endOfSelection.isNull()); @@ -200,10 +209,24 @@ void IndentOutdentCommand::indentRegion() VisiblePosition endOfNextParagraph = endOfParagraph(endOfCurrentParagraph.next()); if (tryIndentingAsListItem(endOfCurrentParagraph)) blockquoteForNextIndent = 0; - else - indentIntoBlockquote(endOfCurrentParagraph, endOfNextParagraph, blockquoteForNextIndent); - // blockquoteForNextIndent maybe updated - // this is due to the way prepareBlockquoteLevelForInsertion was designed. + else { + VisiblePosition startOfCurrentParagraph = startOfParagraph(endOfCurrentParagraph); + Node* blockNode = enclosingBlock(endOfCurrentParagraph.deepEquivalent().node()); + // extend the region so that it contains all the ancestor blocks within the selection + ExceptionCode ec; + Element* unsplittableNode = unsplittableElementForPosition(endOfCurrentParagraph.deepEquivalent()); + RefPtr originalRange = createRange(document(), endOfCurrentParagraph, endOfCurrentParagraph, ec); + RefPtr extendedRange = extendRangeToWrappingNodes(originalRange, selectedRange.get(), unsplittableNode); + if (originalRange != extendedRange) { + ExceptionCode ec = 0; + endOfCurrentParagraph = endOfParagraph(extendedRange->endPosition().previous()); + blockNode = enclosingBlock(extendedRange->commonAncestorContainer(ec)); + } + + endOfNextParagraph = endOfParagraph(endOfCurrentParagraph.next()); + indentIntoBlockquote(startOfCurrentParagraph, endOfCurrentParagraph, blockquoteForNextIndent, blockNode); + // blockquoteForNextIndent will be updated in the function + } // Sanity check: Make sure our moveParagraph calls didn't remove endOfNextParagraph.deepEquivalent().node() // If somehow we did, return to prevent crashes. if (endOfNextParagraph.isNotNull() && !endOfNextParagraph.deepEquivalent().node()->inDocument()) { @@ -212,11 +235,7 @@ void IndentOutdentCommand::indentRegion() } endOfCurrentParagraph = endOfNextParagraph; } - - RefPtr startRange = TextIterator::rangeFromLocationAndLength(document()->documentElement(), startIndex, 0, true); - RefPtr endRange = TextIterator::rangeFromLocationAndLength(document()->documentElement(), endIndex, 0, true); - if (startRange && endRange) - setEndingSelection(VisibleSelection(startRange->startPosition(), endRange->startPosition(), DOWNSTREAM)); + } void IndentOutdentCommand::outdentParagraph() @@ -238,7 +257,7 @@ void IndentOutdentCommand::outdentParagraph() return; } - // The selection is inside a blockquote + // The selection is inside a blockquote i.e. enclosingNode is a blockquote VisiblePosition positionInEnclosingBlock = VisiblePosition(Position(enclosingNode, 0)); VisiblePosition startOfEnclosingBlock = startOfBlock(positionInEnclosingBlock); VisiblePosition lastPositionInEnclosingBlock = VisiblePosition(Position(enclosingNode, enclosingNode->childNodeCount())); @@ -252,8 +271,8 @@ void IndentOutdentCommand::outdentParagraph() // just removed one, then this assumption isn't true. By splitting the next containing blockquote after this node, we keep this assumption true if (splitPoint) { if (Node* splitPointParent = splitPoint->parentNode()) { - if (isIndentBlockquote(splitPointParent) - && !isIndentBlockquote(splitPoint) + if (splitPointParent->hasTagName(blockquoteTag) + && !splitPoint->hasTagName(blockquoteTag) && isContentEditable(splitPointParent->parentNode())) // We can't outdent if there is no place to go! splitElement(static_cast(splitPointParent), splitPoint); } @@ -269,10 +288,14 @@ void IndentOutdentCommand::outdentParagraph() return; } - Node* enclosingBlockFlow = enclosingBlockFlowElement(visibleStartOfParagraph); + Node* enclosingBlockFlow = enclosingBlock(visibleStartOfParagraph.deepEquivalent().node()); RefPtr splitBlockquoteNode = enclosingNode; if (enclosingBlockFlow != enclosingNode) - splitBlockquoteNode = splitTreeToNode(enclosingBlockFlowElement(visibleStartOfParagraph), enclosingNode, true); + splitBlockquoteNode = splitTreeToNode(enclosingBlockFlow, enclosingNode, true); + else { + // We split the blockquote at where we start outdenting. + splitElement(static_cast(enclosingNode), visibleStartOfParagraph.deepEquivalent().node()); + } RefPtr placeholder = createBreakElement(document()); insertNodeBefore(placeholder, splitBlockquoteNode); moveParagraph(startOfParagraph(visibleStartOfParagraph), endOfParagraph(visibleEndOfParagraph), VisiblePosition(Position(placeholder.get(), 0)), true); diff --git a/src/3rdparty/webkit/WebCore/editing/IndentOutdentCommand.h b/src/3rdparty/webkit/WebCore/editing/IndentOutdentCommand.h index a10b89d96..104a0e7c7 100644 --- a/src/3rdparty/webkit/WebCore/editing/IndentOutdentCommand.h +++ b/src/3rdparty/webkit/WebCore/editing/IndentOutdentCommand.h @@ -48,13 +48,14 @@ private: // FIXME: Does this belong in htmlediting.cpp? bool isAtUnsplittableElement(const Position&) const; + void appendParagraphIntoNode(const VisiblePosition& start, const VisiblePosition& end, Node* newParent); + void removeUnnecessaryLineBreakAt(const Position& endOfParagraph); void indentRegion(); void outdentRegion(); void outdentParagraph(); - PassRefPtr prepareBlockquoteLevelForInsertion(const VisiblePosition&, RefPtr&); bool tryIndentingAsListItem(const VisiblePosition&); - void indentIntoBlockquote(const VisiblePosition&, const VisiblePosition&, RefPtr&); + void indentIntoBlockquote(const VisiblePosition&, const VisiblePosition&, RefPtr& targetBlockquote, Node* nodeToSplitTo); EIndentType m_typeOfAction; int m_marginInPixels; diff --git a/src/3rdparty/webkit/WebCore/editing/RemoveFormatCommand.cpp b/src/3rdparty/webkit/WebCore/editing/RemoveFormatCommand.cpp index 6d681ee4e..1cf9aa228 100644 --- a/src/3rdparty/webkit/WebCore/editing/RemoveFormatCommand.cpp +++ b/src/3rdparty/webkit/WebCore/editing/RemoveFormatCommand.cpp @@ -55,7 +55,7 @@ void RemoveFormatCommand::doApply() // Get the default style for this editable root, it's the style that we'll give the // content that we're operating on. Node* root = frame->selection()->rootEditableElement(); - RefPtr defaultStyle = computedStyle(root)->copyInheritableProperties(); + RefPtr defaultStyle = computedStyle(root)->deprecatedCopyInheritableProperties(); // Delete the selected content. // FIXME: We should be able to leave this to insertText, but its delete operation diff --git a/src/3rdparty/webkit/WebCore/editing/ReplaceSelectionCommand.cpp b/src/3rdparty/webkit/WebCore/editing/ReplaceSelectionCommand.cpp index c6da8642a..e0f62cffd 100644 --- a/src/3rdparty/webkit/WebCore/editing/ReplaceSelectionCommand.cpp +++ b/src/3rdparty/webkit/WebCore/editing/ReplaceSelectionCommand.cpp @@ -60,7 +60,7 @@ enum EFragmentType { EmptyFragment, SingleTextNodeFragment, TreeFragment }; // --- ReplacementFragment helper class -class ReplacementFragment : Noncopyable { +class ReplacementFragment : public Noncopyable { public: ReplacementFragment(Document*, DocumentFragment*, bool matchStyle, const VisibleSelection&); @@ -550,7 +550,7 @@ static bool handleStyleSpansBeforeInsertion(ReplacementFragment& fragment, const Node* sourceDocumentStyleSpan = topNode; RefPtr copiedRangeStyleSpan = sourceDocumentStyleSpan->firstChild(); - RefPtr styleAtInsertionPos = rangeCompliantEquivalent(insertionPos).computedStyle()->copyInheritableProperties(); + RefPtr styleAtInsertionPos = rangeCompliantEquivalent(insertionPos).computedStyle()->deprecatedCopyInheritableProperties(); String styleText = styleAtInsertionPos->cssText(); if (styleText == static_cast(sourceDocumentStyleSpan)->getAttribute(styleAttr)) { @@ -606,8 +606,8 @@ void ReplaceSelectionCommand::handleStyleSpans() // styles from blockquoteNode are allowed to override those from the source document, see and . Node* blockquoteNode = isMailPasteAsQuotationNode(context) ? context : nearestMailBlockquote(context); if (blockquoteNode) { - RefPtr blockquoteStyle = computedStyle(blockquoteNode)->copyInheritableProperties(); - RefPtr parentStyle = computedStyle(blockquoteNode->parentNode())->copyInheritableProperties(); + RefPtr blockquoteStyle = computedStyle(blockquoteNode)->deprecatedCopyInheritableProperties(); + RefPtr parentStyle = computedStyle(blockquoteNode->parentNode())->deprecatedCopyInheritableProperties(); parentStyle->diff(blockquoteStyle.get()); CSSMutableStyleDeclaration::const_iterator end = blockquoteStyle->end(); @@ -619,7 +619,7 @@ void ReplaceSelectionCommand::handleStyleSpans() context = blockquoteNode->parentNode(); } - RefPtr contextStyle = computedStyle(context)->copyInheritableProperties(); + RefPtr contextStyle = computedStyle(context)->deprecatedCopyInheritableProperties(); contextStyle->diff(sourceDocumentStyle.get()); // Remove block properties in the span's style. This prevents properties that probably have no effect @@ -655,7 +655,7 @@ void ReplaceSelectionCommand::handleStyleSpans() // Remove redundant styles. context = copiedRangeStyleSpan->parentNode(); - contextStyle = computedStyle(context)->copyInheritableProperties(); + contextStyle = computedStyle(context)->deprecatedCopyInheritableProperties(); contextStyle->diff(copiedRangeStyle.get()); // See the comments above about removing block properties. diff --git a/src/3rdparty/webkit/WebCore/editing/SelectionController.cpp b/src/3rdparty/webkit/WebCore/editing/SelectionController.cpp index 54f09cd95..b6874d6f1 100644 --- a/src/3rdparty/webkit/WebCore/editing/SelectionController.cpp +++ b/src/3rdparty/webkit/WebCore/editing/SelectionController.cpp @@ -100,6 +100,8 @@ void SelectionController::moveTo(const Position &base, const Position &extent, E void SelectionController::setSelection(const VisibleSelection& s, bool closeTyping, bool clearTypingStyle, bool userTriggered) { + m_lastChangeWasHorizontalExtension = false; + if (m_isDragCaretController) { invalidateCaretRect(); m_sel = s; @@ -223,29 +225,24 @@ void SelectionController::nodeWillBeRemoved(Node *node) void SelectionController::willBeModified(EAlteration alter, EDirection direction) { - switch (alter) { - case MOVE: - m_lastChangeWasHorizontalExtension = false; + if (alter != EXTEND) + return; + if (m_lastChangeWasHorizontalExtension) + return; + + Position start = m_sel.start(); + Position end = m_sel.end(); + // FIXME: This is probably not correct for right and left when the direction is RTL. + switch (direction) { + case RIGHT: + case FORWARD: + m_sel.setBase(start); + m_sel.setExtent(end); break; - case EXTEND: - if (!m_lastChangeWasHorizontalExtension) { - m_lastChangeWasHorizontalExtension = true; - Position start = m_sel.start(); - Position end = m_sel.end(); - switch (direction) { - // FIXME: right for bidi? - case RIGHT: - case FORWARD: - m_sel.setBase(start); - m_sel.setExtent(end); - break; - case LEFT: - case BACKWARD: - m_sel.setBase(end); - m_sel.setExtent(start); - break; - } - } + case LEFT: + case BACKWARD: + m_sel.setBase(end); + m_sel.setExtent(start); break; } } @@ -560,8 +557,8 @@ bool SelectionController::modify(EAlteration alter, EDirection dir, TextGranular { if (userTriggered) { SelectionController trialSelectionController; - trialSelectionController.setLastChangeWasHorizontalExtension(m_lastChangeWasHorizontalExtension); trialSelectionController.setSelection(m_sel); + trialSelectionController.setLastChangeWasHorizontalExtension(m_lastChangeWasHorizontalExtension); trialSelectionController.modify(alter, dir, granularity, false); bool change = m_frame->shouldChangeSelection(trialSelectionController.selection()); @@ -634,6 +631,8 @@ bool SelectionController::modify(EAlteration alter, EDirection dir, TextGranular setNeedsLayout(); + m_lastChangeWasHorizontalExtension = alter == EXTEND; + return true; } @@ -655,6 +654,7 @@ bool SelectionController::modify(EAlteration alter, int verticalDistance, bool u if (userTriggered) { SelectionController trialSelectionController; trialSelectionController.setSelection(m_sel); + trialSelectionController.setLastChangeWasHorizontalExtension(m_lastChangeWasHorizontalExtension); trialSelectionController.modify(alter, verticalDistance, false); bool change = m_frame->shouldChangeSelection(trialSelectionController.selection()); diff --git a/src/3rdparty/webkit/WebCore/editing/SelectionController.h b/src/3rdparty/webkit/WebCore/editing/SelectionController.h index bbd343cd1..4a13a3094 100644 --- a/src/3rdparty/webkit/WebCore/editing/SelectionController.h +++ b/src/3rdparty/webkit/WebCore/editing/SelectionController.h @@ -38,7 +38,7 @@ class GraphicsContext; class RenderObject; class VisiblePosition; -class SelectionController : Noncopyable { +class SelectionController : public Noncopyable { public: enum EAlteration { MOVE, EXTEND }; enum EDirection { FORWARD, BACKWARD, RIGHT, LEFT }; diff --git a/src/3rdparty/webkit/WebCore/editing/TextIterator.cpp b/src/3rdparty/webkit/WebCore/editing/TextIterator.cpp index a1b3bc578..f82a9726c 100644 --- a/src/3rdparty/webkit/WebCore/editing/TextIterator.cpp +++ b/src/3rdparty/webkit/WebCore/editing/TextIterator.cpp @@ -57,7 +57,7 @@ using namespace HTMLNames; // Keeps enough of the previous text to be able to search in the future, but no more. // Non-breaking spaces are always equal to normal spaces. // Case folding is also done if is false. -class SearchBuffer : Noncopyable { +class SearchBuffer : public Noncopyable { public: SearchBuffer(const String& target, bool isCaseSensitive); ~SearchBuffer(); @@ -1393,8 +1393,40 @@ const UChar* WordAwareIterator::characters() const // -------- +static inline UChar foldQuoteMark(UChar c) +{ + switch (c) { + case hebrewPunctuationGershayim: + case leftDoubleQuotationMark: + case rightDoubleQuotationMark: + return '"'; + case hebrewPunctuationGeresh: + case leftSingleQuotationMark: + case rightSingleQuotationMark: + return '\''; + default: + return c; + } +} + +static inline void foldQuoteMarks(String& s) +{ + s.replace(hebrewPunctuationGeresh, '\''); + s.replace(hebrewPunctuationGershayim, '"'); + s.replace(leftDoubleQuotationMark, '"'); + s.replace(leftSingleQuotationMark, '\''); + s.replace(rightDoubleQuotationMark, '"'); + s.replace(rightSingleQuotationMark, '\''); +} + #if USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION +static inline void foldQuoteMarks(UChar* data, size_t length) +{ + for (size_t i = 0; i < length; ++i) + data[i] = foldQuoteMark(data[i]); +} + static const size_t minimumSearchBufferSize = 8192; #ifndef NDEBUG @@ -1408,7 +1440,7 @@ static UStringSearch* createSearcher() // without setting both the pattern and the text. UErrorCode status = U_ZERO_ERROR; UStringSearch* searcher = usearch_open(&newlineCharacter, 1, &newlineCharacter, 1, currentSearchLocaleID(), 0, &status); - ASSERT(status == U_ZERO_ERROR || status == U_USING_FALLBACK_WARNING); + ASSERT(status == U_ZERO_ERROR || status == U_USING_FALLBACK_WARNING || status == U_USING_DEFAULT_WARNING); return searcher; } @@ -1440,7 +1472,12 @@ inline SearchBuffer::SearchBuffer(const String& target, bool isCaseSensitive) { ASSERT(!m_target.isEmpty()); - size_t targetLength = target.length(); + // FIXME: We'd like to tailor the searcher to fold quote marks for us instead + // of doing it in a separate replacement pass here, but ICU doesn't offer a way + // to add tailoring on top of the locale-specific tailoring as of this writing. + foldQuoteMarks(m_target); + + size_t targetLength = m_target.length(); m_buffer.reserveInitialCapacity(max(targetLength * 8, minimumSearchBufferSize)); m_overlap = m_buffer.capacity() / 4; @@ -1480,9 +1517,11 @@ inline size_t SearchBuffer::append(const UChar* characters, size_t length) m_buffer.shrink(m_overlap); } - size_t usableLength = min(m_buffer.capacity() - m_buffer.size(), length); + size_t oldLength = m_buffer.size(); + size_t usableLength = min(m_buffer.capacity() - oldLength, length); ASSERT(usableLength); m_buffer.append(characters, usableLength); + foldQuoteMarks(m_buffer.data() + oldLength, usableLength); return usableLength; } @@ -1549,6 +1588,7 @@ inline SearchBuffer::SearchBuffer(const String& target, bool isCaseSensitive) { ASSERT(!m_target.isEmpty()); m_target.replace(noBreakSpace, ' '); + foldQuoteMarks(m_target); } inline SearchBuffer::~SearchBuffer() @@ -1568,7 +1608,7 @@ inline bool SearchBuffer::atBreak() const inline void SearchBuffer::append(UChar c, bool isStart) { - m_buffer[m_cursor] = c == noBreakSpace ? ' ' : c; + m_buffer[m_cursor] = c == noBreakSpace ? ' ' : foldQuoteMark(c); m_isCharacterStartBuffer[m_cursor] = isStart; if (++m_cursor == m_target.length()) { m_cursor = 0; @@ -1875,11 +1915,6 @@ tryAgain: PassRefPtr findPlainText(const Range* range, const String& target, bool forward, bool caseSensitive) { - // We can't search effectively for a string that's entirely made of collapsible - // whitespace, so we won't even try. This also takes care of the empty string case. - if (isAllCollapsibleWhitespace(target)) - return collapsedToBoundary(range, forward); - // First, find the text. size_t matchStart; size_t matchLength; diff --git a/src/3rdparty/webkit/WebCore/editing/htmlediting.cpp b/src/3rdparty/webkit/WebCore/editing/htmlediting.cpp index c0bf0095f..a04d2b70f 100644 --- a/src/3rdparty/webkit/WebCore/editing/htmlediting.cpp +++ b/src/3rdparty/webkit/WebCore/editing/htmlediting.cpp @@ -207,6 +207,20 @@ Element* editableRootForPosition(const Position& p) return node->rootEditableElement(); } +// Finds the enclosing element until which the tree can be split. +// When a user hits ENTER, he/she won't expect this element to be split into two. +// You may pass it as the second argument of splitTreeToNode. +Element* unsplittableElementForPosition(const Position& p) +{ + // Since enclosingNodeOfType won't search beyond the highest root editable node, + // this code works even if the closest table cell was outside of the root editable node. + Element* enclosingCell = static_cast(enclosingNodeOfType(p, &isTableCell, true)); + if (enclosingCell) + return enclosingCell; + + return editableRootForPosition(p); +} + bool isContentEditable(const Node* node) { return node->isContentEditable(); @@ -565,16 +579,79 @@ Node* isLastPositionBeforeTable(const VisiblePosition& visiblePosition) Position positionBeforeNode(const Node* node) { - // FIXME: This should ASSERT(node->parentNode()) + ASSERT(node); + // FIXME: Should ASSERT(node->parentNode()) but doing so results in editing/deleting/delete-ligature-001.html crashing return Position(node->parentNode(), node->nodeIndex()); } Position positionAfterNode(const Node* node) { - // FIXME: This should ASSERT(node->parentNode()) + ASSERT(node); + // FIXME: Should ASSERT(node->parentNode()) but doing so results in editing/deleting/delete-ligature-001.html crashing return Position(node->parentNode(), node->nodeIndex() + 1); } +// Returns the visible position at the beginning of a node +VisiblePosition visiblePositionBeforeNode(Node* node) +{ + ASSERT(node); + if (node->childNodeCount()) + return VisiblePosition(node, 0, DOWNSTREAM); + ASSERT(node->parentNode()); + return positionBeforeNode(node); +} + +// Returns the visible position at the ending of a node +VisiblePosition visiblePositionAfterNode(Node* node) +{ + ASSERT(node); + if (node->childNodeCount()) + return VisiblePosition(node, node->childNodeCount(), DOWNSTREAM); + ASSERT(node->parentNode()); + return positionAfterNode(node); +} + +// Create a range object with two visible positions, start and end. +// create(PassRefPtr, const Position&, const Position&); will use deprecatedEditingOffset +// Use this function instead of create a regular range object (avoiding editing offset). +PassRefPtr createRange(PassRefPtr document, const VisiblePosition& start, const VisiblePosition& end, ExceptionCode& ec) +{ + ec = 0; + RefPtr selectedRange = Range::create(document); + selectedRange->setStart(start.deepEquivalent().containerNode(), start.deepEquivalent().computeOffsetInContainerNode(), ec); + if (!ec) + selectedRange->setEnd(end.deepEquivalent().containerNode(), end.deepEquivalent().computeOffsetInContainerNode(), ec); + return selectedRange.release(); +} + +// Extend rangeToExtend to include nodes that wraps range and visibly starts and ends inside or at the boudnaries of maximumRange +// e.g. if the original range spaned "hello" in
hello
, then this function extends the range to contain div's around it. +// Call this function before copying / moving paragraphs to contain all wrapping nodes. +// This function stops extending the range immediately below rootNode; i.e. the extended range can contain a child node of rootNode +// but it can never contain rootNode itself. +PassRefPtr extendRangeToWrappingNodes(PassRefPtr range, const Range* maximumRange, const Node* rootNode) +{ + ASSERT(range); + ASSERT(maximumRange); + + ExceptionCode ec = 0; + Node* ancestor = range->commonAncestorContainer(ec);// find the cloeset common ancestor + Node* highestNode = 0; + // traverse through ancestors as long as they are contained within the range, content-editable, and below rootNode (could be =0). + while (ancestor && ancestor->isContentEditable() && isNodeVisiblyContainedWithin(ancestor, maximumRange) && ancestor != rootNode) { + highestNode = ancestor; + ancestor = ancestor->parentNode(); + } + + if (!highestNode) + return range; + + // Create new range with the highest editable node contained within the range + RefPtr extendedRange = Range::create(range->ownerDocument()); + extendedRange->selectNode(highestNode, ec); + return extendedRange.release(); +} + bool isListElement(Node *n) { return (n && (n->hasTagName(ulTag) || n->hasTagName(olTag) || n->hasTagName(dlTag))); @@ -746,7 +823,7 @@ bool canMergeLists(Element* firstList, Element* secondList) return firstList->hasTagName(secondList->tagQName())// make sure the list types match (ol vs. ul) && isContentEditable(firstList) && isContentEditable(secondList)// both lists are editable && firstList->rootEditableElement() == secondList->rootEditableElement()// don't cross editing boundaries - && isVisibilyAdjacent(positionAfterNode(firstList), positionBeforeNode(secondList)); + && isVisiblyAdjacent(positionAfterNode(firstList), positionBeforeNode(secondList)); // Make sure there is no visible content between this li and the previous list } @@ -974,7 +1051,7 @@ VisibleSelection selectionForParagraphIteration(const VisibleSelection& original } -int indexForVisiblePosition(VisiblePosition& visiblePosition) +int indexForVisiblePosition(const VisiblePosition& visiblePosition) { if (visiblePosition.isNull()) return 0; @@ -983,11 +1060,29 @@ int indexForVisiblePosition(VisiblePosition& visiblePosition) return TextIterator::rangeLength(range.get(), true); } -bool isVisibilyAdjacent(const Position& first, const Position& second) +// Determines whether two positions are visibly next to each other (first then second) +// while ignoring whitespaces and unrendered nodes +bool isVisiblyAdjacent(const Position& first, const Position& second) { return VisiblePosition(first) == VisiblePosition(second.upstream()); } +// Determines whether a node is inside a range or visibly starts and ends at the boundaries of the range. +// Call this function to determine whether a node is visibly fit inside selectedRange +bool isNodeVisiblyContainedWithin(Node* node, const Range* selectedRange) +{ + ASSERT(node); + ASSERT(selectedRange); + // If the node is inside the range, then it surely is contained within + ExceptionCode ec = 0; + if (selectedRange->compareNode(node, ec) == Range::NODE_INSIDE) + return true; + + // If the node starts and ends at where selectedRange starts and ends, the node is contained within + return visiblePositionBeforeNode(node) == selectedRange->startPosition() + && visiblePositionAfterNode(node) == selectedRange->endPosition(); +} + PassRefPtr avoidIntersectionWithNode(const Range* range, Node* node) { if (!range) diff --git a/src/3rdparty/webkit/WebCore/editing/htmlediting.h b/src/3rdparty/webkit/WebCore/editing/htmlediting.h index 25ff8472d..8f5d5ff95 100644 --- a/src/3rdparty/webkit/WebCore/editing/htmlediting.h +++ b/src/3rdparty/webkit/WebCore/editing/htmlediting.h @@ -28,6 +28,7 @@ #include #include "HTMLNames.h" +#include "ExceptionCode.h" namespace WebCore { @@ -61,6 +62,7 @@ Position previousVisuallyDistinctCandidate(const Position&); bool isEditablePosition(const Position&); bool isRichlyEditablePosition(const Position&); Element* editableRootForPosition(const Position&); +Element* unsplittableElementForPosition(const Position&); bool isBlock(const Node*); Node* enclosingBlock(Node*); @@ -71,6 +73,10 @@ const String& nonBreakingSpaceString(); Position positionBeforeNode(const Node*); Position positionAfterNode(const Node*); +VisiblePosition visiblePositionBeforeNode(Node*); +VisiblePosition visiblePositionAfterNode(Node*); +PassRefPtr createRange(PassRefPtr, const VisiblePosition& start, const VisiblePosition& end, ExceptionCode&); +PassRefPtr extendRangeToWrappingNodes(PassRefPtr rangeToExtend, const Range* maximumRange, const Node* rootNode); PassRefPtr avoidIntersectionWithNode(const Range*, Node*); VisibleSelection avoidIntersectionWithNode(const VisibleSelection&, Node*); @@ -134,8 +140,9 @@ bool lineBreakExistsAtVisiblePosition(const VisiblePosition&); VisibleSelection selectionForParagraphIteration(const VisibleSelection&); -int indexForVisiblePosition(VisiblePosition&); -bool isVisibilyAdjacent(const Position& first, const Position& second); +int indexForVisiblePosition(const VisiblePosition&); +bool isVisiblyAdjacent(const Position& first, const Position& second); +bool isNodeVisiblyContainedWithin(Node*, const Range*); } #endif diff --git a/src/3rdparty/webkit/WebCore/editing/markup.cpp b/src/3rdparty/webkit/WebCore/editing/markup.cpp index d6fe1cea1..6b6d32601 100644 --- a/src/3rdparty/webkit/WebCore/editing/markup.cpp +++ b/src/3rdparty/webkit/WebCore/editing/markup.cpp @@ -292,8 +292,8 @@ static void removeEnclosingMailBlockquoteStyle(CSSMutableStyleDeclaration* style if (!blockquote || !blockquote->parentNode()) return; - RefPtr parentStyle = Position(blockquote->parentNode(), 0).computedStyle()->copyInheritableProperties(); - RefPtr blockquoteStyle = Position(blockquote, 0).computedStyle()->copyInheritableProperties(); + RefPtr parentStyle = Position(blockquote->parentNode(), 0).computedStyle()->deprecatedCopyInheritableProperties(); + RefPtr blockquoteStyle = Position(blockquote, 0).computedStyle()->deprecatedCopyInheritableProperties(); parentStyle->diff(blockquoteStyle.get()); blockquoteStyle->diff(style); } @@ -303,7 +303,7 @@ static void removeDefaultStyles(CSSMutableStyleDeclaration* style, Document* doc if (!document || !document->documentElement()) return; - RefPtr documentStyle = computedStyle(document->documentElement())->copyInheritableProperties(); + RefPtr documentStyle = computedStyle(document->documentElement())->deprecatedCopyInheritableProperties(); documentStyle->diff(style); } @@ -692,7 +692,7 @@ static PassRefPtr styleFromMatchedRulesAndInlineDecl return style.release(); } -static bool propertyMissingOrEqualToNone(CSSMutableStyleDeclaration* style, int propertyID) +static bool propertyMissingOrEqualToNone(CSSStyleDeclaration* style, int propertyID) { if (!style) return false; @@ -704,8 +704,11 @@ static bool propertyMissingOrEqualToNone(CSSMutableStyleDeclaration* style, int return static_cast(value.get())->getIdent() == CSSValueNone; } -static bool elementHasTextDecorationProperty(const Node* node) +static bool isElementPresentational(const Node* node) { + if (node->hasTagName(uTag) || node->hasTagName(sTag) || node->hasTagName(strikeTag) || + node->hasTagName(iTag) || node->hasTagName(emTag) || node->hasTagName(bTag) || node->hasTagName(strongTag)) + return true; RefPtr style = styleFromMatchedRulesAndInlineDecl(node); if (!style) return false; @@ -763,6 +766,25 @@ static bool shouldIncludeWrapperForFullySelectedRoot(Node* fullySelectedRoot, CS style->getPropertyCSSValue(CSSPropertyBackgroundColor); } +static void addStyleMarkup(Vector& preMarkups, Vector& postMarkups, CSSStyleDeclaration* style, Document* document, bool isBlock = false) +{ + // All text-decoration-related elements should have been treated as special ancestors + // If we ever hit this ASSERT, we should export StyleChange in ApplyStyleCommand and use it here + ASSERT(propertyMissingOrEqualToNone(style, CSSPropertyTextDecoration) && propertyMissingOrEqualToNone(style, CSSPropertyWebkitTextDecorationsInEffect)); + DEFINE_STATIC_LOCAL(const String, divStyle, ("
")); + DEFINE_STATIC_LOCAL(const String, styleSpanOpen, ("")); + Vector openTag; + append(openTag, isBlock ? divStyle : styleSpanOpen); + appendAttributeValue(openTag, style->cssText(), document->isHTMLDocument()); + openTag.append('\"'); + openTag.append('>'); + preMarkups.append(String::adopt(openTag)); + + postMarkups.append(isBlock ? divClose : styleSpanClose); +} + // FIXME: Shouldn't we omit style info when annotate == DoNotAnnotateForInterchange? // FIXME: At least, annotation and style info should probably not be included in range.markupString() String createMarkup(const Range* range, Vector* nodes, EAnnotateForInterchange annotate, bool convertBlocksToInlines) @@ -776,8 +798,6 @@ String createMarkup(const Range* range, Vector* nodes, EAnnotateForInterc if (!document) return ""; - bool documentIsHTML = document->isHTMLDocument(); - // Disable the delete button so it's elements are not serialized into the markup, // but make sure neither endpoint is inside the delete user interface. Frame* frame = document->frame(); @@ -927,12 +947,12 @@ String createMarkup(const Range* range, Vector* nodes, EAnnotateForInterc if (isMailBlockquote(ancestor)) specialCommonAncestor = ancestor; } - + Node* checkAncestor = specialCommonAncestor ? specialCommonAncestor : commonAncestor; if (checkAncestor->renderer()) { - RefPtr checkAncestorStyle = computedStyle(checkAncestor)->copyInheritableProperties(); - if (!propertyMissingOrEqualToNone(checkAncestorStyle.get(), CSSPropertyWebkitTextDecorationsInEffect)) - specialCommonAncestor = enclosingNodeOfType(Position(checkAncestor, 0), &elementHasTextDecorationProperty); + Node* newSpecialCommonAncestor = highestEnclosingNodeOfType(Position(checkAncestor, 0), &isElementPresentational); + if (newSpecialCommonAncestor) + specialCommonAncestor = newSpecialCommonAncestor; } // If a single tab is selected, commonAncestor will be a text node inside a tab span. @@ -966,18 +986,8 @@ String createMarkup(const Range* range, Vector* nodes, EAnnotateForInterc if (!fullySelectedRootStyle->getPropertyCSSValue(CSSPropertyBackgroundImage) && static_cast(fullySelectedRoot)->hasAttribute(backgroundAttr)) fullySelectedRootStyle->setProperty(CSSPropertyBackgroundImage, "url('" + static_cast(fullySelectedRoot)->getAttribute(backgroundAttr) + "')"); - if (fullySelectedRootStyle->length()) { - Vector openTag; - DEFINE_STATIC_LOCAL(const String, divStyle, ("
cssText(), documentIsHTML); - openTag.append('\"'); - openTag.append('>'); - preMarkups.append(String::adopt(openTag)); - - DEFINE_STATIC_LOCAL(const String, divCloseTag, ("
")); - markups.append(divCloseTag); - } + if (fullySelectedRootStyle->length()) + addStyleMarkup(preMarkups, markups, fullySelectedRootStyle.get(), document, true); } else { // Since this node and all the other ancestors are not in the selection we want to set RangeFullySelectsNode to DoesNotFullySelectNode // so that styles that affect the exterior of the node are not included. @@ -993,14 +1003,11 @@ String createMarkup(const Range* range, Vector* nodes, EAnnotateForInterc break; } } - - DEFINE_STATIC_LOCAL(const String, styleSpanOpen, ("")); - + // Add a wrapper span with the styles that all of the nodes in the markup inherit. Node* parentOfLastClosed = lastClosed ? lastClosed->parentNode() : 0; if (parentOfLastClosed && parentOfLastClosed->renderer()) { - RefPtr style = computedStyle(parentOfLastClosed)->copyInheritableProperties(); + RefPtr style = computedStyle(parentOfLastClosed)->deprecatedCopyInheritableProperties(); // Styles that Mail blockquotes contribute should only be placed on the Mail blockquote, to help // us differentiate those styles from ones that the user has applied. This helps us @@ -1016,33 +1023,18 @@ String createMarkup(const Range* range, Vector* nodes, EAnnotateForInterc if (convertBlocksToInlines) style->removeBlockProperties(); - if (style->length() > 0) { - Vector openTag; - append(openTag, styleSpanOpen); - appendAttributeValue(openTag, style->cssText(), documentIsHTML); - openTag.append('\"'); - openTag.append('>'); - preMarkups.append(String::adopt(openTag)); - - markups.append(styleSpanClose); - } + if (style->length() > 0) + addStyleMarkup(preMarkups, markups, style.get(), document); } if (lastClosed && lastClosed != document->documentElement()) { // Add a style span with the document's default styles. We add these in a separate // span so that at paste time we can differentiate between document defaults and user // applied styles. - RefPtr defaultStyle = computedStyle(document->documentElement())->copyInheritableProperties(); + RefPtr defaultStyle = computedStyle(document->documentElement())->deprecatedCopyInheritableProperties(); - if (defaultStyle->length() > 0) { - Vector openTag; - append(openTag, styleSpanOpen); - appendAttributeValue(openTag, defaultStyle->cssText(), documentIsHTML); - openTag.append('\"'); - openTag.append('>'); - preMarkups.append(String::adopt(openTag)); - markups.append(styleSpanClose); - } + if (defaultStyle->length() > 0) + addStyleMarkup(preMarkups, markups, defaultStyle.get(), document); } // FIXME: The interchange newline should be placed in the block that it's in, not after all of the content, unconditionally. diff --git a/src/3rdparty/webkit/WebCore/editing/visible_units.cpp b/src/3rdparty/webkit/WebCore/editing/visible_units.cpp index 02e9fb859..869c89331 100644 --- a/src/3rdparty/webkit/WebCore/editing/visible_units.cpp +++ b/src/3rdparty/webkit/WebCore/editing/visible_units.cpp @@ -1178,9 +1178,6 @@ VisiblePosition logicalStartOfLine(const VisiblePosition& c) { VisiblePosition visPos = logicalStartPositionForLine(c); - if (visPos.isNull()) - return c.honorEditableBoundaryAtOrAfter(visPos); - return c.honorEditableBoundaryAtOrAfter(visPos); } diff --git a/src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp b/src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp index 1c2da0693..bdd43466b 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp +++ b/src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp @@ -115,12 +115,16 @@ #include "MediaList.h" #include "WebKitCSSKeyframeRule.h" #include "WebKitCSSKeyframesRule.h" +#include #include #include using namespace WebCore; using namespace HTMLNames; +#define YYMALLOC fastMalloc +#define YYFREE fastFree + #define YYENABLE_NLS 0 #define YYLTYPE_IS_TRIVIAL 1 #define YYMAXDEPTH 10000 @@ -133,7 +137,7 @@ using namespace HTMLNames; /* Line 189 of yacc.c */ -#line 137 "WebCore/tmp/../generated/CSSGrammar.tab.c" +#line 141 "WebCore/tmp/../generated/CSSGrammar.tab.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -197,32 +201,33 @@ using namespace HTMLNames; MEDIA_ONLY = 291, MEDIA_NOT = 292, MEDIA_AND = 293, - QEMS = 294, - EMS = 295, - EXS = 296, - PXS = 297, - CMS = 298, - MMS = 299, - INS = 300, - PTS = 301, - PCS = 302, - DEGS = 303, - RADS = 304, - GRADS = 305, - TURNS = 306, - MSECS = 307, - SECS = 308, - HERZ = 309, - KHERZ = 310, - DIMEN = 311, - PERCENTAGE = 312, - FLOATTOKEN = 313, - INTEGER = 314, - URI = 315, - FUNCTION = 316, - NOTFUNCTION = 317, - UNICODERANGE = 318, - VARCALL = 319 + REMS = 294, + QEMS = 295, + EMS = 296, + EXS = 297, + PXS = 298, + CMS = 299, + MMS = 300, + INS = 301, + PTS = 302, + PCS = 303, + DEGS = 304, + RADS = 305, + GRADS = 306, + TURNS = 307, + MSECS = 308, + SECS = 309, + HERZ = 310, + KHERZ = 311, + DIMEN = 312, + PERCENTAGE = 313, + FLOATTOKEN = 314, + INTEGER = 315, + URI = 316, + FUNCTION = 317, + NOTFUNCTION = 318, + UNICODERANGE = 319, + VARCALL = 320 }; #endif @@ -233,7 +238,7 @@ typedef union YYSTYPE { /* Line 214 of yacc.c */ -#line 58 "../css/CSSGrammar.y" +#line 62 "../css/CSSGrammar.y" bool boolean; char character; @@ -260,7 +265,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 264 "WebCore/tmp/../generated/CSSGrammar.tab.c" +#line 269 "WebCore/tmp/../generated/CSSGrammar.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -271,7 +276,7 @@ typedef union YYSTYPE /* Copy the second part of user declarations. */ /* Line 264 of yacc.c */ -#line 82 "../css/CSSGrammar.y" +#line 86 "../css/CSSGrammar.y" static inline int cssyyerror(const char*) @@ -287,7 +292,7 @@ static int cssyylex(YYSTYPE* yylval, void* parser) /* Line 264 of yacc.c */ -#line 291 "WebCore/tmp/../generated/CSSGrammar.tab.c" +#line 296 "WebCore/tmp/../generated/CSSGrammar.tab.c" #ifdef short # undef short @@ -502,20 +507,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 28 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1315 +#define YYLAST 1329 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 85 +#define YYNTOKENS 86 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 90 /* YYNRULES -- Number of rules. */ -#define YYNRULES 267 +#define YYNRULES 268 /* YYNRULES -- Number of states. */ -#define YYNSTATES 513 +#define YYNSTATES 515 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 319 +#define YYMAXUTOK 320 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -526,16 +531,16 @@ static const yytype_uint8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 83, 2, 84, 2, 2, - 73, 74, 20, 76, 75, 79, 18, 82, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 17, 72, - 2, 81, 78, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 84, 2, 85, 2, 2, + 74, 75, 20, 77, 76, 80, 18, 83, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 17, 73, + 2, 82, 79, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 19, 2, 80, 2, 2, 2, 2, 2, 2, + 2, 19, 2, 81, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 70, 21, 71, 77, 2, 2, 2, + 2, 2, 2, 71, 21, 72, 78, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -554,7 +559,8 @@ static const yytype_uint8 yytranslate[] = 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69 + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70 }; #if YYDEBUG @@ -587,137 +593,137 @@ static const yytype_uint16 yyprhs[] = 761, 764, 767, 771, 774, 777, 779, 782, 784, 787, 790, 793, 796, 799, 802, 805, 808, 811, 814, 817, 820, 823, 826, 829, 832, 835, 838, 841, 844, 847, - 850, 852, 858, 862, 865, 868, 870, 873, 877, 881, - 884, 888, 890, 892, 895, 901, 905, 907 + 850, 853, 855, 861, 865, 868, 871, 873, 876, 880, + 884, 887, 891, 893, 895, 898, 904, 908, 910 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 86, 0, -1, 97, 96, 100, 101, 102, 103, -1, - 88, 95, -1, 90, 95, -1, 92, 95, -1, 93, - 95, -1, 94, 95, -1, 91, 95, -1, 89, 95, - -1, 104, -1, 109, -1, 28, 70, 95, 87, 95, - 71, -1, 30, 70, 95, 133, 95, 71, -1, 29, - 70, 95, 155, 71, -1, 38, 70, 95, 112, 71, - -1, 32, 70, 95, 160, 71, -1, 33, 5, 95, - 125, 71, -1, 34, 70, 95, 141, 71, -1, -1, - 95, 5, -1, -1, 96, 6, -1, 96, 5, -1, - -1, 99, -1, 71, -1, 0, -1, 26, 95, 12, - 95, 72, -1, 26, 1, 173, -1, 26, 1, 72, - -1, -1, 100, 109, 96, -1, 169, -1, -1, 101, - 110, 96, -1, -1, 102, 116, 96, -1, -1, 103, - 105, 96, -1, 140, -1, 128, -1, 136, -1, 137, - -1, 130, -1, 104, -1, 172, -1, 168, -1, 170, - -1, -1, 106, 108, 96, -1, 140, -1, 136, -1, - 137, -1, 130, -1, 107, -1, 172, -1, 168, -1, - 170, -1, 171, -1, 22, 95, 118, 95, 126, 72, - -1, 22, 95, 118, 95, 126, 173, -1, 22, 1, - 72, -1, 22, 1, 173, -1, 35, 95, 126, 70, - 95, 112, 71, -1, 36, 95, 111, 70, 95, 112, - 71, -1, -1, 37, 5, 127, -1, 114, -1, 113, - 114, -1, 113, -1, 1, 174, 1, -1, 1, -1, - 113, 1, -1, 114, 72, 95, -1, 114, 174, 72, - 95, -1, 1, 72, 95, -1, 1, 174, 1, 72, - 95, -1, 113, 114, 72, 95, -1, 113, 1, 72, - 95, -1, 113, 1, 174, 1, 72, 95, -1, 115, - 17, 95, 160, -1, 115, 95, 70, 95, 155, 71, - 95, -1, 115, 1, -1, 115, 17, 95, 1, 160, - -1, 115, 17, 95, -1, 115, 17, 95, 1, -1, - 13, 95, -1, 27, 95, 117, 118, 95, 72, -1, - 27, 1, 173, -1, 27, 1, 72, -1, -1, 13, - 5, -1, 12, -1, 65, -1, 13, 95, -1, -1, - 17, 95, 160, 95, -1, 73, 95, 119, 95, 120, - 74, 95, -1, 121, -1, 122, 95, 43, 95, 121, - -1, -1, 43, 95, 122, -1, -1, 41, -1, 42, - -1, 122, -1, 124, 95, 129, 123, -1, -1, 127, - -1, 125, -1, 127, 75, 95, 125, -1, 127, 1, - -1, 24, 95, 127, 70, 95, 106, 167, -1, 24, - 95, 70, 95, 106, 167, -1, 13, 95, -1, 31, - 95, 131, 95, 70, 95, 132, 71, -1, 13, -1, - 12, -1, -1, 132, 133, 95, -1, 134, 95, 70, - 95, 155, 71, -1, 135, -1, 134, 95, 75, 95, - 135, -1, 62, -1, 13, -1, 23, 1, 173, -1, - 23, 1, 72, -1, 25, 95, 70, 95, 155, 71, - 95, -1, 25, 1, 173, -1, 25, 1, 72, -1, - 76, 95, -1, 77, 95, -1, 78, 95, -1, 79, - -1, 76, -1, 141, 70, 95, 155, 98, -1, 143, - -1, 141, 75, 95, 143, -1, 141, 1, -1, 143, - 5, -1, 145, -1, 142, -1, 142, 145, -1, 143, - 138, 145, -1, 143, 1, -1, 21, -1, 20, 21, - -1, 13, 21, -1, 146, -1, 146, 147, -1, 147, - -1, 144, 146, -1, 144, 146, 147, -1, 144, 147, - -1, 13, -1, 20, -1, 148, -1, 147, 148, -1, - 147, 1, -1, 16, -1, 15, -1, 149, -1, 151, - -1, 154, -1, 18, 13, -1, 13, 95, -1, 19, - 95, 150, 80, -1, 19, 95, 150, 152, 95, 153, - 95, 80, -1, 19, 95, 144, 150, 80, -1, 19, - 95, 144, 150, 152, 95, 153, 95, 80, -1, 81, + 87, 0, -1, 98, 97, 101, 102, 103, 104, -1, + 89, 96, -1, 91, 96, -1, 93, 96, -1, 94, + 96, -1, 95, 96, -1, 92, 96, -1, 90, 96, + -1, 105, -1, 110, -1, 28, 71, 96, 88, 96, + 72, -1, 30, 71, 96, 134, 96, 72, -1, 29, + 71, 96, 156, 72, -1, 38, 71, 96, 113, 72, + -1, 32, 71, 96, 161, 72, -1, 33, 5, 96, + 126, 72, -1, 34, 71, 96, 142, 72, -1, -1, + 96, 5, -1, -1, 97, 6, -1, 97, 5, -1, + -1, 100, -1, 72, -1, 0, -1, 26, 96, 12, + 96, 73, -1, 26, 1, 174, -1, 26, 1, 73, + -1, -1, 101, 110, 97, -1, 170, -1, -1, 102, + 111, 97, -1, -1, 103, 117, 97, -1, -1, 104, + 106, 97, -1, 141, -1, 129, -1, 137, -1, 138, + -1, 131, -1, 105, -1, 173, -1, 169, -1, 171, + -1, -1, 107, 109, 97, -1, 141, -1, 137, -1, + 138, -1, 131, -1, 108, -1, 173, -1, 169, -1, + 171, -1, 172, -1, 22, 96, 119, 96, 127, 73, + -1, 22, 96, 119, 96, 127, 174, -1, 22, 1, + 73, -1, 22, 1, 174, -1, 35, 96, 127, 71, + 96, 113, 72, -1, 36, 96, 112, 71, 96, 113, + 72, -1, -1, 37, 5, 128, -1, 115, -1, 114, + 115, -1, 114, -1, 1, 175, 1, -1, 1, -1, + 114, 1, -1, 115, 73, 96, -1, 115, 175, 73, + 96, -1, 1, 73, 96, -1, 1, 175, 1, 73, + 96, -1, 114, 115, 73, 96, -1, 114, 1, 73, + 96, -1, 114, 1, 175, 1, 73, 96, -1, 116, + 17, 96, 161, -1, 116, 96, 71, 96, 156, 72, + 96, -1, 116, 1, -1, 116, 17, 96, 1, 161, + -1, 116, 17, 96, -1, 116, 17, 96, 1, -1, + 13, 96, -1, 27, 96, 118, 119, 96, 73, -1, + 27, 1, 174, -1, 27, 1, 73, -1, -1, 13, + 5, -1, 12, -1, 66, -1, 13, 96, -1, -1, + 17, 96, 161, 96, -1, 74, 96, 120, 96, 121, + 75, 96, -1, 122, -1, 123, 96, 43, 96, 122, + -1, -1, 43, 96, 123, -1, -1, 41, -1, 42, + -1, 123, -1, 125, 96, 130, 124, -1, -1, 128, + -1, 126, -1, 128, 76, 96, 126, -1, 128, 1, + -1, 24, 96, 128, 71, 96, 107, 168, -1, 24, + 96, 71, 96, 107, 168, -1, 13, 96, -1, 31, + 96, 132, 96, 71, 96, 133, 72, -1, 13, -1, + 12, -1, -1, 133, 134, 96, -1, 135, 96, 71, + 96, 156, 72, -1, 136, -1, 135, 96, 76, 96, + 136, -1, 63, -1, 13, -1, 23, 1, 174, -1, + 23, 1, 73, -1, 25, 96, 71, 96, 156, 72, + 96, -1, 25, 1, 174, -1, 25, 1, 73, -1, + 77, 96, -1, 78, 96, -1, 79, 96, -1, 80, + -1, 77, -1, 142, 71, 96, 156, 99, -1, 144, + -1, 142, 76, 96, 144, -1, 142, 1, -1, 144, + 5, -1, 146, -1, 143, -1, 143, 146, -1, 144, + 139, 146, -1, 144, 1, -1, 21, -1, 20, 21, + -1, 13, 21, -1, 147, -1, 147, 148, -1, 148, + -1, 145, 147, -1, 145, 147, 148, -1, 145, 148, + -1, 13, -1, 20, -1, 149, -1, 148, 149, -1, + 148, 1, -1, 16, -1, 15, -1, 150, -1, 152, + -1, 155, -1, 18, 13, -1, 13, 96, -1, 19, + 96, 151, 81, -1, 19, 96, 151, 153, 96, 154, + 96, 81, -1, 19, 96, 145, 151, 81, -1, 19, + 96, 145, 151, 153, 96, 154, 96, 81, -1, 82, -1, 7, -1, 8, -1, 9, -1, 10, -1, 11, -1, 13, -1, 12, -1, 17, 13, -1, 17, 17, - 13, -1, 17, 66, 14, 74, -1, 17, 66, 64, - 74, -1, 17, 66, 13, 74, -1, 17, 67, 95, - 145, 95, 74, -1, 157, -1, 156, 157, -1, 156, - -1, 1, 174, 1, -1, 1, -1, 156, 1, -1, - 156, 174, -1, 157, 72, 95, -1, 157, 174, 72, - 95, -1, 1, 72, 95, -1, 1, 174, 1, 72, - 95, -1, 156, 157, 72, 95, -1, 156, 1, 72, - 95, -1, 156, 1, 174, 1, 72, 95, -1, 158, - 17, 95, 160, 159, -1, 164, 95, -1, 158, 1, - -1, 158, 17, 95, 1, 160, 159, -1, 158, 17, - 95, 160, 159, 1, -1, 40, 95, -1, 158, 17, - 95, -1, 158, 17, 95, 1, -1, 158, 173, -1, - 13, 95, -1, 40, 95, -1, -1, 162, -1, 160, - 161, 162, -1, 160, 1, -1, 82, 95, -1, 75, - 95, -1, -1, 163, -1, 139, 163, -1, 12, 95, - -1, 13, 95, -1, 61, 95, -1, 139, 61, 95, - -1, 65, 95, -1, 68, 95, -1, 166, -1, 83, - 95, -1, 165, -1, 164, 95, -1, 84, 95, -1, - 64, 95, -1, 63, 95, -1, 62, 95, -1, 47, - 95, -1, 48, 95, -1, 49, 95, -1, 50, 95, - -1, 51, 95, -1, 52, 95, -1, 53, 95, -1, - 54, 95, -1, 55, 95, -1, 56, 95, -1, 57, - 95, -1, 58, 95, -1, 59, 95, -1, 60, 95, - -1, 45, 95, -1, 44, 95, -1, 46, 95, -1, - 69, -1, 66, 95, 160, 74, 95, -1, 66, 95, - 1, -1, 15, 95, -1, 16, 95, -1, 98, -1, - 1, 98, -1, 39, 1, 173, -1, 39, 1, 72, - -1, 168, 96, -1, 169, 168, 96, -1, 109, -1, - 128, -1, 1, 173, -1, 70, 1, 174, 1, 98, - -1, 70, 1, 98, -1, 173, -1, 174, 1, 173, - -1 + 13, -1, 17, 67, 14, 75, -1, 17, 67, 65, + 75, -1, 17, 67, 13, 75, -1, 17, 68, 96, + 146, 96, 75, -1, 158, -1, 157, 158, -1, 157, + -1, 1, 175, 1, -1, 1, -1, 157, 1, -1, + 157, 175, -1, 158, 73, 96, -1, 158, 175, 73, + 96, -1, 1, 73, 96, -1, 1, 175, 1, 73, + 96, -1, 157, 158, 73, 96, -1, 157, 1, 73, + 96, -1, 157, 1, 175, 1, 73, 96, -1, 159, + 17, 96, 161, 160, -1, 165, 96, -1, 159, 1, + -1, 159, 17, 96, 1, 161, 160, -1, 159, 17, + 96, 161, 160, 1, -1, 40, 96, -1, 159, 17, + 96, -1, 159, 17, 96, 1, -1, 159, 174, -1, + 13, 96, -1, 40, 96, -1, -1, 163, -1, 161, + 162, 163, -1, 161, 1, -1, 83, 96, -1, 76, + 96, -1, -1, 164, -1, 140, 164, -1, 12, 96, + -1, 13, 96, -1, 62, 96, -1, 140, 62, 96, + -1, 66, 96, -1, 69, 96, -1, 167, -1, 84, + 96, -1, 166, -1, 165, 96, -1, 85, 96, -1, + 65, 96, -1, 64, 96, -1, 63, 96, -1, 48, + 96, -1, 49, 96, -1, 50, 96, -1, 51, 96, + -1, 52, 96, -1, 53, 96, -1, 54, 96, -1, + 55, 96, -1, 56, 96, -1, 57, 96, -1, 58, + 96, -1, 59, 96, -1, 60, 96, -1, 61, 96, + -1, 46, 96, -1, 45, 96, -1, 47, 96, -1, + 44, 96, -1, 70, -1, 67, 96, 161, 75, 96, + -1, 67, 96, 1, -1, 15, 96, -1, 16, 96, + -1, 99, -1, 1, 99, -1, 39, 1, 174, -1, + 39, 1, 73, -1, 169, 97, -1, 170, 169, 97, + -1, 110, -1, 129, -1, 1, 174, -1, 71, 1, + 175, 1, 99, -1, 71, 1, 99, -1, 174, -1, + 175, 1, 174, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 266, 266, 267, 268, 269, 270, 271, 272, 273, - 277, 278, 282, 288, 294, 300, 306, 320, 327, 337, - 338, 341, 343, 344, 347, 349, 354, 355, 359, 365, - 367, 371, 373, 378, 382, 384, 391, 393, 396, 398, - 406, 407, 408, 409, 410, 414, 415, 416, 417, 421, - 422, 433, 434, 435, 436, 440, 441, 442, 443, 444, - 449, 452, 455, 458, 464, 468, 474, 478, 484, 487, - 492, 495, 498, 501, 507, 510, 513, 516, 519, 524, - 527, 533, 537, 541, 545, 549, 554, 561, 567, 572, - 573, 577, 578, 582, 583, 587, 593, 596, 602, 609, - 614, 621, 624, 630, 633, 636, 642, 647, 655, 658, - 662, 667, 672, 678, 681, 687, 693, 700, 701, 705, - 706, 714, 720, 725, 734, 735, 759, 762, 768, 772, - 775, 781, 782, 783, 787, 788, 792, 798, 807, 815, - 821, 827, 830, 834, 850, 870, 876, 877, 878, 882, - 887, 894, 900, 910, 922, 935, 943, 951, 954, 967, - 973, 981, 993, 994, 995, 999, 1010, 1021, 1026, 1032, - 1040, 1052, 1055, 1058, 1061, 1064, 1067, 1073, 1074, 1078, - 1108, 1128, 1146, 1164, 1183, 1198, 1201, 1206, 1209, 1212, - 1215, 1218, 1224, 1227, 1230, 1233, 1236, 1241, 1244, 1250, - 1264, 1276, 1280, 1287, 1292, 1297, 1302, 1307, 1314, 1320, - 1321, 1325, 1330, 1344, 1350, 1353, 1356, 1362, 1363, 1364, - 1365, 1371, 1372, 1373, 1374, 1375, 1376, 1378, 1381, 1384, - 1390, 1391, 1392, 1393, 1394, 1395, 1396, 1397, 1398, 1399, - 1400, 1401, 1402, 1403, 1404, 1405, 1406, 1407, 1408, 1409, - 1413, 1421, 1430, 1446, 1447, 1454, 1457, 1463, 1466, 1472, - 1473, 1477, 1483, 1489, 1507, 1508, 1512, 1513 + 0, 271, 271, 272, 273, 274, 275, 276, 277, 278, + 282, 283, 287, 293, 299, 305, 311, 325, 332, 342, + 343, 346, 348, 349, 352, 354, 359, 360, 364, 370, + 372, 376, 378, 383, 387, 389, 396, 398, 401, 403, + 411, 412, 413, 414, 415, 419, 420, 421, 422, 426, + 427, 438, 439, 440, 441, 445, 446, 447, 448, 449, + 454, 457, 460, 463, 469, 473, 479, 483, 489, 492, + 497, 500, 503, 506, 512, 515, 518, 521, 524, 529, + 532, 538, 542, 546, 550, 554, 559, 566, 572, 577, + 578, 582, 583, 587, 588, 592, 598, 601, 607, 614, + 619, 626, 629, 635, 638, 641, 647, 652, 660, 663, + 667, 672, 677, 683, 686, 692, 698, 705, 706, 710, + 711, 719, 725, 730, 739, 740, 764, 767, 773, 777, + 780, 786, 787, 788, 792, 793, 797, 803, 812, 820, + 826, 832, 835, 839, 855, 875, 881, 882, 883, 887, + 892, 899, 905, 915, 927, 940, 948, 956, 959, 972, + 978, 986, 998, 999, 1000, 1004, 1015, 1026, 1031, 1037, + 1045, 1057, 1060, 1063, 1066, 1069, 1072, 1078, 1079, 1083, + 1113, 1133, 1151, 1169, 1188, 1203, 1206, 1211, 1214, 1217, + 1220, 1223, 1229, 1232, 1235, 1238, 1241, 1246, 1249, 1255, + 1269, 1281, 1285, 1292, 1297, 1302, 1307, 1312, 1319, 1325, + 1326, 1330, 1335, 1349, 1355, 1358, 1361, 1367, 1368, 1369, + 1370, 1376, 1377, 1378, 1379, 1380, 1381, 1383, 1386, 1389, + 1395, 1396, 1397, 1398, 1399, 1400, 1401, 1402, 1403, 1404, + 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412, 1413, 1414, + 1415, 1426, 1434, 1443, 1459, 1460, 1467, 1470, 1476, 1479, + 1485, 1486, 1490, 1496, 1502, 1520, 1521, 1525, 1526 }; #endif @@ -735,19 +741,19 @@ static const char *const yytname[] = "WEBKIT_VALUE_SYM", "WEBKIT_MEDIAQUERY_SYM", "WEBKIT_SELECTOR_SYM", "WEBKIT_VARIABLES_SYM", "WEBKIT_DEFINE_SYM", "VARIABLES_FOR", "WEBKIT_VARIABLES_DECLS_SYM", "ATKEYWORD", "IMPORTANT_SYM", "MEDIA_ONLY", - "MEDIA_NOT", "MEDIA_AND", "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", - "INS", "PTS", "PCS", "DEGS", "RADS", "GRADS", "TURNS", "MSECS", "SECS", - "HERZ", "KHERZ", "DIMEN", "PERCENTAGE", "FLOATTOKEN", "INTEGER", "URI", - "FUNCTION", "NOTFUNCTION", "UNICODERANGE", "VARCALL", "'{'", "'}'", - "';'", "'('", "')'", "','", "'+'", "'~'", "'>'", "'-'", "']'", "'='", - "'/'", "'#'", "'%'", "$accept", "stylesheet", "valid_rule_or_import", - "webkit_rule", "webkit_keyframe_rule", "webkit_decls", - "webkit_variables_decls", "webkit_value", "webkit_mediaquery", - "webkit_selector", "maybe_space", "maybe_sgml", "maybe_charset", - "closing_brace", "charset", "import_list", "variables_list", - "namespace_list", "rule_list", "valid_rule", "rule", "block_rule_list", - "block_valid_rule", "block_rule", "import", "variables_rule", - "variables_media_list", "variables_declaration_list", + "MEDIA_NOT", "MEDIA_AND", "REMS", "QEMS", "EMS", "EXS", "PXS", "CMS", + "MMS", "INS", "PTS", "PCS", "DEGS", "RADS", "GRADS", "TURNS", "MSECS", + "SECS", "HERZ", "KHERZ", "DIMEN", "PERCENTAGE", "FLOATTOKEN", "INTEGER", + "URI", "FUNCTION", "NOTFUNCTION", "UNICODERANGE", "VARCALL", "'{'", + "'}'", "';'", "'('", "')'", "','", "'+'", "'~'", "'>'", "'-'", "']'", + "'='", "'/'", "'#'", "'%'", "$accept", "stylesheet", + "valid_rule_or_import", "webkit_rule", "webkit_keyframe_rule", + "webkit_decls", "webkit_variables_decls", "webkit_value", + "webkit_mediaquery", "webkit_selector", "maybe_space", "maybe_sgml", + "maybe_charset", "closing_brace", "charset", "import_list", + "variables_list", "namespace_list", "rule_list", "valid_rule", "rule", + "block_rule_list", "block_valid_rule", "block_rule", "import", + "variables_rule", "variables_media_list", "variables_declaration_list", "variables_decl_list", "variables_declaration", "variable_name", "namespace", "maybe_ns_prefix", "string_or_uri", "media_feature", "maybe_media_value", "media_query_exp", "media_query_exp_list", @@ -778,41 +784,41 @@ static const yytype_uint16 yytoknum[] = 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, - 123, 125, 59, 40, 41, 44, 43, 126, 62, 45, - 93, 61, 47, 35, 37 + 320, 123, 125, 59, 40, 41, 44, 43, 126, 62, + 45, 93, 61, 47, 35, 37 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 85, 86, 86, 86, 86, 86, 86, 86, 86, - 87, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 95, 96, 96, 96, 97, 97, 98, 98, 99, 99, - 99, 100, 100, 100, 101, 101, 102, 102, 103, 103, - 104, 104, 104, 104, 104, 105, 105, 105, 105, 106, - 106, 107, 107, 107, 107, 108, 108, 108, 108, 108, - 109, 109, 109, 109, 110, 110, 111, 111, 112, 112, - 112, 112, 112, 112, 113, 113, 113, 113, 113, 113, - 113, 114, 114, 114, 114, 114, 114, 115, 116, 116, - 116, 117, 117, 118, 118, 119, 120, 120, 121, 122, - 122, 123, 123, 124, 124, 124, 125, 125, 126, 126, - 127, 127, 127, 128, 128, 129, 130, 131, 131, 132, - 132, 133, 134, 134, 135, 135, 136, 136, 137, 137, - 137, 138, 138, 138, 139, 139, 140, 141, 141, 141, - 142, 143, 143, 143, 143, 143, 144, 144, 144, 145, - 145, 145, 145, 145, 145, 146, 146, 147, 147, 147, - 148, 148, 148, 148, 148, 149, 150, 151, 151, 151, - 151, 152, 152, 152, 152, 152, 152, 153, 153, 154, - 154, 154, 154, 154, 154, 155, 155, 155, 155, 155, - 155, 155, 156, 156, 156, 156, 156, 156, 156, 157, - 157, 157, 157, 157, 157, 157, 157, 157, 158, 159, - 159, 160, 160, 160, 161, 161, 161, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, + 0, 86, 87, 87, 87, 87, 87, 87, 87, 87, + 88, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 96, 97, 97, 97, 98, 98, 99, 99, 100, 100, + 100, 101, 101, 101, 102, 102, 103, 103, 104, 104, + 105, 105, 105, 105, 105, 106, 106, 106, 106, 107, + 107, 108, 108, 108, 108, 109, 109, 109, 109, 109, + 110, 110, 110, 110, 111, 111, 112, 112, 113, 113, + 113, 113, 113, 113, 114, 114, 114, 114, 114, 114, + 114, 115, 115, 115, 115, 115, 115, 116, 117, 117, + 117, 118, 118, 119, 119, 120, 121, 121, 122, 123, + 123, 124, 124, 125, 125, 125, 126, 126, 127, 127, + 128, 128, 128, 129, 129, 130, 131, 132, 132, 133, + 133, 134, 135, 135, 136, 136, 137, 137, 138, 138, + 138, 139, 139, 139, 140, 140, 141, 142, 142, 142, + 143, 144, 144, 144, 144, 144, 145, 145, 145, 146, + 146, 146, 146, 146, 146, 147, 147, 148, 148, 148, + 149, 149, 149, 149, 149, 150, 151, 152, 152, 152, + 152, 153, 153, 153, 153, 153, 153, 154, 154, 155, + 155, 155, 155, 155, 155, 156, 156, 156, 156, 156, + 156, 156, 157, 157, 157, 157, 157, 157, 157, 158, + 158, 158, 158, 158, 158, 158, 158, 158, 159, 160, + 160, 161, 161, 161, 162, 162, 162, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 164, 165, 165, 166, 166, 167, 167, 168, 168, 169, - 169, 170, 171, 172, 173, 173, 174, 174 + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 165, 166, 166, 167, 167, 168, 168, 169, 169, + 170, 170, 171, 172, 173, 174, 174, 175, 175 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -843,8 +849,8 @@ static const yytype_uint8 yyr2[] = 2, 2, 3, 2, 2, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 1, 5, 3, 2, 2, 1, 2, 3, 3, 2, - 3, 1, 1, 2, 5, 3, 1, 3 + 2, 1, 5, 3, 2, 2, 1, 2, 3, 3, + 2, 3, 1, 1, 2, 5, 3, 1, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -861,136 +867,136 @@ static const yytype_uint16 yydefact[] = 0, 0, 19, 156, 146, 0, 0, 19, 0, 19, 19, 10, 11, 41, 44, 42, 43, 40, 0, 142, 0, 0, 141, 149, 0, 157, 162, 163, 164, 189, - 19, 19, 250, 0, 0, 185, 0, 19, 125, 124, + 19, 19, 251, 0, 0, 185, 0, 19, 125, 124, 19, 19, 122, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 135, 134, 19, 19, 0, 0, 211, 217, 19, - 227, 225, 104, 105, 19, 99, 106, 19, 0, 0, - 72, 19, 0, 0, 68, 0, 0, 36, 21, 259, - 21, 27, 26, 265, 266, 0, 28, 148, 179, 0, - 0, 19, 165, 0, 147, 0, 0, 0, 103, 0, - 0, 0, 0, 139, 19, 19, 143, 145, 140, 19, - 19, 19, 0, 155, 156, 152, 0, 0, 159, 158, - 19, 0, 208, 204, 14, 190, 186, 0, 19, 0, - 201, 19, 207, 200, 0, 0, 219, 220, 253, 254, - 248, 247, 249, 233, 234, 235, 236, 237, 238, 239, - 240, 241, 242, 243, 244, 245, 246, 221, 232, 231, - 230, 223, 0, 224, 226, 229, 19, 218, 213, 16, - 19, 19, 0, 228, 0, 0, 0, 17, 18, 19, - 0, 87, 15, 73, 69, 19, 0, 83, 19, 0, - 258, 257, 19, 19, 38, 21, 32, 260, 0, 180, - 0, 0, 0, 0, 19, 0, 0, 0, 62, 63, - 93, 94, 19, 127, 126, 19, 110, 0, 130, 129, - 19, 118, 117, 19, 12, 0, 0, 131, 132, 133, - 144, 0, 194, 188, 19, 0, 19, 0, 192, 19, - 0, 13, 19, 19, 252, 0, 222, 215, 214, 212, - 19, 19, 19, 19, 101, 76, 71, 19, 0, 19, - 74, 19, 0, 19, 103, 66, 0, 0, 21, 35, - 264, 267, 183, 181, 182, 19, 166, 19, 0, 172, - 173, 174, 175, 176, 167, 171, 19, 108, 49, 112, - 19, 19, 0, 0, 0, 0, 19, 197, 0, 196, - 193, 206, 0, 0, 0, 19, 95, 96, 0, 115, - 19, 107, 19, 79, 0, 78, 75, 86, 0, 0, - 0, 0, 0, 0, 0, 91, 0, 45, 21, 261, - 47, 48, 46, 37, 0, 169, 19, 0, 0, 0, - 49, 103, 0, 19, 136, 195, 19, 0, 19, 0, - 0, 123, 251, 19, 0, 100, 0, 77, 19, 0, - 0, 19, 103, 19, 90, 89, 0, 0, 263, 39, - 184, 0, 178, 177, 19, 60, 61, 0, 255, 55, - 21, 262, 54, 52, 53, 51, 114, 57, 58, 59, - 56, 0, 111, 19, 119, 198, 202, 209, 203, 121, - 0, 19, 102, 80, 19, 0, 0, 0, 92, 19, - 19, 0, 256, 50, 113, 128, 0, 0, 98, 82, - 0, 0, 0, 0, 168, 116, 19, 97, 64, 65, - 88, 170, 120 + 19, 19, 135, 134, 19, 19, 0, 0, 211, 217, + 19, 227, 225, 104, 105, 19, 99, 106, 19, 0, + 0, 72, 19, 0, 0, 68, 0, 0, 36, 21, + 260, 21, 27, 26, 266, 267, 0, 28, 148, 179, + 0, 0, 19, 165, 0, 147, 0, 0, 0, 103, + 0, 0, 0, 0, 139, 19, 19, 143, 145, 140, + 19, 19, 19, 0, 155, 156, 152, 0, 0, 159, + 158, 19, 0, 208, 204, 14, 190, 186, 0, 19, + 0, 201, 19, 207, 200, 0, 0, 219, 220, 254, + 255, 250, 248, 247, 249, 233, 234, 235, 236, 237, + 238, 239, 240, 241, 242, 243, 244, 245, 246, 221, + 232, 231, 230, 223, 0, 224, 226, 229, 19, 218, + 213, 16, 19, 19, 0, 228, 0, 0, 0, 17, + 18, 19, 0, 87, 15, 73, 69, 19, 0, 83, + 19, 0, 259, 258, 19, 19, 38, 21, 32, 261, + 0, 180, 0, 0, 0, 0, 19, 0, 0, 0, + 62, 63, 93, 94, 19, 127, 126, 19, 110, 0, + 130, 129, 19, 118, 117, 19, 12, 0, 0, 131, + 132, 133, 144, 0, 194, 188, 19, 0, 19, 0, + 192, 19, 0, 13, 19, 19, 253, 0, 222, 215, + 214, 212, 19, 19, 19, 19, 101, 76, 71, 19, + 0, 19, 74, 19, 0, 19, 103, 66, 0, 0, + 21, 35, 265, 268, 183, 181, 182, 19, 166, 19, + 0, 172, 173, 174, 175, 176, 167, 171, 19, 108, + 49, 112, 19, 19, 0, 0, 0, 0, 19, 197, + 0, 196, 193, 206, 0, 0, 0, 19, 95, 96, + 0, 115, 19, 107, 19, 79, 0, 78, 75, 86, + 0, 0, 0, 0, 0, 0, 0, 91, 0, 45, + 21, 262, 47, 48, 46, 37, 0, 169, 19, 0, + 0, 0, 49, 103, 0, 19, 136, 195, 19, 0, + 19, 0, 0, 123, 252, 19, 0, 100, 0, 77, + 19, 0, 0, 19, 103, 19, 90, 89, 0, 0, + 264, 39, 184, 0, 178, 177, 19, 60, 61, 0, + 256, 55, 21, 263, 54, 52, 53, 51, 114, 57, + 58, 59, 56, 0, 111, 19, 119, 198, 202, 209, + 203, 121, 0, 19, 102, 80, 19, 0, 0, 0, + 92, 19, 19, 0, 257, 50, 113, 128, 0, 0, + 98, 82, 0, 0, 0, 0, 168, 116, 19, 97, + 64, 65, 88, 170, 120 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { -1, 9, 70, 10, 11, 12, 13, 14, 15, 16, - 255, 36, 17, 458, 18, 52, 157, 274, 347, 71, - 408, 419, 459, 460, 409, 275, 403, 152, 153, 154, - 155, 348, 447, 292, 331, 434, 145, 146, 391, 147, - 296, 400, 401, 73, 334, 74, 303, 496, 100, 101, - 102, 75, 76, 192, 135, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 287, 87, 366, 454, 88, - 93, 94, 95, 96, 429, 136, 252, 137, 138, 139, - 140, 141, 466, 467, 54, 468, 469, 470, 164, 165 + 257, 36, 17, 460, 18, 52, 158, 276, 349, 71, + 410, 421, 461, 462, 411, 277, 405, 153, 154, 155, + 156, 350, 449, 294, 333, 436, 146, 147, 393, 148, + 298, 402, 403, 73, 336, 74, 305, 498, 100, 101, + 102, 75, 76, 193, 136, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 289, 87, 368, 456, 88, + 93, 94, 95, 96, 431, 137, 254, 138, 139, 140, + 141, 142, 468, 469, 54, 470, 471, 472, 165, 166 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -435 +#define YYPACT_NINF -301 static const yytype_int16 yypact[] = { - 818, 44, -36, -18, 112, 127, 66, 141, 162, 243, - -435, -435, -435, -435, -435, -435, -435, -435, -435, 239, - 43, -435, -435, -435, -435, -435, -435, -435, -435, 250, - 250, 250, 250, 250, 250, 250, 37, 304, -435, -435, - -435, -435, 763, 354, 31, 1114, 144, 622, 49, -435, - -435, 346, 344, -435, 332, 27, 23, 358, -435, -435, - 401, 370, -435, 371, -435, 381, 406, -435, 193, -435, - -435, -435, -435, -435, -435, -435, -435, -435, 171, 702, - 143, 631, -435, 756, 159, -435, -435, -435, -435, 240, - -435, -435, -435, 329, 303, 254, 199, -435, -435, -435, - -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, - -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, - -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, - -435, -435, -435, -435, -435, 949, 903, -435, -435, -435, - -435, -435, -435, -435, -435, -435, 34, -435, 342, 4, - 274, -435, 353, 59, 291, 223, 331, 395, -435, 438, - -435, -435, -435, -435, -435, 437, -435, -435, -435, 448, - 24, -435, -435, 415, -435, 349, 295, 377, 375, 399, - 198, 421, 190, -435, -435, -435, -435, -435, -435, -435, - -435, -435, 702, -435, -435, 756, 334, 380, -435, -435, - -435, 463, 250, 250, -435, 409, 398, 180, -435, 15, - -435, -435, -435, 250, 221, 182, 250, 250, 250, 250, - 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, - 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, - 250, 250, 1052, 250, 250, 250, -435, -435, -435, -435, - -435, -435, 1172, 250, 188, 166, 301, -435, -435, -435, - 472, 250, -435, 412, 404, -435, 62, -435, -435, 220, - -435, -435, -435, -435, 458, -435, 438, 438, 27, -435, - 413, 417, 430, 622, 358, 371, 473, 158, -435, -435, - -435, -435, -435, -435, -435, -435, -435, 172, -435, -435, - -435, -435, -435, -435, -435, 354, 622, 250, 250, 250, - -435, 555, 250, 420, -435, 502, -435, 459, 250, -435, - 535, -435, -435, -435, -435, 976, 250, 250, 250, -435, - -435, -435, -435, -435, 496, 250, 423, -435, 541, -435, - 250, -435, 754, -435, 424, 36, 552, 685, -435, 438, - -435, -435, -435, -435, -435, -435, 250, -435, 277, -435, - -435, -435, -435, -435, -435, -435, -435, 856, 250, -435, - -435, -435, 354, 226, 65, 203, -435, 250, 428, 250, - 250, 1172, 462, 354, 31, -435, 250, 53, 186, 250, - -435, -435, -435, 250, 429, 250, 250, 1172, 608, 354, - 479, 83, 538, 485, 482, 320, 459, -435, -435, -435, - -435, -435, -435, 438, 78, -435, -435, 447, 489, 1244, - 250, 144, 487, -435, -435, 250, -435, 462, -435, 205, - 491, -435, 250, -435, 492, -435, 186, 250, -435, 681, - 497, -435, 5, -435, -435, -435, 558, 150, -435, 438, - -435, 447, -435, -435, -435, -435, -435, 27, -435, -435, - -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, - -435, 1244, -435, -435, 250, 250, -435, 250, -435, -435, - 1114, -435, 34, 250, -435, 49, 178, 49, -435, -435, - -435, 1, -435, 438, -435, 250, 306, 827, 250, 250, - 498, 504, 151, 14, -435, -435, -435, 250, -435, -435, - -435, -435, 250 + 467, 43, -9, 143, 155, 174, 47, 179, 199, 202, + -301, -301, -301, -301, -301, -301, -301, -301, -301, -15, + 220, -301, -301, -301, -301, -301, -301, -301, -301, 233, + 233, 233, 233, 233, 233, 233, 31, 325, -301, -301, + -301, -301, 769, 191, 420, 1125, 407, 556, 38, -301, + -301, 336, 290, -301, 345, 146, 14, 374, -301, -301, + 419, 393, -301, 397, -301, 402, 446, -301, 194, -301, + -301, -301, -301, -301, -301, -301, -301, -301, 82, 616, + 297, 629, -301, 454, 164, -301, -301, -301, -301, 236, + -301, -301, -301, 384, 640, 237, 277, -301, -301, -301, + -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, + -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, + -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, + -301, -301, -301, -301, -301, -301, 807, 911, -301, -301, + -301, -301, -301, -301, -301, -301, -301, 28, -301, 390, + 87, 248, -301, 394, 185, 308, 229, 355, 319, -301, + 405, -301, -301, -301, -301, -301, 450, -301, -301, -301, + 471, 292, -301, -301, 25, -301, 364, 285, 367, 311, + 379, 22, 37, 196, -301, -301, -301, -301, -301, -301, + -301, -301, -301, 616, -301, -301, 454, 205, 344, -301, + -301, -301, 466, 233, 233, -301, 484, 416, 94, -301, + 62, -301, -301, -301, 233, 223, 183, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 1062, 233, 233, 233, -301, -301, + -301, -301, -301, -301, 1184, 233, 60, 29, 383, -301, + -301, -301, 493, 233, -301, 507, 429, -301, 83, -301, + -301, 192, -301, -301, -301, -301, 476, -301, 405, 405, + 146, -301, 431, 457, 470, 556, 374, 397, 529, 68, + -301, -301, -301, -301, -301, -301, -301, -301, -301, 96, + -301, -301, -301, -301, -301, -301, -301, 191, 556, 233, + 233, 233, -301, 382, 233, 508, -301, 545, -301, 481, + 233, -301, 538, -301, -301, -301, -301, 985, 233, 233, + 233, -301, -301, -301, -301, -301, 519, 233, 541, -301, + 569, -301, 233, -301, 760, -301, 404, 23, 555, 915, + -301, 405, -301, -301, -301, -301, -301, -301, 233, -301, + 167, -301, -301, -301, -301, -301, -301, -301, -301, 389, + 233, -301, -301, -301, 191, 208, 161, 487, -301, 233, + 546, 233, 233, 1184, 464, 191, 420, -301, 233, 36, + 131, 233, -301, -301, -301, 233, 579, 233, 233, 1184, + 612, 191, 535, 97, 611, 549, 620, 400, 481, -301, + -301, -301, -301, -301, -301, 405, 152, -301, -301, 323, + 632, 1257, 233, 407, 554, -301, -301, 233, -301, 464, + -301, 215, 558, -301, 233, -301, 563, -301, 131, 233, + -301, 686, 567, -301, 272, -301, -301, -301, 638, 299, + -301, 405, -301, 323, -301, -301, -301, -301, -301, 146, + -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, + -301, -301, -301, 1257, -301, -301, 233, 233, -301, 233, + -301, -301, 1125, -301, 28, 233, -301, 38, 136, 38, + -301, -301, -301, 0, -301, 405, -301, 233, 181, 834, + 233, 233, 582, 583, 182, 1, -301, -301, -301, 233, + -301, -301, -301, -301, 233 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -435, -435, -435, -435, -435, -435, -435, -435, -435, -435, - -1, -21, -435, -51, -435, -435, -435, -435, -435, 229, - -435, 147, -435, -435, 256, -435, -435, -434, -435, 425, - -435, -435, -435, 130, -435, -435, 214, 174, -435, -435, - -45, 241, -176, -389, -435, -227, -435, -435, 116, -435, - 231, -154, -137, -435, -435, -130, 566, -435, 310, 449, - -61, 547, -50, -55, -435, 348, -435, 278, 194, -435, - -298, -435, 581, -435, 261, -185, -435, 443, 546, -35, - -435, -435, 218, -19, -435, 352, -435, 364, -16, -3 + -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, + -1, -21, -301, -51, -301, -301, -301, -301, -301, 302, + -301, 264, -301, -301, 5, -301, -301, 217, -301, 536, + -301, -301, -301, 245, -301, -301, 310, 269, -301, -301, + -45, 339, -177, -202, -301, -146, -301, -301, 211, -301, + 327, -132, -130, -301, -301, -103, 667, -301, 408, 543, + -48, 634, -65, -55, -301, 430, -301, 359, 267, -301, + -300, -301, 627, -301, 293, -190, -301, 469, 588, -35, + -301, -301, 252, -19, -301, 377, -301, 378, -16, -3 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1000,332 +1006,334 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -217 static const yytype_int16 yytable[] = { - 20, 148, 297, 39, 163, 183, 40, 374, 97, 29, - 30, 31, 32, 33, 34, 35, 317, 53, 186, 40, - 42, 43, 44, 45, 46, 47, 48, 161, 40, 199, - 461, 196, 159, 197, 21, 160, 40, 280, 281, -19, - 56, 40, 49, 50, 98, 19, 142, 143, 40, -19, - 150, 500, 22, 501, 40, 41, -19, 325, 40, 97, - 263, 173, 151, 317, 176, 161, 178, 180, 181, 182, - 433, 25, 151, 402, 422, 258, 51, -19, 144, 185, - 212, 504, 461, 40, 369, 430, 201, 319, 282, 202, - 203, 207, 209, 99, 511, 166, 213, 37, 162, 214, - 215, 440, 216, 217, 218, 219, 220, 221, 222, 223, - 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, - 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, - -70, 310, 244, 245, 341, 382, 162, 276, 253, 277, - 271, 199, 199, 254, 187, 311, 256, 260, 188, 40, - 261, 266, 450, -109, 269, -109, 40, 398, 371, 289, - 198, 294, 290, 299, -151, 359, 360, 361, 362, 363, - 283, 40, 183, 369, 58, 59, 60, 61, 62, 369, - -191, 317, 23, 305, 306, 142, 143, 40, 307, 308, - 309, 40, 462, 40, 179, 40, 427, 24, -19, 312, - 210, 330, 315, 40, 187, -199, 478, 318, 188, 332, - 320, 26, 439, -137, -137, 291, 211, 144, -137, 189, - 190, 191, 355, 510, 267, 40, 40, 350, -19, -151, - -151, 40, 27, -151, -151, -151, -151, -151, 364, 365, - 268, 184, 370, 28, 462, 326, 185, 371, -67, 327, - 328, -191, 322, 371, 349, 40, 199, 323, 335, 144, - 338, 304, 351, -19, 340, 463, 486, 342, 300, 37, - 97, 344, 345, -138, -138, -199, -199, -199, -138, 189, - 190, 191, 464, 356, 359, 360, 361, 362, 363, 465, - 343, 367, 321, -19, 368, 497, 423, 351, 72, 372, - 40, 351, 373, -187, 205, 55, 40, 290, 158, 37, - 37, 38, 200, 377, 333, 379, 90, 463, 380, 98, - 351, 383, 384, 424, 37, 40, 208, 413, 410, 386, - 387, 388, 389, 446, 464, 198, 393, 97, 395, -154, - 396, 465, 399, 91, 37, 405, 259, 156, 97, 58, - 59, 60, 61, 62, 414, 89, 356, 415, 365, 40, - 291, 37, 351, 265, 97, 417, 65, 90, 99, 420, - 421, 51, 92, 37, -187, 425, 472, 505, 351, 167, - 40, 198, 175, 172, 432, -150, -19, 449, 445, 436, - 448, 437, 174, -19, 91, 58, 59, 60, 61, 62, - 204, 37, 456, 270, -154, -154, 492, 177, -154, -154, - -154, -154, -154, 257, 168, 451, 142, 143, 169, 37, - 40, 288, 474, 92, 262, 475, 40, 477, 284, 40, - 272, 273, 480, 301, 302, 285, 64, 483, 278, 493, - 485, 448, 487, 49, 50, 295, -19, 37, 144, 293, - -150, -150, 40, 491, -150, -150, -150, -150, -150, 452, - 453, 279, -210, 248, 313, 142, 143, 170, 171, 37, - 316, 298, 495, 336, -216, -216, 339, -216, -216, 37, - 498, 314, 37, 499, 337, 346, 357, 352, 502, 503, - 37, 353, 376, 37, -108, 392, 507, 144, 37, 37, - 426, 438, 428, 378, 354, 512, -216, -216, -216, -216, + 20, 149, 299, 39, 164, 40, 40, 376, 97, 29, + 30, 31, 32, 33, 34, 35, 197, 53, 198, 40, + 42, 43, 44, 45, 46, 47, 48, 40, 40, 200, + 40, 187, 160, -19, 40, 161, 49, 50, 286, 151, + 56, 40, 40, 40, 19, 287, 64, 72, -19, 303, + 304, 152, 25, 435, 327, -19, 37, 159, 38, 97, + 404, 174, 21, 319, 177, 40, 179, 181, 182, 183, + 51, -19, 334, 332, 424, 361, 362, 363, 364, 365, + 213, 506, 513, 184, 319, 432, 202, 167, 184, 203, + 204, 208, 210, 302, -191, 319, 214, 371, 371, 215, + 216, 442, 217, 218, 219, 220, 221, 222, 223, 224, + 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, + 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, + 245, 313, 384, 246, 247, 321, 40, 371, 278, 255, + 279, 273, 200, 200, 256, 312, 162, 258, 262, 366, + 367, 263, 268, 185, 400, 271, 343, 40, 186, 260, + 291, 162, 296, 186, 301, 199, -191, 372, -109, -151, + -109, 285, 373, 373, 361, 362, 363, 364, 365, 58, + 59, 60, 61, 62, 307, 308, 265, 40, 40, 309, + 310, 311, 89, 429, 98, 180, 40, 40, 152, -19, + 314, 40, 28, 317, 90, 145, 199, -67, 320, 441, + -154, 322, 373, 40, 22, -199, 480, 37, 163, 463, + 58, 59, 60, 61, 62, 40, 23, 452, 40, 352, + 269, 91, 41, 163, -19, -151, -151, 357, 40, -151, + -151, -151, -151, -151, 99, 24, 270, 328, 417, 367, + 26, 329, 330, 507, 324, 512, 351, -70, 200, 325, + 337, 92, 340, 345, 353, -19, 342, 488, 306, 344, + 27, 463, 97, 346, 347, 464, -154, -154, 211, 425, + -154, -154, -154, -154, -154, 358, -199, -199, -199, 465, + 40, 466, 499, 369, 212, 323, 370, 292, 188, 353, + -19, 374, 189, 353, 375, 282, 283, 37, 37, 201, + 209, 292, 65, 143, 144, 379, 40, 381, 467, 37, + 382, 261, 353, 385, 386, 426, 55, 464, 40, 415, + 412, 388, 389, 390, 391, 454, 455, 157, 395, 97, + 397, 465, 398, 466, 401, 199, 145, 407, 37, -150, + 97, 293, 143, 144, 274, 275, 416, 284, 358, 58, + 59, 60, 61, 62, 353, 293, 97, 419, -137, -137, + 467, 422, 423, -137, 190, 191, 192, 427, 474, 37, + 353, 267, 297, 199, 51, 145, 434, -153, 40, 451, + 447, 438, 450, 439, 40, 168, 335, 58, 59, 60, + 61, 62, -103, 176, 458, 40, 173, -19, 494, 40, + 49, 50, 40, 448, -19, -150, -150, 453, 175, -150, + -150, -150, -150, -150, 476, 40, 37, 477, 272, 479, + 143, 144, 169, 98, 482, 37, 170, 290, 37, 485, + 295, 495, 487, 450, 489, 143, 144, 178, 143, 144, + 37, 280, 300, -153, -153, 493, 205, -153, -153, -153, + -153, -153, 259, 145, -210, 250, 264, 315, -19, 58, + 59, 60, 61, 62, 497, -108, -216, -216, 145, -216, + -216, 145, 500, 99, 281, 501, 171, 172, 188, 318, + 504, 505, 189, 1, 338, 2, 3, 4, 509, 5, + 6, 7, 341, 348, 430, 8, 354, 514, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, -216, -216, -216, -216, -216, 37, - -216, -216, -210, -210, -210, -205, 381, 250, -216, 390, - 40, -216, 394, 442, 251, -216, -216, 103, 104, 441, - 105, 106, 37, 404, 444, 443, 198, -19, 473, 37, - -153, 455, 479, 488, -19, -19, 481, 471, 484, 508, - 58, 59, 60, 61, 62, 509, 407, 489, 264, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 435, 130, 92, -205, -205, -205, 418, 248, - 482, 131, 506, 149, 132, 431, 375, -19, 133, 134, - -216, -216, 286, -216, -216, -153, -153, 40, 195, -153, - -153, -153, -153, -153, 358, 57, 416, 58, 59, 60, - 61, 62, 63, 64, 193, 490, 58, 59, 60, 61, - 62, 194, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, -216, 206, -216, -216, -81, -81, - -81, 247, 248, 250, -216, -2, 406, -216, 476, 494, - 251, -216, -216, -216, -216, 329, -216, -216, 57, 411, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 412, 0, 0, 0, 57, 69, 58, 59, 60, - 61, 62, 63, 64, 51, -216, -216, -216, -216, -216, + -216, -216, 355, -216, -216, -210, -210, -210, -205, 383, + 252, -216, 359, 40, -216, 356, 380, 253, -216, -216, + 103, 104, 37, 105, 106, 37, 406, 316, -138, -138, + -19, 40, 392, -138, 190, 191, 192, -19, -19, 57, + 396, 58, 59, 60, 61, 62, 63, 64, 37, 37, + 339, 378, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 443, 131, 92, -205, + -205, -205, 37, 250, 394, 132, 444, 37, 133, 428, + 445, -19, 134, 135, -216, -216, 475, -216, -216, 57, + 481, 58, 59, 60, 61, 62, 63, 64, 483, 486, + -187, 206, 194, 490, 58, 59, 60, 61, 62, 195, + 37, 409, 440, 90, 510, 511, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, -216, -216, -216, -216, 0, -216, - -216, -84, -84, -84, 0, 397, 250, -216, 0, 40, - -216, 0, 0, 251, -216, -216, 103, 104, 40, 105, - 106, 58, 59, 60, 61, 62, 57, 0, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 0, - 0, 0, 0, 0, 69, 0, 0, 0, 107, 108, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 0, 130, 92, -85, -85, -85, 0, 248, 0, - 131, 0, -19, 132, 0, 0, 0, 133, 134, -216, - -216, 0, -216, -216, 1, 0, 2, 3, 4, 0, - 5, 6, 7, 0, 0, 0, 8, 0, 0, 0, - 0, 40, 0, 0, 0, 0, 0, 0, 0, -103, - 0, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, 0, -216, -216, 142, 143, 0, - 0, -19, 250, -216, 248, 0, -216, 0, 0, 251, - -216, -216, 0, 0, 0, -216, -216, 0, -216, -216, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -216, -216, -216, + 91, -216, -216, -81, -81, -81, 473, 250, 252, -216, + 266, 37, -216, 446, 491, 253, -216, -216, -216, -216, + 437, -216, -216, 37, 502, 457, 503, 484, 420, 508, + 92, 37, -187, 433, 150, 196, 377, 288, 360, 418, + 492, 207, 478, 331, 249, 496, 413, 414, 0, 0, + -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, + -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, + -216, -216, -216, -216, 0, -216, -216, -84, -84, -84, + 0, 399, 252, -216, 0, 40, -216, 0, 0, 253, + -216, -216, 103, 104, 40, 105, 106, 0, 0, 0, + 0, 0, 57, 0, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 0, 0, 0, 0, 0, + 69, 0, 0, 0, 107, 108, 109, 110, 111, 112, + 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 0, 131, + 92, -85, -85, -85, 0, 250, 0, 132, 0, -19, + 133, 0, 0, 0, 134, 135, -216, -216, 0, -216, + -216, 107, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 121, 122, 123, 124, 248, + 126, 127, 128, 0, 0, 0, 0, 0, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - 0, -216, -216, 0, 249, 0, 0, 248, 250, -216, - 0, 0, -216, 0, 0, 251, -216, -216, -216, -216, - 0, -216, -216, 107, 108, 109, 110, 111, 112, 113, - 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, - 246, 125, 126, 127, 0, 0, 0, 0, 0, 0, + -216, -216, 0, -216, -216, 0, 0, 0, 0, -19, + 252, -216, 250, 0, -216, -2, 408, 253, -216, -216, + 0, 0, 0, -216, -216, 0, -216, -216, 57, 0, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 0, 0, 0, 0, 0, 69, 0, 0, 0, + 0, 0, 0, 0, 51, -216, -216, -216, -216, -216, + -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, + -216, -216, -216, -216, -216, -216, -216, -216, -216, 0, + -216, -216, 0, 251, 0, 0, 250, 252, -216, 0, + 0, -216, 0, 0, 253, -216, -216, -216, -216, 0, + -216, -216, 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, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, 0, -216, -216, 0, 0, 0, 0, - 385, 250, -216, 324, 0, -216, 0, 40, 251, -216, + 387, 252, -216, 326, 0, -216, 0, 40, 253, -216, -216, 0, 0, 0, 103, 104, 0, 105, 106, 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, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 125, 126, 127, 128, 129, 40, - 130, 92, 0, 0, 0, 0, 103, 104, 131, 105, - 106, 132, 0, 0, 0, 133, 134, 0, 0, 0, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 40, 131, 92, 0, 0, 0, 0, 103, 104, 132, + 105, 106, 133, 0, 0, 0, 134, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, + 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, + 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 0, 131, 92, 103, 104, 0, 105, + 106, 0, 132, 0, 0, 133, 0, 0, 0, 134, + 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 0, 130, 92, 103, 104, 0, 105, 106, 0, - 131, 0, 0, 132, 0, 0, 0, 133, 134, 0, + 129, 130, 0, 131, 92, 0, 0, 162, 459, 0, + 0, 132, 0, 0, 133, 0, 0, 0, 134, 135, + 57, 0, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 67, 68, 0, 0, 0, 0, 0, 69, 0, + 0, 0, 0, 0, 0, 0, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 107, 108, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 125, 126, 127, 128, 129, 0, - 130, 92, 0, 0, 161, 457, 0, 0, 131, 0, - 0, 132, 0, 0, 0, 133, 134, 57, 0, 58, - 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, - 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, - 0, 0, 0, 51, 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, 162 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 163 }; static const yytype_int16 yycheck[] = { - 1, 46, 178, 19, 55, 1, 5, 305, 43, 10, - 11, 12, 13, 14, 15, 16, 1, 36, 79, 5, - 21, 22, 23, 24, 25, 26, 27, 0, 5, 84, - 419, 81, 53, 83, 70, 54, 5, 13, 14, 5, - 41, 5, 5, 6, 13, 1, 41, 42, 5, 5, - 1, 485, 70, 487, 5, 12, 12, 242, 5, 94, - 1, 62, 13, 1, 65, 0, 67, 68, 69, 70, - 17, 5, 13, 37, 372, 71, 39, 43, 73, 75, - 96, 80, 471, 5, 1, 383, 89, 72, 64, 90, - 91, 94, 95, 62, 80, 72, 97, 70, 71, 100, - 101, 399, 103, 104, 105, 106, 107, 108, 109, 110, + 1, 46, 179, 19, 55, 5, 5, 307, 43, 10, + 11, 12, 13, 14, 15, 16, 81, 36, 83, 5, + 21, 22, 23, 24, 25, 26, 27, 5, 5, 84, + 5, 79, 53, 5, 5, 54, 5, 6, 13, 1, + 41, 5, 5, 5, 1, 20, 21, 42, 5, 12, + 13, 13, 5, 17, 244, 12, 71, 52, 73, 94, + 37, 62, 71, 1, 65, 5, 67, 68, 69, 70, + 39, 43, 43, 13, 374, 7, 8, 9, 10, 11, + 96, 81, 81, 1, 1, 385, 89, 73, 1, 90, + 91, 94, 95, 71, 0, 1, 97, 1, 1, 100, + 101, 401, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, - 71, 192, 133, 134, 72, 320, 71, 158, 139, 160, - 156, 196, 197, 144, 1, 195, 147, 150, 5, 5, - 151, 154, 74, 70, 155, 72, 5, 342, 75, 175, - 1, 177, 12, 179, 5, 7, 8, 9, 10, 11, - 171, 5, 1, 1, 15, 16, 17, 18, 19, 1, - 0, 1, 70, 184, 185, 41, 42, 5, 189, 190, - 191, 5, 419, 5, 1, 5, 381, 70, 5, 200, - 1, 13, 205, 5, 1, 0, 1, 208, 5, 43, - 211, 70, 397, 70, 71, 65, 17, 73, 75, 76, - 77, 78, 283, 72, 1, 5, 5, 278, 5, 70, - 71, 5, 70, 74, 75, 76, 77, 78, 80, 81, - 17, 70, 70, 0, 471, 246, 75, 75, 70, 250, - 251, 71, 70, 75, 275, 5, 311, 75, 259, 73, - 263, 71, 278, 70, 265, 419, 442, 268, 70, 70, - 305, 272, 273, 70, 71, 70, 71, 72, 75, 76, - 77, 78, 419, 284, 7, 8, 9, 10, 11, 419, - 70, 292, 71, 70, 295, 480, 70, 313, 42, 300, - 5, 317, 303, 0, 1, 1, 5, 12, 52, 70, - 70, 72, 72, 314, 13, 316, 13, 471, 319, 13, - 336, 322, 323, 374, 70, 5, 72, 348, 347, 330, - 331, 332, 333, 13, 471, 1, 337, 372, 339, 5, - 341, 471, 343, 40, 70, 346, 72, 1, 383, 15, - 16, 17, 18, 19, 355, 1, 357, 80, 81, 5, - 65, 70, 378, 72, 399, 366, 22, 13, 62, 370, - 371, 39, 69, 70, 71, 376, 421, 71, 394, 21, - 5, 1, 1, 13, 385, 5, 5, 408, 404, 390, - 406, 392, 21, 12, 40, 15, 16, 17, 18, 19, - 71, 70, 418, 72, 70, 71, 457, 1, 74, 75, - 76, 77, 78, 71, 13, 416, 41, 42, 17, 70, - 5, 72, 423, 69, 71, 426, 5, 428, 13, 5, - 35, 36, 433, 12, 13, 20, 21, 438, 1, 460, - 441, 457, 443, 5, 6, 70, 65, 70, 73, 72, - 70, 71, 5, 454, 74, 75, 76, 77, 78, 12, - 13, 13, 0, 1, 1, 41, 42, 66, 67, 70, - 72, 72, 473, 1, 12, 13, 72, 15, 16, 70, - 481, 72, 70, 484, 72, 27, 13, 74, 489, 490, - 70, 74, 72, 70, 70, 72, 497, 73, 70, 70, - 72, 72, 40, 1, 74, 506, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 70, - 68, 69, 70, 71, 72, 0, 1, 75, 76, 43, - 5, 79, 1, 5, 82, 83, 84, 12, 13, 70, - 15, 16, 70, 1, 72, 70, 1, 5, 71, 70, - 5, 72, 71, 5, 12, 13, 74, 420, 71, 71, - 15, 16, 17, 18, 19, 71, 347, 447, 153, 44, - 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 388, 68, 69, 70, 71, 72, 367, 1, - 436, 76, 496, 47, 79, 384, 306, 65, 83, 84, - 12, 13, 173, 15, 16, 70, 71, 5, 81, 74, - 75, 76, 77, 78, 286, 13, 358, 15, 16, 17, - 18, 19, 20, 21, 13, 451, 15, 16, 17, 18, - 19, 20, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 94, 68, 69, 70, 71, - 72, 135, 1, 75, 76, 0, 1, 79, 427, 471, - 82, 83, 84, 12, 13, 252, 15, 16, 13, 347, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 347, -1, -1, -1, 13, 31, 15, 16, 17, - 18, 19, 20, 21, 39, 44, 45, 46, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 63, 64, 65, 66, -1, 68, - 69, 70, 71, 72, -1, 1, 75, 76, -1, 5, - 79, -1, -1, 82, 83, 84, 12, 13, 5, 15, - 16, 15, 16, 17, 18, 19, 13, -1, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, - -1, -1, -1, -1, 31, -1, -1, -1, 44, 45, + 131, 196, 322, 134, 135, 73, 5, 1, 159, 140, + 161, 157, 197, 198, 145, 193, 0, 148, 151, 81, + 82, 152, 155, 71, 344, 156, 73, 5, 76, 72, + 176, 0, 178, 76, 180, 1, 72, 71, 71, 5, + 73, 172, 76, 76, 7, 8, 9, 10, 11, 15, + 16, 17, 18, 19, 185, 186, 1, 5, 5, 190, + 191, 192, 1, 383, 13, 1, 5, 5, 13, 5, + 201, 5, 0, 206, 13, 74, 1, 71, 209, 399, + 5, 212, 76, 5, 71, 0, 1, 71, 72, 421, + 15, 16, 17, 18, 19, 5, 71, 75, 5, 280, + 1, 40, 12, 72, 5, 71, 72, 285, 5, 75, + 76, 77, 78, 79, 63, 71, 17, 248, 81, 82, + 71, 252, 253, 72, 71, 73, 277, 72, 313, 76, + 261, 70, 265, 71, 280, 71, 267, 444, 72, 270, + 71, 473, 307, 274, 275, 421, 71, 72, 1, 71, + 75, 76, 77, 78, 79, 286, 71, 72, 73, 421, + 5, 421, 482, 294, 17, 72, 297, 12, 1, 315, + 71, 302, 5, 319, 305, 13, 14, 71, 71, 73, + 73, 12, 22, 41, 42, 316, 5, 318, 421, 71, + 321, 73, 338, 324, 325, 376, 1, 473, 5, 350, + 349, 332, 333, 334, 335, 12, 13, 1, 339, 374, + 341, 473, 343, 473, 345, 1, 74, 348, 71, 5, + 385, 66, 41, 42, 35, 36, 357, 65, 359, 15, + 16, 17, 18, 19, 380, 66, 401, 368, 71, 72, + 473, 372, 373, 76, 77, 78, 79, 378, 423, 71, + 396, 73, 71, 1, 39, 74, 387, 5, 5, 410, + 406, 392, 408, 394, 5, 21, 13, 15, 16, 17, + 18, 19, 13, 1, 420, 5, 13, 5, 459, 5, + 5, 6, 5, 13, 12, 71, 72, 418, 21, 75, + 76, 77, 78, 79, 425, 5, 71, 428, 73, 430, + 41, 42, 13, 13, 435, 71, 17, 73, 71, 440, + 73, 462, 443, 459, 445, 41, 42, 1, 41, 42, + 71, 1, 73, 71, 72, 456, 72, 75, 76, 77, + 78, 79, 72, 74, 0, 1, 72, 1, 66, 15, + 16, 17, 18, 19, 475, 71, 12, 13, 74, 15, + 16, 74, 483, 63, 13, 486, 67, 68, 1, 73, + 491, 492, 5, 26, 1, 28, 29, 30, 499, 32, + 33, 34, 73, 27, 40, 38, 75, 508, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, -1, 68, 69, 70, 71, 72, -1, 1, -1, - 76, -1, 5, 79, -1, -1, -1, 83, 84, 12, - 13, -1, 15, 16, 26, -1, 28, 29, 30, -1, - 32, 33, 34, -1, -1, -1, 38, -1, -1, -1, - -1, 5, -1, -1, -1, -1, -1, -1, -1, 13, - -1, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 66, -1, 68, 69, 41, 42, -1, - -1, 74, 75, 76, 1, -1, 79, -1, -1, 82, - 83, 84, -1, -1, -1, 12, 13, -1, 15, 16, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 73, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, - -1, 68, 69, -1, 71, -1, -1, 1, 75, 76, - -1, -1, 79, -1, -1, 82, 83, 84, 12, 13, - -1, 15, 16, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, - 61, 62, 63, 64, -1, -1, -1, -1, -1, -1, + 66, 67, 75, 69, 70, 71, 72, 73, 0, 1, + 76, 77, 13, 5, 80, 75, 1, 83, 84, 85, + 12, 13, 71, 15, 16, 71, 1, 73, 71, 72, + 5, 5, 43, 76, 77, 78, 79, 12, 13, 13, + 1, 15, 16, 17, 18, 19, 20, 21, 71, 71, + 73, 73, 44, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 71, 69, 70, 71, + 72, 73, 71, 1, 73, 77, 5, 71, 80, 73, + 71, 66, 84, 85, 12, 13, 72, 15, 16, 13, + 72, 15, 16, 17, 18, 19, 20, 21, 75, 72, + 0, 1, 13, 5, 15, 16, 17, 18, 19, 20, + 71, 349, 73, 13, 72, 72, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 40, 69, 70, 71, 72, 73, 422, 1, 76, 77, + 154, 71, 80, 73, 449, 83, 84, 85, 12, 13, + 390, 15, 16, 71, 487, 73, 489, 438, 369, 498, + 70, 71, 72, 386, 47, 81, 308, 174, 288, 360, + 453, 94, 429, 254, 136, 473, 349, 349, -1, -1, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, -1, 68, 69, -1, -1, -1, -1, - 74, 75, 76, 1, -1, 79, -1, 5, 82, 83, - 84, -1, -1, -1, 12, 13, -1, 15, 16, -1, + 64, 65, 66, 67, -1, 69, 70, 71, 72, 73, + -1, 1, 76, 77, -1, 5, 80, -1, -1, 83, + 84, 85, 12, 13, 5, 15, 16, -1, -1, -1, + -1, -1, 13, -1, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, + 31, -1, -1, -1, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, -1, 69, + 70, 71, 72, 73, -1, 1, -1, 77, -1, 5, + 80, -1, -1, -1, 84, 85, 12, 13, -1, 15, + 16, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, + 63, 64, 65, -1, -1, -1, -1, -1, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 67, -1, 69, 70, -1, -1, -1, -1, 75, + 76, 77, 1, -1, 80, 0, 1, 83, 84, 85, + -1, -1, -1, 12, 13, -1, 15, 16, 13, -1, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, -1, -1, -1, -1, -1, 31, -1, -1, -1, + -1, -1, -1, -1, 39, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, + 59, 60, 61, 62, 63, 64, 65, 66, 67, -1, + 69, 70, -1, 72, -1, -1, 1, 76, 77, -1, + -1, 80, -1, -1, 83, 84, 85, 12, 13, -1, + 15, 16, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, -1, 69, 70, -1, -1, -1, -1, + 75, 76, 77, 1, -1, 80, -1, 5, 83, 84, + 85, -1, -1, -1, 12, 13, -1, 15, 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 5, - 68, 69, -1, -1, -1, -1, 12, 13, 76, 15, - 16, 79, -1, -1, -1, 83, 84, -1, -1, -1, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 5, 69, 70, -1, -1, -1, -1, 12, 13, 77, + 15, 16, 80, -1, -1, -1, 84, 85, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, -1, 69, 70, 12, 13, -1, 15, + 16, -1, 77, -1, -1, 80, -1, -1, -1, 84, + 85, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, -1, 68, 69, 12, 13, -1, 15, 16, -1, - 76, -1, -1, 79, -1, -1, -1, 83, 84, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, -1, - 68, 69, -1, -1, 0, 1, -1, -1, 76, -1, - -1, 79, -1, -1, -1, 83, 84, 13, -1, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - -1, -1, -1, -1, -1, 31, -1, -1, -1, -1, - -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, + 66, 67, -1, 69, 70, -1, -1, 0, 1, -1, + -1, 77, -1, -1, 80, -1, -1, -1, 84, 85, + 13, -1, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, -1, -1, -1, -1, -1, 31, -1, + -1, -1, -1, -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 71 + -1, -1, -1, -1, -1, -1, -1, -1, -1, 72 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 26, 28, 29, 30, 32, 33, 34, 38, 86, - 88, 89, 90, 91, 92, 93, 94, 97, 99, 1, - 95, 70, 70, 70, 70, 5, 70, 70, 0, 95, - 95, 95, 95, 95, 95, 95, 96, 70, 72, 173, - 5, 12, 95, 95, 95, 95, 95, 95, 95, 5, - 6, 39, 100, 168, 169, 1, 95, 13, 15, 16, + 0, 26, 28, 29, 30, 32, 33, 34, 38, 87, + 89, 90, 91, 92, 93, 94, 95, 98, 100, 1, + 96, 71, 71, 71, 71, 5, 71, 71, 0, 96, + 96, 96, 96, 96, 96, 96, 97, 71, 73, 174, + 5, 12, 96, 96, 96, 96, 96, 96, 96, 5, + 6, 39, 101, 169, 170, 1, 96, 13, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 31, - 87, 104, 109, 128, 130, 136, 137, 140, 141, 142, - 143, 144, 145, 146, 147, 148, 149, 151, 154, 1, - 13, 40, 69, 155, 156, 157, 158, 164, 13, 62, - 133, 134, 135, 12, 13, 15, 16, 44, 45, 46, + 88, 105, 110, 129, 131, 137, 138, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 152, 155, 1, + 13, 40, 70, 156, 157, 158, 159, 165, 13, 63, + 134, 135, 136, 12, 13, 15, 16, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, - 68, 76, 79, 83, 84, 139, 160, 162, 163, 164, - 165, 166, 41, 42, 73, 121, 122, 124, 125, 141, - 1, 13, 112, 113, 114, 115, 1, 101, 109, 96, - 168, 0, 71, 98, 173, 174, 72, 21, 13, 17, - 66, 67, 13, 95, 21, 1, 95, 1, 95, 1, - 95, 95, 95, 1, 70, 75, 145, 1, 5, 76, - 77, 78, 138, 13, 20, 146, 147, 147, 1, 148, - 72, 174, 95, 95, 71, 1, 157, 174, 72, 174, - 1, 17, 173, 95, 95, 95, 95, 95, 95, 95, - 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, - 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, - 95, 95, 95, 95, 95, 95, 61, 163, 1, 71, - 75, 82, 161, 95, 95, 95, 95, 71, 71, 72, - 174, 95, 71, 1, 114, 72, 174, 1, 17, 95, - 72, 173, 35, 36, 102, 110, 96, 96, 1, 13, - 13, 14, 64, 95, 13, 20, 144, 150, 72, 173, - 12, 65, 118, 72, 173, 70, 125, 127, 72, 173, - 70, 12, 13, 131, 71, 95, 95, 95, 95, 95, - 145, 147, 95, 1, 72, 174, 72, 1, 95, 72, - 95, 71, 70, 75, 1, 160, 95, 95, 95, 162, - 13, 119, 43, 13, 129, 95, 1, 72, 174, 72, - 95, 72, 95, 70, 95, 95, 27, 103, 116, 96, - 98, 173, 74, 74, 74, 145, 95, 13, 150, 7, - 8, 9, 10, 11, 80, 81, 152, 95, 95, 1, - 70, 75, 95, 95, 155, 143, 72, 95, 1, 95, - 95, 1, 160, 95, 95, 74, 95, 95, 95, 95, - 43, 123, 72, 95, 1, 95, 95, 1, 160, 95, - 126, 127, 37, 111, 1, 95, 1, 104, 105, 109, - 168, 170, 172, 96, 95, 80, 152, 95, 126, 106, - 95, 95, 155, 70, 98, 95, 72, 160, 40, 159, - 155, 135, 95, 17, 120, 121, 95, 95, 72, 160, - 155, 70, 5, 70, 72, 173, 13, 117, 173, 96, - 74, 95, 12, 13, 153, 72, 173, 1, 98, 107, - 108, 128, 130, 136, 137, 140, 167, 168, 170, 171, - 172, 106, 125, 71, 95, 95, 159, 95, 1, 71, - 95, 74, 122, 95, 71, 95, 127, 95, 5, 118, - 153, 95, 98, 96, 167, 95, 132, 160, 95, 95, - 112, 112, 95, 95, 80, 71, 133, 95, 71, 71, - 72, 80, 95 + 67, 69, 77, 80, 84, 85, 140, 161, 163, 164, + 165, 166, 167, 41, 42, 74, 122, 123, 125, 126, + 142, 1, 13, 113, 114, 115, 116, 1, 102, 110, + 97, 169, 0, 72, 99, 174, 175, 73, 21, 13, + 17, 67, 68, 13, 96, 21, 1, 96, 1, 96, + 1, 96, 96, 96, 1, 71, 76, 146, 1, 5, + 77, 78, 79, 139, 13, 20, 147, 148, 148, 1, + 149, 73, 175, 96, 96, 72, 1, 158, 175, 73, + 175, 1, 17, 174, 96, 96, 96, 96, 96, 96, + 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, + 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, + 96, 96, 96, 96, 96, 96, 96, 96, 62, 164, + 1, 72, 76, 83, 162, 96, 96, 96, 96, 72, + 72, 73, 175, 96, 72, 1, 115, 73, 175, 1, + 17, 96, 73, 174, 35, 36, 103, 111, 97, 97, + 1, 13, 13, 14, 65, 96, 13, 20, 145, 151, + 73, 174, 12, 66, 119, 73, 174, 71, 126, 128, + 73, 174, 71, 12, 13, 132, 72, 96, 96, 96, + 96, 96, 146, 148, 96, 1, 73, 175, 73, 1, + 96, 73, 96, 72, 71, 76, 1, 161, 96, 96, + 96, 163, 13, 120, 43, 13, 130, 96, 1, 73, + 175, 73, 96, 73, 96, 71, 96, 96, 27, 104, + 117, 97, 99, 174, 75, 75, 75, 146, 96, 13, + 151, 7, 8, 9, 10, 11, 81, 82, 153, 96, + 96, 1, 71, 76, 96, 96, 156, 144, 73, 96, + 1, 96, 96, 1, 161, 96, 96, 75, 96, 96, + 96, 96, 43, 124, 73, 96, 1, 96, 96, 1, + 161, 96, 127, 128, 37, 112, 1, 96, 1, 105, + 106, 110, 169, 171, 173, 97, 96, 81, 153, 96, + 127, 107, 96, 96, 156, 71, 99, 96, 73, 161, + 40, 160, 156, 136, 96, 17, 121, 122, 96, 96, + 73, 161, 156, 71, 5, 71, 73, 174, 13, 118, + 174, 97, 75, 96, 12, 13, 154, 73, 174, 1, + 99, 108, 109, 129, 131, 137, 138, 141, 168, 169, + 171, 172, 173, 107, 126, 72, 96, 96, 160, 96, + 1, 72, 96, 75, 123, 96, 72, 96, 128, 96, + 5, 119, 154, 96, 99, 97, 168, 96, 133, 161, + 96, 96, 113, 113, 96, 96, 81, 72, 134, 96, + 72, 72, 73, 81, 96 }; #define yyerrok (yyerrstatus = 0) @@ -2138,7 +2146,7 @@ yyreduce: case 12: /* Line 1455 of yacc.c */ -#line 282 "../css/CSSGrammar.y" +#line 287 "../css/CSSGrammar.y" { static_cast(parser)->m_rule = (yyvsp[(4) - (6)].rule); ;} @@ -2147,7 +2155,7 @@ yyreduce: case 13: /* Line 1455 of yacc.c */ -#line 288 "../css/CSSGrammar.y" +#line 293 "../css/CSSGrammar.y" { static_cast(parser)->m_keyframe = (yyvsp[(4) - (6)].keyframeRule); ;} @@ -2156,7 +2164,7 @@ yyreduce: case 14: /* Line 1455 of yacc.c */ -#line 294 "../css/CSSGrammar.y" +#line 299 "../css/CSSGrammar.y" { /* can be empty */ ;} @@ -2165,7 +2173,7 @@ yyreduce: case 15: /* Line 1455 of yacc.c */ -#line 300 "../css/CSSGrammar.y" +#line 305 "../css/CSSGrammar.y" { /* can be empty */ ;} @@ -2174,7 +2182,7 @@ yyreduce: case 16: /* Line 1455 of yacc.c */ -#line 306 "../css/CSSGrammar.y" +#line 311 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); if ((yyvsp[(4) - (5)].valueList)) { @@ -2191,7 +2199,7 @@ yyreduce: case 17: /* Line 1455 of yacc.c */ -#line 320 "../css/CSSGrammar.y" +#line 325 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); p->m_mediaQuery = p->sinkFloatingMediaQuery((yyvsp[(4) - (5)].mediaQuery)); @@ -2201,7 +2209,7 @@ yyreduce: case 18: /* Line 1455 of yacc.c */ -#line 327 "../css/CSSGrammar.y" +#line 332 "../css/CSSGrammar.y" { if ((yyvsp[(4) - (5)].selectorList)) { CSSParser* p = static_cast(parser); @@ -2214,7 +2222,7 @@ yyreduce: case 25: /* Line 1455 of yacc.c */ -#line 349 "../css/CSSGrammar.y" +#line 354 "../css/CSSGrammar.y" { ;} break; @@ -2222,7 +2230,7 @@ yyreduce: case 28: /* Line 1455 of yacc.c */ -#line 359 "../css/CSSGrammar.y" +#line 364 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.rule) = static_cast(parser)->createCharsetRule((yyvsp[(3) - (5)].string)); @@ -2234,7 +2242,7 @@ yyreduce: case 29: /* Line 1455 of yacc.c */ -#line 365 "../css/CSSGrammar.y" +#line 370 "../css/CSSGrammar.y" { ;} break; @@ -2242,7 +2250,7 @@ yyreduce: case 30: /* Line 1455 of yacc.c */ -#line 367 "../css/CSSGrammar.y" +#line 372 "../css/CSSGrammar.y" { ;} break; @@ -2250,7 +2258,7 @@ yyreduce: case 32: /* Line 1455 of yacc.c */ -#line 373 "../css/CSSGrammar.y" +#line 378 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); if ((yyvsp[(2) - (3)].rule) && p->m_styleSheet) @@ -2261,7 +2269,7 @@ yyreduce: case 33: /* Line 1455 of yacc.c */ -#line 378 "../css/CSSGrammar.y" +#line 383 "../css/CSSGrammar.y" { ;} break; @@ -2269,7 +2277,7 @@ yyreduce: case 35: /* Line 1455 of yacc.c */ -#line 384 "../css/CSSGrammar.y" +#line 389 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); if ((yyvsp[(2) - (3)].rule) && p->m_styleSheet) @@ -2280,7 +2288,7 @@ yyreduce: case 39: /* Line 1455 of yacc.c */ -#line 398 "../css/CSSGrammar.y" +#line 403 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); if ((yyvsp[(2) - (3)].rule) && p->m_styleSheet) @@ -2291,14 +2299,14 @@ yyreduce: case 49: /* Line 1455 of yacc.c */ -#line 421 "../css/CSSGrammar.y" +#line 426 "../css/CSSGrammar.y" { (yyval.ruleList) = 0; ;} break; case 50: /* Line 1455 of yacc.c */ -#line 422 "../css/CSSGrammar.y" +#line 427 "../css/CSSGrammar.y" { (yyval.ruleList) = (yyvsp[(1) - (3)].ruleList); if ((yyvsp[(2) - (3)].rule)) { @@ -2312,7 +2320,7 @@ yyreduce: case 60: /* Line 1455 of yacc.c */ -#line 449 "../css/CSSGrammar.y" +#line 454 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createImportRule((yyvsp[(3) - (6)].string), (yyvsp[(5) - (6)].mediaList)); ;} @@ -2321,7 +2329,7 @@ yyreduce: case 61: /* Line 1455 of yacc.c */ -#line 452 "../css/CSSGrammar.y" +#line 457 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} @@ -2330,7 +2338,7 @@ yyreduce: case 62: /* Line 1455 of yacc.c */ -#line 455 "../css/CSSGrammar.y" +#line 460 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} @@ -2339,7 +2347,7 @@ yyreduce: case 63: /* Line 1455 of yacc.c */ -#line 458 "../css/CSSGrammar.y" +#line 463 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} @@ -2348,7 +2356,7 @@ yyreduce: case 64: /* Line 1455 of yacc.c */ -#line 464 "../css/CSSGrammar.y" +#line 469 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createVariablesRule((yyvsp[(3) - (7)].mediaList), true); ;} @@ -2357,7 +2365,7 @@ yyreduce: case 65: /* Line 1455 of yacc.c */ -#line 468 "../css/CSSGrammar.y" +#line 473 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createVariablesRule((yyvsp[(3) - (7)].mediaList), false); ;} @@ -2366,7 +2374,7 @@ yyreduce: case 66: /* Line 1455 of yacc.c */ -#line 474 "../css/CSSGrammar.y" +#line 479 "../css/CSSGrammar.y" { (yyval.mediaList) = static_cast(parser)->createMediaList(); ;} @@ -2375,7 +2383,7 @@ yyreduce: case 67: /* Line 1455 of yacc.c */ -#line 478 "../css/CSSGrammar.y" +#line 483 "../css/CSSGrammar.y" { (yyval.mediaList) = (yyvsp[(3) - (3)].mediaList); ;} @@ -2384,7 +2392,7 @@ yyreduce: case 68: /* Line 1455 of yacc.c */ -#line 484 "../css/CSSGrammar.y" +#line 489 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); ;} @@ -2393,7 +2401,7 @@ yyreduce: case 69: /* Line 1455 of yacc.c */ -#line 487 "../css/CSSGrammar.y" +#line 492 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); if ((yyvsp[(2) - (2)].boolean)) @@ -2404,7 +2412,7 @@ yyreduce: case 70: /* Line 1455 of yacc.c */ -#line 492 "../css/CSSGrammar.y" +#line 497 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); ;} @@ -2413,7 +2421,7 @@ yyreduce: case 71: /* Line 1455 of yacc.c */ -#line 495 "../css/CSSGrammar.y" +#line 500 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} @@ -2422,7 +2430,7 @@ yyreduce: case 72: /* Line 1455 of yacc.c */ -#line 498 "../css/CSSGrammar.y" +#line 503 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} @@ -2431,7 +2439,7 @@ yyreduce: case 73: /* Line 1455 of yacc.c */ -#line 501 "../css/CSSGrammar.y" +#line 506 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); ;} @@ -2440,7 +2448,7 @@ yyreduce: case 74: /* Line 1455 of yacc.c */ -#line 507 "../css/CSSGrammar.y" +#line 512 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (3)].boolean); ;} @@ -2449,7 +2457,7 @@ yyreduce: case 75: /* Line 1455 of yacc.c */ -#line 510 "../css/CSSGrammar.y" +#line 515 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} @@ -2458,7 +2466,7 @@ yyreduce: case 76: /* Line 1455 of yacc.c */ -#line 513 "../css/CSSGrammar.y" +#line 518 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} @@ -2467,7 +2475,7 @@ yyreduce: case 77: /* Line 1455 of yacc.c */ -#line 516 "../css/CSSGrammar.y" +#line 521 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} @@ -2476,7 +2484,7 @@ yyreduce: case 78: /* Line 1455 of yacc.c */ -#line 519 "../css/CSSGrammar.y" +#line 524 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (4)].boolean); if ((yyvsp[(2) - (4)].boolean)) @@ -2487,7 +2495,7 @@ yyreduce: case 79: /* Line 1455 of yacc.c */ -#line 524 "../css/CSSGrammar.y" +#line 529 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (4)].boolean); ;} @@ -2496,7 +2504,7 @@ yyreduce: case 80: /* Line 1455 of yacc.c */ -#line 527 "../css/CSSGrammar.y" +#line 532 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (6)].boolean); ;} @@ -2505,7 +2513,7 @@ yyreduce: case 81: /* Line 1455 of yacc.c */ -#line 533 "../css/CSSGrammar.y" +#line 538 "../css/CSSGrammar.y" { (yyval.boolean) = static_cast(parser)->addVariable((yyvsp[(1) - (4)].string), (yyvsp[(4) - (4)].valueList)); ;} @@ -2514,7 +2522,7 @@ yyreduce: case 82: /* Line 1455 of yacc.c */ -#line 537 "../css/CSSGrammar.y" +#line 542 "../css/CSSGrammar.y" { (yyval.boolean) = static_cast(parser)->addVariableDeclarationBlock((yyvsp[(1) - (7)].string)); ;} @@ -2523,7 +2531,7 @@ yyreduce: case 83: /* Line 1455 of yacc.c */ -#line 541 "../css/CSSGrammar.y" +#line 546 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} @@ -2532,7 +2540,7 @@ yyreduce: case 84: /* Line 1455 of yacc.c */ -#line 545 "../css/CSSGrammar.y" +#line 550 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} @@ -2541,7 +2549,7 @@ yyreduce: case 85: /* Line 1455 of yacc.c */ -#line 549 "../css/CSSGrammar.y" +#line 554 "../css/CSSGrammar.y" { /* @variables { varname: } Just reduce away this variable with no value. */ (yyval.boolean) = false; @@ -2551,7 +2559,7 @@ yyreduce: case 86: /* Line 1455 of yacc.c */ -#line 554 "../css/CSSGrammar.y" +#line 559 "../css/CSSGrammar.y" { /* if we come across rules with invalid values like this case: @variables { varname: *; }, just discard the property/value pair */ (yyval.boolean) = false; @@ -2561,7 +2569,7 @@ yyreduce: case 87: /* Line 1455 of yacc.c */ -#line 561 "../css/CSSGrammar.y" +#line 566 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} @@ -2570,7 +2578,7 @@ yyreduce: case 88: /* Line 1455 of yacc.c */ -#line 567 "../css/CSSGrammar.y" +#line 572 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); if (p->m_styleSheet) @@ -2581,21 +2589,21 @@ yyreduce: case 91: /* Line 1455 of yacc.c */ -#line 577 "../css/CSSGrammar.y" +#line 582 "../css/CSSGrammar.y" { (yyval.string).characters = 0; ;} break; case 92: /* Line 1455 of yacc.c */ -#line 578 "../css/CSSGrammar.y" +#line 583 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 95: /* Line 1455 of yacc.c */ -#line 587 "../css/CSSGrammar.y" +#line 592 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} @@ -2604,7 +2612,7 @@ yyreduce: case 96: /* Line 1455 of yacc.c */ -#line 593 "../css/CSSGrammar.y" +#line 598 "../css/CSSGrammar.y" { (yyval.valueList) = 0; ;} @@ -2613,7 +2621,7 @@ yyreduce: case 97: /* Line 1455 of yacc.c */ -#line 596 "../css/CSSGrammar.y" +#line 601 "../css/CSSGrammar.y" { (yyval.valueList) = (yyvsp[(3) - (4)].valueList); ;} @@ -2622,7 +2630,7 @@ yyreduce: case 98: /* Line 1455 of yacc.c */ -#line 602 "../css/CSSGrammar.y" +#line 607 "../css/CSSGrammar.y" { (yyvsp[(3) - (7)].string).lower(); (yyval.mediaQueryExp) = static_cast(parser)->createFloatingMediaQueryExp((yyvsp[(3) - (7)].string), (yyvsp[(5) - (7)].valueList)); @@ -2632,7 +2640,7 @@ yyreduce: case 99: /* Line 1455 of yacc.c */ -#line 609 "../css/CSSGrammar.y" +#line 614 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.mediaQueryExpList) = p->createFloatingMediaQueryExpList(); @@ -2643,7 +2651,7 @@ yyreduce: case 100: /* Line 1455 of yacc.c */ -#line 614 "../css/CSSGrammar.y" +#line 619 "../css/CSSGrammar.y" { (yyval.mediaQueryExpList) = (yyvsp[(1) - (5)].mediaQueryExpList); (yyval.mediaQueryExpList)->append(static_cast(parser)->sinkFloatingMediaQueryExp((yyvsp[(5) - (5)].mediaQueryExp))); @@ -2653,7 +2661,7 @@ yyreduce: case 101: /* Line 1455 of yacc.c */ -#line 621 "../css/CSSGrammar.y" +#line 626 "../css/CSSGrammar.y" { (yyval.mediaQueryExpList) = static_cast(parser)->createFloatingMediaQueryExpList(); ;} @@ -2662,7 +2670,7 @@ yyreduce: case 102: /* Line 1455 of yacc.c */ -#line 624 "../css/CSSGrammar.y" +#line 629 "../css/CSSGrammar.y" { (yyval.mediaQueryExpList) = (yyvsp[(3) - (3)].mediaQueryExpList); ;} @@ -2671,7 +2679,7 @@ yyreduce: case 103: /* Line 1455 of yacc.c */ -#line 630 "../css/CSSGrammar.y" +#line 635 "../css/CSSGrammar.y" { (yyval.mediaQueryRestrictor) = MediaQuery::None; ;} @@ -2680,7 +2688,7 @@ yyreduce: case 104: /* Line 1455 of yacc.c */ -#line 633 "../css/CSSGrammar.y" +#line 638 "../css/CSSGrammar.y" { (yyval.mediaQueryRestrictor) = MediaQuery::Only; ;} @@ -2689,7 +2697,7 @@ yyreduce: case 105: /* Line 1455 of yacc.c */ -#line 636 "../css/CSSGrammar.y" +#line 641 "../css/CSSGrammar.y" { (yyval.mediaQueryRestrictor) = MediaQuery::Not; ;} @@ -2698,7 +2706,7 @@ yyreduce: case 106: /* Line 1455 of yacc.c */ -#line 642 "../css/CSSGrammar.y" +#line 647 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.mediaQuery) = p->createFloatingMediaQuery(p->sinkFloatingMediaQueryExpList((yyvsp[(1) - (1)].mediaQueryExpList))); @@ -2708,7 +2716,7 @@ yyreduce: case 107: /* Line 1455 of yacc.c */ -#line 647 "../css/CSSGrammar.y" +#line 652 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyvsp[(3) - (4)].string).lower(); @@ -2719,7 +2727,7 @@ yyreduce: case 108: /* Line 1455 of yacc.c */ -#line 655 "../css/CSSGrammar.y" +#line 660 "../css/CSSGrammar.y" { (yyval.mediaList) = static_cast(parser)->createMediaList(); ;} @@ -2728,7 +2736,7 @@ yyreduce: case 110: /* Line 1455 of yacc.c */ -#line 662 "../css/CSSGrammar.y" +#line 667 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.mediaList) = p->createMediaList(); @@ -2739,7 +2747,7 @@ yyreduce: case 111: /* Line 1455 of yacc.c */ -#line 667 "../css/CSSGrammar.y" +#line 672 "../css/CSSGrammar.y" { (yyval.mediaList) = (yyvsp[(1) - (4)].mediaList); if ((yyval.mediaList)) @@ -2750,7 +2758,7 @@ yyreduce: case 112: /* Line 1455 of yacc.c */ -#line 672 "../css/CSSGrammar.y" +#line 677 "../css/CSSGrammar.y" { (yyval.mediaList) = 0; ;} @@ -2759,7 +2767,7 @@ yyreduce: case 113: /* Line 1455 of yacc.c */ -#line 678 "../css/CSSGrammar.y" +#line 683 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createMediaRule((yyvsp[(3) - (7)].mediaList), (yyvsp[(6) - (7)].ruleList)); ;} @@ -2768,7 +2776,7 @@ yyreduce: case 114: /* Line 1455 of yacc.c */ -#line 681 "../css/CSSGrammar.y" +#line 686 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createMediaRule(0, (yyvsp[(5) - (6)].ruleList)); ;} @@ -2777,7 +2785,7 @@ yyreduce: case 115: /* Line 1455 of yacc.c */ -#line 687 "../css/CSSGrammar.y" +#line 692 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} @@ -2786,7 +2794,7 @@ yyreduce: case 116: /* Line 1455 of yacc.c */ -#line 693 "../css/CSSGrammar.y" +#line 698 "../css/CSSGrammar.y" { (yyval.rule) = (yyvsp[(7) - (8)].keyframesRule); (yyvsp[(7) - (8)].keyframesRule)->setNameInternal((yyvsp[(3) - (8)].string)); @@ -2796,14 +2804,14 @@ yyreduce: case 119: /* Line 1455 of yacc.c */ -#line 705 "../css/CSSGrammar.y" +#line 710 "../css/CSSGrammar.y" { (yyval.keyframesRule) = static_cast(parser)->createKeyframesRule(); ;} break; case 120: /* Line 1455 of yacc.c */ -#line 706 "../css/CSSGrammar.y" +#line 711 "../css/CSSGrammar.y" { (yyval.keyframesRule) = (yyvsp[(1) - (3)].keyframesRule); if ((yyvsp[(2) - (3)].keyframeRule)) @@ -2814,7 +2822,7 @@ yyreduce: case 121: /* Line 1455 of yacc.c */ -#line 714 "../css/CSSGrammar.y" +#line 719 "../css/CSSGrammar.y" { (yyval.keyframeRule) = static_cast(parser)->createKeyframeRule((yyvsp[(1) - (6)].valueList)); ;} @@ -2823,7 +2831,7 @@ yyreduce: case 122: /* Line 1455 of yacc.c */ -#line 720 "../css/CSSGrammar.y" +#line 725 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.valueList) = p->createFloatingValueList(); @@ -2834,7 +2842,7 @@ yyreduce: case 123: /* Line 1455 of yacc.c */ -#line 725 "../css/CSSGrammar.y" +#line 730 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.valueList) = (yyvsp[(1) - (5)].valueList); @@ -2846,14 +2854,14 @@ yyreduce: case 124: /* Line 1455 of yacc.c */ -#line 734 "../css/CSSGrammar.y" +#line 739 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (1)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;} break; case 125: /* Line 1455 of yacc.c */ -#line 735 "../css/CSSGrammar.y" +#line 740 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; CSSParserString& str = (yyvsp[(1) - (1)].string); @@ -2869,7 +2877,7 @@ yyreduce: case 126: /* Line 1455 of yacc.c */ -#line 759 "../css/CSSGrammar.y" +#line 764 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} @@ -2878,7 +2886,7 @@ yyreduce: case 127: /* Line 1455 of yacc.c */ -#line 762 "../css/CSSGrammar.y" +#line 767 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} @@ -2887,7 +2895,7 @@ yyreduce: case 128: /* Line 1455 of yacc.c */ -#line 769 "../css/CSSGrammar.y" +#line 774 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createFontFaceRule(); ;} @@ -2896,7 +2904,7 @@ yyreduce: case 129: /* Line 1455 of yacc.c */ -#line 772 "../css/CSSGrammar.y" +#line 777 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} @@ -2905,7 +2913,7 @@ yyreduce: case 130: /* Line 1455 of yacc.c */ -#line 775 "../css/CSSGrammar.y" +#line 780 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} @@ -2914,42 +2922,42 @@ yyreduce: case 131: /* Line 1455 of yacc.c */ -#line 781 "../css/CSSGrammar.y" +#line 786 "../css/CSSGrammar.y" { (yyval.relation) = CSSSelector::DirectAdjacent; ;} break; case 132: /* Line 1455 of yacc.c */ -#line 782 "../css/CSSGrammar.y" +#line 787 "../css/CSSGrammar.y" { (yyval.relation) = CSSSelector::IndirectAdjacent; ;} break; case 133: /* Line 1455 of yacc.c */ -#line 783 "../css/CSSGrammar.y" +#line 788 "../css/CSSGrammar.y" { (yyval.relation) = CSSSelector::Child; ;} break; case 134: /* Line 1455 of yacc.c */ -#line 787 "../css/CSSGrammar.y" +#line 792 "../css/CSSGrammar.y" { (yyval.integer) = -1; ;} break; case 135: /* Line 1455 of yacc.c */ -#line 788 "../css/CSSGrammar.y" +#line 793 "../css/CSSGrammar.y" { (yyval.integer) = 1; ;} break; case 136: /* Line 1455 of yacc.c */ -#line 792 "../css/CSSGrammar.y" +#line 797 "../css/CSSGrammar.y" { (yyval.rule) = static_cast(parser)->createStyleRule((yyvsp[(1) - (5)].selectorList)); ;} @@ -2958,7 +2966,7 @@ yyreduce: case 137: /* Line 1455 of yacc.c */ -#line 798 "../css/CSSGrammar.y" +#line 803 "../css/CSSGrammar.y" { if ((yyvsp[(1) - (1)].selector)) { CSSParser* p = static_cast(parser); @@ -2973,7 +2981,7 @@ yyreduce: case 138: /* Line 1455 of yacc.c */ -#line 807 "../css/CSSGrammar.y" +#line 812 "../css/CSSGrammar.y" { if ((yyvsp[(1) - (4)].selectorList) && (yyvsp[(4) - (4)].selector)) { CSSParser* p = static_cast(parser); @@ -2987,7 +2995,7 @@ yyreduce: case 139: /* Line 1455 of yacc.c */ -#line 815 "../css/CSSGrammar.y" +#line 820 "../css/CSSGrammar.y" { (yyval.selectorList) = 0; ;} @@ -2996,7 +3004,7 @@ yyreduce: case 140: /* Line 1455 of yacc.c */ -#line 821 "../css/CSSGrammar.y" +#line 826 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (2)].selector); ;} @@ -3005,7 +3013,7 @@ yyreduce: case 141: /* Line 1455 of yacc.c */ -#line 827 "../css/CSSGrammar.y" +#line 832 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); ;} @@ -3014,7 +3022,7 @@ yyreduce: case 142: /* Line 1455 of yacc.c */ -#line 831 "../css/CSSGrammar.y" +#line 836 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); ;} @@ -3023,7 +3031,7 @@ yyreduce: case 143: /* Line 1455 of yacc.c */ -#line 835 "../css/CSSGrammar.y" +#line 840 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(2) - (2)].selector); if (!(yyvsp[(1) - (2)].selector)) @@ -3044,7 +3052,7 @@ yyreduce: case 144: /* Line 1455 of yacc.c */ -#line 850 "../css/CSSGrammar.y" +#line 855 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(3) - (3)].selector); if (!(yyvsp[(1) - (3)].selector)) @@ -3070,7 +3078,7 @@ yyreduce: case 145: /* Line 1455 of yacc.c */ -#line 870 "../css/CSSGrammar.y" +#line 875 "../css/CSSGrammar.y" { (yyval.selector) = 0; ;} @@ -3079,28 +3087,28 @@ yyreduce: case 146: /* Line 1455 of yacc.c */ -#line 876 "../css/CSSGrammar.y" +#line 881 "../css/CSSGrammar.y" { (yyval.string).characters = 0; (yyval.string).length = 0; ;} break; case 147: /* Line 1455 of yacc.c */ -#line 877 "../css/CSSGrammar.y" +#line 882 "../css/CSSGrammar.y" { static UChar star = '*'; (yyval.string).characters = ☆ (yyval.string).length = 1; ;} break; case 148: /* Line 1455 of yacc.c */ -#line 878 "../css/CSSGrammar.y" +#line 883 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; case 149: /* Line 1455 of yacc.c */ -#line 882 "../css/CSSGrammar.y" +#line 887 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3111,7 +3119,7 @@ yyreduce: case 150: /* Line 1455 of yacc.c */ -#line 887 "../css/CSSGrammar.y" +#line 892 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(2) - (2)].selector); if ((yyval.selector)) { @@ -3124,7 +3132,7 @@ yyreduce: case 151: /* Line 1455 of yacc.c */ -#line 894 "../css/CSSGrammar.y" +#line 899 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); CSSParser* p = static_cast(parser); @@ -3136,7 +3144,7 @@ yyreduce: case 152: /* Line 1455 of yacc.c */ -#line 900 "../css/CSSGrammar.y" +#line 905 "../css/CSSGrammar.y" { AtomicString namespacePrefix = (yyvsp[(1) - (2)].string); CSSParser* p = static_cast(parser); @@ -3152,7 +3160,7 @@ yyreduce: case 153: /* Line 1455 of yacc.c */ -#line 910 "../css/CSSGrammar.y" +#line 915 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(3) - (3)].selector); if ((yyval.selector)) { @@ -3170,7 +3178,7 @@ yyreduce: case 154: /* Line 1455 of yacc.c */ -#line 922 "../css/CSSGrammar.y" +#line 927 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(2) - (2)].selector); if ((yyval.selector)) { @@ -3186,7 +3194,7 @@ yyreduce: case 155: /* Line 1455 of yacc.c */ -#line 935 "../css/CSSGrammar.y" +#line 940 "../css/CSSGrammar.y" { CSSParserString& str = (yyvsp[(1) - (1)].string); CSSParser* p = static_cast(parser); @@ -3200,7 +3208,7 @@ yyreduce: case 156: /* Line 1455 of yacc.c */ -#line 943 "../css/CSSGrammar.y" +#line 948 "../css/CSSGrammar.y" { static UChar star = '*'; (yyval.string).characters = ☆ @@ -3211,7 +3219,7 @@ yyreduce: case 157: /* Line 1455 of yacc.c */ -#line 951 "../css/CSSGrammar.y" +#line 956 "../css/CSSGrammar.y" { (yyval.selector) = (yyvsp[(1) - (1)].selector); ;} @@ -3220,7 +3228,7 @@ yyreduce: case 158: /* Line 1455 of yacc.c */ -#line 954 "../css/CSSGrammar.y" +#line 959 "../css/CSSGrammar.y" { if (!(yyvsp[(2) - (2)].selector)) (yyval.selector) = 0; @@ -3239,7 +3247,7 @@ yyreduce: case 159: /* Line 1455 of yacc.c */ -#line 967 "../css/CSSGrammar.y" +#line 972 "../css/CSSGrammar.y" { (yyval.selector) = 0; ;} @@ -3248,7 +3256,7 @@ yyreduce: case 160: /* Line 1455 of yacc.c */ -#line 973 "../css/CSSGrammar.y" +#line 978 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3262,7 +3270,7 @@ yyreduce: case 161: /* Line 1455 of yacc.c */ -#line 981 "../css/CSSGrammar.y" +#line 986 "../css/CSSGrammar.y" { if ((yyvsp[(1) - (1)].string).characters[0] >= '0' && (yyvsp[(1) - (1)].string).characters[0] <= '9') { (yyval.selector) = 0; @@ -3280,7 +3288,7 @@ yyreduce: case 165: /* Line 1455 of yacc.c */ -#line 999 "../css/CSSGrammar.y" +#line 1004 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3294,7 +3302,7 @@ yyreduce: case 166: /* Line 1455 of yacc.c */ -#line 1010 "../css/CSSGrammar.y" +#line 1015 "../css/CSSGrammar.y" { CSSParserString& str = (yyvsp[(1) - (2)].string); CSSParser* p = static_cast(parser); @@ -3308,7 +3316,7 @@ yyreduce: case 167: /* Line 1455 of yacc.c */ -#line 1021 "../css/CSSGrammar.y" +#line 1026 "../css/CSSGrammar.y" { (yyval.selector) = static_cast(parser)->createFloatingSelector(); (yyval.selector)->setAttribute(QualifiedName(nullAtom, (yyvsp[(3) - (4)].string), nullAtom)); @@ -3319,7 +3327,7 @@ yyreduce: case 168: /* Line 1455 of yacc.c */ -#line 1026 "../css/CSSGrammar.y" +#line 1031 "../css/CSSGrammar.y" { (yyval.selector) = static_cast(parser)->createFloatingSelector(); (yyval.selector)->setAttribute(QualifiedName(nullAtom, (yyvsp[(3) - (8)].string), nullAtom)); @@ -3331,7 +3339,7 @@ yyreduce: case 169: /* Line 1455 of yacc.c */ -#line 1032 "../css/CSSGrammar.y" +#line 1037 "../css/CSSGrammar.y" { AtomicString namespacePrefix = (yyvsp[(3) - (5)].string); CSSParser* p = static_cast(parser); @@ -3345,7 +3353,7 @@ yyreduce: case 170: /* Line 1455 of yacc.c */ -#line 1040 "../css/CSSGrammar.y" +#line 1045 "../css/CSSGrammar.y" { AtomicString namespacePrefix = (yyvsp[(3) - (9)].string); CSSParser* p = static_cast(parser); @@ -3360,7 +3368,7 @@ yyreduce: case 171: /* Line 1455 of yacc.c */ -#line 1052 "../css/CSSGrammar.y" +#line 1057 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Exact; ;} @@ -3369,7 +3377,7 @@ yyreduce: case 172: /* Line 1455 of yacc.c */ -#line 1055 "../css/CSSGrammar.y" +#line 1060 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::List; ;} @@ -3378,7 +3386,7 @@ yyreduce: case 173: /* Line 1455 of yacc.c */ -#line 1058 "../css/CSSGrammar.y" +#line 1063 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Hyphen; ;} @@ -3387,7 +3395,7 @@ yyreduce: case 174: /* Line 1455 of yacc.c */ -#line 1061 "../css/CSSGrammar.y" +#line 1066 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Begin; ;} @@ -3396,7 +3404,7 @@ yyreduce: case 175: /* Line 1455 of yacc.c */ -#line 1064 "../css/CSSGrammar.y" +#line 1069 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::End; ;} @@ -3405,7 +3413,7 @@ yyreduce: case 176: /* Line 1455 of yacc.c */ -#line 1067 "../css/CSSGrammar.y" +#line 1072 "../css/CSSGrammar.y" { (yyval.integer) = CSSSelector::Contain; ;} @@ -3414,7 +3422,7 @@ yyreduce: case 179: /* Line 1455 of yacc.c */ -#line 1078 "../css/CSSGrammar.y" +#line 1083 "../css/CSSGrammar.y" { (yyval.selector) = static_cast(parser)->createFloatingSelector(); (yyval.selector)->m_match = CSSSelector::PseudoClass; @@ -3450,7 +3458,7 @@ yyreduce: case 180: /* Line 1455 of yacc.c */ -#line 1108 "../css/CSSGrammar.y" +#line 1113 "../css/CSSGrammar.y" { (yyval.selector) = static_cast(parser)->createFloatingSelector(); (yyval.selector)->m_match = CSSSelector::PseudoElement; @@ -3475,7 +3483,7 @@ yyreduce: case 181: /* Line 1455 of yacc.c */ -#line 1128 "../css/CSSGrammar.y" +#line 1133 "../css/CSSGrammar.y" { CSSParser *p = static_cast(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3498,7 +3506,7 @@ yyreduce: case 182: /* Line 1455 of yacc.c */ -#line 1146 "../css/CSSGrammar.y" +#line 1151 "../css/CSSGrammar.y" { CSSParser *p = static_cast(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3521,7 +3529,7 @@ yyreduce: case 183: /* Line 1455 of yacc.c */ -#line 1164 "../css/CSSGrammar.y" +#line 1169 "../css/CSSGrammar.y" { CSSParser *p = static_cast(parser); (yyval.selector) = p->createFloatingSelector(); @@ -3545,7 +3553,7 @@ yyreduce: case 184: /* Line 1455 of yacc.c */ -#line 1183 "../css/CSSGrammar.y" +#line 1188 "../css/CSSGrammar.y" { if (!(yyvsp[(4) - (6)].selector) || (yyvsp[(4) - (6)].selector)->simpleSelector() || (yyvsp[(4) - (6)].selector)->tagHistory()) (yyval.selector) = 0; @@ -3563,7 +3571,7 @@ yyreduce: case 185: /* Line 1455 of yacc.c */ -#line 1198 "../css/CSSGrammar.y" +#line 1203 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); ;} @@ -3572,7 +3580,7 @@ yyreduce: case 186: /* Line 1455 of yacc.c */ -#line 1201 "../css/CSSGrammar.y" +#line 1206 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); if ( (yyvsp[(2) - (2)].boolean) ) @@ -3583,7 +3591,7 @@ yyreduce: case 187: /* Line 1455 of yacc.c */ -#line 1206 "../css/CSSGrammar.y" +#line 1211 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (1)].boolean); ;} @@ -3592,7 +3600,7 @@ yyreduce: case 188: /* Line 1455 of yacc.c */ -#line 1209 "../css/CSSGrammar.y" +#line 1214 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} @@ -3601,7 +3609,7 @@ yyreduce: case 189: /* Line 1455 of yacc.c */ -#line 1212 "../css/CSSGrammar.y" +#line 1217 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} @@ -3610,7 +3618,7 @@ yyreduce: case 190: /* Line 1455 of yacc.c */ -#line 1215 "../css/CSSGrammar.y" +#line 1220 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); ;} @@ -3619,7 +3627,7 @@ yyreduce: case 191: /* Line 1455 of yacc.c */ -#line 1218 "../css/CSSGrammar.y" +#line 1223 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (2)].boolean); ;} @@ -3628,7 +3636,7 @@ yyreduce: case 192: /* Line 1455 of yacc.c */ -#line 1224 "../css/CSSGrammar.y" +#line 1229 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (3)].boolean); ;} @@ -3637,7 +3645,7 @@ yyreduce: case 193: /* Line 1455 of yacc.c */ -#line 1227 "../css/CSSGrammar.y" +#line 1232 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} @@ -3646,7 +3654,7 @@ yyreduce: case 194: /* Line 1455 of yacc.c */ -#line 1230 "../css/CSSGrammar.y" +#line 1235 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} @@ -3655,7 +3663,7 @@ yyreduce: case 195: /* Line 1455 of yacc.c */ -#line 1233 "../css/CSSGrammar.y" +#line 1238 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} @@ -3664,7 +3672,7 @@ yyreduce: case 196: /* Line 1455 of yacc.c */ -#line 1236 "../css/CSSGrammar.y" +#line 1241 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (4)].boolean); if ((yyvsp[(2) - (4)].boolean)) @@ -3675,7 +3683,7 @@ yyreduce: case 197: /* Line 1455 of yacc.c */ -#line 1241 "../css/CSSGrammar.y" +#line 1246 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (4)].boolean); ;} @@ -3684,7 +3692,7 @@ yyreduce: case 198: /* Line 1455 of yacc.c */ -#line 1244 "../css/CSSGrammar.y" +#line 1249 "../css/CSSGrammar.y" { (yyval.boolean) = (yyvsp[(1) - (6)].boolean); ;} @@ -3693,7 +3701,7 @@ yyreduce: case 199: /* Line 1455 of yacc.c */ -#line 1250 "../css/CSSGrammar.y" +#line 1255 "../css/CSSGrammar.y" { (yyval.boolean) = false; CSSParser* p = static_cast(parser); @@ -3712,7 +3720,7 @@ yyreduce: case 200: /* Line 1455 of yacc.c */ -#line 1264 "../css/CSSGrammar.y" +#line 1269 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); p->m_valueList = new CSSParserValueList; @@ -3729,7 +3737,7 @@ yyreduce: case 201: /* Line 1455 of yacc.c */ -#line 1276 "../css/CSSGrammar.y" +#line 1281 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} @@ -3738,7 +3746,7 @@ yyreduce: case 202: /* Line 1455 of yacc.c */ -#line 1280 "../css/CSSGrammar.y" +#line 1285 "../css/CSSGrammar.y" { /* The default movable type template has letter-spacing: .none; Handle this by looking for error tokens at the start of an expr, recover the expr and then treat as an error, cleaning @@ -3750,7 +3758,7 @@ yyreduce: case 203: /* Line 1455 of yacc.c */ -#line 1287 "../css/CSSGrammar.y" +#line 1292 "../css/CSSGrammar.y" { /* When we encounter something like p {color: red !important fail;} we should drop the declaration */ (yyval.boolean) = false; @@ -3760,7 +3768,7 @@ yyreduce: case 204: /* Line 1455 of yacc.c */ -#line 1292 "../css/CSSGrammar.y" +#line 1297 "../css/CSSGrammar.y" { /* Handle this case: div { text-align: center; !important } Just reduce away the stray !important. */ (yyval.boolean) = false; @@ -3770,7 +3778,7 @@ yyreduce: case 205: /* Line 1455 of yacc.c */ -#line 1297 "../css/CSSGrammar.y" +#line 1302 "../css/CSSGrammar.y" { /* div { font-family: } Just reduce away this property with no value. */ (yyval.boolean) = false; @@ -3780,7 +3788,7 @@ yyreduce: case 206: /* Line 1455 of yacc.c */ -#line 1302 "../css/CSSGrammar.y" +#line 1307 "../css/CSSGrammar.y" { /* if we come across rules with invalid values like this case: p { weight: *; }, just discard the rule */ (yyval.boolean) = false; @@ -3790,7 +3798,7 @@ yyreduce: case 207: /* Line 1455 of yacc.c */ -#line 1307 "../css/CSSGrammar.y" +#line 1312 "../css/CSSGrammar.y" { /* if we come across: div { color{;color:maroon} }, ignore everything within curly brackets */ (yyval.boolean) = false; @@ -3800,7 +3808,7 @@ yyreduce: case 208: /* Line 1455 of yacc.c */ -#line 1314 "../css/CSSGrammar.y" +#line 1319 "../css/CSSGrammar.y" { (yyval.integer) = cssPropertyID((yyvsp[(1) - (2)].string)); ;} @@ -3809,21 +3817,21 @@ yyreduce: case 209: /* Line 1455 of yacc.c */ -#line 1320 "../css/CSSGrammar.y" +#line 1325 "../css/CSSGrammar.y" { (yyval.boolean) = true; ;} break; case 210: /* Line 1455 of yacc.c */ -#line 1321 "../css/CSSGrammar.y" +#line 1326 "../css/CSSGrammar.y" { (yyval.boolean) = false; ;} break; case 211: /* Line 1455 of yacc.c */ -#line 1325 "../css/CSSGrammar.y" +#line 1330 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.valueList) = p->createFloatingValueList(); @@ -3834,7 +3842,7 @@ yyreduce: case 212: /* Line 1455 of yacc.c */ -#line 1330 "../css/CSSGrammar.y" +#line 1335 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); (yyval.valueList) = (yyvsp[(1) - (3)].valueList); @@ -3854,7 +3862,7 @@ yyreduce: case 213: /* Line 1455 of yacc.c */ -#line 1344 "../css/CSSGrammar.y" +#line 1349 "../css/CSSGrammar.y" { (yyval.valueList) = 0; ;} @@ -3863,7 +3871,7 @@ yyreduce: case 214: /* Line 1455 of yacc.c */ -#line 1350 "../css/CSSGrammar.y" +#line 1355 "../css/CSSGrammar.y" { (yyval.character) = '/'; ;} @@ -3872,7 +3880,7 @@ yyreduce: case 215: /* Line 1455 of yacc.c */ -#line 1353 "../css/CSSGrammar.y" +#line 1358 "../css/CSSGrammar.y" { (yyval.character) = ','; ;} @@ -3881,7 +3889,7 @@ yyreduce: case 216: /* Line 1455 of yacc.c */ -#line 1356 "../css/CSSGrammar.y" +#line 1361 "../css/CSSGrammar.y" { (yyval.character) = 0; ;} @@ -3890,28 +3898,28 @@ yyreduce: case 217: /* Line 1455 of yacc.c */ -#line 1362 "../css/CSSGrammar.y" +#line 1367 "../css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (1)].value); ;} break; case 218: /* Line 1455 of yacc.c */ -#line 1363 "../css/CSSGrammar.y" +#line 1368 "../css/CSSGrammar.y" { (yyval.value) = (yyvsp[(2) - (2)].value); (yyval.value).fValue *= (yyvsp[(1) - (2)].integer); ;} break; case 219: /* Line 1455 of yacc.c */ -#line 1364 "../css/CSSGrammar.y" +#line 1369 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_STRING; ;} break; case 220: /* Line 1455 of yacc.c */ -#line 1365 "../css/CSSGrammar.y" +#line 1370 "../css/CSSGrammar.y" { (yyval.value).id = cssValueKeywordID((yyvsp[(1) - (2)].string)); (yyval.value).unit = CSSPrimitiveValue::CSS_IDENT; @@ -3922,49 +3930,49 @@ yyreduce: case 221: /* Line 1455 of yacc.c */ -#line 1371 "../css/CSSGrammar.y" +#line 1376 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; ;} break; case 222: /* Line 1455 of yacc.c */ -#line 1372 "../css/CSSGrammar.y" +#line 1377 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(2) - (3)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; ;} break; case 223: /* Line 1455 of yacc.c */ -#line 1373 "../css/CSSGrammar.y" +#line 1378 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_URI; ;} break; case 224: /* Line 1455 of yacc.c */ -#line 1374 "../css/CSSGrammar.y" +#line 1379 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; ;} break; case 225: /* Line 1455 of yacc.c */ -#line 1375 "../css/CSSGrammar.y" +#line 1380 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (1)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; ;} break; case 226: /* Line 1455 of yacc.c */ -#line 1376 "../css/CSSGrammar.y" +#line 1381 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = CSSParserString(); (yyval.value).unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; ;} break; case 227: /* Line 1455 of yacc.c */ -#line 1378 "../css/CSSGrammar.y" +#line 1383 "../css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (1)].value); ;} @@ -3973,7 +3981,7 @@ yyreduce: case 228: /* Line 1455 of yacc.c */ -#line 1381 "../css/CSSGrammar.y" +#line 1386 "../css/CSSGrammar.y" { (yyval.value) = (yyvsp[(1) - (2)].value); ;} @@ -3982,7 +3990,7 @@ yyreduce: case 229: /* Line 1455 of yacc.c */ -#line 1384 "../css/CSSGrammar.y" +#line 1389 "../css/CSSGrammar.y" { /* Handle width: %; */ (yyval.value).id = 0; (yyval.value).unit = 0; ;} @@ -3991,147 +3999,161 @@ yyreduce: case 230: /* Line 1455 of yacc.c */ -#line 1390 "../css/CSSGrammar.y" +#line 1395 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = true; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;} break; case 231: /* Line 1455 of yacc.c */ -#line 1391 "../css/CSSGrammar.y" +#line 1396 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;} break; case 232: /* Line 1455 of yacc.c */ -#line 1392 "../css/CSSGrammar.y" +#line 1397 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;} break; case 233: /* Line 1455 of yacc.c */ -#line 1393 "../css/CSSGrammar.y" +#line 1398 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PX; ;} break; case 234: /* Line 1455 of yacc.c */ -#line 1394 "../css/CSSGrammar.y" +#line 1399 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_CM; ;} break; case 235: /* Line 1455 of yacc.c */ -#line 1395 "../css/CSSGrammar.y" +#line 1400 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_MM; ;} break; case 236: /* Line 1455 of yacc.c */ -#line 1396 "../css/CSSGrammar.y" +#line 1401 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_IN; ;} break; case 237: /* Line 1455 of yacc.c */ -#line 1397 "../css/CSSGrammar.y" +#line 1402 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PT; ;} break; case 238: /* Line 1455 of yacc.c */ -#line 1398 "../css/CSSGrammar.y" +#line 1403 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PC; ;} break; case 239: /* Line 1455 of yacc.c */ -#line 1399 "../css/CSSGrammar.y" +#line 1404 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_DEG; ;} break; case 240: /* Line 1455 of yacc.c */ -#line 1400 "../css/CSSGrammar.y" +#line 1405 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_RAD; ;} break; case 241: /* Line 1455 of yacc.c */ -#line 1401 "../css/CSSGrammar.y" +#line 1406 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_GRAD; ;} break; case 242: /* Line 1455 of yacc.c */ -#line 1402 "../css/CSSGrammar.y" +#line 1407 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_TURN; ;} break; case 243: /* Line 1455 of yacc.c */ -#line 1403 "../css/CSSGrammar.y" +#line 1408 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_MS; ;} break; case 244: /* Line 1455 of yacc.c */ -#line 1404 "../css/CSSGrammar.y" +#line 1409 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_S; ;} break; case 245: /* Line 1455 of yacc.c */ -#line 1405 "../css/CSSGrammar.y" +#line 1410 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_HZ; ;} break; case 246: /* Line 1455 of yacc.c */ -#line 1406 "../css/CSSGrammar.y" +#line 1411 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_KHZ; ;} break; case 247: /* Line 1455 of yacc.c */ -#line 1407 "../css/CSSGrammar.y" +#line 1412 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_EMS; ;} break; case 248: /* Line 1455 of yacc.c */ -#line 1408 "../css/CSSGrammar.y" +#line 1413 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSParserValue::Q_EMS; ;} break; case 249: /* Line 1455 of yacc.c */ -#line 1409 "../css/CSSGrammar.y" +#line 1414 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_EXS; ;} break; case 250: /* Line 1455 of yacc.c */ -#line 1413 "../css/CSSGrammar.y" +#line 1415 "../css/CSSGrammar.y" + { + (yyval.value).id = 0; + (yyval.value).fValue = (yyvsp[(1) - (2)].number); + (yyval.value).unit = CSSPrimitiveValue::CSS_REMS; + CSSParser* p = static_cast(parser); + if (Document* doc = p->document()) + doc->setUsesRemUnits(true); + ;} + break; + + case 251: + +/* Line 1455 of yacc.c */ +#line 1426 "../css/CSSGrammar.y" { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (1)].string); @@ -4139,10 +4161,10 @@ yyreduce: ;} break; - case 251: + case 252: /* Line 1455 of yacc.c */ -#line 1421 "../css/CSSGrammar.y" +#line 1434 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); CSSParserFunction* f = p->createFloatingFunction(); @@ -4154,10 +4176,10 @@ yyreduce: ;} break; - case 252: + case 253: /* Line 1455 of yacc.c */ -#line 1430 "../css/CSSGrammar.y" +#line 1443 "../css/CSSGrammar.y" { CSSParser* p = static_cast(parser); CSSParserFunction* f = p->createFloatingFunction(); @@ -4169,78 +4191,78 @@ yyreduce: ;} break; - case 253: + case 254: /* Line 1455 of yacc.c */ -#line 1446 "../css/CSSGrammar.y" +#line 1459 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; - case 254: + case 255: /* Line 1455 of yacc.c */ -#line 1447 "../css/CSSGrammar.y" +#line 1460 "../css/CSSGrammar.y" { (yyval.string) = (yyvsp[(1) - (2)].string); ;} break; - case 255: + case 256: /* Line 1455 of yacc.c */ -#line 1454 "../css/CSSGrammar.y" +#line 1467 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; - case 256: + case 257: /* Line 1455 of yacc.c */ -#line 1457 "../css/CSSGrammar.y" +#line 1470 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; - case 257: + case 258: /* Line 1455 of yacc.c */ -#line 1463 "../css/CSSGrammar.y" +#line 1476 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; - case 258: + case 259: /* Line 1455 of yacc.c */ -#line 1466 "../css/CSSGrammar.y" +#line 1479 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; - case 261: + case 262: /* Line 1455 of yacc.c */ -#line 1477 "../css/CSSGrammar.y" +#line 1490 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; - case 262: + case 263: /* Line 1455 of yacc.c */ -#line 1483 "../css/CSSGrammar.y" +#line 1496 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} break; - case 263: + case 264: /* Line 1455 of yacc.c */ -#line 1489 "../css/CSSGrammar.y" +#line 1502 "../css/CSSGrammar.y" { (yyval.rule) = 0; ;} @@ -4249,7 +4271,7 @@ yyreduce: /* Line 1455 of yacc.c */ -#line 4253 "WebCore/tmp/../generated/CSSGrammar.tab.c" +#line 4275 "WebCore/tmp/../generated/CSSGrammar.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -4461,6 +4483,6 @@ yyreturn: /* Line 1675 of yacc.c */ -#line 1516 "../css/CSSGrammar.y" +#line 1529 "../css/CSSGrammar.y" diff --git a/src/3rdparty/webkit/WebCore/generated/CSSGrammar.h b/src/3rdparty/webkit/WebCore/generated/CSSGrammar.h index 4223680d5..ad6b20ad8 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSGrammar.h +++ b/src/3rdparty/webkit/WebCore/generated/CSSGrammar.h @@ -78,32 +78,33 @@ MEDIA_ONLY = 291, MEDIA_NOT = 292, MEDIA_AND = 293, - QEMS = 294, - EMS = 295, - EXS = 296, - PXS = 297, - CMS = 298, - MMS = 299, - INS = 300, - PTS = 301, - PCS = 302, - DEGS = 303, - RADS = 304, - GRADS = 305, - TURNS = 306, - MSECS = 307, - SECS = 308, - HERZ = 309, - KHERZ = 310, - DIMEN = 311, - PERCENTAGE = 312, - FLOATTOKEN = 313, - INTEGER = 314, - URI = 315, - FUNCTION = 316, - NOTFUNCTION = 317, - UNICODERANGE = 318, - VARCALL = 319 + REMS = 294, + QEMS = 295, + EMS = 296, + EXS = 297, + PXS = 298, + CMS = 299, + MMS = 300, + INS = 301, + PTS = 302, + PCS = 303, + DEGS = 304, + RADS = 305, + GRADS = 306, + TURNS = 307, + MSECS = 308, + SECS = 309, + HERZ = 310, + KHERZ = 311, + DIMEN = 312, + PERCENTAGE = 313, + FLOATTOKEN = 314, + INTEGER = 315, + URI = 316, + FUNCTION = 317, + NOTFUNCTION = 318, + UNICODERANGE = 319, + VARCALL = 320 }; #endif @@ -114,7 +115,7 @@ typedef union YYSTYPE { /* Line 1676 of yacc.c */ -#line 58 "../css/CSSGrammar.y" +#line 62 "../css/CSSGrammar.y" bool boolean; char character; @@ -141,7 +142,7 @@ typedef union YYSTYPE /* Line 1676 of yacc.c */ -#line 143 "WebCore/tmp/../generated/CSSGrammar.tab.h" +#line 144 "WebCore/tmp/../generated/CSSGrammar.tab.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.cpp b/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.cpp index dc000542b..65b49d658 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.cpp +++ b/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.cpp @@ -37,7 +37,7 @@ struct props { const char* name; int id; }; -/* maximum key range = 1603, duplicates = 0 */ +/* maximum key range = 1853, duplicates = 0 */ #ifdef __GNUC__ __inline @@ -51,32 +51,32 @@ hash_prop (register const char *str, register unsigned int len) { static const unsigned short asso_values[] = { - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 0, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 5, 0, 75, - 0, 0, 325, 5, 295, 0, 0, 0, 105, 0, - 5, 0, 55, 20, 5, 25, 0, 50, 55, 15, - 400, 295, 145, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1609, 1609, 1609 + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 0, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 5, 0, 75, + 0, 0, 355, 5, 315, 0, 0, 0, 105, 0, + 5, 0, 55, 20, 5, 25, 0, 140, 30, 15, + 420, 395, 10, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, 1859, + 1859, 1859, 1859, 1859, 1859, 1859 }; register int hval = len; @@ -226,667 +226,676 @@ findProp (register const char *str, register unsigned int len) { enum { - TOTAL_KEYWORDS = 269, + TOTAL_KEYWORDS = 271, MIN_WORD_LENGTH = 3, MAX_WORD_LENGTH = 43, MIN_HASH_VALUE = 6, - MAX_HASH_VALUE = 1608 + MAX_HASH_VALUE = 1858 }; static const struct props wordlist_prop[] = { -#line 40 "CSSPropertyNames.gperf" +#line 42 "CSSPropertyNames.gperf" {"bottom", CSSPropertyBottom}, -#line 18 "CSSPropertyNames.gperf" +#line 140 "CSSPropertyNames.gperf" + {"zoom", CSSPropertyZoom}, +#line 20 "CSSPropertyNames.gperf" {"border", CSSPropertyBorder}, -#line 257 "CSSPropertyNames.gperf" +#line 259 "CSSPropertyNames.gperf" {"marker", CSSPropertyMarker}, -#line 19 "CSSPropertyNames.gperf" +#line 21 "CSSPropertyNames.gperf" {"border-bottom", CSSPropertyBorderBottom}, -#line 259 "CSSPropertyNames.gperf" +#line 261 "CSSPropertyNames.gperf" {"marker-mid", CSSPropertyMarkerMid}, -#line 68 "CSSPropertyNames.gperf" +#line 71 "CSSPropertyNames.gperf" {"margin", CSSPropertyMargin}, -#line 276 "CSSPropertyNames.gperf" +#line 278 "CSSPropertyNames.gperf" {"kerning", CSSPropertyKerning}, -#line 258 "CSSPropertyNames.gperf" +#line 260 "CSSPropertyNames.gperf" {"marker-end", CSSPropertyMarkerEnd}, -#line 69 "CSSPropertyNames.gperf" +#line 72 "CSSPropertyNames.gperf" {"margin-bottom", CSSPropertyMarginBottom}, -#line 241 "CSSPropertyNames.gperf" +#line 243 "CSSPropertyNames.gperf" {"mask", CSSPropertyMask}, -#line 262 "CSSPropertyNames.gperf" +#line 264 "CSSPropertyNames.gperf" {"stroke", CSSPropertyStroke}, -#line 133 "CSSPropertyNames.gperf" +#line 104 "CSSPropertyNames.gperf" + {"size", CSSPropertySize}, +#line 136 "CSSPropertyNames.gperf" {"word-break", CSSPropertyWordBreak}, -#line 278 "CSSPropertyNames.gperf" +#line 280 "CSSPropertyNames.gperf" {"writing-mode", CSSPropertyWritingMode}, -#line 151 "CSSPropertyNames.gperf" +#line 154 "CSSPropertyNames.gperf" {"-webkit-binding", CSSPropertyWebkitBinding}, -#line 256 "CSSPropertyNames.gperf" +#line 102 "CSSPropertyNames.gperf" + {"resize", CSSPropertyResize}, +#line 258 "CSSPropertyNames.gperf" {"image-rendering", CSSPropertyImageRendering}, -#line 138 "CSSPropertyNames.gperf" +#line 141 "CSSPropertyNames.gperf" {"-webkit-animation", CSSPropertyWebkitAnimation}, -#line 156 "CSSPropertyNames.gperf" +#line 159 "CSSPropertyNames.gperf" {"-webkit-border-image", CSSPropertyWebkitBorderImage}, -#line 197 "CSSPropertyNames.gperf" +#line 199 "CSSPropertyNames.gperf" {"-webkit-mask", CSSPropertyWebkitMask}, -#line 125 "CSSPropertyNames.gperf" +#line 128 "CSSPropertyNames.gperf" {"top", CSSPropertyTop}, -#line 131 "CSSPropertyNames.gperf" +#line 134 "CSSPropertyNames.gperf" {"widows", CSSPropertyWidows}, -#line 260 "CSSPropertyNames.gperf" +#line 262 "CSSPropertyNames.gperf" {"marker-start", CSSPropertyMarkerStart}, -#line 143 "CSSPropertyNames.gperf" +#line 146 "CSSPropertyNames.gperf" {"-webkit-animation-name", CSSPropertyWebkitAnimationName}, -#line 92 "CSSPropertyNames.gperf" +#line 95 "CSSPropertyNames.gperf" {"page", CSSPropertyPage}, -#line 202 "CSSPropertyNames.gperf" +#line 204 "CSSPropertyNames.gperf" {"-webkit-mask-image", CSSPropertyWebkitMaskImage}, -#line 35 "CSSPropertyNames.gperf" +#line 37 "CSSPropertyNames.gperf" {"border-top", CSSPropertyBorderTop}, -#line 87 "CSSPropertyNames.gperf" +#line 90 "CSSPropertyNames.gperf" {"padding", CSSPropertyPadding}, -#line 230 "CSSPropertyNames.gperf" +#line 232 "CSSPropertyNames.gperf" {"-webkit-transition", CSSPropertyWebkitTransition}, -#line 203 "CSSPropertyNames.gperf" +#line 205 "CSSPropertyNames.gperf" {"-webkit-mask-origin", CSSPropertyWebkitMaskOrigin}, -#line 88 "CSSPropertyNames.gperf" +#line 91 "CSSPropertyNames.gperf" {"padding-bottom", CSSPropertyPaddingBottom}, -#line 72 "CSSPropertyNames.gperf" +#line 75 "CSSPropertyNames.gperf" {"margin-top", CSSPropertyMarginTop}, -#line 189 "CSSPropertyNames.gperf" +#line 191 "CSSPropertyNames.gperf" {"-webkit-margin-start", CSSPropertyWebkitMarginStart}, -#line 45 "CSSPropertyNames.gperf" +#line 48 "CSSPropertyNames.gperf" {"content", CSSPropertyContent}, -#line 97 "CSSPropertyNames.gperf" +#line 100 "CSSPropertyNames.gperf" {"position", CSSPropertyPosition}, -#line 49 "CSSPropertyNames.gperf" +#line 52 "CSSPropertyNames.gperf" {"direction", CSSPropertyDirection}, -#line 98 "CSSPropertyNames.gperf" - {"quotes", CSSPropertyQuotes}, -#line 102 "CSSPropertyNames.gperf" +#line 210 "CSSPropertyNames.gperf" + {"-webkit-mask-size", CSSPropertyWebkitMaskSize}, +#line 105 "CSSPropertyNames.gperf" {"src", CSSPropertySrc}, -#line 135 "CSSPropertyNames.gperf" +#line 138 "CSSPropertyNames.gperf" {"word-wrap", CSSPropertyWordWrap}, -#line 191 "CSSPropertyNames.gperf" - {"-webkit-marquee", CSSPropertyWebkitMarquee}, -#line 210 "CSSPropertyNames.gperf" +#line 212 "CSSPropertyNames.gperf" {"-webkit-nbsp-mode", CSSPropertyWebkitNbspMode}, -#line 95 "CSSPropertyNames.gperf" +#line 98 "CSSPropertyNames.gperf" {"page-break-inside", CSSPropertyPageBreakInside}, -#line 141 "CSSPropertyNames.gperf" - {"-webkit-animation-duration", CSSPropertyWebkitAnimationDuration}, -#line 235 "CSSPropertyNames.gperf" - {"-webkit-user-drag", CSSPropertyWebkitUserDrag}, -#line 207 "CSSPropertyNames.gperf" +#line 209 "CSSPropertyNames.gperf" {"-webkit-mask-repeat", CSSPropertyWebkitMaskRepeat}, -#line 157 "CSSPropertyNames.gperf" - {"-webkit-border-radius", CSSPropertyWebkitBorderRadius}, -#line 91 "CSSPropertyNames.gperf" +#line 94 "CSSPropertyNames.gperf" {"padding-top", CSSPropertyPaddingTop}, -#line 211 "CSSPropertyNames.gperf" +#line 99 "CSSPropertyNames.gperf" + {"pointer-events", CSSPropertyPointerEvents}, +#line 213 "CSSPropertyNames.gperf" {"-webkit-padding-start", CSSPropertyWebkitPaddingStart}, -#line 126 "CSSPropertyNames.gperf" - {"unicode-bidi", CSSPropertyUnicodeBidi}, -#line 140 "CSSPropertyNames.gperf" +#line 143 "CSSPropertyNames.gperf" {"-webkit-animation-direction", CSSPropertyWebkitAnimationDirection}, -#line 137 "CSSPropertyNames.gperf" - {"zoom", CSSPropertyZoom}, -#line 204 "CSSPropertyNames.gperf" +#line 206 "CSSPropertyNames.gperf" {"-webkit-mask-position", CSSPropertyWebkitMaskPosition}, -#line 232 "CSSPropertyNames.gperf" - {"-webkit-transition-duration", CSSPropertyWebkitTransitionDuration}, -#line 185 "CSSPropertyNames.gperf" +#line 187 "CSSPropertyNames.gperf" {"-webkit-line-break", CSSPropertyWebkitLineBreak}, -#line 10 "CSSPropertyNames.gperf" - {"background", CSSPropertyBackground}, -#line 267 "CSSPropertyNames.gperf" +#line 269 "CSSPropertyNames.gperf" {"stroke-miterlimit", CSSPropertyStrokeMiterlimit}, -#line 266 "CSSPropertyNames.gperf" +#line 268 "CSSPropertyNames.gperf" {"stroke-linejoin", CSSPropertyStrokeLinejoin}, -#line 127 "CSSPropertyNames.gperf" - {"unicode-range", CSSPropertyUnicodeRange}, -#line 96 "CSSPropertyNames.gperf" - {"pointer-events", CSSPropertyPointerEvents}, -#line 216 "CSSPropertyNames.gperf" +#line 218 "CSSPropertyNames.gperf" {"-webkit-rtl-ordering", CSSPropertyWebkitRtlOrdering}, -#line 48 "CSSPropertyNames.gperf" - {"cursor", CSSPropertyCursor}, -#line 79 "CSSPropertyNames.gperf" - {"outline", CSSPropertyOutline}, -#line 13 "CSSPropertyNames.gperf" - {"background-image", CSSPropertyBackgroundImage}, -#line 273 "CSSPropertyNames.gperf" +#line 275 "CSSPropertyNames.gperf" {"dominant-baseline", CSSPropertyDominantBaseline}, -#line 101 "CSSPropertyNames.gperf" - {"size", CSSPropertySize}, -#line 41 "CSSPropertyNames.gperf" +#line 44 "CSSPropertyNames.gperf" {"caption-side", CSSPropertyCaptionSide}, #line 47 "CSSPropertyNames.gperf" - {"counter-reset", CSSPropertyCounterReset}, -#line 99 "CSSPropertyNames.gperf" - {"resize", CSSPropertyResize}, -#line 194 "CSSPropertyNames.gperf" - {"-webkit-marquee-repetition", CSSPropertyWebkitMarqueeRepetition}, -#line 44 "CSSPropertyNames.gperf" {"color", CSSPropertyColor}, -#line 33 "CSSPropertyNames.gperf" +#line 101 "CSSPropertyNames.gperf" + {"quotes", CSSPropertyQuotes}, +#line 35 "CSSPropertyNames.gperf" {"border-spacing", CSSPropertyBorderSpacing}, -#line 42 "CSSPropertyNames.gperf" +#line 45 "CSSPropertyNames.gperf" {"clear", CSSPropertyClear}, -#line 195 "CSSPropertyNames.gperf" - {"-webkit-marquee-speed", CSSPropertyWebkitMarqueeSpeed}, -#line 149 "CSSPropertyNames.gperf" - {"-webkit-background-origin", CSSPropertyWebkitBackgroundOrigin}, -#line 134 "CSSPropertyNames.gperf" +#line 193 "CSSPropertyNames.gperf" + {"-webkit-marquee", CSSPropertyWebkitMarquee}, +#line 137 "CSSPropertyNames.gperf" {"word-spacing", CSSPropertyWordSpacing}, -#line 192 "CSSPropertyNames.gperf" - {"-webkit-marquee-direction", CSSPropertyWebkitMarqueeDirection}, -#line 24 "CSSPropertyNames.gperf" +#line 26 "CSSPropertyNames.gperf" {"border-color", CSSPropertyBorderColor}, -#line 193 "CSSPropertyNames.gperf" - {"-webkit-marquee-increment", CSSPropertyWebkitMarqueeIncrement}, -#line 142 "CSSPropertyNames.gperf" - {"-webkit-animation-iteration-count", CSSPropertyWebkitAnimationIterationCount}, -#line 20 "CSSPropertyNames.gperf" +#line 22 "CSSPropertyNames.gperf" {"border-bottom-color", CSSPropertyBorderBottomColor}, -#line 201 "CSSPropertyNames.gperf" +#line 144 "CSSPropertyNames.gperf" + {"-webkit-animation-duration", CSSPropertyWebkitAnimationDuration}, +#line 237 "CSSPropertyNames.gperf" + {"-webkit-user-drag", CSSPropertyWebkitUserDrag}, +#line 160 "CSSPropertyNames.gperf" + {"-webkit-border-radius", CSSPropertyWebkitBorderRadius}, +#line 203 "CSSPropertyNames.gperf" {"-webkit-mask-composite", CSSPropertyWebkitMaskComposite}, -#line 252 "CSSPropertyNames.gperf" +#line 254 "CSSPropertyNames.gperf" {"color-rendering", CSSPropertyColorRendering}, -#line 17 "CSSPropertyNames.gperf" - {"background-repeat", CSSPropertyBackgroundRepeat}, -#line 208 "CSSPropertyNames.gperf" - {"-webkit-mask-size", CSSPropertyWebkitMaskSize}, -#line 43 "CSSPropertyNames.gperf" - {"clip", CSSPropertyClip}, +#line 129 "CSSPropertyNames.gperf" + {"unicode-bidi", CSSPropertyUnicodeBidi}, #line 46 "CSSPropertyNames.gperf" - {"counter-increment", CSSPropertyCounterIncrement}, -#line 145 "CSSPropertyNames.gperf" + {"clip", CSSPropertyClip}, +#line 234 "CSSPropertyNames.gperf" + {"-webkit-transition-duration", CSSPropertyWebkitTransitionDuration}, +#line 148 "CSSPropertyNames.gperf" {"-webkit-appearance", CSSPropertyWebkitAppearance}, +#line 10 "CSSPropertyNames.gperf" + {"background", CSSPropertyBackground}, +#line 130 "CSSPropertyNames.gperf" + {"unicode-range", CSSPropertyUnicodeRange}, +#line 51 "CSSPropertyNames.gperf" + {"cursor", CSSPropertyCursor}, +#line 82 "CSSPropertyNames.gperf" + {"outline", CSSPropertyOutline}, #line 14 "CSSPropertyNames.gperf" - {"background-position", CSSPropertyBackgroundPosition}, -#line 36 "CSSPropertyNames.gperf" + {"background-image", CSSPropertyBackgroundImage}, +#line 38 "CSSPropertyNames.gperf" {"border-top-color", CSSPropertyBorderTopColor}, -#line 247 "CSSPropertyNames.gperf" +#line 15 "CSSPropertyNames.gperf" + {"background-origin", CSSPropertyBackgroundOrigin}, +#line 50 "CSSPropertyNames.gperf" + {"counter-reset", CSSPropertyCounterReset}, +#line 249 "CSSPropertyNames.gperf" {"stop-color", CSSPropertyStopColor}, -#line 242 "CSSPropertyNames.gperf" - {"enable-background", CSSPropertyEnableBackground}, -#line 271 "CSSPropertyNames.gperf" +#line 196 "CSSPropertyNames.gperf" + {"-webkit-marquee-repetition", CSSPropertyWebkitMarqueeRepetition}, +#line 214 "CSSPropertyNames.gperf" + {"-webkit-perspective", CSSPropertyWebkitPerspective}, +#line 273 "CSSPropertyNames.gperf" {"alignment-baseline", CSSPropertyAlignmentBaseline}, -#line 265 "CSSPropertyNames.gperf" +#line 197 "CSSPropertyNames.gperf" + {"-webkit-marquee-speed", CSSPropertyWebkitMarqueeSpeed}, +#line 267 "CSSPropertyNames.gperf" {"stroke-linecap", CSSPropertyStrokeLinecap}, -#line 182 "CSSPropertyNames.gperf" - {"-webkit-columns", CSSPropertyWebkitColumns}, -#line 62 "CSSPropertyNames.gperf" +#line 152 "CSSPropertyNames.gperf" + {"-webkit-background-origin", CSSPropertyWebkitBackgroundOrigin}, +#line 65 "CSSPropertyNames.gperf" {"letter-spacing", CSSPropertyLetterSpacing}, -#line 200 "CSSPropertyNames.gperf" +#line 194 "CSSPropertyNames.gperf" + {"-webkit-marquee-direction", CSSPropertyWebkitMarqueeDirection}, +#line 202 "CSSPropertyNames.gperf" {"-webkit-mask-clip", CSSPropertyWebkitMaskClip}, -#line 212 "CSSPropertyNames.gperf" - {"-webkit-perspective", CSSPropertyWebkitPerspective}, -#line 100 "CSSPropertyNames.gperf" +#line 195 "CSSPropertyNames.gperf" + {"-webkit-marquee-increment", CSSPropertyWebkitMarqueeIncrement}, +#line 215 "CSSPropertyNames.gperf" + {"-webkit-perspective-origin", CSSPropertyWebkitPerspectiveOrigin}, +#line 145 "CSSPropertyNames.gperf" + {"-webkit-animation-iteration-count", CSSPropertyWebkitAnimationIterationCount}, +#line 153 "CSSPropertyNames.gperf" + {"-webkit-background-size", CSSPropertyWebkitBackgroundSize}, +#line 19 "CSSPropertyNames.gperf" + {"background-repeat", CSSPropertyBackgroundRepeat}, +#line 103 "CSSPropertyNames.gperf" {"right", CSSPropertyRight}, -#line 132 "CSSPropertyNames.gperf" +#line 49 "CSSPropertyNames.gperf" + {"counter-increment", CSSPropertyCounterIncrement}, +#line 135 "CSSPropertyNames.gperf" {"width", CSSPropertyWidth}, -#line 174 "CSSPropertyNames.gperf" - {"-webkit-column-break-inside", CSSPropertyWebkitColumnBreakInside}, -#line 237 "CSSPropertyNames.gperf" - {"-webkit-user-select", CSSPropertyWebkitUserSelect}, -#line 76 "CSSPropertyNames.gperf" +#line 16 "CSSPropertyNames.gperf" + {"background-position", CSSPropertyBackgroundPosition}, +#line 79 "CSSPropertyNames.gperf" {"min-width", CSSPropertyMinWidth}, -#line 213 "CSSPropertyNames.gperf" - {"-webkit-perspective-origin", CSSPropertyWebkitPerspectiveOrigin}, -#line 29 "CSSPropertyNames.gperf" +#line 31 "CSSPropertyNames.gperf" {"border-right", CSSPropertyBorderRight}, -#line 39 "CSSPropertyNames.gperf" +#line 41 "CSSPropertyNames.gperf" {"border-width", CSSPropertyBorderWidth}, -#line 176 "CSSPropertyNames.gperf" - {"-webkit-column-gap", CSSPropertyWebkitColumnGap}, -#line 53 "CSSPropertyNames.gperf" - {"font", CSSPropertyFont}, -#line 71 "CSSPropertyNames.gperf" +#line 131 "CSSPropertyNames.gperf" + {"vertical-align", CSSPropertyVerticalAlign}, +#line 74 "CSSPropertyNames.gperf" {"margin-right", CSSPropertyMarginRight}, -#line 22 "CSSPropertyNames.gperf" +#line 24 "CSSPropertyNames.gperf" {"border-bottom-width", CSSPropertyBorderBottomWidth}, -#line 148 "CSSPropertyNames.gperf" - {"-webkit-background-composite", CSSPropertyWebkitBackgroundComposite}, -#line 12 "CSSPropertyNames.gperf" - {"background-color", CSSPropertyBackgroundColor}, -#line 269 "CSSPropertyNames.gperf" +#line 56 "CSSPropertyNames.gperf" + {"font", CSSPropertyFont}, +#line 244 "CSSPropertyNames.gperf" + {"enable-background", CSSPropertyEnableBackground}, +#line 271 "CSSPropertyNames.gperf" {"stroke-width", CSSPropertyStrokeWidth}, -#line 150 "CSSPropertyNames.gperf" - {"-webkit-background-size", CSSPropertyWebkitBackgroundSize}, -#line 80 "CSSPropertyNames.gperf" - {"outline-color", CSSPropertyOutlineColor}, -#line 154 "CSSPropertyNames.gperf" - {"-webkit-border-fit", CSSPropertyWebkitBorderFit}, -#line 128 "CSSPropertyNames.gperf" - {"vertical-align", CSSPropertyVerticalAlign}, -#line 186 "CSSPropertyNames.gperf" +#line 184 "CSSPropertyNames.gperf" + {"-webkit-columns", CSSPropertyWebkitColumns}, +#line 188 "CSSPropertyNames.gperf" {"-webkit-line-clamp", CSSPropertyWebkitLineClamp}, -#line 249 "CSSPropertyNames.gperf" +#line 251 "CSSPropertyNames.gperf" {"color-interpolation", CSSPropertyColorInterpolation}, -#line 90 "CSSPropertyNames.gperf" +#line 25 "CSSPropertyNames.gperf" + {"border-collapse", CSSPropertyBorderCollapse}, +#line 157 "CSSPropertyNames.gperf" + {"-webkit-border-fit", CSSPropertyWebkitBorderFit}, +#line 58 "CSSPropertyNames.gperf" + {"font-size", CSSPropertyFontSize}, +#line 176 "CSSPropertyNames.gperf" + {"-webkit-column-break-inside", CSSPropertyWebkitColumnBreakInside}, +#line 93 "CSSPropertyNames.gperf" {"padding-right", CSSPropertyPaddingRight}, -#line 38 "CSSPropertyNames.gperf" +#line 239 "CSSPropertyNames.gperf" + {"-webkit-user-select", CSSPropertyWebkitUserSelect}, +#line 40 "CSSPropertyNames.gperf" {"border-top-width", CSSPropertyBorderTopWidth}, -#line 23 "CSSPropertyNames.gperf" - {"border-collapse", CSSPropertyBorderCollapse}, -#line 78 "CSSPropertyNames.gperf" +#line 81 "CSSPropertyNames.gperf" {"orphans", CSSPropertyOrphans}, -#line 175 "CSSPropertyNames.gperf" - {"-webkit-column-count", CSSPropertyWebkitColumnCount}, -#line 224 "CSSPropertyNames.gperf" - {"-webkit-transform", CSSPropertyWebkitTransform}, -#line 240 "CSSPropertyNames.gperf" - {"clip-rule", CSSPropertyClipRule}, -#line 58 "CSSPropertyNames.gperf" +#line 61 "CSSPropertyNames.gperf" {"font-variant", CSSPropertyFontVariant}, -#line 147 "CSSPropertyNames.gperf" - {"-webkit-background-clip", CSSPropertyWebkitBackgroundClip}, -#line 261 "CSSPropertyNames.gperf" +#line 178 "CSSPropertyNames.gperf" + {"-webkit-column-gap", CSSPropertyWebkitColumnGap}, +#line 190 "CSSPropertyNames.gperf" + {"-webkit-margin-collapse", CSSPropertyWebkitMarginCollapse}, +#line 226 "CSSPropertyNames.gperf" + {"-webkit-transform", CSSPropertyWebkitTransform}, +#line 151 "CSSPropertyNames.gperf" + {"-webkit-background-composite", CSSPropertyWebkitBackgroundComposite}, +#line 189 "CSSPropertyNames.gperf" + {"-webkit-margin-bottom-collapse", CSSPropertyWebkitMarginBottomCollapse}, +#line 13 "CSSPropertyNames.gperf" + {"background-color", CSSPropertyBackgroundColor}, +#line 263 "CSSPropertyNames.gperf" {"shape-rendering", CSSPropertyShapeRendering}, -#line 106 "CSSPropertyNames.gperf" +#line 109 "CSSPropertyNames.gperf" {"text-indent", CSSPropertyTextIndent}, -#line 94 "CSSPropertyNames.gperf" +#line 139 "CSSPropertyNames.gperf" + {"z-index", CSSPropertyZIndex}, +#line 163 "CSSPropertyNames.gperf" + {"-webkit-border-vertical-spacing", CSSPropertyWebkitBorderVerticalSpacing}, +#line 83 "CSSPropertyNames.gperf" + {"outline-color", CSSPropertyOutlineColor}, +#line 97 "CSSPropertyNames.gperf" {"page-break-before", CSSPropertyPageBreakBefore}, -#line 225 "CSSPropertyNames.gperf" +#line 227 "CSSPropertyNames.gperf" {"-webkit-transform-origin", CSSPropertyWebkitTransformOrigin}, -#line 93 "CSSPropertyNames.gperf" +#line 96 "CSSPropertyNames.gperf" {"page-break-after", CSSPropertyPageBreakAfter}, -#line 188 "CSSPropertyNames.gperf" - {"-webkit-margin-collapse", CSSPropertyWebkitMarginCollapse}, -#line 177 "CSSPropertyNames.gperf" - {"-webkit-column-rule", CSSPropertyWebkitColumnRule}, -#line 61 "CSSPropertyNames.gperf" - {"left", CSSPropertyLeft}, -#line 187 "CSSPropertyNames.gperf" - {"-webkit-margin-bottom-collapse", CSSPropertyWebkitMarginBottomCollapse}, -#line 77 "CSSPropertyNames.gperf" - {"opacity", CSSPropertyOpacity}, -#line 270 "CSSPropertyNames.gperf" +#line 272 "CSSPropertyNames.gperf" {"text-rendering", CSSPropertyTextRendering}, -#line 52 "CSSPropertyNames.gperf" +#line 170 "CSSPropertyNames.gperf" + {"-webkit-box-orient", CSSPropertyWebkitBoxOrient}, +#line 64 "CSSPropertyNames.gperf" + {"left", CSSPropertyLeft}, +#line 230 "CSSPropertyNames.gperf" + {"-webkit-transform-origin-z", CSSPropertyWebkitTransformOriginZ}, +#line 55 "CSSPropertyNames.gperf" {"float", CSSPropertyFloat}, -#line 243 "CSSPropertyNames.gperf" +#line 245 "CSSPropertyNames.gperf" {"filter", CSSPropertyFilter}, -#line 167 "CSSPropertyNames.gperf" - {"-webkit-box-orient", CSSPropertyWebkitBoxOrient}, -#line 34 "CSSPropertyNames.gperf" - {"border-style", CSSPropertyBorderStyle}, -#line 206 "CSSPropertyNames.gperf" - {"-webkit-mask-position-y", CSSPropertyWebkitMaskPositionY}, -#line 153 "CSSPropertyNames.gperf" - {"-webkit-border-bottom-right-radius", CSSPropertyWebkitBorderBottomRightRadius}, -#line 25 "CSSPropertyNames.gperf" - {"border-left", CSSPropertyBorderLeft}, -#line 198 "CSSPropertyNames.gperf" +#line 200 "CSSPropertyNames.gperf" {"-webkit-mask-attachment", CSSPropertyWebkitMaskAttachment}, -#line 21 "CSSPropertyNames.gperf" - {"border-bottom-style", CSSPropertyBorderBottomStyle}, -#line 70 "CSSPropertyNames.gperf" - {"margin-left", CSSPropertyMarginLeft}, -#line 139 "CSSPropertyNames.gperf" - {"-webkit-animation-delay", CSSPropertyWebkitAnimationDelay}, -#line 221 "CSSPropertyNames.gperf" +#line 27 "CSSPropertyNames.gperf" + {"border-left", CSSPropertyBorderLeft}, +#line 223 "CSSPropertyNames.gperf" {"-webkit-text-stroke", CSSPropertyWebkitTextStroke}, -#line 160 "CSSPropertyNames.gperf" - {"-webkit-border-vertical-spacing", CSSPropertyWebkitBorderVerticalSpacing}, -#line 268 "CSSPropertyNames.gperf" - {"stroke-opacity", CSSPropertyStrokeOpacity}, -#line 199 "CSSPropertyNames.gperf" +#line 12 "CSSPropertyNames.gperf" + {"background-clip", CSSPropertyBackgroundClip}, +#line 192 "CSSPropertyNames.gperf" + {"-webkit-margin-top-collapse", CSSPropertyWebkitMarginTopCollapse}, +#line 73 "CSSPropertyNames.gperf" + {"margin-left", CSSPropertyMarginLeft}, +#line 242 "CSSPropertyNames.gperf" + {"clip-rule", CSSPropertyClipRule}, +#line 201 "CSSPropertyNames.gperf" {"-webkit-mask-box-image", CSSPropertyWebkitMaskBoxImage}, -#line 130 "CSSPropertyNames.gperf" +#line 173 "CSSPropertyNames.gperf" + {"-webkit-box-sizing", CSSPropertyWebkitBoxSizing}, +#line 133 "CSSPropertyNames.gperf" {"white-space", CSSPropertyWhiteSpace}, -#line 83 "CSSPropertyNames.gperf" - {"outline-width", CSSPropertyOutlineWidth}, -#line 190 "CSSPropertyNames.gperf" - {"-webkit-margin-top-collapse", CSSPropertyWebkitMarginTopCollapse}, -#line 231 "CSSPropertyNames.gperf" - {"-webkit-transition-delay", CSSPropertyWebkitTransitionDelay}, -#line 129 "CSSPropertyNames.gperf" - {"visibility", CSSPropertyVisibility}, -#line 50 "CSSPropertyNames.gperf" - {"display", CSSPropertyDisplay}, -#line 159 "CSSPropertyNames.gperf" - {"-webkit-border-top-right-radius", CSSPropertyWebkitBorderTopRightRadius}, -#line 233 "CSSPropertyNames.gperf" - {"-webkit-transition-property", CSSPropertyWebkitTransitionProperty}, -#line 105 "CSSPropertyNames.gperf" - {"text-decoration", CSSPropertyTextDecoration}, -#line 37 "CSSPropertyNames.gperf" - {"border-top-style", CSSPropertyBorderTopStyle}, -#line 55 "CSSPropertyNames.gperf" - {"font-size", CSSPropertyFontSize}, -#line 89 "CSSPropertyNames.gperf" - {"padding-left", CSSPropertyPaddingLeft}, -#line 84 "CSSPropertyNames.gperf" +#line 150 "CSSPropertyNames.gperf" + {"-webkit-background-clip", CSSPropertyWebkitBackgroundClip}, +#line 87 "CSSPropertyNames.gperf" {"overflow", CSSPropertyOverflow}, -#line 30 "CSSPropertyNames.gperf" +#line 108 "CSSPropertyNames.gperf" + {"text-decoration", CSSPropertyTextDecoration}, +#line 80 "CSSPropertyNames.gperf" + {"opacity", CSSPropertyOpacity}, +#line 32 "CSSPropertyNames.gperf" {"border-right-color", CSSPropertyBorderRightColor}, -#line 162 "CSSPropertyNames.gperf" +#line 165 "CSSPropertyNames.gperf" {"-webkit-box-direction", CSSPropertyWebkitBoxDirection}, -#line 248 "CSSPropertyNames.gperf" - {"stop-opacity", CSSPropertyStopOpacity}, -#line 104 "CSSPropertyNames.gperf" +#line 92 "CSSPropertyNames.gperf" + {"padding-left", CSSPropertyPaddingLeft}, +#line 185 "CSSPropertyNames.gperf" + {"-webkit-font-size-delta", CSSPropertyWebkitFontSizeDelta}, +#line 36 "CSSPropertyNames.gperf" + {"border-style", CSSPropertyBorderStyle}, +#line 208 "CSSPropertyNames.gperf" + {"-webkit-mask-position-y", CSSPropertyWebkitMaskPositionY}, +#line 107 "CSSPropertyNames.gperf" {"text-align", CSSPropertyTextAlign}, -#line 144 "CSSPropertyNames.gperf" - {"-webkit-animation-timing-function", CSSPropertyWebkitAnimationTimingFunction}, -#line 253 "CSSPropertyNames.gperf" +#line 23 "CSSPropertyNames.gperf" + {"border-bottom-style", CSSPropertyBorderBottomStyle}, +#line 156 "CSSPropertyNames.gperf" + {"-webkit-border-bottom-right-radius", CSSPropertyWebkitBorderBottomRightRadius}, +#line 142 "CSSPropertyNames.gperf" + {"-webkit-animation-delay", CSSPropertyWebkitAnimationDelay}, +#line 132 "CSSPropertyNames.gperf" + {"visibility", CSSPropertyVisibility}, +#line 255 "CSSPropertyNames.gperf" {"fill", CSSPropertyFill}, -#line 196 "CSSPropertyNames.gperf" - {"-webkit-marquee-style", CSSPropertyWebkitMarqueeStyle}, -#line 16 "CSSPropertyNames.gperf" - {"background-position-y", CSSPropertyBackgroundPositionY}, -#line 11 "CSSPropertyNames.gperf" - {"background-attachment", CSSPropertyBackgroundAttachment}, -#line 161 "CSSPropertyNames.gperf" +#line 164 "CSSPropertyNames.gperf" {"-webkit-box-align", CSSPropertyWebkitBoxAlign}, -#line 205 "CSSPropertyNames.gperf" +#line 207 "CSSPropertyNames.gperf" {"-webkit-mask-position-x", CSSPropertyWebkitMaskPositionX}, -#line 136 "CSSPropertyNames.gperf" - {"z-index", CSSPropertyZIndex}, -#line 234 "CSSPropertyNames.gperf" - {"-webkit-transition-timing-function", CSSPropertyWebkitTransitionTimingFunction}, -#line 64 "CSSPropertyNames.gperf" - {"list-style", CSSPropertyListStyle}, -#line 168 "CSSPropertyNames.gperf" - {"-webkit-box-pack", CSSPropertyWebkitBoxPack}, -#line 165 "CSSPropertyNames.gperf" - {"-webkit-box-lines", CSSPropertyWebkitBoxLines}, -#line 228 "CSSPropertyNames.gperf" - {"-webkit-transform-origin-z", CSSPropertyWebkitTransformOriginZ}, -#line 152 "CSSPropertyNames.gperf" - {"-webkit-border-bottom-left-radius", CSSPropertyWebkitBorderBottomLeftRadius}, -#line 103 "CSSPropertyNames.gperf" - {"table-layout", CSSPropertyTableLayout}, -#line 181 "CSSPropertyNames.gperf" - {"-webkit-column-width", CSSPropertyWebkitColumnWidth}, -#line 65 "CSSPropertyNames.gperf" - {"list-style-image", CSSPropertyListStyleImage}, -#line 113 "CSSPropertyNames.gperf" +#line 270 "CSSPropertyNames.gperf" + {"stroke-opacity", CSSPropertyStrokeOpacity}, +#line 116 "CSSPropertyNames.gperf" {"text-overline", CSSPropertyTextOverline}, -#line 120 "CSSPropertyNames.gperf" - {"text-underline", CSSPropertyTextUnderline}, -#line 115 "CSSPropertyNames.gperf" +#line 240 "CSSPropertyNames.gperf" + {"-webkit-variable-declaration-block", CSSPropertyWebkitVariableDeclarationBlock}, +#line 177 "CSSPropertyNames.gperf" + {"-webkit-column-count", CSSPropertyWebkitColumnCount}, +#line 118 "CSSPropertyNames.gperf" {"text-overline-mode", CSSPropertyTextOverlineMode}, -#line 122 "CSSPropertyNames.gperf" - {"text-underline-mode", CSSPropertyTextUnderlineMode}, -#line 82 "CSSPropertyNames.gperf" - {"outline-style", CSSPropertyOutlineStyle}, -#line 239 "CSSPropertyNames.gperf" +#line 171 "CSSPropertyNames.gperf" + {"-webkit-box-pack", CSSPropertyWebkitBoxPack}, +#line 168 "CSSPropertyNames.gperf" + {"-webkit-box-lines", CSSPropertyWebkitBoxLines}, +#line 233 "CSSPropertyNames.gperf" + {"-webkit-transition-delay", CSSPropertyWebkitTransitionDelay}, +#line 53 "CSSPropertyNames.gperf" + {"display", CSSPropertyDisplay}, +#line 86 "CSSPropertyNames.gperf" + {"outline-width", CSSPropertyOutlineWidth}, +#line 235 "CSSPropertyNames.gperf" + {"-webkit-transition-property", CSSPropertyWebkitTransitionProperty}, +#line 39 "CSSPropertyNames.gperf" + {"border-top-style", CSSPropertyBorderTopStyle}, +#line 179 "CSSPropertyNames.gperf" + {"-webkit-column-rule", CSSPropertyWebkitColumnRule}, +#line 162 "CSSPropertyNames.gperf" + {"-webkit-border-top-right-radius", CSSPropertyWebkitBorderTopRightRadius}, +#line 241 "CSSPropertyNames.gperf" {"clip-path", CSSPropertyClipPath}, -#line 60 "CSSPropertyNames.gperf" +#line 250 "CSSPropertyNames.gperf" + {"stop-opacity", CSSPropertyStopOpacity}, +#line 248 "CSSPropertyNames.gperf" + {"lighting-color", CSSPropertyLightingColor}, +#line 63 "CSSPropertyNames.gperf" {"height", CSSPropertyHeight}, -#line 238 "CSSPropertyNames.gperf" - {"-webkit-variable-declaration-block", CSSPropertyWebkitVariableDeclarationBlock}, -#line 75 "CSSPropertyNames.gperf" +#line 78 "CSSPropertyNames.gperf" {"min-height", CSSPropertyMinHeight}, -#line 171 "CSSPropertyNames.gperf" - {"-webkit-box-sizing", CSSPropertyWebkitBoxSizing}, #line 246 "CSSPropertyNames.gperf" - {"lighting-color", CSSPropertyLightingColor}, -#line 173 "CSSPropertyNames.gperf" - {"-webkit-column-break-before", CSSPropertyWebkitColumnBreakBefore}, -#line 178 "CSSPropertyNames.gperf" - {"-webkit-column-rule-color", CSSPropertyWebkitColumnRuleColor}, -#line 172 "CSSPropertyNames.gperf" - {"-webkit-column-break-after", CSSPropertyWebkitColumnBreakAfter}, -#line 215 "CSSPropertyNames.gperf" - {"-webkit-perspective-origin-y", CSSPropertyWebkitPerspectiveOriginY}, -#line 158 "CSSPropertyNames.gperf" - {"-webkit-border-top-left-radius", CSSPropertyWebkitBorderTopLeftRadius}, -#line 244 "CSSPropertyNames.gperf" {"flood-color", CSSPropertyFloodColor}, -#line 26 "CSSPropertyNames.gperf" +#line 147 "CSSPropertyNames.gperf" + {"-webkit-animation-timing-function", CSSPropertyWebkitAnimationTimingFunction}, +#line 11 "CSSPropertyNames.gperf" + {"background-attachment", CSSPropertyBackgroundAttachment}, +#line 222 "CSSPropertyNames.gperf" + {"-webkit-text-size-adjust", CSSPropertyWebkitTextSizeAdjust}, +#line 67 "CSSPropertyNames.gperf" + {"list-style", CSSPropertyListStyle}, +#line 28 "CSSPropertyNames.gperf" {"border-left-color", CSSPropertyBorderLeftColor}, -#line 32 "CSSPropertyNames.gperf" +#line 158 "CSSPropertyNames.gperf" + {"-webkit-border-horizontal-spacing", CSSPropertyWebkitBorderHorizontalSpacing}, +#line 224 "CSSPropertyNames.gperf" + {"-webkit-text-stroke-color", CSSPropertyWebkitTextStrokeColor}, +#line 68 "CSSPropertyNames.gperf" + {"list-style-image", CSSPropertyListStyleImage}, +#line 34 "CSSPropertyNames.gperf" {"border-right-width", CSSPropertyBorderRightWidth}, +#line 236 "CSSPropertyNames.gperf" + {"-webkit-transition-timing-function", CSSPropertyWebkitTransitionTimingFunction}, #line 183 "CSSPropertyNames.gperf" - {"-webkit-font-size-delta", CSSPropertyWebkitFontSizeDelta}, -#line 15 "CSSPropertyNames.gperf" - {"background-position-x", CSSPropertyBackgroundPositionX}, -#line 222 "CSSPropertyNames.gperf" - {"-webkit-text-stroke-color", CSSPropertyWebkitTextStrokeColor}, -#line 59 "CSSPropertyNames.gperf" + {"-webkit-column-width", CSSPropertyWebkitColumnWidth}, +#line 155 "CSSPropertyNames.gperf" + {"-webkit-border-bottom-left-radius", CSSPropertyWebkitBorderBottomLeftRadius}, +#line 123 "CSSPropertyNames.gperf" + {"text-underline", CSSPropertyTextUnderline}, +#line 217 "CSSPropertyNames.gperf" + {"-webkit-perspective-origin-y", CSSPropertyWebkitPerspectiveOriginY}, +#line 125 "CSSPropertyNames.gperf" + {"text-underline-mode", CSSPropertyTextUnderlineMode}, +#line 62 "CSSPropertyNames.gperf" {"font-weight", CSSPropertyFontWeight}, +#line 253 "CSSPropertyNames.gperf" + {"color-profile", CSSPropertyColorProfile}, +#line 216 "CSSPropertyNames.gperf" + {"-webkit-perspective-origin-x", CSSPropertyWebkitPerspectiveOriginX}, +#line 198 "CSSPropertyNames.gperf" + {"-webkit-marquee-style", CSSPropertyWebkitMarqueeStyle}, +#line 18 "CSSPropertyNames.gperf" + {"background-position-y", CSSPropertyBackgroundPositionY}, +#line 175 "CSSPropertyNames.gperf" + {"-webkit-column-break-before", CSSPropertyWebkitColumnBreakBefore}, +#line 174 "CSSPropertyNames.gperf" + {"-webkit-column-break-after", CSSPropertyWebkitColumnBreakAfter}, +#line 161 "CSSPropertyNames.gperf" + {"-webkit-border-top-left-radius", CSSPropertyWebkitBorderTopLeftRadius}, #line 66 "CSSPropertyNames.gperf" + {"line-height", CSSPropertyLineHeight}, +#line 69 "CSSPropertyNames.gperf" {"list-style-position", CSSPropertyListStylePosition}, -#line 51 "CSSPropertyNames.gperf" +#line 17 "CSSPropertyNames.gperf" + {"background-position-x", CSSPropertyBackgroundPositionX}, +#line 77 "CSSPropertyNames.gperf" + {"max-width", CSSPropertyMaxWidth}, +#line 106 "CSSPropertyNames.gperf" + {"table-layout", CSSPropertyTableLayout}, +#line 117 "CSSPropertyNames.gperf" + {"text-overline-color", CSSPropertyTextOverlineColor}, +#line 54 "CSSPropertyNames.gperf" {"empty-cells", CSSPropertyEmptyCells}, -#line 166 "CSSPropertyNames.gperf" +#line 169 "CSSPropertyNames.gperf" {"-webkit-box-ordinal-group", CSSPropertyWebkitBoxOrdinalGroup}, -#line 263 "CSSPropertyNames.gperf" - {"stroke-dasharray", CSSPropertyStrokeDasharray}, -#line 251 "CSSPropertyNames.gperf" - {"color-profile", CSSPropertyColorProfile}, -#line 220 "CSSPropertyNames.gperf" - {"-webkit-text-size-adjust", CSSPropertyWebkitTextSizeAdjust}, -#line 255 "CSSPropertyNames.gperf" - {"fill-rule", CSSPropertyFillRule}, -#line 63 "CSSPropertyNames.gperf" - {"line-height", CSSPropertyLineHeight}, -#line 227 "CSSPropertyNames.gperf" - {"-webkit-transform-origin-y", CSSPropertyWebkitTransformOriginY}, -#line 74 "CSSPropertyNames.gperf" - {"max-width", CSSPropertyMaxWidth}, -#line 214 "CSSPropertyNames.gperf" - {"-webkit-perspective-origin-x", CSSPropertyWebkitPerspectiveOriginX}, -#line 236 "CSSPropertyNames.gperf" - {"-webkit-user-modify", CSSPropertyWebkitUserModify}, -#line 56 "CSSPropertyNames.gperf" +#line 85 "CSSPropertyNames.gperf" + {"outline-style", CSSPropertyOutlineStyle}, +#line 43 "CSSPropertyNames.gperf" + {"box-shadow", CSSPropertyBoxShadow}, +#line 121 "CSSPropertyNames.gperf" + {"text-shadow", CSSPropertyTextShadow}, +#line 59 "CSSPropertyNames.gperf" {"font-stretch", CSSPropertyFontStretch}, #line 180 "CSSPropertyNames.gperf" - {"-webkit-column-rule-width", CSSPropertyWebkitColumnRuleWidth}, -#line 118 "CSSPropertyNames.gperf" - {"text-shadow", CSSPropertyTextShadow}, -#line 31 "CSSPropertyNames.gperf" - {"border-right-style", CSSPropertyBorderRightStyle}, -#line 57 "CSSPropertyNames.gperf" - {"font-style", CSSPropertyFontStyle}, -#line 28 "CSSPropertyNames.gperf" + {"-webkit-column-rule-color", CSSPropertyWebkitColumnRuleColor}, +#line 265 "CSSPropertyNames.gperf" + {"stroke-dasharray", CSSPropertyStrokeDasharray}, +#line 30 "CSSPropertyNames.gperf" {"border-left-width", CSSPropertyBorderLeftWidth}, -#line 170 "CSSPropertyNames.gperf" - {"-webkit-box-shadow", CSSPropertyWebkitBoxShadow}, -#line 114 "CSSPropertyNames.gperf" - {"text-overline-color", CSSPropertyTextOverlineColor}, -#line 121 "CSSPropertyNames.gperf" - {"text-underline-color", CSSPropertyTextUnderlineColor}, -#line 223 "CSSPropertyNames.gperf" +#line 225 "CSSPropertyNames.gperf" {"-webkit-text-stroke-width", CSSPropertyWebkitTextStrokeWidth}, -#line 119 "CSSPropertyNames.gperf" +#line 257 "CSSPropertyNames.gperf" + {"fill-rule", CSSPropertyFillRule}, +#line 122 "CSSPropertyNames.gperf" {"text-transform", CSSPropertyTextTransform}, -#line 155 "CSSPropertyNames.gperf" - {"-webkit-border-horizontal-spacing", CSSPropertyWebkitBorderHorizontalSpacing}, -#line 277 "CSSPropertyNames.gperf" +#line 279 "CSSPropertyNames.gperf" {"text-anchor", CSSPropertyTextAnchor}, -#line 272 "CSSPropertyNames.gperf" +#line 274 "CSSPropertyNames.gperf" {"baseline-shift", CSSPropertyBaselineShift}, -#line 86 "CSSPropertyNames.gperf" - {"overflow-y", CSSPropertyOverflowY}, -#line 226 "CSSPropertyNames.gperf" - {"-webkit-transform-origin-x", CSSPropertyWebkitTransformOriginX}, #line 229 "CSSPropertyNames.gperf" - {"-webkit-transform-style", CSSPropertyWebkitTransformStyle}, -#line 81 "CSSPropertyNames.gperf" - {"outline-offset", CSSPropertyOutlineOffset}, -#line 250 "CSSPropertyNames.gperf" + {"-webkit-transform-origin-y", CSSPropertyWebkitTransformOriginY}, +#line 228 "CSSPropertyNames.gperf" + {"-webkit-transform-origin-x", CSSPropertyWebkitTransformOriginX}, +#line 33 "CSSPropertyNames.gperf" + {"border-right-style", CSSPropertyBorderRightStyle}, +#line 252 "CSSPropertyNames.gperf" {"color-interpolation-filters", CSSPropertyColorInterpolationFilters}, -#line 179 "CSSPropertyNames.gperf" - {"-webkit-column-rule-style", CSSPropertyWebkitColumnRuleStyle}, -#line 245 "CSSPropertyNames.gperf" - {"flood-opacity", CSSPropertyFloodOpacity}, -#line 27 "CSSPropertyNames.gperf" - {"border-left-style", CSSPropertyBorderLeftStyle}, -#line 219 "CSSPropertyNames.gperf" - {"-webkit-text-security", CSSPropertyWebkitTextSecurity}, -#line 117 "CSSPropertyNames.gperf" - {"text-overline-width", CSSPropertyTextOverlineWidth}, #line 124 "CSSPropertyNames.gperf" - {"text-underline-width", CSSPropertyTextUnderlineWidth}, -#line 85 "CSSPropertyNames.gperf" + {"text-underline-color", CSSPropertyTextUnderlineColor}, +#line 60 "CSSPropertyNames.gperf" + {"font-style", CSSPropertyFontStyle}, +#line 120 "CSSPropertyNames.gperf" + {"text-overline-width", CSSPropertyTextOverlineWidth}, +#line 89 "CSSPropertyNames.gperf" + {"overflow-y", CSSPropertyOverflowY}, +#line 88 "CSSPropertyNames.gperf" {"overflow-x", CSSPropertyOverflowX}, -#line 112 "CSSPropertyNames.gperf" +#line 115 "CSSPropertyNames.gperf" {"text-overflow", CSSPropertyTextOverflow}, -#line 67 "CSSPropertyNames.gperf" - {"list-style-type", CSSPropertyListStyleType}, -#line 169 "CSSPropertyNames.gperf" +#line 182 "CSSPropertyNames.gperf" + {"-webkit-column-rule-width", CSSPropertyWebkitColumnRuleWidth}, +#line 238 "CSSPropertyNames.gperf" + {"-webkit-user-modify", CSSPropertyWebkitUserModify}, +#line 231 "CSSPropertyNames.gperf" + {"-webkit-transform-style", CSSPropertyWebkitTransformStyle}, +#line 172 "CSSPropertyNames.gperf" {"-webkit-box-reflect", CSSPropertyWebkitBoxReflect}, -#line 254 "CSSPropertyNames.gperf" - {"fill-opacity", CSSPropertyFillOpacity}, -#line 146 "CSSPropertyNames.gperf" - {"-webkit-backface-visibility", CSSPropertyWebkitBackfaceVisibility}, -#line 73 "CSSPropertyNames.gperf" +#line 84 "CSSPropertyNames.gperf" + {"outline-offset", CSSPropertyOutlineOffset}, +#line 247 "CSSPropertyNames.gperf" + {"flood-opacity", CSSPropertyFloodOpacity}, +#line 29 "CSSPropertyNames.gperf" + {"border-left-style", CSSPropertyBorderLeftStyle}, +#line 127 "CSSPropertyNames.gperf" + {"text-underline-width", CSSPropertyTextUnderlineWidth}, +#line 76 "CSSPropertyNames.gperf" {"max-height", CSSPropertyMaxHeight}, -#line 116 "CSSPropertyNames.gperf" +#line 186 "CSSPropertyNames.gperf" + {"-webkit-highlight", CSSPropertyWebkitHighlight}, +#line 221 "CSSPropertyNames.gperf" + {"-webkit-text-security", CSSPropertyWebkitTextSecurity}, +#line 256 "CSSPropertyNames.gperf" + {"fill-opacity", CSSPropertyFillOpacity}, +#line 119 "CSSPropertyNames.gperf" {"text-overline-style", CSSPropertyTextOverlineStyle}, -#line 123 "CSSPropertyNames.gperf" - {"text-underline-style", CSSPropertyTextUnderlineStyle}, -#line 209 "CSSPropertyNames.gperf" +#line 149 "CSSPropertyNames.gperf" + {"-webkit-backface-visibility", CSSPropertyWebkitBackfaceVisibility}, +#line 70 "CSSPropertyNames.gperf" + {"list-style-type", CSSPropertyListStyleType}, +#line 266 "CSSPropertyNames.gperf" + {"stroke-dashoffset", CSSPropertyStrokeDashoffset}, +#line 211 "CSSPropertyNames.gperf" {"-webkit-match-nearest-mail-blockquote-color", CSSPropertyWebkitMatchNearestMailBlockquoteColor}, -#line 184 "CSSPropertyNames.gperf" - {"-webkit-highlight", CSSPropertyWebkitHighlight}, -#line 275 "CSSPropertyNames.gperf" +#line 181 "CSSPropertyNames.gperf" + {"-webkit-column-rule-style", CSSPropertyWebkitColumnRuleStyle}, +#line 277 "CSSPropertyNames.gperf" {"glyph-orientation-vertical", CSSPropertyGlyphOrientationVertical}, -#line 264 "CSSPropertyNames.gperf" - {"stroke-dashoffset", CSSPropertyStrokeDashoffset}, -#line 54 "CSSPropertyNames.gperf" - {"font-family", CSSPropertyFontFamily}, -#line 218 "CSSPropertyNames.gperf" +#line 220 "CSSPropertyNames.gperf" {"-webkit-text-fill-color", CSSPropertyWebkitTextFillColor}, -#line 107 "CSSPropertyNames.gperf" +#line 126 "CSSPropertyNames.gperf" + {"text-underline-style", CSSPropertyTextUnderlineStyle}, +#line 57 "CSSPropertyNames.gperf" + {"font-family", CSSPropertyFontFamily}, +#line 110 "CSSPropertyNames.gperf" {"text-line-through", CSSPropertyTextLineThrough}, -#line 109 "CSSPropertyNames.gperf" - {"text-line-through-mode", CSSPropertyTextLineThroughMode}, -#line 163 "CSSPropertyNames.gperf" +#line 166 "CSSPropertyNames.gperf" {"-webkit-box-flex", CSSPropertyWebkitBoxFlex}, -#line 217 "CSSPropertyNames.gperf" - {"-webkit-text-decorations-in-effect", CSSPropertyWebkitTextDecorationsInEffect}, -#line 274 "CSSPropertyNames.gperf" +#line 112 "CSSPropertyNames.gperf" + {"text-line-through-mode", CSSPropertyTextLineThroughMode}, +#line 276 "CSSPropertyNames.gperf" {"glyph-orientation-horizontal", CSSPropertyGlyphOrientationHorizontal}, -#line 108 "CSSPropertyNames.gperf" +#line 219 "CSSPropertyNames.gperf" + {"-webkit-text-decorations-in-effect", CSSPropertyWebkitTextDecorationsInEffect}, +#line 111 "CSSPropertyNames.gperf" {"text-line-through-color", CSSPropertyTextLineThroughColor}, -#line 164 "CSSPropertyNames.gperf" +#line 167 "CSSPropertyNames.gperf" {"-webkit-box-flex-group", CSSPropertyWebkitBoxFlexGroup}, -#line 111 "CSSPropertyNames.gperf" +#line 114 "CSSPropertyNames.gperf" {"text-line-through-width", CSSPropertyTextLineThroughWidth}, -#line 110 "CSSPropertyNames.gperf" +#line 113 "CSSPropertyNames.gperf" {"text-line-through-style", CSSPropertyTextLineThroughStyle} }; static const short lookup[] = { -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, - -1, 2, -1, 3, -1, 4, 5, 6, -1, -1, - 7, -1, -1, 8, 9, -1, 10, -1, -1, -1, - 11, -1, 12, -1, -1, 13, -1, -1, -1, -1, - 14, -1, 15, -1, -1, 16, -1, 17, 18, -1, - -1, 19, 20, -1, -1, -1, -1, 21, -1, 22, - -1, -1, -1, 23, -1, 24, -1, 25, 26, 27, - -1, -1, -1, -1, 28, 29, -1, -1, -1, -1, - 30, -1, 31, 32, 33, -1, -1, -1, -1, -1, - -1, 34, -1, -1, -1, -1, -1, -1, 35, 36, - 37, -1, -1, -1, -1, -1, -1, 38, -1, -1, - -1, -1, 39, -1, -1, -1, 40, 41, -1, 42, - -1, 43, -1, -1, -1, -1, 44, -1, -1, -1, - -1, 45, 46, -1, -1, -1, -1, 47, -1, 48, - -1, 49, 50, 51, -1, 52, -1, 53, -1, -1, - 54, -1, -1, 55, 56, 57, 58, 59, -1, -1, - -1, 60, 61, -1, 62, -1, -1, 63, 64, -1, - -1, 65, -1, -1, -1, -1, 66, -1, -1, -1, - 67, -1, -1, -1, 68, 69, 70, -1, -1, -1, - 71, -1, 72, -1, -1, 73, -1, 74, -1, -1, - 75, -1, -1, 76, 77, -1, -1, -1, -1, -1, - -1, -1, 78, -1, -1, 79, -1, 80, -1, -1, - -1, -1, 81, -1, -1, -1, -1, -1, -1, 82, - -1, -1, 83, 84, -1, -1, -1, -1, -1, 85, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 86, -1, -1, -1, - -1, -1, -1, -1, -1, 87, -1, 88, -1, -1, - -1, -1, -1, 89, -1, -1, -1, -1, -1, 90, - 91, -1, -1, -1, 92, -1, -1, 93, -1, -1, - -1, -1, -1, -1, 94, -1, -1, -1, -1, -1, - 95, -1, -1, -1, -1, 96, -1, 97, -1, 98, - -1, -1, -1, -1, 99, -1, 100, 101, -1, -1, - -1, -1, 102, 103, 104, -1, -1, 105, -1, 106, - -1, -1, -1, 107, -1, -1, 108, -1, -1, -1, - -1, -1, 109, 110, -1, -1, -1, -1, 111, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 112, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 113, - -1, -1, -1, 114, 115, -1, -1, -1, 116, -1, - -1, 117, -1, -1, -1, 118, -1, 119, -1, -1, - 120, -1, 121, -1, 122, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 123, 124, -1, - 125, 126, 127, -1, 128, -1, 129, -1, 130, 131, - -1, -1, -1, -1, 132, 133, -1, 134, -1, 135, - 136, 137, -1, 138, -1, -1, -1, 139, 140, 141, - -1, 142, -1, 143, 144, -1, -1, -1, -1, -1, - -1, 145, -1, 146, 147, -1, -1, -1, -1, -1, - -1, 148, -1, -1, 149, -1, -1, 150, -1, -1, - -1, 151, -1, 152, -1, -1, -1, 153, -1, 154, - 155, -1, 156, -1, -1, -1, -1, -1, -1, -1, - -1, 157, 158, -1, -1, 159, 160, -1, -1, 161, - -1, -1, 162, 163, -1, -1, -1, -1, 164, -1, - -1, 165, 166, -1, -1, -1, -1, -1, -1, -1, - 167, -1, -1, -1, -1, -1, -1, -1, 168, 169, - -1, 170, -1, -1, -1, -1, 171, -1, -1, -1, - -1, 172, 173, 174, -1, -1, -1, 175, -1, -1, - -1, -1, -1, -1, 176, 177, 178, 179, -1, -1, - -1, 180, -1, 181, -1, -1, -1, 182, -1, -1, - 183, 184, -1, 185, 186, -1, -1, -1, 187, 188, - -1, -1, -1, -1, -1, -1, -1, -1, 189, 190, - -1, 191, -1, -1, 192, -1, -1, -1, -1, -1, - 193, -1, -1, 194, 195, -1, -1, 196, -1, -1, - 197, 198, -1, 199, -1, 200, 201, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 202, 203, -1, -1, -1, -1, 204, -1, - -1, 205, -1, -1, -1, 206, 207, -1, -1, 208, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 209, -1, -1, -1, 210, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 211, -1, 212, 213, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 214, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 215, -1, -1, -1, - -1, 216, -1, -1, 217, -1, -1, -1, 218, -1, - -1, -1, -1, -1, 219, -1, -1, -1, -1, -1, - -1, -1, 220, -1, -1, 221, -1, -1, -1, -1, - -1, 222, -1, -1, -1, -1, -1, -1, 223, -1, - -1, -1, -1, -1, -1, 224, -1, 225, -1, -1, - -1, -1, -1, 226, 227, 228, -1, -1, -1, -1, - 229, -1, -1, -1, 230, -1, -1, -1, 231, -1, - -1, -1, -1, -1, -1, -1, 232, -1, -1, 233, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 234, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 235, -1, -1, -1, - -1, -1, -1, 236, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 237, - -1, -1, 238, -1, -1, -1, -1, -1, -1, -1, - 239, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 240, -1, -1, -1, -1, -1, -1, - -1, -1, 241, -1, -1, -1, 242, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 243, - 244, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 245, -1, -1, 246, -1, - 247, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 1, -1, 2, -1, -1, -1, + -1, 3, -1, 4, -1, 5, 6, 7, -1, -1, + 8, -1, -1, 9, 10, -1, 11, -1, -1, 12, + 13, -1, 14, -1, -1, 15, 16, -1, -1, -1, + 17, -1, 18, -1, -1, 19, -1, 20, 21, -1, + -1, 22, 23, -1, -1, -1, -1, 24, -1, 25, + -1, -1, -1, 26, -1, 27, -1, 28, 29, 30, + -1, -1, -1, -1, 31, 32, -1, -1, -1, -1, + 33, -1, 34, 35, 36, -1, -1, 37, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 38, 39, + -1, -1, -1, -1, -1, -1, -1, 40, -1, -1, + -1, -1, 41, -1, -1, -1, -1, -1, -1, 42, + -1, -1, -1, -1, -1, -1, 43, -1, -1, 44, + -1, 45, -1, -1, -1, -1, -1, 46, -1, -1, + -1, 47, -1, 48, -1, -1, -1, 49, -1, -1, + 50, -1, -1, -1, -1, 51, -1, -1, -1, -1, + -1, -1, 52, -1, -1, -1, -1, 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 248, -1, -1, -1, -1, -1, + 54, 55, -1, -1, 56, 57, -1, -1, -1, -1, + 58, -1, 59, -1, -1, -1, -1, 60, -1, -1, + -1, -1, -1, -1, 61, -1, 62, 63, -1, -1, + -1, 64, 65, -1, -1, 66, -1, -1, -1, -1, + -1, -1, 67, -1, -1, -1, -1, -1, -1, 68, + -1, -1, 69, 70, -1, 71, -1, -1, -1, -1, + -1, -1, -1, 72, -1, -1, 73, 74, -1, -1, + -1, 75, -1, -1, -1, -1, 76, 77, 78, -1, + -1, -1, -1, -1, -1, 79, 80, -1, -1, 81, + -1, -1, -1, 82, -1, -1, 83, -1, -1, 84, + 85, -1, -1, -1, 86, 87, -1, 88, -1, -1, + 89, 90, -1, 91, -1, -1, -1, -1, 92, -1, + -1, -1, -1, -1, -1, -1, -1, 93, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 94, -1, 95, -1, -1, 96, -1, -1, -1, 97, + -1, -1, -1, -1, 98, -1, -1, 99, -1, -1, + -1, -1, 100, -1, 101, -1, -1, 102, -1, 103, + -1, -1, -1, -1, 104, -1, -1, 105, -1, -1, + -1, -1, 106, -1, -1, -1, -1, -1, -1, -1, + 107, -1, -1, 108, 109, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 110, -1, -1, 111, -1, + -1, -1, -1, -1, 112, -1, -1, 113, 114, 115, + -1, 116, -1, -1, -1, -1, -1, 117, -1, -1, + -1, -1, 118, 119, -1, -1, -1, -1, 120, -1, + -1, -1, 121, 122, -1, 123, 124, -1, -1, -1, + 125, 126, 127, -1, -1, -1, 128, -1, 129, -1, + -1, -1, 130, -1, 131, -1, 132, -1, -1, 133, + -1, -1, -1, 134, 135, -1, 136, -1, -1, -1, + 137, 138, -1, 139, -1, -1, -1, -1, -1, -1, + -1, 140, -1, -1, 141, 142, -1, 143, -1, -1, + -1, 144, -1, -1, 145, -1, -1, 146, 147, -1, + -1, 148, -1, -1, -1, -1, -1, -1, 149, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 150, -1, + -1, -1, -1, -1, -1, 151, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 152, 153, -1, + -1, 154, 155, 156, -1, -1, -1, 157, 158, -1, + 159, -1, -1, -1, 160, -1, -1, -1, -1, 161, + -1, -1, -1, 162, -1, 163, -1, -1, -1, 164, + -1, -1, 165, 166, 167, -1, -1, -1, 168, 169, + 170, -1, -1, 171, -1, -1, 172, 173, -1, 174, + -1, -1, 175, 176, -1, -1, -1, -1, -1, -1, + -1, -1, 177, -1, -1, -1, 178, -1, -1, 179, + -1, 180, -1, -1, -1, -1, -1, -1, -1, 181, + -1, -1, 182, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 183, -1, -1, -1, -1, -1, + -1, 184, -1, -1, -1, -1, -1, -1, -1, -1, + 185, -1, -1, -1, -1, -1, 186, -1, 187, -1, + -1, 188, -1, -1, 189, 190, -1, -1, -1, -1, + -1, -1, 191, 192, -1, 193, -1, -1, -1, -1, + -1, 194, -1, 195, 196, -1, -1, -1, -1, -1, + 197, -1, -1, 198, 199, -1, -1, -1, 200, 201, + -1, -1, -1, -1, -1, -1, 202, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 203, -1, + -1, -1, -1, 204, -1, -1, -1, -1, -1, -1, + -1, 205, -1, -1, -1, -1, 206, 207, -1, -1, + -1, 208, -1, -1, -1, 209, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 210, -1, -1, 211, + -1, 212, -1, -1, 213, -1, -1, 214, -1, 215, + -1, 216, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 217, -1, -1, 218, -1, + 219, 220, 221, -1, -1, -1, -1, -1, -1, -1, + 222, -1, -1, -1, -1, -1, 223, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 224, -1, -1, + 225, -1, -1, -1, 226, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 227, -1, 228, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 229, + -1, 230, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 249, -1, -1, + -1, -1, -1, -1, -1, -1, 231, -1, 232, -1, + -1, -1, 233, -1, -1, 234, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 235, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 236, 237, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 250, -1, -1, - 251, -1, -1, -1, 252, 253, -1, -1, 254, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 255, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 256, 257, -1, -1, + 238, -1, -1, 239, -1, 240, -1, -1, -1, -1, + -1, -1, -1, -1, 241, -1, -1, -1, -1, -1, + -1, -1, -1, 242, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 258, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 243, -1, -1, -1, -1, 244, + -1, -1, -1, 245, -1, -1, -1, -1, -1, -1, + -1, -1, 246, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 247, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 248, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 249, -1, -1, -1, 250, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 251, -1, 252, + -1, -1, 253, -1, -1, -1, -1, -1, -1, -1, + 254, -1, -1, -1, -1, -1, -1, 255, 256, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 257, 258, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -894,39 +903,43 @@ findProp (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 259, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 260, -1, -1, - -1, -1, 261, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 260, -1, -1, -1, -1, + -1, 261, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 262, -1, -1, + -1, 263, 264, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 262, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 265, -1, + -1, -1, -1, -1, 266, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 263, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 264, -1, -1, -1, -1, 265, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 266, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 267, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 268, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 267, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -934,10 +947,26 @@ findProp (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 269, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 268 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 270 }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -959,13 +988,15 @@ findProp (register const char *str, register unsigned int len) } return 0; } -#line 279 "CSSPropertyNames.gperf" +#line 281 "CSSPropertyNames.gperf" -static const char * const propertyNameStrings[269] = { +static const char * const propertyNameStrings[271] = { "background", "background-attachment", +"background-clip", "background-color", "background-image", +"background-origin", "background-position", "background-position-x", "background-position-y", @@ -993,6 +1024,7 @@ static const char * const propertyNameStrings[269] = { "border-top-width", "border-width", "bottom", +"box-shadow", "caption-side", "clear", "clip", @@ -1122,7 +1154,6 @@ static const char * const propertyNameStrings[269] = { "-webkit-box-orient", "-webkit-box-pack", "-webkit-box-reflect", -"-webkit-box-shadow", "-webkit-box-sizing", "-webkit-column-break-after", "-webkit-column-break-before", diff --git a/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h b/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h index aaddf0563..cc3627d91 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h +++ b/src/3rdparty/webkit/WebCore/generated/CSSPropertyNames.h @@ -7,277 +7,279 @@ enum CSSPropertyID { CSSPropertyInvalid = 0, CSSPropertyBackground = 1001, CSSPropertyBackgroundAttachment = 1002, - CSSPropertyBackgroundColor = 1003, - CSSPropertyBackgroundImage = 1004, - CSSPropertyBackgroundPosition = 1005, - CSSPropertyBackgroundPositionX = 1006, - CSSPropertyBackgroundPositionY = 1007, - CSSPropertyBackgroundRepeat = 1008, - CSSPropertyBorder = 1009, - CSSPropertyBorderBottom = 1010, - CSSPropertyBorderBottomColor = 1011, - CSSPropertyBorderBottomStyle = 1012, - CSSPropertyBorderBottomWidth = 1013, - CSSPropertyBorderCollapse = 1014, - CSSPropertyBorderColor = 1015, - CSSPropertyBorderLeft = 1016, - CSSPropertyBorderLeftColor = 1017, - CSSPropertyBorderLeftStyle = 1018, - CSSPropertyBorderLeftWidth = 1019, - CSSPropertyBorderRight = 1020, - CSSPropertyBorderRightColor = 1021, - CSSPropertyBorderRightStyle = 1022, - CSSPropertyBorderRightWidth = 1023, - CSSPropertyBorderSpacing = 1024, - CSSPropertyBorderStyle = 1025, - CSSPropertyBorderTop = 1026, - CSSPropertyBorderTopColor = 1027, - CSSPropertyBorderTopStyle = 1028, - CSSPropertyBorderTopWidth = 1029, - CSSPropertyBorderWidth = 1030, - CSSPropertyBottom = 1031, - CSSPropertyCaptionSide = 1032, - CSSPropertyClear = 1033, - CSSPropertyClip = 1034, - CSSPropertyColor = 1035, - CSSPropertyContent = 1036, - CSSPropertyCounterIncrement = 1037, - CSSPropertyCounterReset = 1038, - CSSPropertyCursor = 1039, - CSSPropertyDirection = 1040, - CSSPropertyDisplay = 1041, - CSSPropertyEmptyCells = 1042, - CSSPropertyFloat = 1043, - CSSPropertyFont = 1044, - CSSPropertyFontFamily = 1045, - CSSPropertyFontSize = 1046, - CSSPropertyFontStretch = 1047, - CSSPropertyFontStyle = 1048, - CSSPropertyFontVariant = 1049, - CSSPropertyFontWeight = 1050, - CSSPropertyHeight = 1051, - CSSPropertyLeft = 1052, - CSSPropertyLetterSpacing = 1053, - CSSPropertyLineHeight = 1054, - CSSPropertyListStyle = 1055, - CSSPropertyListStyleImage = 1056, - CSSPropertyListStylePosition = 1057, - CSSPropertyListStyleType = 1058, - CSSPropertyMargin = 1059, - CSSPropertyMarginBottom = 1060, - CSSPropertyMarginLeft = 1061, - CSSPropertyMarginRight = 1062, - CSSPropertyMarginTop = 1063, - CSSPropertyMaxHeight = 1064, - CSSPropertyMaxWidth = 1065, - CSSPropertyMinHeight = 1066, - CSSPropertyMinWidth = 1067, - CSSPropertyOpacity = 1068, - CSSPropertyOrphans = 1069, - CSSPropertyOutline = 1070, - CSSPropertyOutlineColor = 1071, - CSSPropertyOutlineOffset = 1072, - CSSPropertyOutlineStyle = 1073, - CSSPropertyOutlineWidth = 1074, - CSSPropertyOverflow = 1075, - CSSPropertyOverflowX = 1076, - CSSPropertyOverflowY = 1077, - CSSPropertyPadding = 1078, - CSSPropertyPaddingBottom = 1079, - CSSPropertyPaddingLeft = 1080, - CSSPropertyPaddingRight = 1081, - CSSPropertyPaddingTop = 1082, - CSSPropertyPage = 1083, - CSSPropertyPageBreakAfter = 1084, - CSSPropertyPageBreakBefore = 1085, - CSSPropertyPageBreakInside = 1086, - CSSPropertyPointerEvents = 1087, - CSSPropertyPosition = 1088, - CSSPropertyQuotes = 1089, - CSSPropertyResize = 1090, - CSSPropertyRight = 1091, - CSSPropertySize = 1092, - CSSPropertySrc = 1093, - CSSPropertyTableLayout = 1094, - CSSPropertyTextAlign = 1095, - CSSPropertyTextDecoration = 1096, - CSSPropertyTextIndent = 1097, - CSSPropertyTextLineThrough = 1098, - CSSPropertyTextLineThroughColor = 1099, - CSSPropertyTextLineThroughMode = 1100, - CSSPropertyTextLineThroughStyle = 1101, - CSSPropertyTextLineThroughWidth = 1102, - CSSPropertyTextOverflow = 1103, - CSSPropertyTextOverline = 1104, - CSSPropertyTextOverlineColor = 1105, - CSSPropertyTextOverlineMode = 1106, - CSSPropertyTextOverlineStyle = 1107, - CSSPropertyTextOverlineWidth = 1108, - CSSPropertyTextShadow = 1109, - CSSPropertyTextTransform = 1110, - CSSPropertyTextUnderline = 1111, - CSSPropertyTextUnderlineColor = 1112, - CSSPropertyTextUnderlineMode = 1113, - CSSPropertyTextUnderlineStyle = 1114, - CSSPropertyTextUnderlineWidth = 1115, - CSSPropertyTop = 1116, - CSSPropertyUnicodeBidi = 1117, - CSSPropertyUnicodeRange = 1118, - CSSPropertyVerticalAlign = 1119, - CSSPropertyVisibility = 1120, - CSSPropertyWhiteSpace = 1121, - CSSPropertyWidows = 1122, - CSSPropertyWidth = 1123, - CSSPropertyWordBreak = 1124, - CSSPropertyWordSpacing = 1125, - CSSPropertyWordWrap = 1126, - CSSPropertyZIndex = 1127, - CSSPropertyZoom = 1128, - CSSPropertyWebkitAnimation = 1129, - CSSPropertyWebkitAnimationDelay = 1130, - CSSPropertyWebkitAnimationDirection = 1131, - CSSPropertyWebkitAnimationDuration = 1132, - CSSPropertyWebkitAnimationIterationCount = 1133, - CSSPropertyWebkitAnimationName = 1134, - CSSPropertyWebkitAnimationTimingFunction = 1135, - CSSPropertyWebkitAppearance = 1136, - CSSPropertyWebkitBackfaceVisibility = 1137, - CSSPropertyWebkitBackgroundClip = 1138, - CSSPropertyWebkitBackgroundComposite = 1139, - CSSPropertyWebkitBackgroundOrigin = 1140, - CSSPropertyWebkitBackgroundSize = 1141, - CSSPropertyWebkitBinding = 1142, - CSSPropertyWebkitBorderBottomLeftRadius = 1143, - CSSPropertyWebkitBorderBottomRightRadius = 1144, - CSSPropertyWebkitBorderFit = 1145, - CSSPropertyWebkitBorderHorizontalSpacing = 1146, - CSSPropertyWebkitBorderImage = 1147, - CSSPropertyWebkitBorderRadius = 1148, - CSSPropertyWebkitBorderTopLeftRadius = 1149, - CSSPropertyWebkitBorderTopRightRadius = 1150, - CSSPropertyWebkitBorderVerticalSpacing = 1151, - CSSPropertyWebkitBoxAlign = 1152, - CSSPropertyWebkitBoxDirection = 1153, - CSSPropertyWebkitBoxFlex = 1154, - CSSPropertyWebkitBoxFlexGroup = 1155, - CSSPropertyWebkitBoxLines = 1156, - CSSPropertyWebkitBoxOrdinalGroup = 1157, - CSSPropertyWebkitBoxOrient = 1158, - CSSPropertyWebkitBoxPack = 1159, - CSSPropertyWebkitBoxReflect = 1160, - CSSPropertyWebkitBoxShadow = 1161, - CSSPropertyWebkitBoxSizing = 1162, - CSSPropertyWebkitColumnBreakAfter = 1163, - CSSPropertyWebkitColumnBreakBefore = 1164, - CSSPropertyWebkitColumnBreakInside = 1165, - CSSPropertyWebkitColumnCount = 1166, - CSSPropertyWebkitColumnGap = 1167, - CSSPropertyWebkitColumnRule = 1168, - CSSPropertyWebkitColumnRuleColor = 1169, - CSSPropertyWebkitColumnRuleStyle = 1170, - CSSPropertyWebkitColumnRuleWidth = 1171, - CSSPropertyWebkitColumnWidth = 1172, - CSSPropertyWebkitColumns = 1173, - CSSPropertyWebkitFontSizeDelta = 1174, - CSSPropertyWebkitHighlight = 1175, - CSSPropertyWebkitLineBreak = 1176, - CSSPropertyWebkitLineClamp = 1177, - CSSPropertyWebkitMarginBottomCollapse = 1178, - CSSPropertyWebkitMarginCollapse = 1179, - CSSPropertyWebkitMarginStart = 1180, - CSSPropertyWebkitMarginTopCollapse = 1181, - CSSPropertyWebkitMarquee = 1182, - CSSPropertyWebkitMarqueeDirection = 1183, - CSSPropertyWebkitMarqueeIncrement = 1184, - CSSPropertyWebkitMarqueeRepetition = 1185, - CSSPropertyWebkitMarqueeSpeed = 1186, - CSSPropertyWebkitMarqueeStyle = 1187, - CSSPropertyWebkitMask = 1188, - CSSPropertyWebkitMaskAttachment = 1189, - CSSPropertyWebkitMaskBoxImage = 1190, - CSSPropertyWebkitMaskClip = 1191, - CSSPropertyWebkitMaskComposite = 1192, - CSSPropertyWebkitMaskImage = 1193, - CSSPropertyWebkitMaskOrigin = 1194, - CSSPropertyWebkitMaskPosition = 1195, - CSSPropertyWebkitMaskPositionX = 1196, - CSSPropertyWebkitMaskPositionY = 1197, - CSSPropertyWebkitMaskRepeat = 1198, - CSSPropertyWebkitMaskSize = 1199, - CSSPropertyWebkitMatchNearestMailBlockquoteColor = 1200, - CSSPropertyWebkitNbspMode = 1201, - CSSPropertyWebkitPaddingStart = 1202, - CSSPropertyWebkitPerspective = 1203, - CSSPropertyWebkitPerspectiveOrigin = 1204, - CSSPropertyWebkitPerspectiveOriginX = 1205, - CSSPropertyWebkitPerspectiveOriginY = 1206, - CSSPropertyWebkitRtlOrdering = 1207, - CSSPropertyWebkitTextDecorationsInEffect = 1208, - CSSPropertyWebkitTextFillColor = 1209, - CSSPropertyWebkitTextSecurity = 1210, - CSSPropertyWebkitTextSizeAdjust = 1211, - CSSPropertyWebkitTextStroke = 1212, - CSSPropertyWebkitTextStrokeColor = 1213, - CSSPropertyWebkitTextStrokeWidth = 1214, - CSSPropertyWebkitTransform = 1215, - CSSPropertyWebkitTransformOrigin = 1216, - CSSPropertyWebkitTransformOriginX = 1217, - CSSPropertyWebkitTransformOriginY = 1218, - CSSPropertyWebkitTransformOriginZ = 1219, - CSSPropertyWebkitTransformStyle = 1220, - CSSPropertyWebkitTransition = 1221, - CSSPropertyWebkitTransitionDelay = 1222, - CSSPropertyWebkitTransitionDuration = 1223, - CSSPropertyWebkitTransitionProperty = 1224, - CSSPropertyWebkitTransitionTimingFunction = 1225, - CSSPropertyWebkitUserDrag = 1226, - CSSPropertyWebkitUserModify = 1227, - CSSPropertyWebkitUserSelect = 1228, - CSSPropertyWebkitVariableDeclarationBlock = 1229, - CSSPropertyClipPath = 1230, - CSSPropertyClipRule = 1231, - CSSPropertyMask = 1232, - CSSPropertyEnableBackground = 1233, - CSSPropertyFilter = 1234, - CSSPropertyFloodColor = 1235, - CSSPropertyFloodOpacity = 1236, - CSSPropertyLightingColor = 1237, - CSSPropertyStopColor = 1238, - CSSPropertyStopOpacity = 1239, - CSSPropertyColorInterpolation = 1240, - CSSPropertyColorInterpolationFilters = 1241, - CSSPropertyColorProfile = 1242, - CSSPropertyColorRendering = 1243, - CSSPropertyFill = 1244, - CSSPropertyFillOpacity = 1245, - CSSPropertyFillRule = 1246, - CSSPropertyImageRendering = 1247, - CSSPropertyMarker = 1248, - CSSPropertyMarkerEnd = 1249, - CSSPropertyMarkerMid = 1250, - CSSPropertyMarkerStart = 1251, - CSSPropertyShapeRendering = 1252, - CSSPropertyStroke = 1253, - CSSPropertyStrokeDasharray = 1254, - CSSPropertyStrokeDashoffset = 1255, - CSSPropertyStrokeLinecap = 1256, - CSSPropertyStrokeLinejoin = 1257, - CSSPropertyStrokeMiterlimit = 1258, - CSSPropertyStrokeOpacity = 1259, - CSSPropertyStrokeWidth = 1260, - CSSPropertyTextRendering = 1261, - CSSPropertyAlignmentBaseline = 1262, - CSSPropertyBaselineShift = 1263, - CSSPropertyDominantBaseline = 1264, - CSSPropertyGlyphOrientationHorizontal = 1265, - CSSPropertyGlyphOrientationVertical = 1266, - CSSPropertyKerning = 1267, - CSSPropertyTextAnchor = 1268, - CSSPropertyWritingMode = 1269, + CSSPropertyBackgroundClip = 1003, + CSSPropertyBackgroundColor = 1004, + CSSPropertyBackgroundImage = 1005, + CSSPropertyBackgroundOrigin = 1006, + CSSPropertyBackgroundPosition = 1007, + CSSPropertyBackgroundPositionX = 1008, + CSSPropertyBackgroundPositionY = 1009, + CSSPropertyBackgroundRepeat = 1010, + CSSPropertyBorder = 1011, + CSSPropertyBorderBottom = 1012, + CSSPropertyBorderBottomColor = 1013, + CSSPropertyBorderBottomStyle = 1014, + CSSPropertyBorderBottomWidth = 1015, + CSSPropertyBorderCollapse = 1016, + CSSPropertyBorderColor = 1017, + CSSPropertyBorderLeft = 1018, + CSSPropertyBorderLeftColor = 1019, + CSSPropertyBorderLeftStyle = 1020, + CSSPropertyBorderLeftWidth = 1021, + CSSPropertyBorderRight = 1022, + CSSPropertyBorderRightColor = 1023, + CSSPropertyBorderRightStyle = 1024, + CSSPropertyBorderRightWidth = 1025, + CSSPropertyBorderSpacing = 1026, + CSSPropertyBorderStyle = 1027, + CSSPropertyBorderTop = 1028, + CSSPropertyBorderTopColor = 1029, + CSSPropertyBorderTopStyle = 1030, + CSSPropertyBorderTopWidth = 1031, + CSSPropertyBorderWidth = 1032, + CSSPropertyBottom = 1033, + CSSPropertyBoxShadow = 1034, + CSSPropertyCaptionSide = 1035, + CSSPropertyClear = 1036, + CSSPropertyClip = 1037, + CSSPropertyColor = 1038, + CSSPropertyContent = 1039, + CSSPropertyCounterIncrement = 1040, + CSSPropertyCounterReset = 1041, + CSSPropertyCursor = 1042, + CSSPropertyDirection = 1043, + CSSPropertyDisplay = 1044, + CSSPropertyEmptyCells = 1045, + CSSPropertyFloat = 1046, + CSSPropertyFont = 1047, + CSSPropertyFontFamily = 1048, + CSSPropertyFontSize = 1049, + CSSPropertyFontStretch = 1050, + CSSPropertyFontStyle = 1051, + CSSPropertyFontVariant = 1052, + CSSPropertyFontWeight = 1053, + CSSPropertyHeight = 1054, + CSSPropertyLeft = 1055, + CSSPropertyLetterSpacing = 1056, + CSSPropertyLineHeight = 1057, + CSSPropertyListStyle = 1058, + CSSPropertyListStyleImage = 1059, + CSSPropertyListStylePosition = 1060, + CSSPropertyListStyleType = 1061, + CSSPropertyMargin = 1062, + CSSPropertyMarginBottom = 1063, + CSSPropertyMarginLeft = 1064, + CSSPropertyMarginRight = 1065, + CSSPropertyMarginTop = 1066, + CSSPropertyMaxHeight = 1067, + CSSPropertyMaxWidth = 1068, + CSSPropertyMinHeight = 1069, + CSSPropertyMinWidth = 1070, + CSSPropertyOpacity = 1071, + CSSPropertyOrphans = 1072, + CSSPropertyOutline = 1073, + CSSPropertyOutlineColor = 1074, + CSSPropertyOutlineOffset = 1075, + CSSPropertyOutlineStyle = 1076, + CSSPropertyOutlineWidth = 1077, + CSSPropertyOverflow = 1078, + CSSPropertyOverflowX = 1079, + CSSPropertyOverflowY = 1080, + CSSPropertyPadding = 1081, + CSSPropertyPaddingBottom = 1082, + CSSPropertyPaddingLeft = 1083, + CSSPropertyPaddingRight = 1084, + CSSPropertyPaddingTop = 1085, + CSSPropertyPage = 1086, + CSSPropertyPageBreakAfter = 1087, + CSSPropertyPageBreakBefore = 1088, + CSSPropertyPageBreakInside = 1089, + CSSPropertyPointerEvents = 1090, + CSSPropertyPosition = 1091, + CSSPropertyQuotes = 1092, + CSSPropertyResize = 1093, + CSSPropertyRight = 1094, + CSSPropertySize = 1095, + CSSPropertySrc = 1096, + CSSPropertyTableLayout = 1097, + CSSPropertyTextAlign = 1098, + CSSPropertyTextDecoration = 1099, + CSSPropertyTextIndent = 1100, + CSSPropertyTextLineThrough = 1101, + CSSPropertyTextLineThroughColor = 1102, + CSSPropertyTextLineThroughMode = 1103, + CSSPropertyTextLineThroughStyle = 1104, + CSSPropertyTextLineThroughWidth = 1105, + CSSPropertyTextOverflow = 1106, + CSSPropertyTextOverline = 1107, + CSSPropertyTextOverlineColor = 1108, + CSSPropertyTextOverlineMode = 1109, + CSSPropertyTextOverlineStyle = 1110, + CSSPropertyTextOverlineWidth = 1111, + CSSPropertyTextShadow = 1112, + CSSPropertyTextTransform = 1113, + CSSPropertyTextUnderline = 1114, + CSSPropertyTextUnderlineColor = 1115, + CSSPropertyTextUnderlineMode = 1116, + CSSPropertyTextUnderlineStyle = 1117, + CSSPropertyTextUnderlineWidth = 1118, + CSSPropertyTop = 1119, + CSSPropertyUnicodeBidi = 1120, + CSSPropertyUnicodeRange = 1121, + CSSPropertyVerticalAlign = 1122, + CSSPropertyVisibility = 1123, + CSSPropertyWhiteSpace = 1124, + CSSPropertyWidows = 1125, + CSSPropertyWidth = 1126, + CSSPropertyWordBreak = 1127, + CSSPropertyWordSpacing = 1128, + CSSPropertyWordWrap = 1129, + CSSPropertyZIndex = 1130, + CSSPropertyZoom = 1131, + CSSPropertyWebkitAnimation = 1132, + CSSPropertyWebkitAnimationDelay = 1133, + CSSPropertyWebkitAnimationDirection = 1134, + CSSPropertyWebkitAnimationDuration = 1135, + CSSPropertyWebkitAnimationIterationCount = 1136, + CSSPropertyWebkitAnimationName = 1137, + CSSPropertyWebkitAnimationTimingFunction = 1138, + CSSPropertyWebkitAppearance = 1139, + CSSPropertyWebkitBackfaceVisibility = 1140, + CSSPropertyWebkitBackgroundClip = 1141, + CSSPropertyWebkitBackgroundComposite = 1142, + CSSPropertyWebkitBackgroundOrigin = 1143, + CSSPropertyWebkitBackgroundSize = 1144, + CSSPropertyWebkitBinding = 1145, + CSSPropertyWebkitBorderBottomLeftRadius = 1146, + CSSPropertyWebkitBorderBottomRightRadius = 1147, + CSSPropertyWebkitBorderFit = 1148, + CSSPropertyWebkitBorderHorizontalSpacing = 1149, + CSSPropertyWebkitBorderImage = 1150, + CSSPropertyWebkitBorderRadius = 1151, + CSSPropertyWebkitBorderTopLeftRadius = 1152, + CSSPropertyWebkitBorderTopRightRadius = 1153, + CSSPropertyWebkitBorderVerticalSpacing = 1154, + CSSPropertyWebkitBoxAlign = 1155, + CSSPropertyWebkitBoxDirection = 1156, + CSSPropertyWebkitBoxFlex = 1157, + CSSPropertyWebkitBoxFlexGroup = 1158, + CSSPropertyWebkitBoxLines = 1159, + CSSPropertyWebkitBoxOrdinalGroup = 1160, + CSSPropertyWebkitBoxOrient = 1161, + CSSPropertyWebkitBoxPack = 1162, + CSSPropertyWebkitBoxReflect = 1163, + CSSPropertyWebkitBoxSizing = 1164, + CSSPropertyWebkitColumnBreakAfter = 1165, + CSSPropertyWebkitColumnBreakBefore = 1166, + CSSPropertyWebkitColumnBreakInside = 1167, + CSSPropertyWebkitColumnCount = 1168, + CSSPropertyWebkitColumnGap = 1169, + CSSPropertyWebkitColumnRule = 1170, + CSSPropertyWebkitColumnRuleColor = 1171, + CSSPropertyWebkitColumnRuleStyle = 1172, + CSSPropertyWebkitColumnRuleWidth = 1173, + CSSPropertyWebkitColumnWidth = 1174, + CSSPropertyWebkitColumns = 1175, + CSSPropertyWebkitFontSizeDelta = 1176, + CSSPropertyWebkitHighlight = 1177, + CSSPropertyWebkitLineBreak = 1178, + CSSPropertyWebkitLineClamp = 1179, + CSSPropertyWebkitMarginBottomCollapse = 1180, + CSSPropertyWebkitMarginCollapse = 1181, + CSSPropertyWebkitMarginStart = 1182, + CSSPropertyWebkitMarginTopCollapse = 1183, + CSSPropertyWebkitMarquee = 1184, + CSSPropertyWebkitMarqueeDirection = 1185, + CSSPropertyWebkitMarqueeIncrement = 1186, + CSSPropertyWebkitMarqueeRepetition = 1187, + CSSPropertyWebkitMarqueeSpeed = 1188, + CSSPropertyWebkitMarqueeStyle = 1189, + CSSPropertyWebkitMask = 1190, + CSSPropertyWebkitMaskAttachment = 1191, + CSSPropertyWebkitMaskBoxImage = 1192, + CSSPropertyWebkitMaskClip = 1193, + CSSPropertyWebkitMaskComposite = 1194, + CSSPropertyWebkitMaskImage = 1195, + CSSPropertyWebkitMaskOrigin = 1196, + CSSPropertyWebkitMaskPosition = 1197, + CSSPropertyWebkitMaskPositionX = 1198, + CSSPropertyWebkitMaskPositionY = 1199, + CSSPropertyWebkitMaskRepeat = 1200, + CSSPropertyWebkitMaskSize = 1201, + CSSPropertyWebkitMatchNearestMailBlockquoteColor = 1202, + CSSPropertyWebkitNbspMode = 1203, + CSSPropertyWebkitPaddingStart = 1204, + CSSPropertyWebkitPerspective = 1205, + CSSPropertyWebkitPerspectiveOrigin = 1206, + CSSPropertyWebkitPerspectiveOriginX = 1207, + CSSPropertyWebkitPerspectiveOriginY = 1208, + CSSPropertyWebkitRtlOrdering = 1209, + CSSPropertyWebkitTextDecorationsInEffect = 1210, + CSSPropertyWebkitTextFillColor = 1211, + CSSPropertyWebkitTextSecurity = 1212, + CSSPropertyWebkitTextSizeAdjust = 1213, + CSSPropertyWebkitTextStroke = 1214, + CSSPropertyWebkitTextStrokeColor = 1215, + CSSPropertyWebkitTextStrokeWidth = 1216, + CSSPropertyWebkitTransform = 1217, + CSSPropertyWebkitTransformOrigin = 1218, + CSSPropertyWebkitTransformOriginX = 1219, + CSSPropertyWebkitTransformOriginY = 1220, + CSSPropertyWebkitTransformOriginZ = 1221, + CSSPropertyWebkitTransformStyle = 1222, + CSSPropertyWebkitTransition = 1223, + CSSPropertyWebkitTransitionDelay = 1224, + CSSPropertyWebkitTransitionDuration = 1225, + CSSPropertyWebkitTransitionProperty = 1226, + CSSPropertyWebkitTransitionTimingFunction = 1227, + CSSPropertyWebkitUserDrag = 1228, + CSSPropertyWebkitUserModify = 1229, + CSSPropertyWebkitUserSelect = 1230, + CSSPropertyWebkitVariableDeclarationBlock = 1231, + CSSPropertyClipPath = 1232, + CSSPropertyClipRule = 1233, + CSSPropertyMask = 1234, + CSSPropertyEnableBackground = 1235, + CSSPropertyFilter = 1236, + CSSPropertyFloodColor = 1237, + CSSPropertyFloodOpacity = 1238, + CSSPropertyLightingColor = 1239, + CSSPropertyStopColor = 1240, + CSSPropertyStopOpacity = 1241, + CSSPropertyColorInterpolation = 1242, + CSSPropertyColorInterpolationFilters = 1243, + CSSPropertyColorProfile = 1244, + CSSPropertyColorRendering = 1245, + CSSPropertyFill = 1246, + CSSPropertyFillOpacity = 1247, + CSSPropertyFillRule = 1248, + CSSPropertyImageRendering = 1249, + CSSPropertyMarker = 1250, + CSSPropertyMarkerEnd = 1251, + CSSPropertyMarkerMid = 1252, + CSSPropertyMarkerStart = 1253, + CSSPropertyShapeRendering = 1254, + CSSPropertyStroke = 1255, + CSSPropertyStrokeDasharray = 1256, + CSSPropertyStrokeDashoffset = 1257, + CSSPropertyStrokeLinecap = 1258, + CSSPropertyStrokeLinejoin = 1259, + CSSPropertyStrokeMiterlimit = 1260, + CSSPropertyStrokeOpacity = 1261, + CSSPropertyStrokeWidth = 1262, + CSSPropertyTextRendering = 1263, + CSSPropertyAlignmentBaseline = 1264, + CSSPropertyBaselineShift = 1265, + CSSPropertyDominantBaseline = 1266, + CSSPropertyGlyphOrientationHorizontal = 1267, + CSSPropertyGlyphOrientationVertical = 1268, + CSSPropertyKerning = 1269, + CSSPropertyTextAnchor = 1270, + CSSPropertyWritingMode = 1271, }; const int firstCSSProperty = 1001; -const int numCSSProperties = 269; +const int numCSSProperties = 271; const size_t maxCSSPropertyNameLength = 43; const char* getPropertyName(CSSPropertyID); diff --git a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c index 6362110c3..44df1ce45 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c +++ b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c @@ -38,7 +38,7 @@ struct css_value { const char* name; int id; }; -/* maximum key range = 8752, duplicates = 0 */ +/* maximum key range = 7172, duplicates = 0 */ #ifdef __GNUC__ __inline @@ -52,32 +52,32 @@ hash_val (register const char *str, register unsigned int len) { static const unsigned short asso_values[] = { - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 970, 27, 8752, 8752, 0, - 55, 5, 50, 40, 35, 30, 25, 20, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 5, 200, 15, - 590, 0, 515, 251, 21, 35, 1, 905, 10, 20, - 30, 10, 45, 651, 160, 5, 80, 145, 960, 136, - 920, 971, 105, 0, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, 8752, - 8752, 8752, 8752, 8752, 8752, 8752, 8752 + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 500, 17, 7172, 7172, 0, + 55, 5, 50, 40, 35, 30, 25, 20, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 5, 245, 15, + 200, 0, 695, 401, 825, 35, 136, 86, 10, 20, + 30, 10, 45, 127, 370, 5, 80, 450, 1, 456, + 936, 1021, 95, 0, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, 7172, + 7172, 7172, 7172, 7172, 7172, 7172, 7172 }; register int hval = 0; @@ -191,11 +191,11 @@ findValue (register const char *str, register unsigned int len) { enum { - TOTAL_KEYWORDS = 539, + TOTAL_KEYWORDS = 540, MIN_WORD_LENGTH = 2, MAX_WORD_LENGTH = 31, MIN_HASH_VALUE = 0, - MAX_HASH_VALUE = 8751 + MAX_HASH_VALUE = 7171 }; static const struct css_value wordlist_value[] = @@ -204,52 +204,46 @@ findValue (register const char *str, register unsigned int len) {"100", CSSValue100}, #line 42 "CSSValueKeywords.gperf" {"300", CSSValue300}, -#line 287 "CSSValueKeywords.gperf" +#line 288 "CSSValueKeywords.gperf" {"end", CSSValueEnd}, -#line 547 "CSSValueKeywords.gperf" +#line 548 "CSSValueKeywords.gperf" {"lr", CSSValueLr}, #line 48 "CSSValueKeywords.gperf" {"900", CSSValue900}, -#line 256 "CSSValueKeywords.gperf" - {"hide", CSSValueHide}, +#line 146 "CSSValueKeywords.gperf" + {"sub", CSSValueSub}, #line 47 "CSSValueKeywords.gperf" {"800", CSSValue800}, -#line 371 "CSSValueKeywords.gperf" - {"lines", CSSValueLines}, #line 46 "CSSValueKeywords.gperf" {"700", CSSValue700}, #line 45 "CSSValueKeywords.gperf" {"600", CSSValue600}, -#line 209 "CSSValueKeywords.gperf" - {"alias", CSSValueAlias}, #line 44 "CSSValueKeywords.gperf" {"500", CSSValue500}, -#line 81 "CSSValueKeywords.gperf" - {"lime", CSSValueLime}, #line 34 "CSSValueKeywords.gperf" {"all", CSSValueAll}, -#line 164 "CSSValueKeywords.gperf" - {"circle", CSSValueCircle}, #line 43 "CSSValueKeywords.gperf" {"400", CSSValue400}, -#line 465 "CSSValueKeywords.gperf" - {"linen", CSSValueLinen}, #line 41 "CSSValueKeywords.gperf" {"200", CSSValue200}, -#line 481 "CSSValueKeywords.gperf" +#line 482 "CSSValueKeywords.gperf" {"oldlace", CSSValueOldlace}, +#line 71 "CSSValueKeywords.gperf" + {"cursive", CSSValueCursive}, +#line 242 "CSSValueKeywords.gperf" + {"above", CSSValueAbove}, #line 252 "CSSValueKeywords.gperf" {"cross", CSSValueCross}, -#line 402 "CSSValueKeywords.gperf" +#line 403 "CSSValueKeywords.gperf" {"coral", CSSValueCoral}, -#line 312 "CSSValueKeywords.gperf" - {"clip", CSSValueClip}, #line 13 "CSSValueKeywords.gperf" {"none", CSSValueNone}, -#line 405 "CSSValueKeywords.gperf" - {"crimson", CSSValueCrimson}, -#line 549 "CSSValueKeywords.gperf" +#line 494 "CSSValueKeywords.gperf" + {"plum", CSSValuePlum}, +#line 550 "CSSValueKeywords.gperf" {"tb", CSSValueTb}, +#line 86 "CSSValueKeywords.gperf" + {"purple", CSSValuePurple}, #line 251 "CSSValueKeywords.gperf" {"crop", CSSValueCrop}, #line 36 "CSSValueKeywords.gperf" @@ -258,1022 +252,1030 @@ findValue (register const char *str, register unsigned int len) {"inline", CSSValueInline}, #line 176 "CSSValueKeywords.gperf" {"armenian", CSSValueArmenian}, -#line 369 "CSSValueKeywords.gperf" - {"logical", CSSValueLogical}, #line 241 "CSSValueKeywords.gperf" {"collapse", CSSValueCollapse}, -#line 282 "CSSValueKeywords.gperf" - {"thin", CSSValueThin}, #line 73 "CSSValueKeywords.gperf" {"monospace", CSSValueMonospace}, -#line 235 "CSSValueKeywords.gperf" - {"ltr", CSSValueLtr}, -#line 313 "CSSValueKeywords.gperf" - {"ellipsis", CSSValueEllipsis}, -#line 12 "CSSValueKeywords.gperf" - {"initial", CSSValueInitial}, #line 215 "CSSValueKeywords.gperf" {"e-resize", CSSValueEResize}, -#line 548 "CSSValueKeywords.gperf" - {"rl", CSSValueRl}, +#line 372 "CSSValueKeywords.gperf" + {"lines", CSSValueLines}, #line 221 "CSSValueKeywords.gperf" {"s-resize", CSSValueSResize}, -#line 377 "CSSValueKeywords.gperf" - {"linear", CSSValueLinear}, -#line 507 "CSSValueKeywords.gperf" - {"snow", CSSValueSnow}, -#line 205 "CSSValueKeywords.gperf" - {"move", CSSValueMove}, -#line 15 "CSSValueKeywords.gperf" - {"inset", CSSValueInset}, -#line 300 "CSSValueKeywords.gperf" - {"slow", CSSValueSlow}, +#line 314 "CSSValueKeywords.gperf" + {"ellipsis", CSSValueEllipsis}, +#line 84 "CSSValueKeywords.gperf" + {"olive", CSSValueOlive}, +#line 209 "CSSValueKeywords.gperf" + {"alias", CSSValueAlias}, +#line 81 "CSSValueKeywords.gperf" + {"lime", CSSValueLime}, +#line 164 "CSSValueKeywords.gperf" + {"circle", CSSValueCircle}, +#line 466 "CSSValueKeywords.gperf" + {"linen", CSSValueLinen}, #line 218 "CSSValueKeywords.gperf" {"n-resize", CSSValueNResize}, -#line 511 "CSSValueKeywords.gperf" - {"thistle", CSSValueThistle}, -#line 457 "CSSValueKeywords.gperf" - {"lightsalmon", CSSValueLightsalmon}, -#line 401 "CSSValueKeywords.gperf" +#line 15 "CSSValueKeywords.gperf" + {"inset", CSSValueInset}, +#line 295 "CSSValueKeywords.gperf" + {"multiple", CSSValueMultiple}, +#line 402 "CSSValueKeywords.gperf" {"chocolate", CSSValueChocolate}, -#line 279 "CSSValueKeywords.gperf" - {"show", CSSValueShow}, -#line 257 "CSSValueKeywords.gperf" - {"higher", CSSValueHigher}, -#line 522 "CSSValueKeywords.gperf" - {"srgb", CSSValueSrgb}, +#line 313 "CSSValueKeywords.gperf" + {"clip", CSSValueClip}, +#line 406 "CSSValueKeywords.gperf" + {"crimson", CSSValueCrimson}, +#line 405 "CSSValueKeywords.gperf" + {"cornsilk", CSSValueCornsilk}, #line 187 "CSSValueKeywords.gperf" {"compact", CSSValueCompact}, -#line 309 "CSSValueKeywords.gperf" - {"ignore", CSSValueIgnore}, -#line 512 "CSSValueKeywords.gperf" +#line 278 "CSSValueKeywords.gperf" + {"scroll", CSSValueScroll}, +#line 253 "CSSValueKeywords.gperf" + {"embed", CSSValueEmbed}, +#line 513 "CSSValueKeywords.gperf" {"tomato", CSSValueTomato}, -#line 90 "CSSValueKeywords.gperf" - {"white", CSSValueWhite}, +#line 150 "CSSValueKeywords.gperf" + {"top", CSSValueTop}, +#line 263 "CSSValueKeywords.gperf" + {"loud", CSSValueLoud}, +#line 366 "CSSValueKeywords.gperf" + {"content", CSSValueContent}, +#line 77 "CSSValueKeywords.gperf" + {"blue", CSSValueBlue}, +#line 262 "CSSValueKeywords.gperf" + {"local", CSSValueLocal}, +#line 515 "CSSValueKeywords.gperf" + {"violet", CSSValueViolet}, +#line 493 "CSSValueKeywords.gperf" + {"pink", CSSValuePink}, +#line 283 "CSSValueKeywords.gperf" + {"thin", CSSValueThin}, #line 51 "CSSValueKeywords.gperf" {"small", CSSValueSmall}, -#line 364 "CSSValueKeywords.gperf" - {"content", CSSValueContent}, -#line 285 "CSSValueKeywords.gperf" - {"stretch", CSSValueStretch}, +#line 21 "CSSValueKeywords.gperf" + {"solid", CSSValueSolid}, +#line 24 "CSSValueKeywords.gperf" + {"icon", CSSValueIcon}, +#line 12 "CSSValueKeywords.gperf" + {"initial", CSSValueInitial}, #line 82 "CSSValueKeywords.gperf" {"maroon", CSSValueMaroon}, -#line 293 "CSSValueKeywords.gperf" - {"single", CSSValueSingle}, -#line 376 "CSSValueKeywords.gperf" +#line 377 "CSSValueKeywords.gperf" {"ease", CSSValueEase}, -#line 155 "CSSValueKeywords.gperf" - {"right", CSSValueRight}, -#line 498 "CSSValueKeywords.gperf" +#line 499 "CSSValueKeywords.gperf" {"salmon", CSSValueSalmon}, -#line 510 "CSSValueKeywords.gperf" +#line 511 "CSSValueKeywords.gperf" {"tan", CSSValueTan}, -#line 546 "CSSValueKeywords.gperf" - {"tb-rl", CSSValueTbRl}, -#line 39 "CSSValueKeywords.gperf" - {"lighter", CSSValueLighter}, -#line 202 "CSSValueKeywords.gperf" - {"crosshair", CSSValueCrosshair}, -#line 59 "CSSValueKeywords.gperf" - {"wider", CSSValueWider}, -#line 353 "CSSValueKeywords.gperf" +#line 354 "CSSValueKeywords.gperf" {"caret", CSSValueCaret}, +#line 512 "CSSValueKeywords.gperf" + {"thistle", CSSValueThistle}, #line 189 "CSSValueKeywords.gperf" {"table", CSSValueTable}, -#line 332 "CSSValueKeywords.gperf" - {"listitem", CSSValueListitem}, -#line 477 "CSSValueKeywords.gperf" - {"mintcream", CSSValueMintcream}, -#line 222 "CSSValueKeywords.gperf" - {"w-resize", CSSValueWResize}, -#line 544 "CSSValueKeywords.gperf" +#line 282 "CSSValueKeywords.gperf" + {"thick", CSSValueThick}, +#line 480 "CSSValueKeywords.gperf" + {"moccasin", CSSValueMoccasin}, +#line 545 "CSSValueKeywords.gperf" {"lr-tb", CSSValueLrTb}, -#line 179 "CSSValueKeywords.gperf" - {"hiragana", CSSValueHiragana}, -#line 236 "CSSValueKeywords.gperf" - {"rtl", CSSValueRtl}, -#line 529 "CSSValueKeywords.gperf" - {"miter", CSSValueMiter}, -#line 450 "CSSValueKeywords.gperf" - {"lightcoral", CSSValueLightcoral}, -#line 442 "CSSValueKeywords.gperf" - {"indigo", CSSValueIndigo}, -#line 243 "CSSValueKeywords.gperf" - {"absolute", CSSValueAbsolute}, -#line 289 "CSSValueKeywords.gperf" - {"horizontal", CSSValueHorizontal}, -#line 406 "CSSValueKeywords.gperf" +#line 162 "CSSValueKeywords.gperf" + {"inside", CSSValueInside}, +#line 304 "CSSValueKeywords.gperf" + {"slide", CSSValueSlide}, +#line 145 "CSSValueKeywords.gperf" + {"middle", CSSValueMiddle}, +#line 393 "CSSValueKeywords.gperf" + {"azure", CSSValueAzure}, +#line 75 "CSSValueKeywords.gperf" + {"aqua", CSSValueAqua}, +#line 407 "CSSValueKeywords.gperf" {"cyan", CSSValueCyan}, +#line 549 "CSSValueKeywords.gperf" + {"rl", CSSValueRl}, +#line 323 "CSSValueKeywords.gperf" + {"space", CSSValueSpace}, +#line 397 "CSSValueKeywords.gperf" + {"blueviolet", CSSValueBlueviolet}, +#line 184 "CSSValueKeywords.gperf" + {"block", CSSValueBlock}, +#line 163 "CSSValueKeywords.gperf" + {"disc", CSSValueDisc}, +#line 333 "CSSValueKeywords.gperf" + {"listitem", CSSValueListitem}, +#line 16 "CSSValueKeywords.gperf" + {"groove", CSSValueGroove}, +#line 235 "CSSValueKeywords.gperf" + {"ltr", CSSValueLtr}, +#line 201 "CSSValueKeywords.gperf" + {"auto", CSSValueAuto}, +#line 445 "CSSValueKeywords.gperf" + {"khaki", CSSValueKhaki}, +#line 443 "CSSValueKeywords.gperf" + {"indigo", CSSValueIndigo}, +#line 547 "CSSValueKeywords.gperf" + {"tb-rl", CSSValueTbRl}, +#line 374 "CSSValueKeywords.gperf" + {"paused", CSSValuePaused}, +#line 22 "CSSValueKeywords.gperf" + {"double", CSSValueDouble}, +#line 147 "CSSValueKeywords.gperf" + {"super", CSSValueSuper}, +#line 63 "CSSValueKeywords.gperf" + {"condensed", CSSValueCondensed}, +#line 240 "CSSValueKeywords.gperf" + {"visible", CSSValueVisible}, +#line 37 "CSSValueKeywords.gperf" + {"bold", CSSValueBold}, +#line 508 "CSSValueKeywords.gperf" + {"snow", CSSValueSnow}, +#line 248 "CSSValueKeywords.gperf" + {"blink", CSSValueBlink}, +#line 205 "CSSValueKeywords.gperf" + {"move", CSSValueMove}, +#line 301 "CSSValueKeywords.gperf" + {"slow", CSSValueSlow}, +#line 378 "CSSValueKeywords.gperf" + {"linear", CSSValueLinear}, +#line 88 "CSSValueKeywords.gperf" + {"silver", CSSValueSilver}, +#line 259 "CSSValueKeywords.gperf" + {"landscape", CSSValueLandscape}, +#line 280 "CSSValueKeywords.gperf" + {"show", CSSValueShow}, +#line 23 "CSSValueKeywords.gperf" + {"caption", CSSValueCaption}, +#line 18 "CSSValueKeywords.gperf" + {"outset", CSSValueOutset}, +#line 389 "CSSValueKeywords.gperf" + {"stroke", CSSValueStroke}, +#line 519 "CSSValueKeywords.gperf" + {"nonzero", CSSValueNonzero}, +#line 294 "CSSValueKeywords.gperf" + {"single", CSSValueSingle}, #line 11 "CSSValueKeywords.gperf" {"inherit", CSSValueInherit}, -#line 466 "CSSValueKeywords.gperf" - {"magenta", CSSValueMagenta}, -#line 518 "CSSValueKeywords.gperf" - {"nonzero", CSSValueNonzero}, -#line 204 "CSSValueKeywords.gperf" - {"pointer", CSSValuePointer}, -#line 283 "CSSValueKeywords.gperf" - {"underline", CSSValueUnderline}, +#line 299 "CSSValueKeywords.gperf" + {"up", CSSValueUp}, #line 130 "CSSValueKeywords.gperf" {"no-repeat", CSSValueNoRepeat}, -#line 389 "CSSValueKeywords.gperf" - {"aliceblue", CSSValueAliceblue}, -#line 112 "CSSValueKeywords.gperf" - {"match", CSSValueMatch}, -#line 325 "CSSValueKeywords.gperf" +#line 76 "CSSValueKeywords.gperf" + {"black", CSSValueBlack}, +#line 222 "CSSValueKeywords.gperf" + {"w-resize", CSSValueWResize}, +#line 420 "CSSValueKeywords.gperf" + {"darksalmon", CSSValueDarksalmon}, +#line 303 "CSSValueKeywords.gperf" + {"infinite", CSSValueInfinite}, +#line 224 "CSSValueKeywords.gperf" + {"ns-resize", CSSValueNsResize}, +#line 108 "CSSValueKeywords.gperf" + {"inactivecaption", CSSValueInactivecaption}, +#line 144 "CSSValueKeywords.gperf" + {"baseline", CSSValueBaseline}, +#line 363 "CSSValueKeywords.gperf" + {"round", CSSValueRound}, +#line 237 "CSSValueKeywords.gperf" + {"capitalize", CSSValueCapitalize}, +#line 243 "CSSValueKeywords.gperf" + {"absolute", CSSValueAbsolute}, +#line 478 "CSSValueKeywords.gperf" + {"mintcream", CSSValueMintcream}, +#line 33 "CSSValueKeywords.gperf" + {"oblique", CSSValueOblique}, +#line 326 "CSSValueKeywords.gperf" {"radio", CSSValueRadio}, -#line 249 "CSSValueKeywords.gperf" - {"both", CSSValueBoth}, -#line 17 "CSSValueKeywords.gperf" - {"ridge", CSSValueRidge}, +#line 53 "CSSValueKeywords.gperf" + {"large", CSSValueLarge}, +#line 273 "CSSValueKeywords.gperf" + {"portrait", CSSValuePortrait}, +#line 437 "CSSValueKeywords.gperf" + {"gold", CSSValueGold}, #line 57 "CSSValueKeywords.gperf" {"smaller", CSSValueSmaller}, -#line 397 "CSSValueKeywords.gperf" +#line 426 "CSSValueKeywords.gperf" + {"darkviolet", CSSValueDarkviolet}, +#line 371 "CSSValueKeywords.gperf" + {"visual", CSSValueVisual}, +#line 442 "CSSValueKeywords.gperf" + {"indianred", CSSValueIndianred}, +#line 85 "CSSValueKeywords.gperf" + {"orange", CSSValueOrange}, +#line 161 "CSSValueKeywords.gperf" + {"outside", CSSValueOutside}, +#line 204 "CSSValueKeywords.gperf" + {"pointer", CSSValuePointer}, +#line 90 "CSSValueKeywords.gperf" + {"white", CSSValueWhite}, +#line 514 "CSSValueKeywords.gperf" + {"turquoise", CSSValueTurquoise}, +#line 211 "CSSValueKeywords.gperf" + {"no-drop", CSSValueNoDrop}, +#line 546 "CSSValueKeywords.gperf" + {"rl-tb", CSSValueRlTb}, +#line 387 "CSSValueKeywords.gperf" + {"painted", CSSValuePainted}, +#line 207 "CSSValueKeywords.gperf" + {"cell", CSSValueCell}, +#line 245 "CSSValueKeywords.gperf" + {"avoid", CSSValueAvoid}, +#line 274 "CSSValueKeywords.gperf" + {"pre", CSSValuePre}, +#line 165 "CSSValueKeywords.gperf" + {"square", CSSValueSquare}, +#line 529 "CSSValueKeywords.gperf" + {"butt", CSSValueButt}, +#line 398 "CSSValueKeywords.gperf" {"brown", CSSValueBrown}, -#line 230 "CSSValueKeywords.gperf" - {"wait", CSSValueWait}, -#line 258 "CSSValueKeywords.gperf" - {"invert", CSSValueInvert}, -#line 542 "CSSValueKeywords.gperf" - {"no-change", CSSValueNoChange}, #line 32 "CSSValueKeywords.gperf" {"italic", CSSValueItalic}, -#line 224 "CSSValueKeywords.gperf" - {"ns-resize", CSSValueNsResize}, -#line 304 "CSSValueKeywords.gperf" - {"alternate", CSSValueAlternate}, -#line 272 "CSSValueKeywords.gperf" - {"portrait", CSSValuePortrait}, -#line 105 "CSSValueKeywords.gperf" - {"highlight", CSSValueHighlight}, -#line 53 "CSSValueKeywords.gperf" - {"large", CSSValueLarge}, -#line 310 "CSSValueKeywords.gperf" - {"intrinsic", CSSValueIntrinsic}, -#line 317 "CSSValueKeywords.gperf" - {"wave", CSSValueWave}, -#line 503 "CSSValueKeywords.gperf" +#line 527 "CSSValueKeywords.gperf" + {"crispedges", CSSValueCrispedges}, +#line 504 "CSSValueKeywords.gperf" {"skyblue", CSSValueSkyblue}, -#line 302 "CSSValueKeywords.gperf" - {"infinite", CSSValueInfinite}, -#line 280 "CSSValueKeywords.gperf" +#line 329 "CSSValueKeywords.gperf" + {"button", CSSValueButton}, +#line 517 "CSSValueKeywords.gperf" + {"whitesmoke", CSSValueWhitesmoke}, +#line 281 "CSSValueKeywords.gperf" {"static", CSSValueStatic}, -#line 464 "CSSValueKeywords.gperf" - {"limegreen", CSSValueLimegreen}, -#line 545 "CSSValueKeywords.gperf" - {"rl-tb", CSSValueRlTb}, -#line 449 "CSSValueKeywords.gperf" - {"lightblue", CSSValueLightblue}, -#line 85 "CSSValueKeywords.gperf" - {"orange", CSSValueOrange}, +#line 236 "CSSValueKeywords.gperf" + {"rtl", CSSValueRtl}, +#line 392 "CSSValueKeywords.gperf" + {"aquamarine", CSSValueAquamarine}, +#line 309 "CSSValueKeywords.gperf" + {"element", CSSValueElement}, +#line 291 "CSSValueKeywords.gperf" + {"vertical", CSSValueVertical}, #line 151 "CSSValueKeywords.gperf" {"bottom", CSSValueBottom}, +#line 114 "CSSValueKeywords.gperf" + {"scrollbar", CSSValueScrollbar}, +#line 388 "CSSValueKeywords.gperf" + {"fill", CSSValueFill}, +#line 364 "CSSValueKeywords.gperf" + {"border", CSSValueBorder}, +#line 35 "CSSValueKeywords.gperf" + {"small-caps", CSSValueSmallCaps}, #line 210 "CSSValueKeywords.gperf" {"progress", CSSValueProgress}, -#line 318 "CSSValueKeywords.gperf" - {"continuous", CSSValueContinuous}, -#line 387 "CSSValueKeywords.gperf" - {"fill", CSSValueFill}, -#line 144 "CSSValueKeywords.gperf" - {"baseline", CSSValueBaseline}, -#line 540 "CSSValueKeywords.gperf" - {"mathematical", CSSValueMathematical}, -#line 207 "CSSValueKeywords.gperf" - {"cell", CSSValueCell}, -#line 273 "CSSValueKeywords.gperf" - {"pre", CSSValuePre}, -#line 454 "CSSValueKeywords.gperf" - {"lightgreen", CSSValueLightgreen}, -#line 462 "CSSValueKeywords.gperf" - {"lightsteelblue", CSSValueLightsteelblue}, -#line 458 "CSSValueKeywords.gperf" - {"lightseagreen", CSSValueLightseagreen}, -#line 502 "CSSValueKeywords.gperf" +#line 373 "CSSValueKeywords.gperf" + {"running", CSSValueRunning}, +#line 38 "CSSValueKeywords.gperf" + {"bolder", CSSValueBolder}, +#line 390 "CSSValueKeywords.gperf" + {"aliceblue", CSSValueAliceblue}, +#line 197 "CSSValueKeywords.gperf" + {"table-cell", CSSValueTableCell}, +#line 379 "CSSValueKeywords.gperf" + {"ease-in", CSSValueEaseIn}, +#line 92 "CSSValueKeywords.gperf" + {"transparent", CSSValueTransparent}, +#line 503 "CSSValueKeywords.gperf" {"sienna", CSSValueSienna}, -#line 286 "CSSValueKeywords.gperf" - {"start", CSSValueStart}, -#line 231 "CSSValueKeywords.gperf" - {"help", CSSValueHelp}, -#line 303 "CSSValueKeywords.gperf" - {"slide", CSSValueSlide}, -#line 145 "CSSValueKeywords.gperf" - {"middle", CSSValueMiddle}, +#line 384 "CSSValueKeywords.gperf" + {"visiblepainted", CSSValueVisiblepainted}, +#line 284 "CSSValueKeywords.gperf" + {"underline", CSSValueUnderline}, +#line 17 "CSSValueKeywords.gperf" + {"ridge", CSSValueRidge}, +#line 96 "CSSValueKeywords.gperf" + {"activecaption", CSSValueActivecaption}, +#line 180 "CSSValueKeywords.gperf" + {"katakana", CSSValueKatakana}, +#line 124 "CSSValueKeywords.gperf" + {"currentcolor", CSSValueCurrentcolor}, +#line 230 "CSSValueKeywords.gperf" + {"wait", CSSValueWait}, +#line 298 "CSSValueKeywords.gperf" + {"ahead", CSSValueAhead}, +#line 185 "CSSValueKeywords.gperf" + {"list-item", CSSValueListItem}, +#line 370 "CSSValueKeywords.gperf" + {"logical", CSSValueLogical}, +#line 186 "CSSValueKeywords.gperf" + {"run-in", CSSValueRunIn}, +#line 258 "CSSValueKeywords.gperf" + {"invert", CSSValueInvert}, +#line 368 "CSSValueKeywords.gperf" + {"padding", CSSValuePadding}, +#line 305 "CSSValueKeywords.gperf" + {"alternate", CSSValueAlternate}, +#line 256 "CSSValueKeywords.gperf" + {"hide", CSSValueHide}, +#line 59 "CSSValueKeywords.gperf" + {"wider", CSSValueWider}, +#line 232 "CSSValueKeywords.gperf" + {"all-scroll", CSSValueAllScroll}, +#line 190 "CSSValueKeywords.gperf" + {"inline-table", CSSValueInlineTable}, +#line 19 "CSSValueKeywords.gperf" + {"dotted", CSSValueDotted}, +#line 530 "CSSValueKeywords.gperf" + {"miter", CSSValueMiter}, +#line 465 "CSSValueKeywords.gperf" + {"limegreen", CSSValueLimegreen}, +#line 311 "CSSValueKeywords.gperf" + {"intrinsic", CSSValueIntrinsic}, +#line 141 "CSSValueKeywords.gperf" + {"xor", CSSValueXor}, +#line 483 "CSSValueKeywords.gperf" + {"olivedrab", CSSValueOlivedrab}, +#line 188 "CSSValueKeywords.gperf" + {"inline-block", CSSValueInlineBlock}, +#line 134 "CSSValueKeywords.gperf" + {"source-in", CSSValueSourceIn}, +#line 315 "CSSValueKeywords.gperf" + {"discard", CSSValueDiscard}, +#line 489 "CSSValueKeywords.gperf" + {"palevioletred", CSSValuePalevioletred}, +#line 27 "CSSValueKeywords.gperf" + {"small-caption", CSSValueSmallCaption}, +#line 525 "CSSValueKeywords.gperf" + {"optimizespeed", CSSValueOptimizespeed}, +#line 382 "CSSValueKeywords.gperf" + {"document", CSSValueDocument}, +#line 89 "CSSValueKeywords.gperf" + {"teal", CSSValueTeal}, #line 58 "CSSValueKeywords.gperf" {"larger", CSSValueLarger}, -#line 277 "CSSValueKeywords.gperf" - {"scroll", CSSValueScroll}, -#line 253 "CSSValueKeywords.gperf" - {"embed", CSSValueEmbed}, -#line 92 "CSSValueKeywords.gperf" - {"transparent", CSSValueTransparent}, -#line 14 "CSSValueKeywords.gperf" - {"hidden", CSSValueHidden}, -#line 399 "CSSValueKeywords.gperf" +#line 116 "CSSValueKeywords.gperf" + {"threedface", CSSValueThreedface}, +#line 395 "CSSValueKeywords.gperf" + {"bisque", CSSValueBisque}, +#line 375 "CSSValueKeywords.gperf" + {"flat", CSSValueFlat}, +#line 400 "CSSValueKeywords.gperf" {"cadetblue", CSSValueCadetblue}, -#line 480 "CSSValueKeywords.gperf" - {"navajowhite", CSSValueNavajowhite}, -#line 504 "CSSValueKeywords.gperf" +#line 505 "CSSValueKeywords.gperf" {"slateblue", CSSValueSlateblue}, -#line 308 "CSSValueKeywords.gperf" - {"element", CSSValueElement}, -#line 260 "CSSValueKeywords.gperf" - {"level", CSSValueLevel}, +#line 386 "CSSValueKeywords.gperf" + {"visiblestroke", CSSValueVisiblestroke}, #line 87 "CSSValueKeywords.gperf" {"red", CSSValueRed}, -#line 496 "CSSValueKeywords.gperf" - {"royalblue", CSSValueRoyalblue}, -#line 163 "CSSValueKeywords.gperf" - {"disc", CSSValueDisc}, -#line 435 "CSSValueKeywords.gperf" - {"ghostwhite", CSSValueGhostwhite}, -#line 25 "CSSValueKeywords.gperf" - {"menu", CSSValueMenu}, -#line 21 "CSSValueKeywords.gperf" - {"solid", CSSValueSolid}, -#line 24 "CSSValueKeywords.gperf" - {"icon", CSSValueIcon}, -#line 60 "CSSValueKeywords.gperf" - {"narrower", CSSValueNarrower}, -#line 486 "CSSValueKeywords.gperf" - {"palegreen", CSSValuePalegreen}, -#line 491 "CSSValueKeywords.gperf" - {"peru", CSSValuePeru}, +#line 198 "CSSValueKeywords.gperf" + {"table-caption", CSSValueTableCaption}, +#line 136 "CSSValueKeywords.gperf" + {"source-atop", CSSValueSourceAtop}, +#line 415 "CSSValueKeywords.gperf" + {"darkmagenta", CSSValueDarkmagenta}, +#line 50 "CSSValueKeywords.gperf" + {"x-small", CSSValueXSmall}, +#line 523 "CSSValueKeywords.gperf" + {"srgb", CSSValueSrgb}, +#line 227 "CSSValueKeywords.gperf" + {"col-resize", CSSValueColResize}, +#line 238 "CSSValueKeywords.gperf" + {"uppercase", CSSValueUppercase}, +#line 302 "CSSValueKeywords.gperf" + {"fast", CSSValueFast}, #line 131 "CSSValueKeywords.gperf" {"clear", CSSValueClear}, -#line 52 "CSSValueKeywords.gperf" - {"medium", CSSValueMedium}, -#line 479 "CSSValueKeywords.gperf" - {"moccasin", CSSValueMoccasin}, -#line 162 "CSSValueKeywords.gperf" - {"inside", CSSValueInside}, -#line 501 "CSSValueKeywords.gperf" - {"seashell", CSSValueSeashell}, -#line 515 "CSSValueKeywords.gperf" - {"wheat", CSSValueWheat}, -#line 150 "CSSValueKeywords.gperf" - {"top", CSSValueTop}, +#line 419 "CSSValueKeywords.gperf" + {"darkred", CSSValueDarkred}, +#line 487 "CSSValueKeywords.gperf" + {"palegreen", CSSValuePalegreen}, +#line 319 "CSSValueKeywords.gperf" + {"continuous", CSSValueContinuous}, +#line 80 "CSSValueKeywords.gperf" + {"green", CSSValueGreen}, +#line 290 "CSSValueKeywords.gperf" + {"horizontal", CSSValueHorizontal}, +#line 287 "CSSValueKeywords.gperf" + {"start", CSSValueStart}, +#line 318 "CSSValueKeywords.gperf" + {"wave", CSSValueWave}, +#line 166 "CSSValueKeywords.gperf" + {"decimal", CSSValueDecimal}, #line 156 "CSSValueKeywords.gperf" {"center", CSSValueCenter}, -#line 476 "CSSValueKeywords.gperf" - {"midnightblue", CSSValueMidnightblue}, -#line 534 "CSSValueKeywords.gperf" +#line 260 "CSSValueKeywords.gperf" + {"level", CSSValueLevel}, +#line 25 "CSSValueKeywords.gperf" + {"menu", CSSValueMenu}, +#line 266 "CSSValueKeywords.gperf" + {"mix", CSSValueMix}, +#line 535 "CSSValueKeywords.gperf" {"central", CSSValueCentral}, -#line 298 "CSSValueKeywords.gperf" - {"up", CSSValueUp}, -#line 523 "CSSValueKeywords.gperf" - {"linearrgb", CSSValueLinearrgb}, -#line 539 "CSSValueKeywords.gperf" - {"hanging", CSSValueHanging}, -#line 400 "CSSValueKeywords.gperf" - {"chartreuse", CSSValueChartreuse}, -#line 80 "CSSValueKeywords.gperf" - {"green", CSSValueGreen}, -#line 89 "CSSValueKeywords.gperf" - {"teal", CSSValueTeal}, -#line 245 "CSSValueKeywords.gperf" - {"avoid", CSSValueAvoid}, -#line 374 "CSSValueKeywords.gperf" - {"flat", CSSValueFlat}, -#line 345 "CSSValueKeywords.gperf" - {"menulist", CSSValueMenulist}, -#line 255 "CSSValueKeywords.gperf" - {"hand", CSSValueHand}, -#line 382 "CSSValueKeywords.gperf" - {"reset", CSSValueReset}, -#line 175 "CSSValueKeywords.gperf" - {"hebrew", CSSValueHebrew}, -#line 219 "CSSValueKeywords.gperf" - {"se-resize", CSSValueSeResize}, -#line 37 "CSSValueKeywords.gperf" - {"bold", CSSValueBold}, #line 154 "CSSValueKeywords.gperf" {"left", CSSValueLeft}, -#line 530 "CSSValueKeywords.gperf" - {"bevel", CSSValueBevel}, -#line 441 "CSSValueKeywords.gperf" - {"indianred", CSSValueIndianred}, -#line 434 "CSSValueKeywords.gperf" - {"gainsboro", CSSValueGainsboro}, -#line 322 "CSSValueKeywords.gperf" - {"space", CSSValueSpace}, -#line 301 "CSSValueKeywords.gperf" - {"fast", CSSValueFast}, -#line 33 "CSSValueKeywords.gperf" - {"oblique", CSSValueOblique}, +#line 14 "CSSValueKeywords.gperf" + {"hidden", CSSValueHidden}, +#line 492 "CSSValueKeywords.gperf" + {"peru", CSSValuePeru}, +#line 467 "CSSValueKeywords.gperf" + {"magenta", CSSValueMagenta}, +#line 277 "CSSValueKeywords.gperf" + {"relative", CSSValueRelative}, +#line 132 "CSSValueKeywords.gperf" + {"copy", CSSValueCopy}, +#line 300 "CSSValueKeywords.gperf" + {"down", CSSValueDown}, +#line 52 "CSSValueKeywords.gperf" + {"medium", CSSValueMedium}, +#line 219 "CSSValueKeywords.gperf" + {"se-resize", CSSValueSeResize}, +#line 383 "CSSValueKeywords.gperf" + {"reset", CSSValueReset}, +#line 497 "CSSValueKeywords.gperf" + {"royalblue", CSSValueRoyalblue}, +#line 408 "CSSValueKeywords.gperf" + {"darkblue", CSSValueDarkblue}, #line 216 "CSSValueKeywords.gperf" {"ne-resize", CSSValueNeResize}, -#line 259 "CSSValueKeywords.gperf" - {"landscape", CSSValueLandscape}, -#line 246 "CSSValueKeywords.gperf" - {"below", CSSValueBelow}, +#line 310 "CSSValueKeywords.gperf" + {"ignore", CSSValueIgnore}, +#line 97 "CSSValueKeywords.gperf" + {"appworkspace", CSSValueAppworkspace}, +#line 250 "CSSValueKeywords.gperf" + {"close-quote", CSSValueCloseQuote}, +#line 385 "CSSValueKeywords.gperf" + {"visiblefill", CSSValueVisiblefill}, +#line 484 "CSSValueKeywords.gperf" + {"orangered", CSSValueOrangered}, #line 120 "CSSValueKeywords.gperf" {"window", CSSValueWindow}, -#line 271 "CSSValueKeywords.gperf" - {"overline", CSSValueOverline}, -#line 436 "CSSValueKeywords.gperf" - {"gold", CSSValueGold}, -#line 211 "CSSValueKeywords.gperf" - {"no-drop", CSSValueNoDrop}, -#line 526 "CSSValueKeywords.gperf" - {"crispedges", CSSValueCrispedges}, -#line 386 "CSSValueKeywords.gperf" - {"painted", CSSValuePainted}, -#line 492 "CSSValueKeywords.gperf" - {"pink", CSSValuePink}, -#line 393 "CSSValueKeywords.gperf" - {"beige", CSSValueBeige}, -#line 141 "CSSValueKeywords.gperf" - {"xor", CSSValueXor}, -#line 288 "CSSValueKeywords.gperf" - {"reverse", CSSValueReverse}, -#line 146 "CSSValueKeywords.gperf" - {"sub", CSSValueSub}, -#line 84 "CSSValueKeywords.gperf" - {"olive", CSSValueOlive}, -#line 265 "CSSValueKeywords.gperf" - {"mix", CSSValueMix}, -#line 114 "CSSValueKeywords.gperf" - {"scrollbar", CSSValueScrollbar}, -#line 363 "CSSValueKeywords.gperf" - {"border", CSSValueBorder}, -#line 38 "CSSValueKeywords.gperf" - {"bolder", CSSValueBolder}, -#line 23 "CSSValueKeywords.gperf" - {"caption", CSSValueCaption}, -#line 242 "CSSValueKeywords.gperf" - {"above", CSSValueAbove}, -#line 432 "CSSValueKeywords.gperf" - {"floralwhite", CSSValueFloralwhite}, -#line 509 "CSSValueKeywords.gperf" - {"steelblue", CSSValueSteelblue}, -#line 538 "CSSValueKeywords.gperf" - {"alphabetic", CSSValueAlphabetic}, -#line 281 "CSSValueKeywords.gperf" - {"thick", CSSValueThick}, -#line 493 "CSSValueKeywords.gperf" - {"plum", CSSValuePlum}, -#line 404 "CSSValueKeywords.gperf" - {"cornsilk", CSSValueCornsilk}, -#line 86 "CSSValueKeywords.gperf" - {"purple", CSSValuePurple}, -#line 388 "CSSValueKeywords.gperf" - {"stroke", CSSValueStroke}, -#line 50 "CSSValueKeywords.gperf" - {"x-small", CSSValueXSmall}, -#line 69 "CSSValueKeywords.gperf" - {"serif", CSSValueSerif}, -#line 394 "CSSValueKeywords.gperf" - {"bisque", CSSValueBisque}, -#line 468 "CSSValueKeywords.gperf" - {"mediumblue", CSSValueMediumblue}, -#line 433 "CSSValueKeywords.gperf" - {"forestgreen", CSSValueForestgreen}, -#line 537 "CSSValueKeywords.gperf" - {"ideographic", CSSValueIdeographic}, -#line 514 "CSSValueKeywords.gperf" - {"violet", CSSValueViolet}, -#line 201 "CSSValueKeywords.gperf" - {"auto", CSSValueAuto}, -#line 392 "CSSValueKeywords.gperf" - {"azure", CSSValueAzure}, -#line 445 "CSSValueKeywords.gperf" +#line 516 "CSSValueKeywords.gperf" + {"wheat", CSSValueWheat}, +#line 485 "CSSValueKeywords.gperf" + {"orchid", CSSValueOrchid}, +#line 438 "CSSValueKeywords.gperf" + {"goldenrod", CSSValueGoldenrod}, +#line 127 "CSSValueKeywords.gperf" + {"repeat", CSSValueRepeat}, +#line 255 "CSSValueKeywords.gperf" + {"hand", CSSValueHand}, +#line 279 "CSSValueKeywords.gperf" + {"separate", CSSValueSeparate}, +#line 267 "CSSValueKeywords.gperf" + {"no-close-quote", CSSValueNoCloseQuote}, +#line 312 "CSSValueKeywords.gperf" + {"min-intrinsic", CSSValueMinIntrinsic}, +#line 346 "CSSValueKeywords.gperf" + {"menulist", CSSValueMenulist}, +#line 202 "CSSValueKeywords.gperf" + {"crosshair", CSSValueCrosshair}, +#line 446 "CSSValueKeywords.gperf" {"lavender", CSSValueLavender}, -#line 75 "CSSValueKeywords.gperf" - {"aqua", CSSValueAqua}, -#line 263 "CSSValueKeywords.gperf" - {"lower", CSSValueLower}, -#line 237 "CSSValueKeywords.gperf" - {"capitalize", CSSValueCapitalize}, -#line 470 "CSSValueKeywords.gperf" - {"mediumpurple", CSSValueMediumpurple}, -#line 88 "CSSValueKeywords.gperf" - {"silver", CSSValueSilver}, -#line 456 "CSSValueKeywords.gperf" - {"lightpink", CSSValueLightpink}, -#line 297 "CSSValueKeywords.gperf" - {"ahead", CSSValueAhead}, -#line 365 "CSSValueKeywords.gperf" - {"padding", CSSValuePadding}, -#line 451 "CSSValueKeywords.gperf" - {"lightcyan", CSSValueLightcyan}, -#line 248 "CSSValueKeywords.gperf" - {"blink", CSSValueBlink}, +#line 133 "CSSValueKeywords.gperf" + {"source-over", CSSValueSourceOver}, +#line 275 "CSSValueKeywords.gperf" + {"pre-line", CSSValuePreLine}, +#line 412 "CSSValueKeywords.gperf" + {"darkgreen", CSSValueDarkgreen}, +#line 422 "CSSValueKeywords.gperf" + {"darkslateblue", CSSValueDarkslateblue}, +#line 268 "CSSValueKeywords.gperf" + {"no-open-quote", CSSValueNoOpenQuote}, +#line 421 "CSSValueKeywords.gperf" + {"darkseagreen", CSSValueDarkseagreen}, +#line 417 "CSSValueKeywords.gperf" + {"darkorange", CSSValueDarkorange}, +#line 539 "CSSValueKeywords.gperf" + {"alphabetic", CSSValueAlphabetic}, +#line 264 "CSSValueKeywords.gperf" + {"lower", CSSValueLower}, +#line 380 "CSSValueKeywords.gperf" + {"ease-out", CSSValueEaseOut}, +#line 543 "CSSValueKeywords.gperf" + {"no-change", CSSValueNoChange}, +#line 286 "CSSValueKeywords.gperf" + {"stretch", CSSValueStretch}, +#line 196 "CSSValueKeywords.gperf" + {"table-column", CSSValueTableColumn}, #line 239 "CSSValueKeywords.gperf" {"lowercase", CSSValueLowercase}, -#line 500 "CSSValueKeywords.gperf" - {"seagreen", CSSValueSeagreen}, -#line 294 "CSSValueKeywords.gperf" - {"multiple", CSSValueMultiple}, -#line 77 "CSSValueKeywords.gperf" - {"blue", CSSValueBlue}, -#line 184 "CSSValueKeywords.gperf" - {"block", CSSValueBlock}, -#line 471 "CSSValueKeywords.gperf" - {"mediumseagreen", CSSValueMediumseagreen}, -#line 472 "CSSValueKeywords.gperf" - {"mediumslateblue", CSSValueMediumslateblue}, -#line 516 "CSSValueKeywords.gperf" - {"whitesmoke", CSSValueWhitesmoke}, -#line 18 "CSSValueKeywords.gperf" - {"outset", CSSValueOutset}, -#line 370 "CSSValueKeywords.gperf" - {"visual", CSSValueVisual}, -#line 268 "CSSValueKeywords.gperf" +#line 416 "CSSValueKeywords.gperf" + {"darkolivegreen", CSSValueDarkolivegreen}, +#line 509 "CSSValueKeywords.gperf" + {"springgreen", CSSValueSpringgreen}, +#line 531 "CSSValueKeywords.gperf" + {"bevel", CSSValueBevel}, +#line 179 "CSSValueKeywords.gperf" + {"hiragana", CSSValueHiragana}, +#line 521 "CSSValueKeywords.gperf" + {"accumulate", CSSValueAccumulate}, +#line 246 "CSSValueKeywords.gperf" + {"below", CSSValueBelow}, +#line 269 "CSSValueKeywords.gperf" {"nowrap", CSSValueNowrap}, -#line 232 "CSSValueKeywords.gperf" - {"all-scroll", CSSValueAllScroll}, -#line 440 "CSSValueKeywords.gperf" - {"hotpink", CSSValueHotpink}, -#line 116 "CSSValueKeywords.gperf" - {"threedface", CSSValueThreedface}, -#line 483 "CSSValueKeywords.gperf" - {"orangered", CSSValueOrangered}, -#line 484 "CSSValueKeywords.gperf" - {"orchid", CSSValueOrchid}, +#line 69 "CSSValueKeywords.gperf" + {"serif", CSSValueSerif}, +#line 435 "CSSValueKeywords.gperf" + {"gainsboro", CSSValueGainsboro}, #line 223 "CSSValueKeywords.gperf" {"ew-resize", CSSValueEwResize}, #line 220 "CSSValueKeywords.gperf" {"sw-resize", CSSValueSwResize}, -#line 390 "CSSValueKeywords.gperf" - {"antiquewhite", CSSValueAntiquewhite}, -#line 463 "CSSValueKeywords.gperf" - {"lightyellow", CSSValueLightyellow}, -#line 16 "CSSValueKeywords.gperf" - {"groove", CSSValueGroove}, -#line 185 "CSSValueKeywords.gperf" - {"list-item", CSSValueListItem}, -#line 403 "CSSValueKeywords.gperf" - {"cornflowerblue", CSSValueCornflowerblue}, +#line 135 "CSSValueKeywords.gperf" + {"source-out", CSSValueSourceOut}, +#line 394 "CSSValueKeywords.gperf" + {"beige", CSSValueBeige}, +#line 60 "CSSValueKeywords.gperf" + {"narrower", CSSValueNarrower}, #line 217 "CSSValueKeywords.gperf" {"nw-resize", CSSValueNwResize}, -#line 63 "CSSValueKeywords.gperf" - {"condensed", CSSValueCondensed}, -#line 240 "CSSValueKeywords.gperf" - {"visible", CSSValueVisible}, -#line 165 "CSSValueKeywords.gperf" - {"square", CSSValueSquare}, -#line 177 "CSSValueKeywords.gperf" - {"georgian", CSSValueGeorgian}, -#line 35 "CSSValueKeywords.gperf" - {"small-caps", CSSValueSmallCaps}, -#line 331 "CSSValueKeywords.gperf" +#line 332 "CSSValueKeywords.gperf" {"listbox", CSSValueListbox}, -#line 197 "CSSValueKeywords.gperf" - {"table-cell", CSSValueTableCell}, -#line 378 "CSSValueKeywords.gperf" - {"ease-in", CSSValueEaseIn}, -#line 478 "CSSValueKeywords.gperf" - {"mistyrose", CSSValueMistyrose}, -#line 83 "CSSValueKeywords.gperf" - {"navy", CSSValueNavy}, -#line 76 "CSSValueKeywords.gperf" - {"black", CSSValueBlack}, -#line 497 "CSSValueKeywords.gperf" - {"saddlebrown", CSSValueSaddlebrown}, -#line 443 "CSSValueKeywords.gperf" - {"ivory", CSSValueIvory}, -#line 227 "CSSValueKeywords.gperf" - {"col-resize", CSSValueColResize}, -#line 391 "CSSValueKeywords.gperf" - {"aquamarine", CSSValueAquamarine}, -#line 54 "CSSValueKeywords.gperf" - {"x-large", CSSValueXLarge}, -#line 528 "CSSValueKeywords.gperf" - {"butt", CSSValueButt}, +#line 441 "CSSValueKeywords.gperf" + {"hotpink", CSSValueHotpink}, +#line 99 "CSSValueKeywords.gperf" + {"buttonface", CSSValueButtonface}, +#line 486 "CSSValueKeywords.gperf" + {"palegoldenrod", CSSValuePalegoldenrod}, +#line 524 "CSSValueKeywords.gperf" + {"linearrgb", CSSValueLinearrgb}, +#line 20 "CSSValueKeywords.gperf" + {"dashed", CSSValueDashed}, #line 111 "CSSValueKeywords.gperf" {"infotext", CSSValueInfotext}, -#line 190 "CSSValueKeywords.gperf" - {"inline-table", CSSValueInlineTable}, -#line 430 "CSSValueKeywords.gperf" - {"dodgerblue", CSSValueDodgerblue}, -#line 127 "CSSValueKeywords.gperf" - {"repeat", CSSValueRepeat}, -#line 508 "CSSValueKeywords.gperf" - {"springgreen", CSSValueSpringgreen}, -#line 278 "CSSValueKeywords.gperf" - {"separate", CSSValueSeparate}, -#line 328 "CSSValueKeywords.gperf" - {"button", CSSValueButton}, -#line 311 "CSSValueKeywords.gperf" - {"min-intrinsic", CSSValueMinIntrinsic}, +#line 112 "CSSValueKeywords.gperf" + {"match", CSSValueMatch}, +#line 321 "CSSValueKeywords.gperf" + {"break-all", CSSValueBreakAll}, +#line 249 "CSSValueKeywords.gperf" + {"both", CSSValueBoth}, +#line 401 "CSSValueKeywords.gperf" + {"chartreuse", CSSValueChartreuse}, +#line 498 "CSSValueKeywords.gperf" + {"saddlebrown", CSSValueSaddlebrown}, +#line 330 "CSSValueKeywords.gperf" + {"button-bevel", CSSValueButtonBevel}, +#line 414 "CSSValueKeywords.gperf" + {"darkkhaki", CSSValueDarkkhaki}, +#line 66 "CSSValueKeywords.gperf" + {"expanded", CSSValueExpanded}, +#line 231 "CSSValueKeywords.gperf" + {"help", CSSValueHelp}, +#line 432 "CSSValueKeywords.gperf" + {"firebrick", CSSValueFirebrick}, +#line 520 "CSSValueKeywords.gperf" + {"evenodd", CSSValueEvenodd}, +#line 142 "CSSValueKeywords.gperf" + {"plus-darker", CSSValuePlusDarker}, +#line 272 "CSSValueKeywords.gperf" + {"overline", CSSValueOverline}, +#line 409 "CSSValueKeywords.gperf" + {"darkcyan", CSSValueDarkcyan}, +#line 292 "CSSValueKeywords.gperf" + {"inline-axis", CSSValueInlineAxis}, +#line 107 "CSSValueKeywords.gperf" + {"inactiveborder", CSSValueInactiveborder}, +#line 434 "CSSValueKeywords.gperf" + {"forestgreen", CSSValueForestgreen}, +#line 103 "CSSValueKeywords.gperf" + {"captiontext", CSSValueCaptiontext}, +#line 522 "CSSValueKeywords.gperf" + {"new", CSSValueNew}, #line 79 "CSSValueKeywords.gperf" {"gray", CSSValueGray}, -#line 117 "CSSValueKeywords.gperf" - {"threedhighlight", CSSValueThreedhighlight}, -#line 314 "CSSValueKeywords.gperf" - {"discard", CSSValueDiscard}, -#line 27 "CSSValueKeywords.gperf" - {"small-caption", CSSValueSmallCaption}, -#line 19 "CSSValueKeywords.gperf" - {"dotted", CSSValueDotted}, -#line 124 "CSSValueKeywords.gperf" - {"currentcolor", CSSValueCurrentcolor}, -#line 527 "CSSValueKeywords.gperf" - {"geometricprecision", CSSValueGeometricprecision}, -#line 295 "CSSValueKeywords.gperf" +#line 194 "CSSValueKeywords.gperf" + {"table-row", CSSValueTableRow}, +#line 541 "CSSValueKeywords.gperf" + {"mathematical", CSSValueMathematical}, +#line 212 "CSSValueKeywords.gperf" + {"not-allowed", CSSValueNotAllowed}, +#line 431 "CSSValueKeywords.gperf" + {"dodgerblue", CSSValueDodgerblue}, +#line 479 "CSSValueKeywords.gperf" + {"mistyrose", CSSValueMistyrose}, +#line 174 "CSSValueKeywords.gperf" + {"upper-latin", CSSValueUpperLatin}, +#line 109 "CSSValueKeywords.gperf" + {"inactivecaptiontext", CSSValueInactivecaptiontext}, +#line 501 "CSSValueKeywords.gperf" + {"seagreen", CSSValueSeagreen}, +#line 351 "CSSValueKeywords.gperf" + {"slider-vertical", CSSValueSliderVertical}, +#line 54 "CSSValueKeywords.gperf" + {"x-large", CSSValueXLarge}, +#line 83 "CSSValueKeywords.gperf" + {"navy", CSSValueNavy}, +#line 64 "CSSValueKeywords.gperf" + {"semi-condensed", CSSValueSemiCondensed}, +#line 78 "CSSValueKeywords.gperf" + {"fuchsia", CSSValueFuchsia}, +#line 410 "CSSValueKeywords.gperf" + {"darkgoldenrod", CSSValueDarkgoldenrod}, +#line 296 "CSSValueKeywords.gperf" {"forwards", CSSValueForwards}, -#line 521 "CSSValueKeywords.gperf" - {"new", CSSValueNew}, -#line 372 "CSSValueKeywords.gperf" - {"running", CSSValueRunning}, +#line 502 "CSSValueKeywords.gperf" + {"seashell", CSSValueSeashell}, +#line 297 "CSSValueKeywords.gperf" + {"backwards", CSSValueBackwards}, #line 119 "CSSValueKeywords.gperf" {"threedshadow", CSSValueThreedshadow}, -#line 20 "CSSValueKeywords.gperf" - {"dashed", CSSValueDashed}, -#line 379 "CSSValueKeywords.gperf" - {"ease-out", CSSValueEaseOut}, -#line 198 "CSSValueKeywords.gperf" - {"table-caption", CSSValueTableCaption}, -#line 487 "CSSValueKeywords.gperf" - {"paleturquoise", CSSValuePaleturquoise}, -#line 381 "CSSValueKeywords.gperf" - {"document", CSSValueDocument}, -#line 196 "CSSValueKeywords.gperf" - {"table-column", CSSValueTableColumn}, -#line 446 "CSSValueKeywords.gperf" - {"lavenderblush", CSSValueLavenderblush}, -#line 455 "CSSValueKeywords.gperf" - {"lightgrey", CSSValueLightgrey}, -#line 453 "CSSValueKeywords.gperf" - {"lightgray", CSSValueLightgray}, -#line 181 "CSSValueKeywords.gperf" - {"hiragana-iroha", CSSValueHiraganaIroha}, -#line 106 "CSSValueKeywords.gperf" - {"highlighttext", CSSValueHighlighttext}, -#line 108 "CSSValueKeywords.gperf" - {"inactivecaption", CSSValueInactivecaption}, -#line 469 "CSSValueKeywords.gperf" - {"mediumorchid", CSSValueMediumorchid}, -#line 194 "CSSValueKeywords.gperf" - {"table-row", CSSValueTableRow}, -#line 121 "CSSValueKeywords.gperf" - {"windowframe", CSSValueWindowframe}, -#line 299 "CSSValueKeywords.gperf" - {"down", CSSValueDown}, -#line 520 "CSSValueKeywords.gperf" - {"accumulate", CSSValueAccumulate}, +#line 376 "CSSValueKeywords.gperf" + {"preserve-3d", CSSValuePreserve3d}, +#line 427 "CSSValueKeywords.gperf" + {"deeppink", CSSValueDeeppink}, +#line 488 "CSSValueKeywords.gperf" + {"paleturquoise", CSSValuePaleturquoise}, #line 203 "CSSValueKeywords.gperf" {"default", CSSValueDefault}, -#line 447 "CSSValueKeywords.gperf" - {"lawngreen", CSSValueLawngreen}, -#line 262 "CSSValueKeywords.gperf" - {"loud", CSSValueLoud}, -#line 274 "CSSValueKeywords.gperf" - {"pre-line", CSSValuePreLine}, -#line 461 "CSSValueKeywords.gperf" - {"lightslategrey", CSSValueLightslategrey}, -#line 460 "CSSValueKeywords.gperf" - {"lightslategray", CSSValueLightslategray}, -#line 290 "CSSValueKeywords.gperf" - {"vertical", CSSValueVertical}, -#line 238 "CSSValueKeywords.gperf" - {"uppercase", CSSValueUppercase}, -#line 524 "CSSValueKeywords.gperf" - {"optimizespeed", CSSValueOptimizespeed}, -#line 229 "CSSValueKeywords.gperf" - {"text", CSSValueText}, -#line 91 "CSSValueKeywords.gperf" - {"yellow", CSSValueYellow}, -#line 261 "CSSValueKeywords.gperf" - {"line-through", CSSValueLineThrough}, -#line 132 "CSSValueKeywords.gperf" - {"copy", CSSValueCopy}, -#line 506 "CSSValueKeywords.gperf" - {"slategrey", CSSValueSlategrey}, -#line 505 "CSSValueKeywords.gperf" - {"slategray", CSSValueSlategray}, -#line 437 "CSSValueKeywords.gperf" - {"goldenrod", CSSValueGoldenrod}, -#line 473 "CSSValueKeywords.gperf" - {"mediumspringgreen", CSSValueMediumspringgreen}, -#line 448 "CSSValueKeywords.gperf" - {"lemonchiffon", CSSValueLemonchiffon}, -#line 395 "CSSValueKeywords.gperf" +#line 138 "CSSValueKeywords.gperf" + {"destination-in", CSSValueDestinationIn}, +#line 396 "CSSValueKeywords.gperf" {"blanchedalmond", CSSValueBlanchedalmond}, -#line 125 "CSSValueKeywords.gperf" - {"grey", CSSValueGrey}, -#line 161 "CSSValueKeywords.gperf" - {"outside", CSSValueOutside}, -#line 166 "CSSValueKeywords.gperf" - {"decimal", CSSValueDecimal}, -#line 113 "CSSValueKeywords.gperf" - {"menutext", CSSValueMenutext}, -#line 439 "CSSValueKeywords.gperf" - {"honeydew", CSSValueHoneydew}, -#line 276 "CSSValueKeywords.gperf" - {"relative", CSSValueRelative}, -#line 147 "CSSValueKeywords.gperf" - {"super", CSSValueSuper}, -#line 419 "CSSValueKeywords.gperf" - {"darksalmon", CSSValueDarksalmon}, -#line 362 "CSSValueKeywords.gperf" - {"round", CSSValueRound}, -#line 72 "CSSValueKeywords.gperf" - {"fantasy", CSSValueFantasy}, -#line 467 "CSSValueKeywords.gperf" - {"mediumaquamarine", CSSValueMediumaquamarine}, -#line 495 "CSSValueKeywords.gperf" - {"rosybrown", CSSValueRosybrown}, -#line 373 "CSSValueKeywords.gperf" - {"paused", CSSValuePaused}, -#line 22 "CSSValueKeywords.gperf" - {"double", CSSValueDouble}, -#line 270 "CSSValueKeywords.gperf" - {"overlay", CSSValueOverlay}, -#line 360 "CSSValueKeywords.gperf" - {"textarea", CSSValueTextarea}, -#line 431 "CSSValueKeywords.gperf" - {"firebrick", CSSValueFirebrick}, -#line 384 "CSSValueKeywords.gperf" - {"visiblefill", CSSValueVisiblefill}, -#line 519 "CSSValueKeywords.gperf" - {"evenodd", CSSValueEvenodd}, -#line 118 "CSSValueKeywords.gperf" - {"threedlightshadow", CSSValueThreedlightshadow}, -#line 275 "CSSValueKeywords.gperf" - {"pre-wrap", CSSValuePreWrap}, -#line 513 "CSSValueKeywords.gperf" - {"turquoise", CSSValueTurquoise}, +#line 544 "CSSValueKeywords.gperf" + {"reset-size", CSSValueResetSize}, +#line 510 "CSSValueKeywords.gperf" + {"steelblue", CSSValueSteelblue}, #line 70 "CSSValueKeywords.gperf" {"sans-serif", CSSValueSansSerif}, -#line 31 "CSSValueKeywords.gperf" - {"status-bar", CSSValueStatusBar}, -#line 485 "CSSValueKeywords.gperf" - {"palegoldenrod", CSSValuePalegoldenrod}, +#line 341 "CSSValueKeywords.gperf" + {"media-slider", CSSValueMediaSlider}, +#line 229 "CSSValueKeywords.gperf" + {"text", CSSValueText}, +#line 95 "CSSValueKeywords.gperf" + {"activeborder", CSSValueActiveborder}, +#line 293 "CSSValueKeywords.gperf" + {"block-axis", CSSValueBlockAxis}, +#line 289 "CSSValueKeywords.gperf" + {"reverse", CSSValueReverse}, +#line 247 "CSSValueKeywords.gperf" + {"bidi-override", CSSValueBidiOverride}, +#line 102 "CSSValueKeywords.gperf" + {"buttontext", CSSValueButtontext}, +#line 140 "CSSValueKeywords.gperf" + {"destination-atop", CSSValueDestinationAtop}, +#line 469 "CSSValueKeywords.gperf" + {"mediumblue", CSSValueMediumblue}, +#line 476 "CSSValueKeywords.gperf" + {"mediumvioletred", CSSValueMediumvioletred}, +#line 444 "CSSValueKeywords.gperf" + {"ivory", CSSValueIvory}, +#line 381 "CSSValueKeywords.gperf" + {"ease-in-out", CSSValueEaseInOut}, +#line 540 "CSSValueKeywords.gperf" + {"hanging", CSSValueHanging}, +#line 367 "CSSValueKeywords.gperf" + {"content-box", CSSValueContentBox}, +#line 458 "CSSValueKeywords.gperf" + {"lightsalmon", CSSValueLightsalmon}, +#line 399 "CSSValueKeywords.gperf" + {"burlywood", CSSValueBurlywood}, +#line 436 "CSSValueKeywords.gperf" + {"ghostwhite", CSSValueGhostwhite}, +#line 177 "CSSValueKeywords.gperf" + {"georgian", CSSValueGeorgian}, +#line 418 "CSSValueKeywords.gperf" + {"darkorchid", CSSValueDarkorchid}, #line 244 "CSSValueKeywords.gperf" {"always", CSSValueAlways}, -#line 438 "CSSValueKeywords.gperf" - {"greenyellow", CSSValueGreenyellow}, -#line 250 "CSSValueKeywords.gperf" - {"close-quote", CSSValueCloseQuote}, -#line 482 "CSSValueKeywords.gperf" - {"olivedrab", CSSValueOlivedrab}, -#line 543 "CSSValueKeywords.gperf" - {"reset-size", CSSValueResetSize}, -#line 212 "CSSValueKeywords.gperf" - {"not-allowed", CSSValueNotAllowed}, -#line 96 "CSSValueKeywords.gperf" - {"activecaption", CSSValueActivecaption}, -#line 99 "CSSValueKeywords.gperf" - {"buttonface", CSSValueButtonface}, -#line 122 "CSSValueKeywords.gperf" - {"windowtext", CSSValueWindowtext}, -#line 474 "CSSValueKeywords.gperf" - {"mediumturquoise", CSSValueMediumturquoise}, -#line 49 "CSSValueKeywords.gperf" - {"xx-small", CSSValueXxSmall}, -#line 71 "CSSValueKeywords.gperf" - {"cursive", CSSValueCursive}, -#line 266 "CSSValueKeywords.gperf" - {"no-close-quote", CSSValueNoCloseQuote}, -#line 429 "CSSValueKeywords.gperf" - {"dimgrey", CSSValueDimgrey}, -#line 428 "CSSValueKeywords.gperf" - {"dimgray", CSSValueDimgray}, -#line 490 "CSSValueKeywords.gperf" - {"peachpuff", CSSValuePeachpuff}, -#line 225 "CSSValueKeywords.gperf" - {"nesw-resize", CSSValueNeswResize}, -#line 267 "CSSValueKeywords.gperf" - {"no-open-quote", CSSValueNoOpenQuote}, -#line 541 "CSSValueKeywords.gperf" - {"use-script", CSSValueUseScript}, -#line 407 "CSSValueKeywords.gperf" - {"darkblue", CSSValueDarkblue}, -#line 291 "CSSValueKeywords.gperf" - {"inline-axis", CSSValueInlineAxis}, -#line 354 "CSSValueKeywords.gperf" - {"searchfield", CSSValueSearchfield}, -#line 383 "CSSValueKeywords.gperf" - {"visiblepainted", CSSValueVisiblepainted}, -#line 254 "CSSValueKeywords.gperf" - {"fixed", CSSValueFixed}, -#line 444 "CSSValueKeywords.gperf" - {"khaki", CSSValueKhaki}, -#line 414 "CSSValueKeywords.gperf" - {"darkmagenta", CSSValueDarkmagenta}, -#line 103 "CSSValueKeywords.gperf" - {"captiontext", CSSValueCaptiontext}, -#line 517 "CSSValueKeywords.gperf" - {"yellowgreen", CSSValueYellowgreen}, -#line 488 "CSSValueKeywords.gperf" - {"palevioletred", CSSValuePalevioletred}, -#line 489 "CSSValueKeywords.gperf" - {"papayawhip", CSSValuePapayawhip}, -#line 494 "CSSValueKeywords.gperf" - {"powderblue", CSSValuePowderblue}, -#line 78 "CSSValueKeywords.gperf" - {"fuchsia", CSSValueFuchsia}, -#line 411 "CSSValueKeywords.gperf" - {"darkgreen", CSSValueDarkgreen}, -#line 100 "CSSValueKeywords.gperf" - {"buttonhighlight", CSSValueButtonhighlight}, -#line 420 "CSSValueKeywords.gperf" - {"darkseagreen", CSSValueDarkseagreen}, -#line 421 "CSSValueKeywords.gperf" - {"darkslateblue", CSSValueDarkslateblue}, -#line 416 "CSSValueKeywords.gperf" - {"darkorange", CSSValueDarkorange}, -#line 186 "CSSValueKeywords.gperf" - {"run-in", CSSValueRunIn}, -#line 171 "CSSValueKeywords.gperf" - {"lower-alpha", CSSValueLowerAlpha}, -#line 101 "CSSValueKeywords.gperf" - {"buttonshadow", CSSValueButtonshadow}, -#line 180 "CSSValueKeywords.gperf" - {"katakana", CSSValueKatakana}, -#line 349 "CSSValueKeywords.gperf" - {"slider-horizontal", CSSValueSliderHorizontal}, -#line 134 "CSSValueKeywords.gperf" - {"source-in", CSSValueSourceIn}, -#line 188 "CSSValueKeywords.gperf" - {"inline-block", CSSValueInlineBlock}, +#line 169 "CSSValueKeywords.gperf" + {"upper-roman", CSSValueUpperRoman}, #line 172 "CSSValueKeywords.gperf" {"lower-latin", CSSValueLowerLatin}, -#line 396 "CSSValueKeywords.gperf" - {"blueviolet", CSSValueBlueviolet}, -#line 136 "CSSValueKeywords.gperf" - {"source-atop", CSSValueSourceAtop}, +#line 448 "CSSValueKeywords.gperf" + {"lawngreen", CSSValueLawngreen}, +#line 49 "CSSValueKeywords.gperf" + {"xx-small", CSSValueXxSmall}, +#line 473 "CSSValueKeywords.gperf" + {"mediumslateblue", CSSValueMediumslateblue}, +#line 270 "CSSValueKeywords.gperf" + {"open-quote", CSSValueOpenQuote}, +#line 472 "CSSValueKeywords.gperf" + {"mediumseagreen", CSSValueMediumseagreen}, +#line 325 "CSSValueKeywords.gperf" + {"checkbox", CSSValueCheckbox}, +#line 157 "CSSValueKeywords.gperf" + {"justify", CSSValueJustify}, #line 226 "CSSValueKeywords.gperf" {"nwse-resize", CSSValueNwseResize}, -#line 499 "CSSValueKeywords.gperf" - {"sandybrown", CSSValueSandybrown}, +#line 254 "CSSValueKeywords.gperf" + {"fixed", CSSValueFixed}, +#line 72 "CSSValueKeywords.gperf" + {"fantasy", CSSValueFantasy}, +#line 425 "CSSValueKeywords.gperf" + {"darkturquoise", CSSValueDarkturquoise}, +#line 457 "CSSValueKeywords.gperf" + {"lightpink", CSSValueLightpink}, +#line 276 "CSSValueKeywords.gperf" + {"pre-wrap", CSSValuePreWrap}, +#line 125 "CSSValueKeywords.gperf" + {"grey", CSSValueGrey}, +#line 471 "CSSValueKeywords.gperf" + {"mediumpurple", CSSValueMediumpurple}, +#line 507 "CSSValueKeywords.gperf" + {"slategrey", CSSValueSlategrey}, +#line 328 "CSSValueKeywords.gperf" + {"square-button", CSSValueSquareButton}, +#line 506 "CSSValueKeywords.gperf" + {"slategray", CSSValueSlategray}, +#line 430 "CSSValueKeywords.gperf" + {"dimgrey", CSSValueDimgrey}, +#line 137 "CSSValueKeywords.gperf" + {"destination-over", CSSValueDestinationOver}, +#line 429 "CSSValueKeywords.gperf" + {"dimgray", CSSValueDimgray}, #line 208 "CSSValueKeywords.gperf" {"context-menu", CSSValueContextMenu}, -#line 168 "CSSValueKeywords.gperf" - {"lower-roman", CSSValueLowerRoman}, -#line 346 "CSSValueKeywords.gperf" - {"menulist-button", CSSValueMenulistButton}, -#line 319 "CSSValueKeywords.gperf" - {"skip-white-space", CSSValueSkipWhiteSpace}, -#line 55 "CSSValueKeywords.gperf" - {"xx-large", CSSValueXxLarge}, -#line 340 "CSSValueKeywords.gperf" - {"media-slider", CSSValueMediaSlider}, -#line 368 "CSSValueKeywords.gperf" - {"content-box", CSSValueContentBox}, -#line 459 "CSSValueKeywords.gperf" - {"lightskyblue", CSSValueLightskyblue}, -#line 315 "CSSValueKeywords.gperf" +#line 528 "CSSValueKeywords.gperf" + {"geometricprecision", CSSValueGeometricprecision}, +#line 91 "CSSValueKeywords.gperf" + {"yellow", CSSValueYellow}, +#line 316 "CSSValueKeywords.gperf" {"dot-dash", CSSValueDotDash}, -#line 533 "CSSValueKeywords.gperf" - {"after-edge", CSSValueAfterEdge}, -#line 135 "CSSValueKeywords.gperf" - {"source-out", CSSValueSourceOut}, -#line 228 "CSSValueKeywords.gperf" - {"row-resize", CSSValueRowResize}, -#line 385 "CSSValueKeywords.gperf" - {"visiblestroke", CSSValueVisiblestroke}, -#line 418 "CSSValueKeywords.gperf" - {"darkred", CSSValueDarkred}, -#line 107 "CSSValueKeywords.gperf" - {"inactiveborder", CSSValueInactiveborder}, -#line 102 "CSSValueKeywords.gperf" - {"buttontext", CSSValueButtontext}, -#line 104 "CSSValueKeywords.gperf" - {"graytext", CSSValueGraytext}, -#line 380 "CSSValueKeywords.gperf" - {"ease-in-out", CSSValueEaseInOut}, -#line 138 "CSSValueKeywords.gperf" - {"destination-in", CSSValueDestinationIn}, -#line 417 "CSSValueKeywords.gperf" - {"darkorchid", CSSValueDarkorchid}, -#line 143 "CSSValueKeywords.gperf" - {"plus-lighter", CSSValuePlusLighter}, -#line 475 "CSSValueKeywords.gperf" - {"mediumvioletred", CSSValueMediumvioletred}, -#line 97 "CSSValueKeywords.gperf" - {"appworkspace", CSSValueAppworkspace}, -#line 140 "CSSValueKeywords.gperf" - {"destination-atop", CSSValueDestinationAtop}, -#line 324 "CSSValueKeywords.gperf" - {"checkbox", CSSValueCheckbox}, +#line 477 "CSSValueKeywords.gperf" + {"midnightblue", CSSValueMidnightblue}, +#line 155 "CSSValueKeywords.gperf" + {"right", CSSValueRight}, +#line 98 "CSSValueKeywords.gperf" + {"background", CSSValueBackground}, +#line 39 "CSSValueKeywords.gperf" + {"lighter", CSSValueLighter}, +#line 361 "CSSValueKeywords.gperf" + {"textarea", CSSValueTextarea}, +#line 225 "CSSValueKeywords.gperf" + {"nesw-resize", CSSValueNeswResize}, +#line 468 "CSSValueKeywords.gperf" + {"mediumaquamarine", CSSValueMediumaquamarine}, #line 110 "CSSValueKeywords.gperf" {"infobackground", CSSValueInfobackground}, -#line 326 "CSSValueKeywords.gperf" - {"push-button", CSSValuePushButton}, -#line 320 "CSSValueKeywords.gperf" - {"break-all", CSSValueBreakAll}, -#line 531 "CSSValueKeywords.gperf" - {"optimizelegibility", CSSValueOptimizelegibility}, -#line 109 "CSSValueKeywords.gperf" - {"inactivecaptiontext", CSSValueInactivecaptiontext}, -#line 157 "CSSValueKeywords.gperf" - {"justify", CSSValueJustify}, -#line 173 "CSSValueKeywords.gperf" - {"upper-alpha", CSSValueUpperAlpha}, -#line 351 "CSSValueKeywords.gperf" - {"sliderthumb-horizontal", CSSValueSliderthumbHorizontal}, -#line 426 "CSSValueKeywords.gperf" - {"deeppink", CSSValueDeeppink}, -#line 139 "CSSValueKeywords.gperf" - {"destination-out", CSSValueDestinationOut}, +#line 113 "CSSValueKeywords.gperf" + {"menutext", CSSValueMenutext}, +#line 542 "CSSValueKeywords.gperf" + {"use-script", CSSValueUseScript}, +#line 481 "CSSValueKeywords.gperf" + {"navajowhite", CSSValueNavajowhite}, #line 61 "CSSValueKeywords.gperf" {"ultra-condensed", CSSValueUltraCondensed}, -#line 408 "CSSValueKeywords.gperf" - {"darkcyan", CSSValueDarkcyan}, -#line 174 "CSSValueKeywords.gperf" - {"upper-latin", CSSValueUpperLatin}, -#line 148 "CSSValueKeywords.gperf" - {"text-top", CSSValueTextTop}, -#line 296 "CSSValueKeywords.gperf" - {"backwards", CSSValueBackwards}, -#line 425 "CSSValueKeywords.gperf" - {"darkviolet", CSSValueDarkviolet}, -#line 359 "CSSValueKeywords.gperf" - {"textfield", CSSValueTextfield}, -#line 169 "CSSValueKeywords.gperf" - {"upper-roman", CSSValueUpperRoman}, -#line 327 "CSSValueKeywords.gperf" - {"square-button", CSSValueSquareButton}, -#line 341 "CSSValueKeywords.gperf" - {"media-sliderthumb", CSSValueMediaSliderthumb}, -#line 64 "CSSValueKeywords.gperf" - {"semi-condensed", CSSValueSemiCondensed}, -#line 66 "CSSValueKeywords.gperf" - {"expanded", CSSValueExpanded}, -#line 323 "CSSValueKeywords.gperf" - {"after-white-space", CSSValueAfterWhiteSpace}, -#line 306 "CSSValueKeywords.gperf" - {"read-write", CSSValueReadWrite}, -#line 95 "CSSValueKeywords.gperf" - {"activeborder", CSSValueActiveborder}, -#line 347 "CSSValueKeywords.gperf" - {"menulist-text", CSSValueMenulistText}, -#line 398 "CSSValueKeywords.gperf" - {"burlywood", CSSValueBurlywood}, -#line 525 "CSSValueKeywords.gperf" - {"optimizequality", CSSValueOptimizequality}, -#line 452 "CSSValueKeywords.gperf" - {"lightgoldenrodyellow", CSSValueLightgoldenrodyellow}, -#line 424 "CSSValueKeywords.gperf" - {"darkturquoise", CSSValueDarkturquoise}, -#line 532 "CSSValueKeywords.gperf" - {"before-edge", CSSValueBeforeEdge}, -#line 26 "CSSValueKeywords.gperf" - {"message-box", CSSValueMessageBox}, -#line 350 "CSSValueKeywords.gperf" - {"slider-vertical", CSSValueSliderVertical}, -#line 149 "CSSValueKeywords.gperf" - {"text-bottom", CSSValueTextBottom}, -#line 269 "CSSValueKeywords.gperf" - {"open-quote", CSSValueOpenQuote}, -#line 178 "CSSValueKeywords.gperf" - {"cjk-ideographic", CSSValueCjkIdeographic}, -#line 98 "CSSValueKeywords.gperf" - {"background", CSSValueBackground}, -#line 412 "CSSValueKeywords.gperf" +#line 451 "CSSValueKeywords.gperf" + {"lightcoral", CSSValueLightcoral}, +#line 143 "CSSValueKeywords.gperf" + {"plus-lighter", CSSValuePlusLighter}, +#line 362 "CSSValueKeywords.gperf" + {"caps-lock-indicator", CSSValueCapsLockIndicator}, +#line 168 "CSSValueKeywords.gperf" + {"lower-roman", CSSValueLowerRoman}, +#line 495 "CSSValueKeywords.gperf" + {"powderblue", CSSValuePowderblue}, +#line 101 "CSSValueKeywords.gperf" + {"buttonshadow", CSSValueButtonshadow}, +#line 139 "CSSValueKeywords.gperf" + {"destination-out", CSSValueDestinationOut}, +#line 534 "CSSValueKeywords.gperf" + {"after-edge", CSSValueAfterEdge}, +#line 413 "CSSValueKeywords.gperf" {"darkgrey", CSSValueDarkgrey}, -#line 195 "CSSValueKeywords.gperf" - {"table-column-group", CSSValueTableColumnGroup}, -#line 410 "CSSValueKeywords.gperf" +#line 411 "CSSValueKeywords.gperf" {"darkgray", CSSValueDarkgray}, -#line 367 "CSSValueKeywords.gperf" - {"border-box", CSSValueBorderBox}, -#line 330 "CSSValueKeywords.gperf" - {"default-button", CSSValueDefaultButton}, -#line 292 "CSSValueKeywords.gperf" - {"block-axis", CSSValueBlockAxis}, -#line 247 "CSSValueKeywords.gperf" - {"bidi-override", CSSValueBidiOverride}, -#line 115 "CSSValueKeywords.gperf" - {"threeddarkshadow", CSSValueThreeddarkshadow}, -#line 415 "CSSValueKeywords.gperf" - {"darkolivegreen", CSSValueDarkolivegreen}, -#line 191 "CSSValueKeywords.gperf" - {"table-row-group", CSSValueTableRowGroup}, -#line 423 "CSSValueKeywords.gperf" +#line 404 "CSSValueKeywords.gperf" + {"cornflowerblue", CSSValueCornflowerblue}, +#line 327 "CSSValueKeywords.gperf" + {"push-button", CSSValuePushButton}, +#line 31 "CSSValueKeywords.gperf" + {"status-bar", CSSValueStatusBar}, +#line 228 "CSSValueKeywords.gperf" + {"row-resize", CSSValueRowResize}, +#line 121 "CSSValueKeywords.gperf" + {"windowframe", CSSValueWindowframe}, +#line 175 "CSSValueKeywords.gperf" + {"hebrew", CSSValueHebrew}, +#line 122 "CSSValueKeywords.gperf" + {"windowtext", CSSValueWindowtext}, +#line 424 "CSSValueKeywords.gperf" {"darkslategrey", CSSValueDarkslategrey}, -#line 422 "CSSValueKeywords.gperf" +#line 423 "CSSValueKeywords.gperf" {"darkslategray", CSSValueDarkslategray}, -#line 366 "CSSValueKeywords.gperf" +#line 538 "CSSValueKeywords.gperf" + {"ideographic", CSSValueIdeographic}, +#line 206 "CSSValueKeywords.gperf" + {"vertical-text", CSSValueVerticalText}, +#line 173 "CSSValueKeywords.gperf" + {"upper-alpha", CSSValueUpperAlpha}, +#line 391 "CSSValueKeywords.gperf" + {"antiquewhite", CSSValueAntiquewhite}, +#line 115 "CSSValueKeywords.gperf" + {"threeddarkshadow", CSSValueThreeddarkshadow}, +#line 526 "CSSValueKeywords.gperf" + {"optimizequality", CSSValueOptimizequality}, +#line 148 "CSSValueKeywords.gperf" + {"text-top", CSSValueTextTop}, +#line 433 "CSSValueKeywords.gperf" + {"floralwhite", CSSValueFloralwhite}, +#line 178 "CSSValueKeywords.gperf" + {"cjk-ideographic", CSSValueCjkIdeographic}, +#line 365 "CSSValueKeywords.gperf" + {"border-box", CSSValueBorderBox}, +#line 440 "CSSValueKeywords.gperf" + {"honeydew", CSSValueHoneydew}, +#line 271 "CSSValueKeywords.gperf" + {"overlay", CSSValueOverlay}, +#line 322 "CSSValueKeywords.gperf" + {"break-word", CSSValueBreakWord}, +#line 450 "CSSValueKeywords.gperf" + {"lightblue", CSSValueLightblue}, +#line 500 "CSSValueKeywords.gperf" + {"sandybrown", CSSValueSandybrown}, +#line 496 "CSSValueKeywords.gperf" + {"rosybrown", CSSValueRosybrown}, +#line 439 "CSSValueKeywords.gperf" + {"greenyellow", CSSValueGreenyellow}, +#line 532 "CSSValueKeywords.gperf" + {"optimizelegibility", CSSValueOptimizelegibility}, +#line 369 "CSSValueKeywords.gperf" {"padding-box", CSSValuePaddingBox}, -#line 375 "CSSValueKeywords.gperf" - {"preserve-3d", CSSValuePreserve3d}, -#line 133 "CSSValueKeywords.gperf" - {"source-over", CSSValueSourceOver}, -#line 128 "CSSValueKeywords.gperf" - {"repeat-x", CSSValueRepeatX}, -#line 334 "CSSValueKeywords.gperf" - {"media-mute-button", CSSValueMediaMuteButton}, -#line 409 "CSSValueKeywords.gperf" - {"darkgoldenrod", CSSValueDarkgoldenrod}, -#line 129 "CSSValueKeywords.gperf" - {"repeat-y", CSSValueRepeatY}, #line 182 "CSSValueKeywords.gperf" {"katakana-iroha", CSSValueKatakanaIroha}, +#line 320 "CSSValueKeywords.gperf" + {"skip-white-space", CSSValueSkipWhiteSpace}, +#line 470 "CSSValueKeywords.gperf" + {"mediumorchid", CSSValueMediumorchid}, +#line 463 "CSSValueKeywords.gperf" + {"lightsteelblue", CSSValueLightsteelblue}, +#line 455 "CSSValueKeywords.gperf" + {"lightgreen", CSSValueLightgreen}, +#line 65 "CSSValueKeywords.gperf" + {"semi-expanded", CSSValueSemiExpanded}, +#line 459 "CSSValueKeywords.gperf" + {"lightseagreen", CSSValueLightseagreen}, +#line 347 "CSSValueKeywords.gperf" + {"menulist-button", CSSValueMenulistButton}, +#line 350 "CSSValueKeywords.gperf" + {"slider-horizontal", CSSValueSliderHorizontal}, +#line 128 "CSSValueKeywords.gperf" + {"repeat-x", CSSValueRepeatX}, #line 170 "CSSValueKeywords.gperf" {"lower-greek", CSSValueLowerGreek}, -#line 305 "CSSValueKeywords.gperf" - {"read-only", CSSValueReadOnly}, -#line 352 "CSSValueKeywords.gperf" - {"sliderthumb-vertical", CSSValueSliderthumbVertical}, -#line 321 "CSSValueKeywords.gperf" - {"break-word", CSSValueBreakWord}, +#line 475 "CSSValueKeywords.gperf" + {"mediumturquoise", CSSValueMediumturquoise}, +#line 171 "CSSValueKeywords.gperf" + {"lower-alpha", CSSValueLowerAlpha}, +#line 55 "CSSValueKeywords.gperf" + {"xx-large", CSSValueXxLarge}, +#line 104 "CSSValueKeywords.gperf" + {"graytext", CSSValueGraytext}, +#line 129 "CSSValueKeywords.gperf" + {"repeat-y", CSSValueRepeatY}, +#line 490 "CSSValueKeywords.gperf" + {"papayawhip", CSSValuePapayawhip}, +#line 360 "CSSValueKeywords.gperf" + {"textfield", CSSValueTextfield}, +#line 149 "CSSValueKeywords.gperf" + {"text-bottom", CSSValueTextBottom}, +#line 533 "CSSValueKeywords.gperf" + {"before-edge", CSSValueBeforeEdge}, #line 62 "CSSValueKeywords.gperf" {"extra-condensed", CSSValueExtraCondensed}, -#line 329 "CSSValueKeywords.gperf" - {"button-bevel", CSSValueButtonBevel}, -#line 413 "CSSValueKeywords.gperf" - {"darkkhaki", CSSValueDarkkhaki}, -#line 137 "CSSValueKeywords.gperf" - {"destination-over", CSSValueDestinationOver}, -#line 68 "CSSValueKeywords.gperf" - {"ultra-expanded", CSSValueUltraExpanded}, -#line 193 "CSSValueKeywords.gperf" - {"table-footer-group", CSSValueTableFooterGroup}, -#line 192 "CSSValueKeywords.gperf" - {"table-header-group", CSSValueTableHeaderGroup}, -#line 206 "CSSValueKeywords.gperf" - {"vertical-text", CSSValueVerticalText}, -#line 65 "CSSValueKeywords.gperf" - {"semi-expanded", CSSValueSemiExpanded}, -#line 142 "CSSValueKeywords.gperf" - {"plus-darker", CSSValuePlusDarker}, -#line 427 "CSSValueKeywords.gperf" - {"deepskyblue", CSSValueDeepskyblue}, -#line 333 "CSSValueKeywords.gperf" - {"media-fullscreen-button", CSSValueMediaFullscreenButton}, -#line 355 "CSSValueKeywords.gperf" - {"searchfield-decoration", CSSValueSearchfieldDecoration}, -#line 338 "CSSValueKeywords.gperf" - {"media-rewind-button", CSSValueMediaRewindButton}, +#line 447 "CSSValueKeywords.gperf" + {"lavenderblush", CSSValueLavenderblush}, +#line 26 "CSSValueKeywords.gperf" + {"message-box", CSSValueMessageBox}, #line 348 "CSSValueKeywords.gperf" - {"menulist-textfield", CSSValueMenulistTextfield}, -#line 316 "CSSValueKeywords.gperf" + {"menulist-text", CSSValueMenulistText}, +#line 474 "CSSValueKeywords.gperf" + {"mediumspringgreen", CSSValueMediumspringgreen}, +#line 452 "CSSValueKeywords.gperf" + {"lightcyan", CSSValueLightcyan}, +#line 307 "CSSValueKeywords.gperf" + {"read-write", CSSValueReadWrite}, +#line 257 "CSSValueKeywords.gperf" + {"higher", CSSValueHigher}, +#line 518 "CSSValueKeywords.gperf" + {"yellowgreen", CSSValueYellowgreen}, +#line 317 "CSSValueKeywords.gperf" {"dot-dot-dash", CSSValueDotDotDash}, +#line 449 "CSSValueKeywords.gperf" + {"lemonchiffon", CSSValueLemonchiffon}, +#line 306 "CSSValueKeywords.gperf" + {"read-only", CSSValueReadOnly}, +#line 355 "CSSValueKeywords.gperf" + {"searchfield", CSSValueSearchfield}, +#line 181 "CSSValueKeywords.gperf" + {"hiragana-iroha", CSSValueHiraganaIroha}, +#line 195 "CSSValueKeywords.gperf" + {"table-column-group", CSSValueTableColumnGroup}, +#line 118 "CSSValueKeywords.gperf" + {"threedlightshadow", CSSValueThreedlightshadow}, #line 335 "CSSValueKeywords.gperf" - {"media-play-button", CSSValueMediaPlayButton}, -#line 67 "CSSValueKeywords.gperf" - {"extra-expanded", CSSValueExtraExpanded}, -#line 358 "CSSValueKeywords.gperf" - {"searchfield-cancel-button", CSSValueSearchfieldCancelButton}, -#line 361 "CSSValueKeywords.gperf" - {"caps-lock-indicator", CSSValueCapsLockIndicator}, -#line 153 "CSSValueKeywords.gperf" - {"-webkit-auto", CSSValueWebkitAuto}, -#line 160 "CSSValueKeywords.gperf" - {"-webkit-center", CSSValueWebkitCenter}, + {"media-mute-button", CSSValueMediaMuteButton}, +#line 68 "CSSValueKeywords.gperf" + {"ultra-expanded", CSSValueUltraExpanded}, +#line 331 "CSSValueKeywords.gperf" + {"default-button", CSSValueDefaultButton}, +#line 93 "CSSValueKeywords.gperf" + {"-webkit-link", CSSValueWebkitLink}, #line 167 "CSSValueKeywords.gperf" {"decimal-leading-zero", CSSValueDecimalLeadingZero}, +#line 353 "CSSValueKeywords.gperf" + {"sliderthumb-vertical", CSSValueSliderthumbVertical}, +#line 94 "CSSValueKeywords.gperf" + {"-webkit-activelink", CSSValueWebkitActivelink}, +#line 464 "CSSValueKeywords.gperf" + {"lightyellow", CSSValueLightyellow}, +#line 428 "CSSValueKeywords.gperf" + {"deepskyblue", CSSValueDeepskyblue}, +#line 191 "CSSValueKeywords.gperf" + {"table-row-group", CSSValueTableRowGroup}, +#line 342 "CSSValueKeywords.gperf" + {"media-sliderthumb", CSSValueMediaSliderthumb}, +#line 160 "CSSValueKeywords.gperf" + {"-webkit-center", CSSValueWebkitCenter}, +#line 337 "CSSValueKeywords.gperf" + {"media-seek-back-button", CSSValueMediaSeekBackButton}, #line 30 "CSSValueKeywords.gperf" {"-webkit-control", CSSValueWebkitControl}, -#line 357 "CSSValueKeywords.gperf" - {"searchfield-results-button", CSSValueSearchfieldResultsButton}, -#line 284 "CSSValueKeywords.gperf" - {"-webkit-nowrap", CSSValueWebkitNowrap}, -#line 159 "CSSValueKeywords.gperf" - {"-webkit-right", CSSValueWebkitRight}, -#line 342 "CSSValueKeywords.gperf" - {"media-controls-background", CSSValueMediaControlsBackground}, -#line 536 "CSSValueKeywords.gperf" - {"text-after-edge", CSSValueTextAfterEdge}, +#line 261 "CSSValueKeywords.gperf" + {"line-through", CSSValueLineThrough}, +#line 153 "CSSValueKeywords.gperf" + {"-webkit-auto", CSSValueWebkitAuto}, +#line 456 "CSSValueKeywords.gperf" + {"lightgrey", CSSValueLightgrey}, +#line 454 "CSSValueKeywords.gperf" + {"lightgray", CSSValueLightgray}, +#line 324 "CSSValueKeywords.gperf" + {"after-white-space", CSSValueAfterWhiteSpace}, +#line 460 "CSSValueKeywords.gperf" + {"lightskyblue", CSSValueLightskyblue}, +#line 491 "CSSValueKeywords.gperf" + {"peachpuff", CSSValuePeachpuff}, +#line 336 "CSSValueKeywords.gperf" + {"media-play-button", CSSValueMediaPlayButton}, +#line 339 "CSSValueKeywords.gperf" + {"media-rewind-button", CSSValueMediaRewindButton}, +#line 117 "CSSValueKeywords.gperf" + {"threedhighlight", CSSValueThreedhighlight}, +#line 67 "CSSValueKeywords.gperf" + {"extra-expanded", CSSValueExtraExpanded}, +#line 462 "CSSValueKeywords.gperf" + {"lightslategrey", CSSValueLightslategrey}, +#line 461 "CSSValueKeywords.gperf" + {"lightslategray", CSSValueLightslategray}, +#line 213 "CSSValueKeywords.gperf" + {"-webkit-zoom-in", CSSValueWebkitZoomIn}, +#line 193 "CSSValueKeywords.gperf" + {"table-footer-group", CSSValueTableFooterGroup}, +#line 349 "CSSValueKeywords.gperf" + {"menulist-textfield", CSSValueMenulistTextfield}, #line 158 "CSSValueKeywords.gperf" {"-webkit-left", CSSValueWebkitLeft}, +#line 105 "CSSValueKeywords.gperf" + {"highlight", CSSValueHighlight}, +#line 285 "CSSValueKeywords.gperf" + {"-webkit-nowrap", CSSValueWebkitNowrap}, +#line 192 "CSSValueKeywords.gperf" + {"table-header-group", CSSValueTableHeaderGroup}, +#line 265 "CSSValueKeywords.gperf" + {"-webkit-marquee", CSSValueWebkitMarquee}, +#line 343 "CSSValueKeywords.gperf" + {"media-controls-background", CSSValueMediaControlsBackground}, #line 233 "CSSValueKeywords.gperf" {"-webkit-grab", CSSValueWebkitGrab}, -#line 535 "CSSValueKeywords.gperf" - {"text-before-edge", CSSValueTextBeforeEdge}, -#line 356 "CSSValueKeywords.gperf" - {"searchfield-results-decoration", CSSValueSearchfieldResultsDecoration}, -#line 93 "CSSValueKeywords.gperf" - {"-webkit-link", CSSValueWebkitLink}, -#line 264 "CSSValueKeywords.gperf" - {"-webkit-marquee", CSSValueWebkitMarquee}, +#line 29 "CSSValueKeywords.gperf" + {"-webkit-small-control", CSSValueWebkitSmallControl}, #line 126 "CSSValueKeywords.gperf" {"-webkit-text", CSSValueWebkitText}, +#line 28 "CSSValueKeywords.gperf" + {"-webkit-mini-control", CSSValueWebkitMiniControl}, +#line 334 "CSSValueKeywords.gperf" + {"media-fullscreen-button", CSSValueMediaFullscreenButton}, +#line 214 "CSSValueKeywords.gperf" + {"-webkit-zoom-out", CSSValueWebkitZoomOut}, +#line 100 "CSSValueKeywords.gperf" + {"buttonhighlight", CSSValueButtonhighlight}, #line 199 "CSSValueKeywords.gperf" {"-webkit-box", CSSValueWebkitBox}, +#line 352 "CSSValueKeywords.gperf" + {"sliderthumb-horizontal", CSSValueSliderthumbHorizontal}, +#line 356 "CSSValueKeywords.gperf" + {"searchfield-decoration", CSSValueSearchfieldDecoration}, +#line 152 "CSSValueKeywords.gperf" + {"-webkit-baseline-middle", CSSValueWebkitBaselineMiddle}, +#line 74 "CSSValueKeywords.gperf" + {"-webkit-body", CSSValueWebkitBody}, +#line 453 "CSSValueKeywords.gperf" + {"lightgoldenrodyellow", CSSValueLightgoldenrodyellow}, +#line 537 "CSSValueKeywords.gperf" + {"text-after-edge", CSSValueTextAfterEdge}, +#line 345 "CSSValueKeywords.gperf" + {"media-time-remaining-display", CSSValueMediaTimeRemainingDisplay}, +#line 159 "CSSValueKeywords.gperf" + {"-webkit-right", CSSValueWebkitRight}, +#line 536 "CSSValueKeywords.gperf" + {"text-before-edge", CSSValueTextBeforeEdge}, #line 234 "CSSValueKeywords.gperf" {"-webkit-grabbing", CSSValueWebkitGrabbing}, -#line 213 "CSSValueKeywords.gperf" - {"-webkit-zoom-in", CSSValueWebkitZoomIn}, +#line 200 "CSSValueKeywords.gperf" + {"-webkit-inline-box", CSSValueWebkitInlineBox}, #line 344 "CSSValueKeywords.gperf" - {"media-time-remaining-display", CSSValueMediaTimeRemainingDisplay}, -#line 343 "CSSValueKeywords.gperf" {"media-current-time-display", CSSValueMediaCurrentTimeDisplay}, -#line 29 "CSSValueKeywords.gperf" - {"-webkit-small-control", CSSValueWebkitSmallControl}, -#line 214 "CSSValueKeywords.gperf" - {"-webkit-zoom-out", CSSValueWebkitZoomOut}, -#line 339 "CSSValueKeywords.gperf" - {"media-return-to-realtime-button", CSSValueMediaReturnToRealtimeButton}, -#line 28 "CSSValueKeywords.gperf" - {"-webkit-mini-control", CSSValueWebkitMiniControl}, -#line 336 "CSSValueKeywords.gperf" - {"media-seek-back-button", CSSValueMediaSeekBackButton}, -#line 74 "CSSValueKeywords.gperf" - {"-webkit-body", CSSValueWebkitBody}, -#line 337 "CSSValueKeywords.gperf" +#line 106 "CSSValueKeywords.gperf" + {"highlighttext", CSSValueHighlighttext}, +#line 359 "CSSValueKeywords.gperf" + {"searchfield-cancel-button", CSSValueSearchfieldCancelButton}, +#line 338 "CSSValueKeywords.gperf" {"media-seek-forward-button", CSSValueMediaSeekForwardButton}, -#line 94 "CSSValueKeywords.gperf" - {"-webkit-activelink", CSSValueWebkitActivelink}, -#line 200 "CSSValueKeywords.gperf" - {"-webkit-inline-box", CSSValueWebkitInlineBox}, -#line 307 "CSSValueKeywords.gperf" +#line 340 "CSSValueKeywords.gperf" + {"media-return-to-realtime-button", CSSValueMediaReturnToRealtimeButton}, +#line 357 "CSSValueKeywords.gperf" + {"searchfield-results-decoration", CSSValueSearchfieldResultsDecoration}, +#line 358 "CSSValueKeywords.gperf" + {"searchfield-results-button", CSSValueSearchfieldResultsButton}, +#line 308 "CSSValueKeywords.gperf" {"read-write-plaintext-only", CSSValueReadWritePlaintextOnly}, -#line 152 "CSSValueKeywords.gperf" - {"-webkit-baseline-middle", CSSValueWebkitBaselineMiddle}, #line 123 "CSSValueKeywords.gperf" {"-webkit-focus-ring-color", CSSValueWebkitFocusRingColor}, #line 56 "CSSValueKeywords.gperf" @@ -1284,477 +1286,391 @@ findValue (register const char *str, register unsigned int len) { 0, -1, -1, -1, -1, 1, -1, -1, -1, -1, 2, -1, -1, -1, -1, 3, -1, -1, -1, -1, - 4, -1, 5, -1, -1, 6, 7, -1, -1, -1, - 8, -1, -1, -1, -1, 9, 10, -1, -1, -1, - 11, 12, -1, -1, -1, 13, 14, -1, -1, -1, - 15, 16, -1, -1, -1, 17, -1, -1, -1, -1, - 18, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 19, -1, -1, -1, -1, - 20, 21, -1, -1, -1, 22, 23, -1, -1, -1, - -1, -1, -1, -1, -1, 24, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 4, 5, -1, -1, -1, 6, -1, -1, -1, -1, + 7, -1, -1, -1, -1, 8, -1, -1, -1, -1, + 9, -1, -1, -1, -1, 10, -1, -1, -1, -1, + 11, -1, -1, -1, -1, 12, -1, -1, -1, -1, + 13, -1, 14, -1, -1, -1, 15, -1, -1, -1, + -1, -1, -1, -1, -1, 16, -1, -1, -1, -1, + 17, -1, -1, -1, -1, 18, 19, -1, -1, -1, + -1, -1, -1, -1, -1, 20, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 21, -1, -1, -1, + 22, -1, -1, -1, -1, 23, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, 25, -1, -1, -1, -1, 26, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 28, 29, -1, -1, -1, 30, 31, -1, -1, -1, - -1, -1, -1, -1, -1, 32, -1, -1, -1, -1, - 33, -1, -1, -1, -1, 34, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 35, 36, -1, -1, - 37, -1, 38, -1, -1, -1, 39, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 40, -1, -1, -1, - -1, 41, -1, -1, -1, 42, 43, 44, -1, -1, - -1, 45, -1, 46, -1, 47, -1, -1, -1, -1, - -1, 48, -1, -1, 49, -1, -1, -1, -1, -1, - -1, 50, -1, -1, -1, 51, 52, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 53, -1, 54, -1, -1, 55, -1, -1, -1, -1, - 56, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 57, -1, -1, -1, 58, -1, 59, -1, -1, - 60, -1, -1, 61, -1, 62, -1, -1, -1, -1, - 63, -1, 64, 65, -1, -1, 66, 67, -1, -1, - 68, -1, -1, -1, -1, 69, 70, -1, -1, -1, - -1, 71, -1, 72, -1, -1, -1, -1, -1, -1, - -1, -1, 73, 74, -1, 75, 76, -1, -1, -1, - -1, -1, -1, 77, -1, -1, -1, -1, -1, -1, - -1, 78, -1, -1, -1, 79, 80, -1, -1, -1, - 81, -1, -1, -1, -1, 82, 83, -1, -1, -1, - 84, 85, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 86, -1, 87, -1, -1, -1, 88, -1, -1, -1, - -1, 89, -1, -1, -1, 90, -1, -1, -1, -1, - -1, 91, 92, -1, -1, 93, 94, 95, -1, -1, - -1, 96, -1, -1, 97, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 98, -1, 99, -1, -1, 100, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 101, -1, -1, -1, -1, - -1, 102, -1, -1, -1, -1, 103, -1, -1, -1, - 104, -1, 105, -1, -1, 106, 107, -1, -1, -1, - 108, -1, 109, -1, -1, -1, -1, 110, 111, -1, - -1, -1, -1, -1, -1, -1, 112, -1, -1, -1, - 113, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 114, -1, -1, -1, - 115, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 116, -1, -1, -1, - -1, -1, -1, -1, -1, 117, 118, -1, -1, -1, - 119, -1, -1, -1, -1, 120, -1, -1, -1, -1, - -1, -1, -1, -1, 121, -1, -1, -1, -1, -1, - -1, -1, -1, 122, 123, -1, 124, -1, -1, -1, - 125, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 126, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 127, -1, -1, -1, - -1, 128, -1, -1, -1, -1, 129, -1, -1, -1, - 130, -1, -1, -1, -1, 131, -1, -1, -1, -1, - 132, -1, 133, -1, -1, -1, -1, -1, -1, -1, - 134, -1, -1, -1, 135, -1, -1, -1, -1, -1, - 136, -1, -1, -1, -1, 137, -1, -1, -1, -1, - -1, 138, -1, -1, -1, 139, -1, -1, -1, -1, - 140, -1, -1, -1, -1, -1, 141, -1, 142, -1, - 143, -1, -1, -1, -1, 144, -1, -1, -1, -1, - 145, 146, -1, -1, -1, -1, 147, -1, -1, -1, - 148, -1, -1, -1, -1, 149, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 150, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 151, -1, -1, -1, -1, - 152, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 153, -1, -1, -1, - -1, 154, -1, -1, -1, -1, 155, -1, -1, -1, - 156, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 157, -1, 158, 159, 160, 161, -1, - 162, 163, -1, -1, -1, 164, -1, -1, -1, -1, - -1, 165, -1, -1, -1, 166, -1, -1, -1, -1, - 167, 168, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 169, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 170, -1, -1, - -1, -1, 171, -1, -1, 172, 173, -1, -1, -1, - -1, 174, -1, -1, -1, 175, -1, 176, -1, -1, - -1, 177, -1, -1, -1, 178, 179, 180, -1, -1, - 181, 182, -1, 183, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 184, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 185, 186, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 187, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 188, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 189, -1, -1, -1, -1, -1, 190, -1, -1, - 191, -1, -1, -1, -1, -1, 192, -1, -1, -1, - 193, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 194, 195, -1, -1, 196, -1, -1, -1, -1, - 197, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 198, -1, -1, -1, -1, - -1, 199, -1, -1, -1, 200, -1, 201, -1, -1, - 202, -1, 203, -1, -1, -1, 204, -1, -1, -1, - -1, -1, -1, -1, -1, 205, -1, -1, -1, -1, - 206, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 207, -1, -1, -1, -1, - 208, -1, 209, -1, -1, 210, -1, 211, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 212, 213, 214, -1, -1, -1, 215, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 216, -1, -1, -1, -1, 217, 218, -1, -1, -1, - 219, -1, -1, -1, -1, 220, 221, -1, -1, -1, - 222, -1, -1, -1, -1, -1, 223, -1, 224, -1, - 225, 226, -1, -1, 227, -1, 228, -1, -1, -1, - 229, 230, -1, -1, -1, -1, -1, -1, -1, -1, - 231, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 232, -1, -1, -1, -1, 233, 234, -1, -1, -1, - 235, -1, 236, -1, -1, -1, -1, -1, -1, -1, - 237, 238, -1, -1, -1, 239, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 240, 241, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 242, 243, -1, -1, -1, - -1, 244, 245, -1, -1, -1, -1, 246, -1, -1, - -1, -1, -1, 247, -1, -1, -1, -1, -1, -1, - 248, 249, -1, -1, -1, -1, 250, -1, -1, -1, - -1, 251, 252, -1, -1, 253, 254, -1, -1, -1, - 255, -1, 256, -1, -1, 257, -1, -1, -1, -1, - -1, 258, -1, -1, -1, -1, -1, -1, -1, -1, - 259, -1, -1, -1, -1, 260, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 27, -1, 28, -1, -1, + -1, 29, 30, -1, -1, 31, -1, 32, -1, -1, + -1, 33, -1, -1, -1, -1, 34, -1, -1, -1, + -1, 35, -1, -1, -1, -1, 36, 37, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 38, -1, -1, -1, -1, + -1, 39, -1, -1, -1, 40, 41, -1, -1, -1, + -1, 42, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 43, -1, -1, -1, 44, -1, -1, -1, -1, + 45, -1, -1, -1, -1, 46, -1, -1, -1, -1, + 47, -1, 48, -1, -1, -1, 49, -1, -1, -1, + 50, -1, -1, -1, -1, -1, 51, -1, -1, -1, + 52, -1, 53, -1, -1, -1, -1, 54, -1, -1, + -1, 55, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 56, -1, -1, -1, -1, 57, -1, -1, -1, -1, + 58, 59, -1, -1, -1, -1, -1, -1, -1, -1, + 60, -1, -1, -1, -1, 61, -1, -1, -1, -1, + 62, -1, -1, -1, -1, 63, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 64, 65, -1, -1, -1, + 66, -1, 67, -1, -1, 68, -1, 69, -1, -1, + 70, 71, -1, -1, -1, -1, 72, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 73, -1, -1, -1, + -1, 74, -1, -1, -1, 75, -1, -1, -1, -1, + 76, -1, 77, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 78, -1, -1, -1, -1, -1, -1, -1, + -1, 79, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 80, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 81, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 82, -1, -1, 83, 84, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 85, -1, -1, + -1, 86, 87, -1, -1, -1, 88, -1, -1, -1, + -1, 89, -1, 90, -1, 91, -1, 92, -1, -1, + 93, -1, -1, -1, -1, -1, 94, 95, -1, -1, + -1, 96, -1, -1, -1, -1, 97, -1, -1, -1, + -1, 98, 99, -1, -1, 100, -1, -1, -1, -1, + -1, 101, 102, -1, -1, -1, 103, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 104, -1, -1, -1, + 105, -1, 106, -1, -1, 107, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 108, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 109, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 110, -1, 111, -1, -1, 112, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 113, -1, -1, -1, + -1, -1, 114, -1, -1, -1, -1, -1, -1, -1, + -1, 115, -1, -1, -1, 116, 117, 118, -1, -1, + 119, -1, -1, -1, -1, -1, 120, 121, -1, -1, + 122, 123, -1, -1, -1, 124, 125, -1, -1, -1, + 126, -1, 127, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 128, -1, -1, 129, -1, -1, -1, -1, + -1, 130, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 131, -1, -1, -1, -1, 132, 133, -1, -1, + -1, -1, -1, 134, -1, -1, -1, 135, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 136, -1, -1, -1, 137, -1, -1, -1, + 138, 139, -1, -1, -1, 140, -1, -1, -1, -1, + -1, 141, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 142, -1, -1, -1, + -1, 143, -1, -1, -1, -1, -1, -1, -1, -1, + 144, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 145, -1, -1, 146, 147, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 148, -1, + 149, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 150, 151, -1, -1, -1, 152, 153, -1, -1, -1, + 154, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 155, 156, -1, -1, -1, 157, -1, -1, -1, -1, + 158, -1, -1, -1, -1, -1, 159, 160, -1, -1, + 161, 162, -1, -1, -1, 163, -1, -1, -1, -1, + 164, -1, -1, -1, -1, 165, -1, -1, -1, -1, + -1, 166, 167, -1, -1, 168, -1, 169, -1, -1, + -1, 170, 171, -1, -1, -1, 172, 173, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 174, 175, -1, -1, -1, 176, 177, -1, -1, -1, + -1, 178, -1, -1, -1, -1, 179, -1, -1, -1, + 180, 181, 182, -1, -1, 183, -1, -1, -1, -1, + 184, -1, -1, -1, -1, 185, 186, 187, -1, -1, + -1, -1, -1, -1, -1, 188, 189, 190, -1, -1, + -1, -1, -1, -1, -1, -1, 191, -1, -1, -1, + -1, 192, -1, -1, -1, -1, 193, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 194, -1, -1, -1, + 195, -1, 196, -1, -1, 197, -1, -1, -1, -1, + 198, 199, -1, -1, -1, 200, -1, -1, 201, -1, + 202, -1, -1, -1, -1, 203, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 204, -1, -1, 205, -1, + -1, -1, -1, -1, -1, 206, -1, -1, -1, -1, + 207, -1, -1, -1, -1, -1, 208, 209, 210, -1, + 211, -1, -1, -1, -1, 212, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 213, + 214, -1, -1, -1, -1, 215, 216, -1, -1, -1, + -1, 217, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 218, 219, -1, -1, -1, -1, -1, -1, -1, -1, + 220, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 221, -1, -1, -1, -1, -1, -1, 222, -1, -1, + -1, -1, -1, -1, -1, 223, -1, -1, -1, -1, + 224, 225, -1, -1, -1, 226, -1, 227, -1, -1, + -1, -1, -1, -1, -1, 228, 229, -1, -1, -1, + -1, 230, -1, -1, -1, 231, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 232, 233, -1, 234, -1, + -1, 235, -1, -1, -1, -1, -1, -1, -1, -1, + 236, -1, 237, -1, -1, 238, -1, -1, -1, -1, + 239, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 240, -1, -1, -1, -1, -1, 241, -1, -1, + 242, 243, 244, -1, -1, -1, -1, 245, -1, -1, + -1, 246, -1, -1, -1, -1, -1, -1, 247, -1, + -1, 248, -1, -1, -1, 249, 250, 251, -1, -1, + 252, -1, -1, -1, -1, -1, -1, 253, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 254, + -1, 255, -1, -1, -1, 256, -1, -1, -1, -1, + 257, 258, -1, -1, -1, -1, -1, 259, -1, -1, + 260, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 261, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 262, -1, -1, - 263, 264, -1, -1, -1, -1, -1, 265, -1, -1, - -1, -1, -1, -1, -1, 266, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 267, -1, -1, 268, -1, 269, 270, -1, -1, -1, - -1, -1, -1, -1, -1, 271, -1, -1, -1, -1, - -1, 272, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 273, -1, -1, -1, -1, -1, -1, 274, -1, - -1, 275, -1, -1, -1, 276, 277, 278, -1, -1, - -1, -1, -1, -1, -1, 279, -1, -1, -1, -1, - -1, 280, -1, -1, -1, 281, -1, -1, -1, -1, - 282, -1, -1, -1, -1, 283, 284, -1, -1, -1, - -1, 285, -1, -1, -1, 286, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 287, 288, -1, -1, - -1, 289, -1, -1, -1, 290, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 291, 292, -1, -1, -1, - 293, -1, -1, -1, -1, 294, -1, 295, -1, -1, - -1, -1, -1, -1, -1, 296, -1, -1, -1, -1, - 297, -1, -1, -1, 298, -1, -1, -1, -1, -1, + -1, 262, -1, -1, 263, -1, -1, 264, -1, -1, + -1, -1, 265, -1, -1, -1, -1, 266, -1, -1, + -1, 267, -1, -1, -1, 268, -1, -1, 269, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 270, -1, -1, -1, -1, 271, 272, -1, -1, -1, + -1, -1, -1, 273, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 274, -1, 275, -1, -1, -1, + -1, -1, 276, -1, -1, -1, -1, -1, -1, -1, + 277, -1, -1, -1, -1, -1, 278, -1, -1, -1, + -1, 279, -1, -1, -1, 280, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 299, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 300, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 301, -1, -1, -1, + -1, -1, 281, -1, -1, -1, -1, -1, 282, -1, + -1, -1, -1, 283, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 284, 285, -1, -1, + -1, -1, -1, -1, -1, -1, 286, -1, 287, -1, + -1, -1, -1, -1, -1, -1, -1, 288, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 302, -1, 303, -1, 304, -1, -1, -1, -1, - 305, -1, -1, -1, -1, -1, 306, -1, -1, -1, - -1, 307, -1, -1, -1, 308, -1, -1, -1, -1, - 309, -1, -1, -1, -1, 310, -1, -1, -1, -1, - 311, -1, -1, -1, -1, 312, -1, -1, -1, -1, - -1, -1, 313, -1, -1, -1, -1, -1, -1, -1, - -1, 314, -1, -1, -1, -1, 315, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 289, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 316, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 317, - -1, -1, 318, -1, -1, -1, -1, 319, -1, -1, - -1, -1, 320, -1, -1, -1, 321, -1, -1, -1, - -1, -1, 322, -1, -1, -1, -1, -1, -1, -1, + -1, 290, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 291, -1, -1, -1, -1, -1, 292, -1, -1, + 293, -1, 294, -1, -1, 295, -1, -1, -1, -1, + -1, 296, -1, -1, -1, 297, -1, -1, -1, -1, + 298, 299, 300, 301, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 302, -1, 303, -1, 304, -1, -1, + -1, 305, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 306, -1, -1, -1, 307, 308, -1, -1, + -1, 309, -1, -1, -1, -1, 310, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 311, -1, -1, -1, -1, -1, -1, 312, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 323, -1, -1, -1, - -1, 324, 325, -1, -1, 326, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 327, -1, -1, -1, -1, - 328, -1, -1, 329, -1, 330, 331, -1, -1, -1, - 332, -1, -1, -1, -1, 333, 334, -1, -1, -1, - -1, 335, 336, -1, -1, -1, -1, -1, -1, -1, - 337, -1, -1, -1, -1, 338, -1, 339, -1, -1, - -1, -1, -1, -1, -1, -1, 340, -1, -1, -1, + -1, 313, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 314, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 315, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 341, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 342, -1, -1, -1, + 316, -1, -1, -1, -1, -1, 317, -1, -1, -1, + -1, 318, 319, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 320, -1, -1, 321, -1, -1, + -1, -1, -1, -1, -1, -1, 322, 323, -1, 324, + -1, -1, 325, -1, -1, 326, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 327, 328, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 343, -1, -1, 344, -1, -1, -1, -1, -1, - -1, 345, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 346, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 347, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 348, 349, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 350, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 351, -1, - -1, 352, -1, -1, -1, -1, 353, -1, -1, -1, - 354, 355, -1, -1, -1, 356, -1, -1, -1, -1, - 357, -1, -1, 358, -1, -1, 359, -1, 360, -1, + -1, 329, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 330, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 361, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 362, -1, - -1, -1, -1, 363, -1, -1, -1, -1, 364, -1, - -1, -1, -1, -1, -1, -1, 365, -1, -1, -1, + -1, -1, 331, -1, -1, -1, -1, -1, -1, -1, + -1, 332, -1, -1, -1, -1, 333, -1, -1, -1, + -1, 334, -1, -1, -1, -1, -1, 335, -1, -1, + -1, 336, -1, -1, -1, 337, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 338, -1, -1, -1, -1, + 339, -1, -1, -1, -1, 340, -1, -1, -1, -1, + 341, -1, -1, -1, -1, 342, 343, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 344, -1, -1, -1, + -1, -1, 345, -1, -1, -1, 346, -1, -1, -1, + -1, -1, 347, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 348, -1, -1, -1, -1, -1, -1, -1, + 349, -1, -1, -1, -1, 350, 351, 352, -1, -1, + 353, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 354, -1, -1, + -1, 355, -1, -1, -1, -1, 356, -1, 357, -1, + -1, -1, 358, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 366, -1, -1, -1, - -1, -1, -1, 367, -1, -1, -1, -1, -1, -1, - 368, -1, -1, -1, -1, 369, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 370, 371, -1, -1, -1, - -1, 372, -1, -1, -1, -1, -1, 373, -1, -1, - 374, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 375, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 376, -1, 377, -1, -1, -1, -1, -1, -1, - 378, -1, -1, -1, 379, 380, -1, -1, -1, -1, + -1, -1, 359, -1, -1, -1, -1, -1, -1, -1, + -1, 360, 361, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 362, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 381, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 382, -1, -1, -1, -1, -1, -1, -1, -1, - 383, 384, -1, -1, -1, 385, 386, -1, -1, -1, - -1, -1, -1, -1, -1, 387, -1, -1, -1, -1, + -1, 363, 364, -1, 365, 366, -1, -1, -1, 367, + -1, 368, -1, -1, -1, -1, -1, 369, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 370, -1, + -1, 371, 372, -1, -1, -1, -1, -1, -1, -1, + -1, 373, -1, 374, -1, -1, -1, -1, -1, -1, + -1, -1, 375, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 388, 389, -1, -1, -1, -1, -1, -1, -1, - 390, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 391, -1, -1, -1, -1, -1, -1, -1, - 392, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 393, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 394, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 395, -1, -1, -1, -1, + -1, 376, 377, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 396, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 397, -1, -1, -1, -1, - -1, -1, 398, -1, -1, 399, -1, -1, -1, -1, + 378, -1, 379, -1, -1, -1, 380, 381, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 382, -1, + -1, 383, -1, 384, -1, -1, 385, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 400, -1, -1, -1, -1, 401, -1, -1, -1, -1, - -1, -1, -1, 402, 403, 404, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 405, -1, -1, -1, -1, -1, -1, -1, -1, 406, - -1, 407, 408, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 409, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 410, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 386, -1, -1, -1, + -1, -1, 387, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 388, -1, 389, -1, -1, -1, 390, 391, -1, -1, + -1, -1, -1, -1, -1, -1, 392, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 393, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 394, 395, 396, -1, + -1, 397, -1, -1, -1, 398, -1, -1, 399, -1, + -1, -1, -1, -1, -1, 400, 401, -1, -1, -1, + -1, -1, 402, 403, -1, -1, 404, -1, -1, -1, + -1, 405, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 406, -1, -1, + 407, -1, -1, -1, -1, -1, -1, 408, 409, -1, + -1, -1, -1, 410, -1, -1, -1, -1, -1, -1, + -1, 411, -1, -1, -1, -1, 412, -1, -1, -1, + -1, -1, -1, -1, -1, 413, 414, -1, 415, -1, + -1, 416, -1, -1, 417, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 411, -1, -1, -1, - 412, -1, -1, -1, -1, 413, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 418, -1, + -1, -1, -1, 419, -1, -1, 420, -1, -1, -1, + -1, -1, 421, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 414, -1, 415, -1, -1, + -1, -1, -1, -1, 422, -1, -1, -1, -1, -1, + -1, -1, -1, 423, -1, -1, -1, -1, -1, -1, + -1, -1, 424, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 416, -1, -1, -1, -1, 417, -1, -1, -1, -1, - -1, 418, -1, -1, -1, -1, -1, -1, -1, -1, + 425, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 426, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 419, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 427, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 428, -1, -1, -1, 429, 430, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 431, -1, -1, + -1, -1, 432, -1, -1, -1, -1, -1, -1, -1, + -1, 433, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 434, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 420, -1, -1, -1, -1, -1, -1, -1, 421, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 422, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 423, -1, 424, -1, -1, - -1, 425, -1, -1, -1, 426, -1, -1, 427, -1, - -1, -1, -1, -1, -1, 428, -1, -1, -1, -1, - -1, -1, 429, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 435, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 436, -1, + -1, -1, -1, -1, 437, -1, -1, 438, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 439, -1, -1, + -1, -1, 440, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 441, 442, 443, -1, -1, + -1, 444, -1, -1, -1, -1, -1, 445, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 430, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 431, -1, - 432, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 433, -1, -1, -1, -1, + 446, 447, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 448, -1, -1, -1, -1, 449, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 434, -1, -1, -1, -1, - -1, 435, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 436, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 437, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 450, -1, -1, + -1, 451, -1, -1, -1, -1, -1, -1, -1, -1, + 452, -1, -1, -1, -1, -1, -1, -1, 453, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 454, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 455, + -1, -1, -1, -1, -1, -1, 456, -1, -1, -1, + -1, 457, 458, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 459, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 460, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 438, -1, -1, -1, 439, 440, -1, -1, -1, - -1, -1, 441, -1, -1, 442, -1, -1, -1, -1, - -1, 443, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 444, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 445, -1, -1, - -1, -1, -1, 446, -1, -1, 447, -1, -1, -1, - -1, -1, -1, -1, -1, 448, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 449, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 450, -1, -1, -1, -1, -1, 451, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 461, -1, -1, + -1, 462, -1, -1, -1, -1, -1, 463, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 452, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 453, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 454, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 455, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 456, -1, -1, -1, -1, 457, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 458, -1, -1, -1, -1, 459, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 460, 461, -1, -1, -1, 462, 463, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 464, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 464, -1, -1, -1, 465, -1, -1, -1, -1, -1, -1, -1, -1, - 466, 467, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 468, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 469, -1, -1, -1, - -1, -1, 470, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 471, -1, -1, -1, -1, 472, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 473, -1, -1, -1, 474, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 466, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 475, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 476, -1, -1, -1, 477, -1, -1, -1, -1, + -1, -1, -1, 467, -1, -1, -1, -1, -1, -1, + 468, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 478, 479, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 469, 470, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 471, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 480, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 481, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 472, -1, -1, + -1, 473, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 474, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 482, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 483, -1, -1, + 475, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 476, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 484, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 477, -1, 478, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 485, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 486, -1, -1, -1, -1, - -1, 487, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 488, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 489, -1, -1, -1, -1, - -1, 490, 491, -1, -1, -1, -1, -1, -1, -1, + -1, 479, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 492, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 480, -1, -1, + -1, -1, -1, -1, 481, -1, -1, -1, -1, -1, + -1, -1, -1, 482, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 493, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 483, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 484, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 485, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 494, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 486, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 487, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 488, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 489, -1, -1, + -1, -1, 490, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 491, -1, + -1, -1, -1, 492, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 495, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 493, 494, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 495, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 496, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 496, -1, -1, -1, -1, -1, -1, -1, -1, -1, 497, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 498, -1, -1, + -1, -1, 499, -1, -1, -1, -1, -1, 500, -1, + -1, -1, -1, 501, -1, -1, -1, 502, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 498, -1, -1, -1, -1, -1, -1, -1, -1, - 499, 500, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 501, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 502, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 503, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 503, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 504, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 505, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1764,60 +1680,48 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 505, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 506, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 507, -1, -1, -1, -1, -1, -1, -1, -1, - 508, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 509, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 510, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 506, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 507, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 508, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 509, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 510, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 511, -1, -1, -1, 512, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 512, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 513, -1, -1, + -1, -1, -1, 513, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 514, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 515, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 514, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 515, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 516, 517, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 518, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 516, -1, -1, -1, -1, -1, -1, -1, + -1, 519, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 517, -1, -1, -1, + 520, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 521, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1835,60 +1739,21 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 518, 519, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 520, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 521, -1, 522, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 523, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 522, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 523, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 524, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 525, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 525, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 526, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 527, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 528, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 529, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 530, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1897,6 +1762,9 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 526, -1, + -1, -1, -1, -1, -1, -1, -1, 527, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 528, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1906,6 +1774,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 529, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1917,9 +1786,11 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 530, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 531, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 531, -1, + -1, -1, -1, -1, -1, 532, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1933,7 +1804,6 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 532, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1948,8 +1818,8 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 533, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 533, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1965,12 +1835,12 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 534, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 534, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1983,7 +1853,6 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 535, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1991,8 +1860,8 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 536, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 535, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -2006,6 +1875,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 536, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -2038,6 +1908,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 537, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -2063,6 +1934,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 538, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -2072,7 +1944,6 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 537, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -2130,34 +2001,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 538 + -1, 539 }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -2179,7 +2023,7 @@ findValue (register const char *str, register unsigned int len) } return 0; } -#line 550 "CSSValueKeywords.gperf" +#line 551 "CSSValueKeywords.gperf" static const char * const valueList[] = { "", @@ -2434,6 +2278,7 @@ static const char * const valueList[] = { "landscape", "level", "line-through", +"local", "loud", "lower", "-webkit-marquee", @@ -2536,11 +2381,11 @@ static const char * const valueList[] = { "caps-lock-indicator", "round", "border", +"border-box", "content", +"content-box", "padding", "padding-box", -"border-box", -"content-box", "logical", "visual", "lines", diff --git a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.h b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.h index b8f83c43c..6d2667d86 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.h +++ b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.h @@ -255,295 +255,296 @@ const int CSSValueInvert = 248; const int CSSValueLandscape = 249; const int CSSValueLevel = 250; const int CSSValueLineThrough = 251; -const int CSSValueLoud = 252; -const int CSSValueLower = 253; -const int CSSValueWebkitMarquee = 254; -const int CSSValueMix = 255; -const int CSSValueNoCloseQuote = 256; -const int CSSValueNoOpenQuote = 257; -const int CSSValueNowrap = 258; -const int CSSValueOpenQuote = 259; -const int CSSValueOverlay = 260; -const int CSSValueOverline = 261; -const int CSSValuePortrait = 262; -const int CSSValuePre = 263; -const int CSSValuePreLine = 264; -const int CSSValuePreWrap = 265; -const int CSSValueRelative = 266; -const int CSSValueScroll = 267; -const int CSSValueSeparate = 268; -const int CSSValueShow = 269; -const int CSSValueStatic = 270; -const int CSSValueThick = 271; -const int CSSValueThin = 272; -const int CSSValueUnderline = 273; -const int CSSValueWebkitNowrap = 274; -const int CSSValueStretch = 275; -const int CSSValueStart = 276; -const int CSSValueEnd = 277; -const int CSSValueReverse = 278; -const int CSSValueHorizontal = 279; -const int CSSValueVertical = 280; -const int CSSValueInlineAxis = 281; -const int CSSValueBlockAxis = 282; -const int CSSValueSingle = 283; -const int CSSValueMultiple = 284; -const int CSSValueForwards = 285; -const int CSSValueBackwards = 286; -const int CSSValueAhead = 287; -const int CSSValueUp = 288; -const int CSSValueDown = 289; -const int CSSValueSlow = 290; -const int CSSValueFast = 291; -const int CSSValueInfinite = 292; -const int CSSValueSlide = 293; -const int CSSValueAlternate = 294; -const int CSSValueReadOnly = 295; -const int CSSValueReadWrite = 296; -const int CSSValueReadWritePlaintextOnly = 297; -const int CSSValueElement = 298; -const int CSSValueIgnore = 299; -const int CSSValueIntrinsic = 300; -const int CSSValueMinIntrinsic = 301; -const int CSSValueClip = 302; -const int CSSValueEllipsis = 303; -const int CSSValueDiscard = 304; -const int CSSValueDotDash = 305; -const int CSSValueDotDotDash = 306; -const int CSSValueWave = 307; -const int CSSValueContinuous = 308; -const int CSSValueSkipWhiteSpace = 309; -const int CSSValueBreakAll = 310; -const int CSSValueBreakWord = 311; -const int CSSValueSpace = 312; -const int CSSValueAfterWhiteSpace = 313; -const int CSSValueCheckbox = 314; -const int CSSValueRadio = 315; -const int CSSValuePushButton = 316; -const int CSSValueSquareButton = 317; -const int CSSValueButton = 318; -const int CSSValueButtonBevel = 319; -const int CSSValueDefaultButton = 320; -const int CSSValueListbox = 321; -const int CSSValueListitem = 322; -const int CSSValueMediaFullscreenButton = 323; -const int CSSValueMediaMuteButton = 324; -const int CSSValueMediaPlayButton = 325; -const int CSSValueMediaSeekBackButton = 326; -const int CSSValueMediaSeekForwardButton = 327; -const int CSSValueMediaRewindButton = 328; -const int CSSValueMediaReturnToRealtimeButton = 329; -const int CSSValueMediaSlider = 330; -const int CSSValueMediaSliderthumb = 331; -const int CSSValueMediaControlsBackground = 332; -const int CSSValueMediaCurrentTimeDisplay = 333; -const int CSSValueMediaTimeRemainingDisplay = 334; -const int CSSValueMenulist = 335; -const int CSSValueMenulistButton = 336; -const int CSSValueMenulistText = 337; -const int CSSValueMenulistTextfield = 338; -const int CSSValueSliderHorizontal = 339; -const int CSSValueSliderVertical = 340; -const int CSSValueSliderthumbHorizontal = 341; -const int CSSValueSliderthumbVertical = 342; -const int CSSValueCaret = 343; -const int CSSValueSearchfield = 344; -const int CSSValueSearchfieldDecoration = 345; -const int CSSValueSearchfieldResultsDecoration = 346; -const int CSSValueSearchfieldResultsButton = 347; -const int CSSValueSearchfieldCancelButton = 348; -const int CSSValueTextfield = 349; -const int CSSValueTextarea = 350; -const int CSSValueCapsLockIndicator = 351; -const int CSSValueRound = 352; -const int CSSValueBorder = 353; -const int CSSValueContent = 354; -const int CSSValuePadding = 355; -const int CSSValuePaddingBox = 356; -const int CSSValueBorderBox = 357; -const int CSSValueContentBox = 358; -const int CSSValueLogical = 359; -const int CSSValueVisual = 360; -const int CSSValueLines = 361; -const int CSSValueRunning = 362; -const int CSSValuePaused = 363; -const int CSSValueFlat = 364; -const int CSSValuePreserve3d = 365; -const int CSSValueEase = 366; -const int CSSValueLinear = 367; -const int CSSValueEaseIn = 368; -const int CSSValueEaseOut = 369; -const int CSSValueEaseInOut = 370; -const int CSSValueDocument = 371; -const int CSSValueReset = 372; -const int CSSValueVisiblepainted = 373; -const int CSSValueVisiblefill = 374; -const int CSSValueVisiblestroke = 375; -const int CSSValuePainted = 376; -const int CSSValueFill = 377; -const int CSSValueStroke = 378; -const int CSSValueAliceblue = 379; -const int CSSValueAntiquewhite = 380; -const int CSSValueAquamarine = 381; -const int CSSValueAzure = 382; -const int CSSValueBeige = 383; -const int CSSValueBisque = 384; -const int CSSValueBlanchedalmond = 385; -const int CSSValueBlueviolet = 386; -const int CSSValueBrown = 387; -const int CSSValueBurlywood = 388; -const int CSSValueCadetblue = 389; -const int CSSValueChartreuse = 390; -const int CSSValueChocolate = 391; -const int CSSValueCoral = 392; -const int CSSValueCornflowerblue = 393; -const int CSSValueCornsilk = 394; -const int CSSValueCrimson = 395; -const int CSSValueCyan = 396; -const int CSSValueDarkblue = 397; -const int CSSValueDarkcyan = 398; -const int CSSValueDarkgoldenrod = 399; -const int CSSValueDarkgray = 400; -const int CSSValueDarkgreen = 401; -const int CSSValueDarkgrey = 402; -const int CSSValueDarkkhaki = 403; -const int CSSValueDarkmagenta = 404; -const int CSSValueDarkolivegreen = 405; -const int CSSValueDarkorange = 406; -const int CSSValueDarkorchid = 407; -const int CSSValueDarkred = 408; -const int CSSValueDarksalmon = 409; -const int CSSValueDarkseagreen = 410; -const int CSSValueDarkslateblue = 411; -const int CSSValueDarkslategray = 412; -const int CSSValueDarkslategrey = 413; -const int CSSValueDarkturquoise = 414; -const int CSSValueDarkviolet = 415; -const int CSSValueDeeppink = 416; -const int CSSValueDeepskyblue = 417; -const int CSSValueDimgray = 418; -const int CSSValueDimgrey = 419; -const int CSSValueDodgerblue = 420; -const int CSSValueFirebrick = 421; -const int CSSValueFloralwhite = 422; -const int CSSValueForestgreen = 423; -const int CSSValueGainsboro = 424; -const int CSSValueGhostwhite = 425; -const int CSSValueGold = 426; -const int CSSValueGoldenrod = 427; -const int CSSValueGreenyellow = 428; -const int CSSValueHoneydew = 429; -const int CSSValueHotpink = 430; -const int CSSValueIndianred = 431; -const int CSSValueIndigo = 432; -const int CSSValueIvory = 433; -const int CSSValueKhaki = 434; -const int CSSValueLavender = 435; -const int CSSValueLavenderblush = 436; -const int CSSValueLawngreen = 437; -const int CSSValueLemonchiffon = 438; -const int CSSValueLightblue = 439; -const int CSSValueLightcoral = 440; -const int CSSValueLightcyan = 441; -const int CSSValueLightgoldenrodyellow = 442; -const int CSSValueLightgray = 443; -const int CSSValueLightgreen = 444; -const int CSSValueLightgrey = 445; -const int CSSValueLightpink = 446; -const int CSSValueLightsalmon = 447; -const int CSSValueLightseagreen = 448; -const int CSSValueLightskyblue = 449; -const int CSSValueLightslategray = 450; -const int CSSValueLightslategrey = 451; -const int CSSValueLightsteelblue = 452; -const int CSSValueLightyellow = 453; -const int CSSValueLimegreen = 454; -const int CSSValueLinen = 455; -const int CSSValueMagenta = 456; -const int CSSValueMediumaquamarine = 457; -const int CSSValueMediumblue = 458; -const int CSSValueMediumorchid = 459; -const int CSSValueMediumpurple = 460; -const int CSSValueMediumseagreen = 461; -const int CSSValueMediumslateblue = 462; -const int CSSValueMediumspringgreen = 463; -const int CSSValueMediumturquoise = 464; -const int CSSValueMediumvioletred = 465; -const int CSSValueMidnightblue = 466; -const int CSSValueMintcream = 467; -const int CSSValueMistyrose = 468; -const int CSSValueMoccasin = 469; -const int CSSValueNavajowhite = 470; -const int CSSValueOldlace = 471; -const int CSSValueOlivedrab = 472; -const int CSSValueOrangered = 473; -const int CSSValueOrchid = 474; -const int CSSValuePalegoldenrod = 475; -const int CSSValuePalegreen = 476; -const int CSSValuePaleturquoise = 477; -const int CSSValuePalevioletred = 478; -const int CSSValuePapayawhip = 479; -const int CSSValuePeachpuff = 480; -const int CSSValuePeru = 481; -const int CSSValuePink = 482; -const int CSSValuePlum = 483; -const int CSSValuePowderblue = 484; -const int CSSValueRosybrown = 485; -const int CSSValueRoyalblue = 486; -const int CSSValueSaddlebrown = 487; -const int CSSValueSalmon = 488; -const int CSSValueSandybrown = 489; -const int CSSValueSeagreen = 490; -const int CSSValueSeashell = 491; -const int CSSValueSienna = 492; -const int CSSValueSkyblue = 493; -const int CSSValueSlateblue = 494; -const int CSSValueSlategray = 495; -const int CSSValueSlategrey = 496; -const int CSSValueSnow = 497; -const int CSSValueSpringgreen = 498; -const int CSSValueSteelblue = 499; -const int CSSValueTan = 500; -const int CSSValueThistle = 501; -const int CSSValueTomato = 502; -const int CSSValueTurquoise = 503; -const int CSSValueViolet = 504; -const int CSSValueWheat = 505; -const int CSSValueWhitesmoke = 506; -const int CSSValueYellowgreen = 507; -const int CSSValueNonzero = 508; -const int CSSValueEvenodd = 509; -const int CSSValueAccumulate = 510; -const int CSSValueNew = 511; -const int CSSValueSrgb = 512; -const int CSSValueLinearrgb = 513; -const int CSSValueOptimizespeed = 514; -const int CSSValueOptimizequality = 515; -const int CSSValueCrispedges = 516; -const int CSSValueGeometricprecision = 517; -const int CSSValueButt = 518; -const int CSSValueMiter = 519; -const int CSSValueBevel = 520; -const int CSSValueOptimizelegibility = 521; -const int CSSValueBeforeEdge = 522; -const int CSSValueAfterEdge = 523; -const int CSSValueCentral = 524; -const int CSSValueTextBeforeEdge = 525; -const int CSSValueTextAfterEdge = 526; -const int CSSValueIdeographic = 527; -const int CSSValueAlphabetic = 528; -const int CSSValueHanging = 529; -const int CSSValueMathematical = 530; -const int CSSValueUseScript = 531; -const int CSSValueNoChange = 532; -const int CSSValueResetSize = 533; -const int CSSValueLrTb = 534; -const int CSSValueRlTb = 535; -const int CSSValueTbRl = 536; -const int CSSValueLr = 537; -const int CSSValueRl = 538; -const int CSSValueTb = 539; -const int numCSSValueKeywords = 540; +const int CSSValueLocal = 252; +const int CSSValueLoud = 253; +const int CSSValueLower = 254; +const int CSSValueWebkitMarquee = 255; +const int CSSValueMix = 256; +const int CSSValueNoCloseQuote = 257; +const int CSSValueNoOpenQuote = 258; +const int CSSValueNowrap = 259; +const int CSSValueOpenQuote = 260; +const int CSSValueOverlay = 261; +const int CSSValueOverline = 262; +const int CSSValuePortrait = 263; +const int CSSValuePre = 264; +const int CSSValuePreLine = 265; +const int CSSValuePreWrap = 266; +const int CSSValueRelative = 267; +const int CSSValueScroll = 268; +const int CSSValueSeparate = 269; +const int CSSValueShow = 270; +const int CSSValueStatic = 271; +const int CSSValueThick = 272; +const int CSSValueThin = 273; +const int CSSValueUnderline = 274; +const int CSSValueWebkitNowrap = 275; +const int CSSValueStretch = 276; +const int CSSValueStart = 277; +const int CSSValueEnd = 278; +const int CSSValueReverse = 279; +const int CSSValueHorizontal = 280; +const int CSSValueVertical = 281; +const int CSSValueInlineAxis = 282; +const int CSSValueBlockAxis = 283; +const int CSSValueSingle = 284; +const int CSSValueMultiple = 285; +const int CSSValueForwards = 286; +const int CSSValueBackwards = 287; +const int CSSValueAhead = 288; +const int CSSValueUp = 289; +const int CSSValueDown = 290; +const int CSSValueSlow = 291; +const int CSSValueFast = 292; +const int CSSValueInfinite = 293; +const int CSSValueSlide = 294; +const int CSSValueAlternate = 295; +const int CSSValueReadOnly = 296; +const int CSSValueReadWrite = 297; +const int CSSValueReadWritePlaintextOnly = 298; +const int CSSValueElement = 299; +const int CSSValueIgnore = 300; +const int CSSValueIntrinsic = 301; +const int CSSValueMinIntrinsic = 302; +const int CSSValueClip = 303; +const int CSSValueEllipsis = 304; +const int CSSValueDiscard = 305; +const int CSSValueDotDash = 306; +const int CSSValueDotDotDash = 307; +const int CSSValueWave = 308; +const int CSSValueContinuous = 309; +const int CSSValueSkipWhiteSpace = 310; +const int CSSValueBreakAll = 311; +const int CSSValueBreakWord = 312; +const int CSSValueSpace = 313; +const int CSSValueAfterWhiteSpace = 314; +const int CSSValueCheckbox = 315; +const int CSSValueRadio = 316; +const int CSSValuePushButton = 317; +const int CSSValueSquareButton = 318; +const int CSSValueButton = 319; +const int CSSValueButtonBevel = 320; +const int CSSValueDefaultButton = 321; +const int CSSValueListbox = 322; +const int CSSValueListitem = 323; +const int CSSValueMediaFullscreenButton = 324; +const int CSSValueMediaMuteButton = 325; +const int CSSValueMediaPlayButton = 326; +const int CSSValueMediaSeekBackButton = 327; +const int CSSValueMediaSeekForwardButton = 328; +const int CSSValueMediaRewindButton = 329; +const int CSSValueMediaReturnToRealtimeButton = 330; +const int CSSValueMediaSlider = 331; +const int CSSValueMediaSliderthumb = 332; +const int CSSValueMediaControlsBackground = 333; +const int CSSValueMediaCurrentTimeDisplay = 334; +const int CSSValueMediaTimeRemainingDisplay = 335; +const int CSSValueMenulist = 336; +const int CSSValueMenulistButton = 337; +const int CSSValueMenulistText = 338; +const int CSSValueMenulistTextfield = 339; +const int CSSValueSliderHorizontal = 340; +const int CSSValueSliderVertical = 341; +const int CSSValueSliderthumbHorizontal = 342; +const int CSSValueSliderthumbVertical = 343; +const int CSSValueCaret = 344; +const int CSSValueSearchfield = 345; +const int CSSValueSearchfieldDecoration = 346; +const int CSSValueSearchfieldResultsDecoration = 347; +const int CSSValueSearchfieldResultsButton = 348; +const int CSSValueSearchfieldCancelButton = 349; +const int CSSValueTextfield = 350; +const int CSSValueTextarea = 351; +const int CSSValueCapsLockIndicator = 352; +const int CSSValueRound = 353; +const int CSSValueBorder = 354; +const int CSSValueBorderBox = 355; +const int CSSValueContent = 356; +const int CSSValueContentBox = 357; +const int CSSValuePadding = 358; +const int CSSValuePaddingBox = 359; +const int CSSValueLogical = 360; +const int CSSValueVisual = 361; +const int CSSValueLines = 362; +const int CSSValueRunning = 363; +const int CSSValuePaused = 364; +const int CSSValueFlat = 365; +const int CSSValuePreserve3d = 366; +const int CSSValueEase = 367; +const int CSSValueLinear = 368; +const int CSSValueEaseIn = 369; +const int CSSValueEaseOut = 370; +const int CSSValueEaseInOut = 371; +const int CSSValueDocument = 372; +const int CSSValueReset = 373; +const int CSSValueVisiblepainted = 374; +const int CSSValueVisiblefill = 375; +const int CSSValueVisiblestroke = 376; +const int CSSValuePainted = 377; +const int CSSValueFill = 378; +const int CSSValueStroke = 379; +const int CSSValueAliceblue = 380; +const int CSSValueAntiquewhite = 381; +const int CSSValueAquamarine = 382; +const int CSSValueAzure = 383; +const int CSSValueBeige = 384; +const int CSSValueBisque = 385; +const int CSSValueBlanchedalmond = 386; +const int CSSValueBlueviolet = 387; +const int CSSValueBrown = 388; +const int CSSValueBurlywood = 389; +const int CSSValueCadetblue = 390; +const int CSSValueChartreuse = 391; +const int CSSValueChocolate = 392; +const int CSSValueCoral = 393; +const int CSSValueCornflowerblue = 394; +const int CSSValueCornsilk = 395; +const int CSSValueCrimson = 396; +const int CSSValueCyan = 397; +const int CSSValueDarkblue = 398; +const int CSSValueDarkcyan = 399; +const int CSSValueDarkgoldenrod = 400; +const int CSSValueDarkgray = 401; +const int CSSValueDarkgreen = 402; +const int CSSValueDarkgrey = 403; +const int CSSValueDarkkhaki = 404; +const int CSSValueDarkmagenta = 405; +const int CSSValueDarkolivegreen = 406; +const int CSSValueDarkorange = 407; +const int CSSValueDarkorchid = 408; +const int CSSValueDarkred = 409; +const int CSSValueDarksalmon = 410; +const int CSSValueDarkseagreen = 411; +const int CSSValueDarkslateblue = 412; +const int CSSValueDarkslategray = 413; +const int CSSValueDarkslategrey = 414; +const int CSSValueDarkturquoise = 415; +const int CSSValueDarkviolet = 416; +const int CSSValueDeeppink = 417; +const int CSSValueDeepskyblue = 418; +const int CSSValueDimgray = 419; +const int CSSValueDimgrey = 420; +const int CSSValueDodgerblue = 421; +const int CSSValueFirebrick = 422; +const int CSSValueFloralwhite = 423; +const int CSSValueForestgreen = 424; +const int CSSValueGainsboro = 425; +const int CSSValueGhostwhite = 426; +const int CSSValueGold = 427; +const int CSSValueGoldenrod = 428; +const int CSSValueGreenyellow = 429; +const int CSSValueHoneydew = 430; +const int CSSValueHotpink = 431; +const int CSSValueIndianred = 432; +const int CSSValueIndigo = 433; +const int CSSValueIvory = 434; +const int CSSValueKhaki = 435; +const int CSSValueLavender = 436; +const int CSSValueLavenderblush = 437; +const int CSSValueLawngreen = 438; +const int CSSValueLemonchiffon = 439; +const int CSSValueLightblue = 440; +const int CSSValueLightcoral = 441; +const int CSSValueLightcyan = 442; +const int CSSValueLightgoldenrodyellow = 443; +const int CSSValueLightgray = 444; +const int CSSValueLightgreen = 445; +const int CSSValueLightgrey = 446; +const int CSSValueLightpink = 447; +const int CSSValueLightsalmon = 448; +const int CSSValueLightseagreen = 449; +const int CSSValueLightskyblue = 450; +const int CSSValueLightslategray = 451; +const int CSSValueLightslategrey = 452; +const int CSSValueLightsteelblue = 453; +const int CSSValueLightyellow = 454; +const int CSSValueLimegreen = 455; +const int CSSValueLinen = 456; +const int CSSValueMagenta = 457; +const int CSSValueMediumaquamarine = 458; +const int CSSValueMediumblue = 459; +const int CSSValueMediumorchid = 460; +const int CSSValueMediumpurple = 461; +const int CSSValueMediumseagreen = 462; +const int CSSValueMediumslateblue = 463; +const int CSSValueMediumspringgreen = 464; +const int CSSValueMediumturquoise = 465; +const int CSSValueMediumvioletred = 466; +const int CSSValueMidnightblue = 467; +const int CSSValueMintcream = 468; +const int CSSValueMistyrose = 469; +const int CSSValueMoccasin = 470; +const int CSSValueNavajowhite = 471; +const int CSSValueOldlace = 472; +const int CSSValueOlivedrab = 473; +const int CSSValueOrangered = 474; +const int CSSValueOrchid = 475; +const int CSSValuePalegoldenrod = 476; +const int CSSValuePalegreen = 477; +const int CSSValuePaleturquoise = 478; +const int CSSValuePalevioletred = 479; +const int CSSValuePapayawhip = 480; +const int CSSValuePeachpuff = 481; +const int CSSValuePeru = 482; +const int CSSValuePink = 483; +const int CSSValuePlum = 484; +const int CSSValuePowderblue = 485; +const int CSSValueRosybrown = 486; +const int CSSValueRoyalblue = 487; +const int CSSValueSaddlebrown = 488; +const int CSSValueSalmon = 489; +const int CSSValueSandybrown = 490; +const int CSSValueSeagreen = 491; +const int CSSValueSeashell = 492; +const int CSSValueSienna = 493; +const int CSSValueSkyblue = 494; +const int CSSValueSlateblue = 495; +const int CSSValueSlategray = 496; +const int CSSValueSlategrey = 497; +const int CSSValueSnow = 498; +const int CSSValueSpringgreen = 499; +const int CSSValueSteelblue = 500; +const int CSSValueTan = 501; +const int CSSValueThistle = 502; +const int CSSValueTomato = 503; +const int CSSValueTurquoise = 504; +const int CSSValueViolet = 505; +const int CSSValueWheat = 506; +const int CSSValueWhitesmoke = 507; +const int CSSValueYellowgreen = 508; +const int CSSValueNonzero = 509; +const int CSSValueEvenodd = 510; +const int CSSValueAccumulate = 511; +const int CSSValueNew = 512; +const int CSSValueSrgb = 513; +const int CSSValueLinearrgb = 514; +const int CSSValueOptimizespeed = 515; +const int CSSValueOptimizequality = 516; +const int CSSValueCrispedges = 517; +const int CSSValueGeometricprecision = 518; +const int CSSValueButt = 519; +const int CSSValueMiter = 520; +const int CSSValueBevel = 521; +const int CSSValueOptimizelegibility = 522; +const int CSSValueBeforeEdge = 523; +const int CSSValueAfterEdge = 524; +const int CSSValueCentral = 525; +const int CSSValueTextBeforeEdge = 526; +const int CSSValueTextAfterEdge = 527; +const int CSSValueIdeographic = 528; +const int CSSValueAlphabetic = 529; +const int CSSValueHanging = 530; +const int CSSValueMathematical = 531; +const int CSSValueUseScript = 532; +const int CSSValueNoChange = 533; +const int CSSValueResetSize = 534; +const int CSSValueLrTb = 535; +const int CSSValueRlTb = 536; +const int CSSValueTbRl = 537; +const int CSSValueLr = 538; +const int CSSValueRl = 539; +const int CSSValueTb = 540; +const int numCSSValueKeywords = 541; const size_t maxCSSValueKeywordLength = 31; const char* getValueName(unsigned short id); diff --git a/src/3rdparty/webkit/WebCore/generated/Grammar.cpp b/src/3rdparty/webkit/WebCore/generated/Grammar.cpp index d1a7a8010..6e976b96a 100644 --- a/src/3rdparty/webkit/WebCore/generated/Grammar.cpp +++ b/src/3rdparty/webkit/WebCore/generated/Grammar.cpp @@ -113,8 +113,12 @@ #include "CommonIdentifiers.h" #include "NodeInfo.h" #include "Parser.h" +#include #include +#define YYMALLOC fastMalloc +#define YYFREE fastFree + #define YYMAXDEPTH 10000 #define YYENABLE_NLS 0 @@ -165,12 +169,6 @@ static ExpressionNode* combineCommaNodes(void*, ExpressionNode* list, Expression #pragma warning(disable: 4244) #pragma warning(disable: 4702) -// At least some of the time, the declarations of malloc and free that bison -// generates are causing warnings. A way to avoid this is to explicitly define -// the macros so that bison doesn't try to declare malloc and free. -#define YYMALLOC malloc -#define YYFREE free - #endif #define YYPARSE_PARAM globalPtr @@ -232,7 +230,7 @@ static inline void appendToVarDeclarationList(void* globalPtr, ParserArenaData(new (GLOBAL_DATA) NullNode(GLOBAL_DATA), 0, 1); ;} break; case 3: /* Line 1455 of yacc.c */ -#line 291 "../../JavaScriptCore/parser/Grammar.y" +#line 289 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BooleanNode(GLOBAL_DATA, true), 0, 1); ;} break; case 4: /* Line 1455 of yacc.c */ -#line 292 "../../JavaScriptCore/parser/Grammar.y" +#line 290 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BooleanNode(GLOBAL_DATA, false), 0, 1); ;} break; case 5: /* Line 1455 of yacc.c */ -#line 293 "../../JavaScriptCore/parser/Grammar.y" +#line 291 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeNumberNode(GLOBAL_DATA, (yyvsp[(1) - (1)].doubleValue)), 0, 1); ;} break; case 6: /* Line 1455 of yacc.c */ -#line 294 "../../JavaScriptCore/parser/Grammar.y" +#line 292 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) StringNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident)), 0, 1); ;} break; case 7: /* Line 1455 of yacc.c */ -#line 295 "../../JavaScriptCore/parser/Grammar.y" +#line 293 "../../JavaScriptCore/parser/Grammar.y" { Lexer& l = *LEXER; if (!l.scanRegExp()) @@ -3020,7 +3018,7 @@ yyreduce: case 8: /* Line 1455 of yacc.c */ -#line 304 "../../JavaScriptCore/parser/Grammar.y" +#line 302 "../../JavaScriptCore/parser/Grammar.y" { Lexer& l = *LEXER; if (!l.scanRegExp()) @@ -3035,35 +3033,35 @@ yyreduce: case 9: /* Line 1455 of yacc.c */ -#line 316 "../../JavaScriptCore/parser/Grammar.y" +#line 314 "../../JavaScriptCore/parser/Grammar.y" { (yyval.propertyNode) = createNodeInfo(new (GLOBAL_DATA) PropertyNode(GLOBAL_DATA, *(yyvsp[(1) - (3)].ident), (yyvsp[(3) - (3)].expressionNode).m_node, PropertyNode::Constant), (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 10: /* Line 1455 of yacc.c */ -#line 317 "../../JavaScriptCore/parser/Grammar.y" +#line 315 "../../JavaScriptCore/parser/Grammar.y" { (yyval.propertyNode) = createNodeInfo(new (GLOBAL_DATA) PropertyNode(GLOBAL_DATA, *(yyvsp[(1) - (3)].ident), (yyvsp[(3) - (3)].expressionNode).m_node, PropertyNode::Constant), (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 11: /* Line 1455 of yacc.c */ -#line 318 "../../JavaScriptCore/parser/Grammar.y" +#line 316 "../../JavaScriptCore/parser/Grammar.y" { (yyval.propertyNode) = createNodeInfo(new (GLOBAL_DATA) PropertyNode(GLOBAL_DATA, Identifier(GLOBAL_DATA, UString::from((yyvsp[(1) - (3)].doubleValue))), (yyvsp[(3) - (3)].expressionNode).m_node, PropertyNode::Constant), (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 12: /* Line 1455 of yacc.c */ -#line 319 "../../JavaScriptCore/parser/Grammar.y" +#line 317 "../../JavaScriptCore/parser/Grammar.y" { (yyval.propertyNode) = createNodeInfo(makeGetterOrSetterPropertyNode(globalPtr, *(yyvsp[(1) - (7)].ident), *(yyvsp[(2) - (7)].ident), 0, (yyvsp[(6) - (7)].functionBodyNode), LEXER->sourceCode((yyvsp[(5) - (7)].intValue), (yyvsp[(7) - (7)].intValue), (yylsp[(5) - (7)]).first_line)), ClosureFeature, 0); DBG((yyvsp[(6) - (7)].functionBodyNode), (yylsp[(5) - (7)]), (yylsp[(7) - (7)])); if (!(yyval.propertyNode).m_node) YYABORT; ;} break; case 13: /* Line 1455 of yacc.c */ -#line 321 "../../JavaScriptCore/parser/Grammar.y" +#line 319 "../../JavaScriptCore/parser/Grammar.y" { (yyval.propertyNode) = createNodeInfo(makeGetterOrSetterPropertyNode(globalPtr, *(yyvsp[(1) - (8)].ident), *(yyvsp[(2) - (8)].ident), (yyvsp[(4) - (8)].parameterList).m_node.head, (yyvsp[(7) - (8)].functionBodyNode), LEXER->sourceCode((yyvsp[(6) - (8)].intValue), (yyvsp[(8) - (8)].intValue), (yylsp[(6) - (8)]).first_line)), (yyvsp[(4) - (8)].parameterList).m_features | ClosureFeature, 0); if ((yyvsp[(4) - (8)].parameterList).m_features & ArgumentsFeature) @@ -3077,7 +3075,7 @@ yyreduce: case 14: /* Line 1455 of yacc.c */ -#line 332 "../../JavaScriptCore/parser/Grammar.y" +#line 330 "../../JavaScriptCore/parser/Grammar.y" { (yyval.propertyList).m_node.head = new (GLOBAL_DATA) PropertyListNode(GLOBAL_DATA, (yyvsp[(1) - (1)].propertyNode).m_node); (yyval.propertyList).m_node.tail = (yyval.propertyList).m_node.head; (yyval.propertyList).m_features = (yyvsp[(1) - (1)].propertyNode).m_features; @@ -3087,7 +3085,7 @@ yyreduce: case 15: /* Line 1455 of yacc.c */ -#line 336 "../../JavaScriptCore/parser/Grammar.y" +#line 334 "../../JavaScriptCore/parser/Grammar.y" { (yyval.propertyList).m_node.head = (yyvsp[(1) - (3)].propertyList).m_node.head; (yyval.propertyList).m_node.tail = new (GLOBAL_DATA) PropertyListNode(GLOBAL_DATA, (yyvsp[(3) - (3)].propertyNode).m_node, (yyvsp[(1) - (3)].propertyList).m_node.tail); (yyval.propertyList).m_features = (yyvsp[(1) - (3)].propertyList).m_features | (yyvsp[(3) - (3)].propertyNode).m_features; @@ -3097,70 +3095,70 @@ yyreduce: case 17: /* Line 1455 of yacc.c */ -#line 344 "../../JavaScriptCore/parser/Grammar.y" +#line 342 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ObjectLiteralNode(GLOBAL_DATA), 0, 0); ;} break; case 18: /* Line 1455 of yacc.c */ -#line 345 "../../JavaScriptCore/parser/Grammar.y" +#line 343 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ObjectLiteralNode(GLOBAL_DATA, (yyvsp[(2) - (3)].propertyList).m_node.head), (yyvsp[(2) - (3)].propertyList).m_features, (yyvsp[(2) - (3)].propertyList).m_numConstants); ;} break; case 19: /* Line 1455 of yacc.c */ -#line 347 "../../JavaScriptCore/parser/Grammar.y" +#line 345 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ObjectLiteralNode(GLOBAL_DATA, (yyvsp[(2) - (4)].propertyList).m_node.head), (yyvsp[(2) - (4)].propertyList).m_features, (yyvsp[(2) - (4)].propertyList).m_numConstants); ;} break; case 20: /* Line 1455 of yacc.c */ -#line 351 "../../JavaScriptCore/parser/Grammar.y" +#line 349 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ThisNode(GLOBAL_DATA), ThisFeature, 0); ;} break; case 23: /* Line 1455 of yacc.c */ -#line 354 "../../JavaScriptCore/parser/Grammar.y" +#line 352 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ResolveNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident), (yylsp[(1) - (1)]).first_column), (*(yyvsp[(1) - (1)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0, 0); ;} break; case 24: /* Line 1455 of yacc.c */ -#line 355 "../../JavaScriptCore/parser/Grammar.y" +#line 353 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = (yyvsp[(2) - (3)].expressionNode); ;} break; case 25: /* Line 1455 of yacc.c */ -#line 359 "../../JavaScriptCore/parser/Grammar.y" +#line 357 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ArrayNode(GLOBAL_DATA, (yyvsp[(2) - (3)].intValue)), 0, (yyvsp[(2) - (3)].intValue) ? 1 : 0); ;} break; case 26: /* Line 1455 of yacc.c */ -#line 360 "../../JavaScriptCore/parser/Grammar.y" +#line 358 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ArrayNode(GLOBAL_DATA, (yyvsp[(2) - (3)].elementList).m_node.head), (yyvsp[(2) - (3)].elementList).m_features, (yyvsp[(2) - (3)].elementList).m_numConstants); ;} break; case 27: /* Line 1455 of yacc.c */ -#line 361 "../../JavaScriptCore/parser/Grammar.y" +#line 359 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ArrayNode(GLOBAL_DATA, (yyvsp[(4) - (5)].intValue), (yyvsp[(2) - (5)].elementList).m_node.head), (yyvsp[(2) - (5)].elementList).m_features, (yyvsp[(4) - (5)].intValue) ? (yyvsp[(2) - (5)].elementList).m_numConstants + 1 : (yyvsp[(2) - (5)].elementList).m_numConstants); ;} break; case 28: /* Line 1455 of yacc.c */ -#line 365 "../../JavaScriptCore/parser/Grammar.y" +#line 363 "../../JavaScriptCore/parser/Grammar.y" { (yyval.elementList).m_node.head = new (GLOBAL_DATA) ElementNode(GLOBAL_DATA, (yyvsp[(1) - (2)].intValue), (yyvsp[(2) - (2)].expressionNode).m_node); (yyval.elementList).m_node.tail = (yyval.elementList).m_node.head; (yyval.elementList).m_features = (yyvsp[(2) - (2)].expressionNode).m_features; @@ -3170,7 +3168,7 @@ yyreduce: case 29: /* Line 1455 of yacc.c */ -#line 370 "../../JavaScriptCore/parser/Grammar.y" +#line 368 "../../JavaScriptCore/parser/Grammar.y" { (yyval.elementList).m_node.head = (yyvsp[(1) - (4)].elementList).m_node.head; (yyval.elementList).m_node.tail = new (GLOBAL_DATA) ElementNode(GLOBAL_DATA, (yyvsp[(1) - (4)].elementList).m_node.tail, (yyvsp[(3) - (4)].intValue), (yyvsp[(4) - (4)].expressionNode).m_node); (yyval.elementList).m_features = (yyvsp[(1) - (4)].elementList).m_features | (yyvsp[(4) - (4)].expressionNode).m_features; @@ -3180,35 +3178,35 @@ yyreduce: case 30: /* Line 1455 of yacc.c */ -#line 377 "../../JavaScriptCore/parser/Grammar.y" +#line 375 "../../JavaScriptCore/parser/Grammar.y" { (yyval.intValue) = 0; ;} break; case 32: /* Line 1455 of yacc.c */ -#line 382 "../../JavaScriptCore/parser/Grammar.y" +#line 380 "../../JavaScriptCore/parser/Grammar.y" { (yyval.intValue) = 1; ;} break; case 33: /* Line 1455 of yacc.c */ -#line 383 "../../JavaScriptCore/parser/Grammar.y" +#line 381 "../../JavaScriptCore/parser/Grammar.y" { (yyval.intValue) = (yyvsp[(1) - (2)].intValue) + 1; ;} break; case 35: /* Line 1455 of yacc.c */ -#line 388 "../../JavaScriptCore/parser/Grammar.y" +#line 386 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo((yyvsp[(1) - (1)].funcExprNode).m_node, (yyvsp[(1) - (1)].funcExprNode).m_features, (yyvsp[(1) - (1)].funcExprNode).m_numConstants); ;} break; case 36: /* Line 1455 of yacc.c */ -#line 389 "../../JavaScriptCore/parser/Grammar.y" +#line 387 "../../JavaScriptCore/parser/Grammar.y" { BracketAccessorNode* node = new (GLOBAL_DATA) BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (4)]).first_column, (yylsp[(1) - (4)]).last_column, (yylsp[(4) - (4)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (4)].expressionNode).m_features | (yyvsp[(3) - (4)].expressionNode).m_features, (yyvsp[(1) - (4)].expressionNode).m_numConstants + (yyvsp[(3) - (4)].expressionNode).m_numConstants); @@ -3218,7 +3216,7 @@ yyreduce: case 37: /* Line 1455 of yacc.c */ -#line 393 "../../JavaScriptCore/parser/Grammar.y" +#line 391 "../../JavaScriptCore/parser/Grammar.y" { DotAccessorNode* node = new (GLOBAL_DATA) DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(1) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants); @@ -3228,7 +3226,7 @@ yyreduce: case 38: /* Line 1455 of yacc.c */ -#line 397 "../../JavaScriptCore/parser/Grammar.y" +#line 395 "../../JavaScriptCore/parser/Grammar.y" { NewExprNode* node = new (GLOBAL_DATA) NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].argumentsNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(2) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].argumentsNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].argumentsNode).m_numConstants); @@ -3238,7 +3236,7 @@ yyreduce: case 40: /* Line 1455 of yacc.c */ -#line 405 "../../JavaScriptCore/parser/Grammar.y" +#line 403 "../../JavaScriptCore/parser/Grammar.y" { BracketAccessorNode* node = new (GLOBAL_DATA) BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (4)]).first_column, (yylsp[(1) - (4)]).last_column, (yylsp[(4) - (4)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (4)].expressionNode).m_features | (yyvsp[(3) - (4)].expressionNode).m_features, (yyvsp[(1) - (4)].expressionNode).m_numConstants + (yyvsp[(3) - (4)].expressionNode).m_numConstants); @@ -3248,7 +3246,7 @@ yyreduce: case 41: /* Line 1455 of yacc.c */ -#line 409 "../../JavaScriptCore/parser/Grammar.y" +#line 407 "../../JavaScriptCore/parser/Grammar.y" { DotAccessorNode* node = new (GLOBAL_DATA) DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(1) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants); @@ -3258,7 +3256,7 @@ yyreduce: case 42: /* Line 1455 of yacc.c */ -#line 413 "../../JavaScriptCore/parser/Grammar.y" +#line 411 "../../JavaScriptCore/parser/Grammar.y" { NewExprNode* node = new (GLOBAL_DATA) NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].argumentsNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(2) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].argumentsNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].argumentsNode).m_numConstants); @@ -3268,7 +3266,7 @@ yyreduce: case 44: /* Line 1455 of yacc.c */ -#line 421 "../../JavaScriptCore/parser/Grammar.y" +#line 419 "../../JavaScriptCore/parser/Grammar.y" { NewExprNode* node = new (GLOBAL_DATA) NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); @@ -3278,7 +3276,7 @@ yyreduce: case 46: /* Line 1455 of yacc.c */ -#line 429 "../../JavaScriptCore/parser/Grammar.y" +#line 427 "../../JavaScriptCore/parser/Grammar.y" { NewExprNode* node = new (GLOBAL_DATA) NewExprNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); @@ -3288,21 +3286,21 @@ yyreduce: case 47: /* Line 1455 of yacc.c */ -#line 436 "../../JavaScriptCore/parser/Grammar.y" +#line 434 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = makeFunctionCallNode(globalPtr, (yyvsp[(1) - (2)].expressionNode), (yyvsp[(2) - (2)].argumentsNode), (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); ;} break; case 48: /* Line 1455 of yacc.c */ -#line 437 "../../JavaScriptCore/parser/Grammar.y" +#line 435 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = makeFunctionCallNode(globalPtr, (yyvsp[(1) - (2)].expressionNode), (yyvsp[(2) - (2)].argumentsNode), (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); ;} break; case 49: /* Line 1455 of yacc.c */ -#line 438 "../../JavaScriptCore/parser/Grammar.y" +#line 436 "../../JavaScriptCore/parser/Grammar.y" { BracketAccessorNode* node = new (GLOBAL_DATA) BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (4)]).first_column, (yylsp[(1) - (4)]).last_column, (yylsp[(4) - (4)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (4)].expressionNode).m_features | (yyvsp[(3) - (4)].expressionNode).m_features, (yyvsp[(1) - (4)].expressionNode).m_numConstants + (yyvsp[(3) - (4)].expressionNode).m_numConstants); @@ -3312,7 +3310,7 @@ yyreduce: case 50: /* Line 1455 of yacc.c */ -#line 442 "../../JavaScriptCore/parser/Grammar.y" +#line 440 "../../JavaScriptCore/parser/Grammar.y" { DotAccessorNode* node = new (GLOBAL_DATA) DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(1) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants); ;} @@ -3321,21 +3319,21 @@ yyreduce: case 51: /* Line 1455 of yacc.c */ -#line 448 "../../JavaScriptCore/parser/Grammar.y" +#line 446 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = makeFunctionCallNode(globalPtr, (yyvsp[(1) - (2)].expressionNode), (yyvsp[(2) - (2)].argumentsNode), (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); ;} break; case 52: /* Line 1455 of yacc.c */ -#line 449 "../../JavaScriptCore/parser/Grammar.y" +#line 447 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = makeFunctionCallNode(globalPtr, (yyvsp[(1) - (2)].expressionNode), (yyvsp[(2) - (2)].argumentsNode), (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column); ;} break; case 53: /* Line 1455 of yacc.c */ -#line 450 "../../JavaScriptCore/parser/Grammar.y" +#line 448 "../../JavaScriptCore/parser/Grammar.y" { BracketAccessorNode* node = new (GLOBAL_DATA) BracketAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_node, (yyvsp[(3) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (4)]).first_column, (yylsp[(1) - (4)]).last_column, (yylsp[(4) - (4)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (4)].expressionNode).m_features | (yyvsp[(3) - (4)].expressionNode).m_features, (yyvsp[(1) - (4)].expressionNode).m_numConstants + (yyvsp[(3) - (4)].expressionNode).m_numConstants); @@ -3345,7 +3343,7 @@ yyreduce: case 54: /* Line 1455 of yacc.c */ -#line 454 "../../JavaScriptCore/parser/Grammar.y" +#line 452 "../../JavaScriptCore/parser/Grammar.y" { DotAccessorNode* node = new (GLOBAL_DATA) DotAccessorNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, *(yyvsp[(3) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(1) - (3)]).last_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants); @@ -3355,21 +3353,21 @@ yyreduce: case 55: /* Line 1455 of yacc.c */ -#line 461 "../../JavaScriptCore/parser/Grammar.y" +#line 459 "../../JavaScriptCore/parser/Grammar.y" { (yyval.argumentsNode) = createNodeInfo(new (GLOBAL_DATA) ArgumentsNode(GLOBAL_DATA), 0, 0); ;} break; case 56: /* Line 1455 of yacc.c */ -#line 462 "../../JavaScriptCore/parser/Grammar.y" +#line 460 "../../JavaScriptCore/parser/Grammar.y" { (yyval.argumentsNode) = createNodeInfo(new (GLOBAL_DATA) ArgumentsNode(GLOBAL_DATA, (yyvsp[(2) - (3)].argumentList).m_node.head), (yyvsp[(2) - (3)].argumentList).m_features, (yyvsp[(2) - (3)].argumentList).m_numConstants); ;} break; case 57: /* Line 1455 of yacc.c */ -#line 466 "../../JavaScriptCore/parser/Grammar.y" +#line 464 "../../JavaScriptCore/parser/Grammar.y" { (yyval.argumentList).m_node.head = new (GLOBAL_DATA) ArgumentListNode(GLOBAL_DATA, (yyvsp[(1) - (1)].expressionNode).m_node); (yyval.argumentList).m_node.tail = (yyval.argumentList).m_node.head; (yyval.argumentList).m_features = (yyvsp[(1) - (1)].expressionNode).m_features; @@ -3379,7 +3377,7 @@ yyreduce: case 58: /* Line 1455 of yacc.c */ -#line 470 "../../JavaScriptCore/parser/Grammar.y" +#line 468 "../../JavaScriptCore/parser/Grammar.y" { (yyval.argumentList).m_node.head = (yyvsp[(1) - (3)].argumentList).m_node.head; (yyval.argumentList).m_node.tail = new (GLOBAL_DATA) ArgumentListNode(GLOBAL_DATA, (yyvsp[(1) - (3)].argumentList).m_node.tail, (yyvsp[(3) - (3)].expressionNode).m_node); (yyval.argumentList).m_features = (yyvsp[(1) - (3)].argumentList).m_features | (yyvsp[(3) - (3)].expressionNode).m_features; @@ -3389,252 +3387,252 @@ yyreduce: case 64: /* Line 1455 of yacc.c */ -#line 488 "../../JavaScriptCore/parser/Grammar.y" +#line 486 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePostfixNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node, OpPlusPlus, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(1) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (2)].expressionNode).m_numConstants); ;} break; case 65: /* Line 1455 of yacc.c */ -#line 489 "../../JavaScriptCore/parser/Grammar.y" +#line 487 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePostfixNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node, OpMinusMinus, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(1) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (2)].expressionNode).m_numConstants); ;} break; case 67: /* Line 1455 of yacc.c */ -#line 494 "../../JavaScriptCore/parser/Grammar.y" +#line 492 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePostfixNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node, OpPlusPlus, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(1) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (2)].expressionNode).m_numConstants); ;} break; case 68: /* Line 1455 of yacc.c */ -#line 495 "../../JavaScriptCore/parser/Grammar.y" +#line 493 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePostfixNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node, OpMinusMinus, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(1) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (2)].expressionNode).m_numConstants); ;} break; case 69: /* Line 1455 of yacc.c */ -#line 499 "../../JavaScriptCore/parser/Grammar.y" +#line 497 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeDeleteNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).last_column, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 70: /* Line 1455 of yacc.c */ -#line 500 "../../JavaScriptCore/parser/Grammar.y" +#line 498 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) VoidNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants + 1); ;} break; case 71: /* Line 1455 of yacc.c */ -#line 501 "../../JavaScriptCore/parser/Grammar.y" +#line 499 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeTypeOfNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 72: /* Line 1455 of yacc.c */ -#line 502 "../../JavaScriptCore/parser/Grammar.y" +#line 500 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePrefixNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, OpPlusPlus, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 73: /* Line 1455 of yacc.c */ -#line 503 "../../JavaScriptCore/parser/Grammar.y" +#line 501 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePrefixNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, OpPlusPlus, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 74: /* Line 1455 of yacc.c */ -#line 504 "../../JavaScriptCore/parser/Grammar.y" +#line 502 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePrefixNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, OpMinusMinus, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 75: /* Line 1455 of yacc.c */ -#line 505 "../../JavaScriptCore/parser/Grammar.y" +#line 503 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makePrefixNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node, OpMinusMinus, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column), (yyvsp[(2) - (2)].expressionNode).m_features | AssignFeature, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 76: /* Line 1455 of yacc.c */ -#line 506 "../../JavaScriptCore/parser/Grammar.y" +#line 504 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) UnaryPlusNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 77: /* Line 1455 of yacc.c */ -#line 507 "../../JavaScriptCore/parser/Grammar.y" +#line 505 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeNegateNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 78: /* Line 1455 of yacc.c */ -#line 508 "../../JavaScriptCore/parser/Grammar.y" +#line 506 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeBitwiseNotNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 79: /* Line 1455 of yacc.c */ -#line 509 "../../JavaScriptCore/parser/Grammar.y" +#line 507 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalNotNode(GLOBAL_DATA, (yyvsp[(2) - (2)].expressionNode).m_node), (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 85: /* Line 1455 of yacc.c */ -#line 523 "../../JavaScriptCore/parser/Grammar.y" +#line 521 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeMultNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 86: /* Line 1455 of yacc.c */ -#line 524 "../../JavaScriptCore/parser/Grammar.y" +#line 522 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeDivNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 87: /* Line 1455 of yacc.c */ -#line 525 "../../JavaScriptCore/parser/Grammar.y" +#line 523 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ModNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 89: /* Line 1455 of yacc.c */ -#line 531 "../../JavaScriptCore/parser/Grammar.y" +#line 529 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeMultNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 90: /* Line 1455 of yacc.c */ -#line 533 "../../JavaScriptCore/parser/Grammar.y" +#line 531 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeDivNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 91: /* Line 1455 of yacc.c */ -#line 535 "../../JavaScriptCore/parser/Grammar.y" +#line 533 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ModNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 93: /* Line 1455 of yacc.c */ -#line 540 "../../JavaScriptCore/parser/Grammar.y" +#line 538 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeAddNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 94: /* Line 1455 of yacc.c */ -#line 541 "../../JavaScriptCore/parser/Grammar.y" +#line 539 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeSubNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 96: /* Line 1455 of yacc.c */ -#line 547 "../../JavaScriptCore/parser/Grammar.y" +#line 545 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeAddNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 97: /* Line 1455 of yacc.c */ -#line 549 "../../JavaScriptCore/parser/Grammar.y" +#line 547 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeSubNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 99: /* Line 1455 of yacc.c */ -#line 554 "../../JavaScriptCore/parser/Grammar.y" +#line 552 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeLeftShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 100: /* Line 1455 of yacc.c */ -#line 555 "../../JavaScriptCore/parser/Grammar.y" +#line 553 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 101: /* Line 1455 of yacc.c */ -#line 556 "../../JavaScriptCore/parser/Grammar.y" +#line 554 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) UnsignedRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 103: /* Line 1455 of yacc.c */ -#line 561 "../../JavaScriptCore/parser/Grammar.y" +#line 559 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeLeftShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 104: /* Line 1455 of yacc.c */ -#line 562 "../../JavaScriptCore/parser/Grammar.y" +#line 560 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 105: /* Line 1455 of yacc.c */ -#line 563 "../../JavaScriptCore/parser/Grammar.y" +#line 561 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) UnsignedRightShiftNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 107: /* Line 1455 of yacc.c */ -#line 568 "../../JavaScriptCore/parser/Grammar.y" +#line 566 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LessNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 108: /* Line 1455 of yacc.c */ -#line 569 "../../JavaScriptCore/parser/Grammar.y" +#line 567 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) GreaterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 109: /* Line 1455 of yacc.c */ -#line 570 "../../JavaScriptCore/parser/Grammar.y" +#line 568 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LessEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 110: /* Line 1455 of yacc.c */ -#line 571 "../../JavaScriptCore/parser/Grammar.y" +#line 569 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) GreaterEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 111: /* Line 1455 of yacc.c */ -#line 572 "../../JavaScriptCore/parser/Grammar.y" +#line 570 "../../JavaScriptCore/parser/Grammar.y" { InstanceOfNode* node = new (GLOBAL_DATA) InstanceOfNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3643,7 +3641,7 @@ yyreduce: case 112: /* Line 1455 of yacc.c */ -#line 575 "../../JavaScriptCore/parser/Grammar.y" +#line 573 "../../JavaScriptCore/parser/Grammar.y" { InNode* node = new (GLOBAL_DATA) InNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3652,35 +3650,35 @@ yyreduce: case 114: /* Line 1455 of yacc.c */ -#line 582 "../../JavaScriptCore/parser/Grammar.y" +#line 580 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LessNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 115: /* Line 1455 of yacc.c */ -#line 583 "../../JavaScriptCore/parser/Grammar.y" +#line 581 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) GreaterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 116: /* Line 1455 of yacc.c */ -#line 584 "../../JavaScriptCore/parser/Grammar.y" +#line 582 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LessEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 117: /* Line 1455 of yacc.c */ -#line 585 "../../JavaScriptCore/parser/Grammar.y" +#line 583 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) GreaterEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 118: /* Line 1455 of yacc.c */ -#line 587 "../../JavaScriptCore/parser/Grammar.y" +#line 585 "../../JavaScriptCore/parser/Grammar.y" { InstanceOfNode* node = new (GLOBAL_DATA) InstanceOfNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3689,35 +3687,35 @@ yyreduce: case 120: /* Line 1455 of yacc.c */ -#line 594 "../../JavaScriptCore/parser/Grammar.y" +#line 592 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LessNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 121: /* Line 1455 of yacc.c */ -#line 595 "../../JavaScriptCore/parser/Grammar.y" +#line 593 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) GreaterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 122: /* Line 1455 of yacc.c */ -#line 596 "../../JavaScriptCore/parser/Grammar.y" +#line 594 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LessEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 123: /* Line 1455 of yacc.c */ -#line 597 "../../JavaScriptCore/parser/Grammar.y" +#line 595 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) GreaterEqNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 124: /* Line 1455 of yacc.c */ -#line 599 "../../JavaScriptCore/parser/Grammar.y" +#line 597 "../../JavaScriptCore/parser/Grammar.y" { InstanceOfNode* node = new (GLOBAL_DATA) InstanceOfNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3726,7 +3724,7 @@ yyreduce: case 125: /* Line 1455 of yacc.c */ -#line 603 "../../JavaScriptCore/parser/Grammar.y" +#line 601 "../../JavaScriptCore/parser/Grammar.y" { InNode* node = new (GLOBAL_DATA) InNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(3) - (3)]).first_column, (yylsp[(3) - (3)]).last_column); (yyval.expressionNode) = createNodeInfo(node, (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3735,217 +3733,217 @@ yyreduce: case 127: /* Line 1455 of yacc.c */ -#line 610 "../../JavaScriptCore/parser/Grammar.y" +#line 608 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) EqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 128: /* Line 1455 of yacc.c */ -#line 611 "../../JavaScriptCore/parser/Grammar.y" +#line 609 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) NotEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 129: /* Line 1455 of yacc.c */ -#line 612 "../../JavaScriptCore/parser/Grammar.y" +#line 610 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) StrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 130: /* Line 1455 of yacc.c */ -#line 613 "../../JavaScriptCore/parser/Grammar.y" +#line 611 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) NotStrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 132: /* Line 1455 of yacc.c */ -#line 619 "../../JavaScriptCore/parser/Grammar.y" +#line 617 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) EqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 133: /* Line 1455 of yacc.c */ -#line 621 "../../JavaScriptCore/parser/Grammar.y" +#line 619 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) NotEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 134: /* Line 1455 of yacc.c */ -#line 623 "../../JavaScriptCore/parser/Grammar.y" +#line 621 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) StrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 135: /* Line 1455 of yacc.c */ -#line 625 "../../JavaScriptCore/parser/Grammar.y" +#line 623 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) NotStrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 137: /* Line 1455 of yacc.c */ -#line 631 "../../JavaScriptCore/parser/Grammar.y" +#line 629 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) EqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 138: /* Line 1455 of yacc.c */ -#line 632 "../../JavaScriptCore/parser/Grammar.y" +#line 630 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) NotEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 139: /* Line 1455 of yacc.c */ -#line 634 "../../JavaScriptCore/parser/Grammar.y" +#line 632 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) StrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 140: /* Line 1455 of yacc.c */ -#line 636 "../../JavaScriptCore/parser/Grammar.y" +#line 634 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) NotStrictEqualNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 142: /* Line 1455 of yacc.c */ -#line 641 "../../JavaScriptCore/parser/Grammar.y" +#line 639 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitAndNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 144: /* Line 1455 of yacc.c */ -#line 647 "../../JavaScriptCore/parser/Grammar.y" +#line 645 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitAndNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 146: /* Line 1455 of yacc.c */ -#line 652 "../../JavaScriptCore/parser/Grammar.y" +#line 650 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitAndNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 148: /* Line 1455 of yacc.c */ -#line 657 "../../JavaScriptCore/parser/Grammar.y" +#line 655 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitXOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 150: /* Line 1455 of yacc.c */ -#line 663 "../../JavaScriptCore/parser/Grammar.y" +#line 661 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitXOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 152: /* Line 1455 of yacc.c */ -#line 669 "../../JavaScriptCore/parser/Grammar.y" +#line 667 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitXOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 154: /* Line 1455 of yacc.c */ -#line 674 "../../JavaScriptCore/parser/Grammar.y" +#line 672 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 156: /* Line 1455 of yacc.c */ -#line 680 "../../JavaScriptCore/parser/Grammar.y" +#line 678 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 158: /* Line 1455 of yacc.c */ -#line 686 "../../JavaScriptCore/parser/Grammar.y" +#line 684 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) BitOrNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 160: /* Line 1455 of yacc.c */ -#line 691 "../../JavaScriptCore/parser/Grammar.y" +#line 689 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalAnd), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 162: /* Line 1455 of yacc.c */ -#line 697 "../../JavaScriptCore/parser/Grammar.y" +#line 695 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalAnd), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 164: /* Line 1455 of yacc.c */ -#line 703 "../../JavaScriptCore/parser/Grammar.y" +#line 701 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalAnd), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 166: /* Line 1455 of yacc.c */ -#line 708 "../../JavaScriptCore/parser/Grammar.y" +#line 706 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalOr), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 168: /* Line 1455 of yacc.c */ -#line 714 "../../JavaScriptCore/parser/Grammar.y" +#line 712 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalOr), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 170: /* Line 1455 of yacc.c */ -#line 719 "../../JavaScriptCore/parser/Grammar.y" +#line 717 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) LogicalOpNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node, OpLogicalOr), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 172: /* Line 1455 of yacc.c */ -#line 725 "../../JavaScriptCore/parser/Grammar.y" +#line 723 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ConditionalNode(GLOBAL_DATA, (yyvsp[(1) - (5)].expressionNode).m_node, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].expressionNode).m_node), (yyvsp[(1) - (5)].expressionNode).m_features | (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].expressionNode).m_features, (yyvsp[(1) - (5)].expressionNode).m_numConstants + (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].expressionNode).m_numConstants); ;} break; case 174: /* Line 1455 of yacc.c */ -#line 731 "../../JavaScriptCore/parser/Grammar.y" +#line 729 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ConditionalNode(GLOBAL_DATA, (yyvsp[(1) - (5)].expressionNode).m_node, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].expressionNode).m_node), (yyvsp[(1) - (5)].expressionNode).m_features | (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].expressionNode).m_features, (yyvsp[(1) - (5)].expressionNode).m_numConstants + (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].expressionNode).m_numConstants); ;} break; case 176: /* Line 1455 of yacc.c */ -#line 737 "../../JavaScriptCore/parser/Grammar.y" +#line 735 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(new (GLOBAL_DATA) ConditionalNode(GLOBAL_DATA, (yyvsp[(1) - (5)].expressionNode).m_node, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].expressionNode).m_node), (yyvsp[(1) - (5)].expressionNode).m_features | (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].expressionNode).m_features, (yyvsp[(1) - (5)].expressionNode).m_numConstants + (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].expressionNode).m_numConstants); ;} break; case 178: /* Line 1455 of yacc.c */ -#line 743 "../../JavaScriptCore/parser/Grammar.y" +#line 741 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeAssignNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(2) - (3)].op), (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(1) - (3)].expressionNode).m_features & AssignFeature, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).first_column + 1, (yylsp[(3) - (3)]).last_column), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3954,7 +3952,7 @@ yyreduce: case 180: /* Line 1455 of yacc.c */ -#line 751 "../../JavaScriptCore/parser/Grammar.y" +#line 749 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeAssignNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(2) - (3)].op), (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(1) - (3)].expressionNode).m_features & AssignFeature, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).first_column + 1, (yylsp[(3) - (3)]).last_column), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3963,7 +3961,7 @@ yyreduce: case 182: /* Line 1455 of yacc.c */ -#line 759 "../../JavaScriptCore/parser/Grammar.y" +#line 757 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(makeAssignNode(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(2) - (3)].op), (yyvsp[(3) - (3)].expressionNode).m_node, (yyvsp[(1) - (3)].expressionNode).m_features & AssignFeature, (yyvsp[(3) - (3)].expressionNode).m_features & AssignFeature, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).first_column + 1, (yylsp[(3) - (3)]).last_column), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features | AssignFeature, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} @@ -3972,112 +3970,112 @@ yyreduce: case 183: /* Line 1455 of yacc.c */ -#line 765 "../../JavaScriptCore/parser/Grammar.y" +#line 763 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpEqual; ;} break; case 184: /* Line 1455 of yacc.c */ -#line 766 "../../JavaScriptCore/parser/Grammar.y" +#line 764 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpPlusEq; ;} break; case 185: /* Line 1455 of yacc.c */ -#line 767 "../../JavaScriptCore/parser/Grammar.y" +#line 765 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpMinusEq; ;} break; case 186: /* Line 1455 of yacc.c */ -#line 768 "../../JavaScriptCore/parser/Grammar.y" +#line 766 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpMultEq; ;} break; case 187: /* Line 1455 of yacc.c */ -#line 769 "../../JavaScriptCore/parser/Grammar.y" +#line 767 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpDivEq; ;} break; case 188: /* Line 1455 of yacc.c */ -#line 770 "../../JavaScriptCore/parser/Grammar.y" +#line 768 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpLShift; ;} break; case 189: /* Line 1455 of yacc.c */ -#line 771 "../../JavaScriptCore/parser/Grammar.y" +#line 769 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpRShift; ;} break; case 190: /* Line 1455 of yacc.c */ -#line 772 "../../JavaScriptCore/parser/Grammar.y" +#line 770 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpURShift; ;} break; case 191: /* Line 1455 of yacc.c */ -#line 773 "../../JavaScriptCore/parser/Grammar.y" +#line 771 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpAndEq; ;} break; case 192: /* Line 1455 of yacc.c */ -#line 774 "../../JavaScriptCore/parser/Grammar.y" +#line 772 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpXOrEq; ;} break; case 193: /* Line 1455 of yacc.c */ -#line 775 "../../JavaScriptCore/parser/Grammar.y" +#line 773 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpOrEq; ;} break; case 194: /* Line 1455 of yacc.c */ -#line 776 "../../JavaScriptCore/parser/Grammar.y" +#line 774 "../../JavaScriptCore/parser/Grammar.y" { (yyval.op) = OpModEq; ;} break; case 196: /* Line 1455 of yacc.c */ -#line 781 "../../JavaScriptCore/parser/Grammar.y" +#line 779 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(combineCommaNodes(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 198: /* Line 1455 of yacc.c */ -#line 786 "../../JavaScriptCore/parser/Grammar.y" +#line 784 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(combineCommaNodes(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 200: /* Line 1455 of yacc.c */ -#line 791 "../../JavaScriptCore/parser/Grammar.y" +#line 789 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(combineCommaNodes(GLOBAL_DATA, (yyvsp[(1) - (3)].expressionNode).m_node, (yyvsp[(3) - (3)].expressionNode).m_node), (yyvsp[(1) - (3)].expressionNode).m_features | (yyvsp[(3) - (3)].expressionNode).m_features, (yyvsp[(1) - (3)].expressionNode).m_numConstants + (yyvsp[(3) - (3)].expressionNode).m_numConstants); ;} break; case 218: /* Line 1455 of yacc.c */ -#line 815 "../../JavaScriptCore/parser/Grammar.y" +#line 813 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) BlockNode(GLOBAL_DATA, 0), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} break; @@ -4085,7 +4083,7 @@ yyreduce: case 219: /* Line 1455 of yacc.c */ -#line 817 "../../JavaScriptCore/parser/Grammar.y" +#line 815 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) BlockNode(GLOBAL_DATA, (yyvsp[(2) - (3)].sourceElements).m_node), (yyvsp[(2) - (3)].sourceElements).m_varDeclarations, (yyvsp[(2) - (3)].sourceElements).m_funcDeclarations, (yyvsp[(2) - (3)].sourceElements).m_features, (yyvsp[(2) - (3)].sourceElements).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} break; @@ -4093,7 +4091,7 @@ yyreduce: case 220: /* Line 1455 of yacc.c */ -#line 822 "../../JavaScriptCore/parser/Grammar.y" +#line 820 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(makeVarStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].varDeclList).m_node), (yyvsp[(2) - (3)].varDeclList).m_varDeclarations, (yyvsp[(2) - (3)].varDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].varDeclList).m_features, (yyvsp[(2) - (3)].varDeclList).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} break; @@ -4101,7 +4099,7 @@ yyreduce: case 221: /* Line 1455 of yacc.c */ -#line 824 "../../JavaScriptCore/parser/Grammar.y" +#line 822 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(makeVarStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].varDeclList).m_node), (yyvsp[(2) - (3)].varDeclList).m_varDeclarations, (yyvsp[(2) - (3)].varDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].varDeclList).m_features, (yyvsp[(2) - (3)].varDeclList).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} @@ -4110,7 +4108,7 @@ yyreduce: case 222: /* Line 1455 of yacc.c */ -#line 830 "../../JavaScriptCore/parser/Grammar.y" +#line 828 "../../JavaScriptCore/parser/Grammar.y" { (yyval.varDeclList).m_node = 0; (yyval.varDeclList).m_varDeclarations = new (GLOBAL_DATA) ParserArenaData; appendToVarDeclarationList(GLOBAL_DATA, (yyval.varDeclList).m_varDeclarations, *(yyvsp[(1) - (1)].ident), 0); @@ -4123,7 +4121,7 @@ yyreduce: case 223: /* Line 1455 of yacc.c */ -#line 837 "../../JavaScriptCore/parser/Grammar.y" +#line 835 "../../JavaScriptCore/parser/Grammar.y" { AssignResolveNode* node = new (GLOBAL_DATA) AssignResolveNode(GLOBAL_DATA, *(yyvsp[(1) - (2)].ident), (yyvsp[(2) - (2)].expressionNode).m_node, (yyvsp[(2) - (2)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column); (yyval.varDeclList).m_node = node; @@ -4138,7 +4136,7 @@ yyreduce: case 224: /* Line 1455 of yacc.c */ -#line 847 "../../JavaScriptCore/parser/Grammar.y" +#line 845 "../../JavaScriptCore/parser/Grammar.y" { (yyval.varDeclList).m_node = (yyvsp[(1) - (3)].varDeclList).m_node; (yyval.varDeclList).m_varDeclarations = (yyvsp[(1) - (3)].varDeclList).m_varDeclarations; appendToVarDeclarationList(GLOBAL_DATA, (yyval.varDeclList).m_varDeclarations, *(yyvsp[(3) - (3)].ident), 0); @@ -4151,7 +4149,7 @@ yyreduce: case 225: /* Line 1455 of yacc.c */ -#line 855 "../../JavaScriptCore/parser/Grammar.y" +#line 853 "../../JavaScriptCore/parser/Grammar.y" { AssignResolveNode* node = new (GLOBAL_DATA) AssignResolveNode(GLOBAL_DATA, *(yyvsp[(3) - (4)].ident), (yyvsp[(4) - (4)].expressionNode).m_node, (yyvsp[(4) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(3) - (4)]).first_column, (yylsp[(4) - (4)]).first_column + 1, (yylsp[(4) - (4)]).last_column); (yyval.varDeclList).m_node = combineCommaNodes(GLOBAL_DATA, (yyvsp[(1) - (4)].varDeclList).m_node, node); @@ -4166,7 +4164,7 @@ yyreduce: case 226: /* Line 1455 of yacc.c */ -#line 867 "../../JavaScriptCore/parser/Grammar.y" +#line 865 "../../JavaScriptCore/parser/Grammar.y" { (yyval.varDeclList).m_node = 0; (yyval.varDeclList).m_varDeclarations = new (GLOBAL_DATA) ParserArenaData; appendToVarDeclarationList(GLOBAL_DATA, (yyval.varDeclList).m_varDeclarations, *(yyvsp[(1) - (1)].ident), 0); @@ -4179,7 +4177,7 @@ yyreduce: case 227: /* Line 1455 of yacc.c */ -#line 874 "../../JavaScriptCore/parser/Grammar.y" +#line 872 "../../JavaScriptCore/parser/Grammar.y" { AssignResolveNode* node = new (GLOBAL_DATA) AssignResolveNode(GLOBAL_DATA, *(yyvsp[(1) - (2)].ident), (yyvsp[(2) - (2)].expressionNode).m_node, (yyvsp[(2) - (2)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(2) - (2)]).first_column + 1, (yylsp[(2) - (2)]).last_column); (yyval.varDeclList).m_node = node; @@ -4194,7 +4192,7 @@ yyreduce: case 228: /* Line 1455 of yacc.c */ -#line 884 "../../JavaScriptCore/parser/Grammar.y" +#line 882 "../../JavaScriptCore/parser/Grammar.y" { (yyval.varDeclList).m_node = (yyvsp[(1) - (3)].varDeclList).m_node; (yyval.varDeclList).m_varDeclarations = (yyvsp[(1) - (3)].varDeclList).m_varDeclarations; appendToVarDeclarationList(GLOBAL_DATA, (yyval.varDeclList).m_varDeclarations, *(yyvsp[(3) - (3)].ident), 0); @@ -4207,7 +4205,7 @@ yyreduce: case 229: /* Line 1455 of yacc.c */ -#line 892 "../../JavaScriptCore/parser/Grammar.y" +#line 890 "../../JavaScriptCore/parser/Grammar.y" { AssignResolveNode* node = new (GLOBAL_DATA) AssignResolveNode(GLOBAL_DATA, *(yyvsp[(3) - (4)].ident), (yyvsp[(4) - (4)].expressionNode).m_node, (yyvsp[(4) - (4)].expressionNode).m_features & AssignFeature); SET_EXCEPTION_LOCATION(node, (yylsp[(3) - (4)]).first_column, (yylsp[(4) - (4)]).first_column + 1, (yylsp[(4) - (4)]).last_column); (yyval.varDeclList).m_node = combineCommaNodes(GLOBAL_DATA, (yyvsp[(1) - (4)].varDeclList).m_node, node); @@ -4222,7 +4220,7 @@ yyreduce: case 230: /* Line 1455 of yacc.c */ -#line 904 "../../JavaScriptCore/parser/Grammar.y" +#line 902 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) ConstStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].constDeclList).m_node.head), (yyvsp[(2) - (3)].constDeclList).m_varDeclarations, (yyvsp[(2) - (3)].constDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].constDeclList).m_features, (yyvsp[(2) - (3)].constDeclList).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} break; @@ -4230,7 +4228,7 @@ yyreduce: case 231: /* Line 1455 of yacc.c */ -#line 907 "../../JavaScriptCore/parser/Grammar.y" +#line 905 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) ConstStatementNode(GLOBAL_DATA, (yyvsp[(2) - (3)].constDeclList).m_node.head), (yyvsp[(2) - (3)].constDeclList).m_varDeclarations, (yyvsp[(2) - (3)].constDeclList).m_funcDeclarations, (yyvsp[(2) - (3)].constDeclList).m_features, (yyvsp[(2) - (3)].constDeclList).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} break; @@ -4238,7 +4236,7 @@ yyreduce: case 232: /* Line 1455 of yacc.c */ -#line 912 "../../JavaScriptCore/parser/Grammar.y" +#line 910 "../../JavaScriptCore/parser/Grammar.y" { (yyval.constDeclList).m_node.head = (yyvsp[(1) - (1)].constDeclNode).m_node; (yyval.constDeclList).m_node.tail = (yyval.constDeclList).m_node.head; (yyval.constDeclList).m_varDeclarations = new (GLOBAL_DATA) ParserArenaData; @@ -4252,7 +4250,7 @@ yyreduce: case 233: /* Line 1455 of yacc.c */ -#line 921 "../../JavaScriptCore/parser/Grammar.y" +#line 919 "../../JavaScriptCore/parser/Grammar.y" { (yyval.constDeclList).m_node.head = (yyvsp[(1) - (3)].constDeclList).m_node.head; (yyvsp[(1) - (3)].constDeclList).m_node.tail->m_next = (yyvsp[(3) - (3)].constDeclNode).m_node; (yyval.constDeclList).m_node.tail = (yyvsp[(3) - (3)].constDeclNode).m_node; @@ -4266,42 +4264,42 @@ yyreduce: case 234: /* Line 1455 of yacc.c */ -#line 932 "../../JavaScriptCore/parser/Grammar.y" +#line 930 "../../JavaScriptCore/parser/Grammar.y" { (yyval.constDeclNode) = createNodeInfo(new (GLOBAL_DATA) ConstDeclNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident), 0), (*(yyvsp[(1) - (1)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0, 0); ;} break; case 235: /* Line 1455 of yacc.c */ -#line 933 "../../JavaScriptCore/parser/Grammar.y" +#line 931 "../../JavaScriptCore/parser/Grammar.y" { (yyval.constDeclNode) = createNodeInfo(new (GLOBAL_DATA) ConstDeclNode(GLOBAL_DATA, *(yyvsp[(1) - (2)].ident), (yyvsp[(2) - (2)].expressionNode).m_node), ((*(yyvsp[(1) - (2)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | (yyvsp[(2) - (2)].expressionNode).m_features, (yyvsp[(2) - (2)].expressionNode).m_numConstants); ;} break; case 236: /* Line 1455 of yacc.c */ -#line 937 "../../JavaScriptCore/parser/Grammar.y" +#line 935 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = (yyvsp[(2) - (2)].expressionNode); ;} break; case 237: /* Line 1455 of yacc.c */ -#line 941 "../../JavaScriptCore/parser/Grammar.y" +#line 939 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = (yyvsp[(2) - (2)].expressionNode); ;} break; case 238: /* Line 1455 of yacc.c */ -#line 945 "../../JavaScriptCore/parser/Grammar.y" +#line 943 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) EmptyStatementNode(GLOBAL_DATA), 0, 0, 0, 0); ;} break; case 239: /* Line 1455 of yacc.c */ -#line 949 "../../JavaScriptCore/parser/Grammar.y" +#line 947 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) ExprStatementNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node), 0, 0, (yyvsp[(1) - (2)].expressionNode).m_features, (yyvsp[(1) - (2)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} break; @@ -4309,7 +4307,7 @@ yyreduce: case 240: /* Line 1455 of yacc.c */ -#line 951 "../../JavaScriptCore/parser/Grammar.y" +#line 949 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) ExprStatementNode(GLOBAL_DATA, (yyvsp[(1) - (2)].expressionNode).m_node), 0, 0, (yyvsp[(1) - (2)].expressionNode).m_features, (yyvsp[(1) - (2)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} break; @@ -4317,7 +4315,7 @@ yyreduce: case 241: /* Line 1455 of yacc.c */ -#line 957 "../../JavaScriptCore/parser/Grammar.y" +#line 955 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) IfNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].statementNode).m_node), (yyvsp[(5) - (5)].statementNode).m_varDeclarations, (yyvsp[(5) - (5)].statementNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].statementNode).m_features, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].statementNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (5)]), (yylsp[(4) - (5)])); ;} break; @@ -4325,7 +4323,7 @@ yyreduce: case 242: /* Line 1455 of yacc.c */ -#line 960 "../../JavaScriptCore/parser/Grammar.y" +#line 958 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) IfElseNode(GLOBAL_DATA, (yyvsp[(3) - (7)].expressionNode).m_node, (yyvsp[(5) - (7)].statementNode).m_node, (yyvsp[(7) - (7)].statementNode).m_node), mergeDeclarationLists((yyvsp[(5) - (7)].statementNode).m_varDeclarations, (yyvsp[(7) - (7)].statementNode).m_varDeclarations), mergeDeclarationLists((yyvsp[(5) - (7)].statementNode).m_funcDeclarations, (yyvsp[(7) - (7)].statementNode).m_funcDeclarations), @@ -4337,7 +4335,7 @@ yyreduce: case 243: /* Line 1455 of yacc.c */ -#line 969 "../../JavaScriptCore/parser/Grammar.y" +#line 967 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) DoWhileNode(GLOBAL_DATA, (yyvsp[(2) - (7)].statementNode).m_node, (yyvsp[(5) - (7)].expressionNode).m_node), (yyvsp[(2) - (7)].statementNode).m_varDeclarations, (yyvsp[(2) - (7)].statementNode).m_funcDeclarations, (yyvsp[(2) - (7)].statementNode).m_features | (yyvsp[(5) - (7)].expressionNode).m_features, (yyvsp[(2) - (7)].statementNode).m_numConstants + (yyvsp[(5) - (7)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (7)]), (yylsp[(3) - (7)])); ;} break; @@ -4345,7 +4343,7 @@ yyreduce: case 244: /* Line 1455 of yacc.c */ -#line 971 "../../JavaScriptCore/parser/Grammar.y" +#line 969 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) DoWhileNode(GLOBAL_DATA, (yyvsp[(2) - (7)].statementNode).m_node, (yyvsp[(5) - (7)].expressionNode).m_node), (yyvsp[(2) - (7)].statementNode).m_varDeclarations, (yyvsp[(2) - (7)].statementNode).m_funcDeclarations, (yyvsp[(2) - (7)].statementNode).m_features | (yyvsp[(5) - (7)].expressionNode).m_features, (yyvsp[(2) - (7)].statementNode).m_numConstants + (yyvsp[(5) - (7)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (7)]), (yylsp[(3) - (7)])); ;} break; @@ -4353,7 +4351,7 @@ yyreduce: case 245: /* Line 1455 of yacc.c */ -#line 973 "../../JavaScriptCore/parser/Grammar.y" +#line 971 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) WhileNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].statementNode).m_node), (yyvsp[(5) - (5)].statementNode).m_varDeclarations, (yyvsp[(5) - (5)].statementNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].statementNode).m_features, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].statementNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (5)]), (yylsp[(4) - (5)])); ;} break; @@ -4361,7 +4359,7 @@ yyreduce: case 246: /* Line 1455 of yacc.c */ -#line 976 "../../JavaScriptCore/parser/Grammar.y" +#line 974 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) ForNode(GLOBAL_DATA, (yyvsp[(3) - (9)].expressionNode).m_node, (yyvsp[(5) - (9)].expressionNode).m_node, (yyvsp[(7) - (9)].expressionNode).m_node, (yyvsp[(9) - (9)].statementNode).m_node, false), (yyvsp[(9) - (9)].statementNode).m_varDeclarations, (yyvsp[(9) - (9)].statementNode).m_funcDeclarations, (yyvsp[(3) - (9)].expressionNode).m_features | (yyvsp[(5) - (9)].expressionNode).m_features | (yyvsp[(7) - (9)].expressionNode).m_features | (yyvsp[(9) - (9)].statementNode).m_features, (yyvsp[(3) - (9)].expressionNode).m_numConstants + (yyvsp[(5) - (9)].expressionNode).m_numConstants + (yyvsp[(7) - (9)].expressionNode).m_numConstants + (yyvsp[(9) - (9)].statementNode).m_numConstants); @@ -4372,7 +4370,7 @@ yyreduce: case 247: /* Line 1455 of yacc.c */ -#line 982 "../../JavaScriptCore/parser/Grammar.y" +#line 980 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) ForNode(GLOBAL_DATA, (yyvsp[(4) - (10)].varDeclList).m_node, (yyvsp[(6) - (10)].expressionNode).m_node, (yyvsp[(8) - (10)].expressionNode).m_node, (yyvsp[(10) - (10)].statementNode).m_node, true), mergeDeclarationLists((yyvsp[(4) - (10)].varDeclList).m_varDeclarations, (yyvsp[(10) - (10)].statementNode).m_varDeclarations), mergeDeclarationLists((yyvsp[(4) - (10)].varDeclList).m_funcDeclarations, (yyvsp[(10) - (10)].statementNode).m_funcDeclarations), @@ -4384,7 +4382,7 @@ yyreduce: case 248: /* Line 1455 of yacc.c */ -#line 989 "../../JavaScriptCore/parser/Grammar.y" +#line 987 "../../JavaScriptCore/parser/Grammar.y" { ForInNode* node = new (GLOBAL_DATA) ForInNode(GLOBAL_DATA, (yyvsp[(3) - (7)].expressionNode).m_node, (yyvsp[(5) - (7)].expressionNode).m_node, (yyvsp[(7) - (7)].statementNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(3) - (7)]).first_column, (yylsp[(3) - (7)]).last_column, (yylsp[(5) - (7)]).last_column); @@ -4398,7 +4396,7 @@ yyreduce: case 249: /* Line 1455 of yacc.c */ -#line 998 "../../JavaScriptCore/parser/Grammar.y" +#line 996 "../../JavaScriptCore/parser/Grammar.y" { ForInNode *forIn = new (GLOBAL_DATA) ForInNode(GLOBAL_DATA, *(yyvsp[(4) - (8)].ident), 0, (yyvsp[(6) - (8)].expressionNode).m_node, (yyvsp[(8) - (8)].statementNode).m_node, (yylsp[(5) - (8)]).first_column, (yylsp[(5) - (8)]).first_column - (yylsp[(4) - (8)]).first_column, (yylsp[(6) - (8)]).last_column - (yylsp[(5) - (8)]).first_column); SET_EXCEPTION_LOCATION(forIn, (yylsp[(4) - (8)]).first_column, (yylsp[(5) - (8)]).first_column + 1, (yylsp[(6) - (8)]).last_column); appendToVarDeclarationList(GLOBAL_DATA, (yyvsp[(8) - (8)].statementNode).m_varDeclarations, *(yyvsp[(4) - (8)].ident), DeclarationStacks::HasInitializer); @@ -4409,7 +4407,7 @@ yyreduce: case 250: /* Line 1455 of yacc.c */ -#line 1004 "../../JavaScriptCore/parser/Grammar.y" +#line 1002 "../../JavaScriptCore/parser/Grammar.y" { ForInNode *forIn = new (GLOBAL_DATA) ForInNode(GLOBAL_DATA, *(yyvsp[(4) - (9)].ident), (yyvsp[(5) - (9)].expressionNode).m_node, (yyvsp[(7) - (9)].expressionNode).m_node, (yyvsp[(9) - (9)].statementNode).m_node, (yylsp[(5) - (9)]).first_column, (yylsp[(5) - (9)]).first_column - (yylsp[(4) - (9)]).first_column, (yylsp[(5) - (9)]).last_column - (yylsp[(5) - (9)]).first_column); SET_EXCEPTION_LOCATION(forIn, (yylsp[(4) - (9)]).first_column, (yylsp[(6) - (9)]).first_column + 1, (yylsp[(7) - (9)]).last_column); appendToVarDeclarationList(GLOBAL_DATA, (yyvsp[(9) - (9)].statementNode).m_varDeclarations, *(yyvsp[(4) - (9)].ident), DeclarationStacks::HasInitializer); @@ -4422,21 +4420,21 @@ yyreduce: case 251: /* Line 1455 of yacc.c */ -#line 1014 "../../JavaScriptCore/parser/Grammar.y" +#line 1012 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(0, 0, 0); ;} break; case 253: /* Line 1455 of yacc.c */ -#line 1019 "../../JavaScriptCore/parser/Grammar.y" +#line 1017 "../../JavaScriptCore/parser/Grammar.y" { (yyval.expressionNode) = createNodeInfo(0, 0, 0); ;} break; case 255: /* Line 1455 of yacc.c */ -#line 1024 "../../JavaScriptCore/parser/Grammar.y" +#line 1022 "../../JavaScriptCore/parser/Grammar.y" { ContinueNode* node = new (GLOBAL_DATA) ContinueNode(GLOBAL_DATA); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); @@ -4446,7 +4444,7 @@ yyreduce: case 256: /* Line 1455 of yacc.c */ -#line 1028 "../../JavaScriptCore/parser/Grammar.y" +#line 1026 "../../JavaScriptCore/parser/Grammar.y" { ContinueNode* node = new (GLOBAL_DATA) ContinueNode(GLOBAL_DATA); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); @@ -4456,7 +4454,7 @@ yyreduce: case 257: /* Line 1455 of yacc.c */ -#line 1032 "../../JavaScriptCore/parser/Grammar.y" +#line 1030 "../../JavaScriptCore/parser/Grammar.y" { ContinueNode* node = new (GLOBAL_DATA) ContinueNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); @@ -4466,7 +4464,7 @@ yyreduce: case 258: /* Line 1455 of yacc.c */ -#line 1036 "../../JavaScriptCore/parser/Grammar.y" +#line 1034 "../../JavaScriptCore/parser/Grammar.y" { ContinueNode* node = new (GLOBAL_DATA) ContinueNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); @@ -4476,7 +4474,7 @@ yyreduce: case 259: /* Line 1455 of yacc.c */ -#line 1043 "../../JavaScriptCore/parser/Grammar.y" +#line 1041 "../../JavaScriptCore/parser/Grammar.y" { BreakNode* node = new (GLOBAL_DATA) BreakNode(GLOBAL_DATA); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} @@ -4485,7 +4483,7 @@ yyreduce: case 260: /* Line 1455 of yacc.c */ -#line 1046 "../../JavaScriptCore/parser/Grammar.y" +#line 1044 "../../JavaScriptCore/parser/Grammar.y" { BreakNode* node = new (GLOBAL_DATA) BreakNode(GLOBAL_DATA); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) BreakNode(GLOBAL_DATA), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} @@ -4494,7 +4492,7 @@ yyreduce: case 261: /* Line 1455 of yacc.c */ -#line 1049 "../../JavaScriptCore/parser/Grammar.y" +#line 1047 "../../JavaScriptCore/parser/Grammar.y" { BreakNode* node = new (GLOBAL_DATA) BreakNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} @@ -4503,7 +4501,7 @@ yyreduce: case 262: /* Line 1455 of yacc.c */ -#line 1052 "../../JavaScriptCore/parser/Grammar.y" +#line 1050 "../../JavaScriptCore/parser/Grammar.y" { BreakNode* node = new (GLOBAL_DATA) BreakNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) BreakNode(GLOBAL_DATA, *(yyvsp[(2) - (3)].ident)), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} @@ -4512,7 +4510,7 @@ yyreduce: case 263: /* Line 1455 of yacc.c */ -#line 1058 "../../JavaScriptCore/parser/Grammar.y" +#line 1056 "../../JavaScriptCore/parser/Grammar.y" { ReturnNode* node = new (GLOBAL_DATA) ReturnNode(GLOBAL_DATA, 0); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} @@ -4521,7 +4519,7 @@ yyreduce: case 264: /* Line 1455 of yacc.c */ -#line 1061 "../../JavaScriptCore/parser/Grammar.y" +#line 1059 "../../JavaScriptCore/parser/Grammar.y" { ReturnNode* node = new (GLOBAL_DATA) ReturnNode(GLOBAL_DATA, 0); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (2)]).first_column, (yylsp[(1) - (2)]).last_column, (yylsp[(1) - (2)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} @@ -4530,7 +4528,7 @@ yyreduce: case 265: /* Line 1455 of yacc.c */ -#line 1064 "../../JavaScriptCore/parser/Grammar.y" +#line 1062 "../../JavaScriptCore/parser/Grammar.y" { ReturnNode* node = new (GLOBAL_DATA) ReturnNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(3) - (3)])); ;} @@ -4539,7 +4537,7 @@ yyreduce: case 266: /* Line 1455 of yacc.c */ -#line 1067 "../../JavaScriptCore/parser/Grammar.y" +#line 1065 "../../JavaScriptCore/parser/Grammar.y" { ReturnNode* node = new (GLOBAL_DATA) ReturnNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; ;} @@ -4548,7 +4546,7 @@ yyreduce: case 267: /* Line 1455 of yacc.c */ -#line 1073 "../../JavaScriptCore/parser/Grammar.y" +#line 1071 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) WithNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].statementNode).m_node, (yylsp[(3) - (5)]).last_column, (yylsp[(3) - (5)]).last_column - (yylsp[(3) - (5)]).first_column), (yyvsp[(5) - (5)].statementNode).m_varDeclarations, (yyvsp[(5) - (5)].statementNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].statementNode).m_features | WithFeature, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].statementNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (5)]), (yylsp[(4) - (5)])); ;} @@ -4557,7 +4555,7 @@ yyreduce: case 268: /* Line 1455 of yacc.c */ -#line 1079 "../../JavaScriptCore/parser/Grammar.y" +#line 1077 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) SwitchNode(GLOBAL_DATA, (yyvsp[(3) - (5)].expressionNode).m_node, (yyvsp[(5) - (5)].caseBlockNode).m_node), (yyvsp[(5) - (5)].caseBlockNode).m_varDeclarations, (yyvsp[(5) - (5)].caseBlockNode).m_funcDeclarations, (yyvsp[(3) - (5)].expressionNode).m_features | (yyvsp[(5) - (5)].caseBlockNode).m_features, (yyvsp[(3) - (5)].expressionNode).m_numConstants + (yyvsp[(5) - (5)].caseBlockNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (5)]), (yylsp[(4) - (5)])); ;} @@ -4566,14 +4564,14 @@ yyreduce: case 269: /* Line 1455 of yacc.c */ -#line 1085 "../../JavaScriptCore/parser/Grammar.y" +#line 1083 "../../JavaScriptCore/parser/Grammar.y" { (yyval.caseBlockNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) CaseBlockNode(GLOBAL_DATA, (yyvsp[(2) - (3)].clauseList).m_node.head, 0, 0), (yyvsp[(2) - (3)].clauseList).m_varDeclarations, (yyvsp[(2) - (3)].clauseList).m_funcDeclarations, (yyvsp[(2) - (3)].clauseList).m_features, (yyvsp[(2) - (3)].clauseList).m_numConstants); ;} break; case 270: /* Line 1455 of yacc.c */ -#line 1087 "../../JavaScriptCore/parser/Grammar.y" +#line 1085 "../../JavaScriptCore/parser/Grammar.y" { (yyval.caseBlockNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) CaseBlockNode(GLOBAL_DATA, (yyvsp[(2) - (5)].clauseList).m_node.head, (yyvsp[(3) - (5)].caseClauseNode).m_node, (yyvsp[(4) - (5)].clauseList).m_node.head), mergeDeclarationLists(mergeDeclarationLists((yyvsp[(2) - (5)].clauseList).m_varDeclarations, (yyvsp[(3) - (5)].caseClauseNode).m_varDeclarations), (yyvsp[(4) - (5)].clauseList).m_varDeclarations), mergeDeclarationLists(mergeDeclarationLists((yyvsp[(2) - (5)].clauseList).m_funcDeclarations, (yyvsp[(3) - (5)].caseClauseNode).m_funcDeclarations), (yyvsp[(4) - (5)].clauseList).m_funcDeclarations), @@ -4584,14 +4582,14 @@ yyreduce: case 271: /* Line 1455 of yacc.c */ -#line 1095 "../../JavaScriptCore/parser/Grammar.y" +#line 1093 "../../JavaScriptCore/parser/Grammar.y" { (yyval.clauseList).m_node.head = 0; (yyval.clauseList).m_node.tail = 0; (yyval.clauseList).m_varDeclarations = 0; (yyval.clauseList).m_funcDeclarations = 0; (yyval.clauseList).m_features = 0; (yyval.clauseList).m_numConstants = 0; ;} break; case 273: /* Line 1455 of yacc.c */ -#line 1100 "../../JavaScriptCore/parser/Grammar.y" +#line 1098 "../../JavaScriptCore/parser/Grammar.y" { (yyval.clauseList).m_node.head = new (GLOBAL_DATA) ClauseListNode(GLOBAL_DATA, (yyvsp[(1) - (1)].caseClauseNode).m_node); (yyval.clauseList).m_node.tail = (yyval.clauseList).m_node.head; (yyval.clauseList).m_varDeclarations = (yyvsp[(1) - (1)].caseClauseNode).m_varDeclarations; @@ -4603,7 +4601,7 @@ yyreduce: case 274: /* Line 1455 of yacc.c */ -#line 1106 "../../JavaScriptCore/parser/Grammar.y" +#line 1104 "../../JavaScriptCore/parser/Grammar.y" { (yyval.clauseList).m_node.head = (yyvsp[(1) - (2)].clauseList).m_node.head; (yyval.clauseList).m_node.tail = new (GLOBAL_DATA) ClauseListNode(GLOBAL_DATA, (yyvsp[(1) - (2)].clauseList).m_node.tail, (yyvsp[(2) - (2)].caseClauseNode).m_node); (yyval.clauseList).m_varDeclarations = mergeDeclarationLists((yyvsp[(1) - (2)].clauseList).m_varDeclarations, (yyvsp[(2) - (2)].caseClauseNode).m_varDeclarations); @@ -4616,35 +4614,35 @@ yyreduce: case 275: /* Line 1455 of yacc.c */ -#line 1116 "../../JavaScriptCore/parser/Grammar.y" +#line 1114 "../../JavaScriptCore/parser/Grammar.y" { (yyval.caseClauseNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) CaseClauseNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node), 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); ;} break; case 276: /* Line 1455 of yacc.c */ -#line 1117 "../../JavaScriptCore/parser/Grammar.y" +#line 1115 "../../JavaScriptCore/parser/Grammar.y" { (yyval.caseClauseNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) CaseClauseNode(GLOBAL_DATA, (yyvsp[(2) - (4)].expressionNode).m_node, (yyvsp[(4) - (4)].sourceElements).m_node), (yyvsp[(4) - (4)].sourceElements).m_varDeclarations, (yyvsp[(4) - (4)].sourceElements).m_funcDeclarations, (yyvsp[(2) - (4)].expressionNode).m_features | (yyvsp[(4) - (4)].sourceElements).m_features, (yyvsp[(2) - (4)].expressionNode).m_numConstants + (yyvsp[(4) - (4)].sourceElements).m_numConstants); ;} break; case 277: /* Line 1455 of yacc.c */ -#line 1121 "../../JavaScriptCore/parser/Grammar.y" +#line 1119 "../../JavaScriptCore/parser/Grammar.y" { (yyval.caseClauseNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) CaseClauseNode(GLOBAL_DATA, 0), 0, 0, 0, 0); ;} break; case 278: /* Line 1455 of yacc.c */ -#line 1122 "../../JavaScriptCore/parser/Grammar.y" +#line 1120 "../../JavaScriptCore/parser/Grammar.y" { (yyval.caseClauseNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) CaseClauseNode(GLOBAL_DATA, 0, (yyvsp[(3) - (3)].sourceElements).m_node), (yyvsp[(3) - (3)].sourceElements).m_varDeclarations, (yyvsp[(3) - (3)].sourceElements).m_funcDeclarations, (yyvsp[(3) - (3)].sourceElements).m_features, (yyvsp[(3) - (3)].sourceElements).m_numConstants); ;} break; case 279: /* Line 1455 of yacc.c */ -#line 1126 "../../JavaScriptCore/parser/Grammar.y" +#line 1124 "../../JavaScriptCore/parser/Grammar.y" { LabelNode* node = new (GLOBAL_DATA) LabelNode(GLOBAL_DATA, *(yyvsp[(1) - (3)].ident), (yyvsp[(3) - (3)].statementNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, (yyvsp[(3) - (3)].statementNode).m_varDeclarations, (yyvsp[(3) - (3)].statementNode).m_funcDeclarations, (yyvsp[(3) - (3)].statementNode).m_features, (yyvsp[(3) - (3)].statementNode).m_numConstants); ;} @@ -4653,7 +4651,7 @@ yyreduce: case 280: /* Line 1455 of yacc.c */ -#line 1132 "../../JavaScriptCore/parser/Grammar.y" +#line 1130 "../../JavaScriptCore/parser/Grammar.y" { ThrowNode* node = new (GLOBAL_DATA) ThrowNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); @@ -4663,7 +4661,7 @@ yyreduce: case 281: /* Line 1455 of yacc.c */ -#line 1136 "../../JavaScriptCore/parser/Grammar.y" +#line 1134 "../../JavaScriptCore/parser/Grammar.y" { ThrowNode* node = new (GLOBAL_DATA) ThrowNode(GLOBAL_DATA, (yyvsp[(2) - (3)].expressionNode).m_node); SET_EXCEPTION_LOCATION(node, (yylsp[(1) - (3)]).first_column, (yylsp[(2) - (3)]).last_column, (yylsp[(2) - (3)]).last_column); (yyval.statementNode) = createNodeDeclarationInfo(node, 0, 0, (yyvsp[(2) - (3)].expressionNode).m_features, (yyvsp[(2) - (3)].expressionNode).m_numConstants); DBG((yyval.statementNode).m_node, (yylsp[(1) - (3)]), (yylsp[(2) - (3)])); AUTO_SEMICOLON; @@ -4673,7 +4671,7 @@ yyreduce: case 282: /* Line 1455 of yacc.c */ -#line 1143 "../../JavaScriptCore/parser/Grammar.y" +#line 1141 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) TryNode(GLOBAL_DATA, (yyvsp[(2) - (4)].statementNode).m_node, GLOBAL_DATA->propertyNames->nullIdentifier, false, 0, (yyvsp[(4) - (4)].statementNode).m_node), mergeDeclarationLists((yyvsp[(2) - (4)].statementNode).m_varDeclarations, (yyvsp[(4) - (4)].statementNode).m_varDeclarations), mergeDeclarationLists((yyvsp[(2) - (4)].statementNode).m_funcDeclarations, (yyvsp[(4) - (4)].statementNode).m_funcDeclarations), @@ -4685,7 +4683,7 @@ yyreduce: case 283: /* Line 1455 of yacc.c */ -#line 1149 "../../JavaScriptCore/parser/Grammar.y" +#line 1147 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) TryNode(GLOBAL_DATA, (yyvsp[(2) - (7)].statementNode).m_node, *(yyvsp[(5) - (7)].ident), ((yyvsp[(7) - (7)].statementNode).m_features & EvalFeature) != 0, (yyvsp[(7) - (7)].statementNode).m_node, 0), mergeDeclarationLists((yyvsp[(2) - (7)].statementNode).m_varDeclarations, (yyvsp[(7) - (7)].statementNode).m_varDeclarations), mergeDeclarationLists((yyvsp[(2) - (7)].statementNode).m_funcDeclarations, (yyvsp[(7) - (7)].statementNode).m_funcDeclarations), @@ -4697,7 +4695,7 @@ yyreduce: case 284: /* Line 1455 of yacc.c */ -#line 1156 "../../JavaScriptCore/parser/Grammar.y" +#line 1154 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) TryNode(GLOBAL_DATA, (yyvsp[(2) - (9)].statementNode).m_node, *(yyvsp[(5) - (9)].ident), ((yyvsp[(7) - (9)].statementNode).m_features & EvalFeature) != 0, (yyvsp[(7) - (9)].statementNode).m_node, (yyvsp[(9) - (9)].statementNode).m_node), mergeDeclarationLists(mergeDeclarationLists((yyvsp[(2) - (9)].statementNode).m_varDeclarations, (yyvsp[(7) - (9)].statementNode).m_varDeclarations), (yyvsp[(9) - (9)].statementNode).m_varDeclarations), mergeDeclarationLists(mergeDeclarationLists((yyvsp[(2) - (9)].statementNode).m_funcDeclarations, (yyvsp[(7) - (9)].statementNode).m_funcDeclarations), (yyvsp[(9) - (9)].statementNode).m_funcDeclarations), @@ -4709,7 +4707,7 @@ yyreduce: case 285: /* Line 1455 of yacc.c */ -#line 1165 "../../JavaScriptCore/parser/Grammar.y" +#line 1163 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) DebuggerStatementNode(GLOBAL_DATA), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(2) - (2)])); ;} break; @@ -4717,7 +4715,7 @@ yyreduce: case 286: /* Line 1455 of yacc.c */ -#line 1167 "../../JavaScriptCore/parser/Grammar.y" +#line 1165 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new (GLOBAL_DATA) DebuggerStatementNode(GLOBAL_DATA), 0, 0, 0, 0); DBG((yyval.statementNode).m_node, (yylsp[(1) - (2)]), (yylsp[(1) - (2)])); AUTO_SEMICOLON; ;} break; @@ -4725,14 +4723,14 @@ yyreduce: case 287: /* Line 1455 of yacc.c */ -#line 1172 "../../JavaScriptCore/parser/Grammar.y" +#line 1170 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new FuncDeclNode(GLOBAL_DATA, *(yyvsp[(2) - (7)].ident), (yyvsp[(6) - (7)].functionBodyNode), LEXER->sourceCode((yyvsp[(5) - (7)].intValue), (yyvsp[(7) - (7)].intValue), (yylsp[(5) - (7)]).first_line)), 0, new (GLOBAL_DATA) ParserArenaData, ((*(yyvsp[(2) - (7)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | ClosureFeature, 0); DBG((yyvsp[(6) - (7)].functionBodyNode), (yylsp[(5) - (7)]), (yylsp[(7) - (7)])); (yyval.statementNode).m_funcDeclarations->data.append(static_cast((yyval.statementNode).m_node)); ;} break; case 288: /* Line 1455 of yacc.c */ -#line 1174 "../../JavaScriptCore/parser/Grammar.y" +#line 1172 "../../JavaScriptCore/parser/Grammar.y" { (yyval.statementNode) = createNodeDeclarationInfo(new FuncDeclNode(GLOBAL_DATA, *(yyvsp[(2) - (8)].ident), (yyvsp[(7) - (8)].functionBodyNode), LEXER->sourceCode((yyvsp[(6) - (8)].intValue), (yyvsp[(8) - (8)].intValue), (yylsp[(6) - (8)]).first_line), (yyvsp[(4) - (8)].parameterList).m_node.head), 0, new (GLOBAL_DATA) ParserArenaData, ((*(yyvsp[(2) - (8)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | (yyvsp[(4) - (8)].parameterList).m_features | ClosureFeature, 0); if ((yyvsp[(4) - (8)].parameterList).m_features & ArgumentsFeature) @@ -4745,14 +4743,14 @@ yyreduce: case 289: /* Line 1455 of yacc.c */ -#line 1184 "../../JavaScriptCore/parser/Grammar.y" +#line 1182 "../../JavaScriptCore/parser/Grammar.y" { (yyval.funcExprNode) = createNodeInfo(new FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->nullIdentifier, (yyvsp[(5) - (6)].functionBodyNode), LEXER->sourceCode((yyvsp[(4) - (6)].intValue), (yyvsp[(6) - (6)].intValue), (yylsp[(4) - (6)]).first_line)), ClosureFeature, 0); DBG((yyvsp[(5) - (6)].functionBodyNode), (yylsp[(4) - (6)]), (yylsp[(6) - (6)])); ;} break; case 290: /* Line 1455 of yacc.c */ -#line 1186 "../../JavaScriptCore/parser/Grammar.y" +#line 1184 "../../JavaScriptCore/parser/Grammar.y" { (yyval.funcExprNode) = createNodeInfo(new FuncExprNode(GLOBAL_DATA, GLOBAL_DATA->propertyNames->nullIdentifier, (yyvsp[(6) - (7)].functionBodyNode), LEXER->sourceCode((yyvsp[(5) - (7)].intValue), (yyvsp[(7) - (7)].intValue), (yylsp[(5) - (7)]).first_line), (yyvsp[(3) - (7)].parameterList).m_node.head), (yyvsp[(3) - (7)].parameterList).m_features | ClosureFeature, 0); if ((yyvsp[(3) - (7)].parameterList).m_features & ArgumentsFeature) @@ -4764,14 +4762,14 @@ yyreduce: case 291: /* Line 1455 of yacc.c */ -#line 1192 "../../JavaScriptCore/parser/Grammar.y" +#line 1190 "../../JavaScriptCore/parser/Grammar.y" { (yyval.funcExprNode) = createNodeInfo(new FuncExprNode(GLOBAL_DATA, *(yyvsp[(2) - (7)].ident), (yyvsp[(6) - (7)].functionBodyNode), LEXER->sourceCode((yyvsp[(5) - (7)].intValue), (yyvsp[(7) - (7)].intValue), (yylsp[(5) - (7)]).first_line)), ClosureFeature, 0); DBG((yyvsp[(6) - (7)].functionBodyNode), (yylsp[(5) - (7)]), (yylsp[(7) - (7)])); ;} break; case 292: /* Line 1455 of yacc.c */ -#line 1194 "../../JavaScriptCore/parser/Grammar.y" +#line 1192 "../../JavaScriptCore/parser/Grammar.y" { (yyval.funcExprNode) = createNodeInfo(new FuncExprNode(GLOBAL_DATA, *(yyvsp[(2) - (8)].ident), (yyvsp[(7) - (8)].functionBodyNode), LEXER->sourceCode((yyvsp[(6) - (8)].intValue), (yyvsp[(8) - (8)].intValue), (yylsp[(6) - (8)]).first_line), (yyvsp[(4) - (8)].parameterList).m_node.head), (yyvsp[(4) - (8)].parameterList).m_features | ClosureFeature, 0); if ((yyvsp[(4) - (8)].parameterList).m_features & ArgumentsFeature) @@ -4783,7 +4781,7 @@ yyreduce: case 293: /* Line 1455 of yacc.c */ -#line 1203 "../../JavaScriptCore/parser/Grammar.y" +#line 1201 "../../JavaScriptCore/parser/Grammar.y" { (yyval.parameterList).m_node.head = new (GLOBAL_DATA) ParameterNode(GLOBAL_DATA, *(yyvsp[(1) - (1)].ident)); (yyval.parameterList).m_features = (*(yyvsp[(1) - (1)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0; (yyval.parameterList).m_node.tail = (yyval.parameterList).m_node.head; ;} @@ -4792,7 +4790,7 @@ yyreduce: case 294: /* Line 1455 of yacc.c */ -#line 1206 "../../JavaScriptCore/parser/Grammar.y" +#line 1204 "../../JavaScriptCore/parser/Grammar.y" { (yyval.parameterList).m_node.head = (yyvsp[(1) - (3)].parameterList).m_node.head; (yyval.parameterList).m_features = (yyvsp[(1) - (3)].parameterList).m_features | ((*(yyvsp[(3) - (3)].ident) == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0); (yyval.parameterList).m_node.tail = new (GLOBAL_DATA) ParameterNode(GLOBAL_DATA, (yyvsp[(1) - (3)].parameterList).m_node.tail, *(yyvsp[(3) - (3)].ident)); ;} @@ -4801,28 +4799,28 @@ yyreduce: case 295: /* Line 1455 of yacc.c */ -#line 1212 "../../JavaScriptCore/parser/Grammar.y" +#line 1210 "../../JavaScriptCore/parser/Grammar.y" { (yyval.functionBodyNode) = FunctionBodyNode::create(GLOBAL_DATA); ;} break; case 296: /* Line 1455 of yacc.c */ -#line 1213 "../../JavaScriptCore/parser/Grammar.y" +#line 1211 "../../JavaScriptCore/parser/Grammar.y" { (yyval.functionBodyNode) = FunctionBodyNode::create(GLOBAL_DATA); ;} break; case 297: /* Line 1455 of yacc.c */ -#line 1217 "../../JavaScriptCore/parser/Grammar.y" +#line 1215 "../../JavaScriptCore/parser/Grammar.y" { GLOBAL_DATA->parser->didFinishParsing(new (GLOBAL_DATA) SourceElements(GLOBAL_DATA), 0, 0, NoFeatures, (yylsp[(0) - (0)]).last_line, 0); ;} break; case 298: /* Line 1455 of yacc.c */ -#line 1218 "../../JavaScriptCore/parser/Grammar.y" +#line 1216 "../../JavaScriptCore/parser/Grammar.y" { GLOBAL_DATA->parser->didFinishParsing((yyvsp[(1) - (1)].sourceElements).m_node, (yyvsp[(1) - (1)].sourceElements).m_varDeclarations, (yyvsp[(1) - (1)].sourceElements).m_funcDeclarations, (yyvsp[(1) - (1)].sourceElements).m_features, (yylsp[(1) - (1)]).last_line, (yyvsp[(1) - (1)].sourceElements).m_numConstants); ;} break; @@ -4830,7 +4828,7 @@ yyreduce: case 299: /* Line 1455 of yacc.c */ -#line 1223 "../../JavaScriptCore/parser/Grammar.y" +#line 1221 "../../JavaScriptCore/parser/Grammar.y" { (yyval.sourceElements).m_node = new (GLOBAL_DATA) SourceElements(GLOBAL_DATA); (yyval.sourceElements).m_node->append((yyvsp[(1) - (1)].statementNode).m_node); (yyval.sourceElements).m_varDeclarations = (yyvsp[(1) - (1)].statementNode).m_varDeclarations; @@ -4843,7 +4841,7 @@ yyreduce: case 300: /* Line 1455 of yacc.c */ -#line 1230 "../../JavaScriptCore/parser/Grammar.y" +#line 1228 "../../JavaScriptCore/parser/Grammar.y" { (yyval.sourceElements).m_node->append((yyvsp[(2) - (2)].statementNode).m_node); (yyval.sourceElements).m_varDeclarations = mergeDeclarationLists((yyvsp[(1) - (2)].sourceElements).m_varDeclarations, (yyvsp[(2) - (2)].statementNode).m_varDeclarations); (yyval.sourceElements).m_funcDeclarations = mergeDeclarationLists((yyvsp[(1) - (2)].sourceElements).m_funcDeclarations, (yyvsp[(2) - (2)].statementNode).m_funcDeclarations); @@ -4855,259 +4853,259 @@ yyreduce: case 304: /* Line 1455 of yacc.c */ -#line 1244 "../../JavaScriptCore/parser/Grammar.y" +#line 1242 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 305: /* Line 1455 of yacc.c */ -#line 1245 "../../JavaScriptCore/parser/Grammar.y" +#line 1243 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 306: /* Line 1455 of yacc.c */ -#line 1246 "../../JavaScriptCore/parser/Grammar.y" +#line 1244 "../../JavaScriptCore/parser/Grammar.y" { Lexer& l = *LEXER; if (!l.scanRegExp()) YYABORT; ;} break; case 307: /* Line 1455 of yacc.c */ -#line 1247 "../../JavaScriptCore/parser/Grammar.y" +#line 1245 "../../JavaScriptCore/parser/Grammar.y" { Lexer& l = *LEXER; if (!l.scanRegExp()) YYABORT; ;} break; case 308: /* Line 1455 of yacc.c */ -#line 1251 "../../JavaScriptCore/parser/Grammar.y" +#line 1249 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 309: /* Line 1455 of yacc.c */ -#line 1252 "../../JavaScriptCore/parser/Grammar.y" +#line 1250 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 310: /* Line 1455 of yacc.c */ -#line 1253 "../../JavaScriptCore/parser/Grammar.y" +#line 1251 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 311: /* Line 1455 of yacc.c */ -#line 1254 "../../JavaScriptCore/parser/Grammar.y" +#line 1252 "../../JavaScriptCore/parser/Grammar.y" { if (*(yyvsp[(1) - (7)].ident) != "get" && *(yyvsp[(1) - (7)].ident) != "set") YYABORT; ;} break; case 312: /* Line 1455 of yacc.c */ -#line 1255 "../../JavaScriptCore/parser/Grammar.y" +#line 1253 "../../JavaScriptCore/parser/Grammar.y" { if (*(yyvsp[(1) - (8)].ident) != "get" && *(yyvsp[(1) - (8)].ident) != "set") YYABORT; ;} break; case 316: /* Line 1455 of yacc.c */ -#line 1265 "../../JavaScriptCore/parser/Grammar.y" +#line 1263 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 317: /* Line 1455 of yacc.c */ -#line 1266 "../../JavaScriptCore/parser/Grammar.y" +#line 1264 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 318: /* Line 1455 of yacc.c */ -#line 1268 "../../JavaScriptCore/parser/Grammar.y" +#line 1266 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 322: /* Line 1455 of yacc.c */ -#line 1275 "../../JavaScriptCore/parser/Grammar.y" +#line 1273 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 517: /* Line 1455 of yacc.c */ -#line 1643 "../../JavaScriptCore/parser/Grammar.y" +#line 1641 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 518: /* Line 1455 of yacc.c */ -#line 1644 "../../JavaScriptCore/parser/Grammar.y" +#line 1642 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 520: /* Line 1455 of yacc.c */ -#line 1649 "../../JavaScriptCore/parser/Grammar.y" +#line 1647 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 521: /* Line 1455 of yacc.c */ -#line 1653 "../../JavaScriptCore/parser/Grammar.y" +#line 1651 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 522: /* Line 1455 of yacc.c */ -#line 1654 "../../JavaScriptCore/parser/Grammar.y" +#line 1652 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 525: /* Line 1455 of yacc.c */ -#line 1660 "../../JavaScriptCore/parser/Grammar.y" +#line 1658 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 526: /* Line 1455 of yacc.c */ -#line 1661 "../../JavaScriptCore/parser/Grammar.y" +#line 1659 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 530: /* Line 1455 of yacc.c */ -#line 1668 "../../JavaScriptCore/parser/Grammar.y" +#line 1666 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 533: /* Line 1455 of yacc.c */ -#line 1677 "../../JavaScriptCore/parser/Grammar.y" +#line 1675 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 534: /* Line 1455 of yacc.c */ -#line 1678 "../../JavaScriptCore/parser/Grammar.y" +#line 1676 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 539: /* Line 1455 of yacc.c */ -#line 1695 "../../JavaScriptCore/parser/Grammar.y" +#line 1693 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 555: /* Line 1455 of yacc.c */ -#line 1726 "../../JavaScriptCore/parser/Grammar.y" +#line 1724 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 557: /* Line 1455 of yacc.c */ -#line 1728 "../../JavaScriptCore/parser/Grammar.y" +#line 1726 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 559: /* Line 1455 of yacc.c */ -#line 1733 "../../JavaScriptCore/parser/Grammar.y" +#line 1731 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 561: /* Line 1455 of yacc.c */ -#line 1735 "../../JavaScriptCore/parser/Grammar.y" +#line 1733 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 563: /* Line 1455 of yacc.c */ -#line 1740 "../../JavaScriptCore/parser/Grammar.y" +#line 1738 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 565: /* Line 1455 of yacc.c */ -#line 1742 "../../JavaScriptCore/parser/Grammar.y" +#line 1740 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 568: /* Line 1455 of yacc.c */ -#line 1754 "../../JavaScriptCore/parser/Grammar.y" +#line 1752 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 569: /* Line 1455 of yacc.c */ -#line 1755 "../../JavaScriptCore/parser/Grammar.y" +#line 1753 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 578: /* Line 1455 of yacc.c */ -#line 1779 "../../JavaScriptCore/parser/Grammar.y" +#line 1777 "../../JavaScriptCore/parser/Grammar.y" { ;} break; case 580: /* Line 1455 of yacc.c */ -#line 1784 "../../JavaScriptCore/parser/Grammar.y" +#line 1782 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 585: /* Line 1455 of yacc.c */ -#line 1795 "../../JavaScriptCore/parser/Grammar.y" +#line 1793 "../../JavaScriptCore/parser/Grammar.y" { AUTO_SEMICOLON; ;} break; case 592: /* Line 1455 of yacc.c */ -#line 1811 "../../JavaScriptCore/parser/Grammar.y" +#line 1809 "../../JavaScriptCore/parser/Grammar.y" { ;} break; /* Line 1455 of yacc.c */ -#line 5111 "WebCore/tmp/../generated/Grammar.tab.c" +#line 5109 "WebCore/tmp/../generated/Grammar.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -5326,7 +5324,7 @@ yyreturn: /* Line 1675 of yacc.c */ -#line 1827 "../../JavaScriptCore/parser/Grammar.y" +#line 1825 "../../JavaScriptCore/parser/Grammar.y" static ExpressionNode* makeAssignNode(void* globalPtr, ExpressionNode* loc, Operator op, ExpressionNode* expr, bool locHasAssignments, bool exprHasAssignments, int start, int divot, int end) diff --git a/src/3rdparty/webkit/WebCore/generated/Grammar.h b/src/3rdparty/webkit/WebCore/generated/Grammar.h index 34b0b37d5..2f9d6f0a6 100644 --- a/src/3rdparty/webkit/WebCore/generated/Grammar.h +++ b/src/3rdparty/webkit/WebCore/generated/Grammar.h @@ -112,7 +112,7 @@ typedef union YYSTYPE { /* Line 1676 of yacc.c */ -#line 157 "../../JavaScriptCore/parser/Grammar.y" +#line 155 "../../JavaScriptCore/parser/Grammar.y" int intValue; double doubleValue; diff --git a/src/3rdparty/webkit/WebCore/generated/HTMLNames.cpp b/src/3rdparty/webkit/WebCore/generated/HTMLNames.cpp index f40ae0553..44458f7de 100644 --- a/src/3rdparty/webkit/WebCore/generated/HTMLNames.cpp +++ b/src/3rdparty/webkit/WebCore/generated/HTMLNames.cpp @@ -350,6 +350,7 @@ DEFINE_GLOBAL(QualifiedName, deferAttr, nullAtom, "defer", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, dirAttr, nullAtom, "dir", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, directionAttr, nullAtom, "direction", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, disabledAttr, nullAtom, "disabled", xhtmlNamespaceURI); +DEFINE_GLOBAL(QualifiedName, draggableAttr, nullAtom, "draggable", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, enctypeAttr, nullAtom, "enctype", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, endAttr, nullAtom, "end", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, expandedAttr, nullAtom, "expanded", xhtmlNamespaceURI); @@ -464,6 +465,7 @@ DEFINE_GLOBAL(QualifiedName, onwebkitanimationendAttr, nullAtom, "onwebkitanimat DEFINE_GLOBAL(QualifiedName, onwebkitanimationiterationAttr, nullAtom, "onwebkitanimationiteration", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, onwebkitanimationstartAttr, nullAtom, "onwebkitanimationstart", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, onwebkittransitionendAttr, nullAtom, "onwebkittransitionend", xhtmlNamespaceURI); +DEFINE_GLOBAL(QualifiedName, patternAttr, nullAtom, "pattern", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, placeholderAttr, nullAtom, "placeholder", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, playcountAttr, nullAtom, "playcount", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, pluginurlAttr, nullAtom, "pluginurl", xhtmlNamespaceURI); @@ -475,6 +477,7 @@ DEFINE_GLOBAL(QualifiedName, progressAttr, nullAtom, "progress", xhtmlNamespaceU DEFINE_GLOBAL(QualifiedName, promptAttr, nullAtom, "prompt", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, readonlyAttr, nullAtom, "readonly", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, relAttr, nullAtom, "rel", xhtmlNamespaceURI); +DEFINE_GLOBAL(QualifiedName, requiredAttr, nullAtom, "required", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, resultsAttr, nullAtom, "results", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, revAttr, nullAtom, "rev", xhtmlNamespaceURI); DEFINE_GLOBAL(QualifiedName, roleAttr, nullAtom, "role", xhtmlNamespaceURI); @@ -588,6 +591,7 @@ WebCore::QualifiedName** getHTMLAttrs(size_t* size) (WebCore::QualifiedName*)&dirAttr, (WebCore::QualifiedName*)&directionAttr, (WebCore::QualifiedName*)&disabledAttr, + (WebCore::QualifiedName*)&draggableAttr, (WebCore::QualifiedName*)&enctypeAttr, (WebCore::QualifiedName*)&endAttr, (WebCore::QualifiedName*)&expandedAttr, @@ -702,6 +706,7 @@ WebCore::QualifiedName** getHTMLAttrs(size_t* size) (WebCore::QualifiedName*)&onwebkitanimationiterationAttr, (WebCore::QualifiedName*)&onwebkitanimationstartAttr, (WebCore::QualifiedName*)&onwebkittransitionendAttr, + (WebCore::QualifiedName*)&patternAttr, (WebCore::QualifiedName*)&placeholderAttr, (WebCore::QualifiedName*)&playcountAttr, (WebCore::QualifiedName*)&pluginurlAttr, @@ -713,6 +718,7 @@ WebCore::QualifiedName** getHTMLAttrs(size_t* size) (WebCore::QualifiedName*)&promptAttr, (WebCore::QualifiedName*)&readonlyAttr, (WebCore::QualifiedName*)&relAttr, + (WebCore::QualifiedName*)&requiredAttr, (WebCore::QualifiedName*)&resultsAttr, (WebCore::QualifiedName*)&revAttr, (WebCore::QualifiedName*)&roleAttr, @@ -756,7 +762,7 @@ WebCore::QualifiedName** getHTMLAttrs(size_t* size) (WebCore::QualifiedName*)&widthAttr, (WebCore::QualifiedName*)&wrapAttr, }; - *size = 233; + *size = 236; return HTMLAttr; } @@ -1075,6 +1081,7 @@ void init() const char *dirAttrString = "dir"; const char *directionAttrString = "direction"; const char *disabledAttrString = "disabled"; + const char *draggableAttrString = "draggable"; const char *enctypeAttrString = "enctype"; const char *endAttrString = "end"; const char *expandedAttrString = "expanded"; @@ -1189,6 +1196,7 @@ void init() const char *onwebkitanimationiterationAttrString = "onwebkitanimationiteration"; const char *onwebkitanimationstartAttrString = "onwebkitanimationstart"; const char *onwebkittransitionendAttrString = "onwebkittransitionend"; + const char *patternAttrString = "pattern"; const char *placeholderAttrString = "placeholder"; const char *playcountAttrString = "playcount"; const char *pluginurlAttrString = "pluginurl"; @@ -1200,6 +1208,7 @@ void init() const char *promptAttrString = "prompt"; const char *readonlyAttrString = "readonly"; const char *relAttrString = "rel"; + const char *requiredAttrString = "required"; const char *resultsAttrString = "results"; const char *revAttrString = "rev"; const char *roleAttrString = "role"; @@ -1308,6 +1317,7 @@ void init() new ((void*)&dirAttr) QualifiedName(nullAtom, dirAttrString, nullAtom); new ((void*)&directionAttr) QualifiedName(nullAtom, directionAttrString, nullAtom); new ((void*)&disabledAttr) QualifiedName(nullAtom, disabledAttrString, nullAtom); + new ((void*)&draggableAttr) QualifiedName(nullAtom, draggableAttrString, nullAtom); new ((void*)&enctypeAttr) QualifiedName(nullAtom, enctypeAttrString, nullAtom); new ((void*)&endAttr) QualifiedName(nullAtom, endAttrString, nullAtom); new ((void*)&expandedAttr) QualifiedName(nullAtom, expandedAttrString, nullAtom); @@ -1422,6 +1432,7 @@ void init() new ((void*)&onwebkitanimationiterationAttr) QualifiedName(nullAtom, onwebkitanimationiterationAttrString, nullAtom); new ((void*)&onwebkitanimationstartAttr) QualifiedName(nullAtom, onwebkitanimationstartAttrString, nullAtom); new ((void*)&onwebkittransitionendAttr) QualifiedName(nullAtom, onwebkittransitionendAttrString, nullAtom); + new ((void*)&patternAttr) QualifiedName(nullAtom, patternAttrString, nullAtom); new ((void*)&placeholderAttr) QualifiedName(nullAtom, placeholderAttrString, nullAtom); new ((void*)&playcountAttr) QualifiedName(nullAtom, playcountAttrString, nullAtom); new ((void*)&pluginurlAttr) QualifiedName(nullAtom, pluginurlAttrString, nullAtom); @@ -1433,6 +1444,7 @@ void init() new ((void*)&promptAttr) QualifiedName(nullAtom, promptAttrString, nullAtom); new ((void*)&readonlyAttr) QualifiedName(nullAtom, readonlyAttrString, nullAtom); new ((void*)&relAttr) QualifiedName(nullAtom, relAttrString, nullAtom); + new ((void*)&requiredAttr) QualifiedName(nullAtom, requiredAttrString, nullAtom); new ((void*)&resultsAttr) QualifiedName(nullAtom, resultsAttrString, nullAtom); new ((void*)&revAttr) QualifiedName(nullAtom, revAttrString, nullAtom); new ((void*)&roleAttr) QualifiedName(nullAtom, roleAttrString, nullAtom); diff --git a/src/3rdparty/webkit/WebCore/generated/HTMLNames.h b/src/3rdparty/webkit/WebCore/generated/HTMLNames.h index 3de4fc586..a2544e679 100644 --- a/src/3rdparty/webkit/WebCore/generated/HTMLNames.h +++ b/src/3rdparty/webkit/WebCore/generated/HTMLNames.h @@ -223,6 +223,7 @@ extern const WebCore::QualifiedName deferAttr; extern const WebCore::QualifiedName dirAttr; extern const WebCore::QualifiedName directionAttr; extern const WebCore::QualifiedName disabledAttr; +extern const WebCore::QualifiedName draggableAttr; extern const WebCore::QualifiedName enctypeAttr; extern const WebCore::QualifiedName endAttr; extern const WebCore::QualifiedName expandedAttr; @@ -337,6 +338,7 @@ extern const WebCore::QualifiedName onwebkitanimationendAttr; extern const WebCore::QualifiedName onwebkitanimationiterationAttr; extern const WebCore::QualifiedName onwebkitanimationstartAttr; extern const WebCore::QualifiedName onwebkittransitionendAttr; +extern const WebCore::QualifiedName patternAttr; extern const WebCore::QualifiedName placeholderAttr; extern const WebCore::QualifiedName playcountAttr; extern const WebCore::QualifiedName pluginurlAttr; @@ -348,6 +350,7 @@ extern const WebCore::QualifiedName progressAttr; extern const WebCore::QualifiedName promptAttr; extern const WebCore::QualifiedName readonlyAttr; extern const WebCore::QualifiedName relAttr; +extern const WebCore::QualifiedName requiredAttr; extern const WebCore::QualifiedName resultsAttr; extern const WebCore::QualifiedName revAttr; extern const WebCore::QualifiedName roleAttr; diff --git a/src/3rdparty/webkit/WebCore/generated/JSAbstractWorker.cpp b/src/3rdparty/webkit/WebCore/generated/JSAbstractWorker.cpp new file mode 100644 index 000000000..d591cad53 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSAbstractWorker.cpp @@ -0,0 +1,227 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "config.h" + +#if ENABLE(WORKERS) + +#include "JSAbstractWorker.h" + +#include "AbstractWorker.h" +#include "Event.h" +#include "EventListener.h" +#include "Frame.h" +#include "JSDOMGlobalObject.h" +#include "JSEvent.h" +#include "JSEventListener.h" +#include +#include + +using namespace JSC; + +namespace WebCore { + +ASSERT_CLASS_FITS_IN_CELL(JSAbstractWorker); + +/* Hash table */ + +static const HashTableValue JSAbstractWorkerTableValues[3] = +{ + { "onerror", DontDelete, (intptr_t)jsAbstractWorkerOnerror, (intptr_t)setJSAbstractWorkerOnerror }, + { "constructor", DontEnum|ReadOnly, (intptr_t)jsAbstractWorkerConstructor, (intptr_t)0 }, + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSAbstractWorkerTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 1, JSAbstractWorkerTableValues, 0 }; +#else + { 4, 3, JSAbstractWorkerTableValues, 0 }; +#endif + +/* Hash table for constructor */ + +static const HashTableValue JSAbstractWorkerConstructorTableValues[1] = +{ + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSAbstractWorkerConstructorTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSAbstractWorkerConstructorTableValues, 0 }; +#else + { 1, 0, JSAbstractWorkerConstructorTableValues, 0 }; +#endif + +class JSAbstractWorkerConstructor : public DOMConstructorObject { +public: + JSAbstractWorkerConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSAbstractWorkerConstructor::createStructure(globalObject->objectPrototype()), globalObject) + { + putDirect(exec->propertyNames().prototype, JSAbstractWorkerPrototype::self(exec, globalObject), None); + } + virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); + virtual const ClassInfo* classInfo() const { return &s_info; } + static const ClassInfo s_info; + + static PassRefPtr createStructure(JSValue proto) + { + return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); + } +}; + +const ClassInfo JSAbstractWorkerConstructor::s_info = { "AbstractWorkerConstructor", 0, &JSAbstractWorkerConstructorTable, 0 }; + +bool JSAbstractWorkerConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot(exec, &JSAbstractWorkerConstructorTable, this, propertyName, slot); +} + +/* Hash table for prototype */ + +static const HashTableValue JSAbstractWorkerPrototypeTableValues[4] = +{ + { "addEventListener", DontDelete|Function, (intptr_t)jsAbstractWorkerPrototypeFunctionAddEventListener, (intptr_t)3 }, + { "removeEventListener", DontDelete|Function, (intptr_t)jsAbstractWorkerPrototypeFunctionRemoveEventListener, (intptr_t)3 }, + { "dispatchEvent", DontDelete|Function, (intptr_t)jsAbstractWorkerPrototypeFunctionDispatchEvent, (intptr_t)1 }, + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSAbstractWorkerPrototypeTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 3, JSAbstractWorkerPrototypeTableValues, 0 }; +#else + { 8, 7, JSAbstractWorkerPrototypeTableValues, 0 }; +#endif + +const ClassInfo JSAbstractWorkerPrototype::s_info = { "AbstractWorkerPrototype", 0, &JSAbstractWorkerPrototypeTable, 0 }; + +JSObject* JSAbstractWorkerPrototype::self(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMPrototype(exec, globalObject); +} + +bool JSAbstractWorkerPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticFunctionSlot(exec, &JSAbstractWorkerPrototypeTable, this, propertyName, slot); +} + +const ClassInfo JSAbstractWorker::s_info = { "AbstractWorker", 0, &JSAbstractWorkerTable, 0 }; + +JSAbstractWorker::JSAbstractWorker(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) + , m_impl(impl) +{ +} + +JSAbstractWorker::~JSAbstractWorker() +{ + forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); +} + +JSObject* JSAbstractWorker::createPrototype(ExecState* exec, JSGlobalObject* globalObject) +{ + return new (exec) JSAbstractWorkerPrototype(JSAbstractWorkerPrototype::createStructure(globalObject->objectPrototype())); +} + +bool JSAbstractWorker::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot(exec, &JSAbstractWorkerTable, this, propertyName, slot); +} + +JSValue jsAbstractWorkerOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSAbstractWorker* castedThis = static_cast(asObject(slot.slotBase())); + UNUSED_PARAM(exec); + AbstractWorker* imp = static_cast(castedThis->impl()); + if (EventListener* listener = imp->onerror()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +JSValue jsAbstractWorkerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSAbstractWorker* domObject = static_cast(asObject(slot.slotBase())); + return JSAbstractWorker::getConstructor(exec, domObject->globalObject()); +} +void JSAbstractWorker::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) +{ + lookupPut(exec, propertyName, value, &JSAbstractWorkerTable, this, slot); +} + +void setJSAbstractWorkerOnerror(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + AbstractWorker* imp = static_cast(static_cast(thisObject)->impl()); + JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); + if (!globalObject) + return; + imp->setOnerror(globalObject->createJSAttributeEventListener(value)); +} + +JSValue JSAbstractWorker::getConstructor(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMConstructor(exec, static_cast(globalObject)); +} + +JSValue JSC_HOST_CALL jsAbstractWorkerPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSAbstractWorker::s_info)) + return throwError(exec, TypeError); + JSAbstractWorker* castedThisObj = static_cast(asObject(thisValue)); + return castedThisObj->addEventListener(exec, args); +} + +JSValue JSC_HOST_CALL jsAbstractWorkerPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSAbstractWorker::s_info)) + return throwError(exec, TypeError); + JSAbstractWorker* castedThisObj = static_cast(asObject(thisValue)); + return castedThisObj->removeEventListener(exec, args); +} + +JSValue JSC_HOST_CALL jsAbstractWorkerPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSAbstractWorker::s_info)) + return throwError(exec, TypeError); + JSAbstractWorker* castedThisObj = static_cast(asObject(thisValue)); + AbstractWorker* imp = static_cast(castedThisObj->impl()); + ExceptionCode ec = 0; + Event* evt = toEvent(args.at(0)); + + + JSC::JSValue result = jsBoolean(imp->dispatchEvent(evt, ec)); + setDOMException(exec, ec); + return result; +} + +AbstractWorker* toAbstractWorker(JSC::JSValue value) +{ + return value.isObject(&JSAbstractWorker::s_info) ? static_cast(asObject(value))->impl() : 0; +} + +} + +#endif // ENABLE(WORKERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSAbstractWorker.h b/src/3rdparty/webkit/WebCore/generated/JSAbstractWorker.h new file mode 100644 index 000000000..a2c92a563 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSAbstractWorker.h @@ -0,0 +1,96 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef JSAbstractWorker_h +#define JSAbstractWorker_h + +#if ENABLE(WORKERS) + +#include "DOMObjectWithSVGContext.h" +#include "JSDOMBinding.h" +#include +#include + +namespace WebCore { + +class AbstractWorker; + +class JSAbstractWorker : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; +public: + JSAbstractWorker(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); + virtual ~JSAbstractWorker(); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + + static PassRefPtr createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + + virtual void mark(); + + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); + + // Custom functions + JSC::JSValue addEventListener(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue removeEventListener(JSC::ExecState*, const JSC::ArgList&); + AbstractWorker* impl() const { return m_impl.get(); } + +private: + RefPtr m_impl; +}; + +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, AbstractWorker*); +AbstractWorker* toAbstractWorker(JSC::JSValue); + +class JSAbstractWorkerPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; +public: + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); + static PassRefPtr createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + JSAbstractWorkerPrototype(PassRefPtr structure) : JSC::JSObject(structure) { } +}; + +// Functions + +JSC::JSValue JSC_HOST_CALL jsAbstractWorkerPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsAbstractWorkerPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsAbstractWorkerPrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +// Attributes + +JSC::JSValue jsAbstractWorkerOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSAbstractWorkerOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsAbstractWorkerConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + +} // namespace WebCore + +#endif // ENABLE(WORKERS) + +#endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSAttr.cpp b/src/3rdparty/webkit/WebCore/generated/JSAttr.cpp index 4659189e6..c4f56396f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSAttr.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSAttr.cpp @@ -70,12 +70,12 @@ static JSC_CONST_HASHTABLE HashTable JSAttrConstructorTable = { 1, 0, JSAttrConstructorTableValues, 0 }; #endif -class JSAttrConstructor : public DOMObject { +class JSAttrConstructor : public DOMConstructorObject { public: - JSAttrConstructor(ExecState* exec) - : DOMObject(JSAttrConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSAttrConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSAttrConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSAttrPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSAttrPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -117,8 +117,8 @@ JSObject* JSAttrPrototype::self(ExecState* exec, JSGlobalObject* globalObject) const ClassInfo JSAttr::s_info = { "Attr", &JSNode::s_info, &JSAttrTable, 0 }; -JSAttr::JSAttr(PassRefPtr structure, PassRefPtr impl) - : JSNode(structure, impl) +JSAttr::JSAttr(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSNode(structure, globalObject, impl) { } @@ -134,42 +134,48 @@ bool JSAttr::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, JSValue jsAttrName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSAttr* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Attr* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Attr* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->name()); } JSValue jsAttrSpecified(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSAttr* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Attr* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Attr* imp = static_cast(castedThis->impl()); return jsBoolean(imp->specified()); } JSValue jsAttrValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSAttr* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Attr* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Attr* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->value()); } JSValue jsAttrOwnerElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSAttr* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Attr* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->ownerElement())); + Attr* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->ownerElement())); } JSValue jsAttrStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSAttr* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Attr* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + Attr* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsAttrConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSAttr* domObject = static_cast(asObject(slot.slotBase())); + return JSAttr::getConstructor(exec, domObject->globalObject()); } void JSAttr::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -181,9 +187,9 @@ void setJSAttrValue(ExecState* exec, JSObject* thisObject, JSValue value) static_cast(thisObject)->setValue(exec, value); } -JSValue JSAttr::getConstructor(ExecState* exec) +JSValue JSAttr::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } Attr* toAttr(JSC::JSValue value) diff --git a/src/3rdparty/webkit/WebCore/generated/JSAttr.h b/src/3rdparty/webkit/WebCore/generated/JSAttr.h index 4d13aa8dd..a3b2165e9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSAttr.h +++ b/src/3rdparty/webkit/WebCore/generated/JSAttr.h @@ -31,7 +31,7 @@ class Attr; class JSAttr : public JSNode { typedef JSNode Base; public: - JSAttr(PassRefPtr, PassRefPtr); + JSAttr(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -43,7 +43,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom attributes void setValue(JSC::ExecState*, JSC::JSValue); diff --git a/src/3rdparty/webkit/WebCore/generated/JSBarInfo.cpp b/src/3rdparty/webkit/WebCore/generated/JSBarInfo.cpp index 2b5afda96..c799f7f00 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSBarInfo.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSBarInfo.cpp @@ -68,8 +68,8 @@ JSObject* JSBarInfoPrototype::self(ExecState* exec, JSGlobalObject* globalObject const ClassInfo JSBarInfo::s_info = { "BarInfo", 0, &JSBarInfoTable, 0 }; -JSBarInfo::JSBarInfo(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSBarInfo::JSBarInfo(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -91,14 +91,15 @@ bool JSBarInfo::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa JSValue jsBarInfoVisible(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSBarInfo* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - BarInfo* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + BarInfo* imp = static_cast(castedThis->impl()); return jsBoolean(imp->visible()); } -JSC::JSValue toJS(JSC::ExecState* exec, BarInfo* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, BarInfo* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } BarInfo* toBarInfo(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSBarInfo.h b/src/3rdparty/webkit/WebCore/generated/JSBarInfo.h index c27d6c199..5698443b2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSBarInfo.h +++ b/src/3rdparty/webkit/WebCore/generated/JSBarInfo.h @@ -21,6 +21,7 @@ #ifndef JSBarInfo_h #define JSBarInfo_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class BarInfo; -class JSBarInfo : public DOMObject { - typedef DOMObject Base; +class JSBarInfo : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSBarInfo(PassRefPtr, PassRefPtr); + JSBarInfo(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSBarInfo(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -50,7 +51,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, BarInfo*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, BarInfo*); BarInfo* toBarInfo(JSC::JSValue); class JSBarInfoPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCDATASection.cpp b/src/3rdparty/webkit/WebCore/generated/JSCDATASection.cpp index 51f543f29..f3ef364ee 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCDATASection.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCDATASection.cpp @@ -59,12 +59,12 @@ static JSC_CONST_HASHTABLE HashTable JSCDATASectionConstructorTable = { 1, 0, JSCDATASectionConstructorTableValues, 0 }; #endif -class JSCDATASectionConstructor : public DOMObject { +class JSCDATASectionConstructor : public DOMConstructorObject { public: - JSCDATASectionConstructor(ExecState* exec) - : DOMObject(JSCDATASectionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCDATASectionConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCDATASectionConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCDATASectionPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCDATASectionPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -106,8 +106,8 @@ JSObject* JSCDATASectionPrototype::self(ExecState* exec, JSGlobalObject* globalO const ClassInfo JSCDATASection::s_info = { "CDATASection", &JSText::s_info, &JSCDATASectionTable, 0 }; -JSCDATASection::JSCDATASection(PassRefPtr structure, PassRefPtr impl) - : JSText(structure, impl) +JSCDATASection::JSCDATASection(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSText(structure, globalObject, impl) { } @@ -123,11 +123,12 @@ bool JSCDATASection::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsCDATASectionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCDATASection* domObject = static_cast(asObject(slot.slotBase())); + return JSCDATASection::getConstructor(exec, domObject->globalObject()); } -JSValue JSCDATASection::getConstructor(ExecState* exec) +JSValue JSCDATASection::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCDATASection.h b/src/3rdparty/webkit/WebCore/generated/JSCDATASection.h index 724ca0be2..b45da05a5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCDATASection.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCDATASection.h @@ -30,7 +30,7 @@ class CDATASection; class JSCDATASection : public JSText { typedef JSText Base; public: - JSCDATASection(PassRefPtr, PassRefPtr); + JSCDATASection(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,10 +41,10 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; -JSC::JSValue toJSNewlyCreated(JSC::ExecState*, CDATASection*); +JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject*, CDATASection*); class JSCDATASectionPrototype : public JSC::JSObject { typedef JSC::JSObject Base; diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.cpp index 70a61d5da..f0a22030e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.cpp @@ -61,12 +61,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSCharsetRuleConstructorTable = { 1, 0, JSCSSCharsetRuleConstructorTableValues, 0 }; #endif -class JSCSSCharsetRuleConstructor : public DOMObject { +class JSCSSCharsetRuleConstructor : public DOMConstructorObject { public: - JSCSSCharsetRuleConstructor(ExecState* exec) - : DOMObject(JSCSSCharsetRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSCharsetRuleConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSCharsetRuleConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSCharsetRulePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSCharsetRulePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -108,8 +108,8 @@ JSObject* JSCSSCharsetRulePrototype::self(ExecState* exec, JSGlobalObject* globa const ClassInfo JSCSSCharsetRule::s_info = { "CSSCharsetRule", &JSCSSRule::s_info, &JSCSSCharsetRuleTable, 0 }; -JSCSSCharsetRule::JSCSSCharsetRule(PassRefPtr structure, PassRefPtr impl) - : JSCSSRule(structure, impl) +JSCSSCharsetRule::JSCSSCharsetRule(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCSSRule(structure, globalObject, impl) { } @@ -125,14 +125,16 @@ bool JSCSSCharsetRule::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsCSSCharsetRuleEncoding(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSCharsetRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSCharsetRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSCharsetRule* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->encoding()); } JSValue jsCSSCharsetRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSCharsetRule* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSCharsetRule::getConstructor(exec, domObject->globalObject()); } void JSCSSCharsetRule::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -147,9 +149,9 @@ void setJSCSSCharsetRuleEncoding(ExecState* exec, JSObject* thisObject, JSValue setDOMException(exec, ec); } -JSValue JSCSSCharsetRule::getConstructor(ExecState* exec) +JSValue JSCSSCharsetRule::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.h index 54c3be3cc..d7e303c58 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSCharsetRule.h @@ -30,7 +30,7 @@ class CSSCharsetRule; class JSCSSCharsetRule : public JSCSSRule { typedef JSCSSRule Base; public: - JSCSSCharsetRule(PassRefPtr, PassRefPtr); + JSCSSCharsetRule(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.cpp index 13c119ef7..b8a1735d6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.cpp @@ -63,12 +63,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSFontFaceRuleConstructorTable = { 1, 0, JSCSSFontFaceRuleConstructorTableValues, 0 }; #endif -class JSCSSFontFaceRuleConstructor : public DOMObject { +class JSCSSFontFaceRuleConstructor : public DOMConstructorObject { public: - JSCSSFontFaceRuleConstructor(ExecState* exec) - : DOMObject(JSCSSFontFaceRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSFontFaceRuleConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSFontFaceRuleConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSFontFaceRulePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSFontFaceRulePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -110,8 +110,8 @@ JSObject* JSCSSFontFaceRulePrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSCSSFontFaceRule::s_info = { "CSSFontFaceRule", &JSCSSRule::s_info, &JSCSSFontFaceRuleTable, 0 }; -JSCSSFontFaceRule::JSCSSFontFaceRule(PassRefPtr structure, PassRefPtr impl) - : JSCSSRule(structure, impl) +JSCSSFontFaceRule::JSCSSFontFaceRule(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCSSRule(structure, globalObject, impl) { } @@ -127,18 +127,20 @@ bool JSCSSFontFaceRule::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsCSSFontFaceRuleStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSFontFaceRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSFontFaceRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + CSSFontFaceRule* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsCSSFontFaceRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSFontFaceRule* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSFontFaceRule::getConstructor(exec, domObject->globalObject()); } -JSValue JSCSSFontFaceRule::getConstructor(ExecState* exec) +JSValue JSCSSFontFaceRule::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.h index a2acf4cfb..26ced7616 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSFontFaceRule.h @@ -30,7 +30,7 @@ class CSSFontFaceRule; class JSCSSFontFaceRule : public JSCSSRule { typedef JSCSSRule Base; public: - JSCSSFontFaceRule(PassRefPtr, PassRefPtr); + JSCSSFontFaceRule(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.cpp index 45d5d6083..874eab323 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.cpp @@ -67,12 +67,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSImportRuleConstructorTable = { 1, 0, JSCSSImportRuleConstructorTableValues, 0 }; #endif -class JSCSSImportRuleConstructor : public DOMObject { +class JSCSSImportRuleConstructor : public DOMConstructorObject { public: - JSCSSImportRuleConstructor(ExecState* exec) - : DOMObject(JSCSSImportRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSImportRuleConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSImportRuleConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSImportRulePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSImportRulePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -114,8 +114,8 @@ JSObject* JSCSSImportRulePrototype::self(ExecState* exec, JSGlobalObject* global const ClassInfo JSCSSImportRule::s_info = { "CSSImportRule", &JSCSSRule::s_info, &JSCSSImportRuleTable, 0 }; -JSCSSImportRule::JSCSSImportRule(PassRefPtr structure, PassRefPtr impl) - : JSCSSRule(structure, impl) +JSCSSImportRule::JSCSSImportRule(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCSSRule(structure, globalObject, impl) { } @@ -131,32 +131,36 @@ bool JSCSSImportRule::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsCSSImportRuleHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSImportRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSImportRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSImportRule* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->href()); } JSValue jsCSSImportRuleMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSImportRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSImportRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->media())); + CSSImportRule* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->media())); } JSValue jsCSSImportRuleStyleSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSImportRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSImportRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->styleSheet())); + CSSImportRule* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->styleSheet())); } JSValue jsCSSImportRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSImportRule* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSImportRule::getConstructor(exec, domObject->globalObject()); } -JSValue JSCSSImportRule::getConstructor(ExecState* exec) +JSValue JSCSSImportRule::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.h index 14bae4022..a90a44ae9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSImportRule.h @@ -30,7 +30,7 @@ class CSSImportRule; class JSCSSImportRule : public JSCSSRule { typedef JSCSSRule Base; public: - JSCSSImportRule(PassRefPtr, PassRefPtr); + JSCSSImportRule(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.cpp index 3e13a6983..1b82aa627 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.cpp @@ -67,12 +67,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSMediaRuleConstructorTable = { 1, 0, JSCSSMediaRuleConstructorTableValues, 0 }; #endif -class JSCSSMediaRuleConstructor : public DOMObject { +class JSCSSMediaRuleConstructor : public DOMConstructorObject { public: - JSCSSMediaRuleConstructor(ExecState* exec) - : DOMObject(JSCSSMediaRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSMediaRuleConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSMediaRuleConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSMediaRulePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSMediaRulePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -121,8 +121,8 @@ bool JSCSSMediaRulePrototype::getOwnPropertySlot(ExecState* exec, const Identifi const ClassInfo JSCSSMediaRule::s_info = { "CSSMediaRule", &JSCSSRule::s_info, &JSCSSMediaRuleTable, 0 }; -JSCSSMediaRule::JSCSSMediaRule(PassRefPtr structure, PassRefPtr impl) - : JSCSSRule(structure, impl) +JSCSSMediaRule::JSCSSMediaRule(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCSSRule(structure, globalObject, impl) { } @@ -138,25 +138,28 @@ bool JSCSSMediaRule::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsCSSMediaRuleMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSMediaRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSMediaRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->media())); + CSSMediaRule* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->media())); } JSValue jsCSSMediaRuleCssRules(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSMediaRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSMediaRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->cssRules())); + CSSMediaRule* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->cssRules())); } JSValue jsCSSMediaRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSMediaRule* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSMediaRule::getConstructor(exec, domObject->globalObject()); } -JSValue JSCSSMediaRule::getConstructor(ExecState* exec) +JSValue JSCSSMediaRule::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsCSSMediaRulePrototypeFunctionInsertRule(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.h index bccda5d6c..51f3d6a8c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSMediaRule.h @@ -30,7 +30,7 @@ class CSSMediaRule; class JSCSSMediaRule : public JSCSSRule { typedef JSCSSRule Base; public: - JSCSSMediaRule(PassRefPtr, PassRefPtr); + JSCSSMediaRule(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.cpp index c02abbd2f..d9b383740 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSPageRuleConstructorTable = { 1, 0, JSCSSPageRuleConstructorTableValues, 0 }; #endif -class JSCSSPageRuleConstructor : public DOMObject { +class JSCSSPageRuleConstructor : public DOMConstructorObject { public: - JSCSSPageRuleConstructor(ExecState* exec) - : DOMObject(JSCSSPageRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSPageRuleConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSPageRuleConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSPageRulePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSPageRulePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -112,8 +112,8 @@ JSObject* JSCSSPageRulePrototype::self(ExecState* exec, JSGlobalObject* globalOb const ClassInfo JSCSSPageRule::s_info = { "CSSPageRule", &JSCSSRule::s_info, &JSCSSPageRuleTable, 0 }; -JSCSSPageRule::JSCSSPageRule(PassRefPtr structure, PassRefPtr impl) - : JSCSSRule(structure, impl) +JSCSSPageRule::JSCSSPageRule(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCSSRule(structure, globalObject, impl) { } @@ -129,21 +129,24 @@ bool JSCSSPageRule::getOwnPropertySlot(ExecState* exec, const Identifier& proper JSValue jsCSSPageRuleSelectorText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSPageRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSPageRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSPageRule* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->selectorText()); } JSValue jsCSSPageRuleStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSPageRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSPageRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + CSSPageRule* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsCSSPageRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSPageRule* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSPageRule::getConstructor(exec, domObject->globalObject()); } void JSCSSPageRule::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -158,9 +161,9 @@ void setJSCSSPageRuleSelectorText(ExecState* exec, JSObject* thisObject, JSValue setDOMException(exec, ec); } -JSValue JSCSSPageRule::getConstructor(ExecState* exec) +JSValue JSCSSPageRule::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.h index a8159903c..88050f19d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSPageRule.h @@ -30,7 +30,7 @@ class CSSPageRule; class JSCSSPageRule : public JSCSSRule { typedef JSCSSRule Base; public: - JSCSSPageRule(PassRefPtr, PassRefPtr); + JSCSSPageRule(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.cpp index 5d81a4427..58c9487f0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.cpp @@ -27,6 +27,7 @@ #include "JSRGBColor.h" #include "JSRect.h" #include "KURL.h" +#include "RGBColor.h" #include "Rect.h" #include #include @@ -95,12 +96,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSPrimitiveValueConstructorTable = { 69, 63, JSCSSPrimitiveValueConstructorTableValues, 0 }; #endif -class JSCSSPrimitiveValueConstructor : public DOMObject { +class JSCSSPrimitiveValueConstructor : public DOMConstructorObject { public: - JSCSSPrimitiveValueConstructor(ExecState* exec) - : DOMObject(JSCSSPrimitiveValueConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSPrimitiveValueConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSPrimitiveValueConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSPrimitiveValuePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSPrimitiveValuePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -180,8 +181,8 @@ bool JSCSSPrimitiveValuePrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSCSSPrimitiveValue::s_info = { "CSSPrimitiveValue", &JSCSSValue::s_info, &JSCSSPrimitiveValueTable, 0 }; -JSCSSPrimitiveValue::JSCSSPrimitiveValue(PassRefPtr structure, PassRefPtr impl) - : JSCSSValue(structure, impl) +JSCSSPrimitiveValue::JSCSSPrimitiveValue(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCSSValue(structure, globalObject, impl) { } @@ -197,18 +198,20 @@ bool JSCSSPrimitiveValue::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsCSSPrimitiveValuePrimitiveType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSPrimitiveValue* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSPrimitiveValue* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSPrimitiveValue* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->primitiveType()); } JSValue jsCSSPrimitiveValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSPrimitiveValue* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSPrimitiveValue::getConstructor(exec, domObject->globalObject()); } -JSValue JSCSSPrimitiveValue::getConstructor(ExecState* exec) +JSValue JSCSSPrimitiveValue::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionSetFloatValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -284,7 +287,7 @@ JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionGetCounterValue(ExecSt ExceptionCode ec = 0; - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getCounterValue(ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getCounterValue(ec))); setDOMException(exec, ec); return result; } @@ -299,7 +302,7 @@ JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionGetRectValue(ExecState ExceptionCode ec = 0; - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getRectValue(ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getRectValue(ec))); setDOMException(exec, ec); return result; } @@ -314,7 +317,7 @@ JSValue JSC_HOST_CALL jsCSSPrimitiveValuePrototypeFunctionGetRGBColorValue(ExecS ExceptionCode ec = 0; - JSC::JSValue result = getJSRGBColor(exec, imp->getRGBColorValue(ec)); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getRGBColorValue(ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.h b/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.h index 39416aabc..c1c8acc61 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSPrimitiveValue.h @@ -30,7 +30,7 @@ class CSSPrimitiveValue; class JSCSSPrimitiveValue : public JSCSSValue { typedef JSCSSValue Base; public: - JSCSSPrimitiveValue(PassRefPtr, PassRefPtr); + JSCSSPrimitiveValue(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSRule.cpp index 3aac528d3..ff2835299 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSRule.cpp @@ -78,12 +78,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSRuleConstructorTable = { 34, 31, JSCSSRuleConstructorTableValues, 0 }; #endif -class JSCSSRuleConstructor : public DOMObject { +class JSCSSRuleConstructor : public DOMConstructorObject { public: - JSCSSRuleConstructor(ExecState* exec) - : DOMObject(JSCSSRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSRuleConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSRuleConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSRulePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSRulePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -140,8 +140,8 @@ bool JSCSSRulePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& p const ClassInfo JSCSSRule::s_info = { "CSSRule", 0, &JSCSSRuleTable, 0 }; -JSCSSRule::JSCSSRule(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSCSSRule::JSCSSRule(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -163,35 +163,40 @@ bool JSCSSRule::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa JSValue jsCSSRuleType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSRule* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->type()); } JSValue jsCSSRuleCssText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSRule* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->cssText()); } JSValue jsCSSRuleParentStyleSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->parentStyleSheet())); + CSSRule* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->parentStyleSheet())); } JSValue jsCSSRuleParentRule(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->parentRule())); + CSSRule* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->parentRule())); } JSValue jsCSSRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSRule* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSRule::getConstructor(exec, domObject->globalObject()); } void JSCSSRule::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -206,9 +211,9 @@ void setJSCSSRuleCssText(ExecState* exec, JSObject* thisObject, JSValue value) setDOMException(exec, ec); } -JSValue JSCSSRule::getConstructor(ExecState* exec) +JSValue JSCSSRule::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } // Constant getters diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSRule.h index 75bb90255..c5a0c8dd0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSRule.h @@ -21,6 +21,7 @@ #ifndef JSCSSRule_h #define JSCSSRule_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class CSSRule; -class JSCSSRule : public DOMObject { - typedef DOMObject Base; +class JSCSSRule : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSCSSRule(PassRefPtr, PassRefPtr); + JSCSSRule(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSCSSRule(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -45,14 +46,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); CSSRule* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, CSSRule*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, CSSRule*); CSSRule* toCSSRule(JSC::JSValue); class JSCSSRulePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.cpp index 61880912e..5717a53f2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSRuleListConstructorTable = { 1, 0, JSCSSRuleListConstructorTableValues, 0 }; #endif -class JSCSSRuleListConstructor : public DOMObject { +class JSCSSRuleListConstructor : public DOMConstructorObject { public: - JSCSSRuleListConstructor(ExecState* exec) - : DOMObject(JSCSSRuleListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSRuleListConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSRuleListConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSRuleListPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSRuleListPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -118,8 +118,8 @@ bool JSCSSRuleListPrototype::getOwnPropertySlot(ExecState* exec, const Identifie const ClassInfo JSCSSRuleList::s_info = { "CSSRuleList", 0, &JSCSSRuleListTable, 0 }; -JSCSSRuleList::JSCSSRuleList(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSCSSRuleList::JSCSSRuleList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -161,14 +161,16 @@ bool JSCSSRuleList::getOwnPropertySlot(ExecState* exec, unsigned propertyName, P JSValue jsCSSRuleListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSRuleList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSRuleList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSRuleList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsCSSRuleListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSRuleList* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSRuleList::getConstructor(exec, domObject->globalObject()); } void JSCSSRuleList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) { @@ -177,9 +179,9 @@ void JSCSSRuleList::getPropertyNames(ExecState* exec, PropertyNameArray& propert Base::getPropertyNames(exec, propertyNames); } -JSValue JSCSSRuleList::getConstructor(ExecState* exec) +JSValue JSCSSRuleList::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsCSSRuleListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -192,7 +194,7 @@ JSValue JSC_HOST_CALL jsCSSRuleListPrototypeFunctionItem(ExecState* exec, JSObje unsigned index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->item(index))); return result; } @@ -200,11 +202,11 @@ JSValue JSC_HOST_CALL jsCSSRuleListPrototypeFunctionItem(ExecState* exec, JSObje JSValue JSCSSRuleList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSCSSRuleList* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } -JSC::JSValue toJS(JSC::ExecState* exec, CSSRuleList* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, CSSRuleList* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } CSSRuleList* toCSSRuleList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.h b/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.h index ba3180c39..fb400b200 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSRuleList.h @@ -21,6 +21,7 @@ #ifndef JSCSSRuleList_h #define JSCSSRuleList_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class CSSRuleList; -class JSCSSRuleList : public DOMObject { - typedef DOMObject Base; +class JSCSSRuleList : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSCSSRuleList(PassRefPtr, PassRefPtr); + JSCSSRuleList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSCSSRuleList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,7 +47,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); CSSRuleList* impl() const { return m_impl.get(); } private: @@ -54,7 +55,7 @@ private: static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, CSSRuleList*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, CSSRuleList*); CSSRuleList* toCSSRuleList(JSC::JSValue); class JSCSSRuleListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.cpp index c43723807..87fc6e3b2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.cpp @@ -72,12 +72,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSStyleDeclarationConstructorTable = { 1, 0, JSCSSStyleDeclarationConstructorTableValues, 0 }; #endif -class JSCSSStyleDeclarationConstructor : public DOMObject { +class JSCSSStyleDeclarationConstructor : public DOMConstructorObject { public: - JSCSSStyleDeclarationConstructor(ExecState* exec) - : DOMObject(JSCSSStyleDeclarationConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSStyleDeclarationConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSStyleDeclarationConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSStyleDeclarationPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSStyleDeclarationPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -132,8 +132,8 @@ bool JSCSSStyleDeclarationPrototype::getOwnPropertySlot(ExecState* exec, const I const ClassInfo JSCSSStyleDeclaration::s_info = { "CSSStyleDeclaration", 0, &JSCSSStyleDeclarationTable, 0 }; -JSCSSStyleDeclaration::JSCSSStyleDeclaration(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSCSSStyleDeclaration::JSCSSStyleDeclaration(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -179,28 +179,32 @@ bool JSCSSStyleDeclaration::getOwnPropertySlot(ExecState* exec, unsigned propert JSValue jsCSSStyleDeclarationCssText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSStyleDeclaration* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSStyleDeclaration* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSStyleDeclaration* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->cssText()); } JSValue jsCSSStyleDeclarationLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSStyleDeclaration* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSStyleDeclaration* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSStyleDeclaration* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsCSSStyleDeclarationParentRule(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSStyleDeclaration* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSStyleDeclaration* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->parentRule())); + CSSStyleDeclaration* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->parentRule())); } JSValue jsCSSStyleDeclarationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSStyleDeclaration* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSStyleDeclaration::getConstructor(exec, domObject->globalObject()); } void JSCSSStyleDeclaration::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -224,9 +228,9 @@ void JSCSSStyleDeclaration::getPropertyNames(ExecState* exec, PropertyNameArray& Base::getPropertyNames(exec, propertyNames); } -JSValue JSCSSStyleDeclaration::getConstructor(ExecState* exec) +JSValue JSCSSStyleDeclaration::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionGetPropertyValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -253,7 +257,7 @@ JSValue JSC_HOST_CALL jsCSSStyleDeclarationPrototypeFunctionGetPropertyCSSValue( const UString& propertyName = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPropertyCSSValue(propertyName))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPropertyCSSValue(propertyName))); return result; } @@ -352,9 +356,9 @@ JSValue JSCSSStyleDeclaration::indexGetter(ExecState* exec, const Identifier&, c JSCSSStyleDeclaration* thisObj = static_cast(asObject(slot.slotBase())); return jsStringOrNull(exec, thisObj->impl()->item(slot.index())); } -JSC::JSValue toJS(JSC::ExecState* exec, CSSStyleDeclaration* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, CSSStyleDeclaration* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } CSSStyleDeclaration* toCSSStyleDeclaration(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.h b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.h index df64ddea4..075d438f2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleDeclaration.h @@ -21,6 +21,7 @@ #ifndef JSCSSStyleDeclaration_h #define JSCSSStyleDeclaration_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class CSSStyleDeclaration; -class JSCSSStyleDeclaration : public DOMObject { - typedef DOMObject Base; +class JSCSSStyleDeclaration : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSCSSStyleDeclaration(PassRefPtr, PassRefPtr); + JSCSSStyleDeclaration(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSCSSStyleDeclaration(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -48,7 +49,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); CSSStyleDeclaration* impl() const { return m_impl.get(); } private: @@ -59,7 +60,7 @@ private: static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, CSSStyleDeclaration*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, CSSStyleDeclaration*); CSSStyleDeclaration* toCSSStyleDeclaration(JSC::JSValue); class JSCSSStyleDeclarationPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.cpp index a9f69a26c..4e07880de 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSStyleRuleConstructorTable = { 1, 0, JSCSSStyleRuleConstructorTableValues, 0 }; #endif -class JSCSSStyleRuleConstructor : public DOMObject { +class JSCSSStyleRuleConstructor : public DOMConstructorObject { public: - JSCSSStyleRuleConstructor(ExecState* exec) - : DOMObject(JSCSSStyleRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSStyleRuleConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSStyleRuleConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSStyleRulePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSStyleRulePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -112,8 +112,8 @@ JSObject* JSCSSStyleRulePrototype::self(ExecState* exec, JSGlobalObject* globalO const ClassInfo JSCSSStyleRule::s_info = { "CSSStyleRule", &JSCSSRule::s_info, &JSCSSStyleRuleTable, 0 }; -JSCSSStyleRule::JSCSSStyleRule(PassRefPtr structure, PassRefPtr impl) - : JSCSSRule(structure, impl) +JSCSSStyleRule::JSCSSStyleRule(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCSSRule(structure, globalObject, impl) { } @@ -129,21 +129,24 @@ bool JSCSSStyleRule::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsCSSStyleRuleSelectorText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSStyleRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSStyleRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSStyleRule* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->selectorText()); } JSValue jsCSSStyleRuleStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSStyleRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSStyleRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + CSSStyleRule* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsCSSStyleRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSStyleRule* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSStyleRule::getConstructor(exec, domObject->globalObject()); } void JSCSSStyleRule::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -158,9 +161,9 @@ void setJSCSSStyleRuleSelectorText(ExecState* exec, JSObject* thisObject, JSValu setDOMException(exec, ec); } -JSValue JSCSSStyleRule::getConstructor(ExecState* exec) +JSValue JSCSSStyleRule::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.h index 4f65c87de..aaefdf39b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleRule.h @@ -30,7 +30,7 @@ class CSSStyleRule; class JSCSSStyleRule : public JSCSSRule { typedef JSCSSRule Base; public: - JSCSSStyleRule(PassRefPtr, PassRefPtr); + JSCSSStyleRule(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.cpp index c1cc44601..7e745942d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.cpp @@ -68,12 +68,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSStyleSheetConstructorTable = { 1, 0, JSCSSStyleSheetConstructorTableValues, 0 }; #endif -class JSCSSStyleSheetConstructor : public DOMObject { +class JSCSSStyleSheetConstructor : public DOMConstructorObject { public: - JSCSSStyleSheetConstructor(ExecState* exec) - : DOMObject(JSCSSStyleSheetConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSStyleSheetConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSStyleSheetConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSStyleSheetPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSStyleSheetPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -124,8 +124,8 @@ bool JSCSSStyleSheetPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSCSSStyleSheet::s_info = { "CSSStyleSheet", &JSStyleSheet::s_info, &JSCSSStyleSheetTable, 0 }; -JSCSSStyleSheet::JSCSSStyleSheet(PassRefPtr structure, PassRefPtr impl) - : JSStyleSheet(structure, impl) +JSCSSStyleSheet::JSCSSStyleSheet(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSStyleSheet(structure, globalObject, impl) { } @@ -141,32 +141,36 @@ bool JSCSSStyleSheet::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsCSSStyleSheetOwnerRule(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSStyleSheet* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSStyleSheet* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->ownerRule())); + CSSStyleSheet* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->ownerRule())); } JSValue jsCSSStyleSheetCssRules(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSStyleSheet* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSStyleSheet* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->cssRules())); + CSSStyleSheet* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->cssRules())); } JSValue jsCSSStyleSheetRules(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSStyleSheet* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSStyleSheet* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->rules())); + CSSStyleSheet* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->rules())); } JSValue jsCSSStyleSheetConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSStyleSheet* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSStyleSheet::getConstructor(exec, domObject->globalObject()); } -JSValue JSCSSStyleSheet::getConstructor(ExecState* exec) +JSValue JSCSSStyleSheet::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsCSSStyleSheetPrototypeFunctionInsertRule(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.h b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.h index bd048f26c..088123294 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSStyleSheet.h @@ -30,7 +30,7 @@ class CSSStyleSheet; class JSCSSStyleSheet : public JSStyleSheet { typedef JSStyleSheet Base; public: - JSCSSStyleSheet(PassRefPtr, PassRefPtr); + JSCSSStyleSheet(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSValue.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSValue.cpp index a4023049d..68c5bb8dc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSValue.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSValue.cpp @@ -67,12 +67,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSValueConstructorTable = { 8, 7, JSCSSValueConstructorTableValues, 0 }; #endif -class JSCSSValueConstructor : public DOMObject { +class JSCSSValueConstructor : public DOMConstructorObject { public: - JSCSSValueConstructor(ExecState* exec) - : DOMObject(JSCSSValueConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSValueConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSValueConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSValuePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSValuePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -123,8 +123,8 @@ bool JSCSSValuePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSCSSValue::s_info = { "CSSValue", 0, &JSCSSValueTable, 0 }; -JSCSSValue::JSCSSValue(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSCSSValue::JSCSSValue(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -146,21 +146,24 @@ bool JSCSSValue::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN JSValue jsCSSValueCssText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSValue* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSValue* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSValue* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->cssText()); } JSValue jsCSSValueCssValueType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSValue* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSValue* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSValue* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->cssValueType()); } JSValue jsCSSValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSValue* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSValue::getConstructor(exec, domObject->globalObject()); } void JSCSSValue::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -175,9 +178,9 @@ void setJSCSSValueCssText(ExecState* exec, JSObject* thisObject, JSValue value) setDOMException(exec, ec); } -JSValue JSCSSValue::getConstructor(ExecState* exec) +JSValue JSCSSValue::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } // Constant getters diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSValue.h b/src/3rdparty/webkit/WebCore/generated/JSCSSValue.h index d38c5c429..82f03fd47 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSValue.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSValue.h @@ -21,6 +21,7 @@ #ifndef JSCSSValue_h #define JSCSSValue_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class CSSValue; -class JSCSSValue : public DOMObject { - typedef DOMObject Base; +class JSCSSValue : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSCSSValue(PassRefPtr, PassRefPtr); + JSCSSValue(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSCSSValue(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -45,14 +46,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); CSSValue* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, CSSValue*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, CSSValue*); CSSValue* toCSSValue(JSC::JSValue); class JSCSSValuePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.cpp index 732238522..c09806fc0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSValueListConstructorTable = { 1, 0, JSCSSValueListConstructorTableValues, 0 }; #endif -class JSCSSValueListConstructor : public DOMObject { +class JSCSSValueListConstructor : public DOMConstructorObject { public: - JSCSSValueListConstructor(ExecState* exec) - : DOMObject(JSCSSValueListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSValueListConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSValueListConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSValueListPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSValueListPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -118,8 +118,8 @@ bool JSCSSValueListPrototype::getOwnPropertySlot(ExecState* exec, const Identifi const ClassInfo JSCSSValueList::s_info = { "CSSValueList", &JSCSSValue::s_info, &JSCSSValueListTable, 0 }; -JSCSSValueList::JSCSSValueList(PassRefPtr structure, PassRefPtr impl) - : JSCSSValue(structure, impl) +JSCSSValueList::JSCSSValueList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCSSValue(structure, globalObject, impl) { } @@ -155,14 +155,16 @@ bool JSCSSValueList::getOwnPropertySlot(ExecState* exec, unsigned propertyName, JSValue jsCSSValueListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSValueList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSValueList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSValueList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsCSSValueListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSValueList* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSValueList::getConstructor(exec, domObject->globalObject()); } void JSCSSValueList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) { @@ -171,9 +173,9 @@ void JSCSSValueList::getPropertyNames(ExecState* exec, PropertyNameArray& proper Base::getPropertyNames(exec, propertyNames); } -JSValue JSCSSValueList::getConstructor(ExecState* exec) +JSValue JSCSSValueList::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsCSSValueListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -186,7 +188,7 @@ JSValue JSC_HOST_CALL jsCSSValueListPrototypeFunctionItem(ExecState* exec, JSObj unsigned index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->item(index))); return result; } @@ -194,7 +196,7 @@ JSValue JSC_HOST_CALL jsCSSValueListPrototypeFunctionItem(ExecState* exec, JSObj JSValue JSCSSValueList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSCSSValueList* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.h b/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.h index 3d350937a..59eb2035c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSValueList.h @@ -30,7 +30,7 @@ class CSSValueList; class JSCSSValueList : public JSCSSValue { typedef JSCSSValue Base; public: - JSCSSValueList(PassRefPtr, PassRefPtr); + JSCSSValueList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); @@ -43,7 +43,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.cpp index 4aa1770a8..307492804 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.cpp @@ -69,12 +69,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSVariablesDeclarationConstructorTable = { 1, 0, JSCSSVariablesDeclarationConstructorTableValues, 0 }; #endif -class JSCSSVariablesDeclarationConstructor : public DOMObject { +class JSCSSVariablesDeclarationConstructor : public DOMConstructorObject { public: - JSCSSVariablesDeclarationConstructor(ExecState* exec) - : DOMObject(JSCSSVariablesDeclarationConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSVariablesDeclarationConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSVariablesDeclarationConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSVariablesDeclarationPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSVariablesDeclarationPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -125,8 +125,8 @@ bool JSCSSVariablesDeclarationPrototype::getOwnPropertySlot(ExecState* exec, con const ClassInfo JSCSSVariablesDeclaration::s_info = { "CSSVariablesDeclaration", 0, &JSCSSVariablesDeclarationTable, 0 }; -JSCSSVariablesDeclaration::JSCSSVariablesDeclaration(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSCSSVariablesDeclaration::JSCSSVariablesDeclaration(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -168,28 +168,32 @@ bool JSCSSVariablesDeclaration::getOwnPropertySlot(ExecState* exec, unsigned pro JSValue jsCSSVariablesDeclarationCssText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSVariablesDeclaration* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSVariablesDeclaration* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSVariablesDeclaration* imp = static_cast(castedThis->impl()); return jsString(exec, imp->cssText()); } JSValue jsCSSVariablesDeclarationLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSVariablesDeclaration* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSVariablesDeclaration* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CSSVariablesDeclaration* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsCSSVariablesDeclarationParentRule(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSVariablesDeclaration* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSVariablesDeclaration* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->parentRule())); + CSSVariablesDeclaration* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->parentRule())); } JSValue jsCSSVariablesDeclarationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSVariablesDeclaration* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSVariablesDeclaration::getConstructor(exec, domObject->globalObject()); } void JSCSSVariablesDeclaration::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -209,9 +213,9 @@ void JSCSSVariablesDeclaration::getPropertyNames(ExecState* exec, PropertyNameAr Base::getPropertyNames(exec, propertyNames); } -JSValue JSCSSVariablesDeclaration::getConstructor(ExecState* exec) +JSValue JSCSSVariablesDeclaration::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsCSSVariablesDeclarationPrototypeFunctionGetVariableValue(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -280,9 +284,9 @@ JSValue JSCSSVariablesDeclaration::indexGetter(ExecState* exec, const Identifier JSCSSVariablesDeclaration* thisObj = static_cast(asObject(slot.slotBase())); return jsStringOrNull(exec, thisObj->impl()->item(slot.index())); } -JSC::JSValue toJS(JSC::ExecState* exec, CSSVariablesDeclaration* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, CSSVariablesDeclaration* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } CSSVariablesDeclaration* toCSSVariablesDeclaration(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.h b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.h index fe98f8e13..f2c62b045 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesDeclaration.h @@ -21,6 +21,7 @@ #ifndef JSCSSVariablesDeclaration_h #define JSCSSVariablesDeclaration_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class CSSVariablesDeclaration; -class JSCSSVariablesDeclaration : public DOMObject { - typedef DOMObject Base; +class JSCSSVariablesDeclaration : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSCSSVariablesDeclaration(PassRefPtr, PassRefPtr); + JSCSSVariablesDeclaration(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSCSSVariablesDeclaration(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,7 +48,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); CSSVariablesDeclaration* impl() const { return m_impl.get(); } private: @@ -55,7 +56,7 @@ private: static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, CSSVariablesDeclaration*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, CSSVariablesDeclaration*); CSSVariablesDeclaration* toCSSVariablesDeclaration(JSC::JSValue); class JSCSSVariablesDeclarationPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.cpp index f28aaed4e..241a4f10d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSCSSVariablesRuleConstructorTable = { 1, 0, JSCSSVariablesRuleConstructorTableValues, 0 }; #endif -class JSCSSVariablesRuleConstructor : public DOMObject { +class JSCSSVariablesRuleConstructor : public DOMConstructorObject { public: - JSCSSVariablesRuleConstructor(ExecState* exec) - : DOMObject(JSCSSVariablesRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCSSVariablesRuleConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCSSVariablesRuleConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCSSVariablesRulePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCSSVariablesRulePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -112,8 +112,8 @@ JSObject* JSCSSVariablesRulePrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSCSSVariablesRule::s_info = { "CSSVariablesRule", &JSCSSRule::s_info, &JSCSSVariablesRuleTable, 0 }; -JSCSSVariablesRule::JSCSSVariablesRule(PassRefPtr structure, PassRefPtr impl) - : JSCSSRule(structure, impl) +JSCSSVariablesRule::JSCSSVariablesRule(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCSSRule(structure, globalObject, impl) { } @@ -129,25 +129,28 @@ bool JSCSSVariablesRule::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsCSSVariablesRuleMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSVariablesRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSVariablesRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->media())); + CSSVariablesRule* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->media())); } JSValue jsCSSVariablesRuleVariables(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCSSVariablesRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CSSVariablesRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->variables())); + CSSVariablesRule* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->variables())); } JSValue jsCSSVariablesRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCSSVariablesRule* domObject = static_cast(asObject(slot.slotBase())); + return JSCSSVariablesRule::getConstructor(exec, domObject->globalObject()); } -JSValue JSCSSVariablesRule::getConstructor(ExecState* exec) +JSValue JSCSSVariablesRule::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.h b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.h index c204a1e2c..b2f49dbd8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCSSVariablesRule.h @@ -30,7 +30,7 @@ class CSSVariablesRule; class JSCSSVariablesRule : public JSCSSRule { typedef JSCSSRule Base; public: - JSCSSVariablesRule(PassRefPtr, PassRefPtr); + JSCSSVariablesRule(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.cpp b/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.cpp index 79db6e037..ef5fa3af8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.cpp @@ -61,8 +61,8 @@ bool JSCanvasGradientPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSCanvasGradient::s_info = { "CanvasGradient", 0, 0, 0 }; -JSCanvasGradient::JSCanvasGradient(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSCanvasGradient::JSCanvasGradient(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -93,9 +93,9 @@ JSValue JSC_HOST_CALL jsCanvasGradientPrototypeFunctionAddColorStop(ExecState* e return jsUndefined(); } -JSC::JSValue toJS(JSC::ExecState* exec, CanvasGradient* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, CanvasGradient* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } CanvasGradient* toCanvasGradient(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.h b/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.h index e81a3b44a..f2673f045 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCanvasGradient.h @@ -21,6 +21,7 @@ #ifndef JSCanvasGradient_h #define JSCanvasGradient_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class CanvasGradient; -class JSCanvasGradient : public DOMObject { - typedef DOMObject Base; +class JSCanvasGradient : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSCanvasGradient(PassRefPtr, PassRefPtr); + JSCanvasGradient(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSCanvasGradient(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +45,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, CanvasGradient*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, CanvasGradient*); CanvasGradient* toCanvasGradient(JSC::JSValue); class JSCanvasGradientPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.cpp b/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.cpp index c443a9c1e..3facb356f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.cpp @@ -53,8 +53,8 @@ JSObject* JSCanvasPatternPrototype::self(ExecState* exec, JSGlobalObject* global const ClassInfo JSCanvasPattern::s_info = { "CanvasPattern", 0, 0, 0 }; -JSCanvasPattern::JSCanvasPattern(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSCanvasPattern::JSCanvasPattern(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -69,9 +69,9 @@ JSObject* JSCanvasPattern::createPrototype(ExecState* exec, JSGlobalObject* glob return new (exec) JSCanvasPatternPrototype(JSCanvasPatternPrototype::createStructure(globalObject->objectPrototype())); } -JSC::JSValue toJS(JSC::ExecState* exec, CanvasPattern* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, CanvasPattern* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } CanvasPattern* toCanvasPattern(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.h b/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.h index 776b83069..ec8c97f91 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCanvasPattern.h @@ -21,6 +21,7 @@ #ifndef JSCanvasPattern_h #define JSCanvasPattern_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class CanvasPattern; -class JSCanvasPattern : public DOMObject { - typedef DOMObject Base; +class JSCanvasPattern : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSCanvasPattern(PassRefPtr, PassRefPtr); + JSCanvasPattern(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSCanvasPattern(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +45,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, CanvasPattern*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, CanvasPattern*); CanvasPattern* toCanvasPattern(JSC::JSValue); class JSCanvasPatternPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.cpp b/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.cpp index fd54b4f65..a42f8ab13 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.cpp @@ -90,12 +90,12 @@ static JSC_CONST_HASHTABLE HashTable JSCanvasRenderingContext2DConstructorTable { 1, 0, JSCanvasRenderingContext2DConstructorTableValues, 0 }; #endif -class JSCanvasRenderingContext2DConstructor : public DOMObject { +class JSCanvasRenderingContext2DConstructor : public DOMConstructorObject { public: - JSCanvasRenderingContext2DConstructor(ExecState* exec) - : DOMObject(JSCanvasRenderingContext2DConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCanvasRenderingContext2DConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCanvasRenderingContext2DConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCanvasRenderingContext2DPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCanvasRenderingContext2DPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -186,8 +186,8 @@ bool JSCanvasRenderingContext2DPrototype::getOwnPropertySlot(ExecState* exec, co const ClassInfo JSCanvasRenderingContext2D::s_info = { "CanvasRenderingContext2D", 0, &JSCanvasRenderingContext2DTable, 0 }; -JSCanvasRenderingContext2D::JSCanvasRenderingContext2D(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSCanvasRenderingContext2D::JSCanvasRenderingContext2D(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -209,115 +209,132 @@ bool JSCanvasRenderingContext2D::getOwnPropertySlot(ExecState* exec, const Ident JSValue jsCanvasRenderingContext2DCanvas(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->canvas())); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->canvas())); } JSValue jsCanvasRenderingContext2DGlobalAlpha(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->globalAlpha()); } JSValue jsCanvasRenderingContext2DGlobalCompositeOperation(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); return jsString(exec, imp->globalCompositeOperation()); } JSValue jsCanvasRenderingContext2DLineWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->lineWidth()); } JSValue jsCanvasRenderingContext2DLineCap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); return jsString(exec, imp->lineCap()); } JSValue jsCanvasRenderingContext2DLineJoin(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); return jsString(exec, imp->lineJoin()); } JSValue jsCanvasRenderingContext2DMiterLimit(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->miterLimit()); } JSValue jsCanvasRenderingContext2DShadowOffsetX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->shadowOffsetX()); } JSValue jsCanvasRenderingContext2DShadowOffsetY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->shadowOffsetY()); } JSValue jsCanvasRenderingContext2DShadowBlur(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->shadowBlur()); } JSValue jsCanvasRenderingContext2DShadowColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); return jsString(exec, imp->shadowColor()); } JSValue jsCanvasRenderingContext2DFont(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); return jsString(exec, imp->font()); } JSValue jsCanvasRenderingContext2DTextAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); return jsString(exec, imp->textAlign()); } JSValue jsCanvasRenderingContext2DTextBaseline(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CanvasRenderingContext2D* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CanvasRenderingContext2D* imp = static_cast(castedThis->impl()); return jsString(exec, imp->textBaseline()); } JSValue jsCanvasRenderingContext2DStrokeStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->strokeStyle(exec); + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->strokeStyle(exec); } JSValue jsCanvasRenderingContext2DFillStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->fillStyle(exec); + JSCanvasRenderingContext2D* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->fillStyle(exec); } JSValue jsCanvasRenderingContext2DConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCanvasRenderingContext2D* domObject = static_cast(asObject(slot.slotBase())); + return JSCanvasRenderingContext2D::getConstructor(exec, domObject->globalObject()); } void JSCanvasRenderingContext2D::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -412,9 +429,9 @@ void setJSCanvasRenderingContext2DFillStyle(ExecState* exec, JSObject* thisObjec static_cast(thisObject)->setFillStyle(exec, value); } -JSValue JSCanvasRenderingContext2D::getConstructor(ExecState* exec) +JSValue JSCanvasRenderingContext2D::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionSave(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -532,7 +549,7 @@ JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionCreateLinearGra float y1 = args.at(3).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createLinearGradient(x0, y0, x1, y1, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createLinearGradient(x0, y0, x1, y1, ec))); setDOMException(exec, ec); return result; } @@ -553,7 +570,7 @@ JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionCreateRadialGra float r1 = args.at(5).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createRadialGradient(x0, y0, r0, x1, y1, r1, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createRadialGradient(x0, y0, r0, x1, y1, r1, ec))); setDOMException(exec, ec); return result; } @@ -810,7 +827,7 @@ JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionMeasureText(Exe const UString& text = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->measureText(text))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->measureText(text))); return result; } @@ -978,7 +995,7 @@ JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionCreateImageData float sh = args.at(1).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createImageData(sw, sh))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createImageData(sw, sh))); return result; } @@ -996,7 +1013,7 @@ JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionGetImageData(Ex float sh = args.at(3).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getImageData(sx, sy, sw, sh, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getImageData(sx, sy, sw, sh, ec))); setDOMException(exec, ec); return result; } @@ -1010,9 +1027,9 @@ JSValue JSC_HOST_CALL jsCanvasRenderingContext2DPrototypeFunctionPutImageData(Ex return castedThisObj->putImageData(exec, args); } -JSC::JSValue toJS(JSC::ExecState* exec, CanvasRenderingContext2D* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, CanvasRenderingContext2D* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } CanvasRenderingContext2D* toCanvasRenderingContext2D(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.h b/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.h index 6c084d1a6..cee9884dd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCanvasRenderingContext2D.h @@ -21,6 +21,7 @@ #ifndef JSCanvasRenderingContext2D_h #define JSCanvasRenderingContext2D_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class CanvasRenderingContext2D; -class JSCanvasRenderingContext2D : public DOMObject { - typedef DOMObject Base; +class JSCanvasRenderingContext2D : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSCanvasRenderingContext2D(PassRefPtr, PassRefPtr); + JSCanvasRenderingContext2D(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSCanvasRenderingContext2D(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -45,7 +46,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom attributes JSC::JSValue strokeStyle(JSC::ExecState*) const; @@ -70,7 +71,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, CanvasRenderingContext2D*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, CanvasRenderingContext2D*); CanvasRenderingContext2D* toCanvasRenderingContext2D(JSC::JSValue); class JSCanvasRenderingContext2DPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCharacterData.cpp b/src/3rdparty/webkit/WebCore/generated/JSCharacterData.cpp index a2d10e409..5c86d072e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCharacterData.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCharacterData.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSCharacterDataConstructorTable = { 1, 0, JSCharacterDataConstructorTableValues, 0 }; #endif -class JSCharacterDataConstructor : public DOMObject { +class JSCharacterDataConstructor : public DOMConstructorObject { public: - JSCharacterDataConstructor(ExecState* exec) - : DOMObject(JSCharacterDataConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCharacterDataConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCharacterDataConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCharacterDataPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCharacterDataPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -123,8 +123,8 @@ bool JSCharacterDataPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSCharacterData::s_info = { "CharacterData", &JSNode::s_info, &JSCharacterDataTable, 0 }; -JSCharacterData::JSCharacterData(PassRefPtr structure, PassRefPtr impl) - : JSNode(structure, impl) +JSCharacterData::JSCharacterData(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSNode(structure, globalObject, impl) { } @@ -140,21 +140,24 @@ bool JSCharacterData::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsCharacterDataData(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCharacterData* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CharacterData* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CharacterData* imp = static_cast(castedThis->impl()); return jsString(exec, imp->data()); } JSValue jsCharacterDataLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCharacterData* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - CharacterData* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + CharacterData* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsCharacterDataConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCharacterData* domObject = static_cast(asObject(slot.slotBase())); + return JSCharacterData::getConstructor(exec, domObject->globalObject()); } void JSCharacterData::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -169,9 +172,9 @@ void setJSCharacterDataData(ExecState* exec, JSObject* thisObject, JSValue value setDOMException(exec, ec); } -JSValue JSCharacterData::getConstructor(ExecState* exec) +JSValue JSCharacterData::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsCharacterDataPrototypeFunctionSubstringData(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSCharacterData.h b/src/3rdparty/webkit/WebCore/generated/JSCharacterData.h index 273318f6f..1f6091f6e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCharacterData.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCharacterData.h @@ -30,7 +30,7 @@ class CharacterData; class JSCharacterData : public JSNode { typedef JSNode Base; public: - JSCharacterData(PassRefPtr, PassRefPtr); + JSCharacterData(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSClientRect.cpp b/src/3rdparty/webkit/WebCore/generated/JSClientRect.cpp index aea6ac534..ba2e7561e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSClientRect.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSClientRect.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSClientRectConstructorTable = { 1, 0, JSClientRectConstructorTableValues, 0 }; #endif -class JSClientRectConstructor : public DOMObject { +class JSClientRectConstructor : public DOMConstructorObject { public: - JSClientRectConstructor(ExecState* exec) - : DOMObject(JSClientRectConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSClientRectConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSClientRectConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSClientRectPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSClientRectPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -113,8 +113,8 @@ JSObject* JSClientRectPrototype::self(ExecState* exec, JSGlobalObject* globalObj const ClassInfo JSClientRect::s_info = { "ClientRect", 0, &JSClientRectTable, 0 }; -JSClientRect::JSClientRect(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSClientRect::JSClientRect(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -136,58 +136,65 @@ bool JSClientRect::getOwnPropertySlot(ExecState* exec, const Identifier& propert JSValue jsClientRectTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSClientRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ClientRect* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ClientRect* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->top()); } JSValue jsClientRectRight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSClientRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ClientRect* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ClientRect* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->right()); } JSValue jsClientRectBottom(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSClientRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ClientRect* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ClientRect* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->bottom()); } JSValue jsClientRectLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSClientRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ClientRect* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ClientRect* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->left()); } JSValue jsClientRectWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSClientRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ClientRect* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ClientRect* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->width()); } JSValue jsClientRectHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSClientRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ClientRect* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ClientRect* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->height()); } JSValue jsClientRectConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSClientRect* domObject = static_cast(asObject(slot.slotBase())); + return JSClientRect::getConstructor(exec, domObject->globalObject()); } -JSValue JSClientRect::getConstructor(ExecState* exec) +JSValue JSClientRect::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } -JSC::JSValue toJS(JSC::ExecState* exec, ClientRect* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, ClientRect* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } ClientRect* toClientRect(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSClientRect.h b/src/3rdparty/webkit/WebCore/generated/JSClientRect.h index 13a7b3812..9e6e95113 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSClientRect.h +++ b/src/3rdparty/webkit/WebCore/generated/JSClientRect.h @@ -21,6 +21,7 @@ #ifndef JSClientRect_h #define JSClientRect_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class ClientRect; -class JSClientRect : public DOMObject { - typedef DOMObject Base; +class JSClientRect : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSClientRect(PassRefPtr, PassRefPtr); + JSClientRect(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSClientRect(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); ClientRect* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, ClientRect*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, ClientRect*); ClientRect* toClientRect(JSC::JSValue); class JSClientRectPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSClientRectList.cpp b/src/3rdparty/webkit/WebCore/generated/JSClientRectList.cpp index 854daa3fc..f8c99a2fc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSClientRectList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSClientRectList.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSClientRectListConstructorTable = { 1, 0, JSClientRectListConstructorTableValues, 0 }; #endif -class JSClientRectListConstructor : public DOMObject { +class JSClientRectListConstructor : public DOMConstructorObject { public: - JSClientRectListConstructor(ExecState* exec) - : DOMObject(JSClientRectListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSClientRectListConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSClientRectListConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSClientRectListPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSClientRectListPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -119,8 +119,8 @@ bool JSClientRectListPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSClientRectList::s_info = { "ClientRectList", 0, &JSClientRectListTable, 0 }; -JSClientRectList::JSClientRectList(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSClientRectList::JSClientRectList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -162,14 +162,16 @@ bool JSClientRectList::getOwnPropertySlot(ExecState* exec, unsigned propertyName JSValue jsClientRectListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSClientRectList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ClientRectList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ClientRectList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsClientRectListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSClientRectList* domObject = static_cast(asObject(slot.slotBase())); + return JSClientRectList::getConstructor(exec, domObject->globalObject()); } void JSClientRectList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) { @@ -178,9 +180,9 @@ void JSClientRectList::getPropertyNames(ExecState* exec, PropertyNameArray& prop Base::getPropertyNames(exec, propertyNames); } -JSValue JSClientRectList::getConstructor(ExecState* exec) +JSValue JSClientRectList::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsClientRectListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -197,7 +199,7 @@ JSValue JSC_HOST_CALL jsClientRectListPrototypeFunctionItem(ExecState* exec, JSO } - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->item(index))); return result; } @@ -205,11 +207,11 @@ JSValue JSC_HOST_CALL jsClientRectListPrototypeFunctionItem(ExecState* exec, JSO JSValue JSClientRectList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSClientRectList* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } -JSC::JSValue toJS(JSC::ExecState* exec, ClientRectList* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, ClientRectList* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } ClientRectList* toClientRectList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSClientRectList.h b/src/3rdparty/webkit/WebCore/generated/JSClientRectList.h index fcb1f563f..851a7f9e7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSClientRectList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSClientRectList.h @@ -21,6 +21,7 @@ #ifndef JSClientRectList_h #define JSClientRectList_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class ClientRectList; -class JSClientRectList : public DOMObject { - typedef DOMObject Base; +class JSClientRectList : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSClientRectList(PassRefPtr, PassRefPtr); + JSClientRectList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSClientRectList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,7 +47,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); ClientRectList* impl() const { return m_impl.get(); } private: @@ -54,7 +55,7 @@ private: static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, ClientRectList*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, ClientRectList*); ClientRectList* toClientRectList(JSC::JSValue); class JSClientRectListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSClipboard.cpp b/src/3rdparty/webkit/WebCore/generated/JSClipboard.cpp index 7306d2aa9..aea76dcec 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSClipboard.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSClipboard.cpp @@ -67,12 +67,12 @@ static JSC_CONST_HASHTABLE HashTable JSClipboardConstructorTable = { 1, 0, JSClipboardConstructorTableValues, 0 }; #endif -class JSClipboardConstructor : public DOMObject { +class JSClipboardConstructor : public DOMConstructorObject { public: - JSClipboardConstructor(ExecState* exec) - : DOMObject(JSClipboardConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSClipboardConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSClipboardConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSClipboardPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSClipboardPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -123,8 +123,8 @@ bool JSClipboardPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSClipboard::s_info = { "Clipboard", 0, &JSClipboardTable, 0 }; -JSClipboard::JSClipboard(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSClipboard::JSClipboard(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -146,33 +146,38 @@ bool JSClipboard::getOwnPropertySlot(ExecState* exec, const Identifier& property JSValue jsClipboardDropEffect(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSClipboard* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Clipboard* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Clipboard* imp = static_cast(castedThis->impl()); return jsStringOrUndefined(exec, imp->dropEffect()); } JSValue jsClipboardEffectAllowed(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSClipboard* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Clipboard* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Clipboard* imp = static_cast(castedThis->impl()); return jsStringOrUndefined(exec, imp->effectAllowed()); } JSValue jsClipboardTypes(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->types(exec); + JSClipboard* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->types(exec); } JSValue jsClipboardFiles(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSClipboard* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Clipboard* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->files())); + Clipboard* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->files())); } JSValue jsClipboardConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSClipboard* domObject = static_cast(asObject(slot.slotBase())); + return JSClipboard::getConstructor(exec, domObject->globalObject()); } void JSClipboard::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -191,9 +196,9 @@ void setJSClipboardEffectAllowed(ExecState* exec, JSObject* thisObject, JSValue imp->setEffectAllowed(value.toString(exec)); } -JSValue JSClipboard::getConstructor(ExecState* exec) +JSValue JSClipboard::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsClipboardPrototypeFunctionClearData(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -232,9 +237,9 @@ JSValue JSC_HOST_CALL jsClipboardPrototypeFunctionSetDragImage(ExecState* exec, return castedThisObj->setDragImage(exec, args); } -JSC::JSValue toJS(JSC::ExecState* exec, Clipboard* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Clipboard* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Clipboard* toClipboard(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSClipboard.h b/src/3rdparty/webkit/WebCore/generated/JSClipboard.h index a6fbe3bf2..68fbdf563 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSClipboard.h +++ b/src/3rdparty/webkit/WebCore/generated/JSClipboard.h @@ -21,6 +21,7 @@ #ifndef JSClipboard_h #define JSClipboard_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class Clipboard; -class JSClipboard : public DOMObject { - typedef DOMObject Base; +class JSClipboard : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSClipboard(PassRefPtr, PassRefPtr); + JSClipboard(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSClipboard(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -45,7 +46,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom attributes JSC::JSValue types(JSC::ExecState*) const; @@ -61,7 +62,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, Clipboard*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Clipboard*); Clipboard* toClipboard(JSC::JSValue); class JSClipboardPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSComment.cpp b/src/3rdparty/webkit/WebCore/generated/JSComment.cpp index 666654118..a1476ccce 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSComment.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSComment.cpp @@ -59,12 +59,12 @@ static JSC_CONST_HASHTABLE HashTable JSCommentConstructorTable = { 1, 0, JSCommentConstructorTableValues, 0 }; #endif -class JSCommentConstructor : public DOMObject { +class JSCommentConstructor : public DOMConstructorObject { public: - JSCommentConstructor(ExecState* exec) - : DOMObject(JSCommentConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCommentConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCommentConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCommentPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCommentPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -106,8 +106,8 @@ JSObject* JSCommentPrototype::self(ExecState* exec, JSGlobalObject* globalObject const ClassInfo JSComment::s_info = { "Comment", &JSCharacterData::s_info, &JSCommentTable, 0 }; -JSComment::JSComment(PassRefPtr structure, PassRefPtr impl) - : JSCharacterData(structure, impl) +JSComment::JSComment(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCharacterData(structure, globalObject, impl) { } @@ -123,11 +123,12 @@ bool JSComment::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa JSValue jsCommentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSComment* domObject = static_cast(asObject(slot.slotBase())); + return JSComment::getConstructor(exec, domObject->globalObject()); } -JSValue JSComment::getConstructor(ExecState* exec) +JSValue JSComment::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSComment.h b/src/3rdparty/webkit/WebCore/generated/JSComment.h index 802256e2c..f7d34aac9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSComment.h +++ b/src/3rdparty/webkit/WebCore/generated/JSComment.h @@ -30,7 +30,7 @@ class Comment; class JSComment : public JSCharacterData { typedef JSCharacterData Base; public: - JSComment(PassRefPtr, PassRefPtr); + JSComment(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp b/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp index 2b223a208..110c7e1bf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp @@ -91,8 +91,8 @@ bool JSConsolePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& p const ClassInfo JSConsole::s_info = { "Console", 0, &JSConsoleTable, 0 }; -JSConsole::JSConsole(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSConsole::JSConsole(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -114,7 +114,8 @@ bool JSConsole::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa JSValue jsConsoleProfiles(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->profiles(exec); + JSConsole* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->profiles(exec); } JSValue JSC_HOST_CALL jsConsolePrototypeFunctionDebug(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -328,9 +329,9 @@ JSValue JSC_HOST_CALL jsConsolePrototypeFunctionGroupEnd(ExecState* exec, JSObje return jsUndefined(); } -JSC::JSValue toJS(JSC::ExecState* exec, Console* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Console* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Console* toConsole(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSConsole.h b/src/3rdparty/webkit/WebCore/generated/JSConsole.h index 0b7f0d53b..f66f53f66 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSConsole.h +++ b/src/3rdparty/webkit/WebCore/generated/JSConsole.h @@ -21,6 +21,7 @@ #ifndef JSConsole_h #define JSConsole_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class Console; -class JSConsole : public DOMObject { - typedef DOMObject Base; +class JSConsole : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSConsole(PassRefPtr, PassRefPtr); + JSConsole(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSConsole(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -53,7 +54,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, Console*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Console*); Console* toConsole(JSC::JSValue); class JSConsolePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCoordinates.cpp b/src/3rdparty/webkit/WebCore/generated/JSCoordinates.cpp index eafee51de..bddd8a916 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCoordinates.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCoordinates.cpp @@ -84,8 +84,8 @@ bool JSCoordinatesPrototype::getOwnPropertySlot(ExecState* exec, const Identifie const ClassInfo JSCoordinates::s_info = { "Coordinates", 0, &JSCoordinatesTable, 0 }; -JSCoordinates::JSCoordinates(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSCoordinates::JSCoordinates(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -107,43 +107,50 @@ bool JSCoordinates::getOwnPropertySlot(ExecState* exec, const Identifier& proper JSValue jsCoordinatesLatitude(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCoordinates* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Coordinates* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Coordinates* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->latitude()); } JSValue jsCoordinatesLongitude(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCoordinates* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Coordinates* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Coordinates* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->longitude()); } JSValue jsCoordinatesAltitude(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->altitude(exec); + JSCoordinates* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->altitude(exec); } JSValue jsCoordinatesAccuracy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCoordinates* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Coordinates* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Coordinates* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->accuracy()); } JSValue jsCoordinatesAltitudeAccuracy(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->altitudeAccuracy(exec); + JSCoordinates* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->altitudeAccuracy(exec); } JSValue jsCoordinatesHeading(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->heading(exec); + JSCoordinates* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->heading(exec); } JSValue jsCoordinatesSpeed(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->speed(exec); + JSCoordinates* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->speed(exec); } JSValue JSC_HOST_CALL jsCoordinatesPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -159,9 +166,9 @@ JSValue JSC_HOST_CALL jsCoordinatesPrototypeFunctionToString(ExecState* exec, JS return result; } -JSC::JSValue toJS(JSC::ExecState* exec, Coordinates* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Coordinates* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Coordinates* toCoordinates(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCoordinates.h b/src/3rdparty/webkit/WebCore/generated/JSCoordinates.h index 8a8643da2..d2095407f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCoordinates.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCoordinates.h @@ -21,6 +21,7 @@ #ifndef JSCoordinates_h #define JSCoordinates_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class Coordinates; -class JSCoordinates : public DOMObject { - typedef DOMObject Base; +class JSCoordinates : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSCoordinates(PassRefPtr, PassRefPtr); + JSCoordinates(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSCoordinates(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -56,7 +57,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, Coordinates*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Coordinates*); Coordinates* toCoordinates(JSC::JSValue); class JSCoordinatesPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCounter.cpp b/src/3rdparty/webkit/WebCore/generated/JSCounter.cpp index b3a834f70..026969658 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCounter.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSCounter.cpp @@ -64,12 +64,12 @@ static JSC_CONST_HASHTABLE HashTable JSCounterConstructorTable = { 1, 0, JSCounterConstructorTableValues, 0 }; #endif -class JSCounterConstructor : public DOMObject { +class JSCounterConstructor : public DOMConstructorObject { public: - JSCounterConstructor(ExecState* exec) - : DOMObject(JSCounterConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSCounterConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSCounterConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSCounterPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSCounterPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -111,8 +111,8 @@ JSObject* JSCounterPrototype::self(ExecState* exec, JSGlobalObject* globalObject const ClassInfo JSCounter::s_info = { "Counter", 0, &JSCounterTable, 0 }; -JSCounter::JSCounter(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSCounter::JSCounter(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -134,37 +134,41 @@ bool JSCounter::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa JSValue jsCounterIdentifier(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCounter* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Counter* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Counter* imp = static_cast(castedThis->impl()); return jsString(exec, imp->identifier()); } JSValue jsCounterListStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCounter* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Counter* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Counter* imp = static_cast(castedThis->impl()); return jsString(exec, imp->listStyle()); } JSValue jsCounterSeparator(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSCounter* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Counter* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Counter* imp = static_cast(castedThis->impl()); return jsString(exec, imp->separator()); } JSValue jsCounterConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSCounter* domObject = static_cast(asObject(slot.slotBase())); + return JSCounter::getConstructor(exec, domObject->globalObject()); } -JSValue JSCounter::getConstructor(ExecState* exec) +JSValue JSCounter::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } -JSC::JSValue toJS(JSC::ExecState* exec, Counter* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Counter* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Counter* toCounter(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSCounter.h b/src/3rdparty/webkit/WebCore/generated/JSCounter.h index ab195fe3b..cdfc523a3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSCounter.h +++ b/src/3rdparty/webkit/WebCore/generated/JSCounter.h @@ -21,6 +21,7 @@ #ifndef JSCounter_h #define JSCounter_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class Counter; -class JSCounter : public DOMObject { - typedef DOMObject Base; +class JSCounter : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSCounter(PassRefPtr, PassRefPtr); + JSCounter(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSCounter(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); Counter* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, Counter*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Counter*); Counter* toCounter(JSC::JSValue); class JSCounterPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.cpp index e9d43eebb..bf55e99e3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.cpp @@ -103,8 +103,8 @@ bool JSDOMApplicationCachePrototype::getOwnPropertySlot(ExecState* exec, const I const ClassInfo JSDOMApplicationCache::s_info = { "DOMApplicationCache", 0, &JSDOMApplicationCacheTable, 0 }; -JSDOMApplicationCache::JSDOMApplicationCache(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSDOMApplicationCache::JSDOMApplicationCache(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -126,15 +126,17 @@ bool JSDOMApplicationCache::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsDOMApplicationCacheStatus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMApplicationCache* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMApplicationCache* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMApplicationCache* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->status()); } JSValue jsDOMApplicationCacheOnchecking(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMApplicationCache* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMApplicationCache* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMApplicationCache* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onchecking()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -144,8 +146,9 @@ JSValue jsDOMApplicationCacheOnchecking(ExecState* exec, const Identifier&, cons JSValue jsDOMApplicationCacheOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMApplicationCache* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMApplicationCache* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMApplicationCache* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onerror()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -155,8 +158,9 @@ JSValue jsDOMApplicationCacheOnerror(ExecState* exec, const Identifier&, const P JSValue jsDOMApplicationCacheOnnoupdate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMApplicationCache* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMApplicationCache* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMApplicationCache* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onnoupdate()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -166,8 +170,9 @@ JSValue jsDOMApplicationCacheOnnoupdate(ExecState* exec, const Identifier&, cons JSValue jsDOMApplicationCacheOndownloading(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMApplicationCache* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMApplicationCache* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMApplicationCache* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondownloading()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -177,8 +182,9 @@ JSValue jsDOMApplicationCacheOndownloading(ExecState* exec, const Identifier&, c JSValue jsDOMApplicationCacheOnprogress(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMApplicationCache* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMApplicationCache* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMApplicationCache* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onprogress()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -188,8 +194,9 @@ JSValue jsDOMApplicationCacheOnprogress(ExecState* exec, const Identifier&, cons JSValue jsDOMApplicationCacheOnupdateready(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMApplicationCache* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMApplicationCache* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMApplicationCache* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onupdateready()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -199,8 +206,9 @@ JSValue jsDOMApplicationCacheOnupdateready(ExecState* exec, const Identifier&, c JSValue jsDOMApplicationCacheOncached(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMApplicationCache* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMApplicationCache* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMApplicationCache* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oncached()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -210,8 +218,9 @@ JSValue jsDOMApplicationCacheOncached(ExecState* exec, const Identifier&, const JSValue jsDOMApplicationCacheOnobsolete(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMApplicationCache* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMApplicationCache* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMApplicationCache* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onobsolete()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -398,9 +407,9 @@ JSValue jsDOMApplicationCacheOBSOLETE(ExecState* exec, const Identifier&, const return jsNumber(exec, static_cast(5)); } -JSC::JSValue toJS(JSC::ExecState* exec, DOMApplicationCache* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, DOMApplicationCache* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } DOMApplicationCache* toDOMApplicationCache(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.h b/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.h index 7a6ea14ee..6938f25b7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMApplicationCache.h @@ -23,6 +23,7 @@ #if ENABLE(OFFLINE_WEB_APPLICATIONS) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class DOMApplicationCache; -class JSDOMApplicationCache : public DOMObject { - typedef DOMObject Base; +class JSDOMApplicationCache : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSDOMApplicationCache(PassRefPtr, PassRefPtr); + JSDOMApplicationCache(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSDOMApplicationCache(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -59,7 +60,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, DOMApplicationCache*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, DOMApplicationCache*); DOMApplicationCache* toDOMApplicationCache(JSC::JSValue); class JSDOMApplicationCachePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.cpp index 22411822c..da10b128e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.cpp @@ -88,12 +88,12 @@ static JSC_CONST_HASHTABLE HashTable JSDOMCoreExceptionConstructorTable = { 67, 63, JSDOMCoreExceptionConstructorTableValues, 0 }; #endif -class JSDOMCoreExceptionConstructor : public DOMObject { +class JSDOMCoreExceptionConstructor : public DOMConstructorObject { public: - JSDOMCoreExceptionConstructor(ExecState* exec) - : DOMObject(JSDOMCoreExceptionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSDOMCoreExceptionConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSDOMCoreExceptionConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSDOMCoreExceptionPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSDOMCoreExceptionPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -163,8 +163,8 @@ bool JSDOMCoreExceptionPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSDOMCoreException::s_info = { "DOMException", 0, &JSDOMCoreExceptionTable, 0 }; -JSDOMCoreException::JSDOMCoreException(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSDOMCoreException::JSDOMCoreException(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -186,32 +186,36 @@ bool JSDOMCoreException::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsDOMCoreExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMCoreException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMCoreException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMCoreException* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->code()); } JSValue jsDOMCoreExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMCoreException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMCoreException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMCoreException* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsDOMCoreExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMCoreException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMCoreException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMCoreException* imp = static_cast(castedThis->impl()); return jsString(exec, imp->message()); } JSValue jsDOMCoreExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSDOMCoreException* domObject = static_cast(asObject(slot.slotBase())); + return JSDOMCoreException::getConstructor(exec, domObject->globalObject()); } -JSValue JSDOMCoreException::getConstructor(ExecState* exec) +JSValue JSDOMCoreException::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsDOMCoreExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -339,9 +343,9 @@ JSValue jsDOMCoreExceptionQUOTA_EXCEEDED_ERR(ExecState* exec, const Identifier&, return jsNumber(exec, static_cast(22)); } -JSC::JSValue toJS(JSC::ExecState* exec, DOMCoreException* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, DOMCoreException* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } DOMCoreException* toDOMCoreException(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.h b/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.h index 75b43284e..e0a45f914 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMCoreException.h @@ -21,6 +21,7 @@ #ifndef JSDOMCoreException_h #define JSDOMCoreException_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class DOMCoreException; -class JSDOMCoreException : public DOMObject { - typedef DOMObject Base; +class JSDOMCoreException : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSDOMCoreException(PassRefPtr, PassRefPtr); + JSDOMCoreException(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSDOMCoreException(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); DOMCoreException* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, DOMCoreException*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, DOMCoreException*); DOMCoreException* toDOMCoreException(JSC::JSValue); class JSDOMCoreExceptionPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.cpp index 9b5787cc4..694152149 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.cpp @@ -69,12 +69,12 @@ static JSC_CONST_HASHTABLE HashTable JSDOMImplementationConstructorTable = { 1, 0, JSDOMImplementationConstructorTableValues, 0 }; #endif -class JSDOMImplementationConstructor : public DOMObject { +class JSDOMImplementationConstructor : public DOMConstructorObject { public: - JSDOMImplementationConstructor(ExecState* exec) - : DOMObject(JSDOMImplementationConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSDOMImplementationConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSDOMImplementationConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSDOMImplementationPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSDOMImplementationPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -126,8 +126,8 @@ bool JSDOMImplementationPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSDOMImplementation::s_info = { "DOMImplementation", 0, &JSDOMImplementationTable, 0 }; -JSDOMImplementation::JSDOMImplementation(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSDOMImplementation::JSDOMImplementation(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -149,11 +149,12 @@ bool JSDOMImplementation::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsDOMImplementationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSDOMImplementation* domObject = static_cast(asObject(slot.slotBase())); + return JSDOMImplementation::getConstructor(exec, domObject->globalObject()); } -JSValue JSDOMImplementation::getConstructor(ExecState* exec) +JSValue JSDOMImplementation::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionHasFeature(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -184,7 +185,7 @@ JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionCreateDocumentType(Exe const UString& systemId = valueToStringWithUndefinedOrNullCheck(exec, args.at(2)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createDocumentType(qualifiedName, publicId, systemId, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createDocumentType(qualifiedName, publicId, systemId, ec))); setDOMException(exec, ec); return result; } @@ -202,7 +203,7 @@ JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionCreateDocument(ExecSta DocumentType* doctype = toDocumentType(args.at(2)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createDocument(namespaceURI, qualifiedName, doctype, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createDocument(namespaceURI, qualifiedName, doctype, ec))); setDOMException(exec, ec); return result; } @@ -219,7 +220,7 @@ JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionCreateCSSStyleSheet(Ex const UString& media = args.at(1).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createCSSStyleSheet(title, media, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createCSSStyleSheet(title, media, ec))); setDOMException(exec, ec); return result; } @@ -234,13 +235,13 @@ JSValue JSC_HOST_CALL jsDOMImplementationPrototypeFunctionCreateHTMLDocument(Exe const UString& title = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createHTMLDocument(title))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createHTMLDocument(title))); return result; } -JSC::JSValue toJS(JSC::ExecState* exec, DOMImplementation* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, DOMImplementation* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } DOMImplementation* toDOMImplementation(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.h b/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.h index e0177782e..b81111089 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMImplementation.h @@ -21,6 +21,7 @@ #ifndef JSDOMImplementation_h #define JSDOMImplementation_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class DOMImplementation; -class JSDOMImplementation : public DOMObject { - typedef DOMObject Base; +class JSDOMImplementation : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSDOMImplementation(PassRefPtr, PassRefPtr); + JSDOMImplementation(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSDOMImplementation(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); DOMImplementation* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, DOMImplementation*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, DOMImplementation*); DOMImplementation* toDOMImplementation(JSC::JSValue); class JSDOMImplementationPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMParser.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMParser.cpp index ac05d7d39..31dd1fcf2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMParser.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMParser.cpp @@ -63,12 +63,12 @@ static JSC_CONST_HASHTABLE HashTable JSDOMParserConstructorTable = { 1, 0, JSDOMParserConstructorTableValues, 0 }; #endif -class JSDOMParserConstructor : public DOMObject { +class JSDOMParserConstructor : public DOMConstructorObject { public: - JSDOMParserConstructor(ExecState* exec) - : DOMObject(JSDOMParserConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSDOMParserConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSDOMParserConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSDOMParserPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSDOMParserPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -78,13 +78,13 @@ public: { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } - static JSObject* construct(ExecState* exec, JSObject*, const ArgList&) + static JSObject* constructDOMParser(ExecState* exec, JSObject* constructor, const ArgList&) { - return asObject(toJS(exec, DOMParser::create())); + return asObject(toJS(exec, static_cast(constructor)->globalObject(), DOMParser::create())); } virtual ConstructType getConstructData(ConstructData& constructData) { - constructData.native.function = construct; + constructData.native.function = constructDOMParser; return ConstructTypeHost; } }; @@ -125,8 +125,8 @@ bool JSDOMParserPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSDOMParser::s_info = { "DOMParser", 0, &JSDOMParserTable, 0 }; -JSDOMParser::JSDOMParser(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSDOMParser::JSDOMParser(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -148,11 +148,12 @@ bool JSDOMParser::getOwnPropertySlot(ExecState* exec, const Identifier& property JSValue jsDOMParserConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSDOMParser* domObject = static_cast(asObject(slot.slotBase())); + return JSDOMParser::getConstructor(exec, domObject->globalObject()); } -JSValue JSDOMParser::getConstructor(ExecState* exec) +JSValue JSDOMParser::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsDOMParserPrototypeFunctionParseFromString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -166,13 +167,13 @@ JSValue JSC_HOST_CALL jsDOMParserPrototypeFunctionParseFromString(ExecState* exe const UString& contentType = args.at(1).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->parseFromString(str, contentType))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->parseFromString(str, contentType))); return result; } -JSC::JSValue toJS(JSC::ExecState* exec, DOMParser* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, DOMParser* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } DOMParser* toDOMParser(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMParser.h b/src/3rdparty/webkit/WebCore/generated/JSDOMParser.h index cfdbe9b2a..2271e188a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMParser.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMParser.h @@ -21,6 +21,7 @@ #ifndef JSDOMParser_h #define JSDOMParser_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class DOMParser; -class JSDOMParser : public DOMObject { - typedef DOMObject Base; +class JSDOMParser : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSDOMParser(PassRefPtr, PassRefPtr); + JSDOMParser(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSDOMParser(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); DOMParser* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, DOMParser*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, DOMParser*); DOMParser* toDOMParser(JSC::JSValue); class JSDOMParserPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.cpp index b0a249d80..ffb842a29 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.cpp @@ -106,8 +106,8 @@ bool JSDOMSelectionPrototype::getOwnPropertySlot(ExecState* exec, const Identifi const ClassInfo JSDOMSelection::s_info = { "DOMSelection", 0, &JSDOMSelectionTable, 0 }; -JSDOMSelection::JSDOMSelection(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSDOMSelection::JSDOMSelection(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -129,78 +129,89 @@ bool JSDOMSelection::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsDOMSelectionAnchorNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMSelection* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMSelection* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->anchorNode())); + DOMSelection* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->anchorNode())); } JSValue jsDOMSelectionAnchorOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMSelection* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMSelection* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMSelection* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->anchorOffset()); } JSValue jsDOMSelectionFocusNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMSelection* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMSelection* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->focusNode())); + DOMSelection* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->focusNode())); } JSValue jsDOMSelectionFocusOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMSelection* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMSelection* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMSelection* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->focusOffset()); } JSValue jsDOMSelectionIsCollapsed(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMSelection* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMSelection* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMSelection* imp = static_cast(castedThis->impl()); return jsBoolean(imp->isCollapsed()); } JSValue jsDOMSelectionRangeCount(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMSelection* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMSelection* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMSelection* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->rangeCount()); } JSValue jsDOMSelectionBaseNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMSelection* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMSelection* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->baseNode())); + DOMSelection* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->baseNode())); } JSValue jsDOMSelectionBaseOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMSelection* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMSelection* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMSelection* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->baseOffset()); } JSValue jsDOMSelectionExtentNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMSelection* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMSelection* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->extentNode())); + DOMSelection* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->extentNode())); } JSValue jsDOMSelectionExtentOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMSelection* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMSelection* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMSelection* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->extentOffset()); } JSValue jsDOMSelectionType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMSelection* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMSelection* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMSelection* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } @@ -313,7 +324,7 @@ JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionGetRangeAt(ExecState* exec, int index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getRangeAt(index, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getRangeAt(index, ec))); setDOMException(exec, ec); return result; } @@ -417,9 +428,9 @@ JSValue JSC_HOST_CALL jsDOMSelectionPrototypeFunctionEmpty(ExecState* exec, JSOb return jsUndefined(); } -JSC::JSValue toJS(JSC::ExecState* exec, DOMSelection* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, DOMSelection* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } DOMSelection* toDOMSelection(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.h b/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.h index 2af8cbd08..a0fae0a8e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMSelection.h @@ -21,6 +21,7 @@ #ifndef JSDOMSelection_h #define JSDOMSelection_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class DOMSelection; -class JSDOMSelection : public DOMObject { - typedef DOMObject Base; +class JSDOMSelection : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSDOMSelection(PassRefPtr, PassRefPtr); + JSDOMSelection(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSDOMSelection(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -50,7 +51,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, DOMSelection*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, DOMSelection*); DOMSelection* toDOMSelection(JSC::JSValue); class JSDOMSelectionPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp index 6ac47498e..364a975a9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp @@ -167,6 +167,7 @@ #include "JSPluginArray.h" #include "JSProcessingInstruction.h" #include "JSProgressEvent.h" +#include "JSRGBColor.h" #include "JSRange.h" #include "JSRangeException.h" #include "JSRect.h" @@ -228,7 +229,7 @@ ASSERT_CLASS_FITS_IN_CELL(JSDOMWindow); /* Hash table */ -static const HashTableValue JSDOMWindowTableValues[275] = +static const HashTableValue JSDOMWindowTableValues[276] = { { "screen", DontDelete|ReadOnly, (intptr_t)jsDOMWindowScreen, (intptr_t)0 }, { "history", DontDelete|ReadOnly, (intptr_t)jsDOMWindowHistory, (intptr_t)0 }, @@ -357,6 +358,7 @@ static const HashTableValue JSDOMWindowTableValues[275] = { "Counter", DontDelete, (intptr_t)jsDOMWindowCounterConstructor, (intptr_t)setJSDOMWindowCounterConstructor }, { "CSSRuleList", DontDelete, (intptr_t)jsDOMWindowCSSRuleListConstructor, (intptr_t)setJSDOMWindowCSSRuleListConstructor }, { "Rect", DontDelete, (intptr_t)jsDOMWindowRectConstructor, (intptr_t)setJSDOMWindowRectConstructor }, + { "RGBColor", DontDelete, (intptr_t)jsDOMWindowRGBColorConstructor, (intptr_t)setJSDOMWindowRGBColorConstructor }, { "StyleSheetList", DontDelete, (intptr_t)jsDOMWindowStyleSheetListConstructor, (intptr_t)setJSDOMWindowStyleSheetListConstructor }, { "DOMException", DontDelete, (intptr_t)jsDOMWindowDOMExceptionConstructor, (intptr_t)setJSDOMWindowDOMExceptionConstructor }, { "DOMImplementation", DontDelete, (intptr_t)jsDOMWindowDOMImplementationConstructor, (intptr_t)setJSDOMWindowDOMImplementationConstructor }, @@ -606,386 +608,432 @@ JSDOMWindow::~JSDOMWindow() JSValue jsDOMWindowScreen(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->screen())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->screen())); } JSValue jsDOMWindowHistory(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->history(exec); + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->history(exec); } JSValue jsDOMWindowLocationbar(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->locationbar())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->locationbar())); } JSValue jsDOMWindowMenubar(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->menubar())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->menubar())); } JSValue jsDOMWindowPersonalbar(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->personalbar())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->personalbar())); } JSValue jsDOMWindowScrollbars(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->scrollbars())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->scrollbars())); } JSValue jsDOMWindowStatusbar(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->statusbar())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->statusbar())); } JSValue jsDOMWindowToolbar(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->toolbar())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->toolbar())); } JSValue jsDOMWindowNavigator(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->navigator())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->navigator())); } JSValue jsDOMWindowClientInformation(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->clientInformation())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->clientInformation())); } JSValue jsDOMWindowLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->location(exec); + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->location(exec); } JSValue jsDOMWindowEvent(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - return static_cast(asObject(slot.slotBase()))->event(exec); + return castedThis->event(exec); } JSValue jsDOMWindowCrypto(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - return static_cast(asObject(slot.slotBase()))->crypto(exec); + return castedThis->crypto(exec); } JSValue jsDOMWindowFrameElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return checkNodeSecurity(exec, imp->frameElement()) ? toJS(exec, WTF::getPtr(imp->frameElement())) : jsUndefined(); + DOMWindow* imp = static_cast(castedThis->impl()); + return checkNodeSecurity(exec, imp->frameElement()) ? toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->frameElement())) : jsUndefined(); } JSValue jsDOMWindowOffscreenBuffering(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsBoolean(imp->offscreenBuffering()); } JSValue jsDOMWindowOuterHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->outerHeight()); } JSValue jsDOMWindowOuterWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->outerWidth()); } JSValue jsDOMWindowInnerHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->innerHeight()); } JSValue jsDOMWindowInnerWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->innerWidth()); } JSValue jsDOMWindowScreenX(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->screenX()); } JSValue jsDOMWindowScreenY(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->screenY()); } JSValue jsDOMWindowScreenLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->screenLeft()); } JSValue jsDOMWindowScreenTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->screenTop()); } JSValue jsDOMWindowScrollX(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->scrollX()); } JSValue jsDOMWindowScrollY(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->scrollY()); } JSValue jsDOMWindowPageXOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->pageXOffset()); } JSValue jsDOMWindowPageYOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->pageYOffset()); } JSValue jsDOMWindowClosed(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsBoolean(imp->closed()); } JSValue jsDOMWindowLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsDOMWindowName(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsDOMWindowStatus(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsString(exec, imp->status()); } JSValue jsDOMWindowDefaultStatus(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsString(exec, imp->defaultStatus()); } JSValue jsDOMWindowDefaultstatus(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsString(exec, imp->defaultstatus()); } JSValue jsDOMWindowSelf(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->self())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->self())); } JSValue jsDOMWindowWindow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->window())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->window())); } JSValue jsDOMWindowFrames(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->frames())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->frames())); } JSValue jsDOMWindowOpener(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->opener())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->opener())); } JSValue jsDOMWindowParent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->parent())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->parent())); } JSValue jsDOMWindowTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->top())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->top())); } JSValue jsDOMWindowDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->document())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->document())); } JSValue jsDOMWindowDevicePixelRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->devicePixelRatio()); } JSValue jsDOMWindowApplicationCache(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->applicationCache())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->applicationCache())); } JSValue jsDOMWindowSessionStorage(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->sessionStorage())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->sessionStorage())); } JSValue jsDOMWindowLocalStorage(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->localStorage())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->localStorage())); } JSValue jsDOMWindowConsole(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->console())); + DOMWindow* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->console())); } JSValue jsDOMWindowOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onabort()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -995,10 +1043,11 @@ JSValue jsDOMWindowOnabort(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDOMWindowOnbeforeunload(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onbeforeunload()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1008,10 +1057,11 @@ JSValue jsDOMWindowOnbeforeunload(ExecState* exec, const Identifier&, const Prop JSValue jsDOMWindowOnblur(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onblur()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1021,10 +1071,11 @@ JSValue jsDOMWindowOnblur(ExecState* exec, const Identifier&, const PropertySlot JSValue jsDOMWindowOncanplay(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oncanplay()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1034,10 +1085,11 @@ JSValue jsDOMWindowOncanplay(ExecState* exec, const Identifier&, const PropertyS JSValue jsDOMWindowOncanplaythrough(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oncanplaythrough()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1047,10 +1099,11 @@ JSValue jsDOMWindowOncanplaythrough(ExecState* exec, const Identifier&, const Pr JSValue jsDOMWindowOnchange(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onchange()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1060,10 +1113,11 @@ JSValue jsDOMWindowOnchange(ExecState* exec, const Identifier&, const PropertySl JSValue jsDOMWindowOnclick(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onclick()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1073,10 +1127,11 @@ JSValue jsDOMWindowOnclick(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDOMWindowOncontextmenu(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oncontextmenu()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1086,10 +1141,11 @@ JSValue jsDOMWindowOncontextmenu(ExecState* exec, const Identifier&, const Prope JSValue jsDOMWindowOndblclick(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondblclick()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1099,10 +1155,11 @@ JSValue jsDOMWindowOndblclick(ExecState* exec, const Identifier&, const Property JSValue jsDOMWindowOndrag(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondrag()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1112,10 +1169,11 @@ JSValue jsDOMWindowOndrag(ExecState* exec, const Identifier&, const PropertySlot JSValue jsDOMWindowOndragend(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragend()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1125,10 +1183,11 @@ JSValue jsDOMWindowOndragend(ExecState* exec, const Identifier&, const PropertyS JSValue jsDOMWindowOndragenter(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragenter()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1138,10 +1197,11 @@ JSValue jsDOMWindowOndragenter(ExecState* exec, const Identifier&, const Propert JSValue jsDOMWindowOndragleave(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragleave()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1151,10 +1211,11 @@ JSValue jsDOMWindowOndragleave(ExecState* exec, const Identifier&, const Propert JSValue jsDOMWindowOndragover(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragover()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1164,10 +1225,11 @@ JSValue jsDOMWindowOndragover(ExecState* exec, const Identifier&, const Property JSValue jsDOMWindowOndragstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragstart()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1177,10 +1239,11 @@ JSValue jsDOMWindowOndragstart(ExecState* exec, const Identifier&, const Propert JSValue jsDOMWindowOndrop(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondrop()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1190,10 +1253,11 @@ JSValue jsDOMWindowOndrop(ExecState* exec, const Identifier&, const PropertySlot JSValue jsDOMWindowOndurationchange(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondurationchange()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1203,10 +1267,11 @@ JSValue jsDOMWindowOndurationchange(ExecState* exec, const Identifier&, const Pr JSValue jsDOMWindowOnemptied(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onemptied()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1216,10 +1281,11 @@ JSValue jsDOMWindowOnemptied(ExecState* exec, const Identifier&, const PropertyS JSValue jsDOMWindowOnended(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onended()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1229,10 +1295,11 @@ JSValue jsDOMWindowOnended(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDOMWindowOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onerror()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1242,10 +1309,11 @@ JSValue jsDOMWindowOnerror(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDOMWindowOnfocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onfocus()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1255,10 +1323,11 @@ JSValue jsDOMWindowOnfocus(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDOMWindowOninput(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oninput()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1268,10 +1337,11 @@ JSValue jsDOMWindowOninput(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDOMWindowOnkeydown(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onkeydown()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1281,10 +1351,11 @@ JSValue jsDOMWindowOnkeydown(ExecState* exec, const Identifier&, const PropertyS JSValue jsDOMWindowOnkeypress(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onkeypress()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1294,10 +1365,11 @@ JSValue jsDOMWindowOnkeypress(ExecState* exec, const Identifier&, const Property JSValue jsDOMWindowOnkeyup(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onkeyup()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1307,10 +1379,11 @@ JSValue jsDOMWindowOnkeyup(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDOMWindowOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onload()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1320,10 +1393,11 @@ JSValue jsDOMWindowOnload(ExecState* exec, const Identifier&, const PropertySlot JSValue jsDOMWindowOnloadeddata(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onloadeddata()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1333,10 +1407,11 @@ JSValue jsDOMWindowOnloadeddata(ExecState* exec, const Identifier&, const Proper JSValue jsDOMWindowOnloadedmetadata(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onloadedmetadata()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1346,10 +1421,11 @@ JSValue jsDOMWindowOnloadedmetadata(ExecState* exec, const Identifier&, const Pr JSValue jsDOMWindowOnloadstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onloadstart()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1359,10 +1435,11 @@ JSValue jsDOMWindowOnloadstart(ExecState* exec, const Identifier&, const Propert JSValue jsDOMWindowOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmessage()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1372,10 +1449,11 @@ JSValue jsDOMWindowOnmessage(ExecState* exec, const Identifier&, const PropertyS JSValue jsDOMWindowOnmousedown(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmousedown()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1385,10 +1463,11 @@ JSValue jsDOMWindowOnmousedown(ExecState* exec, const Identifier&, const Propert JSValue jsDOMWindowOnmousemove(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmousemove()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1398,10 +1477,11 @@ JSValue jsDOMWindowOnmousemove(ExecState* exec, const Identifier&, const Propert JSValue jsDOMWindowOnmouseout(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmouseout()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1411,10 +1491,11 @@ JSValue jsDOMWindowOnmouseout(ExecState* exec, const Identifier&, const Property JSValue jsDOMWindowOnmouseover(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmouseover()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1424,10 +1505,11 @@ JSValue jsDOMWindowOnmouseover(ExecState* exec, const Identifier&, const Propert JSValue jsDOMWindowOnmouseup(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmouseup()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1437,10 +1519,11 @@ JSValue jsDOMWindowOnmouseup(ExecState* exec, const Identifier&, const PropertyS JSValue jsDOMWindowOnmousewheel(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmousewheel()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1450,10 +1533,11 @@ JSValue jsDOMWindowOnmousewheel(ExecState* exec, const Identifier&, const Proper JSValue jsDOMWindowOnoffline(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onoffline()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1463,10 +1547,11 @@ JSValue jsDOMWindowOnoffline(ExecState* exec, const Identifier&, const PropertyS JSValue jsDOMWindowOnonline(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ononline()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1476,10 +1561,11 @@ JSValue jsDOMWindowOnonline(ExecState* exec, const Identifier&, const PropertySl JSValue jsDOMWindowOnpause(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onpause()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1489,10 +1575,11 @@ JSValue jsDOMWindowOnpause(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDOMWindowOnplay(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onplay()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1502,10 +1589,11 @@ JSValue jsDOMWindowOnplay(ExecState* exec, const Identifier&, const PropertySlot JSValue jsDOMWindowOnplaying(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onplaying()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1515,10 +1603,11 @@ JSValue jsDOMWindowOnplaying(ExecState* exec, const Identifier&, const PropertyS JSValue jsDOMWindowOnprogress(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onprogress()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1528,10 +1617,11 @@ JSValue jsDOMWindowOnprogress(ExecState* exec, const Identifier&, const Property JSValue jsDOMWindowOnratechange(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onratechange()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1541,10 +1631,11 @@ JSValue jsDOMWindowOnratechange(ExecState* exec, const Identifier&, const Proper JSValue jsDOMWindowOnresize(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onresize()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1554,10 +1645,11 @@ JSValue jsDOMWindowOnresize(ExecState* exec, const Identifier&, const PropertySl JSValue jsDOMWindowOnscroll(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onscroll()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1567,10 +1659,11 @@ JSValue jsDOMWindowOnscroll(ExecState* exec, const Identifier&, const PropertySl JSValue jsDOMWindowOnseeked(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onseeked()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1580,10 +1673,11 @@ JSValue jsDOMWindowOnseeked(ExecState* exec, const Identifier&, const PropertySl JSValue jsDOMWindowOnseeking(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onseeking()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1593,10 +1687,11 @@ JSValue jsDOMWindowOnseeking(ExecState* exec, const Identifier&, const PropertyS JSValue jsDOMWindowOnselect(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onselect()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1606,10 +1701,11 @@ JSValue jsDOMWindowOnselect(ExecState* exec, const Identifier&, const PropertySl JSValue jsDOMWindowOnstalled(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onstalled()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1619,10 +1715,11 @@ JSValue jsDOMWindowOnstalled(ExecState* exec, const Identifier&, const PropertyS JSValue jsDOMWindowOnstorage(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onstorage()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1632,10 +1729,11 @@ JSValue jsDOMWindowOnstorage(ExecState* exec, const Identifier&, const PropertyS JSValue jsDOMWindowOnsubmit(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onsubmit()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1645,10 +1743,11 @@ JSValue jsDOMWindowOnsubmit(ExecState* exec, const Identifier&, const PropertySl JSValue jsDOMWindowOnsuspend(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onsuspend()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1658,10 +1757,11 @@ JSValue jsDOMWindowOnsuspend(ExecState* exec, const Identifier&, const PropertyS JSValue jsDOMWindowOntimeupdate(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ontimeupdate()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1671,10 +1771,11 @@ JSValue jsDOMWindowOntimeupdate(ExecState* exec, const Identifier&, const Proper JSValue jsDOMWindowOnunload(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onunload()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1684,10 +1785,11 @@ JSValue jsDOMWindowOnunload(ExecState* exec, const Identifier&, const PropertySl JSValue jsDOMWindowOnvolumechange(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onvolumechange()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1697,10 +1799,11 @@ JSValue jsDOMWindowOnvolumechange(ExecState* exec, const Identifier&, const Prop JSValue jsDOMWindowOnwaiting(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onwaiting()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1710,10 +1813,11 @@ JSValue jsDOMWindowOnwaiting(ExecState* exec, const Identifier&, const PropertyS JSValue jsDOMWindowOnreset(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onreset()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1723,10 +1827,11 @@ JSValue jsDOMWindowOnreset(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDOMWindowOnsearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onsearch()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1736,10 +1841,11 @@ JSValue jsDOMWindowOnsearch(ExecState* exec, const Identifier&, const PropertySl JSValue jsDOMWindowOnwebkitanimationend(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onwebkitanimationend()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1749,10 +1855,11 @@ JSValue jsDOMWindowOnwebkitanimationend(ExecState* exec, const Identifier&, cons JSValue jsDOMWindowOnwebkitanimationiteration(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onwebkitanimationiteration()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1762,10 +1869,11 @@ JSValue jsDOMWindowOnwebkitanimationiteration(ExecState* exec, const Identifier& JSValue jsDOMWindowOnwebkitanimationstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onwebkitanimationstart()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1775,10 +1883,11 @@ JSValue jsDOMWindowOnwebkitanimationstart(ExecState* exec, const Identifier&, co JSValue jsDOMWindowOnwebkittransitionend(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); UNUSED_PARAM(exec); - DOMWindow* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DOMWindow* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onwebkittransitionend()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -1788,1346 +1897,1362 @@ JSValue jsDOMWindowOnwebkittransitionend(ExecState* exec, const Identifier&, con JSValue jsDOMWindowStyleSheetConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSStyleSheet::getConstructor(exec); + return JSStyleSheet::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSStyleSheetConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSStyleSheet::getConstructor(exec); + return JSCSSStyleSheet::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSValue::getConstructor(exec); + return JSCSSValue::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSPrimitiveValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSPrimitiveValue::getConstructor(exec); + return JSCSSPrimitiveValue::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSValueListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSValueList::getConstructor(exec); + return JSCSSValueList::getConstructor(exec, castedThis); } JSValue jsDOMWindowWebKitCSSTransformValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSWebKitCSSTransformValue::getConstructor(exec); + return JSWebKitCSSTransformValue::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSRule::getConstructor(exec); + return JSCSSRule::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSCharsetRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSCharsetRule::getConstructor(exec); + return JSCSSCharsetRule::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSFontFaceRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSFontFaceRule::getConstructor(exec); + return JSCSSFontFaceRule::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSImportRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSImportRule::getConstructor(exec); + return JSCSSImportRule::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSMediaRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSMediaRule::getConstructor(exec); + return JSCSSMediaRule::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSPageRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSPageRule::getConstructor(exec); + return JSCSSPageRule::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSStyleRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSStyleRule::getConstructor(exec); + return JSCSSStyleRule::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSVariablesRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSVariablesRule::getConstructor(exec); + return JSCSSVariablesRule::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSVariablesDeclarationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSVariablesDeclaration::getConstructor(exec); + return JSCSSVariablesDeclaration::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSStyleDeclarationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSStyleDeclaration::getConstructor(exec); + return JSCSSStyleDeclaration::getConstructor(exec, castedThis); } JSValue jsDOMWindowMediaListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSMediaList::getConstructor(exec); + return JSMediaList::getConstructor(exec, castedThis); } JSValue jsDOMWindowCounterConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCounter::getConstructor(exec); + return JSCounter::getConstructor(exec, castedThis); } JSValue jsDOMWindowCSSRuleListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCSSRuleList::getConstructor(exec); + return JSCSSRuleList::getConstructor(exec, castedThis); } JSValue jsDOMWindowRectConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSRect::getConstructor(exec); + return JSRect::getConstructor(exec, castedThis); +} + +JSValue jsDOMWindowRGBColorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) + return jsUndefined(); + return JSRGBColor::getConstructor(exec, castedThis); } JSValue jsDOMWindowStyleSheetListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSStyleSheetList::getConstructor(exec); + return JSStyleSheetList::getConstructor(exec, castedThis); } JSValue jsDOMWindowDOMExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSDOMCoreException::getConstructor(exec); + return JSDOMCoreException::getConstructor(exec, castedThis); } JSValue jsDOMWindowDOMImplementationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSDOMImplementation::getConstructor(exec); + return JSDOMImplementation::getConstructor(exec, castedThis); } JSValue jsDOMWindowDocumentFragmentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSDocumentFragment::getConstructor(exec); + return JSDocumentFragment::getConstructor(exec, castedThis); } JSValue jsDOMWindowDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSDocument::getConstructor(exec); + return JSDocument::getConstructor(exec, castedThis); } JSValue jsDOMWindowNodeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSNode::getConstructor(exec); + return JSNode::getConstructor(exec, castedThis); } JSValue jsDOMWindowNodeListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSNodeList::getConstructor(exec); + return JSNodeList::getConstructor(exec, castedThis); } JSValue jsDOMWindowNamedNodeMapConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSNamedNodeMap::getConstructor(exec); + return JSNamedNodeMap::getConstructor(exec, castedThis); } JSValue jsDOMWindowCharacterDataConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCharacterData::getConstructor(exec); + return JSCharacterData::getConstructor(exec, castedThis); } JSValue jsDOMWindowAttrConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSAttr::getConstructor(exec); + return JSAttr::getConstructor(exec, castedThis); } JSValue jsDOMWindowElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSElement::getConstructor(exec); + return JSElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowTextConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSText::getConstructor(exec); + return JSText::getConstructor(exec, castedThis); } JSValue jsDOMWindowCommentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSComment::getConstructor(exec); + return JSComment::getConstructor(exec, castedThis); } JSValue jsDOMWindowCDATASectionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCDATASection::getConstructor(exec); + return JSCDATASection::getConstructor(exec, castedThis); } JSValue jsDOMWindowDocumentTypeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSDocumentType::getConstructor(exec); + return JSDocumentType::getConstructor(exec, castedThis); } JSValue jsDOMWindowNotationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSNotation::getConstructor(exec); + return JSNotation::getConstructor(exec, castedThis); } JSValue jsDOMWindowEntityConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSEntity::getConstructor(exec); + return JSEntity::getConstructor(exec, castedThis); } JSValue jsDOMWindowEntityReferenceConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSEntityReference::getConstructor(exec); + return JSEntityReference::getConstructor(exec, castedThis); } JSValue jsDOMWindowProcessingInstructionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSProcessingInstruction::getConstructor(exec); + return JSProcessingInstruction::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLDocument::getConstructor(exec); + return JSHTMLDocument::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLElement::getConstructor(exec); + return JSHTMLElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLAnchorElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLAnchorElement::getConstructor(exec); + return JSHTMLAnchorElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLAppletElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLAppletElement::getConstructor(exec); + return JSHTMLAppletElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLAreaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLAreaElement::getConstructor(exec); + return JSHTMLAreaElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLBRElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLBRElement::getConstructor(exec); + return JSHTMLBRElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLBaseElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLBaseElement::getConstructor(exec); + return JSHTMLBaseElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLBaseFontElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLBaseFontElement::getConstructor(exec); + return JSHTMLBaseFontElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLBlockquoteElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLBlockquoteElement::getConstructor(exec); + return JSHTMLBlockquoteElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLBodyElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLBodyElement::getConstructor(exec); + return JSHTMLBodyElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLButtonElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLButtonElement::getConstructor(exec); + return JSHTMLButtonElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLCanvasElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLCanvasElement::getConstructor(exec); + return JSHTMLCanvasElement::getConstructor(exec, castedThis); } #if ENABLE(DATAGRID) JSValue jsDOMWindowHTMLDataGridElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLDataGridElement::getConstructor(exec); + return JSHTMLDataGridElement::getConstructor(exec, castedThis); } #endif #if ENABLE(DATAGRID) JSValue jsDOMWindowHTMLDataGridCellElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLDataGridCellElement::getConstructor(exec); + return JSHTMLDataGridCellElement::getConstructor(exec, castedThis); } #endif #if ENABLE(DATAGRID) JSValue jsDOMWindowHTMLDataGridColElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLDataGridColElement::getConstructor(exec); + return JSHTMLDataGridColElement::getConstructor(exec, castedThis); } #endif JSValue jsDOMWindowHTMLDListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLDListElement::getConstructor(exec); + return JSHTMLDListElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLDirectoryElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLDirectoryElement::getConstructor(exec); + return JSHTMLDirectoryElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLDivElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLDivElement::getConstructor(exec); + return JSHTMLDivElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLEmbedElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLEmbedElement::getConstructor(exec); + return JSHTMLEmbedElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLFieldSetElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLFieldSetElement::getConstructor(exec); + return JSHTMLFieldSetElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLFontElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLFontElement::getConstructor(exec); + return JSHTMLFontElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLFormElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLFormElement::getConstructor(exec); + return JSHTMLFormElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLFrameElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLFrameElement::getConstructor(exec); + return JSHTMLFrameElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLFrameSetElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLFrameSetElement::getConstructor(exec); + return JSHTMLFrameSetElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLHRElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLHRElement::getConstructor(exec); + return JSHTMLHRElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLHeadElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLHeadElement::getConstructor(exec); + return JSHTMLHeadElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLHeadingElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLHeadingElement::getConstructor(exec); + return JSHTMLHeadingElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLHtmlElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLHtmlElement::getConstructor(exec); + return JSHTMLHtmlElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLIFrameElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLIFrameElement::getConstructor(exec); + return JSHTMLIFrameElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLImageElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLImageElement::getConstructor(exec); + return JSHTMLImageElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLInputElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLInputElement::getConstructor(exec); + return JSHTMLInputElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLIsIndexElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLIsIndexElement::getConstructor(exec); + return JSHTMLIsIndexElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLLIElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLLIElement::getConstructor(exec); + return JSHTMLLIElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLLabelElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLLabelElement::getConstructor(exec); + return JSHTMLLabelElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLLegendElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLLegendElement::getConstructor(exec); + return JSHTMLLegendElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLLinkElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLLinkElement::getConstructor(exec); + return JSHTMLLinkElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLMapElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLMapElement::getConstructor(exec); + return JSHTMLMapElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLMarqueeElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLMarqueeElement::getConstructor(exec); + return JSHTMLMarqueeElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLMenuElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLMenuElement::getConstructor(exec); + return JSHTMLMenuElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLMetaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLMetaElement::getConstructor(exec); + return JSHTMLMetaElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLModElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLModElement::getConstructor(exec); + return JSHTMLModElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLOListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLOListElement::getConstructor(exec); + return JSHTMLOListElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLObjectElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLObjectElement::getConstructor(exec); + return JSHTMLObjectElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLOptGroupElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLOptGroupElement::getConstructor(exec); + return JSHTMLOptGroupElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLOptionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLOptionElement::getConstructor(exec); + return JSHTMLOptionElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLParagraphElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLParagraphElement::getConstructor(exec); + return JSHTMLParagraphElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLParamElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLParamElement::getConstructor(exec); + return JSHTMLParamElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLPreElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLPreElement::getConstructor(exec); + return JSHTMLPreElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLQuoteElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLQuoteElement::getConstructor(exec); + return JSHTMLQuoteElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLScriptElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLScriptElement::getConstructor(exec); + return JSHTMLScriptElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLSelectElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLSelectElement::getConstructor(exec); + return JSHTMLSelectElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLStyleElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLStyleElement::getConstructor(exec); + return JSHTMLStyleElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLTableCaptionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLTableCaptionElement::getConstructor(exec); + return JSHTMLTableCaptionElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLTableCellElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLTableCellElement::getConstructor(exec); + return JSHTMLTableCellElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLTableColElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLTableColElement::getConstructor(exec); + return JSHTMLTableColElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLTableElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLTableElement::getConstructor(exec); + return JSHTMLTableElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLTableRowElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLTableRowElement::getConstructor(exec); + return JSHTMLTableRowElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLTableSectionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLTableSectionElement::getConstructor(exec); + return JSHTMLTableSectionElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLTextAreaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLTextAreaElement::getConstructor(exec); + return JSHTMLTextAreaElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLTitleElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLTitleElement::getConstructor(exec); + return JSHTMLTitleElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLUListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLUListElement::getConstructor(exec); + return JSHTMLUListElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowHTMLCollectionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLCollection::getConstructor(exec); + return JSHTMLCollection::getConstructor(exec, castedThis); } JSValue jsDOMWindowImageConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - return static_cast(asObject(slot.slotBase()))->image(exec); + return castedThis->image(exec); } JSValue jsDOMWindowOptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - return static_cast(asObject(slot.slotBase()))->option(exec); + return castedThis->option(exec); } JSValue jsDOMWindowCanvasRenderingContext2DConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSCanvasRenderingContext2D::getConstructor(exec); + return JSCanvasRenderingContext2D::getConstructor(exec, castedThis); } JSValue jsDOMWindowTextMetricsConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSTextMetrics::getConstructor(exec); + return JSTextMetrics::getConstructor(exec, castedThis); } JSValue jsDOMWindowEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSEvent::getConstructor(exec); + return JSEvent::getConstructor(exec, castedThis); } JSValue jsDOMWindowKeyboardEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSKeyboardEvent::getConstructor(exec); + return JSKeyboardEvent::getConstructor(exec, castedThis); } JSValue jsDOMWindowMouseEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSMouseEvent::getConstructor(exec); + return JSMouseEvent::getConstructor(exec, castedThis); } JSValue jsDOMWindowMutationEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSMutationEvent::getConstructor(exec); + return JSMutationEvent::getConstructor(exec, castedThis); } JSValue jsDOMWindowOverflowEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSOverflowEvent::getConstructor(exec); + return JSOverflowEvent::getConstructor(exec, castedThis); } JSValue jsDOMWindowProgressEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSProgressEvent::getConstructor(exec); + return JSProgressEvent::getConstructor(exec, castedThis); } JSValue jsDOMWindowTextEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSTextEvent::getConstructor(exec); + return JSTextEvent::getConstructor(exec, castedThis); } JSValue jsDOMWindowUIEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSUIEvent::getConstructor(exec); + return JSUIEvent::getConstructor(exec, castedThis); } JSValue jsDOMWindowWebKitAnimationEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSWebKitAnimationEvent::getConstructor(exec); + return JSWebKitAnimationEvent::getConstructor(exec, castedThis); } JSValue jsDOMWindowWebKitTransitionEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSWebKitTransitionEvent::getConstructor(exec); + return JSWebKitTransitionEvent::getConstructor(exec, castedThis); } JSValue jsDOMWindowWheelEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSWheelEvent::getConstructor(exec); + return JSWheelEvent::getConstructor(exec, castedThis); } JSValue jsDOMWindowMessageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSMessageEvent::getConstructor(exec); + return JSMessageEvent::getConstructor(exec, castedThis); } JSValue jsDOMWindowEventExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSEventException::getConstructor(exec); + return JSEventException::getConstructor(exec, castedThis); } JSValue jsDOMWindowWebKitCSSKeyframeRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSWebKitCSSKeyframeRule::getConstructor(exec); + return JSWebKitCSSKeyframeRule::getConstructor(exec, castedThis); } JSValue jsDOMWindowWebKitCSSKeyframesRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSWebKitCSSKeyframesRule::getConstructor(exec); + return JSWebKitCSSKeyframesRule::getConstructor(exec, castedThis); } JSValue jsDOMWindowWebKitCSSMatrixConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - return static_cast(asObject(slot.slotBase()))->webKitCSSMatrix(exec); + return castedThis->webKitCSSMatrix(exec); } JSValue jsDOMWindowWebKitPointConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - return static_cast(asObject(slot.slotBase()))->webKitPoint(exec); + return castedThis->webKitPoint(exec); } JSValue jsDOMWindowClipboardConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSClipboard::getConstructor(exec); + return JSClipboard::getConstructor(exec, castedThis); } JSValue jsDOMWindowFileConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSFile::getConstructor(exec); + return JSFile::getConstructor(exec, castedThis); } JSValue jsDOMWindowFileListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSFileList::getConstructor(exec); + return JSFileList::getConstructor(exec, castedThis); } JSValue jsDOMWindowNodeFilterConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSNodeFilter::getConstructor(exec); + return JSNodeFilter::getConstructor(exec, castedThis); } JSValue jsDOMWindowRangeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSRange::getConstructor(exec); + return JSRange::getConstructor(exec, castedThis); } JSValue jsDOMWindowRangeExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSRangeException::getConstructor(exec); + return JSRangeException::getConstructor(exec, castedThis); } JSValue jsDOMWindowXMLDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSDocument::getConstructor(exec); + return JSDocument::getConstructor(exec, castedThis); } JSValue jsDOMWindowDOMParserConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSDOMParser::getConstructor(exec); + return JSDOMParser::getConstructor(exec, castedThis); } JSValue jsDOMWindowXMLSerializerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSXMLSerializer::getConstructor(exec); + return JSXMLSerializer::getConstructor(exec, castedThis); } JSValue jsDOMWindowXMLHttpRequestConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - return static_cast(asObject(slot.slotBase()))->xmlHttpRequest(exec); + return castedThis->xmlHttpRequest(exec); } JSValue jsDOMWindowXMLHttpRequestUploadConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSXMLHttpRequestUpload::getConstructor(exec); + return JSXMLHttpRequestUpload::getConstructor(exec, castedThis); } JSValue jsDOMWindowXMLHttpRequestExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSXMLHttpRequestException::getConstructor(exec); + return JSXMLHttpRequestException::getConstructor(exec, castedThis); } JSValue jsDOMWindowMessagePortConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSMessagePort::getConstructor(exec); + return JSMessagePort::getConstructor(exec, castedThis); } JSValue jsDOMWindowMessageChannelConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - return static_cast(asObject(slot.slotBase()))->messageChannel(exec); + return castedThis->messageChannel(exec); } JSValue jsDOMWindowWorkerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - return static_cast(asObject(slot.slotBase()))->worker(exec); + return castedThis->worker(exec); } JSValue jsDOMWindowPluginConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSPlugin::getConstructor(exec); + return JSPlugin::getConstructor(exec, castedThis); } JSValue jsDOMWindowPluginArrayConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSPluginArray::getConstructor(exec); + return JSPluginArray::getConstructor(exec, castedThis); } JSValue jsDOMWindowMimeTypeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSMimeType::getConstructor(exec); + return JSMimeType::getConstructor(exec, castedThis); } JSValue jsDOMWindowMimeTypeArrayConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSMimeTypeArray::getConstructor(exec); + return JSMimeTypeArray::getConstructor(exec, castedThis); } JSValue jsDOMWindowClientRectConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSClientRect::getConstructor(exec); + return JSClientRect::getConstructor(exec, castedThis); } JSValue jsDOMWindowClientRectListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSClientRectList::getConstructor(exec); + return JSClientRectList::getConstructor(exec, castedThis); } JSValue jsDOMWindowStorageConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSStorage::getConstructor(exec); + return JSStorage::getConstructor(exec, castedThis); } JSValue jsDOMWindowStorageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSStorageEvent::getConstructor(exec); + return JSStorageEvent::getConstructor(exec, castedThis); } #if ENABLE(VIDEO) JSValue jsDOMWindowAudioConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - return static_cast(asObject(slot.slotBase()))->audio(exec); + return castedThis->audio(exec); } #endif #if ENABLE(VIDEO) JSValue jsDOMWindowHTMLAudioElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLAudioElement::getConstructor(exec); + return JSHTMLAudioElement::getConstructor(exec, castedThis); } #endif #if ENABLE(VIDEO) JSValue jsDOMWindowHTMLMediaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLMediaElement::getConstructor(exec); + return JSHTMLMediaElement::getConstructor(exec, castedThis); } #endif #if ENABLE(VIDEO) JSValue jsDOMWindowHTMLVideoElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSHTMLVideoElement::getConstructor(exec); + return JSHTMLVideoElement::getConstructor(exec, castedThis); } #endif #if ENABLE(VIDEO) JSValue jsDOMWindowMediaErrorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSMediaError::getConstructor(exec); + return JSMediaError::getConstructor(exec, castedThis); } #endif JSValue jsDOMWindowXPathEvaluatorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSXPathEvaluator::getConstructor(exec); + return JSXPathEvaluator::getConstructor(exec, castedThis); } JSValue jsDOMWindowXPathResultConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSXPathResult::getConstructor(exec); + return JSXPathResult::getConstructor(exec, castedThis); } JSValue jsDOMWindowXPathExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSXPathException::getConstructor(exec); + return JSXPathException::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGAngleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGAngle::getConstructor(exec); + return JSSVGAngle::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGColorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGColor::getConstructor(exec); + return JSSVGColor::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGException::getConstructor(exec); + return JSSVGException::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGGradientElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGGradientElement::getConstructor(exec); + return JSSVGGradientElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGLengthConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGLength::getConstructor(exec); + return JSSVGLength::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGMarkerElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGMarkerElement::getConstructor(exec); + return JSSVGMarkerElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGPaintConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGPaint::getConstructor(exec); + return JSSVGPaint::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGPathSegConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGPathSeg::getConstructor(exec); + return JSSVGPathSeg::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGPreserveAspectRatioConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGPreserveAspectRatio::getConstructor(exec); + return JSSVGPreserveAspectRatio::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGRenderingIntentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGRenderingIntent::getConstructor(exec); + return JSSVGRenderingIntent::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGTextContentElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGTextContentElement::getConstructor(exec); + return JSSVGTextContentElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGTextPathElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGTextPathElement::getConstructor(exec); + return JSSVGTextPathElement::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGTransformConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGTransform::getConstructor(exec); + return JSSVGTransform::getConstructor(exec, castedThis); } JSValue jsDOMWindowSVGUnitTypesConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - if (!static_cast(asObject(slot.slotBase()))->allowsAccessFrom(exec)) + JSDOMWindow* castedThis = static_cast(asObject(slot.slotBase())); + if (!castedThis->allowsAccessFrom(exec)) return jsUndefined(); - UNUSED_PARAM(slot); - return JSSVGUnitTypes::getConstructor(exec); + return JSSVGUnitTypes::getConstructor(exec, castedThis); } void setJSDOMWindowLocationbar(ExecState* exec, JSObject* thisObject, JSValue value) @@ -4171,6 +4296,14 @@ void setJSDOMWindowRectConstructor(ExecState* exec, JSObject* thisObject, JSValu static_cast(thisObject)->putDirect(Identifier(exec, "Rect"), value); } +void setJSDOMWindowRGBColorConstructor(ExecState* exec, JSObject* thisObject, JSValue value) +{ + if (!static_cast(thisObject)->allowsAccessFrom(exec)) + return; + // Shadowing a built-in constructor + static_cast(thisObject)->putDirect(Identifier(exec, "RGBColor"), value); +} + void setJSDOMWindowStyleSheetListConstructor(ExecState* exec, JSObject* thisObject, JSValue value) { if (!static_cast(thisObject)->allowsAccessFrom(exec)) @@ -5358,7 +5491,7 @@ JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionGetSelection(ExecState* exec, DOMWindow* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getSelection())); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getSelection())); return result; } @@ -5657,7 +5790,7 @@ JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionGetComputedStyle(ExecState* ex const UString& pseudoElement = args.at(1).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getComputedStyle(element, pseudoElement))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getComputedStyle(element, pseudoElement))); return result; } @@ -5676,14 +5809,14 @@ JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionGetMatchedCSSRules(ExecState* int argsCount = args.size(); if (argsCount < 3) { - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getMatchedCSSRules(element, pseudoElement))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getMatchedCSSRules(element, pseudoElement))); return result; } bool authorOnly = args.at(2).toBoolean(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getMatchedCSSRules(element, pseudoElement, authorOnly))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getMatchedCSSRules(element, pseudoElement, authorOnly))); return result; } @@ -5700,7 +5833,7 @@ JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionWebkitConvertPointFromPageToNo WebKitPoint* p = toWebKitPoint(args.at(1)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->webkitConvertPointFromPageToNode(node, p))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->webkitConvertPointFromPageToNode(node, p))); return result; } @@ -5717,7 +5850,7 @@ JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionWebkitConvertPointFromNodeToPa WebKitPoint* p = toWebKitPoint(args.at(1)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->webkitConvertPointFromNodeToPage(node, p))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->webkitConvertPointFromNodeToPage(node, p))); return result; } @@ -5737,7 +5870,7 @@ JSValue JSC_HOST_CALL jsDOMWindowPrototypeFunctionOpenDatabase(ExecState* exec, unsigned estimatedSize = args.at(3).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->openDatabase(name, version, displayName, estimatedSize, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->openDatabase(name, version, displayName, estimatedSize, ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h index 073eff733..8e7defe84 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h @@ -384,6 +384,8 @@ JSC::JSValue jsDOMWindowCSSRuleListConstructor(JSC::ExecState*, const JSC::Ident void setJSDOMWindowCSSRuleListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsDOMWindowRectConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSDOMWindowRectConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsDOMWindowRGBColorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDOMWindowRGBColorConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsDOMWindowStyleSheetListConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSDOMWindowStyleSheetListConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsDOMWindowDOMExceptionConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSDataGridColumn.cpp b/src/3rdparty/webkit/WebCore/generated/JSDataGridColumn.cpp index 9559fb537..1f6069372 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDataGridColumn.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDataGridColumn.cpp @@ -77,12 +77,12 @@ static JSC_CONST_HASHTABLE HashTable JSDataGridColumnConstructorTable = { 17, 15, JSDataGridColumnConstructorTableValues, 0 }; #endif -class JSDataGridColumnConstructor : public DOMObject { +class JSDataGridColumnConstructor : public DOMConstructorObject { public: - JSDataGridColumnConstructor(ExecState* exec) - : DOMObject(JSDataGridColumnConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSDataGridColumnConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSDataGridColumnConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSDataGridColumnPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSDataGridColumnPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -135,8 +135,8 @@ bool JSDataGridColumnPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSDataGridColumn::s_info = { "DataGridColumn", 0, &JSDataGridColumnTable, 0 }; -JSDataGridColumn::JSDataGridColumn(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSDataGridColumn::JSDataGridColumn(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -158,49 +158,56 @@ bool JSDataGridColumn::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsDataGridColumnId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDataGridColumn* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DataGridColumn* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DataGridColumn* imp = static_cast(castedThis->impl()); return jsString(exec, imp->id()); } JSValue jsDataGridColumnLabel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDataGridColumn* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DataGridColumn* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DataGridColumn* imp = static_cast(castedThis->impl()); return jsString(exec, imp->label()); } JSValue jsDataGridColumnType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDataGridColumn* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DataGridColumn* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DataGridColumn* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsDataGridColumnSortable(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDataGridColumn* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DataGridColumn* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DataGridColumn* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->sortable()); } JSValue jsDataGridColumnSortDirection(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDataGridColumn* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DataGridColumn* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DataGridColumn* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->sortDirection()); } JSValue jsDataGridColumnPrimary(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDataGridColumn* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DataGridColumn* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DataGridColumn* imp = static_cast(castedThis->impl()); return jsBoolean(imp->primary()); } JSValue jsDataGridColumnConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSDataGridColumn* domObject = static_cast(asObject(slot.slotBase())); + return JSDataGridColumn::getConstructor(exec, domObject->globalObject()); } void JSDataGridColumn::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -243,9 +250,9 @@ void setJSDataGridColumnPrimary(ExecState* exec, JSObject* thisObject, JSValue v imp->setPrimary(value.toBoolean(exec)); } -JSValue JSDataGridColumn::getConstructor(ExecState* exec) +JSValue JSDataGridColumn::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } // Constant getters @@ -280,9 +287,9 @@ JSValue jsDataGridColumnSORC_DESCENDING(ExecState* exec, const Identifier&, cons return jsNumber(exec, static_cast(2)); } -JSC::JSValue toJS(JSC::ExecState* exec, DataGridColumn* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, DataGridColumn* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } DataGridColumn* toDataGridColumn(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDataGridColumn.h b/src/3rdparty/webkit/WebCore/generated/JSDataGridColumn.h index a85b988e4..cbb59bef8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDataGridColumn.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDataGridColumn.h @@ -23,6 +23,7 @@ #if ENABLE(DATAGRID) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class DataGridColumn; -class JSDataGridColumn : public DOMObject { - typedef DOMObject Base; +class JSDataGridColumn : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSDataGridColumn(PassRefPtr, PassRefPtr); + JSDataGridColumn(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSDataGridColumn(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,14 +48,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); DataGridColumn* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, DataGridColumn*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, DataGridColumn*); DataGridColumn* toDataGridColumn(JSC::JSValue); class JSDataGridColumnPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDataGridColumnList.cpp b/src/3rdparty/webkit/WebCore/generated/JSDataGridColumnList.cpp index 3c0eb8d2a..f2525a53f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDataGridColumnList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDataGridColumnList.cpp @@ -72,12 +72,12 @@ static JSC_CONST_HASHTABLE HashTable JSDataGridColumnListConstructorTable = { 1, 0, JSDataGridColumnListConstructorTableValues, 0 }; #endif -class JSDataGridColumnListConstructor : public DOMObject { +class JSDataGridColumnListConstructor : public DOMConstructorObject { public: - JSDataGridColumnListConstructor(ExecState* exec) - : DOMObject(JSDataGridColumnListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSDataGridColumnListConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSDataGridColumnListConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSDataGridColumnListPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSDataGridColumnListPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -129,8 +129,8 @@ bool JSDataGridColumnListPrototype::getOwnPropertySlot(ExecState* exec, const Id const ClassInfo JSDataGridColumnList::s_info = { "DataGridColumnList", 0, &JSDataGridColumnListTable, 0 }; -JSDataGridColumnList::JSDataGridColumnList(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSDataGridColumnList::JSDataGridColumnList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -176,28 +176,32 @@ bool JSDataGridColumnList::getOwnPropertySlot(ExecState* exec, unsigned property JSValue jsDataGridColumnListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDataGridColumnList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DataGridColumnList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DataGridColumnList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsDataGridColumnListSortColumn(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDataGridColumnList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DataGridColumnList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->sortColumn())); + DataGridColumnList* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->sortColumn())); } JSValue jsDataGridColumnListPrimaryColumn(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDataGridColumnList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DataGridColumnList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->primaryColumn())); + DataGridColumnList* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->primaryColumn())); } JSValue jsDataGridColumnListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSDataGridColumnList* domObject = static_cast(asObject(slot.slotBase())); + return JSDataGridColumnList::getConstructor(exec, domObject->globalObject()); } void JSDataGridColumnList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) { @@ -206,9 +210,9 @@ void JSDataGridColumnList::getPropertyNames(ExecState* exec, PropertyNameArray& Base::getPropertyNames(exec, propertyNames); } -JSValue JSDataGridColumnList::getConstructor(ExecState* exec) +JSValue JSDataGridColumnList::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsDataGridColumnListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -225,7 +229,7 @@ JSValue JSC_HOST_CALL jsDataGridColumnListPrototypeFunctionItem(ExecState* exec, } - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->item(index))); return result; } @@ -243,7 +247,7 @@ JSValue JSC_HOST_CALL jsDataGridColumnListPrototypeFunctionAdd(ExecState* exec, unsigned short sortable = args.at(4).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->add(id, label, type, primary, sortable))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->add(id, label, type, primary, sortable))); return result; } @@ -290,11 +294,11 @@ JSValue JSC_HOST_CALL jsDataGridColumnListPrototypeFunctionClear(ExecState* exec JSValue JSDataGridColumnList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSDataGridColumnList* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } -JSC::JSValue toJS(JSC::ExecState* exec, DataGridColumnList* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, DataGridColumnList* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } DataGridColumnList* toDataGridColumnList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDataGridColumnList.h b/src/3rdparty/webkit/WebCore/generated/JSDataGridColumnList.h index b76ffd5c2..b9041467e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDataGridColumnList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDataGridColumnList.h @@ -23,6 +23,7 @@ #if ENABLE(DATAGRID) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class DataGridColumnList; -class JSDataGridColumnList : public DOMObject { - typedef DOMObject Base; +class JSDataGridColumnList : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSDataGridColumnList(PassRefPtr, PassRefPtr); + JSDataGridColumnList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSDataGridColumnList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -48,7 +49,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); DataGridColumnList* impl() const { return m_impl.get(); } private: @@ -59,7 +60,7 @@ private: static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, DataGridColumnList*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, DataGridColumnList*); DataGridColumnList* toDataGridColumnList(JSC::JSValue); class JSDataGridColumnListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDatabase.cpp b/src/3rdparty/webkit/WebCore/generated/JSDatabase.cpp index 894f93cdd..6f02f71ee 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDatabase.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDatabase.cpp @@ -81,8 +81,8 @@ bool JSDatabasePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSDatabase::s_info = { "Database", 0, &JSDatabaseTable, 0 }; -JSDatabase::JSDatabase(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSDatabase::JSDatabase(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -104,8 +104,9 @@ bool JSDatabase::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN JSValue jsDatabaseVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDatabase* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Database* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Database* imp = static_cast(castedThis->impl()); return jsString(exec, imp->version()); } @@ -127,9 +128,9 @@ JSValue JSC_HOST_CALL jsDatabasePrototypeFunctionTransaction(ExecState* exec, JS return castedThisObj->transaction(exec, args); } -JSC::JSValue toJS(JSC::ExecState* exec, Database* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Database* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Database* toDatabase(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDatabase.h b/src/3rdparty/webkit/WebCore/generated/JSDatabase.h index 94b60befd..8ca36a59b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDatabase.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDatabase.h @@ -23,6 +23,7 @@ #if ENABLE(DATABASE) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class Database; -class JSDatabase : public DOMObject { - typedef DOMObject Base; +class JSDatabase : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSDatabase(PassRefPtr, PassRefPtr); + JSDatabase(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSDatabase(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -56,7 +57,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, Database*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Database*); Database* toDatabase(JSC::JSValue); class JSDatabasePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDedicatedWorkerContext.cpp b/src/3rdparty/webkit/WebCore/generated/JSDedicatedWorkerContext.cpp new file mode 100644 index 000000000..373bb3054 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSDedicatedWorkerContext.cpp @@ -0,0 +1,158 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "config.h" + +#if ENABLE(WORKERS) + +#include "JSDedicatedWorkerContext.h" + +#include "DedicatedWorkerContext.h" +#include "EventListener.h" +#include "JSEventListener.h" +#include "JSMessagePort.h" +#include +#include + +using namespace JSC; + +namespace WebCore { + +ASSERT_CLASS_FITS_IN_CELL(JSDedicatedWorkerContext); + +/* Hash table */ + +static const HashTableValue JSDedicatedWorkerContextTableValues[2] = +{ + { "onmessage", DontDelete, (intptr_t)jsDedicatedWorkerContextOnmessage, (intptr_t)setJSDedicatedWorkerContextOnmessage }, + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSDedicatedWorkerContextTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSDedicatedWorkerContextTableValues, 0 }; +#else + { 2, 1, JSDedicatedWorkerContextTableValues, 0 }; +#endif + +/* Hash table for prototype */ + +static const HashTableValue JSDedicatedWorkerContextPrototypeTableValues[2] = +{ + { "postMessage", DontDelete|Function, (intptr_t)jsDedicatedWorkerContextPrototypeFunctionPostMessage, (intptr_t)2 }, + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSDedicatedWorkerContextPrototypeTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSDedicatedWorkerContextPrototypeTableValues, 0 }; +#else + { 2, 1, JSDedicatedWorkerContextPrototypeTableValues, 0 }; +#endif + +static const HashTable* getJSDedicatedWorkerContextPrototypeTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSDedicatedWorkerContextPrototypeTable); +} +const ClassInfo JSDedicatedWorkerContextPrototype::s_info = { "DedicatedWorkerContextPrototype", 0, 0, getJSDedicatedWorkerContextPrototypeTable }; + +void* JSDedicatedWorkerContextPrototype::operator new(size_t size, JSGlobalData* globalData) +{ + return globalData->heap.allocate(size); +} + +bool JSDedicatedWorkerContextPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticFunctionSlot(exec, getJSDedicatedWorkerContextPrototypeTable(exec), this, propertyName, slot); +} + +static const HashTable* getJSDedicatedWorkerContextTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSDedicatedWorkerContextTable); +} +const ClassInfo JSDedicatedWorkerContext::s_info = { "DedicatedWorkerContext", &JSWorkerContext::s_info, 0, getJSDedicatedWorkerContextTable }; + +JSDedicatedWorkerContext::JSDedicatedWorkerContext(PassRefPtr structure, PassRefPtr impl) + : JSWorkerContext(structure, impl) +{ +} + +bool JSDedicatedWorkerContext::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot(exec, getJSDedicatedWorkerContextTable(exec), this, propertyName, slot); +} + +JSValue jsDedicatedWorkerContextOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSDedicatedWorkerContext* castedThis = static_cast(asObject(slot.slotBase())); + UNUSED_PARAM(exec); + DedicatedWorkerContext* imp = static_cast(castedThis->impl()); + if (EventListener* listener = imp->onmessage()) { + if (JSObject* jsFunction = listener->jsFunction()) + return jsFunction; + } + return jsNull(); +} + +void JSDedicatedWorkerContext::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) +{ + lookupPut(exec, propertyName, value, getJSDedicatedWorkerContextTable(exec), this, slot); +} + +void setJSDedicatedWorkerContextOnmessage(ExecState* exec, JSObject* thisObject, JSValue value) +{ + UNUSED_PARAM(exec); + DedicatedWorkerContext* imp = static_cast(static_cast(thisObject)->impl()); + JSDOMGlobalObject* globalObject = static_cast(thisObject); + imp->setOnmessage(globalObject->createJSAttributeEventListener(value)); +} + +JSValue JSC_HOST_CALL jsDedicatedWorkerContextPrototypeFunctionPostMessage(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + JSDedicatedWorkerContext* castedThisObj = toJSDedicatedWorkerContext(thisValue.toThisObject(exec)); + if (!castedThisObj) + return throwError(exec, TypeError); + DedicatedWorkerContext* imp = static_cast(castedThisObj->impl()); + ExceptionCode ec = 0; + const UString& message = args.at(0).toString(exec); + + int argsCount = args.size(); + if (argsCount < 2) { + imp->postMessage(message, ec); + setDOMException(exec, ec); + return jsUndefined(); + } + + MessagePort* messagePort = toMessagePort(args.at(1)); + + imp->postMessage(message, messagePort, ec); + setDOMException(exec, ec); + return jsUndefined(); +} + +DedicatedWorkerContext* toDedicatedWorkerContext(JSC::JSValue value) +{ + return value.isObject(&JSDedicatedWorkerContext::s_info) ? static_cast(asObject(value))->impl() : 0; +} + +} + +#endif // ENABLE(WORKERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSDedicatedWorkerContext.h b/src/3rdparty/webkit/WebCore/generated/JSDedicatedWorkerContext.h new file mode 100644 index 000000000..6054c802a --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSDedicatedWorkerContext.h @@ -0,0 +1,83 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef JSDedicatedWorkerContext_h +#define JSDedicatedWorkerContext_h + +#if ENABLE(WORKERS) + +#include "DedicatedWorkerContext.h" +#include "JSWorkerContext.h" + +namespace WebCore { + +class DedicatedWorkerContext; + +class JSDedicatedWorkerContext : public JSWorkerContext { + typedef JSWorkerContext Base; +public: + JSDedicatedWorkerContext(PassRefPtr, PassRefPtr); + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); + virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + + static PassRefPtr createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + + virtual void mark(); + + DedicatedWorkerContext* impl() const + { + return static_cast(Base::impl()); + } +}; + +DedicatedWorkerContext* toDedicatedWorkerContext(JSC::JSValue); + +class JSDedicatedWorkerContextPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; +public: + void* operator new(size_t, JSC::JSGlobalData*); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); + static PassRefPtr createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + JSDedicatedWorkerContextPrototype(PassRefPtr structure) : JSC::JSObject(structure) { } +}; + +// Functions + +JSC::JSValue JSC_HOST_CALL jsDedicatedWorkerContextPrototypeFunctionPostMessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +// Attributes + +JSC::JSValue jsDedicatedWorkerContextOnmessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSDedicatedWorkerContextOnmessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); + +} // namespace WebCore + +#endif // ENABLE(WORKERS) + +#endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSDocument.cpp b/src/3rdparty/webkit/WebCore/generated/JSDocument.cpp index ce7b8504d..68b7cccee 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDocument.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDocument.cpp @@ -190,12 +190,12 @@ static JSC_CONST_HASHTABLE HashTable JSDocumentConstructorTable = { 1, 0, JSDocumentConstructorTableValues, 0 }; #endif -class JSDocumentConstructor : public DOMObject { +class JSDocumentConstructor : public DOMConstructorObject { public: - JSDocumentConstructor(ExecState* exec) - : DOMObject(JSDocumentConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSDocumentConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSDocumentConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSDocumentPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSDocumentPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -278,8 +278,8 @@ bool JSDocumentPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSDocument::s_info = { "Document", &JSNode::s_info, &JSDocumentTable, 0 }; -JSDocument::JSDocument(PassRefPtr structure, PassRefPtr impl) - : JSNode(structure, impl) +JSDocument::JSDocument(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSNode(structure, globalObject, impl) { } @@ -295,209 +295,239 @@ JSObject* JSDocument::createPrototype(ExecState* exec, JSGlobalObject* globalObj JSValue jsDocumentDoctype(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->doctype())); + Document* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->doctype())); } JSValue jsDocumentImplementation(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->implementation())); + Document* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->implementation())); } JSValue jsDocumentDocumentElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->documentElement())); + Document* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->documentElement())); } JSValue jsDocumentInputEncoding(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->inputEncoding()); } JSValue jsDocumentXMLEncoding(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->xmlEncoding()); } JSValue jsDocumentXMLVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->xmlVersion()); } JSValue jsDocumentXMLStandalone(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsBoolean(imp->xmlStandalone()); } JSValue jsDocumentDocumentURI(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->documentURI()); } JSValue jsDocumentDefaultView(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->defaultView())); + Document* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->defaultView())); } JSValue jsDocumentStyleSheets(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->styleSheets())); + Document* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->styleSheets())); } JSValue jsDocumentTitle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsString(exec, imp->title()); } JSValue jsDocumentReferrer(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsString(exec, imp->referrer()); } JSValue jsDocumentDomain(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsString(exec, imp->domain()); } JSValue jsDocumentURL(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsString(exec, imp->url()); } JSValue jsDocumentCookie(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsString(exec, imp->cookie()); } JSValue jsDocumentBody(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->body())); + Document* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->body())); } JSValue jsDocumentImages(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->images())); + Document* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->images())); } JSValue jsDocumentApplets(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->applets())); + Document* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->applets())); } JSValue jsDocumentLinks(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->links())); + Document* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->links())); } JSValue jsDocumentForms(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->forms())); + Document* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->forms())); } JSValue jsDocumentAnchors(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->anchors())); + Document* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->anchors())); } JSValue jsDocumentLastModified(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsString(exec, imp->lastModified()); } JSValue jsDocumentLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->location(exec); + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->location(exec); } JSValue jsDocumentCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsStringOrUndefined(exec, imp->charset()); } JSValue jsDocumentDefaultCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsStringOrUndefined(exec, imp->defaultCharset()); } JSValue jsDocumentReadyState(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsStringOrUndefined(exec, imp->readyState()); } JSValue jsDocumentCharacterSet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->characterSet()); } JSValue jsDocumentPreferredStylesheetSet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->preferredStylesheetSet()); } JSValue jsDocumentSelectedStylesheetSet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->selectedStylesheetSet()); } JSValue jsDocumentOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onabort()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -507,8 +537,9 @@ JSValue jsDocumentOnabort(ExecState* exec, const Identifier&, const PropertySlot JSValue jsDocumentOnblur(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onblur()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -518,8 +549,9 @@ JSValue jsDocumentOnblur(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsDocumentOnchange(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onchange()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -529,8 +561,9 @@ JSValue jsDocumentOnchange(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDocumentOnclick(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onclick()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -540,8 +573,9 @@ JSValue jsDocumentOnclick(ExecState* exec, const Identifier&, const PropertySlot JSValue jsDocumentOncontextmenu(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oncontextmenu()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -551,8 +585,9 @@ JSValue jsDocumentOncontextmenu(ExecState* exec, const Identifier&, const Proper JSValue jsDocumentOndblclick(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondblclick()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -562,8 +597,9 @@ JSValue jsDocumentOndblclick(ExecState* exec, const Identifier&, const PropertyS JSValue jsDocumentOndrag(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondrag()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -573,8 +609,9 @@ JSValue jsDocumentOndrag(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsDocumentOndragend(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragend()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -584,8 +621,9 @@ JSValue jsDocumentOndragend(ExecState* exec, const Identifier&, const PropertySl JSValue jsDocumentOndragenter(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragenter()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -595,8 +633,9 @@ JSValue jsDocumentOndragenter(ExecState* exec, const Identifier&, const Property JSValue jsDocumentOndragleave(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragleave()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -606,8 +645,9 @@ JSValue jsDocumentOndragleave(ExecState* exec, const Identifier&, const Property JSValue jsDocumentOndragover(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragover()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -617,8 +657,9 @@ JSValue jsDocumentOndragover(ExecState* exec, const Identifier&, const PropertyS JSValue jsDocumentOndragstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragstart()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -628,8 +669,9 @@ JSValue jsDocumentOndragstart(ExecState* exec, const Identifier&, const Property JSValue jsDocumentOndrop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondrop()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -639,8 +681,9 @@ JSValue jsDocumentOndrop(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsDocumentOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onerror()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -650,8 +693,9 @@ JSValue jsDocumentOnerror(ExecState* exec, const Identifier&, const PropertySlot JSValue jsDocumentOnfocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onfocus()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -661,8 +705,9 @@ JSValue jsDocumentOnfocus(ExecState* exec, const Identifier&, const PropertySlot JSValue jsDocumentOninput(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oninput()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -672,8 +717,9 @@ JSValue jsDocumentOninput(ExecState* exec, const Identifier&, const PropertySlot JSValue jsDocumentOnkeydown(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onkeydown()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -683,8 +729,9 @@ JSValue jsDocumentOnkeydown(ExecState* exec, const Identifier&, const PropertySl JSValue jsDocumentOnkeypress(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onkeypress()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -694,8 +741,9 @@ JSValue jsDocumentOnkeypress(ExecState* exec, const Identifier&, const PropertyS JSValue jsDocumentOnkeyup(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onkeyup()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -705,8 +753,9 @@ JSValue jsDocumentOnkeyup(ExecState* exec, const Identifier&, const PropertySlot JSValue jsDocumentOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onload()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -716,8 +765,9 @@ JSValue jsDocumentOnload(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsDocumentOnmousedown(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmousedown()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -727,8 +777,9 @@ JSValue jsDocumentOnmousedown(ExecState* exec, const Identifier&, const Property JSValue jsDocumentOnmousemove(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmousemove()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -738,8 +789,9 @@ JSValue jsDocumentOnmousemove(ExecState* exec, const Identifier&, const Property JSValue jsDocumentOnmouseout(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmouseout()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -749,8 +801,9 @@ JSValue jsDocumentOnmouseout(ExecState* exec, const Identifier&, const PropertyS JSValue jsDocumentOnmouseover(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmouseover()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -760,8 +813,9 @@ JSValue jsDocumentOnmouseover(ExecState* exec, const Identifier&, const Property JSValue jsDocumentOnmouseup(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmouseup()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -771,8 +825,9 @@ JSValue jsDocumentOnmouseup(ExecState* exec, const Identifier&, const PropertySl JSValue jsDocumentOnmousewheel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmousewheel()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -782,8 +837,9 @@ JSValue jsDocumentOnmousewheel(ExecState* exec, const Identifier&, const Propert JSValue jsDocumentOnscroll(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onscroll()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -793,8 +849,9 @@ JSValue jsDocumentOnscroll(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDocumentOnselect(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onselect()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -804,8 +861,9 @@ JSValue jsDocumentOnselect(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDocumentOnsubmit(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onsubmit()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -815,8 +873,9 @@ JSValue jsDocumentOnsubmit(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDocumentOnbeforecut(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onbeforecut()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -826,8 +885,9 @@ JSValue jsDocumentOnbeforecut(ExecState* exec, const Identifier&, const Property JSValue jsDocumentOncut(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oncut()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -837,8 +897,9 @@ JSValue jsDocumentOncut(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsDocumentOnbeforecopy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onbeforecopy()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -848,8 +909,9 @@ JSValue jsDocumentOnbeforecopy(ExecState* exec, const Identifier&, const Propert JSValue jsDocumentOncopy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oncopy()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -859,8 +921,9 @@ JSValue jsDocumentOncopy(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsDocumentOnbeforepaste(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onbeforepaste()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -870,8 +933,9 @@ JSValue jsDocumentOnbeforepaste(ExecState* exec, const Identifier&, const Proper JSValue jsDocumentOnpaste(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onpaste()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -881,8 +945,9 @@ JSValue jsDocumentOnpaste(ExecState* exec, const Identifier&, const PropertySlot JSValue jsDocumentOnreset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onreset()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -892,8 +957,9 @@ JSValue jsDocumentOnreset(ExecState* exec, const Identifier&, const PropertySlot JSValue jsDocumentOnsearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onsearch()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -903,8 +969,9 @@ JSValue jsDocumentOnsearch(ExecState* exec, const Identifier&, const PropertySlo JSValue jsDocumentOnselectstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Document* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Document* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onselectstart()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -914,7 +981,8 @@ JSValue jsDocumentOnselectstart(ExecState* exec, const Identifier&, const Proper JSValue jsDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSDocument* domObject = static_cast(asObject(slot.slotBase())); + return JSDocument::getConstructor(exec, domObject->globalObject()); } void JSDocument::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -1366,9 +1434,9 @@ void setJSDocumentOnselectstart(ExecState* exec, JSObject* thisObject, JSValue v imp->setOnselectstart(globalObject->createJSAttributeEventListener(value)); } -JSValue JSDocument::getConstructor(ExecState* exec) +JSValue JSDocument::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -1382,7 +1450,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateElement(ExecState* exec, const UString& tagName = valueToStringWithNullCheck(exec, args.at(0)); - JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createElement(tagName, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createElement(tagName, ec))); setDOMException(exec, ec); return result; } @@ -1396,7 +1464,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateDocumentFragment(ExecStat Document* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createDocumentFragment())); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createDocumentFragment())); return result; } @@ -1410,7 +1478,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateTextNode(ExecState* exec, const UString& data = args.at(0).toString(exec); - JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createTextNode(data))); + JSC::JSValue result = toJSNewlyCreated(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createTextNode(data))); return result; } @@ -1424,7 +1492,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateComment(ExecState* exec, const UString& data = args.at(0).toString(exec); - JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createComment(data))); + JSC::JSValue result = toJSNewlyCreated(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createComment(data))); return result; } @@ -1439,7 +1507,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateCDATASection(ExecState* e const UString& data = args.at(0).toString(exec); - JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createCDATASection(data, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createCDATASection(data, ec))); setDOMException(exec, ec); return result; } @@ -1456,7 +1524,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateProcessingInstruction(Exe const UString& data = args.at(1).toString(exec); - JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createProcessingInstruction(target, data, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createProcessingInstruction(target, data, ec))); setDOMException(exec, ec); return result; } @@ -1472,7 +1540,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateAttribute(ExecState* exec const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createAttribute(name, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createAttribute(name, ec))); setDOMException(exec, ec); return result; } @@ -1488,7 +1556,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateEntityReference(ExecState const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createEntityReference(name, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createEntityReference(name, ec))); setDOMException(exec, ec); return result; } @@ -1503,7 +1571,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementsByTagName(ExecState* const UString& tagname = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByTagName(tagname))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getElementsByTagName(tagname))); return result; } @@ -1519,7 +1587,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionImportNode(ExecState* exec, JSO bool deep = args.at(1).toBoolean(exec); - JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->importNode(importedNode, deep, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, castedThisObj->globalObject(), WTF::getPtr(imp->importNode(importedNode, deep, ec))); setDOMException(exec, ec); return result; } @@ -1536,7 +1604,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateElementNS(ExecState* exec const UString& qualifiedName = valueToStringWithNullCheck(exec, args.at(1)); - JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createElementNS(namespaceURI, qualifiedName, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createElementNS(namespaceURI, qualifiedName, ec))); setDOMException(exec, ec); return result; } @@ -1553,7 +1621,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateAttributeNS(ExecState* ex const UString& qualifiedName = valueToStringWithNullCheck(exec, args.at(1)); - JSC::JSValue result = toJSNewlyCreated(exec, WTF::getPtr(imp->createAttributeNS(namespaceURI, qualifiedName, ec))); + JSC::JSValue result = toJSNewlyCreated(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createAttributeNS(namespaceURI, qualifiedName, ec))); setDOMException(exec, ec); return result; } @@ -1569,7 +1637,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementsByTagNameNS(ExecStat const UString& localName = args.at(1).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByTagNameNS(namespaceURI, localName))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getElementsByTagNameNS(namespaceURI, localName))); return result; } @@ -1583,7 +1651,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementById(ExecState* exec, const UString& elementId = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementById(elementId))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getElementById(elementId))); return result; } @@ -1598,7 +1666,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionAdoptNode(ExecState* exec, JSOb Node* source = toNode(args.at(0)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->adoptNode(source, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->adoptNode(source, ec))); setDOMException(exec, ec); return result; } @@ -1614,7 +1682,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateEvent(ExecState* exec, JS const UString& eventType = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createEvent(eventType, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createEvent(eventType, ec))); setDOMException(exec, ec); return result; } @@ -1628,7 +1696,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateRange(ExecState* exec, JS Document* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createRange())); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createRange())); return result; } @@ -1646,7 +1714,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateNodeIterator(ExecState* e bool expandEntityReferences = args.at(3).toBoolean(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createNodeIterator(root, whatToShow, filter.get(), expandEntityReferences, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createNodeIterator(root, whatToShow, filter.get(), expandEntityReferences, ec))); setDOMException(exec, ec); return result; } @@ -1665,7 +1733,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateTreeWalker(ExecState* exe bool expandEntityReferences = args.at(3).toBoolean(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createTreeWalker(root, whatToShow, filter.get(), expandEntityReferences, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createTreeWalker(root, whatToShow, filter.get(), expandEntityReferences, ec))); setDOMException(exec, ec); return result; } @@ -1681,7 +1749,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetOverrideStyle(ExecState* exe const UString& pseudoElement = args.at(1).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getOverrideStyle(element, pseudoElement))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getOverrideStyle(element, pseudoElement))); return result; } @@ -1704,7 +1772,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateExpression(ExecState* exe } - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createExpression(expression, resolver, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createExpression(expression, resolver, ec))); setDOMException(exec, ec); return result; } @@ -1719,7 +1787,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionCreateNSResolver(ExecState* exe Node* nodeResolver = toNode(args.at(0)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createNSResolver(nodeResolver))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createNSResolver(nodeResolver))); return result; } @@ -1745,7 +1813,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionEvaluate(ExecState* exec, JSObj XPathResult* inResult = toXPathResult(args.at(4)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->evaluate(expression, contextNode, resolver, type, inResult, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->evaluate(expression, contextNode, resolver, type, inResult, ec))); setDOMException(exec, ec); return result; } @@ -1846,7 +1914,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementsByName(ExecState* ex const UString& elementName = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByName(elementName))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getElementsByName(elementName))); return result; } @@ -1861,7 +1929,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionElementFromPoint(ExecState* exe int y = args.at(1).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->elementFromPoint(x, y))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->elementFromPoint(x, y))); return result; } @@ -1874,7 +1942,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetSelection(ExecState* exec, J Document* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getSelection())); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getSelection())); return result; } @@ -1891,7 +1959,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetCSSCanvasContext(ExecState* int height = args.at(3).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getCSSCanvasContext(contextId, name, width, height))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getCSSCanvasContext(contextId, name, width, height))); return result; } @@ -1905,7 +1973,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionGetElementsByClassName(ExecStat const UString& tagname = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByClassName(tagname))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getElementsByClassName(tagname))); return result; } @@ -1920,7 +1988,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQuerySelector(ExecState* exec, const UString& selectors = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->querySelector(selectors, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->querySelector(selectors, ec))); setDOMException(exec, ec); return result; } @@ -1936,7 +2004,7 @@ JSValue JSC_HOST_CALL jsDocumentPrototypeFunctionQuerySelectorAll(ExecState* exe const UString& selectors = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->querySelectorAll(selectors, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->querySelectorAll(selectors, ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSDocument.h b/src/3rdparty/webkit/WebCore/generated/JSDocument.h index c2032eaef..470c67157 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDocument.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDocument.h @@ -33,7 +33,7 @@ class Document; class JSDocument : public JSNode { typedef JSNode Base; public: - JSDocument(PassRefPtr, PassRefPtr); + JSDocument(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSDocument(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -48,7 +48,7 @@ public: virtual void mark(); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom attributes JSC::JSValue location(JSC::ExecState*) const; @@ -64,7 +64,7 @@ ALWAYS_INLINE bool JSDocument::getOwnPropertySlot(JSC::ExecState* exec, const JS return JSC::getStaticValueSlot(exec, s_info.staticPropHashTable, this, propertyName, slot); } -JSC::JSValue toJS(JSC::ExecState*, Document*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Document*); Document* toDocument(JSC::JSValue); class JSDocumentPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.cpp b/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.cpp index 05deb3c4e..0a1a7e9f2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSDocumentFragmentConstructorTable = { 1, 0, JSDocumentFragmentConstructorTableValues, 0 }; #endif -class JSDocumentFragmentConstructor : public DOMObject { +class JSDocumentFragmentConstructor : public DOMConstructorObject { public: - JSDocumentFragmentConstructor(ExecState* exec) - : DOMObject(JSDocumentFragmentConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSDocumentFragmentConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSDocumentFragmentConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSDocumentFragmentPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSDocumentFragmentPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -119,8 +119,8 @@ bool JSDocumentFragmentPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSDocumentFragment::s_info = { "DocumentFragment", &JSNode::s_info, &JSDocumentFragmentTable, 0 }; -JSDocumentFragment::JSDocumentFragment(PassRefPtr structure, PassRefPtr impl) - : JSNode(structure, impl) +JSDocumentFragment::JSDocumentFragment(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSNode(structure, globalObject, impl) { } @@ -136,11 +136,12 @@ bool JSDocumentFragment::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsDocumentFragmentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSDocumentFragment* domObject = static_cast(asObject(slot.slotBase())); + return JSDocumentFragment::getConstructor(exec, domObject->globalObject()); } -JSValue JSDocumentFragment::getConstructor(ExecState* exec) +JSValue JSDocumentFragment::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsDocumentFragmentPrototypeFunctionQuerySelector(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -154,7 +155,7 @@ JSValue JSC_HOST_CALL jsDocumentFragmentPrototypeFunctionQuerySelector(ExecState const UString& selectors = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->querySelector(selectors, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->querySelector(selectors, ec))); setDOMException(exec, ec); return result; } @@ -170,7 +171,7 @@ JSValue JSC_HOST_CALL jsDocumentFragmentPrototypeFunctionQuerySelectorAll(ExecSt const UString& selectors = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->querySelectorAll(selectors, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->querySelectorAll(selectors, ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.h b/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.h index d5f57a3b8..d49b29863 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.h @@ -30,7 +30,7 @@ class DocumentFragment; class JSDocumentFragment : public JSNode { typedef JSNode Base; public: - JSDocumentFragment(PassRefPtr, PassRefPtr); + JSDocumentFragment(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSDocumentType.cpp b/src/3rdparty/webkit/WebCore/generated/JSDocumentType.cpp index 361e62fbc..a0df48371 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDocumentType.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSDocumentType.cpp @@ -69,12 +69,12 @@ static JSC_CONST_HASHTABLE HashTable JSDocumentTypeConstructorTable = { 1, 0, JSDocumentTypeConstructorTableValues, 0 }; #endif -class JSDocumentTypeConstructor : public DOMObject { +class JSDocumentTypeConstructor : public DOMConstructorObject { public: - JSDocumentTypeConstructor(ExecState* exec) - : DOMObject(JSDocumentTypeConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSDocumentTypeConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSDocumentTypeConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSDocumentTypePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSDocumentTypePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -116,8 +116,8 @@ JSObject* JSDocumentTypePrototype::self(ExecState* exec, JSGlobalObject* globalO const ClassInfo JSDocumentType::s_info = { "DocumentType", &JSNode::s_info, &JSDocumentTypeTable, 0 }; -JSDocumentType::JSDocumentType(PassRefPtr structure, PassRefPtr impl) - : JSNode(structure, impl) +JSDocumentType::JSDocumentType(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSNode(structure, globalObject, impl) { } @@ -133,53 +133,60 @@ bool JSDocumentType::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsDocumentTypeName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocumentType* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DocumentType* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DocumentType* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsDocumentTypeEntities(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocumentType* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DocumentType* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->entities())); + DocumentType* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->entities())); } JSValue jsDocumentTypeNotations(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocumentType* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DocumentType* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->notations())); + DocumentType* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->notations())); } JSValue jsDocumentTypePublicId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocumentType* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DocumentType* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DocumentType* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->publicId()); } JSValue jsDocumentTypeSystemId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocumentType* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DocumentType* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DocumentType* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->systemId()); } JSValue jsDocumentTypeInternalSubset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSDocumentType* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - DocumentType* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + DocumentType* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->internalSubset()); } JSValue jsDocumentTypeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSDocumentType* domObject = static_cast(asObject(slot.slotBase())); + return JSDocumentType::getConstructor(exec, domObject->globalObject()); } -JSValue JSDocumentType::getConstructor(ExecState* exec) +JSValue JSDocumentType::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } DocumentType* toDocumentType(JSC::JSValue value) diff --git a/src/3rdparty/webkit/WebCore/generated/JSDocumentType.h b/src/3rdparty/webkit/WebCore/generated/JSDocumentType.h index 10a5530b8..e6569c83b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSDocumentType.h +++ b/src/3rdparty/webkit/WebCore/generated/JSDocumentType.h @@ -31,7 +31,7 @@ class DocumentType; class JSDocumentType : public JSNode { typedef JSNode Base; public: - JSDocumentType(PassRefPtr, PassRefPtr); + JSDocumentType(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); DocumentType* impl() const { return static_cast(Base::impl()); diff --git a/src/3rdparty/webkit/WebCore/generated/JSElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSElement.cpp index a4d240974..9c101b503 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSElement.cpp @@ -138,12 +138,12 @@ static JSC_CONST_HASHTABLE HashTable JSElementConstructorTable = { 1, 0, JSElementConstructorTableValues, 0 }; #endif -class JSElementConstructor : public DOMObject { +class JSElementConstructor : public DOMConstructorObject { public: - JSElementConstructor(ExecState* exec) - : DOMObject(JSElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -217,8 +217,8 @@ bool JSElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& p const ClassInfo JSElement::s_info = { "Element", &JSNode::s_info, &JSElementTable, 0 }; -JSElement::JSElement(PassRefPtr structure, PassRefPtr impl) - : JSNode(structure, impl) +JSElement::JSElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSNode(structure, globalObject, impl) { } @@ -229,148 +229,169 @@ JSObject* JSElement::createPrototype(ExecState* exec, JSGlobalObject* globalObje JSValue jsElementTagName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->tagName()); } JSValue jsElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + Element* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsElementOffsetLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->offsetLeft()); } JSValue jsElementOffsetTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->offsetTop()); } JSValue jsElementOffsetWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->offsetWidth()); } JSValue jsElementOffsetHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->offsetHeight()); } JSValue jsElementOffsetParent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->offsetParent())); + Element* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->offsetParent())); } JSValue jsElementClientLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->clientLeft()); } JSValue jsElementClientTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->clientTop()); } JSValue jsElementClientWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->clientWidth()); } JSValue jsElementClientHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->clientHeight()); } JSValue jsElementScrollLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->scrollLeft()); } JSValue jsElementScrollTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->scrollTop()); } JSValue jsElementScrollWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->scrollWidth()); } JSValue jsElementScrollHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->scrollHeight()); } JSValue jsElementFirstElementChild(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->firstElementChild())); + Element* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->firstElementChild())); } JSValue jsElementLastElementChild(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->lastElementChild())); + Element* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->lastElementChild())); } JSValue jsElementPreviousElementSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->previousElementSibling())); + Element* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->previousElementSibling())); } JSValue jsElementNextElementSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nextElementSibling())); + Element* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nextElementSibling())); } JSValue jsElementChildElementCount(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->childElementCount()); } JSValue jsElementOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onabort()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -380,8 +401,9 @@ JSValue jsElementOnabort(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsElementOnblur(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onblur()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -391,8 +413,9 @@ JSValue jsElementOnblur(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsElementOnchange(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onchange()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -402,8 +425,9 @@ JSValue jsElementOnchange(ExecState* exec, const Identifier&, const PropertySlot JSValue jsElementOnclick(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onclick()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -413,8 +437,9 @@ JSValue jsElementOnclick(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsElementOncontextmenu(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oncontextmenu()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -424,8 +449,9 @@ JSValue jsElementOncontextmenu(ExecState* exec, const Identifier&, const Propert JSValue jsElementOndblclick(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondblclick()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -435,8 +461,9 @@ JSValue jsElementOndblclick(ExecState* exec, const Identifier&, const PropertySl JSValue jsElementOndrag(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondrag()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -446,8 +473,9 @@ JSValue jsElementOndrag(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsElementOndragend(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragend()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -457,8 +485,9 @@ JSValue jsElementOndragend(ExecState* exec, const Identifier&, const PropertySlo JSValue jsElementOndragenter(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragenter()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -468,8 +497,9 @@ JSValue jsElementOndragenter(ExecState* exec, const Identifier&, const PropertyS JSValue jsElementOndragleave(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragleave()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -479,8 +509,9 @@ JSValue jsElementOndragleave(ExecState* exec, const Identifier&, const PropertyS JSValue jsElementOndragover(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragover()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -490,8 +521,9 @@ JSValue jsElementOndragover(ExecState* exec, const Identifier&, const PropertySl JSValue jsElementOndragstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragstart()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -501,8 +533,9 @@ JSValue jsElementOndragstart(ExecState* exec, const Identifier&, const PropertyS JSValue jsElementOndrop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondrop()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -512,8 +545,9 @@ JSValue jsElementOndrop(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsElementOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onerror()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -523,8 +557,9 @@ JSValue jsElementOnerror(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsElementOnfocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onfocus()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -534,8 +569,9 @@ JSValue jsElementOnfocus(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsElementOninput(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oninput()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -545,8 +581,9 @@ JSValue jsElementOninput(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsElementOnkeydown(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onkeydown()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -556,8 +593,9 @@ JSValue jsElementOnkeydown(ExecState* exec, const Identifier&, const PropertySlo JSValue jsElementOnkeypress(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onkeypress()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -567,8 +605,9 @@ JSValue jsElementOnkeypress(ExecState* exec, const Identifier&, const PropertySl JSValue jsElementOnkeyup(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onkeyup()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -578,8 +617,9 @@ JSValue jsElementOnkeyup(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsElementOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onload()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -589,8 +629,9 @@ JSValue jsElementOnload(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsElementOnmousedown(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmousedown()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -600,8 +641,9 @@ JSValue jsElementOnmousedown(ExecState* exec, const Identifier&, const PropertyS JSValue jsElementOnmousemove(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmousemove()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -611,8 +653,9 @@ JSValue jsElementOnmousemove(ExecState* exec, const Identifier&, const PropertyS JSValue jsElementOnmouseout(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmouseout()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -622,8 +665,9 @@ JSValue jsElementOnmouseout(ExecState* exec, const Identifier&, const PropertySl JSValue jsElementOnmouseover(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmouseover()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -633,8 +677,9 @@ JSValue jsElementOnmouseover(ExecState* exec, const Identifier&, const PropertyS JSValue jsElementOnmouseup(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmouseup()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -644,8 +689,9 @@ JSValue jsElementOnmouseup(ExecState* exec, const Identifier&, const PropertySlo JSValue jsElementOnmousewheel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmousewheel()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -655,8 +701,9 @@ JSValue jsElementOnmousewheel(ExecState* exec, const Identifier&, const Property JSValue jsElementOnscroll(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onscroll()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -666,8 +713,9 @@ JSValue jsElementOnscroll(ExecState* exec, const Identifier&, const PropertySlot JSValue jsElementOnselect(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onselect()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -677,8 +725,9 @@ JSValue jsElementOnselect(ExecState* exec, const Identifier&, const PropertySlot JSValue jsElementOnsubmit(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onsubmit()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -688,8 +737,9 @@ JSValue jsElementOnsubmit(ExecState* exec, const Identifier&, const PropertySlot JSValue jsElementOnbeforecut(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onbeforecut()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -699,8 +749,9 @@ JSValue jsElementOnbeforecut(ExecState* exec, const Identifier&, const PropertyS JSValue jsElementOncut(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oncut()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -710,8 +761,9 @@ JSValue jsElementOncut(ExecState* exec, const Identifier&, const PropertySlot& s JSValue jsElementOnbeforecopy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onbeforecopy()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -721,8 +773,9 @@ JSValue jsElementOnbeforecopy(ExecState* exec, const Identifier&, const Property JSValue jsElementOncopy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oncopy()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -732,8 +785,9 @@ JSValue jsElementOncopy(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsElementOnbeforepaste(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onbeforepaste()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -743,8 +797,9 @@ JSValue jsElementOnbeforepaste(ExecState* exec, const Identifier&, const Propert JSValue jsElementOnpaste(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onpaste()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -754,8 +809,9 @@ JSValue jsElementOnpaste(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsElementOnreset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onreset()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -765,8 +821,9 @@ JSValue jsElementOnreset(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsElementOnsearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onsearch()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -776,8 +833,9 @@ JSValue jsElementOnsearch(ExecState* exec, const Identifier&, const PropertySlot JSValue jsElementOnselectstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Element* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Element* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onselectstart()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -787,7 +845,8 @@ JSValue jsElementOnselectstart(ExecState* exec, const Identifier&, const Propert JSValue jsElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSElement* domObject = static_cast(asObject(slot.slotBase())); + return JSElement::getConstructor(exec, domObject->globalObject()); } void JSElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -1186,9 +1245,9 @@ void setJSElementOnselectstart(ExecState* exec, JSObject* thisObject, JSValue va imp->setOnselectstart(globalObject->createJSAttributeEventListener(value)); } -JSValue JSElement::getConstructor(ExecState* exec) +JSValue JSElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -1239,7 +1298,7 @@ JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetAttributeNode(ExecState* exec const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getAttributeNode(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getAttributeNode(name))); return result; } @@ -1263,7 +1322,7 @@ JSValue JSC_HOST_CALL jsElementPrototypeFunctionRemoveAttributeNode(ExecState* e Attr* oldAttr = toAttr(args.at(0)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->removeAttributeNode(oldAttr, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->removeAttributeNode(oldAttr, ec))); setDOMException(exec, ec); return result; } @@ -1278,7 +1337,7 @@ JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetElementsByTagName(ExecState* const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByTagName(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getElementsByTagName(name))); return result; } @@ -1333,7 +1392,7 @@ JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetElementsByTagNameNS(ExecState const UString& localName = args.at(1).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByTagNameNS(namespaceURI, localName))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getElementsByTagNameNS(namespaceURI, localName))); return result; } @@ -1348,7 +1407,7 @@ JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetAttributeNodeNS(ExecState* ex const UString& localName = args.at(1).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getAttributeNodeNS(namespaceURI, localName))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getAttributeNodeNS(namespaceURI, localName))); return result; } @@ -1504,7 +1563,7 @@ JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetElementsByClassName(ExecState const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getElementsByClassName(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getElementsByClassName(name))); return result; } @@ -1519,7 +1578,7 @@ JSValue JSC_HOST_CALL jsElementPrototypeFunctionQuerySelector(ExecState* exec, J const UString& selectors = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->querySelector(selectors, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->querySelector(selectors, ec))); setDOMException(exec, ec); return result; } @@ -1535,7 +1594,7 @@ JSValue JSC_HOST_CALL jsElementPrototypeFunctionQuerySelectorAll(ExecState* exec const UString& selectors = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->querySelectorAll(selectors, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->querySelectorAll(selectors, ec))); setDOMException(exec, ec); return result; } @@ -1549,7 +1608,7 @@ JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetClientRects(ExecState* exec, Element* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getClientRects())); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getClientRects())); return result; } @@ -1562,7 +1621,7 @@ JSValue JSC_HOST_CALL jsElementPrototypeFunctionGetBoundingClientRect(ExecState* Element* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getBoundingClientRect())); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getBoundingClientRect())); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSElement.h b/src/3rdparty/webkit/WebCore/generated/JSElement.h index 36c81ac65..b7a27479e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSElement.h @@ -33,7 +33,7 @@ class Element; class JSElement : public JSNode { typedef JSNode Base; public: - JSElement(PassRefPtr, PassRefPtr); + JSElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -45,7 +45,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom functions JSC::JSValue setAttribute(JSC::ExecState*, const JSC::ArgList&); @@ -64,7 +64,7 @@ ALWAYS_INLINE bool JSElement::getOwnPropertySlot(JSC::ExecState* exec, const JSC } Element* toElement(JSC::JSValue); -JSC::JSValue toJSNewlyCreated(JSC::ExecState*, Element*); +JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject*, Element*); class JSElementPrototype : public JSC::JSObject { typedef JSC::JSObject Base; diff --git a/src/3rdparty/webkit/WebCore/generated/JSEntity.cpp b/src/3rdparty/webkit/WebCore/generated/JSEntity.cpp index 4b354b05d..3b519ceab 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEntity.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSEntity.cpp @@ -63,12 +63,12 @@ static JSC_CONST_HASHTABLE HashTable JSEntityConstructorTable = { 1, 0, JSEntityConstructorTableValues, 0 }; #endif -class JSEntityConstructor : public DOMObject { +class JSEntityConstructor : public DOMConstructorObject { public: - JSEntityConstructor(ExecState* exec) - : DOMObject(JSEntityConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSEntityConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSEntityConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSEntityPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSEntityPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -110,8 +110,8 @@ JSObject* JSEntityPrototype::self(ExecState* exec, JSGlobalObject* globalObject) const ClassInfo JSEntity::s_info = { "Entity", &JSNode::s_info, &JSEntityTable, 0 }; -JSEntity::JSEntity(PassRefPtr structure, PassRefPtr impl) - : JSNode(structure, impl) +JSEntity::JSEntity(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSNode(structure, globalObject, impl) { } @@ -127,32 +127,36 @@ bool JSEntity::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNam JSValue jsEntityPublicId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEntity* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Entity* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Entity* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->publicId()); } JSValue jsEntitySystemId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEntity* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Entity* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Entity* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->systemId()); } JSValue jsEntityNotationName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEntity* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Entity* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Entity* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->notationName()); } JSValue jsEntityConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSEntity* domObject = static_cast(asObject(slot.slotBase())); + return JSEntity::getConstructor(exec, domObject->globalObject()); } -JSValue JSEntity::getConstructor(ExecState* exec) +JSValue JSEntity::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSEntity.h b/src/3rdparty/webkit/WebCore/generated/JSEntity.h index b54cf5822..323d70c2e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEntity.h +++ b/src/3rdparty/webkit/WebCore/generated/JSEntity.h @@ -30,7 +30,7 @@ class Entity; class JSEntity : public JSNode { typedef JSNode Base; public: - JSEntity(PassRefPtr, PassRefPtr); + JSEntity(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp b/src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp index 1d6b6ff23..5e18f0733 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSEntityReference.cpp @@ -59,12 +59,12 @@ static JSC_CONST_HASHTABLE HashTable JSEntityReferenceConstructorTable = { 1, 0, JSEntityReferenceConstructorTableValues, 0 }; #endif -class JSEntityReferenceConstructor : public DOMObject { +class JSEntityReferenceConstructor : public DOMConstructorObject { public: - JSEntityReferenceConstructor(ExecState* exec) - : DOMObject(JSEntityReferenceConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSEntityReferenceConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSEntityReferenceConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSEntityReferencePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSEntityReferencePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -106,8 +106,8 @@ JSObject* JSEntityReferencePrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSEntityReference::s_info = { "EntityReference", &JSNode::s_info, &JSEntityReferenceTable, 0 }; -JSEntityReference::JSEntityReference(PassRefPtr structure, PassRefPtr impl) - : JSNode(structure, impl) +JSEntityReference::JSEntityReference(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSNode(structure, globalObject, impl) { } @@ -123,11 +123,12 @@ bool JSEntityReference::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsEntityReferenceConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSEntityReference* domObject = static_cast(asObject(slot.slotBase())); + return JSEntityReference::getConstructor(exec, domObject->globalObject()); } -JSValue JSEntityReference::getConstructor(ExecState* exec) +JSValue JSEntityReference::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSEntityReference.h b/src/3rdparty/webkit/WebCore/generated/JSEntityReference.h index 0c0957a7a..261e2e9ae 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEntityReference.h +++ b/src/3rdparty/webkit/WebCore/generated/JSEntityReference.h @@ -30,7 +30,7 @@ class EntityReference; class JSEntityReference : public JSNode { typedef JSNode Base; public: - JSEntityReference(PassRefPtr, PassRefPtr); + JSEntityReference(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSErrorEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSErrorEvent.cpp new file mode 100644 index 000000000..24bf5f279 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSErrorEvent.cpp @@ -0,0 +1,203 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "config.h" + +#if ENABLE(WORKERS) + +#include "JSErrorEvent.h" + +#include "ErrorEvent.h" +#include "KURL.h" +#include +#include +#include +#include + +using namespace JSC; + +namespace WebCore { + +ASSERT_CLASS_FITS_IN_CELL(JSErrorEvent); + +/* Hash table */ + +static const HashTableValue JSErrorEventTableValues[5] = +{ + { "message", DontDelete|ReadOnly, (intptr_t)jsErrorEventMessage, (intptr_t)0 }, + { "filename", DontDelete|ReadOnly, (intptr_t)jsErrorEventFilename, (intptr_t)0 }, + { "lineno", DontDelete|ReadOnly, (intptr_t)jsErrorEventLineno, (intptr_t)0 }, + { "constructor", DontEnum|ReadOnly, (intptr_t)jsErrorEventConstructor, (intptr_t)0 }, + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSErrorEventTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 15, JSErrorEventTableValues, 0 }; +#else + { 9, 7, JSErrorEventTableValues, 0 }; +#endif + +/* Hash table for constructor */ + +static const HashTableValue JSErrorEventConstructorTableValues[1] = +{ + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSErrorEventConstructorTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSErrorEventConstructorTableValues, 0 }; +#else + { 1, 0, JSErrorEventConstructorTableValues, 0 }; +#endif + +class JSErrorEventConstructor : public DOMConstructorObject { +public: + JSErrorEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSErrorEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) + { + putDirect(exec->propertyNames().prototype, JSErrorEventPrototype::self(exec, globalObject), None); + } + virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); + virtual const ClassInfo* classInfo() const { return &s_info; } + static const ClassInfo s_info; + + static PassRefPtr createStructure(JSValue proto) + { + return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); + } +}; + +const ClassInfo JSErrorEventConstructor::s_info = { "ErrorEventConstructor", 0, &JSErrorEventConstructorTable, 0 }; + +bool JSErrorEventConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot(exec, &JSErrorEventConstructorTable, this, propertyName, slot); +} + +/* Hash table for prototype */ + +static const HashTableValue JSErrorEventPrototypeTableValues[2] = +{ + { "initErrorEvent", DontDelete|Function, (intptr_t)jsErrorEventPrototypeFunctionInitErrorEvent, (intptr_t)6 }, + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSErrorEventPrototypeTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSErrorEventPrototypeTableValues, 0 }; +#else + { 2, 1, JSErrorEventPrototypeTableValues, 0 }; +#endif + +static const HashTable* getJSErrorEventPrototypeTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSErrorEventPrototypeTable); +} +const ClassInfo JSErrorEventPrototype::s_info = { "ErrorEventPrototype", 0, 0, getJSErrorEventPrototypeTable }; + +JSObject* JSErrorEventPrototype::self(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMPrototype(exec, globalObject); +} + +bool JSErrorEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticFunctionSlot(exec, getJSErrorEventPrototypeTable(exec), this, propertyName, slot); +} + +static const HashTable* getJSErrorEventTable(ExecState* exec) +{ + return getHashTableForGlobalData(exec->globalData(), &JSErrorEventTable); +} +const ClassInfo JSErrorEvent::s_info = { "ErrorEvent", &JSEvent::s_info, 0, getJSErrorEventTable }; + +JSErrorEvent::JSErrorEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSEvent(structure, globalObject, impl) +{ +} + +JSObject* JSErrorEvent::createPrototype(ExecState* exec, JSGlobalObject* globalObject) +{ + return new (exec) JSErrorEventPrototype(JSErrorEventPrototype::createStructure(JSEventPrototype::self(exec, globalObject))); +} + +bool JSErrorEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot(exec, getJSErrorEventTable(exec), this, propertyName, slot); +} + +JSValue jsErrorEventMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSErrorEvent* castedThis = static_cast(asObject(slot.slotBase())); + UNUSED_PARAM(exec); + ErrorEvent* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->message()); +} + +JSValue jsErrorEventFilename(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSErrorEvent* castedThis = static_cast(asObject(slot.slotBase())); + UNUSED_PARAM(exec); + ErrorEvent* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->filename()); +} + +JSValue jsErrorEventLineno(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSErrorEvent* castedThis = static_cast(asObject(slot.slotBase())); + UNUSED_PARAM(exec); + ErrorEvent* imp = static_cast(castedThis->impl()); + return jsNumber(exec, imp->lineno()); +} + +JSValue jsErrorEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSErrorEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSErrorEvent::getConstructor(exec, domObject->globalObject()); +} +JSValue JSErrorEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMConstructor(exec, static_cast(globalObject)); +} + +JSValue JSC_HOST_CALL jsErrorEventPrototypeFunctionInitErrorEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSErrorEvent::s_info)) + return throwError(exec, TypeError); + JSErrorEvent* castedThisObj = static_cast(asObject(thisValue)); + ErrorEvent* imp = static_cast(castedThisObj->impl()); + const UString& typeArg = args.at(0).toString(exec); + bool canBubbleArg = args.at(1).toBoolean(exec); + bool cancelableArg = args.at(2).toBoolean(exec); + const UString& messageArg = args.at(3).toString(exec); + const UString& filenameArg = args.at(4).toString(exec); + unsigned linenoArg = args.at(5).toInt32(exec); + + imp->initErrorEvent(typeArg, canBubbleArg, cancelableArg, messageArg, filenameArg, linenoArg); + return jsUndefined(); +} + + +} + +#endif // ENABLE(WORKERS) diff --git a/src/3rdparty/webkit/WebCore/generated/JSErrorEvent.h b/src/3rdparty/webkit/WebCore/generated/JSErrorEvent.h new file mode 100644 index 000000000..bcf57dedd --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSErrorEvent.h @@ -0,0 +1,78 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef JSErrorEvent_h +#define JSErrorEvent_h + +#if ENABLE(WORKERS) + +#include "JSEvent.h" + +namespace WebCore { + +class ErrorEvent; + +class JSErrorEvent : public JSEvent { + typedef JSEvent Base; +public: + JSErrorEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + + static PassRefPtr createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); +}; + + +class JSErrorEventPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; +public: + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); + static PassRefPtr createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + JSErrorEventPrototype(PassRefPtr structure) : JSC::JSObject(structure) { } +}; + +// Functions + +JSC::JSValue JSC_HOST_CALL jsErrorEventPrototypeFunctionInitErrorEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +// Attributes + +JSC::JSValue jsErrorEventMessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsErrorEventFilename(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsErrorEventLineno(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsErrorEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + +} // namespace WebCore + +#endif // ENABLE(WORKERS) + +#endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSEvent.cpp index 550db2583..58865e0ea 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSEvent.cpp @@ -95,12 +95,12 @@ static JSC_CONST_HASHTABLE HashTable JSEventConstructorTable = { 68, 63, JSEventConstructorTableValues, 0 }; #endif -class JSEventConstructor : public DOMObject { +class JSEventConstructor : public DOMConstructorObject { public: - JSEventConstructor(ExecState* exec) - : DOMObject(JSEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -177,8 +177,8 @@ static const HashTable* getJSEventTable(ExecState* exec) } const ClassInfo JSEvent::s_info = { "Event", 0, 0, getJSEventTable }; -JSEvent::JSEvent(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSEvent::JSEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -200,82 +200,94 @@ bool JSEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName JSValue jsEventType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Event* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Event* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsEventTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Event* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->target())); + Event* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->target())); } JSValue jsEventCurrentTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Event* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->currentTarget())); + Event* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->currentTarget())); } JSValue jsEventEventPhase(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Event* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Event* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->eventPhase()); } JSValue jsEventBubbles(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Event* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Event* imp = static_cast(castedThis->impl()); return jsBoolean(imp->bubbles()); } JSValue jsEventCancelable(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Event* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Event* imp = static_cast(castedThis->impl()); return jsBoolean(imp->cancelable()); } JSValue jsEventTimeStamp(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Event* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Event* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->timeStamp()); } JSValue jsEventSrcElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Event* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->srcElement())); + Event* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->srcElement())); } JSValue jsEventReturnValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Event* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Event* imp = static_cast(castedThis->impl()); return jsBoolean(imp->returnValue()); } JSValue jsEventCancelBubble(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Event* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Event* imp = static_cast(castedThis->impl()); return jsBoolean(imp->cancelBubble()); } JSValue jsEventClipboardData(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->clipboardData(exec); + JSEvent* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->clipboardData(exec); } JSValue jsEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSEvent::getConstructor(exec, domObject->globalObject()); } void JSEvent::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -294,9 +306,9 @@ void setJSEventCancelBubble(ExecState* exec, JSObject* thisObject, JSValue value imp->setCancelBubble(value.toBoolean(exec)); } -JSValue JSEvent::getConstructor(ExecState* exec) +JSValue JSEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsEventPrototypeFunctionStopPropagation(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSEvent.h b/src/3rdparty/webkit/WebCore/generated/JSEvent.h index 281010bee..f56b8892f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSEvent.h @@ -21,6 +21,7 @@ #ifndef JSEvent_h #define JSEvent_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class Event; -class JSEvent : public DOMObject { - typedef DOMObject Base; +class JSEvent : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSEvent(PassRefPtr, PassRefPtr); + JSEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSEvent(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -45,7 +46,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom attributes JSC::JSValue clipboardData(JSC::ExecState*) const; @@ -55,7 +56,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, Event*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Event*); Event* toEvent(JSC::JSValue); class JSEventPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSEventException.cpp b/src/3rdparty/webkit/WebCore/generated/JSEventException.cpp index 1c39ced46..b92465a9c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEventException.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSEventException.cpp @@ -67,12 +67,12 @@ static JSC_CONST_HASHTABLE HashTable JSEventExceptionConstructorTable = { 2, 1, JSEventExceptionConstructorTableValues, 0 }; #endif -class JSEventExceptionConstructor : public DOMObject { +class JSEventExceptionConstructor : public DOMConstructorObject { public: - JSEventExceptionConstructor(ExecState* exec) - : DOMObject(JSEventExceptionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSEventExceptionConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSEventExceptionConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSEventExceptionPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSEventExceptionPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -129,8 +129,8 @@ static const HashTable* getJSEventExceptionTable(ExecState* exec) } const ClassInfo JSEventException::s_info = { "EventException", 0, 0, getJSEventExceptionTable }; -JSEventException::JSEventException(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSEventException::JSEventException(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -152,32 +152,36 @@ bool JSEventException::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsEventExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEventException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - EventException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + EventException* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->code()); } JSValue jsEventExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEventException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - EventException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + EventException* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsEventExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSEventException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - EventException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + EventException* imp = static_cast(castedThis->impl()); return jsString(exec, imp->message()); } JSValue jsEventExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSEventException* domObject = static_cast(asObject(slot.slotBase())); + return JSEventException::getConstructor(exec, domObject->globalObject()); } -JSValue JSEventException::getConstructor(ExecState* exec) +JSValue JSEventException::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsEventExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -200,9 +204,9 @@ JSValue jsEventExceptionUNSPECIFIED_EVENT_TYPE_ERR(ExecState* exec, const Identi return jsNumber(exec, static_cast(0)); } -JSC::JSValue toJS(JSC::ExecState* exec, EventException* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, EventException* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } EventException* toEventException(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSEventException.h b/src/3rdparty/webkit/WebCore/generated/JSEventException.h index bc71abe9e..433e440ce 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSEventException.h +++ b/src/3rdparty/webkit/WebCore/generated/JSEventException.h @@ -21,6 +21,7 @@ #ifndef JSEventException_h #define JSEventException_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class EventException; -class JSEventException : public DOMObject { - typedef DOMObject Base; +class JSEventException : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSEventException(PassRefPtr, PassRefPtr); + JSEventException(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSEventException(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); EventException* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, EventException*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, EventException*); EventException* toEventException(JSC::JSValue); class JSEventExceptionPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSFile.cpp b/src/3rdparty/webkit/WebCore/generated/JSFile.cpp index 923e24b69..86c9f1f9e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSFile.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSFile.cpp @@ -64,12 +64,12 @@ static JSC_CONST_HASHTABLE HashTable JSFileConstructorTable = { 1, 0, JSFileConstructorTableValues, 0 }; #endif -class JSFileConstructor : public DOMObject { +class JSFileConstructor : public DOMConstructorObject { public: - JSFileConstructor(ExecState* exec) - : DOMObject(JSFileConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSFileConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSFileConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSFilePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSFilePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -111,8 +111,8 @@ JSObject* JSFilePrototype::self(ExecState* exec, JSGlobalObject* globalObject) const ClassInfo JSFile::s_info = { "File", 0, &JSFileTable, 0 }; -JSFile::JSFile(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSFile::JSFile(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -134,30 +134,33 @@ bool JSFile::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, JSValue jsFileFileName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSFile* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - File* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + File* imp = static_cast(castedThis->impl()); return jsString(exec, imp->fileName()); } JSValue jsFileFileSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSFile* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - File* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + File* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->fileSize()); } JSValue jsFileConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSFile* domObject = static_cast(asObject(slot.slotBase())); + return JSFile::getConstructor(exec, domObject->globalObject()); } -JSValue JSFile::getConstructor(ExecState* exec) +JSValue JSFile::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } -JSC::JSValue toJS(JSC::ExecState* exec, File* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, File* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } File* toFile(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSFile.h b/src/3rdparty/webkit/WebCore/generated/JSFile.h index efa4744a0..afeaaf596 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSFile.h +++ b/src/3rdparty/webkit/WebCore/generated/JSFile.h @@ -21,6 +21,7 @@ #ifndef JSFile_h #define JSFile_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class File; -class JSFile : public DOMObject { - typedef DOMObject Base; +class JSFile : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSFile(PassRefPtr, PassRefPtr); + JSFile(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSFile(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); File* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, File*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, File*); File* toFile(JSC::JSValue); class JSFilePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSFileList.cpp b/src/3rdparty/webkit/WebCore/generated/JSFileList.cpp index 9d1409850..e359c6953 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSFileList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSFileList.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSFileListConstructorTable = { 1, 0, JSFileListConstructorTableValues, 0 }; #endif -class JSFileListConstructor : public DOMObject { +class JSFileListConstructor : public DOMConstructorObject { public: - JSFileListConstructor(ExecState* exec) - : DOMObject(JSFileListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSFileListConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSFileListConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSFileListPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSFileListPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -119,8 +119,8 @@ bool JSFileListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSFileList::s_info = { "FileList", 0, &JSFileListTable, 0 }; -JSFileList::JSFileList(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSFileList::JSFileList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -162,14 +162,16 @@ bool JSFileList::getOwnPropertySlot(ExecState* exec, unsigned propertyName, Prop JSValue jsFileListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSFileList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - FileList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + FileList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsFileListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSFileList* domObject = static_cast(asObject(slot.slotBase())); + return JSFileList::getConstructor(exec, domObject->globalObject()); } void JSFileList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) { @@ -178,9 +180,9 @@ void JSFileList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNa Base::getPropertyNames(exec, propertyNames); } -JSValue JSFileList::getConstructor(ExecState* exec) +JSValue JSFileList::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsFileListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -197,7 +199,7 @@ JSValue JSC_HOST_CALL jsFileListPrototypeFunctionItem(ExecState* exec, JSObject* } - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->item(index))); return result; } @@ -205,11 +207,11 @@ JSValue JSC_HOST_CALL jsFileListPrototypeFunctionItem(ExecState* exec, JSObject* JSValue JSFileList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSFileList* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } -JSC::JSValue toJS(JSC::ExecState* exec, FileList* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, FileList* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } FileList* toFileList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSFileList.h b/src/3rdparty/webkit/WebCore/generated/JSFileList.h index 4a7075d2a..43cac5698 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSFileList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSFileList.h @@ -21,6 +21,7 @@ #ifndef JSFileList_h #define JSFileList_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class FileList; -class JSFileList : public DOMObject { - typedef DOMObject Base; +class JSFileList : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSFileList(PassRefPtr, PassRefPtr); + JSFileList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSFileList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,7 +47,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); FileList* impl() const { return m_impl.get(); } private: @@ -54,7 +55,7 @@ private: static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, FileList*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, FileList*); FileList* toFileList(JSC::JSValue); class JSFileListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp b/src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp index 104d781a7..481852c7e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSGeolocation.cpp @@ -79,8 +79,8 @@ bool JSGeolocationPrototype::getOwnPropertySlot(ExecState* exec, const Identifie const ClassInfo JSGeolocation::s_info = { "Geolocation", 0, &JSGeolocationTable, 0 }; -JSGeolocation::JSGeolocation(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSGeolocation::JSGeolocation(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -102,9 +102,10 @@ bool JSGeolocation::getOwnPropertySlot(ExecState* exec, const Identifier& proper JSValue jsGeolocationLastPosition(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSGeolocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Geolocation* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->lastPosition())); + Geolocation* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->lastPosition())); } JSValue JSC_HOST_CALL jsGeolocationPrototypeFunctionGetCurrentPosition(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -138,9 +139,9 @@ JSValue JSC_HOST_CALL jsGeolocationPrototypeFunctionClearWatch(ExecState* exec, return jsUndefined(); } -JSC::JSValue toJS(JSC::ExecState* exec, Geolocation* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Geolocation* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Geolocation* toGeolocation(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSGeolocation.h b/src/3rdparty/webkit/WebCore/generated/JSGeolocation.h index 736d01981..38af988a2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSGeolocation.h +++ b/src/3rdparty/webkit/WebCore/generated/JSGeolocation.h @@ -21,6 +21,7 @@ #ifndef JSGeolocation_h #define JSGeolocation_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class Geolocation; -class JSGeolocation : public DOMObject { - typedef DOMObject Base; +class JSGeolocation : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSGeolocation(PassRefPtr, PassRefPtr); + JSGeolocation(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSGeolocation(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -54,7 +55,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, Geolocation*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Geolocation*); Geolocation* toGeolocation(JSC::JSValue); class JSGeolocationPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSGeoposition.cpp b/src/3rdparty/webkit/WebCore/generated/JSGeoposition.cpp index b8721716d..348f0a54f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSGeoposition.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSGeoposition.cpp @@ -81,8 +81,8 @@ bool JSGeopositionPrototype::getOwnPropertySlot(ExecState* exec, const Identifie const ClassInfo JSGeoposition::s_info = { "Geoposition", 0, &JSGeopositionTable, 0 }; -JSGeoposition::JSGeoposition(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSGeoposition::JSGeoposition(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -104,15 +104,17 @@ bool JSGeoposition::getOwnPropertySlot(ExecState* exec, const Identifier& proper JSValue jsGeopositionCoords(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSGeoposition* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Geoposition* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->coords())); + Geoposition* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->coords())); } JSValue jsGeopositionTimestamp(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSGeoposition* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Geoposition* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Geoposition* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->timestamp()); } @@ -129,9 +131,9 @@ JSValue JSC_HOST_CALL jsGeopositionPrototypeFunctionToString(ExecState* exec, JS return result; } -JSC::JSValue toJS(JSC::ExecState* exec, Geoposition* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Geoposition* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Geoposition* toGeoposition(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSGeoposition.h b/src/3rdparty/webkit/WebCore/generated/JSGeoposition.h index 200bb6e0d..8d5a2ba7f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSGeoposition.h +++ b/src/3rdparty/webkit/WebCore/generated/JSGeoposition.h @@ -21,6 +21,7 @@ #ifndef JSGeoposition_h #define JSGeoposition_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class Geoposition; -class JSGeoposition : public DOMObject { - typedef DOMObject Base; +class JSGeoposition : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSGeoposition(PassRefPtr, PassRefPtr); + JSGeoposition(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSGeoposition(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -50,7 +51,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, Geoposition*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Geoposition*); Geoposition* toGeoposition(JSC::JSValue); class JSGeopositionPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.cpp index a9bbfcaaf..1e301465a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.cpp @@ -22,6 +22,7 @@ #include "JSHTMLAnchorElement.h" #include "HTMLAnchorElement.h" +#include "HTMLNames.h" #include "KURL.h" #include #include @@ -81,12 +82,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLAnchorElementConstructorTable = { 1, 0, JSHTMLAnchorElementConstructorTableValues, 0 }; #endif -class JSHTMLAnchorElementConstructor : public DOMObject { +class JSHTMLAnchorElementConstructor : public DOMConstructorObject { public: - JSHTMLAnchorElementConstructor(ExecState* exec) - : DOMObject(JSHTMLAnchorElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLAnchorElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLAnchorElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLAnchorElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLAnchorElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -134,8 +135,8 @@ bool JSHTMLAnchorElementPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSHTMLAnchorElement::s_info = { "HTMLAnchorElement", &JSHTMLElement::s_info, &JSHTMLAnchorElementTable, 0 }; -JSHTMLAnchorElement::JSHTMLAnchorElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLAnchorElement::JSHTMLAnchorElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -151,140 +152,160 @@ bool JSHTMLAnchorElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsHTMLAnchorElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->accessKey()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::accesskeyAttr)); } JSValue jsHTMLAnchorElementCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->charset()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::charsetAttr)); } JSValue jsHTMLAnchorElementCoords(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->coords()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::coordsAttr)); } JSValue jsHTMLAnchorElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->href()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getURLAttribute(HTMLNames::hrefAttr)); } JSValue jsHTMLAnchorElementHreflang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->hreflang()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::hreflangAttr)); } JSValue jsHTMLAnchorElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->name()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::nameAttr)); } JSValue jsHTMLAnchorElementRel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->rel()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::relAttr)); } JSValue jsHTMLAnchorElementRev(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->rev()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::revAttr)); } JSValue jsHTMLAnchorElementShape(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->shape()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::shapeAttr)); } JSValue jsHTMLAnchorElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->target()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::targetAttr)); } JSValue jsHTMLAnchorElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->type()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::typeAttr)); } JSValue jsHTMLAnchorElementHash(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->hash()); } JSValue jsHTMLAnchorElementHost(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->host()); } JSValue jsHTMLAnchorElementHostname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->hostname()); } JSValue jsHTMLAnchorElementPathname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->pathname()); } JSValue jsHTMLAnchorElementPort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->port()); } JSValue jsHTMLAnchorElementProtocol(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->protocol()); } JSValue jsHTMLAnchorElementSearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->search()); } JSValue jsHTMLAnchorElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAnchorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAnchorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAnchorElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->text()); } JSValue jsHTMLAnchorElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLAnchorElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLAnchorElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLAnchorElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -294,72 +315,72 @@ void JSHTMLAnchorElement::put(ExecState* exec, const Identifier& propertyName, J void setJSHTMLAnchorElementAccessKey(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setAccessKey(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::accesskeyAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAnchorElementCharset(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setCharset(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::charsetAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAnchorElementCoords(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setCoords(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::coordsAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAnchorElementHref(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setHref(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::hrefAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAnchorElementHreflang(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setHreflang(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::hreflangAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAnchorElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setName(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::nameAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAnchorElementRel(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setRel(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::relAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAnchorElementRev(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setRev(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::revAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAnchorElementShape(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setShape(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::shapeAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAnchorElementTarget(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setTarget(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::targetAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAnchorElementType(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAnchorElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setType(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::typeAttr, valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLAnchorElement::getConstructor(ExecState* exec) +JSValue JSHTMLAnchorElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLAnchorElementPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.h index b7864c41c..e9a99b3be 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAnchorElement.h @@ -30,7 +30,7 @@ class HTMLAnchorElement; class JSHTMLAnchorElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLAnchorElement(PassRefPtr, PassRefPtr); + JSHTMLAnchorElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.cpp index 4fe98d6e6..8731f25cf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.cpp @@ -23,6 +23,7 @@ #include "AtomicString.h" #include "HTMLAppletElement.h" +#include "HTMLNames.h" #include "JSHTMLAppletElementCustom.h" #include "KURL.h" #include @@ -74,12 +75,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLAppletElementConstructorTable = { 1, 0, JSHTMLAppletElementConstructorTableValues, 0 }; #endif -class JSHTMLAppletElementConstructor : public DOMObject { +class JSHTMLAppletElementConstructor : public DOMConstructorObject { public: - JSHTMLAppletElementConstructor(ExecState* exec) - : DOMObject(JSHTMLAppletElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLAppletElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLAppletElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLAppletElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLAppletElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -121,8 +122,8 @@ JSObject* JSHTMLAppletElementPrototype::self(ExecState* exec, JSGlobalObject* gl const ClassInfo JSHTMLAppletElement::s_info = { "HTMLAppletElement", &JSHTMLElement::s_info, &JSHTMLAppletElementTable, 0 }; -JSHTMLAppletElement::JSHTMLAppletElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLAppletElement::JSHTMLAppletElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -144,84 +145,96 @@ bool JSHTMLAppletElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsHTMLAppletElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAppletElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAppletElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->align()); + HTMLAppletElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::alignAttr)); } JSValue jsHTMLAppletElementAlt(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAppletElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAppletElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->alt()); + HTMLAppletElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::altAttr)); } JSValue jsHTMLAppletElementArchive(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAppletElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAppletElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->archive()); + HTMLAppletElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::archiveAttr)); } JSValue jsHTMLAppletElementCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAppletElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAppletElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->code()); + HTMLAppletElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::codeAttr)); } JSValue jsHTMLAppletElementCodeBase(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAppletElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAppletElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->codeBase()); + HTMLAppletElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::codebaseAttr)); } JSValue jsHTMLAppletElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAppletElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAppletElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->height()); + HTMLAppletElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::heightAttr)); } JSValue jsHTMLAppletElementHspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAppletElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAppletElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->hspace()); + HTMLAppletElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::hspaceAttr)); } JSValue jsHTMLAppletElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAppletElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAppletElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->name()); + HTMLAppletElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::nameAttr)); } JSValue jsHTMLAppletElementObject(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAppletElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAppletElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->object()); + HTMLAppletElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::objectAttr)); } JSValue jsHTMLAppletElementVspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAppletElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAppletElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->vspace()); + HTMLAppletElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::vspaceAttr)); } JSValue jsHTMLAppletElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAppletElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAppletElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->width()); + HTMLAppletElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::widthAttr)); } JSValue jsHTMLAppletElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLAppletElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLAppletElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLAppletElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -233,72 +246,72 @@ void JSHTMLAppletElement::put(ExecState* exec, const Identifier& propertyName, J void setJSHTMLAppletElementAlign(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setAlign(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::alignAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAppletElementAlt(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setAlt(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::altAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAppletElementArchive(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setArchive(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::archiveAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAppletElementCode(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setCode(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::codeAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAppletElementCodeBase(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setCodeBase(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::codebaseAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAppletElementHeight(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setHeight(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::heightAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAppletElementHspace(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setHspace(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::hspaceAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAppletElementName(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setName(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::nameAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAppletElementObject(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setObject(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::objectAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAppletElementVspace(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setVspace(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::vspaceAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAppletElementWidth(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAppletElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setWidth(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::widthAttr, valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLAppletElement::getConstructor(ExecState* exec) +JSValue JSHTMLAppletElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h index 0ebfc7b53..256bfb6ea 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAppletElement.h @@ -31,7 +31,7 @@ class HTMLAppletElement; class JSHTMLAppletElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLAppletElement(PassRefPtr, PassRefPtr); + JSHTMLAppletElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); bool getOwnPropertySlotDelegate(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); @@ -47,7 +47,7 @@ public: virtual JSC::CallType getCallData(JSC::CallData&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); private: static bool canGetItemsForName(JSC::ExecState*, HTMLAppletElement*, const JSC::Identifier&); static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.cpp index f78a54bf5..5fa120414 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.cpp @@ -22,6 +22,7 @@ #include "JSHTMLAreaElement.h" #include "HTMLAreaElement.h" +#include "HTMLNames.h" #include "KURL.h" #include #include @@ -75,12 +76,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLAreaElementConstructorTable = { 1, 0, JSHTMLAreaElementConstructorTableValues, 0 }; #endif -class JSHTMLAreaElementConstructor : public DOMObject { +class JSHTMLAreaElementConstructor : public DOMConstructorObject { public: - JSHTMLAreaElementConstructor(ExecState* exec) - : DOMObject(JSHTMLAreaElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLAreaElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLAreaElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLAreaElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLAreaElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -122,8 +123,8 @@ JSObject* JSHTMLAreaElementPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSHTMLAreaElement::s_info = { "HTMLAreaElement", &JSHTMLElement::s_info, &JSHTMLAreaElementTable, 0 }; -JSHTMLAreaElement::JSHTMLAreaElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLAreaElement::JSHTMLAreaElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -139,105 +140,120 @@ bool JSHTMLAreaElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsHTMLAreaElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->accessKey()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::accesskeyAttr)); } JSValue jsHTMLAreaElementAlt(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->alt()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::altAttr)); } JSValue jsHTMLAreaElementCoords(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->coords()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::coordsAttr)); } JSValue jsHTMLAreaElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->href()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getURLAttribute(HTMLNames::hrefAttr)); } JSValue jsHTMLAreaElementNoHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->noHref()); } JSValue jsHTMLAreaElementShape(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->shape()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::shapeAttr)); } JSValue jsHTMLAreaElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->target()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::targetAttr)); } JSValue jsHTMLAreaElementHash(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->hash()); } JSValue jsHTMLAreaElementHost(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->host()); } JSValue jsHTMLAreaElementHostname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->hostname()); } JSValue jsHTMLAreaElementPathname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->pathname()); } JSValue jsHTMLAreaElementPort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->port()); } JSValue jsHTMLAreaElementProtocol(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->protocol()); } JSValue jsHTMLAreaElementSearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLAreaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->search()); } JSValue jsHTMLAreaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLAreaElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLAreaElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLAreaElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -247,25 +263,25 @@ void JSHTMLAreaElement::put(ExecState* exec, const Identifier& propertyName, JSV void setJSHTMLAreaElementAccessKey(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAreaElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setAccessKey(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::accesskeyAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAreaElementAlt(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAreaElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setAlt(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::altAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAreaElementCoords(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAreaElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setCoords(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::coordsAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAreaElementHref(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAreaElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setHref(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::hrefAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAreaElementNoHref(ExecState* exec, JSObject* thisObject, JSValue value) @@ -277,18 +293,18 @@ void setJSHTMLAreaElementNoHref(ExecState* exec, JSObject* thisObject, JSValue v void setJSHTMLAreaElementShape(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAreaElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setShape(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::shapeAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLAreaElementTarget(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLAreaElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setTarget(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::targetAttr, valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLAreaElement::getConstructor(ExecState* exec) +JSValue JSHTMLAreaElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.h index 9d2d8fcfd..4b430210b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAreaElement.h @@ -30,7 +30,7 @@ class HTMLAreaElement; class JSHTMLAreaElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLAreaElement(PassRefPtr, PassRefPtr); + JSHTMLAreaElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.cpp index a2fbfce1a..6c8ae85e5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLAudioElementConstructorTable = { 1, 0, JSHTMLAudioElementConstructorTableValues, 0 }; #endif -class JSHTMLAudioElementConstructor : public DOMObject { +class JSHTMLAudioElementConstructor : public DOMConstructorObject { public: - JSHTMLAudioElementConstructor(ExecState* exec) - : DOMObject(JSHTMLAudioElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLAudioElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLAudioElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLAudioElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLAudioElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +109,8 @@ JSObject* JSHTMLAudioElementPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSHTMLAudioElement::s_info = { "HTMLAudioElement", &JSHTMLMediaElement::s_info, &JSHTMLAudioElementTable, 0 }; -JSHTMLAudioElement::JSHTMLAudioElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLMediaElement(structure, impl) +JSHTMLAudioElement::JSHTMLAudioElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLMediaElement(structure, globalObject, impl) { } @@ -126,11 +126,12 @@ bool JSHTMLAudioElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLAudioElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLAudioElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLAudioElement::getConstructor(exec, domObject->globalObject()); } -JSValue JSHTMLAudioElement::getConstructor(ExecState* exec) +JSValue JSHTMLAudioElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.h index cea0209b9..bb3e51d59 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLAudioElement.h @@ -32,7 +32,7 @@ class HTMLAudioElement; class JSHTMLAudioElement : public JSHTMLMediaElement { typedef JSHTMLMediaElement Base; public: - JSHTMLAudioElement(PassRefPtr, PassRefPtr); + JSHTMLAudioElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -43,7 +43,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.cpp index 2a43e6ca6..3cac476cf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.cpp @@ -22,6 +22,7 @@ #include "JSHTMLBRElement.h" #include "HTMLBRElement.h" +#include "HTMLNames.h" #include "KURL.h" #include #include @@ -62,12 +63,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLBRElementConstructorTable = { 1, 0, JSHTMLBRElementConstructorTableValues, 0 }; #endif -class JSHTMLBRElementConstructor : public DOMObject { +class JSHTMLBRElementConstructor : public DOMConstructorObject { public: - JSHTMLBRElementConstructor(ExecState* exec) - : DOMObject(JSHTMLBRElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLBRElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLBRElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLBRElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLBRElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +110,8 @@ JSObject* JSHTMLBRElementPrototype::self(ExecState* exec, JSGlobalObject* global const ClassInfo JSHTMLBRElement::s_info = { "HTMLBRElement", &JSHTMLElement::s_info, &JSHTMLBRElementTable, 0 }; -JSHTMLBRElement::JSHTMLBRElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLBRElement::JSHTMLBRElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -126,14 +127,16 @@ bool JSHTMLBRElement::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsHTMLBRElementClear(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBRElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBRElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->clear()); + HTMLBRElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::clearAttr)); } JSValue jsHTMLBRElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLBRElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLBRElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLBRElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -143,12 +146,12 @@ void JSHTMLBRElement::put(ExecState* exec, const Identifier& propertyName, JSVal void setJSHTMLBRElementClear(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBRElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setClear(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::clearAttr, valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLBRElement::getConstructor(ExecState* exec) +JSValue JSHTMLBRElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.h index 3352cb7ae..d6b124bdb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBRElement.h @@ -30,7 +30,7 @@ class HTMLBRElement; class JSHTMLBRElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLBRElement(PassRefPtr, PassRefPtr); + JSHTMLBRElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.cpp index 7c78555d4..10e393c3b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.cpp @@ -22,6 +22,7 @@ #include "JSHTMLBaseElement.h" #include "HTMLBaseElement.h" +#include "HTMLNames.h" #include "KURL.h" #include #include @@ -63,12 +64,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLBaseElementConstructorTable = { 1, 0, JSHTMLBaseElementConstructorTableValues, 0 }; #endif -class JSHTMLBaseElementConstructor : public DOMObject { +class JSHTMLBaseElementConstructor : public DOMConstructorObject { public: - JSHTMLBaseElementConstructor(ExecState* exec) - : DOMObject(JSHTMLBaseElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLBaseElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLBaseElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLBaseElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLBaseElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -110,8 +111,8 @@ JSObject* JSHTMLBaseElementPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSHTMLBaseElement::s_info = { "HTMLBaseElement", &JSHTMLElement::s_info, &JSHTMLBaseElementTable, 0 }; -JSHTMLBaseElement::JSHTMLBaseElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLBaseElement::JSHTMLBaseElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -127,21 +128,24 @@ bool JSHTMLBaseElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsHTMLBaseElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBaseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBaseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->href()); + HTMLBaseElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::hrefAttr)); } JSValue jsHTMLBaseElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBaseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBaseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->target()); + HTMLBaseElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::targetAttr)); } JSValue jsHTMLBaseElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLBaseElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLBaseElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLBaseElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -151,18 +155,18 @@ void JSHTMLBaseElement::put(ExecState* exec, const Identifier& propertyName, JSV void setJSHTMLBaseElementHref(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBaseElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setHref(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::hrefAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLBaseElementTarget(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBaseElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setTarget(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::targetAttr, valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLBaseElement::getConstructor(ExecState* exec) +JSValue JSHTMLBaseElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.h index 8fdbe0693..00649634d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseElement.h @@ -30,7 +30,7 @@ class HTMLBaseElement; class JSHTMLBaseElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLBaseElement(PassRefPtr, PassRefPtr); + JSHTMLBaseElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.cpp index 081be5a33..277770bfe 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.cpp @@ -22,6 +22,7 @@ #include "JSHTMLBaseFontElement.h" #include "HTMLBaseFontElement.h" +#include "HTMLNames.h" #include "KURL.h" #include #include @@ -65,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLBaseFontElementConstructorTable = { 1, 0, JSHTMLBaseFontElementConstructorTableValues, 0 }; #endif -class JSHTMLBaseFontElementConstructor : public DOMObject { +class JSHTMLBaseFontElementConstructor : public DOMConstructorObject { public: - JSHTMLBaseFontElementConstructor(ExecState* exec) - : DOMObject(JSHTMLBaseFontElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLBaseFontElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLBaseFontElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLBaseFontElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLBaseFontElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -112,8 +113,8 @@ JSObject* JSHTMLBaseFontElementPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSHTMLBaseFontElement::s_info = { "HTMLBaseFontElement", &JSHTMLElement::s_info, &JSHTMLBaseFontElementTable, 0 }; -JSHTMLBaseFontElement::JSHTMLBaseFontElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLBaseFontElement::JSHTMLBaseFontElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -129,28 +130,32 @@ bool JSHTMLBaseFontElement::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsHTMLBaseFontElementColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBaseFontElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBaseFontElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->color()); + HTMLBaseFontElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::colorAttr)); } JSValue jsHTMLBaseFontElementFace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBaseFontElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBaseFontElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->face()); + HTMLBaseFontElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::faceAttr)); } JSValue jsHTMLBaseFontElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBaseFontElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBaseFontElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLBaseFontElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->size()); } JSValue jsHTMLBaseFontElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLBaseFontElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLBaseFontElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLBaseFontElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -160,13 +165,13 @@ void JSHTMLBaseFontElement::put(ExecState* exec, const Identifier& propertyName, void setJSHTMLBaseFontElementColor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBaseFontElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setColor(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::colorAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLBaseFontElementFace(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBaseFontElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setFace(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::faceAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLBaseFontElementSize(ExecState* exec, JSObject* thisObject, JSValue value) @@ -175,9 +180,9 @@ void setJSHTMLBaseFontElementSize(ExecState* exec, JSObject* thisObject, JSValue imp->setSize(value.toInt32(exec)); } -JSValue JSHTMLBaseFontElement::getConstructor(ExecState* exec) +JSValue JSHTMLBaseFontElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.h index 534bb8082..fcaa36395 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBaseFontElement.h @@ -30,7 +30,7 @@ class HTMLBaseFontElement; class JSHTMLBaseFontElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLBaseFontElement(PassRefPtr, PassRefPtr); + JSHTMLBaseFontElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.cpp index 852568b09..bdf10b7e3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.cpp @@ -22,6 +22,7 @@ #include "JSHTMLBlockquoteElement.h" #include "HTMLBlockquoteElement.h" +#include "HTMLNames.h" #include "KURL.h" #include #include @@ -62,12 +63,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLBlockquoteElementConstructorTable = { 1, 0, JSHTMLBlockquoteElementConstructorTableValues, 0 }; #endif -class JSHTMLBlockquoteElementConstructor : public DOMObject { +class JSHTMLBlockquoteElementConstructor : public DOMConstructorObject { public: - JSHTMLBlockquoteElementConstructor(ExecState* exec) - : DOMObject(JSHTMLBlockquoteElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLBlockquoteElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLBlockquoteElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLBlockquoteElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLBlockquoteElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +110,8 @@ JSObject* JSHTMLBlockquoteElementPrototype::self(ExecState* exec, JSGlobalObject const ClassInfo JSHTMLBlockquoteElement::s_info = { "HTMLBlockquoteElement", &JSHTMLElement::s_info, &JSHTMLBlockquoteElementTable, 0 }; -JSHTMLBlockquoteElement::JSHTMLBlockquoteElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLBlockquoteElement::JSHTMLBlockquoteElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -126,14 +127,16 @@ bool JSHTMLBlockquoteElement::getOwnPropertySlot(ExecState* exec, const Identifi JSValue jsHTMLBlockquoteElementCite(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBlockquoteElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBlockquoteElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->cite()); + HTMLBlockquoteElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::citeAttr)); } JSValue jsHTMLBlockquoteElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLBlockquoteElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLBlockquoteElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLBlockquoteElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -143,12 +146,12 @@ void JSHTMLBlockquoteElement::put(ExecState* exec, const Identifier& propertyNam void setJSHTMLBlockquoteElementCite(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBlockquoteElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setCite(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::citeAttr, valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLBlockquoteElement::getConstructor(ExecState* exec) +JSValue JSHTMLBlockquoteElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.h index 7949bddba..a2046b31c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBlockquoteElement.h @@ -30,7 +30,7 @@ class HTMLBlockquoteElement; class JSHTMLBlockquoteElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLBlockquoteElement(PassRefPtr, PassRefPtr); + JSHTMLBlockquoteElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.cpp index d86b72376..7628bd62e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.cpp @@ -24,6 +24,7 @@ #include "EventListener.h" #include "Frame.h" #include "HTMLBodyElement.h" +#include "HTMLNames.h" #include "JSDOMGlobalObject.h" #include "JSEventListener.h" #include "KURL.h" @@ -78,12 +79,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLBodyElementConstructorTable = { 1, 0, JSHTMLBodyElementConstructorTableValues, 0 }; #endif -class JSHTMLBodyElementConstructor : public DOMObject { +class JSHTMLBodyElementConstructor : public DOMConstructorObject { public: - JSHTMLBodyElementConstructor(ExecState* exec) - : DOMObject(JSHTMLBodyElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLBodyElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLBodyElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLBodyElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLBodyElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -125,8 +126,8 @@ JSObject* JSHTMLBodyElementPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSHTMLBodyElement::s_info = { "HTMLBodyElement", &JSHTMLElement::s_info, &JSHTMLBodyElementTable, 0 }; -JSHTMLBodyElement::JSHTMLBodyElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLBodyElement::JSHTMLBodyElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -142,50 +143,57 @@ bool JSHTMLBodyElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsHTMLBodyElementALink(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBodyElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->aLink()); + HTMLBodyElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::alinkAttr)); } JSValue jsHTMLBodyElementBackground(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBodyElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->background()); + HTMLBodyElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::backgroundAttr)); } JSValue jsHTMLBodyElementBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBodyElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->bgColor()); + HTMLBodyElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::bgcolorAttr)); } JSValue jsHTMLBodyElementLink(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBodyElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->link()); + HTMLBodyElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::linkAttr)); } JSValue jsHTMLBodyElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBodyElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->text()); + HTMLBodyElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::textAttr)); } JSValue jsHTMLBodyElementVLink(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBodyElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return jsString(exec, imp->vLink()); + HTMLBodyElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::vlinkAttr)); } JSValue jsHTMLBodyElementOnbeforeunload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBodyElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLBodyElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onbeforeunload()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -195,8 +203,9 @@ JSValue jsHTMLBodyElementOnbeforeunload(ExecState* exec, const Identifier&, cons JSValue jsHTMLBodyElementOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBodyElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLBodyElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmessage()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -206,8 +215,9 @@ JSValue jsHTMLBodyElementOnmessage(ExecState* exec, const Identifier&, const Pro JSValue jsHTMLBodyElementOnoffline(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBodyElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLBodyElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onoffline()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -217,8 +227,9 @@ JSValue jsHTMLBodyElementOnoffline(ExecState* exec, const Identifier&, const Pro JSValue jsHTMLBodyElementOnonline(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBodyElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLBodyElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ononline()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -228,8 +239,9 @@ JSValue jsHTMLBodyElementOnonline(ExecState* exec, const Identifier&, const Prop JSValue jsHTMLBodyElementOnresize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBodyElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLBodyElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onresize()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -239,8 +251,9 @@ JSValue jsHTMLBodyElementOnresize(ExecState* exec, const Identifier&, const Prop JSValue jsHTMLBodyElementOnstorage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBodyElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLBodyElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onstorage()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -250,8 +263,9 @@ JSValue jsHTMLBodyElementOnstorage(ExecState* exec, const Identifier&, const Pro JSValue jsHTMLBodyElementOnunload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLBodyElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLBodyElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLBodyElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onunload()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -261,7 +275,8 @@ JSValue jsHTMLBodyElementOnunload(ExecState* exec, const Identifier&, const Prop JSValue jsHTMLBodyElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLBodyElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLBodyElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLBodyElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -271,37 +286,37 @@ void JSHTMLBodyElement::put(ExecState* exec, const Identifier& propertyName, JSV void setJSHTMLBodyElementALink(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBodyElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setALink(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::alinkAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLBodyElementBackground(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBodyElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setBackground(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::backgroundAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLBodyElementBgColor(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBodyElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setBgColor(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::bgcolorAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLBodyElementLink(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBodyElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setLink(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::linkAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLBodyElementText(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBodyElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setText(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::textAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLBodyElementVLink(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLBodyElement* imp = static_cast(static_cast(thisObject)->impl()); - imp->setVLink(valueToStringWithNullCheck(exec, value)); + imp->setAttribute(HTMLNames::vlinkAttr, valueToStringWithNullCheck(exec, value)); } void setJSHTMLBodyElementOnbeforeunload(ExecState* exec, JSObject* thisObject, JSValue value) @@ -374,9 +389,9 @@ void setJSHTMLBodyElementOnunload(ExecState* exec, JSObject* thisObject, JSValue imp->setOnunload(globalObject->createJSAttributeEventListener(value)); } -JSValue JSHTMLBodyElement::getConstructor(ExecState* exec) +JSValue JSHTMLBodyElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.h index caabc5b54..706a3c476 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLBodyElement.h @@ -30,7 +30,7 @@ class HTMLBodyElement; class JSHTMLBodyElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLBodyElement(PassRefPtr, PassRefPtr); + JSHTMLBodyElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.cpp index 098528d1b..c0c73227e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.cpp @@ -75,12 +75,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLButtonElementConstructorTable = { 1, 0, JSHTMLButtonElementConstructorTableValues, 0 }; #endif -class JSHTMLButtonElementConstructor : public DOMObject { +class JSHTMLButtonElementConstructor : public DOMConstructorObject { public: - JSHTMLButtonElementConstructor(ExecState* exec) - : DOMObject(JSHTMLButtonElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLButtonElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLButtonElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLButtonElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLButtonElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -128,8 +128,8 @@ bool JSHTMLButtonElementPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSHTMLButtonElement::s_info = { "HTMLButtonElement", &JSHTMLElement::s_info, &JSHTMLButtonElementTable, 0 }; -JSHTMLButtonElement::JSHTMLButtonElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLButtonElement::JSHTMLButtonElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -145,70 +145,80 @@ bool JSHTMLButtonElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsHTMLButtonElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLButtonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLButtonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->form())); + HTMLButtonElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->form())); } JSValue jsHTMLButtonElementValidity(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLButtonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLButtonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->validity())); + HTMLButtonElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->validity())); } JSValue jsHTMLButtonElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLButtonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLButtonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLButtonElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->accessKey()); } JSValue jsHTMLButtonElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLButtonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLButtonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLButtonElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->disabled()); } JSValue jsHTMLButtonElementAutofocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLButtonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLButtonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLButtonElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->autofocus()); } JSValue jsHTMLButtonElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLButtonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLButtonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLButtonElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsHTMLButtonElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLButtonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLButtonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLButtonElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLButtonElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLButtonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLButtonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLButtonElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->value()); } JSValue jsHTMLButtonElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLButtonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLButtonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLButtonElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->willValidate()); } JSValue jsHTMLButtonElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLButtonElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLButtonElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLButtonElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -245,9 +255,9 @@ void setJSHTMLButtonElementValue(ExecState* exec, JSObject* thisObject, JSValue imp->setValue(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLButtonElement::getConstructor(ExecState* exec) +JSValue JSHTMLButtonElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLButtonElementPrototypeFunctionClick(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.h index 1ac56c566..9fa59ff9d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLButtonElement.h @@ -30,7 +30,7 @@ class HTMLButtonElement; class JSHTMLButtonElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLButtonElement(PassRefPtr, PassRefPtr); + JSHTMLButtonElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.cpp index d40e90020..5c5533fff 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLCanvasElementConstructorTable = { 1, 0, JSHTMLCanvasElementConstructorTableValues, 0 }; #endif -class JSHTMLCanvasElementConstructor : public DOMObject { +class JSHTMLCanvasElementConstructor : public DOMConstructorObject { public: - JSHTMLCanvasElementConstructor(ExecState* exec) - : DOMObject(JSHTMLCanvasElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLCanvasElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLCanvasElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLCanvasElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLCanvasElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -120,8 +120,8 @@ bool JSHTMLCanvasElementPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSHTMLCanvasElement::s_info = { "HTMLCanvasElement", &JSHTMLElement::s_info, &JSHTMLCanvasElementTable, 0 }; -JSHTMLCanvasElement::JSHTMLCanvasElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLCanvasElement::JSHTMLCanvasElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -137,21 +137,24 @@ bool JSHTMLCanvasElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsHTMLCanvasElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLCanvasElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLCanvasElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLCanvasElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->width()); } JSValue jsHTMLCanvasElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLCanvasElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLCanvasElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLCanvasElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->height()); } JSValue jsHTMLCanvasElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLCanvasElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLCanvasElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLCanvasElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -170,9 +173,9 @@ void setJSHTMLCanvasElementHeight(ExecState* exec, JSObject* thisObject, JSValue imp->setHeight(value.toInt32(exec)); } -JSValue JSHTMLCanvasElement::getConstructor(ExecState* exec) +JSValue JSHTMLCanvasElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLCanvasElementPrototypeFunctionToDataURL(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -201,7 +204,7 @@ JSValue JSC_HOST_CALL jsHTMLCanvasElementPrototypeFunctionGetContext(ExecState* const UString& contextId = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getContext(contextId))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getContext(contextId))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.h index ad41d1526..5ccb23ac0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLCanvasElement.h @@ -30,7 +30,7 @@ class HTMLCanvasElement; class JSHTMLCanvasElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLCanvasElement(PassRefPtr, PassRefPtr); + JSHTMLCanvasElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.cpp index 9b6bda31b..de0106870 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.cpp @@ -69,12 +69,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLCollectionConstructorTable = { 1, 0, JSHTMLCollectionConstructorTableValues, 0 }; #endif -class JSHTMLCollectionConstructor : public DOMObject { +class JSHTMLCollectionConstructor : public DOMConstructorObject { public: - JSHTMLCollectionConstructor(ExecState* exec) - : DOMObject(JSHTMLCollectionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLCollectionConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLCollectionConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLCollectionPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLCollectionPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -124,8 +124,8 @@ bool JSHTMLCollectionPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSHTMLCollection::s_info = { "HTMLCollection", 0, &JSHTMLCollectionTable, 0 }; -JSHTMLCollection::JSHTMLCollection(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSHTMLCollection::JSHTMLCollection(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -175,14 +175,16 @@ bool JSHTMLCollection::getOwnPropertySlot(ExecState* exec, unsigned propertyName JSValue jsHTMLCollectionLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLCollection* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLCollection* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLCollection* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsHTMLCollectionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLCollection* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLCollection::getConstructor(exec, domObject->globalObject()); } void JSHTMLCollection::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) { @@ -191,9 +193,9 @@ void JSHTMLCollection::getPropertyNames(ExecState* exec, PropertyNameArray& prop Base::getPropertyNames(exec, propertyNames); } -JSValue JSHTMLCollection::getConstructor(ExecState* exec) +JSValue JSHTMLCollection::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLCollectionPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -224,7 +226,7 @@ JSValue JSC_HOST_CALL jsHTMLCollectionPrototypeFunctionTags(ExecState* exec, JSO const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->tags(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->tags(name))); return result; } @@ -232,7 +234,7 @@ JSValue JSC_HOST_CALL jsHTMLCollectionPrototypeFunctionTags(ExecState* exec, JSO JSValue JSHTMLCollection::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSHTMLCollection* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } HTMLCollection* toHTMLCollection(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.h index 44d977eb8..c6b640658 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLCollection.h @@ -21,6 +21,7 @@ #ifndef JSHTMLCollection_h #define JSHTMLCollection_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -30,10 +31,10 @@ namespace WebCore { class HTMLCollection; -class JSHTMLCollection : public DOMObject { - typedef DOMObject Base; +class JSHTMLCollection : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSHTMLCollection(PassRefPtr, PassRefPtr); + JSHTMLCollection(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSHTMLCollection(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -49,7 +50,7 @@ public: virtual JSC::CallType getCallData(JSC::CallData&); virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom functions JSC::JSValue item(JSC::ExecState*, const JSC::ArgList&); @@ -64,7 +65,7 @@ private: static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, HTMLCollection*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, HTMLCollection*); HTMLCollection* toHTMLCollection(JSC::JSValue); class JSHTMLCollectionPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.cpp index a3f60b292..3e7c701e0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.cpp @@ -60,12 +60,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLDListElementConstructorTable = { 1, 0, JSHTMLDListElementConstructorTableValues, 0 }; #endif -class JSHTMLDListElementConstructor : public DOMObject { +class JSHTMLDListElementConstructor : public DOMConstructorObject { public: - JSHTMLDListElementConstructor(ExecState* exec) - : DOMObject(JSHTMLDListElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLDListElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLDListElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLDListElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLDListElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -107,8 +107,8 @@ JSObject* JSHTMLDListElementPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSHTMLDListElement::s_info = { "HTMLDListElement", &JSHTMLElement::s_info, &JSHTMLDListElementTable, 0 }; -JSHTMLDListElement::JSHTMLDListElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLDListElement::JSHTMLDListElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -124,14 +124,16 @@ bool JSHTMLDListElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLDListElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDListElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDListElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDListElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->compact()); } JSValue jsHTMLDListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLDListElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLDListElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLDListElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -144,9 +146,9 @@ void setJSHTMLDListElementCompact(ExecState* exec, JSObject* thisObject, JSValue imp->setCompact(value.toBoolean(exec)); } -JSValue JSHTMLDListElement::getConstructor(ExecState* exec) +JSValue JSHTMLDListElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.h index a1519ebcd..ea25315fc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDListElement.h @@ -30,7 +30,7 @@ class HTMLDListElement; class JSHTMLDListElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLDListElement(PassRefPtr, PassRefPtr); + JSHTMLDListElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridCellElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridCellElement.cpp index f070da618..91b63d840 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridCellElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridCellElement.cpp @@ -70,12 +70,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLDataGridCellElementConstructorTable = { 1, 0, JSHTMLDataGridCellElementConstructorTableValues, 0 }; #endif -class JSHTMLDataGridCellElementConstructor : public DOMObject { +class JSHTMLDataGridCellElementConstructor : public DOMConstructorObject { public: - JSHTMLDataGridCellElementConstructor(ExecState* exec) - : DOMObject(JSHTMLDataGridCellElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLDataGridCellElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLDataGridCellElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLDataGridCellElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLDataGridCellElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -117,8 +117,8 @@ JSObject* JSHTMLDataGridCellElementPrototype::self(ExecState* exec, JSGlobalObje const ClassInfo JSHTMLDataGridCellElement::s_info = { "HTMLDataGridCellElement", &JSHTMLElement::s_info, &JSHTMLDataGridCellElementTable, 0 }; -JSHTMLDataGridCellElement::JSHTMLDataGridCellElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLDataGridCellElement::JSHTMLDataGridCellElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -134,42 +134,48 @@ bool JSHTMLDataGridCellElement::getOwnPropertySlot(ExecState* exec, const Identi JSValue jsHTMLDataGridCellElementLabel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridCellElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->label()); } JSValue jsHTMLDataGridCellElementFocused(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridCellElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->focused()); } JSValue jsHTMLDataGridCellElementChecked(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridCellElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->checked()); } JSValue jsHTMLDataGridCellElementIndeterminate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridCellElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->indeterminate()); } JSValue jsHTMLDataGridCellElementProgress(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridCellElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->progress()); } JSValue jsHTMLDataGridCellElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLDataGridCellElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLDataGridCellElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLDataGridCellElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -206,9 +212,9 @@ void setJSHTMLDataGridCellElementProgress(ExecState* exec, JSObject* thisObject, imp->setProgress(value.toFloat(exec)); } -JSValue JSHTMLDataGridCellElement::getConstructor(ExecState* exec) +JSValue JSHTMLDataGridCellElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridCellElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridCellElement.h index eb0a6defd..05496eaf0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridCellElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridCellElement.h @@ -32,7 +32,7 @@ class HTMLDataGridCellElement; class JSHTMLDataGridCellElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLDataGridCellElement(PassRefPtr, PassRefPtr); + JSHTMLDataGridCellElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridColElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridColElement.cpp index 0f750e794..7ecccbcf8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridColElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridColElement.cpp @@ -70,12 +70,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLDataGridColElementConstructorTable = { 1, 0, JSHTMLDataGridColElementConstructorTableValues, 0 }; #endif -class JSHTMLDataGridColElementConstructor : public DOMObject { +class JSHTMLDataGridColElementConstructor : public DOMConstructorObject { public: - JSHTMLDataGridColElementConstructor(ExecState* exec) - : DOMObject(JSHTMLDataGridColElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLDataGridColElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLDataGridColElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLDataGridColElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLDataGridColElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -117,8 +117,8 @@ JSObject* JSHTMLDataGridColElementPrototype::self(ExecState* exec, JSGlobalObjec const ClassInfo JSHTMLDataGridColElement::s_info = { "HTMLDataGridColElement", &JSHTMLElement::s_info, &JSHTMLDataGridColElementTable, 0 }; -JSHTMLDataGridColElement::JSHTMLDataGridColElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLDataGridColElement::JSHTMLDataGridColElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -134,42 +134,48 @@ bool JSHTMLDataGridColElement::getOwnPropertySlot(ExecState* exec, const Identif JSValue jsHTMLDataGridColElementLabel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridColElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridColElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridColElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->label()); } JSValue jsHTMLDataGridColElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridColElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridColElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridColElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLDataGridColElementSortable(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridColElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridColElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridColElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->sortable()); } JSValue jsHTMLDataGridColElementSortDirection(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridColElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridColElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridColElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->sortDirection()); } JSValue jsHTMLDataGridColElementPrimary(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridColElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridColElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridColElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->primary()); } JSValue jsHTMLDataGridColElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLDataGridColElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLDataGridColElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLDataGridColElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -206,9 +212,9 @@ void setJSHTMLDataGridColElementPrimary(ExecState* exec, JSObject* thisObject, J imp->setPrimary(value.toBoolean(exec)); } -JSValue JSHTMLDataGridColElement::getConstructor(ExecState* exec) +JSValue JSHTMLDataGridColElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridColElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridColElement.h index 0fe1b0ed5..bb219106e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridColElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridColElement.h @@ -32,7 +32,7 @@ class HTMLDataGridColElement; class JSHTMLDataGridColElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLDataGridColElement(PassRefPtr, PassRefPtr); + JSHTMLDataGridColElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridElement.cpp index d964c7b93..8da3253a1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridElement.cpp @@ -69,12 +69,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLDataGridElementConstructorTable = { 1, 0, JSHTMLDataGridElementConstructorTableValues, 0 }; #endif -class JSHTMLDataGridElementConstructor : public DOMObject { +class JSHTMLDataGridElementConstructor : public DOMConstructorObject { public: - JSHTMLDataGridElementConstructor(ExecState* exec) - : DOMObject(JSHTMLDataGridElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLDataGridElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLDataGridElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLDataGridElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLDataGridElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -116,8 +116,8 @@ JSObject* JSHTMLDataGridElementPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSHTMLDataGridElement::s_info = { "HTMLDataGridElement", &JSHTMLElement::s_info, &JSHTMLDataGridElementTable, 0 }; -JSHTMLDataGridElement::JSHTMLDataGridElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLDataGridElement::JSHTMLDataGridElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -133,40 +133,46 @@ bool JSHTMLDataGridElement::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsHTMLDataGridElementDataSource(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->dataSource(exec); + JSHTMLDataGridElement* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->dataSource(exec); } JSValue jsHTMLDataGridElementColumns(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->columns())); + HTMLDataGridElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->columns())); } JSValue jsHTMLDataGridElementAutofocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->autofocus()); } JSValue jsHTMLDataGridElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->disabled()); } JSValue jsHTMLDataGridElementMultiple(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->multiple()); } JSValue jsHTMLDataGridElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLDataGridElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLDataGridElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLDataGridElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -196,9 +202,9 @@ void setJSHTMLDataGridElementMultiple(ExecState* exec, JSObject* thisObject, JSV imp->setMultiple(value.toBoolean(exec)); } -JSValue JSHTMLDataGridElement::getConstructor(ExecState* exec) +JSValue JSHTMLDataGridElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridElement.h index 7be0e5e32..bec8e2328 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridElement.h @@ -32,7 +32,7 @@ class HTMLDataGridElement; class JSHTMLDataGridElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLDataGridElement(PassRefPtr, PassRefPtr); + JSHTMLDataGridElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom attributes JSC::JSValue dataSource(JSC::ExecState*) const; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridRowElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridRowElement.cpp index b6a2d9706..af98411f4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridRowElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridRowElement.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLDataGridRowElementConstructorTable = { 1, 0, JSHTMLDataGridRowElementConstructorTableValues, 0 }; #endif -class JSHTMLDataGridRowElementConstructor : public DOMObject { +class JSHTMLDataGridRowElementConstructor : public DOMConstructorObject { public: - JSHTMLDataGridRowElementConstructor(ExecState* exec) - : DOMObject(JSHTMLDataGridRowElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLDataGridRowElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLDataGridRowElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLDataGridRowElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLDataGridRowElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -112,8 +112,8 @@ JSObject* JSHTMLDataGridRowElementPrototype::self(ExecState* exec, JSGlobalObjec const ClassInfo JSHTMLDataGridRowElement::s_info = { "HTMLDataGridRowElement", &JSHTMLElement::s_info, &JSHTMLDataGridRowElementTable, 0 }; -JSHTMLDataGridRowElement::JSHTMLDataGridRowElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLDataGridRowElement::JSHTMLDataGridRowElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -129,28 +129,32 @@ bool JSHTMLDataGridRowElement::getOwnPropertySlot(ExecState* exec, const Identif JSValue jsHTMLDataGridRowElementSelected(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridRowElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridRowElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridRowElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->selected()); } JSValue jsHTMLDataGridRowElementFocused(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridRowElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridRowElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridRowElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->focused()); } JSValue jsHTMLDataGridRowElementExpanded(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDataGridRowElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDataGridRowElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDataGridRowElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->expanded()); } JSValue jsHTMLDataGridRowElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLDataGridRowElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLDataGridRowElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLDataGridRowElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -175,9 +179,9 @@ void setJSHTMLDataGridRowElementExpanded(ExecState* exec, JSObject* thisObject, imp->setExpanded(value.toBoolean(exec)); } -JSValue JSHTMLDataGridRowElement::getConstructor(ExecState* exec) +JSValue JSHTMLDataGridRowElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridRowElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridRowElement.h index 987e8bfa1..c7f77ddfd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridRowElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDataGridRowElement.h @@ -32,7 +32,7 @@ class HTMLDataGridRowElement; class JSHTMLDataGridRowElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLDataGridRowElement(PassRefPtr, PassRefPtr); + JSHTMLDataGridRowElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.cpp index ddad16bb3..a6d86c057 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.cpp @@ -60,12 +60,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLDirectoryElementConstructorTable = { 1, 0, JSHTMLDirectoryElementConstructorTableValues, 0 }; #endif -class JSHTMLDirectoryElementConstructor : public DOMObject { +class JSHTMLDirectoryElementConstructor : public DOMConstructorObject { public: - JSHTMLDirectoryElementConstructor(ExecState* exec) - : DOMObject(JSHTMLDirectoryElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLDirectoryElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLDirectoryElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLDirectoryElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLDirectoryElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -107,8 +107,8 @@ JSObject* JSHTMLDirectoryElementPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSHTMLDirectoryElement::s_info = { "HTMLDirectoryElement", &JSHTMLElement::s_info, &JSHTMLDirectoryElementTable, 0 }; -JSHTMLDirectoryElement::JSHTMLDirectoryElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLDirectoryElement::JSHTMLDirectoryElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -124,14 +124,16 @@ bool JSHTMLDirectoryElement::getOwnPropertySlot(ExecState* exec, const Identifie JSValue jsHTMLDirectoryElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDirectoryElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDirectoryElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDirectoryElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->compact()); } JSValue jsHTMLDirectoryElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLDirectoryElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLDirectoryElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLDirectoryElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -144,9 +146,9 @@ void setJSHTMLDirectoryElementCompact(ExecState* exec, JSObject* thisObject, JSV imp->setCompact(value.toBoolean(exec)); } -JSValue JSHTMLDirectoryElement::getConstructor(ExecState* exec) +JSValue JSHTMLDirectoryElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.h index 09242bfe4..675587c03 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDirectoryElement.h @@ -30,7 +30,7 @@ class HTMLDirectoryElement; class JSHTMLDirectoryElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLDirectoryElement(PassRefPtr, PassRefPtr); + JSHTMLDirectoryElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.cpp index 779666ede..15153e1b5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLDivElementConstructorTable = { 1, 0, JSHTMLDivElementConstructorTableValues, 0 }; #endif -class JSHTMLDivElementConstructor : public DOMObject { +class JSHTMLDivElementConstructor : public DOMConstructorObject { public: - JSHTMLDivElementConstructor(ExecState* exec) - : DOMObject(JSHTMLDivElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLDivElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLDivElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLDivElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLDivElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +109,8 @@ JSObject* JSHTMLDivElementPrototype::self(ExecState* exec, JSGlobalObject* globa const ClassInfo JSHTMLDivElement::s_info = { "HTMLDivElement", &JSHTMLElement::s_info, &JSHTMLDivElementTable, 0 }; -JSHTMLDivElement::JSHTMLDivElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLDivElement::JSHTMLDivElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -126,14 +126,16 @@ bool JSHTMLDivElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsHTMLDivElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDivElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDivElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDivElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLDivElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLDivElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLDivElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLDivElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -146,9 +148,9 @@ void setJSHTMLDivElementAlign(ExecState* exec, JSObject* thisObject, JSValue val imp->setAlign(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLDivElement::getConstructor(ExecState* exec) +JSValue JSHTMLDivElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.h index 1f3545b9c..eeaa89b12 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDivElement.h @@ -30,7 +30,7 @@ class HTMLDivElement; class JSHTMLDivElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLDivElement(PassRefPtr, PassRefPtr); + JSHTMLDivElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.cpp index fd3aaf4bb..f7c385932 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.cpp @@ -83,12 +83,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLDocumentConstructorTable = { 1, 0, JSHTMLDocumentConstructorTableValues, 0 }; #endif -class JSHTMLDocumentConstructor : public DOMObject { +class JSHTMLDocumentConstructor : public DOMConstructorObject { public: - JSHTMLDocumentConstructor(ExecState* exec) - : DOMObject(JSHTMLDocumentConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLDocumentConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLDocumentConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLDocumentPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLDocumentPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -143,8 +143,8 @@ bool JSHTMLDocumentPrototype::getOwnPropertySlot(ExecState* exec, const Identifi const ClassInfo JSHTMLDocument::s_info = { "HTMLDocument", &JSDocument::s_info, &JSHTMLDocumentTable, 0 }; -JSHTMLDocument::JSHTMLDocument(PassRefPtr structure, PassRefPtr impl) - : JSDocument(structure, impl) +JSHTMLDocument::JSHTMLDocument(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSDocument(structure, globalObject, impl) { } @@ -164,110 +164,126 @@ bool JSHTMLDocument::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsHTMLDocumentEmbeds(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->embeds())); + HTMLDocument* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->embeds())); } JSValue jsHTMLDocumentPlugins(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->plugins())); + HTMLDocument* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->plugins())); } JSValue jsHTMLDocumentScripts(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->scripts())); + HTMLDocument* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->scripts())); } JSValue jsHTMLDocumentAll(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->all(exec); + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->all(exec); } JSValue jsHTMLDocumentWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDocument* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->width()); } JSValue jsHTMLDocumentHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDocument* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->height()); } JSValue jsHTMLDocumentDir(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDocument* imp = static_cast(castedThis->impl()); return jsString(exec, imp->dir()); } JSValue jsHTMLDocumentDesignMode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDocument* imp = static_cast(castedThis->impl()); return jsString(exec, imp->designMode()); } JSValue jsHTMLDocumentCompatMode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDocument* imp = static_cast(castedThis->impl()); return jsString(exec, imp->compatMode()); } JSValue jsHTMLDocumentActiveElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->activeElement())); + HTMLDocument* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->activeElement())); } JSValue jsHTMLDocumentBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDocument* imp = static_cast(castedThis->impl()); return jsString(exec, imp->bgColor()); } JSValue jsHTMLDocumentFgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDocument* imp = static_cast(castedThis->impl()); return jsString(exec, imp->fgColor()); } JSValue jsHTMLDocumentAlinkColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDocument* imp = static_cast(castedThis->impl()); return jsString(exec, imp->alinkColor()); } JSValue jsHTMLDocumentLinkColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDocument* imp = static_cast(castedThis->impl()); return jsString(exec, imp->linkColor()); } JSValue jsHTMLDocumentVlinkColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLDocument* imp = static_cast(castedThis->impl()); return jsString(exec, imp->vlinkColor()); } JSValue jsHTMLDocumentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLDocument* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLDocument::getConstructor(exec, domObject->globalObject()); } void JSHTMLDocument::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -321,9 +337,9 @@ void setJSHTMLDocumentVlinkColor(ExecState* exec, JSObject* thisObject, JSValue imp->setVlinkColor(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLDocument::getConstructor(ExecState* exec) +JSValue JSHTMLDocument::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLDocumentPrototypeFunctionOpen(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.h index 3827df26c..110c7e4ab 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLDocument.h @@ -30,7 +30,7 @@ class HTMLDocument; class JSHTMLDocument : public JSDocument { typedef JSDocument Base; public: - JSHTMLDocument(PassRefPtr, PassRefPtr); + JSHTMLDocument(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom attributes JSC::JSValue all(JSC::ExecState*) const; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.cpp index 25e9bca38..7fe918a13 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.cpp @@ -41,7 +41,7 @@ ASSERT_CLASS_FITS_IN_CELL(JSHTMLElement); /* Hash table */ -static const HashTableValue JSHTMLElementTableValues[15] = +static const HashTableValue JSHTMLElementTableValues[16] = { { "id", DontDelete, (intptr_t)jsHTMLElementId, (intptr_t)setJSHTMLElementId }, { "title", DontDelete, (intptr_t)jsHTMLElementTitle, (intptr_t)setJSHTMLElementTitle }, @@ -49,6 +49,7 @@ static const HashTableValue JSHTMLElementTableValues[15] = { "dir", DontDelete, (intptr_t)jsHTMLElementDir, (intptr_t)setJSHTMLElementDir }, { "className", DontDelete, (intptr_t)jsHTMLElementClassName, (intptr_t)setJSHTMLElementClassName }, { "tabIndex", DontDelete, (intptr_t)jsHTMLElementTabIndex, (intptr_t)setJSHTMLElementTabIndex }, + { "draggable", DontDelete, (intptr_t)jsHTMLElementDraggable, (intptr_t)setJSHTMLElementDraggable }, { "innerHTML", DontDelete, (intptr_t)jsHTMLElementInnerHTML, (intptr_t)setJSHTMLElementInnerHTML }, { "innerText", DontDelete, (intptr_t)jsHTMLElementInnerText, (intptr_t)setJSHTMLElementInnerText }, { "outerHTML", DontDelete, (intptr_t)jsHTMLElementOuterHTML, (intptr_t)setJSHTMLElementOuterHTML }, @@ -81,12 +82,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLElementConstructorTable = { 1, 0, JSHTMLElementConstructorTableValues, 0 }; #endif -class JSHTMLElementConstructor : public DOMObject { +class JSHTMLElementConstructor : public DOMConstructorObject { public: - JSHTMLElementConstructor(ExecState* exec) - : DOMObject(JSHTMLElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -136,8 +137,8 @@ bool JSHTMLElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifie const ClassInfo JSHTMLElement::s_info = { "HTMLElement", &JSElement::s_info, &JSHTMLElementTable, 0 }; -JSHTMLElement::JSHTMLElement(PassRefPtr structure, PassRefPtr impl) - : JSElement(structure, impl) +JSHTMLElement::JSHTMLElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSElement(structure, globalObject, impl) { } @@ -153,98 +154,120 @@ bool JSHTMLElement::getOwnPropertySlot(ExecState* exec, const Identifier& proper JSValue jsHTMLElementId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->getAttribute(HTMLNames::idAttr)); } JSValue jsHTMLElementTitle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->getAttribute(HTMLNames::titleAttr)); } JSValue jsHTMLElementLang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->getAttribute(HTMLNames::langAttr)); } JSValue jsHTMLElementDir(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->getAttribute(HTMLNames::dirAttr)); } JSValue jsHTMLElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->getAttribute(HTMLNames::classAttr)); } JSValue jsHTMLElementTabIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->tabIndex()); } +JSValue jsHTMLElementDraggable(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); + UNUSED_PARAM(exec); + HTMLElement* imp = static_cast(castedThis->impl()); + return jsBoolean(imp->draggable()); +} + JSValue jsHTMLElementInnerHTML(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->innerHTML()); } JSValue jsHTMLElementInnerText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->innerText()); } JSValue jsHTMLElementOuterHTML(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->outerHTML()); } JSValue jsHTMLElementOuterText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->outerText()); } JSValue jsHTMLElementChildren(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->children())); + HTMLElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->children())); } JSValue jsHTMLElementContentEditable(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->contentEditable()); } JSValue jsHTMLElementIsContentEditable(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->isContentEditable()); } JSValue jsHTMLElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -287,6 +310,12 @@ void setJSHTMLElementTabIndex(ExecState* exec, JSObject* thisObject, JSValue val imp->setTabIndex(value.toInt32(exec)); } +void setJSHTMLElementDraggable(ExecState* exec, JSObject* thisObject, JSValue value) +{ + HTMLElement* imp = static_cast(static_cast(thisObject)->impl()); + imp->setDraggable(value.toBoolean(exec)); +} + void setJSHTMLElementInnerHTML(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLElement* imp = static_cast(static_cast(thisObject)->impl()); @@ -325,9 +354,9 @@ void setJSHTMLElementContentEditable(ExecState* exec, JSObject* thisObject, JSVa imp->setContentEditable(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLElement::getConstructor(ExecState* exec) +JSValue JSHTMLElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLElementPrototypeFunctionInsertAdjacentElement(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -342,7 +371,7 @@ JSValue JSC_HOST_CALL jsHTMLElementPrototypeFunctionInsertAdjacentElement(ExecSt Element* element = toElement(args.at(1)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->insertAdjacentElement(where, element, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->insertAdjacentElement(where, element, ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.h index d4ca1f333..76757324b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLElement.h @@ -31,7 +31,7 @@ class HTMLElement; class JSHTMLElement : public JSElement { typedef JSElement Base; public: - JSHTMLElement(PassRefPtr, PassRefPtr); + JSHTMLElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -45,7 +45,7 @@ public: virtual void pushEventHandlerScope(JSC::ExecState*, JSC::ScopeChain&) const; - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); HTMLElement* impl() const { return static_cast(Base::impl()); @@ -87,6 +87,8 @@ JSC::JSValue jsHTMLElementClassName(JSC::ExecState*, const JSC::Identifier&, con void setJSHTMLElementClassName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLElementTabIndex(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSHTMLElementTabIndex(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLElementDraggable(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLElementDraggable(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLElementInnerHTML(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSHTMLElementInnerHTML(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLElementInnerText(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLElementWrapperFactory.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLElementWrapperFactory.cpp index aaedcca56..1e9dc4294 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLElementWrapperFactory.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLElementWrapperFactory.cpp @@ -170,358 +170,358 @@ namespace WebCore { using namespace HTMLNames; -typedef JSNode* (*CreateHTMLElementWrapperFunction)(ExecState*, PassRefPtr); +typedef JSNode* (*CreateHTMLElementWrapperFunction)(ExecState*, JSDOMGlobalObject*, PassRefPtr); -static JSNode* createHTMLAnchorElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLAnchorElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLAnchorElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLAnchorElement, element.get()); } -static JSNode* createHTMLAppletElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLAppletElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLAppletElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLAppletElement, element.get()); } -static JSNode* createHTMLAreaElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLAreaElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLAreaElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLAreaElement, element.get()); } #if ENABLE(VIDEO) -static JSNode* createHTMLAudioElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLAudioElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { if (!MediaPlayer::isAvailable()) - return CREATE_DOM_NODE_WRAPPER(exec, HTMLElement, element.get()); - return CREATE_DOM_NODE_WRAPPER(exec, HTMLAudioElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLAudioElement, element.get()); } #endif -static JSNode* createHTMLBaseElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLBaseElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLBaseElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLBaseElement, element.get()); } -static JSNode* createHTMLBaseFontElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLBaseFontElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLBaseFontElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLBaseFontElement, element.get()); } -static JSNode* createHTMLBlockquoteElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLBlockquoteElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLBlockquoteElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLBlockquoteElement, element.get()); } -static JSNode* createHTMLBodyElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLBodyElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLBodyElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLBodyElement, element.get()); } -static JSNode* createHTMLBRElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLBRElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLBRElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLBRElement, element.get()); } -static JSNode* createHTMLButtonElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLButtonElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLButtonElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLButtonElement, element.get()); } -static JSNode* createHTMLCanvasElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLCanvasElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLCanvasElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLCanvasElement, element.get()); } -static JSNode* createHTMLTableCaptionElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLTableCaptionElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLTableCaptionElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLTableCaptionElement, element.get()); } -static JSNode* createHTMLTableColElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLTableColElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLTableColElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLTableColElement, element.get()); } #if ENABLE(DATAGRID) -static JSNode* createHTMLDataGridElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLDataGridElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLDataGridElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLDataGridElement, element.get()); } #endif #if ENABLE(DATAGRID) -static JSNode* createHTMLDataGridCellElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLDataGridCellElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLDataGridCellElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLDataGridCellElement, element.get()); } #endif #if ENABLE(DATAGRID) -static JSNode* createHTMLDataGridColElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLDataGridColElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLDataGridColElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLDataGridColElement, element.get()); } #endif -static JSNode* createHTMLModElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLModElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLModElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLModElement, element.get()); } -static JSNode* createHTMLDirectoryElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLDirectoryElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLDirectoryElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLDirectoryElement, element.get()); } -static JSNode* createHTMLDivElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLDivElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLDivElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLDivElement, element.get()); } -static JSNode* createHTMLDListElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLDListElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLDListElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLDListElement, element.get()); } #if ENABLE(DATAGRID) -static JSNode* createHTMLDataGridRowElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLDataGridRowElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLDataGridRowElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLDataGridRowElement, element.get()); } #endif -static JSNode* createHTMLEmbedElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLEmbedElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLEmbedElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLEmbedElement, element.get()); } -static JSNode* createHTMLFieldSetElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLFieldSetElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLFieldSetElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLFieldSetElement, element.get()); } -static JSNode* createHTMLFontElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLFontElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLFontElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLFontElement, element.get()); } -static JSNode* createHTMLFormElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLFormElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLFormElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLFormElement, element.get()); } -static JSNode* createHTMLFrameElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLFrameElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLFrameElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLFrameElement, element.get()); } -static JSNode* createHTMLFrameSetElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLFrameSetElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLFrameSetElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLFrameSetElement, element.get()); } -static JSNode* createHTMLHeadingElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLHeadingElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLHeadingElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLHeadingElement, element.get()); } -static JSNode* createHTMLHeadElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLHeadElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLHeadElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLHeadElement, element.get()); } -static JSNode* createHTMLHRElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLHRElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLHRElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLHRElement, element.get()); } -static JSNode* createHTMLHtmlElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLHtmlElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLHtmlElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLHtmlElement, element.get()); } -static JSNode* createHTMLIFrameElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLIFrameElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLIFrameElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLIFrameElement, element.get()); } -static JSNode* createHTMLImageElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLImageElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLImageElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLImageElement, element.get()); } -static JSNode* createHTMLInputElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLInputElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLInputElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLInputElement, element.get()); } -static JSNode* createHTMLIsIndexElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLIsIndexElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLIsIndexElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLIsIndexElement, element.get()); } -static JSNode* createHTMLSelectElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLSelectElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLSelectElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLSelectElement, element.get()); } -static JSNode* createHTMLLabelElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLLabelElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLLabelElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLLabelElement, element.get()); } -static JSNode* createHTMLLegendElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLLegendElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLLegendElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLLegendElement, element.get()); } -static JSNode* createHTMLLIElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLLIElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLLIElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLLIElement, element.get()); } -static JSNode* createHTMLLinkElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLLinkElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLLinkElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLLinkElement, element.get()); } -static JSNode* createHTMLPreElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLPreElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLPreElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLPreElement, element.get()); } -static JSNode* createHTMLMapElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLMapElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLMapElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLMapElement, element.get()); } -static JSNode* createHTMLMarqueeElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLMarqueeElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLMarqueeElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLMarqueeElement, element.get()); } -static JSNode* createHTMLMenuElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLMenuElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLMenuElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLMenuElement, element.get()); } -static JSNode* createHTMLMetaElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLMetaElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLMetaElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLMetaElement, element.get()); } -static JSNode* createHTMLObjectElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLObjectElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLObjectElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLObjectElement, element.get()); } -static JSNode* createHTMLOListElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLOListElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLOListElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLOListElement, element.get()); } -static JSNode* createHTMLOptGroupElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLOptGroupElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLOptGroupElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLOptGroupElement, element.get()); } -static JSNode* createHTMLOptionElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLOptionElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLOptionElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLOptionElement, element.get()); } -static JSNode* createHTMLParagraphElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLParagraphElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLParagraphElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLParagraphElement, element.get()); } -static JSNode* createHTMLParamElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLParamElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLParamElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLParamElement, element.get()); } -static JSNode* createHTMLQuoteElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLQuoteElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLQuoteElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLQuoteElement, element.get()); } -static JSNode* createHTMLScriptElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLScriptElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLScriptElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLScriptElement, element.get()); } #if ENABLE(VIDEO) -static JSNode* createHTMLSourceElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLSourceElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { if (!MediaPlayer::isAvailable()) - return CREATE_DOM_NODE_WRAPPER(exec, HTMLElement, element.get()); - return CREATE_DOM_NODE_WRAPPER(exec, HTMLSourceElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLSourceElement, element.get()); } #endif -static JSNode* createHTMLStyleElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLStyleElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLStyleElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLStyleElement, element.get()); } -static JSNode* createHTMLTableElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLTableElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLTableElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLTableElement, element.get()); } -static JSNode* createHTMLTableSectionElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLTableSectionElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLTableSectionElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLTableSectionElement, element.get()); } -static JSNode* createHTMLTableCellElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLTableCellElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLTableCellElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLTableCellElement, element.get()); } -static JSNode* createHTMLTextAreaElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLTextAreaElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLTextAreaElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLTextAreaElement, element.get()); } -static JSNode* createHTMLTitleElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLTitleElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLTitleElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLTitleElement, element.get()); } -static JSNode* createHTMLTableRowElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLTableRowElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLTableRowElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLTableRowElement, element.get()); } -static JSNode* createHTMLUListElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLUListElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, HTMLUListElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLUListElement, element.get()); } #if ENABLE(VIDEO) -static JSNode* createHTMLVideoElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createHTMLVideoElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { if (!MediaPlayer::isAvailable()) - return CREATE_DOM_NODE_WRAPPER(exec, HTMLElement, element.get()); - return CREATE_DOM_NODE_WRAPPER(exec, HTMLVideoElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLVideoElement, element.get()); } #endif -JSNode* createJSHTMLWrapper(ExecState* exec, PassRefPtr element) +JSNode* createJSHTMLWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { typedef HashMap FunctionMap; DEFINE_STATIC_LOCAL(FunctionMap, map, ()); @@ -620,8 +620,8 @@ JSNode* createJSHTMLWrapper(ExecState* exec, PassRefPtr element) } CreateHTMLElementWrapperFunction createWrapperFunction = map.get(element->localName().impl()); if (createWrapperFunction) - return createWrapperFunction(exec, element); - return CREATE_DOM_NODE_WRAPPER(exec, HTMLElement, element.get()); + return createWrapperFunction(exec, globalObject, element); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, HTMLElement, element.get()); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLElementWrapperFactory.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLElementWrapperFactory.h index 9d11bbf6e..826f4fe81 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLElementWrapperFactory.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLElementWrapperFactory.h @@ -39,9 +39,10 @@ namespace JSC { namespace WebCore { class JSNode; + class JSDOMGlobalObject; class HTMLElement; - JSNode* createJSHTMLWrapper(JSC::ExecState*, PassRefPtr); + JSNode* createJSHTMLWrapper(JSC::ExecState*, JSDOMGlobalObject*, PassRefPtr); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.cpp index b1c63f8a0..430ca1c52 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.cpp @@ -73,12 +73,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLEmbedElementConstructorTable = { 1, 0, JSHTMLEmbedElementConstructorTableValues, 0 }; #endif -class JSHTMLEmbedElementConstructor : public DOMObject { +class JSHTMLEmbedElementConstructor : public DOMConstructorObject { public: - JSHTMLEmbedElementConstructor(ExecState* exec) - : DOMObject(JSHTMLEmbedElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLEmbedElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLEmbedElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLEmbedElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLEmbedElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -126,8 +126,8 @@ bool JSHTMLEmbedElementPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSHTMLEmbedElement::s_info = { "HTMLEmbedElement", &JSHTMLElement::s_info, &JSHTMLEmbedElementTable, 0 }; -JSHTMLEmbedElement::JSHTMLEmbedElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLEmbedElement::JSHTMLEmbedElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -149,49 +149,56 @@ bool JSHTMLEmbedElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLEmbedElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLEmbedElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLEmbedElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLEmbedElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLEmbedElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLEmbedElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLEmbedElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLEmbedElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->height()); } JSValue jsHTMLEmbedElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLEmbedElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLEmbedElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLEmbedElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsHTMLEmbedElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLEmbedElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLEmbedElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLEmbedElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->src()); } JSValue jsHTMLEmbedElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLEmbedElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLEmbedElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLEmbedElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLEmbedElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLEmbedElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLEmbedElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLEmbedElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->width()); } JSValue jsHTMLEmbedElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLEmbedElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLEmbedElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLEmbedElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -236,9 +243,9 @@ void setJSHTMLEmbedElementWidth(ExecState* exec, JSObject* thisObject, JSValue v imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLEmbedElement::getConstructor(ExecState* exec) +JSValue JSHTMLEmbedElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLEmbedElementPrototypeFunctionGetSVGDocument(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -253,7 +260,7 @@ JSValue JSC_HOST_CALL jsHTMLEmbedElementPrototypeFunctionGetSVGDocument(ExecStat return jsUndefined(); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getSVGDocument(ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getSVGDocument(ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.h index 2538ee356..92eb7fef8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLEmbedElement.h @@ -31,7 +31,7 @@ class HTMLEmbedElement; class JSHTMLEmbedElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLEmbedElement(PassRefPtr, PassRefPtr); + JSHTMLEmbedElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); bool getOwnPropertySlotDelegate(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); @@ -47,7 +47,7 @@ public: virtual JSC::CallType getCallData(JSC::CallData&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); private: static bool canGetItemsForName(JSC::ExecState*, HTMLEmbedElement*, const JSC::Identifier&); static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.cpp index 07dc1700d..ddf115f7b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLFieldSetElementConstructorTable = { 1, 0, JSHTMLFieldSetElementConstructorTableValues, 0 }; #endif -class JSHTMLFieldSetElementConstructor : public DOMObject { +class JSHTMLFieldSetElementConstructor : public DOMConstructorObject { public: - JSHTMLFieldSetElementConstructor(ExecState* exec) - : DOMObject(JSHTMLFieldSetElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLFieldSetElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLFieldSetElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLFieldSetElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLFieldSetElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -113,8 +113,8 @@ JSObject* JSHTMLFieldSetElementPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSHTMLFieldSetElement::s_info = { "HTMLFieldSetElement", &JSHTMLElement::s_info, &JSHTMLFieldSetElementTable, 0 }; -JSHTMLFieldSetElement::JSHTMLFieldSetElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLFieldSetElement::JSHTMLFieldSetElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -130,32 +130,36 @@ bool JSHTMLFieldSetElement::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsHTMLFieldSetElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFieldSetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFieldSetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->form())); + HTMLFieldSetElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->form())); } JSValue jsHTMLFieldSetElementValidity(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFieldSetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFieldSetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->validity())); + HTMLFieldSetElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->validity())); } JSValue jsHTMLFieldSetElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFieldSetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFieldSetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFieldSetElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->willValidate()); } JSValue jsHTMLFieldSetElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLFieldSetElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLFieldSetElement::getConstructor(exec, domObject->globalObject()); } -JSValue JSHTMLFieldSetElement::getConstructor(ExecState* exec) +JSValue JSHTMLFieldSetElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.h index 6966b40b9..d339d21e9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFieldSetElement.h @@ -30,7 +30,7 @@ class HTMLFieldSetElement; class JSHTMLFieldSetElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLFieldSetElement(PassRefPtr, PassRefPtr); + JSHTMLFieldSetElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.cpp index 5d80326c4..4ed60a21e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.cpp @@ -64,12 +64,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLFontElementConstructorTable = { 1, 0, JSHTMLFontElementConstructorTableValues, 0 }; #endif -class JSHTMLFontElementConstructor : public DOMObject { +class JSHTMLFontElementConstructor : public DOMConstructorObject { public: - JSHTMLFontElementConstructor(ExecState* exec) - : DOMObject(JSHTMLFontElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLFontElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLFontElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLFontElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLFontElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -111,8 +111,8 @@ JSObject* JSHTMLFontElementPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSHTMLFontElement::s_info = { "HTMLFontElement", &JSHTMLElement::s_info, &JSHTMLFontElementTable, 0 }; -JSHTMLFontElement::JSHTMLFontElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLFontElement::JSHTMLFontElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -128,28 +128,32 @@ bool JSHTMLFontElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsHTMLFontElementColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFontElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFontElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFontElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->color()); } JSValue jsHTMLFontElementFace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFontElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFontElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFontElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->face()); } JSValue jsHTMLFontElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFontElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFontElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFontElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->size()); } JSValue jsHTMLFontElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLFontElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLFontElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLFontElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -174,9 +178,9 @@ void setJSHTMLFontElementSize(ExecState* exec, JSObject* thisObject, JSValue val imp->setSize(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLFontElement::getConstructor(ExecState* exec) +JSValue JSHTMLFontElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.h index c53d90aa4..6edf8fea6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFontElement.h @@ -30,7 +30,7 @@ class HTMLFontElement; class JSHTMLFontElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLFontElement(PassRefPtr, PassRefPtr); + JSHTMLFontElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.cpp index c3cb279b2..1f941c025 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.cpp @@ -76,12 +76,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLFormElementConstructorTable = { 1, 0, JSHTMLFormElementConstructorTableValues, 0 }; #endif -class JSHTMLFormElementConstructor : public DOMObject { +class JSHTMLFormElementConstructor : public DOMConstructorObject { public: - JSHTMLFormElementConstructor(ExecState* exec) - : DOMObject(JSHTMLFormElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLFormElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLFormElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLFormElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLFormElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -130,8 +130,8 @@ bool JSHTMLFormElementPrototype::getOwnPropertySlot(ExecState* exec, const Ident const ClassInfo JSHTMLFormElement::s_info = { "HTMLFormElement", &JSHTMLElement::s_info, &JSHTMLFormElementTable, 0 }; -JSHTMLFormElement::JSHTMLFormElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLFormElement::JSHTMLFormElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -162,70 +162,80 @@ bool JSHTMLFormElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsHTMLFormElementElements(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFormElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFormElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->elements())); + HTMLFormElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->elements())); } JSValue jsHTMLFormElementLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFormElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFormElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFormElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsHTMLFormElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFormElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFormElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFormElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsHTMLFormElementAcceptCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFormElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFormElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFormElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->acceptCharset()); } JSValue jsHTMLFormElementAction(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFormElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFormElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFormElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->action()); } JSValue jsHTMLFormElementEncoding(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFormElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFormElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFormElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->encoding()); } JSValue jsHTMLFormElementEnctype(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFormElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFormElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFormElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->enctype()); } JSValue jsHTMLFormElementMethod(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFormElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFormElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFormElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->method()); } JSValue jsHTMLFormElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFormElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFormElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFormElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->target()); } JSValue jsHTMLFormElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLFormElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLFormElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLFormElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -281,9 +291,9 @@ void JSHTMLFormElement::getPropertyNames(ExecState* exec, PropertyNameArray& pro Base::getPropertyNames(exec, propertyNames); } -JSValue JSHTMLFormElement::getConstructor(ExecState* exec) +JSValue JSHTMLFormElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLFormElementPrototypeFunctionSubmit(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -311,7 +321,7 @@ JSValue JSC_HOST_CALL jsHTMLFormElementPrototypeFunctionReset(ExecState* exec, J JSValue JSHTMLFormElement::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSHTMLFormElement* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.h index b44e6db04..6ad5c004f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFormElement.h @@ -30,7 +30,7 @@ class HTMLFormElement; class JSHTMLFormElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLFormElement(PassRefPtr, PassRefPtr); + JSHTMLFormElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -43,7 +43,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom functions JSC::JSValue submit(JSC::ExecState*, const JSC::ArgList&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.cpp index d11a90808..2a8778547 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.cpp @@ -83,12 +83,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLFrameElementConstructorTable = { 1, 0, JSHTMLFrameElementConstructorTableValues, 0 }; #endif -class JSHTMLFrameElementConstructor : public DOMObject { +class JSHTMLFrameElementConstructor : public DOMConstructorObject { public: - JSHTMLFrameElementConstructor(ExecState* exec) - : DOMObject(JSHTMLFrameElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLFrameElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLFrameElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLFrameElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLFrameElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -136,8 +136,8 @@ bool JSHTMLFrameElementPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSHTMLFrameElement::s_info = { "HTMLFrameElement", &JSHTMLElement::s_info, &JSHTMLFrameElementTable, 0 }; -JSHTMLFrameElement::JSHTMLFrameElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLFrameElement::JSHTMLFrameElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -153,97 +153,111 @@ bool JSHTMLFrameElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLFrameElementFrameBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->frameBorder()); } JSValue jsHTMLFrameElementLongDesc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->longDesc()); } JSValue jsHTMLFrameElementMarginHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->marginHeight()); } JSValue jsHTMLFrameElementMarginWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->marginWidth()); } JSValue jsHTMLFrameElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsHTMLFrameElementNoResize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->noResize()); } JSValue jsHTMLFrameElementScrolling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->scrolling()); } JSValue jsHTMLFrameElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->src()); } JSValue jsHTMLFrameElementContentDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) { - HTMLFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return checkNodeSecurity(exec, imp->contentDocument()) ? toJS(exec, WTF::getPtr(imp->contentDocument())) : jsUndefined(); + JSHTMLFrameElement* castedThis = static_cast(asObject(slot.slotBase())); + HTMLFrameElement* imp = static_cast(castedThis->impl()); + return checkNodeSecurity(exec, imp->contentDocument()) ? toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->contentDocument())) : jsUndefined(); } JSValue jsHTMLFrameElementContentWindow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->contentWindow())); + HTMLFrameElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->contentWindow())); } JSValue jsHTMLFrameElementLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->location()); } JSValue jsHTMLFrameElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->width()); } JSValue jsHTMLFrameElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->height()); } JSValue jsHTMLFrameElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLFrameElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLFrameElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLFrameElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -302,9 +316,9 @@ void setJSHTMLFrameElementLocation(ExecState* exec, JSObject* thisObject, JSValu static_cast(thisObject)->setLocation(exec, value); } -JSValue JSHTMLFrameElement::getConstructor(ExecState* exec) +JSValue JSHTMLFrameElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLFrameElementPrototypeFunctionGetSVGDocument(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -319,7 +333,7 @@ JSValue JSC_HOST_CALL jsHTMLFrameElementPrototypeFunctionGetSVGDocument(ExecStat return jsUndefined(); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getSVGDocument(ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getSVGDocument(ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.h index 573ff5298..c89f3f866 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameElement.h @@ -30,7 +30,7 @@ class HTMLFrameElement; class JSHTMLFrameElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLFrameElement(PassRefPtr, PassRefPtr); + JSHTMLFrameElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom attributes void setSrc(JSC::ExecState*, JSC::JSValue); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.cpp index 358280c15..f72049281 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.cpp @@ -75,12 +75,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLFrameSetElementConstructorTable = { 1, 0, JSHTMLFrameSetElementConstructorTableValues, 0 }; #endif -class JSHTMLFrameSetElementConstructor : public DOMObject { +class JSHTMLFrameSetElementConstructor : public DOMConstructorObject { public: - JSHTMLFrameSetElementConstructor(ExecState* exec) - : DOMObject(JSHTMLFrameSetElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLFrameSetElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLFrameSetElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLFrameSetElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLFrameSetElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -122,8 +122,8 @@ JSObject* JSHTMLFrameSetElementPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSHTMLFrameSetElement::s_info = { "HTMLFrameSetElement", &JSHTMLElement::s_info, &JSHTMLFrameSetElementTable, 0 }; -JSHTMLFrameSetElement::JSHTMLFrameSetElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLFrameSetElement::JSHTMLFrameSetElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -143,22 +143,25 @@ bool JSHTMLFrameSetElement::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsHTMLFrameSetElementCols(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameSetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameSetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameSetElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->cols()); } JSValue jsHTMLFrameSetElementRows(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameSetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameSetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameSetElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->rows()); } JSValue jsHTMLFrameSetElementOnbeforeunload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameSetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameSetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameSetElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onbeforeunload()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -168,8 +171,9 @@ JSValue jsHTMLFrameSetElementOnbeforeunload(ExecState* exec, const Identifier&, JSValue jsHTMLFrameSetElementOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameSetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameSetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameSetElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmessage()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -179,8 +183,9 @@ JSValue jsHTMLFrameSetElementOnmessage(ExecState* exec, const Identifier&, const JSValue jsHTMLFrameSetElementOnoffline(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameSetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameSetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameSetElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onoffline()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -190,8 +195,9 @@ JSValue jsHTMLFrameSetElementOnoffline(ExecState* exec, const Identifier&, const JSValue jsHTMLFrameSetElementOnonline(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameSetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameSetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameSetElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ononline()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -201,8 +207,9 @@ JSValue jsHTMLFrameSetElementOnonline(ExecState* exec, const Identifier&, const JSValue jsHTMLFrameSetElementOnresize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameSetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameSetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameSetElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onresize()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -212,8 +219,9 @@ JSValue jsHTMLFrameSetElementOnresize(ExecState* exec, const Identifier&, const JSValue jsHTMLFrameSetElementOnstorage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameSetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameSetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameSetElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onstorage()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -223,8 +231,9 @@ JSValue jsHTMLFrameSetElementOnstorage(ExecState* exec, const Identifier&, const JSValue jsHTMLFrameSetElementOnunload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLFrameSetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLFrameSetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLFrameSetElement* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onunload()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -234,7 +243,8 @@ JSValue jsHTMLFrameSetElementOnunload(ExecState* exec, const Identifier&, const JSValue jsHTMLFrameSetElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLFrameSetElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLFrameSetElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLFrameSetElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -323,9 +333,9 @@ void setJSHTMLFrameSetElementOnunload(ExecState* exec, JSObject* thisObject, JSV imp->setOnunload(globalObject->createJSAttributeEventListener(value)); } -JSValue JSHTMLFrameSetElement::getConstructor(ExecState* exec) +JSValue JSHTMLFrameSetElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.h index c4528e549..5b0f82f58 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLFrameSetElement.h @@ -30,7 +30,7 @@ class HTMLFrameSetElement; class JSHTMLFrameSetElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLFrameSetElement(PassRefPtr, PassRefPtr); + JSHTMLFrameSetElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); private: static bool canGetItemsForName(JSC::ExecState*, HTMLFrameSetElement*, const JSC::Identifier&); static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.cpp index e20897620..2c4232cfa 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLHRElementConstructorTable = { 1, 0, JSHTMLHRElementConstructorTableValues, 0 }; #endif -class JSHTMLHRElementConstructor : public DOMObject { +class JSHTMLHRElementConstructor : public DOMConstructorObject { public: - JSHTMLHRElementConstructor(ExecState* exec) - : DOMObject(JSHTMLHRElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLHRElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLHRElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLHRElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLHRElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -112,8 +112,8 @@ JSObject* JSHTMLHRElementPrototype::self(ExecState* exec, JSGlobalObject* global const ClassInfo JSHTMLHRElement::s_info = { "HTMLHRElement", &JSHTMLElement::s_info, &JSHTMLHRElementTable, 0 }; -JSHTMLHRElement::JSHTMLHRElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLHRElement::JSHTMLHRElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -129,35 +129,40 @@ bool JSHTMLHRElement::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsHTMLHRElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLHRElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLHRElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLHRElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLHRElementNoShade(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLHRElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLHRElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLHRElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->noShade()); } JSValue jsHTMLHRElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLHRElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLHRElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLHRElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->size()); } JSValue jsHTMLHRElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLHRElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLHRElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLHRElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->width()); } JSValue jsHTMLHRElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLHRElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLHRElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLHRElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -188,9 +193,9 @@ void setJSHTMLHRElementWidth(ExecState* exec, JSObject* thisObject, JSValue valu imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLHRElement::getConstructor(ExecState* exec) +JSValue JSHTMLHRElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.h index fb624404a..c420fae89 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHRElement.h @@ -30,7 +30,7 @@ class HTMLHRElement; class JSHTMLHRElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLHRElement(PassRefPtr, PassRefPtr); + JSHTMLHRElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.cpp index ff1f3e47b..e04d2d9c0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLHeadElementConstructorTable = { 1, 0, JSHTMLHeadElementConstructorTableValues, 0 }; #endif -class JSHTMLHeadElementConstructor : public DOMObject { +class JSHTMLHeadElementConstructor : public DOMConstructorObject { public: - JSHTMLHeadElementConstructor(ExecState* exec) - : DOMObject(JSHTMLHeadElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLHeadElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLHeadElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLHeadElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLHeadElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +109,8 @@ JSObject* JSHTMLHeadElementPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSHTMLHeadElement::s_info = { "HTMLHeadElement", &JSHTMLElement::s_info, &JSHTMLHeadElementTable, 0 }; -JSHTMLHeadElement::JSHTMLHeadElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLHeadElement::JSHTMLHeadElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -126,14 +126,16 @@ bool JSHTMLHeadElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsHTMLHeadElementProfile(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLHeadElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLHeadElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLHeadElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->profile()); } JSValue jsHTMLHeadElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLHeadElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLHeadElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLHeadElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -146,9 +148,9 @@ void setJSHTMLHeadElementProfile(ExecState* exec, JSObject* thisObject, JSValue imp->setProfile(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLHeadElement::getConstructor(ExecState* exec) +JSValue JSHTMLHeadElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.h index b63b31767..95453499c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadElement.h @@ -30,7 +30,7 @@ class HTMLHeadElement; class JSHTMLHeadElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLHeadElement(PassRefPtr, PassRefPtr); + JSHTMLHeadElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.cpp index b4702f3f2..57b3c235d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLHeadingElementConstructorTable = { 1, 0, JSHTMLHeadingElementConstructorTableValues, 0 }; #endif -class JSHTMLHeadingElementConstructor : public DOMObject { +class JSHTMLHeadingElementConstructor : public DOMConstructorObject { public: - JSHTMLHeadingElementConstructor(ExecState* exec) - : DOMObject(JSHTMLHeadingElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLHeadingElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLHeadingElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLHeadingElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLHeadingElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +109,8 @@ JSObject* JSHTMLHeadingElementPrototype::self(ExecState* exec, JSGlobalObject* g const ClassInfo JSHTMLHeadingElement::s_info = { "HTMLHeadingElement", &JSHTMLElement::s_info, &JSHTMLHeadingElementTable, 0 }; -JSHTMLHeadingElement::JSHTMLHeadingElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLHeadingElement::JSHTMLHeadingElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -126,14 +126,16 @@ bool JSHTMLHeadingElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsHTMLHeadingElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLHeadingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLHeadingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLHeadingElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLHeadingElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLHeadingElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLHeadingElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLHeadingElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -146,9 +148,9 @@ void setJSHTMLHeadingElementAlign(ExecState* exec, JSObject* thisObject, JSValue imp->setAlign(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLHeadingElement::getConstructor(ExecState* exec) +JSValue JSHTMLHeadingElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.h index a5fdd87c2..590d603ad 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHeadingElement.h @@ -30,7 +30,7 @@ class HTMLHeadingElement; class JSHTMLHeadingElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLHeadingElement(PassRefPtr, PassRefPtr); + JSHTMLHeadingElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.cpp index 8325f69bf..8060fc171 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLHtmlElementConstructorTable = { 1, 0, JSHTMLHtmlElementConstructorTableValues, 0 }; #endif -class JSHTMLHtmlElementConstructor : public DOMObject { +class JSHTMLHtmlElementConstructor : public DOMConstructorObject { public: - JSHTMLHtmlElementConstructor(ExecState* exec) - : DOMObject(JSHTMLHtmlElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLHtmlElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLHtmlElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLHtmlElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLHtmlElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +109,8 @@ JSObject* JSHTMLHtmlElementPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSHTMLHtmlElement::s_info = { "HTMLHtmlElement", &JSHTMLElement::s_info, &JSHTMLHtmlElementTable, 0 }; -JSHTMLHtmlElement::JSHTMLHtmlElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLHtmlElement::JSHTMLHtmlElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -126,14 +126,16 @@ bool JSHTMLHtmlElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsHTMLHtmlElementVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLHtmlElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLHtmlElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLHtmlElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->version()); } JSValue jsHTMLHtmlElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLHtmlElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLHtmlElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLHtmlElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -146,9 +148,9 @@ void setJSHTMLHtmlElementVersion(ExecState* exec, JSObject* thisObject, JSValue imp->setVersion(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLHtmlElement::getConstructor(ExecState* exec) +JSValue JSHTMLHtmlElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.h index b9e49c782..fb6150acf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLHtmlElement.h @@ -30,7 +30,7 @@ class HTMLHtmlElement; class JSHTMLHtmlElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLHtmlElement(PassRefPtr, PassRefPtr); + JSHTMLHtmlElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.cpp index 557b3a436..b11b75331 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.cpp @@ -81,12 +81,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLIFrameElementConstructorTable = { 1, 0, JSHTMLIFrameElementConstructorTableValues, 0 }; #endif -class JSHTMLIFrameElementConstructor : public DOMObject { +class JSHTMLIFrameElementConstructor : public DOMConstructorObject { public: - JSHTMLIFrameElementConstructor(ExecState* exec) - : DOMObject(JSHTMLIFrameElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLIFrameElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLIFrameElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLIFrameElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLIFrameElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -134,8 +134,8 @@ bool JSHTMLIFrameElementPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSHTMLIFrameElement::s_info = { "HTMLIFrameElement", &JSHTMLElement::s_info, &JSHTMLIFrameElementTable, 0 }; -JSHTMLIFrameElement::JSHTMLIFrameElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLIFrameElement::JSHTMLIFrameElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -151,90 +151,103 @@ bool JSHTMLIFrameElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsHTMLIFrameElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLIFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLIFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLIFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLIFrameElementFrameBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLIFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLIFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLIFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->frameBorder()); } JSValue jsHTMLIFrameElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLIFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLIFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLIFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->height()); } JSValue jsHTMLIFrameElementLongDesc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLIFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLIFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLIFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->longDesc()); } JSValue jsHTMLIFrameElementMarginHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLIFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLIFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLIFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->marginHeight()); } JSValue jsHTMLIFrameElementMarginWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLIFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLIFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLIFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->marginWidth()); } JSValue jsHTMLIFrameElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLIFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLIFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLIFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsHTMLIFrameElementScrolling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLIFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLIFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLIFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->scrolling()); } JSValue jsHTMLIFrameElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLIFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLIFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLIFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->src()); } JSValue jsHTMLIFrameElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLIFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLIFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLIFrameElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->width()); } JSValue jsHTMLIFrameElementContentDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) { - HTMLIFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return checkNodeSecurity(exec, imp->contentDocument()) ? toJS(exec, WTF::getPtr(imp->contentDocument())) : jsUndefined(); + JSHTMLIFrameElement* castedThis = static_cast(asObject(slot.slotBase())); + HTMLIFrameElement* imp = static_cast(castedThis->impl()); + return checkNodeSecurity(exec, imp->contentDocument()) ? toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->contentDocument())) : jsUndefined(); } JSValue jsHTMLIFrameElementContentWindow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLIFrameElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLIFrameElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->contentWindow())); + HTMLIFrameElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->contentWindow())); } JSValue jsHTMLIFrameElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLIFrameElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLIFrameElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLIFrameElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -300,9 +313,9 @@ void setJSHTMLIFrameElementWidth(ExecState* exec, JSObject* thisObject, JSValue imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLIFrameElement::getConstructor(ExecState* exec) +JSValue JSHTMLIFrameElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLIFrameElementPrototypeFunctionGetSVGDocument(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -317,7 +330,7 @@ JSValue JSC_HOST_CALL jsHTMLIFrameElementPrototypeFunctionGetSVGDocument(ExecSta return jsUndefined(); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getSVGDocument(ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getSVGDocument(ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.h index 158ae7068..a1a62beeb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLIFrameElement.h @@ -30,7 +30,7 @@ class HTMLIFrameElement; class JSHTMLIFrameElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLIFrameElement(PassRefPtr, PassRefPtr); + JSHTMLIFrameElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom attributes void setSrc(JSC::ExecState*, JSC::JSValue); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.cpp index da621b226..0fdb3343c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.cpp @@ -81,12 +81,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLImageElementConstructorTable = { 1, 0, JSHTMLImageElementConstructorTableValues, 0 }; #endif -class JSHTMLImageElementConstructor : public DOMObject { +class JSHTMLImageElementConstructor : public DOMConstructorObject { public: - JSHTMLImageElementConstructor(ExecState* exec) - : DOMObject(JSHTMLImageElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLImageElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLImageElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLImageElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLImageElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -128,8 +128,8 @@ JSObject* JSHTMLImageElementPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSHTMLImageElement::s_info = { "HTMLImageElement", &JSHTMLElement::s_info, &JSHTMLImageElementTable, 0 }; -JSHTMLImageElement::JSHTMLImageElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLImageElement::JSHTMLImageElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -145,133 +145,152 @@ bool JSHTMLImageElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLImageElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->getAttribute(HTMLNames::nameAttr)); } JSValue jsHTMLImageElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->getAttribute(HTMLNames::alignAttr)); } JSValue jsHTMLImageElementAlt(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->getAttribute(HTMLNames::altAttr)); } JSValue jsHTMLImageElementBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->getAttribute(HTMLNames::borderAttr)); } JSValue jsHTMLImageElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->height()); } JSValue jsHTMLImageElementHspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->hspace()); } JSValue jsHTMLImageElementIsMap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->isMap()); } JSValue jsHTMLImageElementLongDesc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->getURLAttribute(HTMLNames::longdescAttr)); } JSValue jsHTMLImageElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->getURLAttribute(HTMLNames::srcAttr)); } JSValue jsHTMLImageElementUseMap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->getAttribute(HTMLNames::usemapAttr)); } JSValue jsHTMLImageElementVspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->vspace()); } JSValue jsHTMLImageElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->width()); } JSValue jsHTMLImageElementComplete(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->complete()); } JSValue jsHTMLImageElementLowsrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->getURLAttribute(HTMLNames::lowsrcAttr)); } JSValue jsHTMLImageElementNaturalHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->naturalHeight()); } JSValue jsHTMLImageElementNaturalWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->naturalWidth()); } JSValue jsHTMLImageElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsHTMLImageElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLImageElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } JSValue jsHTMLImageElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLImageElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLImageElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLImageElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -356,9 +375,9 @@ void setJSHTMLImageElementLowsrc(ExecState* exec, JSObject* thisObject, JSValue imp->setAttribute(HTMLNames::lowsrcAttr, valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLImageElement::getConstructor(ExecState* exec) +JSValue JSHTMLImageElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.h index d24fda030..ec618c0d2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLImageElement.h @@ -30,7 +30,7 @@ class HTMLImageElement; class JSHTMLImageElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLImageElement(PassRefPtr, PassRefPtr); + JSHTMLImageElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.cpp index e6111bb6a..849989312 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.cpp @@ -24,6 +24,7 @@ #include "FileList.h" #include "HTMLFormElement.h" #include "HTMLInputElement.h" +#include "HTMLNames.h" #include "JSFileList.h" #include "JSHTMLFormElement.h" #include "JSValidityState.h" @@ -42,7 +43,7 @@ ASSERT_CLASS_FITS_IN_CELL(JSHTMLInputElement); /* Hash table */ -static const HashTableValue JSHTMLInputElementTableValues[28] = +static const HashTableValue JSHTMLInputElementTableValues[30] = { { "defaultValue", DontDelete, (intptr_t)jsHTMLInputElementDefaultValue, (intptr_t)setJSHTMLInputElementDefaultValue }, { "defaultChecked", DontDelete, (intptr_t)jsHTMLInputElementDefaultChecked, (intptr_t)setJSHTMLInputElementDefaultChecked }, @@ -58,8 +59,10 @@ static const HashTableValue JSHTMLInputElementTableValues[28] = { "maxLength", DontDelete, (intptr_t)jsHTMLInputElementMaxLength, (intptr_t)setJSHTMLInputElementMaxLength }, { "multiple", DontDelete, (intptr_t)jsHTMLInputElementMultiple, (intptr_t)setJSHTMLInputElementMultiple }, { "name", DontDelete, (intptr_t)jsHTMLInputElementName, (intptr_t)setJSHTMLInputElementName }, + { "pattern", DontDelete, (intptr_t)jsHTMLInputElementPattern, (intptr_t)setJSHTMLInputElementPattern }, { "placeholder", DontDelete, (intptr_t)jsHTMLInputElementPlaceholder, (intptr_t)setJSHTMLInputElementPlaceholder }, { "readOnly", DontDelete, (intptr_t)jsHTMLInputElementReadOnly, (intptr_t)setJSHTMLInputElementReadOnly }, + { "required", DontDelete, (intptr_t)jsHTMLInputElementRequired, (intptr_t)setJSHTMLInputElementRequired }, { "size", DontDelete, (intptr_t)jsHTMLInputElementSize, (intptr_t)setJSHTMLInputElementSize }, { "src", DontDelete, (intptr_t)jsHTMLInputElementSrc, (intptr_t)setJSHTMLInputElementSrc }, { "type", DontDelete, (intptr_t)jsHTMLInputElementType, (intptr_t)setJSHTMLInputElementType }, @@ -76,9 +79,9 @@ static const HashTableValue JSHTMLInputElementTableValues[28] = static JSC_CONST_HASHTABLE HashTable JSHTMLInputElementTable = #if ENABLE(PERFECT_HASH_SIZE) - { 255, JSHTMLInputElementTableValues, 0 }; + { 2047, JSHTMLInputElementTableValues, 0 }; #else - { 70, 63, JSHTMLInputElementTableValues, 0 }; + { 71, 63, JSHTMLInputElementTableValues, 0 }; #endif /* Hash table for constructor */ @@ -95,12 +98,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLInputElementConstructorTable = { 1, 0, JSHTMLInputElementConstructorTableValues, 0 }; #endif -class JSHTMLInputElementConstructor : public DOMObject { +class JSHTMLInputElementConstructor : public DOMConstructorObject { public: - JSHTMLInputElementConstructor(ExecState* exec) - : DOMObject(JSHTMLInputElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLInputElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLInputElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLInputElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLInputElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -150,8 +153,8 @@ bool JSHTMLInputElementPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSHTMLInputElement::s_info = { "HTMLInputElement", &JSHTMLElement::s_info, &JSHTMLInputElementTable, 0 }; -JSHTMLInputElement::JSHTMLInputElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLInputElement::JSHTMLInputElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -167,183 +170,226 @@ bool JSHTMLInputElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLInputElementDefaultValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->defaultValue()); } JSValue jsHTMLInputElementDefaultChecked(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->defaultChecked()); } JSValue jsHTMLInputElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->form())); + HTMLInputElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->form())); } JSValue jsHTMLInputElementValidity(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->validity())); + HTMLInputElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->validity())); } JSValue jsHTMLInputElementAccept(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->accept()); } JSValue jsHTMLInputElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->accessKey()); } JSValue jsHTMLInputElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLInputElementAlt(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->alt()); } JSValue jsHTMLInputElementChecked(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->checked()); } JSValue jsHTMLInputElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->disabled()); } JSValue jsHTMLInputElementAutofocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->autofocus()); } JSValue jsHTMLInputElementMaxLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->maxLength()); } JSValue jsHTMLInputElementMultiple(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->multiple()); } JSValue jsHTMLInputElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } +JSValue jsHTMLInputElementPattern(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); + UNUSED_PARAM(exec); + HTMLInputElement* imp = static_cast(castedThis->impl()); + return jsString(exec, imp->getAttribute(HTMLNames::patternAttr)); +} + JSValue jsHTMLInputElementPlaceholder(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->placeholder()); } JSValue jsHTMLInputElementReadOnly(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->readOnly()); } +JSValue jsHTMLInputElementRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); + UNUSED_PARAM(exec); + HTMLInputElement* imp = static_cast(castedThis->impl()); + return jsBoolean(imp->required()); +} + JSValue jsHTMLInputElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->size()); } JSValue jsHTMLInputElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->src()); } JSValue jsHTMLInputElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->type(exec); + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->type(exec); } JSValue jsHTMLInputElementUseMap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->useMap()); } JSValue jsHTMLInputElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->value()); } JSValue jsHTMLInputElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->willValidate()); } JSValue jsHTMLInputElementIndeterminate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLInputElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->indeterminate()); } JSValue jsHTMLInputElementSelectionStart(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->selectionStart(exec); + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->selectionStart(exec); } JSValue jsHTMLInputElementSelectionEnd(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->selectionEnd(exec); + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->selectionEnd(exec); } JSValue jsHTMLInputElementFiles(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLInputElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLInputElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->files())); + HTMLInputElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->files())); } JSValue jsHTMLInputElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLInputElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLInputElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLInputElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -422,6 +468,12 @@ void setJSHTMLInputElementName(ExecState* exec, JSObject* thisObject, JSValue va imp->setName(valueToStringWithNullCheck(exec, value)); } +void setJSHTMLInputElementPattern(ExecState* exec, JSObject* thisObject, JSValue value) +{ + HTMLInputElement* imp = static_cast(static_cast(thisObject)->impl()); + imp->setAttribute(HTMLNames::patternAttr, value.toString(exec)); +} + void setJSHTMLInputElementPlaceholder(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast(static_cast(thisObject)->impl()); @@ -434,6 +486,12 @@ void setJSHTMLInputElementReadOnly(ExecState* exec, JSObject* thisObject, JSValu imp->setReadOnly(value.toBoolean(exec)); } +void setJSHTMLInputElementRequired(ExecState* exec, JSObject* thisObject, JSValue value) +{ + HTMLInputElement* imp = static_cast(static_cast(thisObject)->impl()); + imp->setRequired(value.toBoolean(exec)); +} + void setJSHTMLInputElementSize(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLInputElement* imp = static_cast(static_cast(thisObject)->impl()); @@ -480,9 +538,9 @@ void setJSHTMLInputElementSelectionEnd(ExecState* exec, JSObject* thisObject, JS static_cast(thisObject)->setSelectionEnd(exec, value); } -JSValue JSHTMLInputElement::getConstructor(ExecState* exec) +JSValue JSHTMLInputElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLInputElementPrototypeFunctionSelect(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.h index 52f455e49..8a5f61a5e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLInputElement.h @@ -30,7 +30,7 @@ class HTMLInputElement; class JSHTMLInputElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLInputElement(PassRefPtr, PassRefPtr); + JSHTMLInputElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom attributes JSC::JSValue type(JSC::ExecState*) const; @@ -103,10 +103,14 @@ JSC::JSValue jsHTMLInputElementMultiple(JSC::ExecState*, const JSC::Identifier&, void setJSHTMLInputElementMultiple(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLInputElementName(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSHTMLInputElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementPattern(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementPattern(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLInputElementPlaceholder(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSHTMLInputElementPlaceholder(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLInputElementReadOnly(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSHTMLInputElementReadOnly(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLInputElementRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLInputElementRequired(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLInputElementSize(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSHTMLInputElementSize(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLInputElementSrc(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.cpp index 6322e515c..b937fb583 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLIsIndexElementConstructorTable = { 1, 0, JSHTMLIsIndexElementConstructorTableValues, 0 }; #endif -class JSHTMLIsIndexElementConstructor : public DOMObject { +class JSHTMLIsIndexElementConstructor : public DOMConstructorObject { public: - JSHTMLIsIndexElementConstructor(ExecState* exec) - : DOMObject(JSHTMLIsIndexElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLIsIndexElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLIsIndexElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLIsIndexElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLIsIndexElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -112,8 +112,8 @@ JSObject* JSHTMLIsIndexElementPrototype::self(ExecState* exec, JSGlobalObject* g const ClassInfo JSHTMLIsIndexElement::s_info = { "HTMLIsIndexElement", &JSHTMLInputElement::s_info, &JSHTMLIsIndexElementTable, 0 }; -JSHTMLIsIndexElement::JSHTMLIsIndexElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLInputElement(structure, impl) +JSHTMLIsIndexElement::JSHTMLIsIndexElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLInputElement(structure, globalObject, impl) { } @@ -129,21 +129,24 @@ bool JSHTMLIsIndexElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsHTMLIsIndexElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLIsIndexElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLIsIndexElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->form())); + HTMLIsIndexElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->form())); } JSValue jsHTMLIsIndexElementPrompt(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLIsIndexElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLIsIndexElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLIsIndexElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->prompt()); } JSValue jsHTMLIsIndexElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLIsIndexElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLIsIndexElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLIsIndexElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -156,9 +159,9 @@ void setJSHTMLIsIndexElementPrompt(ExecState* exec, JSObject* thisObject, JSValu imp->setPrompt(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLIsIndexElement::getConstructor(ExecState* exec) +JSValue JSHTMLIsIndexElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.h index a4a3363c2..335e78575 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLIsIndexElement.h @@ -30,7 +30,7 @@ class HTMLIsIndexElement; class JSHTMLIsIndexElement : public JSHTMLInputElement { typedef JSHTMLInputElement Base; public: - JSHTMLIsIndexElement(PassRefPtr, PassRefPtr); + JSHTMLIsIndexElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.cpp index 14ba46454..f82c7b032 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.cpp @@ -64,12 +64,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLLIElementConstructorTable = { 1, 0, JSHTMLLIElementConstructorTableValues, 0 }; #endif -class JSHTMLLIElementConstructor : public DOMObject { +class JSHTMLLIElementConstructor : public DOMConstructorObject { public: - JSHTMLLIElementConstructor(ExecState* exec) - : DOMObject(JSHTMLLIElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLLIElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLLIElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLLIElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLLIElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -111,8 +111,8 @@ JSObject* JSHTMLLIElementPrototype::self(ExecState* exec, JSGlobalObject* global const ClassInfo JSHTMLLIElement::s_info = { "HTMLLIElement", &JSHTMLElement::s_info, &JSHTMLLIElementTable, 0 }; -JSHTMLLIElement::JSHTMLLIElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLLIElement::JSHTMLLIElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -128,21 +128,24 @@ bool JSHTMLLIElement::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsHTMLLIElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLIElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLIElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLIElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLLIElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLIElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLIElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLIElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->value()); } JSValue jsHTMLLIElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLLIElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLLIElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLLIElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -161,9 +164,9 @@ void setJSHTMLLIElementValue(ExecState* exec, JSObject* thisObject, JSValue valu imp->setValue(value.toInt32(exec)); } -JSValue JSHTMLLIElement::getConstructor(ExecState* exec) +JSValue JSHTMLLIElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.h index 1c3ffcd2f..92ee1a6ac 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLIElement.h @@ -30,7 +30,7 @@ class HTMLLIElement; class JSHTMLLIElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLLIElement(PassRefPtr, PassRefPtr); + JSHTMLLIElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.cpp index 37c7c7671..c765a38c0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLLabelElementConstructorTable = { 1, 0, JSHTMLLabelElementConstructorTableValues, 0 }; #endif -class JSHTMLLabelElementConstructor : public DOMObject { +class JSHTMLLabelElementConstructor : public DOMConstructorObject { public: - JSHTMLLabelElementConstructor(ExecState* exec) - : DOMObject(JSHTMLLabelElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLLabelElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLLabelElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLLabelElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLLabelElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -113,8 +113,8 @@ JSObject* JSHTMLLabelElementPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSHTMLLabelElement::s_info = { "HTMLLabelElement", &JSHTMLElement::s_info, &JSHTMLLabelElementTable, 0 }; -JSHTMLLabelElement::JSHTMLLabelElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLLabelElement::JSHTMLLabelElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -130,28 +130,32 @@ bool JSHTMLLabelElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLLabelElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLabelElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLabelElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->form())); + HTMLLabelElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->form())); } JSValue jsHTMLLabelElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLabelElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLabelElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLabelElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->accessKey()); } JSValue jsHTMLLabelElementHtmlFor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLabelElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLabelElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLabelElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->htmlFor()); } JSValue jsHTMLLabelElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLLabelElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLLabelElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLLabelElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -170,9 +174,9 @@ void setJSHTMLLabelElementHtmlFor(ExecState* exec, JSObject* thisObject, JSValue imp->setHtmlFor(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLLabelElement::getConstructor(ExecState* exec) +JSValue JSHTMLLabelElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.h index 32eb0569b..4ec25cc94 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLabelElement.h @@ -30,7 +30,7 @@ class HTMLLabelElement; class JSHTMLLabelElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLLabelElement(PassRefPtr, PassRefPtr); + JSHTMLLabelElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.cpp index b3b985a9f..1094cf4ee 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLLegendElementConstructorTable = { 1, 0, JSHTMLLegendElementConstructorTableValues, 0 }; #endif -class JSHTMLLegendElementConstructor : public DOMObject { +class JSHTMLLegendElementConstructor : public DOMConstructorObject { public: - JSHTMLLegendElementConstructor(ExecState* exec) - : DOMObject(JSHTMLLegendElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLLegendElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLLegendElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLLegendElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLLegendElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -113,8 +113,8 @@ JSObject* JSHTMLLegendElementPrototype::self(ExecState* exec, JSGlobalObject* gl const ClassInfo JSHTMLLegendElement::s_info = { "HTMLLegendElement", &JSHTMLElement::s_info, &JSHTMLLegendElementTable, 0 }; -JSHTMLLegendElement::JSHTMLLegendElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLLegendElement::JSHTMLLegendElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -130,28 +130,32 @@ bool JSHTMLLegendElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsHTMLLegendElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLegendElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLegendElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->form())); + HTMLLegendElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->form())); } JSValue jsHTMLLegendElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLegendElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLegendElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLegendElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->accessKey()); } JSValue jsHTMLLegendElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLegendElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLegendElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLegendElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLLegendElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLLegendElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLLegendElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLLegendElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -170,9 +174,9 @@ void setJSHTMLLegendElementAlign(ExecState* exec, JSObject* thisObject, JSValue imp->setAlign(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLLegendElement::getConstructor(ExecState* exec) +JSValue JSHTMLLegendElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.h index 9f0b2c2ca..507a8ba57 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLegendElement.h @@ -30,7 +30,7 @@ class HTMLLegendElement; class JSHTMLLegendElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLLegendElement(PassRefPtr, PassRefPtr); + JSHTMLLegendElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.cpp index d6bf6340f..616387201 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.cpp @@ -73,12 +73,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLLinkElementConstructorTable = { 1, 0, JSHTMLLinkElementConstructorTableValues, 0 }; #endif -class JSHTMLLinkElementConstructor : public DOMObject { +class JSHTMLLinkElementConstructor : public DOMConstructorObject { public: - JSHTMLLinkElementConstructor(ExecState* exec) - : DOMObject(JSHTMLLinkElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLLinkElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLLinkElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLLinkElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLLinkElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -120,8 +120,8 @@ JSObject* JSHTMLLinkElementPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSHTMLLinkElement::s_info = { "HTMLLinkElement", &JSHTMLElement::s_info, &JSHTMLLinkElementTable, 0 }; -JSHTMLLinkElement::JSHTMLLinkElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLLinkElement::JSHTMLLinkElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -137,77 +137,88 @@ bool JSHTMLLinkElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsHTMLLinkElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLinkElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLinkElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLinkElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->disabled()); } JSValue jsHTMLLinkElementCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLinkElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLinkElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLinkElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->charset()); } JSValue jsHTMLLinkElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLinkElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLinkElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLinkElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->href()); } JSValue jsHTMLLinkElementHreflang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLinkElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLinkElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLinkElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->hreflang()); } JSValue jsHTMLLinkElementMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLinkElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLinkElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLinkElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->media()); } JSValue jsHTMLLinkElementRel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLinkElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLinkElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLinkElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->rel()); } JSValue jsHTMLLinkElementRev(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLinkElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLinkElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLinkElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->rev()); } JSValue jsHTMLLinkElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLinkElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLinkElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLinkElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->target()); } JSValue jsHTMLLinkElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLinkElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLinkElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLLinkElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLLinkElementSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLLinkElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLLinkElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->sheet())); + HTMLLinkElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->sheet())); } JSValue jsHTMLLinkElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLLinkElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLLinkElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLLinkElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -268,9 +279,9 @@ void setJSHTMLLinkElementType(ExecState* exec, JSObject* thisObject, JSValue val imp->setType(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLLinkElement::getConstructor(ExecState* exec) +JSValue JSHTMLLinkElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.h index d1bb4de45..4d3e094bd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLLinkElement.h @@ -30,7 +30,7 @@ class HTMLLinkElement; class JSHTMLLinkElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLLinkElement(PassRefPtr, PassRefPtr); + JSHTMLLinkElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.cpp index 9c9345f6a..ab7fcd61a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLMapElementConstructorTable = { 1, 0, JSHTMLMapElementConstructorTableValues, 0 }; #endif -class JSHTMLMapElementConstructor : public DOMObject { +class JSHTMLMapElementConstructor : public DOMConstructorObject { public: - JSHTMLMapElementConstructor(ExecState* exec) - : DOMObject(JSHTMLMapElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLMapElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLMapElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLMapElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLMapElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -112,8 +112,8 @@ JSObject* JSHTMLMapElementPrototype::self(ExecState* exec, JSGlobalObject* globa const ClassInfo JSHTMLMapElement::s_info = { "HTMLMapElement", &JSHTMLElement::s_info, &JSHTMLMapElementTable, 0 }; -JSHTMLMapElement::JSHTMLMapElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLMapElement::JSHTMLMapElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -129,21 +129,24 @@ bool JSHTMLMapElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsHTMLMapElementAreas(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->areas())); + HTMLMapElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->areas())); } JSValue jsHTMLMapElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMapElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsHTMLMapElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLMapElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLMapElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLMapElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -156,9 +159,9 @@ void setJSHTMLMapElementName(ExecState* exec, JSObject* thisObject, JSValue valu imp->setName(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLMapElement::getConstructor(ExecState* exec) +JSValue JSHTMLMapElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.h index 8476c3a66..23d3a90cc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMapElement.h @@ -30,7 +30,7 @@ class HTMLMapElement; class JSHTMLMapElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLMapElement(PassRefPtr, PassRefPtr); + JSHTMLMapElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.cpp index 2e8c6d357..be92487a1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.cpp @@ -60,12 +60,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLMarqueeElementConstructorTable = { 1, 0, JSHTMLMarqueeElementConstructorTableValues, 0 }; #endif -class JSHTMLMarqueeElementConstructor : public DOMObject { +class JSHTMLMarqueeElementConstructor : public DOMConstructorObject { public: - JSHTMLMarqueeElementConstructor(ExecState* exec) - : DOMObject(JSHTMLMarqueeElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLMarqueeElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLMarqueeElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLMarqueeElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLMarqueeElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -114,8 +114,8 @@ bool JSHTMLMarqueeElementPrototype::getOwnPropertySlot(ExecState* exec, const Id const ClassInfo JSHTMLMarqueeElement::s_info = { "HTMLMarqueeElement", &JSHTMLElement::s_info, &JSHTMLMarqueeElementTable, 0 }; -JSHTMLMarqueeElement::JSHTMLMarqueeElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLMarqueeElement::JSHTMLMarqueeElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -131,11 +131,12 @@ bool JSHTMLMarqueeElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsHTMLMarqueeElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLMarqueeElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLMarqueeElement::getConstructor(exec, domObject->globalObject()); } -JSValue JSHTMLMarqueeElement::getConstructor(ExecState* exec) +JSValue JSHTMLMarqueeElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLMarqueeElementPrototypeFunctionStart(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.h index 238b8d34e..b1ec1afc8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMarqueeElement.h @@ -30,7 +30,7 @@ class HTMLMarqueeElement; class JSHTMLMarqueeElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLMarqueeElement(PassRefPtr, PassRefPtr); + JSHTMLMarqueeElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.cpp index c3c74d385..2778b6e08 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.cpp @@ -103,12 +103,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLMediaElementConstructorTable = { 33, 31, JSHTMLMediaElementConstructorTableValues, 0 }; #endif -class JSHTMLMediaElementConstructor : public DOMObject { +class JSHTMLMediaElementConstructor : public DOMConstructorObject { public: - JSHTMLMediaElementConstructor(ExecState* exec) - : DOMObject(JSHTMLMediaElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLMediaElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLMediaElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLMediaElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLMediaElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -169,8 +169,8 @@ bool JSHTMLMediaElementPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSHTMLMediaElement::s_info = { "HTMLMediaElement", &JSHTMLElement::s_info, &JSHTMLMediaElementTable, 0 }; -JSHTMLMediaElement::JSHTMLMediaElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLMediaElement::JSHTMLMediaElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -186,168 +186,192 @@ bool JSHTMLMediaElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLMediaElementError(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->error())); + HTMLMediaElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->error())); } JSValue jsHTMLMediaElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->src()); } JSValue jsHTMLMediaElementCurrentSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->currentSrc()); } JSValue jsHTMLMediaElementNetworkState(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->networkState()); } JSValue jsHTMLMediaElementAutobuffer(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->autobuffer()); } JSValue jsHTMLMediaElementBuffered(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->buffered())); + HTMLMediaElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->buffered())); } JSValue jsHTMLMediaElementReadyState(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->readyState()); } JSValue jsHTMLMediaElementSeeking(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->seeking()); } JSValue jsHTMLMediaElementCurrentTime(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->currentTime()); } JSValue jsHTMLMediaElementStartTime(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->startTime()); } JSValue jsHTMLMediaElementDuration(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->duration()); } JSValue jsHTMLMediaElementPaused(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->paused()); } JSValue jsHTMLMediaElementDefaultPlaybackRate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->defaultPlaybackRate()); } JSValue jsHTMLMediaElementPlaybackRate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->playbackRate()); } JSValue jsHTMLMediaElementPlayed(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->played())); + HTMLMediaElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->played())); } JSValue jsHTMLMediaElementSeekable(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->seekable())); + HTMLMediaElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->seekable())); } JSValue jsHTMLMediaElementEnded(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->ended()); } JSValue jsHTMLMediaElementAutoplay(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->autoplay()); } JSValue jsHTMLMediaElementLoop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->loop()); } JSValue jsHTMLMediaElementControls(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->controls()); } JSValue jsHTMLMediaElementVolume(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->volume()); } JSValue jsHTMLMediaElementMuted(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->muted()); } JSValue jsHTMLMediaElementWebkitPreservesPitch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMediaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMediaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMediaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->webkitPreservesPitch()); } JSValue jsHTMLMediaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLMediaElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLMediaElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLMediaElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -424,9 +448,9 @@ void setJSHTMLMediaElementWebkitPreservesPitch(ExecState* exec, JSObject* thisOb imp->setWebkitPreservesPitch(value.toBoolean(exec)); } -JSValue JSHTMLMediaElement::getConstructor(ExecState* exec) +JSValue JSHTMLMediaElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLMediaElementPrototypeFunctionLoad(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.h index c0fb829b4..01e1e10f8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMediaElement.h @@ -32,7 +32,7 @@ class HTMLMediaElement; class JSHTMLMediaElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLMediaElement(PassRefPtr, PassRefPtr); + JSHTMLMediaElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.cpp index e658ed843..5319a4688 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.cpp @@ -60,12 +60,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLMenuElementConstructorTable = { 1, 0, JSHTMLMenuElementConstructorTableValues, 0 }; #endif -class JSHTMLMenuElementConstructor : public DOMObject { +class JSHTMLMenuElementConstructor : public DOMConstructorObject { public: - JSHTMLMenuElementConstructor(ExecState* exec) - : DOMObject(JSHTMLMenuElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLMenuElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLMenuElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLMenuElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLMenuElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -107,8 +107,8 @@ JSObject* JSHTMLMenuElementPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSHTMLMenuElement::s_info = { "HTMLMenuElement", &JSHTMLElement::s_info, &JSHTMLMenuElementTable, 0 }; -JSHTMLMenuElement::JSHTMLMenuElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLMenuElement::JSHTMLMenuElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -124,14 +124,16 @@ bool JSHTMLMenuElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsHTMLMenuElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMenuElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMenuElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMenuElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->compact()); } JSValue jsHTMLMenuElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLMenuElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLMenuElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLMenuElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -144,9 +146,9 @@ void setJSHTMLMenuElementCompact(ExecState* exec, JSObject* thisObject, JSValue imp->setCompact(value.toBoolean(exec)); } -JSValue JSHTMLMenuElement::getConstructor(ExecState* exec) +JSValue JSHTMLMenuElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.h index ca9321c19..0002e55bb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMenuElement.h @@ -30,7 +30,7 @@ class HTMLMenuElement; class JSHTMLMenuElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLMenuElement(PassRefPtr, PassRefPtr); + JSHTMLMenuElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.cpp index 6b2652013..c1df16851 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLMetaElementConstructorTable = { 1, 0, JSHTMLMetaElementConstructorTableValues, 0 }; #endif -class JSHTMLMetaElementConstructor : public DOMObject { +class JSHTMLMetaElementConstructor : public DOMConstructorObject { public: - JSHTMLMetaElementConstructor(ExecState* exec) - : DOMObject(JSHTMLMetaElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLMetaElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLMetaElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLMetaElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLMetaElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -112,8 +112,8 @@ JSObject* JSHTMLMetaElementPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSHTMLMetaElement::s_info = { "HTMLMetaElement", &JSHTMLElement::s_info, &JSHTMLMetaElementTable, 0 }; -JSHTMLMetaElement::JSHTMLMetaElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLMetaElement::JSHTMLMetaElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -129,35 +129,40 @@ bool JSHTMLMetaElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsHTMLMetaElementContent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMetaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMetaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMetaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->content()); } JSValue jsHTMLMetaElementHttpEquiv(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMetaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMetaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMetaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->httpEquiv()); } JSValue jsHTMLMetaElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMetaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMetaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMetaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsHTMLMetaElementScheme(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLMetaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLMetaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLMetaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->scheme()); } JSValue jsHTMLMetaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLMetaElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLMetaElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLMetaElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -188,9 +193,9 @@ void setJSHTMLMetaElementScheme(ExecState* exec, JSObject* thisObject, JSValue v imp->setScheme(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLMetaElement::getConstructor(ExecState* exec) +JSValue JSHTMLMetaElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.h index ee531c5d7..acb73af0f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLMetaElement.h @@ -30,7 +30,7 @@ class HTMLMetaElement; class JSHTMLMetaElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLMetaElement(PassRefPtr, PassRefPtr); + JSHTMLMetaElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.cpp index ded7e9f0d..27b71e900 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.cpp @@ -63,12 +63,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLModElementConstructorTable = { 1, 0, JSHTMLModElementConstructorTableValues, 0 }; #endif -class JSHTMLModElementConstructor : public DOMObject { +class JSHTMLModElementConstructor : public DOMConstructorObject { public: - JSHTMLModElementConstructor(ExecState* exec) - : DOMObject(JSHTMLModElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLModElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLModElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLModElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLModElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -110,8 +110,8 @@ JSObject* JSHTMLModElementPrototype::self(ExecState* exec, JSGlobalObject* globa const ClassInfo JSHTMLModElement::s_info = { "HTMLModElement", &JSHTMLElement::s_info, &JSHTMLModElementTable, 0 }; -JSHTMLModElement::JSHTMLModElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLModElement::JSHTMLModElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -127,21 +127,24 @@ bool JSHTMLModElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsHTMLModElementCite(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLModElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLModElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLModElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->cite()); } JSValue jsHTMLModElementDateTime(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLModElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLModElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLModElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->dateTime()); } JSValue jsHTMLModElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLModElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLModElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLModElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -160,9 +163,9 @@ void setJSHTMLModElementDateTime(ExecState* exec, JSObject* thisObject, JSValue imp->setDateTime(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLModElement::getConstructor(ExecState* exec) +JSValue JSHTMLModElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.h index 67b6e0236..b9cfe5b99 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLModElement.h @@ -30,7 +30,7 @@ class HTMLModElement; class JSHTMLModElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLModElement(PassRefPtr, PassRefPtr); + JSHTMLModElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.cpp index 63b781c57..189107c0a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLOListElementConstructorTable = { 1, 0, JSHTMLOListElementConstructorTableValues, 0 }; #endif -class JSHTMLOListElementConstructor : public DOMObject { +class JSHTMLOListElementConstructor : public DOMConstructorObject { public: - JSHTMLOListElementConstructor(ExecState* exec) - : DOMObject(JSHTMLOListElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLOListElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLOListElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLOListElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLOListElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -112,8 +112,8 @@ JSObject* JSHTMLOListElementPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSHTMLOListElement::s_info = { "HTMLOListElement", &JSHTMLElement::s_info, &JSHTMLOListElementTable, 0 }; -JSHTMLOListElement::JSHTMLOListElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLOListElement::JSHTMLOListElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -129,28 +129,32 @@ bool JSHTMLOListElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLOListElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOListElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOListElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLOListElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->compact()); } JSValue jsHTMLOListElementStart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOListElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOListElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLOListElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->start()); } JSValue jsHTMLOListElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOListElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOListElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLOListElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLOListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLOListElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLOListElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLOListElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -175,9 +179,9 @@ void setJSHTMLOListElementType(ExecState* exec, JSObject* thisObject, JSValue va imp->setType(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLOListElement::getConstructor(ExecState* exec) +JSValue JSHTMLOListElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.h index e7cfac538..57dcb6afd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOListElement.h @@ -30,7 +30,7 @@ class HTMLOListElement; class JSHTMLOListElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLOListElement(PassRefPtr, PassRefPtr); + JSHTMLOListElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.cpp index c9f710253..4ca8e94b6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.cpp @@ -90,12 +90,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLObjectElementConstructorTable = { 1, 0, JSHTMLObjectElementConstructorTableValues, 0 }; #endif -class JSHTMLObjectElementConstructor : public DOMObject { +class JSHTMLObjectElementConstructor : public DOMConstructorObject { public: - JSHTMLObjectElementConstructor(ExecState* exec) - : DOMObject(JSHTMLObjectElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLObjectElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLObjectElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLObjectElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLObjectElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -143,8 +143,8 @@ bool JSHTMLObjectElementPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSHTMLObjectElement::s_info = { "HTMLObjectElement", &JSHTMLElement::s_info, &JSHTMLObjectElementTable, 0 }; -JSHTMLObjectElement::JSHTMLObjectElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLObjectElement::JSHTMLObjectElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -166,132 +166,151 @@ bool JSHTMLObjectElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsHTMLObjectElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->form())); + HTMLObjectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->form())); } JSValue jsHTMLObjectElementCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->code()); } JSValue jsHTMLObjectElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLObjectElementArchive(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->archive()); } JSValue jsHTMLObjectElementBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->border()); } JSValue jsHTMLObjectElementCodeBase(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->codeBase()); } JSValue jsHTMLObjectElementCodeType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->codeType()); } JSValue jsHTMLObjectElementData(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->data()); } JSValue jsHTMLObjectElementDeclare(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->declare()); } JSValue jsHTMLObjectElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->height()); } JSValue jsHTMLObjectElementHspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->hspace()); } JSValue jsHTMLObjectElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsHTMLObjectElementStandby(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->standby()); } JSValue jsHTMLObjectElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLObjectElementUseMap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->useMap()); } JSValue jsHTMLObjectElementVspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->vspace()); } JSValue jsHTMLObjectElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->width()); } JSValue jsHTMLObjectElementContentDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) { - HTMLObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return checkNodeSecurity(exec, imp->contentDocument()) ? toJS(exec, WTF::getPtr(imp->contentDocument())) : jsUndefined(); + JSHTMLObjectElement* castedThis = static_cast(asObject(slot.slotBase())); + HTMLObjectElement* imp = static_cast(castedThis->impl()); + return checkNodeSecurity(exec, imp->contentDocument()) ? toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->contentDocument())) : jsUndefined(); } JSValue jsHTMLObjectElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLObjectElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLObjectElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLObjectElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -396,9 +415,9 @@ void setJSHTMLObjectElementWidth(ExecState* exec, JSObject* thisObject, JSValue imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLObjectElement::getConstructor(ExecState* exec) +JSValue JSHTMLObjectElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLObjectElementPrototypeFunctionGetSVGDocument(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -413,7 +432,7 @@ JSValue JSC_HOST_CALL jsHTMLObjectElementPrototypeFunctionGetSVGDocument(ExecSta return jsUndefined(); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getSVGDocument(ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getSVGDocument(ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.h index 5e9d01c68..7414b0cb8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLObjectElement.h @@ -31,7 +31,7 @@ class HTMLObjectElement; class JSHTMLObjectElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLObjectElement(PassRefPtr, PassRefPtr); + JSHTMLObjectElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); bool getOwnPropertySlotDelegate(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); @@ -47,7 +47,7 @@ public: virtual JSC::CallType getCallData(JSC::CallData&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); private: static bool canGetItemsForName(JSC::ExecState*, HTMLObjectElement*, const JSC::Identifier&); static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.cpp index 4b651c4e3..0ed746eca 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.cpp @@ -63,12 +63,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLOptGroupElementConstructorTable = { 1, 0, JSHTMLOptGroupElementConstructorTableValues, 0 }; #endif -class JSHTMLOptGroupElementConstructor : public DOMObject { +class JSHTMLOptGroupElementConstructor : public DOMConstructorObject { public: - JSHTMLOptGroupElementConstructor(ExecState* exec) - : DOMObject(JSHTMLOptGroupElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLOptGroupElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLOptGroupElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLOptGroupElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLOptGroupElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -110,8 +110,8 @@ JSObject* JSHTMLOptGroupElementPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSHTMLOptGroupElement::s_info = { "HTMLOptGroupElement", &JSHTMLElement::s_info, &JSHTMLOptGroupElementTable, 0 }; -JSHTMLOptGroupElement::JSHTMLOptGroupElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLOptGroupElement::JSHTMLOptGroupElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -127,21 +127,24 @@ bool JSHTMLOptGroupElement::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsHTMLOptGroupElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOptGroupElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOptGroupElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLOptGroupElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->disabled()); } JSValue jsHTMLOptGroupElementLabel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOptGroupElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOptGroupElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLOptGroupElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->label()); } JSValue jsHTMLOptGroupElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLOptGroupElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLOptGroupElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLOptGroupElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -160,9 +163,9 @@ void setJSHTMLOptGroupElementLabel(ExecState* exec, JSObject* thisObject, JSValu imp->setLabel(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLOptGroupElement::getConstructor(ExecState* exec) +JSValue JSHTMLOptGroupElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.h index 44cfa4416..d489b26b2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptGroupElement.h @@ -30,7 +30,7 @@ class HTMLOptGroupElement; class JSHTMLOptGroupElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLOptGroupElement(PassRefPtr, PassRefPtr); + JSHTMLOptGroupElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.cpp index 4c9b51a5c..65d92e610 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.cpp @@ -72,12 +72,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLOptionElementConstructorTable = { 1, 0, JSHTMLOptionElementConstructorTableValues, 0 }; #endif -class JSHTMLOptionElementConstructor : public DOMObject { +class JSHTMLOptionElementConstructor : public DOMConstructorObject { public: - JSHTMLOptionElementConstructor(ExecState* exec) - : DOMObject(JSHTMLOptionElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLOptionElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLOptionElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLOptionElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLOptionElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -119,8 +119,8 @@ JSObject* JSHTMLOptionElementPrototype::self(ExecState* exec, JSGlobalObject* gl const ClassInfo JSHTMLOptionElement::s_info = { "HTMLOptionElement", &JSHTMLElement::s_info, &JSHTMLOptionElementTable, 0 }; -JSHTMLOptionElement::JSHTMLOptionElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLOptionElement::JSHTMLOptionElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -136,63 +136,72 @@ bool JSHTMLOptionElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsHTMLOptionElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOptionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOptionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->form())); + HTMLOptionElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->form())); } JSValue jsHTMLOptionElementDefaultSelected(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOptionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOptionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLOptionElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->defaultSelected()); } JSValue jsHTMLOptionElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOptionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOptionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLOptionElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->text()); } JSValue jsHTMLOptionElementIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOptionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOptionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLOptionElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->index()); } JSValue jsHTMLOptionElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOptionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOptionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLOptionElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->disabled()); } JSValue jsHTMLOptionElementLabel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOptionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOptionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLOptionElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->label()); } JSValue jsHTMLOptionElementSelected(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOptionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOptionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLOptionElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->selected()); } JSValue jsHTMLOptionElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOptionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOptionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLOptionElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->value()); } JSValue jsHTMLOptionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLOptionElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLOptionElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLOptionElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -237,9 +246,9 @@ void setJSHTMLOptionElementValue(ExecState* exec, JSObject* thisObject, JSValue imp->setValue(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLOptionElement::getConstructor(ExecState* exec) +JSValue JSHTMLOptionElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } HTMLOptionElement* toHTMLOptionElement(JSC::JSValue value) diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.h index d9bd33843..be931837f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionElement.h @@ -31,7 +31,7 @@ class HTMLOptionElement; class JSHTMLOptionElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLOptionElement(PassRefPtr, PassRefPtr); + JSHTMLOptionElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -43,7 +43,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); HTMLOptionElement* impl() const { return static_cast(Base::impl()); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp index b9e8d15d2..bebf56ac2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.cpp @@ -78,8 +78,8 @@ bool JSHTMLOptionsCollectionPrototype::getOwnPropertySlot(ExecState* exec, const const ClassInfo JSHTMLOptionsCollection::s_info = { "HTMLOptionsCollection", &JSHTMLCollection::s_info, &JSHTMLOptionsCollectionTable, 0 }; -JSHTMLOptionsCollection::JSHTMLOptionsCollection(PassRefPtr structure, PassRefPtr impl) - : JSHTMLCollection(structure, impl) +JSHTMLOptionsCollection::JSHTMLOptionsCollection(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLCollection(structure, globalObject, impl) { } @@ -95,14 +95,16 @@ bool JSHTMLOptionsCollection::getOwnPropertySlot(ExecState* exec, const Identifi JSValue jsHTMLOptionsCollectionSelectedIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLOptionsCollection* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLOptionsCollection* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLOptionsCollection* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->selectedIndex()); } JSValue jsHTMLOptionsCollectionLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->length(exec); + JSHTMLOptionsCollection* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->length(exec); } void JSHTMLOptionsCollection::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.h index 40d89f609..de8669546 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLOptionsCollection.h @@ -31,7 +31,7 @@ class HTMLOptionsCollection; class JSHTMLOptionsCollection : public JSHTMLCollection { typedef JSHTMLCollection Base; public: - JSHTMLOptionsCollection(PassRefPtr, PassRefPtr); + JSHTMLOptionsCollection(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.cpp index b267dc211..f8e9fd617 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLParagraphElementConstructorTable = { 1, 0, JSHTMLParagraphElementConstructorTableValues, 0 }; #endif -class JSHTMLParagraphElementConstructor : public DOMObject { +class JSHTMLParagraphElementConstructor : public DOMConstructorObject { public: - JSHTMLParagraphElementConstructor(ExecState* exec) - : DOMObject(JSHTMLParagraphElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLParagraphElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLParagraphElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLParagraphElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLParagraphElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +109,8 @@ JSObject* JSHTMLParagraphElementPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSHTMLParagraphElement::s_info = { "HTMLParagraphElement", &JSHTMLElement::s_info, &JSHTMLParagraphElementTable, 0 }; -JSHTMLParagraphElement::JSHTMLParagraphElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLParagraphElement::JSHTMLParagraphElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -126,14 +126,16 @@ bool JSHTMLParagraphElement::getOwnPropertySlot(ExecState* exec, const Identifie JSValue jsHTMLParagraphElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLParagraphElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLParagraphElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLParagraphElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLParagraphElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLParagraphElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLParagraphElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLParagraphElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -146,9 +148,9 @@ void setJSHTMLParagraphElementAlign(ExecState* exec, JSObject* thisObject, JSVal imp->setAlign(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLParagraphElement::getConstructor(ExecState* exec) +JSValue JSHTMLParagraphElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.h index 369384989..1fa7ea50c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLParagraphElement.h @@ -30,7 +30,7 @@ class HTMLParagraphElement; class JSHTMLParagraphElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLParagraphElement(PassRefPtr, PassRefPtr); + JSHTMLParagraphElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.cpp index 467df0380..717ff8071 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLParamElementConstructorTable = { 1, 0, JSHTMLParamElementConstructorTableValues, 0 }; #endif -class JSHTMLParamElementConstructor : public DOMObject { +class JSHTMLParamElementConstructor : public DOMConstructorObject { public: - JSHTMLParamElementConstructor(ExecState* exec) - : DOMObject(JSHTMLParamElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLParamElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLParamElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLParamElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLParamElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -112,8 +112,8 @@ JSObject* JSHTMLParamElementPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSHTMLParamElement::s_info = { "HTMLParamElement", &JSHTMLElement::s_info, &JSHTMLParamElementTable, 0 }; -JSHTMLParamElement::JSHTMLParamElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLParamElement::JSHTMLParamElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -129,35 +129,40 @@ bool JSHTMLParamElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLParamElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLParamElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLParamElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLParamElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsHTMLParamElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLParamElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLParamElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLParamElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLParamElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLParamElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLParamElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLParamElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->value()); } JSValue jsHTMLParamElementValueType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLParamElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLParamElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLParamElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->valueType()); } JSValue jsHTMLParamElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLParamElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLParamElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLParamElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -188,9 +193,9 @@ void setJSHTMLParamElementValueType(ExecState* exec, JSObject* thisObject, JSVal imp->setValueType(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLParamElement::getConstructor(ExecState* exec) +JSValue JSHTMLParamElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.h index 7e7760e55..12b80d673 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLParamElement.h @@ -30,7 +30,7 @@ class HTMLParamElement; class JSHTMLParamElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLParamElement(PassRefPtr, PassRefPtr); + JSHTMLParamElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.cpp index b6bc6fb0a..2b7320a1f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLPreElementConstructorTable = { 1, 0, JSHTMLPreElementConstructorTableValues, 0 }; #endif -class JSHTMLPreElementConstructor : public DOMObject { +class JSHTMLPreElementConstructor : public DOMConstructorObject { public: - JSHTMLPreElementConstructor(ExecState* exec) - : DOMObject(JSHTMLPreElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLPreElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLPreElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLPreElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLPreElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +109,8 @@ JSObject* JSHTMLPreElementPrototype::self(ExecState* exec, JSGlobalObject* globa const ClassInfo JSHTMLPreElement::s_info = { "HTMLPreElement", &JSHTMLElement::s_info, &JSHTMLPreElementTable, 0 }; -JSHTMLPreElement::JSHTMLPreElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLPreElement::JSHTMLPreElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -126,21 +126,24 @@ bool JSHTMLPreElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsHTMLPreElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLPreElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLPreElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLPreElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->width()); } JSValue jsHTMLPreElementWrap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLPreElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLPreElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLPreElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->wrap()); } JSValue jsHTMLPreElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLPreElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLPreElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLPreElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -159,9 +162,9 @@ void setJSHTMLPreElementWrap(ExecState* exec, JSObject* thisObject, JSValue valu imp->setWrap(value.toBoolean(exec)); } -JSValue JSHTMLPreElement::getConstructor(ExecState* exec) +JSValue JSHTMLPreElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.h index 1938f930c..439a7b34a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLPreElement.h @@ -30,7 +30,7 @@ class HTMLPreElement; class JSHTMLPreElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLPreElement(PassRefPtr, PassRefPtr); + JSHTMLPreElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.cpp index a8313b920..84fce1b23 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLQuoteElementConstructorTable = { 1, 0, JSHTMLQuoteElementConstructorTableValues, 0 }; #endif -class JSHTMLQuoteElementConstructor : public DOMObject { +class JSHTMLQuoteElementConstructor : public DOMConstructorObject { public: - JSHTMLQuoteElementConstructor(ExecState* exec) - : DOMObject(JSHTMLQuoteElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLQuoteElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLQuoteElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLQuoteElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLQuoteElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +109,8 @@ JSObject* JSHTMLQuoteElementPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSHTMLQuoteElement::s_info = { "HTMLQuoteElement", &JSHTMLElement::s_info, &JSHTMLQuoteElementTable, 0 }; -JSHTMLQuoteElement::JSHTMLQuoteElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLQuoteElement::JSHTMLQuoteElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -126,14 +126,16 @@ bool JSHTMLQuoteElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLQuoteElementCite(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLQuoteElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLQuoteElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLQuoteElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->cite()); } JSValue jsHTMLQuoteElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLQuoteElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLQuoteElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLQuoteElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -146,9 +148,9 @@ void setJSHTMLQuoteElementCite(ExecState* exec, JSObject* thisObject, JSValue va imp->setCite(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLQuoteElement::getConstructor(ExecState* exec) +JSValue JSHTMLQuoteElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.h index a45fc2f2e..26d985ccd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLQuoteElement.h @@ -30,7 +30,7 @@ class HTMLQuoteElement; class JSHTMLQuoteElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLQuoteElement(PassRefPtr, PassRefPtr); + JSHTMLQuoteElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.cpp index 8e157d1c4..42d4410d3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.cpp @@ -68,12 +68,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLScriptElementConstructorTable = { 1, 0, JSHTMLScriptElementConstructorTableValues, 0 }; #endif -class JSHTMLScriptElementConstructor : public DOMObject { +class JSHTMLScriptElementConstructor : public DOMConstructorObject { public: - JSHTMLScriptElementConstructor(ExecState* exec) - : DOMObject(JSHTMLScriptElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLScriptElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLScriptElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLScriptElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLScriptElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -115,8 +115,8 @@ JSObject* JSHTMLScriptElementPrototype::self(ExecState* exec, JSGlobalObject* gl const ClassInfo JSHTMLScriptElement::s_info = { "HTMLScriptElement", &JSHTMLElement::s_info, &JSHTMLScriptElementTable, 0 }; -JSHTMLScriptElement::JSHTMLScriptElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLScriptElement::JSHTMLScriptElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -132,56 +132,64 @@ bool JSHTMLScriptElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsHTMLScriptElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLScriptElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLScriptElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLScriptElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->text()); } JSValue jsHTMLScriptElementHtmlFor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLScriptElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLScriptElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLScriptElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->htmlFor()); } JSValue jsHTMLScriptElementEvent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLScriptElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLScriptElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLScriptElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->event()); } JSValue jsHTMLScriptElementCharset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLScriptElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLScriptElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLScriptElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->charset()); } JSValue jsHTMLScriptElementDefer(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLScriptElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLScriptElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLScriptElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->defer()); } JSValue jsHTMLScriptElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLScriptElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLScriptElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLScriptElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->src()); } JSValue jsHTMLScriptElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLScriptElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLScriptElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLScriptElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLScriptElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLScriptElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLScriptElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLScriptElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -230,9 +238,9 @@ void setJSHTMLScriptElementType(ExecState* exec, JSObject* thisObject, JSValue v imp->setType(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLScriptElement::getConstructor(ExecState* exec) +JSValue JSHTMLScriptElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.h index 89b67ef33..a028470a4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLScriptElement.h @@ -30,7 +30,7 @@ class HTMLScriptElement; class JSHTMLScriptElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLScriptElement(PassRefPtr, PassRefPtr); + JSHTMLScriptElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.cpp index 08e765c7b..794d24c55 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.cpp @@ -87,12 +87,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLSelectElementConstructorTable = { 1, 0, JSHTMLSelectElementConstructorTableValues, 0 }; #endif -class JSHTMLSelectElementConstructor : public DOMObject { +class JSHTMLSelectElementConstructor : public DOMConstructorObject { public: - JSHTMLSelectElementConstructor(ExecState* exec) - : DOMObject(JSHTMLSelectElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLSelectElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLSelectElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLSelectElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLSelectElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -143,8 +143,8 @@ bool JSHTMLSelectElementPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSHTMLSelectElement::s_info = { "HTMLSelectElement", &JSHTMLElement::s_info, &JSHTMLSelectElementTable, 0 }; -JSHTMLSelectElement::JSHTMLSelectElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLSelectElement::JSHTMLSelectElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -180,98 +180,112 @@ bool JSHTMLSelectElement::getOwnPropertySlot(ExecState* exec, unsigned propertyN JSValue jsHTMLSelectElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSelectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSelectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLSelectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLSelectElementSelectedIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSelectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSelectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLSelectElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->selectedIndex()); } JSValue jsHTMLSelectElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSelectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSelectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLSelectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->value()); } JSValue jsHTMLSelectElementLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSelectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSelectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLSelectElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsHTMLSelectElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSelectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSelectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->form())); + HTMLSelectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->form())); } JSValue jsHTMLSelectElementValidity(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSelectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSelectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->validity())); + HTMLSelectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->validity())); } JSValue jsHTMLSelectElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSelectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSelectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLSelectElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->willValidate()); } JSValue jsHTMLSelectElementOptions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSelectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSelectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->options())); + HTMLSelectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->options())); } JSValue jsHTMLSelectElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSelectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSelectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLSelectElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->disabled()); } JSValue jsHTMLSelectElementAutofocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSelectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSelectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLSelectElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->autofocus()); } JSValue jsHTMLSelectElementMultiple(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSelectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSelectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLSelectElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->multiple()); } JSValue jsHTMLSelectElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSelectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSelectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLSelectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsHTMLSelectElementSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSelectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSelectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLSelectElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->size()); } JSValue jsHTMLSelectElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLSelectElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLSelectElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLSelectElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -347,9 +361,9 @@ void JSHTMLSelectElement::getPropertyNames(ExecState* exec, PropertyNameArray& p Base::getPropertyNames(exec, propertyNames); } -JSValue JSHTMLSelectElement::getConstructor(ExecState* exec) +JSValue JSHTMLSelectElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLSelectElementPrototypeFunctionAdd(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -391,7 +405,7 @@ JSValue JSC_HOST_CALL jsHTMLSelectElementPrototypeFunctionItem(ExecState* exec, } - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->item(index))); return result; } @@ -405,7 +419,7 @@ JSValue JSC_HOST_CALL jsHTMLSelectElementPrototypeFunctionNamedItem(ExecState* e const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->namedItem(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->namedItem(name))); return result; } @@ -413,7 +427,7 @@ JSValue JSC_HOST_CALL jsHTMLSelectElementPrototypeFunctionNamedItem(ExecState* e JSValue JSHTMLSelectElement::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSHTMLSelectElement* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.h index 53459cb04..654425487 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLSelectElement.h @@ -30,7 +30,7 @@ class HTMLSelectElement; class JSHTMLSelectElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLSelectElement(PassRefPtr, PassRefPtr); + JSHTMLSelectElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); @@ -45,7 +45,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom functions JSC::JSValue remove(JSC::ExecState*, const JSC::ArgList&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.cpp index 5e534cfba..d4a7d72ef 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.cpp @@ -67,12 +67,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLSourceElementConstructorTable = { 1, 0, JSHTMLSourceElementConstructorTableValues, 0 }; #endif -class JSHTMLSourceElementConstructor : public DOMObject { +class JSHTMLSourceElementConstructor : public DOMConstructorObject { public: - JSHTMLSourceElementConstructor(ExecState* exec) - : DOMObject(JSHTMLSourceElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLSourceElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLSourceElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLSourceElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLSourceElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -114,8 +114,8 @@ JSObject* JSHTMLSourceElementPrototype::self(ExecState* exec, JSGlobalObject* gl const ClassInfo JSHTMLSourceElement::s_info = { "HTMLSourceElement", &JSHTMLElement::s_info, &JSHTMLSourceElementTable, 0 }; -JSHTMLSourceElement::JSHTMLSourceElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLSourceElement::JSHTMLSourceElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -131,28 +131,32 @@ bool JSHTMLSourceElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsHTMLSourceElementSrc(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSourceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSourceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLSourceElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->src()); } JSValue jsHTMLSourceElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSourceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSourceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLSourceElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLSourceElementMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLSourceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLSourceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLSourceElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->media()); } JSValue jsHTMLSourceElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLSourceElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLSourceElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLSourceElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -177,9 +181,9 @@ void setJSHTMLSourceElementMedia(ExecState* exec, JSObject* thisObject, JSValue imp->setMedia(value.toString(exec)); } -JSValue JSHTMLSourceElement::getConstructor(ExecState* exec) +JSValue JSHTMLSourceElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.h index 18ece59a1..7c00c0e31 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLSourceElement.h @@ -32,7 +32,7 @@ class HTMLSourceElement; class JSHTMLSourceElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLSourceElement(PassRefPtr, PassRefPtr); + JSHTMLSourceElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.cpp index 77b1b1aba..4de3dc87e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.cpp @@ -67,12 +67,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLStyleElementConstructorTable = { 1, 0, JSHTMLStyleElementConstructorTableValues, 0 }; #endif -class JSHTMLStyleElementConstructor : public DOMObject { +class JSHTMLStyleElementConstructor : public DOMConstructorObject { public: - JSHTMLStyleElementConstructor(ExecState* exec) - : DOMObject(JSHTMLStyleElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLStyleElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLStyleElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLStyleElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLStyleElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -114,8 +114,8 @@ JSObject* JSHTMLStyleElementPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSHTMLStyleElement::s_info = { "HTMLStyleElement", &JSHTMLElement::s_info, &JSHTMLStyleElementTable, 0 }; -JSHTMLStyleElement::JSHTMLStyleElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLStyleElement::JSHTMLStyleElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -131,35 +131,40 @@ bool JSHTMLStyleElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLStyleElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLStyleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLStyleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLStyleElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->disabled()); } JSValue jsHTMLStyleElementMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLStyleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLStyleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLStyleElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->media()); } JSValue jsHTMLStyleElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLStyleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLStyleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLStyleElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLStyleElementSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLStyleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLStyleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->sheet())); + HTMLStyleElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->sheet())); } JSValue jsHTMLStyleElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLStyleElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLStyleElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLStyleElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -184,9 +189,9 @@ void setJSHTMLStyleElementType(ExecState* exec, JSObject* thisObject, JSValue va imp->setType(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLStyleElement::getConstructor(ExecState* exec) +JSValue JSHTMLStyleElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.h index d0e9201eb..3698a232b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLStyleElement.h @@ -30,7 +30,7 @@ class HTMLStyleElement; class JSHTMLStyleElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLStyleElement(PassRefPtr, PassRefPtr); + JSHTMLStyleElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.cpp index 3fcbcba37..62069312e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLTableCaptionElementConstructorTable = { 1, 0, JSHTMLTableCaptionElementConstructorTableValues, 0 }; #endif -class JSHTMLTableCaptionElementConstructor : public DOMObject { +class JSHTMLTableCaptionElementConstructor : public DOMConstructorObject { public: - JSHTMLTableCaptionElementConstructor(ExecState* exec) - : DOMObject(JSHTMLTableCaptionElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLTableCaptionElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLTableCaptionElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLTableCaptionElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLTableCaptionElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +109,8 @@ JSObject* JSHTMLTableCaptionElementPrototype::self(ExecState* exec, JSGlobalObje const ClassInfo JSHTMLTableCaptionElement::s_info = { "HTMLTableCaptionElement", &JSHTMLElement::s_info, &JSHTMLTableCaptionElementTable, 0 }; -JSHTMLTableCaptionElement::JSHTMLTableCaptionElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLTableCaptionElement::JSHTMLTableCaptionElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -126,14 +126,16 @@ bool JSHTMLTableCaptionElement::getOwnPropertySlot(ExecState* exec, const Identi JSValue jsHTMLTableCaptionElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCaptionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCaptionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCaptionElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLTableCaptionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLTableCaptionElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLTableCaptionElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLTableCaptionElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -146,9 +148,9 @@ void setJSHTMLTableCaptionElementAlign(ExecState* exec, JSObject* thisObject, JS imp->setAlign(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLTableCaptionElement::getConstructor(ExecState* exec) +JSValue JSHTMLTableCaptionElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } HTMLTableCaptionElement* toHTMLTableCaptionElement(JSC::JSValue value) diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.h index bc37fd4bb..50711863f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCaptionElement.h @@ -31,7 +31,7 @@ class HTMLTableCaptionElement; class JSHTMLTableCaptionElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLTableCaptionElement(PassRefPtr, PassRefPtr); + JSHTMLTableCaptionElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -43,7 +43,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); HTMLTableCaptionElement* impl() const { return static_cast(Base::impl()); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.cpp index 8ddf4ca28..02a8e96bd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.cpp @@ -77,12 +77,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLTableCellElementConstructorTable = { 1, 0, JSHTMLTableCellElementConstructorTableValues, 0 }; #endif -class JSHTMLTableCellElementConstructor : public DOMObject { +class JSHTMLTableCellElementConstructor : public DOMConstructorObject { public: - JSHTMLTableCellElementConstructor(ExecState* exec) - : DOMObject(JSHTMLTableCellElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLTableCellElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLTableCellElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLTableCellElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLTableCellElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -124,8 +124,8 @@ JSObject* JSHTMLTableCellElementPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSHTMLTableCellElement::s_info = { "HTMLTableCellElement", &JSHTMLElement::s_info, &JSHTMLTableCellElementTable, 0 }; -JSHTMLTableCellElement::JSHTMLTableCellElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLTableCellElement::JSHTMLTableCellElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -141,112 +141,128 @@ bool JSHTMLTableCellElement::getOwnPropertySlot(ExecState* exec, const Identifie JSValue jsHTMLTableCellElementCellIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->cellIndex()); } JSValue jsHTMLTableCellElementAbbr(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->abbr()); } JSValue jsHTMLTableCellElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLTableCellElementAxis(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->axis()); } JSValue jsHTMLTableCellElementBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->bgColor()); } JSValue jsHTMLTableCellElementCh(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->ch()); } JSValue jsHTMLTableCellElementChOff(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->chOff()); } JSValue jsHTMLTableCellElementColSpan(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->colSpan()); } JSValue jsHTMLTableCellElementHeaders(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->headers()); } JSValue jsHTMLTableCellElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->height()); } JSValue jsHTMLTableCellElementNoWrap(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->noWrap()); } JSValue jsHTMLTableCellElementRowSpan(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->rowSpan()); } JSValue jsHTMLTableCellElementScope(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->scope()); } JSValue jsHTMLTableCellElementVAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->vAlign()); } JSValue jsHTMLTableCellElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableCellElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableCellElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableCellElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->width()); } JSValue jsHTMLTableCellElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLTableCellElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLTableCellElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLTableCellElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -337,9 +353,9 @@ void setJSHTMLTableCellElementWidth(ExecState* exec, JSObject* thisObject, JSVal imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLTableCellElement::getConstructor(ExecState* exec) +JSValue JSHTMLTableCellElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.h index 7aa08ef00..3575ad984 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableCellElement.h @@ -30,7 +30,7 @@ class HTMLTableCellElement; class JSHTMLTableCellElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLTableCellElement(PassRefPtr, PassRefPtr); + JSHTMLTableCellElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.cpp index b79eda4ce..033a6e0d9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.cpp @@ -68,12 +68,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLTableColElementConstructorTable = { 1, 0, JSHTMLTableColElementConstructorTableValues, 0 }; #endif -class JSHTMLTableColElementConstructor : public DOMObject { +class JSHTMLTableColElementConstructor : public DOMConstructorObject { public: - JSHTMLTableColElementConstructor(ExecState* exec) - : DOMObject(JSHTMLTableColElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLTableColElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLTableColElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLTableColElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLTableColElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -115,8 +115,8 @@ JSObject* JSHTMLTableColElementPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSHTMLTableColElement::s_info = { "HTMLTableColElement", &JSHTMLElement::s_info, &JSHTMLTableColElementTable, 0 }; -JSHTMLTableColElement::JSHTMLTableColElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLTableColElement::JSHTMLTableColElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -132,49 +132,56 @@ bool JSHTMLTableColElement::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsHTMLTableColElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableColElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableColElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableColElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLTableColElementCh(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableColElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableColElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableColElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->ch()); } JSValue jsHTMLTableColElementChOff(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableColElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableColElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableColElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->chOff()); } JSValue jsHTMLTableColElementSpan(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableColElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableColElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableColElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->span()); } JSValue jsHTMLTableColElementVAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableColElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableColElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableColElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->vAlign()); } JSValue jsHTMLTableColElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableColElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableColElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableColElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->width()); } JSValue jsHTMLTableColElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLTableColElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLTableColElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLTableColElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -217,9 +224,9 @@ void setJSHTMLTableColElementWidth(ExecState* exec, JSObject* thisObject, JSValu imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLTableColElement::getConstructor(ExecState* exec) +JSValue JSHTMLTableColElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.h index a060d19ba..87584cd87 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableColElement.h @@ -30,7 +30,7 @@ class HTMLTableColElement; class JSHTMLTableColElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLTableColElement(PassRefPtr, PassRefPtr); + JSHTMLTableColElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.cpp index 6965555c5..55e43e05e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.cpp @@ -84,12 +84,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLTableElementConstructorTable = { 1, 0, JSHTMLTableElementConstructorTableValues, 0 }; #endif -class JSHTMLTableElementConstructor : public DOMObject { +class JSHTMLTableElementConstructor : public DOMConstructorObject { public: - JSHTMLTableElementConstructor(ExecState* exec) - : DOMObject(JSHTMLTableElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLTableElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLTableElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLTableElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLTableElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -144,8 +144,8 @@ bool JSHTMLTableElementPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSHTMLTableElement::s_info = { "HTMLTableElement", &JSHTMLElement::s_info, &JSHTMLTableElementTable, 0 }; -JSHTMLTableElement::JSHTMLTableElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLTableElement::JSHTMLTableElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -161,105 +161,120 @@ bool JSHTMLTableElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLTableElementCaption(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->caption())); + HTMLTableElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->caption())); } JSValue jsHTMLTableElementTHead(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->tHead())); + HTMLTableElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->tHead())); } JSValue jsHTMLTableElementTFoot(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->tFoot())); + HTMLTableElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->tFoot())); } JSValue jsHTMLTableElementRows(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->rows())); + HTMLTableElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->rows())); } JSValue jsHTMLTableElementTBodies(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->tBodies())); + HTMLTableElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->tBodies())); } JSValue jsHTMLTableElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLTableElementBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->bgColor()); } JSValue jsHTMLTableElementBorder(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->border()); } JSValue jsHTMLTableElementCellPadding(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->cellPadding()); } JSValue jsHTMLTableElementCellSpacing(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->cellSpacing()); } JSValue jsHTMLTableElementFrame(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->frame()); } JSValue jsHTMLTableElementRules(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->rules()); } JSValue jsHTMLTableElementSummary(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->summary()); } JSValue jsHTMLTableElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->width()); } JSValue jsHTMLTableElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLTableElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLTableElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLTableElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -344,9 +359,9 @@ void setJSHTMLTableElementWidth(ExecState* exec, JSObject* thisObject, JSValue v imp->setWidth(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLTableElement::getConstructor(ExecState* exec) +JSValue JSHTMLTableElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionCreateTHead(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -358,7 +373,7 @@ JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionCreateTHead(ExecState* HTMLTableElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createTHead())); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createTHead())); return result; } @@ -383,7 +398,7 @@ JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionCreateTFoot(ExecState* HTMLTableElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createTFoot())); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createTFoot())); return result; } @@ -408,7 +423,7 @@ JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionCreateCaption(ExecState HTMLTableElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createCaption())); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createCaption())); return result; } @@ -435,7 +450,7 @@ JSValue JSC_HOST_CALL jsHTMLTableElementPrototypeFunctionInsertRow(ExecState* ex int index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->insertRow(index, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->insertRow(index, ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.h index 234d81246..ebef7fd0c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.h @@ -30,7 +30,7 @@ class HTMLTableElement; class JSHTMLTableElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLTableElement(PassRefPtr, PassRefPtr); + JSHTMLTableElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.cpp index d806271f8..3305604ad 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.cpp @@ -75,12 +75,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLTableRowElementConstructorTable = { 1, 0, JSHTMLTableRowElementConstructorTableValues, 0 }; #endif -class JSHTMLTableRowElementConstructor : public DOMObject { +class JSHTMLTableRowElementConstructor : public DOMConstructorObject { public: - JSHTMLTableRowElementConstructor(ExecState* exec) - : DOMObject(JSHTMLTableRowElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLTableRowElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLTableRowElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLTableRowElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLTableRowElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -129,8 +129,8 @@ bool JSHTMLTableRowElementPrototype::getOwnPropertySlot(ExecState* exec, const I const ClassInfo JSHTMLTableRowElement::s_info = { "HTMLTableRowElement", &JSHTMLElement::s_info, &JSHTMLTableRowElementTable, 0 }; -JSHTMLTableRowElement::JSHTMLTableRowElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLTableRowElement::JSHTMLTableRowElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -146,63 +146,72 @@ bool JSHTMLTableRowElement::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsHTMLTableRowElementRowIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableRowElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableRowElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableRowElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->rowIndex()); } JSValue jsHTMLTableRowElementSectionRowIndex(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableRowElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableRowElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableRowElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->sectionRowIndex()); } JSValue jsHTMLTableRowElementCells(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableRowElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableRowElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->cells())); + HTMLTableRowElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->cells())); } JSValue jsHTMLTableRowElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableRowElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableRowElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableRowElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLTableRowElementBgColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableRowElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableRowElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableRowElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->bgColor()); } JSValue jsHTMLTableRowElementCh(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableRowElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableRowElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableRowElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->ch()); } JSValue jsHTMLTableRowElementChOff(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableRowElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableRowElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableRowElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->chOff()); } JSValue jsHTMLTableRowElementVAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableRowElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableRowElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableRowElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->vAlign()); } JSValue jsHTMLTableRowElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLTableRowElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLTableRowElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLTableRowElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -239,9 +248,9 @@ void setJSHTMLTableRowElementVAlign(ExecState* exec, JSObject* thisObject, JSVal imp->setVAlign(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLTableRowElement::getConstructor(ExecState* exec) +JSValue JSHTMLTableRowElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLTableRowElementPrototypeFunctionInsertCell(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -255,7 +264,7 @@ JSValue JSC_HOST_CALL jsHTMLTableRowElementPrototypeFunctionInsertCell(ExecState int index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->insertCell(index, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->insertCell(index, ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.h index e3e93bceb..3a592b48a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableRowElement.h @@ -30,7 +30,7 @@ class HTMLTableRowElement; class JSHTMLTableRowElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLTableRowElement(PassRefPtr, PassRefPtr); + JSHTMLTableRowElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.cpp index 7515cfd89..fa3c5b584 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.cpp @@ -71,12 +71,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLTableSectionElementConstructorTable = { 1, 0, JSHTMLTableSectionElementConstructorTableValues, 0 }; #endif -class JSHTMLTableSectionElementConstructor : public DOMObject { +class JSHTMLTableSectionElementConstructor : public DOMConstructorObject { public: - JSHTMLTableSectionElementConstructor(ExecState* exec) - : DOMObject(JSHTMLTableSectionElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLTableSectionElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLTableSectionElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLTableSectionElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLTableSectionElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -125,8 +125,8 @@ bool JSHTMLTableSectionElementPrototype::getOwnPropertySlot(ExecState* exec, con const ClassInfo JSHTMLTableSectionElement::s_info = { "HTMLTableSectionElement", &JSHTMLElement::s_info, &JSHTMLTableSectionElementTable, 0 }; -JSHTMLTableSectionElement::JSHTMLTableSectionElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLTableSectionElement::JSHTMLTableSectionElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -142,42 +142,48 @@ bool JSHTMLTableSectionElement::getOwnPropertySlot(ExecState* exec, const Identi JSValue jsHTMLTableSectionElementAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableSectionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableSectionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableSectionElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->align()); } JSValue jsHTMLTableSectionElementCh(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableSectionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableSectionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableSectionElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->ch()); } JSValue jsHTMLTableSectionElementChOff(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableSectionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableSectionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableSectionElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->chOff()); } JSValue jsHTMLTableSectionElementVAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableSectionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableSectionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTableSectionElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->vAlign()); } JSValue jsHTMLTableSectionElementRows(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTableSectionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTableSectionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->rows())); + HTMLTableSectionElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->rows())); } JSValue jsHTMLTableSectionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLTableSectionElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLTableSectionElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLTableSectionElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -208,9 +214,9 @@ void setJSHTMLTableSectionElementVAlign(ExecState* exec, JSObject* thisObject, J imp->setVAlign(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLTableSectionElement::getConstructor(ExecState* exec) +JSValue JSHTMLTableSectionElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLTableSectionElementPrototypeFunctionInsertRow(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -224,7 +230,7 @@ JSValue JSC_HOST_CALL jsHTMLTableSectionElementPrototypeFunctionInsertRow(ExecSt int index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->insertRow(index, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->insertRow(index, ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.h index 672165fe9..0734bdbaa 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableSectionElement.h @@ -31,7 +31,7 @@ class HTMLTableSectionElement; class JSHTMLTableSectionElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLTableSectionElement(PassRefPtr, PassRefPtr); + JSHTMLTableSectionElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -43,7 +43,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); HTMLTableSectionElement* impl() const { return static_cast(Base::impl()); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp index f103fb775..0a2c77949 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.cpp @@ -40,7 +40,7 @@ ASSERT_CLASS_FITS_IN_CELL(JSHTMLTextAreaElement); /* Hash table */ -static const HashTableValue JSHTMLTextAreaElementTableValues[17] = +static const HashTableValue JSHTMLTextAreaElementTableValues[18] = { { "defaultValue", DontDelete, (intptr_t)jsHTMLTextAreaElementDefaultValue, (intptr_t)setJSHTMLTextAreaElementDefaultValue }, { "form", DontDelete|ReadOnly, (intptr_t)jsHTMLTextAreaElementForm, (intptr_t)0 }, @@ -51,6 +51,7 @@ static const HashTableValue JSHTMLTextAreaElementTableValues[17] = { "autofocus", DontDelete, (intptr_t)jsHTMLTextAreaElementAutofocus, (intptr_t)setJSHTMLTextAreaElementAutofocus }, { "name", DontDelete, (intptr_t)jsHTMLTextAreaElementName, (intptr_t)setJSHTMLTextAreaElementName }, { "readOnly", DontDelete, (intptr_t)jsHTMLTextAreaElementReadOnly, (intptr_t)setJSHTMLTextAreaElementReadOnly }, + { "required", DontDelete, (intptr_t)jsHTMLTextAreaElementRequired, (intptr_t)setJSHTMLTextAreaElementRequired }, { "rows", DontDelete, (intptr_t)jsHTMLTextAreaElementRows, (intptr_t)setJSHTMLTextAreaElementRows }, { "type", DontDelete|ReadOnly, (intptr_t)jsHTMLTextAreaElementType, (intptr_t)0 }, { "value", DontDelete, (intptr_t)jsHTMLTextAreaElementValue, (intptr_t)setJSHTMLTextAreaElementValue }, @@ -65,7 +66,7 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLTextAreaElementTable = #if ENABLE(PERFECT_HASH_SIZE) { 255, JSHTMLTextAreaElementTableValues, 0 }; #else - { 36, 31, JSHTMLTextAreaElementTableValues, 0 }; + { 67, 63, JSHTMLTextAreaElementTableValues, 0 }; #endif /* Hash table for constructor */ @@ -82,12 +83,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLTextAreaElementConstructorTable = { 1, 0, JSHTMLTextAreaElementConstructorTableValues, 0 }; #endif -class JSHTMLTextAreaElementConstructor : public DOMObject { +class JSHTMLTextAreaElementConstructor : public DOMConstructorObject { public: - JSHTMLTextAreaElementConstructor(ExecState* exec) - : DOMObject(JSHTMLTextAreaElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLTextAreaElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLTextAreaElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLTextAreaElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLTextAreaElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -136,8 +137,8 @@ bool JSHTMLTextAreaElementPrototype::getOwnPropertySlot(ExecState* exec, const I const ClassInfo JSHTMLTextAreaElement::s_info = { "HTMLTextAreaElement", &JSHTMLElement::s_info, &JSHTMLTextAreaElementTable, 0 }; -JSHTMLTextAreaElement::JSHTMLTextAreaElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLTextAreaElement::JSHTMLTextAreaElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -153,112 +154,136 @@ bool JSHTMLTextAreaElement::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsHTMLTextAreaElementDefaultValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->defaultValue()); } JSValue jsHTMLTextAreaElementForm(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->form())); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->form())); } JSValue jsHTMLTextAreaElementValidity(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->validity())); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->validity())); } JSValue jsHTMLTextAreaElementAccessKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->accessKey()); } JSValue jsHTMLTextAreaElementCols(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->cols()); } JSValue jsHTMLTextAreaElementDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->disabled()); } JSValue jsHTMLTextAreaElementAutofocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->autofocus()); } JSValue jsHTMLTextAreaElementName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsHTMLTextAreaElementReadOnly(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->readOnly()); } +JSValue jsHTMLTextAreaElementRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); + UNUSED_PARAM(exec); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); + return jsBoolean(imp->required()); +} + JSValue jsHTMLTextAreaElementRows(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->rows()); } JSValue jsHTMLTextAreaElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLTextAreaElementValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->value()); } JSValue jsHTMLTextAreaElementWillValidate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->willValidate()); } JSValue jsHTMLTextAreaElementSelectionStart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->selectionStart()); } JSValue jsHTMLTextAreaElementSelectionEnd(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTextAreaElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTextAreaElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTextAreaElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->selectionEnd()); } JSValue jsHTMLTextAreaElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLTextAreaElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLTextAreaElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLTextAreaElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -307,6 +332,12 @@ void setJSHTMLTextAreaElementReadOnly(ExecState* exec, JSObject* thisObject, JSV imp->setReadOnly(value.toBoolean(exec)); } +void setJSHTMLTextAreaElementRequired(ExecState* exec, JSObject* thisObject, JSValue value) +{ + HTMLTextAreaElement* imp = static_cast(static_cast(thisObject)->impl()); + imp->setRequired(value.toBoolean(exec)); +} + void setJSHTMLTextAreaElementRows(ExecState* exec, JSObject* thisObject, JSValue value) { HTMLTextAreaElement* imp = static_cast(static_cast(thisObject)->impl()); @@ -331,9 +362,9 @@ void setJSHTMLTextAreaElementSelectionEnd(ExecState* exec, JSObject* thisObject, imp->setSelectionEnd(value.toInt32(exec)); } -JSValue JSHTMLTextAreaElement::getConstructor(ExecState* exec) +JSValue JSHTMLTextAreaElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsHTMLTextAreaElementPrototypeFunctionSelect(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.h index 63d057537..52b05dda7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTextAreaElement.h @@ -30,7 +30,7 @@ class HTMLTextAreaElement; class JSHTMLTextAreaElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLTextAreaElement(PassRefPtr, PassRefPtr); + JSHTMLTextAreaElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; @@ -82,6 +82,8 @@ JSC::JSValue jsHTMLTextAreaElementName(JSC::ExecState*, const JSC::Identifier&, void setJSHTMLTextAreaElementName(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLTextAreaElementReadOnly(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSHTMLTextAreaElementReadOnly(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsHTMLTextAreaElementRequired(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSHTMLTextAreaElementRequired(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLTextAreaElementRows(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSHTMLTextAreaElementRows(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsHTMLTextAreaElementType(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.cpp index dbc993273..04bf7e058 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLTitleElementConstructorTable = { 1, 0, JSHTMLTitleElementConstructorTableValues, 0 }; #endif -class JSHTMLTitleElementConstructor : public DOMObject { +class JSHTMLTitleElementConstructor : public DOMConstructorObject { public: - JSHTMLTitleElementConstructor(ExecState* exec) - : DOMObject(JSHTMLTitleElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLTitleElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLTitleElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLTitleElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLTitleElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +109,8 @@ JSObject* JSHTMLTitleElementPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSHTMLTitleElement::s_info = { "HTMLTitleElement", &JSHTMLElement::s_info, &JSHTMLTitleElementTable, 0 }; -JSHTMLTitleElement::JSHTMLTitleElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLTitleElement::JSHTMLTitleElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -126,14 +126,16 @@ bool JSHTMLTitleElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLTitleElementText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLTitleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLTitleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLTitleElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->text()); } JSValue jsHTMLTitleElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLTitleElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLTitleElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLTitleElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -146,9 +148,9 @@ void setJSHTMLTitleElementText(ExecState* exec, JSObject* thisObject, JSValue va imp->setText(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLTitleElement::getConstructor(ExecState* exec) +JSValue JSHTMLTitleElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.h index 79e73aecc..fa8c4c6c6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTitleElement.h @@ -30,7 +30,7 @@ class HTMLTitleElement; class JSHTMLTitleElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLTitleElement(PassRefPtr, PassRefPtr); + JSHTMLTitleElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.cpp index aae57e3da..017a317e0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.cpp @@ -63,12 +63,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLUListElementConstructorTable = { 1, 0, JSHTMLUListElementConstructorTableValues, 0 }; #endif -class JSHTMLUListElementConstructor : public DOMObject { +class JSHTMLUListElementConstructor : public DOMConstructorObject { public: - JSHTMLUListElementConstructor(ExecState* exec) - : DOMObject(JSHTMLUListElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLUListElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLUListElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLUListElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLUListElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -110,8 +110,8 @@ JSObject* JSHTMLUListElementPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSHTMLUListElement::s_info = { "HTMLUListElement", &JSHTMLElement::s_info, &JSHTMLUListElementTable, 0 }; -JSHTMLUListElement::JSHTMLUListElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLElement(structure, impl) +JSHTMLUListElement::JSHTMLUListElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLElement(structure, globalObject, impl) { } @@ -127,21 +127,24 @@ bool JSHTMLUListElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLUListElementCompact(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLUListElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLUListElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLUListElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->compact()); } JSValue jsHTMLUListElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLUListElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLUListElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLUListElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsHTMLUListElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLUListElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLUListElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLUListElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -160,9 +163,9 @@ void setJSHTMLUListElementType(ExecState* exec, JSObject* thisObject, JSValue va imp->setType(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLUListElement::getConstructor(ExecState* exec) +JSValue JSHTMLUListElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.h index 339b5f027..9c1cc105c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLUListElement.h @@ -30,7 +30,7 @@ class HTMLUListElement; class JSHTMLUListElement : public JSHTMLElement { typedef JSHTMLElement Base; public: - JSHTMLUListElement(PassRefPtr, PassRefPtr); + JSHTMLUListElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.cpp index 19c1a203a..152ae5fc2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.cpp @@ -70,12 +70,12 @@ static JSC_CONST_HASHTABLE HashTable JSHTMLVideoElementConstructorTable = { 1, 0, JSHTMLVideoElementConstructorTableValues, 0 }; #endif -class JSHTMLVideoElementConstructor : public DOMObject { +class JSHTMLVideoElementConstructor : public DOMConstructorObject { public: - JSHTMLVideoElementConstructor(ExecState* exec) - : DOMObject(JSHTMLVideoElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSHTMLVideoElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSHTMLVideoElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSHTMLVideoElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSHTMLVideoElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -117,8 +117,8 @@ JSObject* JSHTMLVideoElementPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSHTMLVideoElement::s_info = { "HTMLVideoElement", &JSHTMLMediaElement::s_info, &JSHTMLVideoElementTable, 0 }; -JSHTMLVideoElement::JSHTMLVideoElement(PassRefPtr structure, PassRefPtr impl) - : JSHTMLMediaElement(structure, impl) +JSHTMLVideoElement::JSHTMLVideoElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSHTMLMediaElement(structure, globalObject, impl) { } @@ -134,42 +134,48 @@ bool JSHTMLVideoElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsHTMLVideoElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLVideoElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLVideoElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLVideoElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->width()); } JSValue jsHTMLVideoElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLVideoElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLVideoElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLVideoElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->height()); } JSValue jsHTMLVideoElementVideoWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLVideoElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLVideoElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLVideoElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->videoWidth()); } JSValue jsHTMLVideoElementVideoHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLVideoElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLVideoElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLVideoElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->videoHeight()); } JSValue jsHTMLVideoElementPoster(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHTMLVideoElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - HTMLVideoElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + HTMLVideoElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->poster()); } JSValue jsHTMLVideoElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSHTMLVideoElement* domObject = static_cast(asObject(slot.slotBase())); + return JSHTMLVideoElement::getConstructor(exec, domObject->globalObject()); } void JSHTMLVideoElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -194,9 +200,9 @@ void setJSHTMLVideoElementPoster(ExecState* exec, JSObject* thisObject, JSValue imp->setPoster(valueToStringWithNullCheck(exec, value)); } -JSValue JSHTMLVideoElement::getConstructor(ExecState* exec) +JSValue JSHTMLVideoElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.h b/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.h index 3e3b8c2ff..15bcc8994 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLVideoElement.h @@ -32,7 +32,7 @@ class HTMLVideoElement; class JSHTMLVideoElement : public JSHTMLMediaElement { typedef JSHTMLMediaElement Base; public: - JSHTMLVideoElement(PassRefPtr, PassRefPtr); + JSHTMLVideoElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSHistory.cpp b/src/3rdparty/webkit/WebCore/generated/JSHistory.cpp index 097a6b7f3..fc8c0b60b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHistory.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHistory.cpp @@ -79,8 +79,8 @@ bool JSHistoryPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& p const ClassInfo JSHistory::s_info = { "History", 0, &JSHistoryTable, 0 }; -JSHistory::JSHistory(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSHistory::JSHistory(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -104,8 +104,9 @@ bool JSHistory::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa JSValue jsHistoryLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSHistory* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - History* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + History* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } @@ -153,9 +154,9 @@ JSValue JSC_HOST_CALL jsHistoryPrototypeFunctionGo(ExecState* exec, JSObject*, J return jsUndefined(); } -JSC::JSValue toJS(JSC::ExecState* exec, History* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, History* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } History* toHistory(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSHistory.h b/src/3rdparty/webkit/WebCore/generated/JSHistory.h index e81255aeb..8163882f3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHistory.h +++ b/src/3rdparty/webkit/WebCore/generated/JSHistory.h @@ -21,6 +21,7 @@ #ifndef JSHistory_h #define JSHistory_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class History; -class JSHistory : public DOMObject { - typedef DOMObject Base; +class JSHistory : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSHistory(PassRefPtr, PassRefPtr); + JSHistory(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSHistory(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -55,7 +56,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, History*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, History*); History* toHistory(JSC::JSValue); class JSHistoryPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSImageData.cpp b/src/3rdparty/webkit/WebCore/generated/JSImageData.cpp index 139249b9b..841b1a2e6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSImageData.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSImageData.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSImageDataConstructorTable = { 1, 0, JSImageDataConstructorTableValues, 0 }; #endif -class JSImageDataConstructor : public DOMObject { +class JSImageDataConstructor : public DOMConstructorObject { public: - JSImageDataConstructor(ExecState* exec) - : DOMObject(JSImageDataConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSImageDataConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSImageDataConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSImageDataPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSImageDataPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +109,8 @@ JSObject* JSImageDataPrototype::self(ExecState* exec, JSGlobalObject* globalObje const ClassInfo JSImageData::s_info = { "ImageData", 0, &JSImageDataTable, 0 }; -JSImageData::JSImageData(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSImageData::JSImageData(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -132,25 +132,28 @@ bool JSImageData::getOwnPropertySlot(ExecState* exec, const Identifier& property JSValue jsImageDataWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSImageData* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ImageData* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ImageData* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->width()); } JSValue jsImageDataHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSImageData* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ImageData* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ImageData* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->height()); } JSValue jsImageDataConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSImageData* domObject = static_cast(asObject(slot.slotBase())); + return JSImageData::getConstructor(exec, domObject->globalObject()); } -JSValue JSImageData::getConstructor(ExecState* exec) +JSValue JSImageData::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } ImageData* toImageData(JSC::JSValue value) diff --git a/src/3rdparty/webkit/WebCore/generated/JSImageData.h b/src/3rdparty/webkit/WebCore/generated/JSImageData.h index 12a9f014a..5b6ab1d08 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSImageData.h +++ b/src/3rdparty/webkit/WebCore/generated/JSImageData.h @@ -21,6 +21,7 @@ #ifndef JSImageData_h #define JSImageData_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class ImageData; -class JSImageData : public DOMObject { - typedef DOMObject Base; +class JSImageData : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSImageData(PassRefPtr, PassRefPtr); + JSImageData(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSImageData(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); ImageData* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, ImageData*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, ImageData*); ImageData* toImageData(JSC::JSValue); class JSImageDataPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSInspectorBackend.cpp b/src/3rdparty/webkit/WebCore/generated/JSInspectorBackend.cpp new file mode 100644 index 000000000..78e542005 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSInspectorBackend.cpp @@ -0,0 +1,773 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "config.h" +#include "JSInspectorBackend.h" + +#include "DOMWindow.h" +#include "InspectorBackend.h" +#include "JSNode.h" +#include "KURL.h" +#include +#include +#include + +using namespace JSC; + +namespace WebCore { + +ASSERT_CLASS_FITS_IN_CELL(JSInspectorBackend); + +/* Hash table */ + +static const HashTableValue JSInspectorBackendTableValues[2] = +{ + { "constructor", DontEnum|ReadOnly, (intptr_t)jsInspectorBackendConstructor, (intptr_t)0 }, + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSInspectorBackendTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSInspectorBackendTableValues, 0 }; +#else + { 2, 1, JSInspectorBackendTableValues, 0 }; +#endif + +/* Hash table for constructor */ + +static const HashTableValue JSInspectorBackendConstructorTableValues[1] = +{ + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSInspectorBackendConstructorTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSInspectorBackendConstructorTableValues, 0 }; +#else + { 1, 0, JSInspectorBackendConstructorTableValues, 0 }; +#endif + +class JSInspectorBackendConstructor : public DOMConstructorObject { +public: + JSInspectorBackendConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSInspectorBackendConstructor::createStructure(globalObject->objectPrototype()), globalObject) + { + putDirect(exec->propertyNames().prototype, JSInspectorBackendPrototype::self(exec, globalObject), None); + } + virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); + virtual const ClassInfo* classInfo() const { return &s_info; } + static const ClassInfo s_info; + + static PassRefPtr createStructure(JSValue proto) + { + return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); + } +}; + +const ClassInfo JSInspectorBackendConstructor::s_info = { "InspectorBackendConstructor", 0, &JSInspectorBackendConstructorTable, 0 }; + +bool JSInspectorBackendConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot(exec, &JSInspectorBackendConstructorTable, this, propertyName, slot); +} + +/* Hash table for prototype */ + +static const HashTableValue JSInspectorBackendPrototypeTableValues[48] = +{ + { "hideDOMNodeHighlight", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionHideDOMNodeHighlight, (intptr_t)0 }, + { "highlightDOMNode", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionHighlightDOMNode, (intptr_t)1 }, + { "loaded", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionLoaded, (intptr_t)0 }, + { "windowUnloading", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionWindowUnloading, (intptr_t)0 }, + { "attach", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionAttach, (intptr_t)0 }, + { "detach", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionDetach, (intptr_t)0 }, + { "closeWindow", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionCloseWindow, (intptr_t)0 }, + { "clearMessages", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionClearMessages, (intptr_t)0 }, + { "toggleNodeSearch", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionToggleNodeSearch, (intptr_t)0 }, + { "isWindowVisible", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionIsWindowVisible, (intptr_t)0 }, + { "searchingForNode", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionSearchingForNode, (intptr_t)0 }, + { "addResourceSourceToFrame", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionAddResourceSourceToFrame, (intptr_t)2 }, + { "addSourceToFrame", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionAddSourceToFrame, (intptr_t)3 }, + { "search", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionSearch, (intptr_t)2 }, + { "databaseTableNames", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionDatabaseTableNames, (intptr_t)1 }, + { "setting", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionSetting, (intptr_t)1 }, + { "setSetting", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionSetSetting, (intptr_t)2 }, + { "inspectedWindow", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionInspectedWindow, (intptr_t)0 }, + { "localizedStringsURL", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionLocalizedStringsURL, (intptr_t)0 }, + { "hiddenPanels", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionHiddenPanels, (intptr_t)0 }, + { "platform", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionPlatform, (intptr_t)0 }, + { "moveByUnrestricted", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionMoveByUnrestricted, (intptr_t)2 }, + { "setAttachedWindowHeight", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionSetAttachedWindowHeight, (intptr_t)1 }, + { "wrapCallback", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionWrapCallback, (intptr_t)1 }, + { "resourceTrackingEnabled", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionResourceTrackingEnabled, (intptr_t)0 }, + { "enableResourceTracking", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionEnableResourceTracking, (intptr_t)1 }, + { "disableResourceTracking", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionDisableResourceTracking, (intptr_t)1 }, + { "storeLastActivePanel", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionStoreLastActivePanel, (intptr_t)1 }, + { "debuggerEnabled", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionDebuggerEnabled, (intptr_t)0 }, + { "enableDebugger", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionEnableDebugger, (intptr_t)1 }, + { "disableDebugger", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionDisableDebugger, (intptr_t)1 }, + { "addBreakpoint", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionAddBreakpoint, (intptr_t)2 }, + { "removeBreakpoint", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionRemoveBreakpoint, (intptr_t)2 }, + { "pauseInDebugger", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionPauseInDebugger, (intptr_t)0 }, + { "resumeDebugger", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionResumeDebugger, (intptr_t)0 }, + { "stepOverStatementInDebugger", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionStepOverStatementInDebugger, (intptr_t)0 }, + { "stepIntoStatementInDebugger", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionStepIntoStatementInDebugger, (intptr_t)0 }, + { "stepOutOfFunctionInDebugger", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionStepOutOfFunctionInDebugger, (intptr_t)0 }, + { "currentCallFrame", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionCurrentCallFrame, (intptr_t)0 }, + { "pauseOnExceptions", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionPauseOnExceptions, (intptr_t)0 }, + { "setPauseOnExceptions", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionSetPauseOnExceptions, (intptr_t)1 }, + { "profilerEnabled", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionProfilerEnabled, (intptr_t)0 }, + { "enableProfiler", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionEnableProfiler, (intptr_t)1 }, + { "disableProfiler", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionDisableProfiler, (intptr_t)1 }, + { "startProfiling", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionStartProfiling, (intptr_t)0 }, + { "stopProfiling", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionStopProfiling, (intptr_t)0 }, + { "profiles", DontDelete|Function, (intptr_t)jsInspectorBackendPrototypeFunctionProfiles, (intptr_t)0 }, + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSInspectorBackendPrototypeTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 2047, JSInspectorBackendPrototypeTableValues, 0 }; +#else + { 137, 127, JSInspectorBackendPrototypeTableValues, 0 }; +#endif + +const ClassInfo JSInspectorBackendPrototype::s_info = { "InspectorBackendPrototype", 0, &JSInspectorBackendPrototypeTable, 0 }; + +JSObject* JSInspectorBackendPrototype::self(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMPrototype(exec, globalObject); +} + +bool JSInspectorBackendPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticFunctionSlot(exec, &JSInspectorBackendPrototypeTable, this, propertyName, slot); +} + +const ClassInfo JSInspectorBackend::s_info = { "InspectorBackend", 0, &JSInspectorBackendTable, 0 }; + +JSInspectorBackend::JSInspectorBackend(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) + , m_impl(impl) +{ +} + +JSInspectorBackend::~JSInspectorBackend() +{ + forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); +} + +JSObject* JSInspectorBackend::createPrototype(ExecState* exec, JSGlobalObject* globalObject) +{ + return new (exec) JSInspectorBackendPrototype(JSInspectorBackendPrototype::createStructure(globalObject->objectPrototype())); +} + +bool JSInspectorBackend::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot(exec, &JSInspectorBackendTable, this, propertyName, slot); +} + +JSValue jsInspectorBackendConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSInspectorBackend* domObject = static_cast(asObject(slot.slotBase())); + return JSInspectorBackend::getConstructor(exec, domObject->globalObject()); +} +JSValue JSInspectorBackend::getConstructor(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMConstructor(exec, static_cast(globalObject)); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionHideDOMNodeHighlight(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->hideDOMNodeHighlight(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionHighlightDOMNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + return castedThisObj->highlightDOMNode(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionLoaded(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->loaded(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionWindowUnloading(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->windowUnloading(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionAttach(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->attach(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionDetach(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->detach(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionCloseWindow(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->closeWindow(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionClearMessages(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->clearMessages(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionToggleNodeSearch(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->toggleNodeSearch(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionIsWindowVisible(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + + JSC::JSValue result = jsBoolean(imp->isWindowVisible()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionSearchingForNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + + JSC::JSValue result = jsBoolean(imp->searchingForNode()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionAddResourceSourceToFrame(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + int identifier = args.at(0).toInt32(exec); + Node* frame = toNode(args.at(1)); + + imp->addResourceSourceToFrame(identifier, frame); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionAddSourceToFrame(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + const UString& mimeType = args.at(0).toString(exec); + const UString& sourceValue = args.at(1).toString(exec); + Node* frame = toNode(args.at(2)); + + + JSC::JSValue result = jsBoolean(imp->addSourceToFrame(mimeType, sourceValue, frame)); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionSearch(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + return castedThisObj->search(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionDatabaseTableNames(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + return castedThisObj->databaseTableNames(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionSetting(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + return castedThisObj->setting(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionSetSetting(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + return castedThisObj->setSetting(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionInspectedWindow(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + return castedThisObj->inspectedWindow(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionLocalizedStringsURL(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + + JSC::JSValue result = jsString(exec, imp->localizedStringsURL()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionHiddenPanels(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + + JSC::JSValue result = jsString(exec, imp->hiddenPanels()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionPlatform(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + + JSC::JSValue result = jsString(exec, imp->platform()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionMoveByUnrestricted(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + float x = args.at(0).toFloat(exec); + float y = args.at(1).toFloat(exec); + + imp->moveWindowBy(x, y); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionSetAttachedWindowHeight(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + unsigned height = args.at(0).toInt32(exec); + + imp->setAttachedWindowHeight(height); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionWrapCallback(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + return castedThisObj->wrapCallback(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionResourceTrackingEnabled(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + + JSC::JSValue result = jsBoolean(imp->resourceTrackingEnabled()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionEnableResourceTracking(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + bool always = args.at(0).toBoolean(exec); + + imp->enableResourceTracking(always); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionDisableResourceTracking(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + bool always = args.at(0).toBoolean(exec); + + imp->disableResourceTracking(always); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionStoreLastActivePanel(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + const UString& panelName = args.at(0).toString(exec); + + imp->storeLastActivePanel(panelName); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionDebuggerEnabled(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + + JSC::JSValue result = jsBoolean(imp->debuggerEnabled()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionEnableDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + bool always = args.at(0).toBoolean(exec); + + imp->enableDebugger(always); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionDisableDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + bool always = args.at(0).toBoolean(exec); + + imp->disableDebugger(always); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionAddBreakpoint(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + const UString& sourceID = args.at(0).toString(exec); + unsigned lineNumber = args.at(1).toInt32(exec); + + imp->addBreakpoint(sourceID, lineNumber); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionRemoveBreakpoint(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + const UString& sourceID = args.at(0).toString(exec); + unsigned lineNumber = args.at(1).toInt32(exec); + + imp->removeBreakpoint(sourceID, lineNumber); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionPauseInDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->pauseInDebugger(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionResumeDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->resumeDebugger(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionStepOverStatementInDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->stepOverStatementInDebugger(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionStepIntoStatementInDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->stepIntoStatementInDebugger(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionStepOutOfFunctionInDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->stepOutOfFunctionInDebugger(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionCurrentCallFrame(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + return castedThisObj->currentCallFrame(exec, args); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionPauseOnExceptions(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + + JSC::JSValue result = jsBoolean(imp->pauseOnExceptions()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionSetPauseOnExceptions(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + bool pauseOnExceptions = args.at(0).toBoolean(exec); + + imp->setPauseOnExceptions(pauseOnExceptions); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionProfilerEnabled(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + + JSC::JSValue result = jsBoolean(imp->profilerEnabled()); + return result; +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionEnableProfiler(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + bool always = args.at(0).toBoolean(exec); + + imp->enableProfiler(always); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionDisableProfiler(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + bool always = args.at(0).toBoolean(exec); + + imp->disableProfiler(always); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionStartProfiling(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->startProfiling(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionStopProfiling(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + InspectorBackend* imp = static_cast(castedThisObj->impl()); + + imp->stopProfiling(); + return jsUndefined(); +} + +JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionProfiles(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) +{ + UNUSED_PARAM(args); + if (!thisValue.isObject(&JSInspectorBackend::s_info)) + return throwError(exec, TypeError); + JSInspectorBackend* castedThisObj = static_cast(asObject(thisValue)); + return castedThisObj->profiles(exec, args); +} + +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, InspectorBackend* object) +{ + return getDOMObjectWrapper(exec, globalObject, object); +} +InspectorBackend* toInspectorBackend(JSC::JSValue value) +{ + return value.isObject(&JSInspectorBackend::s_info) ? static_cast(asObject(value))->impl() : 0; +} + +} diff --git a/src/3rdparty/webkit/WebCore/generated/JSInspectorBackend.h b/src/3rdparty/webkit/WebCore/generated/JSInspectorBackend.h new file mode 100644 index 000000000..da9a09ebc --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSInspectorBackend.h @@ -0,0 +1,138 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef JSInspectorBackend_h +#define JSInspectorBackend_h + +#include "DOMObjectWithSVGContext.h" +#include "JSDOMBinding.h" +#include +#include + +namespace WebCore { + +class InspectorBackend; + +class JSInspectorBackend : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; +public: + JSInspectorBackend(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); + virtual ~JSInspectorBackend(); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + + static PassRefPtr createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); + + // Custom functions + JSC::JSValue highlightDOMNode(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue search(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue databaseTableNames(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setting(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue setSetting(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue inspectedWindow(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue wrapCallback(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue currentCallFrame(JSC::ExecState*, const JSC::ArgList&); + JSC::JSValue profiles(JSC::ExecState*, const JSC::ArgList&); + InspectorBackend* impl() const { return m_impl.get(); } + +private: + RefPtr m_impl; +}; + +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, InspectorBackend*); +InspectorBackend* toInspectorBackend(JSC::JSValue); + +class JSInspectorBackendPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; +public: + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); + static PassRefPtr createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + JSInspectorBackendPrototype(PassRefPtr structure) : JSC::JSObject(structure) { } +}; + +// Functions + +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionHideDOMNodeHighlight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionHighlightDOMNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionLoaded(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionWindowUnloading(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionAttach(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionDetach(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionCloseWindow(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionClearMessages(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionToggleNodeSearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionIsWindowVisible(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionSearchingForNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionAddResourceSourceToFrame(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionAddSourceToFrame(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionSearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionDatabaseTableNames(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionSetting(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionSetSetting(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionInspectedWindow(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionLocalizedStringsURL(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionHiddenPanels(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionPlatform(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionMoveByUnrestricted(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionSetAttachedWindowHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionWrapCallback(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionResourceTrackingEnabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionEnableResourceTracking(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionDisableResourceTracking(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionStoreLastActivePanel(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionDebuggerEnabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionEnableDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionDisableDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionAddBreakpoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionRemoveBreakpoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionPauseInDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionResumeDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionStepOverStatementInDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionStepIntoStatementInDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionStepOutOfFunctionInDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionCurrentCallFrame(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionPauseOnExceptions(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionSetPauseOnExceptions(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionProfilerEnabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionEnableProfiler(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionDisableProfiler(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionStartProfiling(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionStopProfiling(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +JSC::JSValue JSC_HOST_CALL jsInspectorBackendPrototypeFunctionProfiles(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); +// Attributes + +JSC::JSValue jsInspectorBackendConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + +} // namespace WebCore + +#endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSInspectorController.cpp b/src/3rdparty/webkit/WebCore/generated/JSInspectorController.cpp deleted file mode 100644 index a457224c8..000000000 --- a/src/3rdparty/webkit/WebCore/generated/JSInspectorController.cpp +++ /dev/null @@ -1,769 +0,0 @@ -/* - This file is part of the WebKit open source project. - This file has been generated by generate-bindings.pl. DO NOT MODIFY! - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "config.h" -#include "JSInspectorController.h" - -#include "DOMWindow.h" -#include "InspectorController.h" -#include "JSNode.h" -#include "KURL.h" -#include "Node.h" -#include -#include -#include - -using namespace JSC; - -namespace WebCore { - -ASSERT_CLASS_FITS_IN_CELL(JSInspectorController); - -/* Hash table */ - -static const HashTableValue JSInspectorControllerTableValues[2] = -{ - { "constructor", DontEnum|ReadOnly, (intptr_t)jsInspectorControllerConstructor, (intptr_t)0 }, - { 0, 0, 0, 0 } -}; - -static JSC_CONST_HASHTABLE HashTable JSInspectorControllerTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 0, JSInspectorControllerTableValues, 0 }; -#else - { 2, 1, JSInspectorControllerTableValues, 0 }; -#endif - -/* Hash table for constructor */ - -static const HashTableValue JSInspectorControllerConstructorTableValues[1] = -{ - { 0, 0, 0, 0 } -}; - -static JSC_CONST_HASHTABLE HashTable JSInspectorControllerConstructorTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 0, JSInspectorControllerConstructorTableValues, 0 }; -#else - { 1, 0, JSInspectorControllerConstructorTableValues, 0 }; -#endif - -class JSInspectorControllerConstructor : public DOMObject { -public: - JSInspectorControllerConstructor(ExecState* exec) - : DOMObject(JSInspectorControllerConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) - { - putDirect(exec->propertyNames().prototype, JSInspectorControllerPrototype::self(exec, exec->lexicalGlobalObject()), None); - } - virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); - virtual const ClassInfo* classInfo() const { return &s_info; } - static const ClassInfo s_info; - - static PassRefPtr createStructure(JSValue proto) - { - return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); - } -}; - -const ClassInfo JSInspectorControllerConstructor::s_info = { "InspectorControllerConstructor", 0, &JSInspectorControllerConstructorTable, 0 }; - -bool JSInspectorControllerConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) -{ - return getStaticValueSlot(exec, &JSInspectorControllerConstructorTable, this, propertyName, slot); -} - -/* Hash table for prototype */ - -static const HashTableValue JSInspectorControllerPrototypeTableValues[48] = -{ - { "hideDOMNodeHighlight", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionHideDOMNodeHighlight, (intptr_t)0 }, - { "highlightDOMNode", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionHighlightDOMNode, (intptr_t)1 }, - { "loaded", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionLoaded, (intptr_t)0 }, - { "windowUnloading", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionWindowUnloading, (intptr_t)0 }, - { "attach", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionAttach, (intptr_t)0 }, - { "detach", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionDetach, (intptr_t)0 }, - { "closeWindow", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionCloseWindow, (intptr_t)0 }, - { "clearMessages", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionClearMessages, (intptr_t)0 }, - { "toggleNodeSearch", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionToggleNodeSearch, (intptr_t)0 }, - { "isWindowVisible", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionIsWindowVisible, (intptr_t)0 }, - { "searchingForNode", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionSearchingForNode, (intptr_t)0 }, - { "addResourceSourceToFrame", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionAddResourceSourceToFrame, (intptr_t)2 }, - { "addSourceToFrame", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionAddSourceToFrame, (intptr_t)3 }, - { "getResourceDocumentNode", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionGetResourceDocumentNode, (intptr_t)1 }, - { "search", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionSearch, (intptr_t)2 }, - { "databaseTableNames", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionDatabaseTableNames, (intptr_t)1 }, - { "setting", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionSetting, (intptr_t)1 }, - { "setSetting", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionSetSetting, (intptr_t)2 }, - { "inspectedWindow", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionInspectedWindow, (intptr_t)0 }, - { "localizedStringsURL", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionLocalizedStringsURL, (intptr_t)0 }, - { "hiddenPanels", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionHiddenPanels, (intptr_t)0 }, - { "platform", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionPlatform, (intptr_t)0 }, - { "moveByUnrestricted", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionMoveByUnrestricted, (intptr_t)2 }, - { "setAttachedWindowHeight", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionSetAttachedWindowHeight, (intptr_t)1 }, - { "wrapCallback", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionWrapCallback, (intptr_t)1 }, - { "resourceTrackingEnabled", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionResourceTrackingEnabled, (intptr_t)0 }, - { "enableResourceTracking", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionEnableResourceTracking, (intptr_t)1 }, - { "disableResourceTracking", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionDisableResourceTracking, (intptr_t)1 }, - { "enableDebuggerFromFrontend", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionEnableDebuggerFromFrontend, (intptr_t)1 }, - { "disableDebugger", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionDisableDebugger, (intptr_t)1 }, - { "pauseInDebugger", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionPauseInDebugger, (intptr_t)0 }, - { "resumeDebugger", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionResumeDebugger, (intptr_t)0 }, - { "stepOverStatementInDebugger", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionStepOverStatementInDebugger, (intptr_t)0 }, - { "stepIntoStatementInDebugger", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionStepIntoStatementInDebugger, (intptr_t)0 }, - { "stepOutOfFunctionInDebugger", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionStepOutOfFunctionInDebugger, (intptr_t)0 }, - { "debuggerEnabled", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionDebuggerEnabled, (intptr_t)0 }, - { "pauseOnExceptions", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionPauseOnExceptions, (intptr_t)0 }, - { "profilerEnabled", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionProfilerEnabled, (intptr_t)0 }, - { "startProfiling", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionStartProfiling, (intptr_t)0 }, - { "stopProfiling", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionStopProfiling, (intptr_t)0 }, - { "enableProfiler", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionEnableProfiler, (intptr_t)1 }, - { "disableProfiler", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionDisableProfiler, (intptr_t)1 }, - { "currentCallFrame", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionCurrentCallFrame, (intptr_t)0 }, - { "setPauseOnExceptions", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionSetPauseOnExceptions, (intptr_t)1 }, - { "addBreakpoint", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionAddBreakpoint, (intptr_t)2 }, - { "removeBreakpoint", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionRemoveBreakpoint, (intptr_t)2 }, - { "profiles", DontDelete|Function, (intptr_t)jsInspectorControllerPrototypeFunctionProfiles, (intptr_t)0 }, - { 0, 0, 0, 0 } -}; - -static JSC_CONST_HASHTABLE HashTable JSInspectorControllerPrototypeTable = -#if ENABLE(PERFECT_HASH_SIZE) - { 2047, JSInspectorControllerPrototypeTableValues, 0 }; -#else - { 137, 127, JSInspectorControllerPrototypeTableValues, 0 }; -#endif - -const ClassInfo JSInspectorControllerPrototype::s_info = { "InspectorControllerPrototype", 0, &JSInspectorControllerPrototypeTable, 0 }; - -JSObject* JSInspectorControllerPrototype::self(ExecState* exec, JSGlobalObject* globalObject) -{ - return getDOMPrototype(exec, globalObject); -} - -bool JSInspectorControllerPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) -{ - return getStaticFunctionSlot(exec, &JSInspectorControllerPrototypeTable, this, propertyName, slot); -} - -const ClassInfo JSInspectorController::s_info = { "InspectorController", 0, &JSInspectorControllerTable, 0 }; - -JSInspectorController::JSInspectorController(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) - , m_impl(impl) -{ -} - -JSInspectorController::~JSInspectorController() -{ - forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); -} - -JSObject* JSInspectorController::createPrototype(ExecState* exec, JSGlobalObject* globalObject) -{ - return new (exec) JSInspectorControllerPrototype(JSInspectorControllerPrototype::createStructure(globalObject->objectPrototype())); -} - -bool JSInspectorController::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) -{ - return getStaticValueSlot(exec, &JSInspectorControllerTable, this, propertyName, slot); -} - -JSValue jsInspectorControllerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); -} -JSValue JSInspectorController::getConstructor(ExecState* exec) -{ - return getDOMConstructor(exec); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionHideDOMNodeHighlight(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->hideHighlight(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionHighlightDOMNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - return castedThisObj->highlightDOMNode(exec, args); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionLoaded(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->scriptObjectReady(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionWindowUnloading(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->close(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAttach(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->attachWindow(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDetach(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->detachWindow(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionCloseWindow(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->closeWindow(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionClearMessages(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->clearConsoleMessages(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionToggleNodeSearch(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->toggleSearchForNodeInPage(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionIsWindowVisible(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - - JSC::JSValue result = jsBoolean(imp->windowVisible()); - return result; -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSearchingForNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - - JSC::JSValue result = jsBoolean(imp->searchingForNodeInPage()); - return result; -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAddResourceSourceToFrame(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - int identifier = args.at(0).toInt32(exec); - Node* frame = toNode(args.at(1)); - - imp->addResourceSourceToFrame(identifier, frame); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAddSourceToFrame(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - const UString& mimeType = args.at(0).toString(exec); - const UString& sourceValue = args.at(1).toString(exec); - Node* frame = toNode(args.at(2)); - - - JSC::JSValue result = jsBoolean(imp->addSourceToFrame(mimeType, sourceValue, frame)); - return result; -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionGetResourceDocumentNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - return castedThisObj->getResourceDocumentNode(exec, args); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSearch(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - return castedThisObj->search(exec, args); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDatabaseTableNames(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - return castedThisObj->databaseTableNames(exec, args); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetting(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - return castedThisObj->setting(exec, args); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetSetting(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - return castedThisObj->setSetting(exec, args); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionInspectedWindow(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - return castedThisObj->inspectedWindow(exec, args); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionLocalizedStringsURL(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - - JSC::JSValue result = jsString(exec, imp->localizedStringsURL()); - return result; -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionHiddenPanels(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - - JSC::JSValue result = jsString(exec, imp->hiddenPanels()); - return result; -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionPlatform(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - - JSC::JSValue result = jsString(exec, imp->platform()); - return result; -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionMoveByUnrestricted(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - float x = args.at(0).toFloat(exec); - float y = args.at(1).toFloat(exec); - - imp->moveWindowBy(x, y); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetAttachedWindowHeight(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - unsigned height = args.at(0).toInt32(exec); - - imp->setAttachedWindowHeight(height); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionWrapCallback(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - return castedThisObj->wrapCallback(exec, args); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionResourceTrackingEnabled(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - - JSC::JSValue result = jsBoolean(imp->resourceTrackingEnabled()); - return result; -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionEnableResourceTracking(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - bool always = args.at(0).toBoolean(exec); - - imp->enableResourceTracking(always); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDisableResourceTracking(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - bool always = args.at(0).toBoolean(exec); - - imp->disableResourceTracking(always); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionEnableDebuggerFromFrontend(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - bool always = args.at(0).toBoolean(exec); - - imp->enableDebuggerFromFrontend(always); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDisableDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - bool always = args.at(0).toBoolean(exec); - - imp->disableDebugger(always); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionPauseInDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->pauseInDebugger(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionResumeDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->resumeDebugger(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStepOverStatementInDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->stepOverStatementInDebugger(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStepIntoStatementInDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->stepIntoStatementInDebugger(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStepOutOfFunctionInDebugger(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->stepOutOfFunctionInDebugger(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDebuggerEnabled(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - - JSC::JSValue result = jsBoolean(imp->debuggerEnabled()); - return result; -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionPauseOnExceptions(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - - JSC::JSValue result = jsBoolean(imp->pauseOnExceptions()); - return result; -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionProfilerEnabled(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - - JSC::JSValue result = jsBoolean(imp->profilerEnabled()); - return result; -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStartProfiling(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->startUserInitiatedProfiling(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStopProfiling(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - - imp->stopUserInitiatedProfiling(); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionEnableProfiler(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - bool always = args.at(0).toBoolean(exec); - - imp->enableProfiler(always); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDisableProfiler(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - bool always = args.at(0).toBoolean(exec); - - imp->disableProfiler(always); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionCurrentCallFrame(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - return castedThisObj->currentCallFrame(exec, args); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetPauseOnExceptions(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - bool pauseOnExceptions = args.at(0).toBoolean(exec); - - imp->setPauseOnExceptions(pauseOnExceptions); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAddBreakpoint(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - const UString& sourceID = args.at(0).toString(exec); - unsigned lineNumber = args.at(1).toInt32(exec); - - imp->addBreakpoint(sourceID, lineNumber); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionRemoveBreakpoint(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - InspectorController* imp = static_cast(castedThisObj->impl()); - const UString& sourceID = args.at(0).toString(exec); - unsigned lineNumber = args.at(1).toInt32(exec); - - imp->removeBreakpoint(sourceID, lineNumber); - return jsUndefined(); -} - -JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionProfiles(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSInspectorController::s_info)) - return throwError(exec, TypeError); - JSInspectorController* castedThisObj = static_cast(asObject(thisValue)); - return castedThisObj->profiles(exec, args); -} - -JSC::JSValue toJS(JSC::ExecState* exec, InspectorController* object) -{ - return getDOMObjectWrapper(exec, object); -} -InspectorController* toInspectorController(JSC::JSValue value) -{ - return value.isObject(&JSInspectorController::s_info) ? static_cast(asObject(value))->impl() : 0; -} - -} diff --git a/src/3rdparty/webkit/WebCore/generated/JSInspectorController.h b/src/3rdparty/webkit/WebCore/generated/JSInspectorController.h deleted file mode 100644 index 3bb1480d0..000000000 --- a/src/3rdparty/webkit/WebCore/generated/JSInspectorController.h +++ /dev/null @@ -1,138 +0,0 @@ -/* - This file is part of the WebKit open source project. - This file has been generated by generate-bindings.pl. DO NOT MODIFY! - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef JSInspectorController_h -#define JSInspectorController_h - -#include "JSDOMBinding.h" -#include -#include - -namespace WebCore { - -class InspectorController; - -class JSInspectorController : public DOMObject { - typedef DOMObject Base; -public: - JSInspectorController(PassRefPtr, PassRefPtr); - virtual ~JSInspectorController(); - static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); - virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); - virtual const JSC::ClassInfo* classInfo() const { return &s_info; } - static const JSC::ClassInfo s_info; - - static PassRefPtr createStructure(JSC::JSValue prototype) - { - return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); - } - - static JSC::JSValue getConstructor(JSC::ExecState*); - - // Custom functions - JSC::JSValue highlightDOMNode(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValue getResourceDocumentNode(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValue search(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValue databaseTableNames(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValue setting(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValue setSetting(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValue inspectedWindow(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValue wrapCallback(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValue currentCallFrame(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValue profiles(JSC::ExecState*, const JSC::ArgList&); - InspectorController* impl() const { return m_impl.get(); } - -private: - RefPtr m_impl; -}; - -JSC::JSValue toJS(JSC::ExecState*, InspectorController*); -InspectorController* toInspectorController(JSC::JSValue); - -class JSInspectorControllerPrototype : public JSC::JSObject { - typedef JSC::JSObject Base; -public: - static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); - virtual const JSC::ClassInfo* classInfo() const { return &s_info; } - static const JSC::ClassInfo s_info; - virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); - static PassRefPtr createStructure(JSC::JSValue prototype) - { - return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); - } - JSInspectorControllerPrototype(PassRefPtr structure) : JSC::JSObject(structure) { } -}; - -// Functions - -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionHideDOMNodeHighlight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionHighlightDOMNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionLoaded(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionWindowUnloading(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAttach(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDetach(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionCloseWindow(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionClearMessages(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionToggleNodeSearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionIsWindowVisible(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSearchingForNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAddResourceSourceToFrame(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAddSourceToFrame(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionGetResourceDocumentNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSearch(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDatabaseTableNames(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetting(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetSetting(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionInspectedWindow(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionLocalizedStringsURL(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionHiddenPanels(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionPlatform(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionMoveByUnrestricted(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetAttachedWindowHeight(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionWrapCallback(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionResourceTrackingEnabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionEnableResourceTracking(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDisableResourceTracking(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionEnableDebuggerFromFrontend(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDisableDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionPauseInDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionResumeDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStepOverStatementInDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStepIntoStatementInDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStepOutOfFunctionInDebugger(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDebuggerEnabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionPauseOnExceptions(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionProfilerEnabled(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStartProfiling(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionStopProfiling(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionEnableProfiler(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionDisableProfiler(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionCurrentCallFrame(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionSetPauseOnExceptions(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionAddBreakpoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionRemoveBreakpoint(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsInspectorControllerPrototypeFunctionProfiles(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -// Attributes - -JSC::JSValue jsInspectorControllerConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); - -} // namespace WebCore - -#endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp index a4a4f8be5..dc9389f77 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp @@ -88,8 +88,8 @@ bool JSJavaScriptCallFramePrototype::getOwnPropertySlot(ExecState* exec, const I const ClassInfo JSJavaScriptCallFrame::s_info = { "JavaScriptCallFrame", 0, &JSJavaScriptCallFrameTable, 0 }; -JSJavaScriptCallFrame::JSJavaScriptCallFrame(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSJavaScriptCallFrame::JSJavaScriptCallFrame(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -111,45 +111,52 @@ bool JSJavaScriptCallFrame::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsJavaScriptCallFrameCaller(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSJavaScriptCallFrame* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - JavaScriptCallFrame* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->caller())); + JavaScriptCallFrame* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->caller())); } JSValue jsJavaScriptCallFrameSourceID(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSJavaScriptCallFrame* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - JavaScriptCallFrame* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + JavaScriptCallFrame* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->sourceID()); } JSValue jsJavaScriptCallFrameLine(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSJavaScriptCallFrame* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - JavaScriptCallFrame* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + JavaScriptCallFrame* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->line()); } JSValue jsJavaScriptCallFrameScopeChain(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->scopeChain(exec); + JSJavaScriptCallFrame* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->scopeChain(exec); } JSValue jsJavaScriptCallFrameThisObject(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->thisObject(exec); + JSJavaScriptCallFrame* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->thisObject(exec); } JSValue jsJavaScriptCallFrameFunctionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSJavaScriptCallFrame* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - JavaScriptCallFrame* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + JavaScriptCallFrame* imp = static_cast(castedThis->impl()); return jsString(exec, imp->functionName()); } JSValue jsJavaScriptCallFrameType(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->type(exec); + JSJavaScriptCallFrame* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->type(exec); } JSValue JSC_HOST_CALL jsJavaScriptCallFramePrototypeFunctionEvaluate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -161,9 +168,9 @@ JSValue JSC_HOST_CALL jsJavaScriptCallFramePrototypeFunctionEvaluate(ExecState* return castedThisObj->evaluate(exec, args); } -JSC::JSValue toJS(JSC::ExecState* exec, JavaScriptCallFrame* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, JavaScriptCallFrame* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } JavaScriptCallFrame* toJavaScriptCallFrame(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h index 166ee6057..3dff1bc31 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h +++ b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.h @@ -23,6 +23,7 @@ #if ENABLE(JAVASCRIPT_DEBUGGER) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class JavaScriptCallFrame; -class JSJavaScriptCallFrame : public DOMObject { - typedef DOMObject Base; +class JSJavaScriptCallFrame : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSJavaScriptCallFrame(PassRefPtr, PassRefPtr); + JSJavaScriptCallFrame(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSJavaScriptCallFrame(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -60,7 +61,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, JavaScriptCallFrame*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, JavaScriptCallFrame*); JavaScriptCallFrame* toJavaScriptCallFrame(JSC::JSValue); class JSJavaScriptCallFramePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.cpp index a03e149b7..2c5d0bd13 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.cpp @@ -71,12 +71,12 @@ static JSC_CONST_HASHTABLE HashTable JSKeyboardEventConstructorTable = { 1, 0, JSKeyboardEventConstructorTableValues, 0 }; #endif -class JSKeyboardEventConstructor : public DOMObject { +class JSKeyboardEventConstructor : public DOMConstructorObject { public: - JSKeyboardEventConstructor(ExecState* exec) - : DOMObject(JSKeyboardEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSKeyboardEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSKeyboardEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSKeyboardEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSKeyboardEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -124,8 +124,8 @@ bool JSKeyboardEventPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSKeyboardEvent::s_info = { "KeyboardEvent", &JSUIEvent::s_info, &JSKeyboardEventTable, 0 }; -JSKeyboardEvent::JSKeyboardEvent(PassRefPtr structure, PassRefPtr impl) - : JSUIEvent(structure, impl) +JSKeyboardEvent::JSKeyboardEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSUIEvent(structure, globalObject, impl) { } @@ -141,60 +141,68 @@ bool JSKeyboardEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsKeyboardEventKeyIdentifier(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSKeyboardEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - KeyboardEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + KeyboardEvent* imp = static_cast(castedThis->impl()); return jsString(exec, imp->keyIdentifier()); } JSValue jsKeyboardEventKeyLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSKeyboardEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - KeyboardEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + KeyboardEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->keyLocation()); } JSValue jsKeyboardEventCtrlKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSKeyboardEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - KeyboardEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + KeyboardEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->ctrlKey()); } JSValue jsKeyboardEventShiftKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSKeyboardEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - KeyboardEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + KeyboardEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->shiftKey()); } JSValue jsKeyboardEventAltKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSKeyboardEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - KeyboardEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + KeyboardEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->altKey()); } JSValue jsKeyboardEventMetaKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSKeyboardEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - KeyboardEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + KeyboardEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->metaKey()); } JSValue jsKeyboardEventAltGraphKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSKeyboardEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - KeyboardEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + KeyboardEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->altGraphKey()); } JSValue jsKeyboardEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSKeyboardEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSKeyboardEvent::getConstructor(exec, domObject->globalObject()); } -JSValue JSKeyboardEvent::getConstructor(ExecState* exec) +JSValue JSKeyboardEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsKeyboardEventPrototypeFunctionInitKeyboardEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.h b/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.h index 40e6eb1c2..b1ead271a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSKeyboardEvent.h @@ -30,7 +30,7 @@ class KeyboardEvent; class JSKeyboardEvent : public JSUIEvent { typedef JSUIEvent Base; public: - JSKeyboardEvent(PassRefPtr, PassRefPtr); + JSKeyboardEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSLocation.cpp b/src/3rdparty/webkit/WebCore/generated/JSLocation.cpp index 01b1416ba..f6d9be462 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSLocation.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSLocation.cpp @@ -95,8 +95,8 @@ void JSLocationPrototype::put(ExecState* exec, const Identifier& propertyName, J const ClassInfo JSLocation::s_info = { "Location", 0, &JSLocationTable, 0 }; -JSLocation::JSLocation(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSLocation::JSLocation(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -120,57 +120,65 @@ bool JSLocation::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN JSValue jsLocationHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Location* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Location* imp = static_cast(castedThis->impl()); return jsString(exec, imp->href()); } JSValue jsLocationProtocol(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Location* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Location* imp = static_cast(castedThis->impl()); return jsString(exec, imp->protocol()); } JSValue jsLocationHost(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Location* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Location* imp = static_cast(castedThis->impl()); return jsString(exec, imp->host()); } JSValue jsLocationHostname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Location* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Location* imp = static_cast(castedThis->impl()); return jsString(exec, imp->hostname()); } JSValue jsLocationPort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Location* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Location* imp = static_cast(castedThis->impl()); return jsString(exec, imp->port()); } JSValue jsLocationPathname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Location* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Location* imp = static_cast(castedThis->impl()); return jsString(exec, imp->pathname()); } JSValue jsLocationSearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Location* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Location* imp = static_cast(castedThis->impl()); return jsString(exec, imp->search()); } JSValue jsLocationHash(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Location* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Location* imp = static_cast(castedThis->impl()); return jsString(exec, imp->hash()); } @@ -257,9 +265,9 @@ JSValue JSC_HOST_CALL jsLocationPrototypeFunctionToString(ExecState* exec, JSObj return castedThisObj->toString(exec, args); } -JSC::JSValue toJS(JSC::ExecState* exec, Location* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Location* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Location* toLocation(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSLocation.h b/src/3rdparty/webkit/WebCore/generated/JSLocation.h index 81cb7a37a..155cfbc4f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSLocation.h +++ b/src/3rdparty/webkit/WebCore/generated/JSLocation.h @@ -21,6 +21,7 @@ #ifndef JSLocation_h #define JSLocation_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class Location; -class JSLocation : public DOMObject { - typedef DOMObject Base; +class JSLocation : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSLocation(PassRefPtr, PassRefPtr); + JSLocation(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSLocation(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -72,7 +73,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, Location*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Location*); Location* toLocation(JSC::JSValue); class JSLocationPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSMediaError.cpp b/src/3rdparty/webkit/WebCore/generated/JSMediaError.cpp index 76d80441f..37b1b43df 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMediaError.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMediaError.cpp @@ -68,12 +68,12 @@ static JSC_CONST_HASHTABLE HashTable JSMediaErrorConstructorTable = { 9, 7, JSMediaErrorConstructorTableValues, 0 }; #endif -class JSMediaErrorConstructor : public DOMObject { +class JSMediaErrorConstructor : public DOMConstructorObject { public: - JSMediaErrorConstructor(ExecState* exec) - : DOMObject(JSMediaErrorConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSMediaErrorConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSMediaErrorConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSMediaErrorPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSMediaErrorPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -124,8 +124,8 @@ bool JSMediaErrorPrototype::getOwnPropertySlot(ExecState* exec, const Identifier const ClassInfo JSMediaError::s_info = { "MediaError", 0, &JSMediaErrorTable, 0 }; -JSMediaError::JSMediaError(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSMediaError::JSMediaError(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -147,18 +147,20 @@ bool JSMediaError::getOwnPropertySlot(ExecState* exec, const Identifier& propert JSValue jsMediaErrorCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMediaError* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MediaError* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MediaError* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->code()); } JSValue jsMediaErrorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSMediaError* domObject = static_cast(asObject(slot.slotBase())); + return JSMediaError::getConstructor(exec, domObject->globalObject()); } -JSValue JSMediaError::getConstructor(ExecState* exec) +JSValue JSMediaError::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } // Constant getters @@ -183,9 +185,9 @@ JSValue jsMediaErrorMEDIA_ERR_SRC_NOT_SUPPORTED(ExecState* exec, const Identifie return jsNumber(exec, static_cast(4)); } -JSC::JSValue toJS(JSC::ExecState* exec, MediaError* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, MediaError* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } MediaError* toMediaError(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSMediaError.h b/src/3rdparty/webkit/WebCore/generated/JSMediaError.h index 54f58a7d1..5a159b92d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMediaError.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMediaError.h @@ -23,6 +23,7 @@ #if ENABLE(VIDEO) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class MediaError; -class JSMediaError : public DOMObject { - typedef DOMObject Base; +class JSMediaError : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSMediaError(PassRefPtr, PassRefPtr); + JSMediaError(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSMediaError(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,14 +47,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); MediaError* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, MediaError*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, MediaError*); MediaError* toMediaError(JSC::JSValue); class JSMediaErrorPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSMediaList.cpp b/src/3rdparty/webkit/WebCore/generated/JSMediaList.cpp index 448b378ce..007e9762d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMediaList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMediaList.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSMediaListConstructorTable = { 1, 0, JSMediaListConstructorTableValues, 0 }; #endif -class JSMediaListConstructor : public DOMObject { +class JSMediaListConstructor : public DOMConstructorObject { public: - JSMediaListConstructor(ExecState* exec) - : DOMObject(JSMediaListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSMediaListConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSMediaListConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSMediaListPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSMediaListPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -120,8 +120,8 @@ bool JSMediaListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSMediaList::s_info = { "MediaList", 0, &JSMediaListTable, 0 }; -JSMediaList::JSMediaList(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSMediaList::JSMediaList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -163,21 +163,24 @@ bool JSMediaList::getOwnPropertySlot(ExecState* exec, unsigned propertyName, Pro JSValue jsMediaListMediaText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMediaList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MediaList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MediaList* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->mediaText()); } JSValue jsMediaListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMediaList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MediaList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MediaList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsMediaListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSMediaList* domObject = static_cast(asObject(slot.slotBase())); + return JSMediaList::getConstructor(exec, domObject->globalObject()); } void JSMediaList::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -199,9 +202,9 @@ void JSMediaList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyN Base::getPropertyNames(exec, propertyNames); } -JSValue JSMediaList::getConstructor(ExecState* exec) +JSValue JSMediaList::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsMediaListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -254,9 +257,9 @@ JSValue JSMediaList::indexGetter(ExecState* exec, const Identifier&, const Prope JSMediaList* thisObj = static_cast(asObject(slot.slotBase())); return jsStringOrNull(exec, thisObj->impl()->item(slot.index())); } -JSC::JSValue toJS(JSC::ExecState* exec, MediaList* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, MediaList* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } MediaList* toMediaList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSMediaList.h b/src/3rdparty/webkit/WebCore/generated/JSMediaList.h index 800d9d4b9..da82e56e7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMediaList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMediaList.h @@ -21,6 +21,7 @@ #ifndef JSMediaList_h #define JSMediaList_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class MediaList; -class JSMediaList : public DOMObject { - typedef DOMObject Base; +class JSMediaList : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSMediaList(PassRefPtr, PassRefPtr); + JSMediaList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSMediaList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,7 +48,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); MediaList* impl() const { return m_impl.get(); } private: @@ -55,7 +56,7 @@ private: static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, MediaList*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, MediaList*); MediaList* toMediaList(JSC::JSValue); class JSMediaListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.cpp b/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.cpp index 5b41a54c6..9304f8342 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.cpp @@ -79,8 +79,8 @@ static const HashTable* getJSMessageChannelTable(ExecState* exec) } const ClassInfo JSMessageChannel::s_info = { "MessageChannel", 0, 0, getJSMessageChannelTable }; -JSMessageChannel::JSMessageChannel(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSMessageChannel::JSMessageChannel(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -102,21 +102,23 @@ bool JSMessageChannel::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsMessageChannelPort1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMessageChannel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MessageChannel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->port1())); + MessageChannel* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->port1())); } JSValue jsMessageChannelPort2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMessageChannel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MessageChannel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->port2())); + MessageChannel* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->port2())); } -JSC::JSValue toJS(JSC::ExecState* exec, MessageChannel* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, MessageChannel* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } MessageChannel* toMessageChannel(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.h b/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.h index f9a90261b..a56f7c319 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMessageChannel.h @@ -21,6 +21,7 @@ #ifndef JSMessageChannel_h #define JSMessageChannel_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class MessageChannel; -class JSMessageChannel : public DOMObject { - typedef DOMObject Base; +class JSMessageChannel : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSMessageChannel(PassRefPtr, PassRefPtr); + JSMessageChannel(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSMessageChannel(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -52,7 +53,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, MessageChannel*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, MessageChannel*); MessageChannel* toMessageChannel(JSC::JSValue); class JSMessageChannelPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.cpp index 190fb5a8a..293655d04 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.cpp @@ -71,12 +71,12 @@ static JSC_CONST_HASHTABLE HashTable JSMessageEventConstructorTable = { 1, 0, JSMessageEventConstructorTableValues, 0 }; #endif -class JSMessageEventConstructor : public DOMObject { +class JSMessageEventConstructor : public DOMConstructorObject { public: - JSMessageEventConstructor(ExecState* exec) - : DOMObject(JSMessageEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSMessageEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSMessageEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSMessageEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSMessageEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -132,8 +132,8 @@ static const HashTable* getJSMessageEventTable(ExecState* exec) } const ClassInfo JSMessageEvent::s_info = { "MessageEvent", &JSEvent::s_info, 0, getJSMessageEventTable }; -JSMessageEvent::JSMessageEvent(PassRefPtr structure, PassRefPtr impl) - : JSEvent(structure, impl) +JSMessageEvent::JSMessageEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSEvent(structure, globalObject, impl) { } @@ -149,46 +149,52 @@ bool JSMessageEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsMessageEventData(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMessageEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MessageEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MessageEvent* imp = static_cast(castedThis->impl()); return jsString(exec, imp->data()); } JSValue jsMessageEventOrigin(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMessageEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MessageEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MessageEvent* imp = static_cast(castedThis->impl()); return jsString(exec, imp->origin()); } JSValue jsMessageEventLastEventId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMessageEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MessageEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MessageEvent* imp = static_cast(castedThis->impl()); return jsString(exec, imp->lastEventId()); } JSValue jsMessageEventSource(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMessageEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MessageEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->source())); + MessageEvent* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->source())); } JSValue jsMessageEventMessagePort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMessageEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MessageEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->messagePort())); + MessageEvent* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->messagePort())); } JSValue jsMessageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSMessageEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSMessageEvent::getConstructor(exec, domObject->globalObject()); } -JSValue JSMessageEvent::getConstructor(ExecState* exec) +JSValue JSMessageEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsMessageEventPrototypeFunctionInitMessageEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.h b/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.h index 4cdefab8f..34a0b9fb2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMessageEvent.h @@ -30,7 +30,7 @@ class MessageEvent; class JSMessageEvent : public JSEvent { typedef JSEvent Base; public: - JSMessageEvent(PassRefPtr, PassRefPtr); + JSMessageEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSMessagePort.cpp b/src/3rdparty/webkit/WebCore/generated/JSMessagePort.cpp index cc43258ef..2969c2243 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMessagePort.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMessagePort.cpp @@ -69,12 +69,12 @@ static JSC_CONST_HASHTABLE HashTable JSMessagePortConstructorTable = { 1, 0, JSMessagePortConstructorTableValues, 0 }; #endif -class JSMessagePortConstructor : public DOMObject { +class JSMessagePortConstructor : public DOMConstructorObject { public: - JSMessagePortConstructor(ExecState* exec) - : DOMObject(JSMessagePortConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSMessagePortConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSMessagePortConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSMessagePortPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSMessagePortPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -135,8 +135,8 @@ static const HashTable* getJSMessagePortTable(ExecState* exec) } const ClassInfo JSMessagePort::s_info = { "MessagePort", 0, 0, getJSMessagePortTable }; -JSMessagePort::JSMessagePort(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSMessagePort::JSMessagePort(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -158,8 +158,9 @@ bool JSMessagePort::getOwnPropertySlot(ExecState* exec, const Identifier& proper JSValue jsMessagePortOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMessagePort* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MessagePort* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MessagePort* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmessage()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -169,7 +170,8 @@ JSValue jsMessagePortOnmessage(ExecState* exec, const Identifier&, const Propert JSValue jsMessagePortConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSMessagePort* domObject = static_cast(asObject(slot.slotBase())); + return JSMessagePort::getConstructor(exec, domObject->globalObject()); } void JSMessagePort::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -186,9 +188,9 @@ void setJSMessagePortOnmessage(ExecState* exec, JSObject* thisObject, JSValue va imp->setOnmessage(globalObject->createJSAttributeEventListener(value)); } -JSValue JSMessagePort::getConstructor(ExecState* exec) +JSValue JSMessagePort::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionPostMessage(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -273,9 +275,9 @@ JSValue JSC_HOST_CALL jsMessagePortPrototypeFunctionDispatchEvent(ExecState* exe return result; } -JSC::JSValue toJS(JSC::ExecState* exec, MessagePort* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, MessagePort* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } MessagePort* toMessagePort(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSMessagePort.h b/src/3rdparty/webkit/WebCore/generated/JSMessagePort.h index 1804d8d7e..7db583858 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMessagePort.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMessagePort.h @@ -21,6 +21,7 @@ #ifndef JSMessagePort_h #define JSMessagePort_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class MessagePort; -class JSMessagePort : public DOMObject { - typedef DOMObject Base; +class JSMessagePort : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSMessagePort(PassRefPtr, PassRefPtr); + JSMessagePort(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSMessagePort(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,7 +48,7 @@ public: virtual void mark(); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom functions JSC::JSValue addEventListener(JSC::ExecState*, const JSC::ArgList&); @@ -58,7 +59,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, MessagePort*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, MessagePort*); MessagePort* toMessagePort(JSC::JSValue); class JSMessagePortPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSMimeType.cpp b/src/3rdparty/webkit/WebCore/generated/JSMimeType.cpp index 19380617e..e5ef403f8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMimeType.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMimeType.cpp @@ -67,12 +67,12 @@ static JSC_CONST_HASHTABLE HashTable JSMimeTypeConstructorTable = { 1, 0, JSMimeTypeConstructorTableValues, 0 }; #endif -class JSMimeTypeConstructor : public DOMObject { +class JSMimeTypeConstructor : public DOMConstructorObject { public: - JSMimeTypeConstructor(ExecState* exec) - : DOMObject(JSMimeTypeConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSMimeTypeConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSMimeTypeConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSMimeTypePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSMimeTypePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -114,8 +114,8 @@ JSObject* JSMimeTypePrototype::self(ExecState* exec, JSGlobalObject* globalObjec const ClassInfo JSMimeType::s_info = { "MimeType", 0, &JSMimeTypeTable, 0 }; -JSMimeType::JSMimeType(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSMimeType::JSMimeType(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -137,44 +137,49 @@ bool JSMimeType::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN JSValue jsMimeTypeType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMimeType* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MimeType* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MimeType* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsMimeTypeSuffixes(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMimeType* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MimeType* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MimeType* imp = static_cast(castedThis->impl()); return jsString(exec, imp->suffixes()); } JSValue jsMimeTypeDescription(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMimeType* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MimeType* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MimeType* imp = static_cast(castedThis->impl()); return jsString(exec, imp->description()); } JSValue jsMimeTypeEnabledPlugin(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMimeType* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MimeType* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->enabledPlugin())); + MimeType* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->enabledPlugin())); } JSValue jsMimeTypeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSMimeType* domObject = static_cast(asObject(slot.slotBase())); + return JSMimeType::getConstructor(exec, domObject->globalObject()); } -JSValue JSMimeType::getConstructor(ExecState* exec) +JSValue JSMimeType::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } -JSC::JSValue toJS(JSC::ExecState* exec, MimeType* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, MimeType* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } MimeType* toMimeType(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSMimeType.h b/src/3rdparty/webkit/WebCore/generated/JSMimeType.h index 79b904d42..662945a70 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMimeType.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMimeType.h @@ -21,6 +21,7 @@ #ifndef JSMimeType_h #define JSMimeType_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class MimeType; -class JSMimeType : public DOMObject { - typedef DOMObject Base; +class JSMimeType : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSMimeType(PassRefPtr, PassRefPtr); + JSMimeType(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSMimeType(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); MimeType* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, MimeType*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, MimeType*); MimeType* toMimeType(JSC::JSValue); class JSMimeTypePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.cpp b/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.cpp index 28e39304f..8f769fb57 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSMimeTypeArrayConstructorTable = { 1, 0, JSMimeTypeArrayConstructorTableValues, 0 }; #endif -class JSMimeTypeArrayConstructor : public DOMObject { +class JSMimeTypeArrayConstructor : public DOMConstructorObject { public: - JSMimeTypeArrayConstructor(ExecState* exec) - : DOMObject(JSMimeTypeArrayConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSMimeTypeArrayConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSMimeTypeArrayConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSMimeTypeArrayPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSMimeTypeArrayPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -120,8 +120,8 @@ bool JSMimeTypeArrayPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSMimeTypeArray::s_info = { "MimeTypeArray", 0, &JSMimeTypeArrayTable, 0 }; -JSMimeTypeArray::JSMimeTypeArray(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSMimeTypeArray::JSMimeTypeArray(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -167,14 +167,16 @@ bool JSMimeTypeArray::getOwnPropertySlot(ExecState* exec, unsigned propertyName, JSValue jsMimeTypeArrayLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMimeTypeArray* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MimeTypeArray* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MimeTypeArray* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsMimeTypeArrayConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSMimeTypeArray* domObject = static_cast(asObject(slot.slotBase())); + return JSMimeTypeArray::getConstructor(exec, domObject->globalObject()); } void JSMimeTypeArray::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) { @@ -183,9 +185,9 @@ void JSMimeTypeArray::getPropertyNames(ExecState* exec, PropertyNameArray& prope Base::getPropertyNames(exec, propertyNames); } -JSValue JSMimeTypeArray::getConstructor(ExecState* exec) +JSValue JSMimeTypeArray::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsMimeTypeArrayPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -198,7 +200,7 @@ JSValue JSC_HOST_CALL jsMimeTypeArrayPrototypeFunctionItem(ExecState* exec, JSOb unsigned index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->item(index))); return result; } @@ -212,7 +214,7 @@ JSValue JSC_HOST_CALL jsMimeTypeArrayPrototypeFunctionNamedItem(ExecState* exec, const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->namedItem(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->namedItem(name))); return result; } @@ -220,11 +222,11 @@ JSValue JSC_HOST_CALL jsMimeTypeArrayPrototypeFunctionNamedItem(ExecState* exec, JSValue JSMimeTypeArray::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSMimeTypeArray* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } -JSC::JSValue toJS(JSC::ExecState* exec, MimeTypeArray* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, MimeTypeArray* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } MimeTypeArray* toMimeTypeArray(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.h b/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.h index adc48244f..f0625e478 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMimeTypeArray.h @@ -21,6 +21,7 @@ #ifndef JSMimeTypeArray_h #define JSMimeTypeArray_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class MimeTypeArray; -class JSMimeTypeArray : public DOMObject { - typedef DOMObject Base; +class JSMimeTypeArray : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSMimeTypeArray(PassRefPtr, PassRefPtr); + JSMimeTypeArray(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSMimeTypeArray(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,7 +47,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); MimeTypeArray* impl() const { return m_impl.get(); } private: @@ -57,7 +58,7 @@ private: static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, MimeTypeArray*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, MimeTypeArray*); MimeTypeArray* toMimeTypeArray(JSC::JSValue); class JSMimeTypeArrayPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.cpp index fca18c5ae..1ba4b0ec3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.cpp @@ -85,12 +85,12 @@ static JSC_CONST_HASHTABLE HashTable JSMouseEventConstructorTable = { 1, 0, JSMouseEventConstructorTableValues, 0 }; #endif -class JSMouseEventConstructor : public DOMObject { +class JSMouseEventConstructor : public DOMConstructorObject { public: - JSMouseEventConstructor(ExecState* exec) - : DOMObject(JSMouseEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSMouseEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSMouseEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSMouseEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSMouseEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -138,8 +138,8 @@ bool JSMouseEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier const ClassInfo JSMouseEvent::s_info = { "MouseEvent", &JSUIEvent::s_info, &JSMouseEventTable, 0 }; -JSMouseEvent::JSMouseEvent(PassRefPtr structure, PassRefPtr impl) - : JSUIEvent(structure, impl) +JSMouseEvent::JSMouseEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSUIEvent(structure, globalObject, impl) { } @@ -155,130 +155,148 @@ bool JSMouseEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propert JSValue jsMouseEventScreenX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MouseEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->screenX()); } JSValue jsMouseEventScreenY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MouseEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->screenY()); } JSValue jsMouseEventClientX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MouseEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->clientX()); } JSValue jsMouseEventClientY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MouseEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->clientY()); } JSValue jsMouseEventCtrlKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MouseEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->ctrlKey()); } JSValue jsMouseEventShiftKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MouseEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->shiftKey()); } JSValue jsMouseEventAltKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MouseEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->altKey()); } JSValue jsMouseEventMetaKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MouseEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->metaKey()); } JSValue jsMouseEventButton(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MouseEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->button()); } JSValue jsMouseEventRelatedTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->relatedTarget())); + MouseEvent* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->relatedTarget())); } JSValue jsMouseEventOffsetX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MouseEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->offsetX()); } JSValue jsMouseEventOffsetY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MouseEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->offsetY()); } JSValue jsMouseEventX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MouseEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsMouseEventY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MouseEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } JSValue jsMouseEventFromElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->fromElement())); + MouseEvent* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->fromElement())); } JSValue jsMouseEventToElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->toElement())); + MouseEvent* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->toElement())); } JSValue jsMouseEventDataTransfer(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMouseEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MouseEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->dataTransfer())); + MouseEvent* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->dataTransfer())); } JSValue jsMouseEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSMouseEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSMouseEvent::getConstructor(exec, domObject->globalObject()); } -JSValue JSMouseEvent::getConstructor(ExecState* exec) +JSValue JSMouseEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsMouseEventPrototypeFunctionInitMouseEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.h b/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.h index 3730d934c..73727e5f3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMouseEvent.h @@ -30,7 +30,7 @@ class MouseEvent; class JSMouseEvent : public JSUIEvent { typedef JSUIEvent Base; public: - JSMouseEvent(PassRefPtr, PassRefPtr); + JSMouseEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.cpp index 2f6bc8e6c..7632b91c6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.cpp @@ -73,12 +73,12 @@ static JSC_CONST_HASHTABLE HashTable JSMutationEventConstructorTable = { 8, 7, JSMutationEventConstructorTableValues, 0 }; #endif -class JSMutationEventConstructor : public DOMObject { +class JSMutationEventConstructor : public DOMConstructorObject { public: - JSMutationEventConstructor(ExecState* exec) - : DOMObject(JSMutationEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSMutationEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSMutationEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSMutationEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSMutationEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -129,8 +129,8 @@ bool JSMutationEventPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSMutationEvent::s_info = { "MutationEvent", &JSEvent::s_info, &JSMutationEventTable, 0 }; -JSMutationEvent::JSMutationEvent(PassRefPtr structure, PassRefPtr impl) - : JSEvent(structure, impl) +JSMutationEvent::JSMutationEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSEvent(structure, globalObject, impl) { } @@ -146,46 +146,52 @@ bool JSMutationEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsMutationEventRelatedNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMutationEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MutationEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->relatedNode())); + MutationEvent* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->relatedNode())); } JSValue jsMutationEventPrevValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMutationEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MutationEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MutationEvent* imp = static_cast(castedThis->impl()); return jsString(exec, imp->prevValue()); } JSValue jsMutationEventNewValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMutationEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MutationEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MutationEvent* imp = static_cast(castedThis->impl()); return jsString(exec, imp->newValue()); } JSValue jsMutationEventAttrName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMutationEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MutationEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MutationEvent* imp = static_cast(castedThis->impl()); return jsString(exec, imp->attrName()); } JSValue jsMutationEventAttrChange(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSMutationEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - MutationEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + MutationEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->attrChange()); } JSValue jsMutationEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSMutationEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSMutationEvent::getConstructor(exec, domObject->globalObject()); } -JSValue JSMutationEvent::getConstructor(ExecState* exec) +JSValue JSMutationEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsMutationEventPrototypeFunctionInitMutationEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.h b/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.h index 794839873..faa1b647a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSMutationEvent.h @@ -30,7 +30,7 @@ class MutationEvent; class JSMutationEvent : public JSEvent { typedef JSEvent Base; public: - JSMutationEvent(PassRefPtr, PassRefPtr); + JSMutationEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.cpp b/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.cpp index 47a764312..355464c13 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSNamedNodeMapConstructorTable = { 1, 0, JSNamedNodeMapConstructorTableValues, 0 }; #endif -class JSNamedNodeMapConstructor : public DOMObject { +class JSNamedNodeMapConstructor : public DOMConstructorObject { public: - JSNamedNodeMapConstructor(ExecState* exec) - : DOMObject(JSNamedNodeMapConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSNamedNodeMapConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSNamedNodeMapConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSNamedNodeMapPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSNamedNodeMapPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -125,8 +125,8 @@ bool JSNamedNodeMapPrototype::getOwnPropertySlot(ExecState* exec, const Identifi const ClassInfo JSNamedNodeMap::s_info = { "NamedNodeMap", 0, &JSNamedNodeMapTable, 0 }; -JSNamedNodeMap::JSNamedNodeMap(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSNamedNodeMap::JSNamedNodeMap(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -176,14 +176,16 @@ bool JSNamedNodeMap::getOwnPropertySlot(ExecState* exec, unsigned propertyName, JSValue jsNamedNodeMapLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNamedNodeMap* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - NamedNodeMap* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + NamedNodeMap* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsNamedNodeMapConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSNamedNodeMap* domObject = static_cast(asObject(slot.slotBase())); + return JSNamedNodeMap::getConstructor(exec, domObject->globalObject()); } void JSNamedNodeMap::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) { @@ -192,9 +194,9 @@ void JSNamedNodeMap::getPropertyNames(ExecState* exec, PropertyNameArray& proper Base::getPropertyNames(exec, propertyNames); } -JSValue JSNamedNodeMap::getConstructor(ExecState* exec) +JSValue JSNamedNodeMap::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionGetNamedItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -207,7 +209,7 @@ JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionGetNamedItem(ExecState* exe const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getNamedItem(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getNamedItem(name))); return result; } @@ -222,7 +224,7 @@ JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionSetNamedItem(ExecState* exe Node* node = toNode(args.at(0)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->setNamedItem(node, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->setNamedItem(node, ec))); setDOMException(exec, ec); return result; } @@ -238,7 +240,7 @@ JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionRemoveNamedItem(ExecState* const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->removeNamedItem(name, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->removeNamedItem(name, ec))); setDOMException(exec, ec); return result; } @@ -253,7 +255,7 @@ JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionItem(ExecState* exec, JSObj unsigned index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->item(index))); return result; } @@ -268,7 +270,7 @@ JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionGetNamedItemNS(ExecState* e const UString& localName = args.at(1).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getNamedItemNS(namespaceURI, localName))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getNamedItemNS(namespaceURI, localName))); return result; } @@ -283,7 +285,7 @@ JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionSetNamedItemNS(ExecState* e Node* node = toNode(args.at(0)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->setNamedItemNS(node, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->setNamedItemNS(node, ec))); setDOMException(exec, ec); return result; } @@ -300,7 +302,7 @@ JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionRemoveNamedItemNS(ExecState const UString& localName = args.at(1).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->removeNamedItemNS(namespaceURI, localName, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->removeNamedItemNS(namespaceURI, localName, ec))); setDOMException(exec, ec); return result; } @@ -309,11 +311,11 @@ JSValue JSC_HOST_CALL jsNamedNodeMapPrototypeFunctionRemoveNamedItemNS(ExecState JSValue JSNamedNodeMap::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSNamedNodeMap* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } -JSC::JSValue toJS(JSC::ExecState* exec, NamedNodeMap* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, NamedNodeMap* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } NamedNodeMap* toNamedNodeMap(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.h b/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.h index f7c132e87..ca64bfb7c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNamedNodeMap.h @@ -21,6 +21,7 @@ #ifndef JSNamedNodeMap_h #define JSNamedNodeMap_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class NamedNodeMap; -class JSNamedNodeMap : public DOMObject { - typedef DOMObject Base; +class JSNamedNodeMap : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSNamedNodeMap(PassRefPtr, PassRefPtr); + JSNamedNodeMap(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSNamedNodeMap(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,7 +47,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); NamedNodeMap* impl() const { return m_impl.get(); } private: @@ -57,7 +58,7 @@ private: static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, NamedNodeMap*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, NamedNodeMap*); NamedNodeMap* toNamedNodeMap(JSC::JSValue); class JSNamedNodeMapPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSNavigator.cpp b/src/3rdparty/webkit/WebCore/generated/JSNavigator.cpp index e55a3ccf1..19dfdee53 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNavigator.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNavigator.cpp @@ -94,8 +94,8 @@ bool JSNavigatorPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSNavigator::s_info = { "Navigator", 0, &JSNavigatorTable, 0 }; -JSNavigator::JSNavigator(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSNavigator::JSNavigator(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -117,99 +117,113 @@ bool JSNavigator::getOwnPropertySlot(ExecState* exec, const Identifier& property JSValue jsNavigatorAppCodeName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Navigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->appCodeName()); } JSValue jsNavigatorAppName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Navigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->appName()); } JSValue jsNavigatorAppVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Navigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->appVersion()); } JSValue jsNavigatorLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Navigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->language()); } JSValue jsNavigatorUserAgent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Navigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->userAgent()); } JSValue jsNavigatorPlatform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Navigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->platform()); } JSValue jsNavigatorPlugins(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->plugins())); + Navigator* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->plugins())); } JSValue jsNavigatorMimeTypes(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->mimeTypes())); + Navigator* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->mimeTypes())); } JSValue jsNavigatorProduct(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Navigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->product()); } JSValue jsNavigatorProductSub(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Navigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->productSub()); } JSValue jsNavigatorVendor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Navigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->vendor()); } JSValue jsNavigatorVendorSub(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Navigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->vendorSub()); } JSValue jsNavigatorCookieEnabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Navigator* imp = static_cast(castedThis->impl()); return jsBoolean(imp->cookieEnabled()); } JSValue jsNavigatorOnLine(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Navigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Navigator* imp = static_cast(castedThis->impl()); return jsBoolean(imp->onLine()); } @@ -226,9 +240,9 @@ JSValue JSC_HOST_CALL jsNavigatorPrototypeFunctionJavaEnabled(ExecState* exec, J return result; } -JSC::JSValue toJS(JSC::ExecState* exec, Navigator* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Navigator* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Navigator* toNavigator(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSNavigator.h b/src/3rdparty/webkit/WebCore/generated/JSNavigator.h index 0a3a5df59..b332f7448 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNavigator.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNavigator.h @@ -21,6 +21,7 @@ #ifndef JSNavigator_h #define JSNavigator_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class Navigator; -class JSNavigator : public DOMObject { - typedef DOMObject Base; +class JSNavigator : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSNavigator(PassRefPtr, PassRefPtr); + JSNavigator(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSNavigator(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -52,7 +53,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, Navigator*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Navigator*); Navigator* toNavigator(JSC::JSValue); class JSNavigatorPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSNode.cpp b/src/3rdparty/webkit/WebCore/generated/JSNode.cpp index d9d3d35ce..98d82ce7b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNode.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNode.cpp @@ -110,12 +110,12 @@ static JSC_CONST_HASHTABLE HashTable JSNodeConstructorTable = { 67, 63, JSNodeConstructorTableValues, 0 }; #endif -class JSNodeConstructor : public DOMObject { +class JSNodeConstructor : public DOMConstructorObject { public: - JSNodeConstructor(ExecState* exec) - : DOMObject(JSNodeConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSNodeConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSNodeConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSNodePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSNodePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -198,8 +198,8 @@ bool JSNodePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& prop const ClassInfo JSNode::s_info = { "Node", 0, &JSNodeTable, 0 }; -JSNode::JSNode(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSNode::JSNode(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -217,126 +217,144 @@ JSObject* JSNode::createPrototype(ExecState* exec, JSGlobalObject* globalObject) JSValue jsNodeNodeName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Node* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->nodeName()); } JSValue jsNodeNodeValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Node* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->nodeValue()); } JSValue jsNodeNodeType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Node* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->nodeType()); } JSValue jsNodeParentNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->parentNode())); + Node* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->parentNode())); } JSValue jsNodeChildNodes(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->childNodes())); + Node* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->childNodes())); } JSValue jsNodeFirstChild(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->firstChild())); + Node* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->firstChild())); } JSValue jsNodeLastChild(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->lastChild())); + Node* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->lastChild())); } JSValue jsNodePreviousSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->previousSibling())); + Node* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->previousSibling())); } JSValue jsNodeNextSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nextSibling())); + Node* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nextSibling())); } JSValue jsNodeAttributes(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->attributes())); + Node* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->attributes())); } JSValue jsNodeOwnerDocument(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->ownerDocument())); + Node* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->ownerDocument())); } JSValue jsNodeNamespaceURI(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Node* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->namespaceURI()); } JSValue jsNodePrefix(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Node* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->prefix()); } JSValue jsNodeLocalName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Node* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->localName()); } JSValue jsNodeBaseURI(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Node* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->baseURI()); } JSValue jsNodeTextContent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Node* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->textContent()); } JSValue jsNodeParentElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNode* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Node* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->parentElement())); + Node* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->parentElement())); } JSValue jsNodeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSNode* domObject = static_cast(asObject(slot.slotBase())); + return JSNode::getConstructor(exec, domObject->globalObject()); } void JSNode::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -367,9 +385,9 @@ void setJSNodeTextContent(ExecState* exec, JSObject* thisObject, JSValue value) setDOMException(exec, ec); } -JSValue JSNode::getConstructor(ExecState* exec) +JSValue JSNode::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsNodePrototypeFunctionInsertBefore(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -431,7 +449,7 @@ JSValue JSC_HOST_CALL jsNodePrototypeFunctionCloneNode(ExecState* exec, JSObject bool deep = args.at(0).toBoolean(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->cloneNode(deep))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->cloneNode(deep))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSNode.h b/src/3rdparty/webkit/WebCore/generated/JSNode.h index 3fdc5a325..d4d1f5923 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNode.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNode.h @@ -21,6 +21,7 @@ #ifndef JSNode_h #define JSNode_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class Node; -class JSNode : public DOMObject { - typedef DOMObject Base; +class JSNode : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSNode(PassRefPtr, PassRefPtr); + JSNode(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSNode(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -51,7 +52,7 @@ public: virtual void pushEventHandlerScope(JSC::ExecState*, JSC::ScopeChain&) const; - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom functions JSC::JSValue insertBefore(JSC::ExecState*, const JSC::ArgList&); @@ -71,9 +72,9 @@ ALWAYS_INLINE bool JSNode::getOwnPropertySlot(JSC::ExecState* exec, const JSC::I return JSC::getStaticValueSlot(exec, s_info.staticPropHashTable, this, propertyName, slot); } -JSC::JSValue toJS(JSC::ExecState*, Node*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Node*); Node* toNode(JSC::JSValue); -JSC::JSValue toJSNewlyCreated(JSC::ExecState*, Node*); +JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject*, Node*); class JSNodePrototype : public JSC::JSObject { typedef JSC::JSObject Base; diff --git a/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.cpp b/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.cpp index 32ef1011b..ead0b47b9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.cpp @@ -76,12 +76,12 @@ static JSC_CONST_HASHTABLE HashTable JSNodeFilterConstructorTable = { 34, 31, JSNodeFilterConstructorTableValues, 0 }; #endif -class JSNodeFilterConstructor : public DOMObject { +class JSNodeFilterConstructor : public DOMConstructorObject { public: - JSNodeFilterConstructor(ExecState* exec) - : DOMObject(JSNodeFilterConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSNodeFilterConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSNodeFilterConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSNodeFilterPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSNodeFilterPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -145,8 +145,8 @@ bool JSNodeFilterPrototype::getOwnPropertySlot(ExecState* exec, const Identifier const ClassInfo JSNodeFilter::s_info = { "NodeFilter", 0, &JSNodeFilterTable, 0 }; -JSNodeFilter::JSNodeFilter(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSNodeFilter::JSNodeFilter(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -168,11 +168,12 @@ bool JSNodeFilter::getOwnPropertySlot(ExecState* exec, const Identifier& propert JSValue jsNodeFilterConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSNodeFilter* domObject = static_cast(asObject(slot.slotBase())); + return JSNodeFilter::getConstructor(exec, domObject->globalObject()); } -JSValue JSNodeFilter::getConstructor(ExecState* exec) +JSValue JSNodeFilter::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsNodeFilterPrototypeFunctionAcceptNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -266,9 +267,9 @@ JSValue jsNodeFilterSHOW_NOTATION(ExecState* exec, const Identifier&, const Prop return jsNumber(exec, static_cast(0x00000800)); } -JSC::JSValue toJS(JSC::ExecState* exec, NodeFilter* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, NodeFilter* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.h b/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.h index 0fd1b4290..b955a03be 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNodeFilter.h @@ -21,6 +21,7 @@ #ifndef JSNodeFilter_h #define JSNodeFilter_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class NodeFilter; -class JSNodeFilter : public DOMObject { - typedef DOMObject Base; +class JSNodeFilter : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSNodeFilter(PassRefPtr, PassRefPtr); + JSNodeFilter(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSNodeFilter(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,7 +47,7 @@ public: virtual void mark(); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom functions JSC::JSValue acceptNode(JSC::ExecState*, const JSC::ArgList&); @@ -56,7 +57,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, NodeFilter*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, NodeFilter*); PassRefPtr toNodeFilter(JSC::JSValue); class JSNodeFilterPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.cpp b/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.cpp index 6e7966949..81613a0c9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.cpp @@ -71,12 +71,12 @@ static JSC_CONST_HASHTABLE HashTable JSNodeIteratorConstructorTable = { 1, 0, JSNodeIteratorConstructorTableValues, 0 }; #endif -class JSNodeIteratorConstructor : public DOMObject { +class JSNodeIteratorConstructor : public DOMConstructorObject { public: - JSNodeIteratorConstructor(ExecState* exec) - : DOMObject(JSNodeIteratorConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSNodeIteratorConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSNodeIteratorConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSNodeIteratorPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSNodeIteratorPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -126,8 +126,8 @@ bool JSNodeIteratorPrototype::getOwnPropertySlot(ExecState* exec, const Identifi const ClassInfo JSNodeIterator::s_info = { "NodeIterator", 0, &JSNodeIteratorTable, 0 }; -JSNodeIterator::JSNodeIterator(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSNodeIterator::JSNodeIterator(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -149,53 +149,60 @@ bool JSNodeIterator::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsNodeIteratorRoot(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNodeIterator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - NodeIterator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->root())); + NodeIterator* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->root())); } JSValue jsNodeIteratorWhatToShow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNodeIterator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - NodeIterator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + NodeIterator* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->whatToShow()); } JSValue jsNodeIteratorFilter(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNodeIterator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - NodeIterator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->filter())); + NodeIterator* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->filter())); } JSValue jsNodeIteratorExpandEntityReferences(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNodeIterator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - NodeIterator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + NodeIterator* imp = static_cast(castedThis->impl()); return jsBoolean(imp->expandEntityReferences()); } JSValue jsNodeIteratorReferenceNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNodeIterator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - NodeIterator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->referenceNode())); + NodeIterator* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->referenceNode())); } JSValue jsNodeIteratorPointerBeforeReferenceNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNodeIterator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - NodeIterator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + NodeIterator* imp = static_cast(castedThis->impl()); return jsBoolean(imp->pointerBeforeReferenceNode()); } JSValue jsNodeIteratorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSNodeIterator* domObject = static_cast(asObject(slot.slotBase())); + return JSNodeIterator::getConstructor(exec, domObject->globalObject()); } -JSValue JSNodeIterator::getConstructor(ExecState* exec) +JSValue JSNodeIterator::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsNodeIteratorPrototypeFunctionNextNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -228,9 +235,9 @@ JSValue JSC_HOST_CALL jsNodeIteratorPrototypeFunctionDetach(ExecState* exec, JSO return jsUndefined(); } -JSC::JSValue toJS(JSC::ExecState* exec, NodeIterator* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, NodeIterator* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } NodeIterator* toNodeIterator(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.h b/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.h index ab5e7c670..e521a05d7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNodeIterator.h @@ -21,6 +21,7 @@ #ifndef JSNodeIterator_h #define JSNodeIterator_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class NodeIterator; -class JSNodeIterator : public DOMObject { - typedef DOMObject Base; +class JSNodeIterator : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSNodeIterator(PassRefPtr, PassRefPtr); + JSNodeIterator(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSNodeIterator(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,7 +47,7 @@ public: virtual void mark(); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom functions JSC::JSValue nextNode(JSC::ExecState*, const JSC::ArgList&); @@ -57,7 +58,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, NodeIterator*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, NodeIterator*); NodeIterator* toNodeIterator(JSC::JSValue); class JSNodeIteratorPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSNodeList.cpp b/src/3rdparty/webkit/WebCore/generated/JSNodeList.cpp index f02b7b7fd..437dd84e0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNodeList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNodeList.cpp @@ -67,12 +67,12 @@ static JSC_CONST_HASHTABLE HashTable JSNodeListConstructorTable = { 1, 0, JSNodeListConstructorTableValues, 0 }; #endif -class JSNodeListConstructor : public DOMObject { +class JSNodeListConstructor : public DOMConstructorObject { public: - JSNodeListConstructor(ExecState* exec) - : DOMObject(JSNodeListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSNodeListConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSNodeListConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSNodeListPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSNodeListPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -120,8 +120,8 @@ bool JSNodeListPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSNodeList::s_info = { "NodeList", 0, &JSNodeListTable, 0 }; -JSNodeList::JSNodeList(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSNodeList::JSNodeList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -167,14 +167,16 @@ bool JSNodeList::getOwnPropertySlot(ExecState* exec, unsigned propertyName, Prop JSValue jsNodeListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNodeList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - NodeList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + NodeList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsNodeListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSNodeList* domObject = static_cast(asObject(slot.slotBase())); + return JSNodeList::getConstructor(exec, domObject->globalObject()); } void JSNodeList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) { @@ -183,9 +185,9 @@ void JSNodeList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNa Base::getPropertyNames(exec, propertyNames); } -JSValue JSNodeList::getConstructor(ExecState* exec) +JSValue JSNodeList::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsNodeListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -202,7 +204,7 @@ JSValue JSC_HOST_CALL jsNodeListPrototypeFunctionItem(ExecState* exec, JSObject* } - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->item(index))); return result; } @@ -210,11 +212,11 @@ JSValue JSC_HOST_CALL jsNodeListPrototypeFunctionItem(ExecState* exec, JSObject* JSValue JSNodeList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSNodeList* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } -JSC::JSValue toJS(JSC::ExecState* exec, NodeList* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, NodeList* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } NodeList* toNodeList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSNodeList.h b/src/3rdparty/webkit/WebCore/generated/JSNodeList.h index c4fce0b6e..21faa3a30 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNodeList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNodeList.h @@ -21,6 +21,7 @@ #ifndef JSNodeList_h #define JSNodeList_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -30,10 +31,10 @@ namespace WebCore { class NodeList; -class JSNodeList : public DOMObject { - typedef DOMObject Base; +class JSNodeList : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSNodeList(PassRefPtr, PassRefPtr); + JSNodeList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSNodeList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -49,7 +50,7 @@ public: virtual JSC::CallType getCallData(JSC::CallData&); virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); NodeList* impl() const { return m_impl.get(); } private: @@ -60,7 +61,7 @@ private: static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, NodeList*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, NodeList*); NodeList* toNodeList(JSC::JSValue); class JSNodeListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSNotation.cpp b/src/3rdparty/webkit/WebCore/generated/JSNotation.cpp index 13ac97bb7..31b9d1830 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNotation.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSNotation.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSNotationConstructorTable = { 1, 0, JSNotationConstructorTableValues, 0 }; #endif -class JSNotationConstructor : public DOMObject { +class JSNotationConstructor : public DOMConstructorObject { public: - JSNotationConstructor(ExecState* exec) - : DOMObject(JSNotationConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSNotationConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSNotationConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSNotationPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSNotationPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -109,8 +109,8 @@ JSObject* JSNotationPrototype::self(ExecState* exec, JSGlobalObject* globalObjec const ClassInfo JSNotation::s_info = { "Notation", &JSNode::s_info, &JSNotationTable, 0 }; -JSNotation::JSNotation(PassRefPtr structure, PassRefPtr impl) - : JSNode(structure, impl) +JSNotation::JSNotation(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSNode(structure, globalObject, impl) { } @@ -126,25 +126,28 @@ bool JSNotation::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN JSValue jsNotationPublicId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNotation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Notation* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Notation* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->publicId()); } JSValue jsNotationSystemId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSNotation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Notation* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Notation* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->systemId()); } JSValue jsNotationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSNotation* domObject = static_cast(asObject(slot.slotBase())); + return JSNotation::getConstructor(exec, domObject->globalObject()); } -JSValue JSNotation::getConstructor(ExecState* exec) +JSValue JSNotation::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSNotation.h b/src/3rdparty/webkit/WebCore/generated/JSNotation.h index 00d342789..5928834b7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSNotation.h +++ b/src/3rdparty/webkit/WebCore/generated/JSNotation.h @@ -30,7 +30,7 @@ class Notation; class JSNotation : public JSNode { typedef JSNode Base; public: - JSNotation(PassRefPtr, PassRefPtr); + JSNotation(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.cpp index 88a8bd370..69715e3fc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.cpp @@ -67,12 +67,12 @@ static JSC_CONST_HASHTABLE HashTable JSOverflowEventConstructorTable = { 9, 7, JSOverflowEventConstructorTableValues, 0 }; #endif -class JSOverflowEventConstructor : public DOMObject { +class JSOverflowEventConstructor : public DOMConstructorObject { public: - JSOverflowEventConstructor(ExecState* exec) - : DOMObject(JSOverflowEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSOverflowEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSOverflowEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSOverflowEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSOverflowEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -123,8 +123,8 @@ bool JSOverflowEventPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSOverflowEvent::s_info = { "OverflowEvent", &JSEvent::s_info, &JSOverflowEventTable, 0 }; -JSOverflowEvent::JSOverflowEvent(PassRefPtr structure, PassRefPtr impl) - : JSEvent(structure, impl) +JSOverflowEvent::JSOverflowEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSEvent(structure, globalObject, impl) { } @@ -140,32 +140,36 @@ bool JSOverflowEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsOverflowEventOrient(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSOverflowEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - OverflowEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + OverflowEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->orient()); } JSValue jsOverflowEventHorizontalOverflow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSOverflowEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - OverflowEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + OverflowEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->horizontalOverflow()); } JSValue jsOverflowEventVerticalOverflow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSOverflowEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - OverflowEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + OverflowEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->verticalOverflow()); } JSValue jsOverflowEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSOverflowEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSOverflowEvent::getConstructor(exec, domObject->globalObject()); } -JSValue JSOverflowEvent::getConstructor(ExecState* exec) +JSValue JSOverflowEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsOverflowEventPrototypeFunctionInitOverflowEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.h b/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.h index b018a86cb..f179a71b5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSOverflowEvent.h @@ -30,7 +30,7 @@ class OverflowEvent; class JSOverflowEvent : public JSEvent { typedef JSEvent Base; public: - JSOverflowEvent(PassRefPtr, PassRefPtr); + JSOverflowEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp b/src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp index c8d04327b..39616d6ed 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp @@ -71,12 +71,12 @@ static JSC_CONST_HASHTABLE HashTable JSPluginConstructorTable = { 1, 0, JSPluginConstructorTableValues, 0 }; #endif -class JSPluginConstructor : public DOMObject { +class JSPluginConstructor : public DOMConstructorObject { public: - JSPluginConstructor(ExecState* exec) - : DOMObject(JSPluginConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSPluginConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSPluginConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSPluginPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSPluginPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -125,8 +125,8 @@ bool JSPluginPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& pr const ClassInfo JSPlugin::s_info = { "Plugin", 0, &JSPluginTable, 0 }; -JSPlugin::JSPlugin(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSPlugin::JSPlugin(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -172,35 +172,40 @@ bool JSPlugin::getOwnPropertySlot(ExecState* exec, unsigned propertyName, Proper JSValue jsPluginName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSPlugin* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Plugin* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Plugin* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsPluginFilename(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSPlugin* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Plugin* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Plugin* imp = static_cast(castedThis->impl()); return jsString(exec, imp->filename()); } JSValue jsPluginDescription(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSPlugin* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Plugin* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Plugin* imp = static_cast(castedThis->impl()); return jsString(exec, imp->description()); } JSValue jsPluginLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSPlugin* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Plugin* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Plugin* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsPluginConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSPlugin* domObject = static_cast(asObject(slot.slotBase())); + return JSPlugin::getConstructor(exec, domObject->globalObject()); } void JSPlugin::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) { @@ -209,9 +214,9 @@ void JSPlugin::getPropertyNames(ExecState* exec, PropertyNameArray& propertyName Base::getPropertyNames(exec, propertyNames); } -JSValue JSPlugin::getConstructor(ExecState* exec) +JSValue JSPlugin::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsPluginPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -224,7 +229,7 @@ JSValue JSC_HOST_CALL jsPluginPrototypeFunctionItem(ExecState* exec, JSObject*, unsigned index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->item(index))); return result; } @@ -238,7 +243,7 @@ JSValue JSC_HOST_CALL jsPluginPrototypeFunctionNamedItem(ExecState* exec, JSObje const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->namedItem(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->namedItem(name))); return result; } @@ -246,11 +251,11 @@ JSValue JSC_HOST_CALL jsPluginPrototypeFunctionNamedItem(ExecState* exec, JSObje JSValue JSPlugin::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSPlugin* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } -JSC::JSValue toJS(JSC::ExecState* exec, Plugin* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Plugin* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Plugin* toPlugin(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSPlugin.h b/src/3rdparty/webkit/WebCore/generated/JSPlugin.h index 7ff040fd9..eee4c7dd6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSPlugin.h +++ b/src/3rdparty/webkit/WebCore/generated/JSPlugin.h @@ -21,6 +21,7 @@ #ifndef JSPlugin_h #define JSPlugin_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class Plugin; -class JSPlugin : public DOMObject { - typedef DOMObject Base; +class JSPlugin : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSPlugin(PassRefPtr, PassRefPtr); + JSPlugin(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSPlugin(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,7 +47,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); Plugin* impl() const { return m_impl.get(); } private: @@ -57,7 +58,7 @@ private: static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, Plugin*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Plugin*); Plugin* toPlugin(JSC::JSValue); class JSPluginPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSPluginArray.cpp b/src/3rdparty/webkit/WebCore/generated/JSPluginArray.cpp index 2d0ec3665..955d50ca4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSPluginArray.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSPluginArray.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSPluginArrayConstructorTable = { 1, 0, JSPluginArrayConstructorTableValues, 0 }; #endif -class JSPluginArrayConstructor : public DOMObject { +class JSPluginArrayConstructor : public DOMConstructorObject { public: - JSPluginArrayConstructor(ExecState* exec) - : DOMObject(JSPluginArrayConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSPluginArrayConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSPluginArrayConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSPluginArrayPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSPluginArrayPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -121,8 +121,8 @@ bool JSPluginArrayPrototype::getOwnPropertySlot(ExecState* exec, const Identifie const ClassInfo JSPluginArray::s_info = { "PluginArray", 0, &JSPluginArrayTable, 0 }; -JSPluginArray::JSPluginArray(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSPluginArray::JSPluginArray(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -168,14 +168,16 @@ bool JSPluginArray::getOwnPropertySlot(ExecState* exec, unsigned propertyName, P JSValue jsPluginArrayLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSPluginArray* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - PluginArray* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + PluginArray* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsPluginArrayConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSPluginArray* domObject = static_cast(asObject(slot.slotBase())); + return JSPluginArray::getConstructor(exec, domObject->globalObject()); } void JSPluginArray::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) { @@ -184,9 +186,9 @@ void JSPluginArray::getPropertyNames(ExecState* exec, PropertyNameArray& propert Base::getPropertyNames(exec, propertyNames); } -JSValue JSPluginArray::getConstructor(ExecState* exec) +JSValue JSPluginArray::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsPluginArrayPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -199,7 +201,7 @@ JSValue JSC_HOST_CALL jsPluginArrayPrototypeFunctionItem(ExecState* exec, JSObje unsigned index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->item(index))); return result; } @@ -213,7 +215,7 @@ JSValue JSC_HOST_CALL jsPluginArrayPrototypeFunctionNamedItem(ExecState* exec, J const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->namedItem(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->namedItem(name))); return result; } @@ -234,11 +236,11 @@ JSValue JSC_HOST_CALL jsPluginArrayPrototypeFunctionRefresh(ExecState* exec, JSO JSValue JSPluginArray::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSPluginArray* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } -JSC::JSValue toJS(JSC::ExecState* exec, PluginArray* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, PluginArray* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } PluginArray* toPluginArray(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSPluginArray.h b/src/3rdparty/webkit/WebCore/generated/JSPluginArray.h index 56bb33e68..44443f36e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSPluginArray.h +++ b/src/3rdparty/webkit/WebCore/generated/JSPluginArray.h @@ -21,6 +21,7 @@ #ifndef JSPluginArray_h #define JSPluginArray_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class PluginArray; -class JSPluginArray : public DOMObject { - typedef DOMObject Base; +class JSPluginArray : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSPluginArray(PassRefPtr, PassRefPtr); + JSPluginArray(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSPluginArray(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,7 +47,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); PluginArray* impl() const { return m_impl.get(); } private: @@ -57,7 +58,7 @@ private: static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, PluginArray*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, PluginArray*); PluginArray* toPluginArray(JSC::JSValue); class JSPluginArrayPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSPositionError.cpp b/src/3rdparty/webkit/WebCore/generated/JSPositionError.cpp index 680cfc3dd..c0c1a10ca 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSPositionError.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSPositionError.cpp @@ -68,12 +68,12 @@ static JSC_CONST_HASHTABLE HashTable JSPositionErrorConstructorTable = { 10, 7, JSPositionErrorConstructorTableValues, 0 }; #endif -class JSPositionErrorConstructor : public DOMObject { +class JSPositionErrorConstructor : public DOMConstructorObject { public: - JSPositionErrorConstructor(ExecState* exec) - : DOMObject(JSPositionErrorConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSPositionErrorConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSPositionErrorConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSPositionErrorPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSPositionErrorPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -124,8 +124,8 @@ bool JSPositionErrorPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSPositionError::s_info = { "PositionError", 0, &JSPositionErrorTable, 0 }; -JSPositionError::JSPositionError(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSPositionError::JSPositionError(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -147,25 +147,28 @@ bool JSPositionError::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsPositionErrorCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSPositionError* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - PositionError* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + PositionError* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->code()); } JSValue jsPositionErrorMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSPositionError* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - PositionError* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + PositionError* imp = static_cast(castedThis->impl()); return jsString(exec, imp->message()); } JSValue jsPositionErrorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSPositionError* domObject = static_cast(asObject(slot.slotBase())); + return JSPositionError::getConstructor(exec, domObject->globalObject()); } -JSValue JSPositionError::getConstructor(ExecState* exec) +JSValue JSPositionError::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } // Constant getters @@ -190,9 +193,9 @@ JSValue jsPositionErrorTIMEOUT(ExecState* exec, const Identifier&, const Propert return jsNumber(exec, static_cast(3)); } -JSC::JSValue toJS(JSC::ExecState* exec, PositionError* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, PositionError* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } PositionError* toPositionError(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSPositionError.h b/src/3rdparty/webkit/WebCore/generated/JSPositionError.h index 9f256f449..a7478fc39 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSPositionError.h +++ b/src/3rdparty/webkit/WebCore/generated/JSPositionError.h @@ -21,6 +21,7 @@ #ifndef JSPositionError_h #define JSPositionError_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class PositionError; -class JSPositionError : public DOMObject { - typedef DOMObject Base; +class JSPositionError : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSPositionError(PassRefPtr, PassRefPtr); + JSPositionError(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSPositionError(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); PositionError* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, PositionError*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, PositionError*); PositionError* toPositionError(JSC::JSValue); class JSPositionErrorPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.cpp b/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.cpp index f9d2fc0f0..c945742b3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSProcessingInstructionConstructorTable = { 1, 0, JSProcessingInstructionConstructorTableValues, 0 }; #endif -class JSProcessingInstructionConstructor : public DOMObject { +class JSProcessingInstructionConstructor : public DOMConstructorObject { public: - JSProcessingInstructionConstructor(ExecState* exec) - : DOMObject(JSProcessingInstructionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSProcessingInstructionConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSProcessingInstructionConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSProcessingInstructionPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSProcessingInstructionPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -112,8 +112,8 @@ JSObject* JSProcessingInstructionPrototype::self(ExecState* exec, JSGlobalObject const ClassInfo JSProcessingInstruction::s_info = { "ProcessingInstruction", &JSNode::s_info, &JSProcessingInstructionTable, 0 }; -JSProcessingInstruction::JSProcessingInstruction(PassRefPtr structure, PassRefPtr impl) - : JSNode(structure, impl) +JSProcessingInstruction::JSProcessingInstruction(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSNode(structure, globalObject, impl) { } @@ -129,28 +129,32 @@ bool JSProcessingInstruction::getOwnPropertySlot(ExecState* exec, const Identifi JSValue jsProcessingInstructionTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSProcessingInstruction* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ProcessingInstruction* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ProcessingInstruction* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->target()); } JSValue jsProcessingInstructionData(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSProcessingInstruction* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ProcessingInstruction* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ProcessingInstruction* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->data()); } JSValue jsProcessingInstructionSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSProcessingInstruction* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ProcessingInstruction* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->sheet())); + ProcessingInstruction* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->sheet())); } JSValue jsProcessingInstructionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSProcessingInstruction* domObject = static_cast(asObject(slot.slotBase())); + return JSProcessingInstruction::getConstructor(exec, domObject->globalObject()); } void JSProcessingInstruction::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -165,9 +169,9 @@ void setJSProcessingInstructionData(ExecState* exec, JSObject* thisObject, JSVal setDOMException(exec, ec); } -JSValue JSProcessingInstruction::getConstructor(ExecState* exec) +JSValue JSProcessingInstruction::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.h b/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.h index 7c0ccd6f4..0b2b7dfec 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.h +++ b/src/3rdparty/webkit/WebCore/generated/JSProcessingInstruction.h @@ -30,7 +30,7 @@ class ProcessingInstruction; class JSProcessingInstruction : public JSNode { typedef JSNode Base; public: - JSProcessingInstruction(PassRefPtr, PassRefPtr); + JSProcessingInstruction(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.cpp index 5c7bd50b6..bb7be660e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.cpp @@ -64,12 +64,12 @@ static JSC_CONST_HASHTABLE HashTable JSProgressEventConstructorTable = { 1, 0, JSProgressEventConstructorTableValues, 0 }; #endif -class JSProgressEventConstructor : public DOMObject { +class JSProgressEventConstructor : public DOMConstructorObject { public: - JSProgressEventConstructor(ExecState* exec) - : DOMObject(JSProgressEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSProgressEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSProgressEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSProgressEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSProgressEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -117,8 +117,8 @@ bool JSProgressEventPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSProgressEvent::s_info = { "ProgressEvent", &JSEvent::s_info, &JSProgressEventTable, 0 }; -JSProgressEvent::JSProgressEvent(PassRefPtr structure, PassRefPtr impl) - : JSEvent(structure, impl) +JSProgressEvent::JSProgressEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSEvent(structure, globalObject, impl) { } @@ -134,32 +134,36 @@ bool JSProgressEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsProgressEventLengthComputable(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSProgressEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ProgressEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ProgressEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->lengthComputable()); } JSValue jsProgressEventLoaded(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSProgressEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ProgressEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ProgressEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->loaded()); } JSValue jsProgressEventTotal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSProgressEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ProgressEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ProgressEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->total()); } JSValue jsProgressEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSProgressEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSProgressEvent::getConstructor(exec, domObject->globalObject()); } -JSValue JSProgressEvent::getConstructor(ExecState* exec) +JSValue JSProgressEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsProgressEventPrototypeFunctionInitProgressEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.h b/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.h index 5f0744ace..7e436be81 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSProgressEvent.h @@ -30,7 +30,7 @@ class ProgressEvent; class JSProgressEvent : public JSEvent { typedef JSEvent Base; public: - JSProgressEvent(PassRefPtr, PassRefPtr); + JSProgressEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSRGBColor.cpp b/src/3rdparty/webkit/WebCore/generated/JSRGBColor.cpp new file mode 100644 index 000000000..27d17a973 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSRGBColor.cpp @@ -0,0 +1,178 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "config.h" +#include "JSRGBColor.h" + +#include "CSSPrimitiveValue.h" +#include "JSCSSPrimitiveValue.h" +#include "RGBColor.h" +#include + +using namespace JSC; + +namespace WebCore { + +ASSERT_CLASS_FITS_IN_CELL(JSRGBColor); + +/* Hash table */ + +static const HashTableValue JSRGBColorTableValues[5] = +{ + { "red", DontDelete|ReadOnly, (intptr_t)jsRGBColorRed, (intptr_t)0 }, + { "green", DontDelete|ReadOnly, (intptr_t)jsRGBColorGreen, (intptr_t)0 }, + { "blue", DontDelete|ReadOnly, (intptr_t)jsRGBColorBlue, (intptr_t)0 }, + { "constructor", DontEnum|ReadOnly, (intptr_t)jsRGBColorConstructor, (intptr_t)0 }, + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSRGBColorTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 7, JSRGBColorTableValues, 0 }; +#else + { 8, 7, JSRGBColorTableValues, 0 }; +#endif + +/* Hash table for constructor */ + +static const HashTableValue JSRGBColorConstructorTableValues[1] = +{ + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSRGBColorConstructorTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSRGBColorConstructorTableValues, 0 }; +#else + { 1, 0, JSRGBColorConstructorTableValues, 0 }; +#endif + +class JSRGBColorConstructor : public DOMConstructorObject { +public: + JSRGBColorConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSRGBColorConstructor::createStructure(globalObject->objectPrototype()), globalObject) + { + putDirect(exec->propertyNames().prototype, JSRGBColorPrototype::self(exec, globalObject), None); + } + virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); + virtual const ClassInfo* classInfo() const { return &s_info; } + static const ClassInfo s_info; + + static PassRefPtr createStructure(JSValue proto) + { + return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); + } +}; + +const ClassInfo JSRGBColorConstructor::s_info = { "RGBColorConstructor", 0, &JSRGBColorConstructorTable, 0 }; + +bool JSRGBColorConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot(exec, &JSRGBColorConstructorTable, this, propertyName, slot); +} + +/* Hash table for prototype */ + +static const HashTableValue JSRGBColorPrototypeTableValues[1] = +{ + { 0, 0, 0, 0 } +}; + +static JSC_CONST_HASHTABLE HashTable JSRGBColorPrototypeTable = +#if ENABLE(PERFECT_HASH_SIZE) + { 0, JSRGBColorPrototypeTableValues, 0 }; +#else + { 1, 0, JSRGBColorPrototypeTableValues, 0 }; +#endif + +const ClassInfo JSRGBColorPrototype::s_info = { "RGBColorPrototype", 0, &JSRGBColorPrototypeTable, 0 }; + +JSObject* JSRGBColorPrototype::self(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMPrototype(exec, globalObject); +} + +const ClassInfo JSRGBColor::s_info = { "RGBColor", 0, &JSRGBColorTable, 0 }; + +JSRGBColor::JSRGBColor(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) + , m_impl(impl) +{ +} + +JSRGBColor::~JSRGBColor() +{ + forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); +} + +JSObject* JSRGBColor::createPrototype(ExecState* exec, JSGlobalObject* globalObject) +{ + return new (exec) JSRGBColorPrototype(JSRGBColorPrototype::createStructure(globalObject->objectPrototype())); +} + +bool JSRGBColor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) +{ + return getStaticValueSlot(exec, &JSRGBColorTable, this, propertyName, slot); +} + +JSValue jsRGBColorRed(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSRGBColor* castedThis = static_cast(asObject(slot.slotBase())); + UNUSED_PARAM(exec); + RGBColor* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->red())); +} + +JSValue jsRGBColorGreen(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSRGBColor* castedThis = static_cast(asObject(slot.slotBase())); + UNUSED_PARAM(exec); + RGBColor* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->green())); +} + +JSValue jsRGBColorBlue(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSRGBColor* castedThis = static_cast(asObject(slot.slotBase())); + UNUSED_PARAM(exec); + RGBColor* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->blue())); +} + +JSValue jsRGBColorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSRGBColor* domObject = static_cast(asObject(slot.slotBase())); + return JSRGBColor::getConstructor(exec, domObject->globalObject()); +} +JSValue JSRGBColor::getConstructor(ExecState* exec, JSGlobalObject* globalObject) +{ + return getDOMConstructor(exec, static_cast(globalObject)); +} + +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, RGBColor* object) +{ + return getDOMObjectWrapper(exec, globalObject, object); +} +RGBColor* toRGBColor(JSC::JSValue value) +{ + return value.isObject(&JSRGBColor::s_info) ? static_cast(asObject(value))->impl() : 0; +} + +} diff --git a/src/3rdparty/webkit/WebCore/generated/JSRGBColor.h b/src/3rdparty/webkit/WebCore/generated/JSRGBColor.h new file mode 100644 index 000000000..8116d7bc2 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/generated/JSRGBColor.h @@ -0,0 +1,76 @@ +/* + This file is part of the WebKit open source project. + This file has been generated by generate-bindings.pl. DO NOT MODIFY! + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef JSRGBColor_h +#define JSRGBColor_h + +#include "DOMObjectWithSVGContext.h" +#include "JSDOMBinding.h" +#include +#include + +namespace WebCore { + +class RGBColor; + +class JSRGBColor : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; +public: + JSRGBColor(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); + virtual ~JSRGBColor(); + static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); + virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + + static PassRefPtr createStructure(JSC::JSValue prototype) + { + return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); + } + + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); + RGBColor* impl() const { return m_impl.get(); } + +private: + RefPtr m_impl; +}; + +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, RGBColor*); +RGBColor* toRGBColor(JSC::JSValue); + +class JSRGBColorPrototype : public JSC::JSObject { + typedef JSC::JSObject Base; +public: + static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); + virtual const JSC::ClassInfo* classInfo() const { return &s_info; } + static const JSC::ClassInfo s_info; + JSRGBColorPrototype(PassRefPtr structure) : JSC::JSObject(structure) { } +}; + +// Attributes + +JSC::JSValue jsRGBColorRed(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRGBColorGreen(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRGBColorBlue(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +JSC::JSValue jsRGBColorConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); + +} // namespace WebCore + +#endif diff --git a/src/3rdparty/webkit/WebCore/generated/JSRGBColor.lut.h b/src/3rdparty/webkit/WebCore/generated/JSRGBColor.lut.h deleted file mode 100644 index 4bcba9c90..000000000 --- a/src/3rdparty/webkit/WebCore/generated/JSRGBColor.lut.h +++ /dev/null @@ -1,16 +0,0 @@ -// Automatically generated from ../bindings/js/JSRGBColor.cpp using WebCore/../JavaScriptCore/create_hash_table. DO NOT EDIT! - -namespace WebCore { - -using namespace JSC; - -static const struct HashTableValue JSRGBColorTableValues[4] = { - { "red", DontDelete|ReadOnly, (intptr_t)jsRGBColorRed, (intptr_t)0 }, - { "green", DontDelete|ReadOnly, (intptr_t)jsRGBColorGreen, (intptr_t)0 }, - { "blue", DontDelete|ReadOnly, (intptr_t)jsRGBColorBlue, (intptr_t)0 }, - { 0, 0, 0, 0 } -}; - -extern JSC_CONST_HASHTABLE HashTable JSRGBColorTable = - { 8, 7, JSRGBColorTableValues, 0 }; -} // namespace diff --git a/src/3rdparty/webkit/WebCore/generated/JSRange.cpp b/src/3rdparty/webkit/WebCore/generated/JSRange.cpp index 35582f5d4..cefe59251 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSRange.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSRange.cpp @@ -82,12 +82,12 @@ static JSC_CONST_HASHTABLE HashTable JSRangeConstructorTable = { 18, 15, JSRangeConstructorTableValues, 0 }; #endif -class JSRangeConstructor : public DOMObject { +class JSRangeConstructor : public DOMConstructorObject { public: - JSRangeConstructor(ExecState* exec) - : DOMObject(JSRangeConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSRangeConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSRangeConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSRangePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSRangePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -165,8 +165,8 @@ bool JSRangePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& pro const ClassInfo JSRange::s_info = { "Range", 0, &JSRangeTable, 0 }; -JSRange::JSRange(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSRange::JSRange(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -188,17 +188,19 @@ bool JSRange::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName JSValue jsRangeStartContainer(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSRange* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - Range* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->startContainer(ec))); + Range* imp = static_cast(castedThis->impl()); + JSC::JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->startContainer(ec))); setDOMException(exec, ec); return result; } JSValue jsRangeStartOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSRange* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - Range* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Range* imp = static_cast(castedThis->impl()); JSC::JSValue result = jsNumber(exec, imp->startOffset(ec)); setDOMException(exec, ec); return result; @@ -206,17 +208,19 @@ JSValue jsRangeStartOffset(ExecState* exec, const Identifier&, const PropertySlo JSValue jsRangeEndContainer(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSRange* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - Range* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->endContainer(ec))); + Range* imp = static_cast(castedThis->impl()); + JSC::JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->endContainer(ec))); setDOMException(exec, ec); return result; } JSValue jsRangeEndOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSRange* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - Range* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Range* imp = static_cast(castedThis->impl()); JSC::JSValue result = jsNumber(exec, imp->endOffset(ec)); setDOMException(exec, ec); return result; @@ -224,8 +228,9 @@ JSValue jsRangeEndOffset(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsRangeCollapsed(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSRange* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - Range* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Range* imp = static_cast(castedThis->impl()); JSC::JSValue result = jsBoolean(imp->collapsed(ec)); setDOMException(exec, ec); return result; @@ -233,20 +238,22 @@ JSValue jsRangeCollapsed(ExecState* exec, const Identifier&, const PropertySlot& JSValue jsRangeCommonAncestorContainer(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSRange* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - Range* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->commonAncestorContainer(ec))); + Range* imp = static_cast(castedThis->impl()); + JSC::JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->commonAncestorContainer(ec))); setDOMException(exec, ec); return result; } JSValue jsRangeConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSRange* domObject = static_cast(asObject(slot.slotBase())); + return JSRange::getConstructor(exec, domObject->globalObject()); } -JSValue JSRange::getConstructor(ExecState* exec) +JSValue JSRange::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsRangePrototypeFunctionSetStart(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -427,7 +434,7 @@ JSValue JSC_HOST_CALL jsRangePrototypeFunctionExtractContents(ExecState* exec, J ExceptionCode ec = 0; - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->extractContents(ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->extractContents(ec))); setDOMException(exec, ec); return result; } @@ -442,7 +449,7 @@ JSValue JSC_HOST_CALL jsRangePrototypeFunctionCloneContents(ExecState* exec, JSO ExceptionCode ec = 0; - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->cloneContents(ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->cloneContents(ec))); setDOMException(exec, ec); return result; } @@ -487,7 +494,7 @@ JSValue JSC_HOST_CALL jsRangePrototypeFunctionCloneRange(ExecState* exec, JSObje ExceptionCode ec = 0; - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->cloneRange(ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->cloneRange(ec))); setDOMException(exec, ec); return result; } @@ -532,7 +539,7 @@ JSValue JSC_HOST_CALL jsRangePrototypeFunctionCreateContextualFragment(ExecState const UString& html = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createContextualFragment(html, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createContextualFragment(html, ec))); setDOMException(exec, ec); return result; } @@ -645,9 +652,9 @@ JSValue jsRangeNODE_INSIDE(ExecState* exec, const Identifier&, const PropertySlo return jsNumber(exec, static_cast(3)); } -JSC::JSValue toJS(JSC::ExecState* exec, Range* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Range* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Range* toRange(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSRange.h b/src/3rdparty/webkit/WebCore/generated/JSRange.h index 4d8a6f929..a97f75945 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSRange.h +++ b/src/3rdparty/webkit/WebCore/generated/JSRange.h @@ -21,6 +21,7 @@ #ifndef JSRange_h #define JSRange_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class Range; -class JSRange : public DOMObject { - typedef DOMObject Base; +class JSRange : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSRange(PassRefPtr, PassRefPtr); + JSRange(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSRange(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); Range* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, Range*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Range*); Range* toRange(JSC::JSValue); class JSRangePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSRangeException.cpp b/src/3rdparty/webkit/WebCore/generated/JSRangeException.cpp index 799616e8c..fb8addff6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSRangeException.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSRangeException.cpp @@ -68,12 +68,12 @@ static JSC_CONST_HASHTABLE HashTable JSRangeExceptionConstructorTable = { 4, 3, JSRangeExceptionConstructorTableValues, 0 }; #endif -class JSRangeExceptionConstructor : public DOMObject { +class JSRangeExceptionConstructor : public DOMConstructorObject { public: - JSRangeExceptionConstructor(ExecState* exec) - : DOMObject(JSRangeExceptionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSRangeExceptionConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSRangeExceptionConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSRangeExceptionPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSRangeExceptionPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -123,8 +123,8 @@ bool JSRangeExceptionPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSRangeException::s_info = { "RangeException", 0, &JSRangeExceptionTable, 0 }; -JSRangeException::JSRangeException(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSRangeException::JSRangeException(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -146,32 +146,36 @@ bool JSRangeException::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsRangeExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSRangeException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - RangeException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + RangeException* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->code()); } JSValue jsRangeExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSRangeException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - RangeException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + RangeException* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsRangeExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSRangeException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - RangeException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + RangeException* imp = static_cast(castedThis->impl()); return jsString(exec, imp->message()); } JSValue jsRangeExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSRangeException* domObject = static_cast(asObject(slot.slotBase())); + return JSRangeException::getConstructor(exec, domObject->globalObject()); } -JSValue JSRangeException::getConstructor(ExecState* exec) +JSValue JSRangeException::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsRangeExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -199,9 +203,9 @@ JSValue jsRangeExceptionINVALID_NODE_TYPE_ERR(ExecState* exec, const Identifier& return jsNumber(exec, static_cast(2)); } -JSC::JSValue toJS(JSC::ExecState* exec, RangeException* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, RangeException* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } RangeException* toRangeException(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSRangeException.h b/src/3rdparty/webkit/WebCore/generated/JSRangeException.h index 5c45cd2df..7afd13396 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSRangeException.h +++ b/src/3rdparty/webkit/WebCore/generated/JSRangeException.h @@ -21,6 +21,7 @@ #ifndef JSRangeException_h #define JSRangeException_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class RangeException; -class JSRangeException : public DOMObject { - typedef DOMObject Base; +class JSRangeException : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSRangeException(PassRefPtr, PassRefPtr); + JSRangeException(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSRangeException(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); RangeException* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, RangeException*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, RangeException*); RangeException* toRangeException(JSC::JSValue); class JSRangeExceptionPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSRect.cpp b/src/3rdparty/webkit/WebCore/generated/JSRect.cpp index 4f6a2f776..998f649a9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSRect.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSRect.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSRectConstructorTable = { 1, 0, JSRectConstructorTableValues, 0 }; #endif -class JSRectConstructor : public DOMObject { +class JSRectConstructor : public DOMConstructorObject { public: - JSRectConstructor(ExecState* exec) - : DOMObject(JSRectConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSRectConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSRectConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSRectPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSRectPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -112,8 +112,8 @@ JSObject* JSRectPrototype::self(ExecState* exec, JSGlobalObject* globalObject) const ClassInfo JSRect::s_info = { "Rect", 0, &JSRectTable, 0 }; -JSRect::JSRect(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSRect::JSRect(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -135,44 +135,49 @@ bool JSRect::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, JSValue jsRectTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Rect* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->top())); + Rect* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->top())); } JSValue jsRectRight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Rect* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->right())); + Rect* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->right())); } JSValue jsRectBottom(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Rect* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->bottom())); + Rect* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->bottom())); } JSValue jsRectLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Rect* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->left())); + Rect* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->left())); } JSValue jsRectConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSRect* domObject = static_cast(asObject(slot.slotBase())); + return JSRect::getConstructor(exec, domObject->globalObject()); } -JSValue JSRect::getConstructor(ExecState* exec) +JSValue JSRect::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } -JSC::JSValue toJS(JSC::ExecState* exec, Rect* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Rect* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Rect* toRect(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSRect.h b/src/3rdparty/webkit/WebCore/generated/JSRect.h index be2396609..4b1e427eb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSRect.h +++ b/src/3rdparty/webkit/WebCore/generated/JSRect.h @@ -21,6 +21,7 @@ #ifndef JSRect_h #define JSRect_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class Rect; -class JSRect : public DOMObject { - typedef DOMObject Base; +class JSRect : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSRect(PassRefPtr, PassRefPtr); + JSRect(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSRect(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); Rect* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, Rect*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Rect*); Rect* toRect(JSC::JSValue); class JSRectPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLError.cpp b/src/3rdparty/webkit/WebCore/generated/JSSQLError.cpp index f907210c2..bb987c38c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLError.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLError.cpp @@ -75,8 +75,8 @@ JSObject* JSSQLErrorPrototype::self(ExecState* exec, JSGlobalObject* globalObjec const ClassInfo JSSQLError::s_info = { "SQLError", 0, &JSSQLErrorTable, 0 }; -JSSQLError::JSSQLError(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSSQLError::JSSQLError(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -98,21 +98,23 @@ bool JSSQLError::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN JSValue jsSQLErrorCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSQLError* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SQLError* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SQLError* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->code()); } JSValue jsSQLErrorMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSQLError* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SQLError* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SQLError* imp = static_cast(castedThis->impl()); return jsString(exec, imp->message()); } -JSC::JSValue toJS(JSC::ExecState* exec, SQLError* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SQLError* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } SQLError* toSQLError(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLError.h b/src/3rdparty/webkit/WebCore/generated/JSSQLError.h index d500434f8..04aad811d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLError.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLError.h @@ -23,6 +23,7 @@ #if ENABLE(DATABASE) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class SQLError; -class JSSQLError : public DOMObject { - typedef DOMObject Base; +class JSSQLError : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSSQLError(PassRefPtr, PassRefPtr); + JSSQLError(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSSQLError(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -52,7 +53,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SQLError*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SQLError*); SQLError* toSQLError(JSC::JSValue); class JSSQLErrorPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.cpp b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.cpp index e00abfe2c..11d8ffcc0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.cpp @@ -76,8 +76,8 @@ JSObject* JSSQLResultSetPrototype::self(ExecState* exec, JSGlobalObject* globalO const ClassInfo JSSQLResultSet::s_info = { "SQLResultSet", 0, &JSSQLResultSetTable, 0 }; -JSSQLResultSet::JSSQLResultSet(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSSQLResultSet::JSSQLResultSet(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -99,15 +99,17 @@ bool JSSQLResultSet::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsSQLResultSetRows(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSQLResultSet* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SQLResultSet* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->rows())); + SQLResultSet* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->rows())); } JSValue jsSQLResultSetInsertId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSQLResultSet* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - SQLResultSet* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SQLResultSet* imp = static_cast(castedThis->impl()); JSC::JSValue result = jsNumber(exec, imp->insertId(ec)); setDOMException(exec, ec); return result; @@ -115,14 +117,15 @@ JSValue jsSQLResultSetInsertId(ExecState* exec, const Identifier&, const Propert JSValue jsSQLResultSetRowsAffected(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSQLResultSet* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SQLResultSet* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SQLResultSet* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->rowsAffected()); } -JSC::JSValue toJS(JSC::ExecState* exec, SQLResultSet* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SQLResultSet* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } SQLResultSet* toSQLResultSet(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.h b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.h index d009dadf8..401bc3a68 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSet.h @@ -23,6 +23,7 @@ #if ENABLE(DATABASE) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class SQLResultSet; -class JSSQLResultSet : public DOMObject { - typedef DOMObject Base; +class JSSQLResultSet : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSSQLResultSet(PassRefPtr, PassRefPtr); + JSSQLResultSet(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSSQLResultSet(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -52,7 +53,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SQLResultSet*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SQLResultSet*); SQLResultSet* toSQLResultSet(JSC::JSValue); class JSSQLResultSetPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.cpp index 1a8af169b..a166fb003 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.cpp @@ -79,8 +79,8 @@ bool JSSQLResultSetRowListPrototype::getOwnPropertySlot(ExecState* exec, const I const ClassInfo JSSQLResultSetRowList::s_info = { "SQLResultSetRowList", 0, &JSSQLResultSetRowListTable, 0 }; -JSSQLResultSetRowList::JSSQLResultSetRowList(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSSQLResultSetRowList::JSSQLResultSetRowList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -102,8 +102,9 @@ bool JSSQLResultSetRowList::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsSQLResultSetRowListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSQLResultSetRowList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SQLResultSetRowList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SQLResultSetRowList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } @@ -116,9 +117,9 @@ JSValue JSC_HOST_CALL jsSQLResultSetRowListPrototypeFunctionItem(ExecState* exec return castedThisObj->item(exec, args); } -JSC::JSValue toJS(JSC::ExecState* exec, SQLResultSetRowList* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SQLResultSetRowList* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } SQLResultSetRowList* toSQLResultSetRowList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.h b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.h index df285679c..22fb844ea 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLResultSetRowList.h @@ -23,6 +23,7 @@ #if ENABLE(DATABASE) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class SQLResultSetRowList; -class JSSQLResultSetRowList : public DOMObject { - typedef DOMObject Base; +class JSSQLResultSetRowList : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSSQLResultSetRowList(PassRefPtr, PassRefPtr); + JSSQLResultSetRowList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSSQLResultSetRowList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -55,7 +56,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SQLResultSetRowList*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SQLResultSetRowList*); SQLResultSetRowList* toSQLResultSetRowList(JSC::JSValue); class JSSQLResultSetRowListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.cpp b/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.cpp index cb7dabdb6..f8c6d6711 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.cpp @@ -63,8 +63,8 @@ bool JSSQLTransactionPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSSQLTransaction::s_info = { "SQLTransaction", 0, 0, 0 }; -JSSQLTransaction::JSSQLTransaction(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSSQLTransaction::JSSQLTransaction(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -88,9 +88,9 @@ JSValue JSC_HOST_CALL jsSQLTransactionPrototypeFunctionExecuteSql(ExecState* exe return castedThisObj->executeSql(exec, args); } -JSC::JSValue toJS(JSC::ExecState* exec, SQLTransaction* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SQLTransaction* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } SQLTransaction* toSQLTransaction(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.h b/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.h index 94c10a5e6..bb72108ec 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSQLTransaction.h @@ -23,6 +23,7 @@ #if ENABLE(DATABASE) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class SQLTransaction; -class JSSQLTransaction : public DOMObject { - typedef DOMObject Base; +class JSSQLTransaction : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSSQLTransaction(PassRefPtr, PassRefPtr); + JSSQLTransaction(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSSQLTransaction(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -49,7 +50,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SQLTransaction*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SQLTransaction*); SQLTransaction* toSQLTransaction(JSC::JSValue); class JSSQLTransactionPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.cpp index b7a323775..dd66b1fab 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.cpp @@ -111,8 +111,8 @@ bool JSSVGAElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifie const ClassInfo JSSVGAElement::s_info = { "SVGAElement", &JSSVGElement::s_info, &JSSVGAElementTable, 0 }; -JSSVGAElement::JSSVGAElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGAElement::JSSVGAElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -128,98 +128,111 @@ bool JSSVGAElement::getOwnPropertySlot(ExecState* exec, const Identifier& proper JSValue jsSVGAElementTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->targetAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGAElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->hrefAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGAElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGAElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGAElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGAElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGAElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGAElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGAElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGAElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGAElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGAElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGAElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGAElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGAElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGAElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGAElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGAElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGAElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } void JSSVGAElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -263,7 +276,7 @@ JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetPresentationAttribute(Exe const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -276,7 +289,7 @@ JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetBBox(ExecState* exec, JSO SVGAElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -289,7 +302,7 @@ JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetCTM(ExecState* exec, JSOb SVGAElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -302,7 +315,7 @@ JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetScreenCTM(ExecState* exec SVGAElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -317,7 +330,7 @@ JSValue JSC_HOST_CALL jsSVGAElementPrototypeFunctionGetTransformToElement(ExecSt SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.h index 78406f617..09d21e3e0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAElement.h @@ -33,7 +33,7 @@ class SVGAElement; class JSSVGAElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGAElement(PassRefPtr, PassRefPtr); + JSSVGAElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.cpp index 56a439209..8f8a5faf5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.cpp @@ -76,8 +76,8 @@ JSObject* JSSVGAltGlyphElementPrototype::self(ExecState* exec, JSGlobalObject* g const ClassInfo JSSVGAltGlyphElement::s_info = { "SVGAltGlyphElement", &JSSVGTextPositioningElement::s_info, &JSSVGAltGlyphElementTable, 0 }; -JSSVGAltGlyphElement::JSSVGAltGlyphElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGTextPositioningElement(structure, impl) +JSSVGAltGlyphElement::JSSVGAltGlyphElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGTextPositioningElement(structure, globalObject, impl) { } @@ -93,24 +93,27 @@ bool JSSVGAltGlyphElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGAltGlyphElementGlyphRef(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAltGlyphElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAltGlyphElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAltGlyphElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->glyphRef()); } JSValue jsSVGAltGlyphElementFormat(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAltGlyphElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAltGlyphElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAltGlyphElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->format()); } JSValue jsSVGAltGlyphElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAltGlyphElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAltGlyphElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAltGlyphElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->hrefAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } void JSSVGAltGlyphElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.h index f92bdcd34..5df51fede 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAltGlyphElement.h @@ -33,7 +33,7 @@ class SVGAltGlyphElement; class JSSVGAltGlyphElement : public JSSVGTextPositioningElement { typedef JSSVGTextPositioningElement Base; public: - JSSVGAltGlyphElement(PassRefPtr, PassRefPtr); + JSSVGAltGlyphElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.cpp index 4bb4518e3..be8000303 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.cpp @@ -75,12 +75,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGAngleConstructorTable = { 18, 15, JSSVGAngleConstructorTableValues, 0 }; #endif -class JSSVGAngleConstructor : public DOMObject { +class JSSVGAngleConstructor : public DOMConstructorObject { public: - JSSVGAngleConstructor(ExecState* exec) - : DOMObject(JSSVGAngleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGAngleConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGAngleConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGAnglePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGAnglePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -134,9 +134,8 @@ bool JSSVGAnglePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSSVGAngle::s_info = { "SVGAngle", 0, &JSSVGAngleTable, 0 }; -JSSVGAngle::JSSVGAngle(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGAngle::JSSVGAngle(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -158,35 +157,40 @@ bool JSSVGAngle::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN JSValue jsSVGAngleUnitType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAngle* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAngle* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAngle* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->unitType()); } JSValue jsSVGAngleValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAngle* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAngle* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAngle* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->value()); } JSValue jsSVGAngleValueInSpecifiedUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAngle* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAngle* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAngle* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->valueInSpecifiedUnits()); } JSValue jsSVGAngleValueAsString(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAngle* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAngle* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAngle* imp = static_cast(castedThis->impl()); return jsString(exec, imp->valueAsString()); } JSValue jsSVGAngleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + UNUSED_PARAM(slot); + return JSSVGAngle::getConstructor(exec, deprecatedGlobalObjectForPrototype(exec)); } void JSSVGAngle::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -217,9 +221,9 @@ void setJSSVGAngleValueAsString(ExecState* exec, JSObject* thisObject, JSValue v static_cast(thisObject)->context()->svgAttributeChanged(static_cast(thisObject)->impl()->associatedAttributeName()); } -JSValue JSSVGAngle::getConstructor(ExecState* exec) +JSValue JSSVGAngle::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGAnglePrototypeFunctionNewValueSpecifiedUnits(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -276,9 +280,9 @@ JSValue jsSVGAngleSVG_ANGLETYPE_GRAD(ExecState* exec, const Identifier&, const P return jsNumber(exec, static_cast(4)); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGAngle* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGAngle* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGAngle* toSVGAngle(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.h index 531258108..92cf6b50e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAngle.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGAngle; -class JSSVGAngle : public DOMObject { - typedef DOMObject Base; +class JSSVGAngle : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGAngle(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGAngle(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGAngle(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -48,16 +49,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); SVGAngle* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGAngle*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGAngle*, SVGElement* context); SVGAngle* toSVGAngle(JSC::JSValue); class JSSVGAnglePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.cpp index 432bd7e8d..e6aa04780 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGAnimateColorElementPrototype::self(ExecState* exec, JSGlobalObjec const ClassInfo JSSVGAnimateColorElement::s_info = { "SVGAnimateColorElement", &JSSVGAnimationElement::s_info, 0, 0 }; -JSSVGAnimateColorElement::JSSVGAnimateColorElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGAnimationElement(structure, impl) +JSSVGAnimateColorElement::JSSVGAnimateColorElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGAnimationElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.h index a1519a4b8..2a44d4138 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateColorElement.h @@ -33,7 +33,7 @@ class SVGAnimateColorElement; class JSSVGAnimateColorElement : public JSSVGAnimationElement { typedef JSSVGAnimationElement Base; public: - JSSVGAnimateColorElement(PassRefPtr, PassRefPtr); + JSSVGAnimateColorElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.cpp index b79ba6900..a49dea628 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGAnimateElementPrototype::self(ExecState* exec, JSGlobalObject* gl const ClassInfo JSSVGAnimateElement::s_info = { "SVGAnimateElement", &JSSVGAnimationElement::s_info, 0, 0 }; -JSSVGAnimateElement::JSSVGAnimateElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGAnimationElement(structure, impl) +JSSVGAnimateElement::JSSVGAnimateElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGAnimationElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.h index 77415d9b3..90937ca84 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateElement.h @@ -33,7 +33,7 @@ class SVGAnimateElement; class JSSVGAnimateElement : public JSSVGAnimationElement { typedef JSSVGAnimationElement Base; public: - JSSVGAnimateElement(PassRefPtr, PassRefPtr); + JSSVGAnimateElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.cpp index 8b68ea4d4..d5c70c05f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGAnimateTransformElementPrototype::self(ExecState* exec, JSGlobalO const ClassInfo JSSVGAnimateTransformElement::s_info = { "SVGAnimateTransformElement", &JSSVGAnimationElement::s_info, 0, 0 }; -JSSVGAnimateTransformElement::JSSVGAnimateTransformElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGAnimationElement(structure, impl) +JSSVGAnimateTransformElement::JSSVGAnimateTransformElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGAnimationElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.h index ed8d9bbc7..fb8c1c30e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimateTransformElement.h @@ -33,7 +33,7 @@ class SVGAnimateTransformElement; class JSSVGAnimateTransformElement : public JSSVGAnimationElement { typedef JSSVGAnimationElement Base; public: - JSSVGAnimateTransformElement(PassRefPtr, PassRefPtr); + JSSVGAnimateTransformElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.cpp index 34a9a9bd5..e123d2f3a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.cpp @@ -73,9 +73,8 @@ JSObject* JSSVGAnimatedAnglePrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSSVGAnimatedAngle::s_info = { "SVGAnimatedAngle", 0, &JSSVGAnimatedAngleTable, 0 }; -JSSVGAnimatedAngle::JSSVGAnimatedAngle(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGAnimatedAngle::JSSVGAnimatedAngle(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -97,21 +96,23 @@ bool JSSVGAnimatedAngle::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsSVGAnimatedAngleBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedAngle* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedAngle* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->baseVal()), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedAngle* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), WTF::getPtr(imp->baseVal()), castedThis->context()); } JSValue jsSVGAnimatedAngleAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedAngle* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedAngle* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->animVal()), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedAngle* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), WTF::getPtr(imp->animVal()), castedThis->context()); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedAngle* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGAnimatedAngle* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGAnimatedAngle* toSVGAnimatedAngle(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.h index 95000548e..fb2a73ffe 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedAngle.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -30,10 +31,10 @@ namespace WebCore { -class JSSVGAnimatedAngle : public DOMObject { - typedef DOMObject Base; +class JSSVGAnimatedAngle : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGAnimatedAngle(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGAnimatedAngle(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGAnimatedAngle(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,14 +47,12 @@ public: } SVGAnimatedAngle* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedAngle*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGAnimatedAngle*, SVGElement* context); SVGAnimatedAngle* toSVGAnimatedAngle(JSC::JSValue); class JSSVGAnimatedAnglePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.cpp index 969a5c9db..983dd2a15 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.cpp @@ -71,9 +71,8 @@ JSObject* JSSVGAnimatedBooleanPrototype::self(ExecState* exec, JSGlobalObject* g const ClassInfo JSSVGAnimatedBoolean::s_info = { "SVGAnimatedBoolean", 0, &JSSVGAnimatedBooleanTable, 0 }; -JSSVGAnimatedBoolean::JSSVGAnimatedBoolean(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGAnimatedBoolean::JSSVGAnimatedBoolean(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -95,15 +94,17 @@ bool JSSVGAnimatedBoolean::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGAnimatedBooleanBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedBoolean* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedBoolean* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAnimatedBoolean* imp = static_cast(castedThis->impl()); return jsBoolean(imp->baseVal()); } JSValue jsSVGAnimatedBooleanAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedBoolean* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedBoolean* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAnimatedBoolean* imp = static_cast(castedThis->impl()); return jsBoolean(imp->animVal()); } @@ -120,9 +121,9 @@ void setJSSVGAnimatedBooleanBaseVal(ExecState* exec, JSObject* thisObject, JSVal static_cast(thisObject)->context()->svgAttributeChanged(static_cast(thisObject)->impl()->associatedAttributeName()); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedBoolean* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGAnimatedBoolean* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGAnimatedBoolean* toSVGAnimatedBoolean(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.h index 4a4d6f698..599e2a0c7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedBoolean.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -30,10 +31,10 @@ namespace WebCore { -class JSSVGAnimatedBoolean : public DOMObject { - typedef DOMObject Base; +class JSSVGAnimatedBoolean : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGAnimatedBoolean(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGAnimatedBoolean(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGAnimatedBoolean(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,14 +48,12 @@ public: } SVGAnimatedBoolean* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedBoolean*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGAnimatedBoolean*, SVGElement* context); SVGAnimatedBoolean* toSVGAnimatedBoolean(JSC::JSValue); class JSSVGAnimatedBooleanPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.cpp index d61ea12ab..2cf3ad919 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.cpp @@ -72,9 +72,8 @@ JSObject* JSSVGAnimatedEnumerationPrototype::self(ExecState* exec, JSGlobalObjec const ClassInfo JSSVGAnimatedEnumeration::s_info = { "SVGAnimatedEnumeration", 0, &JSSVGAnimatedEnumerationTable, 0 }; -JSSVGAnimatedEnumeration::JSSVGAnimatedEnumeration(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGAnimatedEnumeration::JSSVGAnimatedEnumeration(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -96,15 +95,17 @@ bool JSSVGAnimatedEnumeration::getOwnPropertySlot(ExecState* exec, const Identif JSValue jsSVGAnimatedEnumerationBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedEnumeration* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedEnumeration* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAnimatedEnumeration* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->baseVal()); } JSValue jsSVGAnimatedEnumerationAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedEnumeration* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedEnumeration* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAnimatedEnumeration* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->animVal()); } @@ -121,9 +122,9 @@ void setJSSVGAnimatedEnumerationBaseVal(ExecState* exec, JSObject* thisObject, J static_cast(thisObject)->context()->svgAttributeChanged(static_cast(thisObject)->impl()->associatedAttributeName()); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedEnumeration* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGAnimatedEnumeration* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGAnimatedEnumeration* toSVGAnimatedEnumeration(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.h index b02118390..20403abb4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedEnumeration.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -30,10 +31,10 @@ namespace WebCore { -class JSSVGAnimatedEnumeration : public DOMObject { - typedef DOMObject Base; +class JSSVGAnimatedEnumeration : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGAnimatedEnumeration(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGAnimatedEnumeration(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGAnimatedEnumeration(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,14 +48,12 @@ public: } SVGAnimatedEnumeration* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedEnumeration*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGAnimatedEnumeration*, SVGElement* context); SVGAnimatedEnumeration* toSVGAnimatedEnumeration(JSC::JSValue); class JSSVGAnimatedEnumerationPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.cpp index 822840913..6602bcd84 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.cpp @@ -72,9 +72,8 @@ JSObject* JSSVGAnimatedIntegerPrototype::self(ExecState* exec, JSGlobalObject* g const ClassInfo JSSVGAnimatedInteger::s_info = { "SVGAnimatedInteger", 0, &JSSVGAnimatedIntegerTable, 0 }; -JSSVGAnimatedInteger::JSSVGAnimatedInteger(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGAnimatedInteger::JSSVGAnimatedInteger(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -96,15 +95,17 @@ bool JSSVGAnimatedInteger::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGAnimatedIntegerBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedInteger* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedInteger* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAnimatedInteger* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->baseVal()); } JSValue jsSVGAnimatedIntegerAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedInteger* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedInteger* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAnimatedInteger* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->animVal()); } @@ -121,9 +122,9 @@ void setJSSVGAnimatedIntegerBaseVal(ExecState* exec, JSObject* thisObject, JSVal static_cast(thisObject)->context()->svgAttributeChanged(static_cast(thisObject)->impl()->associatedAttributeName()); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedInteger* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGAnimatedInteger* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGAnimatedInteger* toSVGAnimatedInteger(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.h index 34947f0b5..9045693e0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedInteger.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -30,10 +31,10 @@ namespace WebCore { -class JSSVGAnimatedInteger : public DOMObject { - typedef DOMObject Base; +class JSSVGAnimatedInteger : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGAnimatedInteger(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGAnimatedInteger(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGAnimatedInteger(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,14 +48,12 @@ public: } SVGAnimatedInteger* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedInteger*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGAnimatedInteger*, SVGElement* context); SVGAnimatedInteger* toSVGAnimatedInteger(JSC::JSValue); class JSSVGAnimatedIntegerPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.cpp index e680aea11..bcc5a818b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.cpp @@ -72,9 +72,8 @@ JSObject* JSSVGAnimatedLengthPrototype::self(ExecState* exec, JSGlobalObject* gl const ClassInfo JSSVGAnimatedLength::s_info = { "SVGAnimatedLength", 0, &JSSVGAnimatedLengthTable, 0 }; -JSSVGAnimatedLength::JSSVGAnimatedLength(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGAnimatedLength::JSSVGAnimatedLength(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -96,21 +95,23 @@ bool JSSVGAnimatedLength::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGAnimatedLengthBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedLength* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedLength* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, JSSVGDynamicPODTypeWrapperCache::lookupOrCreateWrapper(imp, &SVGAnimatedLength::baseVal, &SVGAnimatedLength::setBaseVal).get(), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedLength* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGDynamicPODTypeWrapperCache::lookupOrCreateWrapper(imp, &SVGAnimatedLength::baseVal, &SVGAnimatedLength::setBaseVal).get(), castedThis->context()); } JSValue jsSVGAnimatedLengthAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedLength* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedLength* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, JSSVGDynamicPODTypeWrapperCache::lookupOrCreateWrapper(imp, &SVGAnimatedLength::animVal, &SVGAnimatedLength::setAnimVal).get(), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedLength* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGDynamicPODTypeWrapperCache::lookupOrCreateWrapper(imp, &SVGAnimatedLength::animVal, &SVGAnimatedLength::setAnimVal).get(), castedThis->context()); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedLength* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGAnimatedLength* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGAnimatedLength* toSVGAnimatedLength(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.h index 430d78bda..7e3ba122a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLength.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -30,10 +31,10 @@ namespace WebCore { -class JSSVGAnimatedLength : public DOMObject { - typedef DOMObject Base; +class JSSVGAnimatedLength : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGAnimatedLength(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGAnimatedLength(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGAnimatedLength(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,14 +47,12 @@ public: } SVGAnimatedLength* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedLength*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGAnimatedLength*, SVGElement* context); SVGAnimatedLength* toSVGAnimatedLength(JSC::JSValue); class JSSVGAnimatedLengthPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.cpp index f6bf5143f..6dc24abcf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.cpp @@ -73,9 +73,8 @@ JSObject* JSSVGAnimatedLengthListPrototype::self(ExecState* exec, JSGlobalObject const ClassInfo JSSVGAnimatedLengthList::s_info = { "SVGAnimatedLengthList", 0, &JSSVGAnimatedLengthListTable, 0 }; -JSSVGAnimatedLengthList::JSSVGAnimatedLengthList(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGAnimatedLengthList::JSSVGAnimatedLengthList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -97,21 +96,23 @@ bool JSSVGAnimatedLengthList::getOwnPropertySlot(ExecState* exec, const Identifi JSValue jsSVGAnimatedLengthListBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedLengthList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedLengthList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->baseVal()), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedLengthList* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), WTF::getPtr(imp->baseVal()), castedThis->context()); } JSValue jsSVGAnimatedLengthListAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedLengthList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedLengthList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->animVal()), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedLengthList* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), WTF::getPtr(imp->animVal()), castedThis->context()); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedLengthList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGAnimatedLengthList* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGAnimatedLengthList* toSVGAnimatedLengthList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.h index bd19ac9ae..288ccfcf0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedLengthList.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -30,10 +31,10 @@ namespace WebCore { -class JSSVGAnimatedLengthList : public DOMObject { - typedef DOMObject Base; +class JSSVGAnimatedLengthList : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGAnimatedLengthList(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGAnimatedLengthList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGAnimatedLengthList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,14 +47,12 @@ public: } SVGAnimatedLengthList* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedLengthList*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGAnimatedLengthList*, SVGElement* context); SVGAnimatedLengthList* toSVGAnimatedLengthList(JSC::JSValue); class JSSVGAnimatedLengthListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.cpp index 232b0850f..9081e47c1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.cpp @@ -72,9 +72,8 @@ JSObject* JSSVGAnimatedNumberPrototype::self(ExecState* exec, JSGlobalObject* gl const ClassInfo JSSVGAnimatedNumber::s_info = { "SVGAnimatedNumber", 0, &JSSVGAnimatedNumberTable, 0 }; -JSSVGAnimatedNumber::JSSVGAnimatedNumber(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGAnimatedNumber::JSSVGAnimatedNumber(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -96,15 +95,17 @@ bool JSSVGAnimatedNumber::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGAnimatedNumberBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedNumber* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedNumber* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAnimatedNumber* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->baseVal()); } JSValue jsSVGAnimatedNumberAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedNumber* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedNumber* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAnimatedNumber* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->animVal()); } @@ -121,9 +122,9 @@ void setJSSVGAnimatedNumberBaseVal(ExecState* exec, JSObject* thisObject, JSValu static_cast(thisObject)->context()->svgAttributeChanged(static_cast(thisObject)->impl()->associatedAttributeName()); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedNumber* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGAnimatedNumber* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGAnimatedNumber* toSVGAnimatedNumber(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.h index 77f77a6f1..eab38884f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumber.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -30,10 +31,10 @@ namespace WebCore { -class JSSVGAnimatedNumber : public DOMObject { - typedef DOMObject Base; +class JSSVGAnimatedNumber : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGAnimatedNumber(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGAnimatedNumber(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGAnimatedNumber(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,14 +48,12 @@ public: } SVGAnimatedNumber* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedNumber*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGAnimatedNumber*, SVGElement* context); SVGAnimatedNumber* toSVGAnimatedNumber(JSC::JSValue); class JSSVGAnimatedNumberPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.cpp index c782499be..224936f4c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.cpp @@ -73,9 +73,8 @@ JSObject* JSSVGAnimatedNumberListPrototype::self(ExecState* exec, JSGlobalObject const ClassInfo JSSVGAnimatedNumberList::s_info = { "SVGAnimatedNumberList", 0, &JSSVGAnimatedNumberListTable, 0 }; -JSSVGAnimatedNumberList::JSSVGAnimatedNumberList(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGAnimatedNumberList::JSSVGAnimatedNumberList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -97,21 +96,23 @@ bool JSSVGAnimatedNumberList::getOwnPropertySlot(ExecState* exec, const Identifi JSValue jsSVGAnimatedNumberListBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedNumberList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedNumberList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->baseVal()), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedNumberList* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), WTF::getPtr(imp->baseVal()), castedThis->context()); } JSValue jsSVGAnimatedNumberListAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedNumberList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedNumberList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->animVal()), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedNumberList* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), WTF::getPtr(imp->animVal()), castedThis->context()); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedNumberList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGAnimatedNumberList* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGAnimatedNumberList* toSVGAnimatedNumberList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.h index bc1c751d6..c37905ca7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedNumberList.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -30,10 +31,10 @@ namespace WebCore { -class JSSVGAnimatedNumberList : public DOMObject { - typedef DOMObject Base; +class JSSVGAnimatedNumberList : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGAnimatedNumberList(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGAnimatedNumberList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGAnimatedNumberList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,14 +47,12 @@ public: } SVGAnimatedNumberList* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedNumberList*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGAnimatedNumberList*, SVGElement* context); SVGAnimatedNumberList* toSVGAnimatedNumberList(JSC::JSValue); class JSSVGAnimatedNumberListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.cpp index 6fd809c65..6a602c404 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.cpp @@ -73,9 +73,8 @@ JSObject* JSSVGAnimatedPreserveAspectRatioPrototype::self(ExecState* exec, JSGlo const ClassInfo JSSVGAnimatedPreserveAspectRatio::s_info = { "SVGAnimatedPreserveAspectRatio", 0, &JSSVGAnimatedPreserveAspectRatioTable, 0 }; -JSSVGAnimatedPreserveAspectRatio::JSSVGAnimatedPreserveAspectRatio(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGAnimatedPreserveAspectRatio::JSSVGAnimatedPreserveAspectRatio(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -97,21 +96,23 @@ bool JSSVGAnimatedPreserveAspectRatio::getOwnPropertySlot(ExecState* exec, const JSValue jsSVGAnimatedPreserveAspectRatioBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedPreserveAspectRatio* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedPreserveAspectRatio* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->baseVal()), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedPreserveAspectRatio* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), WTF::getPtr(imp->baseVal()), castedThis->context()); } JSValue jsSVGAnimatedPreserveAspectRatioAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedPreserveAspectRatio* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedPreserveAspectRatio* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->animVal()), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedPreserveAspectRatio* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), WTF::getPtr(imp->animVal()), castedThis->context()); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedPreserveAspectRatio* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGAnimatedPreserveAspectRatio* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGAnimatedPreserveAspectRatio* toSVGAnimatedPreserveAspectRatio(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.h index 3a36ff9f5..172691a33 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedPreserveAspectRatio.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -30,10 +31,10 @@ namespace WebCore { -class JSSVGAnimatedPreserveAspectRatio : public DOMObject { - typedef DOMObject Base; +class JSSVGAnimatedPreserveAspectRatio : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGAnimatedPreserveAspectRatio(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGAnimatedPreserveAspectRatio(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGAnimatedPreserveAspectRatio(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,14 +47,12 @@ public: } SVGAnimatedPreserveAspectRatio* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedPreserveAspectRatio*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGAnimatedPreserveAspectRatio*, SVGElement* context); SVGAnimatedPreserveAspectRatio* toSVGAnimatedPreserveAspectRatio(JSC::JSValue); class JSSVGAnimatedPreserveAspectRatioPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.cpp index 8d8a4da4d..34bd262ff 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.cpp @@ -73,9 +73,8 @@ JSObject* JSSVGAnimatedRectPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSSVGAnimatedRect::s_info = { "SVGAnimatedRect", 0, &JSSVGAnimatedRectTable, 0 }; -JSSVGAnimatedRect::JSSVGAnimatedRect(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGAnimatedRect::JSSVGAnimatedRect(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -97,21 +96,23 @@ bool JSSVGAnimatedRect::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsSVGAnimatedRectBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedRect* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, JSSVGDynamicPODTypeWrapperCache::lookupOrCreateWrapper(imp, &SVGAnimatedRect::baseVal, &SVGAnimatedRect::setBaseVal).get(), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedRect* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGDynamicPODTypeWrapperCache::lookupOrCreateWrapper(imp, &SVGAnimatedRect::baseVal, &SVGAnimatedRect::setBaseVal).get(), castedThis->context()); } JSValue jsSVGAnimatedRectAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedRect* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, JSSVGDynamicPODTypeWrapperCache::lookupOrCreateWrapper(imp, &SVGAnimatedRect::animVal, &SVGAnimatedRect::setAnimVal).get(), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedRect* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGDynamicPODTypeWrapperCache::lookupOrCreateWrapper(imp, &SVGAnimatedRect::animVal, &SVGAnimatedRect::setAnimVal).get(), castedThis->context()); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedRect* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGAnimatedRect* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGAnimatedRect* toSVGAnimatedRect(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.h index 00c9ffa7e..c71c0b301 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedRect.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -30,10 +31,10 @@ namespace WebCore { -class JSSVGAnimatedRect : public DOMObject { - typedef DOMObject Base; +class JSSVGAnimatedRect : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGAnimatedRect(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGAnimatedRect(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGAnimatedRect(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,14 +47,12 @@ public: } SVGAnimatedRect* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedRect*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGAnimatedRect*, SVGElement* context); SVGAnimatedRect* toSVGAnimatedRect(JSC::JSValue); class JSSVGAnimatedRectPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.cpp index cfcebf033..52c812919 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.cpp @@ -74,9 +74,8 @@ JSObject* JSSVGAnimatedStringPrototype::self(ExecState* exec, JSGlobalObject* gl const ClassInfo JSSVGAnimatedString::s_info = { "SVGAnimatedString", 0, &JSSVGAnimatedStringTable, 0 }; -JSSVGAnimatedString::JSSVGAnimatedString(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGAnimatedString::JSSVGAnimatedString(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -98,15 +97,17 @@ bool JSSVGAnimatedString::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGAnimatedStringBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedString* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedString* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAnimatedString* imp = static_cast(castedThis->impl()); return jsString(exec, imp->baseVal()); } JSValue jsSVGAnimatedStringAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedString* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedString* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAnimatedString* imp = static_cast(castedThis->impl()); return jsString(exec, imp->animVal()); } @@ -123,9 +124,9 @@ void setJSSVGAnimatedStringBaseVal(ExecState* exec, JSObject* thisObject, JSValu static_cast(thisObject)->context()->svgAttributeChanged(static_cast(thisObject)->impl()->associatedAttributeName()); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedString* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGAnimatedString* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGAnimatedString* toSVGAnimatedString(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.h index c7fd6dbc5..6380728b8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedString.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -30,10 +31,10 @@ namespace WebCore { -class JSSVGAnimatedString : public DOMObject { - typedef DOMObject Base; +class JSSVGAnimatedString : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGAnimatedString(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGAnimatedString(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGAnimatedString(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,14 +48,12 @@ public: } SVGAnimatedString* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedString*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGAnimatedString*, SVGElement* context); SVGAnimatedString* toSVGAnimatedString(JSC::JSValue); class JSSVGAnimatedStringPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.cpp index 80d48c9d0..077f37973 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.cpp @@ -73,9 +73,8 @@ JSObject* JSSVGAnimatedTransformListPrototype::self(ExecState* exec, JSGlobalObj const ClassInfo JSSVGAnimatedTransformList::s_info = { "SVGAnimatedTransformList", 0, &JSSVGAnimatedTransformListTable, 0 }; -JSSVGAnimatedTransformList::JSSVGAnimatedTransformList(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGAnimatedTransformList::JSSVGAnimatedTransformList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -97,21 +96,23 @@ bool JSSVGAnimatedTransformList::getOwnPropertySlot(ExecState* exec, const Ident JSValue jsSVGAnimatedTransformListBaseVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedTransformList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedTransformList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->baseVal()), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedTransformList* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), WTF::getPtr(imp->baseVal()), castedThis->context()); } JSValue jsSVGAnimatedTransformListAnimVal(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimatedTransformList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimatedTransformList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->animVal()), static_cast(asObject(slot.slotBase()))->context()); + SVGAnimatedTransformList* imp = static_cast(castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), WTF::getPtr(imp->animVal()), castedThis->context()); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGAnimatedTransformList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGAnimatedTransformList* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGAnimatedTransformList* toSVGAnimatedTransformList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.h index eb129ef30..358905c4a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimatedTransformList.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -30,10 +31,10 @@ namespace WebCore { -class JSSVGAnimatedTransformList : public DOMObject { - typedef DOMObject Base; +class JSSVGAnimatedTransformList : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGAnimatedTransformList(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGAnimatedTransformList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGAnimatedTransformList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,14 +47,12 @@ public: } SVGAnimatedTransformList* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGAnimatedTransformList*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGAnimatedTransformList*, SVGElement* context); SVGAnimatedTransformList* toSVGAnimatedTransformList(JSC::JSValue); class JSSVGAnimatedTransformListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.cpp index 70fc7b33d..48a51e4b8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.cpp @@ -95,8 +95,8 @@ bool JSSVGAnimationElementPrototype::getOwnPropertySlot(ExecState* exec, const I const ClassInfo JSSVGAnimationElement::s_info = { "SVGAnimationElement", &JSSVGElement::s_info, &JSSVGAnimationElementTable, 0 }; -JSSVGAnimationElement::JSSVGAnimationElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGAnimationElement::JSSVGAnimationElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -112,38 +112,43 @@ bool JSSVGAnimationElement::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsSVGAnimationElementTargetElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimationElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimationElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->targetElement())); + SVGAnimationElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->targetElement())); } JSValue jsSVGAnimationElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimationElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimationElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGAnimationElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGAnimationElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimationElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimationElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGAnimationElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGAnimationElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimationElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimationElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGAnimationElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGAnimationElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGAnimationElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGAnimationElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGAnimationElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue JSC_HOST_CALL jsSVGAnimationElementPrototypeFunctionGetStartTime(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.h index 989c0d047..4a48a7bbe 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGAnimationElement.h @@ -33,7 +33,7 @@ class SVGAnimationElement; class JSSVGAnimationElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGAnimationElement(PassRefPtr, PassRefPtr); + JSSVGAnimationElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.cpp index a487e9c80..92213c79b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.cpp @@ -113,8 +113,8 @@ bool JSSVGCircleElementPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSSVGCircleElement::s_info = { "SVGCircleElement", &JSSVGElement::s_info, &JSSVGCircleElementTable, 0 }; -JSSVGCircleElement::JSSVGCircleElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGCircleElement::JSSVGCircleElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -130,106 +130,120 @@ bool JSSVGCircleElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsSVGCircleElementCx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGCircleElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->cxAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGCircleElementCy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGCircleElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->cyAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGCircleElementR(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGCircleElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->rAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGCircleElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGCircleElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGCircleElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGCircleElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGCircleElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGCircleElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGCircleElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGCircleElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGCircleElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGCircleElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGCircleElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGCircleElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGCircleElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGCircleElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGCircleElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGCircleElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGCircleElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGCircleElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGCircleElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGCircleElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGCircleElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCircleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCircleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGCircleElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } void JSSVGCircleElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -273,7 +287,7 @@ JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetPresentationAttribut const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -286,7 +300,7 @@ JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetBBox(ExecState* exec SVGCircleElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -299,7 +313,7 @@ JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetCTM(ExecState* exec, SVGCircleElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -312,7 +326,7 @@ JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetScreenCTM(ExecState* SVGCircleElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -327,7 +341,7 @@ JSValue JSC_HOST_CALL jsSVGCircleElementPrototypeFunctionGetTransformToElement(E SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.h index 8c9acda5e..6dfad23fc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGCircleElement.h @@ -33,7 +33,7 @@ class SVGCircleElement; class JSSVGCircleElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGCircleElement(PassRefPtr, PassRefPtr); + JSSVGCircleElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.cpp index 5adfdb9c6..c67ced4ce 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.cpp @@ -111,8 +111,8 @@ bool JSSVGClipPathElementPrototype::getOwnPropertySlot(ExecState* exec, const Id const ClassInfo JSSVGClipPathElement::s_info = { "SVGClipPathElement", &JSSVGElement::s_info, &JSSVGClipPathElementTable, 0 }; -JSSVGClipPathElement::JSSVGClipPathElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGClipPathElement::JSSVGClipPathElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -128,90 +128,102 @@ bool JSSVGClipPathElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGClipPathElementClipPathUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGClipPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGClipPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGClipPathElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->clipPathUnitsAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGClipPathElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGClipPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGClipPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGClipPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGClipPathElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGClipPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGClipPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGClipPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGClipPathElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGClipPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGClipPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGClipPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGClipPathElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGClipPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGClipPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGClipPathElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGClipPathElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGClipPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGClipPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGClipPathElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGClipPathElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGClipPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGClipPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGClipPathElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGClipPathElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGClipPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGClipPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGClipPathElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGClipPathElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGClipPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGClipPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGClipPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGClipPathElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGClipPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGClipPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGClipPathElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGClipPathElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGClipPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGClipPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGClipPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGClipPathElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGClipPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGClipPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGClipPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } void JSSVGClipPathElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -255,7 +267,7 @@ JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetPresentationAttrib const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -268,7 +280,7 @@ JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetBBox(ExecState* ex SVGClipPathElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -281,7 +293,7 @@ JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetCTM(ExecState* exe SVGClipPathElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -294,7 +306,7 @@ JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetScreenCTM(ExecStat SVGClipPathElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -309,7 +321,7 @@ JSValue JSC_HOST_CALL jsSVGClipPathElementPrototypeFunctionGetTransformToElement SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.h index b4a44cffa..b27abca22 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGClipPathElement.h @@ -33,7 +33,7 @@ class SVGClipPathElement; class JSSVGClipPathElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGClipPathElement(PassRefPtr, PassRefPtr); + JSSVGClipPathElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGColor.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGColor.cpp index 97ea35b06..59c2549cb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGColor.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGColor.cpp @@ -25,6 +25,7 @@ #include "JSSVGColor.h" #include "JSRGBColor.h" +#include "RGBColor.h" #include "SVGColor.h" #include #include @@ -71,12 +72,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGColorConstructorTable = { 8, 7, JSSVGColorConstructorTableValues, 0 }; #endif -class JSSVGColorConstructor : public DOMObject { +class JSSVGColorConstructor : public DOMConstructorObject { public: - JSSVGColorConstructor(ExecState* exec) - : DOMObject(JSSVGColorConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGColorConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGColorConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGColorPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGColorPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -130,8 +131,8 @@ bool JSSVGColorPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSSVGColor::s_info = { "SVGColor", &JSCSSValue::s_info, &JSSVGColorTable, 0 }; -JSSVGColor::JSSVGColor(PassRefPtr structure, PassRefPtr impl) - : JSCSSValue(structure, impl) +JSSVGColor::JSSVGColor(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCSSValue(structure, globalObject, impl) { } @@ -147,25 +148,28 @@ bool JSSVGColor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN JSValue jsSVGColorColorType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGColor* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGColor* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGColor* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->colorType()); } JSValue jsSVGColorRgbColor(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGColor* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGColor* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return getJSRGBColor(exec, imp->rgbColor()); + SVGColor* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->rgbColor())); } JSValue jsSVGColorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSSVGColor* domObject = static_cast(asObject(slot.slotBase())); + return JSSVGColor::getConstructor(exec, domObject->globalObject()); } -JSValue JSSVGColor::getConstructor(ExecState* exec) +JSValue JSSVGColor::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGColorPrototypeFunctionSetRGBColor(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGColor.h b/src/3rdparty/webkit/WebCore/generated/JSSVGColor.h index 43baabb3e..9161bfcfc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGColor.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGColor.h @@ -33,7 +33,7 @@ class SVGColor; class JSSVGColor : public JSCSSValue { typedef JSCSSValue Base; public: - JSSVGColor(PassRefPtr, PassRefPtr); + JSSVGColor(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.cpp index 3fc9adca0..be144bbd7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.cpp @@ -78,12 +78,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGComponentTransferFunctionElementConstr { 17, 15, JSSVGComponentTransferFunctionElementConstructorTableValues, 0 }; #endif -class JSSVGComponentTransferFunctionElementConstructor : public DOMObject { +class JSSVGComponentTransferFunctionElementConstructor : public DOMConstructorObject { public: - JSSVGComponentTransferFunctionElementConstructor(ExecState* exec) - : DOMObject(JSSVGComponentTransferFunctionElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGComponentTransferFunctionElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGComponentTransferFunctionElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGComponentTransferFunctionElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGComponentTransferFunctionElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -136,8 +136,8 @@ bool JSSVGComponentTransferFunctionElementPrototype::getOwnPropertySlot(ExecStat const ClassInfo JSSVGComponentTransferFunctionElement::s_info = { "SVGComponentTransferFunctionElement", &JSSVGElement::s_info, &JSSVGComponentTransferFunctionElementTable, 0 }; -JSSVGComponentTransferFunctionElement::JSSVGComponentTransferFunctionElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGComponentTransferFunctionElement::JSSVGComponentTransferFunctionElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -153,67 +153,75 @@ bool JSSVGComponentTransferFunctionElement::getOwnPropertySlot(ExecState* exec, JSValue jsSVGComponentTransferFunctionElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGComponentTransferFunctionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGComponentTransferFunctionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGComponentTransferFunctionElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->typeAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGComponentTransferFunctionElementTableValues(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGComponentTransferFunctionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGComponentTransferFunctionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGComponentTransferFunctionElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->tableValuesAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGComponentTransferFunctionElementSlope(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGComponentTransferFunctionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGComponentTransferFunctionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGComponentTransferFunctionElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->slopeAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGComponentTransferFunctionElementIntercept(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGComponentTransferFunctionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGComponentTransferFunctionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGComponentTransferFunctionElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->interceptAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGComponentTransferFunctionElementAmplitude(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGComponentTransferFunctionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGComponentTransferFunctionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGComponentTransferFunctionElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->amplitudeAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGComponentTransferFunctionElementExponent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGComponentTransferFunctionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGComponentTransferFunctionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGComponentTransferFunctionElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->exponentAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGComponentTransferFunctionElementOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGComponentTransferFunctionElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGComponentTransferFunctionElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGComponentTransferFunctionElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->offsetAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGComponentTransferFunctionElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSSVGComponentTransferFunctionElement* domObject = static_cast(asObject(slot.slotBase())); + return JSSVGComponentTransferFunctionElement::getConstructor(exec, domObject->globalObject()); } -JSValue JSSVGComponentTransferFunctionElement::getConstructor(ExecState* exec) +JSValue JSSVGComponentTransferFunctionElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } // Constant getters diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.h index 6576e322a..6cc0d9ea9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGComponentTransferFunctionElement.h @@ -33,7 +33,7 @@ class SVGComponentTransferFunctionElement; class JSSVGComponentTransferFunctionElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGComponentTransferFunctionElement(PassRefPtr, PassRefPtr); + JSSVGComponentTransferFunctionElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.cpp index c38cb5b62..ed175417d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.cpp @@ -89,8 +89,8 @@ bool JSSVGCursorElementPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSSVGCursorElement::s_info = { "SVGCursorElement", &JSSVGElement::s_info, &JSSVGCursorElementTable, 0 }; -JSSVGCursorElement::JSSVGCursorElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGCursorElement::JSSVGCursorElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -106,55 +106,62 @@ bool JSSVGCursorElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsSVGCursorElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCursorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCursorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGCursorElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGCursorElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCursorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCursorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGCursorElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGCursorElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCursorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCursorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGCursorElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->hrefAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGCursorElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCursorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCursorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGCursorElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGCursorElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCursorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCursorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGCursorElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGCursorElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCursorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCursorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGCursorElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGCursorElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGCursorElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGCursorElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGCursorElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue JSC_HOST_CALL jsSVGCursorElementPrototypeFunctionHasExtension(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.h index 377109071..81921c4eb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGCursorElement.h @@ -33,7 +33,7 @@ class SVGCursorElement; class JSSVGCursorElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGCursorElement(PassRefPtr, PassRefPtr); + JSSVGCursorElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.cpp index 207bbe72d..9550465b8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGDefinitionSrcElementPrototype::self(ExecState* exec, JSGlobalObje const ClassInfo JSSVGDefinitionSrcElement::s_info = { "SVGDefinitionSrcElement", &JSSVGElement::s_info, 0, 0 }; -JSSVGDefinitionSrcElement::JSSVGDefinitionSrcElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGDefinitionSrcElement::JSSVGDefinitionSrcElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.h index 9997f5210..2afb3e962 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDefinitionSrcElement.h @@ -33,7 +33,7 @@ class SVGDefinitionSrcElement; class JSSVGDefinitionSrcElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGDefinitionSrcElement(PassRefPtr, PassRefPtr); + JSSVGDefinitionSrcElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.cpp index dd8721154..f5e8ac78c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.cpp @@ -109,8 +109,8 @@ bool JSSVGDefsElementPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSSVGDefsElement::s_info = { "SVGDefsElement", &JSSVGElement::s_info, &JSSVGDefsElementTable, 0 }; -JSSVGDefsElement::JSSVGDefsElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGDefsElement::JSSVGDefsElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -126,82 +126,93 @@ bool JSSVGDefsElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsSVGDefsElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDefsElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDefsElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGDefsElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGDefsElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDefsElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDefsElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGDefsElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGDefsElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDefsElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDefsElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGDefsElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGDefsElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDefsElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDefsElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGDefsElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGDefsElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDefsElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDefsElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGDefsElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGDefsElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDefsElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDefsElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGDefsElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGDefsElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDefsElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDefsElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGDefsElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGDefsElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDefsElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDefsElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGDefsElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGDefsElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDefsElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDefsElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGDefsElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGDefsElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDefsElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDefsElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGDefsElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGDefsElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDefsElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDefsElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGDefsElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } void JSSVGDefsElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -245,7 +256,7 @@ JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetPresentationAttribute( const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -258,7 +269,7 @@ JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetBBox(ExecState* exec, SVGDefsElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -271,7 +282,7 @@ JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetCTM(ExecState* exec, J SVGDefsElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -284,7 +295,7 @@ JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetScreenCTM(ExecState* e SVGDefsElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -299,7 +310,7 @@ JSValue JSC_HOST_CALL jsSVGDefsElementPrototypeFunctionGetTransformToElement(Exe SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.h index e4fa8b547..b96022645 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDefsElement.h @@ -33,7 +33,7 @@ class SVGDefsElement; class JSSVGDefsElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGDefsElement(PassRefPtr, PassRefPtr); + JSSVGDefsElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.cpp index 77be62199..55ab0556c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.cpp @@ -89,8 +89,8 @@ bool JSSVGDescElementPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSSVGDescElement::s_info = { "SVGDescElement", &JSSVGElement::s_info, &JSSVGDescElementTable, 0 }; -JSSVGDescElement::JSSVGDescElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGDescElement::JSSVGDescElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -106,31 +106,35 @@ bool JSSVGDescElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsSVGDescElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDescElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDescElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGDescElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGDescElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDescElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDescElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGDescElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGDescElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDescElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDescElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGDescElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGDescElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDescElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDescElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGDescElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } void JSSVGDescElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -160,7 +164,7 @@ JSValue JSC_HOST_CALL jsSVGDescElementPrototypeFunctionGetPresentationAttribute( const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.h index b8ca101d6..179d7b3b0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDescElement.h @@ -33,7 +33,7 @@ class SVGDescElement; class JSSVGDescElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGDescElement(PassRefPtr, PassRefPtr); + JSSVGDescElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.cpp index 6d91ccc03..0e7d8fd08 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.cpp @@ -82,8 +82,8 @@ bool JSSVGDocumentPrototype::getOwnPropertySlot(ExecState* exec, const Identifie const ClassInfo JSSVGDocument::s_info = { "SVGDocument", &JSDocument::s_info, &JSSVGDocumentTable, 0 }; -JSSVGDocument::JSSVGDocument(PassRefPtr structure, PassRefPtr impl) - : JSDocument(structure, impl) +JSSVGDocument::JSSVGDocument(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSDocument(structure, globalObject, impl) { } @@ -99,9 +99,10 @@ bool JSSVGDocument::getOwnPropertySlot(ExecState* exec, const Identifier& proper JSValue jsSVGDocumentRootElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGDocument* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGDocument* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->rootElement())); + SVGDocument* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->rootElement())); } JSValue JSC_HOST_CALL jsSVGDocumentPrototypeFunctionCreateEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -115,7 +116,7 @@ JSValue JSC_HOST_CALL jsSVGDocumentPrototypeFunctionCreateEvent(ExecState* exec, const UString& eventType = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createEvent(eventType, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createEvent(eventType, ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.h b/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.h index d4bd50e61..8f279c909 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGDocument.h @@ -33,7 +33,7 @@ class SVGDocument; class JSSVGDocument : public JSDocument { typedef JSDocument Base; public: - JSSVGDocument(PassRefPtr, PassRefPtr); + JSSVGDocument(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGElement.cpp index b9e0a2d16..f6a775bb8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElement.cpp @@ -79,8 +79,8 @@ JSObject* JSSVGElementPrototype::self(ExecState* exec, JSGlobalObject* globalObj const ClassInfo JSSVGElement::s_info = { "SVGElement", &JSElement::s_info, &JSSVGElementTable, 0 }; -JSSVGElement::JSSVGElement(PassRefPtr structure, PassRefPtr impl) - : JSElement(structure, impl) +JSSVGElement::JSSVGElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSElement(structure, globalObject, impl) { } @@ -96,30 +96,34 @@ bool JSSVGElement::getOwnPropertySlot(ExecState* exec, const Identifier& propert JSValue jsSVGElementId(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->id()); } JSValue jsSVGElementXmlbase(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlbase()); } JSValue jsSVGElementOwnerSVGElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->ownerSVGElement())); + SVGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->ownerSVGElement())); } JSValue jsSVGElementViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->viewportElement())); + SVGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->viewportElement())); } void JSSVGElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGElement.h index 7123c7d5d..cb2ae1062 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElement.h @@ -33,7 +33,7 @@ class SVGElement; class JSSVGElement : public JSElement { typedef JSElement Base; public: - JSSVGElement(PassRefPtr, PassRefPtr); + JSSVGElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.cpp index 560630dbc..979d2acbe 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.cpp @@ -140,8 +140,8 @@ bool JSSVGElementInstancePrototype::getOwnPropertySlot(ExecState* exec, const Id const ClassInfo JSSVGElementInstance::s_info = { "SVGElementInstance", 0, &JSSVGElementInstanceTable, 0 }; -JSSVGElementInstance::JSSVGElementInstance(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSSVGElementInstance::JSSVGElementInstance(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -163,64 +163,73 @@ bool JSSVGElementInstance::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGElementInstanceCorrespondingElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->correspondingElement())); + SVGElementInstance* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->correspondingElement())); } JSValue jsSVGElementInstanceCorrespondingUseElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->correspondingUseElement())); + SVGElementInstance* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->correspondingUseElement())); } JSValue jsSVGElementInstanceParentNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->parentNode())); + SVGElementInstance* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->parentNode())); } JSValue jsSVGElementInstanceChildNodes(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->childNodes())); + SVGElementInstance* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->childNodes())); } JSValue jsSVGElementInstanceFirstChild(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->firstChild())); + SVGElementInstance* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->firstChild())); } JSValue jsSVGElementInstanceLastChild(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->lastChild())); + SVGElementInstance* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->lastChild())); } JSValue jsSVGElementInstancePreviousSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->previousSibling())); + SVGElementInstance* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->previousSibling())); } JSValue jsSVGElementInstanceNextSibling(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nextSibling())); + SVGElementInstance* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nextSibling())); } JSValue jsSVGElementInstanceOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onabort()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -230,8 +239,9 @@ JSValue jsSVGElementInstanceOnabort(ExecState* exec, const Identifier&, const Pr JSValue jsSVGElementInstanceOnblur(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onblur()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -241,8 +251,9 @@ JSValue jsSVGElementInstanceOnblur(ExecState* exec, const Identifier&, const Pro JSValue jsSVGElementInstanceOnchange(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onchange()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -252,8 +263,9 @@ JSValue jsSVGElementInstanceOnchange(ExecState* exec, const Identifier&, const P JSValue jsSVGElementInstanceOnclick(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onclick()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -263,8 +275,9 @@ JSValue jsSVGElementInstanceOnclick(ExecState* exec, const Identifier&, const Pr JSValue jsSVGElementInstanceOncontextmenu(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oncontextmenu()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -274,8 +287,9 @@ JSValue jsSVGElementInstanceOncontextmenu(ExecState* exec, const Identifier&, co JSValue jsSVGElementInstanceOndblclick(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondblclick()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -285,8 +299,9 @@ JSValue jsSVGElementInstanceOndblclick(ExecState* exec, const Identifier&, const JSValue jsSVGElementInstanceOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onerror()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -296,8 +311,9 @@ JSValue jsSVGElementInstanceOnerror(ExecState* exec, const Identifier&, const Pr JSValue jsSVGElementInstanceOnfocus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onfocus()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -307,8 +323,9 @@ JSValue jsSVGElementInstanceOnfocus(ExecState* exec, const Identifier&, const Pr JSValue jsSVGElementInstanceOninput(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oninput()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -318,8 +335,9 @@ JSValue jsSVGElementInstanceOninput(ExecState* exec, const Identifier&, const Pr JSValue jsSVGElementInstanceOnkeydown(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onkeydown()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -329,8 +347,9 @@ JSValue jsSVGElementInstanceOnkeydown(ExecState* exec, const Identifier&, const JSValue jsSVGElementInstanceOnkeypress(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onkeypress()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -340,8 +359,9 @@ JSValue jsSVGElementInstanceOnkeypress(ExecState* exec, const Identifier&, const JSValue jsSVGElementInstanceOnkeyup(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onkeyup()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -351,8 +371,9 @@ JSValue jsSVGElementInstanceOnkeyup(ExecState* exec, const Identifier&, const Pr JSValue jsSVGElementInstanceOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onload()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -362,8 +383,9 @@ JSValue jsSVGElementInstanceOnload(ExecState* exec, const Identifier&, const Pro JSValue jsSVGElementInstanceOnmousedown(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmousedown()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -373,8 +395,9 @@ JSValue jsSVGElementInstanceOnmousedown(ExecState* exec, const Identifier&, cons JSValue jsSVGElementInstanceOnmousemove(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmousemove()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -384,8 +407,9 @@ JSValue jsSVGElementInstanceOnmousemove(ExecState* exec, const Identifier&, cons JSValue jsSVGElementInstanceOnmouseout(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmouseout()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -395,8 +419,9 @@ JSValue jsSVGElementInstanceOnmouseout(ExecState* exec, const Identifier&, const JSValue jsSVGElementInstanceOnmouseover(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmouseover()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -406,8 +431,9 @@ JSValue jsSVGElementInstanceOnmouseover(ExecState* exec, const Identifier&, cons JSValue jsSVGElementInstanceOnmouseup(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmouseup()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -417,8 +443,9 @@ JSValue jsSVGElementInstanceOnmouseup(ExecState* exec, const Identifier&, const JSValue jsSVGElementInstanceOnmousewheel(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmousewheel()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -428,8 +455,9 @@ JSValue jsSVGElementInstanceOnmousewheel(ExecState* exec, const Identifier&, con JSValue jsSVGElementInstanceOnbeforecut(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onbeforecut()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -439,8 +467,9 @@ JSValue jsSVGElementInstanceOnbeforecut(ExecState* exec, const Identifier&, cons JSValue jsSVGElementInstanceOncut(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oncut()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -450,8 +479,9 @@ JSValue jsSVGElementInstanceOncut(ExecState* exec, const Identifier&, const Prop JSValue jsSVGElementInstanceOnbeforecopy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onbeforecopy()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -461,8 +491,9 @@ JSValue jsSVGElementInstanceOnbeforecopy(ExecState* exec, const Identifier&, con JSValue jsSVGElementInstanceOncopy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->oncopy()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -472,8 +503,9 @@ JSValue jsSVGElementInstanceOncopy(ExecState* exec, const Identifier&, const Pro JSValue jsSVGElementInstanceOnbeforepaste(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onbeforepaste()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -483,8 +515,9 @@ JSValue jsSVGElementInstanceOnbeforepaste(ExecState* exec, const Identifier&, co JSValue jsSVGElementInstanceOnpaste(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onpaste()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -494,8 +527,9 @@ JSValue jsSVGElementInstanceOnpaste(ExecState* exec, const Identifier&, const Pr JSValue jsSVGElementInstanceOndragenter(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragenter()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -505,8 +539,9 @@ JSValue jsSVGElementInstanceOndragenter(ExecState* exec, const Identifier&, cons JSValue jsSVGElementInstanceOndragover(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragover()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -516,8 +551,9 @@ JSValue jsSVGElementInstanceOndragover(ExecState* exec, const Identifier&, const JSValue jsSVGElementInstanceOndragleave(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragleave()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -527,8 +563,9 @@ JSValue jsSVGElementInstanceOndragleave(ExecState* exec, const Identifier&, cons JSValue jsSVGElementInstanceOndrop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondrop()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -538,8 +575,9 @@ JSValue jsSVGElementInstanceOndrop(ExecState* exec, const Identifier&, const Pro JSValue jsSVGElementInstanceOndragstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragstart()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -549,8 +587,9 @@ JSValue jsSVGElementInstanceOndragstart(ExecState* exec, const Identifier&, cons JSValue jsSVGElementInstanceOndrag(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondrag()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -560,8 +599,9 @@ JSValue jsSVGElementInstanceOndrag(ExecState* exec, const Identifier&, const Pro JSValue jsSVGElementInstanceOndragend(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->ondragend()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -571,8 +611,9 @@ JSValue jsSVGElementInstanceOndragend(ExecState* exec, const Identifier&, const JSValue jsSVGElementInstanceOnreset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onreset()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -582,8 +623,9 @@ JSValue jsSVGElementInstanceOnreset(ExecState* exec, const Identifier&, const Pr JSValue jsSVGElementInstanceOnresize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onresize()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -593,8 +635,9 @@ JSValue jsSVGElementInstanceOnresize(ExecState* exec, const Identifier&, const P JSValue jsSVGElementInstanceOnscroll(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onscroll()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -604,8 +647,9 @@ JSValue jsSVGElementInstanceOnscroll(ExecState* exec, const Identifier&, const P JSValue jsSVGElementInstanceOnsearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onsearch()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -615,8 +659,9 @@ JSValue jsSVGElementInstanceOnsearch(ExecState* exec, const Identifier&, const P JSValue jsSVGElementInstanceOnselect(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onselect()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -626,8 +671,9 @@ JSValue jsSVGElementInstanceOnselect(ExecState* exec, const Identifier&, const P JSValue jsSVGElementInstanceOnselectstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onselectstart()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -637,8 +683,9 @@ JSValue jsSVGElementInstanceOnselectstart(ExecState* exec, const Identifier&, co JSValue jsSVGElementInstanceOnsubmit(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onsubmit()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -648,8 +695,9 @@ JSValue jsSVGElementInstanceOnsubmit(ExecState* exec, const Identifier&, const P JSValue jsSVGElementInstanceOnunload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstance* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstance* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstance* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onunload()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.h b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.h index 59a9c10a6..2922b42d1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstance.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGElementInstance; -class JSSVGElementInstance : public DOMObject { - typedef DOMObject Base; +class JSSVGElementInstance : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSSVGElementInstance(PassRefPtr, PassRefPtr); + JSSVGElementInstance(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSSVGElementInstance(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -62,7 +63,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGElementInstance*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGElementInstance*); SVGElementInstance* toSVGElementInstance(JSC::JSValue); class JSSVGElementInstancePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.cpp index 312345f67..1f965aab0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.cpp @@ -81,8 +81,8 @@ bool JSSVGElementInstanceListPrototype::getOwnPropertySlot(ExecState* exec, cons const ClassInfo JSSVGElementInstanceList::s_info = { "SVGElementInstanceList", 0, &JSSVGElementInstanceListTable, 0 }; -JSSVGElementInstanceList::JSSVGElementInstanceList(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSSVGElementInstanceList::JSSVGElementInstanceList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -104,8 +104,9 @@ bool JSSVGElementInstanceList::getOwnPropertySlot(ExecState* exec, const Identif JSValue jsSVGElementInstanceListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGElementInstanceList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGElementInstanceList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGElementInstanceList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } @@ -119,13 +120,13 @@ JSValue JSC_HOST_CALL jsSVGElementInstanceListPrototypeFunctionItem(ExecState* e unsigned index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->item(index))); return result; } -JSC::JSValue toJS(JSC::ExecState* exec, SVGElementInstanceList* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGElementInstanceList* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } SVGElementInstanceList* toSVGElementInstanceList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.h index 956d44a5b..fa9f8535d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElementInstanceList.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGElementInstanceList; -class JSSVGElementInstanceList : public DOMObject { - typedef DOMObject Base; +class JSSVGElementInstanceList : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSSVGElementInstanceList(PassRefPtr, PassRefPtr); + JSSVGElementInstanceList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSSVGElementInstanceList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -53,7 +54,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGElementInstanceList*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGElementInstanceList*); SVGElementInstanceList* toSVGElementInstanceList(JSC::JSValue); class JSSVGElementInstanceListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElementWrapperFactory.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGElementWrapperFactory.cpp index 657983330..3b44712b5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElementWrapperFactory.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElementWrapperFactory.cpp @@ -143,249 +143,249 @@ namespace WebCore { using namespace SVGNames; -typedef JSNode* (*CreateSVGElementWrapperFunction)(ExecState*, PassRefPtr); +typedef JSNode* (*CreateSVGElementWrapperFunction)(ExecState*, JSDOMGlobalObject*, PassRefPtr); -static JSNode* createSVGAElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGAElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGAElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGAElement, element.get()); } -static JSNode* createSVGAltGlyphElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGAltGlyphElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGAltGlyphElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGAltGlyphElement, element.get()); } -static JSNode* createSVGAnimateElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGAnimateElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGAnimateElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGAnimateElement, element.get()); } -static JSNode* createSVGAnimateColorElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGAnimateColorElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGAnimateColorElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGAnimateColorElement, element.get()); } -static JSNode* createSVGAnimateTransformElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGAnimateTransformElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGAnimateTransformElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGAnimateTransformElement, element.get()); } -static JSNode* createSVGCircleElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGCircleElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGCircleElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGCircleElement, element.get()); } -static JSNode* createSVGClipPathElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGClipPathElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGClipPathElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGClipPathElement, element.get()); } -static JSNode* createSVGCursorElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGCursorElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGCursorElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGCursorElement, element.get()); } -static JSNode* createSVGDefinitionSrcElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGDefinitionSrcElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGDefinitionSrcElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGDefinitionSrcElement, element.get()); } -static JSNode* createSVGDefsElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGDefsElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGDefsElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGDefsElement, element.get()); } -static JSNode* createSVGDescElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGDescElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGDescElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGDescElement, element.get()); } -static JSNode* createSVGEllipseElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGEllipseElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGEllipseElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGEllipseElement, element.get()); } -static JSNode* createSVGFontElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGFontElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGFontElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGFontElement, element.get()); } -static JSNode* createSVGFontFaceElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGFontFaceElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGFontFaceElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGFontFaceElement, element.get()); } -static JSNode* createSVGFontFaceFormatElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGFontFaceFormatElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGFontFaceFormatElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGFontFaceFormatElement, element.get()); } -static JSNode* createSVGFontFaceNameElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGFontFaceNameElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGFontFaceNameElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGFontFaceNameElement, element.get()); } -static JSNode* createSVGFontFaceSrcElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGFontFaceSrcElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGFontFaceSrcElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGFontFaceSrcElement, element.get()); } -static JSNode* createSVGFontFaceUriElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGFontFaceUriElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGFontFaceUriElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGFontFaceUriElement, element.get()); } -static JSNode* createSVGForeignObjectElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGForeignObjectElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGForeignObjectElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGForeignObjectElement, element.get()); } -static JSNode* createSVGGElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGGElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGGElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGGElement, element.get()); } -static JSNode* createSVGGlyphElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGGlyphElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGGlyphElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGGlyphElement, element.get()); } -static JSNode* createSVGImageElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGImageElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGImageElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGImageElement, element.get()); } -static JSNode* createSVGLineElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGLineElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGLineElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGLineElement, element.get()); } -static JSNode* createSVGLinearGradientElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGLinearGradientElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGLinearGradientElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGLinearGradientElement, element.get()); } -static JSNode* createSVGMarkerElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGMarkerElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGMarkerElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGMarkerElement, element.get()); } -static JSNode* createSVGMaskElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGMaskElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGMaskElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGMaskElement, element.get()); } -static JSNode* createSVGMetadataElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGMetadataElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGMetadataElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGMetadataElement, element.get()); } -static JSNode* createSVGMissingGlyphElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGMissingGlyphElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGMissingGlyphElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGMissingGlyphElement, element.get()); } -static JSNode* createSVGPathElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGPathElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGPathElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGPathElement, element.get()); } -static JSNode* createSVGPatternElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGPatternElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGPatternElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGPatternElement, element.get()); } -static JSNode* createSVGPolygonElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGPolygonElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGPolygonElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGPolygonElement, element.get()); } -static JSNode* createSVGPolylineElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGPolylineElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGPolylineElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGPolylineElement, element.get()); } -static JSNode* createSVGRadialGradientElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGRadialGradientElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGRadialGradientElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGRadialGradientElement, element.get()); } -static JSNode* createSVGRectElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGRectElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGRectElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGRectElement, element.get()); } -static JSNode* createSVGScriptElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGScriptElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGScriptElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGScriptElement, element.get()); } -static JSNode* createSVGSetElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGSetElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGSetElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGSetElement, element.get()); } -static JSNode* createSVGStopElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGStopElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGStopElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGStopElement, element.get()); } -static JSNode* createSVGStyleElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGStyleElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGStyleElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGStyleElement, element.get()); } -static JSNode* createSVGSVGElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGSVGElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGSVGElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGSVGElement, element.get()); } -static JSNode* createSVGSwitchElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGSwitchElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGSwitchElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGSwitchElement, element.get()); } -static JSNode* createSVGSymbolElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGSymbolElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGSymbolElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGSymbolElement, element.get()); } -static JSNode* createSVGTextElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGTextElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGTextElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGTextElement, element.get()); } -static JSNode* createSVGTextPathElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGTextPathElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGTextPathElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGTextPathElement, element.get()); } -static JSNode* createSVGTitleElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGTitleElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGTitleElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGTitleElement, element.get()); } -static JSNode* createSVGTRefElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGTRefElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGTRefElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGTRefElement, element.get()); } -static JSNode* createSVGTSpanElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGTSpanElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGTSpanElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGTSpanElement, element.get()); } -static JSNode* createSVGUseElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGUseElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGUseElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGUseElement, element.get()); } -static JSNode* createSVGViewElementWrapper(ExecState* exec, PassRefPtr element) +static JSNode* createSVGViewElementWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { - return CREATE_DOM_NODE_WRAPPER(exec, SVGViewElement, element.get()); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGViewElement, element.get()); } -JSNode* createJSSVGWrapper(ExecState* exec, PassRefPtr element) +JSNode* createJSSVGWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr element) { typedef HashMap FunctionMap; DEFINE_STATIC_LOCAL(FunctionMap, map, ()); @@ -441,8 +441,8 @@ JSNode* createJSSVGWrapper(ExecState* exec, PassRefPtr element) } CreateSVGElementWrapperFunction createWrapperFunction = map.get(element->localName().impl()); if (createWrapperFunction) - return createWrapperFunction(exec, element); - return CREATE_DOM_NODE_WRAPPER(exec, SVGElement, element.get()); + return createWrapperFunction(exec, globalObject, element); + return CREATE_DOM_NODE_WRAPPER(exec, globalObject, SVGElement, element.get()); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGElementWrapperFactory.h b/src/3rdparty/webkit/WebCore/generated/JSSVGElementWrapperFactory.h index 933906b2a..843ba7e8b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGElementWrapperFactory.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGElementWrapperFactory.h @@ -40,9 +40,10 @@ namespace JSC { namespace WebCore { class JSNode; + class JSDOMGlobalObject; class SVGElement; - JSNode* createJSSVGWrapper(JSC::ExecState*, PassRefPtr); + JSNode* createJSSVGWrapper(JSC::ExecState*, JSDOMGlobalObject*, PassRefPtr); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.cpp index 73d7cfacd..0297726af 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.cpp @@ -114,8 +114,8 @@ bool JSSVGEllipseElementPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSSVGEllipseElement::s_info = { "SVGEllipseElement", &JSSVGElement::s_info, &JSSVGEllipseElementTable, 0 }; -JSSVGEllipseElement::JSSVGEllipseElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGEllipseElement::JSSVGEllipseElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -131,114 +131,129 @@ bool JSSVGEllipseElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGEllipseElementCx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGEllipseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->cxAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGEllipseElementCy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGEllipseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->cyAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGEllipseElementRx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGEllipseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->rxAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGEllipseElementRy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGEllipseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->ryAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGEllipseElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGEllipseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGEllipseElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGEllipseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGEllipseElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGEllipseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGEllipseElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGEllipseElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGEllipseElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGEllipseElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGEllipseElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGEllipseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGEllipseElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGEllipseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGEllipseElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGEllipseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGEllipseElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGEllipseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGEllipseElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGEllipseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGEllipseElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGEllipseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGEllipseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGEllipseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } void JSSVGEllipseElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -282,7 +297,7 @@ JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetPresentationAttribu const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -295,7 +310,7 @@ JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetBBox(ExecState* exe SVGEllipseElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -308,7 +323,7 @@ JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetCTM(ExecState* exec SVGEllipseElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -321,7 +336,7 @@ JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetScreenCTM(ExecState SVGEllipseElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -336,7 +351,7 @@ JSValue JSC_HOST_CALL jsSVGEllipseElementPrototypeFunctionGetTransformToElement( SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.h index 2ccb26037..37d23e382 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGEllipseElement.h @@ -33,7 +33,7 @@ class SVGEllipseElement; class JSSVGEllipseElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGEllipseElement(PassRefPtr, PassRefPtr); + JSSVGEllipseElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGException.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGException.cpp index 7860c9df5..bb8942ddc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGException.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGException.cpp @@ -72,12 +72,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGExceptionConstructorTable = { 9, 7, JSSVGExceptionConstructorTableValues, 0 }; #endif -class JSSVGExceptionConstructor : public DOMObject { +class JSSVGExceptionConstructor : public DOMConstructorObject { public: - JSSVGExceptionConstructor(ExecState* exec) - : DOMObject(JSSVGExceptionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGExceptionConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGExceptionConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGExceptionPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGExceptionPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -128,9 +128,8 @@ bool JSSVGExceptionPrototype::getOwnPropertySlot(ExecState* exec, const Identifi const ClassInfo JSSVGException::s_info = { "SVGException", 0, &JSSVGExceptionTable, 0 }; -JSSVGException::JSSVGException(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGException::JSSVGException(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -152,32 +151,36 @@ bool JSSVGException::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsSVGExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGException* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->code()); } JSValue jsSVGExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGException* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsSVGExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGException* imp = static_cast(castedThis->impl()); return jsString(exec, imp->message()); } JSValue jsSVGExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + UNUSED_PARAM(slot); + return JSSVGException::getConstructor(exec, deprecatedGlobalObjectForPrototype(exec)); } -JSValue JSSVGException::getConstructor(ExecState* exec) +JSValue JSSVGException::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -210,9 +213,9 @@ JSValue jsSVGExceptionSVG_MATRIX_NOT_INVERTABLE(ExecState* exec, const Identifie return jsNumber(exec, static_cast(2)); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGException* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGException* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGException* toSVGException(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGException.h b/src/3rdparty/webkit/WebCore/generated/JSSVGException.h index e8fb53dca..15b893d35 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGException.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGException.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGException; -class JSSVGException : public DOMObject { - typedef DOMObject Base; +class JSSVGException : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGException(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGException(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGException(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,16 +48,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); SVGException* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGException*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGException*, SVGElement* context); SVGException* toSVGException(JSC::JSValue); class JSSVGExceptionPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.cpp index a35300633..a3ecf1c17 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.cpp @@ -87,12 +87,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGFEBlendElementConstructorTable = { 16, 15, JSSVGFEBlendElementConstructorTableValues, 0 }; #endif -class JSSVGFEBlendElementConstructor : public DOMObject { +class JSSVGFEBlendElementConstructor : public DOMConstructorObject { public: - JSSVGFEBlendElementConstructor(ExecState* exec) - : DOMObject(JSSVGFEBlendElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGFEBlendElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGFEBlendElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGFEBlendElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGFEBlendElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -146,8 +146,8 @@ bool JSSVGFEBlendElementPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSSVGFEBlendElement::s_info = { "SVGFEBlendElement", &JSSVGElement::s_info, &JSSVGFEBlendElementTable, 0 }; -JSSVGFEBlendElement::JSSVGFEBlendElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFEBlendElement::JSSVGFEBlendElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -163,90 +163,101 @@ bool JSSVGFEBlendElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGFEBlendElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEBlendElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEBlendElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEBlendElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEBlendElementIn2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEBlendElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEBlendElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEBlendElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in2Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEBlendElementMode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEBlendElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEBlendElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEBlendElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->modeAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEBlendElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEBlendElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEBlendElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEBlendElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEBlendElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEBlendElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEBlendElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEBlendElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEBlendElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEBlendElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEBlendElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEBlendElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEBlendElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEBlendElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEBlendElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEBlendElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEBlendElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEBlendElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEBlendElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEBlendElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEBlendElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEBlendElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEBlendElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEBlendElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEBlendElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEBlendElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEBlendElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFEBlendElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGFEBlendElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSSVGFEBlendElement* domObject = static_cast(asObject(slot.slotBase())); + return JSSVGFEBlendElement::getConstructor(exec, domObject->globalObject()); } -JSValue JSSVGFEBlendElement::getConstructor(ExecState* exec) +JSValue JSSVGFEBlendElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGFEBlendElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -259,7 +270,7 @@ JSValue JSC_HOST_CALL jsSVGFEBlendElementPrototypeFunctionGetPresentationAttribu const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.h index 34750a9e7..88033bb3b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEBlendElement.h @@ -33,7 +33,7 @@ class SVGFEBlendElement; class JSSVGFEBlendElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFEBlendElement(PassRefPtr, PassRefPtr); + JSSVGFEBlendElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.cpp index d87538656..6aa69fc73 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.cpp @@ -87,12 +87,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGFEColorMatrixElementConstructorTable = { 17, 15, JSSVGFEColorMatrixElementConstructorTableValues, 0 }; #endif -class JSSVGFEColorMatrixElementConstructor : public DOMObject { +class JSSVGFEColorMatrixElementConstructor : public DOMConstructorObject { public: - JSSVGFEColorMatrixElementConstructor(ExecState* exec) - : DOMObject(JSSVGFEColorMatrixElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGFEColorMatrixElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGFEColorMatrixElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGFEColorMatrixElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGFEColorMatrixElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -145,8 +145,8 @@ bool JSSVGFEColorMatrixElementPrototype::getOwnPropertySlot(ExecState* exec, con const ClassInfo JSSVGFEColorMatrixElement::s_info = { "SVGFEColorMatrixElement", &JSSVGElement::s_info, &JSSVGFEColorMatrixElementTable, 0 }; -JSSVGFEColorMatrixElement::JSSVGFEColorMatrixElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFEColorMatrixElement::JSSVGFEColorMatrixElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -162,90 +162,101 @@ bool JSSVGFEColorMatrixElement::getOwnPropertySlot(ExecState* exec, const Identi JSValue jsSVGFEColorMatrixElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEColorMatrixElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEColorMatrixElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEColorMatrixElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEColorMatrixElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEColorMatrixElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEColorMatrixElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEColorMatrixElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->typeAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEColorMatrixElementValues(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEColorMatrixElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEColorMatrixElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEColorMatrixElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->valuesAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEColorMatrixElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEColorMatrixElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEColorMatrixElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEColorMatrixElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEColorMatrixElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEColorMatrixElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEColorMatrixElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEColorMatrixElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEColorMatrixElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEColorMatrixElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEColorMatrixElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEColorMatrixElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEColorMatrixElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEColorMatrixElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEColorMatrixElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEColorMatrixElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEColorMatrixElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEColorMatrixElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEColorMatrixElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEColorMatrixElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEColorMatrixElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEColorMatrixElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEColorMatrixElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEColorMatrixElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEColorMatrixElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEColorMatrixElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEColorMatrixElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFEColorMatrixElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGFEColorMatrixElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSSVGFEColorMatrixElement* domObject = static_cast(asObject(slot.slotBase())); + return JSSVGFEColorMatrixElement::getConstructor(exec, domObject->globalObject()); } -JSValue JSSVGFEColorMatrixElement::getConstructor(ExecState* exec) +JSValue JSSVGFEColorMatrixElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGFEColorMatrixElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -258,7 +269,7 @@ JSValue JSC_HOST_CALL jsSVGFEColorMatrixElementPrototypeFunctionGetPresentationA const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.h index de9ef2ff1..3a6aa6716 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEColorMatrixElement.h @@ -33,7 +33,7 @@ class SVGFEColorMatrixElement; class JSSVGFEColorMatrixElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFEColorMatrixElement(PassRefPtr, PassRefPtr); + JSSVGFEColorMatrixElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.cpp index c5238a8bd..a0be50127 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.cpp @@ -92,8 +92,8 @@ bool JSSVGFEComponentTransferElementPrototype::getOwnPropertySlot(ExecState* exe const ClassInfo JSSVGFEComponentTransferElement::s_info = { "SVGFEComponentTransferElement", &JSSVGElement::s_info, &JSSVGFEComponentTransferElementTable, 0 }; -JSSVGFEComponentTransferElement::JSSVGFEComponentTransferElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFEComponentTransferElement::JSSVGFEComponentTransferElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -109,65 +109,73 @@ bool JSSVGFEComponentTransferElement::getOwnPropertySlot(ExecState* exec, const JSValue jsSVGFEComponentTransferElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEComponentTransferElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEComponentTransferElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEComponentTransferElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEComponentTransferElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEComponentTransferElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEComponentTransferElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEComponentTransferElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEComponentTransferElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEComponentTransferElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEComponentTransferElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEComponentTransferElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEComponentTransferElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEComponentTransferElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEComponentTransferElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEComponentTransferElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEComponentTransferElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEComponentTransferElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEComponentTransferElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEComponentTransferElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEComponentTransferElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEComponentTransferElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEComponentTransferElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEComponentTransferElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEComponentTransferElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEComponentTransferElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEComponentTransferElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEComponentTransferElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEComponentTransferElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEComponentTransferElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEComponentTransferElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFEComponentTransferElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue JSC_HOST_CALL jsSVGFEComponentTransferElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -180,7 +188,7 @@ JSValue JSC_HOST_CALL jsSVGFEComponentTransferElementPrototypeFunctionGetPresent const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.h index 803a32b12..c50b12be5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEComponentTransferElement.h @@ -33,7 +33,7 @@ class SVGFEComponentTransferElement; class JSSVGFEComponentTransferElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFEComponentTransferElement(PassRefPtr, PassRefPtr); + JSSVGFEComponentTransferElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.cpp index 8edb5f07a..42fe70a41 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.cpp @@ -93,12 +93,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGFECompositeElementConstructorTable = { 16, 15, JSSVGFECompositeElementConstructorTableValues, 0 }; #endif -class JSSVGFECompositeElementConstructor : public DOMObject { +class JSSVGFECompositeElementConstructor : public DOMConstructorObject { public: - JSSVGFECompositeElementConstructor(ExecState* exec) - : DOMObject(JSSVGFECompositeElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGFECompositeElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGFECompositeElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGFECompositeElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGFECompositeElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -153,8 +153,8 @@ bool JSSVGFECompositeElementPrototype::getOwnPropertySlot(ExecState* exec, const const ClassInfo JSSVGFECompositeElement::s_info = { "SVGFECompositeElement", &JSSVGElement::s_info, &JSSVGFECompositeElementTable, 0 }; -JSSVGFECompositeElement::JSSVGFECompositeElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFECompositeElement::JSSVGFECompositeElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -170,122 +170,137 @@ bool JSSVGFECompositeElement::getOwnPropertySlot(ExecState* exec, const Identifi JSValue jsSVGFECompositeElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFECompositeElementIn2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in2Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFECompositeElement_operator(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->_operatorAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFECompositeElementK1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->k1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFECompositeElementK2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->k2Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFECompositeElementK3(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->k3Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFECompositeElementK4(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->k4Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFECompositeElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFECompositeElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFECompositeElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFECompositeElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFECompositeElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFECompositeElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFECompositeElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFECompositeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFECompositeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFECompositeElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGFECompositeElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSSVGFECompositeElement* domObject = static_cast(asObject(slot.slotBase())); + return JSSVGFECompositeElement::getConstructor(exec, domObject->globalObject()); } -JSValue JSSVGFECompositeElement::getConstructor(ExecState* exec) +JSValue JSSVGFECompositeElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGFECompositeElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -298,7 +313,7 @@ JSValue JSC_HOST_CALL jsSVGFECompositeElementPrototypeFunctionGetPresentationAtt const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.h index b2876c39d..826db95f1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFECompositeElement.h @@ -33,7 +33,7 @@ class SVGFECompositeElement; class JSSVGFECompositeElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFECompositeElement(PassRefPtr, PassRefPtr); + JSSVGFECompositeElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.cpp index 0fffc6ecd..01492c45d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.cpp @@ -97,8 +97,8 @@ bool JSSVGFEDiffuseLightingElementPrototype::getOwnPropertySlot(ExecState* exec, const ClassInfo JSSVGFEDiffuseLightingElement::s_info = { "SVGFEDiffuseLightingElement", &JSSVGElement::s_info, &JSSVGFEDiffuseLightingElementTable, 0 }; -JSSVGFEDiffuseLightingElement::JSSVGFEDiffuseLightingElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFEDiffuseLightingElement::JSSVGFEDiffuseLightingElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -114,97 +114,109 @@ bool JSSVGFEDiffuseLightingElement::getOwnPropertySlot(ExecState* exec, const Id JSValue jsSVGFEDiffuseLightingElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDiffuseLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDiffuseLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDiffuseLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDiffuseLightingElementSurfaceScale(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDiffuseLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDiffuseLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDiffuseLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->surfaceScaleAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDiffuseLightingElementDiffuseConstant(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDiffuseLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDiffuseLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDiffuseLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->diffuseConstantAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDiffuseLightingElementKernelUnitLengthX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDiffuseLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDiffuseLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDiffuseLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->kernelUnitLengthXAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDiffuseLightingElementKernelUnitLengthY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDiffuseLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDiffuseLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDiffuseLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->kernelUnitLengthYAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDiffuseLightingElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDiffuseLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDiffuseLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDiffuseLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDiffuseLightingElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDiffuseLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDiffuseLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDiffuseLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDiffuseLightingElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDiffuseLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDiffuseLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDiffuseLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDiffuseLightingElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDiffuseLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDiffuseLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDiffuseLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDiffuseLightingElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDiffuseLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDiffuseLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDiffuseLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDiffuseLightingElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDiffuseLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDiffuseLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDiffuseLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDiffuseLightingElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDiffuseLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDiffuseLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFEDiffuseLightingElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue JSC_HOST_CALL jsSVGFEDiffuseLightingElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -217,7 +229,7 @@ JSValue JSC_HOST_CALL jsSVGFEDiffuseLightingElementPrototypeFunctionGetPresentat const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.h index 96bb14d1e..26e6e9126 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDiffuseLightingElement.h @@ -33,7 +33,7 @@ class SVGFEDiffuseLightingElement; class JSSVGFEDiffuseLightingElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFEDiffuseLightingElement(PassRefPtr, PassRefPtr); + JSSVGFEDiffuseLightingElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.cpp index 0e8e342b3..a3441e482 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.cpp @@ -89,12 +89,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGFEDisplacementMapElementConstructorTab { 16, 15, JSSVGFEDisplacementMapElementConstructorTableValues, 0 }; #endif -class JSSVGFEDisplacementMapElementConstructor : public DOMObject { +class JSSVGFEDisplacementMapElementConstructor : public DOMConstructorObject { public: - JSSVGFEDisplacementMapElementConstructor(ExecState* exec) - : DOMObject(JSSVGFEDisplacementMapElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGFEDisplacementMapElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGFEDisplacementMapElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGFEDisplacementMapElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGFEDisplacementMapElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -147,8 +147,8 @@ bool JSSVGFEDisplacementMapElementPrototype::getOwnPropertySlot(ExecState* exec, const ClassInfo JSSVGFEDisplacementMapElement::s_info = { "SVGFEDisplacementMapElement", &JSSVGElement::s_info, &JSSVGFEDisplacementMapElementTable, 0 }; -JSSVGFEDisplacementMapElement::JSSVGFEDisplacementMapElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFEDisplacementMapElement::JSSVGFEDisplacementMapElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -164,106 +164,119 @@ bool JSSVGFEDisplacementMapElement::getOwnPropertySlot(ExecState* exec, const Id JSValue jsSVGFEDisplacementMapElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDisplacementMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDisplacementMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDisplacementMapElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDisplacementMapElementIn2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDisplacementMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDisplacementMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDisplacementMapElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in2Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDisplacementMapElementScale(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDisplacementMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDisplacementMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDisplacementMapElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->scaleAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDisplacementMapElementXChannelSelector(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDisplacementMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDisplacementMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDisplacementMapElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xChannelSelectorAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDisplacementMapElementYChannelSelector(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDisplacementMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDisplacementMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDisplacementMapElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yChannelSelectorAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDisplacementMapElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDisplacementMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDisplacementMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDisplacementMapElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDisplacementMapElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDisplacementMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDisplacementMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDisplacementMapElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDisplacementMapElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDisplacementMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDisplacementMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDisplacementMapElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDisplacementMapElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDisplacementMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDisplacementMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDisplacementMapElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDisplacementMapElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDisplacementMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDisplacementMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDisplacementMapElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDisplacementMapElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDisplacementMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDisplacementMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDisplacementMapElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDisplacementMapElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDisplacementMapElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDisplacementMapElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFEDisplacementMapElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGFEDisplacementMapElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSSVGFEDisplacementMapElement* domObject = static_cast(asObject(slot.slotBase())); + return JSSVGFEDisplacementMapElement::getConstructor(exec, domObject->globalObject()); } -JSValue JSSVGFEDisplacementMapElement::getConstructor(ExecState* exec) +JSValue JSSVGFEDisplacementMapElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGFEDisplacementMapElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -276,7 +289,7 @@ JSValue JSC_HOST_CALL jsSVGFEDisplacementMapElementPrototypeFunctionGetPresentat const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.h index 93c9fe5a7..3c7db0fd6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDisplacementMapElement.h @@ -33,7 +33,7 @@ class SVGFEDisplacementMapElement; class JSSVGFEDisplacementMapElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFEDisplacementMapElement(PassRefPtr, PassRefPtr); + JSSVGFEDisplacementMapElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.cpp index 63ece0d88..f494d914c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.cpp @@ -73,8 +73,8 @@ JSObject* JSSVGFEDistantLightElementPrototype::self(ExecState* exec, JSGlobalObj const ClassInfo JSSVGFEDistantLightElement::s_info = { "SVGFEDistantLightElement", &JSSVGElement::s_info, &JSSVGFEDistantLightElementTable, 0 }; -JSSVGFEDistantLightElement::JSSVGFEDistantLightElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFEDistantLightElement::JSSVGFEDistantLightElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -90,18 +90,20 @@ bool JSSVGFEDistantLightElement::getOwnPropertySlot(ExecState* exec, const Ident JSValue jsSVGFEDistantLightElementAzimuth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDistantLightElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDistantLightElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDistantLightElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->azimuthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEDistantLightElementElevation(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEDistantLightElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEDistantLightElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEDistantLightElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->elevationAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.h index 1a618716e..c6d46e7f3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEDistantLightElement.h @@ -33,7 +33,7 @@ class SVGFEDistantLightElement; class JSSVGFEDistantLightElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFEDistantLightElement(PassRefPtr, PassRefPtr); + JSSVGFEDistantLightElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.cpp index f80ec71e1..dc392f2de 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.cpp @@ -78,12 +78,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGFEFloodElementConstructorTable = { 1, 0, JSSVGFEFloodElementConstructorTableValues, 0 }; #endif -class JSSVGFEFloodElementConstructor : public DOMObject { +class JSSVGFEFloodElementConstructor : public DOMConstructorObject { public: - JSSVGFEFloodElementConstructor(ExecState* exec) - : DOMObject(JSSVGFEFloodElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGFEFloodElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGFEFloodElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGFEFloodElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGFEFloodElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -131,8 +131,8 @@ bool JSSVGFEFloodElementPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSSVGFEFloodElement::s_info = { "SVGFEFloodElement", &JSSVGElement::s_info, &JSSVGFEFloodElementTable, 0 }; -JSSVGFEFloodElement::JSSVGFEFloodElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFEFloodElement::JSSVGFEFloodElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -148,74 +148,83 @@ bool JSSVGFEFloodElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGFEFloodElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEFloodElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEFloodElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEFloodElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEFloodElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEFloodElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEFloodElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEFloodElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEFloodElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEFloodElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEFloodElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEFloodElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEFloodElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEFloodElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEFloodElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEFloodElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEFloodElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEFloodElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEFloodElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEFloodElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEFloodElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEFloodElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEFloodElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEFloodElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEFloodElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEFloodElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEFloodElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEFloodElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEFloodElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEFloodElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEFloodElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFEFloodElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGFEFloodElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSSVGFEFloodElement* domObject = static_cast(asObject(slot.slotBase())); + return JSSVGFEFloodElement::getConstructor(exec, domObject->globalObject()); } -JSValue JSSVGFEFloodElement::getConstructor(ExecState* exec) +JSValue JSSVGFEFloodElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGFEFloodElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -228,7 +237,7 @@ JSValue JSC_HOST_CALL jsSVGFEFloodElementPrototypeFunctionGetPresentationAttribu const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.h index fe54ca41c..46aa9a58c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFloodElement.h @@ -33,7 +33,7 @@ class SVGFEFloodElement; class JSSVGFEFloodElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFEFloodElement(PassRefPtr, PassRefPtr); + JSSVGFEFloodElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.cpp index a51799bf5..e91153ebd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGFEFuncAElementPrototype::self(ExecState* exec, JSGlobalObject* gl const ClassInfo JSSVGFEFuncAElement::s_info = { "SVGFEFuncAElement", &JSSVGComponentTransferFunctionElement::s_info, 0, 0 }; -JSSVGFEFuncAElement::JSSVGFEFuncAElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGComponentTransferFunctionElement(structure, impl) +JSSVGFEFuncAElement::JSSVGFEFuncAElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGComponentTransferFunctionElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.h index 1afcb5846..f7a84bebf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncAElement.h @@ -33,7 +33,7 @@ class SVGFEFuncAElement; class JSSVGFEFuncAElement : public JSSVGComponentTransferFunctionElement { typedef JSSVGComponentTransferFunctionElement Base; public: - JSSVGFEFuncAElement(PassRefPtr, PassRefPtr); + JSSVGFEFuncAElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.cpp index 710a37b47..5475952cb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGFEFuncBElementPrototype::self(ExecState* exec, JSGlobalObject* gl const ClassInfo JSSVGFEFuncBElement::s_info = { "SVGFEFuncBElement", &JSSVGComponentTransferFunctionElement::s_info, 0, 0 }; -JSSVGFEFuncBElement::JSSVGFEFuncBElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGComponentTransferFunctionElement(structure, impl) +JSSVGFEFuncBElement::JSSVGFEFuncBElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGComponentTransferFunctionElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.h index 5f4484706..b3acd3bee 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncBElement.h @@ -33,7 +33,7 @@ class SVGFEFuncBElement; class JSSVGFEFuncBElement : public JSSVGComponentTransferFunctionElement { typedef JSSVGComponentTransferFunctionElement Base; public: - JSSVGFEFuncBElement(PassRefPtr, PassRefPtr); + JSSVGFEFuncBElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.cpp index 82aa82930..afbf09118 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGFEFuncGElementPrototype::self(ExecState* exec, JSGlobalObject* gl const ClassInfo JSSVGFEFuncGElement::s_info = { "SVGFEFuncGElement", &JSSVGComponentTransferFunctionElement::s_info, 0, 0 }; -JSSVGFEFuncGElement::JSSVGFEFuncGElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGComponentTransferFunctionElement(structure, impl) +JSSVGFEFuncGElement::JSSVGFEFuncGElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGComponentTransferFunctionElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.h index 2a1425272..1b98d35d8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncGElement.h @@ -33,7 +33,7 @@ class SVGFEFuncGElement; class JSSVGFEFuncGElement : public JSSVGComponentTransferFunctionElement { typedef JSSVGComponentTransferFunctionElement Base; public: - JSSVGFEFuncGElement(PassRefPtr, PassRefPtr); + JSSVGFEFuncGElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.cpp index 26b8c93d9..a1df1b70d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGFEFuncRElementPrototype::self(ExecState* exec, JSGlobalObject* gl const ClassInfo JSSVGFEFuncRElement::s_info = { "SVGFEFuncRElement", &JSSVGComponentTransferFunctionElement::s_info, 0, 0 }; -JSSVGFEFuncRElement::JSSVGFEFuncRElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGComponentTransferFunctionElement(structure, impl) +JSSVGFEFuncRElement::JSSVGFEFuncRElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGComponentTransferFunctionElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.h index c6ba5140b..f427dfa69 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEFuncRElement.h @@ -33,7 +33,7 @@ class SVGFEFuncRElement; class JSSVGFEFuncRElement : public JSSVGComponentTransferFunctionElement { typedef JSSVGComponentTransferFunctionElement Base; public: - JSSVGFEFuncRElement(PassRefPtr, PassRefPtr); + JSSVGFEFuncRElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.cpp index f36edd6ff..e1ee3bd8d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.cpp @@ -96,8 +96,8 @@ bool JSSVGFEGaussianBlurElementPrototype::getOwnPropertySlot(ExecState* exec, co const ClassInfo JSSVGFEGaussianBlurElement::s_info = { "SVGFEGaussianBlurElement", &JSSVGElement::s_info, &JSSVGFEGaussianBlurElementTable, 0 }; -JSSVGFEGaussianBlurElement::JSSVGFEGaussianBlurElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFEGaussianBlurElement::JSSVGFEGaussianBlurElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -113,81 +113,91 @@ bool JSSVGFEGaussianBlurElement::getOwnPropertySlot(ExecState* exec, const Ident JSValue jsSVGFEGaussianBlurElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEGaussianBlurElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEGaussianBlurElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEGaussianBlurElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEGaussianBlurElementStdDeviationX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEGaussianBlurElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEGaussianBlurElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEGaussianBlurElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->stdDeviationXAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEGaussianBlurElementStdDeviationY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEGaussianBlurElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEGaussianBlurElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEGaussianBlurElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->stdDeviationYAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEGaussianBlurElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEGaussianBlurElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEGaussianBlurElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEGaussianBlurElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEGaussianBlurElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEGaussianBlurElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEGaussianBlurElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEGaussianBlurElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEGaussianBlurElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEGaussianBlurElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEGaussianBlurElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEGaussianBlurElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEGaussianBlurElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEGaussianBlurElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEGaussianBlurElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEGaussianBlurElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEGaussianBlurElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEGaussianBlurElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEGaussianBlurElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEGaussianBlurElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEGaussianBlurElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEGaussianBlurElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEGaussianBlurElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEGaussianBlurElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEGaussianBlurElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEGaussianBlurElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEGaussianBlurElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFEGaussianBlurElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue JSC_HOST_CALL jsSVGFEGaussianBlurElementPrototypeFunctionSetStdDeviation(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -214,7 +224,7 @@ JSValue JSC_HOST_CALL jsSVGFEGaussianBlurElementPrototypeFunctionGetPresentation const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.h index 2a5bcd344..dc02e5a9a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEGaussianBlurElement.h @@ -33,7 +33,7 @@ class SVGFEGaussianBlurElement; class JSSVGFEGaussianBlurElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFEGaussianBlurElement(PassRefPtr, PassRefPtr); + JSSVGFEGaussianBlurElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.cpp index d3f76f97c..9b2625068 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.cpp @@ -98,8 +98,8 @@ bool JSSVGFEImageElementPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSSVGFEImageElement::s_info = { "SVGFEImageElement", &JSSVGElement::s_info, &JSSVGFEImageElementTable, 0 }; -JSSVGFEImageElement::JSSVGFEImageElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFEImageElement::JSSVGFEImageElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -115,87 +115,98 @@ bool JSSVGFEImageElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGFEImageElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->hrefAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEImageElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEImageElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGFEImageElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEImageElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGFEImageElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEImageElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEImageElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEImageElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEImageElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEImageElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEImageElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEImageElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFEImageElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } void JSSVGFEImageElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -225,7 +236,7 @@ JSValue JSC_HOST_CALL jsSVGFEImageElementPrototypeFunctionGetPresentationAttribu const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.h index e07fb7d7b..8b2d03ee0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEImageElement.h @@ -33,7 +33,7 @@ class SVGFEImageElement; class JSSVGFEImageElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFEImageElement(PassRefPtr, PassRefPtr); + JSSVGFEImageElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.cpp index 4b18c0a84..0d512aa35 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.cpp @@ -91,8 +91,8 @@ bool JSSVGFEMergeElementPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSSVGFEMergeElement::s_info = { "SVGFEMergeElement", &JSSVGElement::s_info, &JSSVGFEMergeElementTable, 0 }; -JSSVGFEMergeElement::JSSVGFEMergeElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFEMergeElement::JSSVGFEMergeElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -108,57 +108,64 @@ bool JSSVGFEMergeElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGFEMergeElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEMergeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEMergeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEMergeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEMergeElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEMergeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEMergeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEMergeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEMergeElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEMergeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEMergeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEMergeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEMergeElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEMergeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEMergeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEMergeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEMergeElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEMergeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEMergeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEMergeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEMergeElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEMergeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEMergeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEMergeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEMergeElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEMergeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEMergeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFEMergeElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue JSC_HOST_CALL jsSVGFEMergeElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -171,7 +178,7 @@ JSValue JSC_HOST_CALL jsSVGFEMergeElementPrototypeFunctionGetPresentationAttribu const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.h index 1d8265d12..0d6471297 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeElement.h @@ -33,7 +33,7 @@ class SVGFEMergeElement; class JSSVGFEMergeElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFEMergeElement(PassRefPtr, PassRefPtr); + JSSVGFEMergeElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.cpp index 3ea7b7465..3358b9d19 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.cpp @@ -72,8 +72,8 @@ JSObject* JSSVGFEMergeNodeElementPrototype::self(ExecState* exec, JSGlobalObject const ClassInfo JSSVGFEMergeNodeElement::s_info = { "SVGFEMergeNodeElement", &JSSVGElement::s_info, &JSSVGFEMergeNodeElementTable, 0 }; -JSSVGFEMergeNodeElement::JSSVGFEMergeNodeElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFEMergeNodeElement::JSSVGFEMergeNodeElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -89,10 +89,11 @@ bool JSSVGFEMergeNodeElement::getOwnPropertySlot(ExecState* exec, const Identifi JSValue jsSVGFEMergeNodeElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEMergeNodeElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEMergeNodeElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEMergeNodeElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.h index d5d192e9e..da757a626 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEMergeNodeElement.h @@ -33,7 +33,7 @@ class SVGFEMergeNodeElement; class JSSVGFEMergeNodeElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFEMergeNodeElement(PassRefPtr, PassRefPtr); + JSSVGFEMergeNodeElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.cpp index 4ea1f8547..dc30cf81c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.cpp @@ -95,8 +95,8 @@ bool JSSVGFEOffsetElementPrototype::getOwnPropertySlot(ExecState* exec, const Id const ClassInfo JSSVGFEOffsetElement::s_info = { "SVGFEOffsetElement", &JSSVGElement::s_info, &JSSVGFEOffsetElementTable, 0 }; -JSSVGFEOffsetElement::JSSVGFEOffsetElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFEOffsetElement::JSSVGFEOffsetElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -112,81 +112,91 @@ bool JSSVGFEOffsetElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGFEOffsetElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEOffsetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEOffsetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEOffsetElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEOffsetElementDx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEOffsetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEOffsetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEOffsetElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->dxAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEOffsetElementDy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEOffsetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEOffsetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEOffsetElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->dyAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEOffsetElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEOffsetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEOffsetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEOffsetElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEOffsetElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEOffsetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEOffsetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEOffsetElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEOffsetElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEOffsetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEOffsetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEOffsetElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEOffsetElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEOffsetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEOffsetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEOffsetElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEOffsetElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEOffsetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEOffsetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEOffsetElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEOffsetElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEOffsetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEOffsetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEOffsetElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEOffsetElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEOffsetElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEOffsetElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFEOffsetElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue JSC_HOST_CALL jsSVGFEOffsetElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -199,7 +209,7 @@ JSValue JSC_HOST_CALL jsSVGFEOffsetElementPrototypeFunctionGetPresentationAttrib const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.h index 0af9898a2..7ee3daf84 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEOffsetElement.h @@ -33,7 +33,7 @@ class SVGFEOffsetElement; class JSSVGFEOffsetElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFEOffsetElement(PassRefPtr, PassRefPtr); + JSSVGFEOffsetElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.cpp index 6ca91ec74..724a55ddd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.cpp @@ -74,8 +74,8 @@ JSObject* JSSVGFEPointLightElementPrototype::self(ExecState* exec, JSGlobalObjec const ClassInfo JSSVGFEPointLightElement::s_info = { "SVGFEPointLightElement", &JSSVGElement::s_info, &JSSVGFEPointLightElementTable, 0 }; -JSSVGFEPointLightElement::JSSVGFEPointLightElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFEPointLightElement::JSSVGFEPointLightElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -91,26 +91,29 @@ bool JSSVGFEPointLightElement::getOwnPropertySlot(ExecState* exec, const Identif JSValue jsSVGFEPointLightElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEPointLightElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEPointLightElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEPointLightElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEPointLightElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEPointLightElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEPointLightElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEPointLightElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFEPointLightElementZ(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFEPointLightElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFEPointLightElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFEPointLightElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->zAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.h index bd3567565..cfbc2555b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFEPointLightElement.h @@ -33,7 +33,7 @@ class SVGFEPointLightElement; class JSSVGFEPointLightElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFEPointLightElement(PassRefPtr, PassRefPtr); + JSSVGFEPointLightElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.cpp index 4f8ac6c18..a481c18f5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.cpp @@ -96,8 +96,8 @@ bool JSSVGFESpecularLightingElementPrototype::getOwnPropertySlot(ExecState* exec const ClassInfo JSSVGFESpecularLightingElement::s_info = { "SVGFESpecularLightingElement", &JSSVGElement::s_info, &JSSVGFESpecularLightingElementTable, 0 }; -JSSVGFESpecularLightingElement::JSSVGFESpecularLightingElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFESpecularLightingElement::JSSVGFESpecularLightingElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -113,89 +113,100 @@ bool JSSVGFESpecularLightingElement::getOwnPropertySlot(ExecState* exec, const I JSValue jsSVGFESpecularLightingElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpecularLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpecularLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpecularLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpecularLightingElementSurfaceScale(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpecularLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpecularLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpecularLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->surfaceScaleAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpecularLightingElementSpecularConstant(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpecularLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpecularLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpecularLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->specularConstantAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpecularLightingElementSpecularExponent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpecularLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpecularLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpecularLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->specularExponentAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpecularLightingElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpecularLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpecularLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpecularLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpecularLightingElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpecularLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpecularLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpecularLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpecularLightingElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpecularLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpecularLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpecularLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpecularLightingElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpecularLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpecularLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpecularLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpecularLightingElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpecularLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpecularLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpecularLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpecularLightingElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpecularLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpecularLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpecularLightingElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpecularLightingElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpecularLightingElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpecularLightingElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFESpecularLightingElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue JSC_HOST_CALL jsSVGFESpecularLightingElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -208,7 +219,7 @@ JSValue JSC_HOST_CALL jsSVGFESpecularLightingElementPrototypeFunctionGetPresenta const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.h index 8085629c0..41d7575b5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpecularLightingElement.h @@ -33,7 +33,7 @@ class SVGFESpecularLightingElement; class JSSVGFESpecularLightingElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFESpecularLightingElement(PassRefPtr, PassRefPtr); + JSSVGFESpecularLightingElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.cpp index b5ae3d1e8..e6a70ea50 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.cpp @@ -79,8 +79,8 @@ JSObject* JSSVGFESpotLightElementPrototype::self(ExecState* exec, JSGlobalObject const ClassInfo JSSVGFESpotLightElement::s_info = { "SVGFESpotLightElement", &JSSVGElement::s_info, &JSSVGFESpotLightElementTable, 0 }; -JSSVGFESpotLightElement::JSSVGFESpotLightElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFESpotLightElement::JSSVGFESpotLightElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -96,66 +96,74 @@ bool JSSVGFESpotLightElement::getOwnPropertySlot(ExecState* exec, const Identifi JSValue jsSVGFESpotLightElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpotLightElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpotLightElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpotLightElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpotLightElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpotLightElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpotLightElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpotLightElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpotLightElementZ(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpotLightElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpotLightElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpotLightElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->zAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpotLightElementPointsAtX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpotLightElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpotLightElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpotLightElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->pointsAtXAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpotLightElementPointsAtY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpotLightElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpotLightElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpotLightElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->pointsAtYAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpotLightElementPointsAtZ(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpotLightElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpotLightElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpotLightElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->pointsAtZAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpotLightElementSpecularExponent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpotLightElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpotLightElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpotLightElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->specularExponentAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFESpotLightElementLimitingConeAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFESpotLightElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFESpotLightElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFESpotLightElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->limitingConeAngleAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.h index 8a9d925b7..bb2dfa5d8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFESpotLightElement.h @@ -33,7 +33,7 @@ class SVGFESpotLightElement; class JSSVGFESpotLightElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFESpotLightElement(PassRefPtr, PassRefPtr); + JSSVGFESpotLightElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.cpp index bc0e33c39..8d804221c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.cpp @@ -92,8 +92,8 @@ bool JSSVGFETileElementPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSSVGFETileElement::s_info = { "SVGFETileElement", &JSSVGElement::s_info, &JSSVGFETileElementTable, 0 }; -JSSVGFETileElement::JSSVGFETileElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFETileElement::JSSVGFETileElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -109,65 +109,73 @@ bool JSSVGFETileElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsSVGFETileElementIn1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETileElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETileElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETileElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->in1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETileElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETileElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETileElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETileElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETileElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETileElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETileElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETileElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETileElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETileElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETileElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETileElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETileElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETileElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETileElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETileElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETileElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETileElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETileElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETileElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETileElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETileElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETileElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETileElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETileElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETileElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETileElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFETileElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue JSC_HOST_CALL jsSVGFETileElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -180,7 +188,7 @@ JSValue JSC_HOST_CALL jsSVGFETileElementPrototypeFunctionGetPresentationAttribut const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.h index b31e65136..13d9cbb79 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFETileElement.h @@ -33,7 +33,7 @@ class SVGFETileElement; class JSSVGFETileElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFETileElement(PassRefPtr, PassRefPtr); + JSSVGFETileElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.cpp index c0e4fac60..ae917a1a4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.cpp @@ -92,12 +92,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGFETurbulenceElementConstructorTable = { 18, 15, JSSVGFETurbulenceElementConstructorTableValues, 0 }; #endif -class JSSVGFETurbulenceElementConstructor : public DOMObject { +class JSSVGFETurbulenceElementConstructor : public DOMConstructorObject { public: - JSSVGFETurbulenceElementConstructor(ExecState* exec) - : DOMObject(JSSVGFETurbulenceElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGFETurbulenceElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGFETurbulenceElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGFETurbulenceElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGFETurbulenceElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -151,8 +151,8 @@ bool JSSVGFETurbulenceElementPrototype::getOwnPropertySlot(ExecState* exec, cons const ClassInfo JSSVGFETurbulenceElement::s_info = { "SVGFETurbulenceElement", &JSSVGElement::s_info, &JSSVGFETurbulenceElementTable, 0 }; -JSSVGFETurbulenceElement::JSSVGFETurbulenceElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFETurbulenceElement::JSSVGFETurbulenceElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -168,114 +168,128 @@ bool JSSVGFETurbulenceElement::getOwnPropertySlot(ExecState* exec, const Identif JSValue jsSVGFETurbulenceElementBaseFrequencyX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETurbulenceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETurbulenceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETurbulenceElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->baseFrequencyXAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETurbulenceElementBaseFrequencyY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETurbulenceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETurbulenceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETurbulenceElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->baseFrequencyYAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETurbulenceElementNumOctaves(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETurbulenceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETurbulenceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETurbulenceElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->numOctavesAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETurbulenceElementSeed(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETurbulenceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETurbulenceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETurbulenceElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->seedAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETurbulenceElementStitchTiles(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETurbulenceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETurbulenceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETurbulenceElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->stitchTilesAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETurbulenceElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETurbulenceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETurbulenceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETurbulenceElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->typeAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETurbulenceElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETurbulenceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETurbulenceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETurbulenceElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETurbulenceElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETurbulenceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETurbulenceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETurbulenceElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETurbulenceElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETurbulenceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETurbulenceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETurbulenceElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETurbulenceElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETurbulenceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETurbulenceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETurbulenceElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETurbulenceElementResult(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETurbulenceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETurbulenceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETurbulenceElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->resultAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETurbulenceElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETurbulenceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETurbulenceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFETurbulenceElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFETurbulenceElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFETurbulenceElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFETurbulenceElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFETurbulenceElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGFETurbulenceElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSSVGFETurbulenceElement* domObject = static_cast(asObject(slot.slotBase())); + return JSSVGFETurbulenceElement::getConstructor(exec, domObject->globalObject()); } -JSValue JSSVGFETurbulenceElement::getConstructor(ExecState* exec) +JSValue JSSVGFETurbulenceElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGFETurbulenceElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -288,7 +302,7 @@ JSValue JSC_HOST_CALL jsSVGFETurbulenceElementPrototypeFunctionGetPresentationAt const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.h index c97395417..94c35c3fb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFETurbulenceElement.h @@ -33,7 +33,7 @@ class SVGFETurbulenceElement; class JSSVGFETurbulenceElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFETurbulenceElement(PassRefPtr, PassRefPtr); + JSSVGFETurbulenceElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.cpp index 6ba6d1b33..2bc864ae7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.cpp @@ -104,8 +104,8 @@ bool JSSVGFilterElementPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSSVGFilterElement::s_info = { "SVGFilterElement", &JSSVGElement::s_info, &JSSVGFilterElementTable, 0 }; -JSSVGFilterElement::JSSVGFilterElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFilterElement::JSSVGFilterElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -121,111 +121,125 @@ bool JSSVGFilterElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsSVGFilterElementFilterUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFilterElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->filterUnitsAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFilterElementPrimitiveUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFilterElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->primitiveUnitsAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFilterElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFilterElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFilterElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFilterElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFilterElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFilterElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFilterElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFilterElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFilterElementFilterResX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFilterElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->filterResXAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFilterElementFilterResY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFilterElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->filterResYAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFilterElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFilterElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->hrefAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFilterElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFilterElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGFilterElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFilterElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGFilterElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFilterElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFilterElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGFilterElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGFilterElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGFilterElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGFilterElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGFilterElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } void JSSVGFilterElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -269,7 +283,7 @@ JSValue JSC_HOST_CALL jsSVGFilterElementPrototypeFunctionGetPresentationAttribut const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.h index faa8d3c13..d5b1a2d51 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFilterElement.h @@ -33,7 +33,7 @@ class SVGFilterElement; class JSSVGFilterElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFilterElement(PassRefPtr, PassRefPtr); + JSSVGFilterElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.cpp index 755c2c0e0..372b8e464 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGFontElementPrototype::self(ExecState* exec, JSGlobalObject* globa const ClassInfo JSSVGFontElement::s_info = { "SVGFontElement", &JSSVGElement::s_info, 0, 0 }; -JSSVGFontElement::JSSVGFontElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFontElement::JSSVGFontElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.h index 4e6dd3b32..65f86e404 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontElement.h @@ -33,7 +33,7 @@ class SVGFontElement; class JSSVGFontElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFontElement(PassRefPtr, PassRefPtr); + JSSVGFontElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.cpp index cddf759c8..269812705 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGFontFaceElementPrototype::self(ExecState* exec, JSGlobalObject* g const ClassInfo JSSVGFontFaceElement::s_info = { "SVGFontFaceElement", &JSSVGElement::s_info, 0, 0 }; -JSSVGFontFaceElement::JSSVGFontFaceElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFontFaceElement::JSSVGFontFaceElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.h index 2bae1cf7f..24829ebfe 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceElement.h @@ -33,7 +33,7 @@ class SVGFontFaceElement; class JSSVGFontFaceElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFontFaceElement(PassRefPtr, PassRefPtr); + JSSVGFontFaceElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.cpp index bc0d0ae45..f4f772ad7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGFontFaceFormatElementPrototype::self(ExecState* exec, JSGlobalObj const ClassInfo JSSVGFontFaceFormatElement::s_info = { "SVGFontFaceFormatElement", &JSSVGElement::s_info, 0, 0 }; -JSSVGFontFaceFormatElement::JSSVGFontFaceFormatElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFontFaceFormatElement::JSSVGFontFaceFormatElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.h index e7b9ad849..e345b40b5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceFormatElement.h @@ -33,7 +33,7 @@ class SVGFontFaceFormatElement; class JSSVGFontFaceFormatElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFontFaceFormatElement(PassRefPtr, PassRefPtr); + JSSVGFontFaceFormatElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.cpp index 87c749a4f..38df90f55 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGFontFaceNameElementPrototype::self(ExecState* exec, JSGlobalObjec const ClassInfo JSSVGFontFaceNameElement::s_info = { "SVGFontFaceNameElement", &JSSVGElement::s_info, 0, 0 }; -JSSVGFontFaceNameElement::JSSVGFontFaceNameElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFontFaceNameElement::JSSVGFontFaceNameElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.h index a334f9887..0aac6fdf4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceNameElement.h @@ -33,7 +33,7 @@ class SVGFontFaceNameElement; class JSSVGFontFaceNameElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFontFaceNameElement(PassRefPtr, PassRefPtr); + JSSVGFontFaceNameElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.cpp index 302e4beea..349fcac84 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGFontFaceSrcElementPrototype::self(ExecState* exec, JSGlobalObject const ClassInfo JSSVGFontFaceSrcElement::s_info = { "SVGFontFaceSrcElement", &JSSVGElement::s_info, 0, 0 }; -JSSVGFontFaceSrcElement::JSSVGFontFaceSrcElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFontFaceSrcElement::JSSVGFontFaceSrcElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.h index d6852c570..6f2fec427 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceSrcElement.h @@ -33,7 +33,7 @@ class SVGFontFaceSrcElement; class JSSVGFontFaceSrcElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFontFaceSrcElement(PassRefPtr, PassRefPtr); + JSSVGFontFaceSrcElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.cpp index 16507ff9c..78aadeca8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGFontFaceUriElementPrototype::self(ExecState* exec, JSGlobalObject const ClassInfo JSSVGFontFaceUriElement::s_info = { "SVGFontFaceUriElement", &JSSVGElement::s_info, 0, 0 }; -JSSVGFontFaceUriElement::JSSVGFontFaceUriElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGFontFaceUriElement::JSSVGFontFaceUriElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.h index e9b9ec2c3..27b1d348b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGFontFaceUriElement.h @@ -33,7 +33,7 @@ class SVGFontFaceUriElement; class JSSVGFontFaceUriElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGFontFaceUriElement(PassRefPtr, PassRefPtr); + JSSVGFontFaceUriElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.cpp index 8bac171cb..50ad695df 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.cpp @@ -114,8 +114,8 @@ bool JSSVGForeignObjectElementPrototype::getOwnPropertySlot(ExecState* exec, con const ClassInfo JSSVGForeignObjectElement::s_info = { "SVGForeignObjectElement", &JSSVGElement::s_info, &JSSVGForeignObjectElementTable, 0 }; -JSSVGForeignObjectElement::JSSVGForeignObjectElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGForeignObjectElement::JSSVGForeignObjectElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -131,114 +131,129 @@ bool JSSVGForeignObjectElement::getOwnPropertySlot(ExecState* exec, const Identi JSValue jsSVGForeignObjectElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGForeignObjectElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGForeignObjectElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGForeignObjectElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGForeignObjectElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGForeignObjectElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGForeignObjectElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGForeignObjectElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGForeignObjectElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGForeignObjectElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGForeignObjectElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGForeignObjectElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGForeignObjectElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGForeignObjectElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGForeignObjectElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGForeignObjectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGForeignObjectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGForeignObjectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } void JSSVGForeignObjectElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -282,7 +297,7 @@ JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetPresentationA const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -295,7 +310,7 @@ JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetBBox(ExecStat SVGForeignObjectElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -308,7 +323,7 @@ JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetCTM(ExecState SVGForeignObjectElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -321,7 +336,7 @@ JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetScreenCTM(Exe SVGForeignObjectElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -336,7 +351,7 @@ JSValue JSC_HOST_CALL jsSVGForeignObjectElementPrototypeFunctionGetTransformToEl SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.h index ad699b686..006f61ed1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGForeignObjectElement.h @@ -33,7 +33,7 @@ class SVGForeignObjectElement; class JSSVGForeignObjectElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGForeignObjectElement(PassRefPtr, PassRefPtr); + JSSVGForeignObjectElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.cpp index 1ea98b257..d9f022260 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.cpp @@ -109,8 +109,8 @@ bool JSSVGGElementPrototype::getOwnPropertySlot(ExecState* exec, const Identifie const ClassInfo JSSVGGElement::s_info = { "SVGGElement", &JSSVGElement::s_info, &JSSVGGElementTable, 0 }; -JSSVGGElement::JSSVGGElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGGElement::JSSVGGElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -126,82 +126,93 @@ bool JSSVGGElement::getOwnPropertySlot(ExecState* exec, const Identifier& proper JSValue jsSVGGElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGGElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGGElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGGElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGGElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGGElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGGElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGGElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGGElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGGElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGGElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGGElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGGElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGGElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGGElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGGElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } void JSSVGGElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -245,7 +256,7 @@ JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetPresentationAttribute(Exe const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -258,7 +269,7 @@ JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetBBox(ExecState* exec, JSO SVGGElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -271,7 +282,7 @@ JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetCTM(ExecState* exec, JSOb SVGGElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -284,7 +295,7 @@ JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetScreenCTM(ExecState* exec SVGGElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -299,7 +310,7 @@ JSValue JSC_HOST_CALL jsSVGGElementPrototypeFunctionGetTransformToElement(ExecSt SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.h index 62c9addaf..920096bb5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGGElement.h @@ -33,7 +33,7 @@ class SVGGElement; class JSSVGGElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGGElement(PassRefPtr, PassRefPtr); + JSSVGGElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.cpp index 6cd22118a..61ff924d1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGGlyphElementPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSSVGGlyphElement::s_info = { "SVGGlyphElement", &JSSVGElement::s_info, 0, 0 }; -JSSVGGlyphElement::JSSVGGlyphElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGGlyphElement::JSSVGGlyphElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.h index 36105e1c6..e2fc42906 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGGlyphElement.h @@ -33,7 +33,7 @@ class SVGGlyphElement; class JSSVGGlyphElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGGlyphElement(PassRefPtr, PassRefPtr); + JSSVGGlyphElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.cpp index bcadbfc25..faea429e5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.cpp @@ -83,12 +83,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGGradientElementConstructorTable = { 8, 7, JSSVGGradientElementConstructorTableValues, 0 }; #endif -class JSSVGGradientElementConstructor : public DOMObject { +class JSSVGGradientElementConstructor : public DOMConstructorObject { public: - JSSVGGradientElementConstructor(ExecState* exec) - : DOMObject(JSSVGGradientElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGGradientElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGGradientElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGGradientElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGGradientElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -140,8 +140,8 @@ bool JSSVGGradientElementPrototype::getOwnPropertySlot(ExecState* exec, const Id const ClassInfo JSSVGGradientElement::s_info = { "SVGGradientElement", &JSSVGElement::s_info, &JSSVGGradientElementTable, 0 }; -JSSVGGradientElement::JSSVGGradientElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGGradientElement::JSSVGGradientElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -157,66 +157,74 @@ bool JSSVGGradientElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGGradientElementGradientUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->gradientUnitsAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGGradientElementGradientTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->gradientTransformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGGradientElementSpreadMethod(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->spreadMethodAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGGradientElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->hrefAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGGradientElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGGradientElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGGradientElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGGradientElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGGradientElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSSVGGradientElement* domObject = static_cast(asObject(slot.slotBase())); + return JSSVGGradientElement::getConstructor(exec, domObject->globalObject()); } -JSValue JSSVGGradientElement::getConstructor(ExecState* exec) +JSValue JSSVGGradientElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGGradientElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -229,7 +237,7 @@ JSValue JSC_HOST_CALL jsSVGGradientElementPrototypeFunctionGetPresentationAttrib const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.h index 11646e7f1..6600e215e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGGradientElement.h @@ -33,7 +33,7 @@ class SVGGradientElement; class JSSVGGradientElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGGradientElement(PassRefPtr, PassRefPtr); + JSSVGGradientElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.cpp index d636a277b..1d45adedf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGHKernElementPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSSVGHKernElement::s_info = { "SVGHKernElement", &JSSVGElement::s_info, 0, 0 }; -JSSVGHKernElement::JSSVGHKernElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGHKernElement::JSSVGHKernElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.h index 7718ecf46..6639fe056 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGHKernElement.h @@ -33,7 +33,7 @@ class SVGHKernElement; class JSSVGHKernElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGHKernElement(PassRefPtr, PassRefPtr); + JSSVGHKernElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.cpp index 8aaa237b2..64efb43ae 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.cpp @@ -117,8 +117,8 @@ bool JSSVGImageElementPrototype::getOwnPropertySlot(ExecState* exec, const Ident const ClassInfo JSSVGImageElement::s_info = { "SVGImageElement", &JSSVGElement::s_info, &JSSVGImageElementTable, 0 }; -JSSVGImageElement::JSSVGImageElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGImageElement::JSSVGImageElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -134,130 +134,147 @@ bool JSSVGImageElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsSVGImageElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGImageElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGImageElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGImageElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGImageElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->preserveAspectRatioAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGImageElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->hrefAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGImageElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGImageElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGImageElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGImageElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGImageElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGImageElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGImageElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGImageElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGImageElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGImageElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGImageElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGImageElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGImageElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGImageElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGImageElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGImageElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGImageElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGImageElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGImageElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGImageElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGImageElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGImageElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } void JSSVGImageElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -301,7 +318,7 @@ JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetPresentationAttribute const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -314,7 +331,7 @@ JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetBBox(ExecState* exec, SVGImageElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -327,7 +344,7 @@ JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetCTM(ExecState* exec, SVGImageElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -340,7 +357,7 @@ JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetScreenCTM(ExecState* SVGImageElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -355,7 +372,7 @@ JSValue JSC_HOST_CALL jsSVGImageElementPrototypeFunctionGetTransformToElement(Ex SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.h index 17dbffb9a..ef2182370 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGImageElement.h @@ -33,7 +33,7 @@ class SVGImageElement; class JSSVGImageElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGImageElement(PassRefPtr, PassRefPtr); + JSSVGImageElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLength.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGLength.cpp index 7a4d143f9..dd7522dee 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLength.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLength.cpp @@ -81,12 +81,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGLengthConstructorTable = { 33, 31, JSSVGLengthConstructorTableValues, 0 }; #endif -class JSSVGLengthConstructor : public DOMObject { +class JSSVGLengthConstructor : public DOMConstructorObject { public: - JSSVGLengthConstructor(ExecState* exec) - : DOMObject(JSSVGLengthConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGLengthConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGLengthConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGLengthPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGLengthPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -146,9 +146,8 @@ bool JSSVGLengthPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSSVGLength::s_info = { "SVGLength", 0, &JSSVGLengthTable, 0 }; -JSSVGLength::JSSVGLength(PassRefPtr structure, PassRefPtr > impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGLength::JSSVGLength(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr > impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -171,33 +170,38 @@ bool JSSVGLength::getOwnPropertySlot(ExecState* exec, const Identifier& property JSValue jsSVGLengthUnitType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLength* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLength imp(*static_cast(asObject(slot.slotBase()))->impl()); + SVGLength imp(*castedThis->impl()); return jsNumber(exec, imp.unitType()); } JSValue jsSVGLengthValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->value(exec); + JSSVGLength* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->value(exec); } JSValue jsSVGLengthValueInSpecifiedUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLength* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLength imp(*static_cast(asObject(slot.slotBase()))->impl()); + SVGLength imp(*castedThis->impl()); return jsNumber(exec, imp.valueInSpecifiedUnits()); } JSValue jsSVGLengthValueAsString(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLength* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLength imp(*static_cast(asObject(slot.slotBase()))->impl()); + SVGLength imp(*castedThis->impl()); return jsString(exec, imp.valueAsString()); } JSValue jsSVGLengthConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + UNUSED_PARAM(slot); + return JSSVGLength::getConstructor(exec, deprecatedGlobalObjectForPrototype(exec)); } void JSSVGLength::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -225,9 +229,9 @@ void setJSSVGLengthValueAsString(ExecState* exec, JSObject* thisObject, JSValue static_cast(thisObject)->impl()->commitChange(imp, static_cast(thisObject)->context()); } -JSValue JSSVGLength::getConstructor(ExecState* exec) +JSValue JSSVGLength::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGLengthPrototypeFunctionNewValueSpecifiedUnits(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -312,9 +316,9 @@ JSValue jsSVGLengthSVG_LENGTHTYPE_PC(ExecState* exec, const Identifier&, const P return jsNumber(exec, static_cast(10)); } -JSC::JSValue toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, JSSVGPODTypeWrapper* object, SVGElement* context) { - return getDOMObjectWrapper >(exec, object, context); + return getDOMObjectWrapper >(exec, globalObject, object, context); } SVGLength toSVGLength(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLength.h b/src/3rdparty/webkit/WebCore/generated/JSSVGLength.h index 50ea7ced3..1bf382a81 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLength.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLength.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "JSSVGPODTypeWrapper.h" #include "SVGElement.h" @@ -32,10 +33,10 @@ namespace WebCore { -class JSSVGLength : public DOMObject { - typedef DOMObject Base; +class JSSVGLength : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGLength(PassRefPtr, PassRefPtr >, SVGElement* context); + JSSVGLength(PassRefPtr, JSDOMGlobalObject*, PassRefPtr >, SVGElement* context); virtual ~JSSVGLength(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -48,22 +49,20 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom attributes JSC::JSValue value(JSC::ExecState*) const; // Custom functions JSC::JSValue convertToSpecifiedUnits(JSC::ExecState*, const JSC::ArgList&); - JSSVGPODTypeWrapper* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } + JSSVGPODTypeWrapper * impl() const { return m_impl.get(); } private: - RefPtr m_context; RefPtr > m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, JSSVGPODTypeWrapper*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, JSSVGPODTypeWrapper*, SVGElement* context); SVGLength toSVGLength(JSC::JSValue); class JSSVGLengthPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.cpp index 86b93204e..7157d65ce 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.cpp @@ -87,9 +87,8 @@ bool JSSVGLengthListPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSSVGLengthList::s_info = { "SVGLengthList", 0, &JSSVGLengthListTable, 0 }; -JSSVGLengthList::JSSVGLengthList(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGLengthList::JSSVGLengthList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -111,8 +110,9 @@ bool JSSVGLengthList::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsSVGLengthListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLengthList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLengthList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLengthList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->numberOfItems()); } @@ -141,7 +141,7 @@ JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionInitialize(ExecState* exec SVGLength item = toSVGLength(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->initialize(item, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->initialize(item, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } @@ -157,7 +157,7 @@ JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionGetItem(ExecState* exec, J unsigned index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getItem(index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->getItem(index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } @@ -174,7 +174,7 @@ JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionInsertItemBefore(ExecState unsigned index = args.at(1).toInt32(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->insertItemBefore(item, index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->insertItemBefore(item, index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } @@ -191,7 +191,7 @@ JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionReplaceItem(ExecState* exe unsigned index = args.at(1).toInt32(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->replaceItem(item, index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->replaceItem(item, index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } @@ -207,7 +207,7 @@ JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionRemoveItem(ExecState* exec unsigned index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->removeItem(index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->removeItem(index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } @@ -223,14 +223,14 @@ JSValue JSC_HOST_CALL jsSVGLengthListPrototypeFunctionAppendItem(ExecState* exec SVGLength item = toSVGLength(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->appendItem(item, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->appendItem(item, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSC::JSValue toJS(JSC::ExecState* exec, SVGLengthList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGLengthList* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGLengthList* toSVGLengthList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.h index 134520335..88500a036 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLengthList.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGLengthList; -class JSSVGLengthList : public DOMObject { - typedef DOMObject Base; +class JSSVGLengthList : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGLengthList(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGLengthList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGLengthList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -48,14 +49,12 @@ public: } SVGLengthList* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGLengthList*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGLengthList*, SVGElement* context); SVGLengthList* toSVGLengthList(JSC::JSValue); class JSSVGLengthListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.cpp index 9e7057b49..26f31a95e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.cpp @@ -114,8 +114,8 @@ bool JSSVGLineElementPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSSVGLineElement::s_info = { "SVGLineElement", &JSSVGElement::s_info, &JSSVGLineElementTable, 0 }; -JSSVGLineElement::JSSVGLineElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGLineElement::JSSVGLineElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -131,114 +131,129 @@ bool JSSVGLineElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsSVGLineElementX1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLineElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->x1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGLineElementY1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLineElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->y1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGLineElementX2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLineElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->x2Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGLineElementY2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLineElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->y2Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGLineElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGLineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGLineElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGLineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGLineElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGLineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGLineElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLineElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGLineElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLineElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGLineElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLineElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGLineElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLineElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGLineElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGLineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGLineElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLineElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGLineElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGLineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGLineElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGLineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } void JSSVGLineElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -282,7 +297,7 @@ JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetPresentationAttribute( const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -295,7 +310,7 @@ JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetBBox(ExecState* exec, SVGLineElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -308,7 +323,7 @@ JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetCTM(ExecState* exec, J SVGLineElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -321,7 +336,7 @@ JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetScreenCTM(ExecState* e SVGLineElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -336,7 +351,7 @@ JSValue JSC_HOST_CALL jsSVGLineElementPrototypeFunctionGetTransformToElement(Exe SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.h index bcdee6f35..d31e6dc1d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLineElement.h @@ -33,7 +33,7 @@ class SVGLineElement; class JSSVGLineElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGLineElement(PassRefPtr, PassRefPtr); + JSSVGLineElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.cpp index 56ec26c21..1e3ff9afb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.cpp @@ -75,8 +75,8 @@ JSObject* JSSVGLinearGradientElementPrototype::self(ExecState* exec, JSGlobalObj const ClassInfo JSSVGLinearGradientElement::s_info = { "SVGLinearGradientElement", &JSSVGGradientElement::s_info, &JSSVGLinearGradientElementTable, 0 }; -JSSVGLinearGradientElement::JSSVGLinearGradientElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGGradientElement(structure, impl) +JSSVGLinearGradientElement::JSSVGLinearGradientElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGGradientElement(structure, globalObject, impl) { } @@ -92,34 +92,38 @@ bool JSSVGLinearGradientElement::getOwnPropertySlot(ExecState* exec, const Ident JSValue jsSVGLinearGradientElementX1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLinearGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLinearGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLinearGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->x1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGLinearGradientElementY1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLinearGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLinearGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLinearGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->y1Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGLinearGradientElementX2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLinearGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLinearGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLinearGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->x2Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGLinearGradientElementY2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGLinearGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGLinearGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGLinearGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->y2Animated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.h index e05e51552..737db34f9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGLinearGradientElement.h @@ -33,7 +33,7 @@ class SVGLinearGradientElement; class JSSVGLinearGradientElement : public JSSVGGradientElement { typedef JSSVGGradientElement Base; public: - JSSVGLinearGradientElement(PassRefPtr, PassRefPtr); + JSSVGLinearGradientElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.cpp index d1b0cd6b9..d7a3b8232 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.cpp @@ -98,12 +98,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGMarkerElementConstructorTable = { 16, 15, JSSVGMarkerElementConstructorTableValues, 0 }; #endif -class JSSVGMarkerElementConstructor : public DOMObject { +class JSSVGMarkerElementConstructor : public DOMConstructorObject { public: - JSSVGMarkerElementConstructor(ExecState* exec) - : DOMObject(JSSVGMarkerElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGMarkerElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGMarkerElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGMarkerElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGMarkerElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -159,8 +159,8 @@ bool JSSVGMarkerElementPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSSVGMarkerElement::s_info = { "SVGMarkerElement", &JSSVGElement::s_info, &JSSVGMarkerElementTable, 0 }; -JSSVGMarkerElement::JSSVGMarkerElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGMarkerElement::JSSVGMarkerElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -176,116 +176,131 @@ bool JSSVGMarkerElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsSVGMarkerElementRefX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMarkerElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->refXAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMarkerElementRefY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMarkerElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->refYAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMarkerElementMarkerUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMarkerElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->markerUnitsAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMarkerElementMarkerWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMarkerElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->markerWidthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMarkerElementMarkerHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMarkerElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->markerHeightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMarkerElementOrientType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMarkerElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->orientTypeAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMarkerElementOrientAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMarkerElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->orientAngleAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMarkerElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMarkerElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGMarkerElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMarkerElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGMarkerElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMarkerElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMarkerElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMarkerElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMarkerElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGMarkerElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGMarkerElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMarkerElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->viewBoxAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMarkerElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMarkerElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMarkerElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMarkerElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->preserveAspectRatioAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMarkerElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSSVGMarkerElement* domObject = static_cast(asObject(slot.slotBase())); + return JSSVGMarkerElement::getConstructor(exec, domObject->globalObject()); } void JSSVGMarkerElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -304,9 +319,9 @@ void setJSSVGMarkerElementXmlspace(ExecState* exec, JSObject* thisObject, JSValu imp->setXmlspace(value.toString(exec)); } -JSValue JSSVGMarkerElement::getConstructor(ExecState* exec) +JSValue JSSVGMarkerElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGMarkerElementPrototypeFunctionSetOrientToAuto(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -344,7 +359,7 @@ JSValue JSC_HOST_CALL jsSVGMarkerElementPrototypeFunctionGetPresentationAttribut const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.h index bf626c7b3..4aad9ee89 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMarkerElement.h @@ -33,7 +33,7 @@ class SVGMarkerElement; class JSSVGMarkerElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGMarkerElement(PassRefPtr, PassRefPtr); + JSSVGMarkerElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -45,7 +45,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.cpp index c26695656..4919818bd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.cpp @@ -105,8 +105,8 @@ bool JSSVGMaskElementPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSSVGMaskElement::s_info = { "SVGMaskElement", &JSSVGElement::s_info, &JSSVGMaskElementTable, 0 }; -JSSVGMaskElement::JSSVGMaskElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGMaskElement::JSSVGMaskElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -122,108 +122,122 @@ bool JSSVGMaskElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsSVGMaskElementMaskUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMaskElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->maskUnitsAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMaskElementMaskContentUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMaskElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->maskContentUnitsAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMaskElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMaskElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMaskElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMaskElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMaskElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMaskElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMaskElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMaskElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMaskElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGMaskElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGMaskElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGMaskElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGMaskElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGMaskElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGMaskElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMaskElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGMaskElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMaskElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGMaskElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMaskElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMaskElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGMaskElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGMaskElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMaskElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGMaskElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGMaskElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } void JSSVGMaskElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -267,7 +281,7 @@ JSValue JSC_HOST_CALL jsSVGMaskElementPrototypeFunctionGetPresentationAttribute( const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.h index 51f35cc49..f8f7abfe3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMaskElement.h @@ -33,7 +33,7 @@ class SVGMaskElement; class JSSVGMaskElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGMaskElement(PassRefPtr, PassRefPtr); + JSSVGMaskElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.cpp index e668ab281..d38cbec8c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.cpp @@ -94,9 +94,8 @@ bool JSSVGMatrixPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSSVGMatrix::s_info = { "SVGMatrix", 0, &JSSVGMatrixTable, 0 }; -JSSVGMatrix::JSSVGMatrix(PassRefPtr structure, PassRefPtr > impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGMatrix::JSSVGMatrix(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr > impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -118,43 +117,49 @@ bool JSSVGMatrix::getOwnPropertySlot(ExecState* exec, const Identifier& property JSValue jsSVGMatrixA(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TransformationMatrix imp(*static_cast(asObject(slot.slotBase()))->impl()); + TransformationMatrix imp(*castedThis->impl()); return jsNumber(exec, imp.a()); } JSValue jsSVGMatrixB(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TransformationMatrix imp(*static_cast(asObject(slot.slotBase()))->impl()); + TransformationMatrix imp(*castedThis->impl()); return jsNumber(exec, imp.b()); } JSValue jsSVGMatrixC(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TransformationMatrix imp(*static_cast(asObject(slot.slotBase()))->impl()); + TransformationMatrix imp(*castedThis->impl()); return jsNumber(exec, imp.c()); } JSValue jsSVGMatrixD(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TransformationMatrix imp(*static_cast(asObject(slot.slotBase()))->impl()); + TransformationMatrix imp(*castedThis->impl()); return jsNumber(exec, imp.d()); } JSValue jsSVGMatrixE(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TransformationMatrix imp(*static_cast(asObject(slot.slotBase()))->impl()); + TransformationMatrix imp(*castedThis->impl()); return jsNumber(exec, imp.e()); } JSValue jsSVGMatrixF(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TransformationMatrix imp(*static_cast(asObject(slot.slotBase()))->impl()); + TransformationMatrix imp(*castedThis->impl()); return jsNumber(exec, imp.f()); } @@ -216,7 +221,7 @@ JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionMultiply(ExecState* exec, JSOb TransformationMatrix secondMatrix = toSVGMatrix(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp.multiply(secondMatrix)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp.multiply(secondMatrix)).get(), castedThisObj->context()); return result; } @@ -241,7 +246,7 @@ JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionTranslate(ExecState* exec, JSO float y = args.at(1).toFloat(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp.translate(x, y)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp.translate(x, y)).get(), castedThisObj->context()); return result; } @@ -256,7 +261,7 @@ JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionScale(ExecState* exec, JSObjec float scaleFactor = args.at(0).toFloat(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp.scale(scaleFactor)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp.scale(scaleFactor)).get(), castedThisObj->context()); return result; } @@ -272,7 +277,7 @@ JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionScaleNonUniform(ExecState* exe float scaleFactorY = args.at(1).toFloat(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp.scaleNonUniform(scaleFactorX, scaleFactorY)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp.scaleNonUniform(scaleFactorX, scaleFactorY)).get(), castedThisObj->context()); return result; } @@ -287,7 +292,7 @@ JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionRotate(ExecState* exec, JSObje float angle = args.at(0).toFloat(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp.rotate(angle)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp.rotate(angle)).get(), castedThisObj->context()); return result; } @@ -310,7 +315,7 @@ JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionFlipX(ExecState* exec, JSObjec TransformationMatrix imp(*wrapper); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp.flipX()).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp.flipX()).get(), castedThisObj->context()); return result; } @@ -324,7 +329,7 @@ JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionFlipY(ExecState* exec, JSObjec TransformationMatrix imp(*wrapper); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp.flipY()).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp.flipY()).get(), castedThisObj->context()); return result; } @@ -339,7 +344,7 @@ JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionSkewX(ExecState* exec, JSObjec float angle = args.at(0).toFloat(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp.skewX(angle)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp.skewX(angle)).get(), castedThisObj->context()); return result; } @@ -354,13 +359,13 @@ JSValue JSC_HOST_CALL jsSVGMatrixPrototypeFunctionSkewY(ExecState* exec, JSObjec float angle = args.at(0).toFloat(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp.skewY(angle)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp.skewY(angle)).get(), castedThisObj->context()); return result; } -JSC::JSValue toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, JSSVGPODTypeWrapper* object, SVGElement* context) { - return getDOMObjectWrapper >(exec, object, context); + return getDOMObjectWrapper >(exec, globalObject, object, context); } TransformationMatrix toSVGMatrix(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.h b/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.h index c1c9068db..b4a07f7e5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMatrix.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "JSSVGPODTypeWrapper.h" #include "SVGElement.h" @@ -32,10 +33,10 @@ namespace WebCore { -class JSSVGMatrix : public DOMObject { - typedef DOMObject Base; +class JSSVGMatrix : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGMatrix(PassRefPtr, PassRefPtr >, SVGElement* context); + JSSVGMatrix(PassRefPtr, JSDOMGlobalObject*, PassRefPtr >, SVGElement* context); virtual ~JSSVGMatrix(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -52,15 +53,13 @@ public: // Custom functions JSC::JSValue inverse(JSC::ExecState*, const JSC::ArgList&); JSC::JSValue rotateFromVector(JSC::ExecState*, const JSC::ArgList&); - JSSVGPODTypeWrapper* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } + JSSVGPODTypeWrapper * impl() const { return m_impl.get(); } private: - RefPtr m_context; RefPtr > m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, JSSVGPODTypeWrapper*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, JSSVGPODTypeWrapper*, SVGElement* context); TransformationMatrix toSVGMatrix(JSC::JSValue); class JSSVGMatrixPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.cpp index 500bb3396..ee3f9789f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGMetadataElementPrototype::self(ExecState* exec, JSGlobalObject* g const ClassInfo JSSVGMetadataElement::s_info = { "SVGMetadataElement", &JSSVGElement::s_info, 0, 0 }; -JSSVGMetadataElement::JSSVGMetadataElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGMetadataElement::JSSVGMetadataElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.h index 49eb3526d..f6d97ee57 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMetadataElement.h @@ -33,7 +33,7 @@ class SVGMetadataElement; class JSSVGMetadataElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGMetadataElement(PassRefPtr, PassRefPtr); + JSSVGMetadataElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.cpp index b6efc8cbb..279a7c7ff 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGMissingGlyphElementPrototype::self(ExecState* exec, JSGlobalObjec const ClassInfo JSSVGMissingGlyphElement::s_info = { "SVGMissingGlyphElement", &JSSVGElement::s_info, 0, 0 }; -JSSVGMissingGlyphElement::JSSVGMissingGlyphElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGMissingGlyphElement::JSSVGMissingGlyphElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.h index 76be66352..035160a76 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGMissingGlyphElement.h @@ -33,7 +33,7 @@ class SVGMissingGlyphElement; class JSSVGMissingGlyphElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGMissingGlyphElement(PassRefPtr, PassRefPtr); + JSSVGMissingGlyphElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.cpp index 491e6bfbf..3131b4400 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.cpp @@ -71,9 +71,8 @@ JSObject* JSSVGNumberPrototype::self(ExecState* exec, JSGlobalObject* globalObje const ClassInfo JSSVGNumber::s_info = { "SVGNumber", 0, &JSSVGNumberTable, 0 }; -JSSVGNumber::JSSVGNumber(PassRefPtr structure, PassRefPtr > impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGNumber::JSSVGNumber(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr > impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -95,8 +94,9 @@ bool JSSVGNumber::getOwnPropertySlot(ExecState* exec, const Identifier& property JSValue jsSVGNumberValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGNumber* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - float imp(*static_cast(asObject(slot.slotBase()))->impl()); + float imp(*castedThis->impl()); return jsNumber(exec, imp); } @@ -112,9 +112,9 @@ void setJSSVGNumberValue(ExecState* exec, JSObject* thisObject, JSValue value) static_cast(thisObject)->impl()->commitChange(imp, static_cast(thisObject)->context()); } -JSC::JSValue toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, JSSVGPODTypeWrapper* object, SVGElement* context) { - return getDOMObjectWrapper >(exec, object, context); + return getDOMObjectWrapper >(exec, globalObject, object, context); } float toSVGNumber(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.h b/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.h index 08bfe8288..de5e02350 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGNumber.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "JSSVGPODTypeWrapper.h" #include "SVGElement.h" @@ -31,10 +32,10 @@ namespace WebCore { -class JSSVGNumber : public DOMObject { - typedef DOMObject Base; +class JSSVGNumber : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGNumber(PassRefPtr, PassRefPtr >, SVGElement* context); + JSSVGNumber(PassRefPtr, JSDOMGlobalObject*, PassRefPtr >, SVGElement* context); virtual ~JSSVGNumber(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,15 +48,13 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - JSSVGPODTypeWrapper* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } + JSSVGPODTypeWrapper * impl() const { return m_impl.get(); } private: - RefPtr m_context; RefPtr > m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, JSSVGPODTypeWrapper*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, JSSVGPODTypeWrapper*, SVGElement* context); float toSVGNumber(JSC::JSValue); class JSSVGNumberPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.cpp index 1558247db..8a635dd03 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.cpp @@ -86,9 +86,8 @@ bool JSSVGNumberListPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSSVGNumberList::s_info = { "SVGNumberList", 0, &JSSVGNumberListTable, 0 }; -JSSVGNumberList::JSSVGNumberList(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGNumberList::JSSVGNumberList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -110,8 +109,9 @@ bool JSSVGNumberList::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsSVGNumberListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGNumberList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGNumberList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGNumberList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->numberOfItems()); } @@ -140,7 +140,7 @@ JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionInitialize(ExecState* exec float item = args.at(0).toFloat(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->initialize(item, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->initialize(item, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } @@ -156,7 +156,7 @@ JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionGetItem(ExecState* exec, J unsigned index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getItem(index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->getItem(index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } @@ -173,7 +173,7 @@ JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionInsertItemBefore(ExecState unsigned index = args.at(1).toInt32(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->insertItemBefore(item, index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->insertItemBefore(item, index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } @@ -190,7 +190,7 @@ JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionReplaceItem(ExecState* exe unsigned index = args.at(1).toInt32(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->replaceItem(item, index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->replaceItem(item, index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } @@ -206,7 +206,7 @@ JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionRemoveItem(ExecState* exec unsigned index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->removeItem(index, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->removeItem(index, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } @@ -222,14 +222,14 @@ JSValue JSC_HOST_CALL jsSVGNumberListPrototypeFunctionAppendItem(ExecState* exec float item = args.at(0).toFloat(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->appendItem(item, ec)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->appendItem(item, ec)).get(), castedThisObj->context()); setDOMException(exec, ec); return result; } -JSC::JSValue toJS(JSC::ExecState* exec, SVGNumberList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGNumberList* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGNumberList* toSVGNumberList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.h index 3eb5ece31..9e7b0b5d5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGNumberList.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGNumberList; -class JSSVGNumberList : public DOMObject { - typedef DOMObject Base; +class JSSVGNumberList : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGNumberList(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGNumberList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGNumberList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -48,14 +49,12 @@ public: } SVGNumberList* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGNumberList*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGNumberList*, SVGElement* context); SVGNumberList* toSVGNumberList(JSC::JSValue); class JSSVGNumberListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.cpp index f3e7b6f46..732860adc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.cpp @@ -78,12 +78,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGPaintConstructorTable = { 35, 31, JSSVGPaintConstructorTableValues, 0 }; #endif -class JSSVGPaintConstructor : public DOMObject { +class JSSVGPaintConstructor : public DOMConstructorObject { public: - JSSVGPaintConstructor(ExecState* exec) - : DOMObject(JSSVGPaintConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGPaintConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGPaintConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGPaintPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGPaintPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -142,8 +142,8 @@ bool JSSVGPaintPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSSVGPaint::s_info = { "SVGPaint", &JSSVGColor::s_info, &JSSVGPaintTable, 0 }; -JSSVGPaint::JSSVGPaint(PassRefPtr structure, PassRefPtr impl) - : JSSVGColor(structure, impl) +JSSVGPaint::JSSVGPaint(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGColor(structure, globalObject, impl) { } @@ -159,25 +159,28 @@ bool JSSVGPaint::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN JSValue jsSVGPaintPaintType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPaint* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPaint* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPaint* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->paintType()); } JSValue jsSVGPaintUri(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPaint* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPaint* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPaint* imp = static_cast(castedThis->impl()); return jsString(exec, imp->uri()); } JSValue jsSVGPaintConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSSVGPaint* domObject = static_cast(asObject(slot.slotBase())); + return JSSVGPaint::getConstructor(exec, domObject->globalObject()); } -JSValue JSSVGPaint::getConstructor(ExecState* exec) +JSValue JSSVGPaint::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGPaintPrototypeFunctionSetUri(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.h index 495c5dd2a..a751b9d73 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPaint.h @@ -33,7 +33,7 @@ class SVGPaint; class JSSVGPaint : public JSSVGColor { typedef JSSVGColor Base; public: - JSSVGPaint(PassRefPtr, PassRefPtr); + JSSVGPaint(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.cpp index 8da1204c0..fd5c679c2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.cpp @@ -170,8 +170,8 @@ bool JSSVGPathElementPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSSVGPathElement::s_info = { "SVGPathElement", &JSSVGElement::s_info, &JSSVGPathElementTable, 0 }; -JSSVGPathElement::JSSVGPathElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGPathElement::JSSVGPathElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -187,118 +187,134 @@ bool JSSVGPathElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsSVGPathElementPathLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->pathLengthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPathElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGPathElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGPathElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGPathElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGPathElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGPathElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPathElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPathElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGPathElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPathElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGPathElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } JSValue jsSVGPathElementPathSegList(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->pathSegList()), imp); + SVGPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->pathSegList()), imp); } JSValue jsSVGPathElementNormalizedPathSegList(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->normalizedPathSegList()), imp); + SVGPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->normalizedPathSegList()), imp); } JSValue jsSVGPathElementAnimatedPathSegList(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->animatedPathSegList()), imp); + SVGPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->animatedPathSegList()), imp); } JSValue jsSVGPathElementAnimatedNormalizedPathSegList(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->animatedNormalizedPathSegList()), imp); + SVGPathElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->animatedNormalizedPathSegList()), imp); } void JSSVGPathElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -341,7 +357,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetPointAtLength(ExecStat float distance = args.at(0).toFloat(exec); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getPointAtLength(distance)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getPointAtLength(distance)).get(), imp); return result; } @@ -368,7 +384,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegClosePath SVGPathElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegClosePath()), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegClosePath()), imp); return result; } @@ -383,7 +399,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegMovetoAbs float y = args.at(1).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegMovetoAbs(x, y)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegMovetoAbs(x, y)), imp); return result; } @@ -398,7 +414,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegMovetoRel float y = args.at(1).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegMovetoRel(x, y)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegMovetoRel(x, y)), imp); return result; } @@ -413,7 +429,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoAbs float y = args.at(1).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoAbs(x, y)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegLinetoAbs(x, y)), imp); return result; } @@ -428,7 +444,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoRel float y = args.at(1).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoRel(x, y)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegLinetoRel(x, y)), imp); return result; } @@ -447,7 +463,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCu float y2 = args.at(5).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoCubicAbs(x, y, x1, y1, x2, y2)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegCurvetoCubicAbs(x, y, x1, y1, x2, y2)), imp); return result; } @@ -466,7 +482,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCu float y2 = args.at(5).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoCubicRel(x, y, x1, y1, x2, y2)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegCurvetoCubicRel(x, y, x1, y1, x2, y2)), imp); return result; } @@ -483,7 +499,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQu float y1 = args.at(3).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticAbs(x, y, x1, y1)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticAbs(x, y, x1, y1)), imp); return result; } @@ -500,7 +516,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQu float y1 = args.at(3).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticRel(x, y, x1, y1)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticRel(x, y, x1, y1)), imp); return result; } @@ -520,7 +536,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegArcAbs(Ex bool sweepFlag = args.at(6).toBoolean(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegArcAbs(x, y, r1, r2, angle, largeArcFlag, sweepFlag)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegArcAbs(x, y, r1, r2, angle, largeArcFlag, sweepFlag)), imp); return result; } @@ -540,7 +556,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegArcRel(Ex bool sweepFlag = args.at(6).toBoolean(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegArcRel(x, y, r1, r2, angle, largeArcFlag, sweepFlag)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegArcRel(x, y, r1, r2, angle, largeArcFlag, sweepFlag)), imp); return result; } @@ -554,7 +570,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoHor float x = args.at(0).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoHorizontalAbs(x)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegLinetoHorizontalAbs(x)), imp); return result; } @@ -568,7 +584,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoHor float x = args.at(0).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoHorizontalRel(x)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegLinetoHorizontalRel(x)), imp); return result; } @@ -582,7 +598,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoVer float y = args.at(0).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoVerticalAbs(y)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegLinetoVerticalAbs(y)), imp); return result; } @@ -596,7 +612,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegLinetoVer float y = args.at(0).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegLinetoVerticalRel(y)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegLinetoVerticalRel(y)), imp); return result; } @@ -613,7 +629,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCu float y2 = args.at(3).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoCubicSmoothAbs(x, y, x2, y2)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegCurvetoCubicSmoothAbs(x, y, x2, y2)), imp); return result; } @@ -630,7 +646,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoCu float y2 = args.at(3).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoCubicSmoothRel(x, y, x2, y2)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegCurvetoCubicSmoothRel(x, y, x2, y2)), imp); return result; } @@ -645,7 +661,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQu float y = args.at(1).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticSmoothAbs(x, y)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticSmoothAbs(x, y)), imp); return result; } @@ -660,7 +676,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionCreateSVGPathSegCurvetoQu float y = args.at(1).toFloat(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticSmoothRel(x, y)), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGPathSegCurvetoQuadraticSmoothRel(x, y)), imp); return result; } @@ -688,7 +704,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetPresentationAttribute( const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -701,7 +717,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetBBox(ExecState* exec, SVGPathElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -714,7 +730,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetCTM(ExecState* exec, J SVGPathElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -727,7 +743,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetScreenCTM(ExecState* e SVGPathElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -742,7 +758,7 @@ JSValue JSC_HOST_CALL jsSVGPathElementPrototypeFunctionGetTransformToElement(Exe SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.h index 62fa4397a..e96b61290 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathElement.h @@ -33,7 +33,7 @@ class SVGPathElement; class JSSVGPathElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGPathElement(PassRefPtr, PassRefPtr); + JSSVGPathElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.cpp index b19e3a0aa..04e307812 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.cpp @@ -87,12 +87,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGPathSegConstructorTable = { 70, 63, JSSVGPathSegConstructorTableValues, 0 }; #endif -class JSSVGPathSegConstructor : public DOMObject { +class JSSVGPathSegConstructor : public DOMConstructorObject { public: - JSSVGPathSegConstructor(ExecState* exec) - : DOMObject(JSSVGPathSegConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGPathSegConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGPathSegConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGPathSegPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGPathSegPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -159,9 +159,8 @@ bool JSSVGPathSegPrototype::getOwnPropertySlot(ExecState* exec, const Identifier const ClassInfo JSSVGPathSeg::s_info = { "SVGPathSeg", 0, &JSSVGPathSegTable, 0 }; -JSSVGPathSeg::JSSVGPathSeg(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGPathSeg::JSSVGPathSeg(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -183,25 +182,28 @@ bool JSSVGPathSeg::getOwnPropertySlot(ExecState* exec, const Identifier& propert JSValue jsSVGPathSegPathSegType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSeg* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSeg* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSeg* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->pathSegType()); } JSValue jsSVGPathSegPathSegTypeAsLetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSeg* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSeg* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSeg* imp = static_cast(castedThis->impl()); return jsString(exec, imp->pathSegTypeAsLetter()); } JSValue jsSVGPathSegConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + UNUSED_PARAM(slot); + return JSSVGPathSeg::getConstructor(exec, deprecatedGlobalObjectForPrototype(exec)); } -JSValue JSSVGPathSeg::getConstructor(ExecState* exec) +JSValue JSSVGPathSeg::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } // Constant getters diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.h index 7ba6512a2..7fb1ab489 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSeg.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGPathSeg; -class JSSVGPathSeg : public DOMObject { - typedef DOMObject Base; +class JSSVGPathSeg : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGPathSeg(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSeg(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGPathSeg(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,16 +48,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); SVGPathSeg* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGPathSeg*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGPathSeg*, SVGElement* context); SVGPathSeg* toSVGPathSeg(JSC::JSValue); class JSSVGPathSegPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.cpp index d8f37b2a5..1edda2e89 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.cpp @@ -78,8 +78,8 @@ JSObject* JSSVGPathSegArcAbsPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSSVGPathSegArcAbs::s_info = { "SVGPathSegArcAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegArcAbsTable, 0 }; -JSSVGPathSegArcAbs::JSSVGPathSegArcAbs(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegArcAbs::JSSVGPathSegArcAbs(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -95,50 +95,57 @@ bool JSSVGPathSegArcAbs::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsSVGPathSegArcAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegArcAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } JSValue jsSVGPathSegArcAbsR1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->r1()); } JSValue jsSVGPathSegArcAbsR2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->r2()); } JSValue jsSVGPathSegArcAbsAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->angle()); } JSValue jsSVGPathSegArcAbsLargeArcFlag(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcAbs* imp = static_cast(castedThis->impl()); return jsBoolean(imp->largeArcFlag()); } JSValue jsSVGPathSegArcAbsSweepFlag(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcAbs* imp = static_cast(castedThis->impl()); return jsBoolean(imp->sweepFlag()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.h index b051822f1..d91b14aff 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcAbs.h @@ -33,7 +33,7 @@ class SVGPathSegArcAbs; class JSSVGPathSegArcAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegArcAbs(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegArcAbs(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.cpp index 0f59520f0..0c5bc6651 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.cpp @@ -78,8 +78,8 @@ JSObject* JSSVGPathSegArcRelPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSSVGPathSegArcRel::s_info = { "SVGPathSegArcRel", &JSSVGPathSeg::s_info, &JSSVGPathSegArcRelTable, 0 }; -JSSVGPathSegArcRel::JSSVGPathSegArcRel(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegArcRel::JSSVGPathSegArcRel(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -95,50 +95,57 @@ bool JSSVGPathSegArcRel::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsSVGPathSegArcRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegArcRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } JSValue jsSVGPathSegArcRelR1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->r1()); } JSValue jsSVGPathSegArcRelR2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->r2()); } JSValue jsSVGPathSegArcRelAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->angle()); } JSValue jsSVGPathSegArcRelLargeArcFlag(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcRel* imp = static_cast(castedThis->impl()); return jsBoolean(imp->largeArcFlag()); } JSValue jsSVGPathSegArcRelSweepFlag(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegArcRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegArcRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegArcRel* imp = static_cast(castedThis->impl()); return jsBoolean(imp->sweepFlag()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.h index 22028d24d..4bb6d0aad 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegArcRel.h @@ -33,7 +33,7 @@ class SVGPathSegArcRel; class JSSVGPathSegArcRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegArcRel(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegArcRel(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.cpp index 1519f2a18..bb220e471 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGPathSegClosePathPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSSVGPathSegClosePath::s_info = { "SVGPathSegClosePath", &JSSVGPathSeg::s_info, 0, 0 }; -JSSVGPathSegClosePath::JSSVGPathSegClosePath(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegClosePath::JSSVGPathSegClosePath(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.h index 749eab1cb..8a44528a9 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegClosePath.h @@ -33,7 +33,7 @@ class SVGPathSegClosePath; class JSSVGPathSegClosePath : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegClosePath(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegClosePath(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.cpp index c86265355..012e821ba 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.cpp @@ -77,8 +77,8 @@ JSObject* JSSVGPathSegCurvetoCubicAbsPrototype::self(ExecState* exec, JSGlobalOb const ClassInfo JSSVGPathSegCurvetoCubicAbs::s_info = { "SVGPathSegCurvetoCubicAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoCubicAbsTable, 0 }; -JSSVGPathSegCurvetoCubicAbs::JSSVGPathSegCurvetoCubicAbs(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegCurvetoCubicAbs::JSSVGPathSegCurvetoCubicAbs(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -94,43 +94,49 @@ bool JSSVGPathSegCurvetoCubicAbs::getOwnPropertySlot(ExecState* exec, const Iden JSValue jsSVGPathSegCurvetoCubicAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegCurvetoCubicAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } JSValue jsSVGPathSegCurvetoCubicAbsX1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x1()); } JSValue jsSVGPathSegCurvetoCubicAbsY1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y1()); } JSValue jsSVGPathSegCurvetoCubicAbsX2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x2()); } JSValue jsSVGPathSegCurvetoCubicAbsY2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y2()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.h index 7ffb1a004..e53a2080a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicAbs.h @@ -33,7 +33,7 @@ class SVGPathSegCurvetoCubicAbs; class JSSVGPathSegCurvetoCubicAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegCurvetoCubicAbs(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegCurvetoCubicAbs(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.cpp index 84c349cc5..c2b5c9b13 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.cpp @@ -77,8 +77,8 @@ JSObject* JSSVGPathSegCurvetoCubicRelPrototype::self(ExecState* exec, JSGlobalOb const ClassInfo JSSVGPathSegCurvetoCubicRel::s_info = { "SVGPathSegCurvetoCubicRel", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoCubicRelTable, 0 }; -JSSVGPathSegCurvetoCubicRel::JSSVGPathSegCurvetoCubicRel(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegCurvetoCubicRel::JSSVGPathSegCurvetoCubicRel(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -94,43 +94,49 @@ bool JSSVGPathSegCurvetoCubicRel::getOwnPropertySlot(ExecState* exec, const Iden JSValue jsSVGPathSegCurvetoCubicRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegCurvetoCubicRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } JSValue jsSVGPathSegCurvetoCubicRelX1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x1()); } JSValue jsSVGPathSegCurvetoCubicRelY1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y1()); } JSValue jsSVGPathSegCurvetoCubicRelX2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x2()); } JSValue jsSVGPathSegCurvetoCubicRelY2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y2()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.h index 87d358d82..0f79a9504 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicRel.h @@ -33,7 +33,7 @@ class SVGPathSegCurvetoCubicRel; class JSSVGPathSegCurvetoCubicRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegCurvetoCubicRel(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegCurvetoCubicRel(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.cpp index f5716b0f8..2ac3d0e3f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.cpp @@ -75,8 +75,8 @@ JSObject* JSSVGPathSegCurvetoCubicSmoothAbsPrototype::self(ExecState* exec, JSGl const ClassInfo JSSVGPathSegCurvetoCubicSmoothAbs::s_info = { "SVGPathSegCurvetoCubicSmoothAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoCubicSmoothAbsTable, 0 }; -JSSVGPathSegCurvetoCubicSmoothAbs::JSSVGPathSegCurvetoCubicSmoothAbs(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegCurvetoCubicSmoothAbs::JSSVGPathSegCurvetoCubicSmoothAbs(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -92,29 +92,33 @@ bool JSSVGPathSegCurvetoCubicSmoothAbs::getOwnPropertySlot(ExecState* exec, cons JSValue jsSVGPathSegCurvetoCubicSmoothAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicSmoothAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegCurvetoCubicSmoothAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicSmoothAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } JSValue jsSVGPathSegCurvetoCubicSmoothAbsX2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicSmoothAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x2()); } JSValue jsSVGPathSegCurvetoCubicSmoothAbsY2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicSmoothAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicSmoothAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y2()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.h index 9b4ce0fc9..b242e39a2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothAbs.h @@ -33,7 +33,7 @@ class SVGPathSegCurvetoCubicSmoothAbs; class JSSVGPathSegCurvetoCubicSmoothAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegCurvetoCubicSmoothAbs(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegCurvetoCubicSmoothAbs(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.cpp index c5c05d739..ed122a366 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.cpp @@ -75,8 +75,8 @@ JSObject* JSSVGPathSegCurvetoCubicSmoothRelPrototype::self(ExecState* exec, JSGl const ClassInfo JSSVGPathSegCurvetoCubicSmoothRel::s_info = { "SVGPathSegCurvetoCubicSmoothRel", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoCubicSmoothRelTable, 0 }; -JSSVGPathSegCurvetoCubicSmoothRel::JSSVGPathSegCurvetoCubicSmoothRel(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegCurvetoCubicSmoothRel::JSSVGPathSegCurvetoCubicSmoothRel(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -92,29 +92,33 @@ bool JSSVGPathSegCurvetoCubicSmoothRel::getOwnPropertySlot(ExecState* exec, cons JSValue jsSVGPathSegCurvetoCubicSmoothRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicSmoothRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicSmoothRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicSmoothRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegCurvetoCubicSmoothRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicSmoothRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicSmoothRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicSmoothRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } JSValue jsSVGPathSegCurvetoCubicSmoothRelX2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicSmoothRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicSmoothRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicSmoothRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x2()); } JSValue jsSVGPathSegCurvetoCubicSmoothRelY2(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoCubicSmoothRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoCubicSmoothRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoCubicSmoothRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y2()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.h index c705365be..557ae46ba 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoCubicSmoothRel.h @@ -33,7 +33,7 @@ class SVGPathSegCurvetoCubicSmoothRel; class JSSVGPathSegCurvetoCubicSmoothRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegCurvetoCubicSmoothRel(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegCurvetoCubicSmoothRel(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.cpp index 4170299bb..eb8515d3b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.cpp @@ -75,8 +75,8 @@ JSObject* JSSVGPathSegCurvetoQuadraticAbsPrototype::self(ExecState* exec, JSGlob const ClassInfo JSSVGPathSegCurvetoQuadraticAbs::s_info = { "SVGPathSegCurvetoQuadraticAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoQuadraticAbsTable, 0 }; -JSSVGPathSegCurvetoQuadraticAbs::JSSVGPathSegCurvetoQuadraticAbs(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegCurvetoQuadraticAbs::JSSVGPathSegCurvetoQuadraticAbs(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -92,29 +92,33 @@ bool JSSVGPathSegCurvetoQuadraticAbs::getOwnPropertySlot(ExecState* exec, const JSValue jsSVGPathSegCurvetoQuadraticAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoQuadraticAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoQuadraticAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoQuadraticAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegCurvetoQuadraticAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoQuadraticAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoQuadraticAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoQuadraticAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } JSValue jsSVGPathSegCurvetoQuadraticAbsX1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoQuadraticAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoQuadraticAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoQuadraticAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x1()); } JSValue jsSVGPathSegCurvetoQuadraticAbsY1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoQuadraticAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoQuadraticAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoQuadraticAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y1()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.h index 6feebd860..91125983e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticAbs.h @@ -33,7 +33,7 @@ class SVGPathSegCurvetoQuadraticAbs; class JSSVGPathSegCurvetoQuadraticAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegCurvetoQuadraticAbs(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegCurvetoQuadraticAbs(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.cpp index 4f5052255..c62f6ac34 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.cpp @@ -75,8 +75,8 @@ JSObject* JSSVGPathSegCurvetoQuadraticRelPrototype::self(ExecState* exec, JSGlob const ClassInfo JSSVGPathSegCurvetoQuadraticRel::s_info = { "SVGPathSegCurvetoQuadraticRel", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoQuadraticRelTable, 0 }; -JSSVGPathSegCurvetoQuadraticRel::JSSVGPathSegCurvetoQuadraticRel(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegCurvetoQuadraticRel::JSSVGPathSegCurvetoQuadraticRel(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -92,29 +92,33 @@ bool JSSVGPathSegCurvetoQuadraticRel::getOwnPropertySlot(ExecState* exec, const JSValue jsSVGPathSegCurvetoQuadraticRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoQuadraticRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoQuadraticRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoQuadraticRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegCurvetoQuadraticRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoQuadraticRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoQuadraticRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoQuadraticRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } JSValue jsSVGPathSegCurvetoQuadraticRelX1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoQuadraticRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoQuadraticRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoQuadraticRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x1()); } JSValue jsSVGPathSegCurvetoQuadraticRelY1(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoQuadraticRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoQuadraticRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoQuadraticRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y1()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.h index 50c484b44..cfbb1b378 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticRel.h @@ -33,7 +33,7 @@ class SVGPathSegCurvetoQuadraticRel; class JSSVGPathSegCurvetoQuadraticRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegCurvetoQuadraticRel(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegCurvetoQuadraticRel(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp index 0ebe08a0d..ea5f5da34 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp @@ -73,8 +73,8 @@ JSObject* JSSVGPathSegCurvetoQuadraticSmoothAbsPrototype::self(ExecState* exec, const ClassInfo JSSVGPathSegCurvetoQuadraticSmoothAbs::s_info = { "SVGPathSegCurvetoQuadraticSmoothAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoQuadraticSmoothAbsTable, 0 }; -JSSVGPathSegCurvetoQuadraticSmoothAbs::JSSVGPathSegCurvetoQuadraticSmoothAbs(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegCurvetoQuadraticSmoothAbs::JSSVGPathSegCurvetoQuadraticSmoothAbs(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -90,15 +90,17 @@ bool JSSVGPathSegCurvetoQuadraticSmoothAbs::getOwnPropertySlot(ExecState* exec, JSValue jsSVGPathSegCurvetoQuadraticSmoothAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoQuadraticSmoothAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoQuadraticSmoothAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoQuadraticSmoothAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegCurvetoQuadraticSmoothAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoQuadraticSmoothAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoQuadraticSmoothAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoQuadraticSmoothAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.h index dee998c67..48967a14c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothAbs.h @@ -33,7 +33,7 @@ class SVGPathSegCurvetoQuadraticSmoothAbs; class JSSVGPathSegCurvetoQuadraticSmoothAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegCurvetoQuadraticSmoothAbs(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegCurvetoQuadraticSmoothAbs(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.cpp index 69382f92c..56a716386 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.cpp @@ -73,8 +73,8 @@ JSObject* JSSVGPathSegCurvetoQuadraticSmoothRelPrototype::self(ExecState* exec, const ClassInfo JSSVGPathSegCurvetoQuadraticSmoothRel::s_info = { "SVGPathSegCurvetoQuadraticSmoothRel", &JSSVGPathSeg::s_info, &JSSVGPathSegCurvetoQuadraticSmoothRelTable, 0 }; -JSSVGPathSegCurvetoQuadraticSmoothRel::JSSVGPathSegCurvetoQuadraticSmoothRel(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegCurvetoQuadraticSmoothRel::JSSVGPathSegCurvetoQuadraticSmoothRel(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -90,15 +90,17 @@ bool JSSVGPathSegCurvetoQuadraticSmoothRel::getOwnPropertySlot(ExecState* exec, JSValue jsSVGPathSegCurvetoQuadraticSmoothRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoQuadraticSmoothRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoQuadraticSmoothRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoQuadraticSmoothRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegCurvetoQuadraticSmoothRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegCurvetoQuadraticSmoothRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegCurvetoQuadraticSmoothRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegCurvetoQuadraticSmoothRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.h index 5854a9460..8e786091d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegCurvetoQuadraticSmoothRel.h @@ -33,7 +33,7 @@ class SVGPathSegCurvetoQuadraticSmoothRel; class JSSVGPathSegCurvetoQuadraticSmoothRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegCurvetoQuadraticSmoothRel(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegCurvetoQuadraticSmoothRel(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.cpp index bd7a4917b..cb3049bba 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.cpp @@ -73,8 +73,8 @@ JSObject* JSSVGPathSegLinetoAbsPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSSVGPathSegLinetoAbs::s_info = { "SVGPathSegLinetoAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegLinetoAbsTable, 0 }; -JSSVGPathSegLinetoAbs::JSSVGPathSegLinetoAbs(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegLinetoAbs::JSSVGPathSegLinetoAbs(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -90,15 +90,17 @@ bool JSSVGPathSegLinetoAbs::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsSVGPathSegLinetoAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegLinetoAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegLinetoAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegLinetoAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegLinetoAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegLinetoAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegLinetoAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegLinetoAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.h index f737c49df..8e403de63 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoAbs.h @@ -33,7 +33,7 @@ class SVGPathSegLinetoAbs; class JSSVGPathSegLinetoAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegLinetoAbs(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegLinetoAbs(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.cpp index d5b7b4f1f..2a6a087bd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.cpp @@ -72,8 +72,8 @@ JSObject* JSSVGPathSegLinetoHorizontalAbsPrototype::self(ExecState* exec, JSGlob const ClassInfo JSSVGPathSegLinetoHorizontalAbs::s_info = { "SVGPathSegLinetoHorizontalAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegLinetoHorizontalAbsTable, 0 }; -JSSVGPathSegLinetoHorizontalAbs::JSSVGPathSegLinetoHorizontalAbs(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegLinetoHorizontalAbs::JSSVGPathSegLinetoHorizontalAbs(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -89,8 +89,9 @@ bool JSSVGPathSegLinetoHorizontalAbs::getOwnPropertySlot(ExecState* exec, const JSValue jsSVGPathSegLinetoHorizontalAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegLinetoHorizontalAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegLinetoHorizontalAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegLinetoHorizontalAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.h index fe2d270bd..237124aeb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalAbs.h @@ -33,7 +33,7 @@ class SVGPathSegLinetoHorizontalAbs; class JSSVGPathSegLinetoHorizontalAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegLinetoHorizontalAbs(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegLinetoHorizontalAbs(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.cpp index 2549cafda..68c5b374d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.cpp @@ -72,8 +72,8 @@ JSObject* JSSVGPathSegLinetoHorizontalRelPrototype::self(ExecState* exec, JSGlob const ClassInfo JSSVGPathSegLinetoHorizontalRel::s_info = { "SVGPathSegLinetoHorizontalRel", &JSSVGPathSeg::s_info, &JSSVGPathSegLinetoHorizontalRelTable, 0 }; -JSSVGPathSegLinetoHorizontalRel::JSSVGPathSegLinetoHorizontalRel(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegLinetoHorizontalRel::JSSVGPathSegLinetoHorizontalRel(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -89,8 +89,9 @@ bool JSSVGPathSegLinetoHorizontalRel::getOwnPropertySlot(ExecState* exec, const JSValue jsSVGPathSegLinetoHorizontalRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegLinetoHorizontalRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegLinetoHorizontalRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegLinetoHorizontalRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.h index b8edfb7cc..8c76dbf5d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoHorizontalRel.h @@ -33,7 +33,7 @@ class SVGPathSegLinetoHorizontalRel; class JSSVGPathSegLinetoHorizontalRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegLinetoHorizontalRel(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegLinetoHorizontalRel(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.cpp index 117083b57..d90984d92 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.cpp @@ -73,8 +73,8 @@ JSObject* JSSVGPathSegLinetoRelPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSSVGPathSegLinetoRel::s_info = { "SVGPathSegLinetoRel", &JSSVGPathSeg::s_info, &JSSVGPathSegLinetoRelTable, 0 }; -JSSVGPathSegLinetoRel::JSSVGPathSegLinetoRel(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegLinetoRel::JSSVGPathSegLinetoRel(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -90,15 +90,17 @@ bool JSSVGPathSegLinetoRel::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsSVGPathSegLinetoRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegLinetoRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegLinetoRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegLinetoRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegLinetoRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegLinetoRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegLinetoRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegLinetoRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.h index 5123bf16d..7d6e15608 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoRel.h @@ -33,7 +33,7 @@ class SVGPathSegLinetoRel; class JSSVGPathSegLinetoRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegLinetoRel(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegLinetoRel(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.cpp index dea3f902b..a51ca334f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.cpp @@ -72,8 +72,8 @@ JSObject* JSSVGPathSegLinetoVerticalAbsPrototype::self(ExecState* exec, JSGlobal const ClassInfo JSSVGPathSegLinetoVerticalAbs::s_info = { "SVGPathSegLinetoVerticalAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegLinetoVerticalAbsTable, 0 }; -JSSVGPathSegLinetoVerticalAbs::JSSVGPathSegLinetoVerticalAbs(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegLinetoVerticalAbs::JSSVGPathSegLinetoVerticalAbs(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -89,8 +89,9 @@ bool JSSVGPathSegLinetoVerticalAbs::getOwnPropertySlot(ExecState* exec, const Id JSValue jsSVGPathSegLinetoVerticalAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegLinetoVerticalAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegLinetoVerticalAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegLinetoVerticalAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.h index 184c021b0..8a2b51dad 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalAbs.h @@ -33,7 +33,7 @@ class SVGPathSegLinetoVerticalAbs; class JSSVGPathSegLinetoVerticalAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegLinetoVerticalAbs(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegLinetoVerticalAbs(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.cpp index e1ff669cf..03873cb5d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.cpp @@ -72,8 +72,8 @@ JSObject* JSSVGPathSegLinetoVerticalRelPrototype::self(ExecState* exec, JSGlobal const ClassInfo JSSVGPathSegLinetoVerticalRel::s_info = { "SVGPathSegLinetoVerticalRel", &JSSVGPathSeg::s_info, &JSSVGPathSegLinetoVerticalRelTable, 0 }; -JSSVGPathSegLinetoVerticalRel::JSSVGPathSegLinetoVerticalRel(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegLinetoVerticalRel::JSSVGPathSegLinetoVerticalRel(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -89,8 +89,9 @@ bool JSSVGPathSegLinetoVerticalRel::getOwnPropertySlot(ExecState* exec, const Id JSValue jsSVGPathSegLinetoVerticalRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegLinetoVerticalRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegLinetoVerticalRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegLinetoVerticalRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.h index a0cade446..25f03a0a3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegLinetoVerticalRel.h @@ -33,7 +33,7 @@ class SVGPathSegLinetoVerticalRel; class JSSVGPathSegLinetoVerticalRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegLinetoVerticalRel(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegLinetoVerticalRel(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.cpp index 8cfdc3c8c..fddc132cb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.cpp @@ -86,9 +86,8 @@ bool JSSVGPathSegListPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSSVGPathSegList::s_info = { "SVGPathSegList", 0, &JSSVGPathSegListTable, 0 }; -JSSVGPathSegList::JSSVGPathSegList(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGPathSegList::JSSVGPathSegList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -110,8 +109,9 @@ bool JSSVGPathSegList::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsSVGPathSegListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->numberOfItems()); } @@ -178,9 +178,9 @@ JSValue JSC_HOST_CALL jsSVGPathSegListPrototypeFunctionAppendItem(ExecState* exe return castedThisObj->appendItem(exec, args); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGPathSegList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGPathSegList* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGPathSegList* toSVGPathSegList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.h index 5815d2cde..dfa9d56a7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegList.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGPathSegList; -class JSSVGPathSegList : public DOMObject { - typedef DOMObject Base; +class JSSVGPathSegList : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGPathSegList(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGPathSegList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -57,14 +58,12 @@ public: JSC::JSValue removeItem(JSC::ExecState*, const JSC::ArgList&); JSC::JSValue appendItem(JSC::ExecState*, const JSC::ArgList&); SVGPathSegList* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGPathSegList*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGPathSegList*, SVGElement* context); SVGPathSegList* toSVGPathSegList(JSC::JSValue); class JSSVGPathSegListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.cpp index 88ef12213..836096b25 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.cpp @@ -73,8 +73,8 @@ JSObject* JSSVGPathSegMovetoAbsPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSSVGPathSegMovetoAbs::s_info = { "SVGPathSegMovetoAbs", &JSSVGPathSeg::s_info, &JSSVGPathSegMovetoAbsTable, 0 }; -JSSVGPathSegMovetoAbs::JSSVGPathSegMovetoAbs(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegMovetoAbs::JSSVGPathSegMovetoAbs(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -90,15 +90,17 @@ bool JSSVGPathSegMovetoAbs::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsSVGPathSegMovetoAbsX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegMovetoAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegMovetoAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegMovetoAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegMovetoAbsY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegMovetoAbs* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegMovetoAbs* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegMovetoAbs* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.h index 99e858267..d072b5df5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoAbs.h @@ -33,7 +33,7 @@ class SVGPathSegMovetoAbs; class JSSVGPathSegMovetoAbs : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegMovetoAbs(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegMovetoAbs(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.cpp index 1f572b2bf..ee180ac59 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.cpp @@ -73,8 +73,8 @@ JSObject* JSSVGPathSegMovetoRelPrototype::self(ExecState* exec, JSGlobalObject* const ClassInfo JSSVGPathSegMovetoRel::s_info = { "SVGPathSegMovetoRel", &JSSVGPathSeg::s_info, &JSSVGPathSegMovetoRelTable, 0 }; -JSSVGPathSegMovetoRel::JSSVGPathSegMovetoRel(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : JSSVGPathSeg(structure, impl, context) +JSSVGPathSegMovetoRel::JSSVGPathSegMovetoRel(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : JSSVGPathSeg(structure, globalObject, impl, context) { } @@ -90,15 +90,17 @@ bool JSSVGPathSegMovetoRel::getOwnPropertySlot(ExecState* exec, const Identifier JSValue jsSVGPathSegMovetoRelX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegMovetoRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegMovetoRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegMovetoRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsSVGPathSegMovetoRelY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPathSegMovetoRel* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPathSegMovetoRel* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPathSegMovetoRel* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.h index 179ea1a0c..c82f21680 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPathSegMovetoRel.h @@ -33,7 +33,7 @@ class SVGPathSegMovetoRel; class JSSVGPathSegMovetoRel : public JSSVGPathSeg { typedef JSSVGPathSeg Base; public: - JSSVGPathSegMovetoRel(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPathSegMovetoRel(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.cpp index 4616edcd4..90c5ce07f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.cpp @@ -112,8 +112,8 @@ bool JSSVGPatternElementPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSSVGPatternElement::s_info = { "SVGPatternElement", &JSSVGElement::s_info, &JSSVGPatternElementTable, 0 }; -JSSVGPatternElement::JSSVGPatternElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGPatternElement::JSSVGPatternElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -129,140 +129,158 @@ bool JSSVGPatternElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGPatternElementPatternUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->patternUnitsAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPatternElementPatternContentUnits(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->patternContentUnitsAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPatternElementPatternTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->patternTransformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPatternElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPatternElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPatternElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPatternElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPatternElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->hrefAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPatternElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGPatternElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGPatternElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGPatternElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGPatternElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGPatternElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGPatternElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGPatternElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGPatternElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPatternElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPatternElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGPatternElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGPatternElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->viewBoxAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPatternElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPatternElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPatternElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPatternElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->preserveAspectRatioAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } void JSSVGPatternElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -306,7 +324,7 @@ JSValue JSC_HOST_CALL jsSVGPatternElementPrototypeFunctionGetPresentationAttribu const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.h index 7541db17a..db19b4b74 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPatternElement.h @@ -33,7 +33,7 @@ class SVGPatternElement; class JSSVGPatternElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGPatternElement(PassRefPtr, PassRefPtr); + JSSVGPatternElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.cpp index d0050bf3f..8eff1cacc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.cpp @@ -81,9 +81,8 @@ bool JSSVGPointPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSSVGPoint::s_info = { "SVGPoint", 0, &JSSVGPointTable, 0 }; -JSSVGPoint::JSSVGPoint(PassRefPtr structure, PassRefPtr > impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGPoint::JSSVGPoint(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr > impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -105,15 +104,17 @@ bool JSSVGPoint::getOwnPropertySlot(ExecState* exec, const Identifier& propertyN JSValue jsSVGPointX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPoint* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - FloatPoint imp(*static_cast(asObject(slot.slotBase()))->impl()); + FloatPoint imp(*castedThis->impl()); return jsNumber(exec, imp.x()); } JSValue jsSVGPointY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPoint* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - FloatPoint imp(*static_cast(asObject(slot.slotBase()))->impl()); + FloatPoint imp(*castedThis->impl()); return jsNumber(exec, imp.y()); } @@ -147,14 +148,14 @@ JSValue JSC_HOST_CALL jsSVGPointPrototypeFunctionMatrixTransform(ExecState* exec TransformationMatrix matrix = toSVGMatrix(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp.matrixTransform(matrix)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp.matrixTransform(matrix)).get(), castedThisObj->context()); wrapper->commitChange(imp, castedThisObj->context()); return result; } -JSC::JSValue toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, JSSVGPODTypeWrapper* object, SVGElement* context) { - return getDOMObjectWrapper >(exec, object, context); + return getDOMObjectWrapper >(exec, globalObject, object, context); } FloatPoint toSVGPoint(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.h index 95ee72d5a..3f1b35ca4 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPoint.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "FloatPoint.h" #include "JSDOMBinding.h" #include "JSSVGPODTypeWrapper.h" @@ -32,10 +33,10 @@ namespace WebCore { -class JSSVGPoint : public DOMObject { - typedef DOMObject Base; +class JSSVGPoint : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGPoint(PassRefPtr, PassRefPtr >, SVGElement* context); + JSSVGPoint(PassRefPtr, JSDOMGlobalObject*, PassRefPtr >, SVGElement* context); virtual ~JSSVGPoint(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -48,15 +49,13 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - JSSVGPODTypeWrapper* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } + JSSVGPODTypeWrapper * impl() const { return m_impl.get(); } private: - RefPtr m_context; RefPtr > m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, JSSVGPODTypeWrapper*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, JSSVGPODTypeWrapper*, SVGElement* context); FloatPoint toSVGPoint(JSC::JSValue); class JSSVGPointPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.cpp index 5c911bd6c..b01266de2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.cpp @@ -85,9 +85,8 @@ bool JSSVGPointListPrototype::getOwnPropertySlot(ExecState* exec, const Identifi const ClassInfo JSSVGPointList::s_info = { "SVGPointList", 0, &JSSVGPointListTable, 0 }; -JSSVGPointList::JSSVGPointList(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGPointList::JSSVGPointList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -109,8 +108,9 @@ bool JSSVGPointList::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsSVGPointListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPointList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPointList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPointList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->numberOfItems()); } @@ -177,9 +177,9 @@ JSValue JSC_HOST_CALL jsSVGPointListPrototypeFunctionAppendItem(ExecState* exec, return castedThisObj->appendItem(exec, args); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGPointList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGPointList* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGPointList* toSVGPointList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.h index 29bd3230e..3e39aae0d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPointList.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGPointList; -class JSSVGPointList : public DOMObject { - typedef DOMObject Base; +class JSSVGPointList : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGPointList(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPointList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGPointList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -57,14 +58,12 @@ public: JSC::JSValue removeItem(JSC::ExecState*, const JSC::ArgList&); JSC::JSValue appendItem(JSC::ExecState*, const JSC::ArgList&); SVGPointList* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGPointList*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGPointList*, SVGElement* context); SVGPointList* toSVGPointList(JSC::JSValue); class JSSVGPointListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.cpp index aba8123ac..8e517a126 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.cpp @@ -113,8 +113,8 @@ bool JSSVGPolygonElementPrototype::getOwnPropertySlot(ExecState* exec, const Ide const ClassInfo JSSVGPolygonElement::s_info = { "SVGPolygonElement", &JSSVGElement::s_info, &JSSVGPolygonElementTable, 0 }; -JSSVGPolygonElement::JSSVGPolygonElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGPolygonElement::JSSVGPolygonElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -130,96 +130,109 @@ bool JSSVGPolygonElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGPolygonElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolygonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolygonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGPolygonElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGPolygonElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolygonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolygonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGPolygonElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGPolygonElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolygonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolygonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGPolygonElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGPolygonElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolygonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolygonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPolygonElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGPolygonElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolygonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolygonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPolygonElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGPolygonElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolygonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolygonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPolygonElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPolygonElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolygonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolygonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPolygonElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPolygonElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolygonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolygonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGPolygonElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGPolygonElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolygonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolygonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPolygonElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPolygonElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolygonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolygonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGPolygonElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGPolygonElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolygonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolygonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGPolygonElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } JSValue jsSVGPolygonElementPoints(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolygonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolygonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->points()), imp); + SVGPolygonElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->points()), imp); } JSValue jsSVGPolygonElementAnimatedPoints(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolygonElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolygonElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->animatedPoints()), imp); + SVGPolygonElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->animatedPoints()), imp); } void JSSVGPolygonElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -263,7 +276,7 @@ JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetPresentationAttribu const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -276,7 +289,7 @@ JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetBBox(ExecState* exe SVGPolygonElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -289,7 +302,7 @@ JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetCTM(ExecState* exec SVGPolygonElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -302,7 +315,7 @@ JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetScreenCTM(ExecState SVGPolygonElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -317,7 +330,7 @@ JSValue JSC_HOST_CALL jsSVGPolygonElementPrototypeFunctionGetTransformToElement( SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.h index b4c31314c..f07549c2c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPolygonElement.h @@ -33,7 +33,7 @@ class SVGPolygonElement; class JSSVGPolygonElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGPolygonElement(PassRefPtr, PassRefPtr); + JSSVGPolygonElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.cpp index 8a967cd0d..6bd7b70a2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.cpp @@ -113,8 +113,8 @@ bool JSSVGPolylineElementPrototype::getOwnPropertySlot(ExecState* exec, const Id const ClassInfo JSSVGPolylineElement::s_info = { "SVGPolylineElement", &JSSVGElement::s_info, &JSSVGPolylineElementTable, 0 }; -JSSVGPolylineElement::JSSVGPolylineElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGPolylineElement::JSSVGPolylineElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -130,96 +130,109 @@ bool JSSVGPolylineElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGPolylineElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolylineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolylineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGPolylineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGPolylineElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolylineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolylineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGPolylineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGPolylineElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolylineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolylineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGPolylineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGPolylineElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolylineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolylineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPolylineElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGPolylineElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolylineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolylineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPolylineElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGPolylineElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolylineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolylineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPolylineElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPolylineElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolylineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolylineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPolylineElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPolylineElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolylineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolylineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGPolylineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGPolylineElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolylineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolylineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPolylineElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGPolylineElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolylineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolylineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGPolylineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGPolylineElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolylineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolylineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGPolylineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } JSValue jsSVGPolylineElementPoints(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolylineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolylineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->points()), imp); + SVGPolylineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->points()), imp); } JSValue jsSVGPolylineElementAnimatedPoints(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPolylineElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPolylineElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->animatedPoints()), imp); + SVGPolylineElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->animatedPoints()), imp); } void JSSVGPolylineElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -263,7 +276,7 @@ JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetPresentationAttrib const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -276,7 +289,7 @@ JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetBBox(ExecState* ex SVGPolylineElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -289,7 +302,7 @@ JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetCTM(ExecState* exe SVGPolylineElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -302,7 +315,7 @@ JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetScreenCTM(ExecStat SVGPolylineElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -317,7 +330,7 @@ JSValue JSC_HOST_CALL jsSVGPolylineElementPrototypeFunctionGetTransformToElement SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.h index 6501a25f3..8260e0d1a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPolylineElement.h @@ -33,7 +33,7 @@ class SVGPolylineElement; class JSSVGPolylineElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGPolylineElement(PassRefPtr, PassRefPtr); + JSSVGPolylineElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.cpp index 85e123c80..dd40aff26 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.cpp @@ -79,12 +79,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGPreserveAspectRatioConstructorTable = { 35, 31, JSSVGPreserveAspectRatioConstructorTableValues, 0 }; #endif -class JSSVGPreserveAspectRatioConstructor : public DOMObject { +class JSSVGPreserveAspectRatioConstructor : public DOMConstructorObject { public: - JSSVGPreserveAspectRatioConstructor(ExecState* exec) - : DOMObject(JSSVGPreserveAspectRatioConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGPreserveAspectRatioConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGPreserveAspectRatioConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGPreserveAspectRatioPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGPreserveAspectRatioPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -145,9 +145,8 @@ bool JSSVGPreserveAspectRatioPrototype::getOwnPropertySlot(ExecState* exec, cons const ClassInfo JSSVGPreserveAspectRatio::s_info = { "SVGPreserveAspectRatio", 0, &JSSVGPreserveAspectRatioTable, 0 }; -JSSVGPreserveAspectRatio::JSSVGPreserveAspectRatio(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGPreserveAspectRatio::JSSVGPreserveAspectRatio(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -169,21 +168,24 @@ bool JSSVGPreserveAspectRatio::getOwnPropertySlot(ExecState* exec, const Identif JSValue jsSVGPreserveAspectRatioAlign(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPreserveAspectRatio* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPreserveAspectRatio* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPreserveAspectRatio* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->align()); } JSValue jsSVGPreserveAspectRatioMeetOrSlice(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGPreserveAspectRatio* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGPreserveAspectRatio* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGPreserveAspectRatio* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->meetOrSlice()); } JSValue jsSVGPreserveAspectRatioConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + UNUSED_PARAM(slot); + return JSSVGPreserveAspectRatio::getConstructor(exec, deprecatedGlobalObjectForPrototype(exec)); } void JSSVGPreserveAspectRatio::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -206,9 +208,9 @@ void setJSSVGPreserveAspectRatioMeetOrSlice(ExecState* exec, JSObject* thisObjec static_cast(thisObject)->context()->svgAttributeChanged(static_cast(thisObject)->impl()->associatedAttributeName()); } -JSValue JSSVGPreserveAspectRatio::getConstructor(ExecState* exec) +JSValue JSSVGPreserveAspectRatio::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } // Constant getters @@ -283,9 +285,9 @@ JSValue jsSVGPreserveAspectRatioSVG_MEETORSLICE_SLICE(ExecState* exec, const Ide return jsNumber(exec, static_cast(2)); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGPreserveAspectRatio* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGPreserveAspectRatio* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGPreserveAspectRatio* toSVGPreserveAspectRatio(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.h b/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.h index d8c7fc882..7835542a2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGPreserveAspectRatio.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGPreserveAspectRatio; -class JSSVGPreserveAspectRatio : public DOMObject { - typedef DOMObject Base; +class JSSVGPreserveAspectRatio : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGPreserveAspectRatio(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGPreserveAspectRatio(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGPreserveAspectRatio(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -48,16 +49,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); SVGPreserveAspectRatio* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGPreserveAspectRatio*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGPreserveAspectRatio*, SVGElement* context); SVGPreserveAspectRatio* toSVGPreserveAspectRatio(JSC::JSValue); class JSSVGPreserveAspectRatioPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.cpp index ae2d18e9c..b6e6e63c5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.cpp @@ -76,8 +76,8 @@ JSObject* JSSVGRadialGradientElementPrototype::self(ExecState* exec, JSGlobalObj const ClassInfo JSSVGRadialGradientElement::s_info = { "SVGRadialGradientElement", &JSSVGGradientElement::s_info, &JSSVGRadialGradientElementTable, 0 }; -JSSVGRadialGradientElement::JSSVGRadialGradientElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGGradientElement(structure, impl) +JSSVGRadialGradientElement::JSSVGRadialGradientElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGGradientElement(structure, globalObject, impl) { } @@ -93,42 +93,47 @@ bool JSSVGRadialGradientElement::getOwnPropertySlot(ExecState* exec, const Ident JSValue jsSVGRadialGradientElementCx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRadialGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRadialGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRadialGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->cxAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGRadialGradientElementCy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRadialGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRadialGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRadialGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->cyAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGRadialGradientElementR(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRadialGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRadialGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRadialGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->rAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGRadialGradientElementFx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRadialGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRadialGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRadialGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->fxAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGRadialGradientElementFy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRadialGradientElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRadialGradientElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRadialGradientElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->fyAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.h index a0e34a55b..575f51173 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRadialGradientElement.h @@ -33,7 +33,7 @@ class SVGRadialGradientElement; class JSSVGRadialGradientElement : public JSSVGGradientElement { typedef JSSVGGradientElement Base; public: - JSSVGRadialGradientElement(PassRefPtr, PassRefPtr); + JSSVGRadialGradientElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRect.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGRect.cpp index 59e412761..6dc78d71e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRect.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRect.cpp @@ -74,9 +74,8 @@ JSObject* JSSVGRectPrototype::self(ExecState* exec, JSGlobalObject* globalObject const ClassInfo JSSVGRect::s_info = { "SVGRect", 0, &JSSVGRectTable, 0 }; -JSSVGRect::JSSVGRect(PassRefPtr structure, PassRefPtr > impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGRect::JSSVGRect(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr > impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -99,29 +98,33 @@ bool JSSVGRect::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa JSValue jsSVGRectX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - FloatRect imp(*static_cast(asObject(slot.slotBase()))->impl()); + FloatRect imp(*castedThis->impl()); return jsNumber(exec, imp.x()); } JSValue jsSVGRectY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - FloatRect imp(*static_cast(asObject(slot.slotBase()))->impl()); + FloatRect imp(*castedThis->impl()); return jsNumber(exec, imp.y()); } JSValue jsSVGRectWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - FloatRect imp(*static_cast(asObject(slot.slotBase()))->impl()); + FloatRect imp(*castedThis->impl()); return jsNumber(exec, imp.width()); } JSValue jsSVGRectHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRect* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - FloatRect imp(*static_cast(asObject(slot.slotBase()))->impl()); + FloatRect imp(*castedThis->impl()); return jsNumber(exec, imp.height()); } @@ -158,9 +161,9 @@ void setJSSVGRectHeight(ExecState* exec, JSObject* thisObject, JSValue value) static_cast(thisObject)->impl()->commitChange(imp, static_cast(thisObject)->context()); } -JSC::JSValue toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, JSSVGPODTypeWrapper* object, SVGElement* context) { - return getDOMObjectWrapper >(exec, object, context); + return getDOMObjectWrapper >(exec, globalObject, object, context); } FloatRect toSVGRect(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRect.h b/src/3rdparty/webkit/WebCore/generated/JSSVGRect.h index b699a0346..4a077d697 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRect.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRect.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "FloatRect.h" #include "JSDOMBinding.h" #include "JSSVGPODTypeWrapper.h" @@ -32,10 +33,10 @@ namespace WebCore { -class JSSVGRect : public DOMObject { - typedef DOMObject Base; +class JSSVGRect : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGRect(PassRefPtr, PassRefPtr >, SVGElement* context); + JSSVGRect(PassRefPtr, JSDOMGlobalObject*, PassRefPtr >, SVGElement* context); virtual ~JSSVGRect(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -48,15 +49,13 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - JSSVGPODTypeWrapper* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } + JSSVGPODTypeWrapper * impl() const { return m_impl.get(); } private: - RefPtr m_context; RefPtr > m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, JSSVGPODTypeWrapper*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, JSSVGPODTypeWrapper*, SVGElement* context); FloatRect toSVGRect(JSC::JSValue); class JSSVGRectPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.cpp index 423808c1e..9f1f76d81 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.cpp @@ -116,8 +116,8 @@ bool JSSVGRectElementPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSSVGRectElement::s_info = { "SVGRectElement", &JSSVGElement::s_info, &JSSVGRectElementTable, 0 }; -JSSVGRectElement::JSSVGRectElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGRectElement::JSSVGRectElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -133,130 +133,147 @@ bool JSSVGRectElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsSVGRectElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGRectElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGRectElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGRectElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGRectElementRx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->rxAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGRectElementRy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->ryAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGRectElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGRectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGRectElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGRectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGRectElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGRectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGRectElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGRectElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRectElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGRectElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGRectElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGRectElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGRectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGRectElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGRectElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGRectElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGRectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGRectElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGRectElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGRectElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGRectElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } void JSSVGRectElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -300,7 +317,7 @@ JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetPresentationAttribute( const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -313,7 +330,7 @@ JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetBBox(ExecState* exec, SVGRectElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -326,7 +343,7 @@ JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetCTM(ExecState* exec, J SVGRectElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -339,7 +356,7 @@ JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetScreenCTM(ExecState* e SVGRectElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -354,7 +371,7 @@ JSValue JSC_HOST_CALL jsSVGRectElementPrototypeFunctionGetTransformToElement(Exe SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.h index 342b4be9d..d20104bcf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRectElement.h @@ -33,7 +33,7 @@ class SVGRectElement; class JSSVGRectElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGRectElement(PassRefPtr, PassRefPtr); + JSSVGRectElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.cpp index 938f09792..9934b0b74 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.cpp @@ -68,12 +68,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGRenderingIntentConstructorTable = { 16, 15, JSSVGRenderingIntentConstructorTableValues, 0 }; #endif -class JSSVGRenderingIntentConstructor : public DOMObject { +class JSSVGRenderingIntentConstructor : public DOMConstructorObject { public: - JSSVGRenderingIntentConstructor(ExecState* exec) - : DOMObject(JSSVGRenderingIntentConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGRenderingIntentConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGRenderingIntentConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGRenderingIntentPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGRenderingIntentPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -126,9 +126,8 @@ bool JSSVGRenderingIntentPrototype::getOwnPropertySlot(ExecState* exec, const Id const ClassInfo JSSVGRenderingIntent::s_info = { "SVGRenderingIntent", 0, &JSSVGRenderingIntentTable, 0 }; -JSSVGRenderingIntent::JSSVGRenderingIntent(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGRenderingIntent::JSSVGRenderingIntent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -150,11 +149,12 @@ bool JSSVGRenderingIntent::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGRenderingIntentConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + UNUSED_PARAM(slot); + return JSSVGRenderingIntent::getConstructor(exec, deprecatedGlobalObjectForPrototype(exec)); } -JSValue JSSVGRenderingIntent::getConstructor(ExecState* exec) +JSValue JSSVGRenderingIntent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } // Constant getters @@ -189,9 +189,9 @@ JSValue jsSVGRenderingIntentRENDERING_INTENT_ABSOLUTE_COLORIMETRIC(ExecState* ex return jsNumber(exec, static_cast(5)); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGRenderingIntent* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGRenderingIntent* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGRenderingIntent* toSVGRenderingIntent(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.h b/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.h index 22aff9cdf..8dad637ef 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGRenderingIntent.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGRenderingIntent; -class JSSVGRenderingIntent : public DOMObject { - typedef DOMObject Base; +class JSSVGRenderingIntent : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGRenderingIntent(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGRenderingIntent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGRenderingIntent(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,16 +48,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); SVGRenderingIntent* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGRenderingIntent*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGRenderingIntent*, SVGElement* context); SVGRenderingIntent* toSVGRenderingIntent(JSC::JSValue); class JSSVGRenderingIntentPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.cpp index b6107797c..5fec42f77 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.cpp @@ -165,8 +165,8 @@ bool JSSVGSVGElementPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSSVGSVGElement::s_info = { "SVGSVGElement", &JSSVGElement::s_info, &JSSVGSVGElementTable, 0 }; -JSSVGSVGElement::JSSVGSVGElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGSVGElement::JSSVGSVGElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -182,198 +182,225 @@ bool JSSVGSVGElement::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsSVGSVGElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSVGElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSVGElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSVGElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSVGElementContentScriptType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->contentScriptType()); } JSValue jsSVGSVGElementContentStyleType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->contentStyleType()); } JSValue jsSVGSVGElementViewport(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->viewport()).get(), imp); + SVGSVGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->viewport()).get(), imp); } JSValue jsSVGSVGElementPixelUnitToMillimeterX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->pixelUnitToMillimeterX()); } JSValue jsSVGSVGElementPixelUnitToMillimeterY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->pixelUnitToMillimeterY()); } JSValue jsSVGSVGElementScreenPixelToMillimeterX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->screenPixelToMillimeterX()); } JSValue jsSVGSVGElementScreenPixelToMillimeterY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->screenPixelToMillimeterY()); } JSValue jsSVGSVGElementUseCurrentView(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); return jsBoolean(imp->useCurrentView()); } JSValue jsSVGSVGElementCurrentScale(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->currentScale()); } JSValue jsSVGSVGElementCurrentTranslate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, JSSVGStaticPODTypeWrapperWithParent::create(imp, &SVGSVGElement::currentTranslate, &SVGSVGElement::setCurrentTranslate).get(), imp); + SVGSVGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), JSSVGStaticPODTypeWrapperWithParent::create(imp, &SVGSVGElement::currentTranslate, &SVGSVGElement::setCurrentTranslate).get(), imp); } JSValue jsSVGSVGElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGSVGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGSVGElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGSVGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGSVGElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGSVGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGSVGElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGSVGElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGSVGElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSVGElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSVGElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGSVGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGSVGElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGSVGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGSVGElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGSVGElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } JSValue jsSVGSVGElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->viewBoxAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSVGElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->preserveAspectRatioAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSVGElementZoomAndPan(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSVGElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSVGElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSVGElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->zoomAndPan()); } @@ -551,7 +578,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetIntersectionList(ExecSt SVGElement* referenceElement = toSVGElement(args.at(1)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getIntersectionList(rect, referenceElement))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getIntersectionList(rect, referenceElement))); return result; } @@ -566,7 +593,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetEnclosureList(ExecState SVGElement* referenceElement = toSVGElement(args.at(1)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getEnclosureList(rect, referenceElement))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getEnclosureList(rect, referenceElement))); return result; } @@ -621,7 +648,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGNumber(ExecState* SVGSVGElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->createSVGNumber()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->createSVGNumber()).get(), imp); return result; } @@ -634,7 +661,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGLength(ExecState* SVGSVGElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->createSVGLength()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->createSVGLength()).get(), imp); return result; } @@ -647,7 +674,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGAngle(ExecState* SVGSVGElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createSVGAngle()), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createSVGAngle()), imp); return result; } @@ -660,7 +687,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGPoint(ExecState* SVGSVGElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->createSVGPoint()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->createSVGPoint()).get(), imp); return result; } @@ -673,7 +700,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGMatrix(ExecState* SVGSVGElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->createSVGMatrix()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->createSVGMatrix()).get(), imp); return result; } @@ -686,7 +713,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGRect(ExecState* e SVGSVGElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->createSVGRect()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->createSVGRect()).get(), imp); return result; } @@ -699,7 +726,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGTransform(ExecSta SVGSVGElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->createSVGTransform()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->createSVGTransform()).get(), imp); return result; } @@ -713,7 +740,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionCreateSVGTransformFromMatr TransformationMatrix matrix = toSVGMatrix(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->createSVGTransformFromMatrix(matrix)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->createSVGTransformFromMatrix(matrix)).get(), imp); return result; } @@ -741,7 +768,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetPresentationAttribute(E const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -754,7 +781,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetBBox(ExecState* exec, J SVGSVGElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -767,7 +794,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetCTM(ExecState* exec, JS SVGSVGElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -780,7 +807,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetScreenCTM(ExecState* ex SVGSVGElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -795,7 +822,7 @@ JSValue JSC_HOST_CALL jsSVGSVGElementPrototypeFunctionGetTransformToElement(Exec SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.h index 7701efe9d..2883b06b3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSVGElement.h @@ -33,7 +33,7 @@ class SVGSVGElement; class JSSVGSVGElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGSVGElement(PassRefPtr, PassRefPtr); + JSSVGSVGElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.cpp index 4c8e140fb..69a416990 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.cpp @@ -77,8 +77,8 @@ JSObject* JSSVGScriptElementPrototype::self(ExecState* exec, JSGlobalObject* glo const ClassInfo JSSVGScriptElement::s_info = { "SVGScriptElement", &JSSVGElement::s_info, &JSSVGScriptElementTable, 0 }; -JSSVGScriptElement::JSSVGScriptElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGScriptElement::JSSVGScriptElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -94,25 +94,28 @@ bool JSSVGScriptElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsSVGScriptElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGScriptElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGScriptElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGScriptElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsSVGScriptElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGScriptElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGScriptElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGScriptElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->hrefAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGScriptElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGScriptElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGScriptElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGScriptElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } void JSSVGScriptElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.h index 0d7eb3ade..b0c514314 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGScriptElement.h @@ -33,7 +33,7 @@ class SVGScriptElement; class JSSVGScriptElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGScriptElement(PassRefPtr, PassRefPtr); + JSSVGScriptElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.cpp index 35f878750..44316855b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGSetElementPrototype::self(ExecState* exec, JSGlobalObject* global const ClassInfo JSSVGSetElement::s_info = { "SVGSetElement", &JSSVGAnimationElement::s_info, 0, 0 }; -JSSVGSetElement::JSSVGSetElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGAnimationElement(structure, impl) +JSSVGSetElement::JSSVGSetElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGAnimationElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.h index 23e7382c9..2d70694b0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSetElement.h @@ -33,7 +33,7 @@ class SVGSetElement; class JSSVGSetElement : public JSSVGAnimationElement { typedef JSSVGAnimationElement Base; public: - JSSVGSetElement(PassRefPtr, PassRefPtr); + JSSVGSetElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.cpp index ea8be7864..ed15447a1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.cpp @@ -87,8 +87,8 @@ bool JSSVGStopElementPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSSVGStopElement::s_info = { "SVGStopElement", &JSSVGElement::s_info, &JSSVGStopElementTable, 0 }; -JSSVGStopElement::JSSVGStopElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGStopElement::JSSVGStopElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -104,25 +104,28 @@ bool JSSVGStopElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsSVGStopElementOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGStopElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGStopElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGStopElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->offsetAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGStopElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGStopElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGStopElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGStopElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGStopElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGStopElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGStopElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGStopElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue JSC_HOST_CALL jsSVGStopElementPrototypeFunctionGetPresentationAttribute(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -135,7 +138,7 @@ JSValue JSC_HOST_CALL jsSVGStopElementPrototypeFunctionGetPresentationAttribute( const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.h index 56f181a1a..b2bd243c8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGStopElement.h @@ -33,7 +33,7 @@ class SVGStopElement; class JSSVGStopElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGStopElement(PassRefPtr, PassRefPtr); + JSSVGStopElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.cpp index 1f806270e..3ccbeaf35 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.cpp @@ -87,9 +87,8 @@ bool JSSVGStringListPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSSVGStringList::s_info = { "SVGStringList", 0, &JSSVGStringListTable, 0 }; -JSSVGStringList::JSSVGStringList(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGStringList::JSSVGStringList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -111,8 +110,9 @@ bool JSSVGStringList::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsSVGStringListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGStringList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGStringList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGStringList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->numberOfItems()); } @@ -228,9 +228,9 @@ JSValue JSC_HOST_CALL jsSVGStringListPrototypeFunctionAppendItem(ExecState* exec return result; } -JSC::JSValue toJS(JSC::ExecState* exec, SVGStringList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGStringList* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGStringList* toSVGStringList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.h index e7b631ea4..c880b8c68 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGStringList.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGStringList; -class JSSVGStringList : public DOMObject { - typedef DOMObject Base; +class JSSVGStringList : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGStringList(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGStringList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGStringList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -48,14 +49,12 @@ public: } SVGStringList* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGStringList*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGStringList*, SVGElement* context); SVGStringList* toSVGStringList(JSC::JSValue); class JSSVGStringListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.cpp index 1d7bd7a39..2e0c093f3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.cpp @@ -76,8 +76,8 @@ JSObject* JSSVGStyleElementPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSSVGStyleElement::s_info = { "SVGStyleElement", &JSSVGElement::s_info, &JSSVGStyleElementTable, 0 }; -JSSVGStyleElement::JSSVGStyleElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGStyleElement::JSSVGStyleElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -93,29 +93,33 @@ bool JSSVGStyleElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsSVGStyleElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGStyleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGStyleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGStyleElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGStyleElementType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGStyleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGStyleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGStyleElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->type()); } JSValue jsSVGStyleElementMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGStyleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGStyleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGStyleElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->media()); } JSValue jsSVGStyleElementTitle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGStyleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGStyleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGStyleElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->title()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.h index d318c527e..adf3ee22b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGStyleElement.h @@ -33,7 +33,7 @@ class SVGStyleElement; class JSSVGStyleElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGStyleElement(PassRefPtr, PassRefPtr); + JSSVGStyleElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.cpp index 83b2146e6..b8c180f16 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.cpp @@ -109,8 +109,8 @@ bool JSSVGSwitchElementPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSSVGSwitchElement::s_info = { "SVGSwitchElement", &JSSVGElement::s_info, &JSSVGSwitchElementTable, 0 }; -JSSVGSwitchElement::JSSVGSwitchElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGSwitchElement::JSSVGSwitchElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -126,82 +126,93 @@ bool JSSVGSwitchElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsSVGSwitchElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSwitchElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSwitchElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGSwitchElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGSwitchElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSwitchElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSwitchElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGSwitchElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGSwitchElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSwitchElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSwitchElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGSwitchElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGSwitchElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSwitchElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSwitchElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSwitchElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGSwitchElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSwitchElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSwitchElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSwitchElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGSwitchElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSwitchElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSwitchElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSwitchElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSwitchElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSwitchElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSwitchElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSwitchElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSwitchElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSwitchElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSwitchElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGSwitchElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGSwitchElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSwitchElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSwitchElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSwitchElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSwitchElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSwitchElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSwitchElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGSwitchElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGSwitchElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSwitchElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSwitchElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGSwitchElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } void JSSVGSwitchElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -245,7 +256,7 @@ JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetPresentationAttribut const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -258,7 +269,7 @@ JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetBBox(ExecState* exec SVGSwitchElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -271,7 +282,7 @@ JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetCTM(ExecState* exec, SVGSwitchElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -284,7 +295,7 @@ JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetScreenCTM(ExecState* SVGSwitchElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -299,7 +310,7 @@ JSValue JSC_HOST_CALL jsSVGSwitchElementPrototypeFunctionGetTransformToElement(E SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.h index 3ae9bd106..727362248 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSwitchElement.h @@ -33,7 +33,7 @@ class SVGSwitchElement; class JSSVGSwitchElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGSwitchElement(PassRefPtr, PassRefPtr); + JSSVGSwitchElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.cpp index 4a34e05ea..c5d16b088 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.cpp @@ -95,8 +95,8 @@ bool JSSVGSymbolElementPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSSVGSymbolElement::s_info = { "SVGSymbolElement", &JSSVGElement::s_info, &JSSVGSymbolElementTable, 0 }; -JSSVGSymbolElement::JSSVGSymbolElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGSymbolElement::JSSVGSymbolElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -112,55 +112,62 @@ bool JSSVGSymbolElement::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsSVGSymbolElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSymbolElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSymbolElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSymbolElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGSymbolElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSymbolElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSymbolElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSymbolElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGSymbolElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSymbolElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSymbolElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSymbolElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSymbolElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSymbolElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSymbolElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSymbolElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSymbolElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSymbolElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSymbolElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGSymbolElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGSymbolElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSymbolElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSymbolElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSymbolElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->viewBoxAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGSymbolElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGSymbolElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGSymbolElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGSymbolElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->preserveAspectRatioAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } void JSSVGSymbolElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -190,7 +197,7 @@ JSValue JSC_HOST_CALL jsSVGSymbolElementPrototypeFunctionGetPresentationAttribut const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.h index c5e5f711c..11aaced60 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGSymbolElement.h @@ -33,7 +33,7 @@ class SVGSymbolElement; class JSSVGSymbolElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGSymbolElement(PassRefPtr, PassRefPtr); + JSSVGSymbolElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.cpp index 8ee0f5f90..85777769d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.cpp @@ -72,8 +72,8 @@ JSObject* JSSVGTRefElementPrototype::self(ExecState* exec, JSGlobalObject* globa const ClassInfo JSSVGTRefElement::s_info = { "SVGTRefElement", &JSSVGTextPositioningElement::s_info, &JSSVGTRefElementTable, 0 }; -JSSVGTRefElement::JSSVGTRefElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGTextPositioningElement(structure, impl) +JSSVGTRefElement::JSSVGTRefElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGTextPositioningElement(structure, globalObject, impl) { } @@ -89,10 +89,11 @@ bool JSSVGTRefElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsSVGTRefElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTRefElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTRefElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTRefElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->hrefAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.h index e70e821cb..eabb96d64 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTRefElement.h @@ -33,7 +33,7 @@ class SVGTRefElement; class JSSVGTRefElement : public JSSVGTextPositioningElement { typedef JSSVGTextPositioningElement Base; public: - JSSVGTRefElement(PassRefPtr, PassRefPtr); + JSSVGTRefElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.cpp index 5203dfbb7..a0a593b8c 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.cpp @@ -56,8 +56,8 @@ JSObject* JSSVGTSpanElementPrototype::self(ExecState* exec, JSGlobalObject* glob const ClassInfo JSSVGTSpanElement::s_info = { "SVGTSpanElement", &JSSVGTextPositioningElement::s_info, 0, 0 }; -JSSVGTSpanElement::JSSVGTSpanElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGTextPositioningElement(structure, impl) +JSSVGTSpanElement::JSSVGTSpanElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGTextPositioningElement(structure, globalObject, impl) { } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.h index a3e9b6a7c..d85c4f110 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTSpanElement.h @@ -33,7 +33,7 @@ class SVGTSpanElement; class JSSVGTSpanElement : public JSSVGTextPositioningElement { typedef JSSVGTextPositioningElement Base; public: - JSSVGTSpanElement(PassRefPtr, PassRefPtr); + JSSVGTSpanElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } static const JSC::ClassInfo s_info; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.cpp index 4208aa38f..ff8c8aa32 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.cpp @@ -94,12 +94,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGTextContentElementConstructorTable = { 8, 7, JSSVGTextContentElementConstructorTableValues, 0 }; #endif -class JSSVGTextContentElementConstructor : public DOMObject { +class JSSVGTextContentElementConstructor : public DOMConstructorObject { public: - JSSVGTextContentElementConstructor(ExecState* exec) - : DOMObject(JSSVGTextContentElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGTextContentElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGTextContentElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGTextContentElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGTextContentElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -160,8 +160,8 @@ bool JSSVGTextContentElementPrototype::getOwnPropertySlot(ExecState* exec, const const ClassInfo JSSVGTextContentElement::s_info = { "SVGTextContentElement", &JSSVGElement::s_info, &JSSVGTextContentElementTable, 0 }; -JSSVGTextContentElement::JSSVGTextContentElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGTextContentElement::JSSVGTextContentElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -177,81 +177,92 @@ bool JSSVGTextContentElement::getOwnPropertySlot(ExecState* exec, const Identifi JSValue jsSVGTextContentElementTextLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextContentElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextContentElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextContentElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->textLengthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTextContentElementLengthAdjust(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextContentElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextContentElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextContentElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->lengthAdjustAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTextContentElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextContentElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextContentElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGTextContentElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGTextContentElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextContentElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextContentElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGTextContentElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGTextContentElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextContentElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextContentElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGTextContentElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGTextContentElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextContentElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextContentElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextContentElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGTextContentElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextContentElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextContentElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextContentElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGTextContentElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextContentElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextContentElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextContentElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTextContentElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextContentElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextContentElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextContentElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTextContentElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextContentElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextContentElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGTextContentElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGTextContentElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSSVGTextContentElement* domObject = static_cast(asObject(slot.slotBase())); + return JSSVGTextContentElement::getConstructor(exec, domObject->globalObject()); } void JSSVGTextContentElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -270,9 +281,9 @@ void setJSSVGTextContentElementXmlspace(ExecState* exec, JSObject* thisObject, J imp->setXmlspace(value.toString(exec)); } -JSValue JSSVGTextContentElement::getConstructor(ExecState* exec) +JSValue JSSVGTextContentElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetNumberOfChars(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -341,7 +352,7 @@ JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetStartPositionOf } - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getStartPositionOfChar(offset, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getStartPositionOfChar(offset, ec)).get(), imp); setDOMException(exec, ec); return result; } @@ -361,7 +372,7 @@ JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetEndPositionOfCh } - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getEndPositionOfChar(offset, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getEndPositionOfChar(offset, ec)).get(), imp); setDOMException(exec, ec); return result; } @@ -381,7 +392,7 @@ JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetExtentOfChar(Ex } - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getExtentOfChar(offset, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getExtentOfChar(offset, ec)).get(), imp); setDOMException(exec, ec); return result; } @@ -468,7 +479,7 @@ JSValue JSC_HOST_CALL jsSVGTextContentElementPrototypeFunctionGetPresentationAtt const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.h index 3fbc5fd82..0c90d837f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextContentElement.h @@ -33,7 +33,7 @@ class SVGTextContentElement; class JSSVGTextContentElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGTextContentElement(PassRefPtr, PassRefPtr); + JSSVGTextContentElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -45,7 +45,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.cpp index 270113bea..4f1dda671 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.cpp @@ -88,8 +88,8 @@ bool JSSVGTextElementPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSSVGTextElement::s_info = { "SVGTextElement", &JSSVGTextPositioningElement::s_info, &JSSVGTextElementTable, 0 }; -JSSVGTextElement::JSSVGTextElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGTextPositioningElement(structure, impl) +JSSVGTextElement::JSSVGTextElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGTextPositioningElement(structure, globalObject, impl) { } @@ -105,24 +105,27 @@ bool JSSVGTextElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsSVGTextElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTextElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGTextElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGTextElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGTextElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } JSValue JSC_HOST_CALL jsSVGTextElementPrototypeFunctionGetBBox(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -134,7 +137,7 @@ JSValue JSC_HOST_CALL jsSVGTextElementPrototypeFunctionGetBBox(ExecState* exec, SVGTextElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -147,7 +150,7 @@ JSValue JSC_HOST_CALL jsSVGTextElementPrototypeFunctionGetCTM(ExecState* exec, J SVGTextElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -160,7 +163,7 @@ JSValue JSC_HOST_CALL jsSVGTextElementPrototypeFunctionGetScreenCTM(ExecState* e SVGTextElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -175,7 +178,7 @@ JSValue JSC_HOST_CALL jsSVGTextElementPrototypeFunctionGetTransformToElement(Exe SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.h index 4aff18046..357640a43 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextElement.h @@ -33,7 +33,7 @@ class SVGTextElement; class JSSVGTextElement : public JSSVGTextPositioningElement { typedef JSSVGTextPositioningElement Base; public: - JSSVGTextElement(PassRefPtr, PassRefPtr); + JSSVGTextElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.cpp index 68bcbf83f..ebc5ad84e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.cpp @@ -75,12 +75,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGTextPathElementConstructorTable = { 18, 15, JSSVGTextPathElementConstructorTableValues, 0 }; #endif -class JSSVGTextPathElementConstructor : public DOMObject { +class JSSVGTextPathElementConstructor : public DOMConstructorObject { public: - JSSVGTextPathElementConstructor(ExecState* exec) - : DOMObject(JSSVGTextPathElementConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGTextPathElementConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGTextPathElementConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGTextPathElementPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGTextPathElementPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -133,8 +133,8 @@ bool JSSVGTextPathElementPrototype::getOwnPropertySlot(ExecState* exec, const Id const ClassInfo JSSVGTextPathElement::s_info = { "SVGTextPathElement", &JSSVGTextContentElement::s_info, &JSSVGTextPathElementTable, 0 }; -JSSVGTextPathElement::JSSVGTextPathElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGTextContentElement(structure, impl) +JSSVGTextPathElement::JSSVGTextPathElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGTextContentElement(structure, globalObject, impl) { } @@ -150,43 +150,48 @@ bool JSSVGTextPathElement::getOwnPropertySlot(ExecState* exec, const Identifier& JSValue jsSVGTextPathElementStartOffset(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextPathElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->startOffsetAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTextPathElementMethod(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextPathElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->methodAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTextPathElementSpacing(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextPathElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->spacingAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTextPathElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextPathElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextPathElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextPathElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->hrefAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTextPathElementConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSSVGTextPathElement* domObject = static_cast(asObject(slot.slotBase())); + return JSSVGTextPathElement::getConstructor(exec, domObject->globalObject()); } -JSValue JSSVGTextPathElement::getConstructor(ExecState* exec) +JSValue JSSVGTextPathElement::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } // Constant getters diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.h index 9301f9dcd..382f8f087 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPathElement.h @@ -33,7 +33,7 @@ class SVGTextPathElement; class JSSVGTextPathElement : public JSSVGTextContentElement { typedef JSSVGTextContentElement Base; public: - JSSVGTextPathElement(PassRefPtr, PassRefPtr); + JSSVGTextPathElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +44,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.cpp index 24bc336a4..88260e773 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.cpp @@ -77,8 +77,8 @@ JSObject* JSSVGTextPositioningElementPrototype::self(ExecState* exec, JSGlobalOb const ClassInfo JSSVGTextPositioningElement::s_info = { "SVGTextPositioningElement", &JSSVGTextContentElement::s_info, &JSSVGTextPositioningElementTable, 0 }; -JSSVGTextPositioningElement::JSSVGTextPositioningElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGTextContentElement(structure, impl) +JSSVGTextPositioningElement::JSSVGTextPositioningElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGTextContentElement(structure, globalObject, impl) { } @@ -94,42 +94,47 @@ bool JSSVGTextPositioningElement::getOwnPropertySlot(ExecState* exec, const Iden JSValue jsSVGTextPositioningElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextPositioningElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextPositioningElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextPositioningElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTextPositioningElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextPositioningElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextPositioningElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextPositioningElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTextPositioningElementDx(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextPositioningElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextPositioningElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextPositioningElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->dxAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTextPositioningElementDy(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextPositioningElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextPositioningElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextPositioningElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->dyAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTextPositioningElementRotate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTextPositioningElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTextPositioningElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTextPositioningElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->rotateAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.h index 3f4864d90..b34c095fe 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTextPositioningElement.h @@ -33,7 +33,7 @@ class SVGTextPositioningElement; class JSSVGTextPositioningElement : public JSSVGTextContentElement { typedef JSSVGTextContentElement Base; public: - JSSVGTextPositioningElement(PassRefPtr, PassRefPtr); + JSSVGTextPositioningElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.cpp index 962a9f5ff..438ed3f39 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.cpp @@ -89,8 +89,8 @@ bool JSSVGTitleElementPrototype::getOwnPropertySlot(ExecState* exec, const Ident const ClassInfo JSSVGTitleElement::s_info = { "SVGTitleElement", &JSSVGElement::s_info, &JSSVGTitleElementTable, 0 }; -JSSVGTitleElement::JSSVGTitleElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGTitleElement::JSSVGTitleElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -106,31 +106,35 @@ bool JSSVGTitleElement::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsSVGTitleElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTitleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTitleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTitleElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGTitleElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTitleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTitleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTitleElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGTitleElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTitleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTitleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTitleElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGTitleElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTitleElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTitleElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGTitleElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } void JSSVGTitleElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -160,7 +164,7 @@ JSValue JSC_HOST_CALL jsSVGTitleElementPrototypeFunctionGetPresentationAttribute const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.h index 31848a793..91a49fd72 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTitleElement.h @@ -33,7 +33,7 @@ class SVGTitleElement; class JSSVGTitleElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGTitleElement(PassRefPtr, PassRefPtr); + JSSVGTitleElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.cpp index 8f0aeb0df..d50dfc529 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.cpp @@ -75,12 +75,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGTransformConstructorTable = { 18, 15, JSSVGTransformConstructorTableValues, 0 }; #endif -class JSSVGTransformConstructor : public DOMObject { +class JSSVGTransformConstructor : public DOMConstructorObject { public: - JSSVGTransformConstructor(ExecState* exec) - : DOMObject(JSSVGTransformConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGTransformConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGTransformConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGTransformPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGTransformPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -140,9 +140,8 @@ bool JSSVGTransformPrototype::getOwnPropertySlot(ExecState* exec, const Identifi const ClassInfo JSSVGTransform::s_info = { "SVGTransform", 0, &JSSVGTransformTable, 0 }; -JSSVGTransform::JSSVGTransform(PassRefPtr structure, PassRefPtr > impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGTransform::JSSVGTransform(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr > impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -164,32 +163,36 @@ bool JSSVGTransform::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsSVGTransformType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTransform* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTransform imp(*static_cast(asObject(slot.slotBase()))->impl()); + SVGTransform imp(*castedThis->impl()); return jsNumber(exec, imp.type()); } JSValue jsSVGTransformMatrix(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTransform* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTransform imp(*static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, JSSVGStaticPODTypeWrapperWithPODTypeParent::create(imp.matrix(), static_cast(asObject(slot.slotBase()))->impl()).get(), static_cast(asObject(slot.slotBase()))->context()); + SVGTransform imp(*castedThis->impl()); + return toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapperWithPODTypeParent::create(imp.matrix(), castedThis->impl()).get(), castedThis->context()); } JSValue jsSVGTransformAngle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTransform* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTransform imp(*static_cast(asObject(slot.slotBase()))->impl()); + SVGTransform imp(*castedThis->impl()); return jsNumber(exec, imp.angle()); } JSValue jsSVGTransformConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + UNUSED_PARAM(slot); + return JSSVGTransform::getConstructor(exec, deprecatedGlobalObjectForPrototype(exec)); } -JSValue JSSVGTransform::getConstructor(ExecState* exec) +JSValue JSSVGTransform::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsSVGTransformPrototypeFunctionSetMatrix(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -323,9 +326,9 @@ JSValue jsSVGTransformSVG_TRANSFORM_SKEWY(ExecState* exec, const Identifier&, co return jsNumber(exec, static_cast(6)); } -JSC::JSValue toJS(JSC::ExecState* exec, JSSVGPODTypeWrapper* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, JSSVGPODTypeWrapper* object, SVGElement* context) { - return getDOMObjectWrapper >(exec, object, context); + return getDOMObjectWrapper >(exec, globalObject, object, context); } SVGTransform toSVGTransform(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.h index c95932a3a..90b8ef95a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTransform.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "JSSVGPODTypeWrapper.h" #include "SVGElement.h" @@ -32,10 +33,10 @@ namespace WebCore { -class JSSVGTransform : public DOMObject { - typedef DOMObject Base; +class JSSVGTransform : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGTransform(PassRefPtr, PassRefPtr >, SVGElement* context); + JSSVGTransform(PassRefPtr, JSDOMGlobalObject*, PassRefPtr >, SVGElement* context); virtual ~JSSVGTransform(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,16 +48,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); - JSSVGPODTypeWrapper* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); + JSSVGPODTypeWrapper * impl() const { return m_impl.get(); } private: - RefPtr m_context; RefPtr > m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, JSSVGPODTypeWrapper*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, JSSVGPODTypeWrapper*, SVGElement* context); SVGTransform toSVGTransform(JSC::JSValue); class JSSVGTransformPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.cpp index 855efe084..676271d32 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.cpp @@ -90,9 +90,8 @@ bool JSSVGTransformListPrototype::getOwnPropertySlot(ExecState* exec, const Iden const ClassInfo JSSVGTransformList::s_info = { "SVGTransformList", 0, &JSSVGTransformListTable, 0 }; -JSSVGTransformList::JSSVGTransformList(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGTransformList::JSSVGTransformList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -114,8 +113,9 @@ bool JSSVGTransformList::getOwnPropertySlot(ExecState* exec, const Identifier& p JSValue jsSVGTransformListNumberOfItems(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGTransformList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGTransformList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGTransformList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->numberOfItems()); } @@ -192,7 +192,7 @@ JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionCreateSVGTransformFromM TransformationMatrix matrix = toSVGMatrix(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->createSVGTransformFromMatrix(matrix)).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->createSVGTransformFromMatrix(matrix)).get(), castedThisObj->context()); return result; } @@ -205,13 +205,13 @@ JSValue JSC_HOST_CALL jsSVGTransformListPrototypeFunctionConsolidate(ExecState* SVGTransformList* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->consolidate()).get(), castedThisObj->context()); + JSC::JSValue result = toJS(exec, deprecatedGlobalObjectForPrototype(exec), JSSVGStaticPODTypeWrapper::create(imp->consolidate()).get(), castedThisObj->context()); return result; } -JSC::JSValue toJS(JSC::ExecState* exec, SVGTransformList* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGTransformList* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGTransformList* toSVGTransformList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.h b/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.h index 9718f9b6c..463d0e41a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGTransformList.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGTransformList; -class JSSVGTransformList : public DOMObject { - typedef DOMObject Base; +class JSSVGTransformList : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGTransformList(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGTransformList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGTransformList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -57,14 +58,12 @@ public: JSC::JSValue removeItem(JSC::ExecState*, const JSC::ArgList&); JSC::JSValue appendItem(JSC::ExecState*, const JSC::ArgList&); SVGTransformList* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGTransformList*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGTransformList*, SVGElement* context); SVGTransformList* toSVGTransformList(JSC::JSValue); class JSSVGTransformListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.cpp index 569a35aac..4eebca76b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSSVGUnitTypesConstructorTable = { 8, 7, JSSVGUnitTypesConstructorTableValues, 0 }; #endif -class JSSVGUnitTypesConstructor : public DOMObject { +class JSSVGUnitTypesConstructor : public DOMConstructorObject { public: - JSSVGUnitTypesConstructor(ExecState* exec) - : DOMObject(JSSVGUnitTypesConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSSVGUnitTypesConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSSVGUnitTypesConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSSVGUnitTypesPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSSVGUnitTypesPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -120,9 +120,8 @@ bool JSSVGUnitTypesPrototype::getOwnPropertySlot(ExecState* exec, const Identifi const ClassInfo JSSVGUnitTypes::s_info = { "SVGUnitTypes", 0, &JSSVGUnitTypesTable, 0 }; -JSSVGUnitTypes::JSSVGUnitTypes(PassRefPtr structure, PassRefPtr impl, SVGElement* context) - : DOMObject(structure) - , m_context(context) +JSSVGUnitTypes::JSSVGUnitTypes(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl, SVGElement* context) + : DOMObjectWithSVGContext(structure, globalObject, context) , m_impl(impl) { } @@ -144,11 +143,12 @@ bool JSSVGUnitTypes::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsSVGUnitTypesConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + UNUSED_PARAM(slot); + return JSSVGUnitTypes::getConstructor(exec, deprecatedGlobalObjectForPrototype(exec)); } -JSValue JSSVGUnitTypes::getConstructor(ExecState* exec) +JSValue JSSVGUnitTypes::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } // Constant getters @@ -168,9 +168,9 @@ JSValue jsSVGUnitTypesSVG_UNIT_TYPE_OBJECTBOUNDINGBOX(ExecState* exec, const Ide return jsNumber(exec, static_cast(2)); } -JSC::JSValue toJS(JSC::ExecState* exec, SVGUnitTypes* object, SVGElement* context) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, SVGUnitTypes* object, SVGElement* context) { - return getDOMObjectWrapper(exec, object, context); + return getDOMObjectWrapper(exec, globalObject, object, context); } SVGUnitTypes* toSVGUnitTypes(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.h b/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.h index 080f7bae2..8ec3a94ee 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGUnitTypes.h @@ -23,6 +23,7 @@ #if ENABLE(SVG) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include "SVGElement.h" #include @@ -32,10 +33,10 @@ namespace WebCore { class SVGUnitTypes; -class JSSVGUnitTypes : public DOMObject { - typedef DOMObject Base; +class JSSVGUnitTypes : public DOMObjectWithSVGContext { + typedef DOMObjectWithSVGContext Base; public: - JSSVGUnitTypes(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGUnitTypes(PassRefPtr, JSDOMGlobalObject*, PassRefPtr, SVGElement* context); virtual ~JSSVGUnitTypes(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,16 +48,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); SVGUnitTypes* impl() const { return m_impl.get(); } - SVGElement* context() const { return m_context.get(); } private: - RefPtr m_context; - RefPtr m_impl; + RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, SVGUnitTypes*, SVGElement* context); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, SVGUnitTypes*, SVGElement* context); SVGUnitTypes* toSVGUnitTypes(JSC::JSValue); class JSSVGUnitTypesPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.cpp index f309e6d68..43c337e1e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.cpp @@ -119,8 +119,8 @@ bool JSSVGUseElementPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSSVGUseElement::s_info = { "SVGUseElement", &JSSVGElement::s_info, &JSSVGUseElementTable, 0 }; -JSSVGUseElement::JSSVGUseElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGUseElement::JSSVGUseElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -136,136 +136,154 @@ bool JSSVGUseElement::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsSVGUseElementX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGUseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->xAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGUseElementY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGUseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->yAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGUseElementWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGUseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->widthAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGUseElementHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGUseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->heightAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGUseElementInstanceRoot(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->instanceRoot())); + SVGUseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->instanceRoot())); } JSValue jsSVGUseElementAnimatedInstanceRoot(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->animatedInstanceRoot())); + SVGUseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->animatedInstanceRoot())); } JSValue jsSVGUseElementHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGUseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->hrefAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGUseElementRequiredFeatures(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredFeatures()), imp); + SVGUseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredFeatures()), imp); } JSValue jsSVGUseElementRequiredExtensions(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->requiredExtensions()), imp); + SVGUseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->requiredExtensions()), imp); } JSValue jsSVGUseElementSystemLanguage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->systemLanguage()), imp); + SVGUseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->systemLanguage()), imp); } JSValue jsSVGUseElementXmllang(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGUseElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmllang()); } JSValue jsSVGUseElementXmlspace(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGUseElement* imp = static_cast(castedThis->impl()); return jsString(exec, imp->xmlspace()); } JSValue jsSVGUseElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGUseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGUseElementClassName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGUseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->classNameAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGUseElementStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + SVGUseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsSVGUseElementTransform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGUseElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->transformAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGUseElementNearestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->nearestViewportElement())); + SVGUseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->nearestViewportElement())); } JSValue jsSVGUseElementFarthestViewportElement(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGUseElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGUseElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->farthestViewportElement())); + SVGUseElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->farthestViewportElement())); } void JSSVGUseElement::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -309,7 +327,7 @@ JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetPresentationAttribute(E const UString& name = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->getPresentationAttribute(name))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->getPresentationAttribute(name))); return result; } @@ -322,7 +340,7 @@ JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetBBox(ExecState* exec, J SVGUseElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getBBox()).get(), imp); return result; } @@ -335,7 +353,7 @@ JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetCTM(ExecState* exec, JS SVGUseElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getCTM()).get(), imp); return result; } @@ -348,7 +366,7 @@ JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetScreenCTM(ExecState* ex SVGUseElement* imp = static_cast(castedThisObj->impl()); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getScreenCTM()).get(), imp); return result; } @@ -363,7 +381,7 @@ JSValue JSC_HOST_CALL jsSVGUseElementPrototypeFunctionGetTransformToElement(Exec SVGElement* element = toSVGElement(args.at(0)); - JSC::JSValue result = toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->getTransformToElement(element, ec)).get(), imp); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.h index e3ffef84c..889f7fd97 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGUseElement.h @@ -33,7 +33,7 @@ class SVGUseElement; class JSSVGUseElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGUseElement(PassRefPtr, PassRefPtr); + JSSVGUseElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.cpp index 16b1ffbbd..0f54e3389 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.cpp @@ -89,8 +89,8 @@ bool JSSVGViewElementPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSSVGViewElement::s_info = { "SVGViewElement", &JSSVGElement::s_info, &JSSVGViewElementTable, 0 }; -JSSVGViewElement::JSSVGViewElement(PassRefPtr structure, PassRefPtr impl) - : JSSVGElement(structure, impl) +JSSVGViewElement::JSSVGViewElement(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSSVGElement(structure, globalObject, impl) { } @@ -106,39 +106,44 @@ bool JSSVGViewElement::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsSVGViewElementViewTarget(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGViewElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGViewElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->viewTarget()), imp); + SVGViewElement* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->viewTarget()), imp); } JSValue jsSVGViewElementExternalResourcesRequired(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGViewElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGViewElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGViewElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->externalResourcesRequiredAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGViewElementViewBox(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGViewElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGViewElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGViewElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->viewBoxAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGViewElementPreserveAspectRatio(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGViewElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGViewElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGViewElement* imp = static_cast(castedThis->impl()); RefPtr obj = imp->preserveAspectRatioAnimated(); - return toJS(exec, obj.get(), imp); + return toJS(exec, castedThis->globalObject(), obj.get(), imp); } JSValue jsSVGViewElementZoomAndPan(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGViewElement* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGViewElement* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGViewElement* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->zoomAndPan()); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.h b/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.h index 0941a00ed..40f2ad93e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGViewElement.h @@ -33,7 +33,7 @@ class SVGViewElement; class JSSVGViewElement : public JSSVGElement { typedef JSSVGElement Base; public: - JSSVGViewElement(PassRefPtr, PassRefPtr); + JSSVGViewElement(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.cpp index 74cdb26d8..6ff7a9e70 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.cpp @@ -78,8 +78,8 @@ JSObject* JSSVGZoomEventPrototype::self(ExecState* exec, JSGlobalObject* globalO const ClassInfo JSSVGZoomEvent::s_info = { "SVGZoomEvent", &JSUIEvent::s_info, &JSSVGZoomEventTable, 0 }; -JSSVGZoomEvent::JSSVGZoomEvent(PassRefPtr structure, PassRefPtr impl, SVGElement*) - : JSUIEvent(structure, impl) +JSSVGZoomEvent::JSSVGZoomEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSUIEvent(structure, globalObject, impl) { } @@ -95,37 +95,42 @@ bool JSSVGZoomEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsSVGZoomEventZoomRectScreen(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGZoomEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGZoomEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->zoomRectScreen()).get(), 0); + SVGZoomEvent* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->zoomRectScreen()).get(), 0); } JSValue jsSVGZoomEventPreviousScale(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGZoomEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGZoomEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGZoomEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->previousScale()); } JSValue jsSVGZoomEventPreviousTranslate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGZoomEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGZoomEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->previousTranslate()).get(), 0); + SVGZoomEvent* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->previousTranslate()).get(), 0); } JSValue jsSVGZoomEventNewScale(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGZoomEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGZoomEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + SVGZoomEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->newScale()); } JSValue jsSVGZoomEventNewTranslate(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSSVGZoomEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - SVGZoomEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, JSSVGStaticPODTypeWrapper::create(imp->newTranslate()).get(), 0); + SVGZoomEvent* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), JSSVGStaticPODTypeWrapper::create(imp->newTranslate()).get(), 0); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.h b/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.h index 59d27a2d7..c96afe872 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSSVGZoomEvent.h @@ -33,7 +33,7 @@ class SVGZoomEvent; class JSSVGZoomEvent : public JSUIEvent { typedef JSUIEvent Base; public: - JSSVGZoomEvent(PassRefPtr, PassRefPtr, SVGElement* context); + JSSVGZoomEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSScreen.cpp b/src/3rdparty/webkit/WebCore/generated/JSScreen.cpp index 0da88973f..a1fc8b790 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSScreen.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSScreen.cpp @@ -76,8 +76,8 @@ JSObject* JSScreenPrototype::self(ExecState* exec, JSGlobalObject* globalObject) const ClassInfo JSScreen::s_info = { "Screen", 0, &JSScreenTable, 0 }; -JSScreen::JSScreen(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSScreen::JSScreen(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -99,63 +99,71 @@ bool JSScreen::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNam JSValue jsScreenHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSScreen* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Screen* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Screen* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->height()); } JSValue jsScreenWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSScreen* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Screen* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Screen* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->width()); } JSValue jsScreenColorDepth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSScreen* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Screen* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Screen* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->colorDepth()); } JSValue jsScreenPixelDepth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSScreen* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Screen* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Screen* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->pixelDepth()); } JSValue jsScreenAvailLeft(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSScreen* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Screen* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Screen* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->availLeft()); } JSValue jsScreenAvailTop(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSScreen* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Screen* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Screen* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->availTop()); } JSValue jsScreenAvailHeight(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSScreen* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Screen* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Screen* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->availHeight()); } JSValue jsScreenAvailWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSScreen* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Screen* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Screen* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->availWidth()); } -JSC::JSValue toJS(JSC::ExecState* exec, Screen* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Screen* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Screen* toScreen(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSScreen.h b/src/3rdparty/webkit/WebCore/generated/JSScreen.h index 4e7be7b77..d55e9c5fe 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSScreen.h +++ b/src/3rdparty/webkit/WebCore/generated/JSScreen.h @@ -21,6 +21,7 @@ #ifndef JSScreen_h #define JSScreen_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class Screen; -class JSScreen : public DOMObject { - typedef DOMObject Base; +class JSScreen : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSScreen(PassRefPtr, PassRefPtr); + JSScreen(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSScreen(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -50,7 +51,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, Screen*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Screen*); Screen* toScreen(JSC::JSValue); class JSScreenPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSStorage.cpp b/src/3rdparty/webkit/WebCore/generated/JSStorage.cpp index 9f156448f..41680a99f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStorage.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSStorage.cpp @@ -69,12 +69,12 @@ static JSC_CONST_HASHTABLE HashTable JSStorageConstructorTable = { 1, 0, JSStorageConstructorTableValues, 0 }; #endif -class JSStorageConstructor : public DOMObject { +class JSStorageConstructor : public DOMConstructorObject { public: - JSStorageConstructor(ExecState* exec) - : DOMObject(JSStorageConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSStorageConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSStorageConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSStoragePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSStoragePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -126,8 +126,8 @@ bool JSStoragePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& p const ClassInfo JSStorage::s_info = { "Storage", 0, &JSStorageTable, 0 }; -JSStorage::JSStorage(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSStorage::JSStorage(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -158,14 +158,16 @@ bool JSStorage::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa JSValue jsStorageLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStorage* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Storage* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Storage* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsStorageConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSStorage* domObject = static_cast(asObject(slot.slotBase())); + return JSStorage::getConstructor(exec, domObject->globalObject()); } void JSStorage::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -174,9 +176,9 @@ void JSStorage::put(ExecState* exec, const Identifier& propertyName, JSValue val Base::put(exec, propertyName, value, slot); } -JSValue JSStorage::getConstructor(ExecState* exec) +JSValue JSStorage::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsStoragePrototypeFunctionKey(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -250,9 +252,9 @@ JSValue JSC_HOST_CALL jsStoragePrototypeFunctionClear(ExecState* exec, JSObject* return jsUndefined(); } -JSC::JSValue toJS(JSC::ExecState* exec, Storage* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Storage* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Storage* toStorage(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSStorage.h b/src/3rdparty/webkit/WebCore/generated/JSStorage.h index 077ccfcae..fbc4ff3e1 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStorage.h +++ b/src/3rdparty/webkit/WebCore/generated/JSStorage.h @@ -23,6 +23,7 @@ #if ENABLE(DOM_STORAGE) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class Storage; -class JSStorage : public DOMObject { - typedef DOMObject Base; +class JSStorage : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSStorage(PassRefPtr, PassRefPtr); + JSStorage(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSStorage(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -50,7 +51,7 @@ public: virtual bool deleteProperty(JSC::ExecState*, const JSC::Identifier&); virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); Storage* impl() const { return m_impl.get(); } private: @@ -60,7 +61,7 @@ private: static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, Storage*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Storage*); Storage* toStorage(JSC::JSValue); class JSStoragePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.cpp index 42aac0eb7..d2730d7b7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.cpp @@ -75,12 +75,12 @@ static JSC_CONST_HASHTABLE HashTable JSStorageEventConstructorTable = { 1, 0, JSStorageEventConstructorTableValues, 0 }; #endif -class JSStorageEventConstructor : public DOMObject { +class JSStorageEventConstructor : public DOMConstructorObject { public: - JSStorageEventConstructor(ExecState* exec) - : DOMObject(JSStorageEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSStorageEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSStorageEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSStorageEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSStorageEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -128,8 +128,8 @@ bool JSStorageEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifi const ClassInfo JSStorageEvent::s_info = { "StorageEvent", &JSEvent::s_info, &JSStorageEventTable, 0 }; -JSStorageEvent::JSStorageEvent(PassRefPtr structure, PassRefPtr impl) - : JSEvent(structure, impl) +JSStorageEvent::JSStorageEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSEvent(structure, globalObject, impl) { } @@ -145,53 +145,60 @@ bool JSStorageEvent::getOwnPropertySlot(ExecState* exec, const Identifier& prope JSValue jsStorageEventKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStorageEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StorageEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + StorageEvent* imp = static_cast(castedThis->impl()); return jsString(exec, imp->key()); } JSValue jsStorageEventOldValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStorageEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StorageEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + StorageEvent* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->oldValue()); } JSValue jsStorageEventNewValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStorageEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StorageEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + StorageEvent* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->newValue()); } JSValue jsStorageEventUri(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStorageEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StorageEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + StorageEvent* imp = static_cast(castedThis->impl()); return jsString(exec, imp->uri()); } JSValue jsStorageEventSource(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStorageEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StorageEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->source())); + StorageEvent* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->source())); } JSValue jsStorageEventStorageArea(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStorageEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StorageEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->storageArea())); + StorageEvent* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->storageArea())); } JSValue jsStorageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSStorageEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSStorageEvent::getConstructor(exec, domObject->globalObject()); } -JSValue JSStorageEvent::getConstructor(ExecState* exec) +JSValue JSStorageEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsStorageEventPrototypeFunctionInitStorageEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.h b/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.h index ec32abfbb..1bf6d217d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSStorageEvent.h @@ -32,7 +32,7 @@ class StorageEvent; class JSStorageEvent : public JSEvent { typedef JSEvent Base; public: - JSStorageEvent(PassRefPtr, PassRefPtr); + JSStorageEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -43,7 +43,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.cpp b/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.cpp index 1e75a0dfe..ab090d19b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.cpp @@ -72,12 +72,12 @@ static JSC_CONST_HASHTABLE HashTable JSStyleSheetConstructorTable = { 1, 0, JSStyleSheetConstructorTableValues, 0 }; #endif -class JSStyleSheetConstructor : public DOMObject { +class JSStyleSheetConstructor : public DOMConstructorObject { public: - JSStyleSheetConstructor(ExecState* exec) - : DOMObject(JSStyleSheetConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSStyleSheetConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSStyleSheetConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSStyleSheetPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSStyleSheetPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -119,8 +119,8 @@ JSObject* JSStyleSheetPrototype::self(ExecState* exec, JSGlobalObject* globalObj const ClassInfo JSStyleSheet::s_info = { "StyleSheet", 0, &JSStyleSheetTable, 0 }; -JSStyleSheet::JSStyleSheet(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSStyleSheet::JSStyleSheet(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -142,56 +142,64 @@ bool JSStyleSheet::getOwnPropertySlot(ExecState* exec, const Identifier& propert JSValue jsStyleSheetType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStyleSheet* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StyleSheet* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + StyleSheet* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->type()); } JSValue jsStyleSheetDisabled(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStyleSheet* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StyleSheet* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + StyleSheet* imp = static_cast(castedThis->impl()); return jsBoolean(imp->disabled()); } JSValue jsStyleSheetOwnerNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStyleSheet* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StyleSheet* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->ownerNode())); + StyleSheet* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->ownerNode())); } JSValue jsStyleSheetParentStyleSheet(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStyleSheet* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StyleSheet* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->parentStyleSheet())); + StyleSheet* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->parentStyleSheet())); } JSValue jsStyleSheetHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStyleSheet* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StyleSheet* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + StyleSheet* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->href()); } JSValue jsStyleSheetTitle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStyleSheet* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StyleSheet* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + StyleSheet* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->title()); } JSValue jsStyleSheetMedia(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStyleSheet* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StyleSheet* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->media())); + StyleSheet* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->media())); } JSValue jsStyleSheetConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSStyleSheet* domObject = static_cast(asObject(slot.slotBase())); + return JSStyleSheet::getConstructor(exec, domObject->globalObject()); } void JSStyleSheet::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -204,9 +212,9 @@ void setJSStyleSheetDisabled(ExecState* exec, JSObject* thisObject, JSValue valu imp->setDisabled(value.toBoolean(exec)); } -JSValue JSStyleSheet::getConstructor(ExecState* exec) +JSValue JSStyleSheet::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } StyleSheet* toStyleSheet(JSC::JSValue value) diff --git a/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.h b/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.h index d8e751e83..ccd0d0ff3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.h +++ b/src/3rdparty/webkit/WebCore/generated/JSStyleSheet.h @@ -21,6 +21,7 @@ #ifndef JSStyleSheet_h #define JSStyleSheet_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class StyleSheet; -class JSStyleSheet : public DOMObject { - typedef DOMObject Base; +class JSStyleSheet : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSStyleSheet(PassRefPtr, PassRefPtr); + JSStyleSheet(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSStyleSheet(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,14 +48,14 @@ public: virtual void mark(); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); StyleSheet* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, StyleSheet*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, StyleSheet*); StyleSheet* toStyleSheet(JSC::JSValue); class JSStyleSheetPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.cpp b/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.cpp index 41cc305ee..a431d096b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSStyleSheetListConstructorTable = { 1, 0, JSStyleSheetListConstructorTableValues, 0 }; #endif -class JSStyleSheetListConstructor : public DOMObject { +class JSStyleSheetListConstructor : public DOMConstructorObject { public: - JSStyleSheetListConstructor(ExecState* exec) - : DOMObject(JSStyleSheetListConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSStyleSheetListConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSStyleSheetListConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSStyleSheetListPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSStyleSheetListPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -119,8 +119,8 @@ bool JSStyleSheetListPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSStyleSheetList::s_info = { "StyleSheetList", 0, &JSStyleSheetListTable, 0 }; -JSStyleSheetList::JSStyleSheetList(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSStyleSheetList::JSStyleSheetList(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -166,14 +166,16 @@ bool JSStyleSheetList::getOwnPropertySlot(ExecState* exec, unsigned propertyName JSValue jsStyleSheetListLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSStyleSheetList* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - StyleSheetList* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + StyleSheetList* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } JSValue jsStyleSheetListConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSStyleSheetList* domObject = static_cast(asObject(slot.slotBase())); + return JSStyleSheetList::getConstructor(exec, domObject->globalObject()); } void JSStyleSheetList::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) { @@ -182,9 +184,9 @@ void JSStyleSheetList::getPropertyNames(ExecState* exec, PropertyNameArray& prop Base::getPropertyNames(exec, propertyNames); } -JSValue JSStyleSheetList::getConstructor(ExecState* exec) +JSValue JSStyleSheetList::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsStyleSheetListPrototypeFunctionItem(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -197,7 +199,7 @@ JSValue JSC_HOST_CALL jsStyleSheetListPrototypeFunctionItem(ExecState* exec, JSO unsigned index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->item(index))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->item(index))); return result; } @@ -205,11 +207,11 @@ JSValue JSC_HOST_CALL jsStyleSheetListPrototypeFunctionItem(ExecState* exec, JSO JSValue JSStyleSheetList::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSStyleSheetList* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } -JSC::JSValue toJS(JSC::ExecState* exec, StyleSheetList* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, StyleSheetList* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } StyleSheetList* toStyleSheetList(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.h b/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.h index bb06c58ff..75c8c6c43 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.h +++ b/src/3rdparty/webkit/WebCore/generated/JSStyleSheetList.h @@ -21,6 +21,7 @@ #ifndef JSStyleSheetList_h #define JSStyleSheetList_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class StyleSheetList; -class JSStyleSheetList : public DOMObject { - typedef DOMObject Base; +class JSStyleSheetList : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSStyleSheetList(PassRefPtr, PassRefPtr); + JSStyleSheetList(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSStyleSheetList(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,7 +47,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); StyleSheetList* impl() const { return m_impl.get(); } private: @@ -57,7 +58,7 @@ private: static JSC::JSValue nameGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; -JSC::JSValue toJS(JSC::ExecState*, StyleSheetList*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, StyleSheetList*); StyleSheetList* toStyleSheetList(JSC::JSValue); class JSStyleSheetListPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSText.cpp b/src/3rdparty/webkit/WebCore/generated/JSText.cpp index 8be8a8907..e5ad3b28f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSText.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSText.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSTextConstructorTable = { 1, 0, JSTextConstructorTableValues, 0 }; #endif -class JSTextConstructor : public DOMObject { +class JSTextConstructor : public DOMConstructorObject { public: - JSTextConstructor(ExecState* exec) - : DOMObject(JSTextConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSTextConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSTextConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSTextPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSTextPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -119,8 +119,8 @@ bool JSTextPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& prop const ClassInfo JSText::s_info = { "Text", &JSCharacterData::s_info, &JSTextTable, 0 }; -JSText::JSText(PassRefPtr structure, PassRefPtr impl) - : JSCharacterData(structure, impl) +JSText::JSText(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCharacterData(structure, globalObject, impl) { } @@ -136,18 +136,20 @@ bool JSText::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, JSValue jsTextWholeText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSText* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Text* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Text* imp = static_cast(castedThis->impl()); return jsString(exec, imp->wholeText()); } JSValue jsTextConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSText* domObject = static_cast(asObject(slot.slotBase())); + return JSText::getConstructor(exec, domObject->globalObject()); } -JSValue JSText::getConstructor(ExecState* exec) +JSValue JSText::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsTextPrototypeFunctionSplitText(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -165,7 +167,7 @@ JSValue JSC_HOST_CALL jsTextPrototypeFunctionSplitText(ExecState* exec, JSObject } - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->splitText(offset, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->splitText(offset, ec))); setDOMException(exec, ec); return result; } @@ -181,7 +183,7 @@ JSValue JSC_HOST_CALL jsTextPrototypeFunctionReplaceWholeText(ExecState* exec, J const UString& content = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->replaceWholeText(content, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->replaceWholeText(content, ec))); setDOMException(exec, ec); return result; } diff --git a/src/3rdparty/webkit/WebCore/generated/JSText.h b/src/3rdparty/webkit/WebCore/generated/JSText.h index e489274f7..eff516f68 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSText.h +++ b/src/3rdparty/webkit/WebCore/generated/JSText.h @@ -30,7 +30,7 @@ class Text; class JSText : public JSCharacterData { typedef JSCharacterData Base; public: - JSText(PassRefPtr, PassRefPtr); + JSText(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,10 +41,10 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; -JSC::JSValue toJSNewlyCreated(JSC::ExecState*, Text*); +JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject*, Text*); class JSTextPrototype : public JSC::JSObject { typedef JSC::JSObject Base; diff --git a/src/3rdparty/webkit/WebCore/generated/JSTextEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSTextEvent.cpp index de001cf7f..721e0a36e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTextEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSTextEvent.cpp @@ -64,12 +64,12 @@ static JSC_CONST_HASHTABLE HashTable JSTextEventConstructorTable = { 1, 0, JSTextEventConstructorTableValues, 0 }; #endif -class JSTextEventConstructor : public DOMObject { +class JSTextEventConstructor : public DOMConstructorObject { public: - JSTextEventConstructor(ExecState* exec) - : DOMObject(JSTextEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSTextEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSTextEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSTextEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSTextEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -117,8 +117,8 @@ bool JSTextEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& const ClassInfo JSTextEvent::s_info = { "TextEvent", &JSUIEvent::s_info, &JSTextEventTable, 0 }; -JSTextEvent::JSTextEvent(PassRefPtr structure, PassRefPtr impl) - : JSUIEvent(structure, impl) +JSTextEvent::JSTextEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSUIEvent(structure, globalObject, impl) { } @@ -134,18 +134,20 @@ bool JSTextEvent::getOwnPropertySlot(ExecState* exec, const Identifier& property JSValue jsTextEventData(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSTextEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TextEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + TextEvent* imp = static_cast(castedThis->impl()); return jsString(exec, imp->data()); } JSValue jsTextEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSTextEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSTextEvent::getConstructor(exec, domObject->globalObject()); } -JSValue JSTextEvent::getConstructor(ExecState* exec) +JSValue JSTextEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsTextEventPrototypeFunctionInitTextEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSTextEvent.h b/src/3rdparty/webkit/WebCore/generated/JSTextEvent.h index 08f014173..548d0f6ca 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTextEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSTextEvent.h @@ -30,7 +30,7 @@ class TextEvent; class JSTextEvent : public JSUIEvent { typedef JSUIEvent Base; public: - JSTextEvent(PassRefPtr, PassRefPtr); + JSTextEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.cpp b/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.cpp index d11e8f8f2..5b0588657 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.cpp @@ -61,12 +61,12 @@ static JSC_CONST_HASHTABLE HashTable JSTextMetricsConstructorTable = { 1, 0, JSTextMetricsConstructorTableValues, 0 }; #endif -class JSTextMetricsConstructor : public DOMObject { +class JSTextMetricsConstructor : public DOMConstructorObject { public: - JSTextMetricsConstructor(ExecState* exec) - : DOMObject(JSTextMetricsConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSTextMetricsConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSTextMetricsConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSTextMetricsPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSTextMetricsPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -108,8 +108,8 @@ JSObject* JSTextMetricsPrototype::self(ExecState* exec, JSGlobalObject* globalOb const ClassInfo JSTextMetrics::s_info = { "TextMetrics", 0, &JSTextMetricsTable, 0 }; -JSTextMetrics::JSTextMetrics(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSTextMetrics::JSTextMetrics(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -131,23 +131,25 @@ bool JSTextMetrics::getOwnPropertySlot(ExecState* exec, const Identifier& proper JSValue jsTextMetricsWidth(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSTextMetrics* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TextMetrics* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + TextMetrics* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->width()); } JSValue jsTextMetricsConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSTextMetrics* domObject = static_cast(asObject(slot.slotBase())); + return JSTextMetrics::getConstructor(exec, domObject->globalObject()); } -JSValue JSTextMetrics::getConstructor(ExecState* exec) +JSValue JSTextMetrics::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } -JSC::JSValue toJS(JSC::ExecState* exec, TextMetrics* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TextMetrics* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } TextMetrics* toTextMetrics(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.h b/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.h index 4fb044fa7..0e18cfc65 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.h +++ b/src/3rdparty/webkit/WebCore/generated/JSTextMetrics.h @@ -21,6 +21,7 @@ #ifndef JSTextMetrics_h #define JSTextMetrics_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class TextMetrics; -class JSTextMetrics : public DOMObject { - typedef DOMObject Base; +class JSTextMetrics : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSTextMetrics(PassRefPtr, PassRefPtr); + JSTextMetrics(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSTextMetrics(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); TextMetrics* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, TextMetrics*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TextMetrics*); TextMetrics* toTextMetrics(JSC::JSValue); class JSTextMetricsPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.cpp b/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.cpp index fdd627830..95ff627ad 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.cpp @@ -77,8 +77,8 @@ bool JSTimeRangesPrototype::getOwnPropertySlot(ExecState* exec, const Identifier const ClassInfo JSTimeRanges::s_info = { "TimeRanges", 0, &JSTimeRangesTable, 0 }; -JSTimeRanges::JSTimeRanges(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSTimeRanges::JSTimeRanges(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -100,8 +100,9 @@ bool JSTimeRanges::getOwnPropertySlot(ExecState* exec, const Identifier& propert JSValue jsTimeRangesLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSTimeRanges* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TimeRanges* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + TimeRanges* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->length()); } @@ -137,9 +138,9 @@ JSValue JSC_HOST_CALL jsTimeRangesPrototypeFunctionEnd(ExecState* exec, JSObject return result; } -JSC::JSValue toJS(JSC::ExecState* exec, TimeRanges* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TimeRanges* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } TimeRanges* toTimeRanges(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.h b/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.h index 41da9efed..b59d905b6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.h +++ b/src/3rdparty/webkit/WebCore/generated/JSTimeRanges.h @@ -21,6 +21,7 @@ #ifndef JSTimeRanges_h #define JSTimeRanges_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class TimeRanges; -class JSTimeRanges : public DOMObject { - typedef DOMObject Base; +class JSTimeRanges : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSTimeRanges(PassRefPtr, PassRefPtr); + JSTimeRanges(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSTimeRanges(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -50,7 +51,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, TimeRanges*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TimeRanges*); TimeRanges* toTimeRanges(JSC::JSValue); class JSTimeRangesPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.cpp b/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.cpp index b10b4cb87..88ec3edd0 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.cpp @@ -70,12 +70,12 @@ static JSC_CONST_HASHTABLE HashTable JSTreeWalkerConstructorTable = { 1, 0, JSTreeWalkerConstructorTableValues, 0 }; #endif -class JSTreeWalkerConstructor : public DOMObject { +class JSTreeWalkerConstructor : public DOMConstructorObject { public: - JSTreeWalkerConstructor(ExecState* exec) - : DOMObject(JSTreeWalkerConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSTreeWalkerConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSTreeWalkerConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSTreeWalkerPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSTreeWalkerPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -129,8 +129,8 @@ bool JSTreeWalkerPrototype::getOwnPropertySlot(ExecState* exec, const Identifier const ClassInfo JSTreeWalker::s_info = { "TreeWalker", 0, &JSTreeWalkerTable, 0 }; -JSTreeWalker::JSTreeWalker(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSTreeWalker::JSTreeWalker(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -152,42 +152,48 @@ bool JSTreeWalker::getOwnPropertySlot(ExecState* exec, const Identifier& propert JSValue jsTreeWalkerRoot(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSTreeWalker* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TreeWalker* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->root())); + TreeWalker* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->root())); } JSValue jsTreeWalkerWhatToShow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSTreeWalker* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TreeWalker* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + TreeWalker* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->whatToShow()); } JSValue jsTreeWalkerFilter(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSTreeWalker* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TreeWalker* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->filter())); + TreeWalker* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->filter())); } JSValue jsTreeWalkerExpandEntityReferences(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSTreeWalker* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TreeWalker* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + TreeWalker* imp = static_cast(castedThis->impl()); return jsBoolean(imp->expandEntityReferences()); } JSValue jsTreeWalkerCurrentNode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSTreeWalker* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - TreeWalker* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->currentNode())); + TreeWalker* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->currentNode())); } JSValue jsTreeWalkerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSTreeWalker* domObject = static_cast(asObject(slot.slotBase())); + return JSTreeWalker::getConstructor(exec, domObject->globalObject()); } void JSTreeWalker::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -202,9 +208,9 @@ void setJSTreeWalkerCurrentNode(ExecState* exec, JSObject* thisObject, JSValue v setDOMException(exec, ec); } -JSValue JSTreeWalker::getConstructor(ExecState* exec) +JSValue JSTreeWalker::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionParentNode(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -270,9 +276,9 @@ JSValue JSC_HOST_CALL jsTreeWalkerPrototypeFunctionNextNode(ExecState* exec, JSO return castedThisObj->nextNode(exec, args); } -JSC::JSValue toJS(JSC::ExecState* exec, TreeWalker* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TreeWalker* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } TreeWalker* toTreeWalker(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.h b/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.h index 92b42bf4e..bf007bb5f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.h +++ b/src/3rdparty/webkit/WebCore/generated/JSTreeWalker.h @@ -21,6 +21,7 @@ #ifndef JSTreeWalker_h #define JSTreeWalker_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class TreeWalker; -class JSTreeWalker : public DOMObject { - typedef DOMObject Base; +class JSTreeWalker : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSTreeWalker(PassRefPtr, PassRefPtr); + JSTreeWalker(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSTreeWalker(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,7 +48,7 @@ public: virtual void mark(); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom functions JSC::JSValue parentNode(JSC::ExecState*, const JSC::ArgList&); @@ -63,7 +64,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, TreeWalker*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TreeWalker*); TreeWalker* toTreeWalker(JSC::JSValue); class JSTreeWalkerPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSUIEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSUIEvent.cpp index cdf611f7a..98891f35e 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSUIEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSUIEvent.cpp @@ -72,12 +72,12 @@ static JSC_CONST_HASHTABLE HashTable JSUIEventConstructorTable = { 1, 0, JSUIEventConstructorTableValues, 0 }; #endif -class JSUIEventConstructor : public DOMObject { +class JSUIEventConstructor : public DOMConstructorObject { public: - JSUIEventConstructor(ExecState* exec) - : DOMObject(JSUIEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSUIEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSUIEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSUIEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSUIEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -125,8 +125,8 @@ bool JSUIEventPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& p const ClassInfo JSUIEvent::s_info = { "UIEvent", &JSEvent::s_info, &JSUIEventTable, 0 }; -JSUIEvent::JSUIEvent(PassRefPtr structure, PassRefPtr impl) - : JSEvent(structure, impl) +JSUIEvent::JSUIEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSEvent(structure, globalObject, impl) { } @@ -142,74 +142,84 @@ bool JSUIEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa JSValue jsUIEventView(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSUIEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - UIEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->view())); + UIEvent* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->view())); } JSValue jsUIEventDetail(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSUIEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - UIEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + UIEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->detail()); } JSValue jsUIEventKeyCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSUIEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - UIEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + UIEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->keyCode()); } JSValue jsUIEventCharCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSUIEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - UIEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + UIEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->charCode()); } JSValue jsUIEventLayerX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSUIEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - UIEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + UIEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->layerX()); } JSValue jsUIEventLayerY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSUIEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - UIEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + UIEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->layerY()); } JSValue jsUIEventPageX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSUIEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - UIEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + UIEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->pageX()); } JSValue jsUIEventPageY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSUIEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - UIEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + UIEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->pageY()); } JSValue jsUIEventWhich(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSUIEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - UIEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + UIEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->which()); } JSValue jsUIEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSUIEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSUIEvent::getConstructor(exec, domObject->globalObject()); } -JSValue JSUIEvent::getConstructor(ExecState* exec) +JSValue JSUIEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsUIEventPrototypeFunctionInitUIEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSUIEvent.h b/src/3rdparty/webkit/WebCore/generated/JSUIEvent.h index 399943801..587296b22 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSUIEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSUIEvent.h @@ -30,7 +30,7 @@ class UIEvent; class JSUIEvent : public JSEvent { typedef JSEvent Base; public: - JSUIEvent(PassRefPtr, PassRefPtr); + JSUIEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSValidityState.cpp b/src/3rdparty/webkit/WebCore/generated/JSValidityState.cpp index fe8ea2074..e99ec02ef 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSValidityState.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSValidityState.cpp @@ -76,8 +76,8 @@ JSObject* JSValidityStatePrototype::self(ExecState* exec, JSGlobalObject* global const ClassInfo JSValidityState::s_info = { "ValidityState", 0, &JSValidityStateTable, 0 }; -JSValidityState::JSValidityState(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSValidityState::JSValidityState(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -99,70 +99,79 @@ bool JSValidityState::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsValidityStateValueMissing(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSValidityState* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ValidityState* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ValidityState* imp = static_cast(castedThis->impl()); return jsBoolean(imp->valueMissing()); } JSValue jsValidityStateTypeMismatch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSValidityState* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ValidityState* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ValidityState* imp = static_cast(castedThis->impl()); return jsBoolean(imp->typeMismatch()); } JSValue jsValidityStatePatternMismatch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSValidityState* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ValidityState* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ValidityState* imp = static_cast(castedThis->impl()); return jsBoolean(imp->patternMismatch()); } JSValue jsValidityStateTooLong(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSValidityState* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ValidityState* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ValidityState* imp = static_cast(castedThis->impl()); return jsBoolean(imp->tooLong()); } JSValue jsValidityStateRangeUnderflow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSValidityState* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ValidityState* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ValidityState* imp = static_cast(castedThis->impl()); return jsBoolean(imp->rangeUnderflow()); } JSValue jsValidityStateRangeOverflow(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSValidityState* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ValidityState* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ValidityState* imp = static_cast(castedThis->impl()); return jsBoolean(imp->rangeOverflow()); } JSValue jsValidityStateStepMismatch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSValidityState* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ValidityState* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ValidityState* imp = static_cast(castedThis->impl()); return jsBoolean(imp->stepMismatch()); } JSValue jsValidityStateCustomError(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSValidityState* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ValidityState* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ValidityState* imp = static_cast(castedThis->impl()); return jsBoolean(imp->customError()); } JSValue jsValidityStateValid(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSValidityState* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - ValidityState* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + ValidityState* imp = static_cast(castedThis->impl()); return jsBoolean(imp->valid()); } -JSC::JSValue toJS(JSC::ExecState* exec, ValidityState* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, ValidityState* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } ValidityState* toValidityState(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSValidityState.h b/src/3rdparty/webkit/WebCore/generated/JSValidityState.h index a866146fe..dab130774 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSValidityState.h +++ b/src/3rdparty/webkit/WebCore/generated/JSValidityState.h @@ -21,6 +21,7 @@ #ifndef JSValidityState_h #define JSValidityState_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class ValidityState; -class JSValidityState : public DOMObject { - typedef DOMObject Base; +class JSValidityState : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSValidityState(PassRefPtr, PassRefPtr); + JSValidityState(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSValidityState(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -50,7 +51,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, ValidityState*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, ValidityState*); ValidityState* toValidityState(JSC::JSValue); class JSValidityStatePrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.cpp b/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.cpp index b95c4402a..8558c88ee 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.cpp @@ -60,8 +60,8 @@ bool JSVoidCallbackPrototype::getOwnPropertySlot(ExecState* exec, const Identifi const ClassInfo JSVoidCallback::s_info = { "VoidCallback", 0, 0, 0 }; -JSVoidCallback::JSVoidCallback(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSVoidCallback::JSVoidCallback(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -88,9 +88,9 @@ JSValue JSC_HOST_CALL jsVoidCallbackPrototypeFunctionHandleEvent(ExecState* exec return jsUndefined(); } -JSC::JSValue toJS(JSC::ExecState* exec, VoidCallback* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, VoidCallback* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.h b/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.h index ac05cb9d1..ce61d3cbc 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.h +++ b/src/3rdparty/webkit/WebCore/generated/JSVoidCallback.h @@ -21,6 +21,7 @@ #ifndef JSVoidCallback_h #define JSVoidCallback_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class VoidCallback; -class JSVoidCallback : public DOMObject { - typedef DOMObject Base; +class JSVoidCallback : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSVoidCallback(PassRefPtr, PassRefPtr); + JSVoidCallback(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSVoidCallback(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -44,7 +45,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, VoidCallback*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, VoidCallback*); VoidCallback* toVoidCallback(JSC::JSValue); class JSVoidCallbackPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.cpp index e8b791b69..9c15afd7a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSWebKitAnimationEventConstructorTable = { 1, 0, JSWebKitAnimationEventConstructorTableValues, 0 }; #endif -class JSWebKitAnimationEventConstructor : public DOMObject { +class JSWebKitAnimationEventConstructor : public DOMConstructorObject { public: - JSWebKitAnimationEventConstructor(ExecState* exec) - : DOMObject(JSWebKitAnimationEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSWebKitAnimationEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSWebKitAnimationEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSWebKitAnimationEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSWebKitAnimationEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -118,8 +118,8 @@ bool JSWebKitAnimationEventPrototype::getOwnPropertySlot(ExecState* exec, const const ClassInfo JSWebKitAnimationEvent::s_info = { "WebKitAnimationEvent", &JSEvent::s_info, &JSWebKitAnimationEventTable, 0 }; -JSWebKitAnimationEvent::JSWebKitAnimationEvent(PassRefPtr structure, PassRefPtr impl) - : JSEvent(structure, impl) +JSWebKitAnimationEvent::JSWebKitAnimationEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSEvent(structure, globalObject, impl) { } @@ -135,25 +135,28 @@ bool JSWebKitAnimationEvent::getOwnPropertySlot(ExecState* exec, const Identifie JSValue jsWebKitAnimationEventAnimationName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitAnimationEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitAnimationEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitAnimationEvent* imp = static_cast(castedThis->impl()); return jsString(exec, imp->animationName()); } JSValue jsWebKitAnimationEventElapsedTime(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitAnimationEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitAnimationEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitAnimationEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->elapsedTime()); } JSValue jsWebKitAnimationEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSWebKitAnimationEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSWebKitAnimationEvent::getConstructor(exec, domObject->globalObject()); } -JSValue JSWebKitAnimationEvent::getConstructor(ExecState* exec) +JSValue JSWebKitAnimationEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsWebKitAnimationEventPrototypeFunctionInitWebKitAnimationEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.h index 5c6862eb5..c6969d8f6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitAnimationEvent.h @@ -30,7 +30,7 @@ class WebKitAnimationEvent; class JSWebKitAnimationEvent : public JSEvent { typedef JSEvent Base; public: - JSWebKitAnimationEvent(PassRefPtr, PassRefPtr); + JSWebKitAnimationEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.cpp index a99fac6d8..2a712092a 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSWebKitCSSKeyframeRuleConstructorTable = { 1, 0, JSWebKitCSSKeyframeRuleConstructorTableValues, 0 }; #endif -class JSWebKitCSSKeyframeRuleConstructor : public DOMObject { +class JSWebKitCSSKeyframeRuleConstructor : public DOMConstructorObject { public: - JSWebKitCSSKeyframeRuleConstructor(ExecState* exec) - : DOMObject(JSWebKitCSSKeyframeRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSWebKitCSSKeyframeRuleConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSWebKitCSSKeyframeRuleConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSWebKitCSSKeyframeRulePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSWebKitCSSKeyframeRulePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -113,8 +113,8 @@ JSObject* JSWebKitCSSKeyframeRulePrototype::self(ExecState* exec, JSGlobalObject const ClassInfo JSWebKitCSSKeyframeRule::s_info = { "WebKitCSSKeyframeRule", &JSCSSRule::s_info, &JSWebKitCSSKeyframeRuleTable, 0 }; -JSWebKitCSSKeyframeRule::JSWebKitCSSKeyframeRule(PassRefPtr structure, PassRefPtr impl) - : JSCSSRule(structure, impl) +JSWebKitCSSKeyframeRule::JSWebKitCSSKeyframeRule(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCSSRule(structure, globalObject, impl) { } @@ -130,21 +130,24 @@ bool JSWebKitCSSKeyframeRule::getOwnPropertySlot(ExecState* exec, const Identifi JSValue jsWebKitCSSKeyframeRuleKeyText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSKeyframeRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSKeyframeRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSKeyframeRule* imp = static_cast(castedThis->impl()); return jsString(exec, imp->keyText()); } JSValue jsWebKitCSSKeyframeRuleStyle(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSKeyframeRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSKeyframeRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->style())); + WebKitCSSKeyframeRule* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->style())); } JSValue jsWebKitCSSKeyframeRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSWebKitCSSKeyframeRule* domObject = static_cast(asObject(slot.slotBase())); + return JSWebKitCSSKeyframeRule::getConstructor(exec, domObject->globalObject()); } void JSWebKitCSSKeyframeRule::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -157,9 +160,9 @@ void setJSWebKitCSSKeyframeRuleKeyText(ExecState* exec, JSObject* thisObject, JS imp->setKeyText(value.toString(exec)); } -JSValue JSWebKitCSSKeyframeRule::getConstructor(ExecState* exec) +JSValue JSWebKitCSSKeyframeRule::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.h index f77c22629..36d05a84b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframeRule.h @@ -30,7 +30,7 @@ class WebKitCSSKeyframeRule; class JSWebKitCSSKeyframeRule : public JSCSSRule { typedef JSCSSRule Base; public: - JSWebKitCSSKeyframeRule(PassRefPtr, PassRefPtr); + JSWebKitCSSKeyframeRule(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -42,7 +42,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.cpp index 013622c5b..baf4e51ce 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.cpp @@ -68,12 +68,12 @@ static JSC_CONST_HASHTABLE HashTable JSWebKitCSSKeyframesRuleConstructorTable = { 1, 0, JSWebKitCSSKeyframesRuleConstructorTableValues, 0 }; #endif -class JSWebKitCSSKeyframesRuleConstructor : public DOMObject { +class JSWebKitCSSKeyframesRuleConstructor : public DOMConstructorObject { public: - JSWebKitCSSKeyframesRuleConstructor(ExecState* exec) - : DOMObject(JSWebKitCSSKeyframesRuleConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSWebKitCSSKeyframesRuleConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSWebKitCSSKeyframesRuleConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSWebKitCSSKeyframesRulePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSWebKitCSSKeyframesRulePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -123,8 +123,8 @@ bool JSWebKitCSSKeyframesRulePrototype::getOwnPropertySlot(ExecState* exec, cons const ClassInfo JSWebKitCSSKeyframesRule::s_info = { "WebKitCSSKeyframesRule", &JSCSSRule::s_info, &JSWebKitCSSKeyframesRuleTable, 0 }; -JSWebKitCSSKeyframesRule::JSWebKitCSSKeyframesRule(PassRefPtr structure, PassRefPtr impl) - : JSCSSRule(structure, impl) +JSWebKitCSSKeyframesRule::JSWebKitCSSKeyframesRule(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCSSRule(structure, globalObject, impl) { } @@ -160,21 +160,24 @@ bool JSWebKitCSSKeyframesRule::getOwnPropertySlot(ExecState* exec, unsigned prop JSValue jsWebKitCSSKeyframesRuleName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSKeyframesRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSKeyframesRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSKeyframesRule* imp = static_cast(castedThis->impl()); return jsStringOrNull(exec, imp->name()); } JSValue jsWebKitCSSKeyframesRuleCssRules(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSKeyframesRule* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSKeyframesRule* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->cssRules())); + WebKitCSSKeyframesRule* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->cssRules())); } JSValue jsWebKitCSSKeyframesRuleConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSWebKitCSSKeyframesRule* domObject = static_cast(asObject(slot.slotBase())); + return JSWebKitCSSKeyframesRule::getConstructor(exec, domObject->globalObject()); } void JSWebKitCSSKeyframesRule::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -194,9 +197,9 @@ void JSWebKitCSSKeyframesRule::getPropertyNames(ExecState* exec, PropertyNameArr Base::getPropertyNames(exec, propertyNames); } -JSValue JSWebKitCSSKeyframesRule::getConstructor(ExecState* exec) +JSValue JSWebKitCSSKeyframesRule::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsWebKitCSSKeyframesRulePrototypeFunctionInsertRule(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -235,7 +238,7 @@ JSValue JSC_HOST_CALL jsWebKitCSSKeyframesRulePrototypeFunctionFindRule(ExecStat const UString& key = args.at(0).toString(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->findRule(key))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->findRule(key))); return result; } @@ -243,7 +246,7 @@ JSValue JSC_HOST_CALL jsWebKitCSSKeyframesRulePrototypeFunctionFindRule(ExecStat JSValue JSWebKitCSSKeyframesRule::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot) { JSWebKitCSSKeyframesRule* thisObj = static_cast(asObject(slot.slotBase())); - return toJS(exec, static_cast(thisObj->impl())->item(slot.index())); + return toJS(exec, thisObj->globalObject(), static_cast(thisObj->impl())->item(slot.index())); } } diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.h index 789f0a149..cae9a5f05 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSKeyframesRule.h @@ -30,7 +30,7 @@ class WebKitCSSKeyframesRule; class JSWebKitCSSKeyframesRule : public JSCSSRule { typedef JSCSSRule Base; public: - JSWebKitCSSKeyframesRule(PassRefPtr, PassRefPtr); + JSWebKitCSSKeyframesRule(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual bool getOwnPropertySlot(JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&); @@ -44,7 +44,7 @@ public: } virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); static JSC::JSValue indexGetter(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.cpp index 9c1436be8..bfd9a37b5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.cpp @@ -107,8 +107,8 @@ bool JSWebKitCSSMatrixPrototype::getOwnPropertySlot(ExecState* exec, const Ident const ClassInfo JSWebKitCSSMatrix::s_info = { "WebKitCSSMatrix", 0, &JSWebKitCSSMatrixTable, 0 }; -JSWebKitCSSMatrix::JSWebKitCSSMatrix(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSWebKitCSSMatrix::JSWebKitCSSMatrix(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -130,155 +130,177 @@ bool JSWebKitCSSMatrix::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsWebKitCSSMatrixA(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->a()); } JSValue jsWebKitCSSMatrixB(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->b()); } JSValue jsWebKitCSSMatrixC(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->c()); } JSValue jsWebKitCSSMatrixD(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->d()); } JSValue jsWebKitCSSMatrixE(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->e()); } JSValue jsWebKitCSSMatrixF(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->f()); } JSValue jsWebKitCSSMatrixM11(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m11()); } JSValue jsWebKitCSSMatrixM12(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m12()); } JSValue jsWebKitCSSMatrixM13(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m13()); } JSValue jsWebKitCSSMatrixM14(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m14()); } JSValue jsWebKitCSSMatrixM21(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m21()); } JSValue jsWebKitCSSMatrixM22(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m22()); } JSValue jsWebKitCSSMatrixM23(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m23()); } JSValue jsWebKitCSSMatrixM24(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m24()); } JSValue jsWebKitCSSMatrixM31(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m31()); } JSValue jsWebKitCSSMatrixM32(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m32()); } JSValue jsWebKitCSSMatrixM33(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m33()); } JSValue jsWebKitCSSMatrixM34(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m34()); } JSValue jsWebKitCSSMatrixM41(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m41()); } JSValue jsWebKitCSSMatrixM42(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m42()); } JSValue jsWebKitCSSMatrixM43(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m43()); } JSValue jsWebKitCSSMatrixM44(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSMatrix* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSMatrix* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSMatrix* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->m44()); } @@ -444,7 +466,7 @@ JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionMultiply(ExecState* exec WebKitCSSMatrix* secondMatrix = toWebKitCSSMatrix(args.at(0)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->multiply(secondMatrix))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->multiply(secondMatrix))); return result; } @@ -458,7 +480,7 @@ JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionInverse(ExecState* exec, ExceptionCode ec = 0; - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->inverse(ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->inverse(ec))); setDOMException(exec, ec); return result; } @@ -475,7 +497,7 @@ JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionTranslate(ExecState* exe double z = args.at(2).toNumber(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->translate(x, y, z))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->translate(x, y, z))); return result; } @@ -491,7 +513,7 @@ JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionScale(ExecState* exec, J double scaleZ = args.at(2).toNumber(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->scale(scaleX, scaleY, scaleZ))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->scale(scaleX, scaleY, scaleZ))); return result; } @@ -507,7 +529,7 @@ JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionRotate(ExecState* exec, double rotZ = args.at(2).toNumber(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->rotate(rotX, rotY, rotZ))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->rotate(rotX, rotY, rotZ))); return result; } @@ -524,7 +546,7 @@ JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionRotateAxisAngle(ExecStat double angle = args.at(3).toNumber(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->rotateAxisAngle(x, y, z, angle))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->rotateAxisAngle(x, y, z, angle))); return result; } @@ -541,9 +563,9 @@ JSValue JSC_HOST_CALL jsWebKitCSSMatrixPrototypeFunctionToString(ExecState* exec return result; } -JSC::JSValue toJS(JSC::ExecState* exec, WebKitCSSMatrix* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, WebKitCSSMatrix* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } WebKitCSSMatrix* toWebKitCSSMatrix(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.h index ad377126d..2e44fcf9f 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSMatrix.h @@ -21,6 +21,7 @@ #ifndef JSWebKitCSSMatrix_h #define JSWebKitCSSMatrix_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class WebKitCSSMatrix; -class JSWebKitCSSMatrix : public DOMObject { - typedef DOMObject Base; +class JSWebKitCSSMatrix : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSWebKitCSSMatrix(PassRefPtr, PassRefPtr); + JSWebKitCSSMatrix(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSWebKitCSSMatrix(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -51,7 +52,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, WebKitCSSMatrix*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, WebKitCSSMatrix*); WebKitCSSMatrix* toWebKitCSSMatrix(JSC::JSValue); class JSWebKitCSSMatrixPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.cpp index 59a4650b8..ca3b00389 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.cpp @@ -82,12 +82,12 @@ static JSC_CONST_HASHTABLE HashTable JSWebKitCSSTransformValueConstructorTable = { 68, 63, JSWebKitCSSTransformValueConstructorTableValues, 0 }; #endif -class JSWebKitCSSTransformValueConstructor : public DOMObject { +class JSWebKitCSSTransformValueConstructor : public DOMConstructorObject { public: - JSWebKitCSSTransformValueConstructor(ExecState* exec) - : DOMObject(JSWebKitCSSTransformValueConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSWebKitCSSTransformValueConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSWebKitCSSTransformValueConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSWebKitCSSTransformValuePrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSWebKitCSSTransformValuePrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -155,8 +155,8 @@ bool JSWebKitCSSTransformValuePrototype::getOwnPropertySlot(ExecState* exec, con const ClassInfo JSWebKitCSSTransformValue::s_info = { "WebKitCSSTransformValue", &JSCSSValueList::s_info, &JSWebKitCSSTransformValueTable, 0 }; -JSWebKitCSSTransformValue::JSWebKitCSSTransformValue(PassRefPtr structure, PassRefPtr impl) - : JSCSSValueList(structure, impl) +JSWebKitCSSTransformValue::JSWebKitCSSTransformValue(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSCSSValueList(structure, globalObject, impl) { } @@ -172,18 +172,20 @@ bool JSWebKitCSSTransformValue::getOwnPropertySlot(ExecState* exec, const Identi JSValue jsWebKitCSSTransformValueOperationType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitCSSTransformValue* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitCSSTransformValue* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitCSSTransformValue* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->operationType()); } JSValue jsWebKitCSSTransformValueConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSWebKitCSSTransformValue* domObject = static_cast(asObject(slot.slotBase())); + return JSWebKitCSSTransformValue::getConstructor(exec, domObject->globalObject()); } -JSValue JSWebKitCSSTransformValue::getConstructor(ExecState* exec) +JSValue JSWebKitCSSTransformValue::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } // Constant getters diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.h index 3f636e3f2..58e7f5c6d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitCSSTransformValue.h @@ -30,7 +30,7 @@ class WebKitCSSTransformValue; class JSWebKitCSSTransformValue : public JSCSSValueList { typedef JSCSSValueList Base; public: - JSWebKitCSSTransformValue(PassRefPtr, PassRefPtr); + JSWebKitCSSTransformValue(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.cpp index ced49fb40..bba55c0ae 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.cpp @@ -70,8 +70,8 @@ JSObject* JSWebKitPointPrototype::self(ExecState* exec, JSGlobalObject* globalOb const ClassInfo JSWebKitPoint::s_info = { "WebKitPoint", 0, &JSWebKitPointTable, 0 }; -JSWebKitPoint::JSWebKitPoint(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSWebKitPoint::JSWebKitPoint(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -93,15 +93,17 @@ bool JSWebKitPoint::getOwnPropertySlot(ExecState* exec, const Identifier& proper JSValue jsWebKitPointX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitPoint* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitPoint* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitPoint* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsWebKitPointY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitPoint* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitPoint* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitPoint* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } @@ -122,9 +124,9 @@ void setJSWebKitPointY(ExecState* exec, JSObject* thisObject, JSValue value) imp->setY(value.toFloat(exec)); } -JSC::JSValue toJS(JSC::ExecState* exec, WebKitPoint* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, WebKitPoint* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } WebKitPoint* toWebKitPoint(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.h index 1a7c88f01..fdc8d4727 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitPoint.h @@ -21,6 +21,7 @@ #ifndef JSWebKitPoint_h #define JSWebKitPoint_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class WebKitPoint; -class JSWebKitPoint : public DOMObject { - typedef DOMObject Base; +class JSWebKitPoint : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSWebKitPoint(PassRefPtr, PassRefPtr); + JSWebKitPoint(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSWebKitPoint(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -51,7 +52,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, WebKitPoint*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, WebKitPoint*); WebKitPoint* toWebKitPoint(JSC::JSValue); class JSWebKitPointPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.cpp index 75e4de7ed..ec0aa0d88 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.cpp @@ -65,12 +65,12 @@ static JSC_CONST_HASHTABLE HashTable JSWebKitTransitionEventConstructorTable = { 1, 0, JSWebKitTransitionEventConstructorTableValues, 0 }; #endif -class JSWebKitTransitionEventConstructor : public DOMObject { +class JSWebKitTransitionEventConstructor : public DOMConstructorObject { public: - JSWebKitTransitionEventConstructor(ExecState* exec) - : DOMObject(JSWebKitTransitionEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSWebKitTransitionEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSWebKitTransitionEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSWebKitTransitionEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSWebKitTransitionEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -118,8 +118,8 @@ bool JSWebKitTransitionEventPrototype::getOwnPropertySlot(ExecState* exec, const const ClassInfo JSWebKitTransitionEvent::s_info = { "WebKitTransitionEvent", &JSEvent::s_info, &JSWebKitTransitionEventTable, 0 }; -JSWebKitTransitionEvent::JSWebKitTransitionEvent(PassRefPtr structure, PassRefPtr impl) - : JSEvent(structure, impl) +JSWebKitTransitionEvent::JSWebKitTransitionEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSEvent(structure, globalObject, impl) { } @@ -135,25 +135,28 @@ bool JSWebKitTransitionEvent::getOwnPropertySlot(ExecState* exec, const Identifi JSValue jsWebKitTransitionEventPropertyName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitTransitionEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitTransitionEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitTransitionEvent* imp = static_cast(castedThis->impl()); return jsString(exec, imp->propertyName()); } JSValue jsWebKitTransitionEventElapsedTime(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWebKitTransitionEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WebKitTransitionEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WebKitTransitionEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->elapsedTime()); } JSValue jsWebKitTransitionEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSWebKitTransitionEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSWebKitTransitionEvent::getConstructor(exec, domObject->globalObject()); } -JSValue JSWebKitTransitionEvent::getConstructor(ExecState* exec) +JSValue JSWebKitTransitionEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsWebKitTransitionEventPrototypeFunctionInitWebKitTransitionEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) diff --git a/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.h b/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.h index de22ec358..d8bf92a25 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWebKitTransitionEvent.h @@ -30,7 +30,7 @@ class WebKitTransitionEvent; class JSWebKitTransitionEvent : public JSEvent { typedef JSEvent Base; public: - JSWebKitTransitionEvent(PassRefPtr, PassRefPtr); + JSWebKitTransitionEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.cpp index 1a47e6fc3..fa29330fb 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.cpp @@ -75,12 +75,12 @@ static JSC_CONST_HASHTABLE HashTable JSWheelEventConstructorTable = { 1, 0, JSWheelEventConstructorTableValues, 0 }; #endif -class JSWheelEventConstructor : public DOMObject { +class JSWheelEventConstructor : public DOMConstructorObject { public: - JSWheelEventConstructor(ExecState* exec) - : DOMObject(JSWheelEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSWheelEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSWheelEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSWheelEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSWheelEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -122,8 +122,8 @@ JSObject* JSWheelEventPrototype::self(ExecState* exec, JSGlobalObject* globalObj const ClassInfo JSWheelEvent::s_info = { "WheelEvent", &JSUIEvent::s_info, &JSWheelEventTable, 0 }; -JSWheelEvent::JSWheelEvent(PassRefPtr structure, PassRefPtr impl) - : JSUIEvent(structure, impl) +JSWheelEvent::JSWheelEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSUIEvent(structure, globalObject, impl) { } @@ -139,116 +139,132 @@ bool JSWheelEvent::getOwnPropertySlot(ExecState* exec, const Identifier& propert JSValue jsWheelEventScreenX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->screenX()); } JSValue jsWheelEventScreenY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->screenY()); } JSValue jsWheelEventClientX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->clientX()); } JSValue jsWheelEventClientY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->clientY()); } JSValue jsWheelEventCtrlKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->ctrlKey()); } JSValue jsWheelEventShiftKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->shiftKey()); } JSValue jsWheelEventAltKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->altKey()); } JSValue jsWheelEventMetaKey(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsBoolean(imp->metaKey()); } JSValue jsWheelEventWheelDelta(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->wheelDelta()); } JSValue jsWheelEventWheelDeltaX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->wheelDeltaX()); } JSValue jsWheelEventWheelDeltaY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->wheelDeltaY()); } JSValue jsWheelEventOffsetX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->offsetX()); } JSValue jsWheelEventOffsetY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->offsetY()); } JSValue jsWheelEventX(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->x()); } JSValue jsWheelEventY(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWheelEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WheelEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WheelEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->y()); } JSValue jsWheelEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSWheelEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSWheelEvent::getConstructor(exec, domObject->globalObject()); } -JSValue JSWheelEvent::getConstructor(ExecState* exec) +JSValue JSWheelEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.h b/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.h index ae9730daa..78fdc12b8 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWheelEvent.h @@ -30,7 +30,7 @@ class WheelEvent; class JSWheelEvent : public JSUIEvent { typedef JSUIEvent Base; public: - JSWheelEvent(PassRefPtr, PassRefPtr); + JSWheelEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorker.cpp b/src/3rdparty/webkit/WebCore/generated/JSWorker.cpp index 979f43b75..0e238e436 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorker.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWorker.cpp @@ -24,11 +24,9 @@ #include "JSWorker.h" -#include "Event.h" #include "EventListener.h" #include "Frame.h" #include "JSDOMGlobalObject.h" -#include "JSEvent.h" #include "JSEventListener.h" #include "JSMessagePort.h" #include "Worker.h" @@ -43,29 +41,25 @@ ASSERT_CLASS_FITS_IN_CELL(JSWorker); /* Hash table */ -static const HashTableValue JSWorkerTableValues[3] = +static const HashTableValue JSWorkerTableValues[2] = { - { "onerror", DontDelete, (intptr_t)jsWorkerOnerror, (intptr_t)setJSWorkerOnerror }, { "onmessage", DontDelete, (intptr_t)jsWorkerOnmessage, (intptr_t)setJSWorkerOnmessage }, { 0, 0, 0, 0 } }; static JSC_CONST_HASHTABLE HashTable JSWorkerTable = #if ENABLE(PERFECT_HASH_SIZE) - { 3, JSWorkerTableValues, 0 }; + { 0, JSWorkerTableValues, 0 }; #else - { 4, 3, JSWorkerTableValues, 0 }; + { 2, 1, JSWorkerTableValues, 0 }; #endif /* Hash table for prototype */ -static const HashTableValue JSWorkerPrototypeTableValues[6] = +static const HashTableValue JSWorkerPrototypeTableValues[3] = { { "postMessage", DontDelete|Function, (intptr_t)jsWorkerPrototypeFunctionPostMessage, (intptr_t)2 }, { "terminate", DontDelete|Function, (intptr_t)jsWorkerPrototypeFunctionTerminate, (intptr_t)0 }, - { "addEventListener", DontDelete|Function, (intptr_t)jsWorkerPrototypeFunctionAddEventListener, (intptr_t)3 }, - { "removeEventListener", DontDelete|Function, (intptr_t)jsWorkerPrototypeFunctionRemoveEventListener, (intptr_t)3 }, - { "dispatchEvent", DontDelete|Function, (intptr_t)jsWorkerPrototypeFunctionDispatchEvent, (intptr_t)1 }, { 0, 0, 0, 0 } }; @@ -73,7 +67,7 @@ static JSC_CONST_HASHTABLE HashTable JSWorkerPrototypeTable = #if ENABLE(PERFECT_HASH_SIZE) { 15, JSWorkerPrototypeTableValues, 0 }; #else - { 16, 15, JSWorkerPrototypeTableValues, 0 }; + { 5, 3, JSWorkerPrototypeTableValues, 0 }; #endif const ClassInfo JSWorkerPrototype::s_info = { "WorkerPrototype", 0, &JSWorkerPrototypeTable, 0 }; @@ -88,22 +82,16 @@ bool JSWorkerPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& pr return getStaticFunctionSlot(exec, &JSWorkerPrototypeTable, this, propertyName, slot); } -const ClassInfo JSWorker::s_info = { "Worker", 0, &JSWorkerTable, 0 }; +const ClassInfo JSWorker::s_info = { "Worker", &JSAbstractWorker::s_info, &JSWorkerTable, 0 }; -JSWorker::JSWorker(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) - , m_impl(impl) +JSWorker::JSWorker(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSAbstractWorker(structure, globalObject, impl) { } -JSWorker::~JSWorker() -{ - forgetDOMObject(*Heap::heap(this)->globalData(), m_impl.get()); -} - JSObject* JSWorker::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSWorkerPrototype(JSWorkerPrototype::createStructure(globalObject->objectPrototype())); + return new (exec) JSWorkerPrototype(JSWorkerPrototype::createStructure(JSAbstractWorkerPrototype::self(exec, globalObject))); } bool JSWorker::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -111,21 +99,11 @@ bool JSWorker::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNam return getStaticValueSlot(exec, &JSWorkerTable, this, propertyName, slot); } -JSValue jsWorkerOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - UNUSED_PARAM(exec); - Worker* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - if (EventListener* listener = imp->onerror()) { - if (JSObject* jsFunction = listener->jsFunction()) - return jsFunction; - } - return jsNull(); -} - JSValue jsWorkerOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorker* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - Worker* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + Worker* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onmessage()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -138,16 +116,6 @@ void JSWorker::put(ExecState* exec, const Identifier& propertyName, JSValue valu lookupPut(exec, propertyName, value, &JSWorkerTable, this, slot); } -void setJSWorkerOnerror(ExecState* exec, JSObject* thisObject, JSValue value) -{ - UNUSED_PARAM(exec); - Worker* imp = static_cast(static_cast(thisObject)->impl()); - JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext()); - if (!globalObject) - return; - imp->setOnerror(globalObject->createJSAttributeEventListener(value)); -} - void setJSWorkerOnmessage(ExecState* exec, JSObject* thisObject, JSValue value) { UNUSED_PARAM(exec); @@ -194,43 +162,9 @@ JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionTerminate(ExecState* exec, JSObje return jsUndefined(); } -JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSWorker::s_info)) - return throwError(exec, TypeError); - JSWorker* castedThisObj = static_cast(asObject(thisValue)); - return castedThisObj->addEventListener(exec, args); -} - -JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSWorker::s_info)) - return throwError(exec, TypeError); - JSWorker* castedThisObj = static_cast(asObject(thisValue)); - return castedThisObj->removeEventListener(exec, args); -} - -JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSWorker::s_info)) - return throwError(exec, TypeError); - JSWorker* castedThisObj = static_cast(asObject(thisValue)); - Worker* imp = static_cast(castedThisObj->impl()); - ExceptionCode ec = 0; - Event* evt = toEvent(args.at(0)); - - - JSC::JSValue result = jsBoolean(imp->dispatchEvent(evt, ec)); - setDOMException(exec, ec); - return result; -} - -JSC::JSValue toJS(JSC::ExecState* exec, Worker* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Worker* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } Worker* toWorker(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorker.h b/src/3rdparty/webkit/WebCore/generated/JSWorker.h index c1ed4af9f..f04866b07 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorker.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWorker.h @@ -23,19 +23,17 @@ #if ENABLE(WORKERS) -#include "JSDOMBinding.h" -#include -#include +#include "JSAbstractWorker.h" +#include "Worker.h" namespace WebCore { class Worker; -class JSWorker : public DOMObject { - typedef DOMObject Base; +class JSWorker : public JSAbstractWorker { + typedef JSAbstractWorker Base; public: - JSWorker(PassRefPtr, PassRefPtr); - virtual ~JSWorker(); + JSWorker(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); @@ -49,17 +47,13 @@ public: virtual void mark(); - - // Custom functions - JSC::JSValue addEventListener(JSC::ExecState*, const JSC::ArgList&); - JSC::JSValue removeEventListener(JSC::ExecState*, const JSC::ArgList&); - Worker* impl() const { return m_impl.get(); } - -private: - RefPtr m_impl; + Worker* impl() const + { + return static_cast(Base::impl()); + } }; -JSC::JSValue toJS(JSC::ExecState*, Worker*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Worker*); Worker* toWorker(JSC::JSValue); class JSWorkerPrototype : public JSC::JSObject { @@ -80,13 +74,8 @@ public: JSC::JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionPostMessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); JSC::JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionTerminate(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionRemoveEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsWorkerPrototypeFunctionDispatchEvent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); // Attributes -JSC::JSValue jsWorkerOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSWorkerOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsWorkerOnmessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSWorkerOnmessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.cpp b/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.cpp index cf46141b1..59a8dcd35 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.cpp @@ -30,7 +30,6 @@ #include "JSEventListener.h" #include "JSMessageChannel.h" #include "JSMessageEvent.h" -#include "JSMessagePort.h" #include "JSWorkerContext.h" #include "JSWorkerLocation.h" #include "JSWorkerNavigator.h" @@ -53,8 +52,8 @@ static const HashTableValue JSWorkerContextTableValues[9] = { { "self", DontDelete, (intptr_t)jsWorkerContextSelf, (intptr_t)setJSWorkerContextSelf }, { "location", DontDelete, (intptr_t)jsWorkerContextLocation, (intptr_t)setJSWorkerContextLocation }, + { "onerror", DontDelete, (intptr_t)jsWorkerContextOnerror, (intptr_t)setJSWorkerContextOnerror }, { "navigator", DontDelete, (intptr_t)jsWorkerContextNavigator, (intptr_t)setJSWorkerContextNavigator }, - { "onmessage", DontDelete, (intptr_t)jsWorkerContextOnmessage, (intptr_t)setJSWorkerContextOnmessage }, { "MessageEvent", DontDelete, (intptr_t)jsWorkerContextMessageEventConstructor, (intptr_t)setJSWorkerContextMessageEventConstructor }, { "WorkerLocation", DontDelete, (intptr_t)jsWorkerContextWorkerLocationConstructor, (intptr_t)setJSWorkerContextWorkerLocationConstructor }, { "MessageChannel", DontDelete, (intptr_t)jsWorkerContextMessageChannelConstructor, (intptr_t)setJSWorkerContextMessageChannelConstructor }, @@ -71,11 +70,10 @@ static JSC_CONST_HASHTABLE HashTable JSWorkerContextTable = /* Hash table for prototype */ -static const HashTableValue JSWorkerContextPrototypeTableValues[11] = +static const HashTableValue JSWorkerContextPrototypeTableValues[10] = { { "close", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionClose, (intptr_t)0 }, { "importScripts", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionImportScripts, (intptr_t)0 }, - { "postMessage", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionPostMessage, (intptr_t)2 }, { "setTimeout", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionSetTimeout, (intptr_t)2 }, { "clearTimeout", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionClearTimeout, (intptr_t)1 }, { "setInterval", DontDelete|Function, (intptr_t)jsWorkerContextPrototypeFunctionSetInterval, (intptr_t)2 }, @@ -129,56 +127,62 @@ bool JSWorkerContext::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsWorkerContextSelf(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerContext* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerContext* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->self())); + WorkerContext* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->self())); } JSValue jsWorkerContextLocation(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerContext* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerContext* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->location())); + WorkerContext* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->location())); } -JSValue jsWorkerContextNavigator(ExecState* exec, const Identifier&, const PropertySlot& slot) -{ - UNUSED_PARAM(exec); - WorkerContext* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->navigator())); -} - -JSValue jsWorkerContextOnmessage(ExecState* exec, const Identifier&, const PropertySlot& slot) +JSValue jsWorkerContextOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerContext* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerContext* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - if (EventListener* listener = imp->onmessage()) { + WorkerContext* imp = static_cast(castedThis->impl()); + if (EventListener* listener = imp->onerror()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; } return jsNull(); } +JSValue jsWorkerContextNavigator(ExecState* exec, const Identifier&, const PropertySlot& slot) +{ + JSWorkerContext* castedThis = static_cast(asObject(slot.slotBase())); + UNUSED_PARAM(exec); + WorkerContext* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->navigator())); +} + JSValue jsWorkerContextMessageEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - UNUSED_PARAM(slot); - return JSMessageEvent::getConstructor(exec); + JSWorkerContext* castedThis = static_cast(asObject(slot.slotBase())); + return JSMessageEvent::getConstructor(exec, castedThis); } JSValue jsWorkerContextWorkerLocationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - UNUSED_PARAM(slot); - return JSWorkerLocation::getConstructor(exec); + JSWorkerContext* castedThis = static_cast(asObject(slot.slotBase())); + return JSWorkerLocation::getConstructor(exec, castedThis); } JSValue jsWorkerContextMessageChannelConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->messageChannel(exec); + JSWorkerContext* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->messageChannel(exec); } JSValue jsWorkerContextXMLHttpRequestConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->xmlHttpRequest(exec); + JSWorkerContext* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->xmlHttpRequest(exec); } void JSWorkerContext::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) @@ -198,18 +202,18 @@ void setJSWorkerContextLocation(ExecState* exec, JSObject* thisObject, JSValue v static_cast(thisObject)->putDirect(Identifier(exec, "location"), value); } -void setJSWorkerContextNavigator(ExecState* exec, JSObject* thisObject, JSValue value) -{ - // Shadowing a built-in object - static_cast(thisObject)->putDirect(Identifier(exec, "navigator"), value); -} - -void setJSWorkerContextOnmessage(ExecState* exec, JSObject* thisObject, JSValue value) +void setJSWorkerContextOnerror(ExecState* exec, JSObject* thisObject, JSValue value) { UNUSED_PARAM(exec); WorkerContext* imp = static_cast(static_cast(thisObject)->impl()); JSDOMGlobalObject* globalObject = static_cast(thisObject); - imp->setOnmessage(globalObject->createJSAttributeEventListener(value)); + imp->setOnerror(globalObject->createJSAttributeEventListener(value)); +} + +void setJSWorkerContextNavigator(ExecState* exec, JSObject* thisObject, JSValue value) +{ + // Shadowing a built-in object + static_cast(thisObject)->putDirect(Identifier(exec, "navigator"), value); } void setJSWorkerContextMessageEventConstructor(ExecState* exec, JSObject* thisObject, JSValue value) @@ -239,9 +243,9 @@ void setJSWorkerContextXMLHttpRequestConstructor(ExecState* exec, JSObject* this JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClose(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { UNUSED_PARAM(args); - if (!thisValue.isObject(&JSWorkerContext::s_info)) + JSWorkerContext* castedThisObj = toJSWorkerContext(thisValue.toThisObject(exec)); + if (!castedThisObj) return throwError(exec, TypeError); - JSWorkerContext* castedThisObj = static_cast(asObject(thisValue)); WorkerContext* imp = static_cast(castedThisObj->impl()); imp->close(); @@ -251,51 +255,27 @@ JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClose(ExecState* exec, JSO JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionImportScripts(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { UNUSED_PARAM(args); - if (!thisValue.isObject(&JSWorkerContext::s_info)) + JSWorkerContext* castedThisObj = toJSWorkerContext(thisValue.toThisObject(exec)); + if (!castedThisObj) return throwError(exec, TypeError); - JSWorkerContext* castedThisObj = static_cast(asObject(thisValue)); return castedThisObj->importScripts(exec, args); } -JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionPostMessage(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) -{ - UNUSED_PARAM(args); - if (!thisValue.isObject(&JSWorkerContext::s_info)) - return throwError(exec, TypeError); - JSWorkerContext* castedThisObj = static_cast(asObject(thisValue)); - WorkerContext* imp = static_cast(castedThisObj->impl()); - ExceptionCode ec = 0; - const UString& message = args.at(0).toString(exec); - - int argsCount = args.size(); - if (argsCount < 2) { - imp->postMessage(message, ec); - setDOMException(exec, ec); - return jsUndefined(); - } - - MessagePort* messagePort = toMessagePort(args.at(1)); - - imp->postMessage(message, messagePort, ec); - setDOMException(exec, ec); - return jsUndefined(); -} - JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionSetTimeout(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { UNUSED_PARAM(args); - if (!thisValue.isObject(&JSWorkerContext::s_info)) + JSWorkerContext* castedThisObj = toJSWorkerContext(thisValue.toThisObject(exec)); + if (!castedThisObj) return throwError(exec, TypeError); - JSWorkerContext* castedThisObj = static_cast(asObject(thisValue)); return castedThisObj->setTimeout(exec, args); } JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClearTimeout(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { UNUSED_PARAM(args); - if (!thisValue.isObject(&JSWorkerContext::s_info)) + JSWorkerContext* castedThisObj = toJSWorkerContext(thisValue.toThisObject(exec)); + if (!castedThisObj) return throwError(exec, TypeError); - JSWorkerContext* castedThisObj = static_cast(asObject(thisValue)); WorkerContext* imp = static_cast(castedThisObj->impl()); int handle = args.at(0).toInt32(exec); @@ -306,18 +286,18 @@ JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClearTimeout(ExecState* ex JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionSetInterval(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { UNUSED_PARAM(args); - if (!thisValue.isObject(&JSWorkerContext::s_info)) + JSWorkerContext* castedThisObj = toJSWorkerContext(thisValue.toThisObject(exec)); + if (!castedThisObj) return throwError(exec, TypeError); - JSWorkerContext* castedThisObj = static_cast(asObject(thisValue)); return castedThisObj->setInterval(exec, args); } JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClearInterval(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { UNUSED_PARAM(args); - if (!thisValue.isObject(&JSWorkerContext::s_info)) + JSWorkerContext* castedThisObj = toJSWorkerContext(thisValue.toThisObject(exec)); + if (!castedThisObj) return throwError(exec, TypeError); - JSWorkerContext* castedThisObj = static_cast(asObject(thisValue)); WorkerContext* imp = static_cast(castedThisObj->impl()); int handle = args.at(0).toInt32(exec); @@ -328,27 +308,27 @@ JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClearInterval(ExecState* e JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { UNUSED_PARAM(args); - if (!thisValue.isObject(&JSWorkerContext::s_info)) + JSWorkerContext* castedThisObj = toJSWorkerContext(thisValue.toThisObject(exec)); + if (!castedThisObj) return throwError(exec, TypeError); - JSWorkerContext* castedThisObj = static_cast(asObject(thisValue)); return castedThisObj->addEventListener(exec, args); } JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionRemoveEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { UNUSED_PARAM(args); - if (!thisValue.isObject(&JSWorkerContext::s_info)) + JSWorkerContext* castedThisObj = toJSWorkerContext(thisValue.toThisObject(exec)); + if (!castedThisObj) return throwError(exec, TypeError); - JSWorkerContext* castedThisObj = static_cast(asObject(thisValue)); return castedThisObj->removeEventListener(exec, args); } JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionDispatchEvent(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) { UNUSED_PARAM(args); - if (!thisValue.isObject(&JSWorkerContext::s_info)) + JSWorkerContext* castedThisObj = toJSWorkerContext(thisValue.toThisObject(exec)); + if (!castedThisObj) return throwError(exec, TypeError); - JSWorkerContext* castedThisObj = static_cast(asObject(thisValue)); WorkerContext* imp = static_cast(castedThisObj->impl()); ExceptionCode ec = 0; Event* evt = toEvent(args.at(0)); diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.h b/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.h index 7453f275b..5ce05b7ad 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerContext.h @@ -78,7 +78,6 @@ public: JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClose(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionImportScripts(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); -JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionPostMessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionSetTimeout(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionClearTimeout(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); JSC::JSValue JSC_HOST_CALL jsWorkerContextPrototypeFunctionSetInterval(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&); @@ -92,10 +91,10 @@ JSC::JSValue jsWorkerContextSelf(JSC::ExecState*, const JSC::Identifier&, const void setJSWorkerContextSelf(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsWorkerContextLocation(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSWorkerContextLocation(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); +JSC::JSValue jsWorkerContextOnerror(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); +void setJSWorkerContextOnerror(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsWorkerContextNavigator(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSWorkerContextNavigator(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); -JSC::JSValue jsWorkerContextOnmessage(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); -void setJSWorkerContextOnmessage(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsWorkerContextMessageEventConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); void setJSWorkerContextMessageEventConstructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue); JSC::JSValue jsWorkerContextWorkerLocationConstructor(JSC::ExecState*, const JSC::Identifier&, const JSC::PropertySlot&); diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.cpp b/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.cpp index d29c219d2..d45c06a43 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.cpp @@ -73,12 +73,12 @@ static JSC_CONST_HASHTABLE HashTable JSWorkerLocationConstructorTable = { 1, 0, JSWorkerLocationConstructorTableValues, 0 }; #endif -class JSWorkerLocationConstructor : public DOMObject { +class JSWorkerLocationConstructor : public DOMConstructorObject { public: - JSWorkerLocationConstructor(ExecState* exec) - : DOMObject(JSWorkerLocationConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSWorkerLocationConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSWorkerLocationConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSWorkerLocationPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSWorkerLocationPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -134,8 +134,8 @@ static const HashTable* getJSWorkerLocationTable(ExecState* exec) } const ClassInfo JSWorkerLocation::s_info = { "WorkerLocation", 0, 0, getJSWorkerLocationTable }; -JSWorkerLocation::JSWorkerLocation(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSWorkerLocation::JSWorkerLocation(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -157,67 +157,76 @@ bool JSWorkerLocation::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsWorkerLocationHref(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerLocation* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WorkerLocation* imp = static_cast(castedThis->impl()); return jsString(exec, imp->href()); } JSValue jsWorkerLocationProtocol(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerLocation* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WorkerLocation* imp = static_cast(castedThis->impl()); return jsString(exec, imp->protocol()); } JSValue jsWorkerLocationHost(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerLocation* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WorkerLocation* imp = static_cast(castedThis->impl()); return jsString(exec, imp->host()); } JSValue jsWorkerLocationHostname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerLocation* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WorkerLocation* imp = static_cast(castedThis->impl()); return jsString(exec, imp->hostname()); } JSValue jsWorkerLocationPort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerLocation* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WorkerLocation* imp = static_cast(castedThis->impl()); return jsString(exec, imp->port()); } JSValue jsWorkerLocationPathname(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerLocation* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WorkerLocation* imp = static_cast(castedThis->impl()); return jsString(exec, imp->pathname()); } JSValue jsWorkerLocationSearch(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerLocation* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WorkerLocation* imp = static_cast(castedThis->impl()); return jsString(exec, imp->search()); } JSValue jsWorkerLocationHash(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerLocation* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerLocation* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WorkerLocation* imp = static_cast(castedThis->impl()); return jsString(exec, imp->hash()); } JSValue jsWorkerLocationConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSWorkerLocation* domObject = static_cast(asObject(slot.slotBase())); + return JSWorkerLocation::getConstructor(exec, domObject->globalObject()); } -JSValue JSWorkerLocation::getConstructor(ExecState* exec) +JSValue JSWorkerLocation::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsWorkerLocationPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -233,9 +242,9 @@ JSValue JSC_HOST_CALL jsWorkerLocationPrototypeFunctionToString(ExecState* exec, return result; } -JSC::JSValue toJS(JSC::ExecState* exec, WorkerLocation* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, WorkerLocation* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } WorkerLocation* toWorkerLocation(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.h b/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.h index cab657d7b..40c72c2dd 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerLocation.h @@ -23,6 +23,7 @@ #if ENABLE(WORKERS) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class WorkerLocation; -class JSWorkerLocation : public DOMObject { - typedef DOMObject Base; +class JSWorkerLocation : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSWorkerLocation(PassRefPtr, PassRefPtr); + JSWorkerLocation(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSWorkerLocation(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,14 +47,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); WorkerLocation* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, WorkerLocation*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, WorkerLocation*); WorkerLocation* toWorkerLocation(JSC::JSValue); class JSWorkerLocationPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.cpp b/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.cpp index 76da8f1bc..bc082b856 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.cpp @@ -85,8 +85,8 @@ static const HashTable* getJSWorkerNavigatorTable(ExecState* exec) } const ClassInfo JSWorkerNavigator::s_info = { "WorkerNavigator", 0, 0, getJSWorkerNavigatorTable }; -JSWorkerNavigator::JSWorkerNavigator(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSWorkerNavigator::JSWorkerNavigator(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -108,42 +108,47 @@ bool JSWorkerNavigator::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsWorkerNavigatorAppName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerNavigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WorkerNavigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->appName()); } JSValue jsWorkerNavigatorAppVersion(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerNavigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WorkerNavigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->appVersion()); } JSValue jsWorkerNavigatorPlatform(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerNavigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WorkerNavigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->platform()); } JSValue jsWorkerNavigatorUserAgent(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerNavigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WorkerNavigator* imp = static_cast(castedThis->impl()); return jsString(exec, imp->userAgent()); } JSValue jsWorkerNavigatorOnLine(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSWorkerNavigator* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - WorkerNavigator* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + WorkerNavigator* imp = static_cast(castedThis->impl()); return jsBoolean(imp->onLine()); } -JSC::JSValue toJS(JSC::ExecState* exec, WorkerNavigator* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, WorkerNavigator* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } WorkerNavigator* toWorkerNavigator(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.h b/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.h index f07606c87..a6c4046e7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.h +++ b/src/3rdparty/webkit/WebCore/generated/JSWorkerNavigator.h @@ -23,6 +23,7 @@ #if ENABLE(WORKERS) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class WorkerNavigator; -class JSWorkerNavigator : public DOMObject { - typedef DOMObject Base; +class JSWorkerNavigator : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSWorkerNavigator(PassRefPtr, PassRefPtr); + JSWorkerNavigator(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSWorkerNavigator(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -52,7 +53,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, WorkerNavigator*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, WorkerNavigator*); WorkerNavigator* toWorkerNavigator(JSC::JSValue); class JSWorkerNavigatorPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.cpp b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.cpp index ebd723e5a..1817d2814 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.cpp @@ -122,8 +122,8 @@ static const HashTable* getJSXMLHttpRequestTable(ExecState* exec) } const ClassInfo JSXMLHttpRequest::s_info = { "XMLHttpRequest", 0, 0, getJSXMLHttpRequestTable }; -JSXMLHttpRequest::JSXMLHttpRequest(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSXMLHttpRequest::JSXMLHttpRequest(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -145,8 +145,9 @@ bool JSXMLHttpRequest::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsXMLHttpRequestOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequest* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequest* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequest* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onabort()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -156,8 +157,9 @@ JSValue jsXMLHttpRequestOnabort(ExecState* exec, const Identifier&, const Proper JSValue jsXMLHttpRequestOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequest* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequest* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequest* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onerror()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -167,8 +169,9 @@ JSValue jsXMLHttpRequestOnerror(ExecState* exec, const Identifier&, const Proper JSValue jsXMLHttpRequestOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequest* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequest* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequest* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onload()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -178,8 +181,9 @@ JSValue jsXMLHttpRequestOnload(ExecState* exec, const Identifier&, const Propert JSValue jsXMLHttpRequestOnloadstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequest* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequest* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequest* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onloadstart()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -189,8 +193,9 @@ JSValue jsXMLHttpRequestOnloadstart(ExecState* exec, const Identifier&, const Pr JSValue jsXMLHttpRequestOnprogress(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequest* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequest* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequest* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onprogress()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -200,8 +205,9 @@ JSValue jsXMLHttpRequestOnprogress(ExecState* exec, const Identifier&, const Pro JSValue jsXMLHttpRequestOnreadystatechange(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequest* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequest* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequest* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onreadystatechange()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -211,41 +217,47 @@ JSValue jsXMLHttpRequestOnreadystatechange(ExecState* exec, const Identifier&, c JSValue jsXMLHttpRequestReadyState(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequest* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequest* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequest* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->readyState()); } JSValue jsXMLHttpRequestWithCredentials(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequest* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequest* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequest* imp = static_cast(castedThis->impl()); return jsBoolean(imp->withCredentials()); } JSValue jsXMLHttpRequestUpload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequest* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequest* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->upload())); + XMLHttpRequest* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->upload())); } JSValue jsXMLHttpRequestResponseText(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->responseText(exec); + JSXMLHttpRequest* castedThis = static_cast(asObject(slot.slotBase())); + return castedThis->responseText(exec); } JSValue jsXMLHttpRequestResponseXML(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequest* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequest* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - return toJS(exec, WTF::getPtr(imp->responseXML())); + XMLHttpRequest* imp = static_cast(castedThis->impl()); + return toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->responseXML())); } JSValue jsXMLHttpRequestStatus(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequest* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - XMLHttpRequest* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequest* imp = static_cast(castedThis->impl()); JSC::JSValue result = jsNumber(exec, imp->status(ec)); setDOMException(exec, ec); return result; @@ -253,8 +265,9 @@ JSValue jsXMLHttpRequestStatus(ExecState* exec, const Identifier&, const Propert JSValue jsXMLHttpRequestStatusText(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequest* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - XMLHttpRequest* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequest* imp = static_cast(castedThis->impl()); JSC::JSValue result = jsString(exec, imp->statusText(ec)); setDOMException(exec, ec); return result; @@ -466,9 +479,9 @@ JSValue jsXMLHttpRequestDONE(ExecState* exec, const Identifier&, const PropertyS return jsNumber(exec, static_cast(4)); } -JSC::JSValue toJS(JSC::ExecState* exec, XMLHttpRequest* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, XMLHttpRequest* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } XMLHttpRequest* toXMLHttpRequest(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.h b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.h index 9529b0d4b..b64b30503 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequest.h @@ -21,6 +21,7 @@ #ifndef JSXMLHttpRequest_h #define JSXMLHttpRequest_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class XMLHttpRequest; -class JSXMLHttpRequest : public DOMObject { - typedef DOMObject Base; +class JSXMLHttpRequest : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSXMLHttpRequest(PassRefPtr, PassRefPtr); + JSXMLHttpRequest(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSXMLHttpRequest(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -65,7 +66,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, XMLHttpRequest*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, XMLHttpRequest*); XMLHttpRequest* toXMLHttpRequest(JSC::JSValue); class JSXMLHttpRequestPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.cpp b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.cpp index 382056702..6f81324db 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.cpp @@ -68,12 +68,12 @@ static JSC_CONST_HASHTABLE HashTable JSXMLHttpRequestExceptionConstructorTable = { 4, 3, JSXMLHttpRequestExceptionConstructorTableValues, 0 }; #endif -class JSXMLHttpRequestExceptionConstructor : public DOMObject { +class JSXMLHttpRequestExceptionConstructor : public DOMConstructorObject { public: - JSXMLHttpRequestExceptionConstructor(ExecState* exec) - : DOMObject(JSXMLHttpRequestExceptionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSXMLHttpRequestExceptionConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSXMLHttpRequestExceptionConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSXMLHttpRequestExceptionPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSXMLHttpRequestExceptionPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -131,8 +131,8 @@ static const HashTable* getJSXMLHttpRequestExceptionTable(ExecState* exec) } const ClassInfo JSXMLHttpRequestException::s_info = { "XMLHttpRequestException", 0, 0, getJSXMLHttpRequestExceptionTable }; -JSXMLHttpRequestException::JSXMLHttpRequestException(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSXMLHttpRequestException::JSXMLHttpRequestException(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -154,32 +154,36 @@ bool JSXMLHttpRequestException::getOwnPropertySlot(ExecState* exec, const Identi JSValue jsXMLHttpRequestExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequestException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequestException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequestException* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->code()); } JSValue jsXMLHttpRequestExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequestException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequestException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequestException* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsXMLHttpRequestExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequestException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequestException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequestException* imp = static_cast(castedThis->impl()); return jsString(exec, imp->message()); } JSValue jsXMLHttpRequestExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSXMLHttpRequestException* domObject = static_cast(asObject(slot.slotBase())); + return JSXMLHttpRequestException::getConstructor(exec, domObject->globalObject()); } -JSValue JSXMLHttpRequestException::getConstructor(ExecState* exec) +JSValue JSXMLHttpRequestException::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsXMLHttpRequestExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -207,9 +211,9 @@ JSValue jsXMLHttpRequestExceptionABORT_ERR(ExecState* exec, const Identifier&, c return jsNumber(exec, static_cast(102)); } -JSC::JSValue toJS(JSC::ExecState* exec, XMLHttpRequestException* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, XMLHttpRequestException* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } XMLHttpRequestException* toXMLHttpRequestException(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.h b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.h index 52f26bfeb..4923f6fac 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestException.h @@ -21,6 +21,7 @@ #ifndef JSXMLHttpRequestException_h #define JSXMLHttpRequestException_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class XMLHttpRequestException; -class JSXMLHttpRequestException : public DOMObject { - typedef DOMObject Base; +class JSXMLHttpRequestException : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSXMLHttpRequestException(PassRefPtr, PassRefPtr); + JSXMLHttpRequestException(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSXMLHttpRequestException(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); XMLHttpRequestException* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, XMLHttpRequestException*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, XMLHttpRequestException*); XMLHttpRequestException* toXMLHttpRequestException(JSC::JSValue); class JSXMLHttpRequestExceptionPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.cpp b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.cpp index d1a532407..12c13293d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.cpp @@ -62,12 +62,12 @@ static JSC_CONST_HASHTABLE HashTable JSXMLHttpRequestProgressEventConstructorTab { 1, 0, JSXMLHttpRequestProgressEventConstructorTableValues, 0 }; #endif -class JSXMLHttpRequestProgressEventConstructor : public DOMObject { +class JSXMLHttpRequestProgressEventConstructor : public DOMConstructorObject { public: - JSXMLHttpRequestProgressEventConstructor(ExecState* exec) - : DOMObject(JSXMLHttpRequestProgressEventConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSXMLHttpRequestProgressEventConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSXMLHttpRequestProgressEventConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSXMLHttpRequestProgressEventPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSXMLHttpRequestProgressEventPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -117,8 +117,8 @@ static const HashTable* getJSXMLHttpRequestProgressEventTable(ExecState* exec) } const ClassInfo JSXMLHttpRequestProgressEvent::s_info = { "XMLHttpRequestProgressEvent", &JSProgressEvent::s_info, 0, getJSXMLHttpRequestProgressEventTable }; -JSXMLHttpRequestProgressEvent::JSXMLHttpRequestProgressEvent(PassRefPtr structure, PassRefPtr impl) - : JSProgressEvent(structure, impl) +JSXMLHttpRequestProgressEvent::JSXMLHttpRequestProgressEvent(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : JSProgressEvent(structure, globalObject, impl) { } @@ -134,25 +134,28 @@ bool JSXMLHttpRequestProgressEvent::getOwnPropertySlot(ExecState* exec, const Id JSValue jsXMLHttpRequestProgressEventPosition(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequestProgressEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequestProgressEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequestProgressEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->position()); } JSValue jsXMLHttpRequestProgressEventTotalSize(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequestProgressEvent* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequestProgressEvent* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequestProgressEvent* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->totalSize()); } JSValue jsXMLHttpRequestProgressEventConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSXMLHttpRequestProgressEvent* domObject = static_cast(asObject(slot.slotBase())); + return JSXMLHttpRequestProgressEvent::getConstructor(exec, domObject->globalObject()); } -JSValue JSXMLHttpRequestProgressEvent::getConstructor(ExecState* exec) +JSValue JSXMLHttpRequestProgressEvent::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.h b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.h index 45ce6103f..d1ff5f65b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestProgressEvent.h @@ -30,7 +30,7 @@ class XMLHttpRequestProgressEvent; class JSXMLHttpRequestProgressEvent : public JSProgressEvent { typedef JSProgressEvent Base; public: - JSXMLHttpRequestProgressEvent(PassRefPtr, PassRefPtr); + JSXMLHttpRequestProgressEvent(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -41,7 +41,7 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); }; diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.cpp b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.cpp index ad482ce7a..b72aefa98 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.cpp @@ -71,12 +71,12 @@ static JSC_CONST_HASHTABLE HashTable JSXMLHttpRequestUploadConstructorTable = { 1, 0, JSXMLHttpRequestUploadConstructorTableValues, 0 }; #endif -class JSXMLHttpRequestUploadConstructor : public DOMObject { +class JSXMLHttpRequestUploadConstructor : public DOMConstructorObject { public: - JSXMLHttpRequestUploadConstructor(ExecState* exec) - : DOMObject(JSXMLHttpRequestUploadConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSXMLHttpRequestUploadConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSXMLHttpRequestUploadConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSXMLHttpRequestUploadPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSXMLHttpRequestUploadPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -134,8 +134,8 @@ static const HashTable* getJSXMLHttpRequestUploadTable(ExecState* exec) } const ClassInfo JSXMLHttpRequestUpload::s_info = { "XMLHttpRequestUpload", 0, 0, getJSXMLHttpRequestUploadTable }; -JSXMLHttpRequestUpload::JSXMLHttpRequestUpload(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSXMLHttpRequestUpload::JSXMLHttpRequestUpload(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -157,8 +157,9 @@ bool JSXMLHttpRequestUpload::getOwnPropertySlot(ExecState* exec, const Identifie JSValue jsXMLHttpRequestUploadOnabort(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequestUpload* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequestUpload* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequestUpload* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onabort()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -168,8 +169,9 @@ JSValue jsXMLHttpRequestUploadOnabort(ExecState* exec, const Identifier&, const JSValue jsXMLHttpRequestUploadOnerror(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequestUpload* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequestUpload* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequestUpload* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onerror()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -179,8 +181,9 @@ JSValue jsXMLHttpRequestUploadOnerror(ExecState* exec, const Identifier&, const JSValue jsXMLHttpRequestUploadOnload(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequestUpload* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequestUpload* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequestUpload* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onload()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -190,8 +193,9 @@ JSValue jsXMLHttpRequestUploadOnload(ExecState* exec, const Identifier&, const P JSValue jsXMLHttpRequestUploadOnloadstart(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequestUpload* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequestUpload* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequestUpload* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onloadstart()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -201,8 +205,9 @@ JSValue jsXMLHttpRequestUploadOnloadstart(ExecState* exec, const Identifier&, co JSValue jsXMLHttpRequestUploadOnprogress(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXMLHttpRequestUpload* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XMLHttpRequestUpload* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XMLHttpRequestUpload* imp = static_cast(castedThis->impl()); if (EventListener* listener = imp->onprogress()) { if (JSObject* jsFunction = listener->jsFunction()) return jsFunction; @@ -212,7 +217,8 @@ JSValue jsXMLHttpRequestUploadOnprogress(ExecState* exec, const Identifier&, con JSValue jsXMLHttpRequestUploadConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSXMLHttpRequestUpload* domObject = static_cast(asObject(slot.slotBase())); + return JSXMLHttpRequestUpload::getConstructor(exec, domObject->globalObject()); } void JSXMLHttpRequestUpload::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) { @@ -269,9 +275,9 @@ void setJSXMLHttpRequestUploadOnprogress(ExecState* exec, JSObject* thisObject, imp->setOnprogress(globalObject->createJSAttributeEventListener(value)); } -JSValue JSXMLHttpRequestUpload::getConstructor(ExecState* exec) +JSValue JSXMLHttpRequestUpload::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsXMLHttpRequestUploadPrototypeFunctionAddEventListener(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -308,9 +314,9 @@ JSValue JSC_HOST_CALL jsXMLHttpRequestUploadPrototypeFunctionDispatchEvent(ExecS return result; } -JSC::JSValue toJS(JSC::ExecState* exec, XMLHttpRequestUpload* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, XMLHttpRequestUpload* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } XMLHttpRequestUpload* toXMLHttpRequestUpload(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.h b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.h index ed0313e87..eca3e0e57 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLHttpRequestUpload.h @@ -21,6 +21,7 @@ #ifndef JSXMLHttpRequestUpload_h #define JSXMLHttpRequestUpload_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class XMLHttpRequestUpload; -class JSXMLHttpRequestUpload : public DOMObject { - typedef DOMObject Base; +class JSXMLHttpRequestUpload : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSXMLHttpRequestUpload(PassRefPtr, PassRefPtr); + JSXMLHttpRequestUpload(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSXMLHttpRequestUpload(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -47,7 +48,7 @@ public: virtual void mark(); - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); // Custom functions JSC::JSValue addEventListener(JSC::ExecState*, const JSC::ArgList&); @@ -58,7 +59,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, XMLHttpRequestUpload*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, XMLHttpRequestUpload*); XMLHttpRequestUpload* toXMLHttpRequestUpload(JSC::JSValue); class JSXMLHttpRequestUploadPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.cpp b/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.cpp index 8c803b551..5816fd069 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.cpp @@ -63,12 +63,12 @@ static JSC_CONST_HASHTABLE HashTable JSXMLSerializerConstructorTable = { 1, 0, JSXMLSerializerConstructorTableValues, 0 }; #endif -class JSXMLSerializerConstructor : public DOMObject { +class JSXMLSerializerConstructor : public DOMConstructorObject { public: - JSXMLSerializerConstructor(ExecState* exec) - : DOMObject(JSXMLSerializerConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSXMLSerializerConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSXMLSerializerConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSXMLSerializerPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSXMLSerializerPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -78,13 +78,13 @@ public: { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } - static JSObject* construct(ExecState* exec, JSObject*, const ArgList&) + static JSObject* constructXMLSerializer(ExecState* exec, JSObject* constructor, const ArgList&) { - return asObject(toJS(exec, XMLSerializer::create())); + return asObject(toJS(exec, static_cast(constructor)->globalObject(), XMLSerializer::create())); } virtual ConstructType getConstructData(ConstructData& constructData) { - constructData.native.function = construct; + constructData.native.function = constructXMLSerializer; return ConstructTypeHost; } }; @@ -125,8 +125,8 @@ bool JSXMLSerializerPrototype::getOwnPropertySlot(ExecState* exec, const Identif const ClassInfo JSXMLSerializer::s_info = { "XMLSerializer", 0, &JSXMLSerializerTable, 0 }; -JSXMLSerializer::JSXMLSerializer(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSXMLSerializer::JSXMLSerializer(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -148,11 +148,12 @@ bool JSXMLSerializer::getOwnPropertySlot(ExecState* exec, const Identifier& prop JSValue jsXMLSerializerConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSXMLSerializer* domObject = static_cast(asObject(slot.slotBase())); + return JSXMLSerializer::getConstructor(exec, domObject->globalObject()); } -JSValue JSXMLSerializer::getConstructor(ExecState* exec) +JSValue JSXMLSerializer::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsXMLSerializerPrototypeFunctionSerializeToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -171,9 +172,9 @@ JSValue JSC_HOST_CALL jsXMLSerializerPrototypeFunctionSerializeToString(ExecStat return result; } -JSC::JSValue toJS(JSC::ExecState* exec, XMLSerializer* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, XMLSerializer* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } XMLSerializer* toXMLSerializer(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.h b/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.h index c9734554e..9f4fabc3d 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXMLSerializer.h @@ -21,6 +21,7 @@ #ifndef JSXMLSerializer_h #define JSXMLSerializer_h +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -29,10 +30,10 @@ namespace WebCore { class XMLSerializer; -class JSXMLSerializer : public DOMObject { - typedef DOMObject Base; +class JSXMLSerializer : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSXMLSerializer(PassRefPtr, PassRefPtr); + JSXMLSerializer(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSXMLSerializer(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -44,14 +45,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); XMLSerializer* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, XMLSerializer*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, XMLSerializer*); XMLSerializer* toXMLSerializer(JSC::JSValue); class JSXMLSerializerPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.cpp b/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.cpp index 7570bc49a..be242bd67 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.cpp @@ -72,12 +72,12 @@ static JSC_CONST_HASHTABLE HashTable JSXPathEvaluatorConstructorTable = { 1, 0, JSXPathEvaluatorConstructorTableValues, 0 }; #endif -class JSXPathEvaluatorConstructor : public DOMObject { +class JSXPathEvaluatorConstructor : public DOMConstructorObject { public: - JSXPathEvaluatorConstructor(ExecState* exec) - : DOMObject(JSXPathEvaluatorConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSXPathEvaluatorConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSXPathEvaluatorConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSXPathEvaluatorPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSXPathEvaluatorPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -87,13 +87,13 @@ public: { return Structure::create(proto, TypeInfo(ObjectType, ImplementsHasInstance)); } - static JSObject* construct(ExecState* exec, JSObject*, const ArgList&) + static JSObject* constructXPathEvaluator(ExecState* exec, JSObject* constructor, const ArgList&) { - return asObject(toJS(exec, XPathEvaluator::create())); + return asObject(toJS(exec, static_cast(constructor)->globalObject(), XPathEvaluator::create())); } virtual ConstructType getConstructData(ConstructData& constructData) { - constructData.native.function = construct; + constructData.native.function = constructXPathEvaluator; return ConstructTypeHost; } }; @@ -136,8 +136,8 @@ bool JSXPathEvaluatorPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSXPathEvaluator::s_info = { "XPathEvaluator", 0, &JSXPathEvaluatorTable, 0 }; -JSXPathEvaluator::JSXPathEvaluator(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSXPathEvaluator::JSXPathEvaluator(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -159,11 +159,12 @@ bool JSXPathEvaluator::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsXPathEvaluatorConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSXPathEvaluator* domObject = static_cast(asObject(slot.slotBase())); + return JSXPathEvaluator::getConstructor(exec, domObject->globalObject()); } -JSValue JSXPathEvaluator::getConstructor(ExecState* exec) +JSValue JSXPathEvaluator::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsXPathEvaluatorPrototypeFunctionCreateExpression(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -185,7 +186,7 @@ JSValue JSC_HOST_CALL jsXPathEvaluatorPrototypeFunctionCreateExpression(ExecStat } - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createExpression(expression, resolver, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createExpression(expression, resolver, ec))); setDOMException(exec, ec); return result; } @@ -200,7 +201,7 @@ JSValue JSC_HOST_CALL jsXPathEvaluatorPrototypeFunctionCreateNSResolver(ExecStat Node* nodeResolver = toNode(args.at(0)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->createNSResolver(nodeResolver))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->createNSResolver(nodeResolver))); return result; } @@ -226,14 +227,14 @@ JSValue JSC_HOST_CALL jsXPathEvaluatorPrototypeFunctionEvaluate(ExecState* exec, XPathResult* inResult = toXPathResult(args.at(4)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->evaluate(expression, contextNode, resolver, type, inResult, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->evaluate(expression, contextNode, resolver, type, inResult, ec))); setDOMException(exec, ec); return result; } -JSC::JSValue toJS(JSC::ExecState* exec, XPathEvaluator* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, XPathEvaluator* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } XPathEvaluator* toXPathEvaluator(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.h b/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.h index be11874b3..3a860dcb7 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathEvaluator.h @@ -23,6 +23,7 @@ #if ENABLE(XPATH) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class XPathEvaluator; -class JSXPathEvaluator : public DOMObject { - typedef DOMObject Base; +class JSXPathEvaluator : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSXPathEvaluator(PassRefPtr, PassRefPtr); + JSXPathEvaluator(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSXPathEvaluator(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,14 +47,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); XPathEvaluator* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, XPathEvaluator*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, XPathEvaluator*); XPathEvaluator* toXPathEvaluator(JSC::JSValue); class JSXPathEvaluatorPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathException.cpp b/src/3rdparty/webkit/WebCore/generated/JSXPathException.cpp index 8ac6eb3ee..f4864f943 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathException.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathException.cpp @@ -71,12 +71,12 @@ static JSC_CONST_HASHTABLE HashTable JSXPathExceptionConstructorTable = { 4, 3, JSXPathExceptionConstructorTableValues, 0 }; #endif -class JSXPathExceptionConstructor : public DOMObject { +class JSXPathExceptionConstructor : public DOMConstructorObject { public: - JSXPathExceptionConstructor(ExecState* exec) - : DOMObject(JSXPathExceptionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSXPathExceptionConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSXPathExceptionConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSXPathExceptionPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSXPathExceptionPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -126,8 +126,8 @@ bool JSXPathExceptionPrototype::getOwnPropertySlot(ExecState* exec, const Identi const ClassInfo JSXPathException::s_info = { "XPathException", 0, &JSXPathExceptionTable, 0 }; -JSXPathException::JSXPathException(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSXPathException::JSXPathException(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -149,32 +149,36 @@ bool JSXPathException::getOwnPropertySlot(ExecState* exec, const Identifier& pro JSValue jsXPathExceptionCode(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXPathException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XPathException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XPathException* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->code()); } JSValue jsXPathExceptionName(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXPathException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XPathException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XPathException* imp = static_cast(castedThis->impl()); return jsString(exec, imp->name()); } JSValue jsXPathExceptionMessage(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXPathException* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XPathException* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XPathException* imp = static_cast(castedThis->impl()); return jsString(exec, imp->message()); } JSValue jsXPathExceptionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSXPathException* domObject = static_cast(asObject(slot.slotBase())); + return JSXPathException::getConstructor(exec, domObject->globalObject()); } -JSValue JSXPathException::getConstructor(ExecState* exec) +JSValue JSXPathException::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsXPathExceptionPrototypeFunctionToString(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -202,9 +206,9 @@ JSValue jsXPathExceptionTYPE_ERR(ExecState* exec, const Identifier&, const Prope return jsNumber(exec, static_cast(52)); } -JSC::JSValue toJS(JSC::ExecState* exec, XPathException* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, XPathException* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } XPathException* toXPathException(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathException.h b/src/3rdparty/webkit/WebCore/generated/JSXPathException.h index 023e6a25d..370ef36d5 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathException.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathException.h @@ -23,6 +23,7 @@ #if ENABLE(XPATH) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class XPathException; -class JSXPathException : public DOMObject { - typedef DOMObject Base; +class JSXPathException : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSXPathException(PassRefPtr, PassRefPtr); + JSXPathException(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSXPathException(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,14 +47,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); XPathException* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, XPathException*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, XPathException*); XPathException* toXPathException(JSC::JSValue); class JSXPathExceptionPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.cpp b/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.cpp index 2bfaae53f..286b257d3 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.cpp @@ -66,12 +66,12 @@ static JSC_CONST_HASHTABLE HashTable JSXPathExpressionConstructorTable = { 1, 0, JSXPathExpressionConstructorTableValues, 0 }; #endif -class JSXPathExpressionConstructor : public DOMObject { +class JSXPathExpressionConstructor : public DOMConstructorObject { public: - JSXPathExpressionConstructor(ExecState* exec) - : DOMObject(JSXPathExpressionConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSXPathExpressionConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSXPathExpressionConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSXPathExpressionPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSXPathExpressionPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -119,8 +119,8 @@ bool JSXPathExpressionPrototype::getOwnPropertySlot(ExecState* exec, const Ident const ClassInfo JSXPathExpression::s_info = { "XPathExpression", 0, &JSXPathExpressionTable, 0 }; -JSXPathExpression::JSXPathExpression(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSXPathExpression::JSXPathExpression(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -142,11 +142,12 @@ bool JSXPathExpression::getOwnPropertySlot(ExecState* exec, const Identifier& pr JSValue jsXPathExpressionConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSXPathExpression* domObject = static_cast(asObject(slot.slotBase())); + return JSXPathExpression::getConstructor(exec, domObject->globalObject()); } -JSValue JSXPathExpression::getConstructor(ExecState* exec) +JSValue JSXPathExpression::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsXPathExpressionPrototypeFunctionEvaluate(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -162,14 +163,14 @@ JSValue JSC_HOST_CALL jsXPathExpressionPrototypeFunctionEvaluate(ExecState* exec XPathResult* inResult = toXPathResult(args.at(2)); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->evaluate(contextNode, type, inResult, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->evaluate(contextNode, type, inResult, ec))); setDOMException(exec, ec); return result; } -JSC::JSValue toJS(JSC::ExecState* exec, XPathExpression* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, XPathExpression* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } XPathExpression* toXPathExpression(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.h b/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.h index 910289484..082560c66 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathExpression.h @@ -23,6 +23,7 @@ #if ENABLE(XPATH) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class XPathExpression; -class JSXPathExpression : public DOMObject { - typedef DOMObject Base; +class JSXPathExpression : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSXPathExpression(PassRefPtr, PassRefPtr); + JSXPathExpression(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSXPathExpression(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,14 +47,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); XPathExpression* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, XPathExpression*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, XPathExpression*); XPathExpression* toXPathExpression(JSC::JSValue); class JSXPathExpressionPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.cpp b/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.cpp index 7136752e0..2943d1718 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.cpp @@ -66,8 +66,8 @@ bool JSXPathNSResolverPrototype::getOwnPropertySlot(ExecState* exec, const Ident const ClassInfo JSXPathNSResolver::s_info = { "XPathNSResolver", 0, 0, 0 }; -JSXPathNSResolver::JSXPathNSResolver(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSXPathNSResolver::JSXPathNSResolver(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -96,9 +96,9 @@ JSValue JSC_HOST_CALL jsXPathNSResolverPrototypeFunctionLookupNamespaceURI(ExecS return result; } -JSC::JSValue toJS(JSC::ExecState* exec, XPathNSResolver* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, XPathNSResolver* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } XPathNSResolver* toXPathNSResolver(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.h b/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.h index e829c711d..f0bb95bc2 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathNSResolver.h @@ -23,6 +23,7 @@ #if ENABLE(XPATH) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class XPathNSResolver; -class JSXPathNSResolver : public DOMObject { - typedef DOMObject Base; +class JSXPathNSResolver : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSXPathNSResolver(PassRefPtr, PassRefPtr); + JSXPathNSResolver(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSXPathNSResolver(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual const JSC::ClassInfo* classInfo() const { return &s_info; } @@ -46,7 +47,7 @@ private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, XPathNSResolver*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, XPathNSResolver*); XPathNSResolver* toXPathNSResolver(JSC::JSValue); class JSXPathNSResolverPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathResult.cpp b/src/3rdparty/webkit/WebCore/generated/JSXPathResult.cpp index 118325b25..c969067f6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathResult.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathResult.cpp @@ -85,12 +85,12 @@ static JSC_CONST_HASHTABLE HashTable JSXPathResultConstructorTable = { 33, 31, JSXPathResultConstructorTableValues, 0 }; #endif -class JSXPathResultConstructor : public DOMObject { +class JSXPathResultConstructor : public DOMConstructorObject { public: - JSXPathResultConstructor(ExecState* exec) - : DOMObject(JSXPathResultConstructor::createStructure(exec->lexicalGlobalObject()->objectPrototype())) + JSXPathResultConstructor(ExecState* exec, JSDOMGlobalObject* globalObject) + : DOMConstructorObject(JSXPathResultConstructor::createStructure(globalObject->objectPrototype()), globalObject) { - putDirect(exec->propertyNames().prototype, JSXPathResultPrototype::self(exec, exec->lexicalGlobalObject()), None); + putDirect(exec->propertyNames().prototype, JSXPathResultPrototype::self(exec, globalObject), None); } virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&); virtual const ClassInfo* classInfo() const { return &s_info; } @@ -149,8 +149,8 @@ bool JSXPathResultPrototype::getOwnPropertySlot(ExecState* exec, const Identifie const ClassInfo JSXPathResult::s_info = { "XPathResult", 0, &JSXPathResultTable, 0 }; -JSXPathResult::JSXPathResult(PassRefPtr structure, PassRefPtr impl) - : DOMObject(structure) +JSXPathResult::JSXPathResult(PassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -172,15 +172,17 @@ bool JSXPathResult::getOwnPropertySlot(ExecState* exec, const Identifier& proper JSValue jsXPathResultResultType(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXPathResult* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XPathResult* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XPathResult* imp = static_cast(castedThis->impl()); return jsNumber(exec, imp->resultType()); } JSValue jsXPathResultNumberValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXPathResult* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - XPathResult* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XPathResult* imp = static_cast(castedThis->impl()); JSC::JSValue result = jsNumber(exec, imp->numberValue(ec)); setDOMException(exec, ec); return result; @@ -188,8 +190,9 @@ JSValue jsXPathResultNumberValue(ExecState* exec, const Identifier&, const Prope JSValue jsXPathResultStringValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXPathResult* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - XPathResult* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XPathResult* imp = static_cast(castedThis->impl()); JSC::JSValue result = jsString(exec, imp->stringValue(ec)); setDOMException(exec, ec); return result; @@ -197,8 +200,9 @@ JSValue jsXPathResultStringValue(ExecState* exec, const Identifier&, const Prope JSValue jsXPathResultBooleanValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXPathResult* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - XPathResult* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XPathResult* imp = static_cast(castedThis->impl()); JSC::JSValue result = jsBoolean(imp->booleanValue(ec)); setDOMException(exec, ec); return result; @@ -206,24 +210,27 @@ JSValue jsXPathResultBooleanValue(ExecState* exec, const Identifier&, const Prop JSValue jsXPathResultSingleNodeValue(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXPathResult* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - XPathResult* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->singleNodeValue(ec))); + XPathResult* imp = static_cast(castedThis->impl()); + JSC::JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->singleNodeValue(ec))); setDOMException(exec, ec); return result; } JSValue jsXPathResultInvalidIteratorState(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXPathResult* castedThis = static_cast(asObject(slot.slotBase())); UNUSED_PARAM(exec); - XPathResult* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XPathResult* imp = static_cast(castedThis->impl()); return jsBoolean(imp->invalidIteratorState()); } JSValue jsXPathResultSnapshotLength(ExecState* exec, const Identifier&, const PropertySlot& slot) { + JSXPathResult* castedThis = static_cast(asObject(slot.slotBase())); ExceptionCode ec = 0; - XPathResult* imp = static_cast(static_cast(asObject(slot.slotBase()))->impl()); + XPathResult* imp = static_cast(castedThis->impl()); JSC::JSValue result = jsNumber(exec, imp->snapshotLength(ec)); setDOMException(exec, ec); return result; @@ -231,11 +238,12 @@ JSValue jsXPathResultSnapshotLength(ExecState* exec, const Identifier&, const Pr JSValue jsXPathResultConstructor(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast(asObject(slot.slotBase()))->getConstructor(exec); + JSXPathResult* domObject = static_cast(asObject(slot.slotBase())); + return JSXPathResult::getConstructor(exec, domObject->globalObject()); } -JSValue JSXPathResult::getConstructor(ExecState* exec) +JSValue JSXPathResult::getConstructor(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMConstructor(exec); + return getDOMConstructor(exec, static_cast(globalObject)); } JSValue JSC_HOST_CALL jsXPathResultPrototypeFunctionIterateNext(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -248,7 +256,7 @@ JSValue JSC_HOST_CALL jsXPathResultPrototypeFunctionIterateNext(ExecState* exec, ExceptionCode ec = 0; - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->iterateNext(ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->iterateNext(ec))); setDOMException(exec, ec); return result; } @@ -264,7 +272,7 @@ JSValue JSC_HOST_CALL jsXPathResultPrototypeFunctionSnapshotItem(ExecState* exec unsigned index = args.at(0).toInt32(exec); - JSC::JSValue result = toJS(exec, WTF::getPtr(imp->snapshotItem(index, ec))); + JSC::JSValue result = toJS(exec, castedThisObj->globalObject(), WTF::getPtr(imp->snapshotItem(index, ec))); setDOMException(exec, ec); return result; } @@ -321,9 +329,9 @@ JSValue jsXPathResultFIRST_ORDERED_NODE_TYPE(ExecState* exec, const Identifier&, return jsNumber(exec, static_cast(9)); } -JSC::JSValue toJS(JSC::ExecState* exec, XPathResult* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, XPathResult* object) { - return getDOMObjectWrapper(exec, object); + return getDOMObjectWrapper(exec, globalObject, object); } XPathResult* toXPathResult(JSC::JSValue value) { diff --git a/src/3rdparty/webkit/WebCore/generated/JSXPathResult.h b/src/3rdparty/webkit/WebCore/generated/JSXPathResult.h index 0f07f80d3..c63c32ff6 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSXPathResult.h +++ b/src/3rdparty/webkit/WebCore/generated/JSXPathResult.h @@ -23,6 +23,7 @@ #if ENABLE(XPATH) +#include "DOMObjectWithSVGContext.h" #include "JSDOMBinding.h" #include #include @@ -31,10 +32,10 @@ namespace WebCore { class XPathResult; -class JSXPathResult : public DOMObject { - typedef DOMObject Base; +class JSXPathResult : public DOMObjectWithGlobalPointer { + typedef DOMObjectWithGlobalPointer Base; public: - JSXPathResult(PassRefPtr, PassRefPtr); + JSXPathResult(PassRefPtr, JSDOMGlobalObject*, PassRefPtr); virtual ~JSXPathResult(); static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); @@ -46,14 +47,14 @@ public: return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType)); } - static JSC::JSValue getConstructor(JSC::ExecState*); + static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*); XPathResult* impl() const { return m_impl.get(); } private: RefPtr m_impl; }; -JSC::JSValue toJS(JSC::ExecState*, XPathResult*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, XPathResult*); XPathResult* toXPathResult(JSC::JSValue); class JSXPathResultPrototype : public JSC::JSObject { diff --git a/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheets.h b/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheets.h index 1ccfa4aa0..dfc9f6d5d 100644 --- a/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheets.h +++ b/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheets.h @@ -1,5 +1,5 @@ namespace WebCore { -extern const char htmlUserAgentStyleSheet[8502]; +extern const char htmlUserAgentStyleSheet[8548]; extern const char quirksUserAgentStyleSheet[359]; extern const char svgUserAgentStyleSheet[358]; extern const char sourceUserAgentStyleSheet[2004]; diff --git a/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheetsData.cpp b/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheetsData.cpp index a6915e6c1..53f1f842d 100644 --- a/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheetsData.cpp +++ b/src/3rdparty/webkit/WebCore/generated/UserAgentStyleSheetsData.cpp @@ -1,5 +1,5 @@ namespace WebCore { -extern const char htmlUserAgentStyleSheet[8502] = { +extern const char htmlUserAgentStyleSheet[8548] = { 110, 97, 109, 101, 115, 112, 97, 99, 101, 32, 34, 104, 116, 116, 112, 58, 47, 47, 119, 119, 119, 46, 119, 51, 46, 111, 114, 103, 47, 49, 57, 57, 57, 47, 120, 104, 116, 109, 108, 34, 59, 32, 104, 116, 109, 108, 32, 123, @@ -256,282 +256,285 @@ extern const char htmlUserAgentStyleSheet[8502] = { 120, 45, 111, 114, 105, 101, 110, 116, 58, 32, 118, 101, 114, 116, 105, 99, 97, 108, 59, 32, 114, 101, 115, 105, 122, 101, 58, 32, 97, 117, 116, 111, 59, 32, 99, 117, 114, 115, 111, 114, 58, 32, 97, 117, 116, 111, 59, 32, - 112, 97, 100, 100, 105, 110, 103, 58, 32, 50, 112, 120, 59, 32, 125, 32, - 105, 110, 112, 117, 116, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 105, - 110, 112, 117, 116, 45, 112, 108, 97, 99, 101, 104, 111, 108, 100, 101, 114, - 44, 32, 105, 115, 105, 110, 100, 101, 120, 58, 58, 45, 119, 101, 98, 107, - 105, 116, 45, 105, 110, 112, 117, 116, 45, 112, 108, 97, 99, 101, 104, 111, - 108, 100, 101, 114, 32, 123, 32, 99, 111, 108, 111, 114, 58, 32, 100, 97, - 114, 107, 71, 114, 97, 121, 59, 32, 125, 32, 105, 110, 112, 117, 116, 91, - 116, 121, 112, 101, 61, 34, 112, 97, 115, 115, 119, 111, 114, 100, 34, 93, - 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 116, 101, 120, 116, 45, - 115, 101, 99, 117, 114, 105, 116, 121, 58, 32, 100, 105, 115, 99, 32, 33, - 105, 109, 112, 111, 114, 116, 97, 110, 116, 59, 32, 125, 32, 105, 110, 112, - 117, 116, 91, 116, 121, 112, 101, 61, 34, 104, 105, 100, 100, 101, 110, 34, - 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 105, - 109, 97, 103, 101, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, + 112, 97, 100, 100, 105, 110, 103, 58, 32, 50, 112, 120, 59, 32, 119, 104, + 105, 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, 112, 114, 101, 45, 119, + 114, 97, 112, 59, 32, 119, 111, 114, 100, 45, 119, 114, 97, 112, 58, 32, + 98, 114, 101, 97, 107, 45, 119, 111, 114, 100, 59, 32, 125, 32, 105, 110, + 112, 117, 116, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 105, 110, 112, + 117, 116, 45, 112, 108, 97, 99, 101, 104, 111, 108, 100, 101, 114, 44, 32, + 105, 115, 105, 110, 100, 101, 120, 58, 58, 45, 119, 101, 98, 107, 105, 116, + 45, 105, 110, 112, 117, 116, 45, 112, 108, 97, 99, 101, 104, 111, 108, 100, + 101, 114, 32, 123, 32, 99, 111, 108, 111, 114, 58, 32, 100, 97, 114, 107, + 71, 114, 97, 121, 59, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, + 112, 101, 61, 34, 112, 97, 115, 115, 119, 111, 114, 100, 34, 93, 32, 123, + 32, 45, 119, 101, 98, 107, 105, 116, 45, 116, 101, 120, 116, 45, 115, 101, + 99, 117, 114, 105, 116, 121, 58, 32, 100, 105, 115, 99, 32, 33, 105, 109, + 112, 111, 114, 116, 97, 110, 116, 59, 32, 125, 32, 105, 110, 112, 117, 116, + 91, 116, 121, 112, 101, 61, 34, 104, 105, 100, 100, 101, 110, 34, 93, 44, + 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 105, 109, 97, + 103, 101, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, + 61, 34, 102, 105, 108, 101, 34, 93, 32, 123, 32, 45, 119, 101, 98, 107, + 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 105, + 110, 105, 116, 105, 97, 108, 59, 32, 112, 97, 100, 100, 105, 110, 103, 58, + 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 98, 97, 99, 107, 103, 114, + 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, 105, 110, 105, 116, + 105, 97, 108, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 105, 110, 105, + 116, 105, 97, 108, 59, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, 32, 123, 32, 45, 119, 101, - 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, - 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 112, 97, 100, 100, 105, 110, + 98, 107, 105, 116, 45, 98, 111, 120, 45, 97, 108, 105, 103, 110, 58, 32, + 98, 97, 115, 101, 108, 105, 110, 101, 59, 32, 116, 101, 120, 116, 45, 97, + 108, 105, 103, 110, 58, 32, 115, 116, 97, 114, 116, 32, 33, 105, 109, 112, + 111, 114, 116, 97, 110, 116, 59, 32, 125, 32, 105, 110, 112, 117, 116, 58, + 45, 119, 101, 98, 107, 105, 116, 45, 97, 117, 116, 111, 102, 105, 108, 108, + 32, 123, 32, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 45, 99, 111, + 108, 111, 114, 58, 32, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 45, + 105, 109, 97, 103, 101, 58, 110, 111, 110, 101, 32, 33, 105, 109, 112, 111, + 114, 116, 97, 110, 116, 59, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, + 121, 112, 101, 61, 34, 114, 97, 100, 105, 111, 34, 93, 44, 32, 105, 110, + 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 99, 104, 101, 99, 107, 98, + 111, 120, 34, 93, 32, 123, 32, 109, 97, 114, 103, 105, 110, 58, 32, 51, + 112, 120, 32, 48, 46, 53, 101, 120, 59, 32, 112, 97, 100, 100, 105, 110, 103, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 125, 32, 105, 110, 112, 117, 116, 91, - 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, 32, 123, 32, 45, - 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 97, 108, 105, 103, 110, - 58, 32, 98, 97, 115, 101, 108, 105, 110, 101, 59, 32, 116, 101, 120, 116, - 45, 97, 108, 105, 103, 110, 58, 32, 115, 116, 97, 114, 116, 32, 33, 105, - 109, 112, 111, 114, 116, 97, 110, 116, 59, 32, 125, 32, 105, 110, 112, 117, - 116, 58, 45, 119, 101, 98, 107, 105, 116, 45, 97, 117, 116, 111, 102, 105, - 108, 108, 32, 123, 32, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 45, - 99, 111, 108, 111, 114, 58, 32, 98, 97, 99, 107, 103, 114, 111, 117, 110, - 100, 45, 105, 109, 97, 103, 101, 58, 110, 111, 110, 101, 32, 33, 105, 109, - 112, 111, 114, 116, 97, 110, 116, 59, 32, 125, 32, 105, 110, 112, 117, 116, - 91, 116, 121, 112, 101, 61, 34, 114, 97, 100, 105, 111, 34, 93, 44, 32, - 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 99, 104, 101, 99, - 107, 98, 111, 120, 34, 93, 32, 123, 32, 109, 97, 114, 103, 105, 110, 58, - 32, 51, 112, 120, 32, 48, 46, 53, 101, 120, 59, 32, 112, 97, 100, 100, - 105, 110, 103, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 98, 97, - 99, 107, 103, 114, 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, - 105, 110, 105, 116, 105, 97, 108, 59, 32, 98, 111, 114, 100, 101, 114, 58, - 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 125, 32, 105, 110, 112, 117, - 116, 91, 116, 121, 112, 101, 61, 34, 98, 117, 116, 116, 111, 110, 34, 93, - 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 115, 117, - 98, 109, 105, 116, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, - 112, 101, 61, 34, 114, 101, 115, 101, 116, 34, 93, 44, 32, 105, 110, 112, - 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, 58, - 58, 45, 119, 101, 98, 107, 105, 116, 45, 102, 105, 108, 101, 45, 117, 112, - 108, 111, 97, 100, 45, 98, 117, 116, 116, 111, 110, 32, 123, 32, 45, 119, - 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, - 58, 32, 112, 117, 115, 104, 45, 98, 117, 116, 116, 111, 110, 59, 32, 119, - 104, 105, 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, 112, 114, 101, 32, - 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 98, 117, - 116, 116, 111, 110, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, - 112, 101, 61, 34, 115, 117, 98, 109, 105, 116, 34, 93, 44, 32, 105, 110, - 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, 101, 116, 34, - 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, - 105, 108, 101, 34, 93, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 102, - 105, 108, 101, 45, 117, 112, 108, 111, 97, 100, 45, 98, 117, 116, 116, 111, - 110, 44, 32, 98, 117, 116, 116, 111, 110, 32, 123, 32, 45, 119, 101, 98, - 107, 105, 116, 45, 98, 111, 120, 45, 97, 108, 105, 103, 110, 58, 32, 99, - 101, 110, 116, 101, 114, 59, 32, 116, 101, 120, 116, 45, 97, 108, 105, 103, - 110, 58, 32, 99, 101, 110, 116, 101, 114, 59, 32, 99, 117, 114, 115, 111, - 114, 58, 32, 100, 101, 102, 97, 117, 108, 116, 59, 32, 99, 111, 108, 111, - 114, 58, 32, 66, 117, 116, 116, 111, 110, 84, 101, 120, 116, 59, 32, 112, - 97, 100, 100, 105, 110, 103, 58, 32, 50, 112, 120, 32, 54, 112, 120, 32, - 51, 112, 120, 32, 54, 112, 120, 59, 32, 98, 111, 114, 100, 101, 114, 58, - 32, 50, 112, 120, 32, 111, 117, 116, 115, 101, 116, 32, 66, 117, 116, 116, - 111, 110, 70, 97, 99, 101, 59, 32, 98, 97, 99, 107, 103, 114, 111, 117, - 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, 66, 117, 116, 116, 111, 110, - 70, 97, 99, 101, 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, - 120, 45, 115, 105, 122, 105, 110, 103, 58, 32, 98, 111, 114, 100, 101, 114, - 45, 98, 111, 120, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, - 101, 61, 34, 114, 97, 110, 103, 101, 34, 93, 32, 123, 32, 45, 119, 101, - 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, - 32, 115, 108, 105, 100, 101, 114, 45, 104, 111, 114, 105, 122, 111, 110, 116, - 97, 108, 59, 32, 112, 97, 100, 100, 105, 110, 103, 58, 32, 105, 110, 105, - 116, 105, 97, 108, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 105, 110, - 105, 116, 105, 97, 108, 59, 32, 109, 97, 114, 103, 105, 110, 58, 32, 50, - 112, 120, 59, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, - 61, 34, 114, 97, 110, 103, 101, 34, 93, 58, 58, 45, 119, 101, 98, 107, - 105, 116, 45, 115, 108, 105, 100, 101, 114, 45, 116, 104, 117, 109, 98, 32, - 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, - 97, 110, 99, 101, 58, 32, 115, 108, 105, 100, 101, 114, 116, 104, 117, 109, - 98, 45, 104, 111, 114, 105, 122, 111, 110, 116, 97, 108, 59, 32, 125, 32, + 116, 121, 112, 101, 61, 34, 98, 117, 116, 116, 111, 110, 34, 93, 44, 32, + 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 115, 117, 98, 109, + 105, 116, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, + 61, 34, 114, 101, 115, 101, 116, 34, 93, 44, 32, 105, 110, 112, 117, 116, + 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, 58, 58, 45, + 119, 101, 98, 107, 105, 116, 45, 102, 105, 108, 101, 45, 117, 112, 108, 111, + 97, 100, 45, 98, 117, 116, 116, 111, 110, 32, 123, 32, 45, 119, 101, 98, + 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, + 112, 117, 115, 104, 45, 98, 117, 116, 116, 111, 110, 59, 32, 119, 104, 105, + 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, 112, 114, 101, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 98, 117, 116, 116, - 111, 110, 34, 93, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 105, - 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 115, 117, 98, 109, 105, - 116, 34, 93, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 105, 110, - 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, 101, 116, 34, + 111, 110, 34, 93, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, + 61, 34, 115, 117, 98, 109, 105, 116, 34, 93, 44, 32, 105, 110, 112, 117, + 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, 101, 116, 34, 93, 44, + 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, + 101, 34, 93, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 102, 105, 108, + 101, 45, 117, 112, 108, 111, 97, 100, 45, 98, 117, 116, 116, 111, 110, 44, + 32, 98, 117, 116, 116, 111, 110, 32, 123, 32, 45, 119, 101, 98, 107, 105, + 116, 45, 98, 111, 120, 45, 97, 108, 105, 103, 110, 58, 32, 99, 101, 110, + 116, 101, 114, 59, 32, 116, 101, 120, 116, 45, 97, 108, 105, 103, 110, 58, + 32, 99, 101, 110, 116, 101, 114, 59, 32, 99, 117, 114, 115, 111, 114, 58, + 32, 100, 101, 102, 97, 117, 108, 116, 59, 32, 99, 111, 108, 111, 114, 58, + 32, 66, 117, 116, 116, 111, 110, 84, 101, 120, 116, 59, 32, 112, 97, 100, + 100, 105, 110, 103, 58, 32, 50, 112, 120, 32, 54, 112, 120, 32, 51, 112, + 120, 32, 54, 112, 120, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 50, + 112, 120, 32, 111, 117, 116, 115, 101, 116, 32, 66, 117, 116, 116, 111, 110, + 70, 97, 99, 101, 59, 32, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, + 45, 99, 111, 108, 111, 114, 58, 32, 66, 117, 116, 116, 111, 110, 70, 97, + 99, 101, 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, + 115, 105, 122, 105, 110, 103, 58, 32, 98, 111, 114, 100, 101, 114, 45, 98, + 111, 120, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, + 34, 114, 97, 110, 103, 101, 34, 93, 32, 123, 32, 45, 119, 101, 98, 107, + 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 115, + 108, 105, 100, 101, 114, 45, 104, 111, 114, 105, 122, 111, 110, 116, 97, 108, + 59, 32, 112, 97, 100, 100, 105, 110, 103, 58, 32, 105, 110, 105, 116, 105, + 97, 108, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 105, 110, 105, 116, + 105, 97, 108, 59, 32, 109, 97, 114, 103, 105, 110, 58, 32, 50, 112, 120, + 59, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, + 114, 97, 110, 103, 101, 34, 93, 58, 58, 45, 119, 101, 98, 107, 105, 116, + 45, 115, 108, 105, 100, 101, 114, 45, 116, 104, 117, 109, 98, 32, 123, 32, + 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, + 99, 101, 58, 32, 115, 108, 105, 100, 101, 114, 116, 104, 117, 109, 98, 45, + 104, 111, 114, 105, 122, 111, 110, 116, 97, 108, 59, 32, 125, 32, 105, 110, + 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 98, 117, 116, 116, 111, 110, + 34, 93, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 105, 110, 112, + 117, 116, 91, 116, 121, 112, 101, 61, 34, 115, 117, 98, 109, 105, 116, 34, 93, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 105, 110, 112, 117, - 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, 58, 100, - 105, 115, 97, 98, 108, 101, 100, 58, 58, 45, 119, 101, 98, 107, 105, 116, - 45, 102, 105, 108, 101, 45, 117, 112, 108, 111, 97, 100, 45, 98, 117, 116, - 116, 111, 110, 44, 32, 98, 117, 116, 116, 111, 110, 58, 100, 105, 115, 97, - 98, 108, 101, 100, 44, 32, 115, 101, 108, 101, 99, 116, 58, 100, 105, 115, - 97, 98, 108, 101, 100, 44, 32, 107, 101, 121, 103, 101, 110, 58, 100, 105, - 115, 97, 98, 108, 101, 100, 44, 32, 111, 112, 116, 103, 114, 111, 117, 112, - 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 111, 112, 116, 105, 111, - 110, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 100, 97, 116, 97, - 103, 114, 105, 100, 58, 100, 105, 115, 97, 98, 108, 101, 100, 32, 123, 32, - 99, 111, 108, 111, 114, 58, 32, 71, 114, 97, 121, 84, 101, 120, 116, 32, - 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 98, 117, - 116, 116, 111, 110, 34, 93, 58, 97, 99, 116, 105, 118, 101, 44, 32, 105, - 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 115, 117, 98, 109, 105, - 116, 34, 93, 58, 97, 99, 116, 105, 118, 101, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, 101, 116, 34, 93, 58, - 97, 99, 116, 105, 118, 101, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, - 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, 58, 97, 99, 116, 105, 118, - 101, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 102, 105, 108, 101, 45, - 117, 112, 108, 111, 97, 100, 45, 98, 117, 116, 116, 111, 110, 44, 32, 98, - 117, 116, 116, 111, 110, 58, 97, 99, 116, 105, 118, 101, 32, 123, 32, 98, - 111, 114, 100, 101, 114, 45, 115, 116, 121, 108, 101, 58, 32, 105, 110, 115, - 101, 116, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, - 34, 98, 117, 116, 116, 111, 110, 34, 93, 58, 97, 99, 116, 105, 118, 101, - 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 105, 110, 112, 117, 116, - 91, 116, 121, 112, 101, 61, 34, 115, 117, 98, 109, 105, 116, 34, 93, 58, - 97, 99, 116, 105, 118, 101, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, - 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, - 101, 116, 34, 93, 58, 97, 99, 116, 105, 118, 101, 58, 100, 105, 115, 97, - 98, 108, 101, 100, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, + 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 105, 110, 112, 117, 116, 91, + 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, 58, 100, 105, 115, + 97, 98, 108, 101, 100, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, 102, + 105, 108, 101, 45, 117, 112, 108, 111, 97, 100, 45, 98, 117, 116, 116, 111, + 110, 44, 32, 98, 117, 116, 116, 111, 110, 58, 100, 105, 115, 97, 98, 108, + 101, 100, 44, 32, 115, 101, 108, 101, 99, 116, 58, 100, 105, 115, 97, 98, + 108, 101, 100, 44, 32, 107, 101, 121, 103, 101, 110, 58, 100, 105, 115, 97, + 98, 108, 101, 100, 44, 32, 111, 112, 116, 103, 114, 111, 117, 112, 58, 100, + 105, 115, 97, 98, 108, 101, 100, 44, 32, 111, 112, 116, 105, 111, 110, 58, + 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 100, 97, 116, 97, 103, 114, + 105, 100, 58, 100, 105, 115, 97, 98, 108, 101, 100, 32, 123, 32, 99, 111, + 108, 111, 114, 58, 32, 71, 114, 97, 121, 84, 101, 120, 116, 32, 125, 32, + 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 98, 117, 116, 116, + 111, 110, 34, 93, 58, 97, 99, 116, 105, 118, 101, 44, 32, 105, 110, 112, + 117, 116, 91, 116, 121, 112, 101, 61, 34, 115, 117, 98, 109, 105, 116, 34, + 93, 58, 97, 99, 116, 105, 118, 101, 44, 32, 105, 110, 112, 117, 116, 91, + 116, 121, 112, 101, 61, 34, 114, 101, 115, 101, 116, 34, 93, 58, 97, 99, + 116, 105, 118, 101, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, 58, 97, 99, 116, 105, 118, 101, 58, - 100, 105, 115, 97, 98, 108, 101, 100, 58, 58, 45, 119, 101, 98, 107, 105, - 116, 45, 102, 105, 108, 101, 45, 117, 112, 108, 111, 97, 100, 45, 98, 117, - 116, 116, 111, 110, 44, 32, 98, 117, 116, 116, 111, 110, 58, 97, 99, 116, - 105, 118, 101, 58, 100, 105, 115, 97, 98, 108, 101, 100, 32, 123, 32, 98, - 111, 114, 100, 101, 114, 45, 115, 116, 121, 108, 101, 58, 32, 111, 117, 116, - 115, 101, 116, 32, 125, 32, 97, 114, 101, 97, 44, 32, 112, 97, 114, 97, - 109, 32, 123, 32, 100, 105, 115, 112, 108, 97, 121, 58, 32, 110, 111, 110, - 101, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, - 99, 104, 101, 99, 107, 98, 111, 120, 34, 93, 32, 123, 32, 45, 119, 101, - 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, - 32, 99, 104, 101, 99, 107, 98, 111, 120, 59, 32, 45, 119, 101, 98, 107, - 105, 116, 45, 98, 111, 120, 45, 115, 105, 122, 105, 110, 103, 58, 32, 98, - 111, 114, 100, 101, 114, 45, 98, 111, 120, 59, 32, 125, 32, 105, 110, 112, - 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 97, 100, 105, 111, 34, 93, - 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, - 114, 97, 110, 99, 101, 58, 32, 114, 97, 100, 105, 111, 59, 32, 45, 119, - 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 115, 105, 122, 105, 110, 103, - 58, 32, 98, 111, 114, 100, 101, 114, 45, 98, 111, 120, 59, 32, 125, 32, - 107, 101, 121, 103, 101, 110, 44, 32, 115, 101, 108, 101, 99, 116, 32, 123, + 58, 45, 119, 101, 98, 107, 105, 116, 45, 102, 105, 108, 101, 45, 117, 112, + 108, 111, 97, 100, 45, 98, 117, 116, 116, 111, 110, 44, 32, 98, 117, 116, + 116, 111, 110, 58, 97, 99, 116, 105, 118, 101, 32, 123, 32, 98, 111, 114, + 100, 101, 114, 45, 115, 116, 121, 108, 101, 58, 32, 105, 110, 115, 101, 116, + 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 98, + 117, 116, 116, 111, 110, 34, 93, 58, 97, 99, 116, 105, 118, 101, 58, 100, + 105, 115, 97, 98, 108, 101, 100, 44, 32, 105, 110, 112, 117, 116, 91, 116, + 121, 112, 101, 61, 34, 115, 117, 98, 109, 105, 116, 34, 93, 58, 97, 99, + 116, 105, 118, 101, 58, 100, 105, 115, 97, 98, 108, 101, 100, 44, 32, 105, + 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, 101, 116, + 34, 93, 58, 97, 99, 116, 105, 118, 101, 58, 100, 105, 115, 97, 98, 108, + 101, 100, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, + 102, 105, 108, 101, 34, 93, 58, 97, 99, 116, 105, 118, 101, 58, 100, 105, + 115, 97, 98, 108, 101, 100, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, + 102, 105, 108, 101, 45, 117, 112, 108, 111, 97, 100, 45, 98, 117, 116, 116, + 111, 110, 44, 32, 98, 117, 116, 116, 111, 110, 58, 97, 99, 116, 105, 118, + 101, 58, 100, 105, 115, 97, 98, 108, 101, 100, 32, 123, 32, 98, 111, 114, + 100, 101, 114, 45, 115, 116, 121, 108, 101, 58, 32, 111, 117, 116, 115, 101, + 116, 32, 125, 32, 97, 114, 101, 97, 44, 32, 112, 97, 114, 97, 109, 32, + 123, 32, 100, 105, 115, 112, 108, 97, 121, 58, 32, 110, 111, 110, 101, 32, + 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 99, 104, + 101, 99, 107, 98, 111, 120, 34, 93, 32, 123, 32, 45, 119, 101, 98, 107, + 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 99, + 104, 101, 99, 107, 98, 111, 120, 59, 32, 45, 119, 101, 98, 107, 105, 116, + 45, 98, 111, 120, 45, 115, 105, 122, 105, 110, 103, 58, 32, 98, 111, 114, + 100, 101, 114, 45, 98, 111, 120, 59, 32, 125, 32, 105, 110, 112, 117, 116, + 91, 116, 121, 112, 101, 61, 34, 114, 97, 100, 105, 111, 34, 93, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, - 110, 99, 101, 58, 32, 109, 101, 110, 117, 108, 105, 115, 116, 59, 32, 45, - 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 115, 105, 122, 105, 110, - 103, 58, 32, 98, 111, 114, 100, 101, 114, 45, 98, 111, 120, 59, 32, 45, - 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 97, 108, 105, 103, 110, - 58, 32, 99, 101, 110, 116, 101, 114, 59, 32, 98, 111, 114, 100, 101, 114, - 58, 32, 49, 112, 120, 32, 115, 111, 108, 105, 100, 59, 32, 45, 119, 101, - 98, 107, 105, 116, 45, 98, 111, 114, 100, 101, 114, 45, 114, 97, 100, 105, - 117, 115, 58, 32, 53, 112, 120, 59, 32, 119, 104, 105, 116, 101, 45, 115, - 112, 97, 99, 101, 58, 32, 112, 114, 101, 59, 32, 45, 119, 101, 98, 107, - 105, 116, 45, 114, 116, 108, 45, 111, 114, 100, 101, 114, 105, 110, 103, 58, - 32, 108, 111, 103, 105, 99, 97, 108, 59, 32, 99, 111, 108, 111, 114, 58, - 32, 98, 108, 97, 99, 107, 59, 32, 98, 97, 99, 107, 103, 114, 111, 117, - 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, 119, 104, 105, 116, 101, 59, - 32, 99, 117, 114, 115, 111, 114, 58, 32, 100, 101, 102, 97, 117, 108, 116, - 59, 32, 125, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, 122, 101, 93, - 44, 32, 115, 101, 108, 101, 99, 116, 91, 109, 117, 108, 116, 105, 112, 108, - 101, 93, 44, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, 122, 101, 93, - 91, 109, 117, 108, 116, 105, 112, 108, 101, 93, 32, 123, 32, 45, 119, 101, - 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, - 32, 108, 105, 115, 116, 98, 111, 120, 59, 32, 45, 119, 101, 98, 107, 105, - 116, 45, 98, 111, 120, 45, 97, 108, 105, 103, 110, 58, 32, 115, 116, 97, - 114, 116, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 49, 112, 120, 32, - 105, 110, 115, 101, 116, 32, 103, 114, 97, 121, 59, 32, 45, 119, 101, 98, - 107, 105, 116, 45, 98, 111, 114, 100, 101, 114, 45, 114, 97, 100, 105, 117, - 115, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 119, 104, 105, 116, + 110, 99, 101, 58, 32, 114, 97, 100, 105, 111, 59, 32, 45, 119, 101, 98, + 107, 105, 116, 45, 98, 111, 120, 45, 115, 105, 122, 105, 110, 103, 58, 32, + 98, 111, 114, 100, 101, 114, 45, 98, 111, 120, 59, 32, 125, 32, 107, 101, + 121, 103, 101, 110, 44, 32, 115, 101, 108, 101, 99, 116, 32, 123, 32, 45, + 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, + 101, 58, 32, 109, 101, 110, 117, 108, 105, 115, 116, 59, 32, 45, 119, 101, + 98, 107, 105, 116, 45, 98, 111, 120, 45, 115, 105, 122, 105, 110, 103, 58, + 32, 98, 111, 114, 100, 101, 114, 45, 98, 111, 120, 59, 32, 45, 119, 101, + 98, 107, 105, 116, 45, 98, 111, 120, 45, 97, 108, 105, 103, 110, 58, 32, + 99, 101, 110, 116, 101, 114, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, + 49, 112, 120, 32, 115, 111, 108, 105, 100, 59, 32, 45, 119, 101, 98, 107, + 105, 116, 45, 98, 111, 114, 100, 101, 114, 45, 114, 97, 100, 105, 117, 115, + 58, 32, 53, 112, 120, 59, 32, 119, 104, 105, 116, 101, 45, 115, 112, 97, + 99, 101, 58, 32, 112, 114, 101, 59, 32, 45, 119, 101, 98, 107, 105, 116, + 45, 114, 116, 108, 45, 111, 114, 100, 101, 114, 105, 110, 103, 58, 32, 108, + 111, 103, 105, 99, 97, 108, 59, 32, 99, 111, 108, 111, 114, 58, 32, 98, + 108, 97, 99, 107, 59, 32, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, + 45, 99, 111, 108, 111, 114, 58, 32, 119, 104, 105, 116, 101, 59, 32, 99, + 117, 114, 115, 111, 114, 58, 32, 100, 101, 102, 97, 117, 108, 116, 59, 32, + 125, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, 122, 101, 93, 44, 32, + 115, 101, 108, 101, 99, 116, 91, 109, 117, 108, 116, 105, 112, 108, 101, 93, + 44, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, 122, 101, 93, 91, 109, + 117, 108, 116, 105, 112, 108, 101, 93, 32, 123, 32, 45, 119, 101, 98, 107, + 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 108, + 105, 115, 116, 98, 111, 120, 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, + 98, 111, 120, 45, 97, 108, 105, 103, 110, 58, 32, 115, 116, 97, 114, 116, + 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 49, 112, 120, 32, 105, 110, + 115, 101, 116, 32, 103, 114, 97, 121, 59, 32, 45, 119, 101, 98, 107, 105, + 116, 45, 98, 111, 114, 100, 101, 114, 45, 114, 97, 100, 105, 117, 115, 58, + 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, 119, 104, 105, 116, 101, 45, + 115, 112, 97, 99, 101, 58, 32, 105, 110, 105, 116, 105, 97, 108, 59, 32, + 125, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, 122, 101, 61, 34, 48, + 34, 93, 44, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, 122, 101, 61, + 34, 49, 34, 93, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, + 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 109, 101, 110, 117, 108, + 105, 115, 116, 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, + 45, 97, 108, 105, 103, 110, 58, 32, 99, 101, 110, 116, 101, 114, 59, 32, + 98, 111, 114, 100, 101, 114, 58, 32, 49, 112, 120, 32, 115, 111, 108, 105, + 100, 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 114, 100, 101, + 114, 45, 114, 97, 100, 105, 117, 115, 58, 32, 53, 112, 120, 59, 32, 119, + 104, 105, 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, 112, 114, 101, 59, + 32, 125, 32, 111, 112, 116, 103, 114, 111, 117, 112, 32, 123, 32, 102, 111, + 110, 116, 45, 119, 101, 105, 103, 104, 116, 58, 32, 98, 111, 108, 100, 101, + 114, 59, 32, 125, 32, 111, 112, 116, 105, 111, 110, 32, 123, 32, 102, 111, + 110, 116, 45, 119, 101, 105, 103, 104, 116, 58, 32, 110, 111, 114, 109, 97, + 108, 59, 32, 125, 32, 100, 97, 116, 97, 103, 114, 105, 100, 32, 123, 32, + 104, 101, 105, 103, 104, 116, 58, 32, 49, 53, 48, 112, 120, 59, 32, 45, + 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, + 101, 58, 32, 100, 97, 116, 97, 103, 114, 105, 100, 59, 32, 45, 119, 101, + 98, 107, 105, 116, 45, 98, 111, 120, 45, 115, 105, 122, 105, 110, 103, 58, + 32, 98, 111, 114, 100, 101, 114, 45, 98, 111, 120, 59, 32, 45, 119, 101, + 98, 107, 105, 116, 45, 114, 116, 108, 45, 111, 114, 100, 101, 114, 105, 110, + 103, 58, 32, 108, 111, 103, 105, 99, 97, 108, 59, 32, 99, 111, 108, 111, + 114, 58, 32, 98, 108, 97, 99, 107, 59, 32, 98, 97, 99, 107, 103, 114, + 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, 119, 104, 105, 116, + 101, 59, 32, 99, 117, 114, 115, 111, 114, 58, 32, 100, 101, 102, 97, 117, + 108, 116, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 49, 112, 120, 32, + 105, 110, 115, 101, 116, 32, 103, 114, 97, 121, 59, 32, 119, 104, 105, 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, 105, 110, 105, 116, 105, 97, 108, - 59, 32, 125, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, 122, 101, 61, - 34, 48, 34, 93, 44, 32, 115, 101, 108, 101, 99, 116, 91, 115, 105, 122, - 101, 61, 34, 49, 34, 93, 32, 123, 32, 45, 119, 101, 98, 107, 105, 116, - 45, 97, 112, 112, 101, 97, 114, 97, 110, 99, 101, 58, 32, 109, 101, 110, - 117, 108, 105, 115, 116, 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, - 111, 120, 45, 97, 108, 105, 103, 110, 58, 32, 99, 101, 110, 116, 101, 114, - 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 49, 112, 120, 32, 115, 111, - 108, 105, 100, 59, 32, 45, 119, 101, 98, 107, 105, 116, 45, 98, 111, 114, - 100, 101, 114, 45, 114, 97, 100, 105, 117, 115, 58, 32, 53, 112, 120, 59, - 32, 119, 104, 105, 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, 112, 114, - 101, 59, 32, 125, 32, 111, 112, 116, 103, 114, 111, 117, 112, 32, 123, 32, - 102, 111, 110, 116, 45, 119, 101, 105, 103, 104, 116, 58, 32, 98, 111, 108, - 100, 101, 114, 59, 32, 125, 32, 111, 112, 116, 105, 111, 110, 32, 123, 32, - 102, 111, 110, 116, 45, 119, 101, 105, 103, 104, 116, 58, 32, 110, 111, 114, - 109, 97, 108, 59, 32, 125, 32, 100, 97, 116, 97, 103, 114, 105, 100, 32, - 123, 32, 104, 101, 105, 103, 104, 116, 58, 32, 49, 53, 48, 112, 120, 59, - 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 112, 112, 101, 97, 114, 97, - 110, 99, 101, 58, 32, 100, 97, 116, 97, 103, 114, 105, 100, 59, 32, 45, - 119, 101, 98, 107, 105, 116, 45, 98, 111, 120, 45, 115, 105, 122, 105, 110, - 103, 58, 32, 98, 111, 114, 100, 101, 114, 45, 98, 111, 120, 59, 32, 45, - 119, 101, 98, 107, 105, 116, 45, 114, 116, 108, 45, 111, 114, 100, 101, 114, - 105, 110, 103, 58, 32, 108, 111, 103, 105, 99, 97, 108, 59, 32, 99, 111, - 108, 111, 114, 58, 32, 98, 108, 97, 99, 107, 59, 32, 98, 97, 99, 107, - 103, 114, 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, 58, 32, 119, 104, - 105, 116, 101, 59, 32, 99, 117, 114, 115, 111, 114, 58, 32, 100, 101, 102, - 97, 117, 108, 116, 59, 32, 98, 111, 114, 100, 101, 114, 58, 32, 49, 112, - 120, 32, 105, 110, 115, 101, 116, 32, 103, 114, 97, 121, 59, 32, 119, 104, - 105, 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, 105, 110, 105, 116, 105, - 97, 108, 59, 32, 125, 32, 117, 44, 32, 105, 110, 115, 32, 123, 32, 116, - 101, 120, 116, 45, 100, 101, 99, 111, 114, 97, 116, 105, 111, 110, 58, 32, - 117, 110, 100, 101, 114, 108, 105, 110, 101, 32, 125, 32, 115, 116, 114, 111, - 110, 103, 44, 32, 98, 32, 123, 32, 102, 111, 110, 116, 45, 119, 101, 105, - 103, 104, 116, 58, 32, 98, 111, 108, 100, 101, 114, 32, 125, 32, 105, 44, - 32, 99, 105, 116, 101, 44, 32, 101, 109, 44, 32, 118, 97, 114, 44, 32, - 97, 100, 100, 114, 101, 115, 115, 32, 123, 32, 102, 111, 110, 116, 45, 115, - 116, 121, 108, 101, 58, 32, 105, 116, 97, 108, 105, 99, 32, 125, 32, 116, - 116, 44, 32, 99, 111, 100, 101, 44, 32, 107, 98, 100, 44, 32, 115, 97, - 109, 112, 32, 123, 32, 102, 111, 110, 116, 45, 102, 97, 109, 105, 108, 121, - 58, 32, 109, 111, 110, 111, 115, 112, 97, 99, 101, 32, 125, 32, 112, 114, - 101, 44, 32, 120, 109, 112, 44, 32, 112, 108, 97, 105, 110, 116, 101, 120, - 116, 44, 32, 108, 105, 115, 116, 105, 110, 103, 32, 123, 32, 100, 105, 115, - 112, 108, 97, 121, 58, 32, 98, 108, 111, 99, 107, 59, 32, 102, 111, 110, - 116, 45, 102, 97, 109, 105, 108, 121, 58, 32, 109, 111, 110, 111, 115, 112, - 97, 99, 101, 59, 32, 119, 104, 105, 116, 101, 45, 115, 112, 97, 99, 101, - 58, 32, 112, 114, 101, 59, 32, 109, 97, 114, 103, 105, 110, 58, 32, 49, - 95, 95, 113, 101, 109, 32, 48, 32, 125, 32, 98, 105, 103, 32, 123, 32, - 102, 111, 110, 116, 45, 115, 105, 122, 101, 58, 32, 108, 97, 114, 103, 101, - 114, 32, 125, 32, 115, 109, 97, 108, 108, 32, 123, 32, 102, 111, 110, 116, - 45, 115, 105, 122, 101, 58, 32, 115, 109, 97, 108, 108, 101, 114, 32, 125, - 32, 115, 44, 32, 115, 116, 114, 105, 107, 101, 44, 32, 100, 101, 108, 32, - 123, 32, 116, 101, 120, 116, 45, 100, 101, 99, 111, 114, 97, 116, 105, 111, - 110, 58, 32, 108, 105, 110, 101, 45, 116, 104, 114, 111, 117, 103, 104, 32, - 125, 32, 115, 117, 98, 32, 123, 32, 118, 101, 114, 116, 105, 99, 97, 108, - 45, 97, 108, 105, 103, 110, 58, 32, 115, 117, 98, 59, 32, 102, 111, 110, + 59, 32, 125, 32, 117, 44, 32, 105, 110, 115, 32, 123, 32, 116, 101, 120, + 116, 45, 100, 101, 99, 111, 114, 97, 116, 105, 111, 110, 58, 32, 117, 110, + 100, 101, 114, 108, 105, 110, 101, 32, 125, 32, 115, 116, 114, 111, 110, 103, + 44, 32, 98, 32, 123, 32, 102, 111, 110, 116, 45, 119, 101, 105, 103, 104, + 116, 58, 32, 98, 111, 108, 100, 101, 114, 32, 125, 32, 105, 44, 32, 99, + 105, 116, 101, 44, 32, 101, 109, 44, 32, 118, 97, 114, 44, 32, 97, 100, + 100, 114, 101, 115, 115, 32, 123, 32, 102, 111, 110, 116, 45, 115, 116, 121, + 108, 101, 58, 32, 105, 116, 97, 108, 105, 99, 32, 125, 32, 116, 116, 44, + 32, 99, 111, 100, 101, 44, 32, 107, 98, 100, 44, 32, 115, 97, 109, 112, + 32, 123, 32, 102, 111, 110, 116, 45, 102, 97, 109, 105, 108, 121, 58, 32, + 109, 111, 110, 111, 115, 112, 97, 99, 101, 32, 125, 32, 112, 114, 101, 44, + 32, 120, 109, 112, 44, 32, 112, 108, 97, 105, 110, 116, 101, 120, 116, 44, + 32, 108, 105, 115, 116, 105, 110, 103, 32, 123, 32, 100, 105, 115, 112, 108, + 97, 121, 58, 32, 98, 108, 111, 99, 107, 59, 32, 102, 111, 110, 116, 45, + 102, 97, 109, 105, 108, 121, 58, 32, 109, 111, 110, 111, 115, 112, 97, 99, + 101, 59, 32, 119, 104, 105, 116, 101, 45, 115, 112, 97, 99, 101, 58, 32, + 112, 114, 101, 59, 32, 109, 97, 114, 103, 105, 110, 58, 32, 49, 95, 95, + 113, 101, 109, 32, 48, 32, 125, 32, 98, 105, 103, 32, 123, 32, 102, 111, + 110, 116, 45, 115, 105, 122, 101, 58, 32, 108, 97, 114, 103, 101, 114, 32, + 125, 32, 115, 109, 97, 108, 108, 32, 123, 32, 102, 111, 110, 116, 45, 115, + 105, 122, 101, 58, 32, 115, 109, 97, 108, 108, 101, 114, 32, 125, 32, 115, + 44, 32, 115, 116, 114, 105, 107, 101, 44, 32, 100, 101, 108, 32, 123, 32, + 116, 101, 120, 116, 45, 100, 101, 99, 111, 114, 97, 116, 105, 111, 110, 58, + 32, 108, 105, 110, 101, 45, 116, 104, 114, 111, 117, 103, 104, 32, 125, 32, + 115, 117, 98, 32, 123, 32, 118, 101, 114, 116, 105, 99, 97, 108, 45, 97, + 108, 105, 103, 110, 58, 32, 115, 117, 98, 59, 32, 102, 111, 110, 116, 45, + 115, 105, 122, 101, 58, 32, 115, 109, 97, 108, 108, 101, 114, 32, 125, 32, + 115, 117, 112, 32, 123, 32, 118, 101, 114, 116, 105, 99, 97, 108, 45, 97, + 108, 105, 103, 110, 58, 32, 115, 117, 112, 101, 114, 59, 32, 102, 111, 110, 116, 45, 115, 105, 122, 101, 58, 32, 115, 109, 97, 108, 108, 101, 114, 32, - 125, 32, 115, 117, 112, 32, 123, 32, 118, 101, 114, 116, 105, 99, 97, 108, - 45, 97, 108, 105, 103, 110, 58, 32, 115, 117, 112, 101, 114, 59, 32, 102, - 111, 110, 116, 45, 115, 105, 122, 101, 58, 32, 115, 109, 97, 108, 108, 101, - 114, 32, 125, 32, 110, 111, 98, 114, 32, 123, 32, 119, 104, 105, 116, 101, - 45, 115, 112, 97, 99, 101, 58, 32, 110, 111, 119, 114, 97, 112, 32, 125, - 32, 58, 102, 111, 99, 117, 115, 32, 123, 32, 111, 117, 116, 108, 105, 110, - 101, 58, 32, 97, 117, 116, 111, 32, 53, 112, 120, 32, 45, 119, 101, 98, - 107, 105, 116, 45, 102, 111, 99, 117, 115, 45, 114, 105, 110, 103, 45, 99, - 111, 108, 111, 114, 32, 125, 32, 104, 116, 109, 108, 58, 102, 111, 99, 117, - 115, 44, 32, 98, 111, 100, 121, 58, 102, 111, 99, 117, 115, 44, 32, 105, - 110, 112, 117, 116, 91, 114, 101, 97, 100, 111, 110, 108, 121, 93, 58, 102, - 111, 99, 117, 115, 32, 123, 32, 111, 117, 116, 108, 105, 110, 101, 58, 32, - 110, 111, 110, 101, 32, 125, 32, 105, 110, 112, 117, 116, 58, 102, 111, 99, - 117, 115, 44, 32, 116, 101, 120, 116, 97, 114, 101, 97, 58, 102, 111, 99, - 117, 115, 44, 32, 105, 115, 105, 110, 100, 101, 120, 58, 102, 111, 99, 117, - 115, 44, 32, 107, 101, 121, 103, 101, 110, 58, 102, 111, 99, 117, 115, 44, - 32, 115, 101, 108, 101, 99, 116, 58, 102, 111, 99, 117, 115, 32, 123, 32, - 111, 117, 116, 108, 105, 110, 101, 45, 111, 102, 102, 115, 101, 116, 58, 32, - 45, 50, 112, 120, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, - 101, 61, 34, 98, 117, 116, 116, 111, 110, 34, 93, 58, 102, 111, 99, 117, - 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 99, - 104, 101, 99, 107, 98, 111, 120, 34, 93, 58, 102, 111, 99, 117, 115, 44, - 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, - 101, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, - 91, 116, 121, 112, 101, 61, 34, 104, 105, 100, 100, 101, 110, 34, 93, 58, - 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, - 101, 61, 34, 105, 109, 97, 103, 101, 34, 93, 58, 102, 111, 99, 117, 115, - 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 97, - 100, 105, 111, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, - 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, 101, 116, 34, 93, - 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, - 112, 101, 61, 34, 115, 101, 97, 114, 99, 104, 34, 93, 58, 102, 111, 99, - 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, - 115, 117, 98, 109, 105, 116, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, - 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, - 34, 93, 58, 102, 111, 99, 117, 115, 58, 58, 45, 119, 101, 98, 107, 105, - 116, 45, 102, 105, 108, 101, 45, 117, 112, 108, 111, 97, 100, 45, 98, 117, - 116, 116, 111, 110, 32, 123, 32, 111, 117, 116, 108, 105, 110, 101, 45, 111, - 102, 102, 115, 101, 116, 58, 32, 48, 32, 125, 32, 97, 58, 45, 119, 101, - 98, 107, 105, 116, 45, 97, 110, 121, 45, 108, 105, 110, 107, 32, 123, 32, - 99, 111, 108, 111, 114, 58, 32, 45, 119, 101, 98, 107, 105, 116, 45, 108, - 105, 110, 107, 59, 32, 116, 101, 120, 116, 45, 100, 101, 99, 111, 114, 97, - 116, 105, 111, 110, 58, 32, 117, 110, 100, 101, 114, 108, 105, 110, 101, 59, - 32, 99, 117, 114, 115, 111, 114, 58, 32, 97, 117, 116, 111, 59, 32, 125, - 32, 97, 58, 45, 119, 101, 98, 107, 105, 116, 45, 97, 110, 121, 45, 108, - 105, 110, 107, 58, 97, 99, 116, 105, 118, 101, 32, 123, 32, 99, 111, 108, - 111, 114, 58, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 99, 116, 105, - 118, 101, 108, 105, 110, 107, 32, 125, 32, 110, 111, 102, 114, 97, 109, 101, - 115, 32, 123, 32, 100, 105, 115, 112, 108, 97, 121, 58, 32, 110, 111, 110, - 101, 32, 125, 32, 102, 114, 97, 109, 101, 115, 101, 116, 44, 32, 102, 114, - 97, 109, 101, 32, 123, 32, 100, 105, 115, 112, 108, 97, 121, 58, 32, 98, - 108, 111, 99, 107, 32, 125, 32, 102, 114, 97, 109, 101, 115, 101, 116, 32, - 123, 32, 98, 111, 114, 100, 101, 114, 45, 99, 111, 108, 111, 114, 58, 32, - 105, 110, 104, 101, 114, 105, 116, 32, 125, 32, 105, 102, 114, 97, 109, 101, - 32, 123, 32, 98, 111, 114, 100, 101, 114, 58, 32, 50, 112, 120, 32, 105, - 110, 115, 101, 116, 32, 125 + 125, 32, 110, 111, 98, 114, 32, 123, 32, 119, 104, 105, 116, 101, 45, 115, + 112, 97, 99, 101, 58, 32, 110, 111, 119, 114, 97, 112, 32, 125, 32, 58, + 102, 111, 99, 117, 115, 32, 123, 32, 111, 117, 116, 108, 105, 110, 101, 58, + 32, 97, 117, 116, 111, 32, 53, 112, 120, 32, 45, 119, 101, 98, 107, 105, + 116, 45, 102, 111, 99, 117, 115, 45, 114, 105, 110, 103, 45, 99, 111, 108, + 111, 114, 32, 125, 32, 104, 116, 109, 108, 58, 102, 111, 99, 117, 115, 44, + 32, 98, 111, 100, 121, 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, + 117, 116, 91, 114, 101, 97, 100, 111, 110, 108, 121, 93, 58, 102, 111, 99, + 117, 115, 32, 123, 32, 111, 117, 116, 108, 105, 110, 101, 58, 32, 110, 111, + 110, 101, 32, 125, 32, 105, 110, 112, 117, 116, 58, 102, 111, 99, 117, 115, + 44, 32, 116, 101, 120, 116, 97, 114, 101, 97, 58, 102, 111, 99, 117, 115, + 44, 32, 105, 115, 105, 110, 100, 101, 120, 58, 102, 111, 99, 117, 115, 44, + 32, 107, 101, 121, 103, 101, 110, 58, 102, 111, 99, 117, 115, 44, 32, 115, + 101, 108, 101, 99, 116, 58, 102, 111, 99, 117, 115, 32, 123, 32, 111, 117, + 116, 108, 105, 110, 101, 45, 111, 102, 102, 115, 101, 116, 58, 32, 45, 50, + 112, 120, 32, 125, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, + 34, 98, 117, 116, 116, 111, 110, 34, 93, 58, 102, 111, 99, 117, 115, 44, + 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 99, 104, 101, + 99, 107, 98, 111, 120, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, + 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, + 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, + 121, 112, 101, 61, 34, 104, 105, 100, 100, 101, 110, 34, 93, 58, 102, 111, + 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, + 34, 105, 109, 97, 103, 101, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, + 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 114, 97, 100, 105, + 111, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, + 91, 116, 121, 112, 101, 61, 34, 114, 101, 115, 101, 116, 34, 93, 58, 102, + 111, 99, 117, 115, 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, + 61, 34, 115, 101, 97, 114, 99, 104, 34, 93, 58, 102, 111, 99, 117, 115, + 44, 32, 105, 110, 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 115, 117, + 98, 109, 105, 116, 34, 93, 58, 102, 111, 99, 117, 115, 44, 32, 105, 110, + 112, 117, 116, 91, 116, 121, 112, 101, 61, 34, 102, 105, 108, 101, 34, 93, + 58, 102, 111, 99, 117, 115, 58, 58, 45, 119, 101, 98, 107, 105, 116, 45, + 102, 105, 108, 101, 45, 117, 112, 108, 111, 97, 100, 45, 98, 117, 116, 116, + 111, 110, 32, 123, 32, 111, 117, 116, 108, 105, 110, 101, 45, 111, 102, 102, + 115, 101, 116, 58, 32, 48, 32, 125, 32, 97, 58, 45, 119, 101, 98, 107, + 105, 116, 45, 97, 110, 121, 45, 108, 105, 110, 107, 32, 123, 32, 99, 111, + 108, 111, 114, 58, 32, 45, 119, 101, 98, 107, 105, 116, 45, 108, 105, 110, + 107, 59, 32, 116, 101, 120, 116, 45, 100, 101, 99, 111, 114, 97, 116, 105, + 111, 110, 58, 32, 117, 110, 100, 101, 114, 108, 105, 110, 101, 59, 32, 99, + 117, 114, 115, 111, 114, 58, 32, 97, 117, 116, 111, 59, 32, 125, 32, 97, + 58, 45, 119, 101, 98, 107, 105, 116, 45, 97, 110, 121, 45, 108, 105, 110, + 107, 58, 97, 99, 116, 105, 118, 101, 32, 123, 32, 99, 111, 108, 111, 114, + 58, 32, 45, 119, 101, 98, 107, 105, 116, 45, 97, 99, 116, 105, 118, 101, + 108, 105, 110, 107, 32, 125, 32, 110, 111, 102, 114, 97, 109, 101, 115, 32, + 123, 32, 100, 105, 115, 112, 108, 97, 121, 58, 32, 110, 111, 110, 101, 32, + 125, 32, 102, 114, 97, 109, 101, 115, 101, 116, 44, 32, 102, 114, 97, 109, + 101, 32, 123, 32, 100, 105, 115, 112, 108, 97, 121, 58, 32, 98, 108, 111, + 99, 107, 32, 125, 32, 102, 114, 97, 109, 101, 115, 101, 116, 32, 123, 32, + 98, 111, 114, 100, 101, 114, 45, 99, 111, 108, 111, 114, 58, 32, 105, 110, + 104, 101, 114, 105, 116, 32, 125, 32, 105, 102, 114, 97, 109, 101, 32, 123, + 32, 98, 111, 114, 100, 101, 114, 58, 32, 50, 112, 120, 32, 105, 110, 115, + 101, 116, 32, 125 }; extern const char quirksUserAgentStyleSheet[359] = { 105, 109, 103, 91, 97, 108, 105, 103, 110, 61, 34, 108, 101, 102, 116, 34, diff --git a/src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp b/src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp index 187298081..5f34852a1 100644 --- a/src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp +++ b/src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp @@ -89,6 +89,10 @@ #include "XPathPath.h" #include "XPathPredicate.h" #include "XPathVariableReference.h" +#include + +#define YYMALLOC fastMalloc +#define YYFREE fastFree #define YYENABLE_NLS 0 #define YYLTYPE_IS_TRIVIAL 1 @@ -103,7 +107,7 @@ using namespace XPath; /* Line 189 of yacc.c */ -#line 107 "WebCore/tmp/../generated/XPathGrammar.tab.c" +#line 111 "WebCore/tmp/../generated/XPathGrammar.tab.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -158,7 +162,7 @@ typedef union YYSTYPE { /* Line 214 of yacc.c */ -#line 56 "../xml/XPathGrammar.y" +#line 60 "../xml/XPathGrammar.y" Step::Axis axis; Step::NodeTest* nodeTest; @@ -174,7 +178,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 178 "WebCore/tmp/../generated/XPathGrammar.tab.c" +#line 182 "WebCore/tmp/../generated/XPathGrammar.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -185,7 +189,7 @@ typedef union YYSTYPE /* Copy the second part of user declarations. */ /* Line 264 of yacc.c */ -#line 69 "../xml/XPathGrammar.y" +#line 73 "../xml/XPathGrammar.y" static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } @@ -194,7 +198,7 @@ static void xpathyyerror(const char*) { } /* Line 264 of yacc.c */ -#line 198 "WebCore/tmp/../generated/XPathGrammar.tab.c" +#line 202 "WebCore/tmp/../generated/XPathGrammar.tab.c" #ifdef short # undef short @@ -500,13 +504,13 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 117, 117, 124, 129, 136, 142, 147, 156, 164, - 170, 180, 191, 209, 220, 238, 242, 244, 251, 264, - 271, 282, 286, 290, 298, 306, 313, 321, 327, 335, - 342, 347, 354, 361, 365, 374, 386, 394, 402, 406, - 408, 420, 425, 427, 436, 449, 451, 461, 463, 473, - 475, 485, 487, 497, 499, 509, 511, 519, 529, 531, - 541, 543 + 0, 121, 121, 128, 133, 140, 146, 151, 160, 168, + 174, 184, 195, 213, 224, 242, 246, 248, 255, 268, + 275, 286, 290, 294, 302, 310, 317, 325, 331, 339, + 346, 351, 358, 365, 369, 378, 390, 398, 406, 410, + 412, 424, 429, 431, 440, 453, 455, 465, 467, 477, + 479, 489, 491, 501, 503, 513, 515, 523, 533, 535, + 545, 547 }; #endif @@ -1479,7 +1483,7 @@ yyreduce: case 2: /* Line 1455 of yacc.c */ -#line 118 "../xml/XPathGrammar.y" +#line 122 "../xml/XPathGrammar.y" { PARSER->m_topExpr = (yyvsp[(1) - (1)].expr); ;} @@ -1488,7 +1492,7 @@ yyreduce: case 3: /* Line 1455 of yacc.c */ -#line 125 "../xml/XPathGrammar.y" +#line 129 "../xml/XPathGrammar.y" { (yyval.locationPath)->setAbsolute(false); ;} @@ -1497,7 +1501,7 @@ yyreduce: case 4: /* Line 1455 of yacc.c */ -#line 130 "../xml/XPathGrammar.y" +#line 134 "../xml/XPathGrammar.y" { (yyval.locationPath)->setAbsolute(true); ;} @@ -1506,7 +1510,7 @@ yyreduce: case 5: /* Line 1455 of yacc.c */ -#line 137 "../xml/XPathGrammar.y" +#line 141 "../xml/XPathGrammar.y" { (yyval.locationPath) = new LocationPath; PARSER->registerParseNode((yyval.locationPath)); @@ -1516,7 +1520,7 @@ yyreduce: case 6: /* Line 1455 of yacc.c */ -#line 143 "../xml/XPathGrammar.y" +#line 147 "../xml/XPathGrammar.y" { (yyval.locationPath) = (yyvsp[(2) - (2)].locationPath); ;} @@ -1525,7 +1529,7 @@ yyreduce: case 7: /* Line 1455 of yacc.c */ -#line 148 "../xml/XPathGrammar.y" +#line 152 "../xml/XPathGrammar.y" { (yyval.locationPath) = (yyvsp[(2) - (2)].locationPath); (yyval.locationPath)->insertFirstStep((yyvsp[(1) - (2)].step)); @@ -1536,7 +1540,7 @@ yyreduce: case 8: /* Line 1455 of yacc.c */ -#line 157 "../xml/XPathGrammar.y" +#line 161 "../xml/XPathGrammar.y" { (yyval.locationPath) = new LocationPath; (yyval.locationPath)->appendStep((yyvsp[(1) - (1)].step)); @@ -1548,7 +1552,7 @@ yyreduce: case 9: /* Line 1455 of yacc.c */ -#line 165 "../xml/XPathGrammar.y" +#line 169 "../xml/XPathGrammar.y" { (yyval.locationPath)->appendStep((yyvsp[(3) - (3)].step)); PARSER->unregisterParseNode((yyvsp[(3) - (3)].step)); @@ -1558,7 +1562,7 @@ yyreduce: case 10: /* Line 1455 of yacc.c */ -#line 171 "../xml/XPathGrammar.y" +#line 175 "../xml/XPathGrammar.y" { (yyval.locationPath)->appendStep((yyvsp[(2) - (3)].step)); (yyval.locationPath)->appendStep((yyvsp[(3) - (3)].step)); @@ -1570,7 +1574,7 @@ yyreduce: case 11: /* Line 1455 of yacc.c */ -#line 181 "../xml/XPathGrammar.y" +#line 185 "../xml/XPathGrammar.y" { if ((yyvsp[(2) - (2)].predList)) { (yyval.step) = new Step(Step::ChildAxis, *(yyvsp[(1) - (2)].nodeTest), *(yyvsp[(2) - (2)].predList)); @@ -1585,7 +1589,7 @@ yyreduce: case 12: /* Line 1455 of yacc.c */ -#line 192 "../xml/XPathGrammar.y" +#line 196 "../xml/XPathGrammar.y" { String localName; String namespaceURI; @@ -1607,7 +1611,7 @@ yyreduce: case 13: /* Line 1455 of yacc.c */ -#line 210 "../xml/XPathGrammar.y" +#line 214 "../xml/XPathGrammar.y" { if ((yyvsp[(3) - (3)].predList)) { (yyval.step) = new Step((yyvsp[(1) - (3)].axis), *(yyvsp[(2) - (3)].nodeTest), *(yyvsp[(3) - (3)].predList)); @@ -1622,7 +1626,7 @@ yyreduce: case 14: /* Line 1455 of yacc.c */ -#line 221 "../xml/XPathGrammar.y" +#line 225 "../xml/XPathGrammar.y" { String localName; String namespaceURI; @@ -1644,7 +1648,7 @@ yyreduce: case 17: /* Line 1455 of yacc.c */ -#line 245 "../xml/XPathGrammar.y" +#line 249 "../xml/XPathGrammar.y" { (yyval.axis) = Step::AttributeAxis; ;} @@ -1653,7 +1657,7 @@ yyreduce: case 18: /* Line 1455 of yacc.c */ -#line 252 "../xml/XPathGrammar.y" +#line 256 "../xml/XPathGrammar.y" { if (*(yyvsp[(1) - (3)].str) == "node") (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::AnyNodeTest); @@ -1670,7 +1674,7 @@ yyreduce: case 19: /* Line 1455 of yacc.c */ -#line 265 "../xml/XPathGrammar.y" +#line 269 "../xml/XPathGrammar.y" { (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); PARSER->deleteString((yyvsp[(1) - (3)].str)); @@ -1681,7 +1685,7 @@ yyreduce: case 20: /* Line 1455 of yacc.c */ -#line 272 "../xml/XPathGrammar.y" +#line 276 "../xml/XPathGrammar.y" { (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, (yyvsp[(3) - (4)].str)->stripWhiteSpace()); PARSER->deleteString((yyvsp[(1) - (4)].str)); @@ -1693,7 +1697,7 @@ yyreduce: case 21: /* Line 1455 of yacc.c */ -#line 282 "../xml/XPathGrammar.y" +#line 286 "../xml/XPathGrammar.y" { (yyval.predList) = 0; ;} @@ -1702,7 +1706,7 @@ yyreduce: case 23: /* Line 1455 of yacc.c */ -#line 291 "../xml/XPathGrammar.y" +#line 295 "../xml/XPathGrammar.y" { (yyval.predList) = new Vector; (yyval.predList)->append(new Predicate((yyvsp[(1) - (1)].expr))); @@ -1714,7 +1718,7 @@ yyreduce: case 24: /* Line 1455 of yacc.c */ -#line 299 "../xml/XPathGrammar.y" +#line 303 "../xml/XPathGrammar.y" { (yyval.predList)->append(new Predicate((yyvsp[(2) - (2)].expr))); PARSER->unregisterParseNode((yyvsp[(2) - (2)].expr)); @@ -1724,7 +1728,7 @@ yyreduce: case 25: /* Line 1455 of yacc.c */ -#line 307 "../xml/XPathGrammar.y" +#line 311 "../xml/XPathGrammar.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;} @@ -1733,7 +1737,7 @@ yyreduce: case 26: /* Line 1455 of yacc.c */ -#line 314 "../xml/XPathGrammar.y" +#line 318 "../xml/XPathGrammar.y" { (yyval.step) = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); PARSER->registerParseNode((yyval.step)); @@ -1743,7 +1747,7 @@ yyreduce: case 27: /* Line 1455 of yacc.c */ -#line 322 "../xml/XPathGrammar.y" +#line 326 "../xml/XPathGrammar.y" { (yyval.step) = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); PARSER->registerParseNode((yyval.step)); @@ -1753,7 +1757,7 @@ yyreduce: case 28: /* Line 1455 of yacc.c */ -#line 328 "../xml/XPathGrammar.y" +#line 332 "../xml/XPathGrammar.y" { (yyval.step) = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); PARSER->registerParseNode((yyval.step)); @@ -1763,7 +1767,7 @@ yyreduce: case 29: /* Line 1455 of yacc.c */ -#line 336 "../xml/XPathGrammar.y" +#line 340 "../xml/XPathGrammar.y" { (yyval.expr) = new VariableReference(*(yyvsp[(1) - (1)].str)); PARSER->deleteString((yyvsp[(1) - (1)].str)); @@ -1774,7 +1778,7 @@ yyreduce: case 30: /* Line 1455 of yacc.c */ -#line 343 "../xml/XPathGrammar.y" +#line 347 "../xml/XPathGrammar.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;} @@ -1783,7 +1787,7 @@ yyreduce: case 31: /* Line 1455 of yacc.c */ -#line 348 "../xml/XPathGrammar.y" +#line 352 "../xml/XPathGrammar.y" { (yyval.expr) = new StringExpression(*(yyvsp[(1) - (1)].str)); PARSER->deleteString((yyvsp[(1) - (1)].str)); @@ -1794,7 +1798,7 @@ yyreduce: case 32: /* Line 1455 of yacc.c */ -#line 355 "../xml/XPathGrammar.y" +#line 359 "../xml/XPathGrammar.y" { (yyval.expr) = new Number((yyvsp[(1) - (1)].str)->toDouble()); PARSER->deleteString((yyvsp[(1) - (1)].str)); @@ -1805,7 +1809,7 @@ yyreduce: case 34: /* Line 1455 of yacc.c */ -#line 366 "../xml/XPathGrammar.y" +#line 370 "../xml/XPathGrammar.y" { (yyval.expr) = createFunction(*(yyvsp[(1) - (3)].str)); if (!(yyval.expr)) @@ -1818,7 +1822,7 @@ yyreduce: case 35: /* Line 1455 of yacc.c */ -#line 375 "../xml/XPathGrammar.y" +#line 379 "../xml/XPathGrammar.y" { (yyval.expr) = createFunction(*(yyvsp[(1) - (4)].str), *(yyvsp[(3) - (4)].argList)); if (!(yyval.expr)) @@ -1832,7 +1836,7 @@ yyreduce: case 36: /* Line 1455 of yacc.c */ -#line 387 "../xml/XPathGrammar.y" +#line 391 "../xml/XPathGrammar.y" { (yyval.argList) = new Vector; (yyval.argList)->append((yyvsp[(1) - (1)].expr)); @@ -1844,7 +1848,7 @@ yyreduce: case 37: /* Line 1455 of yacc.c */ -#line 395 "../xml/XPathGrammar.y" +#line 399 "../xml/XPathGrammar.y" { (yyval.argList)->append((yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(3) - (3)].expr)); @@ -1854,7 +1858,7 @@ yyreduce: case 40: /* Line 1455 of yacc.c */ -#line 409 "../xml/XPathGrammar.y" +#line 413 "../xml/XPathGrammar.y" { (yyval.expr) = new Union; (yyval.expr)->addSubExpression((yyvsp[(1) - (3)].expr)); @@ -1868,7 +1872,7 @@ yyreduce: case 41: /* Line 1455 of yacc.c */ -#line 421 "../xml/XPathGrammar.y" +#line 425 "../xml/XPathGrammar.y" { (yyval.expr) = (yyvsp[(1) - (1)].locationPath); ;} @@ -1877,7 +1881,7 @@ yyreduce: case 43: /* Line 1455 of yacc.c */ -#line 428 "../xml/XPathGrammar.y" +#line 432 "../xml/XPathGrammar.y" { (yyvsp[(3) - (3)].locationPath)->setAbsolute(true); (yyval.expr) = new Path(static_cast((yyvsp[(1) - (3)].expr)), (yyvsp[(3) - (3)].locationPath)); @@ -1890,7 +1894,7 @@ yyreduce: case 44: /* Line 1455 of yacc.c */ -#line 437 "../xml/XPathGrammar.y" +#line 441 "../xml/XPathGrammar.y" { (yyvsp[(3) - (3)].locationPath)->insertFirstStep((yyvsp[(2) - (3)].step)); (yyvsp[(3) - (3)].locationPath)->setAbsolute(true); @@ -1905,7 +1909,7 @@ yyreduce: case 46: /* Line 1455 of yacc.c */ -#line 452 "../xml/XPathGrammar.y" +#line 456 "../xml/XPathGrammar.y" { (yyval.expr) = new Filter((yyvsp[(1) - (2)].expr), *(yyvsp[(2) - (2)].predList)); PARSER->unregisterParseNode((yyvsp[(1) - (2)].expr)); @@ -1917,7 +1921,7 @@ yyreduce: case 48: /* Line 1455 of yacc.c */ -#line 464 "../xml/XPathGrammar.y" +#line 468 "../xml/XPathGrammar.y" { (yyval.expr) = new LogicalOp(LogicalOp::OP_Or, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -1929,7 +1933,7 @@ yyreduce: case 50: /* Line 1455 of yacc.c */ -#line 476 "../xml/XPathGrammar.y" +#line 480 "../xml/XPathGrammar.y" { (yyval.expr) = new LogicalOp(LogicalOp::OP_And, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -1941,7 +1945,7 @@ yyreduce: case 52: /* Line 1455 of yacc.c */ -#line 488 "../xml/XPathGrammar.y" +#line 492 "../xml/XPathGrammar.y" { (yyval.expr) = new EqTestOp((yyvsp[(2) - (3)].eqop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -1953,7 +1957,7 @@ yyreduce: case 54: /* Line 1455 of yacc.c */ -#line 500 "../xml/XPathGrammar.y" +#line 504 "../xml/XPathGrammar.y" { (yyval.expr) = new EqTestOp((yyvsp[(2) - (3)].eqop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -1965,7 +1969,7 @@ yyreduce: case 56: /* Line 1455 of yacc.c */ -#line 512 "../xml/XPathGrammar.y" +#line 516 "../xml/XPathGrammar.y" { (yyval.expr) = new NumericOp(NumericOp::OP_Add, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -1977,7 +1981,7 @@ yyreduce: case 57: /* Line 1455 of yacc.c */ -#line 520 "../xml/XPathGrammar.y" +#line 524 "../xml/XPathGrammar.y" { (yyval.expr) = new NumericOp(NumericOp::OP_Sub, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -1989,7 +1993,7 @@ yyreduce: case 59: /* Line 1455 of yacc.c */ -#line 532 "../xml/XPathGrammar.y" +#line 536 "../xml/XPathGrammar.y" { (yyval.expr) = new NumericOp((yyvsp[(2) - (3)].numop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr)); @@ -2001,7 +2005,7 @@ yyreduce: case 61: /* Line 1455 of yacc.c */ -#line 544 "../xml/XPathGrammar.y" +#line 548 "../xml/XPathGrammar.y" { (yyval.expr) = new Negative; (yyval.expr)->addSubExpression((yyvsp[(2) - (2)].expr)); @@ -2013,7 +2017,7 @@ yyreduce: /* Line 1455 of yacc.c */ -#line 2017 "WebCore/tmp/../generated/XPathGrammar.tab.c" +#line 2021 "WebCore/tmp/../generated/XPathGrammar.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2225,7 +2229,7 @@ yyreturn: /* Line 1675 of yacc.c */ -#line 552 "../xml/XPathGrammar.y" +#line 556 "../xml/XPathGrammar.y" #endif diff --git a/src/3rdparty/webkit/WebCore/generated/XPathGrammar.h b/src/3rdparty/webkit/WebCore/generated/XPathGrammar.h index 5a974bb91..cdf2b3253 100644 --- a/src/3rdparty/webkit/WebCore/generated/XPathGrammar.h +++ b/src/3rdparty/webkit/WebCore/generated/XPathGrammar.h @@ -67,7 +67,7 @@ typedef union YYSTYPE { /* Line 1676 of yacc.c */ -#line 56 "../xml/XPathGrammar.y" +#line 60 "../xml/XPathGrammar.y" Step::Axis axis; Step::NodeTest* nodeTest; diff --git a/src/3rdparty/webkit/WebCore/generated/tokenizer.cpp b/src/3rdparty/webkit/WebCore/generated/tokenizer.cpp index 8462f5152..1f1ff89b0 100644 --- a/src/3rdparty/webkit/WebCore/generated/tokenizer.cpp +++ b/src/3rdparty/webkit/WebCore/generated/tokenizer.cpp @@ -65,8 +65,8 @@ typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; #endif /* ! C99 */ -#define YY_NUM_RULES 68 -#define YY_END_OF_BUFFER 69 +#define YY_NUM_RULES 69 +#define YY_END_OF_BUFFER 70 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -74,60 +74,60 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[479] = +static yyconst flex_int16_t yy_accept[481] = { 0, - 0, 0, 0, 0, 0, 0, 69, 67, 2, 2, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 56, - 67, 67, 15, 15, 15, 67, 67, 67, 67, 66, - 15, 15, 15, 65, 15, 2, 0, 0, 0, 14, + 0, 0, 0, 0, 0, 0, 70, 68, 2, 2, + 68, 68, 68, 68, 68, 68, 68, 68, 68, 57, + 68, 68, 15, 15, 15, 68, 68, 68, 68, 67, + 15, 15, 15, 66, 15, 2, 0, 0, 0, 14, 0, 0, 0, 18, 18, 0, 8, 0, 0, 9, - 0, 0, 15, 15, 15, 0, 57, 0, 55, 0, - 0, 56, 54, 54, 54, 54, 54, 54, 54, 54, - 54, 16, 54, 54, 51, 54, 0, 54, 0, 0, - 35, 35, 35, 35, 35, 35, 35, 0, 62, 15, + 0, 0, 15, 15, 15, 0, 58, 0, 56, 0, + 0, 57, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 16, 55, 55, 52, 55, 0, 55, 0, 0, + 35, 35, 35, 35, 35, 35, 35, 0, 63, 15, 0, 0, 15, 15, 0, 15, 15, 15, 7, 6, 5, 15, 15, 15, 15, 0, 0, 0, 14, 0, 0, 0, 18, 18, 0, 18, 18, 0, 0, 14, - 0, 0, 4, 16, 15, 0, 0, 54, 0, 41, - 54, 37, 39, 54, 52, 43, 54, 42, 50, 54, - 45, 44, 40, 54, 54, 54, 54, 54, 0, 35, - 35, 0, 35, 35, 35, 35, 35, 35, 35, 35, - 15, 15, 16, 15, 15, 63, 63, 15, 15, 12, - 10, 15, 13, 0, 0, 0, 17, 17, 18, 18, - 18, 0, 0, 15, 0, 1, 54, 54, 46, 54, - 53, 16, 47, 54, 54, 54, 3, 35, 35, 35, - - 35, 35, 35, 35, 35, 35, 35, 15, 58, 0, - 63, 63, 63, 62, 15, 11, 0, 0, 0, 18, - 18, 18, 0, 15, 0, 0, 54, 48, 49, 54, - 54, 35, 35, 35, 35, 35, 35, 35, 20, 35, - 15, 64, 63, 63, 63, 63, 0, 0, 0, 0, - 60, 0, 15, 0, 0, 0, 18, 18, 18, 0, - 15, 54, 54, 38, 35, 35, 35, 35, 35, 21, - 35, 35, 15, 64, 63, 63, 63, 63, 63, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 60, 0, - 0, 15, 0, 0, 17, 17, 18, 18, 0, 15, - - 54, 54, 35, 35, 35, 35, 19, 35, 35, 15, - 64, 63, 63, 63, 63, 63, 63, 0, 59, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 15, 0, 0, 18, 18, 0, 15, 54, 54, 35, - 35, 23, 35, 35, 35, 15, 64, 63, 63, 63, - 63, 63, 63, 63, 0, 59, 0, 0, 0, 59, - 0, 0, 0, 0, 18, 15, 54, 35, 35, 35, - 35, 64, 0, 0, 0, 36, 15, 35, 35, 35, - 35, 35, 35, 22, 24, 64, 0, 0, 0, 15, - 35, 35, 35, 35, 35, 35, 0, 0, 0, 62, - - 35, 35, 35, 35, 35, 35, 35, 35, 0, 0, - 0, 0, 0, 0, 35, 35, 35, 35, 25, 35, - 35, 35, 0, 61, 0, 0, 0, 0, 26, 35, - 35, 35, 35, 27, 35, 0, 0, 0, 0, 31, - 35, 35, 35, 35, 0, 0, 0, 35, 35, 35, - 35, 0, 0, 35, 35, 29, 35, 0, 0, 35, - 33, 35, 30, 0, 0, 35, 28, 35, 0, 35, - 35, 35, 35, 34, 35, 35, 32, 0 + 0, 0, 4, 16, 15, 0, 0, 55, 0, 42, + 55, 37, 40, 55, 53, 44, 55, 43, 51, 55, + 46, 45, 41, 55, 55, 55, 55, 55, 55, 0, + 35, 35, 0, 35, 35, 35, 35, 35, 35, 35, + 35, 15, 15, 16, 15, 15, 64, 64, 15, 15, + 12, 10, 15, 13, 0, 0, 0, 17, 17, 18, + 18, 18, 0, 0, 15, 0, 1, 55, 55, 47, + 55, 54, 16, 48, 38, 55, 55, 55, 3, 35, + + 35, 35, 35, 35, 35, 35, 35, 35, 35, 15, + 59, 0, 64, 64, 64, 63, 15, 11, 0, 0, + 0, 18, 18, 18, 0, 15, 0, 0, 55, 49, + 50, 55, 55, 35, 35, 35, 35, 35, 35, 35, + 20, 35, 15, 65, 64, 64, 64, 64, 0, 0, + 0, 0, 61, 0, 15, 0, 0, 0, 18, 18, + 18, 0, 15, 55, 55, 39, 35, 35, 35, 35, + 35, 21, 35, 35, 15, 65, 64, 64, 64, 64, + 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 61, 0, 0, 15, 0, 0, 17, 17, 18, 18, + + 0, 15, 55, 55, 35, 35, 35, 35, 19, 35, + 35, 15, 65, 64, 64, 64, 64, 64, 64, 0, + 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 18, 18, 0, 15, 55, + 55, 35, 35, 23, 35, 35, 35, 15, 65, 64, + 64, 64, 64, 64, 64, 64, 0, 60, 0, 0, + 0, 60, 0, 0, 0, 0, 18, 15, 55, 35, + 35, 35, 35, 65, 0, 0, 0, 36, 15, 35, + 35, 35, 35, 35, 35, 22, 24, 65, 0, 0, + 0, 15, 35, 35, 35, 35, 35, 35, 0, 0, + + 0, 63, 35, 35, 35, 35, 35, 35, 35, 35, + 0, 0, 0, 0, 0, 0, 35, 35, 35, 35, + 25, 35, 35, 35, 0, 62, 0, 0, 0, 0, + 26, 35, 35, 35, 35, 27, 35, 0, 0, 0, + 0, 31, 35, 35, 35, 35, 0, 0, 0, 35, + 35, 35, 35, 0, 0, 35, 35, 29, 35, 0, + 0, 35, 33, 35, 30, 0, 0, 35, 28, 35, + 0, 35, 35, 35, 35, 34, 35, 35, 32, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -175,132 +175,134 @@ static yyconst flex_int32_t yy_meta[86] = 14, 6, 6, 6, 14 } ; -static yyconst flex_int16_t yy_base[550] = +static yyconst flex_int16_t yy_base[552] = { 0, - 0, 0, 64, 66, 54, 56, 1407, 6578, 93, 98, - 107, 83, 155, 1376, 77, 1350, 99, 1345, 1328, 207, - 1334, 275, 100, 108, 125, 326, 1315, 1313, 1312, 6578, + 0, 0, 64, 66, 54, 56, 1515, 6578, 93, 98, + 107, 83, 155, 1489, 77, 1480, 99, 1477, 1470, 207, + 1477, 275, 100, 108, 125, 326, 1442, 1441, 1438, 6578, 141, 110, 151, 6578, 105, 197, 295, 89, 107, 6578, - 387, 120, 0, 429, 1281, 471, 6578, 117, 532, 6578, - 1283, 269, 137, 176, 281, 574, 283, 1289, 1292, 1246, - 1257, 0, 1221, 249, 135, 282, 276, 153, 91, 169, - 299, 308, 318, 266, 1219, 320, 616, 102, 1246, 348, - 1209, 316, 127, 359, 346, 347, 375, 658, 6578, 208, - 700, 1241, 400, 409, 1220, 397, 327, 761, 6578, 6578, - - 6578, 411, 419, 414, 424, 248, 368, 355, 356, 822, - 883, 0, 1191, 925, 967, 1190, 1028, 381, 421, 464, - 1089, 1150, 6578, 214, 456, 1225, 312, 1151, 1192, 1142, - 442, 1139, 1134, 452, 1131, 1104, 458, 1082, 1060, 358, - 1046, 1028, 1027, 462, 453, 1000, 1253, 469, 1023, 463, - 986, 1295, 492, 486, 500, 484, 502, 513, 969, 1356, - 425, 1417, 1001, 545, 494, 193, 993, 543, 1459, 544, - 554, 558, 555, 508, 398, 1520, 0, 1562, 956, 1623, - 1684, 570, 1745, 563, 993, 6578, 948, 1806, 935, 520, - 921, 498, 914, 546, 1848, 564, 6578, 585, 913, 1909, - - 568, 576, 586, 606, 631, 640, 1951, 2012, 6578, 0, - 203, 924, 907, 694, 2054, 565, 543, 2115, 0, 2157, - 2218, 2279, 2340, 669, 912, 505, 2401, 856, 840, 2443, - 612, 615, 2504, 608, 557, 639, 682, 668, 839, 2546, - 2607, 0, 288, 863, 841, 819, 741, 794, 573, 418, - 6578, 2668, 2710, 620, 2771, 0, 2813, 2874, 2935, 2996, - 3057, 3131, 3173, 3234, 670, 3295, 718, 719, 729, 763, - 684, 3337, 3398, 0, 456, 782, 777, 760, 742, 829, - 649, 834, 3459, 572, 3520, 854, 894, 915, 920, 3581, - 3642, 3684, 593, 3745, 6578, 697, 3806, 3867, 3928, 3989, - - 4050, 4111, 730, 4172, 731, 683, 672, 759, 4214, 4275, - 0, 762, 682, 429, 417, 414, 411, 859, 6578, 650, - 838, 957, 4336, 4397, 607, 926, 988, 4458, 4519, 4580, - 1002, 672, 1010, 4622, 4664, 1042, 752, 4706, 4767, 756, - 4828, 376, 812, 847, 1069, 1033, 0, 387, 6578, 6578, - 6578, 6578, 6578, 6578, 1122, 924, 963, 4870, 1162, 1049, - 1050, 4912, 4973, 678, 1063, 850, 1074, 5005, 1103, 841, - 989, 0, 5062, 5104, 5146, 6578, 1066, 1080, 1081, 1084, - 1108, 1137, 877, 328, 273, 6578, 5188, 5230, 5272, 641, - 1140, 884, 916, 836, 1105, 1161, 5314, 5356, 1233, 1286, - - 1147, 1138, 919, 1206, 1165, 1186, 1141, 1207, 1291, 1263, - 1316, 1345, 1327, 5398, 1086, 1029, 1225, 1133, 258, 1247, - 1248, 1310, 1388, 6578, 1427, 5440, 1449, 5501, 242, 1311, - 1341, 1324, 1326, 173, 1317, 1454, 5562, 1480, 5604, 170, - 1061, 1328, 1355, 1372, 1552, 5646, 5688, 1351, 1374, 1389, - 1409, 5730, 5772, 1419, 1456, 154, 1453, 5814, 5856, 1457, - 112, 897, 793, 5898, 1557, 1418, 109, 1348, 1582, 1550, - 1477, 1481, 1485, 90, 1564, 1458, 39, 6578, 5959, 5964, - 5977, 5982, 5987, 5994, 6004, 6017, 296, 6022, 6032, 6045, - 6059, 651, 6064, 6074, 6079, 6089, 6099, 6103, 571, 6112, - - 6125, 6138, 6152, 6166, 6176, 6186, 6191, 6203, 657, 6217, - 758, 6222, 6234, 6247, 801, 6261, 859, 6266, 6278, 6291, - 6304, 6317, 6330, 1086, 6335, 6348, 1120, 6353, 6365, 6378, - 6391, 6404, 6417, 6430, 6435, 6448, 1216, 6453, 6465, 6478, - 6491, 6504, 6517, 1219, 1220, 6530, 6543, 6553, 6563 + 387, 120, 0, 429, 1371, 471, 6578, 117, 532, 6578, + 1380, 269, 137, 176, 281, 574, 283, 1383, 1367, 1297, + 1329, 0, 1294, 249, 135, 282, 276, 153, 91, 169, + 299, 308, 318, 342, 1293, 328, 616, 102, 1326, 273, + 1288, 346, 127, 326, 369, 370, 374, 658, 6578, 208, + 700, 1320, 357, 418, 1314, 399, 314, 761, 6578, 6578, + + 6578, 420, 421, 400, 398, 336, 461, 355, 367, 822, + 883, 0, 1284, 925, 967, 1283, 1028, 351, 423, 460, + 1089, 1150, 6578, 214, 465, 1320, 409, 1281, 1192, 1250, + 278, 1240, 1225, 427, 1222, 1221, 444, 1218, 1217, 416, + 1208, 1188, 1176, 451, 470, 467, 1173, 1253, 441, 1200, + 485, 1140, 1295, 490, 500, 505, 489, 502, 517, 1115, + 1356, 462, 1417, 1147, 554, 512, 193, 1133, 513, 1459, + 543, 544, 558, 559, 436, 501, 1520, 0, 1562, 1062, + 1623, 1684, 571, 1745, 563, 1092, 6578, 1053, 1806, 1000, + 568, 996, 529, 989, 988, 546, 1848, 589, 6578, 597, + + 955, 1909, 566, 534, 588, 587, 608, 631, 1951, 2012, + 6578, 0, 203, 963, 947, 691, 2054, 564, 551, 2115, + 0, 2157, 2218, 2279, 2340, 646, 935, 637, 2401, 896, + 884, 2443, 616, 660, 2504, 681, 388, 668, 626, 694, + 878, 2546, 2607, 0, 288, 884, 876, 869, 793, 854, + 611, 614, 6578, 2668, 2710, 634, 2771, 0, 2813, 2874, + 2935, 2996, 3057, 3131, 3173, 3234, 669, 3295, 692, 716, + 696, 823, 729, 3337, 3398, 0, 641, 842, 781, 753, + 730, 829, 653, 834, 3459, 658, 3520, 894, 915, 920, + 957, 3581, 3642, 3684, 557, 3745, 6578, 684, 3806, 3867, + + 3928, 3989, 4050, 4111, 727, 4172, 730, 682, 654, 697, + 4214, 4275, 0, 646, 590, 556, 553, 526, 496, 962, + 6578, 693, 734, 999, 4336, 4397, 690, 926, 1060, 4458, + 4519, 4580, 988, 711, 1013, 4622, 4664, 1042, 768, 4706, + 4767, 648, 4828, 454, 755, 757, 1074, 1033, 0, 489, + 6578, 6578, 6578, 6578, 6578, 6578, 1121, 838, 898, 4870, + 1182, 968, 1102, 4912, 4973, 729, 868, 785, 1066, 5005, + 1135, 873, 1020, 0, 5062, 5104, 5146, 6578, 830, 1050, + 1052, 1103, 1055, 1112, 836, 402, 386, 6578, 5188, 5230, + 5272, 755, 1137, 809, 916, 1091, 1123, 1161, 5314, 5356, + + 1263, 1242, 1162, 1047, 874, 1138, 1144, 1209, 1185, 1178, + 1285, 1295, 1316, 1327, 1388, 5398, 966, 1223, 1088, 921, + 379, 1172, 1241, 1252, 1361, 6578, 1428, 5440, 1449, 5501, + 368, 1314, 1315, 969, 1118, 173, 1342, 1454, 5562, 1491, + 5604, 170, 1343, 1325, 824, 1341, 1531, 5646, 5688, 1374, + 1375, 1427, 1407, 5730, 5772, 1453, 1456, 154, 1328, 5814, + 5856, 1457, 112, 1080, 811, 5898, 1552, 1350, 109, 1413, + 1557, 1370, 1409, 1451, 1455, 90, 1373, 1522, 39, 6578, + 5959, 5964, 5977, 5982, 5987, 5994, 6004, 6017, 283, 6022, + 6032, 6045, 6059, 306, 6064, 6074, 6079, 6089, 6099, 6103, + + 296, 6112, 6125, 6138, 6152, 6166, 6176, 6186, 6191, 6203, + 799, 6217, 920, 6222, 6234, 6247, 997, 6261, 1086, 6266, + 6278, 6291, 6304, 6317, 6330, 1087, 6335, 6348, 1206, 6353, + 6365, 6378, 6391, 6404, 6417, 6430, 6435, 6448, 1224, 6453, + 6465, 6478, 6491, 6504, 6517, 1227, 1292, 6530, 6543, 6553, + 6563 } ; -static yyconst flex_int16_t yy_def[550] = +static yyconst flex_int16_t yy_def[552] = { 0, - 478, 1, 1, 1, 1, 1, 478, 478, 478, 478, - 478, 479, 480, 478, 481, 478, 482, 478, 478, 478, - 478, 483, 484, 484, 484, 485, 478, 478, 478, 478, - 484, 484, 484, 478, 484, 478, 478, 478, 479, 478, - 486, 480, 487, 488, 488, 489, 478, 481, 490, 478, - 478, 478, 484, 484, 484, 485, 20, 491, 478, 492, - 478, 20, 493, 493, 493, 493, 493, 493, 493, 493, - 493, 493, 493, 493, 493, 493, 494, 493, 478, 483, - 495, 495, 495, 495, 495, 495, 495, 496, 478, 484, - 497, 478, 484, 484, 498, 484, 484, 484, 478, 478, - - 478, 484, 484, 484, 484, 478, 479, 479, 479, 479, - 486, 499, 488, 488, 500, 488, 114, 501, 501, 501, - 501, 502, 478, 478, 484, 503, 504, 493, 505, 493, - 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, - 493, 493, 493, 493, 493, 493, 493, 493, 478, 495, - 495, 506, 495, 495, 495, 495, 495, 495, 495, 495, - 484, 98, 478, 484, 484, 507, 478, 484, 98, 484, - 484, 484, 484, 478, 508, 508, 509, 114, 488, 114, - 114, 501, 501, 484, 510, 478, 493, 147, 493, 493, - 493, 493, 493, 493, 147, 493, 478, 495, 495, 160, - - 495, 495, 495, 495, 495, 495, 160, 98, 478, 511, - 512, 478, 478, 513, 98, 484, 478, 514, 515, 114, - 114, 114, 501, 484, 510, 516, 147, 493, 493, 147, - 493, 495, 160, 495, 495, 495, 495, 495, 495, 160, - 98, 517, 518, 478, 478, 478, 519, 519, 520, 521, - 478, 522, 98, 478, 523, 524, 525, 525, 258, 526, - 98, 147, 147, 147, 495, 160, 495, 495, 495, 495, - 495, 160, 98, 527, 528, 478, 478, 478, 478, 478, - 520, 478, 529, 530, 531, 532, 532, 532, 532, 532, - 533, 98, 478, 534, 478, 535, 535, 297, 536, 98, - - 147, 301, 495, 160, 495, 495, 495, 495, 160, 98, - 537, 538, 478, 478, 478, 478, 478, 478, 478, 539, - 539, 539, 539, 540, 541, 541, 541, 541, 542, 543, - 300, 478, 534, 297, 298, 536, 300, 301, 301, 495, - 160, 495, 495, 495, 495, 300, 544, 478, 478, 478, - 478, 478, 478, 478, 539, 539, 539, 323, 541, 541, - 541, 328, 543, 478, 335, 300, 339, 495, 495, 495, - 495, 545, 323, 328, 363, 478, 300, 495, 495, 495, - 495, 495, 495, 495, 495, 478, 323, 328, 363, 300, - 495, 495, 495, 495, 495, 495, 323, 328, 543, 546, - - 495, 495, 495, 495, 495, 495, 495, 495, 539, 541, - 546, 546, 547, 548, 495, 495, 495, 495, 495, 495, - 495, 495, 478, 478, 547, 549, 547, 547, 495, 495, - 495, 495, 495, 495, 495, 547, 428, 547, 428, 495, - 495, 495, 495, 495, 547, 437, 428, 495, 495, 495, - 495, 437, 428, 495, 495, 495, 495, 437, 428, 495, - 495, 495, 495, 437, 547, 495, 495, 495, 547, 495, - 495, 495, 495, 495, 495, 495, 495, 0, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478 + 480, 1, 1, 1, 1, 1, 480, 480, 480, 480, + 480, 481, 482, 480, 483, 480, 484, 480, 480, 480, + 480, 485, 486, 486, 486, 487, 480, 480, 480, 480, + 486, 486, 486, 480, 486, 480, 480, 480, 481, 480, + 488, 482, 489, 490, 490, 491, 480, 483, 492, 480, + 480, 480, 486, 486, 486, 487, 20, 493, 480, 494, + 480, 20, 495, 495, 495, 495, 495, 495, 495, 495, + 495, 495, 495, 495, 495, 495, 496, 495, 480, 485, + 497, 497, 497, 497, 497, 497, 497, 498, 480, 486, + 499, 480, 486, 486, 500, 486, 486, 486, 480, 480, + + 480, 486, 486, 486, 486, 480, 481, 481, 481, 481, + 488, 501, 490, 490, 502, 490, 114, 503, 503, 503, + 503, 504, 480, 480, 486, 505, 506, 495, 507, 495, + 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, + 495, 495, 495, 495, 495, 495, 495, 495, 495, 480, + 497, 497, 508, 497, 497, 497, 497, 497, 497, 497, + 497, 486, 98, 480, 486, 486, 509, 480, 486, 98, + 486, 486, 486, 486, 480, 510, 510, 511, 114, 490, + 114, 114, 503, 503, 486, 512, 480, 495, 148, 495, + 495, 495, 495, 495, 495, 495, 148, 495, 480, 497, + + 497, 161, 497, 497, 497, 497, 497, 497, 161, 98, + 480, 513, 514, 480, 480, 515, 98, 486, 480, 516, + 517, 114, 114, 114, 503, 486, 512, 518, 148, 495, + 495, 148, 495, 497, 161, 497, 497, 497, 497, 497, + 497, 161, 98, 519, 520, 480, 480, 480, 521, 521, + 522, 523, 480, 524, 98, 480, 525, 526, 527, 527, + 260, 528, 98, 148, 148, 148, 497, 161, 497, 497, + 497, 497, 497, 161, 98, 529, 530, 480, 480, 480, + 480, 480, 522, 480, 531, 532, 533, 534, 534, 534, + 534, 534, 535, 98, 480, 536, 480, 537, 537, 299, + + 538, 98, 148, 303, 497, 161, 497, 497, 497, 497, + 161, 98, 539, 540, 480, 480, 480, 480, 480, 480, + 480, 541, 541, 541, 541, 542, 543, 543, 543, 543, + 544, 545, 302, 480, 536, 299, 300, 538, 302, 303, + 303, 497, 161, 497, 497, 497, 497, 302, 546, 480, + 480, 480, 480, 480, 480, 480, 541, 541, 541, 325, + 543, 543, 543, 330, 545, 480, 337, 302, 341, 497, + 497, 497, 497, 547, 325, 330, 365, 480, 302, 497, + 497, 497, 497, 497, 497, 497, 497, 480, 325, 330, + 365, 302, 497, 497, 497, 497, 497, 497, 325, 330, + + 545, 548, 497, 497, 497, 497, 497, 497, 497, 497, + 541, 543, 548, 548, 549, 550, 497, 497, 497, 497, + 497, 497, 497, 497, 480, 480, 549, 551, 549, 549, + 497, 497, 497, 497, 497, 497, 497, 549, 430, 549, + 430, 497, 497, 497, 497, 497, 549, 439, 430, 497, + 497, 497, 497, 439, 430, 497, 497, 497, 497, 439, + 430, 497, 497, 497, 497, 439, 549, 497, 497, 497, + 549, 497, 497, 497, 497, 497, 497, 497, 497, 0, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480 } ; static yyconst flex_int16_t yy_nxt[6664] = @@ -314,730 +316,730 @@ static yyconst flex_int16_t yy_nxt[6664] = 23, 23, 23, 23, 23, 23, 23, 23, 24, 23, 23, 23, 23, 23, 23, 25, 23, 23, 23, 23, 23, 8, 28, 29, 23, 30, 35, 30, 35, 40, - 40, 31, 152, 31, 36, 36, 36, 36, 36, 36, + 40, 31, 153, 31, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 32, 33, 32, 33, 37, 37, 37, 37, 37, 89, 40, 35, 51, 35, 89, 52, 31, 89, 31, 89, 92, 93, 92, 93, 106, 40, - 49, 136, 32, 33, 32, 33, 41, 478, 89, 54, - 478, 95, 38, 152, 129, 34, 105, 34, 55, 94, - 89, 103, 56, 91, 89, 129, 106, 148, 91, 136, - 41, 91, 152, 91, 89, 152, 131, 54, 154, 96, + 49, 136, 32, 33, 32, 33, 41, 480, 89, 54, + 480, 95, 38, 153, 129, 34, 105, 34, 55, 94, + 89, 103, 56, 91, 89, 129, 106, 149, 91, 136, + 41, 91, 153, 91, 89, 153, 131, 54, 155, 96, 49, 38, 42, 46, 105, 43, 55, 94, 91, 103, - 152, 102, 44, 44, 44, 44, 44, 44, 129, 89, - 91, 104, 92, 93, 91, 131, 154, 96, 36, 36, + 153, 102, 44, 44, 44, 44, 44, 44, 129, 89, + 91, 104, 92, 93, 91, 131, 155, 96, 36, 36, - 36, 36, 36, 137, 91, 135, 129, 152, 46, 102, - 210, 44, 44, 44, 44, 44, 44, 59, 212, 104, - 210, 89, 129, 152, 60, 61, 152, 62, 244, 91, + 36, 36, 36, 137, 91, 135, 129, 153, 46, 102, + 212, 44, 44, 44, 44, 44, 44, 59, 214, 104, + 212, 89, 129, 153, 60, 61, 153, 62, 246, 91, 92, 92, 137, 135, 63, 63, 64, 65, 66, 63, 67, 68, 69, 63, 70, 63, 71, 72, 63, 73, 63, 74, 75, 76, 63, 63, 63, 63, 63, 63, 77, 91, 78, 63, 63, 64, 65, 66, 63, 67, 68, 69, 70, 63, 71, 72, 63, 73, 63, 74, 75, 76, 63, 63, 63, 63, 63, 63, 130, 52, - 174, 63, 80, 144, 89, 152, 37, 37, 37, 37, - - 37, 478, 129, 57, 82, 210, 112, 83, 112, 124, - 84, 152, 125, 276, 85, 86, 130, 87, 174, 129, - 134, 132, 144, 63, 92, 140, 152, 127, 88, 129, - 38, 186, 133, 82, 91, 129, 83, 124, 138, 84, - 89, 125, 85, 86, 139, 87, 98, 141, 134, 132, - 153, 63, 129, 98, 98, 98, 98, 98, 98, 38, - 133, 129, 40, 40, 142, 478, 138, 145, 143, 152, - 39, 129, 139, 129, 157, 40, 141, 156, 192, 153, - 91, 152, 98, 98, 98, 98, 98, 98, 39, 39, - 39, 107, 142, 40, 109, 145, 143, 150, 155, 152, - - 152, 88, 158, 157, 210, 40, 156, 110, 41, 41, - 89, 129, 152, 89, 110, 110, 110, 110, 110, 110, - 164, 41, 89, 478, 89, 150, 155, 89, 152, 152, - 282, 158, 89, 40, 49, 168, 354, 89, 89, 353, - 111, 170, 352, 110, 110, 110, 110, 110, 110, 114, - 91, 41, 172, 91, 351, 165, 114, 114, 114, 114, - 114, 114, 91, 168, 91, 171, 478, 91, 173, 89, - 170, 285, 91, 210, 49, 189, 40, 91, 91, 190, - 172, 313, 115, 165, 184, 114, 114, 114, 114, 114, - 114, 117, 193, 171, 198, 129, 173, 194, 117, 117, - - 117, 117, 117, 117, 189, 129, 129, 209, 190, 91, - 191, 129, 196, 184, 204, 129, 152, 49, 192, 201, - 226, 193, 129, 198, 186, 194, 202, 117, 117, 117, - 117, 117, 117, 48, 48, 48, 118, 152, 191, 152, - 196, 205, 203, 204, 120, 152, 206, 91, 201, 217, - 228, 129, 121, 152, 202, 152, 214, 89, 89, 121, - 121, 121, 121, 121, 121, 164, 152, 209, 89, 205, - 203, 89, 478, 129, 268, 206, 89, 217, 89, 228, - 282, 177, 40, 177, 282, 122, 229, 254, 121, 121, - 121, 121, 121, 121, 98, 231, 91, 91, 91, 129, - - 224, 98, 98, 98, 98, 98, 98, 91, 91, 216, - 152, 91, 234, 232, 229, 254, 91, 129, 91, 282, - 332, 152, 235, 49, 231, 285, 283, 236, 224, 152, - 98, 98, 98, 98, 98, 98, 147, 216, 152, 152, - 234, 237, 232, 147, 147, 147, 147, 147, 147, 332, - 235, 264, 265, 267, 400, 236, 282, 282, 90, 152, - 285, 152, 238, 63, 63, 129, 293, 219, 152, 219, - 237, 239, 147, 147, 147, 147, 147, 147, 160, 264, - 265, 267, 89, 269, 152, 160, 160, 160, 160, 160, - 160, 238, 152, 152, 293, 247, 247, 247, 247, 247, - - 239, 249, 283, 283, 261, 303, 250, 350, 251, 270, - 343, 269, 364, 271, 160, 160, 160, 160, 160, 160, - 162, 152, 91, 152, 376, 152, 308, 162, 162, 162, - 162, 162, 162, 261, 303, 152, 152, 152, 270, 343, - 364, 271, 247, 247, 247, 247, 247, 252, 249, 305, - 115, 306, 376, 250, 308, 251, 162, 162, 162, 162, - 162, 162, 97, 97, 97, 97, 97, 317, 242, 90, - 242, 152, 152, 368, 89, 307, 340, 342, 305, 210, - 306, 169, 152, 152, 152, 316, 344, 349, 169, 169, - 169, 169, 169, 169, 252, 280, 280, 280, 280, 280, - - 366, 478, 315, 307, 340, 342, 478, 314, 251, 152, - 468, 256, 152, 256, 91, 344, 152, 169, 169, 169, - 169, 169, 169, 108, 175, 175, 175, 108, 366, 40, - 280, 280, 280, 280, 280, 318, 318, 318, 318, 318, - 478, 370, 176, 251, 279, 282, 152, 252, 319, 176, - 176, 176, 176, 176, 176, 280, 280, 280, 280, 280, - 318, 318, 318, 318, 318, 152, 278, 90, 251, 274, - 370, 274, 384, 319, 405, 41, 371, 377, 176, 176, - 176, 176, 176, 176, 39, 39, 39, 107, 277, 152, - 109, 283, 152, 129, 152, 280, 280, 280, 280, 280, - - 152, 384, 405, 110, 396, 371, 377, 252, 251, 129, - 110, 110, 110, 110, 110, 110, 280, 280, 280, 280, - 280, 280, 280, 280, 280, 280, 478, 226, 478, 251, - 152, 282, 246, 396, 251, 403, 111, 152, 282, 110, - 110, 110, 110, 110, 110, 178, 404, 252, 467, 245, - 152, 417, 178, 178, 178, 178, 178, 178, 355, 318, - 318, 318, 355, 403, 282, 478, 152, 129, 252, 152, - 282, 356, 152, 252, 129, 404, 467, 283, 115, 285, - 417, 178, 178, 178, 178, 178, 178, 180, 129, 359, - 318, 318, 318, 359, 180, 180, 180, 180, 180, 180, - - 282, 129, 360, 97, 97, 97, 97, 97, 226, 115, - 283, 108, 175, 175, 175, 108, 283, 40, 213, 90, - 385, 163, 152, 180, 180, 180, 180, 180, 180, 116, - 116, 116, 116, 116, 161, 161, 161, 161, 161, 152, - 197, 285, 152, 119, 182, 182, 182, 119, 181, 385, - 90, 478, 478, 129, 40, 181, 181, 181, 181, 181, - 181, 282, 282, 41, 179, 179, 179, 179, 179, 430, - 159, 159, 159, 159, 159, 187, 187, 187, 187, 187, - 129, 129, 152, 90, 181, 181, 181, 181, 181, 181, - 119, 182, 182, 182, 119, 49, 295, 430, 295, 129, - - 448, 40, 285, 285, 199, 199, 199, 199, 199, 183, - 390, 391, 392, 129, 152, 393, 183, 183, 183, 183, - 183, 183, 152, 355, 318, 318, 318, 355, 448, 282, - 311, 429, 311, 152, 152, 129, 356, 152, 390, 152, - 391, 392, 49, 406, 393, 183, 183, 183, 183, 183, - 183, 48, 48, 48, 118, 394, 152, 129, 152, 429, - 432, 152, 120, 359, 318, 318, 318, 359, 395, 401, - 121, 406, 402, 416, 282, 283, 360, 121, 121, 121, - 121, 121, 121, 394, 129, 415, 152, 129, 421, 432, - 152, 152, 129, 152, 152, 129, 419, 395, 401, 407, - - 152, 402, 416, 122, 129, 408, 121, 121, 121, 121, - 121, 121, 188, 415, 152, 285, 421, 420, 152, 188, - 188, 188, 188, 188, 188, 419, 347, 407, 347, 372, - 386, 372, 386, 408, 286, 286, 286, 286, 286, 152, - 127, 418, 422, 115, 115, 167, 420, 251, 188, 188, - 188, 188, 188, 188, 146, 146, 146, 146, 146, 152, - 152, 163, 152, 149, 326, 361, 361, 361, 326, 431, - 418, 422, 129, 195, 129, 282, 433, 57, 152, 434, - 195, 195, 195, 195, 195, 195, 252, 411, 411, 411, - 411, 411, 321, 357, 357, 357, 321, 431, 282, 77, - - 152, 152, 59, 412, 127, 433, 129, 123, 434, 195, - 195, 195, 195, 195, 195, 200, 285, 411, 411, 411, - 411, 411, 200, 200, 200, 200, 200, 200, 423, 423, - 423, 423, 423, 412, 115, 101, 100, 435, 99, 414, - 79, 424, 440, 58, 283, 444, 478, 478, 478, 478, - 478, 200, 200, 200, 200, 200, 200, 159, 159, 159, - 159, 159, 478, 152, 152, 57, 435, 442, 441, 414, - 152, 440, 443, 50, 444, 449, 207, 152, 471, 152, - 426, 152, 454, 207, 207, 207, 207, 207, 207, 423, - 423, 423, 423, 423, 152, 442, 450, 441, 414, 47, - - 443, 152, 424, 449, 152, 455, 478, 471, 152, 152, - 451, 454, 207, 207, 207, 207, 207, 207, 161, 161, - 161, 161, 161, 478, 450, 152, 478, 152, 423, 423, - 423, 423, 423, 456, 455, 478, 460, 208, 451, 478, - 457, 424, 152, 478, 208, 208, 208, 208, 208, 208, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 478, 456, 152, 424, 461, 470, 478, 478, 424, 457, - 478, 152, 152, 208, 208, 208, 208, 208, 208, 215, - 426, 423, 423, 423, 423, 423, 215, 215, 215, 215, - 215, 215, 461, 470, 424, 478, 478, 478, 463, 478, - - 462, 466, 426, 477, 478, 478, 152, 426, 473, 152, - 152, 152, 474, 478, 475, 215, 215, 215, 215, 215, - 215, 108, 175, 175, 175, 108, 463, 40, 462, 466, - 152, 477, 478, 426, 152, 478, 478, 473, 152, 478, - 218, 474, 478, 475, 478, 478, 478, 218, 218, 218, - 218, 218, 218, 423, 423, 423, 423, 423, 438, 438, - 438, 438, 438, 478, 478, 478, 424, 478, 478, 478, - 478, 424, 478, 41, 478, 478, 218, 218, 218, 218, - 218, 218, 220, 445, 445, 445, 445, 445, 472, 220, - 220, 220, 220, 220, 220, 478, 424, 478, 478, 478, - - 478, 478, 476, 152, 478, 426, 478, 478, 478, 478, - 426, 478, 478, 478, 478, 478, 472, 152, 220, 220, - 220, 220, 220, 220, 179, 179, 179, 179, 179, 478, - 476, 478, 478, 478, 478, 426, 478, 478, 478, 478, - 478, 478, 478, 221, 478, 478, 478, 478, 478, 478, - 221, 221, 221, 221, 221, 221, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 221, - 221, 221, 221, 221, 221, 116, 116, 116, 116, 116, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 222, 478, 478, 478, 478, 478, - 478, 222, 222, 222, 222, 222, 222, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 222, 222, 222, 222, 222, 222, 119, 182, 182, 182, - 119, 478, 478, 478, 478, 478, 478, 40, 478, 478, - 478, 478, 478, 478, 478, 223, 478, 478, 478, 478, - 478, 478, 223, 223, 223, 223, 223, 223, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 49, 478, - - 478, 223, 223, 223, 223, 223, 223, 187, 187, 187, - 187, 187, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 227, 478, 478, 478, - 478, 478, 478, 227, 227, 227, 227, 227, 227, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 227, 227, 227, 227, 227, 227, 230, 478, - 478, 478, 478, 478, 478, 230, 230, 230, 230, 230, - 230, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 230, 230, 230, 230, 230, 230, - 199, 199, 199, 199, 199, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 233, - 478, 478, 478, 478, 478, 478, 233, 233, 233, 233, - 233, 233, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 233, 233, 233, 233, 233, - 233, 240, 478, 478, 478, 478, 478, 478, 240, 240, - 240, 240, 240, 240, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 240, 240, 240, - 240, 240, 240, 161, 161, 161, 161, 161, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 241, 478, 478, 478, 478, 478, 478, 241, - 241, 241, 241, 241, 241, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 241, 241, - 241, 241, 241, 241, 253, 478, 478, 478, 478, 478, - 478, 253, 253, 253, 253, 253, 253, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 253, 253, 253, 253, 253, 253, 108, 175, 175, 175, - 108, 478, 40, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 255, 478, 478, 478, 478, - 478, 478, 255, 255, 255, 255, 255, 255, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 41, 478, - 478, 255, 255, 255, 255, 255, 255, 257, 478, 478, - 478, 478, 478, 478, 257, 257, 257, 257, 257, 257, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 257, 257, 257, 257, 257, 257, 179, - 179, 179, 179, 179, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 258, 478, - 478, 478, 478, 478, 478, 258, 258, 258, 258, 258, - 258, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 258, 258, 258, 258, 258, 258, - 116, 116, 116, 116, 116, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 259, - - 478, 478, 478, 478, 478, 478, 259, 259, 259, 259, - 259, 259, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 259, 259, 259, 259, 259, - 259, 119, 182, 182, 182, 119, 478, 478, 478, 478, - 478, 478, 40, 478, 478, 478, 478, 478, 478, 478, - 260, 478, 478, 478, 478, 478, 478, 260, 260, 260, - 260, 260, 260, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 49, 478, 478, 260, 260, 260, 260, - - 260, 260, 187, 187, 187, 187, 187, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 262, 478, 478, 478, 478, 478, 478, 262, 262, - 262, 262, 262, 262, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 262, 262, 262, - 262, 262, 262, 263, 478, 478, 478, 478, 478, 478, - 263, 263, 263, 263, 263, 263, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 263, - - 263, 263, 263, 263, 263, 199, 199, 199, 199, 199, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 266, 478, 478, 478, 478, 478, - 478, 266, 266, 266, 266, 266, 266, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 266, 266, 266, 266, 266, 266, 272, 478, 478, 478, - 478, 478, 478, 272, 272, 272, 272, 272, 272, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 272, 272, 272, 272, 272, 272, 161, 161, - 161, 161, 161, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 273, 478, 478, - 478, 478, 478, 478, 273, 273, 273, 273, 273, 273, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 273, 273, 273, 273, 273, 273, 280, - 280, 280, 280, 286, 478, 288, 478, 478, 478, 478, - 288, 288, 289, 478, 478, 478, 478, 478, 290, 478, - 478, 478, 478, 478, 478, 290, 290, 290, 290, 290, - - 290, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 291, 478, 478, 290, 290, 290, 290, 290, 290, - 292, 478, 478, 478, 478, 478, 478, 292, 292, 292, - 292, 292, 292, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 292, 292, 292, 292, - 292, 292, 108, 175, 175, 175, 108, 478, 40, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 294, 478, 478, 478, 478, 478, 478, 294, 294, - - 294, 294, 294, 294, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 41, 478, 478, 294, 294, 294, - 294, 294, 294, 296, 478, 478, 478, 478, 478, 478, - 296, 296, 296, 296, 296, 296, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 115, 478, 478, 296, - 296, 296, 296, 296, 296, 179, 179, 179, 179, 179, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 297, 478, 478, 478, 478, 478, - - 478, 297, 297, 297, 297, 297, 297, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 115, 478, 478, - 297, 297, 297, 297, 297, 297, 116, 116, 116, 116, - 116, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 298, 478, 478, 478, 478, - 478, 478, 298, 298, 298, 298, 298, 298, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 298, 298, 298, 298, 298, 298, 119, 182, 182, - - 182, 119, 478, 478, 478, 478, 478, 478, 40, 478, - 478, 478, 478, 478, 478, 478, 299, 478, 478, 478, - 478, 478, 478, 299, 299, 299, 299, 299, 299, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 49, - 478, 478, 299, 299, 299, 299, 299, 299, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 90, 478, 478, - 478, 478, 478, 478, 90, 90, 90, 90, 90, 90, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 300, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 90, 90, 90, 90, 90, 90, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 300, 187, 187, 187, 187, 187, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 301, 478, 478, 478, 478, 478, 478, 301, 301, - 301, 301, 301, 301, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 301, 301, 301, - 301, 301, 301, 302, 478, 478, 478, 478, 478, 478, - - 302, 302, 302, 302, 302, 302, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 302, - 302, 302, 302, 302, 302, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 128, 478, 478, 478, 478, 478, - 478, 128, 128, 128, 128, 128, 128, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 128, 128, 128, 128, 128, 128, 199, 199, 199, 199, - - 199, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 304, 478, 478, 478, 478, - 478, 478, 304, 304, 304, 304, 304, 304, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 304, 304, 304, 304, 304, 304, 309, 478, 478, - 478, 478, 478, 478, 309, 309, 309, 309, 309, 309, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 309, 309, 309, 309, 309, 309, 161, - - 161, 161, 161, 161, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 310, 478, - 478, 478, 478, 478, 478, 310, 310, 310, 310, 310, - 310, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 310, 310, 310, 310, 310, 310, - 281, 281, 281, 320, 478, 478, 322, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 323, - 478, 478, 478, 478, 478, 478, 323, 323, 323, 323, - 323, 323, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 324, 478, 478, 323, 323, 323, 323, 323, - 323, 284, 284, 284, 325, 478, 478, 478, 478, 478, - 478, 478, 327, 478, 478, 478, 478, 478, 478, 478, - 328, 478, 478, 478, 478, 478, 478, 328, 328, 328, - 328, 328, 328, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 329, 478, 478, 328, 328, 328, 328, - 328, 328, 286, 286, 286, 286, 286, 478, 478, 478, - 478, 478, 478, 478, 478, 251, 478, 478, 478, 478, - - 478, 330, 478, 478, 478, 478, 478, 478, 330, 330, - 330, 330, 330, 330, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 252, 478, 478, 330, 330, 330, - 330, 330, 330, 280, 280, 280, 280, 286, 478, 288, - 478, 478, 478, 478, 288, 288, 289, 478, 478, 478, - 478, 478, 290, 478, 478, 478, 478, 478, 478, 290, - 290, 290, 290, 290, 290, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 291, 478, 478, 290, 290, - - 290, 290, 290, 290, 331, 478, 478, 478, 478, 478, - 478, 331, 331, 331, 331, 331, 331, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 331, 331, 331, 331, 331, 331, 108, 175, 175, 175, - 108, 478, 40, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 333, 478, 478, 478, 478, - 478, 478, 333, 333, 333, 333, 333, 333, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 41, 478, - - 478, 333, 333, 333, 333, 333, 333, 179, 179, 179, - 179, 179, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 334, 478, 478, 478, - 478, 478, 478, 334, 334, 334, 334, 334, 334, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 115, - 478, 478, 334, 334, 334, 334, 334, 334, 116, 116, - 116, 116, 116, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 335, 478, 478, - 478, 478, 478, 478, 335, 335, 335, 335, 335, 335, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 335, 335, 335, 335, 335, 335, 119, - 182, 182, 182, 119, 478, 478, 478, 478, 478, 478, - 40, 478, 478, 478, 478, 478, 478, 478, 336, 478, - 478, 478, 478, 478, 478, 336, 336, 336, 336, 336, - 336, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 49, 478, 478, 336, 336, 336, 336, 336, 336, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 337, 478, 478, 90, - 478, 478, 478, 478, 478, 478, 90, 90, 90, 90, - 90, 90, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 90, 90, 90, 90, 90, - 90, 187, 187, 187, 187, 187, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 338, 478, 478, 478, 478, 478, 478, 338, 338, 338, - 338, 338, 338, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 338, 338, 338, 338, - 338, 338, 146, 146, 146, 146, 146, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 339, 478, 478, 478, 478, 478, 478, 339, 339, - 339, 339, 339, 339, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 339, 339, 339, - 339, 339, 339, 199, 199, 199, 199, 199, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 341, 478, 478, 478, 478, 478, 478, 341, - - 341, 341, 341, 341, 341, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 341, 341, - 341, 341, 341, 341, 345, 478, 478, 478, 478, 478, - 478, 345, 345, 345, 345, 345, 345, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 345, 345, 345, 345, 345, 345, 161, 161, 161, 161, - 161, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 346, 478, 478, 478, 478, - - 478, 478, 346, 346, 346, 346, 346, 346, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 346, 346, 346, 346, 346, 346, 321, 357, 357, - 357, 321, 478, 282, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 358, 478, 478, 478, - 478, 478, 478, 358, 358, 358, 358, 358, 358, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 283, - 478, 478, 358, 358, 358, 358, 358, 358, 281, 281, - - 281, 320, 478, 478, 322, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 323, 478, 478, - 478, 478, 478, 478, 323, 323, 323, 323, 323, 323, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 324, 478, 478, 323, 323, 323, 323, 323, 323, 326, - 361, 361, 361, 326, 478, 478, 478, 478, 478, 478, - 282, 478, 478, 478, 478, 478, 478, 478, 362, 478, - 478, 478, 478, 478, 478, 362, 362, 362, 362, 362, - 362, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 285, 478, 478, 362, 362, 362, 362, 362, 362, - 284, 284, 284, 325, 478, 478, 478, 478, 478, 478, - 478, 327, 478, 478, 478, 478, 478, 478, 478, 328, - 478, 478, 478, 478, 478, 478, 328, 328, 328, 328, - 328, 328, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 329, 478, 478, 328, 328, 328, 328, 328, - 328, 286, 286, 286, 286, 286, 478, 478, 478, 478, - 478, 478, 478, 478, 251, 478, 478, 478, 478, 478, - - 363, 478, 478, 478, 478, 478, 478, 363, 363, 363, - 363, 363, 363, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 252, 478, 478, 363, 363, 363, 363, - 363, 363, 365, 478, 478, 478, 478, 478, 478, 365, - 365, 365, 365, 365, 365, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 365, 365, - 365, 365, 365, 365, 113, 478, 478, 478, 478, 478, - 478, 113, 113, 113, 113, 113, 113, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 113, 113, 113, 113, 113, 113, 367, 478, 478, 478, - 478, 478, 478, 367, 367, 367, 367, 367, 367, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 367, 367, 367, 367, 367, 367, 146, 146, - 146, 146, 146, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 128, 478, 478, - 478, 478, 478, 478, 128, 128, 128, 128, 128, 128, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 128, 128, 128, 128, 128, 128, 199, - 199, 199, 199, 199, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 369, 478, - 478, 478, 478, 478, 478, 369, 369, 369, 369, 369, - 369, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 369, 369, 369, 369, 369, 369, - 373, 478, 478, 478, 478, 478, 478, 373, 373, 373, - - 373, 373, 373, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 373, 373, 373, 373, - 373, 373, 374, 478, 478, 478, 478, 478, 478, 374, - 374, 374, 374, 374, 374, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 374, 374, - 374, 374, 374, 374, 286, 286, 286, 286, 286, 478, - 478, 478, 478, 478, 478, 478, 478, 251, 478, 478, - 478, 478, 478, 375, 478, 478, 478, 478, 478, 478, - - 375, 375, 375, 375, 375, 375, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 252, 478, 478, 375, - 375, 375, 375, 375, 375, 378, 478, 478, 478, 478, - 478, 478, 379, 478, 380, 478, 478, 478, 478, 381, - 382, 478, 478, 383, 478, 478, 478, 478, 152, 478, - 478, 478, 478, 478, 378, 478, 478, 478, 478, 478, - 379, 478, 380, 478, 478, 478, 478, 381, 382, 478, - 478, 383, 387, 478, 478, 478, 478, 478, 478, 387, - 387, 387, 387, 387, 387, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 387, 387, - 387, 387, 387, 387, 388, 478, 478, 478, 478, 478, - 478, 388, 388, 388, 388, 388, 388, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 388, 388, 388, 388, 388, 388, 389, 478, 478, 478, - 478, 478, 478, 389, 389, 389, 389, 389, 389, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 389, 389, 389, 389, 389, 389, 397, 478, - 478, 478, 478, 478, 478, 397, 397, 397, 397, 397, - 397, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 397, 397, 397, 397, 397, 397, - 398, 478, 478, 478, 478, 478, 478, 398, 398, 398, - 398, 398, 398, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 398, 398, 398, 398, - 398, 398, 399, 478, 478, 478, 478, 478, 478, 399, - - 399, 399, 399, 399, 399, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 399, 399, - 399, 399, 399, 399, 409, 478, 478, 478, 478, 478, - 478, 409, 409, 409, 409, 409, 409, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 409, 409, 409, 409, 409, 409, 410, 478, 478, 478, - 478, 478, 478, 410, 410, 410, 410, 410, 410, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 410, 410, 410, 410, 410, 410, 428, 478, - 478, 478, 478, 478, 478, 428, 428, 428, 428, 428, - 428, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 428, 428, 428, 428, 428, 428, - 437, 478, 478, 478, 478, 478, 478, 437, 437, 437, - 437, 437, 437, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 437, 437, 437, 437, - - 437, 437, 438, 438, 438, 438, 438, 478, 478, 478, - 478, 478, 478, 478, 478, 424, 478, 478, 478, 478, - 478, 439, 478, 478, 478, 478, 478, 478, 439, 439, - 439, 439, 439, 439, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 426, 478, 478, 439, 439, 439, - 439, 439, 439, 445, 445, 445, 445, 445, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 446, 478, 478, 478, 478, 478, 478, 446, - 446, 446, 446, 446, 446, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 446, 446, - 446, 446, 446, 446, 447, 478, 478, 478, 478, 478, - 478, 447, 447, 447, 447, 447, 447, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 447, 447, 447, 447, 447, 447, 452, 478, 478, 478, - 478, 478, 478, 452, 452, 452, 452, 452, 452, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 452, 452, 452, 452, 452, 452, 453, 478, - 478, 478, 478, 478, 478, 453, 453, 453, 453, 453, - 453, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 453, 453, 453, 453, 453, 453, - 458, 478, 478, 478, 478, 478, 478, 458, 458, 458, - 458, 458, 458, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 458, 458, 458, 458, - 458, 458, 459, 478, 478, 478, 478, 478, 478, 459, - - 459, 459, 459, 459, 459, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 459, 459, - 459, 459, 459, 459, 464, 478, 478, 478, 478, 478, - 478, 464, 464, 464, 464, 464, 464, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 464, 464, 464, 464, 464, 464, 465, 478, 478, 478, - 478, 478, 478, 465, 465, 465, 465, 465, 465, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 465, 465, 465, 465, 465, 465, 469, 478, - 478, 478, 478, 478, 478, 469, 469, 469, 469, 469, - 469, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 469, 469, 469, 469, 469, 469, - 39, 478, 478, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 45, 45, 478, 45, 45, 48, 478, - 478, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 53, 53, 478, 53, 53, 81, 478, 478, 81, - - 81, 90, 478, 90, 90, 478, 90, 90, 97, 97, + 480, 63, 80, 112, 89, 112, 37, 37, 37, 37, + + 37, 480, 129, 57, 82, 212, 178, 83, 178, 124, + 84, 190, 125, 278, 85, 86, 130, 87, 63, 63, + 134, 132, 151, 63, 92, 140, 88, 89, 88, 129, + 38, 129, 133, 82, 91, 129, 83, 124, 138, 84, + 190, 125, 85, 86, 139, 87, 98, 141, 134, 132, + 151, 63, 129, 98, 98, 98, 98, 98, 98, 38, + 133, 129, 40, 40, 142, 156, 138, 91, 143, 144, + 89, 129, 139, 145, 40, 146, 141, 165, 175, 153, + 154, 129, 98, 98, 98, 98, 98, 98, 39, 39, + 39, 107, 142, 156, 109, 129, 143, 158, 144, 153, + + 157, 159, 145, 146, 49, 270, 175, 110, 41, 154, + 91, 89, 89, 89, 110, 110, 110, 110, 110, 110, + 41, 153, 153, 153, 127, 480, 158, 153, 187, 157, + 159, 89, 153, 89, 89, 40, 193, 169, 173, 153, + 111, 153, 174, 110, 110, 110, 110, 110, 110, 114, + 171, 91, 91, 91, 191, 153, 114, 114, 114, 114, + 114, 114, 480, 39, 166, 169, 173, 172, 40, 129, + 174, 91, 40, 91, 91, 89, 49, 219, 89, 171, + 129, 194, 115, 191, 198, 114, 114, 114, 114, 114, + 114, 117, 166, 185, 129, 172, 192, 129, 117, 117, + + 117, 117, 117, 117, 129, 219, 212, 153, 40, 195, + 194, 196, 198, 49, 41, 91, 200, 203, 91, 206, + 129, 356, 185, 129, 192, 211, 216, 117, 117, 117, + 117, 117, 117, 48, 48, 48, 118, 195, 153, 196, + 204, 207, 153, 153, 120, 200, 203, 205, 206, 193, + 208, 355, 121, 153, 41, 153, 89, 211, 153, 121, + 121, 121, 121, 121, 121, 91, 91, 89, 204, 207, + 153, 89, 89, 480, 165, 205, 89, 89, 354, 208, + 237, 353, 129, 40, 334, 122, 231, 153, 121, 121, + 121, 121, 121, 121, 98, 256, 91, 91, 230, 129, + + 226, 98, 98, 98, 98, 98, 98, 91, 237, 218, + 236, 91, 91, 334, 231, 352, 91, 91, 284, 153, + 233, 129, 239, 256, 49, 234, 284, 230, 226, 238, + 98, 98, 98, 98, 98, 98, 148, 218, 236, 240, + 153, 153, 129, 148, 148, 148, 148, 148, 148, 233, + 153, 239, 228, 272, 234, 266, 187, 238, 212, 89, + 284, 153, 241, 212, 285, 370, 315, 287, 240, 129, + 284, 351, 148, 148, 148, 148, 148, 148, 161, 153, + 295, 263, 272, 266, 153, 161, 161, 161, 161, 161, + 161, 241, 249, 249, 249, 249, 249, 267, 251, 91, + + 284, 153, 284, 252, 305, 253, 285, 153, 295, 345, + 263, 287, 271, 153, 161, 161, 161, 161, 161, 161, + 163, 153, 153, 307, 346, 267, 269, 163, 163, 163, + 163, 163, 163, 305, 153, 153, 480, 115, 345, 273, + 271, 284, 309, 287, 254, 153, 285, 153, 308, 153, + 153, 366, 307, 346, 269, 319, 163, 163, 163, 163, + 163, 163, 97, 97, 97, 97, 97, 273, 402, 153, + 309, 310, 90, 342, 89, 378, 344, 308, 318, 366, + 153, 170, 153, 153, 372, 90, 373, 285, 170, 170, + 170, 170, 170, 170, 249, 249, 249, 249, 249, 310, + + 251, 342, 90, 378, 344, 252, 317, 253, 153, 221, + 153, 221, 379, 372, 91, 373, 368, 170, 170, 170, + 170, 170, 170, 108, 176, 176, 176, 108, 470, 40, + 282, 282, 282, 282, 282, 320, 320, 320, 320, 320, + 480, 379, 177, 253, 368, 284, 254, 90, 321, 177, + 177, 177, 177, 177, 177, 282, 282, 282, 282, 282, + 405, 480, 153, 398, 153, 452, 480, 316, 253, 180, + 180, 180, 180, 180, 392, 41, 153, 153, 177, 177, + 177, 177, 177, 177, 39, 39, 39, 107, 405, 153, + 109, 285, 398, 452, 281, 282, 282, 282, 282, 282, + + 480, 280, 392, 110, 386, 284, 419, 254, 253, 279, + 110, 110, 110, 110, 110, 110, 282, 282, 282, 282, + 282, 282, 282, 282, 282, 282, 153, 153, 480, 253, + 244, 153, 244, 386, 253, 419, 111, 129, 284, 110, + 110, 110, 110, 110, 110, 179, 406, 254, 434, 129, + 228, 285, 179, 179, 179, 179, 179, 179, 282, 282, + 282, 282, 282, 320, 320, 320, 320, 320, 254, 153, + 480, 253, 248, 254, 153, 406, 321, 434, 115, 287, + 284, 179, 179, 179, 179, 179, 179, 181, 247, 97, + 97, 97, 97, 97, 181, 181, 181, 181, 181, 181, + + 357, 320, 320, 320, 357, 90, 284, 258, 153, 258, + 254, 431, 444, 358, 108, 176, 176, 176, 108, 153, + 40, 287, 153, 181, 181, 181, 181, 181, 181, 116, + 116, 116, 116, 116, 162, 162, 162, 162, 162, 431, + 444, 129, 129, 119, 183, 183, 183, 119, 182, 129, + 90, 387, 285, 129, 40, 182, 182, 182, 182, 182, + 182, 361, 320, 320, 320, 361, 41, 188, 188, 188, + 188, 188, 284, 153, 362, 160, 160, 160, 160, 160, + 387, 393, 418, 394, 182, 182, 182, 182, 182, 182, + 119, 183, 183, 183, 119, 49, 276, 297, 276, 297, + + 153, 40, 396, 153, 480, 153, 129, 228, 153, 184, + 393, 418, 394, 287, 284, 115, 184, 184, 184, 184, + 184, 184, 357, 320, 320, 320, 357, 153, 284, 407, + 396, 469, 433, 153, 395, 358, 201, 201, 201, 201, + 201, 153, 49, 397, 153, 184, 184, 184, 184, 184, + 184, 48, 48, 48, 118, 287, 153, 407, 215, 469, + 433, 408, 120, 395, 445, 153, 403, 164, 153, 404, + 121, 153, 397, 420, 285, 421, 153, 121, 121, 121, + 121, 121, 121, 361, 320, 320, 320, 361, 153, 408, + 153, 153, 445, 153, 284, 403, 362, 153, 404, 409, + + 417, 435, 420, 122, 421, 410, 121, 121, 121, 121, + 121, 121, 189, 424, 153, 153, 313, 199, 313, 189, + 189, 189, 189, 189, 189, 153, 129, 409, 417, 129, + 435, 153, 423, 410, 349, 287, 349, 374, 153, 374, + 422, 129, 424, 413, 413, 413, 413, 413, 189, 189, + 189, 189, 189, 189, 147, 147, 147, 147, 147, 414, + 423, 129, 153, 432, 288, 288, 288, 288, 288, 422, + 129, 129, 436, 197, 129, 129, 153, 253, 129, 437, + 197, 197, 197, 197, 197, 197, 323, 359, 359, 359, + 323, 432, 284, 129, 153, 416, 328, 363, 363, 363, + + 328, 436, 388, 129, 388, 153, 129, 284, 437, 197, + 197, 197, 197, 197, 197, 202, 254, 413, 413, 413, + 413, 413, 202, 202, 202, 202, 202, 202, 480, 480, + 480, 480, 480, 414, 129, 127, 115, 115, 285, 168, + 164, 153, 443, 150, 480, 442, 129, 129, 287, 57, + 77, 202, 202, 202, 202, 202, 202, 160, 160, 160, + 160, 160, 425, 425, 425, 425, 425, 153, 153, 416, + 446, 443, 451, 465, 442, 426, 209, 59, 153, 453, + 416, 153, 450, 209, 209, 209, 209, 209, 209, 425, + 425, 425, 425, 425, 153, 153, 153, 472, 127, 446, + + 451, 465, 426, 153, 123, 456, 457, 453, 474, 153, + 450, 478, 209, 209, 209, 209, 209, 209, 162, 162, + 162, 162, 162, 153, 115, 472, 153, 153, 153, 425, + 425, 425, 425, 425, 456, 457, 474, 210, 459, 478, + 475, 428, 426, 473, 210, 210, 210, 210, 210, 210, + 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, + 153, 101, 153, 426, 100, 99, 153, 459, 426, 475, + 462, 458, 473, 210, 210, 210, 210, 210, 210, 217, + 153, 428, 476, 79, 477, 58, 217, 217, 217, 217, + 217, 217, 425, 425, 425, 425, 425, 57, 463, 458, + + 464, 468, 428, 50, 153, 426, 153, 428, 153, 153, + 153, 476, 47, 477, 480, 217, 217, 217, 217, 217, + 217, 108, 176, 176, 176, 108, 463, 40, 464, 468, + 480, 480, 425, 425, 425, 425, 425, 480, 480, 480, + 220, 480, 480, 480, 428, 426, 480, 220, 220, 220, + 220, 220, 220, 440, 440, 440, 440, 440, 447, 447, + 447, 447, 447, 480, 480, 480, 426, 479, 480, 480, + 480, 426, 480, 41, 480, 153, 220, 220, 220, 220, + 220, 220, 222, 480, 428, 480, 480, 480, 480, 222, + 222, 222, 222, 222, 222, 479, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 428, 480, 480, 480, 480, + 428, 480, 480, 480, 480, 480, 480, 480, 222, 222, + 222, 222, 222, 222, 180, 180, 180, 180, 180, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 223, 480, 480, 480, 480, 480, 480, + 223, 223, 223, 223, 223, 223, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 223, + 223, 223, 223, 223, 223, 116, 116, 116, 116, 116, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 224, 480, 480, 480, 480, 480, + 480, 224, 224, 224, 224, 224, 224, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 224, 224, 224, 224, 224, 224, 119, 183, 183, 183, + 119, 480, 480, 480, 480, 480, 480, 40, 480, 480, + 480, 480, 480, 480, 480, 225, 480, 480, 480, 480, + 480, 480, 225, 225, 225, 225, 225, 225, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 49, 480, + + 480, 225, 225, 225, 225, 225, 225, 188, 188, 188, + 188, 188, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 229, 480, 480, 480, + 480, 480, 480, 229, 229, 229, 229, 229, 229, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 229, 229, 229, 229, 229, 229, 232, 480, + 480, 480, 480, 480, 480, 232, 232, 232, 232, 232, + 232, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 232, 232, 232, 232, 232, 232, + 201, 201, 201, 201, 201, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 235, + 480, 480, 480, 480, 480, 480, 235, 235, 235, 235, + 235, 235, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 235, 235, 235, 235, 235, + 235, 242, 480, 480, 480, 480, 480, 480, 242, 242, + 242, 242, 242, 242, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 480, 242, 242, 242, + 242, 242, 242, 162, 162, 162, 162, 162, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 243, 480, 480, 480, 480, 480, 480, 243, + 243, 243, 243, 243, 243, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 243, 243, + 243, 243, 243, 243, 255, 480, 480, 480, 480, 480, + 480, 255, 255, 255, 255, 255, 255, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 255, 255, 255, 255, 255, 255, 108, 176, 176, 176, + 108, 480, 40, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 257, 480, 480, 480, 480, + 480, 480, 257, 257, 257, 257, 257, 257, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 41, 480, + 480, 257, 257, 257, 257, 257, 257, 259, 480, 480, + 480, 480, 480, 480, 259, 259, 259, 259, 259, 259, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 259, 259, 259, 259, 259, 259, 180, + 180, 180, 180, 180, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 260, 480, + 480, 480, 480, 480, 480, 260, 260, 260, 260, 260, + 260, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 260, 260, 260, 260, 260, 260, + 116, 116, 116, 116, 116, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 261, + + 480, 480, 480, 480, 480, 480, 261, 261, 261, 261, + 261, 261, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 261, 261, 261, 261, 261, + 261, 119, 183, 183, 183, 119, 480, 480, 480, 480, + 480, 480, 40, 480, 480, 480, 480, 480, 480, 480, + 262, 480, 480, 480, 480, 480, 480, 262, 262, 262, + 262, 262, 262, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 49, 480, 480, 262, 262, 262, 262, + + 262, 262, 188, 188, 188, 188, 188, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 264, 480, 480, 480, 480, 480, 480, 264, 264, + 264, 264, 264, 264, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 264, 264, 264, + 264, 264, 264, 265, 480, 480, 480, 480, 480, 480, + 265, 265, 265, 265, 265, 265, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 265, + + 265, 265, 265, 265, 265, 201, 201, 201, 201, 201, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 268, 480, 480, 480, 480, 480, + 480, 268, 268, 268, 268, 268, 268, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 268, 268, 268, 268, 268, 268, 274, 480, 480, 480, + 480, 480, 480, 274, 274, 274, 274, 274, 274, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 274, 274, 274, 274, 274, 274, 162, 162, + 162, 162, 162, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 275, 480, 480, + 480, 480, 480, 480, 275, 275, 275, 275, 275, 275, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 275, 275, 275, 275, 275, 275, 282, + 282, 282, 282, 288, 480, 290, 480, 480, 480, 480, + 290, 290, 291, 480, 480, 480, 480, 480, 292, 480, + 480, 480, 480, 480, 480, 292, 292, 292, 292, 292, + + 292, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 293, 480, 480, 292, 292, 292, 292, 292, 292, + 294, 480, 480, 480, 480, 480, 480, 294, 294, 294, + 294, 294, 294, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 294, 294, 294, 294, + 294, 294, 108, 176, 176, 176, 108, 480, 40, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 296, 480, 480, 480, 480, 480, 480, 296, 296, + + 296, 296, 296, 296, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 41, 480, 480, 296, 296, 296, + 296, 296, 296, 298, 480, 480, 480, 480, 480, 480, + 298, 298, 298, 298, 298, 298, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 115, 480, 480, 298, + 298, 298, 298, 298, 298, 180, 180, 180, 180, 180, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 299, 480, 480, 480, 480, 480, + + 480, 299, 299, 299, 299, 299, 299, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 115, 480, 480, + 299, 299, 299, 299, 299, 299, 116, 116, 116, 116, + 116, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 300, 480, 480, 480, 480, + 480, 480, 300, 300, 300, 300, 300, 300, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 300, 300, 300, 300, 300, 300, 119, 183, 183, + + 183, 119, 480, 480, 480, 480, 480, 480, 40, 480, + 480, 480, 480, 480, 480, 480, 301, 480, 480, 480, + 480, 480, 480, 301, 301, 301, 301, 301, 301, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 49, + 480, 480, 301, 301, 301, 301, 301, 301, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 90, 480, 480, + 480, 480, 480, 480, 90, 90, 90, 90, 90, 90, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 302, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 90, 90, 90, 90, 90, 90, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 302, 188, 188, 188, 188, 188, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 303, 480, 480, 480, 480, 480, 480, 303, 303, + 303, 303, 303, 303, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 303, 303, 303, + 303, 303, 303, 304, 480, 480, 480, 480, 480, 480, + + 304, 304, 304, 304, 304, 304, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 304, + 304, 304, 304, 304, 304, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 128, 480, 480, 480, 480, 480, + 480, 128, 128, 128, 128, 128, 128, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 128, 128, 128, 128, 128, 128, 201, 201, 201, 201, + + 201, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 306, 480, 480, 480, 480, + 480, 480, 306, 306, 306, 306, 306, 306, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 306, 306, 306, 306, 306, 306, 311, 480, 480, + 480, 480, 480, 480, 311, 311, 311, 311, 311, 311, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 311, 311, 311, 311, 311, 311, 162, + + 162, 162, 162, 162, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 312, 480, + 480, 480, 480, 480, 480, 312, 312, 312, 312, 312, + 312, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 312, 312, 312, 312, 312, 312, + 283, 283, 283, 322, 480, 480, 324, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 325, + 480, 480, 480, 480, 480, 480, 325, 325, 325, 325, + 325, 325, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 326, 480, 480, 325, 325, 325, 325, 325, + 325, 286, 286, 286, 327, 480, 480, 480, 480, 480, + 480, 480, 329, 480, 480, 480, 480, 480, 480, 480, + 330, 480, 480, 480, 480, 480, 480, 330, 330, 330, + 330, 330, 330, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 331, 480, 480, 330, 330, 330, 330, + 330, 330, 288, 288, 288, 288, 288, 480, 480, 480, + 480, 480, 480, 480, 480, 253, 480, 480, 480, 480, + + 480, 332, 480, 480, 480, 480, 480, 480, 332, 332, + 332, 332, 332, 332, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 254, 480, 480, 332, 332, 332, + 332, 332, 332, 282, 282, 282, 282, 288, 480, 290, + 480, 480, 480, 480, 290, 290, 291, 480, 480, 480, + 480, 480, 292, 480, 480, 480, 480, 480, 480, 292, + 292, 292, 292, 292, 292, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 293, 480, 480, 292, 292, + + 292, 292, 292, 292, 333, 480, 480, 480, 480, 480, + 480, 333, 333, 333, 333, 333, 333, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 333, 333, 333, 333, 333, 333, 108, 176, 176, 176, + 108, 480, 40, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 335, 480, 480, 480, 480, + 480, 480, 335, 335, 335, 335, 335, 335, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 41, 480, + + 480, 335, 335, 335, 335, 335, 335, 180, 180, 180, + 180, 180, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 336, 480, 480, 480, + 480, 480, 480, 336, 336, 336, 336, 336, 336, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 115, + 480, 480, 336, 336, 336, 336, 336, 336, 116, 116, + 116, 116, 116, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 337, 480, 480, + 480, 480, 480, 480, 337, 337, 337, 337, 337, 337, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 337, 337, 337, 337, 337, 337, 119, + 183, 183, 183, 119, 480, 480, 480, 480, 480, 480, + 40, 480, 480, 480, 480, 480, 480, 480, 338, 480, + 480, 480, 480, 480, 480, 338, 338, 338, 338, 338, + 338, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 49, 480, 480, 338, 338, 338, 338, 338, 338, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 339, 480, 480, 90, + 480, 480, 480, 480, 480, 480, 90, 90, 90, 90, + 90, 90, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 90, 90, 90, 90, 90, + 90, 188, 188, 188, 188, 188, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 340, 480, 480, 480, 480, 480, 480, 340, 340, 340, + 340, 340, 340, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 340, 340, 340, 340, + 340, 340, 147, 147, 147, 147, 147, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 341, 480, 480, 480, 480, 480, 480, 341, 341, + 341, 341, 341, 341, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 341, 341, 341, + 341, 341, 341, 201, 201, 201, 201, 201, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 343, 480, 480, 480, 480, 480, 480, 343, + + 343, 343, 343, 343, 343, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 343, 343, + 343, 343, 343, 343, 347, 480, 480, 480, 480, 480, + 480, 347, 347, 347, 347, 347, 347, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 347, 347, 347, 347, 347, 347, 162, 162, 162, 162, + 162, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 348, 480, 480, 480, 480, + + 480, 480, 348, 348, 348, 348, 348, 348, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 348, 348, 348, 348, 348, 348, 323, 359, 359, + 359, 323, 480, 284, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 360, 480, 480, 480, + 480, 480, 480, 360, 360, 360, 360, 360, 360, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 285, + 480, 480, 360, 360, 360, 360, 360, 360, 283, 283, + + 283, 322, 480, 480, 324, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 325, 480, 480, + 480, 480, 480, 480, 325, 325, 325, 325, 325, 325, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 326, 480, 480, 325, 325, 325, 325, 325, 325, 328, + 363, 363, 363, 328, 480, 480, 480, 480, 480, 480, + 284, 480, 480, 480, 480, 480, 480, 480, 364, 480, + 480, 480, 480, 480, 480, 364, 364, 364, 364, 364, + 364, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 287, 480, 480, 364, 364, 364, 364, 364, 364, + 286, 286, 286, 327, 480, 480, 480, 480, 480, 480, + 480, 329, 480, 480, 480, 480, 480, 480, 480, 330, + 480, 480, 480, 480, 480, 480, 330, 330, 330, 330, + 330, 330, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 331, 480, 480, 330, 330, 330, 330, 330, + 330, 288, 288, 288, 288, 288, 480, 480, 480, 480, + 480, 480, 480, 480, 253, 480, 480, 480, 480, 480, + + 365, 480, 480, 480, 480, 480, 480, 365, 365, 365, + 365, 365, 365, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 254, 480, 480, 365, 365, 365, 365, + 365, 365, 367, 480, 480, 480, 480, 480, 480, 367, + 367, 367, 367, 367, 367, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 367, 367, + 367, 367, 367, 367, 113, 480, 480, 480, 480, 480, + 480, 113, 113, 113, 113, 113, 113, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 113, 113, 113, 113, 113, 113, 369, 480, 480, 480, + 480, 480, 480, 369, 369, 369, 369, 369, 369, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 369, 369, 369, 369, 369, 369, 147, 147, + 147, 147, 147, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 128, 480, 480, + 480, 480, 480, 480, 128, 128, 128, 128, 128, 128, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 128, 128, 128, 128, 128, 128, 201, + 201, 201, 201, 201, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 371, 480, + 480, 480, 480, 480, 480, 371, 371, 371, 371, 371, + 371, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 371, 371, 371, 371, 371, 371, + 375, 480, 480, 480, 480, 480, 480, 375, 375, 375, + + 375, 375, 375, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 375, 375, 375, 375, + 375, 375, 376, 480, 480, 480, 480, 480, 480, 376, + 376, 376, 376, 376, 376, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 376, 376, + 376, 376, 376, 376, 288, 288, 288, 288, 288, 480, + 480, 480, 480, 480, 480, 480, 480, 253, 480, 480, + 480, 480, 480, 377, 480, 480, 480, 480, 480, 480, + + 377, 377, 377, 377, 377, 377, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 254, 480, 480, 377, + 377, 377, 377, 377, 377, 380, 480, 480, 480, 480, + 480, 480, 381, 480, 382, 480, 480, 480, 480, 383, + 384, 480, 480, 385, 480, 480, 480, 480, 153, 480, + 480, 480, 480, 480, 380, 480, 480, 480, 480, 480, + 381, 480, 382, 480, 480, 480, 480, 383, 384, 480, + 480, 385, 389, 480, 480, 480, 480, 480, 480, 389, + 389, 389, 389, 389, 389, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 389, 389, + 389, 389, 389, 389, 390, 480, 480, 480, 480, 480, + 480, 390, 390, 390, 390, 390, 390, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 390, 390, 390, 390, 390, 390, 391, 480, 480, 480, + 480, 480, 480, 391, 391, 391, 391, 391, 391, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 391, 391, 391, 391, 391, 391, 399, 480, + 480, 480, 480, 480, 480, 399, 399, 399, 399, 399, + 399, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 399, 399, 399, 399, 399, 399, + 400, 480, 480, 480, 480, 480, 480, 400, 400, 400, + 400, 400, 400, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 400, 400, 400, 400, + 400, 400, 401, 480, 480, 480, 480, 480, 480, 401, + + 401, 401, 401, 401, 401, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 401, 401, + 401, 401, 401, 401, 411, 480, 480, 480, 480, 480, + 480, 411, 411, 411, 411, 411, 411, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 411, 411, 411, 411, 411, 411, 412, 480, 480, 480, + 480, 480, 480, 412, 412, 412, 412, 412, 412, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 412, 412, 412, 412, 412, 412, 430, 480, + 480, 480, 480, 480, 480, 430, 430, 430, 430, 430, + 430, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 430, 430, 430, 430, 430, 430, + 439, 480, 480, 480, 480, 480, 480, 439, 439, 439, + 439, 439, 439, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 439, 439, 439, 439, + + 439, 439, 440, 440, 440, 440, 440, 480, 480, 480, + 480, 480, 480, 480, 480, 426, 480, 480, 480, 480, + 480, 441, 480, 480, 480, 480, 480, 480, 441, 441, + 441, 441, 441, 441, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 428, 480, 480, 441, 441, 441, + 441, 441, 441, 447, 447, 447, 447, 447, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 448, 480, 480, 480, 480, 480, 480, 448, + 448, 448, 448, 448, 448, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 448, 448, + 448, 448, 448, 448, 449, 480, 480, 480, 480, 480, + 480, 449, 449, 449, 449, 449, 449, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 449, 449, 449, 449, 449, 449, 454, 480, 480, 480, + 480, 480, 480, 454, 454, 454, 454, 454, 454, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 454, 454, 454, 454, 454, 454, 455, 480, + 480, 480, 480, 480, 480, 455, 455, 455, 455, 455, + 455, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 455, 455, 455, 455, 455, 455, + 460, 480, 480, 480, 480, 480, 480, 460, 460, 460, + 460, 460, 460, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 460, 460, 460, 460, + 460, 460, 461, 480, 480, 480, 480, 480, 480, 461, + + 461, 461, 461, 461, 461, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 461, 461, + 461, 461, 461, 461, 466, 480, 480, 480, 480, 480, + 480, 466, 466, 466, 466, 466, 466, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 466, 466, 466, 466, 466, 466, 467, 480, 480, 480, + 480, 480, 480, 467, 467, 467, 467, 467, 467, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 467, 467, 467, 467, 467, 467, 471, 480, + 480, 480, 480, 480, 480, 471, 471, 471, 471, 471, + 471, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 471, 471, 471, 471, 471, 471, + 39, 480, 480, 39, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 45, 45, 480, 45, 45, 48, 480, + 480, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 48, 53, 53, 480, 53, 53, 81, 480, 480, 81, + + 81, 90, 480, 90, 90, 480, 90, 90, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 113, 113, 478, 113, 113, 116, 116, 116, 116, + 108, 113, 113, 480, 113, 113, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, - 126, 126, 126, 128, 128, 478, 128, 128, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 151, 151, - 478, 151, 151, 159, 159, 159, 159, 159, 159, 159, + 126, 126, 126, 128, 128, 480, 128, 128, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 152, 152, + 480, 152, 152, 160, 160, 160, 160, 160, 160, 160, - 159, 159, 159, 161, 161, 161, 161, 161, 161, 161, - 161, 161, 161, 166, 166, 166, 179, 179, 179, 179, - 179, 179, 179, 179, 179, 179, 48, 48, 478, 48, + 160, 160, 160, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 167, 167, 167, 180, 180, 180, 180, + 180, 180, 180, 180, 180, 180, 48, 48, 480, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 126, 126, 126, 126, 126, 126, 126, 126, - 126, 126, 126, 126, 126, 126, 185, 185, 185, 185, - 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, - 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, - 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, - - 211, 211, 211, 211, 39, 478, 478, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 225, 225, 225, - 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, - 225, 243, 243, 243, 243, 248, 248, 248, 248, 248, - 248, 478, 248, 248, 248, 248, 248, 248, 39, 39, + 126, 126, 126, 126, 126, 126, 186, 186, 186, 186, + 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, + 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, + 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, + + 213, 213, 213, 213, 39, 480, 480, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 245, 245, 245, 245, 250, 250, 250, 250, 250, + 250, 480, 250, 250, 250, 250, 250, 250, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 185, 185, 185, 185, 185, 185, 185, 185, 185, - 185, 185, 185, 185, 185, 275, 275, 275, 275, 248, - 248, 248, 248, 248, 248, 478, 248, 248, 248, 248, - 248, 248, 281, 478, 478, 281, 281, 281, 281, 281, - - 281, 281, 281, 281, 281, 284, 478, 478, 284, 284, - 284, 284, 284, 284, 284, 284, 284, 284, 287, 287, - 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, - 287, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 113, 113, 478, 113, 113, 48, + 39, 186, 186, 186, 186, 186, 186, 186, 186, 186, + 186, 186, 186, 186, 186, 277, 277, 277, 277, 250, + 250, 250, 250, 250, 250, 480, 250, 250, 250, 250, + 250, 250, 283, 480, 480, 283, 283, 283, 283, 283, + + 283, 283, 283, 283, 283, 286, 480, 480, 286, 286, + 286, 286, 286, 286, 286, 286, 286, 286, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 39, 39, 39, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 113, 113, 480, 113, 113, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 312, 312, 312, 312, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 284, - 478, 478, 284, 284, 284, 284, 284, 284, 284, 284, - 284, 284, 326, 326, 326, 326, 326, 326, 326, 326, - - 326, 326, 326, 326, 326, 248, 248, 248, 248, 248, - 478, 478, 248, 248, 248, 248, 248, 248, 287, 287, - 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, - 287, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 113, 113, 478, 113, 113, 48, + 48, 48, 314, 314, 314, 314, 323, 323, 323, 323, + 323, 323, 323, 323, 323, 323, 323, 323, 323, 286, + 480, 480, 286, 286, 286, 286, 286, 286, 286, 286, + 286, 286, 328, 328, 328, 328, 328, 328, 328, 328, + + 328, 328, 328, 328, 328, 250, 250, 250, 250, 250, + 480, 480, 250, 250, 250, 250, 250, 250, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 39, 39, 39, 39, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 113, 113, 480, 113, 113, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 348, 348, 348, 348, 281, 281, 478, 281, - 281, 281, 281, 281, 281, 281, 281, 281, 281, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 284, 284, 478, 284, 284, 284, 284, 284, - - 284, 284, 284, 284, 284, 326, 326, 326, 326, 326, - 326, 326, 326, 326, 326, 326, 326, 326, 248, 248, - 248, 248, 248, 478, 478, 248, 248, 248, 248, 248, - 248, 413, 413, 413, 413, 478, 478, 478, 478, 413, - 478, 478, 413, 413, 425, 425, 425, 425, 478, 478, - 478, 425, 425, 425, 478, 425, 425, 427, 427, 427, - 427, 427, 427, 427, 427, 427, 427, 436, 436, 436, - 436, 436, 436, 436, 436, 436, 436, 7, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478 + 48, 48, 350, 350, 350, 350, 283, 283, 480, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 323, + 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, + 323, 323, 286, 286, 480, 286, 286, 286, 286, 286, + + 286, 286, 286, 286, 286, 328, 328, 328, 328, 328, + 328, 328, 328, 328, 328, 328, 328, 328, 250, 250, + 250, 250, 250, 480, 480, 250, 250, 250, 250, 250, + 250, 415, 415, 415, 415, 480, 480, 480, 480, 415, + 480, 480, 415, 415, 427, 427, 427, 427, 480, 480, + 480, 427, 427, 427, 480, 427, 427, 429, 429, 429, + 429, 429, 429, 429, 429, 429, 429, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 7, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480 } ; static yyconst flex_int16_t yy_chk[6664] = @@ -1051,730 +1053,730 @@ static yyconst flex_int16_t yy_chk[6664] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 5, 4, 6, 15, - 12, 3, 477, 4, 9, 9, 9, 9, 9, 10, + 12, 3, 479, 4, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 3, 3, 4, 4, 11, 11, 11, 11, 11, 23, 39, 5, 17, 6, 35, 17, 3, 24, 4, 32, 24, 24, 32, 32, 38, 48, 15, 69, 3, 3, 4, 4, 12, 42, 25, 17, - 42, 25, 11, 474, 69, 3, 35, 4, 17, 24, + 42, 25, 11, 476, 69, 3, 35, 4, 17, 24, 53, 32, 17, 23, 31, 78, 38, 78, 35, 69, - 39, 24, 467, 32, 33, 461, 65, 17, 83, 25, + 39, 24, 469, 32, 33, 463, 65, 17, 83, 25, 48, 11, 13, 42, 35, 13, 17, 24, 25, 32, 83, 31, 13, 13, 13, 13, 13, 13, 65, 54, 53, 33, 54, 54, 31, 65, 83, 25, 36, 36, - 36, 36, 36, 70, 33, 68, 68, 456, 13, 31, - 166, 13, 13, 13, 13, 13, 13, 20, 166, 33, - 211, 90, 70, 440, 20, 20, 434, 20, 211, 54, + 36, 36, 36, 70, 33, 68, 68, 458, 13, 31, + 167, 13, 13, 13, 13, 13, 13, 20, 167, 33, + 213, 90, 70, 442, 20, 20, 436, 20, 213, 54, 124, 124, 70, 68, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 90, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 64, 52, - 106, 20, 22, 74, 55, 429, 37, 37, 37, 37, - - 37, 57, 64, 57, 22, 243, 487, 22, 487, 52, - 22, 419, 55, 243, 22, 22, 64, 22, 106, 74, - 67, 66, 74, 57, 72, 72, 385, 127, 22, 67, - 37, 127, 66, 22, 55, 66, 22, 52, 71, 22, - 97, 55, 22, 22, 71, 22, 26, 73, 67, 66, - 82, 57, 71, 26, 26, 26, 26, 26, 26, 37, - 66, 72, 108, 109, 73, 80, 71, 76, 73, 82, - 107, 73, 71, 76, 86, 107, 73, 85, 140, 82, - 97, 384, 26, 26, 26, 26, 26, 26, 41, 41, - 41, 41, 73, 118, 41, 76, 73, 80, 84, 85, - - 86, 80, 87, 86, 348, 175, 85, 41, 108, 109, - 96, 140, 84, 93, 41, 41, 41, 41, 41, 41, - 93, 107, 94, 119, 102, 80, 84, 104, 87, 342, - 250, 87, 103, 119, 118, 96, 317, 105, 161, 316, - 41, 102, 315, 41, 41, 41, 41, 41, 41, 44, - 96, 175, 104, 93, 314, 94, 44, 44, 44, 44, - 44, 44, 94, 96, 102, 103, 120, 104, 105, 125, - 102, 250, 103, 275, 119, 131, 120, 105, 161, 134, - 104, 275, 44, 94, 125, 44, 44, 44, 44, 44, - 44, 46, 144, 103, 150, 131, 105, 145, 46, 46, - - 46, 46, 46, 46, 131, 134, 145, 165, 134, 125, - 137, 137, 148, 125, 156, 144, 150, 120, 192, 153, - 226, 144, 148, 150, 226, 145, 154, 46, 46, 46, - 46, 46, 46, 49, 49, 49, 49, 156, 137, 154, - 148, 157, 155, 156, 49, 153, 158, 165, 153, 174, - 190, 192, 49, 155, 154, 157, 168, 170, 164, 49, - 49, 49, 49, 49, 49, 164, 158, 171, 173, 157, - 155, 172, 182, 190, 235, 158, 184, 174, 216, 190, - 249, 499, 182, 499, 284, 49, 194, 217, 49, 49, - 49, 49, 49, 49, 56, 196, 168, 170, 164, 194, - - 184, 56, 56, 56, 56, 56, 56, 171, 173, 172, - 235, 172, 201, 198, 194, 217, 184, 196, 216, 325, - 293, 201, 202, 182, 196, 284, 249, 203, 184, 202, - 56, 56, 56, 56, 56, 56, 77, 172, 198, 203, - 201, 204, 198, 77, 77, 77, 77, 77, 77, 293, - 202, 231, 232, 234, 390, 203, 281, 320, 390, 204, - 325, 234, 205, 492, 492, 231, 254, 509, 232, 509, - 204, 206, 77, 77, 77, 77, 77, 77, 88, 231, - 232, 234, 224, 236, 205, 88, 88, 88, 88, 88, - 88, 205, 236, 206, 254, 214, 214, 214, 214, 214, - - 206, 214, 281, 320, 224, 265, 214, 313, 214, 237, - 306, 236, 332, 238, 88, 88, 88, 88, 88, 88, - 91, 238, 224, 265, 364, 307, 271, 91, 91, 91, - 91, 91, 91, 224, 265, 237, 306, 271, 237, 306, - 332, 238, 247, 247, 247, 247, 247, 214, 247, 267, - 296, 268, 364, 247, 271, 247, 91, 91, 91, 91, - 91, 91, 98, 98, 98, 98, 98, 279, 511, 337, - 511, 267, 268, 340, 98, 269, 303, 305, 267, 312, - 268, 98, 269, 303, 305, 278, 308, 312, 98, 98, - 98, 98, 98, 98, 247, 248, 248, 248, 248, 248, - - 337, 248, 277, 269, 303, 305, 248, 276, 248, 340, - 463, 515, 308, 515, 98, 308, 270, 98, 98, 98, - 98, 98, 98, 110, 110, 110, 110, 110, 337, 110, - 280, 280, 280, 280, 280, 282, 282, 282, 282, 282, - 321, 343, 110, 280, 246, 321, 463, 248, 282, 110, - 110, 110, 110, 110, 110, 286, 286, 286, 286, 286, - 318, 318, 318, 318, 318, 343, 245, 366, 286, 517, - 343, 517, 370, 318, 394, 110, 344, 366, 110, 110, - 110, 110, 110, 110, 111, 111, 111, 111, 244, 394, - 111, 321, 239, 229, 370, 287, 287, 287, 287, 287, - - 344, 370, 394, 111, 383, 344, 366, 286, 287, 228, - 111, 111, 111, 111, 111, 111, 288, 288, 288, 288, - 288, 289, 289, 289, 289, 289, 356, 225, 326, 288, - 383, 356, 213, 383, 289, 392, 111, 392, 326, 111, - 111, 111, 111, 111, 111, 114, 393, 287, 462, 212, - 462, 403, 114, 114, 114, 114, 114, 114, 322, 322, - 322, 322, 322, 392, 322, 357, 199, 193, 288, 393, - 357, 322, 403, 289, 191, 393, 462, 356, 114, 326, - 403, 114, 114, 114, 114, 114, 114, 115, 189, 327, - 327, 327, 327, 327, 115, 115, 115, 115, 115, 115, - - 327, 187, 327, 331, 331, 331, 331, 331, 185, 179, - 322, 333, 333, 333, 333, 333, 357, 333, 167, 331, - 371, 163, 159, 115, 115, 115, 115, 115, 115, 117, - 117, 117, 117, 117, 346, 346, 346, 346, 346, 151, - 149, 327, 371, 336, 336, 336, 336, 336, 117, 371, - 346, 360, 361, 146, 336, 117, 117, 117, 117, 117, - 117, 360, 361, 333, 365, 365, 365, 365, 365, 416, - 345, 345, 345, 345, 345, 367, 367, 367, 367, 367, - 143, 142, 416, 377, 117, 117, 117, 117, 117, 117, - 121, 121, 121, 121, 121, 336, 524, 416, 524, 141, - - 441, 121, 360, 361, 369, 369, 369, 369, 369, 121, - 377, 378, 379, 139, 441, 380, 121, 121, 121, 121, - 121, 121, 345, 355, 355, 355, 355, 355, 441, 355, - 527, 415, 527, 378, 379, 138, 355, 380, 377, 415, - 378, 379, 121, 395, 380, 121, 121, 121, 121, 121, - 121, 122, 122, 122, 122, 381, 369, 136, 395, 415, - 418, 381, 122, 359, 359, 359, 359, 359, 382, 391, - 122, 395, 391, 402, 359, 355, 359, 122, 122, 122, - 122, 122, 122, 381, 135, 401, 418, 133, 407, 418, - 382, 402, 132, 391, 407, 130, 405, 382, 391, 396, - - 401, 391, 402, 122, 128, 396, 122, 122, 122, 122, - 122, 122, 129, 401, 396, 359, 407, 406, 405, 129, - 129, 129, 129, 129, 129, 405, 537, 396, 537, 544, - 545, 544, 545, 396, 399, 399, 399, 399, 399, 406, - 126, 404, 408, 116, 113, 95, 406, 399, 129, 129, - 129, 129, 129, 129, 147, 147, 147, 147, 147, 404, - 408, 92, 81, 79, 410, 410, 410, 410, 410, 417, - 404, 408, 75, 147, 63, 410, 420, 61, 417, 421, - 147, 147, 147, 147, 147, 147, 399, 400, 400, 400, - 400, 400, 409, 409, 409, 409, 409, 417, 409, 60, - - 420, 421, 59, 400, 58, 420, 147, 51, 421, 147, - 147, 147, 147, 147, 147, 152, 410, 411, 411, 411, - 411, 411, 152, 152, 152, 152, 152, 152, 413, 413, - 413, 413, 413, 411, 45, 29, 28, 422, 27, 400, - 21, 413, 430, 19, 409, 435, 412, 412, 412, 412, - 412, 152, 152, 152, 152, 152, 152, 160, 160, 160, - 160, 160, 412, 422, 430, 18, 422, 432, 431, 411, - 435, 430, 433, 16, 435, 442, 160, 432, 468, 433, - 413, 442, 448, 160, 160, 160, 160, 160, 160, 423, - 423, 423, 423, 423, 431, 432, 443, 431, 412, 14, - - 433, 468, 423, 442, 448, 449, 7, 468, 443, 160, - 444, 448, 160, 160, 160, 160, 160, 160, 162, 162, - 162, 162, 162, 0, 443, 444, 0, 449, 425, 425, - 425, 425, 425, 450, 449, 0, 454, 162, 444, 0, - 451, 425, 450, 0, 162, 162, 162, 162, 162, 162, - 427, 427, 427, 427, 427, 436, 436, 436, 436, 436, - 0, 450, 451, 427, 454, 466, 0, 0, 436, 451, - 0, 466, 454, 162, 162, 162, 162, 162, 162, 169, - 425, 438, 438, 438, 438, 438, 169, 169, 169, 169, - 169, 169, 454, 466, 438, 0, 0, 0, 457, 0, - - 455, 460, 427, 476, 0, 0, 457, 436, 471, 455, - 460, 476, 472, 0, 473, 169, 169, 169, 169, 169, - 169, 176, 176, 176, 176, 176, 457, 176, 455, 460, - 471, 476, 0, 438, 472, 0, 0, 471, 473, 0, - 176, 472, 0, 473, 0, 0, 0, 176, 176, 176, - 176, 176, 176, 445, 445, 445, 445, 445, 465, 465, - 465, 465, 465, 0, 0, 0, 445, 0, 0, 0, - 0, 465, 0, 176, 0, 0, 176, 176, 176, 176, - 176, 176, 178, 469, 469, 469, 469, 469, 470, 178, - 178, 178, 178, 178, 178, 0, 469, 0, 0, 0, - - 0, 0, 475, 470, 0, 445, 0, 0, 0, 0, - 465, 0, 0, 0, 0, 0, 470, 475, 178, 178, - 178, 178, 178, 178, 180, 180, 180, 180, 180, 0, - 475, 0, 0, 0, 0, 469, 0, 0, 0, 0, - 0, 0, 0, 180, 0, 0, 0, 0, 0, 0, - 180, 180, 180, 180, 180, 180, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 180, - 180, 180, 180, 180, 180, 181, 181, 181, 181, 181, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 181, 0, 0, 0, 0, 0, - 0, 181, 181, 181, 181, 181, 181, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 181, 181, 181, 181, 181, 181, 183, 183, 183, 183, - 183, 0, 0, 0, 0, 0, 0, 183, 0, 0, - 0, 0, 0, 0, 0, 183, 0, 0, 0, 0, - 0, 0, 183, 183, 183, 183, 183, 183, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 183, 0, - - 0, 183, 183, 183, 183, 183, 183, 188, 188, 188, - 188, 188, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 188, 0, 0, 0, - 0, 0, 0, 188, 188, 188, 188, 188, 188, 0, + 80, 20, 22, 489, 55, 489, 37, 37, 37, 37, + + 37, 57, 64, 57, 22, 245, 501, 22, 501, 52, + 22, 131, 55, 245, 22, 22, 64, 22, 494, 494, + 67, 66, 80, 57, 72, 72, 80, 97, 22, 67, + 37, 131, 66, 22, 55, 66, 22, 52, 71, 22, + 131, 55, 22, 22, 71, 22, 26, 73, 67, 66, + 80, 57, 71, 26, 26, 26, 26, 26, 26, 37, + 66, 72, 108, 118, 73, 84, 71, 97, 73, 74, + 93, 73, 71, 74, 109, 76, 73, 93, 106, 84, + 82, 76, 26, 26, 26, 26, 26, 26, 41, 41, + 41, 41, 73, 84, 41, 74, 73, 86, 74, 82, + + 85, 87, 74, 76, 118, 237, 106, 41, 108, 82, + 93, 105, 96, 104, 41, 41, 41, 41, 41, 41, + 109, 431, 85, 86, 127, 119, 86, 87, 127, 85, + 87, 94, 421, 102, 103, 119, 140, 96, 104, 387, + 41, 237, 105, 41, 41, 41, 41, 41, 41, 44, + 102, 105, 96, 104, 134, 386, 44, 44, 44, 44, + 44, 44, 120, 107, 94, 96, 104, 103, 107, 140, + 105, 94, 120, 102, 103, 162, 119, 175, 125, 102, + 134, 144, 44, 134, 149, 44, 44, 44, 44, 44, + 44, 46, 94, 125, 149, 103, 137, 137, 46, 46, + + 46, 46, 46, 46, 144, 175, 350, 344, 176, 145, + 144, 146, 149, 120, 107, 162, 151, 154, 125, 157, + 146, 319, 125, 145, 137, 166, 169, 46, 46, 46, + 46, 46, 46, 49, 49, 49, 49, 145, 151, 146, + 155, 158, 157, 154, 49, 151, 154, 156, 157, 193, + 159, 318, 49, 155, 176, 158, 171, 172, 156, 49, + 49, 49, 49, 49, 49, 166, 169, 165, 155, 158, + 159, 173, 174, 183, 165, 156, 185, 218, 317, 159, + 204, 316, 193, 183, 295, 49, 196, 204, 49, 49, + 49, 49, 49, 49, 56, 219, 171, 172, 191, 196, + + 185, 56, 56, 56, 56, 56, 56, 165, 204, 173, + 203, 173, 174, 295, 196, 315, 185, 218, 251, 203, + 198, 191, 206, 219, 183, 200, 252, 191, 185, 205, + 56, 56, 56, 56, 56, 56, 77, 173, 203, 207, + 206, 205, 198, 77, 77, 77, 77, 77, 77, 198, + 200, 206, 228, 239, 200, 233, 228, 205, 277, 226, + 283, 207, 208, 314, 251, 342, 277, 252, 207, 233, + 286, 314, 77, 77, 77, 77, 77, 77, 88, 239, + 256, 226, 239, 233, 208, 88, 88, 88, 88, 88, + 88, 208, 216, 216, 216, 216, 216, 234, 216, 226, + + 322, 342, 327, 216, 267, 216, 283, 309, 256, 308, + 226, 286, 238, 234, 88, 88, 88, 88, 88, 88, + 91, 238, 267, 269, 310, 234, 236, 91, 91, 91, + 91, 91, 91, 267, 236, 308, 323, 298, 308, 240, + 238, 323, 271, 327, 216, 269, 322, 240, 270, 271, + 310, 334, 269, 310, 236, 281, 91, 91, 91, 91, + 91, 91, 98, 98, 98, 98, 98, 240, 392, 270, + 271, 273, 392, 305, 98, 366, 307, 270, 280, 334, + 305, 98, 273, 307, 345, 339, 346, 323, 98, 98, + 98, 98, 98, 98, 249, 249, 249, 249, 249, 273, + + 249, 305, 368, 366, 307, 249, 279, 249, 345, 511, + 346, 511, 368, 345, 98, 346, 339, 98, 98, 98, + 98, 98, 98, 110, 110, 110, 110, 110, 465, 110, + 282, 282, 282, 282, 282, 284, 284, 284, 284, 284, + 358, 368, 110, 282, 339, 358, 249, 379, 284, 110, + 110, 110, 110, 110, 110, 250, 250, 250, 250, 250, + 394, 250, 394, 385, 465, 445, 250, 278, 250, 367, + 367, 367, 367, 367, 379, 110, 272, 445, 110, 110, + 110, 110, 110, 110, 111, 111, 111, 111, 394, 385, + 111, 358, 385, 445, 248, 288, 288, 288, 288, 288, + + 359, 247, 379, 111, 372, 359, 405, 250, 288, 246, + 111, 111, 111, 111, 111, 111, 289, 289, 289, 289, + 289, 290, 290, 290, 290, 290, 372, 405, 328, 289, + 513, 241, 513, 372, 290, 405, 111, 231, 328, 111, + 111, 111, 111, 111, 111, 114, 395, 288, 420, 230, + 227, 359, 114, 114, 114, 114, 114, 114, 291, 291, + 291, 291, 291, 320, 320, 320, 320, 320, 289, 395, + 362, 291, 215, 290, 420, 395, 320, 420, 114, 328, + 362, 114, 114, 114, 114, 114, 114, 115, 214, 333, + 333, 333, 333, 333, 115, 115, 115, 115, 115, 115, + + 324, 324, 324, 324, 324, 333, 324, 517, 201, 517, + 291, 417, 434, 324, 335, 335, 335, 335, 335, 417, + 335, 362, 434, 115, 115, 115, 115, 115, 115, 117, + 117, 117, 117, 117, 348, 348, 348, 348, 348, 417, + 434, 195, 194, 338, 338, 338, 338, 338, 117, 192, + 348, 373, 324, 190, 338, 117, 117, 117, 117, 117, + 117, 329, 329, 329, 329, 329, 335, 369, 369, 369, + 369, 369, 329, 373, 329, 347, 347, 347, 347, 347, + 373, 380, 404, 381, 117, 117, 117, 117, 117, 117, + 121, 121, 121, 121, 121, 338, 519, 526, 519, 526, + + 404, 121, 383, 380, 363, 381, 188, 186, 383, 121, + 380, 404, 381, 329, 363, 180, 121, 121, 121, 121, + 121, 121, 357, 357, 357, 357, 357, 347, 357, 396, + 383, 464, 419, 464, 382, 357, 371, 371, 371, 371, + 371, 419, 121, 384, 396, 121, 121, 121, 121, 121, + 121, 122, 122, 122, 122, 363, 382, 396, 168, 464, + 419, 397, 122, 382, 435, 384, 393, 164, 160, 393, + 122, 435, 384, 406, 357, 407, 397, 122, 122, 122, + 122, 122, 122, 361, 361, 361, 361, 361, 371, 397, + 393, 406, 435, 152, 361, 393, 361, 407, 393, 398, + + 403, 422, 406, 122, 407, 398, 122, 122, 122, 122, + 122, 122, 129, 410, 398, 403, 529, 150, 529, 129, + 129, 129, 129, 129, 129, 422, 147, 398, 403, 143, + 422, 410, 409, 398, 539, 361, 539, 546, 409, 546, + 408, 142, 410, 402, 402, 402, 402, 402, 129, 129, + 129, 129, 129, 129, 148, 148, 148, 148, 148, 402, + 409, 141, 408, 418, 401, 401, 401, 401, 401, 408, + 139, 138, 423, 148, 136, 135, 418, 401, 133, 424, + 148, 148, 148, 148, 148, 148, 411, 411, 411, 411, + 411, 418, 411, 132, 423, 402, 412, 412, 412, 412, + + 412, 423, 547, 130, 547, 424, 148, 412, 424, 148, + 148, 148, 148, 148, 148, 153, 401, 413, 413, 413, + 413, 413, 153, 153, 153, 153, 153, 153, 414, 414, + 414, 414, 414, 413, 128, 126, 116, 113, 411, 95, + 92, 81, 433, 79, 414, 432, 75, 63, 412, 61, + 60, 153, 153, 153, 153, 153, 153, 161, 161, 161, + 161, 161, 425, 425, 425, 425, 425, 432, 433, 413, + 437, 433, 444, 459, 432, 425, 161, 59, 444, 446, + 414, 459, 443, 161, 161, 161, 161, 161, 161, 415, + 415, 415, 415, 415, 446, 437, 443, 468, 58, 437, + + 444, 459, 415, 468, 51, 450, 451, 446, 472, 161, + 443, 477, 161, 161, 161, 161, 161, 161, 163, 163, + 163, 163, 163, 472, 45, 468, 477, 450, 451, 427, + 427, 427, 427, 427, 450, 451, 472, 163, 453, 477, + 473, 415, 427, 470, 163, 163, 163, 163, 163, 163, + 429, 429, 429, 429, 429, 438, 438, 438, 438, 438, + 453, 29, 473, 429, 28, 27, 470, 453, 438, 473, + 456, 452, 470, 163, 163, 163, 163, 163, 163, 170, + 452, 427, 474, 21, 475, 19, 170, 170, 170, 170, + 170, 170, 440, 440, 440, 440, 440, 18, 456, 452, + + 457, 462, 429, 16, 474, 440, 456, 438, 475, 457, + 462, 474, 14, 475, 7, 170, 170, 170, 170, 170, + 170, 177, 177, 177, 177, 177, 456, 177, 457, 462, + 0, 0, 447, 447, 447, 447, 447, 0, 0, 0, + 177, 0, 0, 0, 440, 447, 0, 177, 177, 177, + 177, 177, 177, 467, 467, 467, 467, 467, 471, 471, + 471, 471, 471, 0, 0, 0, 467, 478, 0, 0, + 0, 471, 0, 177, 0, 478, 177, 177, 177, 177, + 177, 177, 179, 0, 447, 0, 0, 0, 0, 179, + 179, 179, 179, 179, 179, 478, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 467, 0, 0, 0, 0, + 471, 0, 0, 0, 0, 0, 0, 0, 179, 179, + 179, 179, 179, 179, 181, 181, 181, 181, 181, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 181, 0, 0, 0, 0, 0, 0, + 181, 181, 181, 181, 181, 181, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 181, + 181, 181, 181, 181, 181, 182, 182, 182, 182, 182, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 182, 0, 0, 0, 0, 0, + 0, 182, 182, 182, 182, 182, 182, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 182, 182, 182, 182, 182, 182, 184, 184, 184, 184, + 184, 0, 0, 0, 0, 0, 0, 184, 0, 0, + 0, 0, 0, 0, 0, 184, 0, 0, 0, 0, + 0, 0, 184, 184, 184, 184, 184, 184, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 184, 0, + + 0, 184, 184, 184, 184, 184, 184, 189, 189, 189, + 189, 189, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 189, 0, 0, 0, + 0, 0, 0, 189, 189, 189, 189, 189, 189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 188, 188, 188, 188, 188, 188, 195, 0, - 0, 0, 0, 0, 0, 195, 195, 195, 195, 195, - 195, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 189, 189, 189, 189, 189, 189, 197, 0, + 0, 0, 0, 0, 0, 197, 197, 197, 197, 197, + 197, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 195, 195, 195, 195, 195, 195, - 200, 200, 200, 200, 200, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 200, - 0, 0, 0, 0, 0, 0, 200, 200, 200, 200, - 200, 200, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 197, 197, 197, 197, 197, 197, + 202, 202, 202, 202, 202, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 202, + 0, 0, 0, 0, 0, 0, 202, 202, 202, 202, + 202, 202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 200, 200, 200, 200, 200, - 200, 207, 0, 0, 0, 0, 0, 0, 207, 207, - 207, 207, 207, 207, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 202, 202, 202, 202, 202, + 202, 209, 0, 0, 0, 0, 0, 0, 209, 209, + 209, 209, 209, 209, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 207, 207, 207, - 207, 207, 207, 208, 208, 208, 208, 208, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 209, 209, 209, + 209, 209, 209, 210, 210, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 208, 0, 0, 0, 0, 0, 0, 208, - 208, 208, 208, 208, 208, 0, 0, 0, 0, 0, + 0, 0, 210, 0, 0, 0, 0, 0, 0, 210, + 210, 210, 210, 210, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 208, 208, - 208, 208, 208, 208, 215, 0, 0, 0, 0, 0, - 0, 215, 215, 215, 215, 215, 215, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 210, 210, + 210, 210, 210, 210, 217, 0, 0, 0, 0, 0, + 0, 217, 217, 217, 217, 217, 217, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 215, 215, 215, 215, 215, 215, 218, 218, 218, 218, - 218, 0, 218, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 218, 0, 0, 0, 0, - 0, 0, 218, 218, 218, 218, 218, 218, 0, 0, + 217, 217, 217, 217, 217, 217, 220, 220, 220, 220, + 220, 0, 220, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 220, 0, 0, 0, 0, + 0, 0, 220, 220, 220, 220, 220, 220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 218, 0, - 0, 218, 218, 218, 218, 218, 218, 220, 0, 0, - 0, 0, 0, 0, 220, 220, 220, 220, 220, 220, + 0, 0, 0, 0, 0, 0, 0, 0, 220, 0, + 0, 220, 220, 220, 220, 220, 220, 222, 0, 0, + 0, 0, 0, 0, 222, 222, 222, 222, 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 220, 220, 220, 220, 220, 220, 221, - 221, 221, 221, 221, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 221, 0, - 0, 0, 0, 0, 0, 221, 221, 221, 221, 221, - 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 222, 222, 222, 222, 222, 222, 223, + 223, 223, 223, 223, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 223, 0, + 0, 0, 0, 0, 0, 223, 223, 223, 223, 223, + 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 221, 221, 221, 221, 221, 221, - 222, 222, 222, 222, 222, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, + 0, 0, 0, 0, 223, 223, 223, 223, 223, 223, + 224, 224, 224, 224, 224, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, - 0, 0, 0, 0, 0, 0, 222, 222, 222, 222, - 222, 222, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 224, 224, 224, 224, + 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 222, 222, 222, 222, 222, - 222, 223, 223, 223, 223, 223, 0, 0, 0, 0, - 0, 0, 223, 0, 0, 0, 0, 0, 0, 0, - 223, 0, 0, 0, 0, 0, 0, 223, 223, 223, - 223, 223, 223, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 224, 224, 224, 224, 224, + 224, 225, 225, 225, 225, 225, 0, 0, 0, 0, + 0, 0, 225, 0, 0, 0, 0, 0, 0, 0, + 225, 0, 0, 0, 0, 0, 0, 225, 225, 225, + 225, 225, 225, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 223, 0, 0, 223, 223, 223, 223, + 0, 0, 0, 225, 0, 0, 225, 225, 225, 225, - 223, 223, 227, 227, 227, 227, 227, 0, 0, 0, + 225, 225, 229, 229, 229, 229, 229, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 227, 0, 0, 0, 0, 0, 0, 227, 227, - 227, 227, 227, 227, 0, 0, 0, 0, 0, 0, + 0, 229, 0, 0, 0, 0, 0, 0, 229, 229, + 229, 229, 229, 229, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 227, 227, 227, - 227, 227, 227, 230, 0, 0, 0, 0, 0, 0, - 230, 230, 230, 230, 230, 230, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 229, 229, 229, + 229, 229, 229, 232, 0, 0, 0, 0, 0, 0, + 232, 232, 232, 232, 232, 232, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 232, - 230, 230, 230, 230, 230, 233, 233, 233, 233, 233, + 232, 232, 232, 232, 232, 235, 235, 235, 235, 235, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 233, 0, 0, 0, 0, 0, - 0, 233, 233, 233, 233, 233, 233, 0, 0, 0, + 0, 0, 0, 0, 235, 0, 0, 0, 0, 0, + 0, 235, 235, 235, 235, 235, 235, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 233, 233, 233, 233, 233, 233, 240, 0, 0, 0, - 0, 0, 0, 240, 240, 240, 240, 240, 240, 0, + 235, 235, 235, 235, 235, 235, 242, 0, 0, 0, + 0, 0, 0, 242, 242, 242, 242, 242, 242, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 240, 240, 240, 240, 240, 240, 241, 241, - 241, 241, 241, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 241, 0, 0, - 0, 0, 0, 0, 241, 241, 241, 241, 241, 241, + 0, 0, 242, 242, 242, 242, 242, 242, 243, 243, + 243, 243, 243, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 243, 0, 0, + 0, 0, 0, 0, 243, 243, 243, 243, 243, 243, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 241, 241, 241, 241, 241, 241, 252, - 252, 252, 252, 252, 0, 252, 0, 0, 0, 0, - 252, 252, 252, 0, 0, 0, 0, 0, 252, 0, - 0, 0, 0, 0, 0, 252, 252, 252, 252, 252, + 0, 0, 0, 243, 243, 243, 243, 243, 243, 254, + 254, 254, 254, 254, 0, 254, 0, 0, 0, 0, + 254, 254, 254, 0, 0, 0, 0, 0, 254, 0, + 0, 0, 0, 0, 0, 254, 254, 254, 254, 254, - 252, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 252, 0, 0, 252, 252, 252, 252, 252, 252, - 253, 0, 0, 0, 0, 0, 0, 253, 253, 253, - 253, 253, 253, 0, 0, 0, 0, 0, 0, 0, + 0, 254, 0, 0, 254, 254, 254, 254, 254, 254, + 255, 0, 0, 0, 0, 0, 0, 255, 255, 255, + 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 253, 253, 253, 253, - 253, 253, 255, 255, 255, 255, 255, 0, 255, 0, + 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, + 255, 255, 257, 257, 257, 257, 257, 0, 257, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 255, 0, 0, 0, 0, 0, 0, 255, 255, + 0, 257, 0, 0, 0, 0, 0, 0, 257, 257, - 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, + 257, 257, 257, 257, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 255, 0, 0, 255, 255, 255, - 255, 255, 255, 257, 0, 0, 0, 0, 0, 0, - 257, 257, 257, 257, 257, 257, 0, 0, 0, 0, + 0, 0, 0, 0, 257, 0, 0, 257, 257, 257, + 257, 257, 257, 259, 0, 0, 0, 0, 0, 0, + 259, 259, 259, 259, 259, 259, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 257, 0, 0, 257, - 257, 257, 257, 257, 257, 258, 258, 258, 258, 258, + 0, 0, 0, 0, 0, 0, 259, 0, 0, 259, + 259, 259, 259, 259, 259, 260, 260, 260, 260, 260, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 258, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 260, 0, 0, 0, 0, 0, - 0, 258, 258, 258, 258, 258, 258, 0, 0, 0, + 0, 260, 260, 260, 260, 260, 260, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 258, 0, 0, - 258, 258, 258, 258, 258, 258, 259, 259, 259, 259, - 259, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 259, 0, 0, 0, 0, - 0, 0, 259, 259, 259, 259, 259, 259, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 260, 0, 0, + 260, 260, 260, 260, 260, 260, 261, 261, 261, 261, + 261, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 261, 0, 0, 0, 0, + 0, 0, 261, 261, 261, 261, 261, 261, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 259, 259, 259, 259, 259, 259, 260, 260, 260, + 0, 261, 261, 261, 261, 261, 261, 262, 262, 262, - 260, 260, 0, 0, 0, 0, 0, 0, 260, 0, - 0, 0, 0, 0, 0, 0, 260, 0, 0, 0, - 0, 0, 0, 260, 260, 260, 260, 260, 260, 0, + 262, 262, 0, 0, 0, 0, 0, 0, 262, 0, + 0, 0, 0, 0, 0, 0, 262, 0, 0, 0, + 0, 0, 0, 262, 262, 262, 262, 262, 262, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 260, - 0, 0, 260, 260, 260, 260, 260, 260, 261, 261, - 261, 261, 261, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 261, 0, 0, - 0, 0, 0, 0, 261, 261, 261, 261, 261, 261, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 262, + 0, 0, 262, 262, 262, 262, 262, 262, 263, 263, + 263, 263, 263, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 263, 0, 0, + 0, 0, 0, 0, 263, 263, 263, 263, 263, 263, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 261, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 261, 261, 261, 261, 261, 261, 0, + 0, 0, 0, 263, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 263, 263, 263, 263, 263, 263, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 261, 262, 262, 262, 262, 262, 0, 0, 0, + 0, 263, 264, 264, 264, 264, 264, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 262, 0, 0, 0, 0, 0, 0, 262, 262, - 262, 262, 262, 262, 0, 0, 0, 0, 0, 0, + 0, 264, 0, 0, 0, 0, 0, 0, 264, 264, + 264, 264, 264, 264, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 262, 262, 262, - 262, 262, 262, 263, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 264, 264, 264, + 264, 264, 264, 265, 0, 0, 0, 0, 0, 0, - 263, 263, 263, 263, 263, 263, 0, 0, 0, 0, + 265, 265, 265, 265, 265, 265, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 263, - 263, 263, 263, 263, 263, 264, 264, 264, 264, 264, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 265, + 265, 265, 265, 265, 265, 266, 266, 266, 266, 266, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 264, 0, 0, 0, 0, 0, - 0, 264, 264, 264, 264, 264, 264, 0, 0, 0, + 0, 0, 0, 0, 266, 0, 0, 0, 0, 0, + 0, 266, 266, 266, 266, 266, 266, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 264, 264, 264, 264, 264, 264, 266, 266, 266, 266, + 266, 266, 266, 266, 266, 266, 268, 268, 268, 268, - 266, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 266, 0, 0, 0, 0, - 0, 0, 266, 266, 266, 266, 266, 266, 0, 0, + 268, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 268, 0, 0, 0, 0, + 0, 0, 268, 268, 268, 268, 268, 268, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 266, 266, 266, 266, 266, 266, 272, 0, 0, - 0, 0, 0, 0, 272, 272, 272, 272, 272, 272, + 0, 268, 268, 268, 268, 268, 268, 274, 0, 0, + 0, 0, 0, 0, 274, 274, 274, 274, 274, 274, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 272, 272, 272, 272, 272, 272, 273, + 0, 0, 0, 274, 274, 274, 274, 274, 274, 275, - 273, 273, 273, 273, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 273, 0, - 0, 0, 0, 0, 0, 273, 273, 273, 273, 273, - 273, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 275, 275, 275, 275, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 275, 0, + 0, 0, 0, 0, 0, 275, 275, 275, 275, 275, + 275, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 273, 273, 273, 273, 273, 273, - 283, 283, 283, 283, 0, 0, 283, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 283, - 0, 0, 0, 0, 0, 0, 283, 283, 283, 283, - 283, 283, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 275, 275, 275, 275, 275, 275, + 285, 285, 285, 285, 0, 0, 285, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 285, + 0, 0, 0, 0, 0, 0, 285, 285, 285, 285, + 285, 285, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 283, 0, 0, 283, 283, 283, 283, 283, - 283, 285, 285, 285, 285, 0, 0, 0, 0, 0, - 0, 0, 285, 0, 0, 0, 0, 0, 0, 0, - 285, 0, 0, 0, 0, 0, 0, 285, 285, 285, - 285, 285, 285, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 285, 0, 0, 285, 285, 285, 285, 285, + 285, 287, 287, 287, 287, 0, 0, 0, 0, 0, + 0, 0, 287, 0, 0, 0, 0, 0, 0, 0, + 287, 0, 0, 0, 0, 0, 0, 287, 287, 287, + 287, 287, 287, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 285, 0, 0, 285, 285, 285, 285, - 285, 285, 290, 290, 290, 290, 290, 0, 0, 0, - 0, 0, 0, 0, 0, 290, 0, 0, 0, 0, + 0, 0, 0, 287, 0, 0, 287, 287, 287, 287, + 287, 287, 292, 292, 292, 292, 292, 0, 0, 0, + 0, 0, 0, 0, 0, 292, 0, 0, 0, 0, - 0, 290, 0, 0, 0, 0, 0, 0, 290, 290, - 290, 290, 290, 290, 0, 0, 0, 0, 0, 0, + 0, 292, 0, 0, 0, 0, 0, 0, 292, 292, + 292, 292, 292, 292, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 290, 0, 0, 290, 290, 290, - 290, 290, 290, 291, 291, 291, 291, 291, 0, 291, - 0, 0, 0, 0, 291, 291, 291, 0, 0, 0, - 0, 0, 291, 0, 0, 0, 0, 0, 0, 291, - 291, 291, 291, 291, 291, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 292, 0, 0, 292, 292, 292, + 292, 292, 292, 293, 293, 293, 293, 293, 0, 293, + 0, 0, 0, 0, 293, 293, 293, 0, 0, 0, + 0, 0, 293, 0, 0, 0, 0, 0, 0, 293, + 293, 293, 293, 293, 293, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 291, 0, 0, 291, 291, + 0, 0, 0, 0, 0, 293, 0, 0, 293, 293, - 291, 291, 291, 291, 292, 0, 0, 0, 0, 0, - 0, 292, 292, 292, 292, 292, 292, 0, 0, 0, + 293, 293, 293, 293, 294, 0, 0, 0, 0, 0, + 0, 294, 294, 294, 294, 294, 294, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 292, 292, 292, 292, 292, 292, 294, 294, 294, 294, - 294, 0, 294, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 294, 0, 0, 0, 0, - 0, 0, 294, 294, 294, 294, 294, 294, 0, 0, + 294, 294, 294, 294, 294, 294, 296, 296, 296, 296, + 296, 0, 296, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 296, 0, 0, 0, 0, + 0, 0, 296, 296, 296, 296, 296, 296, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 294, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 296, 0, - 0, 294, 294, 294, 294, 294, 294, 297, 297, 297, - 297, 297, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 297, 0, 0, 0, - 0, 0, 0, 297, 297, 297, 297, 297, 297, 0, + 0, 296, 296, 296, 296, 296, 296, 299, 299, 299, + 299, 299, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 299, 0, 0, 0, + 0, 0, 0, 299, 299, 299, 299, 299, 299, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 297, - 0, 0, 297, 297, 297, 297, 297, 297, 298, 298, - 298, 298, 298, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 298, 0, 0, - 0, 0, 0, 0, 298, 298, 298, 298, 298, 298, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 299, + 0, 0, 299, 299, 299, 299, 299, 299, 300, 300, + 300, 300, 300, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 300, 0, 0, + 0, 0, 0, 0, 300, 300, 300, 300, 300, 300, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 298, 298, 298, 298, 298, 298, 299, - 299, 299, 299, 299, 0, 0, 0, 0, 0, 0, - 299, 0, 0, 0, 0, 0, 0, 0, 299, 0, - 0, 0, 0, 0, 0, 299, 299, 299, 299, 299, - 299, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 300, 300, 300, 300, 300, 300, 301, + 301, 301, 301, 301, 0, 0, 0, 0, 0, 0, + 301, 0, 0, 0, 0, 0, 0, 0, 301, 0, + 0, 0, 0, 0, 0, 301, 301, 301, 301, 301, + 301, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 299, 0, 0, 299, 299, 299, 299, 299, 299, - 300, 300, 300, 300, 300, 0, 0, 0, 0, 0, + 0, 301, 0, 0, 301, 301, 301, 301, 301, 301, + 302, 302, 302, 302, 302, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 300, 0, 0, 300, - 0, 0, 0, 0, 0, 0, 300, 300, 300, 300, - 300, 300, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 302, 0, 0, 302, + 0, 0, 0, 0, 0, 0, 302, 302, 302, 302, + 302, 302, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 300, 300, 300, 300, 300, - 300, 301, 301, 301, 301, 301, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 302, 302, 302, 302, 302, + 302, 303, 303, 303, 303, 303, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 301, 0, 0, 0, 0, 0, 0, 301, 301, 301, - 301, 301, 301, 0, 0, 0, 0, 0, 0, 0, + 303, 0, 0, 0, 0, 0, 0, 303, 303, 303, + 303, 303, 303, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 301, 301, 301, 301, - 301, 301, 302, 302, 302, 302, 302, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 303, 303, 303, 303, + 303, 303, 304, 304, 304, 304, 304, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 302, 0, 0, 0, 0, 0, 0, 302, 302, - 302, 302, 302, 302, 0, 0, 0, 0, 0, 0, + 0, 304, 0, 0, 0, 0, 0, 0, 304, 304, + 304, 304, 304, 304, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 302, 302, 302, - 302, 302, 302, 304, 304, 304, 304, 304, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 304, 304, 304, + 304, 304, 304, 306, 306, 306, 306, 306, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 304, 0, 0, 0, 0, 0, 0, 304, + 0, 0, 306, 0, 0, 0, 0, 0, 0, 306, - 304, 304, 304, 304, 304, 0, 0, 0, 0, 0, + 306, 306, 306, 306, 306, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 304, 304, - 304, 304, 304, 304, 309, 0, 0, 0, 0, 0, - 0, 309, 309, 309, 309, 309, 309, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 306, 306, + 306, 306, 306, 306, 311, 0, 0, 0, 0, 0, + 0, 311, 311, 311, 311, 311, 311, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 309, 309, 309, 309, 309, 309, 310, 310, 310, 310, - 310, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 310, 0, 0, 0, 0, + 311, 311, 311, 311, 311, 311, 312, 312, 312, 312, + 312, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 312, 0, 0, 0, 0, - 0, 0, 310, 310, 310, 310, 310, 310, 0, 0, + 0, 0, 312, 312, 312, 312, 312, 312, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 310, 310, 310, 310, 310, 310, 323, 323, 323, - 323, 323, 0, 323, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 323, 0, 0, 0, - 0, 0, 0, 323, 323, 323, 323, 323, 323, 0, + 0, 312, 312, 312, 312, 312, 312, 325, 325, 325, + 325, 325, 0, 325, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 325, 0, 0, 0, + 0, 0, 0, 325, 325, 325, 325, 325, 325, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 323, - 0, 0, 323, 323, 323, 323, 323, 323, 324, 324, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 325, + 0, 0, 325, 325, 325, 325, 325, 325, 326, 326, - 324, 324, 0, 0, 324, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 324, 0, 0, - 0, 0, 0, 0, 324, 324, 324, 324, 324, 324, + 326, 326, 0, 0, 326, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 326, 0, 0, + 0, 0, 0, 0, 326, 326, 326, 326, 326, 326, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 324, 0, 0, 324, 324, 324, 324, 324, 324, 328, - 328, 328, 328, 328, 0, 0, 0, 0, 0, 0, - 328, 0, 0, 0, 0, 0, 0, 0, 328, 0, - 0, 0, 0, 0, 0, 328, 328, 328, 328, 328, - 328, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 326, 0, 0, 326, 326, 326, 326, 326, 326, 330, + 330, 330, 330, 330, 0, 0, 0, 0, 0, 0, + 330, 0, 0, 0, 0, 0, 0, 0, 330, 0, + 0, 0, 0, 0, 0, 330, 330, 330, 330, 330, + 330, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 328, 0, 0, 328, 328, 328, 328, 328, 328, - 329, 329, 329, 329, 0, 0, 0, 0, 0, 0, - 0, 329, 0, 0, 0, 0, 0, 0, 0, 329, - 0, 0, 0, 0, 0, 0, 329, 329, 329, 329, - 329, 329, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 330, 0, 0, 330, 330, 330, 330, 330, 330, + 331, 331, 331, 331, 0, 0, 0, 0, 0, 0, + 0, 331, 0, 0, 0, 0, 0, 0, 0, 331, + 0, 0, 0, 0, 0, 0, 331, 331, 331, 331, + 331, 331, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 329, 0, 0, 329, 329, 329, 329, 329, - 329, 330, 330, 330, 330, 330, 0, 0, 0, 0, - 0, 0, 0, 0, 330, 0, 0, 0, 0, 0, + 0, 0, 331, 0, 0, 331, 331, 331, 331, 331, + 331, 332, 332, 332, 332, 332, 0, 0, 0, 0, + 0, 0, 0, 0, 332, 0, 0, 0, 0, 0, - 330, 0, 0, 0, 0, 0, 0, 330, 330, 330, - 330, 330, 330, 0, 0, 0, 0, 0, 0, 0, + 332, 0, 0, 0, 0, 0, 0, 332, 332, 332, + 332, 332, 332, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 330, 0, 0, 330, 330, 330, 330, - 330, 330, 334, 0, 0, 0, 0, 0, 0, 334, - 334, 334, 334, 334, 334, 0, 0, 0, 0, 0, + 0, 0, 0, 332, 0, 0, 332, 332, 332, 332, + 332, 332, 336, 0, 0, 0, 0, 0, 0, 336, + 336, 336, 336, 336, 336, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 334, 334, - 334, 334, 334, 334, 335, 0, 0, 0, 0, 0, - 0, 335, 335, 335, 335, 335, 335, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 336, 336, + 336, 336, 336, 336, 337, 0, 0, 0, 0, 0, + 0, 337, 337, 337, 337, 337, 337, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 335, 335, 335, 335, 335, 335, 338, 0, 0, 0, - 0, 0, 0, 338, 338, 338, 338, 338, 338, 0, + 337, 337, 337, 337, 337, 337, 340, 0, 0, 0, + 0, 0, 0, 340, 340, 340, 340, 340, 340, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 338, 338, 338, 338, 338, 338, 339, 339, - 339, 339, 339, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 339, 0, 0, - 0, 0, 0, 0, 339, 339, 339, 339, 339, 339, + 0, 0, 340, 340, 340, 340, 340, 340, 341, 341, + 341, 341, 341, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 341, 0, 0, + 0, 0, 0, 0, 341, 341, 341, 341, 341, 341, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 339, 339, 339, 339, 339, 339, 341, - 341, 341, 341, 341, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 341, 0, - 0, 0, 0, 0, 0, 341, 341, 341, 341, 341, - 341, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 341, 341, 341, 341, 341, 341, 343, + 343, 343, 343, 343, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 343, 0, + 0, 0, 0, 0, 0, 343, 343, 343, 343, 343, + 343, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 341, 341, 341, 341, 341, 341, - 358, 0, 0, 0, 0, 0, 0, 358, 358, 358, + 0, 0, 0, 0, 343, 343, 343, 343, 343, 343, + 360, 0, 0, 0, 0, 0, 0, 360, 360, 360, - 358, 358, 358, 0, 0, 0, 0, 0, 0, 0, + 360, 360, 360, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 358, 358, 358, 358, - 358, 358, 362, 0, 0, 0, 0, 0, 0, 362, - 362, 362, 362, 362, 362, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 360, 360, 360, 360, + 360, 360, 364, 0, 0, 0, 0, 0, 0, 364, + 364, 364, 364, 364, 364, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 362, 362, - 362, 362, 362, 362, 363, 363, 363, 363, 363, 0, - 0, 0, 0, 0, 0, 0, 0, 363, 0, 0, - 0, 0, 0, 363, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 364, 364, + 364, 364, 364, 364, 365, 365, 365, 365, 365, 0, + 0, 0, 0, 0, 0, 0, 0, 365, 0, 0, + 0, 0, 0, 365, 0, 0, 0, 0, 0, 0, - 363, 363, 363, 363, 363, 363, 0, 0, 0, 0, + 365, 365, 365, 365, 365, 365, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 363, 0, 0, 363, - 363, 363, 363, 363, 363, 368, 0, 0, 0, 0, - 0, 0, 368, 0, 368, 0, 0, 0, 0, 368, - 368, 0, 0, 368, 0, 0, 0, 0, 368, 0, - 0, 0, 0, 0, 368, 0, 0, 0, 0, 0, - 368, 0, 368, 0, 0, 0, 0, 368, 368, 0, - 0, 368, 373, 0, 0, 0, 0, 0, 0, 373, - 373, 373, 373, 373, 373, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 365, 0, 0, 365, + 365, 365, 365, 365, 365, 370, 0, 0, 0, 0, + 0, 0, 370, 0, 370, 0, 0, 0, 0, 370, + 370, 0, 0, 370, 0, 0, 0, 0, 370, 0, + 0, 0, 0, 0, 370, 0, 0, 0, 0, 0, + 370, 0, 370, 0, 0, 0, 0, 370, 370, 0, + 0, 370, 375, 0, 0, 0, 0, 0, 0, 375, + 375, 375, 375, 375, 375, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 373, 373, - 373, 373, 373, 373, 374, 0, 0, 0, 0, 0, - 0, 374, 374, 374, 374, 374, 374, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 375, 375, + 375, 375, 375, 375, 376, 0, 0, 0, 0, 0, + 0, 376, 376, 376, 376, 376, 376, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 374, 374, 374, 374, 374, 374, 375, 0, 0, 0, - 0, 0, 0, 375, 375, 375, 375, 375, 375, 0, + 376, 376, 376, 376, 376, 376, 377, 0, 0, 0, + 0, 0, 0, 377, 377, 377, 377, 377, 377, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 375, 375, 375, 375, 375, 375, 387, 0, - 0, 0, 0, 0, 0, 387, 387, 387, 387, 387, - 387, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 377, 377, 377, 377, 377, 377, 389, 0, + 0, 0, 0, 0, 0, 389, 389, 389, 389, 389, + 389, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 387, 387, 387, 387, 387, 387, - 388, 0, 0, 0, 0, 0, 0, 388, 388, 388, - 388, 388, 388, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 389, 389, 389, 389, 389, 389, + 390, 0, 0, 0, 0, 0, 0, 390, 390, 390, + 390, 390, 390, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 388, 388, 388, 388, - 388, 388, 389, 0, 0, 0, 0, 0, 0, 389, + 0, 0, 0, 0, 0, 0, 390, 390, 390, 390, + 390, 390, 391, 0, 0, 0, 0, 0, 0, 391, - 389, 389, 389, 389, 389, 0, 0, 0, 0, 0, + 391, 391, 391, 391, 391, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 389, 389, - 389, 389, 389, 389, 397, 0, 0, 0, 0, 0, - 0, 397, 397, 397, 397, 397, 397, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 391, 391, + 391, 391, 391, 391, 399, 0, 0, 0, 0, 0, + 0, 399, 399, 399, 399, 399, 399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 397, 397, 397, 397, 397, 397, 398, 0, 0, 0, - 0, 0, 0, 398, 398, 398, 398, 398, 398, 0, + 399, 399, 399, 399, 399, 399, 400, 0, 0, 0, + 0, 0, 0, 400, 400, 400, 400, 400, 400, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 398, 398, 398, 398, 398, 398, 414, 0, - 0, 0, 0, 0, 0, 414, 414, 414, 414, 414, - 414, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 400, 400, 400, 400, 400, 400, 416, 0, + 0, 0, 0, 0, 0, 416, 416, 416, 416, 416, + 416, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 414, 414, 414, 414, 414, 414, - 426, 0, 0, 0, 0, 0, 0, 426, 426, 426, - 426, 426, 426, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 416, 416, 416, 416, 416, 416, + 428, 0, 0, 0, 0, 0, 0, 428, 428, 428, + 428, 428, 428, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 426, 426, 426, 426, + 0, 0, 0, 0, 0, 0, 428, 428, 428, 428, - 426, 426, 428, 428, 428, 428, 428, 0, 0, 0, - 0, 0, 0, 0, 0, 428, 0, 0, 0, 0, - 0, 428, 0, 0, 0, 0, 0, 0, 428, 428, - 428, 428, 428, 428, 0, 0, 0, 0, 0, 0, + 428, 428, 430, 430, 430, 430, 430, 0, 0, 0, + 0, 0, 0, 0, 0, 430, 0, 0, 0, 0, + 0, 430, 0, 0, 0, 0, 0, 0, 430, 430, + 430, 430, 430, 430, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 428, 0, 0, 428, 428, 428, - 428, 428, 428, 437, 437, 437, 437, 437, 0, 0, + 0, 0, 0, 0, 430, 0, 0, 430, 430, 430, + 430, 430, 430, 439, 439, 439, 439, 439, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 437, 0, 0, 0, 0, 0, 0, 437, - 437, 437, 437, 437, 437, 0, 0, 0, 0, 0, + 0, 0, 439, 0, 0, 0, 0, 0, 0, 439, + 439, 439, 439, 439, 439, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 437, 437, - 437, 437, 437, 437, 439, 0, 0, 0, 0, 0, - 0, 439, 439, 439, 439, 439, 439, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 439, 439, + 439, 439, 439, 439, 441, 0, 0, 0, 0, 0, + 0, 441, 441, 441, 441, 441, 441, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 439, 439, 439, 439, 439, 439, 446, 0, 0, 0, - 0, 0, 0, 446, 446, 446, 446, 446, 446, 0, + 441, 441, 441, 441, 441, 441, 448, 0, 0, 0, + 0, 0, 0, 448, 448, 448, 448, 448, 448, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 446, 446, 446, 446, 446, 446, 447, 0, - 0, 0, 0, 0, 0, 447, 447, 447, 447, 447, - 447, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 448, 448, 448, 448, 448, 448, 449, 0, + 0, 0, 0, 0, 0, 449, 449, 449, 449, 449, + 449, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 447, 447, 447, 447, 447, 447, - 452, 0, 0, 0, 0, 0, 0, 452, 452, 452, - 452, 452, 452, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 449, 449, 449, 449, 449, 449, + 454, 0, 0, 0, 0, 0, 0, 454, 454, 454, + 454, 454, 454, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 452, 452, 452, 452, - 452, 452, 453, 0, 0, 0, 0, 0, 0, 453, + 0, 0, 0, 0, 0, 0, 454, 454, 454, 454, + 454, 454, 455, 0, 0, 0, 0, 0, 0, 455, - 453, 453, 453, 453, 453, 0, 0, 0, 0, 0, + 455, 455, 455, 455, 455, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 453, 453, - 453, 453, 453, 453, 458, 0, 0, 0, 0, 0, - 0, 458, 458, 458, 458, 458, 458, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 455, 455, + 455, 455, 455, 455, 460, 0, 0, 0, 0, 0, + 0, 460, 460, 460, 460, 460, 460, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 458, 458, 458, 458, 458, 458, 459, 0, 0, 0, - 0, 0, 0, 459, 459, 459, 459, 459, 459, 0, + 460, 460, 460, 460, 460, 460, 461, 0, 0, 0, + 0, 0, 0, 461, 461, 461, 461, 461, 461, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 459, 459, 459, 459, 459, 459, 464, 0, - 0, 0, 0, 0, 0, 464, 464, 464, 464, 464, - 464, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 461, 461, 461, 461, 461, 461, 466, 0, + 0, 0, 0, 0, 0, 466, 466, 466, 466, 466, + 466, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 464, 464, 464, 464, 464, 464, - 479, 0, 0, 479, 479, 479, 479, 479, 479, 479, - 479, 479, 479, 480, 480, 0, 480, 480, 481, 0, - 0, 481, 481, 481, 481, 481, 481, 481, 481, 481, - 481, 482, 482, 0, 482, 482, 483, 0, 0, 483, - - 483, 484, 0, 484, 484, 0, 484, 484, 485, 485, - 485, 485, 485, 485, 485, 485, 485, 485, 486, 486, - 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, - 486, 488, 488, 0, 488, 488, 489, 489, 489, 489, - 489, 489, 489, 489, 489, 489, 490, 490, 490, 490, - 490, 490, 490, 490, 490, 490, 490, 490, 490, 491, - 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, - 491, 491, 491, 493, 493, 0, 493, 493, 494, 494, - 494, 494, 494, 494, 494, 494, 494, 494, 495, 495, - 0, 495, 495, 496, 496, 496, 496, 496, 496, 496, + 0, 0, 0, 0, 466, 466, 466, 466, 466, 466, + 481, 0, 0, 481, 481, 481, 481, 481, 481, 481, + 481, 481, 481, 482, 482, 0, 482, 482, 483, 0, + 0, 483, 483, 483, 483, 483, 483, 483, 483, 483, + 483, 484, 484, 0, 484, 484, 485, 0, 0, 485, - 496, 496, 496, 497, 497, 497, 497, 497, 497, 497, - 497, 497, 497, 498, 498, 498, 500, 500, 500, 500, - 500, 500, 500, 500, 500, 500, 501, 501, 0, 501, - 501, 501, 501, 501, 501, 501, 501, 501, 501, 502, - 502, 502, 502, 502, 502, 502, 502, 502, 502, 502, - 502, 502, 503, 503, 503, 503, 503, 503, 503, 503, - 503, 503, 503, 503, 503, 503, 504, 504, 504, 504, + 485, 486, 0, 486, 486, 0, 486, 486, 487, 487, + 487, 487, 487, 487, 487, 487, 487, 487, 488, 488, + 488, 488, 488, 488, 488, 488, 488, 488, 488, 488, + 488, 490, 490, 0, 490, 490, 491, 491, 491, 491, + 491, 491, 491, 491, 491, 491, 492, 492, 492, 492, + 492, 492, 492, 492, 492, 492, 492, 492, 492, 493, + 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, + 493, 493, 493, 495, 495, 0, 495, 495, 496, 496, + 496, 496, 496, 496, 496, 496, 496, 496, 497, 497, + 0, 497, 497, 498, 498, 498, 498, 498, 498, 498, + + 498, 498, 498, 499, 499, 499, 499, 499, 499, 499, + 499, 499, 499, 500, 500, 500, 502, 502, 502, 502, + 502, 502, 502, 502, 502, 502, 503, 503, 0, 503, + 503, 503, 503, 503, 503, 503, 503, 503, 503, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, 504, - 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, + 504, 504, 505, 505, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 505, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, - - 507, 507, 507, 507, 508, 0, 0, 508, 508, 508, - 508, 508, 508, 508, 508, 508, 508, 510, 510, 510, - 510, 510, 510, 510, 510, 510, 510, 510, 510, 510, - 510, 512, 512, 512, 512, 513, 513, 513, 513, 513, - 513, 0, 513, 513, 513, 513, 513, 513, 514, 514, - 514, 514, 514, 514, 514, 514, 514, 514, 514, 514, - 514, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 518, 518, 518, 518, 519, - 519, 519, 519, 519, 519, 0, 519, 519, 519, 519, - 519, 519, 520, 0, 0, 520, 520, 520, 520, 520, - - 520, 520, 520, 520, 520, 521, 0, 0, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 522, 522, - 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, - 522, 523, 523, 523, 523, 523, 523, 523, 523, 523, - 523, 523, 523, 523, 525, 525, 0, 525, 525, 526, - 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, - 526, 526, 528, 528, 528, 528, 529, 529, 529, 529, - 529, 529, 529, 529, 529, 529, 529, 529, 529, 530, - 0, 0, 530, 530, 530, 530, 530, 530, 530, 530, - 530, 530, 531, 531, 531, 531, 531, 531, 531, 531, - - 531, 531, 531, 531, 531, 532, 532, 532, 532, 532, - 0, 0, 532, 532, 532, 532, 532, 532, 533, 533, - 533, 533, 533, 533, 533, 533, 533, 533, 533, 533, - 533, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 535, 535, 0, 535, 535, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 538, 538, 538, 538, 539, 539, 0, 539, - 539, 539, 539, 539, 539, 539, 539, 539, 539, 540, - 540, 540, 540, 540, 540, 540, 540, 540, 540, 540, - 540, 540, 541, 541, 0, 541, 541, 541, 541, 541, - - 541, 541, 541, 541, 541, 542, 542, 542, 542, 542, - 542, 542, 542, 542, 542, 542, 542, 542, 543, 543, - 543, 543, 543, 0, 0, 543, 543, 543, 543, 543, - 543, 546, 546, 546, 546, 0, 0, 0, 0, 546, - 0, 0, 546, 546, 547, 547, 547, 547, 0, 0, - 0, 547, 547, 547, 0, 547, 547, 548, 548, 548, - 548, 548, 548, 548, 548, 548, 548, 549, 549, 549, - 549, 549, 549, 549, 549, 549, 549, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478 + 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, + 508, 508, 508, 508, 508, 508, 508, 508, 508, 508, + + 509, 509, 509, 509, 510, 0, 0, 510, 510, 510, + 510, 510, 510, 510, 510, 510, 510, 512, 512, 512, + 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, + 512, 514, 514, 514, 514, 515, 515, 515, 515, 515, + 515, 0, 515, 515, 515, 515, 515, 515, 516, 516, + 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, + 516, 518, 518, 518, 518, 518, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 520, 520, 520, 520, 521, + 521, 521, 521, 521, 521, 0, 521, 521, 521, 521, + 521, 521, 522, 0, 0, 522, 522, 522, 522, 522, + + 522, 522, 522, 522, 522, 523, 0, 0, 523, 523, + 523, 523, 523, 523, 523, 523, 523, 523, 524, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, + 524, 525, 525, 525, 525, 525, 525, 525, 525, 525, + 525, 525, 525, 525, 527, 527, 0, 527, 527, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 530, 530, 530, 530, 531, 531, 531, 531, + 531, 531, 531, 531, 531, 531, 531, 531, 531, 532, + 0, 0, 532, 532, 532, 532, 532, 532, 532, 532, + 532, 532, 533, 533, 533, 533, 533, 533, 533, 533, + + 533, 533, 533, 533, 533, 534, 534, 534, 534, 534, + 0, 0, 534, 534, 534, 534, 534, 534, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, + 535, 536, 536, 536, 536, 536, 536, 536, 536, 536, + 536, 536, 536, 536, 537, 537, 0, 537, 537, 538, + 538, 538, 538, 538, 538, 538, 538, 538, 538, 538, + 538, 538, 540, 540, 540, 540, 541, 541, 0, 541, + 541, 541, 541, 541, 541, 541, 541, 541, 541, 542, + 542, 542, 542, 542, 542, 542, 542, 542, 542, 542, + 542, 542, 543, 543, 0, 543, 543, 543, 543, 543, + + 543, 543, 543, 543, 543, 544, 544, 544, 544, 544, + 544, 544, 544, 544, 544, 544, 544, 544, 545, 545, + 545, 545, 545, 0, 0, 545, 545, 545, 545, 545, + 545, 548, 548, 548, 548, 0, 0, 0, 0, 548, + 0, 0, 548, 548, 549, 549, 549, 549, 0, 0, + 0, 549, 549, 549, 0, 549, 549, 550, 550, 550, + 550, 550, 550, 550, 550, 550, 550, 551, 551, 551, + 551, 551, 551, 551, 551, 551, 551, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480, 480, 480, 480, 480, 480, 480, 480, + 480, 480, 480 } ; #line 1 "" @@ -1807,7 +1809,7 @@ YY_DECL while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 479 ) + if ( yy_current_state >= 481 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2031,114 +2033,113 @@ YY_RULE_SETUP case 38: YY_RULE_SETUP #line 76 "" -{yyTok = QEMS; return yyTok;} /* quirky ems */ +{yyTok = REMS; return yyTok;} YY_BREAK case 39: YY_RULE_SETUP #line 77 "" -{yyTok = EXS; return yyTok;} +{yyTok = QEMS; return yyTok;} /* quirky ems */ YY_BREAK case 40: YY_RULE_SETUP #line 78 "" -{yyTok = PXS; return yyTok;} +{yyTok = EXS; return yyTok;} YY_BREAK case 41: YY_RULE_SETUP #line 79 "" -{yyTok = CMS; return yyTok;} +{yyTok = PXS; return yyTok;} YY_BREAK case 42: YY_RULE_SETUP #line 80 "" -{yyTok = MMS; return yyTok;} +{yyTok = CMS; return yyTok;} YY_BREAK case 43: YY_RULE_SETUP #line 81 "" -{yyTok = INS; return yyTok;} +{yyTok = MMS; return yyTok;} YY_BREAK case 44: YY_RULE_SETUP #line 82 "" -{yyTok = PTS; return yyTok;} +{yyTok = INS; return yyTok;} YY_BREAK case 45: YY_RULE_SETUP #line 83 "" -{yyTok = PCS; return yyTok;} +{yyTok = PTS; return yyTok;} YY_BREAK case 46: YY_RULE_SETUP #line 84 "" -{yyTok = DEGS; return yyTok;} +{yyTok = PCS; return yyTok;} YY_BREAK case 47: YY_RULE_SETUP #line 85 "" -{yyTok = RADS; return yyTok;} +{yyTok = DEGS; return yyTok;} YY_BREAK case 48: YY_RULE_SETUP #line 86 "" -{yyTok = GRADS; return yyTok;} +{yyTok = RADS; return yyTok;} YY_BREAK case 49: YY_RULE_SETUP #line 87 "" -{yyTok = TURNS; return yyTok;} +{yyTok = GRADS; return yyTok;} YY_BREAK case 50: YY_RULE_SETUP #line 88 "" -{yyTok = MSECS; return yyTok;} +{yyTok = TURNS; return yyTok;} YY_BREAK case 51: YY_RULE_SETUP #line 89 "" -{yyTok = SECS; return yyTok;} +{yyTok = MSECS; return yyTok;} YY_BREAK case 52: YY_RULE_SETUP #line 90 "" -{yyTok = HERZ; return yyTok;} +{yyTok = SECS; return yyTok;} YY_BREAK case 53: YY_RULE_SETUP #line 91 "" -{yyTok = KHERZ; return yyTok;} +{yyTok = HERZ; return yyTok;} YY_BREAK case 54: -/* rule 54 can match eol */ YY_RULE_SETUP #line 92 "" -{yyTok = DIMEN; return yyTok;} +{yyTok = KHERZ; return yyTok;} YY_BREAK case 55: +/* rule 55 can match eol */ YY_RULE_SETUP #line 93 "" -{yyTok = PERCENTAGE; return yyTok;} +{yyTok = DIMEN; return yyTok;} YY_BREAK case 56: YY_RULE_SETUP #line 94 "" -{yyTok = INTEGER; return yyTok;} +{yyTok = PERCENTAGE; return yyTok;} YY_BREAK case 57: YY_RULE_SETUP #line 95 "" -{yyTok = FLOATTOKEN; return yyTok;} +{yyTok = INTEGER; return yyTok;} YY_BREAK case 58: YY_RULE_SETUP -#line 97 "" -{yyTok = NOTFUNCTION; return yyTok;} +#line 96 "" +{yyTok = FLOATTOKEN; return yyTok;} YY_BREAK case 59: -/* rule 59 can match eol */ YY_RULE_SETUP #line 98 "" -{yyTok = URI; return yyTok;} +{yyTok = NOTFUNCTION; return yyTok;} YY_BREAK case 60: /* rule 60 can match eol */ @@ -2150,18 +2151,19 @@ case 61: /* rule 61 can match eol */ YY_RULE_SETUP #line 100 "" -{ yyTok = VARCALL; return yyTok; } +{yyTok = URI; return yyTok;} YY_BREAK case 62: /* rule 62 can match eol */ YY_RULE_SETUP #line 101 "" -{yyTok = FUNCTION; return yyTok;} +{ yyTok = VARCALL; return yyTok; } YY_BREAK case 63: +/* rule 63 can match eol */ YY_RULE_SETUP -#line 103 "" -{yyTok = UNICODERANGE; return yyTok;} +#line 102 "" +{yyTok = FUNCTION; return yyTok;} YY_BREAK case 64: YY_RULE_SETUP @@ -2169,23 +2171,28 @@ YY_RULE_SETUP {yyTok = UNICODERANGE; return yyTok;} YY_BREAK case 65: -#line 107 "" -case 66: YY_RULE_SETUP -#line 107 "" -{BEGIN(INITIAL); yyTok = *yytext; return yyTok; } +#line 105 "" +{yyTok = UNICODERANGE; return yyTok;} YY_BREAK +case 66: +#line 108 "" case 67: YY_RULE_SETUP #line 108 "" -{yyTok = *yytext; return yyTok;} +{BEGIN(INITIAL); yyTok = *yytext; return yyTok; } YY_BREAK case 68: YY_RULE_SETUP -#line 110 "" +#line 109 "" +{yyTok = *yytext; return yyTok;} + YY_BREAK +case 69: +YY_RULE_SETUP +#line 111 "" ECHO; YY_BREAK -#line 2738 "" +#line 2745 "" case YY_STATE_EOF(INITIAL): case YY_END_OF_BUFFER: case YY_STATE_EOF(mediaquery): diff --git a/src/3rdparty/webkit/WebCore/history/BackForwardList.cpp b/src/3rdparty/webkit/WebCore/history/BackForwardList.cpp index 1b7c80e85..a0636b5e4 100644 --- a/src/3rdparty/webkit/WebCore/history/BackForwardList.cpp +++ b/src/3rdparty/webkit/WebCore/history/BackForwardList.cpp @@ -266,11 +266,10 @@ bool BackForwardList::containsItem(HistoryItem* entry) } #if ENABLE(WML) -void BackForwardList::clearWmlPageHistory() +void BackForwardList::clearWMLPageHistory() { - PassRefPtr cur = currentItem(); - - for (unsigned i = 0; i < m_entries.size(); ++i) + int size = m_entries.size(); + for (int i = 0; i < size; ++i) pageCache()->remove(m_entries[i].get()); m_entries.clear(); diff --git a/src/3rdparty/webkit/WebCore/history/BackForwardList.h b/src/3rdparty/webkit/WebCore/history/BackForwardList.h index a99d387c8..fdc3360f2 100644 --- a/src/3rdparty/webkit/WebCore/history/BackForwardList.h +++ b/src/3rdparty/webkit/WebCore/history/BackForwardList.h @@ -97,7 +97,7 @@ public: HistoryItemVector& entries(); #if ENABLE(WML) - void clearWmlPageHistory(); + void clearWMLPageHistory(); #endif private: diff --git a/src/3rdparty/webkit/WebCore/history/CachedFrame.cpp b/src/3rdparty/webkit/WebCore/history/CachedFrame.cpp index 9a43b9dd6..5f4e746ed 100644 --- a/src/3rdparty/webkit/WebCore/history/CachedFrame.cpp +++ b/src/3rdparty/webkit/WebCore/history/CachedFrame.cpp @@ -155,4 +155,13 @@ CachedFramePlatformData* CachedFrame::cachedFramePlatformData() return m_cachedFramePlatformData.get(); } +int CachedFrame::descendantFrameCount() const +{ + int count = m_childFrames.size(); + for (size_t i = 0; i < m_childFrames.size(); ++i) + count += m_childFrames[i]->descendantFrameCount(); + + return count; +} + } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/history/CachedFrame.h b/src/3rdparty/webkit/WebCore/history/CachedFrame.h index 83c3c3c60..03024444b 100644 --- a/src/3rdparty/webkit/WebCore/history/CachedFrame.h +++ b/src/3rdparty/webkit/WebCore/history/CachedFrame.h @@ -60,6 +60,8 @@ public: void setCachedFramePlatformData(CachedFramePlatformData*); CachedFramePlatformData* cachedFramePlatformData(); + + int descendantFrameCount() const; private: CachedFrame(Frame*); diff --git a/src/3rdparty/webkit/WebCore/history/HistoryItem.cpp b/src/3rdparty/webkit/WebCore/history/HistoryItem.cpp index e19933728..d2b83cf20 100644 --- a/src/3rdparty/webkit/WebCore/history/HistoryItem.cpp +++ b/src/3rdparty/webkit/WebCore/history/HistoryItem.cpp @@ -480,7 +480,7 @@ FormData* HistoryItem::formData() bool HistoryItem::isCurrentDocument(Document* doc) const { // FIXME: We should find a better way to check if this is the current document. - return urlString() == doc->url(); + return equalIgnoringRef(url(), doc->url()); } void HistoryItem::mergeAutoCompleteHints(HistoryItem* otherItem) diff --git a/src/3rdparty/webkit/WebCore/history/PageCache.cpp b/src/3rdparty/webkit/WebCore/history/PageCache.cpp index 7c25701c9..8d04f6f9b 100644 --- a/src/3rdparty/webkit/WebCore/history/PageCache.cpp +++ b/src/3rdparty/webkit/WebCore/history/PageCache.cpp @@ -63,6 +63,23 @@ void PageCache::setCapacity(int capacity) prune(); } +int PageCache::frameCount() const +{ + int frameCount = 0; + for (HistoryItem* current = m_head; current; current = current->m_next) { + ++frameCount; + ASSERT(current->m_cachedPage); + frameCount += current->m_cachedPage ? current->m_cachedPage->cachedMainFrame()->descendantFrameCount() : 0; + } + + return frameCount; +} + +int PageCache::autoreleasedPageCount() const +{ + return m_autoreleaseSet.size(); +} + void PageCache::add(PassRefPtr prpItem, PassRefPtr cachedPage) { ASSERT(prpItem); diff --git a/src/3rdparty/webkit/WebCore/history/PageCache.h b/src/3rdparty/webkit/WebCore/history/PageCache.h index ad15ab622..607a87d82 100644 --- a/src/3rdparty/webkit/WebCore/history/PageCache.h +++ b/src/3rdparty/webkit/WebCore/history/PageCache.h @@ -37,7 +37,7 @@ namespace WebCore { class CachedPage; class HistoryItem; - class PageCache : Noncopyable { + class PageCache : public Noncopyable { public: friend PageCache* pageCache(); @@ -49,6 +49,10 @@ namespace WebCore { CachedPage* get(HistoryItem* item) { return item ? item->m_cachedPage.get() : 0; } void releaseAutoreleasedPagesNow(); + + int pageCount() const { return m_size; } + int frameCount() const; + int autoreleasedPageCount() const; private: typedef HashSet > CachedPageSet; diff --git a/src/3rdparty/webkit/WebCore/html/CanvasRenderingContext2D.cpp b/src/3rdparty/webkit/WebCore/html/CanvasRenderingContext2D.cpp index 7a255d8ab..68781291b 100644 --- a/src/3rdparty/webkit/WebCore/html/CanvasRenderingContext2D.cpp +++ b/src/3rdparty/webkit/WebCore/html/CanvasRenderingContext2D.cpp @@ -546,9 +546,10 @@ void CanvasRenderingContext2D::lineTo(float x, float y) return; if (!state().m_invertibleCTM) return; - if (m_path.isEmpty()) + if (!m_path.hasCurrentPoint()) m_path.moveTo(FloatPoint(x, y)); - m_path.addLineTo(FloatPoint(x, y)); + else + m_path.addLineTo(FloatPoint(x, y)); } void CanvasRenderingContext2D::quadraticCurveTo(float cpx, float cpy, float x, float y) @@ -557,9 +558,10 @@ void CanvasRenderingContext2D::quadraticCurveTo(float cpx, float cpy, float x, f return; if (!state().m_invertibleCTM) return; - if (m_path.isEmpty()) - m_path.moveTo(FloatPoint(cpx, cpy)); - m_path.addQuadCurveTo(FloatPoint(cpx, cpy), FloatPoint(x, y)); + if (!m_path.hasCurrentPoint()) + m_path.moveTo(FloatPoint(x, y)); + else + m_path.addQuadCurveTo(FloatPoint(cpx, cpy), FloatPoint(x, y)); } void CanvasRenderingContext2D::bezierCurveTo(float cp1x, float cp1y, float cp2x, float cp2y, float x, float y) @@ -568,9 +570,10 @@ void CanvasRenderingContext2D::bezierCurveTo(float cp1x, float cp1y, float cp2x, return; if (!state().m_invertibleCTM) return; - if (m_path.isEmpty()) - m_path.moveTo(FloatPoint(cp1x, cp1y)); - m_path.addBezierCurveTo(FloatPoint(cp1x, cp1y), FloatPoint(cp2x, cp2y), FloatPoint(x, y)); + if (!m_path.hasCurrentPoint()) + m_path.moveTo(FloatPoint(x, y)); + else + m_path.addBezierCurveTo(FloatPoint(cp1x, cp1y), FloatPoint(cp2x, cp2y), FloatPoint(x, y)); } void CanvasRenderingContext2D::arcTo(float x0, float y0, float x1, float y1, float r, ExceptionCode& ec) diff --git a/src/3rdparty/webkit/WebCore/html/CanvasRenderingContext2D.h b/src/3rdparty/webkit/WebCore/html/CanvasRenderingContext2D.h index f6baa7039..9648ffc7e 100644 --- a/src/3rdparty/webkit/WebCore/html/CanvasRenderingContext2D.h +++ b/src/3rdparty/webkit/WebCore/html/CanvasRenderingContext2D.h @@ -54,7 +54,7 @@ namespace WebCore { typedef int ExceptionCode; - class CanvasRenderingContext2D : Noncopyable { + class CanvasRenderingContext2D : public Noncopyable { public: CanvasRenderingContext2D(HTMLCanvasElement*); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLAnchorElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLAnchorElement.cpp index 09362cd16..1757a7593 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLAnchorElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLAnchorElement.cpp @@ -2,7 +2,7 @@ * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2000 Simon Hausmann - * Copyright (C) 2003, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. * (C) 2006 Graham Dennis (graham.dennis@gmail.com) * * This library is free software; you can redistribute it and/or @@ -24,51 +24,36 @@ #include "config.h" #include "HTMLAnchorElement.h" -#include "CSSHelper.h" #include "DNS.h" -#include "Document.h" -#include "Event.h" -#include "EventHandler.h" #include "EventNames.h" #include "Frame.h" -#include "FrameLoader.h" -#include "FrameLoaderClient.h" #include "HTMLImageElement.h" #include "HTMLNames.h" #include "KeyboardEvent.h" #include "MappedAttribute.h" #include "MouseEvent.h" -#include "MutationEvent.h" #include "Page.h" -#include "RenderBox.h" #include "RenderImage.h" -#include "ResourceRequest.h" -#include "SelectionController.h" #include "Settings.h" -#include "UIEvent.h" namespace WebCore { using namespace HTMLNames; -HTMLAnchorElement::HTMLAnchorElement(Document* doc) - : HTMLElement(aTag, doc) +HTMLAnchorElement::HTMLAnchorElement(Document* document) + : HTMLElement(aTag, document) , m_rootEditableElementForSelectionOnMouseDown(0) , m_wasShiftKeyDownOnMouseDown(false) { } -HTMLAnchorElement::HTMLAnchorElement(const QualifiedName& tagName, Document* doc) - : HTMLElement(tagName, doc) +HTMLAnchorElement::HTMLAnchorElement(const QualifiedName& tagName, Document* document) + : HTMLElement(tagName, document) , m_rootEditableElementForSelectionOnMouseDown(0) , m_wasShiftKeyDownOnMouseDown(false) { } -HTMLAnchorElement::~HTMLAnchorElement() -{ -} - bool HTMLAnchorElement::supportsFocus() const { if (isContentEditable()) @@ -194,7 +179,7 @@ void HTMLAnchorElement::defaultEventHandler(Event* evt) return; } - String url = parseURL(getAttribute(hrefAttr)); + String url = deprecatedParseURL(getAttribute(hrefAttr)); ASSERT(evt->target()); ASSERT(evt->target()->toNode()); @@ -283,7 +268,7 @@ void HTMLAnchorElement::parseMappedAttribute(MappedAttribute *attr) if (wasLink != isLink()) setNeedsStyleRecalc(); if (isLink()) { - String parsedURL = parseURL(attr->value()); + String parsedURL = deprecatedParseURL(attr->value()); if (document()->isDNSPrefetchEnabled()) { if (protocolIs(parsedURL, "http") || protocolIs(parsedURL, "https") || parsedURL.startsWith("//")) prefetchDNS(document()->completeURL(parsedURL).host()); @@ -320,34 +305,15 @@ bool HTMLAnchorElement::canStartSelection() const return isContentEditable(); } -const AtomicString& HTMLAnchorElement::accessKey() const -{ - return getAttribute(accesskeyAttr); -} - -void HTMLAnchorElement::setAccessKey(const AtomicString& value) -{ - setAttribute(accesskeyAttr, value); -} - -const AtomicString& HTMLAnchorElement::charset() const -{ - return getAttribute(charsetAttr); -} - -void HTMLAnchorElement::setCharset(const AtomicString& value) -{ - setAttribute(charsetAttr, value); -} - -const AtomicString& HTMLAnchorElement::coords() const -{ - return getAttribute(coordsAttr); -} - -void HTMLAnchorElement::setCoords(const AtomicString& value) +bool HTMLAnchorElement::draggable() const { - setAttribute(coordsAttr, value); + // Should be draggable if we have an href attribute. + const AtomicString& value = getAttribute(draggableAttr); + if (equalIgnoringCase(value, "true")) + return true; + if (equalIgnoringCase(value, "false")) + return false; + return hasAttribute(hrefAttr); } KURL HTMLAnchorElement::href() const @@ -360,56 +326,11 @@ void HTMLAnchorElement::setHref(const AtomicString& value) setAttribute(hrefAttr, value); } -const AtomicString& HTMLAnchorElement::hreflang() const -{ - return getAttribute(hreflangAttr); -} - -void HTMLAnchorElement::setHreflang(const AtomicString& value) -{ - setAttribute(hreflangAttr, value); -} - const AtomicString& HTMLAnchorElement::name() const { return getAttribute(nameAttr); } -void HTMLAnchorElement::setName(const AtomicString& value) -{ - setAttribute(nameAttr, value); -} - -const AtomicString& HTMLAnchorElement::rel() const -{ - return getAttribute(relAttr); -} - -void HTMLAnchorElement::setRel(const AtomicString& value) -{ - setAttribute(relAttr, value); -} - -const AtomicString& HTMLAnchorElement::rev() const -{ - return getAttribute(revAttr); -} - -void HTMLAnchorElement::setRev(const AtomicString& value) -{ - setAttribute(revAttr, value); -} - -const AtomicString& HTMLAnchorElement::shape() const -{ - return getAttribute(shapeAttr); -} - -void HTMLAnchorElement::setShape(const AtomicString& value) -{ - setAttribute(shapeAttr, value); -} - short HTMLAnchorElement::tabIndex() const { // Skip the supportsFocus check in HTMLElement. @@ -421,21 +342,6 @@ String HTMLAnchorElement::target() const return getAttribute(targetAttr); } -void HTMLAnchorElement::setTarget(const AtomicString& value) -{ - setAttribute(targetAttr, value); -} - -const AtomicString& HTMLAnchorElement::type() const -{ - return getAttribute(typeAttr); -} - -void HTMLAnchorElement::setType(const AtomicString& value) -{ - setAttribute(typeAttr, value); -} - String HTMLAnchorElement::hash() const { String ref = href().ref(); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLAnchorElement.h b/src/3rdparty/webkit/WebCore/html/HTMLAnchorElement.h index dd4b6f938..3c731183f 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLAnchorElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLAnchorElement.h @@ -2,7 +2,7 @@ * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2000 Simon Hausmann - * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -32,57 +32,11 @@ class HTMLAnchorElement : public HTMLElement { public: HTMLAnchorElement(Document*); HTMLAnchorElement(const QualifiedName&, Document*); - ~HTMLAnchorElement(); - - virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; } - virtual int tagPriority() const { return 1; } - - virtual bool supportsFocus() const; - virtual bool isMouseFocusable() const; - virtual bool isKeyboardFocusable(KeyboardEvent*) const; - virtual bool isFocusable() const; - virtual void parseMappedAttribute(MappedAttribute*); - virtual void defaultEventHandler(Event*); - virtual void setActive(bool active = true, bool pause = false); - virtual void accessKeyAction(bool fullAction); - virtual bool isURLAttribute(Attribute*) const; - - virtual bool canStartSelection() const; - - const AtomicString& accessKey() const; - void setAccessKey(const AtomicString&); - - const AtomicString& charset() const; - void setCharset(const AtomicString&); - - const AtomicString& coords() const; - void setCoords(const AtomicString&); KURL href() const; void setHref(const AtomicString&); - const AtomicString& hreflang() const; - void setHreflang(const AtomicString&); - const AtomicString& name() const; - void setName(const AtomicString&); - - const AtomicString& rel() const; - void setRel(const AtomicString&); - - const AtomicString& rev() const; - void setRev(const AtomicString&); - - const AtomicString& shape() const; - void setShape(const AtomicString&); - - virtual short tabIndex() const; - - virtual String target() const; - void setTarget(const AtomicString&); - - const AtomicString& type() const; - void setType(const AtomicString&); String hash() const; String host() const; @@ -92,12 +46,30 @@ public: String protocol() const; String search() const; String text() const; - + String toString() const; bool isLiveLink() const; +protected: + virtual void parseMappedAttribute(MappedAttribute*); + private: + virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; } + virtual int tagPriority() const { return 1; } + virtual bool supportsFocus() const; + virtual bool isMouseFocusable() const; + virtual bool isKeyboardFocusable(KeyboardEvent*) const; + virtual bool isFocusable() const; + virtual void defaultEventHandler(Event*); + virtual void setActive(bool active = true, bool pause = false); + virtual void accessKeyAction(bool fullAction); + virtual bool isURLAttribute(Attribute*) const; + virtual bool canStartSelection() const; + virtual String target() const; + virtual short tabIndex() const; + virtual bool draggable() const; + Element* m_rootEditableElementForSelectionOnMouseDown; bool m_wasShiftKeyDownOnMouseDown; }; diff --git a/src/3rdparty/webkit/WebCore/html/HTMLAnchorElement.idl b/src/3rdparty/webkit/WebCore/html/HTMLAnchorElement.idl index c2dda3d02..057358efe 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLAnchorElement.idl +++ b/src/3rdparty/webkit/WebCore/html/HTMLAnchorElement.idl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007 Apple Inc. + * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. * Copyright (C) 2006 Samuel Weinig * * This library is free software; you can redistribute it and/or @@ -25,17 +25,17 @@ module html { InterfaceUUID=0c74cef8-b1f7-4b44-83a9-8deeb376a257, ImplementationUUID=30f797d5-d145-498e-a126-d8e9ddeedea3 ] HTMLAnchorElement : HTMLElement { - attribute [ConvertNullToNullString] DOMString accessKey; - attribute [ConvertNullToNullString] DOMString charset; - attribute [ConvertNullToNullString] DOMString coords; - attribute [ConvertNullToNullString] DOMString href; - attribute [ConvertNullToNullString] DOMString hreflang; - attribute [ConvertNullToNullString] DOMString name; - attribute [ConvertNullToNullString] DOMString rel; - attribute [ConvertNullToNullString] DOMString rev; - attribute [ConvertNullToNullString] DOMString shape; - attribute [ConvertNullToNullString] DOMString target; - attribute [ConvertNullToNullString] DOMString type; + attribute [ConvertNullToNullString, Reflect=accesskey] DOMString accessKey; + attribute [ConvertNullToNullString, Reflect] DOMString charset; + attribute [ConvertNullToNullString, Reflect] DOMString coords; + attribute [ConvertNullToNullString, ReflectURL] DOMString href; + attribute [ConvertNullToNullString, Reflect] DOMString hreflang; + attribute [ConvertNullToNullString, Reflect] DOMString name; + attribute [ConvertNullToNullString, Reflect] DOMString rel; + attribute [ConvertNullToNullString, Reflect] DOMString rev; + attribute [ConvertNullToNullString, Reflect] DOMString shape; + attribute [ConvertNullToNullString, Reflect] DOMString target; + attribute [ConvertNullToNullString, Reflect] DOMString type; // IE Extensions readonly attribute DOMString hash; diff --git a/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.cpp index 13dd91172..32dfb7134 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.cpp @@ -2,7 +2,7 @@ * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2000 Stefan Schimanski (1Stein@gmx.de) - * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2005, 2006, 2008, 2009 Apple Inc. All rights reserved. * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) * * This library is free software; you can redistribute it and/or @@ -24,14 +24,11 @@ #include "config.h" #include "HTMLAppletElement.h" -#include "Frame.h" #include "HTMLDocument.h" #include "HTMLNames.h" #include "MappedAttribute.h" #include "RenderApplet.h" -#include "RenderInline.h" #include "Settings.h" -#include "ScriptController.h" namespace WebCore { @@ -43,10 +40,6 @@ HTMLAppletElement::HTMLAppletElement(const QualifiedName& tagName, Document* doc ASSERT(hasTagName(appletTag)); } -HTMLAppletElement::~HTMLAppletElement() -{ -} - void HTMLAppletElement::parseMappedAttribute(MappedAttribute* attr) { if (attr->name() == altAttr || @@ -163,46 +156,6 @@ void HTMLAppletElement::finishParsingChildren() renderer()->setNeedsLayout(true); // This will cause it to create its widget & the Java applet } -String HTMLAppletElement::alt() const -{ - return getAttribute(altAttr); -} - -void HTMLAppletElement::setAlt(const String &value) -{ - setAttribute(altAttr, value); -} - -String HTMLAppletElement::archive() const -{ - return getAttribute(archiveAttr); -} - -void HTMLAppletElement::setArchive(const String &value) -{ - setAttribute(archiveAttr, value); -} - -String HTMLAppletElement::code() const -{ - return getAttribute(codeAttr); -} - -void HTMLAppletElement::setCode(const String &value) -{ - setAttribute(codeAttr, value); -} - -String HTMLAppletElement::codeBase() const -{ - return getAttribute(codebaseAttr); -} - -void HTMLAppletElement::setCodeBase(const String &value) -{ - setAttribute(codebaseAttr, value); -} - String HTMLAppletElement::hspace() const { return getAttribute(hspaceAttr); @@ -213,16 +166,6 @@ void HTMLAppletElement::setHspace(const String &value) setAttribute(hspaceAttr, value); } -String HTMLAppletElement::object() const -{ - return getAttribute(objectAttr); -} - -void HTMLAppletElement::setObject(const String &value) -{ - setAttribute(objectAttr, value); -} - String HTMLAppletElement::vspace() const { return getAttribute(vspaceAttr); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.h b/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.h index e27196537..c616bb432 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.h @@ -1,7 +1,7 @@ /* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -33,8 +33,14 @@ class HTMLImageLoader; class HTMLAppletElement : public HTMLPlugInElement { public: HTMLAppletElement(const QualifiedName&, Document*); - ~HTMLAppletElement(); + String hspace() const; + void setHspace(const String&); + + String vspace() const; + void setVspace(const String&); + +private: virtual int tagPriority() const { return 1; } virtual void parseMappedAttribute(MappedAttribute*); @@ -45,33 +51,11 @@ public: virtual RenderWidget* renderWidgetForJSBindings() const; - String alt() const; - void setAlt(const String&); - - String archive() const; - void setArchive(const String&); - - String code() const; - void setCode(const String&); - - String codeBase() const; - void setCodeBase(const String&); - - String hspace() const; - void setHspace(const String&); - - String object() const; - void setObject(const String&); - - String vspace() const; - void setVspace(const String&); - void setupApplet() const; virtual void insertedIntoDocument(); virtual void removedFromDocument(); -private: AtomicString m_id; }; diff --git a/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.idl b/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.idl index da7a33ae2..cc923caa1 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.idl +++ b/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.idl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. + * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. * Copyright (C) 2006 Samuel Weinig * * This library is free software; you can redistribute it and/or @@ -29,25 +29,25 @@ module html { InterfaceUUID=9b5cb4a8-c156-4b55-afdb-c60938a4d1b1, ImplementationUUID=56544372-675e-40dd-ba39-fa708a4c7678 ] HTMLAppletElement : HTMLElement { - attribute [ConvertNullToNullString] DOMString align; - attribute [ConvertNullToNullString] DOMString alt; - attribute [ConvertNullToNullString] DOMString archive; - attribute [ConvertNullToNullString] DOMString code; - attribute [ConvertNullToNullString] DOMString codeBase; - attribute [ConvertNullToNullString] DOMString height; + attribute [ConvertNullToNullString, Reflect] DOMString align; + attribute [ConvertNullToNullString, Reflect] DOMString alt; + attribute [ConvertNullToNullString, Reflect] DOMString archive; + attribute [ConvertNullToNullString, Reflect] DOMString code; + attribute [ConvertNullToNullString, Reflect=codebase] DOMString codeBase; + attribute [ConvertNullToNullString, Reflect] DOMString height; #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT - attribute [ConvertNullToNullString] DOMString hspace; + attribute [ConvertNullToNullString, Reflect] DOMString hspace; #else attribute [ConvertFromString] long hspace; #endif - attribute [ConvertNullToNullString] DOMString name; - attribute [ConvertNullToNullString] DOMString object; + attribute [ConvertNullToNullString, Reflect] DOMString name; + attribute [ConvertNullToNullString, Reflect] DOMString object; #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT - attribute [ConvertNullToNullString] DOMString vspace; + attribute [ConvertNullToNullString, Reflect] DOMString vspace; #else attribute [ConvertFromString] long vspace; #endif - attribute [ConvertNullToNullString] DOMString width; + attribute [ConvertNullToNullString, Reflect] DOMString width; }; } diff --git a/src/3rdparty/webkit/WebCore/html/HTMLAreaElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLAreaElement.cpp index 2f7c1a537..b878a1a51 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLAreaElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLAreaElement.cpp @@ -22,11 +22,8 @@ #include "config.h" #include "HTMLAreaElement.h" -#include "Document.h" -#include "FloatRect.h" #include "HTMLNames.h" #include "HitTestResult.h" -#include "Length.h" #include "MappedAttribute.h" #include "Path.h" #include "RenderObject.h" @@ -52,7 +49,7 @@ HTMLAreaElement::~HTMLAreaElement() delete [] m_coords; } -void HTMLAreaElement::parseMappedAttribute(MappedAttribute *attr) +void HTMLAreaElement::parseMappedAttribute(MappedAttribute* attr) { if (attr->name() == shapeAttr) { if (equalIgnoringCase(attr->value(), "default")) @@ -152,46 +149,11 @@ Path HTMLAreaElement::getRegion(const IntSize& size) const return path; } -const AtomicString& HTMLAreaElement::accessKey() const -{ - return getAttribute(accesskeyAttr); -} - -void HTMLAreaElement::setAccessKey(const AtomicString& value) -{ - setAttribute(accesskeyAttr, value); -} - -const AtomicString& HTMLAreaElement::alt() const -{ - return getAttribute(altAttr); -} - -void HTMLAreaElement::setAlt(const AtomicString& value) -{ - setAttribute(altAttr, value); -} - -const AtomicString& HTMLAreaElement::coords() const -{ - return getAttribute(coordsAttr); -} - -void HTMLAreaElement::setCoords(const AtomicString& value) -{ - setAttribute(coordsAttr, value); -} - KURL HTMLAreaElement::href() const { return document()->completeURL(getAttribute(hrefAttr)); } -void HTMLAreaElement::setHref(const AtomicString& value) -{ - setAttribute(hrefAttr, value); -} - bool HTMLAreaElement::noHref() const { return !getAttribute(nohrefAttr).isNull(); @@ -202,16 +164,6 @@ void HTMLAreaElement::setNoHref(bool noHref) setAttribute(nohrefAttr, noHref ? "" : 0); } -const AtomicString& HTMLAreaElement::shape() const -{ - return getAttribute(shapeAttr); -} - -void HTMLAreaElement::setShape(const AtomicString& value) -{ - setAttribute(shapeAttr, value); -} - bool HTMLAreaElement::isFocusable() const { return HTMLElement::isFocusable(); @@ -222,9 +174,4 @@ String HTMLAreaElement::target() const return getAttribute(targetAttr); } -void HTMLAreaElement::setTarget(const AtomicString& value) -{ - setAttribute(targetAttr, value); -} - } diff --git a/src/3rdparty/webkit/WebCore/html/HTMLAreaElement.h b/src/3rdparty/webkit/WebCore/html/HTMLAreaElement.h index 19533b1d3..fffd45ed5 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLAreaElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLAreaElement.h @@ -34,43 +34,26 @@ class Path; class HTMLAreaElement : public HTMLAnchorElement { public: HTMLAreaElement(const QualifiedName&, Document*); - ~HTMLAreaElement(); - - virtual HTMLTagStatus endTagRequirement() const { return TagStatusForbidden; } - virtual int tagPriority() const { return 0; } - - virtual void parseMappedAttribute(MappedAttribute*); + virtual ~HTMLAreaElement(); bool isDefault() const { return m_shape == Default; } bool mapMouseEvent(int x, int y, const IntSize&, HitTestResult&); - virtual IntRect getRect(RenderObject*) const; - - const AtomicString& accessKey() const; - void setAccessKey(const AtomicString&); - - const AtomicString& alt() const; - void setAlt(const AtomicString&); - - const AtomicString& coords() const; - void setCoords(const AtomicString&); + IntRect getRect(RenderObject*) const; KURL href() const; - void setHref(const AtomicString&); bool noHref() const; void setNoHref(bool); - const AtomicString& shape() const; - void setShape(const AtomicString&); - +private: + virtual HTMLTagStatus endTagRequirement() const { return TagStatusForbidden; } + virtual int tagPriority() const { return 0; } + virtual void parseMappedAttribute(MappedAttribute*); virtual bool isFocusable() const; - virtual String target() const; - void setTarget(const AtomicString&); -private: enum Shape { Default, Poly, Rect, Circle, Unknown }; Path getRegion(const IntSize&) const; diff --git a/src/3rdparty/webkit/WebCore/html/HTMLAreaElement.idl b/src/3rdparty/webkit/WebCore/html/HTMLAreaElement.idl index d80ebeda2..53239c65f 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLAreaElement.idl +++ b/src/3rdparty/webkit/WebCore/html/HTMLAreaElement.idl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Computer, Inc. + * Copyright (C) 2006, 2009 Apple Inc. All rights reserved. * Copyright (C) 2006 Samuel Weinig * * This library is free software; you can redistribute it and/or @@ -25,13 +25,13 @@ module html { InterfaceUUID=aac98729-47d3-4623-8c5b-004783af5bd6, ImplementationUUID=f0631a41-5f55-40e5-a879-c09e663c26ba ] HTMLAreaElement : HTMLElement { - attribute [ConvertNullToNullString] DOMString accessKey; - attribute [ConvertNullToNullString] DOMString alt; - attribute [ConvertNullToNullString] DOMString coords; - attribute [ConvertNullToNullString] DOMString href; + attribute [ConvertNullToNullString, Reflect=accesskey] DOMString accessKey; + attribute [ConvertNullToNullString, Reflect] DOMString alt; + attribute [ConvertNullToNullString, Reflect] DOMString coords; + attribute [ConvertNullToNullString, ReflectURL] DOMString href; attribute boolean noHref; - attribute [ConvertNullToNullString] DOMString shape; - attribute [ConvertNullToNullString] DOMString target; + attribute [ConvertNullToNullString, Reflect] DOMString shape; + attribute [ConvertNullToNullString, Reflect] DOMString target; // IE Extensions readonly attribute DOMString hash; diff --git a/src/3rdparty/webkit/WebCore/html/HTMLAttributeNames.in b/src/3rdparty/webkit/WebCore/html/HTMLAttributeNames.in index 0fc45d710..15db3e9f9 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLAttributeNames.in +++ b/src/3rdparty/webkit/WebCore/html/HTMLAttributeNames.in @@ -69,6 +69,7 @@ defer dir direction disabled +draggable enctype end expanded @@ -184,6 +185,7 @@ onwebkitanimationstart onwebkitanimationiteration onwebkitanimationend onwebkittransitionend +pattern placeholder pluginurl poster @@ -194,6 +196,7 @@ progress prompt readonly rel +required results rev role diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBRElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLBRElement.cpp index 6f86e6a42..dbd8eba35 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBRElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLBRElement.cpp @@ -1,8 +1,8 @@ -/** +/* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2000 Simon Hausmann - * Copyright (C) 2003, 2006 Apple Computer, Inc. + * Copyright (C) 2003, 2006, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -38,10 +38,6 @@ HTMLBRElement::HTMLBRElement(const QualifiedName& tagName, Document *doc) ASSERT(hasTagName(brTag)); } -HTMLBRElement::~HTMLBRElement() -{ -} - bool HTMLBRElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const { if (attrName == clearAttr) { @@ -52,7 +48,7 @@ bool HTMLBRElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEnt return HTMLElement::mapToEntry(attrName, result); } -void HTMLBRElement::parseMappedAttribute(MappedAttribute *attr) +void HTMLBRElement::parseMappedAttribute(MappedAttribute* attr) { if (attr->name() == clearAttr) { // If the string is empty, then don't add the clear property. @@ -76,14 +72,4 @@ RenderObject* HTMLBRElement::createRenderer(RenderArena* arena, RenderStyle* sty return new (arena) RenderBR(this); } -String HTMLBRElement::clear() const -{ - return getAttribute(clearAttr); -} - -void HTMLBRElement::setClear(const String &value) -{ - setAttribute(clearAttr, value); -} - } diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBRElement.h b/src/3rdparty/webkit/WebCore/html/HTMLBRElement.h index 56004631b..6b20b37a9 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBRElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLBRElement.h @@ -2,6 +2,7 @@ * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2000 Simon Hausmann + * Copyright (C) 2003, 2006, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,6 +20,7 @@ * Boston, MA 02110-1301, USA. * */ + #ifndef HTMLBRElement_h #define HTMLBRElement_h @@ -31,18 +33,15 @@ class String; class HTMLBRElement : public HTMLElement { public: HTMLBRElement(const QualifiedName&, Document*); - ~HTMLBRElement(); - + +private: virtual HTMLTagStatus endTagRequirement() const { return TagStatusForbidden; } virtual int tagPriority() const { return 0; } virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const; - virtual void parseMappedAttribute(MappedAttribute *attr); + virtual void parseMappedAttribute(MappedAttribute*); - virtual RenderObject *createRenderer(RenderArena*, RenderStyle*); - - String clear() const; - void setClear(const String&); + virtual RenderObject* createRenderer(RenderArena*, RenderStyle*); }; } //namespace diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBRElement.idl b/src/3rdparty/webkit/WebCore/html/HTMLBRElement.idl index 79e05edde..6d626ff56 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBRElement.idl +++ b/src/3rdparty/webkit/WebCore/html/HTMLBRElement.idl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Computer, Inc. + * Copyright (C) 2006, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,7 +24,7 @@ module html { InterfaceUUID=e84b14bc-b0aa-431f-83c4-fcc297e354b0, ImplementationUUID=c10d45a4-b042-45d0-b170-6ac7173ee823 ] HTMLBRElement : HTMLElement { - attribute [ConvertNullToNullString] DOMString clear; + attribute [ConvertNullToNullString, Reflect] DOMString clear; }; } diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.cpp index 84e359cec..613a0f78f 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.cpp @@ -2,7 +2,7 @@ * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2001 Dirk Mueller (mueller@kde.org) - * Copyright (C) 2003, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2003, 2008, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -26,9 +26,7 @@ #include "CSSHelper.h" #include "Document.h" #include "Frame.h" -#include "FrameLoader.h" #include "HTMLNames.h" -#include "KURL.h" #include "MappedAttribute.h" #include "XSSAuditor.h" @@ -36,21 +34,17 @@ namespace WebCore { using namespace HTMLNames; -HTMLBaseElement::HTMLBaseElement(const QualifiedName& qName, Document* doc) - : HTMLElement(qName, doc) +HTMLBaseElement::HTMLBaseElement(const QualifiedName& qName, Document* document) + : HTMLElement(qName, document) { ASSERT(hasTagName(baseTag)); } -HTMLBaseElement::~HTMLBaseElement() -{ -} - void HTMLBaseElement::parseMappedAttribute(MappedAttribute* attr) { if (attr->name() == hrefAttr) { m_hrefAttrValue = attr->value(); - m_href = parseURL(attr->value()); + m_href = deprecatedParseURL(attr->value()); process(); } else if (attr->name() == targetAttr) { m_target = attr->value(); @@ -69,8 +63,8 @@ void HTMLBaseElement::removedFromDocument() { HTMLElement::removedFromDocument(); - // Since the document doesn't have a base element... - // (This will break in the case of multiple base elements, but that's not valid anyway (?)) + // Since the document doesn't have a base element, clear the base URL and target. + // FIXME: This does not handle the case of multiple base elements correctly. document()->setBaseElementURL(KURL()); document()->setBaseElementTarget(String()); } @@ -86,17 +80,7 @@ void HTMLBaseElement::process() if (!m_target.isEmpty()) document()->setBaseElementTarget(m_target); - // ### should changing a document's base URL dynamically automatically update all images, stylesheets etc? -} - -void HTMLBaseElement::setHref(const String &value) -{ - setAttribute(hrefAttr, value); -} - -void HTMLBaseElement::setTarget(const String &value) -{ - setAttribute(targetAttr, value); + // FIXME: Changing a document's base URL should probably automatically update the resolved relative URLs of all images, stylesheets, etc. } } diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.h b/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.h index bb980e999..d413bece2 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.h @@ -1,7 +1,7 @@ /* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * Copyright (C) 2003 Apple Computer, Inc. + * Copyright (C) 2003, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,6 +19,7 @@ * Boston, MA 02110-1301, USA. * */ + #ifndef HTMLBaseElement_h #define HTMLBaseElement_h @@ -29,12 +30,11 @@ namespace WebCore { class HTMLBaseElement : public HTMLElement { public: HTMLBaseElement(const QualifiedName&, Document*); - ~HTMLBaseElement(); +private: virtual HTMLTagStatus endTagRequirement() const { return TagStatusForbidden; } virtual int tagPriority() const { return 0; } - String href() const { return m_href; } virtual String target() const { return m_target; } virtual void parseMappedAttribute(MappedAttribute*); @@ -46,7 +46,6 @@ public: void setHref(const String&); void setTarget(const String&); -protected: String m_hrefAttrValue; String m_href; String m_target; diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.idl b/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.idl index 76025faf2..b7385ecf5 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.idl +++ b/src/3rdparty/webkit/WebCore/html/HTMLBaseElement.idl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Computer, Inc. + * Copyright (C) 2006, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,8 +24,8 @@ module html { InterfaceUUID=e4112bea-13de-40f6-93d0-41e285ae1491, ImplementationUUID=23cec074-660f-490a-996d-167d66c164d5 ] HTMLBaseElement : HTMLElement { - attribute [ConvertNullToNullString] DOMString href; - attribute [ConvertNullToNullString] DOMString target; + attribute [ConvertNullToNullString, Reflect] DOMString href; + attribute [ConvertNullToNullString, Reflect] DOMString target; }; } diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBaseFontElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLBaseFontElement.cpp index ef08822ce..9acbf7393 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBaseFontElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLBaseFontElement.cpp @@ -1,7 +1,7 @@ /* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. + * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,40 +19,22 @@ * Boston, MA 02110-1301, USA. * */ + #include "config.h" #include "HTMLBaseFontElement.h" + #include "HTMLNames.h" namespace WebCore { using namespace HTMLNames; -HTMLBaseFontElement::HTMLBaseFontElement(const QualifiedName& tagName, Document* doc) - : HTMLElement(tagName, doc) +HTMLBaseFontElement::HTMLBaseFontElement(const QualifiedName& tagName, Document* document) + : HTMLElement(tagName, document) { ASSERT(hasTagName(basefontTag)); } -String HTMLBaseFontElement::color() const -{ - return getAttribute(colorAttr); -} - -void HTMLBaseFontElement::setColor(const String &value) -{ - setAttribute(colorAttr, value); -} - -String HTMLBaseFontElement::face() const -{ - return getAttribute(faceAttr); -} - -void HTMLBaseFontElement::setFace(const String &value) -{ - setAttribute(faceAttr, value); -} - int HTMLBaseFontElement::size() const { return getAttribute(sizeAttr).toInt(); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBaseFontElement.h b/src/3rdparty/webkit/WebCore/html/HTMLBaseFontElement.h index c15a36e4c..e76d07f18 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBaseFontElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLBaseFontElement.h @@ -1,7 +1,7 @@ /* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. + * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,6 +19,7 @@ * Boston, MA 02110-1301, USA. * */ + #ifndef HTMLBaseFontElement_h #define HTMLBaseFontElement_h @@ -28,21 +29,16 @@ namespace WebCore { class HTMLBaseFontElement : public HTMLElement { public: - HTMLBaseFontElement(const QualifiedName&, Document* doc); - - virtual HTMLTagStatus endTagRequirement() const { return TagStatusForbidden; } - virtual int tagPriority() const { return 0; } - - String color() const; - void setColor(const String &); - - String face() const; - void setFace(const String &); + HTMLBaseFontElement(const QualifiedName&, Document*); int size() const; void setSize(int); + +private: + virtual HTMLTagStatus endTagRequirement() const { return TagStatusForbidden; } + virtual int tagPriority() const { return 0; } }; -} //namespace +} // namespace #endif diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBaseFontElement.idl b/src/3rdparty/webkit/WebCore/html/HTMLBaseFontElement.idl index f09c9d7d5..665f12460 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBaseFontElement.idl +++ b/src/3rdparty/webkit/WebCore/html/HTMLBaseFontElement.idl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Computer, Inc. + * Copyright (C) 2006, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,8 +24,8 @@ module html { InterfaceUUID=434b1be5-408e-45b5-be83-c70e11e9bb37, ImplementationUUID=1dc8508e-53c4-4e7e-93c0-16772372b2dc ] HTMLBaseFontElement : HTMLElement { - attribute [ConvertNullToNullString] DOMString color; - attribute [ConvertNullToNullString] DOMString face; + attribute [ConvertNullToNullString, Reflect] DOMString color; + attribute [ConvertNullToNullString, Reflect] DOMString face; #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C attribute [ConvertToString] DOMString size; // this changed to a long, but our existing API is a string #else diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBlockquoteElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLBlockquoteElement.cpp index 682063c95..c064ad38e 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBlockquoteElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLBlockquoteElement.cpp @@ -1,7 +1,7 @@ -/** +/* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * Copyright (C) 2003 Apple Computer, Inc. + * Copyright (C) 2003, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,6 +19,7 @@ * Boston, MA 02110-1301, USA. * */ + #include "config.h" #include "HTMLBlockquoteElement.h" @@ -28,24 +29,10 @@ namespace WebCore { using namespace HTMLNames; -HTMLBlockquoteElement::HTMLBlockquoteElement(const QualifiedName& tagName, Document* doc) - : HTMLElement(tagName, doc) +HTMLBlockquoteElement::HTMLBlockquoteElement(const QualifiedName& tagName, Document* document) + : HTMLElement(tagName, document) { ASSERT(hasTagName(blockquoteTag)); } -HTMLBlockquoteElement::~HTMLBlockquoteElement() -{ -} - -String HTMLBlockquoteElement::cite() const -{ - return getAttribute(citeAttr); -} - -void HTMLBlockquoteElement::setCite(const String &value) -{ - setAttribute(citeAttr, value); -} - } diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBlockquoteElement.h b/src/3rdparty/webkit/WebCore/html/HTMLBlockquoteElement.h index 7b5ee216d..f27d25821 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBlockquoteElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLBlockquoteElement.h @@ -1,6 +1,7 @@ /* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) + * Copyright (C) 2009 Apple Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -29,13 +30,10 @@ namespace WebCore { class HTMLBlockquoteElement : public HTMLElement { public: HTMLBlockquoteElement(const QualifiedName&, Document*); - ~HTMLBlockquoteElement(); +private: virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; } virtual int tagPriority() const { return 5; } - - String cite() const; - void setCite(const String&); }; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBlockquoteElement.idl b/src/3rdparty/webkit/WebCore/html/HTMLBlockquoteElement.idl index d135fcda7..f6463ddfe 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBlockquoteElement.idl +++ b/src/3rdparty/webkit/WebCore/html/HTMLBlockquoteElement.idl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Computer, Inc. + * Copyright (C) 2006, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,7 +24,7 @@ module html { InterfaceUUID=902d9011-c6d6-4363-b6fe-bd2d28ef553b, ImplementationUUID=345db946-ba9c-44b9-87fd-06083aa472e4 ] HTMLBlockquoteElement : HTMLElement { - attribute [ConvertNullToNullString] DOMString cite; + attribute [ConvertNullToNullString, Reflect] DOMString cite; }; } diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBodyElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLBodyElement.cpp index 74c7c9ebb..269e005b8 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBodyElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLBodyElement.cpp @@ -3,7 +3,7 @@ * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2000 Simon Hausmann (hausmann@kde.org) * (C) 2001 Dirk Mueller (mueller@kde.org) - * Copyright (C) 2004, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -24,13 +24,9 @@ #include "config.h" #include "HTMLBodyElement.h" -#include "CSSHelper.h" -#include "CSSMutableStyleDeclaration.h" -#include "CSSPropertyNames.h" #include "CSSStyleSelector.h" #include "CSSStyleSheet.h" #include "CSSValueKeywords.h" -#include "Document.h" #include "EventNames.h" #include "Frame.h" #include "FrameView.h" @@ -43,8 +39,8 @@ namespace WebCore { using namespace HTMLNames; -HTMLBodyElement::HTMLBodyElement(const QualifiedName& tagName, Document* doc) - : HTMLElement(tagName, doc) +HTMLBodyElement::HTMLBodyElement(const QualifiedName& tagName, Document* document) + : HTMLElement(tagName, document) { ASSERT(hasTagName(bodyTag)); } @@ -89,7 +85,7 @@ bool HTMLBodyElement::mapToEntry(const QualifiedName& attrName, MappedAttributeE void HTMLBodyElement::parseMappedAttribute(MappedAttribute *attr) { if (attr->name() == backgroundAttr) { - String url = parseURL(attr->value()); + String url = deprecatedParseURL(attr->value()); if (!url.isEmpty()) addCSSImageProperty(attr, CSSPropertyBackgroundImage, document()->completeURL(url).string()); } else if (attr->name() == marginwidthAttr || attr->name() == leftmarginAttr) { @@ -194,16 +190,6 @@ void HTMLBodyElement::setALink(const String& value) setAttribute(alinkAttr, value); } -String HTMLBodyElement::background() const -{ - return getAttribute(backgroundAttr); -} - -void HTMLBodyElement::setBackground(const String& value) -{ - setAttribute(backgroundAttr, value); -} - String HTMLBodyElement::bgColor() const { return getAttribute(bgcolorAttr); @@ -315,7 +301,7 @@ void HTMLBodyElement::addSubresourceAttributeURLs(ListHashSet& urls) const { HTMLElement::addSubresourceAttributeURLs(urls); - addSubresourceURL(urls, document()->completeURL(background())); + addSubresourceURL(urls, document()->completeURL(getAttribute(backgroundAttr))); } void HTMLBodyElement::didMoveToNewOwnerDocument() diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBodyElement.h b/src/3rdparty/webkit/WebCore/html/HTMLBodyElement.h index 274a675c0..575d562f0 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBodyElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLBodyElement.h @@ -1,10 +1,8 @@ /* - * This file is part of the DOM implementation for KDE. - * * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2000 Simon Hausmann - * Copyright (C) 2004, 2006 Apple Computer, Inc. + * Copyright (C) 2004, 2006, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -33,24 +31,10 @@ namespace WebCore { class HTMLBodyElement : public HTMLElement { public: HTMLBodyElement(const QualifiedName&, Document*); - ~HTMLBodyElement(); - - virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; } - virtual int tagPriority() const { return 10; } - - virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const; - virtual void parseMappedAttribute(MappedAttribute*); - - virtual void insertedIntoDocument(); - - void createLinkDecl(); - - virtual bool isURLAttribute(Attribute*) const; + virtual ~HTMLBodyElement(); String aLink() const; void setALink(const String&); - String background() const; - void setBackground(const String&); String bgColor() const; void setBgColor(const String&); String link() const; @@ -60,7 +44,6 @@ public: String vLink() const; void setVLink(const String&); - // Event handler attributes virtual EventListener* onblur() const; virtual void setOnblur(PassRefPtr); virtual EventListener* onerror() const; @@ -85,6 +68,19 @@ public: EventListener* onunload() const; void setOnunload(PassRefPtr); +private: + virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; } + virtual int tagPriority() const { return 10; } + + virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const; + virtual void parseMappedAttribute(MappedAttribute*); + + virtual void insertedIntoDocument(); + + void createLinkDecl(); + + virtual bool isURLAttribute(Attribute*) const; + virtual int scrollLeft() const; virtual void setScrollLeft(int scrollLeft); @@ -96,11 +92,9 @@ public: virtual void addSubresourceAttributeURLs(ListHashSet&) const; -protected: - RefPtr m_linkDecl; - -private: virtual void didMoveToNewOwnerDocument(); + + RefPtr m_linkDecl; }; } //namespace diff --git a/src/3rdparty/webkit/WebCore/html/HTMLBodyElement.idl b/src/3rdparty/webkit/WebCore/html/HTMLBodyElement.idl index fa3fef991..097b4ac4b 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLBodyElement.idl +++ b/src/3rdparty/webkit/WebCore/html/HTMLBodyElement.idl @@ -25,12 +25,12 @@ module html { InterfaceUUID=4789afc6-2d9e-4f3b-8c27-12abc9d4a014, ImplementationUUID=d2e16911-2f7e-4d58-a92c-94700d445b38 ] HTMLBodyElement : HTMLElement { - attribute [ConvertNullToNullString] DOMString aLink; - attribute [ConvertNullToNullString] DOMString background; - attribute [ConvertNullToNullString] DOMString bgColor; - attribute [ConvertNullToNullString] DOMString link; - attribute [ConvertNullToNullString] DOMString text; - attribute [ConvertNullToNullString] DOMString vLink; + attribute [ConvertNullToNullString, Reflect=alink] DOMString aLink; + attribute [ConvertNullToNullString, Reflect] DOMString background; + attribute [ConvertNullToNullString, Reflect=bgcolor] DOMString bgColor; + attribute [ConvertNullToNullString, Reflect] DOMString link; + attribute [ConvertNullToNullString, Reflect] DOMString text; + attribute [ConvertNullToNullString, Reflect=vlink] DOMString vLink; #if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C #if !defined(LANGUAGE_COM) || !LANGUAGE_COM @@ -43,12 +43,6 @@ module html { attribute [DontEnum] EventListener onstorage; attribute [DontEnum] EventListener onunload; - // Overrides of Element attributes. - // attribute [DontEnum] EventListener onblur; - // attribute [DontEnum] EventListener onerror; - // attribute [DontEnum] EventListener onfocus; - // attribute [DontEnum] EventListener onload; - // Not implemented yet. // attribute [DontEnum] EventListener onafterprint; // attribute [DontEnum] EventListener onbeforeprint; diff --git a/src/3rdparty/webkit/WebCore/html/HTMLButtonElement.h b/src/3rdparty/webkit/WebCore/html/HTMLButtonElement.h index b1d744c26..f5b9b628f 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLButtonElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLButtonElement.h @@ -61,6 +61,7 @@ public: private: enum Type { SUBMIT, RESET, BUTTON }; + virtual bool isOptionalFormControl() const { return true; } Type m_type; bool m_activeSubmit; diff --git a/src/3rdparty/webkit/WebCore/html/HTMLDocument.cpp b/src/3rdparty/webkit/WebCore/html/HTMLDocument.cpp index 5867f0eed..96ae9e41b 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLDocument.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLDocument.cpp @@ -151,9 +151,12 @@ Element* HTMLDocument::activeElement() bool HTMLDocument::hasFocus() { - if (!page()->focusController()->isActive()) + Page* page = this->page(); + if (!page) return false; - if (Frame* focusedFrame = page()->focusController()->focusedFrame()) { + if (!page->focusController()->isActive()) + return false; + if (Frame* focusedFrame = page->focusController()->focusedFrame()) { if (focusedFrame->tree()->isDescendantOf(frame())) return true; } @@ -281,9 +284,8 @@ void HTMLDocument::releaseEvents() Tokenizer *HTMLDocument::createTokenizer() { bool reportErrors = false; - if (frame()) - if (Page* page = frame()->page()) - reportErrors = page->inspectorController()->windowVisible(); + if (Page* page = this->page()) + reportErrors = page->inspectorController()->windowVisible(); return new HTMLTokenizer(this, reportErrors); } @@ -307,34 +309,18 @@ PassRefPtr HTMLDocument::createElement(const AtomicString& name, Except return HTMLElementFactory::createHTMLElement(QualifiedName(nullAtom, lowerName, xhtmlNamespaceURI), this, 0, false); } -static void addItemToMap(HTMLDocument::NameCountMap& map, const AtomicString& name) +static void addItemToMap(HashCountedSet& map, const AtomicString& name) { if (name.isEmpty()) return; - - HTMLDocument::NameCountMap::iterator it = map.find(name.impl()); - if (it == map.end()) - map.set(name.impl(), 1); - else - ++(it->second); + map.add(name.impl()); } -static void removeItemFromMap(HTMLDocument::NameCountMap& map, const AtomicString& name) +static void removeItemFromMap(HashCountedSet& map, const AtomicString& name) { if (name.isEmpty()) return; - - HTMLDocument::NameCountMap::iterator it = map.find(name.impl()); - if (it == map.end()) - return; - - int oldVal = it->second; - ASSERT(oldVal != 0); - int newVal = oldVal - 1; - if (newVal == 0) - map.remove(it); - else - it->second = newVal; + map.remove(name.impl()); } void HTMLDocument::addNamedItem(const AtomicString& name) @@ -342,7 +328,7 @@ void HTMLDocument::addNamedItem(const AtomicString& name) addItemToMap(m_namedItemCounts, name); } -void HTMLDocument::removeNamedItem(const AtomicString &name) +void HTMLDocument::removeNamedItem(const AtomicString& name) { removeItemFromMap(m_namedItemCounts, name); } diff --git a/src/3rdparty/webkit/WebCore/html/HTMLDocument.h b/src/3rdparty/webkit/WebCore/html/HTMLDocument.h index ab5da50a5..eda759328 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLDocument.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLDocument.h @@ -1,7 +1,7 @@ /* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * Copyright (C) 2004, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -23,8 +23,10 @@ #ifndef HTMLDocument_h #define HTMLDocument_h +#include "AtomicStringHash.h" #include "CachedResourceClient.h" #include "Document.h" +#include namespace WebCore { @@ -81,8 +83,6 @@ public: void removeExtraNamedItem(const AtomicString& name); bool hasExtraNamedItem(AtomicStringImpl* name); - typedef HashMap NameCountMap; - protected: HTMLDocument(Frame*); @@ -92,8 +92,8 @@ private: virtual Tokenizer* createTokenizer(); virtual void determineParseMode(); - NameCountMap m_namedItemCounts; - NameCountMap m_extraNamedItemCounts; + HashCountedSet m_namedItemCounts; + HashCountedSet m_extraNamedItemCounts; }; inline bool HTMLDocument::hasNamedItem(AtomicStringImpl* name) @@ -108,6 +108,6 @@ inline bool HTMLDocument::hasExtraNamedItem(AtomicStringImpl* name) return m_extraNamedItemCounts.contains(name); } -} // namespace +} // namespace WebCore -#endif +#endif // HTMLDocument_h diff --git a/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp index 8acc6bd26..d20148236 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp @@ -143,6 +143,13 @@ void HTMLElement::parseMappedAttribute(MappedAttribute *attr) } else if (attr->name() == dirAttr) { addCSSProperty(attr, CSSPropertyDirection, attr->value()); addCSSProperty(attr, CSSPropertyUnicodeBidi, hasLocalName(bdoTag) ? CSSValueBidiOverride : CSSValueEmbed); + } else if (attr->name() == draggableAttr) { + const AtomicString& value = attr->value(); + if (equalIgnoringCase(value, "true")) { + addCSSProperty(attr, CSSPropertyWebkitUserDrag, CSSValueElement); + addCSSProperty(attr, CSSPropertyWebkitUserSelect, CSSValueNone); + } else if (equalIgnoringCase(value, "false")) + addCSSProperty(attr, CSSPropertyWebkitUserDrag, CSSValueNone); } // standard events else if (attr->name() == onclickAttr) { @@ -692,6 +699,16 @@ void HTMLElement::setContentEditable(const String &enabled) setAttribute(contenteditableAttr, enabled.isEmpty() ? "true" : enabled); } +bool HTMLElement::draggable() const +{ + return equalIgnoringCase(getAttribute(draggableAttr), "true"); +} + +void HTMLElement::setDraggable(bool value) +{ + setAttribute(draggableAttr, value ? "true" : "false"); +} + void HTMLElement::click() { dispatchSimulatedClick(0, false, false); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLElement.h b/src/3rdparty/webkit/WebCore/html/HTMLElement.h index 60152cd3e..21b3bb5eb 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLElement.h @@ -79,6 +79,9 @@ public: virtual void setContentEditable(MappedAttribute*); virtual void setContentEditable(const String&); + virtual bool draggable() const; + void setDraggable(bool); + void click(); virtual void accessKeyAction(bool sendToAnyElement); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLElement.idl b/src/3rdparty/webkit/WebCore/html/HTMLElement.idl index 38f960a23..6b9e1d0f0 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLElement.idl +++ b/src/3rdparty/webkit/WebCore/html/HTMLElement.idl @@ -36,6 +36,7 @@ module html { attribute [ConvertNullToNullString, Reflect=class] DOMString className; attribute long tabIndex; + attribute boolean draggable; // Extensions attribute [ConvertNullToNullString] DOMString innerHTML diff --git a/src/3rdparty/webkit/WebCore/html/HTMLEmbedElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLEmbedElement.cpp index 2500dd6f6..1bcbe5601 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLEmbedElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLEmbedElement.cpp @@ -98,9 +98,9 @@ void HTMLEmbedElement::parseMappedAttribute(MappedAttribute* attr) if (!isImageType() && m_imageLoader) m_imageLoader.clear(); } else if (attr->name() == codeAttr) - m_url = parseURL(value.string()); + m_url = deprecatedParseURL(value.string()); else if (attr->name() == srcAttr) { - m_url = parseURL(value.string()); + m_url = deprecatedParseURL(value.string()); if (renderer() && isImageType()) { if (!m_imageLoader) m_imageLoader.set(new HTMLImageLoader(this)); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLFormControlElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLFormControlElement.cpp index 87938ac45..e90a6e0b8 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLFormControlElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLFormControlElement.cpp @@ -204,6 +204,16 @@ void HTMLFormControlElement::setAutofocus(bool b) setAttribute(autofocusAttr, b ? "autofocus" : 0); } +bool HTMLFormControlElement::required() const +{ + return hasAttribute(requiredAttr); +} + +void HTMLFormControlElement::setRequired(bool b) +{ + setAttribute(requiredAttr, b ? "required" : 0); +} + void HTMLFormControlElement::recalcStyle(StyleChange change) { HTMLElement::recalcStyle(change); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLFormControlElement.h b/src/3rdparty/webkit/WebCore/html/HTMLFormControlElement.h index a03eb1ae7..d3dd60f9f 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLFormControlElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLFormControlElement.h @@ -74,6 +74,11 @@ public: virtual bool autofocus() const; void setAutofocus(bool); + bool required() const; + void setRequired(bool); + + virtual bool valueMissing() const { return false; } + virtual void recalcStyle(StyleChange); virtual const AtomicString& formControlName() const; @@ -100,6 +105,8 @@ public: virtual bool willValidate() const; + virtual bool patternMismatch() const { return false; } + void formDestroyed() { m_form = 0; } virtual void dispatchFocusEvent(); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLFormElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLFormElement.cpp index f2012e171..54986b0ca 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLFormElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLFormElement.cpp @@ -429,7 +429,7 @@ void HTMLFormElement::reset() void HTMLFormElement::parseMappedAttribute(MappedAttribute* attr) { if (attr->name() == actionAttr) - m_url = parseURL(attr->value()); + m_url = deprecatedParseURL(attr->value()); else if (attr->name() == targetAttr) m_target = attr->value(); else if (attr->name() == methodAttr) diff --git a/src/3rdparty/webkit/WebCore/html/HTMLFrameElementBase.cpp b/src/3rdparty/webkit/WebCore/html/HTMLFrameElementBase.cpp index 1e0959545..7ae8f596e 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLFrameElementBase.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLFrameElementBase.cpp @@ -111,7 +111,7 @@ void HTMLFrameElementBase::openURL() void HTMLFrameElementBase::parseMappedAttribute(MappedAttribute *attr) { if (attr->name() == srcAttr) - setLocation(parseURL(attr->value())); + setLocation(deprecatedParseURL(attr->value())); else if (attr->name() == idAttr) { // Important to call through to base for the id attribute so the hasID bit gets set. HTMLFrameOwnerElement::parseMappedAttribute(attr); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLImageElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLImageElement.cpp index c4bf5dc1d..517396418 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLImageElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLImageElement.cpp @@ -110,7 +110,7 @@ void HTMLImageElement::parseMappedAttribute(MappedAttribute* attr) if (attr->value().string()[0] == '#') usemap = attr->value(); else - usemap = document()->completeURL(parseURL(attr->value())).string(); + usemap = document()->completeURL(deprecatedParseURL(attr->value())).string(); setIsLink(!attr->isNull()); } else if (attrName == ismapAttr) ismap = true; @@ -319,6 +319,12 @@ void HTMLImageElement::setBorder(const String& value) setAttribute(borderAttr, value); } +bool HTMLImageElement::draggable() const +{ + // Image elements are draggable by default. + return !equalIgnoringCase(getAttribute(draggableAttr), "false"); +} + void HTMLImageElement::setHeight(int value) { setAttribute(heightAttr, String::number(value)); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLImageElement.h b/src/3rdparty/webkit/WebCore/html/HTMLImageElement.h index ae2ce3874..5e8218655 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLImageElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLImageElement.h @@ -81,6 +81,8 @@ public: String border() const; void setBorder(const String&); + virtual bool draggable() const; + void setHeight(int); int hspace() const; diff --git a/src/3rdparty/webkit/WebCore/html/HTMLImageLoader.cpp b/src/3rdparty/webkit/WebCore/html/HTMLImageLoader.cpp index ea53d7e30..2b9f09ca1 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLImageLoader.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLImageLoader.cpp @@ -50,7 +50,7 @@ void HTMLImageLoader::dispatchLoadEvent() String HTMLImageLoader::sourceURI(const AtomicString& attr) const { - return parseURL(attr); + return deprecatedParseURL(attr); } void HTMLImageLoader::notifyFinished(CachedResource*) diff --git a/src/3rdparty/webkit/WebCore/html/HTMLInputElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLInputElement.cpp index 8b2aa0eaa..f35292f61 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLInputElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLInputElement.cpp @@ -47,6 +47,7 @@ #include "MappedAttribute.h" #include "MouseEvent.h" #include "Page.h" +#include "RegularExpression.h" #include "RenderButton.h" #include "RenderFileUploadControl.h" #include "RenderImage.h" @@ -114,6 +115,79 @@ bool HTMLInputElement::autoComplete() const return true; } +bool HTMLInputElement::valueMissing() const +{ + if (!isRequiredFormControl() || readOnly() || disabled()) + return false; + + switch (inputType()) { + case TEXT: + case SEARCH: + case URL: + case TELEPHONE: + case EMAIL: + case PASSWORD: + case NUMBER: + case FILE: + return value().isEmpty(); + case CHECKBOX: + return !checked(); + case RADIO: + return !document()->checkedRadioButtons().checkedButtonForGroup(name()); + case HIDDEN: + case RANGE: + case SUBMIT: + case IMAGE: + case RESET: + case BUTTON: + case ISINDEX: + break; + } + + ASSERT_NOT_REACHED(); + return false; +} + +bool HTMLInputElement::patternMismatch() const +{ + switch (inputType()) { + case ISINDEX: + case CHECKBOX: + case RADIO: + case SUBMIT: + case RESET: + case FILE: + case HIDDEN: + case IMAGE: + case BUTTON: + case RANGE: + case NUMBER: + return false; + case TEXT: + case SEARCH: + case URL: + case TELEPHONE: + case EMAIL: + case PASSWORD: + const AtomicString& pattern = getAttribute(patternAttr); + String value = this->value(); + + // Empty values can't be mismatched + if (pattern.isEmpty() || value.isEmpty()) + return false; + + RegularExpression patternRegExp(pattern, TextCaseSensitive); + int matchLength = 0; + int valueLength = value.length(); + int matchOffset = patternRegExp.match(value, 0, &matchLength); + + return matchOffset != 0 || matchLength != valueLength; + } + + ASSERT_NOT_REACHED(); + return false; +} + static inline CheckedRadioButtons& checkedRadioButtons(const HTMLInputElement *element) { if (HTMLFormElement* form = element->form()) @@ -478,31 +552,34 @@ int HTMLInputElement::selectionEnd() const return toRenderTextControl(renderer())->selectionEnd(); } +static bool isTextFieldWithRenderer(HTMLInputElement* element) +{ + if (!element->isTextField()) + return false; + + element->document()->updateLayoutIgnorePendingStylesheets(); + if (!element->renderer()) + return false; + + return true; +} + void HTMLInputElement::setSelectionStart(int start) { - if (!isTextField()) - return; - if (!renderer()) - return; - toRenderTextControl(renderer())->setSelectionStart(start); + if (isTextFieldWithRenderer(this)) + toRenderTextControl(renderer())->setSelectionStart(start); } void HTMLInputElement::setSelectionEnd(int end) { - if (!isTextField()) - return; - if (!renderer()) - return; - toRenderTextControl(renderer())->setSelectionEnd(end); + if (isTextFieldWithRenderer(this)) + toRenderTextControl(renderer())->setSelectionEnd(end); } void HTMLInputElement::select() { - if (!isTextField()) - return; - if (!renderer()) - return; - toRenderTextControl(renderer())->select(); + if (isTextFieldWithRenderer(this)) + toRenderTextControl(renderer())->select(); } void HTMLInputElement::setSelectionRange(int start, int end) @@ -838,13 +915,25 @@ bool HTMLInputElement::appendFormData(FormDataList& encoding, bool multipart) break; case FILE: { - // Can't submit file on GET. - if (!multipart) - return false; + unsigned numFiles = m_fileList->length(); + if (!multipart) { + // Send only the basenames. + // 4.10.16.4 and 4.10.16.6 sections in HTML5. + + // Unlike the multipart case, we have no special + // handling for the empty fileList because Netscape + // doesn't support for non-multipart submission of + // file inputs, and Firefox doesn't add "name=" query + // parameter. + + for (unsigned i = 0; i < numFiles; ++i) { + encoding.appendData(name(), m_fileList->item(i)->fileName()); + } + return true; + } // If no filename at all is entered, return successful but empty. // Null would be more logical, but Netscape posts an empty file. Argh. - unsigned numFiles = m_fileList->length(); if (!numFiles) { encoding.appendFile(name(), File::create("")); return true; @@ -1567,6 +1656,37 @@ void HTMLInputElement::unregisterForActivationCallbackIfNeeded() document()->unregisterForDocumentActivationCallbacks(this); } +bool HTMLInputElement::isRequiredFormControl() const +{ + if (!required()) + return false; + + switch (inputType()) { + case TEXT: + case SEARCH: + case URL: + case TELEPHONE: + case EMAIL: + case PASSWORD: + case NUMBER: + case CHECKBOX: + case RADIO: + case FILE: + return true; + case HIDDEN: + case RANGE: + case SUBMIT: + case IMAGE: + case RESET: + case BUTTON: + case ISINDEX: + return false; + } + + ASSERT_NOT_REACHED(); + return false; +} + void HTMLInputElement::cacheSelection(int start, int end) { m_data.setCachedSelectionStart(start); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLInputElement.h b/src/3rdparty/webkit/WebCore/html/HTMLInputElement.h index be2b4f4f1..4d887f379 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLInputElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLInputElement.h @@ -90,6 +90,9 @@ public: virtual bool isTextFormControl() const { return isTextField(); } + virtual bool valueMissing() const; + virtual bool patternMismatch() const; + bool isTextButton() const { return m_type == SUBMIT || m_type == RESET || m_type == BUTTON; } virtual bool isRadioButton() const { return m_type == RADIO; } virtual bool isTextField() const { return m_type == TEXT || m_type == PASSWORD || m_type == SEARCH || m_type == ISINDEX || m_type == EMAIL || m_type == NUMBER || m_type == TELEPHONE || m_type == URL; } @@ -237,6 +240,9 @@ private: void registerForActivationCallbackIfNeeded(); void unregisterForActivationCallbackIfNeeded(); + virtual bool isOptionalFormControl() const { return !isRequiredFormControl(); } + virtual bool isRequiredFormControl() const; + InputElementData m_data; int m_xPos; int m_yPos; diff --git a/src/3rdparty/webkit/WebCore/html/HTMLInputElement.idl b/src/3rdparty/webkit/WebCore/html/HTMLInputElement.idl index 7cd91b056..e19b30ecf 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLInputElement.idl +++ b/src/3rdparty/webkit/WebCore/html/HTMLInputElement.idl @@ -41,8 +41,10 @@ module html { attribute long maxLength; attribute boolean multiple; attribute [ConvertNullToNullString] DOMString name; + attribute [Reflect] DOMString pattern; attribute DOMString placeholder; attribute boolean readOnly; + attribute boolean required; #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C attribute [ConvertToString] DOMString size; // DOM level 2 changed this to a long, but our existing API is a string #else diff --git a/src/3rdparty/webkit/WebCore/html/HTMLLinkElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLLinkElement.cpp index 986544ab2..8705521c3 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLLinkElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLLinkElement.cpp @@ -116,7 +116,7 @@ void HTMLLinkElement::parseMappedAttribute(MappedAttribute *attr) tokenizeRelAttribute(attr->value(), m_isStyleSheet, m_alternate, m_isIcon, m_isDNSPrefetch); process(); } else if (attr->name() == hrefAttr) { - m_url = document()->completeURL(parseURL(attr->value())); + m_url = document()->completeURL(deprecatedParseURL(attr->value())); process(); } else if (attr->name() == typeAttr) { m_type = attr->value(); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.cpp index 716a59264..7cda3fb7a 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.cpp @@ -848,6 +848,11 @@ void HTMLMediaElement::returnToRealtime() ExceptionCode e; setCurrentTime(maxTimeSeekable(), e); } + +bool HTMLMediaElement::supportsSave() const +{ + return m_player ? m_player->supportsSave() : false; +} void HTMLMediaElement::seek(float time, ExceptionCode& ec) { diff --git a/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.h b/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.h index 486574bf6..27b48eaa7 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.h @@ -68,8 +68,10 @@ public: void rewind(float timeDelta); void returnToRealtime(); - - virtual bool supportsFullscreen() const { return false; } + + // Eventually overloaded in HTMLVideoElement + virtual bool supportsFullscreen() const { return false; }; + virtual bool supportsSave() const; void scheduleLoad(); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLObjectElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLObjectElement.cpp index 6be41c9e7..16e9a8456 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLObjectElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLObjectElement.cpp @@ -82,7 +82,7 @@ void HTMLObjectElement::parseMappedAttribute(MappedAttribute *attr) if (!isImageType() && m_imageLoader) m_imageLoader.clear(); } else if (attr->name() == dataAttr) { - m_url = parseURL(val); + m_url = deprecatedParseURL(val); if (renderer()) m_needWidgetUpdate = true; if (renderer() && isImageType()) { diff --git a/src/3rdparty/webkit/WebCore/html/HTMLParser.h b/src/3rdparty/webkit/WebCore/html/HTMLParser.h index bd12049fc..094582635 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLParser.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLParser.h @@ -49,7 +49,7 @@ struct Token; * The parser for HTML. It receives a stream of tokens from the HTMLTokenizer, and * builds up the Document structure from it. */ -class HTMLParser : Noncopyable { +class HTMLParser : public Noncopyable { public: HTMLParser(HTMLDocument*, bool reportErrors); HTMLParser(DocumentFragment*); diff --git a/src/3rdparty/webkit/WebCore/html/HTMLParserQuirks.h b/src/3rdparty/webkit/WebCore/html/HTMLParserQuirks.h index b5972a6f0..176bbfbca 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLParserQuirks.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLParserQuirks.h @@ -33,7 +33,7 @@ namespace WebCore { class AtomicString; class Node; -class HTMLParserQuirks : Noncopyable { +class HTMLParserQuirks : public Noncopyable { public: HTMLParserQuirks() { } virtual ~HTMLParserQuirks() { } diff --git a/src/3rdparty/webkit/WebCore/html/HTMLSelectElement.h b/src/3rdparty/webkit/WebCore/html/HTMLSelectElement.h index e523641ed..8f575d237 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLSelectElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLSelectElement.h @@ -130,6 +130,8 @@ private: virtual void insertedIntoTree(bool); + virtual bool isOptionalFormControl() const { return true; } + SelectElementData m_data; CollectionCache m_collectionInfo; }; diff --git a/src/3rdparty/webkit/WebCore/html/HTMLTableElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLTableElement.cpp index e37c171f8..af35740ed 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLTableElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLTableElement.cpp @@ -351,7 +351,7 @@ void HTMLTableElement::parseMappedAttribute(MappedAttribute* attr) m_borderColorAttr = true; } } else if (attr->name() == backgroundAttr) { - String url = parseURL(attr->value()); + String url = deprecatedParseURL(attr->value()); if (!url.isEmpty()) addCSSImageProperty(attr, CSSPropertyBackgroundImage, document()->completeURL(url).string()); } else if (attr->name() == frameAttr) { diff --git a/src/3rdparty/webkit/WebCore/html/HTMLTablePartElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLTablePartElement.cpp index 19babf6fc..0f9a3e893 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLTablePartElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLTablePartElement.cpp @@ -66,7 +66,7 @@ void HTMLTablePartElement::parseMappedAttribute(MappedAttribute *attr) if (attr->name() == bgcolorAttr) addCSSColor(attr, CSSPropertyBackgroundColor, attr->value()); else if (attr->name() == backgroundAttr) { - String url = parseURL(attr->value()); + String url = deprecatedParseURL(attr->value()); if (!url.isEmpty()) addCSSImageProperty(attr, CSSPropertyBackgroundImage, document()->completeURL(url).string()); } else if (attr->name() == bordercolorAttr) { diff --git a/src/3rdparty/webkit/WebCore/html/HTMLTextAreaElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLTextAreaElement.cpp index e19ac0af8..6a1dcf87d 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLTextAreaElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLTextAreaElement.cpp @@ -27,6 +27,7 @@ #include "HTMLTextAreaElement.h" #include "ChromeClient.h" +#include "CSSValueKeywords.h" #include "Document.h" #include "Event.h" #include "EventNames.h" @@ -106,32 +107,34 @@ int HTMLTextAreaElement::selectionEnd() return toRenderTextControl(renderer())->selectionEnd(); } +static RenderTextControl* rendererAfterUpdateLayout(HTMLTextAreaElement* element) +{ + element->document()->updateLayoutIgnorePendingStylesheets(); + return toRenderTextControl(element->renderer()); +} + void HTMLTextAreaElement::setSelectionStart(int start) { - if (!renderer()) - return; - toRenderTextControl(renderer())->setSelectionStart(start); + if (RenderTextControl* renderer = rendererAfterUpdateLayout(this)) + renderer->setSelectionStart(start); } void HTMLTextAreaElement::setSelectionEnd(int end) { - if (!renderer()) - return; - toRenderTextControl(renderer())->setSelectionEnd(end); + if (RenderTextControl* renderer = rendererAfterUpdateLayout(this)) + renderer->setSelectionEnd(end); } void HTMLTextAreaElement::select() { - if (!renderer()) - return; - toRenderTextControl(renderer())->select(); + if (RenderTextControl* renderer = rendererAfterUpdateLayout(this)) + renderer->select(); } void HTMLTextAreaElement::setSelectionRange(int start, int end) { - if (!renderer()) - return; - toRenderTextControl(renderer())->setSelectionRange(start, end); + if (RenderTextControl* renderer = rendererAfterUpdateLayout(this)) + renderer->setSelectionRange(start, end); } void HTMLTextAreaElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta) @@ -172,6 +175,15 @@ void HTMLTextAreaElement::parseMappedAttribute(MappedAttribute* attr) wrap = SoftWrap; if (wrap != m_wrap) { m_wrap = wrap; + + if (shouldWrapText()) { + addCSSProperty(attr, CSSPropertyWhiteSpace, CSSValuePreWrap); + addCSSProperty(attr, CSSPropertyWordWrap, CSSValueBreakWord); + } else { + addCSSProperty(attr, CSSPropertyWhiteSpace, CSSValuePre); + addCSSProperty(attr, CSSPropertyWordWrap, CSSValueNormal); + } + if (renderer()) renderer()->setNeedsLayoutAndPrefWidthsRecalc(); } @@ -229,7 +241,8 @@ bool HTMLTextAreaElement::isMouseFocusable() const void HTMLTextAreaElement::updateFocusAppearance(bool restorePreviousSelection) { ASSERT(renderer()); - + ASSERT(!document()->childNeedsAndNotInStyleRecalc()); + if (!restorePreviousSelection || m_cachedSelectionStart < 0) { #if ENABLE(ON_FIRST_TEXTAREA_FOCUS_SELECT_ALL) // Devices with trackballs or d-pads may focus on a textarea in route diff --git a/src/3rdparty/webkit/WebCore/html/HTMLTextAreaElement.h b/src/3rdparty/webkit/WebCore/html/HTMLTextAreaElement.h index e22b5d524..5ef8e55d1 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLTextAreaElement.h +++ b/src/3rdparty/webkit/WebCore/html/HTMLTextAreaElement.h @@ -52,6 +52,8 @@ public: virtual bool isTextFormControl() const { return true; } + virtual bool valueMissing() const { return isRequiredFormControl() && !disabled() && !readOnly() && value().isEmpty(); } + int selectionStart(); int selectionEnd(); @@ -96,6 +98,9 @@ private: void updateValue() const; + virtual bool isOptionalFormControl() const { return !isRequiredFormControl(); } + virtual bool isRequiredFormControl() const { return required(); } + int m_rows; int m_cols; WrapMethod m_wrap; diff --git a/src/3rdparty/webkit/WebCore/html/HTMLTextAreaElement.idl b/src/3rdparty/webkit/WebCore/html/HTMLTextAreaElement.idl index f6ac05a27..ba8a0620b 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLTextAreaElement.idl +++ b/src/3rdparty/webkit/WebCore/html/HTMLTextAreaElement.idl @@ -36,6 +36,7 @@ module html { attribute boolean autofocus; attribute [ConvertNullToNullString] DOMString name; attribute boolean readOnly; + attribute boolean required; attribute long rows; readonly attribute DOMString type; attribute [ConvertNullToNullString] DOMString value; diff --git a/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp b/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp index 5788eb659..e4e46c5e7 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp @@ -1494,7 +1494,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString& src, State state) if (m_currentToken.attrs && !m_fragment) { if (m_doc->frame() && m_doc->frame()->script()->isEnabled()) { if ((a = m_currentToken.attrs->getAttributeItem(srcAttr))) - m_scriptTagSrcAttrValue = m_doc->completeURL(parseURL(a->value())).string(); + m_scriptTagSrcAttrValue = m_doc->completeURL(deprecatedParseURL(a->value())).string(); } } } diff --git a/src/3rdparty/webkit/WebCore/html/PreloadScanner.cpp b/src/3rdparty/webkit/WebCore/html/PreloadScanner.cpp index 1c1d28a1b..60e538ea5 100644 --- a/src/3rdparty/webkit/WebCore/html/PreloadScanner.cpp +++ b/src/3rdparty/webkit/WebCore/html/PreloadScanner.cpp @@ -696,12 +696,12 @@ void PreloadScanner::processAttribute() String value(m_attributeValue.data(), m_attributeValue.size()); if (tag == scriptTag || tag == imgTag) { if (attribute == srcAttr && m_urlToLoad.isEmpty()) - m_urlToLoad = parseURL(value); + m_urlToLoad = deprecatedParseURL(value); else if (attribute == charsetAttr) m_charset = value; } else if (tag == linkTag) { if (attribute == hrefAttr && m_urlToLoad.isEmpty()) - m_urlToLoad = parseURL(value); + m_urlToLoad = deprecatedParseURL(value); else if (attribute == relAttr) { bool styleSheet = false; bool alternate = false; @@ -848,7 +848,7 @@ void PreloadScanner::emitCSSRule() String rule(m_cssRule.data(), m_cssRule.size()); if (equalIgnoringCase(rule, "import") && !m_cssRuleValue.isEmpty()) { String value(m_cssRuleValue.data(), m_cssRuleValue.size()); - String url = parseURL(value); + String url = deprecatedParseURL(value); if (!url.isEmpty()) m_document->docLoader()->preload(CachedResource::CSSStyleSheet, url, String(), scanningBody()); } diff --git a/src/3rdparty/webkit/WebCore/html/PreloadScanner.h b/src/3rdparty/webkit/WebCore/html/PreloadScanner.h index f1d2cf813..6022ee786 100644 --- a/src/3rdparty/webkit/WebCore/html/PreloadScanner.h +++ b/src/3rdparty/webkit/WebCore/html/PreloadScanner.h @@ -37,7 +37,7 @@ namespace WebCore { class CachedResourceClient; class Document; - class PreloadScanner : Noncopyable { + class PreloadScanner : public Noncopyable { public: PreloadScanner(Document*); ~PreloadScanner(); diff --git a/src/3rdparty/webkit/WebCore/html/ValidityState.cpp b/src/3rdparty/webkit/WebCore/html/ValidityState.cpp index 8ff629c50..86227d41b 100644 --- a/src/3rdparty/webkit/WebCore/html/ValidityState.cpp +++ b/src/3rdparty/webkit/WebCore/html/ValidityState.cpp @@ -22,7 +22,6 @@ #include "config.h" #include "ValidityState.h" -#include "HTMLFormControlElement.h" namespace WebCore { diff --git a/src/3rdparty/webkit/WebCore/html/ValidityState.h b/src/3rdparty/webkit/WebCore/html/ValidityState.h index a011f7a2b..4b2f0228e 100644 --- a/src/3rdparty/webkit/WebCore/html/ValidityState.h +++ b/src/3rdparty/webkit/WebCore/html/ValidityState.h @@ -23,13 +23,12 @@ #ifndef ValidityState_h #define ValidityState_h +#include "HTMLFormControlElement.h" #include #include namespace WebCore { - class HTMLFormControlElement; - class ValidityState : public RefCounted { public: static PassRefPtr create(HTMLFormControlElement* owner) @@ -39,9 +38,9 @@ namespace WebCore { HTMLFormControlElement* control() const { return m_control; } - bool valueMissing() { return false; } + bool valueMissing() { return control()->valueMissing(); } bool typeMismatch() { return false; } - bool patternMismatch() { return false; } + bool patternMismatch() { return control()->patternMismatch(); } bool tooLong() { return false; } bool rangeUnderflow() { return false; } bool rangeOverflow() { return false; } diff --git a/src/3rdparty/webkit/WebCore/inspector/InspectorBackend.cpp b/src/3rdparty/webkit/WebCore/inspector/InspectorBackend.cpp new file mode 100644 index 000000000..d50efd3e8 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/inspector/InspectorBackend.cpp @@ -0,0 +1,363 @@ +/* + * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2008 Matt Lilek + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "InspectorBackend.h" + +#include "Element.h" +#include "Frame.h" +#include "FrameLoader.h" +#include "HTMLFrameOwnerElement.h" +#include "InspectorClient.h" +#include "InspectorController.h" +#include "InspectorResource.h" + +#if ENABLE(JAVASCRIPT_DEBUGGER) +#include "JavaScriptCallFrame.h" +#include "JavaScriptDebugServer.h" +using namespace JSC; +#endif + +#include +#include + +using namespace std; + +namespace WebCore { + +InspectorBackend::InspectorBackend(InspectorController* inspectorController, InspectorClient* client) + : m_inspectorController(inspectorController) + , m_client(client) +{ +} + +InspectorBackend::~InspectorBackend() +{ +} + +void InspectorBackend::hideDOMNodeHighlight() +{ + if (m_inspectorController) + m_inspectorController->hideHighlight(); +} + +String InspectorBackend::localizedStringsURL() +{ + return m_client->localizedStringsURL(); +} + +String InspectorBackend::hiddenPanels() +{ + return m_client->hiddenPanels(); +} + +void InspectorBackend::windowUnloading() +{ + if (m_inspectorController) + m_inspectorController->close(); +} + +bool InspectorBackend::isWindowVisible() +{ + if (m_inspectorController) + return m_inspectorController->windowVisible(); + return false; +} + +void InspectorBackend::addResourceSourceToFrame(long identifier, Node* frame) +{ + if (!m_inspectorController) + return; + RefPtr resource = m_inspectorController->resources().get(identifier); + if (resource) { + String sourceString = resource->sourceString(); + if (!sourceString.isEmpty()) + addSourceToFrame(resource->mimeType(), sourceString, frame); + } +} + +bool InspectorBackend::addSourceToFrame(const String& mimeType, const String& source, Node* frameNode) +{ + ASSERT_ARG(frameNode, frameNode); + + if (!frameNode) + return false; + + if (!frameNode->attached()) { + ASSERT_NOT_REACHED(); + return false; + } + + ASSERT(frameNode->isElementNode()); + if (!frameNode->isElementNode()) + return false; + + Element* element = static_cast(frameNode); + ASSERT(element->isFrameOwnerElement()); + if (!element->isFrameOwnerElement()) + return false; + + HTMLFrameOwnerElement* frameOwner = static_cast(element); + ASSERT(frameOwner->contentFrame()); + if (!frameOwner->contentFrame()) + return false; + + FrameLoader* loader = frameOwner->contentFrame()->loader(); + + loader->setResponseMIMEType(mimeType); + loader->begin(); + loader->write(source); + loader->end(); + + return true; +} + +void InspectorBackend::clearMessages() +{ + if (m_inspectorController) + m_inspectorController->clearConsoleMessages(); +} + +void InspectorBackend::toggleNodeSearch() +{ + if (m_inspectorController) + m_inspectorController->toggleSearchForNodeInPage(); +} + +void InspectorBackend::attach() +{ + if (m_inspectorController) + m_inspectorController->attachWindow(); +} + +void InspectorBackend::detach() +{ + if (m_inspectorController) + m_inspectorController->detachWindow(); +} + +void InspectorBackend::setAttachedWindowHeight(unsigned height) +{ + if (m_inspectorController) + m_inspectorController->setAttachedWindowHeight(height); +} + +void InspectorBackend::storeLastActivePanel(const String& panelName) +{ + if (m_inspectorController) + m_inspectorController->storeLastActivePanel(panelName); +} + +bool InspectorBackend::searchingForNode() +{ + if (m_inspectorController) + return m_inspectorController->searchingForNodeInPage(); + return false; +} + +void InspectorBackend::loaded() +{ + if (m_inspectorController) + m_inspectorController->scriptObjectReady(); +} + +void InspectorBackend::enableResourceTracking(bool always) +{ + if (m_inspectorController) + m_inspectorController->enableResourceTracking(always); +} + +void InspectorBackend::disableResourceTracking(bool always) +{ + if (m_inspectorController) + m_inspectorController->disableResourceTracking(always); +} + +bool InspectorBackend::resourceTrackingEnabled() const +{ + if (m_inspectorController) + return m_inspectorController->resourceTrackingEnabled(); + return false; +} + +void InspectorBackend::moveWindowBy(float x, float y) const +{ + if (m_inspectorController) + m_inspectorController->moveWindowBy(x, y); +} + +void InspectorBackend::closeWindow() +{ + if (m_inspectorController) + m_inspectorController->closeWindow(); +} + +const String& InspectorBackend::platform() const +{ +#if PLATFORM(MAC) +#ifdef BUILDING_ON_TIGER + DEFINE_STATIC_LOCAL(const String, platform, ("mac-tiger")); +#else + DEFINE_STATIC_LOCAL(const String, platform, ("mac-leopard")); +#endif +#elif PLATFORM(WIN_OS) + DEFINE_STATIC_LOCAL(const String, platform, ("windows")); +#elif PLATFORM(QT) + DEFINE_STATIC_LOCAL(const String, platform, ("qt")); +#elif PLATFORM(GTK) + DEFINE_STATIC_LOCAL(const String, platform, ("gtk")); +#elif PLATFORM(WX) + DEFINE_STATIC_LOCAL(const String, platform, ("wx")); +#else + DEFINE_STATIC_LOCAL(const String, platform, ("unknown")); +#endif + + return platform; +} + +#if ENABLE(JAVASCRIPT_DEBUGGER) +const ProfilesArray& InspectorBackend::profiles() const +{ + if (m_inspectorController) + return m_inspectorController->profiles(); + return m_emptyProfiles; +} + +void InspectorBackend::startProfiling() +{ + if (m_inspectorController) + m_inspectorController->startUserInitiatedProfiling(); +} + +void InspectorBackend::stopProfiling() +{ + if (m_inspectorController) + m_inspectorController->stopUserInitiatedProfiling(); +} + +void InspectorBackend::enableProfiler(bool always) +{ + if (m_inspectorController) + m_inspectorController->enableProfiler(always); +} + +void InspectorBackend::disableProfiler(bool always) +{ + if (m_inspectorController) + m_inspectorController->disableProfiler(always); +} + +bool InspectorBackend::profilerEnabled() +{ + if (m_inspectorController) + return m_inspectorController->profilerEnabled(); + return false; +} + +void InspectorBackend::enableDebugger(bool always) +{ + if (m_inspectorController) + m_inspectorController->enableDebuggerFromFrontend(always); +} + +void InspectorBackend::disableDebugger(bool always) +{ + if (m_inspectorController) + m_inspectorController->disableDebugger(always); +} + +bool InspectorBackend::debuggerEnabled() const +{ + if (m_inspectorController) + return m_inspectorController->debuggerEnabled(); + return false; +} + +JavaScriptCallFrame* InspectorBackend::currentCallFrame() const +{ + return JavaScriptDebugServer::shared().currentCallFrame(); +} + +void InspectorBackend::addBreakpoint(const String& sourceID, unsigned lineNumber) +{ + intptr_t sourceIDValue = sourceID.toIntPtr(); + JavaScriptDebugServer::shared().addBreakpoint(sourceIDValue, lineNumber); +} + +void InspectorBackend::removeBreakpoint(const String& sourceID, unsigned lineNumber) +{ + intptr_t sourceIDValue = sourceID.toIntPtr(); + JavaScriptDebugServer::shared().removeBreakpoint(sourceIDValue, lineNumber); +} + +bool InspectorBackend::pauseOnExceptions() +{ + return JavaScriptDebugServer::shared().pauseOnExceptions(); +} + +void InspectorBackend::setPauseOnExceptions(bool pause) +{ + JavaScriptDebugServer::shared().setPauseOnExceptions(pause); +} + +void InspectorBackend::pauseInDebugger() +{ + JavaScriptDebugServer::shared().pauseProgram(); +} + +void InspectorBackend::resumeDebugger() +{ + if (m_inspectorController) + m_inspectorController->resumeDebugger(); +} + +void InspectorBackend::stepOverStatementInDebugger() +{ + JavaScriptDebugServer::shared().stepOverStatement(); +} + +void InspectorBackend::stepIntoStatementInDebugger() +{ + JavaScriptDebugServer::shared().stepIntoStatement(); +} + +void InspectorBackend::stepOutOfFunctionInDebugger() +{ + JavaScriptDebugServer::shared().stepOutOfFunction(); +} + +#endif + +void InspectorBackend::highlight(Node* node) +{ + if (m_inspectorController) + m_inspectorController->highlight(node); +} + +} // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/inspector/InspectorBackend.h b/src/3rdparty/webkit/WebCore/inspector/InspectorBackend.h new file mode 100644 index 000000000..bb891c2a2 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/inspector/InspectorBackend.h @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2007 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef InspectorBackend_h +#define InspectorBackend_h + +#include "Console.h" +#include "InspectorController.h" +#include "PlatformString.h" + +#include + +namespace WebCore { + +class CachedResource; +class InspectorClient; +class JavaScriptCallFrame; +class Node; + +class InspectorBackend : public RefCounted +{ +public: + static PassRefPtr create(InspectorController* inspectorController, InspectorClient* client) + { + return adoptRef(new InspectorBackend(inspectorController, client)); + } + + ~InspectorBackend(); + + InspectorController* inspectorController() { return m_inspectorController; } + + void disconnectController() { m_inspectorController = 0; } + + void hideDOMNodeHighlight(); + + String localizedStringsURL(); + String hiddenPanels(); + + void windowUnloading(); + + bool isWindowVisible(); + + void addResourceSourceToFrame(long identifier, Node* frame); + bool addSourceToFrame(const String& mimeType, const String& source, Node* frame); + + void clearMessages(); + + void toggleNodeSearch(); + + void attach(); + void detach(); + + void setAttachedWindowHeight(unsigned height); + + void storeLastActivePanel(const String& panelName); + + bool searchingForNode(); + + void loaded(); + + void enableResourceTracking(bool always); + void disableResourceTracking(bool always); + bool resourceTrackingEnabled() const; + + void moveWindowBy(float x, float y) const; + void closeWindow(); + + const String& platform() const; + +#if ENABLE(JAVASCRIPT_DEBUGGER) + const ProfilesArray& profiles() const; + + void startProfiling(); + void stopProfiling(); + + void enableProfiler(bool always); + void disableProfiler(bool always); + bool profilerEnabled(); + + void enableDebugger(bool always); + void disableDebugger(bool always); + bool debuggerEnabled() const; + + JavaScriptCallFrame* currentCallFrame() const; + + void addBreakpoint(const String& sourceID, unsigned lineNumber); + void removeBreakpoint(const String& sourceID, unsigned lineNumber); + + bool pauseOnExceptions(); + void setPauseOnExceptions(bool pause); + + void pauseInDebugger(); + void resumeDebugger(); + + void stepOverStatementInDebugger(); + void stepIntoStatementInDebugger(); + void stepOutOfFunctionInDebugger(); +#endif + + // Generic code called from custom implementations. + void highlight(Node* node); + +private: + InspectorBackend(InspectorController* inspectorController, InspectorClient* client); + + InspectorController* m_inspectorController; + InspectorClient* m_client; +#if ENABLE(JAVASCRIPT_DEBUGGER) + ProfilesArray m_emptyProfiles; +#endif +}; + +} // namespace WebCore + +#endif // !defined(InspectorBackend_h) diff --git a/src/3rdparty/webkit/WebCore/inspector/InspectorBackend.idl b/src/3rdparty/webkit/WebCore/inspector/InspectorBackend.idl new file mode 100644 index 000000000..21e6d99bc --- /dev/null +++ b/src/3rdparty/webkit/WebCore/inspector/InspectorBackend.idl @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2008 Matt Lilek + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +module core { + interface [ + GenerateConstructor + ] InspectorBackend { + void hideDOMNodeHighlight(); + [Custom] void highlightDOMNode(in Node node); + void loaded(); + void windowUnloading(); + void attach(); + void detach(); + + void closeWindow(); + void clearMessages(); + void toggleNodeSearch(); + + boolean isWindowVisible(); + boolean searchingForNode(); + + void addResourceSourceToFrame(in long identifier, in Node frame); + boolean addSourceToFrame(in DOMString mimeType, in DOMString sourceValue, in Node frame); + [Custom] void search(in Node node, in DOMString query); +#if defined(ENABLE_DATABASE) && ENABLE_DATABASE + [Custom] DOMObject databaseTableNames(in Database database); +#endif + [Custom] DOMObject setting(in DOMString key); + [Custom] void setSetting(in DOMString key, in DOMObject value); + [Custom] DOMWindow inspectedWindow(); + DOMString localizedStringsURL(); + DOMString hiddenPanels(); + DOMString platform(); + [ImplementationFunction=moveWindowBy] void moveByUnrestricted(in float x, in float y); + void setAttachedWindowHeight(in unsigned long height); + [Custom] DOMObject wrapCallback(in DOMObject callback); + boolean resourceTrackingEnabled(); + void enableResourceTracking(in boolean always); + void disableResourceTracking(in boolean always); + void storeLastActivePanel(in DOMString panelName); + +#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER + boolean debuggerEnabled(); + void enableDebugger(in boolean always); + void disableDebugger(in boolean always); + + void addBreakpoint(in DOMString sourceID, in unsigned long lineNumber); + void removeBreakpoint(in DOMString sourceID, in unsigned long lineNumber); + + void pauseInDebugger(); + void resumeDebugger(); + + void stepOverStatementInDebugger(); + void stepIntoStatementInDebugger(); + void stepOutOfFunctionInDebugger(); + + [Custom] DOMObject currentCallFrame(); + + boolean pauseOnExceptions(); + void setPauseOnExceptions(in boolean pauseOnExceptions); + + boolean profilerEnabled(); + void enableProfiler(in boolean always); + void disableProfiler(in boolean always); + + void startProfiling(); + void stopProfiling(); + + [Custom] Array profiles(); +#endif + }; + } diff --git a/src/3rdparty/webkit/WebCore/inspector/InspectorController.cpp b/src/3rdparty/webkit/WebCore/inspector/InspectorController.cpp index 4b2dd59f7..2c7e5887d 100644 --- a/src/3rdparty/webkit/WebCore/inspector/InspectorController.cpp +++ b/src/3rdparty/webkit/WebCore/inspector/InspectorController.cpp @@ -47,6 +47,7 @@ #include "GraphicsContext.h" #include "HTMLFrameOwnerElement.h" #include "HitTestResult.h" +#include "InspectorBackend.h" #include "InspectorClient.h" #include "InspectorFrontend.h" #include "InspectorDatabaseResource.h" @@ -99,65 +100,12 @@ static const char* const UserInitiatedProfileName = "org.webkit.profiles.user-in static const char* const resourceTrackingEnabledSettingName = "resourceTrackingEnabled"; static const char* const debuggerEnabledSettingName = "debuggerEnabled"; static const char* const profilerEnabledSettingName = "profilerEnabled"; +static const char* const inspectorAttachedHeightName = "inspectorAttachedHeight"; +static const char* const lastActivePanelSettingName = "lastActivePanel"; -bool InspectorController::addSourceToFrame(const String& mimeType, const String& source, Node* frameNode) -{ - ASSERT_ARG(frameNode, frameNode); - - if (!frameNode) - return false; - - if (!frameNode->attached()) { - ASSERT_NOT_REACHED(); - return false; - } - - ASSERT(frameNode->isElementNode()); - if (!frameNode->isElementNode()) - return false; - - Element* element = static_cast(frameNode); - ASSERT(element->isFrameOwnerElement()); - if (!element->isFrameOwnerElement()) - return false; - - HTMLFrameOwnerElement* frameOwner = static_cast(element); - ASSERT(frameOwner->contentFrame()); - if (!frameOwner->contentFrame()) - return false; - - FrameLoader* loader = frameOwner->contentFrame()->loader(); - - loader->setResponseMIMEType(mimeType); - loader->begin(); - loader->write(source); - loader->end(); - - return true; -} - -const String& InspectorController::platform() const -{ -#if PLATFORM(MAC) -#ifdef BUILDING_ON_TIGER - DEFINE_STATIC_LOCAL(const String, platform, ("mac-tiger")); -#else - DEFINE_STATIC_LOCAL(const String, platform, ("mac-leopard")); -#endif -#elif PLATFORM(WIN_OS) - DEFINE_STATIC_LOCAL(const String, platform, ("windows")); -#elif PLATFORM(QT) - DEFINE_STATIC_LOCAL(const String, platform, ("qt")); -#elif PLATFORM(GTK) - DEFINE_STATIC_LOCAL(const String, platform, ("gtk")); -#elif PLATFORM(WX) - DEFINE_STATIC_LOCAL(const String, platform, ("wx")); -#else - DEFINE_STATIC_LOCAL(const String, platform, ("unknown")); -#endif - - return platform; -} +static const unsigned defaultAttachedHeight = 300; +static const float minimumAttachedHeight = 250.0f; +static const float maximumAttachedHeightRatio = 0.75f; static unsigned s_inspectorControllerCount; static HashMap* s_settingCache; @@ -168,13 +116,14 @@ InspectorController::InspectorController(Page* page, InspectorClient* client) , m_page(0) , m_scriptState(0) , m_windowVisible(false) - , m_showAfterVisible(ElementsPanel) + , m_showAfterVisible(CurrentPanel) , m_nextIdentifier(-2) , m_groupLevel(0) , m_searchingForNode(false) , m_previousMessage(0) , m_resourceTrackingEnabled(false) , m_resourceTrackingSettingsLoaded(false) + , m_inspectorBackend(InspectorBackend::create(this, client)) #if ENABLE(JAVASCRIPT_DEBUGGER) , m_debuggerEnabled(false) , m_attachDebuggerWhenShown(false) @@ -209,6 +158,8 @@ InspectorController::~InspectorController() delete s_settingCache; s_settingCache = 0; } + + m_inspectorBackend->disconnectController(); } void InspectorController::inspectedPageDestroyed() @@ -279,20 +230,6 @@ void InspectorController::setSetting(const String& key, const Setting& setting) m_client->storeSetting(key, setting); } -String InspectorController::localizedStringsURL() -{ - if (!enabled()) - return String(); - return m_client->localizedStringsURL(); -} - -String InspectorController::hiddenPanels() -{ - if (!enabled()) - return String(); - return m_client->hiddenPanels(); -} - // Trying to inspect something in a frame with JavaScript disabled would later lead to // crashes trying to create JavaScript wrappers. Some day we could fix this issue, but // for now prevent crashes here by never targeting a node in such a frame. @@ -371,14 +308,27 @@ void InspectorController::setWindowVisible(bool visible, bool attached) if (m_windowVisible) { setAttachedWindow(attached); populateScriptObjects(); + + // Console panel is implemented as a 'fast view', so there should be + // real panel opened along with it. + bool showConsole = m_showAfterVisible == ConsolePanel; + if (m_showAfterVisible == CurrentPanel || showConsole) { + Setting lastActivePanelSetting = setting(lastActivePanelSettingName); + if (lastActivePanelSetting.type() == Setting::StringType) + m_showAfterVisible = specialPanelForJSName(lastActivePanelSetting.string()); + else + m_showAfterVisible = ElementsPanel; + } + if (m_nodeToFocus) focusNode(); #if ENABLE(JAVASCRIPT_DEBUGGER) if (m_attachDebuggerWhenShown) enableDebugger(); #endif - if (m_showAfterVisible != CurrentPanel) - showPanel(m_showAfterVisible); + showPanel(m_showAfterVisible); + if (showConsole) + showPanel(ConsolePanel); } else { #if ENABLE(JAVASCRIPT_DEBUGGER) // If the window is being closed with the debugger enabled, @@ -391,7 +341,6 @@ void InspectorController::setWindowVisible(bool visible, bool attached) #endif resetScriptObjects(); } - m_showAfterVisible = CurrentPanel; } @@ -453,11 +402,26 @@ void InspectorController::endGroup(MessageSource source, unsigned lineNumber, co addConsoleMessage(0, new ConsoleMessage(source, EndGroupMessageType, LogMessageLevel, String(), lineNumber, sourceURL, m_groupLevel)); } +static unsigned constrainedAttachedWindowHeight(unsigned preferredHeight, unsigned totalWindowHeight) +{ + return roundf(max(minimumAttachedHeight, min(preferredHeight, totalWindowHeight * maximumAttachedHeightRatio))); +} + void InspectorController::attachWindow() { if (!enabled()) return; + + unsigned inspectedPageHeight = m_inspectedPage->mainFrame()->view()->visibleHeight(); + m_client->attachWindow(); + + Setting attachedHeight = setting(inspectorAttachedHeightName); + unsigned preferredHeight = attachedHeight.type() == Setting::IntegerType ? attachedHeight.integerValue() : defaultAttachedHeight; + + // We need to constrain the window height here in case the user has resized the inspected page's window so that + // the user's preferred height would be too big to display. + m_client->setAttachedWindowHeight(constrainedAttachedWindowHeight(preferredHeight, inspectedPageHeight)); } void InspectorController::detachWindow() @@ -479,7 +443,18 @@ void InspectorController::setAttachedWindowHeight(unsigned height) { if (!enabled()) return; - m_client->setAttachedWindowHeight(height); + + unsigned totalHeight = m_page->mainFrame()->view()->visibleHeight() + m_inspectedPage->mainFrame()->view()->visibleHeight(); + unsigned attachedHeight = constrainedAttachedWindowHeight(height, totalHeight); + + setSetting(inspectorAttachedHeightName, Setting(attachedHeight)); + + m_client->setAttachedWindowHeight(attachedHeight); +} + +void InspectorController::storeLastActivePanel(const String& panelName) +{ + setSetting(lastActivePanelSettingName, Setting(panelName)); } void InspectorController::toggleSearchForNodeInPage() @@ -492,19 +467,6 @@ void InspectorController::toggleSearchForNodeInPage() hideHighlight(); } -void InspectorController::addResourceSourceToFrame(long identifier, Node* frame) -{ - if (!enabled() || !m_frontend) - return; - - RefPtr resource = resources().get(identifier); - if (resource) { - String sourceString = resource->sourceString(); - if (!sourceString.isEmpty()) - addSourceToFrame(resource->mimeType(), sourceString, frame); - } -} - void InspectorController::mouseDidMoveOverElement(const HitTestResult& result, unsigned) { if (!enabled() || !m_searchingForNode) @@ -546,7 +508,7 @@ void InspectorController::windowScriptObjectAvailable() m_page->mainFrame()->document()->securityOrigin()->grantUniversalAccess(); m_scriptState = scriptStateFromPage(m_page); - ScriptGlobalObject::set(m_scriptState, "InspectorController", this); + ScriptGlobalObject::set(m_scriptState, "InspectorController", m_inspectorBackend.get()); } void InspectorController::scriptObjectReady() @@ -635,7 +597,18 @@ void InspectorController::close() void InspectorController::showWindow() { ASSERT(enabled()); + + unsigned inspectedPageHeight = m_inspectedPage->mainFrame()->view()->visibleHeight(); + m_client->showWindow(); + + Setting attachedHeight = setting(inspectorAttachedHeightName); + unsigned preferredHeight = attachedHeight.type() == Setting::IntegerType ? attachedHeight.integerValue() : defaultAttachedHeight; + + // This call might not go through (if the window starts out detached), but if the window is initially created attached, + // InspectorController::attachWindow is never called, so we need to make sure to set the attachedWindowHeight. + // FIXME: Clean up code so we only have to call setAttachedWindowHeight in InspectorController::attachWindow + m_client->setAttachedWindowHeight(constrainedAttachedWindowHeight(preferredHeight, inspectedPageHeight)); } void InspectorController::closeWindow() @@ -790,7 +763,9 @@ void InspectorController::addResource(InspectorResource* resource) void InspectorController::removeResource(InspectorResource* resource) { m_resources.remove(resource->identifier()); - m_knownResources.remove(resource->requestURL()); + String requestURL = resource->requestURL(); + if (!requestURL.isNull()) + m_knownResources.remove(requestURL); Frame* frame = resource->frame(); ResourcesMap* resourceMap = m_frameResources.get(frame); @@ -1116,7 +1091,7 @@ void InspectorController::addScriptProfile(Profile* profile) if (!m_frontend) return; - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); m_frontend->addProfile(toJS(m_scriptState, profile)); } @@ -1265,28 +1240,6 @@ void InspectorController::disableDebugger(bool always) m_frontend->debuggerWasDisabled(); } -JavaScriptCallFrame* InspectorController::currentCallFrame() const -{ - return JavaScriptDebugServer::shared().currentCallFrame(); -} - -bool InspectorController::pauseOnExceptions() -{ - return JavaScriptDebugServer::shared().pauseOnExceptions(); -} - -void InspectorController::setPauseOnExceptions(bool pause) -{ - JavaScriptDebugServer::shared().setPauseOnExceptions(pause); -} - -void InspectorController::pauseInDebugger() -{ - if (!m_debuggerEnabled) - return; - JavaScriptDebugServer::shared().pauseProgram(); -} - void InspectorController::resumeDebugger() { if (!m_debuggerEnabled) @@ -1294,39 +1247,6 @@ void InspectorController::resumeDebugger() JavaScriptDebugServer::shared().continueProgram(); } -void InspectorController::stepOverStatementInDebugger() -{ - if (!m_debuggerEnabled) - return; - JavaScriptDebugServer::shared().stepOverStatement(); -} - -void InspectorController::stepIntoStatementInDebugger() -{ - if (!m_debuggerEnabled) - return; - JavaScriptDebugServer::shared().stepIntoStatement(); -} - -void InspectorController::stepOutOfFunctionInDebugger() -{ - if (!m_debuggerEnabled) - return; - JavaScriptDebugServer::shared().stepOutOfFunction(); -} - -void InspectorController::addBreakpoint(const String& sourceID, unsigned lineNumber) -{ - intptr_t sourceIDValue = sourceID.toIntPtr(); - JavaScriptDebugServer::shared().addBreakpoint(sourceIDValue, lineNumber); -} - -void InspectorController::removeBreakpoint(const String& sourceID, unsigned lineNumber) -{ - intptr_t sourceIDValue = sourceID.toIntPtr(); - JavaScriptDebugServer::shared().removeBreakpoint(sourceIDValue, lineNumber); -} - // JavaScriptDebugListener functions void InspectorController::didParseSource(ExecState*, const SourceCode& source) @@ -1529,4 +1449,20 @@ bool InspectorController::stopTiming(const String& title, double& elapsed) return true; } +InspectorController::SpecialPanels InspectorController::specialPanelForJSName(const String& panelName) +{ + if (panelName == "elements") + return ElementsPanel; + else if (panelName == "resources") + return ResourcesPanel; + else if (panelName == "scripts") + return ScriptsPanel; + else if (panelName == "profiles") + return ProfilesPanel; + else if (panelName == "databases") + return DatabasesPanel; + else + return ElementsPanel; +} + } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/inspector/InspectorController.h b/src/3rdparty/webkit/WebCore/inspector/InspectorController.h index 4c90bc560..771f74154 100644 --- a/src/3rdparty/webkit/WebCore/inspector/InspectorController.h +++ b/src/3rdparty/webkit/WebCore/inspector/InspectorController.h @@ -56,6 +56,7 @@ class Database; class DocumentLoader; class GraphicsContext; class HitTestResult; +class InspectorBackend; class InspectorClient; class InspectorFrontend; class JavaScriptCallFrame; @@ -76,9 +77,9 @@ class InspectorDatabaseResource; class InspectorDOMStorageResource; class InspectorResource; -class InspectorController : public RefCounted +class InspectorController #if ENABLE(JAVASCRIPT_DEBUGGER) - , JavaScriptDebugListener + : JavaScriptDebugListener #endif { public: @@ -113,6 +114,18 @@ public: m_simpleContent.m_boolean = value; } + explicit Setting(unsigned value) + : m_type(IntegerType) + { + m_simpleContent.m_integer = value; + } + + explicit Setting(const String& value) + : m_type(StringType) + { + m_string = value; + } + Type type() const { return m_type; } String string() const { ASSERT(m_type == StringType); return m_string; } @@ -139,14 +152,11 @@ public: bool m_boolean; } m_simpleContent; }; - - static PassRefPtr create(Page* page, InspectorClient* inspectorClient) - { - return adoptRef(new InspectorController(page, inspectorClient)); - } - + InspectorController(Page*, InspectorClient*); ~InspectorController(); + InspectorBackend* inspectorBackend() { return m_inspectorBackend.get(); } + void inspectedPageDestroyed(); void pageDestroyed() { m_page = 0; } @@ -157,9 +167,6 @@ public: const Setting& setting(const String& key) const; void setSetting(const String& key, const Setting&); - String localizedStringsURL(); - String hiddenPanels(); - void inspect(Node*); void highlight(Node*); void hideHighlight(); @@ -171,8 +178,6 @@ public: bool windowVisible(); void setWindowVisible(bool visible = true, bool attached = false); - void addResourceSourceToFrame(long identifier, Node* frame); - bool addSourceToFrame(const String& mimeType, const String& source, Node*); void addMessageToConsole(MessageSource, MessageType, MessageLevel, ScriptCallStack*); void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID); void clearConsoleMessages(); @@ -180,9 +185,6 @@ public: void attachWindow(); void detachWindow(); - void setAttachedWindow(bool); - void setAttachedWindowHeight(unsigned height); - void toggleSearchForNodeInPage(); bool searchingForNodeInPage() { return m_searchingForNode; }; void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags); @@ -191,7 +193,6 @@ public: void inspectedWindowScriptObjectCleared(Frame*); void windowScriptObjectAvailable(); - void scriptObjectReady(); void setFrontendProxyObject(ScriptState* state, ScriptObject object); void populateScriptObjects(); @@ -225,9 +226,6 @@ public: const ResourcesMap& resources() const { return m_resources; } - void moveWindowBy(float x, float y) const; - void closeWindow(); - void drawNodeHighlight(GraphicsContext&) const; void count(const String& title, unsigned lineNumber, const String& sourceID); @@ -238,8 +236,6 @@ public: void startGroup(MessageSource source, ScriptCallStack* callFrame); void endGroup(MessageSource source, unsigned lineNumber, const String& sourceURL); - const String& platform() const; - #if ENABLE(JAVASCRIPT_DEBUGGER) void addProfile(PassRefPtr, unsigned lineNumber, const JSC::UString& sourceURL); void addProfileFinishedMessageToConsole(PassRefPtr, unsigned lineNumber, const JSC::UString& sourceURL); @@ -250,35 +246,19 @@ public: bool isRecordingUserInitiatedProfile() const { return m_recordingUserInitiatedProfile; } JSC::UString getCurrentUserInitiatedProfileName(bool incrementProfileNumber); - void startUserInitiatedProfilingSoon(); void startUserInitiatedProfiling(Timer* = 0); void stopUserInitiatedProfiling(); - void toggleRecordButton(bool); void enableProfiler(bool always = false, bool skipRecompile = false); void disableProfiler(bool always = false); bool profilerEnabled() const { return enabled() && m_profilerEnabled; } - void enableDebuggerFromFrontend(bool always); void enableDebugger(); void disableDebugger(bool always = false); bool debuggerEnabled() const { return m_debuggerEnabled; } - JavaScriptCallFrame* currentCallFrame() const; - - void addBreakpoint(const String& sourceID, unsigned lineNumber); - void removeBreakpoint(const String& sourceID, unsigned lineNumber); - - bool pauseOnExceptions(); - void setPauseOnExceptions(bool pause); - - void pauseInDebugger(); void resumeDebugger(); - void stepOverStatementInDebugger(); - void stepIntoStatementInDebugger(); - void stepOutOfFunctionInDebugger(); - virtual void didParseSource(JSC::ExecState*, const JSC::SourceCode&); virtual void failedToParseSource(JSC::ExecState*, const JSC::SourceCode&, int errorLine, const JSC::UString& errorMessage); virtual void didPause(); @@ -286,7 +266,20 @@ public: #endif private: - InspectorController(Page*, InspectorClient*); + friend class InspectorBackend; + + // Following are used from InspectorBackend and internally. + void scriptObjectReady(); + void moveWindowBy(float x, float y) const; + void setAttachedWindow(bool); + void setAttachedWindowHeight(unsigned height); + void storeLastActivePanel(const String& panelName); + void closeWindow(); +#if ENABLE(JAVASCRIPT_DEBUGGER) + void startUserInitiatedProfilingSoon(); + void toggleRecordButton(bool); + void enableDebuggerFromFrontend(bool always); +#endif void focusNode(); @@ -303,6 +296,8 @@ private: bool isMainResourceLoader(DocumentLoader* loader, const KURL& requestUrl); + SpecialPanels specialPanelForJSName(const String& panelName); + Page* m_inspectedPage; InspectorClient* m_client; OwnPtr m_frontend; @@ -331,6 +326,7 @@ private: ConsoleMessage* m_previousMessage; bool m_resourceTrackingEnabled; bool m_resourceTrackingSettingsLoaded; + RefPtr m_inspectorBackend; #if ENABLE(JAVASCRIPT_DEBUGGER) bool m_debuggerEnabled; bool m_attachDebuggerWhenShown; diff --git a/src/3rdparty/webkit/WebCore/inspector/InspectorController.idl b/src/3rdparty/webkit/WebCore/inspector/InspectorController.idl deleted file mode 100644 index c6263051a..000000000 --- a/src/3rdparty/webkit/WebCore/inspector/InspectorController.idl +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. - * Copyright (C) 2008 Matt Lilek - * Copyright (C) 2009 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -module core { - interface [ - GenerateConstructor - ] InspectorController { - [ImplementationFunction=hideHighlight] void hideDOMNodeHighlight(); - [Custom] void highlightDOMNode(in Node node); - [ImplementationFunction=scriptObjectReady] void loaded(); - [ImplementationFunction=close] void windowUnloading(); - [ImplementationFunction=attachWindow] void attach(); - [ImplementationFunction=detachWindow] void detach(); - - void closeWindow(); - [ImplementationFunction=clearConsoleMessages] void clearMessages(); - [ImplementationFunction=toggleSearchForNodeInPage] void toggleNodeSearch(); - - [ImplementationFunction=windowVisible] boolean isWindowVisible(); - [ImplementationFunction=searchingForNodeInPage] boolean searchingForNode(); - - void addResourceSourceToFrame(in long identifier, in Node frame); - boolean addSourceToFrame(in DOMString mimeType, in DOMString sourceValue, in Node frame); - [Custom] Node getResourceDocumentNode(in long long identifier); - [Custom] void search(in Node node, in DOMString query); -#if defined(ENABLE_DATABASE) && ENABLE_DATABASE - [Custom] DOMObject databaseTableNames(in Database database); -#endif - [Custom] DOMObject setting(in DOMString key); - [Custom] void setSetting(in DOMString key, in DOMObject value); - [Custom] DOMWindow inspectedWindow(); - DOMString localizedStringsURL(); - DOMString hiddenPanels(); - DOMString platform(); - [ImplementationFunction=moveWindowBy] void moveByUnrestricted(in float x, in float y); - void setAttachedWindowHeight(in unsigned long height); - [Custom] DOMObject wrapCallback(in DOMObject callback); - boolean resourceTrackingEnabled(); - void enableResourceTracking(in boolean always); - void disableResourceTracking(in boolean always); - -#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER - void enableDebuggerFromFrontend(in boolean always); - void disableDebugger(in boolean always); - void pauseInDebugger(); - void resumeDebugger(); - void stepOverStatementInDebugger(); - void stepIntoStatementInDebugger(); - void stepOutOfFunctionInDebugger(); - boolean debuggerEnabled(); - boolean pauseOnExceptions(); - boolean profilerEnabled(); - [ImplementationFunction=startUserInitiatedProfiling] void startProfiling(); - [ImplementationFunction=stopUserInitiatedProfiling] void stopProfiling(); - void enableProfiler(in boolean always); - void disableProfiler(in boolean always); - [Custom] DOMObject currentCallFrame(); - void setPauseOnExceptions(in boolean pauseOnExceptions); - void addBreakpoint(in DOMString sourceID, in unsigned long lineNumber); - void removeBreakpoint(in DOMString sourceID, in unsigned long lineNumber); - - [Custom] Array profiles(); -#endif - }; - } diff --git a/src/3rdparty/webkit/WebCore/inspector/JavaScriptCallFrame.cpp b/src/3rdparty/webkit/WebCore/inspector/JavaScriptCallFrame.cpp index 1ce0defcc..9225a0392 100644 --- a/src/3rdparty/webkit/WebCore/inspector/JavaScriptCallFrame.cpp +++ b/src/3rdparty/webkit/WebCore/inspector/JavaScriptCallFrame.cpp @@ -104,7 +104,7 @@ JSValue JavaScriptCallFrame::evaluate(const UString& script, JSValue& exception) if (!m_isValid) return jsNull(); - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); return m_debuggerCallFrame.evaluate(script, exception); } diff --git a/src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.cpp b/src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.cpp index 84bc2f680..10eff26a1 100644 --- a/src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.cpp +++ b/src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.cpp @@ -554,7 +554,7 @@ void JavaScriptDebugServer::recompileAllJSFunctionsSoon() void JavaScriptDebugServer::recompileAllJSFunctions(Timer*) { - JSLock lock(false); + JSLock lock(SilenceAssertionsOnly); JSGlobalData* globalData = JSDOMWindow::commonJSGlobalData(); // If JavaScript is running, it's not safe to recompile, since we'll end diff --git a/src/3rdparty/webkit/WebCore/inspector/JavaScriptProfileNode.cpp b/src/3rdparty/webkit/WebCore/inspector/JavaScriptProfileNode.cpp index 5b5c340b0..3c3e27978 100644 --- a/src/3rdparty/webkit/WebCore/inspector/JavaScriptProfileNode.cpp +++ b/src/3rdparty/webkit/WebCore/inspector/JavaScriptProfileNode.cpp @@ -84,7 +84,7 @@ static JSValueRef getLineNumber(JSContextRef ctx, JSObjectRef thisObject, JSStri static JSValueRef getTotalTime(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*) { - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass())) return JSValueMakeUndefined(ctx); @@ -95,7 +95,7 @@ static JSValueRef getTotalTime(JSContextRef ctx, JSObjectRef thisObject, JSStrin static JSValueRef getSelfTime(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*) { - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass())) return JSValueMakeUndefined(ctx); @@ -106,7 +106,7 @@ static JSValueRef getSelfTime(JSContextRef ctx, JSObjectRef thisObject, JSString static JSValueRef getTotalPercent(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*) { - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass())) return JSValueMakeUndefined(ctx); @@ -117,7 +117,7 @@ static JSValueRef getTotalPercent(JSContextRef ctx, JSObjectRef thisObject, JSSt static JSValueRef getSelfPercent(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*) { - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass())) return JSValueMakeUndefined(ctx); @@ -128,7 +128,7 @@ static JSValueRef getSelfPercent(JSContextRef ctx, JSObjectRef thisObject, JSStr static JSValueRef getNumberOfCalls(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*) { - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass())) return JSValueMakeUndefined(ctx); @@ -139,7 +139,7 @@ static JSValueRef getNumberOfCalls(JSContextRef ctx, JSObjectRef thisObject, JSS static JSValueRef getChildren(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef* exception) { - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass())) return JSValueMakeUndefined(ctx); @@ -186,7 +186,7 @@ static JSValueRef getChildren(JSContextRef ctx, JSObjectRef thisObject, JSString static JSValueRef getParent(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*) { - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass())) return JSValueMakeUndefined(ctx); @@ -198,7 +198,7 @@ static JSValueRef getParent(JSContextRef ctx, JSObjectRef thisObject, JSStringRe static JSValueRef getHead(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*) { - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass())) return JSValueMakeUndefined(ctx); @@ -210,7 +210,7 @@ static JSValueRef getHead(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, static JSValueRef getVisible(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*) { - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass())) return JSValueMakeUndefined(ctx); @@ -221,7 +221,7 @@ static JSValueRef getVisible(JSContextRef ctx, JSObjectRef thisObject, JSStringR static JSValueRef getCallUID(JSContextRef ctx, JSObjectRef thisObject, JSStringRef, JSValueRef*) { - JSC::JSLock lock(false); + JSC::JSLock lock(SilenceAssertionsOnly); if (!JSValueIsObjectOfClass(ctx, thisObject, ProfileNodeClass())) return JSValueMakeUndefined(ctx); diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/Breakpoint.js b/src/3rdparty/webkit/WebCore/inspector/front-end/Breakpoint.js index 8611cf5e2..347df6084 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/Breakpoint.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/Breakpoint.js @@ -29,6 +29,7 @@ WebInspector.Breakpoint = function(url, line, sourceID) this.line = line; this.sourceID = sourceID; this._enabled = true; + this._sourceText = ""; } WebInspector.Breakpoint.prototype = { @@ -48,6 +49,28 @@ WebInspector.Breakpoint.prototype = { this.dispatchEventToListeners("enabled"); else this.dispatchEventToListeners("disabled"); + }, + + get sourceText() + { + return this._sourceText; + }, + + set sourceText(text) + { + this._sourceText = text; + this.dispatchEventToListeners("text-changed"); + }, + + get label() + { + var displayName = (this.url ? WebInspector.displayNameForURL(this.url) : WebInspector.UIString("(program)")); + return displayName + ":" + this.line; + }, + + get id() + { + return this.sourceID + ":" + this.line; } } diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/BreakpointsSidebarPane.js b/src/3rdparty/webkit/WebCore/inspector/front-end/BreakpointsSidebarPane.js index 2b8f3cded..14f8c06c4 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/BreakpointsSidebarPane.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/BreakpointsSidebarPane.js @@ -27,7 +27,10 @@ WebInspector.BreakpointsSidebarPane = function() { WebInspector.SidebarPane.call(this, WebInspector.UIString("Breakpoints")); - this.breakpoints = []; + this.breakpoints = {}; + + this.listElement = document.createElement("ol"); + this.listElement.className = "breakpoint-list"; this.emptyElement = document.createElement("div"); this.emptyElement.className = "info"; @@ -39,11 +42,21 @@ WebInspector.BreakpointsSidebarPane = function() WebInspector.BreakpointsSidebarPane.prototype = { addBreakpoint: function(breakpoint) { - this.breakpoints.push(breakpoint); + if (this.breakpoints[breakpoint.id]) + return; + + this.breakpoints[breakpoint.id] = breakpoint; + breakpoint.addEventListener("enabled", this._breakpointEnableChanged, this); breakpoint.addEventListener("disabled", this._breakpointEnableChanged, this); + breakpoint.addEventListener("text-changed", this._breakpointTextChanged, this); - // FIXME: add to the breakpoints UI. + this._appendBreakpointElement(breakpoint); + + if (this.emptyElement.parentElement) { + this.bodyElement.removeChild(this.emptyElement); + this.bodyElement.appendChild(this.listElement); + } if (!InspectorController.debuggerEnabled() || !breakpoint.sourceID) return; @@ -52,13 +65,73 @@ WebInspector.BreakpointsSidebarPane.prototype = { InspectorController.addBreakpoint(breakpoint.sourceID, breakpoint.line); }, + _appendBreakpointElement: function(breakpoint) + { + function checkboxClicked() + { + breakpoint.enabled = !breakpoint.enabled; + } + + function labelClicked() + { + var script = WebInspector.panels.scripts.scriptOrResourceForID(breakpoint.sourceID); + if (script) + WebInspector.panels.scripts.showScript(script, breakpoint.line); + } + + var breakpointElement = document.createElement("li"); + breakpoint._breakpointListElement = breakpointElement; + breakpointElement._breakpointObject = breakpoint; + + var checkboxElement = document.createElement("input"); + checkboxElement.className = "checkbox-elem"; + checkboxElement.type = "checkbox"; + checkboxElement.checked = breakpoint.enabled; + checkboxElement.addEventListener("click", checkboxClicked, false); + breakpointElement.appendChild(checkboxElement); + + var labelElement = document.createElement("a"); + labelElement.textContent = breakpoint.label; + labelElement.addEventListener("click", labelClicked, false); + breakpointElement.appendChild(labelElement); + + var sourceTextElement = document.createElement("div"); + sourceTextElement.textContent = breakpoint.sourceText; + sourceTextElement.className = "source-text"; + breakpointElement.appendChild(sourceTextElement); + + var currentElement = this.listElement.firstChild; + while (currentElement) { + var currentBreak = currentElement._breakpointObject; + if (currentBreak.url > breakpoint.url) { + this.listElement.insertBefore(breakpointElement, currentElement); + return; + } else if (currentBreak.url == breakpoint.url && currentBreak.line > breakpoint.line) { + this.listElement.insertBefore(breakpointElement, currentElement); + return; + } + currentElement = currentElement.nextSibling; + } + this.listElement.appendChild(breakpointElement); + }, + removeBreakpoint: function(breakpoint) { - this.breakpoints.remove(breakpoint); + if (!this.breakpoints[breakpoint.id]) + return; + delete this.breakpoints[breakpoint.id]; + breakpoint.removeEventListener("enabled", null, this); breakpoint.removeEventListener("disabled", null, this); + breakpoint.removeEventListener("text-changed", null, this); - // FIXME: remove from the breakpoints UI. + var element = breakpoint._breakpointListElement; + element.parentElement.removeChild(element); + + if (!this.listElement.firstChild) { + this.bodyElement.removeChild(this.listElement); + this.bodyElement.appendChild(this.emptyElement); + } if (!InspectorController.debuggerEnabled() || !breakpoint.sourceID) return; @@ -70,7 +143,8 @@ WebInspector.BreakpointsSidebarPane.prototype = { { var breakpoint = event.target; - // FIXME: change the breakpoint checkbox state in the UI. + var checkbox = breakpoint._breakpointListElement.firstChild; + checkbox.checked = breakpoint.enabled; if (!InspectorController.debuggerEnabled() || !breakpoint.sourceID) return; @@ -79,6 +153,14 @@ WebInspector.BreakpointsSidebarPane.prototype = { InspectorController.addBreakpoint(breakpoint.sourceID, breakpoint.line); else InspectorController.removeBreakpoint(breakpoint.sourceID, breakpoint.line); + }, + + _breakpointTextChanged: function(event) + { + var breakpoint = event.target; + + var sourceTextElement = breakpoint._breakpointListElement.firstChild.nextSibling.nextSibling; + sourceTextElement.textContent = breakpoint.sourceText; } } diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/Console.js b/src/3rdparty/webkit/WebCore/inspector/front-end/Console.js index ca9ac0057..520e213a2 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/Console.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/Console.js @@ -409,16 +409,35 @@ WebInspector.Console.prototype = { }, \ dir: function() { return console.dir.apply(console, arguments) }, \ dirxml: function() { return console.dirxml.apply(console, arguments) }, \ - keys: function(o) { var a = []; for (k in o) a.push(k); return a; }, \ - values: function(o) { var a = []; for (k in o) a.push(o[k]); return a; }, \ + keys: function(o) { var a = []; for (var k in o) a.push(k); return a; }, \ + values: function(o) { var a = []; for (var k in o) a.push(o[k]); return a; }, \ profile: function() { return console.profile.apply(console, arguments) }, \ - profileEnd: function() { return console.profileEnd.apply(console, arguments) } \ + profileEnd: function() { return console.profileEnd.apply(console, arguments) }, \ + _inspectedNodes: [], \ + _addInspectedNode: function(node) { \ + var inspectedNodes = _inspectorCommandLineAPI._inspectedNodes; \ + inspectedNodes.unshift(node); \ + if (inspectedNodes.length >= 5) \ + inspectedNodes.pop(); \ + }, \ + get $0() { return _inspectorCommandLineAPI._inspectedNodes[0] }, \ + get $1() { return _inspectorCommandLineAPI._inspectedNodes[1] }, \ + get $2() { return _inspectorCommandLineAPI._inspectedNodes[2] }, \ + get $3() { return _inspectorCommandLineAPI._inspectedNodes[3] }, \ + get $4() { return _inspectorCommandLineAPI._inspectedNodes[4] } \ };"); inspectedWindow._inspectorCommandLineAPI.clear = InspectorController.wrapCallback(this.clearMessages.bind(this)); } }, - + + addInspectedNode: function(node) + { + var inspectedWindow = InspectorController.inspectedWindow(); + this._ensureCommandLineAPIInstalled(inspectedWindow); + inspectedWindow._inspectorCommandLineAPI._addInspectedNode(node); + }, + doEvalInWindow: function(expression, callback) { if (!expression) { diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/DatabasesPanel.js b/src/3rdparty/webkit/WebCore/inspector/front-end/DatabasesPanel.js index 4644b3b22..b1d815f9c 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/DatabasesPanel.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/DatabasesPanel.js @@ -332,7 +332,7 @@ WebInspector.DatabasesPanel.prototype = { var nodes = []; var length = domStorage.length; - for (index = 0; index < domStorage.length; index++) { + for (var index = 0; index < domStorage.length; index++) { var data = {}; var key = String(domStorage.key(index)); diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/ElementsPanel.js b/src/3rdparty/webkit/WebCore/inspector/front-end/ElementsPanel.js index 3c9be545b..76d97469e 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/ElementsPanel.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/ElementsPanel.js @@ -60,6 +60,8 @@ WebInspector.ElementsPanel = function() InspectorController.toggleNodeSearch(); this.panel.nodeSearchButton.removeStyleClass("toggled-on"); } + + WebInspector.console.addInspectedNode(this._focusedDOMNode); }; this.contentElement.appendChild(this.treeOutline.element); diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/ElementsTreeOutline.js b/src/3rdparty/webkit/WebCore/inspector/front-end/ElementsTreeOutline.js index 2da2f104b..ef5320915 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/ElementsTreeOutline.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/ElementsTreeOutline.js @@ -1,6 +1,7 @@ /* * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. * Copyright (C) 2008 Matt Lilek + * Copyright (C) 2009 Joseph Pecoraro * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -255,6 +256,9 @@ WebInspector.ElementsTreeElement = function(node) // The title will be updated in onattach. TreeElement.call(this, "", node, titleInfo.hasChildren); + + if (this.representedObject.nodeType == Node.ELEMENT_NODE) + this._canAddAttributes = true; } WebInspector.ElementsTreeElement.prototype = { @@ -296,9 +300,36 @@ WebInspector.ElementsTreeElement.prototype = { this.listItemElement.addStyleClass("hovered"); } else this.listItemElement.removeStyleClass("hovered"); + if (this._canAddAttributes) + this.toggleNewAttributeButton(); } }, + toggleNewAttributeButton: function() + { + function removeWhenEditing(event) + { + if (this._addAttributeElement && this._addAttributeElement.parentNode) + this._addAttributeElement.parentNode.removeChild(this._addAttributeElement); + delete this._addAttributeElement; + } + + if (!this._addAttributeElement && this._hovered && !this._editing) { + var span = document.createElement("span"); + span.className = "add-attribute"; + span.textContent = "\u2026"; + span.addEventListener("dblclick", removeWhenEditing.bind(this), false); + this._addAttributeElement = span; + + var tag = this.listItemElement.getElementsByClassName("webkit-html-tag")[0]; + this._insertInLastAttributePosition(tag, span); + } else if (!this._hovered && this._addAttributeElement) { + if (this._addAttributeElement.parentNode) + this._addAttributeElement.parentNode.removeChild(this._addAttributeElement); + delete this._addAttributeElement; + } + }, + updateSelection: function() { var listItemElement = this.listItemElement; @@ -483,7 +514,7 @@ WebInspector.ElementsTreeElement.prototype = { if (this._editing) return; - if (this._startEditing(event)) + if (this._startEditing(event, treeElement)) return; if (this.treeOutline.panel) { @@ -495,7 +526,20 @@ WebInspector.ElementsTreeElement.prototype = { this.expand(); }, - _startEditing: function(event) + _insertInLastAttributePosition: function(tag, node) + { + if (tag.getElementsByClassName("webkit-html-attribute").length > 0) + tag.insertBefore(node, tag.lastChild); + else { + var nodeName = tag.textContent.match(/^<(.*?)>$/)[1]; + tag.textContent = ''; + tag.appendChild(document.createTextNode('<'+nodeName)); + tag.appendChild(node); + tag.appendChild(document.createTextNode('>')); + } + }, + + _startEditing: function(event, treeElement) { if (this.treeOutline.focusedDOMNode != this.representedObject) return; @@ -509,12 +553,51 @@ WebInspector.ElementsTreeElement.prototype = { var attribute = event.target.enclosingNodeOrSelfWithClass("webkit-html-attribute"); if (attribute) - return this._startEditingAttribute(attribute, event); + return this._startEditingAttribute(attribute, event.target); + + var newAttribute = event.target.enclosingNodeOrSelfWithClass("add-attribute"); + if (newAttribute) + return this._addNewAttribute(treeElement.listItemElement); return false; }, - _startEditingAttribute: function(attribute, event) + _addNewAttribute: function(listItemElement) + { + var attr = document.createElement("span"); + attr.className = "webkit-html-attribute"; + attr.style.marginLeft = "2px"; // overrides the .editing margin rule + attr.style.marginRight = "2px"; // overrides the .editing margin rule + var name = document.createElement("span"); + name.className = "webkit-html-attribute-name new-attribute"; + name.textContent = " "; + var value = document.createElement("span"); + value.className = "webkit-html-attribute-value"; + attr.appendChild(name); + attr.appendChild(value); + + var tag = listItemElement.getElementsByClassName("webkit-html-tag")[0]; + this._insertInLastAttributePosition(tag, attr); + return this._startEditingAttribute(attr, attr); + }, + + _triggerEditAttribute: function(attributeName) + { + var attributeElements = this.listItemElement.getElementsByClassName("webkit-html-attribute-name"); + for (var i = 0, len = attributeElements.length; i < len; ++i) { + if (attributeElements[i].textContent === attributeName) { + for (var elem = attributeElements[i].nextSibling; elem; elem = elem.nextSibling) { + if (elem.nodeType !== Node.ELEMENT_NODE) + continue; + + if (elem.hasStyleClass("webkit-html-attribute-value")) + return this._startEditingAttribute(attributeElements[i].parentNode, elem); + } + } + } + }, + + _startEditingAttribute: function(attribute, elementForSelection) { if (WebInspector.isBeingEdited(attribute)) return true; @@ -545,7 +628,7 @@ WebInspector.ElementsTreeElement.prototype = { this._editing = true; WebInspector.startEditing(attribute, this._attributeEditingCommitted.bind(this), this._editingCancelled.bind(this), attributeName); - window.getSelection().setBaseAndExtent(event.target, 0, event.target, 1); + window.getSelection().setBaseAndExtent(elementForSelection, 0, elementForSelection, 1); return true; }, @@ -563,15 +646,56 @@ WebInspector.ElementsTreeElement.prototype = { return true; }, - _attributeEditingCommitted: function(element, newText, oldText, attributeName) + _attributeEditingCommitted: function(element, newText, oldText, attributeName, moveDirection) { delete this._editing; + // Before we do anything, determine where we should move + // next based on the current element's settings + var moveToAttribute; + var newAttribute; + if (moveDirection) { + var found = false; + var attributes = this.representedObject.attributes; + for (var i = 0, len = attributes.length; i < len; ++i) { + if (attributes[i].name === attributeName) { + found = true; + if (moveDirection === "backward" && i > 0) + moveToAttribute = attributes[i - 1].name; + else if (moveDirection === "forward" && i < attributes.length - 1) + moveToAttribute = attributes[i + 1].name; + else if (moveDirection === "forward" && i === attributes.length - 1) + newAttribute = true; + } + } + + if (!found && moveDirection === "backward") + moveToAttribute = attributes[attributes.length - 1].name; + else if (!found && moveDirection === "forward" && !/^\s*$/.test(newText)) + newAttribute = true; + } + + function moveToNextAttributeIfNeeded() { + if (moveToAttribute) + this._triggerEditAttribute(moveToAttribute); + else if (newAttribute) + this._addNewAttribute(this.listItemElement); + } + var parseContainerElement = document.createElement("span"); parseContainerElement.innerHTML = ""; var parseElement = parseContainerElement.firstChild; - if (!parseElement || !parseElement.hasAttributes()) { - this._editingCancelled(element, context); + + if (!parseElement) { + this._editingCancelled(element, attributeName); + moveToNextAttributeIfNeeded.call(this); + return; + } + + if (!parseElement.hasAttributes()) { + InspectorController.inspectedWindow().Element.prototype.removeAttribute.call(this.representedObject, attributeName); + this._updateTitle(); + moveToNextAttributeIfNeeded.call(this); return; } @@ -579,7 +703,9 @@ WebInspector.ElementsTreeElement.prototype = { for (var i = 0; i < parseElement.attributes.length; ++i) { var attr = parseElement.attributes[i]; foundOriginalAttribute = foundOriginalAttribute || attr.name === attributeName; - InspectorController.inspectedWindow().Element.prototype.setAttribute.call(this.representedObject, attr.name, attr.value); + try { + InspectorController.inspectedWindow().Element.prototype.setAttribute.call(this.representedObject, attr.name, attr.value); + } catch(e) {} // ignore invalid attribute (innerHTML doesn't throw errors, but this can) } if (!foundOriginalAttribute) @@ -588,6 +714,8 @@ WebInspector.ElementsTreeElement.prototype = { this._updateTitle(); this.treeOutline.focusedNodeChanged(true); + + moveToNextAttributeIfNeeded.call(this); }, _textNodeEditingCommitted: function(element, newText) diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/ObjectPropertiesSection.js b/src/3rdparty/webkit/WebCore/inspector/front-end/ObjectPropertiesSection.js index 59e73747a..d8c34d7fb 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/ObjectPropertiesSection.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/ObjectPropertiesSection.js @@ -1,5 +1,6 @@ /* * Copyright (C) 2008 Apple Inc. All Rights Reserved. + * Copyright (C) 2009 Joseph Pecoraro * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -58,7 +59,7 @@ WebInspector.ObjectPropertiesSection.prototype = { if (this.extraProperties) for (var prop in this.extraProperties) properties.push(prop); - properties.sort(); + properties.sort(this._displaySort); this.propertiesTreeOutline.removeChildren(); @@ -79,6 +80,44 @@ WebInspector.ObjectPropertiesSection.prototype = { var infoElement = new TreeElement(title, null, false); this.propertiesTreeOutline.appendChild(infoElement); } + }, + + _displaySort: function(a,b) { + + // if used elsewhere make sure to + // - convert a and b to strings (not needed here, properties are all strings) + // - check if a == b (not needed here, no two properties can be the same) + + var diff = 0; + var chunk = /^\d+|^\D+/; + var chunka, chunkb, anum, bnum; + while (diff === 0) { + if (!a && b) + return -1; + if (!b && a) + return 1; + chunka = a.match(chunk)[0]; + chunkb = b.match(chunk)[0]; + anum = !isNaN(chunka); + bnum = !isNaN(chunkb); + if (anum && !bnum) + return -1; + if (bnum && !anum) + return 1; + if (anum && bnum) { + diff = chunka - chunkb; + if (diff === 0 && chunka.length !== chunkb.length) { + if (!+chunka && !+chunkb) // chunks are strings of all 0s (special case) + return chunka.length - chunkb.length; + else + return chunkb.length - chunka.length; + } + } else if (chunka !== chunkb) + return (chunka < chunkb) ? -1 : 1; + a = a.substring(chunka.length); + b = b.substring(chunkb.length); + } + return diff; } } @@ -109,7 +148,7 @@ WebInspector.ObjectPropertyTreeElement.prototype = { this.removeChildren(); var childObject = this.safePropertyValue(this.parentObject, this.propertyName); - var properties = Object.sortedProperties(childObject); + var properties = Object.sortedProperties(childObject, WebInspector.ObjectPropertiesSection.prototype._displaySort); for (var i = 0; i < properties.length; ++i) { var propertyName = properties[i]; if (propertyName === "__treeElementIdentifier") @@ -156,7 +195,7 @@ WebInspector.ObjectPropertyTreeElement.prototype = { var hasSubProperties = false; var type = typeof childObject; if (childObject && (type === "object" || type === "function")) { - for (subPropertyName in childObject) { + for (var subPropertyName in childObject) { if (subPropertyName === "__treeElementIdentifier") continue; hasSubProperties = true; diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/Resource.js b/src/3rdparty/webkit/WebCore/inspector/front-end/Resource.js index 85d5cd2a0..bcb7b2a8e 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/Resource.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/Resource.js @@ -341,12 +341,6 @@ WebInspector.Resource.prototype = { } }, - get documentNode() { - if ("identifier" in this) - return InspectorController.getResourceDocumentNode(this.identifier); - return null; - }, - get requestHeaders() { if (this._requestHeaders === undefined) diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/ResourcesPanel.js b/src/3rdparty/webkit/WebCore/inspector/front-end/ResourcesPanel.js index c4ea83f42..3804b5b6f 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/ResourcesPanel.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/ResourcesPanel.js @@ -1453,6 +1453,12 @@ WebInspector.ResourceSidebarTreeElement.prototype = { { WebInspector.SidebarTreeElement.prototype.onattach.call(this); + var link = document.createElement("a"); + link.href = this.resource.url; + link.className = "invisible"; + while (this._listItemNode.firstChild) + link.appendChild(this._listItemNode.firstChild); + this._listItemNode.appendChild(link); this._listItemNode.addStyleClass("resources-category-" + this.resource.category.name); }, @@ -1460,6 +1466,11 @@ WebInspector.ResourceSidebarTreeElement.prototype = { { WebInspector.panels.resources.showResource(this.resource); }, + + ondblclick: function(treeElement, event) + { + InspectorController.inspectedWindow().open(this.resource.url); + }, get mainTitle() { diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/ScriptsPanel.js b/src/3rdparty/webkit/WebCore/inspector/front-end/ScriptsPanel.js index 68013c9a1..6fcf42f86 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/ScriptsPanel.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/ScriptsPanel.js @@ -56,6 +56,7 @@ WebInspector.ScriptsPanel = function() this.filesSelectElement.className = "status-bar-item"; this.filesSelectElement.id = "scripts-files"; this.filesSelectElement.addEventListener("change", this._changeVisibleFile.bind(this), false); + this.filesSelectElement.handleKeyEvent = this.handleKeyEvent.bind(this); this.topStatusBar.appendChild(this.filesSelectElement); this.functionsSelectElement = document.createElement("select"); @@ -132,13 +133,11 @@ WebInspector.ScriptsPanel = function() for (var pane in this.sidebarPanes) this.sidebarElement.appendChild(this.sidebarPanes[pane].element); - // FIXME: remove the following line of code when the Breakpoints pane has content. - this.sidebarElement.removeChild(this.sidebarPanes.breakpoints.element); - this.sidebarPanes.callstack.expanded = true; this.sidebarPanes.callstack.addEventListener("call frame selected", this._callFrameSelected, this); this.sidebarPanes.scopechain.expanded = true; + this.sidebarPanes.breakpoints.expanded = true; var panelEnablerHeading = WebInspector.UIString("You need to enable debugging before you can use the Scripts panel."); var panelEnablerDisclaimer = WebInspector.UIString("Enabling debugging will make scripts run slower."); @@ -239,7 +238,7 @@ WebInspector.ScriptsPanel.prototype = { view.visible = false; } if (this._attachDebuggerWhenShown) { - InspectorController.enableDebuggerFromFrontend(false); + InspectorController.enableDebugger(false); delete this._attachDebuggerWhenShown; } }, @@ -298,6 +297,11 @@ WebInspector.ScriptsPanel.prototype = { this._addScriptToFilesMenu(script); }, + scriptOrResourceForID: function(id) + { + return this._sourceIDMap[id]; + }, + addBreakpoint: function(breakpoint) { this.sidebarPanes.breakpoints.addBreakpoint(breakpoint); @@ -359,12 +363,12 @@ WebInspector.ScriptsPanel.prototype = { updateInterface = true; var self = this; - function updatingCallbackWrapper(result) + function updatingCallbackWrapper(result, exception) { - callback(result); + callback(result, exception); if (updateInterface) self.sidebarPanes.scopechain.update(selectedCallFrame); - } + } this.doEvalInCallFrame(selectedCallFrame, code, updatingCallbackWrapper); }, @@ -428,7 +432,7 @@ WebInspector.ScriptsPanel.prototype = { attachDebuggerWhenShown: function() { if (this.element.parentElement) { - InspectorController.enableDebuggerFromFrontend(false); + InspectorController.enableDebugger(false); } else { this._attachDebuggerWhenShown = true; } @@ -862,7 +866,7 @@ WebInspector.ScriptsPanel.prototype = { if (InspectorController.debuggerEnabled()) InspectorController.disableDebugger(true); else - InspectorController.enableDebuggerFromFrontend(!!optionalAlways); + InspectorController.enableDebugger(!!optionalAlways); }, _togglePauseOnExceptions: function() diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/SourceFrame.js b/src/3rdparty/webkit/WebCore/inspector/front-end/SourceFrame.js index 18d9073d0..930eb162b 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/SourceFrame.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/SourceFrame.js @@ -27,6 +27,7 @@ WebInspector.SourceFrame = function(element, addBreakpointDelegate) { this.messages = []; this.breakpoints = []; + this._shortcuts = {}; this.addBreakpointDelegate = addBreakpointDelegate; @@ -199,8 +200,16 @@ WebInspector.SourceFrame.prototype = { { WebInspector.addMainEventListeners(this.element.contentDocument); this.element.contentDocument.addEventListener("mousedown", this._documentMouseDown.bind(this), true); + this.element.contentDocument.addEventListener("keydown", this._documentKeyDown.bind(this), true); + this.element.contentDocument.addEventListener("keyup", WebInspector.documentKeyUp.bind(WebInspector), true); this.element.contentDocument.addEventListener("webkitAnimationEnd", this._highlightLineEnds.bind(this), false); + // Register 'eval' shortcut. + var isMac = InspectorController.platform().indexOf("mac-") === 0; + var platformSpecificModifier = isMac ? WebInspector.KeyboardShortcut.Modifiers.Meta : WebInspector.KeyboardShortcut.Modifiers.Ctrl; + var shortcut = WebInspector.KeyboardShortcut.makeKey(69 /* 'E' */, platformSpecificModifier | WebInspector.KeyboardShortcut.Modifiers.Shift); + this._shortcuts[shortcut] = this._evalSelectionInCallFrame.bind(this); + var headElement = this.element.contentDocument.getElementsByTagName("head")[0]; if (!headElement) { headElement = this.element.contentDocument.createElement("head"); @@ -286,6 +295,36 @@ WebInspector.SourceFrame.prototype = { this.addBreakpointDelegate(this.lineNumberForSourceRow(sourceRow)); }, + _documentKeyDown: function(event) + { + var shortcut = WebInspector.KeyboardShortcut.makeKeyFromEvent(event); + var handler = this._shortcuts[shortcut]; + if (handler) { + handler(event); + event.preventDefault(); + } else { + WebInspector.documentKeyDown(event); + } + }, + + _evalSelectionInCallFrame: function(event) + { + if (!WebInspector.panels.scripts || !WebInspector.panels.scripts.paused) + return; + + var selection = this.element.contentWindow.getSelection(); + if (!selection.rangeCount) + return; + + var expression = selection.getRangeAt(0).toString().trimWhitespace(); + WebInspector.panels.scripts.evaluateInSelectedCallFrame(expression, false, function(result, exception) { + WebInspector.showConsole(); + var commandMessage = new WebInspector.ConsoleCommand(expression); + WebInspector.console.addMessage(commandMessage); + WebInspector.console.addMessage(new WebInspector.ConsoleCommandResult(result, exception, commandMessage)); + }); + }, + _breakpointEnableChanged: function(event) { var breakpoint = event.target; @@ -332,6 +371,8 @@ WebInspector.SourceFrame.prototype = { if (!sourceRow) return; + breakpoint.sourceText = sourceRow.getElementsByClassName('webkit-line-content')[0].textContent; + this._drawBreakpointImagesIfNeeded(); sourceRow._breakpointObject = breakpoint; diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/SourceView.js b/src/3rdparty/webkit/WebCore/inspector/front-end/SourceView.js index 7510c8cad..97a5bd5d2 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/SourceView.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/SourceView.js @@ -104,8 +104,11 @@ WebInspector.SourceView.prototype = { { delete this._frameNeedsSetup; this.sourceFrame.removeEventListener("content loaded", this._contentLoaded, this); - - if (this.resource.type === WebInspector.Resource.Type.Script) { + + if (this.resource.type === WebInspector.Resource.Type.Script + || this.resource.mimeType === 'application/json' + || this.resource.mimeType === 'application/javascript' + || /\.js(on)?$/.test(this.resource.lastPathComponent) ) { this.sourceFrame.addEventListener("syntax highlighting complete", this._syntaxHighlightingComplete, this); this.sourceFrame.syntaxHighlightJavascript(); } else diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/StylesSidebarPane.js b/src/3rdparty/webkit/WebCore/inspector/front-end/StylesSidebarPane.js index c30444ba0..1785d7781 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/StylesSidebarPane.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/StylesSidebarPane.js @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 Apple Inc. All rights reserved. + * Copyright (C) 2009 Joseph Pecoraro * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -387,6 +388,11 @@ WebInspector.StylePropertiesSection.prototype = { child = child.traverseNextTreeElement(false, null, true); } } + + if (this._afterUpdate) { + this._afterUpdate(this); + delete this._afterUpdate; + } }, onpopulate: function() @@ -425,6 +431,26 @@ WebInspector.StylePropertiesSection.prototype = { var item = new WebInspector.StylePropertyTreeElement(style, name, isShorthand, inherited, overloaded, disabled); this.propertiesTreeOutline.appendChild(item); } + }, + + findTreeElementWithName: function(name) + { + var treeElement = this.propertiesTreeOutline.children[0]; + while (treeElement) { + if (treeElement.name === name) + return treeElement; + treeElement = treeElement.traverseNextTreeElement(true, null, true); + } + return null; + }, + + addNewBlankProperty: function() + { + var item = new WebInspector.StylePropertyTreeElement(this.styleRule.style, "", false, false, false, false); + this.propertiesTreeOutline.appendChild(item); + item.listItemElement.textContent = ""; + item._newProperty = true; + return item; } } @@ -558,10 +584,12 @@ WebInspector.StylePropertyTreeElement.prototype = { var nameElement = document.createElement("span"); nameElement.className = "name"; nameElement.textContent = this.name; + this.nameElement = nameElement; var valueElement = document.createElement("span"); valueElement.className = "value"; valueElement.innerHTML = htmlValue; + this.valueElement = valueElement; if (priority) { var priorityElement = document.createElement("span"); @@ -843,14 +871,56 @@ WebInspector.StylePropertyTreeElement.prototype = { this.editingEnded(context); }, - editingCommitted: function(element, userInput, previousContent, context) + editingCommitted: function(element, userInput, previousContent, context, moveDirection) { this.editingEnded(context); - if (userInput === previousContent) - return; // nothing changed, so do nothing else + // Determine where to move to before making changes + var newProperty = false; + var moveToPropertyName; + var moveTo = (moveDirection === "forward" ? this.nextSibling : this.previousSibling); + if (moveTo) + moveToPropertyName = moveTo.name; + else if (moveDirection === "forward") + newProperty = true; + + // Make the Changes and trigger the moveToNextCallback after updating + var blankInput = /^\s*$/.test(userInput); + if (userInput !== previousContent || (this._newProperty && blankInput)) { // only if something changed, or adding a new style and it was blank + this.treeOutline.section._afterUpdate = moveToNextCallback.bind(this, this._newProperty, !blankInput); + this.applyStyleText(userInput, true); + } else + moveToNextCallback(this._newProperty, false, this.treeOutline.section, false); + + // The Callback to start editing the next property + function moveToNextCallback(alreadyNew, valueChanged, section) { + if (!moveDirection) + return; + + // User just tabbed through without changes + if (moveTo && moveTo.parent) { + moveTo.startEditing(moveTo.valueElement); + return; + } + + // User has made a change then tabbed, wiping all the original treeElements, + // recalculate the new treeElement for the same property we were going to edit next + if (moveTo && !moveTo.parent) { + var treeElement = section.findTreeElementWithName(moveToPropertyName); + if (treeElement) + treeElement.startEditing(treeElement.valueElement); + return; + } + + // Create a new attribute in this section + if (newProperty) { + if (alreadyNew && !valueChanged) + return; - this.applyStyleText(userInput, true); + var item = section.addNewBlankProperty(); + item.startEditing(); + } + } }, applyStyleText: function(styleText, updateInterface) @@ -876,7 +946,9 @@ WebInspector.StylePropertyTreeElement.prototype = { if (!styleTextLength) { if (updateInterface) { - // The user deleted the everything, so remove the tree element and update. + // The user deleted everything, so remove the tree element and update. + if (!this._newProperty) + delete this.treeOutline.section._afterUpdate; if (this.treeOutline.section && this.treeOutline.section.pane) this.treeOutline.section.pane.update(); this.parent.removeChild(this); @@ -886,7 +958,12 @@ WebInspector.StylePropertyTreeElement.prototype = { if (!tempStyle.length) { // The user typed something, but it didn't parse. Just abort and restore - // the original title for this property. + // the original title for this property. If this was a new attribute and + // we couldn't parse, then just remove it. + if (this._newProperty) { + this.parent.removeChild(this); + return; + } if (updateInterface) this.updateTitle(); return; diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/inspector.css b/src/3rdparty/webkit/WebCore/inspector/front-end/inspector.css index 929caa23d..dabadc25b 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/inspector.css +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/inspector.css @@ -644,6 +644,10 @@ body.console-visible #console { margin-right: -6px; } +.console-group-messages .add-attribute { + display: none; +} + .console-formatted-object, .console-formatted-node { position: relative; display: inline-block; @@ -768,6 +772,11 @@ body.console-visible #console { vertical-align: top; } +.invisible { + color: inherit; + text-decoration: none; +} + .webkit-line-gutter-backdrop { /* Keep this in sync with view-source.css (.webkit-line-gutter-backdrop) */ width: 31px; @@ -1090,6 +1099,11 @@ body.console-visible #console { text-decoration: underline; } +.add-attribute { + margin-left: 1px; + margin-right: 1px; +} + .placard { position: relative; margin-top: 1px; @@ -3102,3 +3116,41 @@ body.inactive .sidebar-tree-item.selected .bubble.search-matches { border-left: 1px solid rgb(184, 184, 184); margin-left: -1px; } + +ol.breakpoint-list { + -webkit-padding-start: 2px; + list-style: none; + margin: 0; +} + +.breakpoint-list li { + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + margin: 4px 0; +} + +.breakpoint-list .checkbox-elem { + font-size: 10px; + margin: 0 4px; + vertical-align: top; + position: relative; + z-index: 1; +} + +.breakpoint-list .source-text { + font-family: monospace; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + margin: 2px 0 0px 20px; +} + +.breakpoint-list a { + color: rgb(33%, 33%, 33%); + cursor: pointer; +} + +.breakpoint-list a:hover { + color: rgb(15%, 15%, 15%); +} diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/inspector.html b/src/3rdparty/webkit/WebCore/inspector/front-end/inspector.html index f211fb7bf..762074eec 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/inspector.html +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/inspector.html @@ -87,11 +87,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
-

+

diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/inspector.js b/src/3rdparty/webkit/WebCore/inspector/front-end/inspector.js index 91f2659e8..7e236925d 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/inspector.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/inspector.js @@ -117,6 +117,26 @@ var WebInspector = { } } } + + for (var panelName in WebInspector.panels) { + if (WebInspector.panels[panelName] == x) + InspectorController.storeLastActivePanel(panelName); + } + }, + + _createPanels: function() + { + var hiddenPanels = (InspectorController.hiddenPanels() || "").split(','); + if (hiddenPanels.indexOf("elements") === -1) + this.panels.elements = new WebInspector.ElementsPanel(); + if (hiddenPanels.indexOf("resources") === -1) + this.panels.resources = new WebInspector.ResourcesPanel(); + if (hiddenPanels.indexOf("scripts") === -1) + this.panels.scripts = new WebInspector.ScriptsPanel(); + if (hiddenPanels.indexOf("profiles") === -1) + this.panels.profiles = new WebInspector.ProfilesPanel(); + if (hiddenPanels.indexOf("databases") === -1) + this.panels.databases = new WebInspector.DatabasesPanel(); }, get attached() @@ -281,24 +301,16 @@ WebInspector.loaded = function() this.console = new WebInspector.Console(); this.panels = {}; - var hiddenPanels = (InspectorController.hiddenPanels() || "").split(','); - if (hiddenPanels.indexOf("elements") === -1) - this.panels.elements = new WebInspector.ElementsPanel(); - if (hiddenPanels.indexOf("resources") === -1) - this.panels.resources = new WebInspector.ResourcesPanel(); - if (hiddenPanels.indexOf("scripts") === -1) - this.panels.scripts = new WebInspector.ScriptsPanel(); - if (hiddenPanels.indexOf("profiles") === -1) - this.panels.profiles = new WebInspector.ProfilesPanel(); - if (hiddenPanels.indexOf("databases") === -1) - this.panels.databases = new WebInspector.DatabasesPanel(); + this._createPanels(); var toolbarElement = document.getElementById("toolbar"); var previousToolbarItem = toolbarElement.children[0]; + this.panelOrder = []; for (var panelName in this.panels) { var panel = this.panels[panelName]; var panelToolbarItem = panel.toolbarItem; + this.panelOrder.push(panel); panelToolbarItem.addEventListener("click", this._toolbarItemClicked.bind(this)); if (previousToolbarItem) toolbarElement.insertBefore(panelToolbarItem, previousToolbarItem.nextSibling); @@ -307,8 +319,6 @@ WebInspector.loaded = function() previousToolbarItem = panelToolbarItem; } - this.currentPanel = this.panels.elements; - this.resourceCategories = { documents: new WebInspector.ResourceCategory(WebInspector.UIString("Documents"), "documents"), stylesheets: new WebInspector.ResourceCategory(WebInspector.UIString("Stylesheets"), "stylesheets"), @@ -522,6 +532,36 @@ WebInspector.documentKeyDown = function(event) event.preventDefault(); } + break; + + case "U+005B": // [ key + if (isMac) + var isRotateLeft = event.metaKey && !event.shiftKey && !event.ctrlKey && !event.altKey; + else + var isRotateLeft = event.ctrlKey && !event.shiftKey && !event.metaKey && !event.altKey; + + if (isRotateLeft) { + var index = this.panelOrder.indexOf(this.currentPanel); + index = (index === 0) ? this.panelOrder.length - 1 : index - 1; + this.panelOrder[index].toolbarItem.click(); + event.preventDefault(); + } + + break; + + case "U+005D": // ] key + if (isMac) + var isRotateRight = event.metaKey && !event.shiftKey && !event.ctrlKey && !event.altKey; + else + var isRotateRight = event.ctrlKey && !event.shiftKey && !event.metaKey && !event.altKey; + + if (isRotateRight) { + var index = this.panelOrder.indexOf(this.currentPanel); + index = (index + 1) % this.panelOrder.length; + this.panelOrder[index].toolbarItem.click(); + event.preventDefault(); + } + break; } } @@ -588,6 +628,7 @@ WebInspector.animateStyle = function(animations, duration, callback, complete) var start = null; var current = null; var end = null; + var key = null; for (key in animation) { if (key === "element") element = animation[key]; @@ -1278,6 +1319,7 @@ WebInspector.startEditing = function(element, committedCallback, cancelledCallba var oldText = element.textContent; var oldHandleKeyEvent = element.handleKeyEvent; + var moveDirection = ""; element.addStyleClass("editing"); @@ -1315,7 +1357,7 @@ WebInspector.startEditing = function(element, committedCallback, cancelledCallba function editingCommitted() { cleanUpAfterEditing.call(this); - committedCallback(this, this.textContent, oldText, context); + committedCallback(this, this.textContent, oldText, context, moveDirection); } element.handleKeyEvent = function(event) { @@ -1331,7 +1373,8 @@ WebInspector.startEditing = function(element, committedCallback, cancelledCallba editingCancelled.call(element); event.preventDefault(); event.handled = true; - } + } else if (event.keyIdentifier === "U+0009") // Tab key + moveDirection = (event.shiftKey ? "backward" : "forward"); } element.addEventListener("blur", blurEventListener, false); diff --git a/src/3rdparty/webkit/WebCore/inspector/front-end/utilities.js b/src/3rdparty/webkit/WebCore/inspector/front-end/utilities.js index 8fb50e202..4285785ed 100644 --- a/src/3rdparty/webkit/WebCore/inspector/front-end/utilities.js +++ b/src/3rdparty/webkit/WebCore/inspector/front-end/utilities.js @@ -38,7 +38,7 @@ Object.type = function(obj, win) win = win || window; if (obj instanceof win.Node) - return "node"; + return (obj.nodeType === undefined ? type : "node"); if (obj instanceof win.String) return "string"; if (obj instanceof win.Array) @@ -94,12 +94,12 @@ Object.describe = function(obj, abbreviated) } } -Object.sortedProperties = function(obj) +Object.sortedProperties = function(obj, sortFunc) { var properties = []; for (var prop in obj) properties.push(prop); - properties.sort(); + properties.sort(sortFunc); return properties; } diff --git a/src/3rdparty/webkit/WebCore/loader/Cache.h b/src/3rdparty/webkit/WebCore/loader/Cache.h index 86a6ceb4f..a0023dad3 100644 --- a/src/3rdparty/webkit/WebCore/loader/Cache.h +++ b/src/3rdparty/webkit/WebCore/loader/Cache.h @@ -55,7 +55,7 @@ class KURL; // -------|-----+++++++++++++++| // -------|-----+++++++++++++++|+++++ -class Cache : Noncopyable { +class Cache : public Noncopyable { public: friend Cache* cache(); diff --git a/src/3rdparty/webkit/WebCore/loader/CrossOriginPreflightResultCache.h b/src/3rdparty/webkit/WebCore/loader/CrossOriginPreflightResultCache.h index 39c3cd1eb..f71d1c894 100644 --- a/src/3rdparty/webkit/WebCore/loader/CrossOriginPreflightResultCache.h +++ b/src/3rdparty/webkit/WebCore/loader/CrossOriginPreflightResultCache.h @@ -32,7 +32,7 @@ namespace WebCore { class HTTPHeaderMap; class ResourceResponse; - class CrossOriginPreflightResultCacheItem : Noncopyable { + class CrossOriginPreflightResultCacheItem : public Noncopyable { public: CrossOriginPreflightResultCacheItem(bool credentials) : m_absoluteExpiryTime(0) @@ -57,7 +57,7 @@ namespace WebCore { HeadersSet m_headers; }; - class CrossOriginPreflightResultCache : Noncopyable { + class CrossOriginPreflightResultCache : public Noncopyable { public: static CrossOriginPreflightResultCache& shared(); diff --git a/src/3rdparty/webkit/WebCore/loader/DocumentThreadableLoader.cpp b/src/3rdparty/webkit/WebCore/loader/DocumentThreadableLoader.cpp index ae6702b4f..dd5ca7675 100644 --- a/src/3rdparty/webkit/WebCore/loader/DocumentThreadableLoader.cpp +++ b/src/3rdparty/webkit/WebCore/loader/DocumentThreadableLoader.cpp @@ -164,7 +164,8 @@ void DocumentThreadableLoader::didFinishLoading(SubresourceLoader* loader) void DocumentThreadableLoader::didFail(SubresourceLoader* loader, const ResourceError& error) { ASSERT(m_client); - ASSERT_UNUSED(loader, loader == m_loader); + // m_loader may be null if we arrive here via SubresourceLoader::create in the ctor + ASSERT_UNUSED(loader, loader == m_loader || !m_loader); m_client->didFail(error); } diff --git a/src/3rdparty/webkit/WebCore/loader/EmptyClients.h b/src/3rdparty/webkit/WebCore/loader/EmptyClients.h index f1c4c5dd9..6d873421c 100644 --- a/src/3rdparty/webkit/WebCore/loader/EmptyClients.h +++ b/src/3rdparty/webkit/WebCore/loader/EmptyClients.h @@ -125,7 +125,7 @@ public: virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned) { } - virtual void setToolTip(const String&) { } + virtual void setToolTip(const String&, TextDirection) { } virtual void print(Frame*) { } @@ -133,6 +133,10 @@ public: virtual void exceededDatabaseQuota(Frame*, const String&) { } #endif +#if ENABLE(OFFLINE_WEB_APPLICATIONS) + virtual void reachedMaxAppCacheSize(int64_t) { } +#endif + virtual void runOpenPanel(Frame*, PassRefPtr) { } virtual void formStateDidChange(const Node*) { } @@ -287,8 +291,9 @@ public: virtual void registerForIconNotification(bool) { } #if USE(V8) - virtual void didCreateScriptContext() { } - virtual void didDestroyScriptContext() { } + virtual void didCreateScriptContextForFrame() { } + virtual void didDestroyScriptContextForFrame() { } + virtual void didCreateIsolatedScriptContext() { } #endif #if PLATFORM(MAC) diff --git a/src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp b/src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp index 1e51583ff..7fc7936e2 100644 --- a/src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp +++ b/src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp @@ -54,7 +54,6 @@ #include "FrameLoaderClient.h" #include "FrameTree.h" #include "FrameView.h" -#include "HTMLAnchorElement.h" #include "HTMLAppletElement.h" #include "HTMLFormElement.h" #include "HTMLFrameElement.h" @@ -71,6 +70,7 @@ #include "Page.h" #include "PageCache.h" #include "PageGroup.h" +#include "PlaceholderDocument.h" #include "PluginData.h" #include "PluginDocument.h" #include "ProgressTracker.h" @@ -271,9 +271,6 @@ FrameLoader::FrameLoader(Frame* frame, FrameLoaderClient* client) #ifndef NDEBUG , m_didDispatchDidCommitLoad(false) #endif -#if ENABLE(WML) - , m_forceReloadWmlDeck(false) -#endif { } @@ -728,15 +725,16 @@ bool FrameLoader::executeIfJavaScriptURL(const KURL& url, bool userGesture, bool if (m_frame->page() && !m_frame->page()->javaScriptURLsAreAllowed()) return true; - String script = decodeURLEscapeSequences(url.string().substring(strlen("javascript:"))); + const int javascriptSchemeLength = sizeof("javascript:") - 1; + + String script = decodeURLEscapeSequences(url.string().substring(javascriptSchemeLength)); ScriptValue result = executeScript(script, userGesture); String scriptResult; if (!result.getString(scriptResult)) return true; - SecurityOrigin* currentSecurityOrigin = 0; - currentSecurityOrigin = m_frame->document()->securityOrigin(); + SecurityOrigin* currentSecurityOrigin = m_frame->document()->securityOrigin(); // FIXME: We should always replace the document, but doing so // synchronously can cause crashes: @@ -897,6 +895,8 @@ void FrameLoader::begin(const KURL& url, bool dispatch, SecurityOrigin* origin) // Create a new document before clearing the frame, because it may need to inherit an aliased security context. if (!m_isDisplayingInitialEmptyDocument && m_client->shouldUsePluginDocument(m_responseMIMEType)) document = PluginDocument::create(m_frame); + else if (!m_client->hasHTMLView()) + document = PlaceholderDocument::create(m_frame); else document = DOMImplementation::createDocument(m_responseMIMEType, m_frame, m_frame->inViewSourceMode()); @@ -953,7 +953,7 @@ void FrameLoader::begin(const KURL& url, bool dispatch, SecurityOrigin* origin) document->implicitOpen(); - if (m_frame->view()) + if (m_frame->view() && m_client->hasHTMLView()) m_frame->view()->setContentsSize(IntSize()); } @@ -1780,6 +1780,17 @@ void FrameLoader::addData(const char* bytes, int length) write(bytes, length); } +#if ENABLE(WML) +static inline bool frameContainsWMLContent(Frame* frame) +{ + Document* document = frame ? frame->document() : 0; + if (!document) + return false; + + return document->containsWMLContent() || document->isWMLDocument(); +} +#endif + bool FrameLoader::canCachePageContainingThisFrame() { return m_documentLoader @@ -1807,6 +1818,9 @@ bool FrameLoader::canCachePageContainingThisFrame() // application cache. tracks that work. && !m_documentLoader->applicationCache() && !m_documentLoader->candidateApplicationCacheGroup() +#endif +#if ENABLE(WML) + && !frameContainsWMLContent(m_frame) #endif && m_client->canCachePage() ; @@ -2920,10 +2934,12 @@ void FrameLoader::transitionToCommitted(PassRefPtr cachedPage) m_committedFirstRealDocumentLoad = true; - // For non-cached HTML pages, these methods are called in FrameLoader::begin. - if (cachedPage || !m_client->hasHTMLView()) { - dispatchDidCommitLoad(); - + if (!m_client->hasHTMLView()) + receivedFirstData(); + else if (cachedPage) { + // For non-cached HTML pages, these methods are called in receivedFirstData(). + dispatchDidCommitLoad(); + // If we have a title let the WebView know about it. if (!ptitle.isNull()) m_client->dispatchDidReceiveTitle(ptitle); @@ -2958,18 +2974,11 @@ void FrameLoader::clientRedirected(const KURL& url, double seconds, double fireD m_quickRedirectComing = lockBackForwardList && m_documentLoader && !m_isExecutingJavaScriptFormAction; } -#if ENABLE(WML) -void FrameLoader::setForceReloadWmlDeck(bool reload) -{ - m_forceReloadWmlDeck = reload; -} -#endif - bool FrameLoader::shouldReload(const KURL& currentURL, const KURL& destinationURL) { #if ENABLE(WML) - // As for WML deck, sometimes it's supposed to be reloaded even if the same URL with fragment - if (m_forceReloadWmlDeck) + // All WML decks are supposed to be reloaded, even within the same URL fragment + if (frameContainsWMLContent(m_frame)) return true; #endif @@ -4424,7 +4433,8 @@ void FrameLoader::loadItem(HistoryItem* item, FrameLoadType loadType) bool shouldScroll = !formData && !(m_currentHistoryItem && m_currentHistoryItem->formData()) && urlsMatchItem(item); #if ENABLE(WML) - if (m_frame->document()->isWMLDocument()) + // All WML decks should go through the real load mechanism, not the scroll-to-anchor code + if (frameContainsWMLContent(m_frame)) shouldScroll = false; #endif @@ -5089,8 +5099,7 @@ void FrameLoader::didChangeTitle(DocumentLoader* loader) { m_client->didChangeTitle(loader); - // The title doesn't get communicated to the WebView until we are committed. - if (loader->isCommitted()) { + if (loader == m_documentLoader) { // Must update the entries in the back-forward list too. if (m_currentHistoryItem) m_currentHistoryItem->setTitle(loader->title()); diff --git a/src/3rdparty/webkit/WebCore/loader/FrameLoader.h b/src/3rdparty/webkit/WebCore/loader/FrameLoader.h index b80a87cdc..58bf2c048 100644 --- a/src/3rdparty/webkit/WebCore/loader/FrameLoader.h +++ b/src/3rdparty/webkit/WebCore/loader/FrameLoader.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. - * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) + * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -111,7 +111,7 @@ namespace WebCore { void* m_argument; }; - class FrameLoader : Noncopyable { + class FrameLoader : public Noncopyable { public: FrameLoader(Frame*, FrameLoaderClient*); ~FrameLoader(); @@ -236,10 +236,6 @@ namespace WebCore { void didFirstVisuallyNonEmptyLayout(); -#if ENABLE(WML) - void setForceReloadWmlDeck(bool); -#endif - void loadedResourceFromMemoryCache(const CachedResource*); void tellClientAboutPastMemoryCacheLoads(); @@ -625,10 +621,6 @@ namespace WebCore { #ifndef NDEBUG bool m_didDispatchDidCommitLoad; #endif - -#if ENABLE(WML) - bool m_forceReloadWmlDeck; -#endif }; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/loader/FrameLoaderClient.h b/src/3rdparty/webkit/WebCore/loader/FrameLoaderClient.h index aa36b501b..1e6899194 100644 --- a/src/3rdparty/webkit/WebCore/loader/FrameLoaderClient.h +++ b/src/3rdparty/webkit/WebCore/loader/FrameLoaderClient.h @@ -213,8 +213,9 @@ namespace WebCore { virtual void didPerformFirstNavigation() const = 0; // "Navigation" here means a transition from one page to another that ends up in the back/forward list. #if USE(V8) - virtual void didCreateScriptContext() = 0; - virtual void didDestroyScriptContext() = 0; + virtual void didCreateScriptContextForFrame() = 0; + virtual void didDestroyScriptContextForFrame() = 0; + virtual void didCreateIsolatedScriptContext() = 0; #endif virtual void registerForIconNotification(bool listen = true) = 0; diff --git a/src/3rdparty/webkit/WebCore/loader/PlaceholderDocument.cpp b/src/3rdparty/webkit/WebCore/loader/PlaceholderDocument.cpp new file mode 100644 index 000000000..e071aa870 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/loader/PlaceholderDocument.cpp @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2009 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "PlaceholderDocument.h" + +#include "CSSStyleSelector.h" +#include "StyleSheetList.h" + +namespace WebCore { + +void PlaceholderDocument::attach() +{ + ASSERT(!attached()); + + if (!styleSelector()) { + RefPtr styleSheetList = StyleSheetList::create(this); + setStyleSelector(new CSSStyleSelector(this, userStyleSheet(), styleSheetList.get(), 0, true, false)); + } + + // Skipping Document::attach(). + ContainerNode::attach(); +} + +} // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/loader/PlaceholderDocument.h b/src/3rdparty/webkit/WebCore/loader/PlaceholderDocument.h new file mode 100644 index 000000000..c54237041 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/loader/PlaceholderDocument.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2009 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef PlaceholderDocument_h +#define PlaceholderDocument_h + +#include "Document.h" + +namespace WebCore { + +class PlaceholderDocument : public Document { +public: + static PassRefPtr create(Frame* frame) + { + return new PlaceholderDocument(frame); + } + + virtual void attach(); + +private: + PlaceholderDocument(Frame* frame) : Document(frame, false) { } +}; + +} // namespace WebCore + +#endif // PlaceholderDocument_h diff --git a/src/3rdparty/webkit/WebCore/loader/ProgressTracker.h b/src/3rdparty/webkit/WebCore/loader/ProgressTracker.h index b8d4532b6..744e10175 100644 --- a/src/3rdparty/webkit/WebCore/loader/ProgressTracker.h +++ b/src/3rdparty/webkit/WebCore/loader/ProgressTracker.h @@ -36,7 +36,7 @@ class Frame; class ResourceResponse; struct ProgressItem; -class ProgressTracker : Noncopyable { +class ProgressTracker : public Noncopyable { public: ProgressTracker(); ~ProgressTracker(); diff --git a/src/3rdparty/webkit/WebCore/loader/ThreadableLoader.h b/src/3rdparty/webkit/WebCore/loader/ThreadableLoader.h index 87ae229c9..1ac12cb34 100644 --- a/src/3rdparty/webkit/WebCore/loader/ThreadableLoader.h +++ b/src/3rdparty/webkit/WebCore/loader/ThreadableLoader.h @@ -65,7 +65,7 @@ namespace WebCore { // Useful for doing loader operations from any thread (not threadsafe, // just able to run on threads other than the main thread). - class ThreadableLoader : Noncopyable { + class ThreadableLoader : public Noncopyable { public: static void loadResourceSynchronously(ScriptExecutionContext*, const ResourceRequest&, ThreadableLoaderClient&, StoredCredentials); static PassRefPtr create(ScriptExecutionContext*, ThreadableLoaderClient*, const ResourceRequest&, LoadCallbacks, ContentSniff, StoredCredentials, CrossOriginRedirectPolicy); diff --git a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCache.cpp b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCache.cpp index 3033718a3..d221bdb19 100644 --- a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCache.cpp +++ b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCache.cpp @@ -39,6 +39,7 @@ namespace WebCore { ApplicationCache::ApplicationCache() : m_group(0) , m_manifest(0) + , m_estimatedSizeInStorage(0) , m_storageID(0) { } @@ -86,7 +87,9 @@ void ApplicationCache::addResource(PassRefPtr resource // Add the resource to the storage. cacheStorage().store(resource.get(), this); } - + + m_estimatedSizeInStorage += resource->estimatedSizeInStorage(); + m_resources.set(url, resource); } @@ -100,12 +103,15 @@ unsigned ApplicationCache::removeResource(const String& url) unsigned type = it->second->type(); m_resources.remove(it); - + + m_estimatedSizeInStorage -= it->second->estimatedSizeInStorage(); + return type; } ApplicationCacheResource* ApplicationCache::resourceForURL(const String& url) { + ASSERT(!KURL(url).hasRef()); return m_resources.get(url).get(); } @@ -125,8 +131,12 @@ ApplicationCacheResource* ApplicationCache::resourceForRequest(const ResourceReq // We only care about HTTP/HTTPS GET requests. if (!requestIsHTTPOrHTTPSGet(request)) return false; - - return resourceForURL(request.url()); + + KURL url(request.url()); + if (url.hasRef()) + url.removeRef(); + + return resourceForURL(url); } void ApplicationCache::setOnlineWhitelist(const Vector& onlineWhitelist) diff --git a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCache.h b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCache.h index 9609f8d24..b1753be14 100644 --- a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCache.h +++ b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCache.h @@ -87,6 +87,8 @@ public: static bool requestIsHTTPOrHTTPSGet(const ResourceRequest&); + int64_t estimatedSizeInStorage() const { return m_estimatedSizeInStorage; } + private: ApplicationCache(); @@ -97,6 +99,11 @@ private: Vector m_onlineWhitelist; FallbackURLVector m_fallbackURLs; + // The total size of the resources belonging to this Application Cache instance. + // This is an estimation of the size this Application Cache occupies in the + // database file. + int64_t m_estimatedSizeInStorage; + unsigned m_storageID; }; diff --git a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp index 642ec6150..dc7335353 100644 --- a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp +++ b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.cpp @@ -31,6 +31,7 @@ #include "ApplicationCache.h" #include "ApplicationCacheResource.h" #include "ApplicationCacheStorage.h" +#include "ChromeClient.h" #include "DocumentLoader.h" #include "DOMApplicationCache.h" #include "DOMWindow.h" @@ -53,6 +54,7 @@ ApplicationCacheGroup::ApplicationCacheGroup(const KURL& manifestURL, bool isCop , m_isObsolete(false) , m_completionType(None) , m_isCopy(isCopy) + , m_calledReachedMaxAppCacheSize(false) { } @@ -83,7 +85,11 @@ ApplicationCache* ApplicationCacheGroup::cacheForMainRequest(const ResourceReque if (!ApplicationCache::requestIsHTTPOrHTTPSGet(request)) return 0; - if (ApplicationCacheGroup* group = cacheStorage().cacheGroupForURL(request.url())) { + KURL url(request.url()); + if (url.hasRef()) + url.removeRef(); + + if (ApplicationCacheGroup* group = cacheStorage().cacheGroupForURL(url)) { ASSERT(group->newestCache()); ASSERT(!group->isObsolete()); @@ -98,7 +104,11 @@ ApplicationCache* ApplicationCacheGroup::fallbackCacheForMainRequest(const Resou if (!ApplicationCache::requestIsHTTPOrHTTPSGet(request)) return 0; - if (ApplicationCacheGroup* group = cacheStorage().fallbackCacheGroupForURL(request.url())) { + KURL url(request.url()); + if (url.hasRef()) + url.removeRef(); + + if (ApplicationCacheGroup* group = cacheStorage().fallbackCacheGroupForURL(url)) { ASSERT(group->newestCache()); ASSERT(!group->isObsolete()); @@ -108,7 +118,7 @@ ApplicationCache* ApplicationCacheGroup::fallbackCacheForMainRequest(const Resou return 0; } -void ApplicationCacheGroup::selectCache(Frame* frame, const KURL& manifestURL) +void ApplicationCacheGroup::selectCache(Frame* frame, const KURL& passedManifestURL) { ASSERT(frame && frame->page()); @@ -118,11 +128,15 @@ void ApplicationCacheGroup::selectCache(Frame* frame, const KURL& manifestURL) DocumentLoader* documentLoader = frame->loader()->documentLoader(); ASSERT(!documentLoader->applicationCache()); - if (manifestURL.isNull()) { + if (passedManifestURL.isNull()) { selectCacheWithoutManifestURL(frame); return; } - + + KURL manifestURL(passedManifestURL); + if (manifestURL.hasRef()) + manifestURL.removeRef(); + ApplicationCache* mainResourceCache = documentLoader->mainResourceApplicationCache(); if (mainResourceCache) { @@ -131,7 +145,10 @@ void ApplicationCacheGroup::selectCache(Frame* frame, const KURL& manifestURL) mainResourceCache->group()->update(frame, ApplicationCacheUpdateWithBrowsingContext); } else { // The main resource was loaded from cache, so the cache must have an entry for it. Mark it as foreign. - ApplicationCacheResource* resource = mainResourceCache->resourceForURL(documentLoader->url()); + KURL documentURL(documentLoader->url()); + if (documentURL.hasRef()) + documentURL.removeRef(); + ApplicationCacheResource* resource = mainResourceCache->resourceForURL(documentURL); bool inStorage = resource->storageID(); resource->addType(ApplicationCacheResource::Foreign); if (inStorage) @@ -193,7 +210,9 @@ void ApplicationCacheGroup::finishedLoadingMainResource(DocumentLoader* loader) { ASSERT(m_pendingMasterResourceLoaders.contains(loader)); ASSERT(m_completionType == None || m_pendingEntries.isEmpty()); - const KURL& url = loader->url(); + KURL url = loader->url(); + if (url.hasRef()) + url.removeRef(); switch (m_completionType) { case None: @@ -434,7 +453,9 @@ void ApplicationCacheGroup::didReceiveResponse(ResourceHandle* handle, const Res ASSERT(handle == m_currentHandle); - const KURL& url = handle->request().url(); + KURL url(handle->request().url()); + if (url.hasRef()) + url.removeRef(); ASSERT(!m_currentResource); ASSERT(m_pendingEntries.contains(url)); @@ -446,12 +467,12 @@ void ApplicationCacheGroup::didReceiveResponse(ResourceHandle* handle, const Res ASSERT(!(type & ApplicationCacheResource::Master)); if (m_newestCache && response.httpStatusCode() == 304) { // Not modified. - ApplicationCacheResource* newestCachedResource = m_newestCache->resourceForURL(handle->request().url()); + ApplicationCacheResource* newestCachedResource = m_newestCache->resourceForURL(url); if (newestCachedResource) { m_cacheBeingUpdated->addResource(ApplicationCacheResource::create(url, newestCachedResource->response(), type, newestCachedResource->data())); + m_pendingEntries.remove(m_currentHandle->request().url()); m_currentHandle->cancel(); m_currentHandle = 0; - m_pendingEntries.remove(handle->request().url()); // Load the next resource, if any. startLoadingEntry(); return; @@ -467,7 +488,7 @@ void ApplicationCacheGroup::didReceiveResponse(ResourceHandle* handle, const Res // Skip this resource. It is dropped from the cache. m_currentHandle->cancel(); m_currentHandle = 0; - m_pendingEntries.remove(handle->request().url()); + m_pendingEntries.remove(url); // Load the next resource, if any. startLoadingEntry(); } else { @@ -477,9 +498,9 @@ void ApplicationCacheGroup::didReceiveResponse(ResourceHandle* handle, const Res ApplicationCacheResource* newestCachedResource = m_newestCache->resourceForURL(handle->request().url()); ASSERT(newestCachedResource); m_cacheBeingUpdated->addResource(ApplicationCacheResource::create(url, newestCachedResource->response(), type, newestCachedResource->data())); + m_pendingEntries.remove(m_currentHandle->request().url()); m_currentHandle->cancel(); m_currentHandle = 0; - m_pendingEntries.remove(handle->request().url()); // Load the next resource, if any. startLoadingEntry(); } @@ -531,7 +552,9 @@ void ApplicationCacheGroup::didFail(ResourceHandle* handle, const ResourceError& } unsigned type = m_currentResource ? m_currentResource->type() : m_pendingEntries.get(handle->request().url()); - const KURL& url = handle->request().url(); + KURL url(handle->request().url()); + if (url.hasRef()) + url.removeRef(); ASSERT(!m_currentResource || !m_pendingEntries.contains(url)); m_currentResource = 0; @@ -652,6 +675,15 @@ void ApplicationCacheGroup::didFinishLoadingManifest() startLoadingEntry(); } +void ApplicationCacheGroup::didReachMaxAppCacheSize() +{ + ASSERT(m_frame); + ASSERT(m_cacheBeingUpdated); + m_frame->page()->chrome()->client()->reachedMaxAppCacheSize(cacheStorage().spaceNeeded(m_cacheBeingUpdated->estimatedSizeInStorage())); + m_calledReachedMaxAppCacheSize = true; + checkIfLoadIsComplete(); +} + void ApplicationCacheGroup::cacheUpdateFailed() { stopLoading(); @@ -730,7 +762,15 @@ void ApplicationCacheGroup::checkIfLoadIsComplete() // FIXME: Fetch the resource from manifest URL again, and check whether it is identical to the one used for update (in case the application was upgraded server-side in the meanwhile). () ASSERT(m_cacheBeingUpdated); - m_cacheBeingUpdated->setManifestResource(m_manifestResource.release()); + if (m_manifestResource) + m_cacheBeingUpdated->setManifestResource(m_manifestResource.release()); + else { + // We can get here as a result of retrying the Complete step, following + // a failure of the cache storage to save the newest cache due to hitting + // the maximum size. In such a case, m_manifestResource may be 0, as + // the manifest was already set on the newest cache object. + ASSERT(cacheStorage().isMaximumSizeReached() && m_calledReachedMaxAppCacheSize); + } RefPtr oldNewestCache = (m_newestCache == m_cacheBeingUpdated) ? 0 : m_newestCache; @@ -742,28 +782,44 @@ void ApplicationCacheGroup::checkIfLoadIsComplete() // Fire the success events. postListenerTask(isUpgradeAttempt ? &DOMApplicationCache::callUpdateReadyListener : &DOMApplicationCache::callCachedListener, m_associatedDocumentLoaders); } else { - // Run the "cache failure steps" - // Fire the error events to all pending master entries, as well any other cache hosts - // currently associated with a cache in this group. - postListenerTask(&DOMApplicationCache::callErrorListener, m_associatedDocumentLoaders); - // Disassociate the pending master entries from the failed new cache. Note that - // all other loaders in the m_associatedDocumentLoaders are still associated with - // some other cache in this group. They are not associated with the failed new cache. - - // Need to copy loaders, because the cache group may be destroyed at the end of iteration. - Vector loaders; - copyToVector(m_pendingMasterResourceLoaders, loaders); - size_t count = loaders.size(); - for (size_t i = 0; i != count; ++i) - disassociateDocumentLoader(loaders[i]); // This can delete this group. - - // Reinstate the oldNewestCache, if there was one. - if (oldNewestCache) { - // This will discard the failed new cache. - setNewestCache(oldNewestCache.release()); - } else { - // We must have been deleted by the last call to disassociateDocumentLoader(). + if (cacheStorage().isMaximumSizeReached() && !m_calledReachedMaxAppCacheSize) { + // We ran out of space. All the changes in the cache storage have + // been rolled back. We roll back to the previous state in here, + // as well, call the chrome client asynchronously and retry to + // save the new cache. + + // Save a reference to the new cache. + m_cacheBeingUpdated = m_newestCache.release(); + if (oldNewestCache) { + // Reinstate the oldNewestCache. + setNewestCache(oldNewestCache.release()); + } + scheduleReachedMaxAppCacheSizeCallback(); return; + } else { + // Run the "cache failure steps" + // Fire the error events to all pending master entries, as well any other cache hosts + // currently associated with a cache in this group. + postListenerTask(&DOMApplicationCache::callErrorListener, m_associatedDocumentLoaders); + // Disassociate the pending master entries from the failed new cache. Note that + // all other loaders in the m_associatedDocumentLoaders are still associated with + // some other cache in this group. They are not associated with the failed new cache. + + // Need to copy loaders, because the cache group may be destroyed at the end of iteration. + Vector loaders; + copyToVector(m_pendingMasterResourceLoaders, loaders); + size_t count = loaders.size(); + for (size_t i = 0; i != count; ++i) + disassociateDocumentLoader(loaders[i]); // This can delete this group. + + // Reinstate the oldNewestCache, if there was one. + if (oldNewestCache) { + // This will discard the failed new cache. + setNewestCache(oldNewestCache.release()); + } else { + // We must have been deleted by the last call to disassociateDocumentLoader(). + return; + } } } break; @@ -775,6 +831,7 @@ void ApplicationCacheGroup::checkIfLoadIsComplete() m_completionType = None; m_updateStatus = Idle; m_frame = 0; + m_calledReachedMaxAppCacheSize = false; } void ApplicationCacheGroup::startLoadingEntry() @@ -820,6 +877,7 @@ void ApplicationCacheGroup::deliverDelayedMainResources() void ApplicationCacheGroup::addEntry(const String& url, unsigned type) { ASSERT(m_cacheBeingUpdated); + ASSERT(!KURL(url).hasRef()); // Don't add the URL if we already have an master resource in the cache // (i.e., the main resource finished loading before the manifest). @@ -857,7 +915,34 @@ void ApplicationCacheGroup::associateDocumentLoaderWithCache(DocumentLoader* loa ASSERT(!m_associatedDocumentLoaders.contains(loader)); m_associatedDocumentLoaders.add(loader); } - + +class ChromeClientCallbackTimer: public TimerBase { +public: + ChromeClientCallbackTimer(ApplicationCacheGroup* cacheGroup) + : m_cacheGroup(cacheGroup) + { + } + +private: + virtual void fired() + { + m_cacheGroup->didReachMaxAppCacheSize(); + delete this; + } + // Note that there is no need to use a RefPtr here. The ApplicationCacheGroup instance is guaranteed + // to be alive when the timer fires since invoking the ChromeClient callback is part of its normal + // update machinery and nothing can yet cause it to get deleted. + ApplicationCacheGroup* m_cacheGroup; +}; + +void ApplicationCacheGroup::scheduleReachedMaxAppCacheSizeCallback() +{ + ASSERT(isMainThread()); + ChromeClientCallbackTimer* timer = new ChromeClientCallbackTimer(this); + timer->startOneShot(0); + // The timer will delete itself once it fires. +} + class CallCacheListenerTask : public ScriptExecutionContext::Task { typedef void (DOMApplicationCache::*ListenerFunction)(); public: @@ -910,7 +995,7 @@ void ApplicationCacheGroup::clearStorageID() for (HashSet::const_iterator it = m_caches.begin(); it != end; ++it) (*it)->clearStorageID(); } - + } diff --git a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.h b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.h index 063fb3b78..375bd178b 100644 --- a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.h +++ b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheGroup.h @@ -52,7 +52,7 @@ enum ApplicationCacheUpdateOption { ApplicationCacheUpdateWithoutBrowsingContext }; -class ApplicationCacheGroup : Noncopyable, ResourceHandleClient { +class ApplicationCacheGroup : public Noncopyable, ResourceHandleClient { public: ApplicationCacheGroup(const KURL& manifestURL, bool isCopy = false); ~ApplicationCacheGroup(); @@ -95,6 +95,7 @@ private: static void postListenerTask(ListenerFunction, const HashSet&); static void postListenerTask(ListenerFunction, const Vector >& loaders); static void postListenerTask(ListenerFunction, DocumentLoader*); + void scheduleReachedMaxAppCacheSizeCallback(); PassRefPtr createResourceHandle(const KURL&, ApplicationCacheResource* newestCachedResource); @@ -106,6 +107,7 @@ private: void didReceiveManifestResponse(const ResourceResponse&); void didReceiveManifestData(const char*, int); void didFinishLoadingManifest(); + void didReachMaxAppCacheSize(); void startLoadingEntry(); void deliverDelayedMainResources(); @@ -163,12 +165,19 @@ private: // Whether this cache group is a copy that's only used for transferring the cache to another file. bool m_isCopy; + + // This flag is set immediately after the ChromeClient::reachedMaxAppCacheSize() callback is invoked as a result of the storage layer failing to save a cache + // due to reaching the maximum size of the application cache database file. This flag is used by ApplicationCacheGroup::checkIfLoadIsComplete() to decide + // the course of action in case of this failure (i.e. call the ChromeClient callback or run the failure steps). + bool m_calledReachedMaxAppCacheSize; RefPtr m_currentHandle; RefPtr m_currentResource; RefPtr m_manifestResource; RefPtr m_manifestHandle; + + friend class ChromeClientCallbackTimer; }; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheResource.cpp b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheResource.cpp index 4beb76a93..03c5c8359 100644 --- a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheResource.cpp +++ b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheResource.cpp @@ -35,6 +35,7 @@ ApplicationCacheResource::ApplicationCacheResource(const KURL& url, const Resour : SubstituteResource(url, response, data) , m_type(type) , m_storageID(0) + , m_estimatedSizeInStorage(0) { } @@ -44,6 +45,28 @@ void ApplicationCacheResource::addType(unsigned type) m_type |= type; } +int64_t ApplicationCacheResource::estimatedSizeInStorage() +{ + if (m_estimatedSizeInStorage) + return m_estimatedSizeInStorage; + + if (data()) + m_estimatedSizeInStorage = data()->size(); + + HTTPHeaderMap::const_iterator end = response().httpHeaderFields().end(); + for (HTTPHeaderMap::const_iterator it = response().httpHeaderFields().begin(); it != end; ++it) + m_estimatedSizeInStorage += (it->first.length() + it->second.length() + 2) * sizeof(UChar); + + m_estimatedSizeInStorage += url().string().length() * sizeof(UChar); + m_estimatedSizeInStorage += sizeof(int); // response().m_httpStatusCode + m_estimatedSizeInStorage += response().url().string().length() * sizeof(UChar); + m_estimatedSizeInStorage += sizeof(unsigned); // dataId + m_estimatedSizeInStorage += response().mimeType().length() * sizeof(UChar); + m_estimatedSizeInStorage += response().textEncodingName().length() * sizeof(UChar); + + return m_estimatedSizeInStorage; +} + #ifndef NDEBUG void ApplicationCacheResource::dumpType(unsigned type) { diff --git a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheResource.h b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheResource.h index 0a8d6c22f..cffc51bf3 100644 --- a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheResource.h +++ b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheResource.h @@ -44,6 +44,7 @@ public: static PassRefPtr create(const KURL& url, const ResourceResponse& response, unsigned type, PassRefPtr buffer = SharedBuffer::create()) { + ASSERT(!url.hasRef()); return adoptRef(new ApplicationCacheResource(url, response, type, buffer)); } @@ -53,6 +54,7 @@ public: void setStorageID(unsigned storageID) { m_storageID = storageID; } unsigned storageID() const { return m_storageID; } void clearStorageID() { m_storageID = 0; } + int64_t estimatedSizeInStorage(); #ifndef NDEBUG static void dumpType(unsigned type); @@ -63,6 +65,7 @@ private: unsigned m_type; unsigned m_storageID; + int64_t m_estimatedSizeInStorage; }; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheStorage.cpp b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheStorage.cpp index 7e611cd6e..18a0ed4d9 100644 --- a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheStorage.cpp +++ b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheStorage.cpp @@ -43,16 +43,17 @@ using namespace std; namespace WebCore { -class ResourceStorageIDJournal { +template +class StorageIDJournal { public: - ~ResourceStorageIDJournal() + ~StorageIDJournal() { size_t size = m_records.size(); for (size_t i = 0; i < size; ++i) m_records[i].restore(); } - void add(ApplicationCacheResource* resource, unsigned storageID) + void add(T* resource, unsigned storageID) { m_records.append(Record(resource, storageID)); } @@ -66,7 +67,7 @@ private: class Record { public: Record() : m_resource(0), m_storageID(0) { } - Record(ApplicationCacheResource* resource, unsigned storageID) : m_resource(resource), m_storageID(storageID) { } + Record(T* resource, unsigned storageID) : m_resource(resource), m_storageID(storageID) { } void restore() { @@ -74,7 +75,7 @@ private: } private: - ApplicationCacheResource* m_resource; + T* m_resource; unsigned m_storageID; }; @@ -126,11 +127,12 @@ ApplicationCacheGroup* ApplicationCacheStorage::loadCacheGroup(const KURL& manif ApplicationCacheGroup* ApplicationCacheStorage::findOrCreateCacheGroup(const KURL& manifestURL) { + ASSERT(!manifestURL.hasRef()); + std::pair result = m_cachesInMemory.add(manifestURL, 0); if (!result.second) { ASSERT(result.first->second); - return result.first->second; } @@ -175,6 +177,8 @@ void ApplicationCacheStorage::loadManifestHostHashes() ApplicationCacheGroup* ApplicationCacheStorage::cacheGroupForURL(const KURL& url) { + ASSERT(!url.hasRef()); + loadManifestHostHashes(); // Hash the host name and see if there's a manifest with the same host. @@ -223,6 +227,8 @@ ApplicationCacheGroup* ApplicationCacheStorage::cacheGroupForURL(const KURL& url // a matching URL. unsigned newestCacheID = static_cast(statement.getColumnInt64(2)); RefPtr cache = loadCache(newestCacheID); + if (!cache) + continue; ApplicationCacheResource* resource = cache->resourceForURL(url); if (!resource) @@ -248,6 +254,8 @@ ApplicationCacheGroup* ApplicationCacheStorage::cacheGroupForURL(const KURL& url ApplicationCacheGroup* ApplicationCacheStorage::fallbackCacheGroupForURL(const KURL& url) { + ASSERT(!url.hasRef()); + // Check if an appropriate cache already exists in memory. CacheGroupMap::const_iterator end = m_cachesInMemory.end(); for (CacheGroupMap::const_iterator it = m_cachesInMemory.begin(); it != end; ++it) { @@ -353,6 +361,58 @@ const String& ApplicationCacheStorage::cacheDirectory() const return m_cacheDirectory; } +void ApplicationCacheStorage::setMaximumSize(int64_t size) +{ + m_maximumSize = size; +} + +int64_t ApplicationCacheStorage::maximumSize() const +{ + return m_maximumSize; +} + +bool ApplicationCacheStorage::isMaximumSizeReached() const +{ + return m_isMaximumSizeReached; +} + +int64_t ApplicationCacheStorage::spaceNeeded(int64_t cacheToSave) +{ + int64_t spaceNeeded = 0; + long long fileSize = 0; + if (!getFileSize(m_cacheFile, fileSize)) + return 0; + + int64_t currentSize = fileSize; + + // Determine the amount of free space we have available. + int64_t totalAvailableSize = 0; + if (m_maximumSize < currentSize) { + // The max size is smaller than the actual size of the app cache file. + // This can happen if the client previously imposed a larger max size + // value and the app cache file has already grown beyond the current + // max size value. + // The amount of free space is just the amount of free space inside + // the database file. Note that this is always 0 if SQLite is compiled + // with AUTO_VACUUM = 1. + totalAvailableSize = m_database.freeSpaceSize(); + } else { + // The max size is the same or larger than the current size. + // The amount of free space available is the amount of free space + // inside the database file plus the amount we can grow until we hit + // the max size. + totalAvailableSize = (m_maximumSize - currentSize) + m_database.freeSpaceSize(); + } + + // The space needed to be freed in order to accomodate the failed cache is + // the size of the failed cache minus any already available free space. + spaceNeeded = cacheToSave - totalAvailableSize; + // The space needed value must be positive (or else the total already + // available free space would be larger than the size of the failed cache and + // saving of the cache should have never failed). + ASSERT(spaceNeeded); + return spaceNeeded; +} bool ApplicationCacheStorage::executeSQLCommand(const String& sql) { @@ -366,7 +426,7 @@ bool ApplicationCacheStorage::executeSQLCommand(const String& sql) return result; } -static const int schemaVersion = 3; +static const int schemaVersion = 4; void ApplicationCacheStorage::verifySchemaVersion() { @@ -400,13 +460,13 @@ void ApplicationCacheStorage::openDatabase(bool createIfDoesNotExist) // The cache directory should never be null, but if it for some weird reason is we bail out. if (m_cacheDirectory.isNull()) return; - - String applicationCachePath = pathByAppendingComponent(m_cacheDirectory, "ApplicationCache.db"); - if (!createIfDoesNotExist && !fileExists(applicationCachePath)) + + m_cacheFile = pathByAppendingComponent(m_cacheDirectory, "ApplicationCache.db"); + if (!createIfDoesNotExist && !fileExists(m_cacheFile)) return; makeAllDirectories(m_cacheDirectory); - m_database.open(applicationCachePath); + m_database.open(m_cacheFile); if (!m_database.isOpen()) return; @@ -416,7 +476,7 @@ void ApplicationCacheStorage::openDatabase(bool createIfDoesNotExist) // Create tables executeSQLCommand("CREATE TABLE IF NOT EXISTS CacheGroups (id INTEGER PRIMARY KEY AUTOINCREMENT, " "manifestHostHash INTEGER NOT NULL ON CONFLICT FAIL, manifestURL TEXT UNIQUE ON CONFLICT FAIL, newestCache INTEGER)"); - executeSQLCommand("CREATE TABLE IF NOT EXISTS Caches (id INTEGER PRIMARY KEY AUTOINCREMENT, cacheGroup INTEGER)"); + executeSQLCommand("CREATE TABLE IF NOT EXISTS Caches (id INTEGER PRIMARY KEY AUTOINCREMENT, cacheGroup INTEGER, size INTEGER)"); executeSQLCommand("CREATE TABLE IF NOT EXISTS CacheWhitelistURLs (url TEXT NOT NULL ON CONFLICT FAIL, cache INTEGER NOT NULL ON CONFLICT FAIL)"); executeSQLCommand("CREATE TABLE IF NOT EXISTS FallbackURLs (namespace TEXT NOT NULL ON CONFLICT FAIL, fallbackURL TEXT NOT NULL ON CONFLICT FAIL, " "cache INTEGER NOT NULL ON CONFLICT FAIL)"); @@ -456,9 +516,10 @@ bool ApplicationCacheStorage::executeStatement(SQLiteStatement& statement) return result; } -bool ApplicationCacheStorage::store(ApplicationCacheGroup* group) +bool ApplicationCacheStorage::store(ApplicationCacheGroup* group, GroupStorageIDJournal* journal) { ASSERT(group->storageID() == 0); + ASSERT(journal); SQLiteStatement statement(m_database, "INSERT INTO CacheGroups (manifestHostHash, manifestURL) VALUES (?, ?)"); if (statement.prepare() != SQLResultOk) @@ -471,6 +532,7 @@ bool ApplicationCacheStorage::store(ApplicationCacheGroup* group) return false; group->setStorageID(static_cast(m_database.lastInsertRowID())); + journal->add(group, 0); return true; } @@ -480,11 +542,12 @@ bool ApplicationCacheStorage::store(ApplicationCache* cache, ResourceStorageIDJo ASSERT(cache->group()->storageID() != 0); ASSERT(storageIDJournal); - SQLiteStatement statement(m_database, "INSERT INTO Caches (cacheGroup) VALUES (?)"); + SQLiteStatement statement(m_database, "INSERT INTO Caches (cacheGroup, size) VALUES (?, ?)"); if (statement.prepare() != SQLResultOk) return false; statement.bindInt64(1, cache->group()->storageID()); + statement.bindInt64(2, cache->estimatedSizeInStorage()); if (!executeStatement(statement)) return false; @@ -581,6 +644,9 @@ bool ApplicationCacheStorage::store(ApplicationCacheResource* resource, unsigned if (resourceStatement.prepare() != SQLResultOk) return false; + // The same ApplicationCacheResource are used in ApplicationCacheResource::size() + // to calculate the approximate size of an ApplicationCacheResource object. If + // you change the code below, please also change ApplicationCacheResource::size(). resourceStatement.bindText(1, resource->url()); resourceStatement.bindInt64(2, resource->response().httpStatusCode()); resourceStatement.bindText(3, resource->response().url()); @@ -626,33 +692,56 @@ bool ApplicationCacheStorage::storeUpdatedType(ApplicationCacheResource* resourc return executeStatement(entryStatement); } -void ApplicationCacheStorage::store(ApplicationCacheResource* resource, ApplicationCache* cache) +bool ApplicationCacheStorage::store(ApplicationCacheResource* resource, ApplicationCache* cache) { ASSERT(cache->storageID()); openDatabase(true); + m_isMaximumSizeReached = false; + m_database.setMaximumSize(m_maximumSize); + SQLiteTransaction storeResourceTransaction(m_database); storeResourceTransaction.begin(); - if (!store(resource, cache->storageID())) - return; + if (!store(resource, cache->storageID())) { + checkForMaxSizeReached(); + return false; + } + + // A resource was added to the cache. Update the total data size for the cache. + SQLiteStatement sizeUpdateStatement(m_database, "UPDATE Caches SET size=size+? WHERE id=?"); + if (sizeUpdateStatement.prepare() != SQLResultOk) + return false; + + sizeUpdateStatement.bindInt64(1, resource->estimatedSizeInStorage()); + sizeUpdateStatement.bindInt64(2, cache->storageID()); + + if (!executeStatement(sizeUpdateStatement)) + return false; storeResourceTransaction.commit(); + return true; } bool ApplicationCacheStorage::storeNewestCache(ApplicationCacheGroup* group) { openDatabase(true); - + + m_isMaximumSizeReached = false; + m_database.setMaximumSize(m_maximumSize); + SQLiteTransaction storeCacheTransaction(m_database); storeCacheTransaction.begin(); - + + GroupStorageIDJournal groupStorageIDJournal; if (!group->storageID()) { // Store the group - if (!store(group)) + if (!store(group, &groupStorageIDJournal)) { + checkForMaxSizeReached(); return false; + } } ASSERT(group->newestCache()); @@ -662,11 +751,13 @@ bool ApplicationCacheStorage::storeNewestCache(ApplicationCacheGroup* group) // Log the storageID changes to the in-memory resource objects. The journal // object will roll them back automatically in case a database operation // fails and this method returns early. - ResourceStorageIDJournal storageIDJournal; + ResourceStorageIDJournal resourceStorageIDJournal; // Store the newest cache - if (!store(group->newestCache(), &storageIDJournal)) + if (!store(group->newestCache(), &resourceStorageIDJournal)) { + checkForMaxSizeReached(); return false; + } // Update the newest cache in the group. @@ -680,7 +771,8 @@ bool ApplicationCacheStorage::storeNewestCache(ApplicationCacheGroup* group) if (!executeStatement(statement)) return false; - storageIDJournal.commit(); + groupStorageIDJournal.commit(); + resourceStorageIDJournal.commit(); storeCacheTransaction.commit(); return true; } @@ -876,7 +968,116 @@ bool ApplicationCacheStorage::storeCopyOfCache(const String& cacheDirectory, App return copyStorage.storeNewestCache(groupCopy.get()); } - + +bool ApplicationCacheStorage::manifestURLs(Vector* urls) +{ + ASSERT(urls); + openDatabase(false); + if (!m_database.isOpen()) + return false; + + SQLiteStatement selectURLs(m_database, "SELECT manifestURL FROM CacheGroups"); + + if (selectURLs.prepare() != SQLResultOk) + return false; + + while (selectURLs.step() == SQLResultRow) + urls->append(selectURLs.getColumnText(0)); + + return true; +} + +bool ApplicationCacheStorage::cacheGroupSize(const String& manifestURL, int64_t* size) +{ + ASSERT(size); + openDatabase(false); + if (!m_database.isOpen()) + return false; + + SQLiteStatement statement(m_database, "SELECT sum(Caches.size) FROM Caches INNER JOIN CacheGroups ON Caches.cacheGroup=CacheGroups.id WHERE CacheGroups.manifestURL=?"); + if (statement.prepare() != SQLResultOk) + return false; + + statement.bindText(1, manifestURL); + + int result = statement.step(); + if (result == SQLResultDone) + return false; + + if (result != SQLResultRow) { + LOG_ERROR("Could not get the size of the cache group, error \"%s\"", m_database.lastErrorMsg()); + return false; + } + + *size = statement.getColumnInt64(0); + return true; +} + +bool ApplicationCacheStorage::deleteCacheGroup(const String& manifestURL) +{ + SQLiteTransaction deleteTransaction(m_database); + // Check to see if the group is in memory. + ApplicationCacheGroup* group = m_cachesInMemory.get(manifestURL); + if (group) + cacheGroupMadeObsolete(group); + else { + // The cache group is not in memory, so remove it from the disk. + openDatabase(false); + if (!m_database.isOpen()) + return false; + + SQLiteStatement idStatement(m_database, "SELECT id FROM CacheGroups WHERE manifestURL=?"); + if (idStatement.prepare() != SQLResultOk) + return false; + + idStatement.bindText(1, manifestURL); + + int result = idStatement.step(); + if (result == SQLResultDone) + return false; + + if (result != SQLResultRow) { + LOG_ERROR("Could not load cache group id, error \"%s\"", m_database.lastErrorMsg()); + return false; + } + + int64_t groupId = idStatement.getColumnInt64(0); + + SQLiteStatement cacheStatement(m_database, "DELETE FROM Caches WHERE cacheGroup=?"); + if (cacheStatement.prepare() != SQLResultOk) + return false; + + SQLiteStatement groupStatement(m_database, "DELETE FROM CacheGroups WHERE id=?"); + if (groupStatement.prepare() != SQLResultOk) + return false; + + cacheStatement.bindInt64(1, groupId); + executeStatement(cacheStatement); + groupStatement.bindInt64(1, groupId); + executeStatement(groupStatement); + } + + deleteTransaction.commit(); + return true; +} + +void ApplicationCacheStorage::vacuumDatabaseFile() +{ + m_database.runVacuumCommand(); +} + +void ApplicationCacheStorage::checkForMaxSizeReached() +{ + if (m_database.lastError() == SQLResultFull) + m_isMaximumSizeReached = true; +} + +ApplicationCacheStorage::ApplicationCacheStorage() + : m_maximumSize(INT_MAX) + , m_isMaximumSizeReached(false) +{ +} + ApplicationCacheStorage& cacheStorage() { DEFINE_STATIC_LOCAL(ApplicationCacheStorage, storage, ()); diff --git a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheStorage.h b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheStorage.h index b13b5966a..c6d687ef7 100644 --- a/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheStorage.h +++ b/src/3rdparty/webkit/WebCore/loader/appcache/ApplicationCacheStorage.h @@ -40,13 +40,19 @@ class ApplicationCache; class ApplicationCacheGroup; class ApplicationCacheResource; class KURL; -class ResourceStorageIDJournal; - +template +class StorageIDJournal; + class ApplicationCacheStorage { public: void setCacheDirectory(const String&); const String& cacheDirectory() const; + void setMaximumSize(int64_t size); + int64_t maximumSize() const; + bool isMaximumSizeReached() const; + int64_t spaceNeeded(int64_t cacheToSave); + ApplicationCacheGroup* cacheGroupForURL(const KURL&); // Cache to load a main resource from. ApplicationCacheGroup* fallbackCacheGroupForURL(const KURL&); // Cache that has a fallback entry to load a main resource from if normal loading fails. @@ -55,7 +61,7 @@ public: void cacheGroupMadeObsolete(ApplicationCacheGroup*); bool storeNewestCache(ApplicationCacheGroup*); // Updates the cache group, but doesn't remove old cache. - void store(ApplicationCacheResource*, ApplicationCache*); + bool store(ApplicationCacheResource*, ApplicationCache*); bool storeUpdatedType(ApplicationCacheResource*, ApplicationCache*); // Removes the group if the cache to be removed is the newest one (so, storeNewestCache() needs to be called beforehand when updating). @@ -65,11 +71,19 @@ public: static bool storeCopyOfCache(const String& cacheDirectory, ApplicationCache*); + bool manifestURLs(Vector* urls); + bool cacheGroupSize(const String& manifestURL, int64_t* size); + bool deleteCacheGroup(const String& manifestURL); + void vacuumDatabaseFile(); private: + ApplicationCacheStorage(); PassRefPtr loadCache(unsigned storageID); ApplicationCacheGroup* loadCacheGroup(const KURL& manifestURL); - bool store(ApplicationCacheGroup*); + typedef StorageIDJournal ResourceStorageIDJournal; + typedef StorageIDJournal GroupStorageIDJournal; + + bool store(ApplicationCacheGroup*, GroupStorageIDJournal*); bool store(ApplicationCache*, ResourceStorageIDJournal*); bool store(ApplicationCacheResource*, unsigned cacheStorageID); @@ -81,8 +95,14 @@ private: bool executeStatement(SQLiteStatement&); bool executeSQLCommand(const String&); + + void checkForMaxSizeReached(); String m_cacheDirectory; + String m_cacheFile; + + int64_t m_maximumSize; + bool m_isMaximumSizeReached; SQLiteDatabase m_database; @@ -92,6 +112,8 @@ private: typedef HashMap CacheGroupMap; CacheGroupMap m_cachesInMemory; // Excludes obsolete cache groups. + + friend ApplicationCacheStorage& cacheStorage(); }; ApplicationCacheStorage& cacheStorage(); diff --git a/src/3rdparty/webkit/WebCore/loader/archive/ArchiveResourceCollection.h b/src/3rdparty/webkit/WebCore/loader/archive/ArchiveResourceCollection.h index f898a8d38..9d630d1b2 100644 --- a/src/3rdparty/webkit/WebCore/loader/archive/ArchiveResourceCollection.h +++ b/src/3rdparty/webkit/WebCore/loader/archive/ArchiveResourceCollection.h @@ -39,7 +39,7 @@ namespace WebCore { -class ArchiveResourceCollection : Noncopyable { +class ArchiveResourceCollection : public Noncopyable { public: ArchiveResourceCollection(); diff --git a/src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.h b/src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.h index 675e6c861..44ef22adb 100644 --- a/src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.h +++ b/src/3rdparty/webkit/WebCore/loader/icon/IconDatabase.h @@ -62,7 +62,7 @@ enum IconLoadDecision { IconLoadUnknown }; -class IconDatabase : Noncopyable { +class IconDatabase : public Noncopyable { // *** Main Thread Only *** public: diff --git a/src/3rdparty/webkit/WebCore/loader/icon/IconLoader.h b/src/3rdparty/webkit/WebCore/loader/icon/IconLoader.h index a7194d8d7..7b96ed8e1 100644 --- a/src/3rdparty/webkit/WebCore/loader/icon/IconLoader.h +++ b/src/3rdparty/webkit/WebCore/loader/icon/IconLoader.h @@ -38,7 +38,7 @@ class Frame; class KURL; class SharedBuffer; -class IconLoader : private SubresourceLoaderClient, Noncopyable { +class IconLoader : private SubresourceLoaderClient, public Noncopyable { public: static std::auto_ptr create(Frame*); ~IconLoader(); diff --git a/src/3rdparty/webkit/WebCore/loader/icon/PageURLRecord.h b/src/3rdparty/webkit/WebCore/loader/icon/PageURLRecord.h index bc52f5b58..f7ccb8fd0 100644 --- a/src/3rdparty/webkit/WebCore/loader/icon/PageURLRecord.h +++ b/src/3rdparty/webkit/WebCore/loader/icon/PageURLRecord.h @@ -51,7 +51,7 @@ public: String iconURL; }; -class PageURLRecord : Noncopyable { +class PageURLRecord : public Noncopyable { public: PageURLRecord(const String& pageURL); ~PageURLRecord(); diff --git a/src/3rdparty/webkit/WebCore/loader/loader.cpp b/src/3rdparty/webkit/WebCore/loader/loader.cpp index 881e200fe..7ca45a578 100644 --- a/src/3rdparty/webkit/WebCore/loader/loader.cpp +++ b/src/3rdparty/webkit/WebCore/loader/loader.cpp @@ -287,11 +287,8 @@ void Loader::Host::servePendingRequests(RequestQueue& requestsPending, bool& ser Request* request = requestsPending.first(); DocLoader* docLoader = request->docLoader(); bool resourceIsCacheValidator = request->cachedResource()->isCacheValidator(); - // If the document is fully parsed and there are no pending stylesheets there won't be any more - // resources that we would want to push to the front of the queue. Just hand off the remaining resources - // to the networking layer. - bool parsedAndStylesheetsKnown = !docLoader->doc()->parsing() && docLoader->doc()->haveStylesheetsLoaded(); - if (!parsedAndStylesheetsKnown && !resourceIsCacheValidator && m_requestsLoading.size() + m_nonCachedRequestsInFlight >= m_maxRequestsInFlight) { + + if (m_requestsLoading.size() + m_nonCachedRequestsInFlight >= m_maxRequestsInFlight) { serveLowerPriority = false; return; } diff --git a/src/3rdparty/webkit/WebCore/loader/loader.h b/src/3rdparty/webkit/WebCore/loader/loader.h index 3cced3d6c..d0a526f96 100644 --- a/src/3rdparty/webkit/WebCore/loader/loader.h +++ b/src/3rdparty/webkit/WebCore/loader/loader.h @@ -38,7 +38,7 @@ namespace WebCore { class KURL; class Request; - class Loader : Noncopyable { + class Loader : public Noncopyable { public: Loader(); ~Loader(); diff --git a/src/3rdparty/webkit/WebCore/page/BarInfo.cpp b/src/3rdparty/webkit/WebCore/page/BarInfo.cpp index f6a12106b..0f6cad5b5 100644 --- a/src/3rdparty/webkit/WebCore/page/BarInfo.cpp +++ b/src/3rdparty/webkit/WebCore/page/BarInfo.cpp @@ -62,20 +62,20 @@ bool BarInfo::visible() const return false; switch (m_type) { - case Locationbar: - return m_frame->page()->chrome()->toolbarsVisible(); - case Toolbar: - return m_frame->page()->chrome()->toolbarsVisible(); - case Personalbar: - return m_frame->page()->chrome()->toolbarsVisible(); - case Menubar: - return m_frame->page()->chrome()->menubarVisible(); - case Scrollbars: - return m_frame->page()->chrome()->scrollbarsVisible(); - case Statusbar: - return m_frame->page()->chrome()->statusbarVisible(); - default: - return false; + case Locationbar: + return m_frame->page()->chrome()->toolbarsVisible(); + case Toolbar: + return m_frame->page()->chrome()->toolbarsVisible(); + case Personalbar: + return m_frame->page()->chrome()->toolbarsVisible(); + case Menubar: + return m_frame->page()->chrome()->menubarVisible(); + case Scrollbars: + return m_frame->page()->chrome()->scrollbarsVisible(); + case Statusbar: + return m_frame->page()->chrome()->statusbarVisible(); + default: + return false; } } diff --git a/src/3rdparty/webkit/WebCore/page/Chrome.cpp b/src/3rdparty/webkit/WebCore/page/Chrome.cpp index 2170723dd..5a5670ee7 100644 --- a/src/3rdparty/webkit/WebCore/page/Chrome.cpp +++ b/src/3rdparty/webkit/WebCore/page/Chrome.cpp @@ -36,6 +36,7 @@ #include "InspectorController.h" #include "Page.h" #include "PageGroupLoadDeferrer.h" +#include "RenderObject.h" #include "ResourceHandle.h" #include "ScriptController.h" #include "SecurityOrigin.h" @@ -115,12 +116,12 @@ FloatRect Chrome::pageRect() const { return m_client->pageRect(); } - + float Chrome::scaleFactor() { return m_client->scaleFactor(); } - + void Chrome::focus() const { m_client->focus(); @@ -140,7 +141,7 @@ void Chrome::takeFocus(FocusDirection direction) const { m_client->takeFocus(direction); } - + Page* Chrome::createWindow(Frame* frame, const FrameLoadRequest& request, const WindowFeatures& features) const { Page* newPage = m_client->createWindow(frame, request, features); @@ -234,7 +235,7 @@ bool Chrome::canRunBeforeUnloadConfirmPanel() bool Chrome::runBeforeUnloadConfirmPanel(const String& message, Frame* frame) { - // Defer loads in case the client method runs a new event loop that would + // Defer loads in case the client method runs a new event loop that would // otherwise cause the load to continue while we're in the middle of executing JavaScript. PageGroupLoadDeferrer deferrer(m_page, true); @@ -248,7 +249,7 @@ void Chrome::closeWindowSoon() void Chrome::runJavaScriptAlert(Frame* frame, const String& message) { - // Defer loads in case the client method runs a new event loop that would + // Defer loads in case the client method runs a new event loop that would // otherwise cause the load to continue while we're in the middle of executing JavaScript. PageGroupLoadDeferrer deferrer(m_page, true); @@ -258,7 +259,7 @@ void Chrome::runJavaScriptAlert(Frame* frame, const String& message) bool Chrome::runJavaScriptConfirm(Frame* frame, const String& message) { - // Defer loads in case the client method runs a new event loop that would + // Defer loads in case the client method runs a new event loop that would // otherwise cause the load to continue while we're in the middle of executing JavaScript. PageGroupLoadDeferrer deferrer(m_page, true); @@ -268,16 +269,16 @@ bool Chrome::runJavaScriptConfirm(Frame* frame, const String& message) bool Chrome::runJavaScriptPrompt(Frame* frame, const String& prompt, const String& defaultValue, String& result) { - // Defer loads in case the client method runs a new event loop that would + // Defer loads in case the client method runs a new event loop that would // otherwise cause the load to continue while we're in the middle of executing JavaScript. PageGroupLoadDeferrer deferrer(m_page, true); ASSERT(frame); bool ok = m_client->runJavaScriptPrompt(frame, frame->displayStringModifiedByEncoding(prompt), frame->displayStringModifiedByEncoding(defaultValue), result); - + if (ok) result = frame->displayStringModifiedByEncoding(result); - + return ok; } @@ -289,7 +290,7 @@ void Chrome::setStatusbarText(Frame* frame, const String& status) bool Chrome::shouldInterruptJavaScript() { - // Defer loads in case the client method runs a new event loop that would + // Defer loads in case the client method runs a new event loop that would // otherwise cause the load to continue while we're in the middle of executing JavaScript. PageGroupLoadDeferrer deferrer(m_page, true); @@ -317,7 +318,8 @@ void Chrome::mouseDidMoveOverElement(const HitTestResult& result, unsigned modif void Chrome::setToolTip(const HitTestResult& result) { // First priority is a potential toolTip representing a spelling or grammar error - String toolTip = result.spellingToolTip(); + TextDirection toolTipDirection; + String toolTip = result.spellingToolTip(toolTipDirection); // Next priority is a toolTip from a URL beneath the mouse (if preference is set to show those). if (toolTip.isEmpty() && m_page->settings()->showsURLsInToolTips()) { @@ -326,20 +328,28 @@ void Chrome::setToolTip(const HitTestResult& result) if (node->hasTagName(inputTag)) { HTMLInputElement* input = static_cast(node); if (input->inputType() == HTMLInputElement::SUBMIT) - if (HTMLFormElement* form = input->form()) + if (HTMLFormElement* form = input->form()) { toolTip = form->action(); + if (form->renderer()) + toolTipDirection = form->renderer()->style()->direction(); + else + toolTipDirection = LTR; + } } } // Get tooltip representing link's URL - if (toolTip.isEmpty()) + if (toolTip.isEmpty()) { // FIXME: Need to pass this URL through userVisibleString once that's in WebCore toolTip = result.absoluteLinkURL().string(); + // URL always display as LTR. + toolTipDirection = LTR; + } } // Next we'll consider a tooltip for element with "title" attribute if (toolTip.isEmpty()) - toolTip = result.title(); + toolTip = result.title(toolTipDirection); // Lastly, for that allow multiple files, we'll consider a tooltip for the selected filenames if (toolTip.isEmpty()) { @@ -357,13 +367,15 @@ void Chrome::setToolTip(const HitTestResult& result) names.append('\n'); } toolTip = String::adopt(names); + // filename always display as LTR. + toolTipDirection = LTR; } } } } } - - m_client->setToolTip(toolTip); + + m_client->setToolTip(toolTip, toolTipDirection); } void Chrome::print(Frame* frame) @@ -373,7 +385,7 @@ void Chrome::print(Frame* frame) void Chrome::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geolocation) { - // Defer loads in case the client method runs a new event loop that would + // Defer loads in case the client method runs a new event loop that would // otherwise cause the load to continue while we're in the middle of executing JavaScript. PageGroupLoadDeferrer deferrer(m_page, true); @@ -420,10 +432,10 @@ bool ChromeClient::shouldReplaceWithGeneratedFileForUpload(const String&, String String ChromeClient::generateReplacementFile(const String&) { ASSERT_NOT_REACHED(); - return String(); + return String(); } -bool ChromeClient::paintCustomScrollbar(GraphicsContext*, const FloatRect&, ScrollbarControlSize, +bool ChromeClient::paintCustomScrollbar(GraphicsContext*, const FloatRect&, ScrollbarControlSize, ScrollbarControlState, ScrollbarPart, bool, float, float, ScrollbarControlPartMask) { diff --git a/src/3rdparty/webkit/WebCore/page/ChromeClient.h b/src/3rdparty/webkit/WebCore/page/ChromeClient.h index 78efa4520..2a9061146 100644 --- a/src/3rdparty/webkit/WebCore/page/ChromeClient.h +++ b/src/3rdparty/webkit/WebCore/page/ChromeClient.h @@ -131,7 +131,7 @@ namespace WebCore { virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags) = 0; - virtual void setToolTip(const String&) = 0; + virtual void setToolTip(const String&, TextDirection) = 0; virtual void print(Frame*) = 0; @@ -139,6 +139,15 @@ namespace WebCore { virtual void exceededDatabaseQuota(Frame*, const String& databaseName) = 0; #endif +#if ENABLE(OFFLINE_WEB_APPLICATIONS) + // Callback invoked when the application cache fails to save a cache object + // because storing it would grow the database file past its defined maximum + // size or past the amount of free space on the device. + // The chrome client would need to take some action such as evicting some + // old caches. + virtual void reachedMaxAppCacheSize(int64_t spaceNeeded) = 0; +#endif + #if ENABLE(DASHBOARD_SUPPORT) virtual void dashboardRegionsChanged(); #endif diff --git a/src/3rdparty/webkit/WebCore/page/Console.cpp b/src/3rdparty/webkit/WebCore/page/Console.cpp index 45ff059df..de7bc720e 100644 --- a/src/3rdparty/webkit/WebCore/page/Console.cpp +++ b/src/3rdparty/webkit/WebCore/page/Console.cpp @@ -29,8 +29,8 @@ #include "config.h" #include "Console.h" -#include "ChromeClient.h" #include "CString.h" +#include "ChromeClient.h" #include "Frame.h" #include "FrameLoader.h" #include "FrameTree.h" @@ -90,48 +90,48 @@ static void printMessageSourceAndLevelPrefix(MessageSource source, MessageLevel { const char* sourceString; switch (source) { - case HTMLMessageSource: - sourceString = "HTML"; - break; - case WMLMessageSource: - sourceString = "WML"; - break; - case XMLMessageSource: - sourceString = "XML"; - break; - case JSMessageSource: - sourceString = "JS"; - break; - case CSSMessageSource: - sourceString = "CSS"; - break; - case OtherMessageSource: - sourceString = "OTHER"; - break; - default: - ASSERT_NOT_REACHED(); - sourceString = "UNKNOWN"; - break; + case HTMLMessageSource: + sourceString = "HTML"; + break; + case WMLMessageSource: + sourceString = "WML"; + break; + case XMLMessageSource: + sourceString = "XML"; + break; + case JSMessageSource: + sourceString = "JS"; + break; + case CSSMessageSource: + sourceString = "CSS"; + break; + case OtherMessageSource: + sourceString = "OTHER"; + break; + default: + ASSERT_NOT_REACHED(); + sourceString = "UNKNOWN"; + break; } const char* levelString; switch (level) { - case TipMessageLevel: - levelString = "TIP"; - break; - case LogMessageLevel: - levelString = "LOG"; - break; - case WarningMessageLevel: - levelString = "WARN"; - break; - case ErrorMessageLevel: - levelString = "ERROR"; - break; - default: - ASSERT_NOT_REACHED(); - levelString = "UNKNOWN"; - break; + case TipMessageLevel: + levelString = "TIP"; + break; + case LogMessageLevel: + levelString = "LOG"; + break; + case WarningMessageLevel: + levelString = "WARN"; + break; + case ErrorMessageLevel: + levelString = "ERROR"; + break; + default: + ASSERT_NOT_REACHED(); + levelString = "UNKNOWN"; + break; } printf("%s %s:", sourceString, levelString); @@ -267,7 +267,7 @@ void Console::profile(const JSC::UString& title, ScriptCallStack* callStack) return; InspectorController* controller = page->inspectorController(); - // FIXME: log a console message when profiling is disabled. + // FIXME: log a console message when profiling is disabled. if (!controller->profilerEnabled()) return; @@ -305,7 +305,7 @@ void Console::profileEnd(const JSC::UString& title, ScriptCallStack* callStack) } #endif - + void Console::time(const String& title) { Page* page = this->page(); @@ -316,7 +316,7 @@ void Console::time(const String& title) // undefined for timing functions if (title.isNull()) return; - + page->inspectorController()->startTiming(title); } diff --git a/src/3rdparty/webkit/WebCore/page/ContextMenuController.h b/src/3rdparty/webkit/WebCore/page/ContextMenuController.h index cb7e6eec4..38095f6d1 100644 --- a/src/3rdparty/webkit/WebCore/page/ContextMenuController.h +++ b/src/3rdparty/webkit/WebCore/page/ContextMenuController.h @@ -37,7 +37,7 @@ namespace WebCore { class Event; class Page; - class ContextMenuController : Noncopyable { + class ContextMenuController : public Noncopyable { public: ContextMenuController(Page*, ContextMenuClient*); ~ContextMenuController(); diff --git a/src/3rdparty/webkit/WebCore/page/Coordinates.cpp b/src/3rdparty/webkit/WebCore/page/Coordinates.cpp index 637a8c2ef..728882aec 100644 --- a/src/3rdparty/webkit/WebCore/page/Coordinates.cpp +++ b/src/3rdparty/webkit/WebCore/page/Coordinates.cpp @@ -31,7 +31,7 @@ namespace WebCore { String Coordinates::toString() const { return String::format("coordinate(%.6lg, %.6lg, %.6lg, %.6lg, %.6lg, %.6lg, %.6lg)", - m_latitude, m_longitude, m_altitude, m_accuracy, + m_latitude, m_longitude, m_altitude, m_accuracy, m_altitudeAccuracy, m_heading, m_speed); } diff --git a/src/3rdparty/webkit/WebCore/page/DOMSelection.cpp b/src/3rdparty/webkit/WebCore/page/DOMSelection.cpp index 3b54f02b8..23c695e4d 100644 --- a/src/3rdparty/webkit/WebCore/page/DOMSelection.cpp +++ b/src/3rdparty/webkit/WebCore/page/DOMSelection.cpp @@ -32,12 +32,12 @@ #include "ExceptionCode.h" #include "Frame.h" -#include "htmlediting.h" #include "Node.h" #include "PlatformString.h" #include "Range.h" #include "SelectionController.h" #include "TextIterator.h" +#include "htmlediting.h" namespace WebCore { @@ -220,7 +220,7 @@ void DOMSelection::setBaseAndExtent(Node* baseNode, int baseOffset, Node* extent } VisiblePosition visibleBase = VisiblePosition(baseNode, baseOffset, DOWNSTREAM); VisiblePosition visibleExtent = VisiblePosition(extentNode, extentOffset, DOWNSTREAM); - + m_frame->selection()->moveTo(visibleBase, visibleExtent); } @@ -245,9 +245,9 @@ void DOMSelection::modify(const String& alterString, const String& directionStri alter = SelectionController::EXTEND; else if (equalIgnoringCase(alterString, "move")) alter = SelectionController::MOVE; - else + else return; - + SelectionController::EDirection direction; if (equalIgnoringCase(directionString, "forward")) direction = SelectionController::FORWARD; @@ -259,7 +259,7 @@ void DOMSelection::modify(const String& alterString, const String& directionStri direction = SelectionController::RIGHT; else return; - + TextGranularity granularity; if (equalIgnoringCase(granularityString, "character")) granularity = CharacterGranularity; @@ -336,7 +336,7 @@ void DOMSelection::addRange(Range* r) return; SelectionController* selection = m_frame->selection(); - + if (selection->isNone()) { selection->setSelection(VisibleSelection(r)); return; @@ -385,7 +385,7 @@ void DOMSelection::deleteFromDocument() ExceptionCode ec = 0; selectedRange->deleteContents(ec); ASSERT(!ec); - + setBaseAndExtent(selectedRange->startContainer(ec), selectedRange->startOffset(ec), selectedRange->startContainer(ec), selectedRange->startOffset(ec), ec); ASSERT(!ec); } diff --git a/src/3rdparty/webkit/WebCore/page/DOMSelection.h b/src/3rdparty/webkit/WebCore/page/DOMSelection.h index 6a914d6a6..e0fe1e318 100644 --- a/src/3rdparty/webkit/WebCore/page/DOMSelection.h +++ b/src/3rdparty/webkit/WebCore/page/DOMSelection.h @@ -30,9 +30,9 @@ #ifndef DOMSelection_h #define DOMSelection_h -#include #include #include +#include namespace WebCore { diff --git a/src/3rdparty/webkit/WebCore/page/DOMTimer.cpp b/src/3rdparty/webkit/WebCore/page/DOMTimer.cpp index 1cc77304c..c42a0dce6 100644 --- a/src/3rdparty/webkit/WebCore/page/DOMTimer.cpp +++ b/src/3rdparty/webkit/WebCore/page/DOMTimer.cpp @@ -54,7 +54,7 @@ DOMTimer::DOMTimer(ScriptExecutionContext* context, ScheduledAction* action, int if (lastUsedTimeoutId <= 0) lastUsedTimeoutId = 1; m_timeoutId = lastUsedTimeoutId; - + m_nestingLevel = timerNestingLevel + 1; scriptExecutionContext()->addTimeout(m_timeoutId, this); @@ -74,11 +74,10 @@ DOMTimer::DOMTimer(ScriptExecutionContext* context, ScheduledAction* action, int DOMTimer::~DOMTimer() { - if (scriptExecutionContext()) { + if (scriptExecutionContext()) scriptExecutionContext()->removeTimeout(m_timeoutId); - } } - + int DOMTimer::install(ScriptExecutionContext* context, ScheduledAction* action, int timeout, bool singleShot) { // DOMTimer constructor links the new timer into a list of ActiveDOMObjects held by the 'context'. @@ -110,7 +109,7 @@ void DOMTimer::fired() if (m_nestingLevel >= maxTimerNestingLevel) augmentRepeatInterval(s_minTimerInterval - repeatInterval()); } - + // No access to member variables after this point, it can delete the timer. m_action->execute(context); return; @@ -121,7 +120,7 @@ void DOMTimer::fired() // No access to member variables after this point. delete this; - + action->execute(context); delete action; timerNestingLevel = 0; @@ -147,24 +146,24 @@ void DOMTimer::stop() m_action.clear(); } -void DOMTimer::suspend() -{ - ASSERT(m_nextFireInterval == 0 && m_repeatInterval == 0); +void DOMTimer::suspend() +{ + ASSERT(!m_nextFireInterval && !m_repeatInterval); m_nextFireInterval = nextFireInterval(); m_repeatInterval = repeatInterval(); TimerBase::stop(); -} - -void DOMTimer::resume() -{ +} + +void DOMTimer::resume() +{ start(m_nextFireInterval, m_repeatInterval); m_nextFireInterval = 0; m_repeatInterval = 0; -} - - -bool DOMTimer::canSuspend() const -{ +} + + +bool DOMTimer::canSuspend() const +{ return true; } diff --git a/src/3rdparty/webkit/WebCore/page/DOMTimer.h b/src/3rdparty/webkit/WebCore/page/DOMTimer.h index f6343fcce..6d6271fdb 100644 --- a/src/3rdparty/webkit/WebCore/page/DOMTimer.h +++ b/src/3rdparty/webkit/WebCore/page/DOMTimer.h @@ -33,41 +33,41 @@ namespace WebCore { -class ScheduledAction; + class ScheduledAction; -class DOMTimer : public TimerBase, public ActiveDOMObject { -public: - virtual ~DOMTimer(); - // Creates a new timer owned by specified ScriptExecutionContext, starts it - // and returns its Id. - static int install(ScriptExecutionContext*, ScheduledAction*, int timeout, bool singleShot); - static void removeById(ScriptExecutionContext*, int timeoutId); + class DOMTimer : public TimerBase, public ActiveDOMObject { + public: + virtual ~DOMTimer(); + // Creates a new timer owned by specified ScriptExecutionContext, starts it + // and returns its Id. + static int install(ScriptExecutionContext*, ScheduledAction*, int timeout, bool singleShot); + static void removeById(ScriptExecutionContext*, int timeoutId); - // ActiveDOMObject - virtual bool hasPendingActivity() const; - virtual void contextDestroyed(); - virtual void stop(); - virtual bool canSuspend() const; - virtual void suspend(); - virtual void resume(); + // ActiveDOMObject + virtual bool hasPendingActivity() const; + virtual void contextDestroyed(); + virtual void stop(); + virtual bool canSuspend() const; + virtual void suspend(); + virtual void resume(); - // The lowest allowable timer setting (in seconds, 0.001 == 1 ms). - // Default is 10ms. - // Chromium uses a non-default timeout. - static double minTimerInterval() { return s_minTimerInterval; } - static void setMinTimerInterval(double value) { s_minTimerInterval = value; } + // The lowest allowable timer setting (in seconds, 0.001 == 1 ms). + // Default is 10ms. + // Chromium uses a non-default timeout. + static double minTimerInterval() { return s_minTimerInterval; } + static void setMinTimerInterval(double value) { s_minTimerInterval = value; } -private: - DOMTimer(ScriptExecutionContext*, ScheduledAction*, int timeout, bool singleShot); - virtual void fired(); + private: + DOMTimer(ScriptExecutionContext*, ScheduledAction*, int timeout, bool singleShot); + virtual void fired(); - int m_timeoutId; - int m_nestingLevel; - OwnPtr m_action; - double m_nextFireInterval; - double m_repeatInterval; - static double s_minTimerInterval; -}; + int m_timeoutId; + int m_nestingLevel; + OwnPtr m_action; + double m_nextFireInterval; + double m_repeatInterval; + static double s_minTimerInterval; + }; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/page/DOMWindow.cpp b/src/3rdparty/webkit/WebCore/page/DOMWindow.cpp index 8e64fe3ff..e8f9004c4 100644 --- a/src/3rdparty/webkit/WebCore/page/DOMWindow.cpp +++ b/src/3rdparty/webkit/WebCore/page/DOMWindow.cpp @@ -546,12 +546,17 @@ Storage* DOMWindow::sessionStorage() const { if (m_sessionStorage) return m_sessionStorage.get(); - - Page* page = m_frame->page(); + + Document* document = this->document(); + if (!document) + return 0; + + Page* page = document->page(); if (!page) return 0; - Document* document = m_frame->document(); + if (!page->settings()->sessionStorageEnabled()) + return 0; RefPtr storageArea = page->sessionStorage()->storageArea(document->securityOrigin()); page->inspectorController()->didUseDOMStorage(storageArea.get(), false, m_frame); @@ -573,8 +578,7 @@ Storage* DOMWindow::localStorage() const if (!page) return 0; - Settings* settings = document->settings(); - if (!settings || !settings->localStorageEnabled()) + if (!page->settings()->localStorageEnabled()) return 0; StorageNamespace* localStorage = page->group().localStorage(); diff --git a/src/3rdparty/webkit/WebCore/page/DOMWindow.idl b/src/3rdparty/webkit/WebCore/page/DOMWindow.idl index bfdebd4a3..e1c9ff071 100644 --- a/src/3rdparty/webkit/WebCore/page/DOMWindow.idl +++ b/src/3rdparty/webkit/WebCore/page/DOMWindow.idl @@ -304,6 +304,7 @@ module window { attribute CounterConstructor Counter; attribute CSSRuleListConstructor CSSRuleList; attribute RectConstructor Rect; + attribute RGBColorConstructor RGBColor; attribute StyleSheetListConstructor StyleSheetList; // FIXME: Implement the commented-out global constructors for interfaces listed in DOM Level 3 Core specification. diff --git a/src/3rdparty/webkit/WebCore/page/DragController.cpp b/src/3rdparty/webkit/WebCore/page/DragController.cpp index 2fe5d975e..64cb2127b 100644 --- a/src/3rdparty/webkit/WebCore/page/DragController.cpp +++ b/src/3rdparty/webkit/WebCore/page/DragController.cpp @@ -72,7 +72,7 @@ static PlatformMouseEvent createMouseEvent(DragData* dragData) LeftButton, MouseEventMoved, 0, false, false, false, false, currentTime()); } - + DragController::DragController(Page* page, DragClient* client) : m_page(page) , m_client(client) @@ -85,12 +85,12 @@ DragController::DragController(Page* page, DragClient* client) , m_sourceDragOperation(DragOperationNone) { } - + DragController::~DragController() -{ +{ m_client->dragControllerDestroyed(); } - + static PassRefPtr documentFragmentFromDragData(DragData* dragData, RefPtr context, bool allowPlainText, bool& chosePlainText) { @@ -122,7 +122,7 @@ static PassRefPtr documentFragmentFromDragData(DragData* dragD chosePlainText = true; return createFragmentFromText(context.get(), dragData->asPlainText()).get(); } - + return 0; } @@ -140,20 +140,20 @@ void DragController::cancelDrag() void DragController::dragEnded() { m_dragInitiator = 0; - m_didInitiateDrag = false; - m_page->dragCaretController()->clear(); -} + m_didInitiateDrag = false; + m_page->dragCaretController()->clear(); +} -DragOperation DragController::dragEntered(DragData* dragData) +DragOperation DragController::dragEntered(DragData* dragData) { return dragEnteredOrUpdated(dragData); } - -void DragController::dragExited(DragData* dragData) -{ + +void DragController::dragExited(DragData* dragData) +{ ASSERT(dragData); Frame* mainFrame = m_page->mainFrame(); - + if (RefPtr v = mainFrame->view()) { ClipboardAccessPolicy policy = (!m_documentUnderMouse || m_documentUnderMouse->securityOrigin()->isLocal()) ? ClipboardReadable : ClipboardTypesReadable; RefPtr clipboard = dragData->createClipboard(policy); @@ -164,14 +164,13 @@ void DragController::dragExited(DragData* dragData) mouseMovedIntoDocument(0); } - -DragOperation DragController::dragUpdated(DragData* dragData) +DragOperation DragController::dragUpdated(DragData* dragData) { return dragEnteredOrUpdated(dragData); } - + bool DragController::performDrag(DragData* dragData) -{ +{ ASSERT(dragData); m_documentUnderMouse = m_page->mainFrame()->documentAtPoint(dragData->clientPosition()); if (m_isHandlingDrag) { @@ -187,13 +186,13 @@ bool DragController::performDrag(DragData* dragData) } m_documentUnderMouse = 0; return true; - } - + } + if ((m_dragDestinationAction & DragDestinationActionEdit) && concludeEditDrag(dragData)) { m_documentUnderMouse = 0; return true; } - + m_documentUnderMouse = 0; if (operationForLoad(dragData) == DragOperationNone) @@ -237,30 +236,30 @@ DragOperation DragController::dragEnteredOrUpdated(DragData* dragData) static HTMLInputElement* asFileInput(Node* node) { ASSERT(node); - + // The button for a FILE input is a sub element with no set input type // In order to get around this problem we assume any non-FILE input element // is this internal button, and try querying the shadow parent node. if (node->hasTagName(HTMLNames::inputTag) && node->isShadowNode() && static_cast(node)->inputType() != HTMLInputElement::FILE) node = node->shadowParentNode(); - + if (!node || !node->hasTagName(HTMLNames::inputTag)) return 0; - + HTMLInputElement* inputElem = static_cast(node); if (inputElem->inputType() == HTMLInputElement::FILE) return inputElem; - + return 0; } - + bool DragController::tryDocumentDrag(DragData* dragData, DragDestinationAction actionMask, DragOperation& operation) { ASSERT(dragData); - + if (!m_documentUnderMouse) return false; - + m_isHandlingDrag = false; if (actionMask & DragDestinationActionDHTML) { m_isHandlingDrag = tryDHTMLDrag(dragData, operation); @@ -289,7 +288,7 @@ bool DragController::tryDocumentDrag(DragData* dragData, DragDestinationAction a operation = DragOperationGeneric; return true; } - + IntPoint dragPos = dragData->clientPosition(); IntPoint point = frameView->windowToContents(dragPos); Element* element = m_documentUnderMouse->elementFromPoint(point.x(), point.y()); @@ -307,11 +306,11 @@ bool DragController::tryDocumentDrag(DragData* dragData, DragDestinationAction a } DragSourceAction DragController::delegateDragSourceAction(const IntPoint& windowPoint) -{ +{ m_dragSourceAction = m_client->dragSourceActionMaskForPoint(windowPoint); return m_dragSourceAction; } - + DragOperation DragController::operationForLoad(DragData* dragData) { ASSERT(dragData); @@ -336,15 +335,15 @@ bool DragController::concludeEditDrag(DragData* dragData) { ASSERT(dragData); ASSERT(!m_isHandlingDrag); - + if (!m_documentUnderMouse) return false; - + IntPoint point = m_documentUnderMouse->view()->windowToContents(dragData->clientPosition()); Element* element = m_documentUnderMouse->elementFromPoint(point.x(), point.y()); ASSERT(element); Frame* innerFrame = element->ownerDocument()->frame(); - ASSERT(innerFrame); + ASSERT(innerFrame); if (dragData->containsColor()) { Color color = dragData->asColor(); @@ -362,32 +361,32 @@ bool DragController::concludeEditDrag(DragData* dragData) innerFrame->editor()->applyStyle(style.get(), EditActionSetColor); return true; } - + if (!m_page->dragController()->canProcessDrag(dragData)) { m_page->dragCaretController()->clear(); return false; } - + if (HTMLInputElement* fileInput = asFileInput(element)) { if (!fileInput->isEnabledFormControl()) return false; - + if (!dragData->containsFiles()) return false; - + Vector filenames; dragData->asFilenames(filenames); if (filenames.isEmpty()) return false; - - // Ugly. For security none of the API's available to us to set the input value + + // Ugly. For security none of the API's available to us to set the input value // on file inputs. Even forcing a change in HTMLInputElement doesn't work as // RenderFileUploadControl clears the file when doing updateFromElement() RenderFileUploadControl* renderer = static_cast(fileInput->renderer()); - + if (!renderer) return false; - + renderer->receiveDroppedFiles(filenames); return true; } @@ -395,71 +394,70 @@ bool DragController::concludeEditDrag(DragData* dragData) VisibleSelection dragCaret(m_page->dragCaretController()->selection()); m_page->dragCaretController()->clear(); RefPtr range = dragCaret.toNormalizedRange(); - + // For range to be null a WebKit client must have done something bad while // manually controlling drag behaviour - if (!range) + if (!range) return false; DocLoader* loader = range->ownerDocument()->docLoader(); loader->setAllowStaleResources(true); - if (dragIsMove(innerFrame->selection()) || dragCaret.isContentRichlyEditable()) { + if (dragIsMove(innerFrame->selection()) || dragCaret.isContentRichlyEditable()) { bool chosePlainText = false; RefPtr fragment = documentFragmentFromDragData(dragData, range, true, chosePlainText); if (!fragment || !innerFrame->editor()->shouldInsertFragment(fragment, range, EditorInsertActionDropped)) { loader->setAllowStaleResources(false); return false; } - + m_client->willPerformDragDestinationAction(DragDestinationActionEdit, dragData); if (dragIsMove(innerFrame->selection())) { - bool smartMove = innerFrame->selectionGranularity() == WordGranularity - && innerFrame->editor()->smartInsertDeleteEnabled() + bool smartMove = innerFrame->selectionGranularity() == WordGranularity + && innerFrame->editor()->smartInsertDeleteEnabled() && dragData->canSmartReplace(); applyCommand(MoveSelectionCommand::create(fragment, dragCaret.base(), smartMove)); } else { if (setSelectionToDragCaret(innerFrame, dragCaret, range, point)) - applyCommand(ReplaceSelectionCommand::create(m_documentUnderMouse, fragment, true, dragData->canSmartReplace(), chosePlainText)); - } + applyCommand(ReplaceSelectionCommand::create(m_documentUnderMouse, fragment, true, dragData->canSmartReplace(), chosePlainText)); + } } else { String text = dragData->asPlainText(); if (text.isEmpty() || !innerFrame->editor()->shouldInsertText(text, range.get(), EditorInsertActionDropped)) { loader->setAllowStaleResources(false); return false; } - + m_client->willPerformDragDestinationAction(DragDestinationActionEdit, dragData); if (setSelectionToDragCaret(innerFrame, dragCaret, range, point)) - applyCommand(ReplaceSelectionCommand::create(m_documentUnderMouse, createFragmentFromText(range.get(), text), true, false, true)); + applyCommand(ReplaceSelectionCommand::create(m_documentUnderMouse, createFragmentFromText(range.get(), text), true, false, true)); } loader->setAllowStaleResources(false); return true; } - - -bool DragController::canProcessDrag(DragData* dragData) + +bool DragController::canProcessDrag(DragData* dragData) { ASSERT(dragData); if (!dragData->containsCompatibleContent()) return false; - + IntPoint point = m_page->mainFrame()->view()->windowToContents(dragData->clientPosition()); HitTestResult result = HitTestResult(point); if (!m_page->mainFrame()->contentRenderer()) return false; result = m_page->mainFrame()->eventHandler()->hitTestResultAtPoint(point, true); - - if (!result.innerNonSharedNode()) + + if (!result.innerNonSharedNode()) return false; - + if (dragData->containsFiles() && asFileInput(result.innerNonSharedNode())) return true; - + if (!result.innerNonSharedNode()->isContentEditable()) return false; - + if (m_didInitiateDrag && m_documentUnderMouse == m_dragInitiator && result.isSelected()) return false; @@ -482,7 +480,7 @@ static DragOperation defaultOperationForDrag(DragOperation srcOpMask) } bool DragController::tryDHTMLDrag(DragData* dragData, DragOperation& operation) -{ +{ ASSERT(dragData); ASSERT(m_documentUnderMouse); RefPtr mainFrame = m_page->mainFrame(); @@ -525,7 +523,7 @@ bool DragController::mayStartDragAtEventLocation(const Frame* frame, const IntPo mouseDownTarget = frame->eventHandler()->hitTestResultAtPoint(framePos, true); - if (mouseDownTarget.image() + if (mouseDownTarget.image() && !mouseDownTarget.absoluteImageURL().isEmpty() && frame->settings()->loadsImagesAutomatically() && m_dragSourceAction & DragSourceActionImage) @@ -543,56 +541,56 @@ bool DragController::mayStartDragAtEventLocation(const Frame* frame, const IntPo return false; } - + static CachedImage* getCachedImage(Element* element) { ASSERT(element); RenderObject* renderer = element->renderer(); - if (!renderer || !renderer->isImage()) + if (!renderer || !renderer->isImage()) return 0; RenderImage* image = toRenderImage(renderer); return image->cachedImage(); } - + static Image* getImage(Element* element) { ASSERT(element); RenderObject* renderer = element->renderer(); - if (!renderer || !renderer->isImage()) + if (!renderer || !renderer->isImage()) return 0; - + RenderImage* image = toRenderImage(renderer); if (image->cachedImage() && !image->cachedImage()->errorOccurred()) return image->cachedImage()->image(); return 0; } - + static void prepareClipboardForImageDrag(Frame* src, Clipboard* clipboard, Element* node, const KURL& linkURL, const KURL& imageURL, const String& label) { RefPtr range = src->document()->createRange(); ExceptionCode ec = 0; range->selectNode(node, ec); - ASSERT(ec == 0); - src->selection()->setSelection(VisibleSelection(range.get(), DOWNSTREAM)); + ASSERT(!ec); + src->selection()->setSelection(VisibleSelection(range.get(), DOWNSTREAM)); clipboard->declareAndWriteDragImage(node, !linkURL.isEmpty() ? linkURL : imageURL, label, src); } - + static IntPoint dragLocForDHTMLDrag(const IntPoint& mouseDraggedPoint, const IntPoint& dragOrigin, const IntPoint& dragImageOffset, bool isLinkImage) { // dragImageOffset is the cursor position relative to the lower-left corner of the image. -#if PLATFORM(MAC) - // We add in the Y dimension because we are a flipped view, so adding moves the image down. +#if PLATFORM(MAC) + // We add in the Y dimension because we are a flipped view, so adding moves the image down. const int yOffset = dragImageOffset.y(); #else const int yOffset = -dragImageOffset.y(); #endif - + if (isLinkImage) return IntPoint(mouseDraggedPoint.x() - dragImageOffset.x(), mouseDraggedPoint.y() + yOffset); - + return IntPoint(dragOrigin.x() - dragImageOffset.x(), dragOrigin.y() + yOffset); } - + static IntPoint dragLocForSelectionDrag(Frame* src) { IntRect draggingRect = enclosingIntRect(src->selectionBounds()); @@ -607,63 +605,63 @@ static IntPoint dragLocForSelectionDrag(Frame* src) #endif return IntPoint(xpos, ypos); } - + bool DragController::startDrag(Frame* src, Clipboard* clipboard, DragOperation srcOp, const PlatformMouseEvent& dragEvent, const IntPoint& dragOrigin, bool isDHTMLDrag) -{ +{ ASSERT(src); ASSERT(clipboard); - + if (!src->view() || !src->contentRenderer()) return false; - + HitTestResult dragSource = HitTestResult(dragOrigin); dragSource = src->eventHandler()->hitTestResultAtPoint(dragOrigin, true); KURL linkURL = dragSource.absoluteLinkURL(); KURL imageURL = dragSource.absoluteImageURL(); bool isSelected = dragSource.isSelected(); - + IntPoint mouseDraggedPoint = src->view()->windowToContents(dragEvent.pos()); - + m_draggingImageURL = KURL(); m_sourceDragOperation = srcOp; - + DragImageRef dragImage = 0; IntPoint dragLoc(0, 0); IntPoint dragImageOffset(0, 0); - - if (isDHTMLDrag) + + if (isDHTMLDrag) dragImage = clipboard->createDragImage(dragImageOffset); - + // We allow DHTML/JS to set the drag image, even if its a link, image or text we're dragging. // This is in the spirit of the IE API, which allows overriding of pasteboard data and DragOp. if (dragImage) { dragLoc = dragLocForDHTMLDrag(mouseDraggedPoint, dragOrigin, dragImageOffset, !linkURL.isEmpty()); m_dragOffset = dragImageOffset; } - + bool startedDrag = true; // optimism - we almost always manage to start the drag - + Node* node = dragSource.innerNonSharedNode(); - + Image* image = getImage(static_cast(node)); if (!imageURL.isEmpty() && node && node->isElementNode() && image && (m_dragSourceAction & DragSourceActionImage)) { - // We shouldn't be starting a drag for an image that can't provide an extension. + // We shouldn't be starting a drag for an image that can't provide an extension. // This is an early detection for problems encountered later upon drop. ASSERT(!image->filenameExtension().isEmpty()); Element* element = static_cast(node); if (!clipboard->hasData()) { - m_draggingImageURL = imageURL; + m_draggingImageURL = imageURL; prepareClipboardForImageDrag(src, clipboard, element, linkURL, imageURL, dragSource.altDisplayString()); } - + m_client->willPerformDragSourceAction(DragSourceActionImage, dragOrigin, clipboard); - + if (!dragImage) { IntRect imageRect = dragSource.imageRect(); imageRect.setLocation(m_page->mainFrame()->view()->windowToContents(src->view()->contentsToWindow(imageRect.location()))); doImageDrag(element, dragOrigin, dragSource.imageRect(), clipboard, src, m_dragOffset); - } else + } else // DHTML defined drag image doSystemDrag(dragImage, dragLoc, dragOrigin, clipboard, src, false); @@ -689,12 +687,12 @@ bool DragController::startDrag(Frame* src, Clipboard* clipboard, DragOperation s IntSize size = dragImageSize(dragImage); m_dragOffset = IntPoint(-size.width() / 2, -LinkDragBorderInset); dragLoc = IntPoint(mouseDraggedPoint.x() + m_dragOffset.x(), mouseDraggedPoint.y() + m_dragOffset.y()); - } + } doSystemDrag(dragImage, dragLoc, mouseDraggedPoint, clipboard, src, true); } else if (isSelected && (m_dragSourceAction & DragSourceActionSelection)) { RefPtr selectionRange = src->selection()->toNormalizedRange(); ASSERT(selectionRange); - if (!clipboard->hasData()) + if (!clipboard->hasData()) clipboard->writeRange(selectionRange.get(), src); m_client->willPerformDragSourceAction(DragSourceActionSelection, dragOrigin, clipboard); if (!dragImage) { @@ -712,7 +710,7 @@ bool DragController::startDrag(Frame* src, Clipboard* clipboard, DragOperation s // under the mousedown point, so linkURL, imageURL and isSelected are all false/empty. startedDrag = false; } - + if (dragImage) deleteDragImage(dragImage); return startedDrag; @@ -723,17 +721,17 @@ void DragController::doImageDrag(Element* element, const IntPoint& dragOrigin, c IntPoint mouseDownPoint = dragOrigin; DragImageRef dragImage; IntPoint origin; - + Image* image = getImage(element); if (image && image->size().height() * image->size().width() <= MaxOriginalImageArea && (dragImage = createDragImageFromImage(image))) { IntSize originalSize = rect.size(); origin = rect.location(); - + dragImage = fitDragImageToMaxSize(dragImage, rect.size(), maxDragImageSize()); dragImage = dissolveDragImageToFraction(dragImage, DragImageAlpha); IntSize newSize = dragImageSize(dragImage); - + // Properly orient the drag image and orient it differently if it's smaller than the original float scale = newSize.width() / (float)originalSize.width(); float dx = origin.x() - mouseDownPoint.x(); @@ -751,14 +749,14 @@ void DragController::doImageDrag(Element* element, const IntPoint& dragOrigin, c if (dragImage) origin = IntPoint(DragIconRightInset - dragImageSize(dragImage).width(), DragIconBottomInset); } - + dragImageOffset.setX(mouseDownPoint.x() + origin.x()); dragImageOffset.setY(mouseDownPoint.y() + origin.y()); doSystemDrag(dragImage, dragImageOffset, dragOrigin, clipboard, frame, false); - + deleteDragImage(dragImage); } - + void DragController::doSystemDrag(DragImageRef image, const IntPoint& dragLoc, const IntPoint& eventPos, Clipboard* clipboard, Frame* frame, bool forLink) { m_didInitiateDrag = true; @@ -768,10 +766,10 @@ void DragController::doSystemDrag(DragImageRef image, const IntPoint& dragLoc, c RefPtr viewProtector = frameProtector->view(); m_client->startDrag(image, viewProtector->windowToContents(frame->view()->contentsToWindow(dragLoc)), viewProtector->windowToContents(frame->view()->contentsToWindow(eventPos)), clipboard, frameProtector.get(), forLink); - + cleanupAfterSystemDrag(); } - + // Manual drag caret manipulation void DragController::placeDragCaret(const IntPoint& windowPoint) { @@ -783,8 +781,8 @@ void DragController::placeDragCaret(const IntPoint& windowPoint) if (!frameView) return; IntPoint framePoint = frameView->windowToContents(windowPoint); - VisibleSelection dragCaret(frame->visiblePositionForPoint(framePoint)); + VisibleSelection dragCaret(frame->visiblePositionForPoint(framePoint)); m_page->dragCaretController()->setSelection(dragCaret); } - + } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/page/EventHandler.cpp b/src/3rdparty/webkit/WebCore/page/EventHandler.cpp index 3f0296ec1..547485c29 100644 --- a/src/3rdparty/webkit/WebCore/page/EventHandler.cpp +++ b/src/3rdparty/webkit/WebCore/page/EventHandler.cpp @@ -141,6 +141,8 @@ EventHandler::EventHandler(Frame* frame) , m_mouseDownWasSingleClickInSelection(false) , m_beganSelectingText(false) , m_panScrollInProgress(false) + , m_panScrollButtonPressed(false) + , m_springLoadedPanScrollInProgress(false) , m_hoverTimer(this, &EventHandler::hoverTimerFired) , m_autoscrollTimer(this, &EventHandler::autoscrollTimerFired) , m_autoscrollRenderer(0) @@ -346,6 +348,11 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve // Reset drag state. dragState().m_dragSrc = 0; + if (ScrollView* scrollView = m_frame->view()) { + if (scrollView->isPointInScrollbarCorner(event.event().pos())) + return false; + } + bool singleClick = event.event().clickCount() <= 1; // If we got the event back, that must mean it wasn't prevented, @@ -650,7 +657,7 @@ void EventHandler::autoscrollTimerFired(Timer*) } } #if ENABLE(PAN_SCROLLING) - setPanScrollCursor(); + updatePanScrollState(); toRenderBox(r)->panScroll(m_panScrollStartPos); #endif } @@ -658,7 +665,7 @@ void EventHandler::autoscrollTimerFired(Timer*) #if ENABLE(PAN_SCROLLING) -void EventHandler::setPanScrollCursor() +void EventHandler::updatePanScrollState() { FrameView* view = m_frame->view(); if (!view) @@ -671,6 +678,9 @@ void EventHandler::setPanScrollCursor() bool north = m_panScrollStartPos.y() > (m_currentMousePosition.y() + ScrollView::noPanScrollRadius); bool south = m_panScrollStartPos.y() < (m_currentMousePosition.y() - ScrollView::noPanScrollRadius); + if ((east || west || north || south) && m_panScrollButtonPressed) + m_springLoadedPanScrollInProgress = true; + if (north) { if (east) view->setCursor(northEastPanningCursor()); @@ -831,6 +841,7 @@ void EventHandler::stopAutoscrollTimer(bool rendererIsBeingDestroyed) m_autoscrollTimer.stop(); m_panScrollInProgress = false; + m_springLoadedPanScrollInProgress = false; // If we're not in the top frame we notify it that we are not doing a panScroll any more. if (Page* page = m_frame->page()) { @@ -1158,6 +1169,7 @@ bool EventHandler::handleMousePressEvent(const PlatformMouseEvent& mouseEvent) if (renderer) { m_panScrollInProgress = true; + m_panScrollButtonPressed = true; handleAutoscroll(renderer); invalidateClick(); return true; @@ -1195,8 +1207,12 @@ bool EventHandler::handleMousePressEvent(const PlatformMouseEvent& mouseEvent) if (swallowEvent) { // scrollbars should get events anyway, even disabled controls might be scrollable - if (mev.scrollbar()) - passMousePressEventToScrollbar(mev, mev.scrollbar()); + Scrollbar* scrollbar = mev.scrollbar(); + + updateLastScrollbarUnderMouse(scrollbar, true); + + if (scrollbar) + passMousePressEventToScrollbar(mev, scrollbar); } else { // Refetch the event target node if it currently is the shadow node inside an element. // If a mouse event handler changes the input element type to one that has a widget associated, @@ -1211,6 +1227,9 @@ bool EventHandler::handleMousePressEvent(const PlatformMouseEvent& mouseEvent) Scrollbar* scrollbar = view ? view->scrollbarAtPoint(mouseEvent.pos()) : 0; if (!scrollbar) scrollbar = mev.scrollbar(); + + updateLastScrollbarUnderMouse(scrollbar, true); + if (scrollbar && passMousePressEventToScrollbar(mev, scrollbar)) swallowEvent = true; else @@ -1327,12 +1346,7 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& mouseEvent, Hi if (!scrollbar) scrollbar = mev.scrollbar(); - if (m_lastScrollbarUnderMouse != scrollbar) { - // Send mouse exited to the old scrollbar. - if (m_lastScrollbarUnderMouse) - m_lastScrollbarUnderMouse->mouseExited(); - m_lastScrollbarUnderMouse = m_mousePressed ? 0 : scrollbar; - } + updateLastScrollbarUnderMouse(scrollbar, !m_mousePressed); } bool swallowEvent = false; @@ -1383,6 +1397,13 @@ bool EventHandler::handleMouseReleaseEvent(const PlatformMouseEvent& mouseEvent) { RefPtr protector(m_frame->view()); +#if ENABLE(PAN_SCROLLING) + if (mouseEvent.button() == MiddleButton) + m_panScrollButtonPressed = false; + if (m_springLoadedPanScrollInProgress) + stopAutoscrollTimer(); +#endif + m_mousePressed = false; m_currentMousePosition = mouseEvent.pos(); @@ -2422,4 +2443,16 @@ bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults& return scrollbar->mouseDown(mev.event()); } +// If scrollbar (under mouse) is different from last, send a mouse exited. Set +// last to scrollbar if setLast is true; else set last to 0. +void EventHandler::updateLastScrollbarUnderMouse(Scrollbar* scrollbar, bool setLast) +{ + if (m_lastScrollbarUnderMouse != scrollbar) { + // Send mouse exited to the old scrollbar. + if (m_lastScrollbarUnderMouse) + m_lastScrollbarUnderMouse->mouseExited(); + m_lastScrollbarUnderMouse = setLast ? scrollbar : 0; + } +} + } diff --git a/src/3rdparty/webkit/WebCore/page/EventHandler.h b/src/3rdparty/webkit/WebCore/page/EventHandler.h index d5c0b972f..409913a90 100644 --- a/src/3rdparty/webkit/WebCore/page/EventHandler.h +++ b/src/3rdparty/webkit/WebCore/page/EventHandler.h @@ -69,7 +69,7 @@ extern const int GeneralDragHysteresis; enum HitTestScrollbars { ShouldHitTestScrollbars, DontHitTestScrollbars }; -class EventHandler : Noncopyable { +class EventHandler : public Noncopyable { public: EventHandler(Frame*); ~EventHandler(); @@ -207,7 +207,7 @@ private: Cursor selectCursor(const MouseEventWithHitTestResults&, Scrollbar*); #if ENABLE(PAN_SCROLLING) - void setPanScrollCursor(); + void updatePanScrollState(); #endif void hoverTimerFired(Timer*); @@ -271,6 +271,8 @@ private: void updateSelectionForMouseDrag(Node* targetNode, const IntPoint& localPoint); + void updateLastScrollbarUnderMouse(Scrollbar*, bool); + bool capturesDragging() const { return m_capturesDragging; } #if PLATFORM(MAC) && defined(__OBJC__) @@ -295,6 +297,9 @@ private: IntPoint m_panScrollStartPos; bool m_panScrollInProgress; + bool m_panScrollButtonPressed; + bool m_springLoadedPanScrollInProgress; + Timer m_hoverTimer; Timer m_autoscrollTimer; diff --git a/src/3rdparty/webkit/WebCore/page/Frame.cpp b/src/3rdparty/webkit/WebCore/page/Frame.cpp index 870bd2ae4..2d6a7950e 100644 --- a/src/3rdparty/webkit/WebCore/page/Frame.cpp +++ b/src/3rdparty/webkit/WebCore/page/Frame.cpp @@ -42,21 +42,20 @@ #include "EditingText.h" #include "EditorClient.h" #include "EventNames.h" -#include "FocusController.h" #include "FloatQuad.h" +#include "FocusController.h" #include "FrameLoader.h" #include "FrameLoaderClient.h" #include "FrameView.h" #include "GraphicsContext.h" #include "HTMLDocument.h" +#include "HTMLFormControlElement.h" #include "HTMLFormElement.h" #include "HTMLFrameElementBase.h" -#include "HTMLFormControlElement.h" #include "HTMLNames.h" #include "HTMLTableCellElement.h" #include "HitTestResult.h" #include "Logging.h" -#include "markup.h" #include "MediaFeatureNames.h" #include "Navigator.h" #include "NodeList.h" @@ -67,12 +66,13 @@ #include "RenderTextControl.h" #include "RenderTheme.h" #include "RenderView.h" +#include "ScriptController.h" #include "Settings.h" #include "TextIterator.h" #include "TextResourceDecoder.h" #include "XMLNames.h" -#include "ScriptController.h" #include "htmlediting.h" +#include "markup.h" #include "npruntime_impl.h" #include "visible_units.h" #include @@ -104,7 +104,7 @@ namespace WebCore { using namespace HTMLNames; -#ifndef NDEBUG +#ifndef NDEBUG static WTF::RefCountedLeakCounter frameCounter("Frame"); #endif @@ -115,7 +115,7 @@ static inline Frame* parentFromOwnerElement(HTMLFrameOwnerElement* ownerElement) return ownerElement->document()->frame(); } -Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* frameLoaderClient) +Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* frameLoaderClient) : m_page(page) , m_treeNode(this, parentFromOwnerElement(ownerElement)) , m_loader(this, frameLoaderClient) @@ -163,7 +163,7 @@ Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* else { page->incrementFrameCount(); // Make sure we will not end up with two frames referencing the same owner element. - ASSERT((!(ownerElement->m_contentFrame)) || (ownerElement->m_contentFrame->ownerElement() != ownerElement)); + ASSERT((!(ownerElement->m_contentFrame)) || (ownerElement->m_contentFrame->ownerElement() != ownerElement)); ownerElement->m_contentFrame = this; } @@ -176,7 +176,7 @@ Frame::~Frame() { setView(0); loader()->cancelAndClear(); - + // FIXME: We should not be doing all this work inside the destructor ASSERT(!m_lifeSupportTimer.isActive()); @@ -186,14 +186,14 @@ Frame::~Frame() #endif disconnectOwnerElement(); - + if (m_domWindow) m_domWindow->disconnectFrame(); HashSet::iterator end = m_liveFormerWindows.end(); for (HashSet::iterator it = m_liveFormerWindows.begin(); it != end; ++it) (*it)->disconnectFrame(); - + if (m_view) { m_view->hide(); m_view->clearFrame(); @@ -262,7 +262,7 @@ void Frame::setDocument(PassRefPtr newDoc) m_doc = newDoc; if (m_doc && selection()->isFocusedAndActive()) setUseSecureKeyboardEntry(m_doc->useSecureKeyboardEntryWhenActive()); - + if (m_doc && !m_doc->attached()) m_doc->attach(); @@ -307,14 +307,14 @@ IntRect Frame::firstRectForRange(Range* range) const if (startCaretRect.y() == endCaretRect.y()) { // start and end are on the same line - return IntRect(min(startCaretRect.x(), endCaretRect.x()), - startCaretRect.y(), + return IntRect(min(startCaretRect.x(), endCaretRect.x()), + startCaretRect.y(), abs(endCaretRect.x() - startCaretRect.x()), max(startCaretRect.height(), endCaretRect.height())); } - + // start and end aren't on the same line, so go from start to the end of its line - return IntRect(startCaretRect.x(), + return IntRect(startCaretRect.x(), startCaretRect.y(), startCaretRect.width() + extraWidthToEndOfLine, startCaretRect.height()); @@ -365,23 +365,21 @@ static RegularExpression* createRegExpForLabels(const Vector& labels) bool startsWithWordChar = false; bool endsWithWordChar = false; - if (label.length() != 0) { + if (label.length()) { startsWithWordChar = wordRegExp.match(label.substring(0, 1)) >= 0; endsWithWordChar = wordRegExp.match(label.substring(label.length() - 1, 1)) >= 0; } - - if (i != 0) + + if (i) pattern.append("|"); // Search for word boundaries only if label starts/ends with "word characters". // If we always searched for word boundaries, this wouldn't work for languages // such as Japanese. - if (startsWithWordChar) { + if (startsWithWordChar) pattern.append("\\b"); - } pattern.append(label); - if (endsWithWordChar) { + if (endsWithWordChar) pattern.append("\\b"); - } } pattern.append(")"); return new RegularExpression(pattern, TextCaseInsensitive); @@ -462,9 +460,8 @@ String Frame::searchForLabelsBeforeElement(const Vector& labels, Element // If we started in a cell, but bailed because we found the start of the form or the // previous element, we still might need to search the row above us for a label. - if (startingTableCell && !searchedCellAbove) { + if (startingTableCell && !searchedCellAbove) return searchForLabelsAboveCell(regExp.get(), startingTableCell); - } return String(); } @@ -477,7 +474,7 @@ String Frame::matchLabelsAgainstElement(const Vector& labels, Element* e // Make numbers and _'s in field names behave like word boundaries, e.g., "address2" replace(name, RegularExpression("\\d", TextCaseSensitive), " "); name.replace('_', ' '); - + OwnPtr regExp(createRegExpForLabels(labels)); // Use the largest match we can find in the whole name string int pos; @@ -640,7 +637,7 @@ void Frame::selectionLayoutChanged() return; VisibleSelection selection = this->selection()->selection(); - + if (!selection.isRange()) view->clearSelection(); else { @@ -654,7 +651,7 @@ void Frame::selectionLayoutChanged() Position endPos = selection.end(); if (endPos.upstream().isCandidate()) endPos = endPos.upstream(); - + // We can get into a state where the selection endpoints map to the same VisiblePosition when a selection is deleted // because we don't yet notify the SelectionController of text removal. if (startPos.isNotNull() && endPos.isNotNull() && selection.visibleStart() != selection.visibleEnd()) { @@ -729,12 +726,12 @@ bool Frame::shouldApplyPageZoom() const } void Frame::setZoomFactor(float percent, bool isTextOnly) -{ +{ if (m_zoomFactor == percent && isZoomFactorTextOnly() == isTextOnly) return; #if ENABLE(SVG) - // SVG doesn't care if the zoom factor is text only. It will always apply a + // SVG doesn't care if the zoom factor is text only. It will always apply a // zoom to the whole SVG. if (m_doc->isSVGDocument()) { if (!static_cast(m_doc.get())->zoomAndPanEnabled()) @@ -827,7 +824,7 @@ void Frame::reapplyStyles() // FIXME: This call doesn't really make sense in a function called reapplyStyles. // We should probably eventually move it into its own function. m_doc->docLoader()->setAutoLoadImages(m_page && m_page->settings()->loadsImagesAutomatically()); - + #if FRAME_LOADS_USER_STYLESHEET const KURL userStyleSheetLocation = m_page ? m_page->settings()->userStyleSheetLocation() : KURL(); if (!userStyleSheetLocation.isEmpty()) @@ -859,7 +856,7 @@ bool Frame::shouldDeleteSelection(const VisibleSelection& selection) const return editor()->client()->shouldDeleteRange(selection.toNormalizedRange().get()); } -bool Frame::isContentEditable() const +bool Frame::isContentEditable() const { if (m_editor.clientIsEditable()) return true; @@ -897,7 +894,7 @@ void Frame::clearTypingStyle() void Frame::computeAndSetTypingStyle(CSSStyleDeclaration *style, EditAction editingAction) { - if (!style || style->length() == 0) { + if (!style || !style->length()) { clearTypingStyle(); return; } @@ -933,7 +930,7 @@ void Frame::computeAndSetTypingStyle(CSSStyleDeclaration *style, EditAction edit blockStyle->diff(mutableStyle.get()); if (blockStyle->length() > 0) applyCommand(ApplyStyleCommand::create(document(), blockStyle.get(), editingAction)); - + // Set the remaining style as the typing style. m_typingStyle = mutableStyle.release(); } @@ -950,7 +947,7 @@ String Frame::selectionStartStylePropertyValue(int stylePropertyID) const if (nodeToRemove) { ExceptionCode ec = 0; nodeToRemove->remove(ec); - ASSERT(ec == 0); + ASSERT(!ec); } return value; @@ -969,7 +966,7 @@ PassRefPtr Frame::selectionComputedStyle(Node*& nod Element *elem = pos.element(); if (!elem) return 0; - + RefPtr styleElement = elem; ExceptionCode ec = 0; @@ -977,10 +974,10 @@ PassRefPtr Frame::selectionComputedStyle(Node*& nod styleElement = document()->createElement(spanTag, false); styleElement->setAttribute(styleAttr, m_typingStyle->cssText().impl(), ec); - ASSERT(ec == 0); - + ASSERT(!ec); + styleElement->appendChild(document()->createEditingTextNode(""), ec); - ASSERT(ec == 0); + ASSERT(!ec); if (elem->renderer() && elem->renderer()->canHaveChildren()) { elem->appendChild(styleElement, ec); @@ -988,13 +985,12 @@ PassRefPtr Frame::selectionComputedStyle(Node*& nod Node *parent = elem->parent(); Node *next = elem->nextSibling(); - if (next) { + if (next) parent->insertBefore(styleElement, next, ec); - } else { + else parent->appendChild(styleElement, ec); - } } - ASSERT(ec == 0); + ASSERT(!ec); nodeToRemove = styleElement.get(); } @@ -1044,18 +1040,16 @@ void Frame::applyEditingStyleToBodyElement() const { RefPtr list = m_doc->getElementsByTagName("body"); unsigned len = list->length(); - for (unsigned i = 0; i < len; i++) { - applyEditingStyleToElement(static_cast(list->item(i))); - } + for (unsigned i = 0; i < len; i++) + applyEditingStyleToElement(static_cast(list->item(i))); } void Frame::removeEditingStyleFromBodyElement() const { RefPtr list = m_doc->getElementsByTagName("body"); unsigned len = list->length(); - for (unsigned i = 0; i < len; i++) { - removeEditingStyleFromElement(static_cast(list->item(i))); - } + for (unsigned i = 0; i < len; i++) + removeEditingStyleFromElement(static_cast(list->item(i))); } void Frame::applyEditingStyleToElement(Element* element) const @@ -1068,11 +1062,11 @@ void Frame::applyEditingStyleToElement(Element* element) const ExceptionCode ec = 0; style->setProperty(CSSPropertyWordWrap, "break-word", false, ec); - ASSERT(ec == 0); + ASSERT(!ec); style->setProperty(CSSPropertyWebkitNbspMode, "space", false, ec); - ASSERT(ec == 0); + ASSERT(!ec); style->setProperty(CSSPropertyWebkitLineBreak, "after-white-space", false, ec); - ASSERT(ec == 0); + ASSERT(!ec); } void Frame::removeEditingStyleFromElement(Element*) const @@ -1189,7 +1183,7 @@ FloatRect Frame::selectionBounds(bool clipToVisibleContent) const FrameView* view = m_view.get(); if (!root || !view) return IntRect(); - + IntRect selectionRect = root->selectionBounds(clipToVisibleContent); return clipToVisibleContent ? intersection(selectionRect, view->visibleContentRect()) : selectionRect; } @@ -1240,7 +1234,7 @@ HTMLFormElement *Frame::currentForm() const Node *start = m_doc ? m_doc->focusedNode() : 0; if (!start) start = selection()->start().node(); - + // try walking up the node tree to find a form element Node *n; for (n = start; n; n = n->parentNode()) { @@ -1249,7 +1243,7 @@ HTMLFormElement *Frame::currentForm() const else if (n->isHTMLElement() && static_cast(n)->isFormControlElement()) return static_cast(n)->form(); } - + // try walking forward in the node tree to find a form element return start ? scanForForm(start) : 0; } @@ -1259,21 +1253,21 @@ void Frame::revealSelection(const ScrollAlignment& alignment, bool revealExtent) IntRect rect; switch (selection()->selectionType()) { - case VisibleSelection::NoSelection: - return; - case VisibleSelection::CaretSelection: - rect = selection()->absoluteCaretBounds(); - break; - case VisibleSelection::RangeSelection: - rect = revealExtent ? VisiblePosition(selection()->extent()).absoluteCaretBounds() : enclosingIntRect(selectionBounds(false)); - break; + case VisibleSelection::NoSelection: + return; + case VisibleSelection::CaretSelection: + rect = selection()->absoluteCaretBounds(); + break; + case VisibleSelection::RangeSelection: + rect = revealExtent ? VisiblePosition(selection()->extent()).absoluteCaretBounds() : enclosingIntRect(selectionBounds(false)); + break; } Position start = selection()->start(); ASSERT(start.node()); if (start.node() && start.node()->renderer()) { // FIXME: This code only handles scrolling the startContainer's layer, but - // the selection rect could intersect more than just that. + // the selection rect could intersect more than just that. // See . if (RenderLayer* layer = start.node()->renderer()->enclosingLayer()) layer->scrollRectToVisible(rect, false, alignment, alignment); @@ -1313,46 +1307,46 @@ void Frame::clearTimers() RenderStyle *Frame::styleForSelectionStart(Node *&nodeToRemove) const { nodeToRemove = 0; - + if (selection()->isNone()) return 0; - + Position pos = selection()->selection().visibleStart().deepEquivalent(); if (!pos.isCandidate()) return 0; Node *node = pos.node(); if (!node) return 0; - + if (!m_typingStyle) return node->renderer()->style(); - + RefPtr styleElement = document()->createElement(spanTag, false); - + ExceptionCode ec = 0; String styleText = m_typingStyle->cssText() + " display: inline"; styleElement->setAttribute(styleAttr, styleText.impl(), ec); - ASSERT(ec == 0); - + ASSERT(!ec); + styleElement->appendChild(document()->createEditingTextNode(""), ec); - ASSERT(ec == 0); - + ASSERT(!ec); + node->parentNode()->appendChild(styleElement, ec); - ASSERT(ec == 0); - - nodeToRemove = styleElement.get(); + ASSERT(!ec); + + nodeToRemove = styleElement.get(); return styleElement->renderer() ? styleElement->renderer()->style() : 0; } void Frame::setSelectionFromNone() { - // Put a caret inside the body if the entire frame is editable (either the + // Put a caret inside the body if the entire frame is editable (either the // entire WebView is editable or designMode is on for this document). Document *doc = document(); bool caretBrowsing = settings() && settings()->caretBrowsingEnabled(); if (!selection()->isNone() || !(isContentEditable() || caretBrowsing)) return; - + Node* node = doc->documentElement(); while (node && !node->hasTagName(bodyTag)) node = node->traverseNextNode(); @@ -1375,10 +1369,10 @@ bool Frame::findString(const String& target, bool forward, bool caseFlag, bool w { if (target.isEmpty()) return false; - + if (excludeFromTextSearch()) return false; - + // Start from an edge of the selection, if there's a selection that's not in shadow content. Which edge // is used depends on whether we're searching forward or backward, and whether startInSelection is set. RefPtr searchRange(rangeOfContents(document())); @@ -1419,7 +1413,7 @@ bool Frame::findString(const String& target, bool forward, bool caseFlag, bool w resultRange = findPlainText(searchRange.get(), target, forward, caseFlag); } - + ExceptionCode exception = 0; // If nothing was found in the shadow tree, search in main content following the shadow tree. @@ -1432,7 +1426,7 @@ bool Frame::findString(const String& target, bool forward, bool caseFlag, bool w resultRange = findPlainText(searchRange.get(), target, forward, caseFlag); } - + if (!editor()->insideVisibleArea(resultRange.get())) { resultRange = editor()->nextVisibleRange(resultRange.get(), target, forward, caseFlag, wrapFlag); if (!resultRange) @@ -1461,9 +1455,9 @@ unsigned Frame::markAllMatchesForText(const String& target, bool caseFlag, unsig { if (target.isEmpty()) return 0; - + RefPtr searchRange(rangeOfContents(document())); - + ExceptionCode exception = 0; unsigned matchCount = 0; do { @@ -1476,7 +1470,7 @@ unsigned Frame::markAllMatchesForText(const String& target, bool caseFlag, unsig searchRange->setStartAfter(resultRange->startContainer()->shadowAncestorNode(), exception); continue; } - + // A non-collapsed result range can in some funky whitespace cases still not // advance the range's start position (4509328). Break to avoid infinite loop. VisiblePosition newStart = endVisiblePosition(resultRange.get(), DOWNSTREAM); @@ -1488,18 +1482,18 @@ unsigned Frame::markAllMatchesForText(const String& target, bool caseFlag, unsig ++matchCount; document()->addMarker(resultRange.get(), DocumentMarker::TextMatch); } - + // Stop looking if we hit the specified limit. A limit of 0 means no limit. if (limit > 0 && matchCount >= limit) break; - + setStart(searchRange.get(), newStart); Node* shadowTreeRoot = searchRange->shadowTreeRootNode(); if (searchRange->collapsed(exception) && shadowTreeRoot) searchRange->setEnd(shadowTreeRoot, shadowTreeRoot->childNodeCount(), exception); } while (true); - - // Do a "fake" paint in order to execute the code that computes the rendered rect for + + // Do a "fake" paint in order to execute the code that computes the rendered rect for // each text match. Document* doc = document(); if (m_view && contentRenderer()) { @@ -1511,7 +1505,7 @@ unsigned Frame::markAllMatchesForText(const String& target, bool caseFlag, unsig m_view->paintContents(&context, visibleRect); } } - + return matchCount; } @@ -1524,7 +1518,7 @@ void Frame::setMarkedTextMatchesAreHighlighted(bool flag) { if (flag == m_highlightTextMatches) return; - + m_highlightTextMatches = flag; document()->repaintMarkers(DocumentMarker::TextMatch); } @@ -1553,7 +1547,7 @@ DOMWindow* Frame::domWindow() const void Frame::clearFormerDOMWindow(DOMWindow* window) { - m_liveFormerWindows.remove(window); + m_liveFormerWindows.remove(window); } Page* Frame::page() const @@ -1619,7 +1613,7 @@ void Frame::unfocusWindow() { if (!page()) return; - + // If we're a top level window, deactivate the window. if (!tree()->parent()) page()->chrome()->unfocus(); @@ -1680,14 +1674,13 @@ void Frame::respondToChangedSelection(const VisibleSelection& oldSelection, bool // oldSelection may no longer be in the document. if (closeTyping && oldSelection.isContentEditable() && oldSelection.start().node() && oldSelection.start().node()->inDocument()) { VisiblePosition oldStart(oldSelection.visibleStart()); - VisibleSelection oldAdjacentWords = VisibleSelection(startOfWord(oldStart, LeftWordIfOnBoundary), endOfWord(oldStart, RightWordIfOnBoundary)); + VisibleSelection oldAdjacentWords = VisibleSelection(startOfWord(oldStart, LeftWordIfOnBoundary), endOfWord(oldStart, RightWordIfOnBoundary)); if (oldAdjacentWords != newAdjacentWords) { if (isContinuousGrammarCheckingEnabled) { VisibleSelection oldSelectedSentence = VisibleSelection(startOfSentence(oldStart), endOfSentence(oldStart)); editor()->markMisspellingsAndBadGrammar(oldAdjacentWords, oldSelectedSentence != newSelectedSentence, oldSelectedSentence); - } else { + } else editor()->markMisspellingsAndBadGrammar(oldAdjacentWords, false, oldAdjacentWords); - } } } @@ -1722,15 +1715,15 @@ VisiblePosition Frame::visiblePositionForPoint(const IntPoint& framePoint) visiblePos = VisiblePosition(Position(node, 0)); return visiblePos; } - + Document* Frame::documentAtPoint(const IntPoint& point) -{ - if (!view()) +{ + if (!view()) return 0; - + IntPoint pt = view()->windowToContents(point); HitTestResult result = HitTestResult(pt); - + if (contentRenderer()) result = eventHandler()->hitTestResultAtPoint(pt, false); return result.innerNode() ? result.innerNode()->document() : 0; diff --git a/src/3rdparty/webkit/WebCore/page/Frame.h b/src/3rdparty/webkit/WebCore/page/Frame.h index 0a44a6d15..652269a18 100644 --- a/src/3rdparty/webkit/WebCore/page/Frame.h +++ b/src/3rdparty/webkit/WebCore/page/Frame.h @@ -37,8 +37,8 @@ #include "FrameLoader.h" #include "FrameTree.h" #include "Range.h" -#include "ScrollBehavior.h" #include "ScriptController.h" +#include "ScrollBehavior.h" #include "SelectionController.h" #include "TextGranularity.h" @@ -62,315 +62,315 @@ typedef struct HBITMAP__* HBITMAP; namespace WebCore { -class CSSMutableStyleDeclaration; -class Editor; -class EventHandler; -class FrameLoader; -class FrameLoaderClient; -class FrameTree; -class FrameView; -class HTMLFrameOwnerElement; -class HTMLTableCellElement; -class RegularExpression; -class RenderPart; -class ScriptController; -class SelectionController; -class Settings; -class VisibleSelection; -class Widget; + class CSSMutableStyleDeclaration; + class Editor; + class EventHandler; + class FrameLoader; + class FrameLoaderClient; + class FrameTree; + class FrameView; + class HTMLFrameOwnerElement; + class HTMLTableCellElement; + class RegularExpression; + class RenderPart; + class ScriptController; + class SelectionController; + class Settings; + class VisibleSelection; + class Widget; #if FRAME_LOADS_USER_STYLESHEET class UserStyleSheetLoader; #endif -template class Timer; + template class Timer; -class Frame : public RefCounted { -public: - static PassRefPtr create(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* client) - { - return adoptRef(new Frame(page, ownerElement, client)); - } - void setView(PassRefPtr); - ~Frame(); - - void init(); + class Frame : public RefCounted { + public: + static PassRefPtr create(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* client) + { + return adoptRef(new Frame(page, ownerElement, client)); + } + void setView(PassRefPtr); + ~Frame(); - Page* page() const; - HTMLFrameOwnerElement* ownerElement() const; + void init(); - void pageDestroyed(); - void disconnectOwnerElement(); + Page* page() const; + HTMLFrameOwnerElement* ownerElement() const; - Document* document() const; - FrameView* view() const; + void pageDestroyed(); + void disconnectOwnerElement(); - void setDOMWindow(DOMWindow*); - DOMWindow* domWindow() const; - void clearFormerDOMWindow(DOMWindow*); + Document* document() const; + FrameView* view() const; - Editor* editor() const; - EventHandler* eventHandler() const; - FrameLoader* loader() const; - SelectionController* selection() const; - FrameTree* tree() const; - AnimationController* animation() const; - ScriptController* script(); + void setDOMWindow(DOMWindow*); + DOMWindow* domWindow() const; + void clearFormerDOMWindow(DOMWindow*); - RenderView* contentRenderer() const; // root renderer for the document contained in this frame - RenderPart* ownerRenderer() const; // renderer for the element that contains this frame - - bool isDisconnected() const; - void setIsDisconnected(bool); - bool excludeFromTextSearch() const; - void setExcludeFromTextSearch(bool); + Editor* editor() const; + EventHandler* eventHandler() const; + FrameLoader* loader() const; + SelectionController* selection() const; + FrameTree* tree() const; + AnimationController* animation() const; + ScriptController* script(); - void createView(const IntSize&, const Color&, bool, const IntSize &, bool, - ScrollbarMode = ScrollbarAuto, ScrollbarMode = ScrollbarAuto); + RenderView* contentRenderer() const; // root renderer for the document contained in this frame + RenderPart* ownerRenderer() const; // renderer for the element that contains this frame + bool isDisconnected() const; + void setIsDisconnected(bool); + bool excludeFromTextSearch() const; + void setExcludeFromTextSearch(bool); -private: - Frame(Page*, HTMLFrameOwnerElement*, FrameLoaderClient*); - -// === undecided, would like to consider moving to another class + void createView(const IntSize&, const Color&, bool, const IntSize &, bool, + ScrollbarMode = ScrollbarAuto, ScrollbarMode = ScrollbarAuto); -public: - static Frame* frameForWidget(const Widget*); - Settings* settings() const; // can be NULL + private: + Frame(Page*, HTMLFrameOwnerElement*, FrameLoaderClient*); -#if FRAME_LOADS_USER_STYLESHEET - void setUserStyleSheetLocation(const KURL&); - void setUserStyleSheet(const String& styleSheetData); -#endif + // === undecided, would like to consider moving to another class - void setPrinting(bool printing, float minPageWidth, float maxPageWidth, bool adjustViewSize); + public: + static Frame* frameForWidget(const Widget*); - bool inViewSourceMode() const; - void setInViewSourceMode(bool = true); + Settings* settings() const; // can be NULL - void keepAlive(); // Used to keep the frame alive when running a script that might destroy it. -#ifndef NDEBUG - static void cancelAllKeepAlive(); -#endif + #if FRAME_LOADS_USER_STYLESHEET + void setUserStyleSheetLocation(const KURL&); + void setUserStyleSheet(const String& styleSheetData); + #endif - void setDocument(PassRefPtr); + void setPrinting(bool printing, float minPageWidth, float maxPageWidth, bool adjustViewSize); - void clearTimers(); - static void clearTimers(FrameView*, Document*); + bool inViewSourceMode() const; + void setInViewSourceMode(bool = true); - void setNeedsReapplyStyles(); - bool needsReapplyStyles() const; - void reapplyStyles(); + void keepAlive(); // Used to keep the frame alive when running a script that might destroy it. + #ifndef NDEBUG + static void cancelAllKeepAlive(); + #endif - String documentTypeString() const; + void setDocument(PassRefPtr); - // This method -- and the corresponding list of former DOM windows -- - // should move onto ScriptController - void clearDOMWindow(); + void clearTimers(); + static void clearTimers(FrameView*, Document*); - String displayStringModifiedByEncoding(const String& str) const - { - return document() ? document()->displayStringModifiedByEncoding(str) : str; - } + void setNeedsReapplyStyles(); + bool needsReapplyStyles() const; + void reapplyStyles(); -private: - void lifeSupportTimerFired(Timer*); + String documentTypeString() const; -// === to be moved into FrameView + // This method -- and the corresponding list of former DOM windows -- + // should move onto ScriptController + void clearDOMWindow(); -public: - void setZoomFactor(float scale, bool isTextOnly); - float zoomFactor() const; - bool isZoomFactorTextOnly() const; - bool shouldApplyTextZoom() const; - bool shouldApplyPageZoom() const; - float pageZoomFactor() const { return shouldApplyPageZoom() ? zoomFactor() : 1.0f; } - float textZoomFactor() const { return shouldApplyTextZoom() ? zoomFactor() : 1.0f; } + String displayStringModifiedByEncoding(const String& str) const + { + return document() ? document()->displayStringModifiedByEncoding(str) : str; + } -// === to be moved into Chrome + private: + void lifeSupportTimerFired(Timer*); -public: - void focusWindow(); - void unfocusWindow(); - bool shouldClose(RegisteredEventListenerVector* alternateEventListeners = 0); - void scheduleClose(); + // === to be moved into FrameView - void setJSStatusBarText(const String&); - void setJSDefaultStatusBarText(const String&); - String jsStatusBarText() const; - String jsDefaultStatusBarText() const; + public: + void setZoomFactor(float scale, bool isTextOnly); + float zoomFactor() const; + bool isZoomFactorTextOnly() const; + bool shouldApplyTextZoom() const; + bool shouldApplyPageZoom() const; + float pageZoomFactor() const { return shouldApplyPageZoom() ? zoomFactor() : 1.0f; } + float textZoomFactor() const { return shouldApplyTextZoom() ? zoomFactor() : 1.0f; } -// === to be moved into Editor + // === to be moved into Chrome -public: - String selectedText() const; - bool findString(const String&, bool forward, bool caseFlag, bool wrapFlag, bool startInSelection); + public: + void focusWindow(); + void unfocusWindow(); + bool shouldClose(RegisteredEventListenerVector* alternateEventListeners = 0); + void scheduleClose(); - const VisibleSelection& mark() const; // Mark, to be used as emacs uses it. - void setMark(const VisibleSelection&); + void setJSStatusBarText(const String&); + void setJSDefaultStatusBarText(const String&); + String jsStatusBarText() const; + String jsDefaultStatusBarText() const; - void computeAndSetTypingStyle(CSSStyleDeclaration* , EditAction = EditActionUnspecified); - String selectionStartStylePropertyValue(int stylePropertyID) const; - void applyEditingStyleToBodyElement() const; - void removeEditingStyleFromBodyElement() const; - void applyEditingStyleToElement(Element*) const; - void removeEditingStyleFromElement(Element*) const; + // === to be moved into Editor - IntRect firstRectForRange(Range*) const; - - void respondToChangedSelection(const VisibleSelection& oldSelection, bool closeTyping); - bool shouldChangeSelection(const VisibleSelection& oldSelection, const VisibleSelection& newSelection, EAffinity, bool stillSelecting) const; + public: + String selectedText() const; + bool findString(const String&, bool forward, bool caseFlag, bool wrapFlag, bool startInSelection); - RenderStyle* styleForSelectionStart(Node*& nodeToRemove) const; + const VisibleSelection& mark() const; // Mark, to be used as emacs uses it. + void setMark(const VisibleSelection&); - unsigned markAllMatchesForText(const String&, bool caseFlag, unsigned limit); - bool markedTextMatchesAreHighlighted() const; - void setMarkedTextMatchesAreHighlighted(bool flag); + void computeAndSetTypingStyle(CSSStyleDeclaration* , EditAction = EditActionUnspecified); + String selectionStartStylePropertyValue(int stylePropertyID) const; + void applyEditingStyleToBodyElement() const; + void removeEditingStyleFromBodyElement() const; + void applyEditingStyleToElement(Element*) const; + void removeEditingStyleFromElement(Element*) const; - PassRefPtr selectionComputedStyle(Node*& nodeToRemove) const; + IntRect firstRectForRange(Range*) const; - void textFieldDidBeginEditing(Element*); - void textFieldDidEndEditing(Element*); - void textDidChangeInTextField(Element*); - bool doTextFieldCommandFromEvent(Element*, KeyboardEvent*); - void textWillBeDeletedInTextField(Element* input); - void textDidChangeInTextArea(Element*); + void respondToChangedSelection(const VisibleSelection& oldSelection, bool closeTyping); + bool shouldChangeSelection(const VisibleSelection& oldSelection, const VisibleSelection& newSelection, EAffinity, bool stillSelecting) const; - DragImageRef dragImageForSelection(); - -// === to be moved into SelectionController + RenderStyle* styleForSelectionStart(Node*& nodeToRemove) const; -public: - TextGranularity selectionGranularity() const; - void setSelectionGranularity(TextGranularity); + unsigned markAllMatchesForText(const String&, bool caseFlag, unsigned limit); + bool markedTextMatchesAreHighlighted() const; + void setMarkedTextMatchesAreHighlighted(bool flag); - bool shouldChangeSelection(const VisibleSelection&) const; - bool shouldDeleteSelection(const VisibleSelection&) const; - void clearCaretRectIfNeeded(); - void setFocusedNodeIfNeeded(); - void selectionLayoutChanged(); - void notifyRendererOfSelectionChange(bool userTriggered); + PassRefPtr selectionComputedStyle(Node*& nodeToRemove) const; - void invalidateSelection(); + void textFieldDidBeginEditing(Element*); + void textFieldDidEndEditing(Element*); + void textDidChangeInTextField(Element*); + bool doTextFieldCommandFromEvent(Element*, KeyboardEvent*); + void textWillBeDeletedInTextField(Element* input); + void textDidChangeInTextArea(Element*); - void setCaretVisible(bool = true); - void paintCaret(GraphicsContext*, int tx, int ty, const IntRect& clipRect) const; - void paintDragCaret(GraphicsContext*, int tx, int ty, const IntRect& clipRect) const; + DragImageRef dragImageForSelection(); - bool isContentEditable() const; // if true, everything in frame is editable + // === to be moved into SelectionController - void updateSecureKeyboardEntryIfActive(); + public: + TextGranularity selectionGranularity() const; + void setSelectionGranularity(TextGranularity); - CSSMutableStyleDeclaration* typingStyle() const; - void setTypingStyle(CSSMutableStyleDeclaration*); - void clearTypingStyle(); + bool shouldChangeSelection(const VisibleSelection&) const; + bool shouldDeleteSelection(const VisibleSelection&) const; + void clearCaretRectIfNeeded(); + void setFocusedNodeIfNeeded(); + void selectionLayoutChanged(); + void notifyRendererOfSelectionChange(bool userTriggered); - FloatRect selectionBounds(bool clipToVisibleContent = true) const; - void selectionTextRects(Vector&, bool clipToVisibleContent = true) const; + void invalidateSelection(); - HTMLFormElement* currentForm() const; + void setCaretVisible(bool = true); + void paintCaret(GraphicsContext*, int tx, int ty, const IntRect& clipRect) const; + void paintDragCaret(GraphicsContext*, int tx, int ty, const IntRect& clipRect) const; - void revealSelection(const ScrollAlignment& = ScrollAlignment::alignCenterIfNeeded, bool revealExtent = false); - void setSelectionFromNone(); + bool isContentEditable() const; // if true, everything in frame is editable - void setUseSecureKeyboardEntry(bool); + void updateSecureKeyboardEntryIfActive(); -private: - void caretBlinkTimerFired(Timer*); + CSSMutableStyleDeclaration* typingStyle() const; + void setTypingStyle(CSSMutableStyleDeclaration*); + void clearTypingStyle(); -public: - SelectionController* dragCaretController() const; + FloatRect selectionBounds(bool clipToVisibleContent = true) const; + void selectionTextRects(Vector&, bool clipToVisibleContent = true) const; - String searchForLabelsAboveCell(RegularExpression*, HTMLTableCellElement*); - String searchForLabelsBeforeElement(const Vector& labels, Element*); - String matchLabelsAgainstElement(const Vector& labels, Element*); - - VisiblePosition visiblePositionForPoint(const IntPoint& framePoint); - Document* documentAtPoint(const IntPoint& windowPoint); + HTMLFormElement* currentForm() const; -#if PLATFORM(MAC) + void revealSelection(const ScrollAlignment& = ScrollAlignment::alignCenterIfNeeded, bool revealExtent = false); + void setSelectionFromNone(); -// === undecided, would like to consider moving to another class + void setUseSecureKeyboardEntry(bool); -public: - NSString* searchForNSLabelsAboveCell(RegularExpression*, HTMLTableCellElement*); - NSString* searchForLabelsBeforeElement(NSArray* labels, Element*); - NSString* matchLabelsAgainstElement(NSArray* labels, Element*); + private: + void caretBlinkTimerFired(Timer*); -#if ENABLE(DASHBOARD_SUPPORT) - NSMutableDictionary* dashboardRegionsDictionary(); -#endif + public: + SelectionController* dragCaretController() const; - NSImage* selectionImage(bool forceBlackText = false) const; - NSImage* snapshotDragImage(Node*, NSRect* imageRect, NSRect* elementRect) const; - NSImage* nodeImage(Node*) const; + String searchForLabelsAboveCell(RegularExpression*, HTMLTableCellElement*); + String searchForLabelsBeforeElement(const Vector& labels, Element*); + String matchLabelsAgainstElement(const Vector& labels, Element*); -private: - NSImage* imageFromRect(NSRect) const; + VisiblePosition visiblePositionForPoint(const IntPoint& framePoint); + Document* documentAtPoint(const IntPoint& windowPoint); -// === to be moved into Editor + #if PLATFORM(MAC) -public: - NSDictionary* fontAttributesForSelectionStart() const; - NSWritingDirection baseWritingDirectionForSelectionStart() const; + // === undecided, would like to consider moving to another class -#endif + public: + NSString* searchForNSLabelsAboveCell(RegularExpression*, HTMLTableCellElement*); + NSString* searchForLabelsBeforeElement(NSArray* labels, Element*); + NSString* matchLabelsAgainstElement(NSArray* labels, Element*); -#if PLATFORM(WIN) + #if ENABLE(DASHBOARD_SUPPORT) + NSMutableDictionary* dashboardRegionsDictionary(); + #endif -public: - // FIXME - We should have a single version of nodeImage instead of using platform types. - HBITMAP nodeImage(Node*) const; + NSImage* selectionImage(bool forceBlackText = false) const; + NSImage* snapshotDragImage(Node*, NSRect* imageRect, NSRect* elementRect) const; + NSImage* nodeImage(Node*) const; -#endif + private: + NSImage* imageFromRect(NSRect) const; -private: - Page* m_page; - mutable FrameTree m_treeNode; - mutable FrameLoader m_loader; + // === to be moved into Editor - mutable RefPtr m_domWindow; - HashSet m_liveFormerWindows; + public: + NSDictionary* fontAttributesForSelectionStart() const; + NSWritingDirection baseWritingDirectionForSelectionStart() const; - HTMLFrameOwnerElement* m_ownerElement; - RefPtr m_view; - RefPtr m_doc; + #endif - ScriptController m_script; + #if PLATFORM(WIN) - String m_kjsStatusBarText; - String m_kjsDefaultStatusBarText; + public: + // FIXME - We should have a single version of nodeImage instead of using platform types. + HBITMAP nodeImage(Node*) const; - float m_zoomFactor; + #endif - TextGranularity m_selectionGranularity; + private: + Page* m_page; + mutable FrameTree m_treeNode; + mutable FrameLoader m_loader; - mutable SelectionController m_selectionController; - mutable VisibleSelection m_mark; - Timer m_caretBlinkTimer; - mutable Editor m_editor; - mutable EventHandler m_eventHandler; - mutable AnimationController m_animationController; + mutable RefPtr m_domWindow; + HashSet m_liveFormerWindows; - RefPtr m_typingStyle; + HTMLFrameOwnerElement* m_ownerElement; + RefPtr m_view; + RefPtr m_doc; - Timer m_lifeSupportTimer; + ScriptController m_script; - bool m_caretVisible; - bool m_caretPaint; - - bool m_highlightTextMatches; - bool m_inViewSourceMode; - bool m_needsReapplyStyles; - bool m_isDisconnected; - bool m_excludeFromTextSearch; + String m_kjsStatusBarText; + String m_kjsDefaultStatusBarText; -#if FRAME_LOADS_USER_STYLESHEET - UserStyleSheetLoader* m_userStyleSheetLoader; -#endif + float m_zoomFactor; + + TextGranularity m_selectionGranularity; + + mutable SelectionController m_selectionController; + mutable VisibleSelection m_mark; + Timer m_caretBlinkTimer; + mutable Editor m_editor; + mutable EventHandler m_eventHandler; + mutable AnimationController m_animationController; + + RefPtr m_typingStyle; + + Timer m_lifeSupportTimer; + + bool m_caretVisible; + bool m_caretPaint; + + bool m_highlightTextMatches; + bool m_inViewSourceMode; + bool m_needsReapplyStyles; + bool m_isDisconnected; + bool m_excludeFromTextSearch; + + #if FRAME_LOADS_USER_STYLESHEET + UserStyleSheetLoader* m_userStyleSheetLoader; + #endif -}; + }; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/page/FrameTree.h b/src/3rdparty/webkit/WebCore/page/FrameTree.h index d4c8c43c0..9ab999fd7 100644 --- a/src/3rdparty/webkit/WebCore/page/FrameTree.h +++ b/src/3rdparty/webkit/WebCore/page/FrameTree.h @@ -26,7 +26,7 @@ namespace WebCore { class Frame; - class FrameTree : Noncopyable { + class FrameTree : public Noncopyable { public: FrameTree(Frame* thisFrame, Frame* parentFrame) : m_thisFrame(thisFrame) diff --git a/src/3rdparty/webkit/WebCore/page/FrameView.cpp b/src/3rdparty/webkit/WebCore/page/FrameView.cpp index d57e845ea..9160c89fd 100644 --- a/src/3rdparty/webkit/WebCore/page/FrameView.cpp +++ b/src/3rdparty/webkit/WebCore/page/FrameView.cpp @@ -825,6 +825,19 @@ void FrameView::repaintContentRectangle(const IntRect& r, bool immediate) ScrollView::repaintContentRectangle(r, immediate); } +void FrameView::visibleContentsResized() +{ + // We check to make sure the view is attached to a frame() as this method can + // be triggered before the view is attached by Frame::createView(...) setting + // various values such as setScrollBarModes(...) for example. An ASSERT is + // triggered when a view is layout before being attached to a frame(). + if (!frame()->view()) + return; + + if (needsLayout()) + layout(); +} + void FrameView::beginDeferredRepaints() { Page* page = m_frame->page(); diff --git a/src/3rdparty/webkit/WebCore/page/FrameView.h b/src/3rdparty/webkit/WebCore/page/FrameView.h index 8eee5b821..83e2c1ebc 100644 --- a/src/3rdparty/webkit/WebCore/page/FrameView.h +++ b/src/3rdparty/webkit/WebCore/page/FrameView.h @@ -207,11 +207,7 @@ private: virtual void repaintContentRectangle(const IntRect&, bool immediate); virtual void contentsResized() { setNeedsLayout(); } - virtual void visibleContentsResized() - { - if (needsLayout()) - layout(); - } + virtual void visibleContentsResized(); // Override ScrollView methods to do point conversion via renderers, in order to // take transforms into account. diff --git a/src/3rdparty/webkit/WebCore/page/NavigatorBase.cpp b/src/3rdparty/webkit/WebCore/page/NavigatorBase.cpp index 5138b0fb5..5b0c5d42e 100644 --- a/src/3rdparty/webkit/WebCore/page/NavigatorBase.cpp +++ b/src/3rdparty/webkit/WebCore/page/NavigatorBase.cpp @@ -29,6 +29,10 @@ #include "NetworkStateNotifier.h" #include "PlatformString.h" +#if PLATFORM(LINUX) +#include "sys/utsname.h" +#include +#endif #ifndef WEBCORE_NAVIGATOR_PLATFORM #if PLATFORM(MAC) && (PLATFORM(PPC) || PLATFORM(PPC64)) @@ -37,6 +41,8 @@ #define WEBCORE_NAVIGATOR_PLATFORM "MacIntel" #elif PLATFORM(WIN_OS) #define WEBCORE_NAVIGATOR_PLATFORM "Win32" +#elif PLATFORM(SYMBIAN) +#define WEBCORE_NAVIGATOR_PLATFORM "Symbian" #else #define WEBCORE_NAVIGATOR_PLATFORM "" #endif @@ -79,7 +85,15 @@ String NavigatorBase::appVersion() const String NavigatorBase::platform() const { +#if PLATFORM(LINUX) + if (String("") != WEBCORE_NAVIGATOR_PLATFORM) + return WEBCORE_NAVIGATOR_PLATFORM; + struct utsname osname; + DEFINE_STATIC_LOCAL(String, platformName, (uname(&osname) >= 0 ? String(osname.sysname) + String(" ") + String(osname.machine) : "")); + return platformName; +#else return WEBCORE_NAVIGATOR_PLATFORM; +#endif } String NavigatorBase::appCodeName() const diff --git a/src/3rdparty/webkit/WebCore/page/Page.cpp b/src/3rdparty/webkit/WebCore/page/Page.cpp index 649470780..32c60c6a3 100644 --- a/src/3rdparty/webkit/WebCore/page/Page.cpp +++ b/src/3rdparty/webkit/WebCore/page/Page.cpp @@ -100,7 +100,7 @@ Page::Page(ChromeClient* chromeClient, ContextMenuClient* contextMenuClient, Edi , m_dragController(new DragController(this, dragClient)) , m_focusController(new FocusController(this)) , m_contextMenuController(new ContextMenuController(this, contextMenuClient)) - , m_inspectorController(InspectorController::create(this, inspectorClient)) + , m_inspectorController(new InspectorController(this, inspectorClient)) , m_settings(new Settings(this)) , m_progress(new ProgressTracker) , m_backForwardList(BackForwardList::create(this)) diff --git a/src/3rdparty/webkit/WebCore/page/Page.h b/src/3rdparty/webkit/WebCore/page/Page.h index b5d6f4bee..cc3d25d17 100644 --- a/src/3rdparty/webkit/WebCore/page/Page.h +++ b/src/3rdparty/webkit/WebCore/page/Page.h @@ -73,7 +73,7 @@ namespace WebCore { enum FindDirection { FindDirectionForward, FindDirectionBackward }; - class Page : Noncopyable { + class Page : public Noncopyable { public: static void setNeedsReapplyStyles(); @@ -209,7 +209,7 @@ namespace WebCore { OwnPtr m_dragController; OwnPtr m_focusController; OwnPtr m_contextMenuController; - RefPtr m_inspectorController; + OwnPtr m_inspectorController; OwnPtr m_settings; OwnPtr m_progress; diff --git a/src/3rdparty/webkit/WebCore/page/PageGroup.h b/src/3rdparty/webkit/WebCore/page/PageGroup.h index cbde1c323..f92c2e614 100644 --- a/src/3rdparty/webkit/WebCore/page/PageGroup.h +++ b/src/3rdparty/webkit/WebCore/page/PageGroup.h @@ -37,7 +37,7 @@ namespace WebCore { class Page; class StorageNamespace; - class PageGroup : Noncopyable { + class PageGroup : public Noncopyable { public: PageGroup(const String& name); PageGroup(Page*); diff --git a/src/3rdparty/webkit/WebCore/page/PageGroupLoadDeferrer.h b/src/3rdparty/webkit/WebCore/page/PageGroupLoadDeferrer.h index 1bdb45c8e..d443ebdd5 100644 --- a/src/3rdparty/webkit/WebCore/page/PageGroupLoadDeferrer.h +++ b/src/3rdparty/webkit/WebCore/page/PageGroupLoadDeferrer.h @@ -28,7 +28,7 @@ namespace WebCore { class Frame; class Page; - class PageGroupLoadDeferrer : Noncopyable { + class PageGroupLoadDeferrer : public Noncopyable { public: PageGroupLoadDeferrer(Page*, bool deferSelf); ~PageGroupLoadDeferrer(); diff --git a/src/3rdparty/webkit/WebCore/page/Settings.cpp b/src/3rdparty/webkit/WebCore/page/Settings.cpp index 6f8b7c7f6..133dd9ac5 100644 --- a/src/3rdparty/webkit/WebCore/page/Settings.cpp +++ b/src/3rdparty/webkit/WebCore/page/Settings.cpp @@ -64,6 +64,7 @@ Settings::Settings(Page* page) , m_arePluginsEnabled(false) , m_databasesEnabled(false) , m_localStorageEnabled(false) + , m_sessionStorageEnabled(true) , m_isJavaScriptEnabled(false) , m_isWebSecurityEnabled(true) , m_allowUniversalAccessFromFileURLs(true) @@ -244,6 +245,11 @@ void Settings::setLocalStorageEnabled(bool localStorageEnabled) m_localStorageEnabled = localStorageEnabled; } +void Settings::setSessionStorageEnabled(bool sessionStorageEnabled) +{ + m_sessionStorageEnabled = sessionStorageEnabled; +} + void Settings::setPrivateBrowsingEnabled(bool privateBrowsingEnabled) { m_privateBrowsingEnabled = privateBrowsingEnabled; diff --git a/src/3rdparty/webkit/WebCore/page/Settings.h b/src/3rdparty/webkit/WebCore/page/Settings.h index 962af1845..544d0d558 100644 --- a/src/3rdparty/webkit/WebCore/page/Settings.h +++ b/src/3rdparty/webkit/WebCore/page/Settings.h @@ -125,6 +125,9 @@ namespace WebCore { void setLocalStorageEnabled(bool); bool localStorageEnabled() const { return m_localStorageEnabled; } + void setSessionStorageEnabled(bool); + bool sessionStorageEnabled() const { return m_sessionStorageEnabled; } + void setPrivateBrowsingEnabled(bool); bool privateBrowsingEnabled() const { return m_privateBrowsingEnabled; } @@ -277,6 +280,7 @@ namespace WebCore { bool m_arePluginsEnabled : 1; bool m_databasesEnabled : 1; bool m_localStorageEnabled : 1; + bool m_sessionStorageEnabled : 1; bool m_isJavaScriptEnabled : 1; bool m_isWebSecurityEnabled : 1; bool m_allowUniversalAccessFromFileURLs: 1; diff --git a/src/3rdparty/webkit/WebCore/page/XSSAuditor.cpp b/src/3rdparty/webkit/WebCore/page/XSSAuditor.cpp index 5dfc96313..70b691b0d 100644 --- a/src/3rdparty/webkit/WebCore/page/XSSAuditor.cpp +++ b/src/3rdparty/webkit/WebCore/page/XSSAuditor.cpp @@ -46,9 +46,14 @@ using namespace WTF; namespace WebCore { -static bool isNonNullControlCharacter(UChar c) +static bool isNonCanonicalCharacter(UChar c) { - return (c > '\0' && c < ' ') || c == 127; + // Note, we don't remove backslashes like PHP stripslashes(), which among other things converts "\\0" to the \0 character. + // Instead, we remove backslashes and zeros (since the string "\\0" =(remove backslashes)=> "0"). However, this has the + // adverse effect that we remove any legitimate zeros from a string. + // + // For instance: new String("http://localhost:8000") => new String("http://localhost:8"). + return (c == '\\' || c == '0' || c < ' ' || c == 127); } XSSAuditor::XSSAuditor(Frame* frame) @@ -66,12 +71,12 @@ bool XSSAuditor::isEnabled() const return (settings && settings->xssAuditorEnabled()); } -bool XSSAuditor::canEvaluate(const String& sourceCode) const +bool XSSAuditor::canEvaluate(const String& code) const { if (!isEnabled()) return true; - if (findInRequest(sourceCode, false, true, false)) { + if (findInRequest(code, false)) { DEFINE_STATIC_LOCAL(String, consoleMessage, ("Refused to execute a JavaScript script. Source code of script found within request.\n")); m_frame->domWindow()->console()->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, consoleMessage, 1, String()); return false; @@ -84,7 +89,7 @@ bool XSSAuditor::canEvaluateJavaScriptURL(const String& code) const if (!isEnabled()) return true; - if (findInRequest(code, false, false, true, true)) { + if (findInRequest(code)) { DEFINE_STATIC_LOCAL(String, consoleMessage, ("Refused to execute a JavaScript script. Source code of script found within request.\n")); m_frame->domWindow()->console()->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, consoleMessage, 1, String()); return false; @@ -123,7 +128,7 @@ bool XSSAuditor::canLoadObject(const String& url) const if (!isEnabled()) return true; - if (findInRequest(url, false, false)) { + if (findInRequest(url)) { DEFINE_STATIC_LOCAL(String, consoleMessage, ("Refused to execute a JavaScript script. Source code of script found within request")); m_frame->domWindow()->console()->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, consoleMessage, 1, String()); return false; @@ -145,11 +150,16 @@ bool XSSAuditor::canSetBaseElementURL(const String& url) const return true; } -String XSSAuditor::decodeURL(const String& str, const TextEncoding& encoding, bool allowNullCharacters, - bool allowNonNullControlCharacters, bool decodeHTMLentities, bool leaveUndecodableHTMLEntitiesUntouched) +String XSSAuditor::canonicalize(const String& string) +{ + String result = decodeHTMLEntities(string); + return result.removeCharacters(&isNonCanonicalCharacter); +} + +String XSSAuditor::decodeURL(const String& string, const TextEncoding& encoding, bool decodeHTMLentities) { String result; - String url = str; + String url = string; url.replace('+', ' '); result = decodeURLEscapeSequences(url); @@ -157,20 +167,13 @@ String XSSAuditor::decodeURL(const String& str, const TextEncoding& encoding, bo if (!decodedResult.isEmpty()) result = decodedResult; if (decodeHTMLentities) - result = decodeHTMLEntities(result, leaveUndecodableHTMLEntitiesUntouched); - if (!allowNullCharacters) - result = StringImpl::createStrippingNullCharacters(result.characters(), result.length()); - if (!allowNonNullControlCharacters) { - decodedResult = result.removeCharacters(&isNonNullControlCharacter); - if (!decodedResult.isEmpty()) - result = decodedResult; - } + result = decodeHTMLEntities(result); return result; } -String XSSAuditor::decodeHTMLEntities(const String& str, bool leaveUndecodableHTMLEntitiesUntouched) +String XSSAuditor::decodeHTMLEntities(const String& string, bool leaveUndecodableHTMLEntitiesUntouched) { - SegmentedString source(str); + SegmentedString source(string); SegmentedString sourceShadow; Vector result; @@ -193,7 +196,7 @@ String XSSAuditor::decodeHTMLEntities(const String& str, bool leaveUndecodableHT if (entity > 0xFFFF) { result.append(U16_LEAD(entity)); result.append(U16_TRAIL(entity)); - } else if (!leaveUndecodableHTMLEntitiesUntouched || entity != 0xFFFD){ + } else if (entity && (!leaveUndecodableHTMLEntitiesUntouched || entity != 0xFFFD)){ result.append(entity); } else { result.append('&'); @@ -205,22 +208,18 @@ String XSSAuditor::decodeHTMLEntities(const String& str, bool leaveUndecodableHT return String::adopt(result); } -bool XSSAuditor::findInRequest(const String& string, bool matchNullCharacters, bool matchNonNullControlCharacters, - bool decodeHTMLentities, bool leaveUndecodableHTMLEntitiesUntouched) const +bool XSSAuditor::findInRequest(const String& string, bool decodeHTMLentities) const { bool result = false; Frame* parentFrame = m_frame->tree()->parent(); if (parentFrame && m_frame->document()->url() == blankURL()) - result = findInRequest(parentFrame, string, matchNullCharacters, matchNonNullControlCharacters, - decodeHTMLentities, leaveUndecodableHTMLEntitiesUntouched); + result = findInRequest(parentFrame, string, decodeHTMLentities); if (!result) - result = findInRequest(m_frame, string, matchNullCharacters, matchNonNullControlCharacters, - decodeHTMLentities, leaveUndecodableHTMLEntitiesUntouched); + result = findInRequest(m_frame, string, decodeHTMLentities); return result; } -bool XSSAuditor::findInRequest(Frame* frame, const String& string, bool matchNullCharacters, bool matchNonNullControlCharacters, - bool decodeHTMLentities, bool leaveUndecodableHTMLEntitiesUntouched) const +bool XSSAuditor::findInRequest(Frame* frame, const String& string, bool decodeHTMLentities) const { ASSERT(frame->document()); String pageURL = frame->document()->url().string(); @@ -236,11 +235,14 @@ bool XSSAuditor::findInRequest(Frame* frame, const String& string, bool matchNul if (string.isEmpty()) return false; + String canonicalizedString = canonicalize(string); + if (canonicalizedString.isEmpty()) + return false; + if (string.length() < pageURL.length()) { // The string can actually fit inside the pageURL. - String decodedPageURL = decodeURL(pageURL, frame->document()->decoder()->encoding(), matchNullCharacters, - matchNonNullControlCharacters, decodeHTMLentities, leaveUndecodableHTMLEntitiesUntouched); - if (decodedPageURL.find(string, 0, false) != -1) + String decodedPageURL = canonicalize(decodeURL(pageURL, frame->document()->decoder()->encoding(), decodeHTMLentities)); + if (decodedPageURL.find(canonicalizedString, 0, false) != -1) return true; // We've found the smoking gun. } @@ -252,9 +254,8 @@ bool XSSAuditor::findInRequest(Frame* frame, const String& string, bool matchNul // the url-encoded POST data because the length of the url-decoded // code is less than or equal to the length of the url-encoded // string. - String decodedFormData = decodeURL(formData, frame->document()->decoder()->encoding(), matchNullCharacters, - matchNonNullControlCharacters, decodeHTMLentities, leaveUndecodableHTMLEntitiesUntouched); - if (decodedFormData.find(string, 0, false) != -1) + String decodedFormData = canonicalize(decodeURL(formData, frame->document()->decoder()->encoding(), decodeHTMLentities)); + if (decodedFormData.find(canonicalizedString, 0, false) != -1) return true; // We found the string in the POST data. } } diff --git a/src/3rdparty/webkit/WebCore/page/XSSAuditor.h b/src/3rdparty/webkit/WebCore/page/XSSAuditor.h index 6c6a56c2b..26f10ab76 100644 --- a/src/3rdparty/webkit/WebCore/page/XSSAuditor.h +++ b/src/3rdparty/webkit/WebCore/page/XSSAuditor.h @@ -72,7 +72,7 @@ namespace WebCore { // Determines whether the script should be allowed or denied execution // based on the content of any user-submitted data. - bool canEvaluate(const String& sourceCode) const; + bool canEvaluate(const String& code) const; // Determines whether the JavaScript URL should be allowed or denied execution // based on the content of any user-submitted data. @@ -99,17 +99,15 @@ namespace WebCore { bool canSetBaseElementURL(const String& url) const; private: - static String decodeURL(const String& url, const TextEncoding& encoding = UTF8Encoding(), bool allowNullCharacters = false, - bool allowNonNullControlCharacters = true, bool decodeHTMLentities = true, - bool leaveUndecodableHTMLEntitiesUntouched = false); + static String canonicalize(const String&); - static String decodeHTMLEntities(const String&, bool leaveUndecodableHTMLEntitiesUntouched = false); + static String decodeURL(const String& url, const TextEncoding& encoding = UTF8Encoding(), bool decodeHTMLentities = true); + + static String decodeHTMLEntities(const String&, bool leaveUndecodableHTMLEntitiesUntouched = true); - bool findInRequest(const String&, bool matchNullCharacters = true, bool matchNonNullControlCharacters = true, - bool decodeHTMLentities = true, bool leaveUndecodableHTMLEntitiesUntouched = false) const; + bool findInRequest(const String&, bool decodeHTMLentities = true) const; - bool findInRequest(Frame*, const String&, bool matchNullCharacters = true, bool matchNonNullControlCharacters = true, - bool decodeHTMLentities = true, bool leaveUndecodableHTMLEntitiesUntouched = false) const; + bool findInRequest(Frame*, const String&, bool decodeHTMLentities = true) const; // The frame to audit. Frame* m_frame; diff --git a/src/3rdparty/webkit/WebCore/page/animation/AnimationBase.cpp b/src/3rdparty/webkit/WebCore/page/animation/AnimationBase.cpp index a4916e90b..dad763c9f 100644 --- a/src/3rdparty/webkit/WebCore/page/animation/AnimationBase.cpp +++ b/src/3rdparty/webkit/WebCore/page/animation/AnimationBase.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Apple Inc. All rights reserved. + * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -113,11 +113,23 @@ static inline IntSize blendFunc(const AnimationBase* anim, const IntSize& from, blendFunc(anim, from.height(), to.height(), progress)); } +static inline ShadowStyle blendFunc(const AnimationBase* anim, ShadowStyle from, ShadowStyle to, double progress) +{ + if (from == to) + return to; + + double fromVal = from == Normal ? 1 : 0; + double toVal = to == Normal ? 1 : 0; + double result = blendFunc(anim, fromVal, toVal, progress); + return result > 0 ? Normal : Inset; +} + static inline ShadowData* blendFunc(const AnimationBase* anim, const ShadowData* from, const ShadowData* to, double progress) { ASSERT(from && to); return new ShadowData(blendFunc(anim, from->x, to->x, progress), blendFunc(anim, from->y, to->y, progress), - blendFunc(anim, from->blur, to->blur, progress), blendFunc(anim, from->color, to->color, progress)); + blendFunc(anim, from->blur, to->blur, progress), blendFunc(anim, from->spread, to->spread, progress), + blendFunc(anim, from->style, to->style, progress), blendFunc(anim, from->color, to->color, progress)); } static inline TransformOperations blendFunc(const AnimationBase* anim, const TransformOperations& from, const TransformOperations& to, double progress) @@ -300,7 +312,7 @@ public: { ShadowData* shadowA = (a->*m_getter)(); ShadowData* shadowB = (b->*m_getter)(); - ShadowData defaultShadowData(0, 0, 0, Color::transparent); + ShadowData defaultShadowData(0, 0, 0, 0, Normal, Color::transparent); if (!shadowA) shadowA = &defaultShadowData; @@ -473,7 +485,7 @@ static void ensurePropertyMap() gPropertyWrappers->append(new PropertyWrapperMaybeInvalidColor(CSSPropertyOutlineColor, &RenderStyle::outlineColor, &RenderStyle::setOutlineColor)); // These are for shadows - gPropertyWrappers->append(new PropertyWrapperShadow(CSSPropertyWebkitBoxShadow, &RenderStyle::boxShadow, &RenderStyle::setBoxShadow)); + gPropertyWrappers->append(new PropertyWrapperShadow(CSSPropertyBoxShadow, &RenderStyle::boxShadow, &RenderStyle::setBoxShadow)); gPropertyWrappers->append(new PropertyWrapperShadow(CSSPropertyTextShadow, &RenderStyle::textShadow, &RenderStyle::setTextShadow)); #if ENABLE(SVG) diff --git a/src/3rdparty/webkit/WebCore/platform/AutodrainedPool.h b/src/3rdparty/webkit/WebCore/platform/AutodrainedPool.h index 1cbbec603..d44ee1eaa 100644 --- a/src/3rdparty/webkit/WebCore/platform/AutodrainedPool.h +++ b/src/3rdparty/webkit/WebCore/platform/AutodrainedPool.h @@ -39,7 +39,7 @@ class NSAutoreleasePool; namespace WebCore { -class AutodrainedPool : Noncopyable { +class AutodrainedPool : public Noncopyable { public: AutodrainedPool(int iterationLimit = 1); ~AutodrainedPool(); diff --git a/src/3rdparty/webkit/WebCore/platform/ContextMenu.h b/src/3rdparty/webkit/WebCore/platform/ContextMenu.h index 75899ba39..dc484b2b9 100644 --- a/src/3rdparty/webkit/WebCore/platform/ContextMenu.h +++ b/src/3rdparty/webkit/WebCore/platform/ContextMenu.h @@ -42,7 +42,7 @@ namespace WebCore { class ContextMenuController; - class ContextMenu : Noncopyable + class ContextMenu : public Noncopyable { public: ContextMenu(const HitTestResult&); diff --git a/src/3rdparty/webkit/WebCore/platform/EventLoop.h b/src/3rdparty/webkit/WebCore/platform/EventLoop.h index 6687c2319..b0507f729 100644 --- a/src/3rdparty/webkit/WebCore/platform/EventLoop.h +++ b/src/3rdparty/webkit/WebCore/platform/EventLoop.h @@ -30,7 +30,7 @@ namespace WebCore { - class EventLoop : Noncopyable { + class EventLoop : public Noncopyable { public: EventLoop() : m_ended(false) diff --git a/src/3rdparty/webkit/WebCore/platform/HostWindow.h b/src/3rdparty/webkit/WebCore/platform/HostWindow.h index 3e982e116..3a024decc 100644 --- a/src/3rdparty/webkit/WebCore/platform/HostWindow.h +++ b/src/3rdparty/webkit/WebCore/platform/HostWindow.h @@ -31,7 +31,7 @@ namespace WebCore { -class HostWindow : Noncopyable { +class HostWindow : public Noncopyable { public: virtual ~HostWindow() { } diff --git a/src/3rdparty/webkit/WebCore/platform/Logging.cpp b/src/3rdparty/webkit/WebCore/platform/Logging.cpp index e36935601..f3c6f1ca3 100644 --- a/src/3rdparty/webkit/WebCore/platform/Logging.cpp +++ b/src/3rdparty/webkit/WebCore/platform/Logging.cpp @@ -65,26 +65,65 @@ WTFLogChannel* getChannelFromName(const String& channelName) if (!(channelName.length() >= 2)) return 0; - if (channelName == String("BackForward")) return &LogBackForward; - if (channelName == String("Editing")) return &LogEditing; - if (channelName == String("Events")) return &LogEvents; - if (channelName == String("Frames")) return &LogFrames; - if (channelName == String("FTP")) return &LogFTP; - if (channelName == String("History")) return &LogHistory; - if (channelName == String("IconDatabase")) return &LogIconDatabase; - if (channelName == String("Loading")) return &LogLoading; - if (channelName == String("Media")) return &LogMedia; - if (channelName == String("Network")) return &LogNetwork; - if (channelName == String("NotYetImplemented")) return &LogNotYetImplemented; - if (channelName == String("PageCache")) return &LogPageCache; - if (channelName == String("PlatformLeaks")) return &LogPlatformLeaks; - if (channelName == String("Plugins")) return &LogPlugins; - if (channelName == String("PopupBlocking")) return &LogPopupBlocking; - if (channelName == String("SpellingAndGrammar")) return &LogSpellingAndGrammar; - if (channelName == String("SQLDatabase")) return &LogSQLDatabase; - if (channelName == String("StorageAPI")) return &LogStorageAPI; - if (channelName == String("TextConversion")) return &LogTextConversion; - if (channelName == String("Threading")) return &LogThreading; + if (equalIgnoringCase(channelName, String("BackForward"))) + return &LogBackForward; + + if (equalIgnoringCase(channelName, String("Editing"))) + return &LogEditing; + + if (equalIgnoringCase(channelName, String("Events"))) + return &LogEvents; + + if (equalIgnoringCase(channelName, String("Frames"))) + return &LogFrames; + + if (equalIgnoringCase(channelName, String("FTP"))) + return &LogFTP; + + if (equalIgnoringCase(channelName, String("History"))) + return &LogHistory; + + if (equalIgnoringCase(channelName, String("IconDatabase"))) + return &LogIconDatabase; + + if (equalIgnoringCase(channelName, String("Loading"))) + return &LogLoading; + + if (equalIgnoringCase(channelName, String("Media"))) + return &LogMedia; + + if (equalIgnoringCase(channelName, String("Network"))) + return &LogNetwork; + + if (equalIgnoringCase(channelName, String("NotYetImplemented"))) + return &LogNotYetImplemented; + + if (equalIgnoringCase(channelName, String("PageCache"))) + return &LogPageCache; + + if (equalIgnoringCase(channelName, String("PlatformLeaks"))) + return &LogPlatformLeaks; + + if (equalIgnoringCase(channelName, String("Plugins"))) + return &LogPlugins; + + if (equalIgnoringCase(channelName, String("PopupBlocking"))) + return &LogPopupBlocking; + + if (equalIgnoringCase(channelName, String("SpellingAndGrammar"))) + return &LogSpellingAndGrammar; + + if (equalIgnoringCase(channelName, String("SQLDatabase"))) + return &LogSQLDatabase; + + if (equalIgnoringCase(channelName, String("StorageAPI"))) + return &LogStorageAPI; + + if (equalIgnoringCase(channelName, String("TextConversion"))) + return &LogTextConversion; + + if (equalIgnoringCase(channelName, String("Threading"))) + return &LogThreading; return 0; } diff --git a/src/3rdparty/webkit/WebCore/platform/Pasteboard.h b/src/3rdparty/webkit/WebCore/platform/Pasteboard.h index f98683f97..883364ab7 100644 --- a/src/3rdparty/webkit/WebCore/platform/Pasteboard.h +++ b/src/3rdparty/webkit/WebCore/platform/Pasteboard.h @@ -76,7 +76,7 @@ class Node; class Range; class String; -class Pasteboard : Noncopyable { +class Pasteboard : public Noncopyable { public: #if PLATFORM(MAC) //Helper functions to allow Clipboard to share code diff --git a/src/3rdparty/webkit/WebCore/platform/PurgeableBuffer.h b/src/3rdparty/webkit/WebCore/platform/PurgeableBuffer.h index 9c8e3cb6f..c487eb994 100644 --- a/src/3rdparty/webkit/WebCore/platform/PurgeableBuffer.h +++ b/src/3rdparty/webkit/WebCore/platform/PurgeableBuffer.h @@ -31,7 +31,7 @@ namespace WebCore { - class PurgeableBuffer : Noncopyable { + class PurgeableBuffer : public Noncopyable { public: static PurgeableBuffer* create(const char* data, size_t); static PurgeableBuffer* create(const Vector& v) { return create(v.data(), v.size()); } diff --git a/src/3rdparty/webkit/WebCore/platform/RunLoopTimer.h b/src/3rdparty/webkit/WebCore/platform/RunLoopTimer.h index 96eb8d82f..65f253e7d 100644 --- a/src/3rdparty/webkit/WebCore/platform/RunLoopTimer.h +++ b/src/3rdparty/webkit/WebCore/platform/RunLoopTimer.h @@ -37,7 +37,7 @@ namespace WebCore { // Time intervals are all in seconds. -class RunLoopTimerBase : Noncopyable { +class RunLoopTimerBase : public Noncopyable { public: virtual ~RunLoopTimerBase(); diff --git a/src/3rdparty/webkit/WebCore/platform/ScrollView.cpp b/src/3rdparty/webkit/WebCore/platform/ScrollView.cpp index ba6b61c1c..b1cff4f05 100644 --- a/src/3rdparty/webkit/WebCore/platform/ScrollView.cpp +++ b/src/3rdparty/webkit/WebCore/platform/ScrollView.cpp @@ -797,6 +797,28 @@ void ScrollView::paint(GraphicsContext* context, const IntRect& rect) } } +bool ScrollView::isPointInScrollbarCorner(const IntPoint& windowPoint) +{ + if (!scrollbarCornerPresent()) + return false; + + IntPoint viewPoint = convertFromContainingWindow(windowPoint); + + if (m_horizontalScrollbar) { + int horizontalScrollbarYMin = m_horizontalScrollbar->frameRect().y(); + int horizontalScrollbarYMax = m_horizontalScrollbar->frameRect().y() + m_horizontalScrollbar->frameRect().height(); + int horizontalScrollbarXMin = m_horizontalScrollbar->frameRect().x() + m_horizontalScrollbar->frameRect().width(); + + return viewPoint.y() > horizontalScrollbarYMin && viewPoint.y() < horizontalScrollbarYMax && viewPoint.x() > horizontalScrollbarXMin; + } + + int verticalScrollbarXMin = m_verticalScrollbar->frameRect().x(); + int verticalScrollbarXMax = m_verticalScrollbar->frameRect().x() + m_verticalScrollbar->frameRect().width(); + int verticalScrollbarYMin = m_verticalScrollbar->frameRect().y() + m_verticalScrollbar->frameRect().height(); + + return viewPoint.x() > verticalScrollbarXMin && viewPoint.x() < verticalScrollbarXMax && viewPoint.y() > verticalScrollbarYMin; +} + bool ScrollView::scrollbarCornerPresent() const { return (m_horizontalScrollbar && width() - m_horizontalScrollbar->width() > 0) || diff --git a/src/3rdparty/webkit/WebCore/platform/ScrollView.h b/src/3rdparty/webkit/WebCore/platform/ScrollView.h index b95032766..4678ad09b 100644 --- a/src/3rdparty/webkit/WebCore/platform/ScrollView.h +++ b/src/3rdparty/webkit/WebCore/platform/ScrollView.h @@ -218,6 +218,7 @@ public: void addPanScrollIcon(const IntPoint&); void removePanScrollIcon(); + virtual bool isPointInScrollbarCorner(const IntPoint&); virtual bool scrollbarCornerPresent() const; virtual IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const; diff --git a/src/3rdparty/webkit/WebCore/platform/ThreadGlobalData.h b/src/3rdparty/webkit/WebCore/platform/ThreadGlobalData.h index e0aa09208..68f5ec04a 100644 --- a/src/3rdparty/webkit/WebCore/platform/ThreadGlobalData.h +++ b/src/3rdparty/webkit/WebCore/platform/ThreadGlobalData.h @@ -38,7 +38,7 @@ namespace WebCore { struct TECConverterWrapper; class ThreadTimers; - class ThreadGlobalData : Noncopyable { + class ThreadGlobalData : public Noncopyable { public: ThreadGlobalData(); ~ThreadGlobalData(); diff --git a/src/3rdparty/webkit/WebCore/platform/ThreadTimers.h b/src/3rdparty/webkit/WebCore/platform/ThreadTimers.h index 366c32073..ea0a366f4 100644 --- a/src/3rdparty/webkit/WebCore/platform/ThreadTimers.h +++ b/src/3rdparty/webkit/WebCore/platform/ThreadTimers.h @@ -37,7 +37,7 @@ namespace WebCore { class TimerBase; // A collection of timers per thread. Kept in ThreadGlobalData. - class ThreadTimers : Noncopyable { + class ThreadTimers : public Noncopyable { public: ThreadTimers(); diff --git a/src/3rdparty/webkit/WebCore/platform/Timer.h b/src/3rdparty/webkit/WebCore/platform/Timer.h index 87235155b..9221df07d 100644 --- a/src/3rdparty/webkit/WebCore/platform/Timer.h +++ b/src/3rdparty/webkit/WebCore/platform/Timer.h @@ -35,7 +35,7 @@ namespace WebCore { class TimerHeapElement; -class TimerBase : Noncopyable { +class TimerBase : public Noncopyable { public: TimerBase(); virtual ~TimerBase(); diff --git a/src/3rdparty/webkit/WebCore/platform/TreeShared.h b/src/3rdparty/webkit/WebCore/platform/TreeShared.h index aaa26aa54..1ac1b3379 100644 --- a/src/3rdparty/webkit/WebCore/platform/TreeShared.h +++ b/src/3rdparty/webkit/WebCore/platform/TreeShared.h @@ -26,7 +26,7 @@ namespace WebCore { -template class TreeShared : Noncopyable { +template class TreeShared : public Noncopyable { public: TreeShared() : m_refCount(0) diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/FontData.h b/src/3rdparty/webkit/WebCore/platform/graphics/FontData.h index cb799197e..76927f5a5 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/FontData.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/FontData.h @@ -32,8 +32,9 @@ namespace WebCore { class SimpleFontData; +class String; -class FontData : Noncopyable { +class FontData : public Noncopyable { public: FontData() : m_maxGlyphPageTreeLevel(0) @@ -51,6 +52,10 @@ public: void setMaxGlyphPageTreeLevel(unsigned level) const { m_maxGlyphPageTreeLevel = level; } unsigned maxGlyphPageTreeLevel() const { return m_maxGlyphPageTreeLevel; } +#ifndef NDEBUG + virtual String description() const = 0; +#endif + private: mutable unsigned m_maxGlyphPageTreeLevel; }; diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/GlyphPageTreeNode.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/GlyphPageTreeNode.cpp index a34a1921e..6419e0c4e 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/GlyphPageTreeNode.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/GlyphPageTreeNode.cpp @@ -29,6 +29,7 @@ #include "config.h" #include "GlyphPageTreeNode.h" +#include "CString.h" #include "CharacterNames.h" #include "SegmentedFontData.h" #include "SimpleFontData.h" @@ -377,4 +378,41 @@ void GlyphPageTreeNode::pruneFontData(const SimpleFontData* fontData, unsigned l it->second->pruneFontData(fontData, level); } +#ifndef NDEBUG + void GlyphPageTreeNode::showSubtree() + { + Vector indent(level()); + indent.fill('\t', level()); + indent.append(0); + + HashMap::iterator end = m_children.end(); + for (HashMap::iterator it = m_children.begin(); it != end; ++it) { + printf("%s\t%p %s\n", indent.data(), it->first, it->first->description().utf8().data()); + it->second->showSubtree(); + } + if (m_systemFallbackChild) { + printf("%s\t* fallback\n", indent.data()); + m_systemFallbackChild->showSubtree(); + } + } +#endif + } + +#ifndef NDEBUG +void showGlyphPageTrees() +{ + printf("Page 0:\n"); + showGlyphPageTree(0); + HashMap::iterator end = WebCore::GlyphPageTreeNode::roots->end(); + for (HashMap::iterator it = WebCore::GlyphPageTreeNode::roots->begin(); it != end; ++it) { + printf("\nPage %d:\n", it->first); + showGlyphPageTree(it->first); + } +} + +void showGlyphPageTree(unsigned pageNumber) +{ + WebCore::GlyphPageTreeNode::getRoot(pageNumber)->showSubtree(); +} +#endif diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/GlyphPageTreeNode.h b/src/3rdparty/webkit/WebCore/platform/graphics/GlyphPageTreeNode.h index 80e87aa66..7918ac5f3 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/GlyphPageTreeNode.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/GlyphPageTreeNode.h @@ -35,6 +35,11 @@ #include #include +#ifndef NDEBUG +void showGlyphPageTrees(); +void showGlyphPageTree(unsigned pageNumber); +#endif + namespace WebCore { class FontData; @@ -210,6 +215,10 @@ private: static GlyphPageTreeNode* getRoot(unsigned pageNumber); void initializePage(const FontData*, unsigned pageNumber); +#ifndef NDEBUG + void showSubtree(); +#endif + GlyphPageTreeNode* m_parent; RefPtr m_page; unsigned m_level; @@ -220,6 +229,8 @@ private: #ifndef NDEBUG unsigned m_pageNumber; + + friend void ::showGlyphPageTree(unsigned pageNumber); #endif }; diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/GlyphWidthMap.h b/src/3rdparty/webkit/WebCore/platform/graphics/GlyphWidthMap.h index e194ecf3b..66dea1fb2 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/GlyphWidthMap.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/GlyphWidthMap.h @@ -39,7 +39,7 @@ typedef unsigned short Glyph; const float cGlyphWidthUnknown = -1; -class GlyphWidthMap : Noncopyable { +class GlyphWidthMap : public Noncopyable { public: GlyphWidthMap() : m_filledPrimaryPage(false) { } ~GlyphWidthMap() { if (m_pages) { deleteAllValues(*m_pages); } } diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/Gradient.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/Gradient.cpp index 51c716274..77a0d21a6 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/Gradient.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/Gradient.cpp @@ -155,4 +155,17 @@ void Gradient::setSpreadMethod(GradientSpreadMethod spreadMethod) m_spreadMethod = spreadMethod; } +void Gradient::setGradientSpaceTransform(const TransformationMatrix& gradientSpaceTransformation) +{ + m_gradientSpaceTransformation = gradientSpaceTransformation; + setPlatformGradientSpaceTransform(gradientSpaceTransformation); +} + +#if !PLATFORM(SKIA) +void Gradient::setPlatformGradientSpaceTransform(const TransformationMatrix&) +{ +} +#endif + + } //namespace diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/Gradient.h b/src/3rdparty/webkit/WebCore/platform/graphics/Gradient.h index efcf0408f..a74b1ef56 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/Gradient.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/Gradient.h @@ -90,11 +90,12 @@ namespace WebCore { void setSpreadMethod(GradientSpreadMethod); GradientSpreadMethod spreadMethod() { return m_spreadMethod; } - void setGradientSpaceTransform(const TransformationMatrix& gradientSpaceTransformation) { m_gradientSpaceTransformation = gradientSpaceTransformation; } + void setGradientSpaceTransform(const TransformationMatrix& gradientSpaceTransformation); // Qt and CG transform the gradient at draw time TransformationMatrix gradientSpaceTransform() { return m_gradientSpaceTransformation; } virtual void fill(GraphicsContext*, const FloatRect&); + void setPlatformGradientSpaceTransform(const TransformationMatrix& gradientSpaceTransformation); private: Gradient(const FloatPoint& p0, const FloatPoint& p1); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsContext.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsContext.cpp index 4dae3d276..3e36f7316 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsContext.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsContext.cpp @@ -214,6 +214,7 @@ void GraphicsContext::setStrokePattern(PassRefPtr pattern) } m_common->state.strokeColorSpace = PatternColorSpace; m_common->state.strokePattern = pattern; + setPlatformStrokePattern(m_common->state.strokePattern.get()); } void GraphicsContext::setFillPattern(PassRefPtr pattern) @@ -225,6 +226,7 @@ void GraphicsContext::setFillPattern(PassRefPtr pattern) } m_common->state.fillColorSpace = PatternColorSpace; m_common->state.fillPattern = pattern; + setPlatformFillPattern(m_common->state.fillPattern.get()); } void GraphicsContext::setStrokeGradient(PassRefPtr gradient) @@ -236,6 +238,7 @@ void GraphicsContext::setStrokeGradient(PassRefPtr gradient) } m_common->state.strokeColorSpace = GradientColorSpace; m_common->state.strokeGradient = gradient; + setPlatformStrokeGradient(m_common->state.strokeGradient.get()); } void GraphicsContext::setFillGradient(PassRefPtr gradient) @@ -247,6 +250,7 @@ void GraphicsContext::setFillGradient(PassRefPtr gradient) } m_common->state.fillColorSpace = GradientColorSpace; m_common->state.fillGradient = gradient; + setPlatformFillGradient(m_common->state.fillGradient.get()); } Gradient* GraphicsContext::fillGradient() const @@ -508,6 +512,24 @@ void GraphicsContext::fillRect(const FloatRect& rect, Generator& generator) generator.fill(this, rect); } +#if !PLATFORM(SKIA) +void GraphicsContext::setPlatformFillGradient(Gradient*) +{ +} + +void GraphicsContext::setPlatformFillPattern(Pattern*) +{ +} + +void GraphicsContext::setPlatformStrokeGradient(Gradient*) +{ +} + +void GraphicsContext::setPlatformStrokePattern(Pattern*) +{ +} +#endif + #if !PLATFORM(CG) && !PLATFORM(SKIA) // Implement this if you want to go ahead and push the drawing mode into your native context // immediately. diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsContext.h b/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsContext.h index 01e2fe634..0237abf78 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsContext.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsContext.h @@ -137,7 +137,7 @@ namespace WebCore { InterpolationHigh }; - class GraphicsContext : Noncopyable { + class GraphicsContext : public Noncopyable { public: GraphicsContext(PlatformGraphicsContext*); ~GraphicsContext(); @@ -364,8 +364,12 @@ namespace WebCore { void setPlatformStrokeColor(const Color&); void setPlatformStrokeStyle(const StrokeStyle&); void setPlatformStrokeThickness(float); + void setPlatformStrokeGradient(Gradient*); + void setPlatformStrokePattern(Pattern*); void setPlatformFillColor(const Color&); + void setPlatformFillGradient(Gradient*); + void setPlatformFillPattern(Pattern*); void setPlatformShouldAntialias(bool b); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsLayer.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsLayer.cpp index 2b85bfa30..b1825481e 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsLayer.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsLayer.cpp @@ -449,6 +449,31 @@ void GraphicsLayer::setZPosition(float position) } #endif +float GraphicsLayer::accumulatedOpacity() const +{ + if (!preserves3D()) + return 1; + + return m_opacity * (parent() ? parent()->accumulatedOpacity() : 1); +} + +void GraphicsLayer::distributeOpacity(float accumulatedOpacity) +{ + // If this is a transform layer we need to distribute our opacity to all our children + + // Incoming accumulatedOpacity is the contribution from our parent(s). We mutiply this by our own + // opacity to get the total contribution + accumulatedOpacity *= m_opacity; + + setOpacityInternal(accumulatedOpacity); + + if (preserves3D()) { + size_t numChildren = children().size(); + for (size_t i = 0; i < numChildren; ++i) + children()[i]->distributeOpacity(accumulatedOpacity); + } +} + static void writeIndent(TextStream& ts, int indent) { for (int i = 0; i != indent; ++i) diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsLayer.h b/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsLayer.h index 9407563ea..3cc11286b 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsLayer.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/GraphicsLayer.h @@ -316,7 +316,12 @@ public: static String propertyIdToString(AnimatedPropertyID); + virtual void distributeOpacity(float); + virtual float accumulatedOpacity() const; + protected: + virtual void setOpacityInternal(float) { } + GraphicsLayer(GraphicsLayerClient*); void dumpProperties(TextStream&, int indent) const; diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/Image.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/Image.cpp index 08d96b450..80b54575d 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/Image.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/Image.cpp @@ -119,7 +119,6 @@ void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const Fl FloatSize scale(scaledTileSize.width() / intrinsicTileSize.width(), scaledTileSize.height() / intrinsicTileSize.height()); - TransformationMatrix patternTransform = TransformationMatrix().scaleNonUniform(scale.width(), scale.height()); FloatRect oneTileRect; oneTileRect.setX(destRect.x() + fmodf(fmodf(-srcPoint.x(), scaledTileSize.width()) - scaledTileSize.width(), scaledTileSize.width())); @@ -137,6 +136,7 @@ void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const Fl return; } + TransformationMatrix patternTransform = TransformationMatrix().scaleNonUniform(scale.width(), scale.height()); FloatRect tileRect(FloatPoint(), intrinsicTileSize); drawPattern(ctxt, tileRect, patternTransform, oneTileRect.location(), op, destRect); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/ImageBuffer.h b/src/3rdparty/webkit/WebCore/platform/graphics/ImageBuffer.h index 573e274a5..841a8914d 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/ImageBuffer.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/ImageBuffer.h @@ -43,7 +43,7 @@ namespace WebCore { class IntRect; class String; - class ImageBuffer : Noncopyable { + class ImageBuffer : public Noncopyable { public: // Will return a null pointer on allocation failure. static PassOwnPtr create(const IntSize& size, bool grayScale) diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/ImageSource.h b/src/3rdparty/webkit/WebCore/platform/graphics/ImageSource.h index e9f066e5e..acb64de84 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/ImageSource.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/ImageSource.h @@ -83,7 +83,7 @@ typedef NativeImageSkia* NativeImagePtr; const int cAnimationLoopOnce = -1; const int cAnimationNone = -2; -class ImageSource : Noncopyable { +class ImageSource : public Noncopyable { public: ImageSource(); ~ImageSource(); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp index 21ce22d92..d4fab5235 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp @@ -229,7 +229,7 @@ void MediaPlayer::load(const String& url, const ContentType& contentType) engine = chooseBestEngineForTypeAndCodecs(type, codecs); // if we didn't find an engine that claims the MIME type, just use the first engine - if (!engine) + if (!engine && !installedMediaEngines().isEmpty()) engine = installedMediaEngines()[0]; // don't delete and recreate the player unless it comes from a different engine @@ -306,6 +306,11 @@ bool MediaPlayer::supportsFullscreen() const return m_private->supportsFullscreen(); } +bool MediaPlayer::supportsSave() const +{ + return m_private->supportsSave(); +} + IntSize MediaPlayer::naturalSize() { return m_private->naturalSize(); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.h b/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.h index 9d9370b7d..7f5f2a04b 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.h @@ -96,7 +96,7 @@ public: #endif }; -class MediaPlayer : Noncopyable { +class MediaPlayer : public Noncopyable { public: MediaPlayer(MediaPlayerClient*); virtual ~MediaPlayer(); @@ -108,6 +108,7 @@ public: static bool isAvailable(); bool supportsFullscreen() const; + bool supportsSave() const; IntSize naturalSize(); bool hasVideo(); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayerPrivate.h b/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayerPrivate.h index 753ccd2e5..6d1359b35 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayerPrivate.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayerPrivate.h @@ -46,7 +46,8 @@ public: virtual void play() = 0; virtual void pause() = 0; - virtual bool supportsFullscreen() const { return false; }; + virtual bool supportsFullscreen() const { return false; } + virtual bool supportsSave() const { return false; } virtual IntSize naturalSize() const = 0; diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/Path.h b/src/3rdparty/webkit/WebCore/platform/graphics/Path.h index 9e2163bb3..04717246d 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/Path.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/Path.h @@ -103,6 +103,9 @@ namespace WebCore { void clear(); bool isEmpty() const; + // Gets the current point of the current path, which is conceptually the final point reached by the path so far. + // Note the Path can be empty (isEmpty() == true) and still have a current point. + bool hasCurrentPoint() const; void moveTo(const FloatPoint&); void addLineTo(const FloatPoint&); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/SegmentedFontData.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/SegmentedFontData.cpp index 1731d16a7..7e1004072 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/SegmentedFontData.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/SegmentedFontData.cpp @@ -26,6 +26,7 @@ #include "config.h" #include "SegmentedFontData.h" +#include "PlatformString.h" #include "SimpleFontData.h" #include @@ -87,4 +88,11 @@ bool SegmentedFontData::isSegmented() const return true; } +#ifndef NDEBUG +String SegmentedFontData::description() const +{ + return "[segmented font]"; +} +#endif + } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/SegmentedFontData.h b/src/3rdparty/webkit/WebCore/platform/graphics/SegmentedFontData.h index 0a7832178..645dc0d5f 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/SegmentedFontData.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/SegmentedFontData.h @@ -59,6 +59,10 @@ public: unsigned numRanges() const { return m_ranges.size(); } const FontDataRange& rangeAt(unsigned i) const { return m_ranges[i]; } +#ifndef NDEBUG + virtual String description() const; +#endif + private: virtual const SimpleFontData* fontDataForCharacter(UChar32) const; virtual bool containsCharacters(const UChar*, int length) const; diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/SimpleFontData.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/SimpleFontData.cpp index bab7d993d..c879228a7 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/SimpleFontData.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/SimpleFontData.cpp @@ -190,4 +190,16 @@ bool SimpleFontData::isSegmented() const return false; } +#ifndef NDEBUG +String SimpleFontData::description() const +{ + if (isSVGFont()) + return "[SVG font]"; + if (isCustomFont()) + return "[custom font]"; + + return platformData().description(); +} +#endif + } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/SimpleFontData.h b/src/3rdparty/webkit/WebCore/platform/graphics/SimpleFontData.h index aab642948..cb472b073 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/SimpleFontData.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/SimpleFontData.h @@ -105,6 +105,10 @@ public: const GlyphData& missingGlyphData() const { return m_missingGlyphData; } +#ifndef NDEBUG + virtual String description() const; +#endif + #if PLATFORM(MAC) NSFont* getNSFont() const { return m_platformData.font(); } #endif diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontCacheQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontCacheQt.cpp index 668912ece..5d29389c9 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontCacheQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontCacheQt.cpp @@ -1,6 +1,8 @@ /* Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) Copyright (C) 2008 Holger Hans Peter Freyther + Copyright (C) 2006, 2008 Apple Inc. All rights reserved. + Copyright (C) 2007 Nicholas Shanks This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -26,10 +28,13 @@ #include "FontDescription.h" #include "FontPlatformData.h" #include "Font.h" +#include "PlatformString.h" #include "StringHash.h" +#include +#include #include -#include +using namespace WTF; namespace WebCore { @@ -47,36 +52,173 @@ void FontCache::getTraitsInFamily(const AtomicString& familyName, Vector FontPlatformDataCache; +// This type must be consistent with FontPlatformData's ctor - the one which +// gets FontDescription as it's parameter. +class FontPlatformDataCacheKey { +public: + FontPlatformDataCacheKey(const FontDescription& description) + : m_familyName() + , m_bold(false) + , m_size(description.computedPixelSize()) + , m_italic(description.italic()) + , m_smallCaps(description.smallCaps()) + , m_hash(0) + { + // FIXME: Map all FontWeight values to QFont weights in FontPlatformData's ctor and follow it here + if (FontPlatformData::toQFontWeight(description.weight()) > QFont::Normal) + m_bold = true; -// using Q_GLOBAL_STATIC leads to crash. TODO investigate the way to fix this. -static FontPlatformDataCache* gFontPlatformDataCache; + const FontFamily* family = &description.family(); + while (family) { + m_familyName.append(family->family()); + family = family->next(); + if (family) + m_familyName.append(','); + } -uint qHash(const FontDescription& key) -{ - uint value = CaseFoldingHash::hash(key.family().family()); - value ^= key.computedPixelSize(); - value ^= static_cast(key.weight()); - return value; -} + computeHash(); + } + + FontPlatformDataCacheKey(const FontPlatformData& fontData) + : m_familyName(static_cast(fontData.family())) + , m_size(fontData.pixelSize()) + , m_bold(fontData.bold()) + , m_italic(fontData.italic()) + , m_smallCaps(fontData.smallCaps()) + , m_hash(0) + { + computeHash(); + } + + FontPlatformDataCacheKey(HashTableDeletedValueType) : m_size(hashTableDeletedSize()) { } + bool isHashTableDeletedValue() const { return m_size == hashTableDeletedSize(); } + + enum HashTableEmptyValueType { HashTableEmptyValue }; + + FontPlatformDataCacheKey(HashTableEmptyValueType) + : m_familyName() + , m_size(0) + , m_bold(false) + , m_italic(false) + , m_smallCaps(false) + , m_hash(0) + { + } + + bool operator==(const FontPlatformDataCacheKey& other) const + { + if (m_hash != other.m_hash) + return false; + + return equalIgnoringCase(m_familyName, other.m_familyName) && m_size == other.m_size && + m_bold == other.m_bold && m_italic == other.m_italic && m_smallCaps == other.m_smallCaps; + } + + unsigned hash() const + { + return m_hash; + } + + void computeHash() + { + unsigned hashCodes[] = { + CaseFoldingHash::hash(m_familyName), + m_size | static_cast(m_bold << sizeof(unsigned) * 8 - 1) + | static_cast(m_italic) << sizeof(unsigned) *8 - 2 + | static_cast(m_smallCaps) << sizeof(unsigned) * 8 - 3 + }; + m_hash = StringImpl::computeHash(reinterpret_cast(hashCodes), sizeof(hashCodes) / sizeof(UChar)); + } + +private: + String m_familyName; + int m_size; + bool m_bold; + bool m_italic; + bool m_smallCaps; + unsigned m_hash; + + static unsigned hashTableDeletedSize() { return 0xFFFFFFFFU; } +}; + +struct FontPlatformDataCacheKeyHash { + static unsigned hash(const FontPlatformDataCacheKey& key) + { + return key.hash(); + } + + static bool equal(const FontPlatformDataCacheKey& a, const FontPlatformDataCacheKey& b) + { + return a == b; + } + + static const bool safeToCompareToEmptyOrDeleted = true; +}; + +struct FontPlatformDataCacheKeyTraits : WTF::GenericHashTraits { + static const bool needsDestruction = true; + static const FontPlatformDataCacheKey& emptyValue() + { + DEFINE_STATIC_LOCAL(FontPlatformDataCacheKey, key, (FontPlatformDataCacheKey::HashTableEmptyValue)); + return key; + } + static void constructDeletedValue(FontPlatformDataCacheKey& slot) + { + new (&slot) FontPlatformDataCacheKey(HashTableDeletedValue); + } + static bool isDeletedValue(const FontPlatformDataCacheKey& value) + { + return value.isHashTableDeletedValue(); + } +}; + +typedef HashMap FontPlatformDataCache; + +// using Q_GLOBAL_STATIC leads to crash. TODO investigate the way to fix this. +static FontPlatformDataCache* gFontPlatformDataCache = 0; FontPlatformData* FontCache::getCachedFontPlatformData(const FontDescription& description, const AtomicString& family, bool checkingAlternateName) { if (!gFontPlatformDataCache) gFontPlatformDataCache = new FontPlatformDataCache; - FontPlatformData* fontData = gFontPlatformDataCache->value(description, 0); - if (!fontData) { - fontData = new FontPlatformData(description); - gFontPlatformDataCache->insert(description, fontData); + FontPlatformDataCacheKey key(description); + FontPlatformData* platformData = gFontPlatformDataCache->get(key); + if (!platformData) { + platformData = new FontPlatformData(description); + gFontPlatformDataCache->add(key, platformData); } - - return fontData; + return platformData; } -SimpleFontData* FontCache::getCachedFontData(const FontPlatformData*) +typedef HashMap, FontPlatformDataCacheKeyHash, FontPlatformDataCacheKeyTraits> FontDataCache; + +static FontDataCache* gFontDataCache = 0; + +static const int cMaxInactiveFontData = 40; +static const int cTargetInactiveFontData = 32; + +static ListHashSet* gInactiveFontDataSet = 0; + +SimpleFontData* FontCache::getCachedFontData(const FontPlatformData* fontPlatformData) { - return 0; + if (!gFontDataCache) { + gFontDataCache = new FontDataCache; + gInactiveFontDataSet = new ListHashSet; + } + + FontPlatformDataCacheKey key(*fontPlatformData); + FontDataCache::iterator it = gFontDataCache->find(key); + if (it == gFontDataCache->end()) { + SimpleFontData* fontData = new SimpleFontData(*fontPlatformData); + gFontDataCache->add(key, std::pair(fontData, 1)); + return fontData; + } + if (!it->second.second++) { + ASSERT(gInactiveFontDataSet->contains(it->second.first)); + gInactiveFontDataSet->remove(it->second.first); + } + return it->second.first; } FontPlatformData* FontCache::getLastResortFallbackFont(const FontDescription&) @@ -84,8 +226,52 @@ FontPlatformData* FontCache::getLastResortFallbackFont(const FontDescription&) return 0; } -void FontCache::releaseFontData(const WebCore::SimpleFontData*) +void FontCache::releaseFontData(const WebCore::SimpleFontData* fontData) { + ASSERT(gFontDataCache); + ASSERT(!fontData->isCustomFont()); + + FontPlatformDataCacheKey key(fontData->platformData()); + FontDataCache::iterator it = gFontDataCache->find(key); + ASSERT(it != gFontDataCache->end()); + if (!--it->second.second) { + gInactiveFontDataSet->add(it->second.first); + if (gInactiveFontDataSet->size() > cMaxInactiveFontData) + purgeInactiveFontData(gInactiveFontDataSet->size() - cTargetInactiveFontData); + } +} + +void FontCache::purgeInactiveFontData(int count) +{ + static bool isPurging; // Guard against reentry when e.g. a deleted FontData releases its small caps FontData. + if (isPurging) + return; + + isPurging = true; + + ListHashSet::iterator it = gInactiveFontDataSet->begin(); + ListHashSet::iterator end = gInactiveFontDataSet->end(); + for (int i = 0; i < count && it != end; ++i, ++it) { + FontPlatformDataCacheKey key = (*it)->platformData(); + pair fontDataPair = gFontDataCache->take(key); + ASSERT(fontDataPair.first != 0); + ASSERT(!fontDataPair.second); + delete fontDataPair.first; + + FontPlatformData* platformData = gFontPlatformDataCache->take(key); + if (platformData) + delete platformData; + } + + if (it == end) { + // Removed everything + gInactiveFontDataSet->clear(); + } else { + for (int i = 0; i < count; ++i) + gInactiveFontDataSet->remove(gInactiveFontDataSet->begin()); + } + + isPurging = false; } void FontCache::addClient(FontSelector*) @@ -98,10 +284,10 @@ void FontCache::removeClient(FontSelector*) void FontCache::invalidate() { - if (!gFontPlatformDataCache) + if (!gFontPlatformDataCache || !gFontDataCache) return; - gFontPlatformDataCache->clear(); + purgeInactiveFontData(); } } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp index 29e77189f..c29fd56f3 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontFallbackListQt.cpp @@ -25,6 +25,7 @@ #include "FontFallbackList.h" #include "Font.h" +#include "FontCache.h" #include "SegmentedFontData.h" #include @@ -58,9 +59,15 @@ void FontFallbackList::invalidate(WTF::PassRefPtr fontSel void FontFallbackList::releaseFontData() { - if (m_fontList.size()) - delete m_fontList[0].first; - m_fontList.clear(); + unsigned numFonts = m_fontList.size(); + for (unsigned i = 0; i < numFonts; ++i) { + if (m_fontList[i].second) + delete m_fontList[i].first; + else { + ASSERT(!m_fontList[i].first->isSegmented()); + fontCache()->releaseFontData(static_cast(m_fontList[i].first)); + } + } } void FontFallbackList::determinePitch(const WebCore::Font* font) const @@ -83,6 +90,14 @@ const FontData* FontFallbackList::fontDataAt(const WebCore::Font* _font, unsigne if (index != 0) return 0; + // Search for the WebCore font that is already in the list + for (int i = m_fontList.size() - 1; i >= 0; --i) { + pair item = m_fontList[i]; + // item.second means that the item was created locally or not + if (!item.second) + return item.first; + } + // Use the FontSelector to get a WebCore font and then fallback to Qt const FontDescription& description = _font->fontDescription(); const FontFamily* family = &description.family(); @@ -92,6 +107,10 @@ const FontData* FontFallbackList::fontDataAt(const WebCore::Font* _font, unsigne if (data) { if (data->isLoading()) m_loadingCustomFonts = true; + if (!data->isCustomFont()) { + // Custom fonts can be freed anytime so we must not hold them + m_fontList.append(pair(data, false)); + } return data; } } @@ -101,8 +120,8 @@ const FontData* FontFallbackList::fontDataAt(const WebCore::Font* _font, unsigne if (m_fontList.size()) return m_fontList[0].first; - const FontData* result = new SimpleFontData(FontPlatformData(description), _font->wordSpacing(), _font->letterSpacing()); - m_fontList.append(pair(result, result->isCustomFont())); + const FontData* result = new SimpleFontData(FontPlatformData(description, _font->wordSpacing(), _font->letterSpacing()), true); + m_fontList.append(pair(result, true)); return result; } diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontPlatformData.h b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontPlatformData.h index 5e97678b8..92219fde6 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontPlatformData.h +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontPlatformData.h @@ -1,6 +1,7 @@ /* Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) Copyright (C) 2008 Holger Hans Peter Freyther + Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -24,11 +25,12 @@ #define FontPlatformData_h #include "FontDescription.h" - #include namespace WebCore { +class String; + class FontPlatformData { public: @@ -39,8 +41,38 @@ public: FontPlatformData(const FontDescription&, int wordSpacing = 0, int letterSpacing = 0); FontPlatformData(const QFont&, bool bold); + static inline QFont::Weight toQFontWeight(FontWeight fontWeight) + { + switch (fontWeight) { + case FontWeight100: + case FontWeight200: + return QFont::Light; // QFont::Light == Weight of 25 + case FontWeight600: + return QFont::DemiBold; // QFont::DemiBold == Weight of 63 + case FontWeight700: + case FontWeight800: + return QFont::Bold; // QFont::Bold == Weight of 75 + case FontWeight900: + return QFont::Black; // QFont::Black == Weight of 87 + case FontWeight300: + case FontWeight400: + case FontWeight500: + default: + return QFont::Normal; // QFont::Normal == Weight of 50 + } + } + QFont font() const { return m_font; } float size() const { return m_size; } + QString family() const { return m_font.family(); } + bool bold() const { return m_bold; } + bool italic() const { return m_font.italic(); } + bool smallCaps() const { return m_font.capitalization() == QFont::SmallCaps; } + int pixelSize() const { return m_font.pixelSize(); } + +#ifndef NDEBUG + String description() const; +#endif float m_size; bool m_bold; diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp index f0dd3ea4a..7709be6b4 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp @@ -1,5 +1,6 @@ /* Copyright (C) 2008 Holger Hans Peter Freyther + Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -21,6 +22,8 @@ #include "config.h" #include "FontPlatformData.h" +#include "PlatformString.h" + namespace WebCore { FontPlatformData::FontPlatformData(const FontDescription& description, int wordSpacing, int letterSpacing) @@ -40,11 +43,9 @@ FontPlatformData::FontPlatformData(const FontDescription& description, int wordS m_font.setFamily(familyName); m_font.setPixelSize(qRound(description.computedSize())); m_font.setItalic(description.italic()); - // FIXME: Map all FontWeight values to QFont weights. - if (description.weight() >= FontWeight600) - m_font.setWeight(QFont::Bold); - else - m_font.setWeight(QFont::Normal); + + m_font.setWeight(toQFontWeight(description.weight())); + m_bold = m_font.bold(); bool smallCaps = description.smallCaps(); m_font.setCapitalization(smallCaps ? QFont::SmallCaps : QFont::MixedCase); @@ -77,4 +78,11 @@ FontPlatformData::FontPlatformData() { } +#ifndef NDEBUG +String FontPlatformData::description() const +{ + return String(); +} +#endif + } diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp index 5a4b7b254..f89ff9f94 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp @@ -47,8 +47,8 @@ namespace WebCore { static const QString qstring(const TextRun& run) { - //We don't detach - return QString::fromRawData((const QChar *)run.characters(), run.length()); + // We don't detach + return QString::fromRawData(reinterpret_cast(run.characters()), run.length()); } static const QString fixSpacing(const QString &string) @@ -57,11 +57,10 @@ static const QString fixSpacing(const QString &string) QString possiblyDetached = string; for (int i = 0; i < string.length(); ++i) { const QChar c = string.at(i); - if (c.unicode() != 0x20 && Font::treatAsSpace(c.unicode())) { - possiblyDetached[i] = 0x20; //detach - } else if (c.unicode() != 0x200c && Font::treatAsZeroWidthSpace(c.unicode())) { - possiblyDetached[i] = 0x200c; //detach - } + if (c.unicode() != 0x20 && Font::treatAsSpace(c.unicode())) + possiblyDetached[i] = 0x20; // detach + else if (c.unicode() != 0x200c && Font::treatAsZeroWidthSpace(c.unicode())) + possiblyDetached[i] = 0x200c; // detach } return possiblyDetached; } diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt43.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt43.cpp index 137b7c97a..45bf05d49 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt43.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt43.cpp @@ -105,9 +105,9 @@ static int generateComponents(Vector* components, const offset += add + letterSpacing + components->last().width; start = 1; // qDebug() << "space at 0" << offset; - } else if (smallCaps) { + } else if (smallCaps) f = (QChar::category(run[0]) == QChar::Letter_Lowercase ? &font.scFont() : &font.font()); - } + for (int i = 1; i < run.length(); ++i) { uint ch = run[i]; if (QChar(ch).isHighSurrogate() && QChar(run[i-1]).isLowSurrogate()) @@ -263,7 +263,7 @@ int Font::offsetForPositionForComplexText(const TextRun& run, int position, bool if (!l.isValid()) return offset; - l.setLineWidth(INT_MAX/256); + l.setLineWidth(INT_MAX / 256); layout.endLayout(); if (position - xs >= l.width()) @@ -272,9 +272,8 @@ int Font::offsetForPositionForComplexText(const TextRun& run, int position, bool if (cursor > 1) --cursor; return offset + cursor; - } else { + } else offset += components.at(i).string.length() - 1; - } } } else { for (int i = 0; i < components.size(); ++i) { @@ -287,7 +286,7 @@ int Font::offsetForPositionForComplexText(const TextRun& run, int position, bool if (!l.isValid()) return offset; - l.setLineWidth(INT_MAX/256); + l.setLineWidth(INT_MAX / 256); layout.endLayout(); if (position - xs >= l.width()) @@ -296,9 +295,8 @@ int Font::offsetForPositionForComplexText(const TextRun& run, int position, bool if (cursor > 1) --cursor; return offset + cursor; - } else { + } else offset += components.at(i).string.length() - 1; - } } } return run.length(); @@ -321,7 +319,7 @@ static float cursorToX(const Vector& components, int wid if (!l.isValid()) return 0; - l.setLineWidth(INT_MAX/256); + l.setLineWidth(INT_MAX / 256); layout.endLayout(); return xs + l.cursorToX(cursor - start + 1); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GradientQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GradientQt.cpp index 1e71f5860..9b9acc28b 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GradientQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GradientQt.cpp @@ -67,7 +67,7 @@ QGradient* Gradient::platformGradient() ++stopIterator; } - switch(m_spreadMethod) { + switch (m_spreadMethod) { case SpreadMethodPad: m_gradient->setSpread(QGradient::PadSpread); break; diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp index 8503fb521..a35c5ac26 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp @@ -155,7 +155,7 @@ static Qt::PenStyle toQPenStyle(StrokeStyle style) static inline Qt::FillRule toQtFillRule(WindRule rule) { - switch(rule) { + switch (rule) { case RULE_EVENODD: return Qt::OddEvenFill; case RULE_NONZERO: @@ -165,8 +165,7 @@ static inline Qt::FillRule toQtFillRule(WindRule rule) return Qt::OddEvenFill; } -struct TransparencyLayer -{ +struct TransparencyLayer { TransparencyLayer(const QPainter* p, const QRect &rect) : pixmap(rect.width(), rect.height()) { @@ -198,8 +197,7 @@ private: TransparencyLayer & operator=(const TransparencyLayer &) { return *this; } }; -class GraphicsContextPlatformPrivate -{ +class GraphicsContextPlatformPrivate { public: GraphicsContextPlatformPrivate(QPainter* painter); ~GraphicsContextPlatformPrivate(); @@ -217,7 +215,7 @@ public: bool antiAliasingForRectsAndLines; - QStack layers; + QStack layers; QPainter* redirect; QBrush solidColor; @@ -242,9 +240,8 @@ GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate(QPainter* p) antiAliasingForRectsAndLines = painter->testRenderHint(QPainter::Antialiasing); // FIXME: Maybe only enable in SVG mode? painter->setRenderHint(QPainter::Antialiasing, true); - } else { + } else antiAliasingForRectsAndLines = false; - } } GraphicsContextPlatformPrivate::~GraphicsContextPlatformPrivate() @@ -265,7 +262,7 @@ GraphicsContext::GraphicsContext(PlatformGraphicsContext* context) GraphicsContext::~GraphicsContext() { - while(!m_data->layers.isEmpty()) + while (!m_data->layers.isEmpty()) endTransparencyLayer(); destroyGraphicsContextPrivate(m_common); @@ -280,7 +277,7 @@ PlatformGraphicsContext* GraphicsContext::platformContext() const TransformationMatrix GraphicsContext::getCTM() const { QTransform matrix(platformContext()->combinedTransform()); - return TransformationMatrix(matrix.m11(), matrix.m12(), 0, matrix.m13(), + return TransformationMatrix(matrix.m11(), matrix.m12(), 0, matrix.m13(), matrix.m21(), matrix.m22(), 0, matrix.m23(), 0, 0, 1, 0, matrix.m31(), matrix.m32(), 0, matrix.m33()); @@ -1126,8 +1123,9 @@ void GraphicsContext::concatCTM(const TransformationMatrix& transform) m_data->p()->setWorldTransform(transform, true); - // Transformations to the context shouldn't transform the currentPath. - // We have to undo every change made to the context from the currentPath to avoid wrong drawings. + // Transformations to the context shouldn't transform the currentPath. + // We have to undo every change made to the context from the currentPath + // to avoid wrong drawings. if (!m_data->currentPath.isEmpty() && transform.isInvertible()) { QTransform matrix = transform.inverse(); m_data->currentPath = m_data->currentPath * matrix; @@ -1210,7 +1208,7 @@ HDC GraphicsContext::getWindowsContext(const IntRect& dstRect, bool supportAlpha bitmapInfo.bmiHeader.biClrImportant = 0; void* pixels = 0; - HBITMAP bitmap = ::CreateDIBSection(NULL, &bitmapInfo, DIB_RGB_COLORS, &pixels, 0, 0); + HBITMAP bitmap = ::CreateDIBSection(0, &bitmapInfo, DIB_RGB_COLORS, &pixels, 0, 0); if (!bitmap) return 0; diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/IconQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/IconQt.cpp index c9f3ced7e..34c3c472a 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/IconQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/IconQt.cpp @@ -39,7 +39,7 @@ Icon::Icon() Icon::~Icon() { } - + PassRefPtr Icon::createIconForFile(const String& filename) { RefPtr i = adoptRef(new Icon); @@ -57,9 +57,8 @@ void Icon::paint(GraphicsContext* ctx, const IntRect& rect) { QPixmap px = m_icon.pixmap(rect.size()); QPainter *p = static_cast(ctx->platformContext()); - if (p && !px.isNull()) { + if (p && !px.isNull()) p->drawPixmap(rect.x(), rect.y(), px); - } } } diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp index 9a7fd75ed..669be1c0d 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp @@ -118,7 +118,7 @@ ImageDecoderQt::ReadContext::ReadResult // Attempt to construct an empty image of the matching size and format // for efficient reading QImage newImage = m_dataFormat != QImage::Format_Invalid ? - QImage(m_size,m_dataFormat) : QImage(); + QImage(m_size, m_dataFormat) : QImage(); m_target.push_back(ImageData(newImage)); } @@ -137,8 +137,8 @@ ImageDecoderQt::ReadContext::ReadResult const bool supportsAnimation = m_reader.supportsAnimation(); if (debugImageDecoderQt) - qDebug() << "readImage(): #" << m_target.size() << " complete, " << m_size << " format " << m_dataFormat - << " supportsAnimation=" << supportsAnimation ; + qDebug() << "readImage(): #" << m_target.size() << " complete, " << m_size + << " format " << m_dataFormat << " supportsAnimation=" << supportsAnimation; // No point in readinfg further if (!supportsAnimation) return ReadComplete; @@ -158,7 +158,7 @@ ImageDecoderQt::ReadContext::IncrementalReadResult // set state to reflect complete header, etc. // For now, we read the whole image. - const qint64 startPos = m_buffer.pos (); + const qint64 startPos = m_buffer.pos(); // Oops, failed. Rewind. if (!m_reader.read(&imageData.m_image)) { m_buffer.seek(startPos); @@ -236,7 +236,7 @@ void ImageDecoderQt::setData(const IncomingData &data, bool allDataReceived) if (debugImageDecoderQt) qDebug() << " read returns " << readResult; - switch ( readResult) { + switch (readResult) { case ReadContext::ReadFailed: m_failed = true; break; diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageQt.cpp index a2e96f340..5d40e26ad 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageQt.cpp @@ -83,7 +83,6 @@ bool FrameData::clear(bool clearMetadata) } - // ================================================ // Image Class // ================================================ @@ -93,7 +92,6 @@ PassRefPtr Image::loadPlatformResource(const char* name) return StillImage::create(loadResourcePixmap(name)); } - void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const TransformationMatrix& patternTransform, const FloatPoint& phase, CompositeOperator op, const FloatRect& destRect) { @@ -103,9 +101,8 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const QPixmap pixmap = *framePixmap; QRect tr = QRectF(tileRect).toRect(); - if (tr.x() || tr.y() || tr.width() != pixmap.width() || tr.height() != pixmap.height()) { + if (tr.x() || tr.y() || tr.width() != pixmap.width() || tr.height() != pixmap.height()) pixmap = pixmap.copy(tr); - } QBrush b(pixmap); b.setTransform(patternTransform); @@ -129,7 +126,7 @@ void BitmapImage::initPlatformData() void BitmapImage::invalidatePlatformData() { } - + // Drawing Routines void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dst, const FloatRect& src, CompositeOperator op) @@ -139,7 +136,7 @@ void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dst, QPixmap* image = nativeImageForCurrentFrame(); if (!image) return; - + if (mayFillWithSolidColor()) { fillWithSolidColor(ctxt, dst, solidColor(), op); return; @@ -158,7 +155,7 @@ void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dst, painter->setCompositionMode(QPainter::CompositionMode_Source); // Test using example site at - // http://www.meyerweb.com/eric/css/edge/complexspiral/demo.html + // http://www.meyerweb.com/eric/css/edge/complexspiral/demo.html painter->drawPixmap(dst, *image, src); ctxt->restore(); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageSourceQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageSourceQt.cpp index 621728e72..1ffc1eb37 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageSourceQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageSourceQt.cpp @@ -124,7 +124,7 @@ float ImageSource::frameDurationAtIndex(size_t index) { if (!m_decoder) return 0; - + // Many annoying ads specify a 0 duration to make an image flash as quickly // as possible. We follow WinIE's behavior and use a duration of 100 ms // for any frames that specify a duration of <= 50 ms. See @@ -138,17 +138,17 @@ bool ImageSource::frameHasAlphaAtIndex(size_t index) { if (!m_decoder || !m_decoder->supportsAlpha()) return false; - - const QPixmap* source = m_decoder->imageAtIndex( index); + + const QPixmap* source = m_decoder->imageAtIndex(index); if (!source) return false; - + return source->hasAlphaChannel(); } bool ImageSource::frameIsCompleteAtIndex(size_t index) { - return (m_decoder && m_decoder->imageAtIndex(index) != 0); + return (m_decoder && m_decoder->imageAtIndex(index)); } void ImageSource::clear(bool destroyAll, size_t clearBeforeFrame, SharedBuffer* data, bool allDataReceived) diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp index 896e3b8fc..76b14943a 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp @@ -43,7 +43,7 @@ using namespace Phonon; -#define LOG_MEDIAOBJECT() (LOG(Media,"%s", debugMediaObject(this, *m_mediaObject).constData())) +#define LOG_MEDIAOBJECT() (LOG(Media, "%s", debugMediaObject(this, *m_mediaObject).constData())) static QByteArray debugMediaObject(WebCore::MediaPlayerPrivate* mediaPlayer, const MediaObject& mediaObject) { @@ -97,9 +97,8 @@ MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player) // Make sure we get updates for each frame m_videoWidget->installEventFilter(this); - foreach(QWidget* widget, qFindChildren(m_videoWidget)) { + foreach (QWidget* widget, qFindChildren(m_videoWidget)) widget->installEventFilter(this); - } connect(m_mediaObject, SIGNAL(stateChanged(Phonon::State, Phonon::State)), this, SLOT(stateChanged(Phonon::State, Phonon::State))); @@ -114,8 +113,8 @@ MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player) connect(m_mediaObject, SIGNAL(totalTimeChanged(qint64)), this, SLOT(totalTimeChanged(qint64))); } -MediaPlayerPrivateInterface* MediaPlayerPrivate::create(MediaPlayer* player) -{ +MediaPlayerPrivateInterface* MediaPlayerPrivate::create(MediaPlayer* player) +{ return new MediaPlayerPrivate(player); } @@ -266,7 +265,7 @@ float MediaPlayerPrivate::maxTimeSeekable() const } unsigned MediaPlayerPrivate::bytesLoaded() const -{ +{ notImplemented(); return 0; } @@ -346,9 +345,8 @@ void MediaPlayerPrivate::updateStates() m_networkState = MediaPlayer::NetworkError; m_readyState = MediaPlayer::HaveNothing; cancelLoad(); - } else { + } else m_mediaObject->pause(); - } } if (seeking()) diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp index fde6ea30b..39e243ecb 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp @@ -170,8 +170,8 @@ void Path::addArcTo(const FloatPoint& p1, const FloatPoint& p2, float radius) return; } - FloatPoint p1p0((p0.x() - p1.x()),(p0.y() - p1.y())); - FloatPoint p1p2((p2.x() - p1.x()),(p2.y() - p1.y())); + FloatPoint p1p0((p0.x() - p1.x()), (p0.y() - p1.y())); + FloatPoint p1p2((p2.x() - p1.x()), (p2.y() - p1.y())); float p1p0_length = sqrtf(p1p0.x() * p1p0.x() + p1p0.y() * p1p0.y()); float p1p2_length = sqrtf(p1p2.x() * p1p2.x() + p1p2.y() * p1p2.y()); @@ -216,7 +216,7 @@ void Path::addArcTo(const FloatPoint& p1, const FloatPoint& p2, float radius) float factor_p1p2 = tangent / p1p2_length; FloatPoint t_p1p2((p1.x() + factor_p1p2 * p1p2.x()), (p1.y() + factor_p1p2 * p1p2.y())); - FloatPoint orth_p1p2((t_p1p2.x() - p.x()),(t_p1p2.y() - p.y())); + FloatPoint orth_p1p2((t_p1p2.x() - p.x()), (t_p1p2.y() - p.y())); float orth_p1p2_length = sqrtf(orth_p1p2.x() * orth_p1p2.x() + orth_p1p2.y() * orth_p1p2.y()); float ea = acos(orth_p1p2.x() / orth_p1p2_length); if (orth_p1p2.y() < 0) @@ -300,7 +300,12 @@ bool Path::isEmpty() const { // Don't use QPainterPath::isEmpty(), as that also returns true if there's only // one initial MoveTo element in the path. - return m_path->elementCount() == 0; + return !m_path->elementCount(); +} + +bool Path::hasCurrentPoint() const +{ + return !isEmpty(); } String Path::debugString() const diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/TransformationMatrixQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/TransformationMatrixQt.cpp index 15f0cc539..37b86f30f 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/TransformationMatrixQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/TransformationMatrixQt.cpp @@ -32,7 +32,7 @@ namespace WebCore { TransformationMatrix::operator QTransform() const -{ +{ return QTransform(m11(), m12(), m14(), m21(), m22(), m24(), m41(), m42(), m44()); } diff --git a/src/3rdparty/webkit/WebCore/platform/mac/LocalCurrentGraphicsContext.h b/src/3rdparty/webkit/WebCore/platform/mac/LocalCurrentGraphicsContext.h index 1c5cae7f4..90beb401f 100644 --- a/src/3rdparty/webkit/WebCore/platform/mac/LocalCurrentGraphicsContext.h +++ b/src/3rdparty/webkit/WebCore/platform/mac/LocalCurrentGraphicsContext.h @@ -31,7 +31,7 @@ class GraphicsContext; // This class automatically saves and restores the current NSGraphicsContext for // functions which call out into AppKit and rely on the currentContext being set -class LocalCurrentGraphicsContext : Noncopyable { +class LocalCurrentGraphicsContext : public Noncopyable { public: LocalCurrentGraphicsContext(GraphicsContext* graphicsContext); ~LocalCurrentGraphicsContext(); diff --git a/src/3rdparty/webkit/WebCore/platform/mac/RuntimeApplicationChecks.h b/src/3rdparty/webkit/WebCore/platform/mac/RuntimeApplicationChecks.h index 44eedfad5..f9c7079ed 100644 --- a/src/3rdparty/webkit/WebCore/platform/mac/RuntimeApplicationChecks.h +++ b/src/3rdparty/webkit/WebCore/platform/mac/RuntimeApplicationChecks.h @@ -30,6 +30,7 @@ namespace WebCore { bool applicationIsAppleMail(); bool applicationIsSafari(); +bool applicationIsMicrosoftMessenger(); } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/platform/mac/RuntimeApplicationChecks.mm b/src/3rdparty/webkit/WebCore/platform/mac/RuntimeApplicationChecks.mm index 16701853f..a3c4aa5ee 100644 --- a/src/3rdparty/webkit/WebCore/platform/mac/RuntimeApplicationChecks.mm +++ b/src/3rdparty/webkit/WebCore/platform/mac/RuntimeApplicationChecks.mm @@ -41,4 +41,10 @@ bool applicationIsSafari() return isSafari; } +bool applicationIsMicrosoftMessenger() +{ + static bool isMicrosoftMessenger = [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.microsoft.Messenger"]; + return isMicrosoftMessenger; +} + } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/platform/network/FormDataBuilder.h b/src/3rdparty/webkit/WebCore/platform/network/FormDataBuilder.h index 666f0c18e..286f59f54 100644 --- a/src/3rdparty/webkit/WebCore/platform/network/FormDataBuilder.h +++ b/src/3rdparty/webkit/WebCore/platform/network/FormDataBuilder.h @@ -30,7 +30,7 @@ class CString; class Document; class TextEncoding; -class FormDataBuilder : Noncopyable { +class FormDataBuilder : public Noncopyable { public: FormDataBuilder(); ~FormDataBuilder(); diff --git a/src/3rdparty/webkit/WebCore/platform/network/ResourceHandle.h b/src/3rdparty/webkit/WebCore/platform/network/ResourceHandle.h index f0e1e944f..4cb3561b8 100644 --- a/src/3rdparty/webkit/WebCore/platform/network/ResourceHandle.h +++ b/src/3rdparty/webkit/WebCore/platform/network/ResourceHandle.h @@ -191,12 +191,6 @@ public: void fireFailure(Timer*); private: -#if USE(SOUP) - bool startData(String urlString); - bool startHttp(String urlString); - bool startGio(KURL url); -#endif - void scheduleFailure(FailureType); bool start(Frame*); diff --git a/src/3rdparty/webkit/WebCore/platform/network/ResourceHandleInternal.h b/src/3rdparty/webkit/WebCore/platform/network/ResourceHandleInternal.h index 676129a42..091a26b0d 100644 --- a/src/3rdparty/webkit/WebCore/platform/network/ResourceHandleInternal.h +++ b/src/3rdparty/webkit/WebCore/platform/network/ResourceHandleInternal.h @@ -75,7 +75,7 @@ class NSURLConnection; namespace WebCore { class ResourceHandleClient; - class ResourceHandleInternal : Noncopyable { + class ResourceHandleInternal : public Noncopyable { public: ResourceHandleInternal(ResourceHandle* loader, const ResourceRequest& request, ResourceHandleClient* c, bool defersLoading, bool shouldContentSniff, bool mightDownloadFromHandle) : m_client(c) diff --git a/src/3rdparty/webkit/WebCore/platform/qt/ClipboardQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/ClipboardQt.cpp index fddda0146..82b12a8cd 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/ClipboardQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/ClipboardQt.cpp @@ -61,9 +61,9 @@ ClipboardQt::ClipboardQt(ClipboardAccessPolicy policy, const QMimeData* readable : Clipboard(policy, true) , m_readableData(readableClipboard) , m_writableData(0) -{ +{ Q_ASSERT(policy == ClipboardReadable || policy == ClipboardTypesReadable); -} +} ClipboardQt::ClipboardQt(ClipboardAccessPolicy policy, bool forDragging) : Clipboard(policy, forDragging) @@ -76,7 +76,7 @@ ClipboardQt::ClipboardQt(ClipboardAccessPolicy policy, bool forDragging) if (policy != ClipboardWritable) { Q_ASSERT(!forDragging); m_readableData = QApplication::clipboard()->mimeData(); - } + } #endif } @@ -104,7 +104,7 @@ void ClipboardQt::clearData(const String& type) if (format != toClearType) formats[format] = m_writableData->data(format); } - + m_writableData->clear(); QMap::const_iterator it, end = formats.constEnd(); for (it = formats.begin(); it != end; ++it) @@ -122,11 +122,11 @@ void ClipboardQt::clearData(const String& type) #endif } -void ClipboardQt::clearAllData() +void ClipboardQt::clearAllData() { if (policy() != ClipboardWritable) return; - + #ifndef QT_NO_CLIPBOARD if (!isForDragging()) QApplication::clipboard()->setMimeData(0); @@ -136,21 +136,21 @@ void ClipboardQt::clearAllData() m_writableData = 0; } -String ClipboardQt::getData(const String& type, bool& success) const +String ClipboardQt::getData(const String& type, bool& success) const { if (policy() != ClipboardReadable) { success = false; return String(); } - + ASSERT(m_readableData); QByteArray data = m_readableData->data(QString(type)); success = !data.isEmpty(); return String(data.data(), data.size()); } -bool ClipboardQt::setData(const String& type, const String& data) +bool ClipboardQt::setData(const String& type, const String& data) { if (policy() != ClipboardWritable) return false; @@ -187,7 +187,7 @@ PassRefPtr ClipboardQt::files() const return 0; } -void ClipboardQt::setDragImage(CachedImage* image, const IntPoint& point) +void ClipboardQt::setDragImage(CachedImage* image, const IntPoint& point) { setDragImage(image, 0, point); } @@ -207,7 +207,7 @@ void ClipboardQt::setDragImage(CachedImage* image, Node *node, const IntPoint &l m_dragImage = image; if (m_dragImage) m_dragImage->addClient(this); - + m_dragLoc = loc; m_dragImageElement = node; } @@ -226,9 +226,9 @@ static CachedImage* getCachedImage(Element* element) // Attempt to pull CachedImage from element ASSERT(element); RenderObject* renderer = element->renderer(); - if (!renderer || !renderer->isImage()) + if (!renderer || !renderer->isImage()) return 0; - + RenderImage* image = static_cast(renderer); if (image->cachedImage() && !image->cachedImage()->errorOccurred()) return image->cachedImage(); @@ -236,7 +236,7 @@ static CachedImage* getCachedImage(Element* element) return 0; } -void ClipboardQt::declareAndWriteDragImage(Element* element, const KURL& url, const String& title, Frame* frame) +void ClipboardQt::declareAndWriteDragImage(Element* element, const KURL& url, const String& title, Frame* frame) { ASSERT(frame); Q_UNUSED(url); @@ -254,11 +254,11 @@ void ClipboardQt::declareAndWriteDragImage(Element* element, const KURL& url, co m_writableData->setImageData(*pixmap); AtomicString imageURL = element->getAttribute(HTMLNames::srcAttr); - if (imageURL.isEmpty()) + if (imageURL.isEmpty()) return; - KURL fullURL = frame->document()->completeURL(parseURL(imageURL)); - if (fullURL.isEmpty()) + KURL fullURL = frame->document()->completeURL(deprecatedParseURL(imageURL)); + if (fullURL.isEmpty()) return; QList urls; @@ -274,7 +274,7 @@ void ClipboardQt::declareAndWriteDragImage(Element* element, const KURL& url, co void ClipboardQt::writeURL(const KURL& url, const String& title, Frame* frame) { ASSERT(frame); - + QList urls; urls.append(frame->document()->completeURL(url.string())); if (!m_writableData) @@ -287,11 +287,11 @@ void ClipboardQt::writeURL(const KURL& url, const String& title, Frame* frame) #endif } -void ClipboardQt::writeRange(Range* range, Frame* frame) +void ClipboardQt::writeRange(Range* range, Frame* frame) { ASSERT(range); ASSERT(frame); - + if (!m_writableData) m_writableData = new QMimeData; QString text = frame->selectedText(); @@ -304,7 +304,7 @@ void ClipboardQt::writeRange(Range* range, Frame* frame) #endif } -bool ClipboardQt::hasData() +bool ClipboardQt::hasData() { const QMimeData *data = m_readableData ? m_readableData : m_writableData; if (!data) diff --git a/src/3rdparty/webkit/WebCore/platform/qt/ClipboardQt.h b/src/3rdparty/webkit/WebCore/platform/qt/ClipboardQt.h index 44324f2f8..9a918ed96 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/ClipboardQt.h +++ b/src/3rdparty/webkit/WebCore/platform/qt/ClipboardQt.h @@ -49,12 +49,12 @@ namespace WebCore { return adoptRef(new ClipboardQt(policy, forDragging)); } virtual ~ClipboardQt(); - + void clearData(const String& type); void clearAllData(); String getData(const String& type, bool& success) const; bool setData(const String& type, const String& data); - + // extensions beyond IE's API virtual HashSet types() const; virtual PassRefPtr files() const; @@ -68,10 +68,10 @@ namespace WebCore { virtual void writeRange(Range*, Frame*); virtual bool hasData(); - + QMimeData* clipboardData() const { return m_writableData; } void invalidateWritableData() { m_writableData = 0; } - + private: ClipboardQt(ClipboardAccessPolicy, const QMimeData* readableClipboard); @@ -79,10 +79,10 @@ namespace WebCore { ClipboardQt(ClipboardAccessPolicy, bool forDragging); void setDragImage(CachedImage*, Node*, const IntPoint& loc); - + const QMimeData* m_readableData; QMimeData* m_writableData; }; -} +} #endif // ClipboardQt_h diff --git a/src/3rdparty/webkit/WebCore/platform/qt/ContextMenuItemQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/ContextMenuItemQt.cpp index c71eacd85..cf2358736 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/ContextMenuItemQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/ContextMenuItemQt.cpp @@ -68,7 +68,7 @@ void ContextMenuItem::setType(ContextMenuItemType type) } ContextMenuAction ContextMenuItem::action() const -{ +{ return m_platformDescription.action; } @@ -77,7 +77,7 @@ void ContextMenuItem::setAction(ContextMenuAction action) m_platformDescription.action = action; } -String ContextMenuItem::title() const +String ContextMenuItem::title() const { return m_platformDescription.title; } diff --git a/src/3rdparty/webkit/WebCore/platform/qt/CursorQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/CursorQt.cpp index 0d7e10098..aad84be12 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/CursorQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/CursorQt.cpp @@ -254,7 +254,7 @@ const Cursor& rowResizeCursor() { return Cursors::self()->SplitVCursor; } - + const Cursor& middlePanningCursor() { return moveCursor(); @@ -298,7 +298,7 @@ const Cursor& southWestPanningCursor() const Cursor& westPanningCursor() { return westResizeCursor(); -} +} const Cursor& verticalTextCursor() { @@ -342,7 +342,7 @@ const Cursor& noneCursor() const Cursor& notAllowedCursor() { - return Cursors::self()->NoDropCursor; + return Cursors::self()->NoDropCursor; } const Cursor& zoomInCursor() diff --git a/src/3rdparty/webkit/WebCore/platform/qt/DragDataQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/DragDataQt.cpp index bc5cce12f..7b1eff8ce 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/DragDataQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/DragDataQt.cpp @@ -42,7 +42,7 @@ bool DragData::canSmartReplace() const { return false; } - + bool DragData::containsColor() const { if (!m_platformDragData) @@ -55,11 +55,11 @@ bool DragData::containsFiles() const if (!m_platformDragData) return false; QList urls = m_platformDragData->urls(); - foreach(const QUrl &url, urls) { + foreach (const QUrl &url, urls) { if (!url.toLocalFile().isEmpty()) return true; } - return false; + return false; } void DragData::asFilenames(Vector& result) const @@ -67,7 +67,7 @@ void DragData::asFilenames(Vector& result) const if (!m_platformDragData) return; QList urls = m_platformDragData->urls(); - foreach(const QUrl &url, urls) { + foreach (const QUrl &url, urls) { QString file = url.toLocalFile(); if (!file.isEmpty()) result.append(file); @@ -88,12 +88,11 @@ String DragData::asPlainText() const String text = m_platformDragData->text(); if (!text.isEmpty()) return text; - + // FIXME: Should handle rich text here - return asURL(0); } - + Color DragData::asColor() const { if (!m_platformDragData) @@ -105,21 +104,21 @@ PassRefPtr DragData::createClipboard(ClipboardAccessPolicy policy) co { return ClipboardQt::create(policy, m_platformDragData); } - + bool DragData::containsCompatibleContent() const { if (!m_platformDragData) return false; return containsColor() || containsURL() || m_platformDragData->hasHtml() || m_platformDragData->hasText(); } - + bool DragData::containsURL() const { if (!m_platformDragData) return false; return m_platformDragData->hasUrls(); } - + String DragData::asURL(String* title) const { if (!m_platformDragData) @@ -131,15 +130,14 @@ String DragData::asURL(String* title) const return urls.first().toString(); } - - + PassRefPtr DragData::asFragment(Document* doc) const { if (m_platformDragData && m_platformDragData->hasHtml()) return createFragmentFromMarkup(doc, m_platformDragData->html(), ""); - + return 0; } - + } diff --git a/src/3rdparty/webkit/WebCore/platform/qt/DragImageQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/DragImageQt.cpp index c9cdd8dd8..3a077e1c0 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/DragImageQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/DragImageQt.cpp @@ -44,20 +44,20 @@ DragImageRef scaleDragImage(DragImageRef image, FloatSize) { return image; } - + DragImageRef dissolveDragImageToFraction(DragImageRef image, float) { return image; } - + DragImageRef createDragImageFromImage(Image*) { return 0; } - + DragImageRef createDragImageIconForCachedImage(CachedImage*) { - return 0; + return 0; } - + } diff --git a/src/3rdparty/webkit/WebCore/platform/qt/FileSystemQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/FileSystemQt.cpp index bc9d2f4f3..28d3ca7b4 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/FileSystemQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/FileSystemQt.cpp @@ -64,7 +64,7 @@ bool getFileSize(const String& path, long long& result) { QFileInfo info(path); result = info.size(); - return info.exists(); + return info.exists(); } bool getFileModificationTime(const String& path, time_t& result) @@ -156,7 +156,7 @@ bool unloadModule(PlatformModule module) delete module; return true; } - + return false; #endif } diff --git a/src/3rdparty/webkit/WebCore/platform/qt/Localizations.cpp b/src/3rdparty/webkit/WebCore/platform/qt/Localizations.cpp index 57a5e99db..d1853fc5e 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/Localizations.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/Localizations.cpp @@ -60,7 +60,7 @@ String searchableIndexIntroduction() { return QCoreApplication::translate("QWebPage", "This is a searchable index. Enter search keywords: ", "text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index'"); } - + String fileButtonChooseFileLabel() { return QCoreApplication::translate("QWebPage", "Choose File", "title for file button used in HTML forms"); @@ -183,7 +183,7 @@ String contextMenuItemTagSpellingMenu() String contextMenuItemTagShowSpellingPanel(bool show) { - return show ? QCoreApplication::translate("QWebPage", "Show Spelling and Grammar", "menu item title") : + return show ? QCoreApplication::translate("QWebPage", "Show Spelling and Grammar", "menu item title") : QCoreApplication::translate("QWebPage", "Hide Spelling and Grammar", "menu item title"); } diff --git a/src/3rdparty/webkit/WebCore/platform/qt/MIMETypeRegistryQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/MIMETypeRegistryQt.cpp index 2b5968a3d..22cee6f76 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/MIMETypeRegistryQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/MIMETypeRegistryQt.cpp @@ -36,7 +36,7 @@ struct ExtensionMap { const char* mimeType; }; -static const ExtensionMap extensionMap [] = { +static const ExtensionMap extensionMap[] = { { "bmp", "image/bmp" }, { "css", "text/css" }, { "gif", "image/gif" }, diff --git a/src/3rdparty/webkit/WebCore/platform/qt/PasteboardQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/PasteboardQt.cpp index b535a74e3..8a377ad70 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/PasteboardQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/PasteboardQt.cpp @@ -44,8 +44,8 @@ #define methodDebug() qDebug() << "PasteboardQt: " << __FUNCTION__; namespace WebCore { - -Pasteboard::Pasteboard() + +Pasteboard::Pasteboard() : m_selectionMode(false) { } @@ -71,7 +71,7 @@ void Pasteboard::writeSelection(Range* selectedRange, bool, Frame* frame) md->setHtml(html); #ifndef QT_NO_CLIPBOARD - QApplication::clipboard()->setMimeData(md, m_selectionMode ? + QApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard); #endif } @@ -84,7 +84,7 @@ bool Pasteboard::canSmartReplace() String Pasteboard::plainText(Frame*) { #ifndef QT_NO_CLIPBOARD - return QApplication::clipboard()->text(m_selectionMode ? + return QApplication::clipboard()->text(m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard); #else return String(); diff --git a/src/3rdparty/webkit/WebCore/platform/qt/PlatformKeyboardEventQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/PlatformKeyboardEventQt.cpp index 955da9bd5..43a294ba1 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/PlatformKeyboardEventQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/PlatformKeyboardEventQt.cpp @@ -493,7 +493,7 @@ PlatformKeyboardEvent::PlatformKeyboardEvent(QKeyEvent* event) m_autoRepeat = event->isAutoRepeat(); m_ctrlKey = (state & Qt::ControlModifier) != 0; m_altKey = (state & Qt::AltModifier) != 0; - m_metaKey = (state & Qt::MetaModifier) != 0; + m_metaKey = (state & Qt::MetaModifier) != 0; m_windowsVirtualKeyCode = windowsKeyCodeForKeyEvent(event->key()); m_nativeVirtualKeyCode = event->nativeVirtualKey(); m_isKeypad = (state & Qt::KeypadModifier) != 0; diff --git a/src/3rdparty/webkit/WebCore/platform/qt/PlatformMouseEventQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/PlatformMouseEventQt.cpp index ba7a4ad80..6c1d82d45 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/PlatformMouseEventQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/PlatformMouseEventQt.cpp @@ -38,9 +38,9 @@ PlatformMouseEvent::PlatformMouseEvent(QInputEvent* event, int clickCount) { m_timestamp = WTF::currentTime(); - QMouseEvent *me = 0; + QMouseEvent* me = 0; - switch(event->type()) { + switch (event->type()) { case QEvent::MouseMove: m_eventType = MouseEventMoved; me = static_cast(event); diff --git a/src/3rdparty/webkit/WebCore/platform/qt/PopupMenuQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/PopupMenuQt.cpp index a7d664342..867e4ea4b 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/PopupMenuQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/PopupMenuQt.cpp @@ -68,8 +68,7 @@ void PopupMenu::populate(const IntRect& r) if (client()->itemIsSeparator(i)) { //FIXME: better seperator item m_popup->insertItem(i, QString::fromLatin1("---")); - } - else { + } else { //PopupMenuStyle style = client()->itemStyle(i); m_popup->insertItem(i, client()->itemText(i)); #if 0 diff --git a/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.cpp index 0b42e5c62..5f64219c5 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.cpp @@ -143,10 +143,10 @@ RenderThemeQt::~RenderThemeQt() // for some widget painting, we need to fallback to Windows style QStyle* RenderThemeQt::fallbackStyle() { - if(!m_fallbackStyle) + if (!m_fallbackStyle) m_fallbackStyle = QStyleFactory::create(QLatin1String("windows")); - if(!m_fallbackStyle) + if (!m_fallbackStyle) m_fallbackStyle = QApplication::style(); return m_fallbackStyle; @@ -227,9 +227,8 @@ static QRect inflateButtonRect(const QRect& originalRect, QStyle* style) int paddingBottom = originalRect.bottom() - layoutRect.bottom(); return originalRect.adjusted(-paddingLeft, -paddingTop, paddingRight, paddingBottom); - } else { + } else return originalRect; - } } void RenderThemeQt::adjustRepaintRect(const RenderObject* o, IntRect& rect) @@ -252,18 +251,6 @@ void RenderThemeQt::adjustRepaintRect(const RenderObject* o, IntRect& rect) } } -bool RenderThemeQt::isControlStyled(const RenderStyle* style, const BorderData& border, - const FillLayer& background, const Color& backgroundColor) const -{ - if (style->appearance() == TextFieldPart - || style->appearance() == TextAreaPart - || style->appearance() == ListboxPart) { - return style->border() != border; - } - - return RenderTheme::isControlStyled(style, border, background, backgroundColor); -} - Color RenderThemeQt::platformActiveSelectionBackgroundColor() const { QPalette pal = QApplication::palette(); @@ -337,11 +324,10 @@ void RenderThemeQt::computeSizeBasedOnStyle(RenderStyle* renderStyle) const // If the style supports layout rects we use that, and compensate accordingly // in paintButton() below. - if (!layoutRect.isNull()) { + if (!layoutRect.isNull()) size.setHeight(layoutRect.height()); - } else { + else size.setHeight(pushButtonSize.height()); - } break; } @@ -492,14 +478,13 @@ bool RenderThemeQt::paintButton(RenderObject* o, const RenderObject::PaintInfo& option.state |= QStyle::State_Small; ControlPart appearance = applyTheme(option, o); - if(appearance == PushButtonPart || appearance == ButtonPart) { + if (appearance == PushButtonPart || appearance == ButtonPart) { option.rect = inflateButtonRect(option.rect, qStyle()); p.drawControl(QStyle::CE_PushButton, option); - } else if(appearance == RadioPart) { + } else if (appearance == RadioPart) p.drawControl(QStyle::CE_RadioButton, option); - } else if(appearance == CheckboxPart) { + else if (appearance == CheckboxPart) p.drawControl(QStyle::CE_CheckBox, option); - } return false; } @@ -597,7 +582,7 @@ bool RenderThemeQt::paintMenuList(RenderObject* o, const RenderObject::PaintInfo const QPoint topLeft = r.topLeft(); p.painter->translate(topLeft); - opt.rect.moveTo(QPoint(0,0)); + opt.rect.moveTo(QPoint(0, 0)); opt.rect.setSize(r.size()); p.drawComplexControl(QStyle::CC_ComboBox, opt); @@ -777,7 +762,7 @@ ControlPart RenderThemeQt::applyTheme(QStyleOption& option, RenderObject* o) con } } - if(result == RadioPart || result == CheckboxPart) + if (result == RadioPart || result == CheckboxPart) option.state |= (isChecked(o) ? QStyle::State_On : QStyle::State_Off); // If the webview has a custom palette, use it @@ -805,10 +790,10 @@ String RenderThemeQt::extraMediaControlsStyleSheet() } // Helper class to transform the painter's world matrix to the object's content area, scaled to 0,0,100,100 -class WorldMatrixTransformer -{ +class WorldMatrixTransformer { public: - WorldMatrixTransformer(QPainter* painter, RenderObject* renderObject, const IntRect& r) : m_painter(painter) { + WorldMatrixTransformer(QPainter* painter, RenderObject* renderObject, const IntRect& r) : m_painter(painter) + { RenderStyle* style = renderObject->style(); m_originalTransform = m_painter->transform(); m_painter->translate(r.x() + style->paddingLeft().value(), r.y() + style->paddingTop().value()); @@ -836,7 +821,7 @@ HTMLMediaElement* RenderThemeQt::getMediaElementFromRenderObject(RenderObject* o void RenderThemeQt::paintMediaBackground(QPainter* painter, const IntRect& r) const { painter->setPen(Qt::NoPen); - static QColor transparentBlack(0,0,0,100); + static QColor transparentBlack(0, 0, 0, 100); painter->setBrush(transparentBlack); painter->drawRoundedRect(r.x(), r.y(), r.width(), r.height(), 5.0, 5.0); } @@ -851,7 +836,7 @@ QColor RenderThemeQt::getMediaControlForegroundColor(RenderObject* o) const bool RenderThemeQt::paintMediaFullscreenButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) { - return RenderTheme::paintMediaFullscreenButton(o, paintInfo, r); + return RenderTheme::paintMediaFullscreenButton(o, paintInfo, r); } bool RenderThemeQt::paintMediaMuteButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) diff --git a/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.h b/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.h index 19d2d3343..617c87594 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.h +++ b/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.h @@ -36,8 +36,7 @@ namespace WebCore { class RenderStyle; class HTMLMediaElement; -class RenderThemeQt : public RenderTheme -{ +class RenderThemeQt : public RenderTheme { private: RenderThemeQt(Page* page); virtual ~RenderThemeQt(); @@ -58,9 +57,6 @@ public: virtual void adjustRepaintRect(const RenderObject* o, IntRect& r); - virtual bool isControlStyled(const RenderStyle*, const BorderData&, - const FillLayer&, const Color&) const; - // The platform selection color. virtual Color platformActiveSelectionBackgroundColor() const; virtual Color platformInactiveSelectionBackgroundColor() const; @@ -154,8 +150,7 @@ private: QStyle* m_fallbackStyle; }; -class StylePainter -{ +class StylePainter { public: explicit StylePainter(const RenderObject::PaintInfo& paintInfo); explicit StylePainter(GraphicsContext* context); diff --git a/src/3rdparty/webkit/WebCore/platform/qt/ScreenQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/ScreenQt.cpp index eda14463c..def199512 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/ScreenQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/ScreenQt.cpp @@ -51,14 +51,14 @@ static QWidget* qwidgetForPage(const Page* page) return frameView->qwidget(); } - + FloatRect screenRect(const Page* page) { QWidget* qw = qwidgetForPage(page); if (!qw) return FloatRect(); - // Taken from KGlobalSettings::desktopGeometry + // Taken from KGlobalSettings::desktopGeometry QDesktopWidget* dw = QApplication::desktop(); if (!dw) return FloatRect(); @@ -81,7 +81,7 @@ FloatRect usableScreenRect(const Page* page) if (!qw) return FloatRect(); - // Taken from KGlobalSettings::desktopGeometry + // Taken from KGlobalSettings::desktopGeometry QDesktopWidget* dw = QApplication::desktop(); if (!dw) return FloatRect(); diff --git a/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarQt.cpp index 29a999784..8eac15f9f 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarQt.cpp @@ -72,8 +72,8 @@ bool Scrollbar::contextMenu(const PlatformMouseEvent& event) const QPoint globalPos = QPoint(event.globalX(), event.globalY()); QAction* actionSelected = menu.exec(globalPos); - if (actionSelected == 0) - /* Do nothing */ ; + if (!actionSelected) + { /* Do nothing */ } else if (actionSelected == actScrollHere) { const QPoint pos = convertFromContainingWindow(event.pos()); moveThumb(horizontal ? pos.x() : pos.y()); diff --git a/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.cpp index 3851dfe31..561e55f81 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.cpp @@ -71,29 +71,29 @@ static QStyle::SubControl scPart(const ScrollbarPart& part) case ForwardButtonEndPart: return QStyle::SC_ScrollBarAddLine; } - + return QStyle::SC_None; } -static ScrollbarPart scrollbarPart(const QStyle::SubControl& sc) -{ - switch (sc) { - case QStyle::SC_None: - return NoPart; - case QStyle::SC_ScrollBarSubLine: - return BackButtonStartPart; - case QStyle::SC_ScrollBarSubPage: - return BackTrackPart; - case QStyle::SC_ScrollBarSlider: - return ThumbPart; - case QStyle::SC_ScrollBarAddPage: - return ForwardTrackPart; - case QStyle::SC_ScrollBarAddLine: - return ForwardButtonStartPart; +static ScrollbarPart scrollbarPart(const QStyle::SubControl& sc) +{ + switch (sc) { + case QStyle::SC_None: + return NoPart; + case QStyle::SC_ScrollBarSubLine: + return BackButtonStartPart; + case QStyle::SC_ScrollBarSubPage: + return BackTrackPart; + case QStyle::SC_ScrollBarSlider: + return ThumbPart; + case QStyle::SC_ScrollBarAddPage: + return ForwardTrackPart; + case QStyle::SC_ScrollBarAddLine: + return ForwardButtonStartPart; } - return NoPart; + return NoPart; } - + static QStyleOptionSlider* styleOptionSlider(Scrollbar* scrollbar, QWidget* widget = 0) { static QStyleOptionSlider opt; diff --git a/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.h b/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.h index 787b15add..6ca44eada 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.h +++ b/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.h @@ -40,7 +40,7 @@ public: virtual ScrollbarPart hitTest(Scrollbar*, const PlatformMouseEvent&); virtual bool shouldCenterOnThumb(Scrollbar*, const PlatformMouseEvent&); - + virtual void invalidatePart(Scrollbar*, ScrollbarPart); virtual int thumbPosition(Scrollbar*); diff --git a/src/3rdparty/webkit/WebCore/platform/qt/SharedBufferQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/SharedBufferQt.cpp index 38ba6d10e..8d62226fd 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/SharedBufferQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/SharedBufferQt.cpp @@ -31,7 +31,7 @@ namespace WebCore { PassRefPtr SharedBuffer::createWithContentsOfFile(const String& fileName) -{ +{ if (fileName.isEmpty()) return 0; diff --git a/src/3rdparty/webkit/WebCore/platform/qt/TemporaryLinkStubs.cpp b/src/3rdparty/webkit/WebCore/platform/qt/TemporaryLinkStubs.cpp index f76eb43dd..8ef598fa2 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/TemporaryLinkStubs.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/TemporaryLinkStubs.cpp @@ -75,22 +75,49 @@ using namespace WebCore; #if defined(Q_OS_WINCE) -Vector PluginDatabase::defaultPluginDirectories() { notImplemented(); return Vector(); } -void PluginDatabase::getPluginPathsInDirectories(HashSet& paths) const { notImplemented(); } -bool PluginDatabase::isPreferredPluginDirectory(const String& directory) { notImplemented(); return false; } +Vector PluginDatabase::defaultPluginDirectories() +{ + notImplemented(); + return Vector(); +} + +void PluginDatabase::getPluginPathsInDirectories(HashSet& paths) const +{ + notImplemented(); +} + +bool PluginDatabase::isPreferredPluginDirectory(const String& directory) +{ + notImplemented(); + return false; +} #endif namespace WebCore { -void getSupportedKeySizes(Vector&) { notImplemented(); } -String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String &challengeString, const KURL &url) { return String(); } +void getSupportedKeySizes(Vector&) +{ + notImplemented(); +} + +String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String &challengeString, const KURL &url) +{ + return String(); +} #if !defined(Q_OS_WIN) // defined in win/SystemTimeWin.cpp, which is compiled for the Qt/Windows port -float userIdleTime() { notImplemented(); return FLT_MAX; } // return an arbitrarily high userIdleTime so that releasing pages from the page cache isn't postponed +float userIdleTime() +{ + notImplemented(); + return FLT_MAX; // return an arbitrarily high userIdleTime so that releasing pages from the page cache isn't postponed +} #endif -void prefetchDNS(const String& hostname) { notImplemented(); } +void prefetchDNS(const String& hostname) +{ + notImplemented(); +} } diff --git a/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.cpp b/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.cpp index d9b57b2a6..9a4e32a36 100644 --- a/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.cpp +++ b/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.cpp @@ -150,6 +150,18 @@ int SQLiteDatabase::pageSize() return m_pageSize; } +int64_t SQLiteDatabase::freeSpaceSize() +{ + MutexLocker locker(m_authorizerLock); + enableAuthorizer(false); + // Note: freelist_count was added in SQLite 3.4.1. + SQLiteStatement statement(*this, "PRAGMA freelist_count"); + int64_t size = statement.getColumnInt64(0) * pageSize(); + + enableAuthorizer(true); + return size; +} + void SQLiteDatabase::setSynchronous(SynchronousPragma sync) { executeCommand(String::format("PRAGMA synchronous = %i", sync)); diff --git a/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.h b/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.h index 76700dc0c..d31343581 100644 --- a/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.h +++ b/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.h @@ -83,6 +83,9 @@ public: int64_t maximumSize(); void setMaximumSize(int64_t); + // Gets the number of unused bytes in the database file. + int64_t freeSpaceSize(); + // The SQLite SYNCHRONOUS pragma can be either FULL, NORMAL, or OFF // FULL - Any writing calls to the DB block until the data is actually on the disk surface // NORMAL - SQLite pauses at some critical moments when writing, but much less than FULL diff --git a/src/3rdparty/webkit/WebCore/platform/text/CharacterNames.h b/src/3rdparty/webkit/WebCore/platform/text/CharacterNames.h index 5b1a33780..cd0944739 100644 --- a/src/3rdparty/webkit/WebCore/platform/text/CharacterNames.h +++ b/src/3rdparty/webkit/WebCore/platform/text/CharacterNames.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Apple Inc. All rights reserved. + * Copyright (C) 2007, 2009 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,22 +37,26 @@ namespace WebCore { const UChar blackSquare = 0x25A0; const UChar bullet = 0x2022; + const UChar hebrewPunctuationGeresh = 0x05F3; const UChar hebrewPunctuationGershayim = 0x05F4; const UChar horizontalEllipsis = 0x2026; - const UChar ideographicSpace = 0x3000; const UChar ideographicComma = 0x3001; const UChar ideographicFullStop = 0x3002; - const UChar leftToRightMark = 0x200E; + const UChar ideographicSpace = 0x3000; + const UChar leftDoubleQuotationMark = 0x201C; + const UChar leftSingleQuotationMark = 0x2018; const UChar leftToRightEmbed = 0x202A; + const UChar leftToRightMark = 0x200E; const UChar leftToRightOverride = 0x202D; const UChar newlineCharacter = 0x000A; const UChar noBreakSpace = 0x00A0; const UChar objectReplacementCharacter = 0xFFFC; const UChar popDirectionalFormatting = 0x202C; const UChar replacementCharacter = 0xFFFD; + const UChar rightDoubleQuotationMark = 0x201D; const UChar rightSingleQuotationMark = 0x2019; - const UChar rightToLeftMark = 0x200F; const UChar rightToLeftEmbed = 0x202B; + const UChar rightToLeftMark = 0x200F; const UChar rightToLeftOverride = 0x202E; const UChar softHyphen = 0x00AD; const UChar whiteBullet = 0x25E6; diff --git a/src/3rdparty/webkit/WebCore/platform/text/StringBuffer.h b/src/3rdparty/webkit/WebCore/platform/text/StringBuffer.h index 28d4e897b..353a44a0c 100644 --- a/src/3rdparty/webkit/WebCore/platform/text/StringBuffer.h +++ b/src/3rdparty/webkit/WebCore/platform/text/StringBuffer.h @@ -35,7 +35,7 @@ namespace WebCore { -class StringBuffer : Noncopyable { +class StringBuffer : public Noncopyable { public: explicit StringBuffer(unsigned length) : m_length(length) diff --git a/src/3rdparty/webkit/WebCore/platform/text/StringImpl.cpp b/src/3rdparty/webkit/WebCore/platform/text/StringImpl.cpp index cd8fdbd00..8cbcc0d95 100644 --- a/src/3rdparty/webkit/WebCore/platform/text/StringImpl.cpp +++ b/src/3rdparty/webkit/WebCore/platform/text/StringImpl.cpp @@ -205,24 +205,26 @@ bool StringImpl::containsOnlyWhitespace() return true; } -PassRefPtr StringImpl::substring(unsigned pos, unsigned len) +PassRefPtr StringImpl::substring(unsigned start, unsigned length) { - if (pos >= m_length) + if (start >= m_length) return empty(); - if (len > m_length - pos) - len = m_length - pos; - return create(m_data + pos, len); + unsigned maxLength = m_length - start; + if (length >= maxLength) { + if (!start) + return this; + length = maxLength; + } + return create(m_data + start, length); } -PassRefPtr StringImpl::substringCopy(unsigned pos, unsigned len) +PassRefPtr StringImpl::substringCopy(unsigned start, unsigned length) { - if (pos >= m_length) - pos = m_length; - if (len > m_length - pos) - len = m_length - pos; - if (!len) + start = min(start, m_length); + length = min(length, m_length - start); + if (!length) return adoptRef(new StringImpl); - return substring(pos, len); + return create(m_data + start, length); } UChar32 StringImpl::characterStartingAt(unsigned i) diff --git a/src/3rdparty/webkit/WebCore/platform/text/TextBreakIteratorICU.cpp b/src/3rdparty/webkit/WebCore/platform/text/TextBreakIteratorICU.cpp index c4fc1b0ee..c922fbc84 100644 --- a/src/3rdparty/webkit/WebCore/platform/text/TextBreakIteratorICU.cpp +++ b/src/3rdparty/webkit/WebCore/platform/text/TextBreakIteratorICU.cpp @@ -160,7 +160,7 @@ TextBreakIterator* cursorMovementIterator(const UChar* string, int length) "$LF = [\\p{Grapheme_Cluster_Break = LF}];" "$Control = [\\p{Grapheme_Cluster_Break = Control}];" "$VoiceMarks = [\\uFF9E\\uFF9F];" // Japanese half-width katakana voiced marks - "$Extend = [\\p{Grapheme_Cluster_Break = Extend} $VoiceMarks];" + "$Extend = [\\p{Grapheme_Cluster_Break = Extend} $VoiceMarks - [\\u0E30 \\u0E32 \\u0E45 \\u0EB0 \\u0EB2]];" "$SpacingMark = [[\\p{General_Category = Spacing Mark}] - $Extend];" "$L = [\\p{Grapheme_Cluster_Break = L}];" "$V = [\\p{Grapheme_Cluster_Break = V}];" diff --git a/src/3rdparty/webkit/WebCore/platform/text/TextCodec.h b/src/3rdparty/webkit/WebCore/platform/text/TextCodec.h index df4258294..3c74165d3 100644 --- a/src/3rdparty/webkit/WebCore/platform/text/TextCodec.h +++ b/src/3rdparty/webkit/WebCore/platform/text/TextCodec.h @@ -56,7 +56,7 @@ namespace WebCore { typedef char UnencodableReplacementArray[32]; - class TextCodec : Noncopyable { + class TextCodec : public Noncopyable { public: virtual ~TextCodec(); diff --git a/src/3rdparty/webkit/WebCore/platform/text/qt/StringQt.cpp b/src/3rdparty/webkit/WebCore/platform/text/qt/StringQt.cpp index 97bbf40b1..62aa9794e 100644 --- a/src/3rdparty/webkit/WebCore/platform/text/qt/StringQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/text/qt/StringQt.cpp @@ -41,7 +41,7 @@ String::String(const QString& qstr) String::String(const QStringRef& ref) { - if (!ref.string()) + if (!ref.string()) return; m_impl = StringImpl::create(reinterpret_cast(ref.unicode()), ref.length()); } diff --git a/src/3rdparty/webkit/WebCore/platform/text/qt/TextBoundaries.cpp b/src/3rdparty/webkit/WebCore/platform/text/qt/TextBoundaries.cpp index bdc851b93..ffc4c44bd 100644 --- a/src/3rdparty/webkit/WebCore/platform/text/qt/TextBoundaries.cpp +++ b/src/3rdparty/webkit/WebCore/platform/text/qt/TextBoundaries.cpp @@ -39,8 +39,7 @@ #if QT_VERSION >= 0x040400 #include -namespace WebCore -{ +namespace WebCore { int findNextWordFromIndex(UChar const* buffer, int len, int position, bool forward) { @@ -78,9 +77,8 @@ void findWordBoundary(UChar const* buffer, int len, int position, int* start, in } #else -namespace WebCore -{ - +namespace WebCore { + int findNextWordFromIndex(UChar const* buffer, int len, int position, bool forward) { QString str(reinterpret_cast(buffer), len); diff --git a/src/3rdparty/webkit/WebCore/platform/text/qt/TextBreakIteratorQt.cpp b/src/3rdparty/webkit/WebCore/platform/text/qt/TextBreakIteratorQt.cpp index 06e8f3741..d80e270b7 100644 --- a/src/3rdparty/webkit/WebCore/platform/text/qt/TextBreakIteratorQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/text/qt/TextBreakIteratorQt.cpp @@ -36,8 +36,7 @@ namespace WebCore { - class TextBreakIterator : public QTextBoundaryFinder - { + class TextBreakIterator : public QTextBoundaryFinder { }; static QTextBoundaryFinder* iterator = 0; static unsigned char buffer[1024]; @@ -138,17 +137,18 @@ namespace WebCore { namespace WebCore { - class TextBreakIterator - { + class TextBreakIterator { public: virtual int first() = 0; virtual int next() = 0; virtual int previous() = 0; - inline int following(int pos) { + inline int following(int pos) + { currentPos = pos; return next(); } - inline int preceding(int pos) { + inline int preceding(int pos) + { currentPos = pos; return previous(); } @@ -157,16 +157,14 @@ namespace WebCore { int length; }; - class WordBreakIteratorQt : public TextBreakIterator - { + class WordBreakIteratorQt : public TextBreakIterator { public: virtual int first(); virtual int next(); virtual int previous(); }; - class CharBreakIteratorQt : public TextBreakIterator - { + class CharBreakIteratorQt : public TextBreakIterator { public: virtual int first(); virtual int next(); @@ -174,12 +172,14 @@ namespace WebCore { QTextLayout layout; }; - int WordBreakIteratorQt::first() { + int WordBreakIteratorQt::first() + { currentPos = 0; return currentPos; } - int WordBreakIteratorQt::next() { + int WordBreakIteratorQt::next() + { if (currentPos >= length) { currentPos = -1; return currentPos; @@ -194,7 +194,9 @@ namespace WebCore { } return currentPos; } - int WordBreakIteratorQt::previous() { + + int WordBreakIteratorQt::previous() + { if (currentPos <= 0) { currentPos = -1; return currentPos; @@ -210,18 +212,22 @@ namespace WebCore { return currentPos; } - int CharBreakIteratorQt::first() { + int CharBreakIteratorQt::first() + { currentPos = 0; return currentPos; } - int CharBreakIteratorQt::next() { + int CharBreakIteratorQt::next() + { if (currentPos >= length) return -1; currentPos = layout.nextCursorPosition(currentPos); return currentPos; } - int CharBreakIteratorQt::previous() { + + int CharBreakIteratorQt::previous() + { if (currentPos <= 0) return -1; currentPos = layout.previousCursorPosition(currentPos); @@ -252,7 +258,7 @@ TextBreakIterator* characterBreakIterator(const UChar* string, int length) iterator->length = length; iterator->currentPos = 0; iterator->layout.setText(QString(reinterpret_cast(string), length)); - + return iterator; } diff --git a/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp b/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp index 8626277aa..de1c298e0 100644 --- a/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp @@ -34,14 +34,17 @@ namespace WebCore { -PluginDatabase* PluginDatabase::installedPlugins() +PluginDatabase* PluginDatabase::installedPlugins(bool populate) { static PluginDatabase* plugins = 0; - + if (!plugins) { plugins = new PluginDatabase; - plugins->setPluginDirectories(PluginDatabase::defaultPluginDirectories()); - plugins->refresh(); + + if (populate) { + plugins->setPluginDirectories(PluginDatabase::defaultPluginDirectories()); + plugins->refresh(); + } } return plugins; @@ -64,7 +67,7 @@ void PluginDatabase::addExtraPluginDirectory(const String& directory) } bool PluginDatabase::refresh() -{ +{ bool pluginSetChanged = false; if (!m_plugins.isEmpty()) { @@ -264,6 +267,14 @@ void PluginDatabase::remove(PluginPackage* package) m_pluginsByPath.remove(package->path()); } +void PluginDatabase::clear() +{ + m_plugins.clear(); + m_pluginsByPath.clear(); + m_pluginPathsWithTimes.clear(); + m_registeredMIMETypes.clear(); +} + #if !PLATFORM(WIN_OS) || PLATFORM(WX) // For Safari/Win the following three methods are implemented // in PluginDatabaseWin.cpp, but if we can use WebCore constructs diff --git a/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.h b/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.h index 58839a295..b8d2bfe5a 100644 --- a/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.h +++ b/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.h @@ -1,6 +1,7 @@ /* * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. * Copyright (C) 2008 Collabora, Ltd. All rights reserved. + * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -42,12 +43,18 @@ namespace WebCore { class PluginPackage; typedef HashSet, PluginPackageHash> PluginSet; - + class PluginDatabase { public: - static PluginDatabase* installedPlugins(); + // The first call to installedPlugins creates the plugin database + // and by default populates it with the plugins installed on the system. + // For testing purposes, it is possible to not populate the database + // automatically, as the plugins might affect the DRT results by + // writing to a.o. stderr. + static PluginDatabase* installedPlugins(bool populate = true); bool refresh(); + void clear(); Vector plugins() const; bool isMIMETypeRegistered(const String& mimeType); void addExtraPluginDirectory(const String&); @@ -57,9 +64,13 @@ namespace WebCore { PluginPackage* findPlugin(const KURL&, String& mimeType); - private: - void setPluginDirectories(const Vector& directories) { m_pluginDirectories = directories; } + void setPluginDirectories(const Vector& directories) + { + clear(); + m_pluginDirectories = directories; + } + private: void getPluginPathsInDirectories(HashSet&) const; void getDeletedPlugins(PluginSet&) const; diff --git a/src/3rdparty/webkit/WebCore/plugins/PluginDebug.cpp b/src/3rdparty/webkit/WebCore/plugins/PluginDebug.cpp new file mode 100644 index 000000000..ace8b21a6 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/plugins/PluginDebug.cpp @@ -0,0 +1,168 @@ +/* + * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. + * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" +#include "PluginDebug.h" +#include "PlatformString.h" + +#if !LOG_DISABLED + +namespace WebCore { + +static const char* const errorStrings[] = { + "No errors occurred.", /* NPERR_NO_ERROR */ + "Error with no specific error code occurred.", /* NPERR_GENERIC_ERROR */ + "Invalid instance passed to the plug-in.", /* NPERR_INVALID_INSTANCE_ERROR */ + "Function table invalid.", /* NPERR_INVALID_FUNCTABLE_ERROR */ + "Loading of plug-in failed.", /* NPERR_MODULE_LOAD_FAILED_ERROR */ + "Memory allocation failed.", /* NPERR_OUT_OF_MEMORY_ERROR */ + "Plug-in missing or invalid.", /* NPERR_INVALID_PLUGIN_ERROR */ + "Plug-in directory missing or invalid.", /* NPERR_INVALID_PLUGIN_DIR_ERROR */ + "Versions of plug-in and Communicator do not match.", /* NPERR_INCOMPATIBLE_VERSION_ERROR */ + "Parameter missing or invalid.", /* NPERR_INVALID_PARAM */ + "URL missing or invalid.", /* NPERR_INVALID_URL */ + "File missing or invalid.", /* NPERR_FILE_NOT_FOUND */ + "Stream contains no data.", /* NPERR_NO_DATA */ + "Seekable stream expected.", /* NPERR_STREAM_NOT_SEEKABLE */ + "Unknown error code" +}; + +#ifdef XP_MACOSX +static const char* const drawingModels[] = { + "NPDrawingModelQuickDraw", + "NPDrawingModelCoreGraphics", + "NPDrawingModelOpenGL", + "NPDrawingModelCoreAnimation" +}; + +static const char* const eventModels[] = { + "NPEventModelCarbon", + "NPEventModelCocoa" +}; +#endif //XP_MACOSX + +const char* prettyNameForNPError(NPError error) +{ + return errorStrings[error]; +} + +#ifdef XP_MACOSX +const char* prettyNameForDrawingModel(NPDrawingModel drawingModel) +{ + return drawingModels[drawingModel]; +} + +const char* prettyNameForEventModel(NPEventModel eventModel) +{ + return eventModels[eventModel]; +} +#endif //XP_MACOSX + +CString prettyNameForNPNVariable(NPNVariable variable) +{ + switch (variable) { + case NPNVxDisplay: return "NPNVxDisplay"; + case NPNVxtAppContext: return "NPNVxtAppContext"; + case NPNVnetscapeWindow: return "NPNVnetscapeWindow"; + case NPNVjavascriptEnabledBool: return "NPNVjavascriptEnabledBool"; + case NPNVasdEnabledBool: return "NPNVasdEnabledBool"; + case NPNVisOfflineBool: return "NPNVisOfflineBool"; + + case NPNVserviceManager: return "NPNVserviceManager (not supported)"; + case NPNVDOMElement: return "NPNVDOMElement (not supported)"; + case NPNVDOMWindow: return "NPNVDOMWindow (not supported)"; + case NPNVToolkit: return "NPNVToolkit (not supported)"; + case NPNVSupportsXEmbedBool: return "NPNVSupportsXEmbedBool (not supported)"; + + case NPNVWindowNPObject: return "NPNVWindowNPObject"; + case NPNVPluginElementNPObject: return "NPNVPluginElementNPObject"; + case NPNVSupportsWindowless: return "NPNVSupportsWindowless"; + case NPNVprivateModeBool: return "NPNVprivateModeBool"; + +#ifdef XP_MACOSX + case NPNVpluginDrawingModel: return "NPNVpluginDrawingModel"; +#ifndef NP_NO_QUICKDRAW + case NPNVsupportsQuickDrawBool: return "NPNVsupportsQuickDrawBool"; +#endif + case NPNVsupportsCoreGraphicsBool: return "NPNVsupportsCoreGraphicsBool"; + case NPNVsupportsOpenGLBool: return "NPNVsupportsOpenGLBool"; + case NPNVsupportsCoreAnimationBool: return "NPNVsupportsCoreAnimationBool"; +#ifndef NP_NO_CARBON + case NPNVsupportsCarbonBool: return "NPNVsupportsCarbonBool"; +#endif + case NPNVsupportsCocoaBool: return "NPNVsupportsCocoaBool"; +#endif + + default: return "Unknown variable"; + } +} + +CString prettyNameForNPPVariable(NPPVariable variable, void* value) +{ + switch (variable) { + case NPPVpluginNameString: return "NPPVpluginNameString"; + case NPPVpluginDescriptionString: return "NPPVpluginDescriptionString"; + case NPPVpluginWindowBool: return "NPPVpluginWindowBool"; + case NPPVpluginTransparentBool: return "NPPVpluginTransparentBool"; + + case NPPVjavaClass: return "NPPVjavaClass (not supported)"; + case NPPVpluginWindowSize: return "NPPVpluginWindowSize (not supported)"; + case NPPVpluginTimerInterval: return "NPPVpluginTimerInterval (not supported)"; + case NPPVpluginScriptableInstance: return "NPPVpluginScriptableInstance (not supported)"; + case NPPVpluginScriptableIID: return "NPPVpluginScriptableIID (not supported)"; + case NPPVjavascriptPushCallerBool: return "NPPVjavascriptPushCallerBool (not supported)"; + case NPPVpluginKeepLibraryInMemory: return "NPPVpluginKeepLibraryInMemory (not supported)"; + case NPPVpluginNeedsXEmbed: return "NPPVpluginNeedsXEmbed (not supported)"; + + case NPPVpluginScriptableNPObject: return "NPPVpluginScriptableNPObject"; + + case NPPVformValue: return "NPPVformValue (not supported)"; + case NPPVpluginUrlRequestsDisplayedBool: return "NPPVpluginUrlRequestsDisplayedBool (not supported)"; + + case NPPVpluginWantsAllNetworkStreams: return "NPPVpluginWantsAllNetworkStreams"; + case NPPVpluginCancelSrcStream: return "NPPVpluginCancelSrcStream"; + +#ifdef XP_MACOSX + case NPPVpluginDrawingModel: { + String result("NPPVpluginDrawingModel, "); + result.append(prettyNameForDrawingModel(NPDrawingModel(uintptr_t(value)))); + return result.latin1(); + } + case NPPVpluginEventModel: { + String result("NPPVpluginEventModel, "); + result.append(prettyNameForEventModel(NPEventModel(uintptr_t(value)))); + return result.latin1(); + } + case NPPVpluginCoreAnimationLayer: return "NPPVpluginCoreAnimationLayer"; +#endif + + default: return "Unknown variable"; + } +} + +} // namespace WebCore + +#endif // !LOG_DISABLED diff --git a/src/3rdparty/webkit/WebCore/plugins/PluginDebug.h b/src/3rdparty/webkit/WebCore/plugins/PluginDebug.h index 54a49f649..5b84393ad 100644 --- a/src/3rdparty/webkit/WebCore/plugins/PluginDebug.h +++ b/src/3rdparty/webkit/WebCore/plugins/PluginDebug.h @@ -28,30 +28,27 @@ #include "Logging.h" #include "npruntime_internal.h" +#include "CString.h" + +#define LOG_NPERROR(err) if (err != NPERR_NO_ERROR) LOG_VERBOSE(Plugins, "%s\n", prettyNameForNPError(err)) +#define LOG_PLUGIN_NET_ERROR() LOG_VERBOSE(Plugins, "Stream failed due to problems with network, disk I/O, lack of memory, or other problems.\n") #if !LOG_DISABLED -static const char* const errorStrings[] = { - "No errors occurred.", /* NPERR_NO_ERROR */ - "Error with no specific error code occurred.", /* NPERR_GENERIC_ERROR */ - "Invalid instance passed to the plug-in.", /* NPERR_INVALID_INSTANCE_ERROR */ - "Function table invalid.", /* NPERR_INVALID_FUNCTABLE_ERROR */ - "Loading of plug-in failed.", /* NPERR_MODULE_LOAD_FAILED_ERROR */ - "Memory allocation failed.", /* NPERR_OUT_OF_MEMORY_ERROR */ - "Plug-in missing or invalid.", /* NPERR_INVALID_PLUGIN_ERROR */ - "Plug-in directory missing or invalid.", /* NPERR_INVALID_PLUGIN_DIR_ERROR */ - "Versions of plug-in and Communicator do not match.", /* NPERR_INCOMPATIBLE_VERSION_ERROR */ - "Parameter missing or invalid.", /* NPERR_INVALID_PARAM */ - "URL missing or invalid.", /* NPERR_INVALID_URL */ - "File missing or invalid.", /* NPERR_FILE_NOT_FOUND */ - "Stream contains no data.", /* NPERR_NO_DATA */ - "Seekable stream expected.", /* NPERR_STREAM_NOT_SEEKABLE */ - "Unknown error code" -}; +namespace WebCore { -#endif +const char* prettyNameForNPError(NPError error); -#define LOG_NPERROR(err) if (err != NPERR_NO_ERROR) LOG_VERBOSE(Plugins, "%s\n", errorStrings[err]) -#define LOG_PLUGIN_NET_ERROR() LOG_VERBOSE(Plugins, "Stream failed due to problems with network, disk I/O, lack of memory, or other problems.\n") +CString prettyNameForNPNVariable(NPNVariable variable); +CString prettyNameForNPPVariable(NPPVariable variable, void* value); +#ifdef XP_MACOSX +const char* prettyNameForDrawingModel(NPDrawingModel drawingModel); +const char* prettyNameForEventModel(NPEventModel eventModel); #endif + +} // namespace WebCore + +#endif // !LOG_DISABLED + +#endif // PluginDebug_h diff --git a/src/3rdparty/webkit/WebCore/plugins/PluginView.cpp b/src/3rdparty/webkit/WebCore/plugins/PluginView.cpp index 8737572a0..2cecdc4e7 100644 --- a/src/3rdparty/webkit/WebCore/plugins/PluginView.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/PluginView.cpp @@ -162,7 +162,7 @@ bool PluginView::start() NPError npErr; { PluginView::setCurrentPluginView(this); - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); setCallingPlugin(true); npErr = m_plugin->pluginFuncs()->newp((NPMIMEType)m_mimeType.data(), m_instance, m_mode, m_paramCount, m_paramNames, m_paramValues, NULL); setCallingPlugin(false); @@ -209,7 +209,7 @@ static bool getString(ScriptController* proxy, JSValue result, String& string) { if (!proxy || !result || result.isUndefined()) return false; - JSLock lock(false); + JSLock lock(JSC::SilenceAssertionsOnly); ExecState* exec = proxy->globalObject()->globalExec(); UString ustring = result.toString(exec); @@ -248,7 +248,7 @@ void PluginView::performRequest(PluginRequest* request) // FIXME: This should be sent when the document has finished loading if (request->sendNotification()) { PluginView::setCurrentPluginView(this); - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); setCallingPlugin(true); m_plugin->pluginFuncs()->urlnotify(m_instance, requestURL.string().utf8().data(), NPRES_DONE, request->notifyData()); setCallingPlugin(false); @@ -418,6 +418,8 @@ void PluginView::status(const char* message) NPError PluginView::setValue(NPPVariable variable, void* value) { + LOG(Plugins, "PluginView::setValue(%s): ", prettyNameForNPPVariable(variable, value).data()); + switch (variable) { case NPPVpluginWindowBool: m_isWindowed = value; @@ -426,11 +428,49 @@ NPError PluginView::setValue(NPPVariable variable, void* value) m_isTransparent = value; return NPERR_NO_ERROR; #if defined(XP_MACOSX) - case NPPVpluginDrawingModel: - return NPERR_NO_ERROR; - case NPPVpluginEventModel: - return NPERR_NO_ERROR; + case NPPVpluginDrawingModel: { + // Can only set drawing model inside NPP_New() + if (this != currentPluginView()) + return NPERR_GENERIC_ERROR; + + NPDrawingModel newDrawingModel = NPDrawingModel(uintptr_t(value)); + switch (newDrawingModel) { + case NPDrawingModelCoreGraphics: + m_drawingModel = newDrawingModel; + return NPERR_NO_ERROR; +#ifndef NP_NO_QUICKDRAW + case NPDrawingModelQuickDraw: +#endif + case NPDrawingModelCoreAnimation: + default: + LOG(Plugins, "Plugin asked for unsupported drawing model: %s", + prettyNameForDrawingModel(newDrawingModel)); + return NPERR_GENERIC_ERROR; + } + } + + case NPPVpluginEventModel: { + // Can only set event model inside NPP_New() + if (this != currentPluginView()) + return NPERR_GENERIC_ERROR; + + NPEventModel newEventModel = NPEventModel(uintptr_t(value)); + switch (newEventModel) { +#ifndef NP_NO_CARBON + case NPEventModelCarbon: #endif + case NPEventModelCocoa: + m_eventModel = newEventModel; + return NPERR_NO_ERROR; + + default: + LOG(Plugins, "Plugin asked for unsupported event model: %s", + prettyNameForEventModel(newEventModel)); + return NPERR_GENERIC_ERROR; + } + } +#endif // defined(XP_MACOSX) + default: notImplemented(); return NPERR_GENERIC_ERROR; @@ -493,7 +533,7 @@ PassRefPtr PluginView::bindingInstance() NPError npErr; { PluginView::setCurrentPluginView(this); - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); setCallingPlugin(true); npErr = m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginScriptableNPObject, &object); setCallingPlugin(false); @@ -583,6 +623,10 @@ PluginView::PluginView(Frame* parentFrame, const IntSize& size, PluginPackage* p #endif #if (PLATFORM(QT) && PLATFORM(WIN_OS)) || defined(XP_MACOSX) , m_window(0) +#endif +#if defined(XP_MACOSX) + , m_drawingModel(NPDrawingModel(-1)) + , m_eventModel(NPEventModel(-1)) #endif , m_loadManually(loadManually) , m_manualStream(0) @@ -601,8 +645,9 @@ PluginView::PluginView(Frame* parentFrame, const IntSize& size, PluginPackage* p setParameters(paramNames, paramValues); -#ifdef XP_UNIX - m_npWindow.ws_info = 0; + memset(&m_npWindow, 0, sizeof(m_npWindow)); +#if defined(XP_MACOSX) + memset(&m_npCgContext, 0, sizeof(m_npCgContext)); #endif m_mode = m_loadManually ? NP_FULL : NP_EMBED; diff --git a/src/3rdparty/webkit/WebCore/plugins/PluginView.h b/src/3rdparty/webkit/WebCore/plugins/PluginView.h index 3ed6756dc..95d73db5e 100644 --- a/src/3rdparty/webkit/WebCore/plugins/PluginView.h +++ b/src/3rdparty/webkit/WebCore/plugins/PluginView.h @@ -293,6 +293,8 @@ private: #elif defined(XP_MACOSX) NP_CGContext m_npCgContext; OwnPtr > m_nullEventTimer; + NPDrawingModel m_drawingModel; + NPEventModel m_eventModel; void setNPWindowIfNeeded(); void nullEventTimerFired(Timer*); diff --git a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp index ce0f859d1..721ec2909 100644 --- a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp @@ -127,6 +127,8 @@ static inline IntPoint topLevelOffsetFor(PlatformWidget widget) void PluginView::init() { + LOG(Plugins, "PluginView::init(): Initializing plug-in '%s'", m_plugin->name().utf8().data()); + if (m_haveInitialized) return; m_haveInitialized = true; @@ -144,23 +146,54 @@ void PluginView::init() if (!start()) { m_status = PluginStatusCanNotLoadPlugin; + stop(); // Make sure we unregister the plugin return; } - setPlatformPluginWidget(m_parentFrame->view()->hostWindow()->platformWindow()); + if (m_drawingModel == NPDrawingModel(-1)) { + // We default to QuickDraw, even though we don't support it, + // since that's what Safari does, and some plugins expect this + // behavior and never set the drawing model explicitly. +#ifndef NP_NO_QUICKDRAW + m_drawingModel = NPDrawingModelQuickDraw; +#else + // QuickDraw not available, so we have to default to CoreGraphics + m_drawingModel = NPDrawingModelCoreGraphics; +#endif + } - m_npCgContext.window = 0; - m_npCgContext.context = 0; - m_npWindow.window = (void*)&m_npCgContext; - m_npWindow.type = NPWindowTypeWindow; - m_npWindow.x = 0; - m_npWindow.y = 0; - m_npWindow.width = 0; - m_npWindow.height = 0; - m_npWindow.clipRect.left = 0; - m_npWindow.clipRect.top = 0; - m_npWindow.clipRect.right = 0; - m_npWindow.clipRect.bottom = 0; + if (m_eventModel == NPEventModel(-1)) { + // If the plug-in did not specify an event model + // we default to Carbon, when it is available. +#ifndef NP_NO_CARBON + m_eventModel = NPEventModelCarbon; +#else + m_eventModel = NPEventModelCocoa; +#endif + } + + // Gracefully handle unsupported drawing or event models. We can do this + // now since the drawing and event model can only be set during NPP_New. + NPBool eventModelSupported, drawingModelSupported; + if (getValueStatic(NPNVariable(NPNVsupportsCarbonBool + m_eventModel), &eventModelSupported) != NPERR_NO_ERROR + || !eventModelSupported) { + m_status = PluginStatusCanNotLoadPlugin; + LOG(Plugins, "Plug-in '%s' uses unsupported event model %s", + m_plugin->name().utf8().data(), prettyNameForEventModel(m_eventModel)); + stop(); + return; + } + + if (getValueStatic(NPNVariable(NPNVsupportsQuickDrawBool + m_drawingModel), &drawingModelSupported) != NPERR_NO_ERROR + || !drawingModelSupported) { + m_status = PluginStatusCanNotLoadPlugin; + LOG(Plugins, "Plug-in '%s' uses unsupported drawing model %s", + m_plugin->name().utf8().data(), prettyNameForDrawingModel(m_drawingModel)); + stop(); + return; + } + + setPlatformPluginWidget(m_parentFrame->view()->hostWindow()->platformWindow()); show(); @@ -173,6 +206,8 @@ void PluginView::init() PluginView::~PluginView() { + LOG(Plugins, "PluginView::~PluginView()"); + stop(); deleteAllValues(m_requests); @@ -193,6 +228,8 @@ void PluginView::stop() if (!m_isStarted) return; + LOG(Plugins, "PluginView::stop(): Stopping plug-in '%s'", m_plugin->name().utf8().data()); + HashSet > streams = m_streams; HashSet >::iterator end = streams.end(); for (HashSet >::iterator it = streams.begin(); it != end; ++it) { @@ -204,7 +241,7 @@ void PluginView::stop() m_isStarted = false; - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); PluginMainThreadScheduler::scheduler().unregisterPlugin(m_instance); @@ -218,9 +255,11 @@ void PluginView::stop() m_instance->pdata = 0; } +// Used before the plugin view has been initialized properly, and as a +// fallback for variables that do not require a view to resolve. NPError PluginView::getValueStatic(NPNVariable variable, void* value) { - LOG(Plugins, "PluginView::getValueStatic(%d)", variable); + LOG(Plugins, "PluginView::getValueStatic(%s)", prettyNameForNPNVariable(variable).data()); switch (variable) { case NPNVToolkit: @@ -231,14 +270,39 @@ NPError PluginView::getValueStatic(NPNVariable variable, void* value) *static_cast(value) = true; return NPERR_NO_ERROR; +#ifndef NP_NO_CARBON + case NPNVsupportsCarbonBool: + *static_cast(value) = true; + return NPERR_NO_ERROR; + +#endif + case NPNVsupportsCocoaBool: + *static_cast(value) = false; + return NPERR_NO_ERROR; + + // CoreGraphics is the only drawing model we support + case NPNVsupportsCoreGraphicsBool: + *static_cast(value) = true; + return NPERR_NO_ERROR; + +#ifndef NP_NO_QUICKDRAW + // QuickDraw is deprecated in 10.5 and not supported on 64-bit + case NPNVsupportsQuickDrawBool: +#endif + case NPNVsupportsOpenGLBool: + case NPNVsupportsCoreAnimationBool: + *static_cast(value) = false; + return NPERR_NO_ERROR; + default: return NPERR_GENERIC_ERROR; } } +// Used only for variables that need a view to resolve NPError PluginView::getValue(NPNVariable variable, void* value) { - LOG(Plugins, "PluginView::getValue(%d)", variable); + LOG(Plugins, "PluginView::getValue(%s)", prettyNameForNPNVariable(variable).data()); switch (variable) { case NPNVWindowNPObject: { @@ -278,10 +342,6 @@ NPError PluginView::getValue(NPNVariable variable, void* value) return NPERR_NO_ERROR; } - case NPNVsupportsCoreGraphicsBool: - *static_cast(value) = true; - return NPERR_NO_ERROR; - default: return getValueStatic(variable, value); } @@ -289,6 +349,8 @@ NPError PluginView::getValue(NPNVariable variable, void* value) } void PluginView::setParent(ScrollView* parent) { + LOG(Plugins, "PluginView::setParent(%p)", parent); + Widget::setParent(parent); if (parent) @@ -363,6 +425,7 @@ void PluginView::setNPWindowIfNeeded() if (!newWindowRef) return; + m_npWindow.type = NPWindowTypeWindow; m_npWindow.window = (void*)&m_npCgContext; m_npCgContext.window = newWindowRef; m_npCgContext.context = newContextRef; @@ -378,8 +441,13 @@ void PluginView::setNPWindowIfNeeded() m_npWindow.clipRect.right = m_windowRect.x() + m_windowRect.width(); m_npWindow.clipRect.bottom = m_windowRect.y() + m_windowRect.height(); + LOG(Plugins, "PluginView::setNPWindowIfNeeded(): window=%p, context=%p," + " window.x:%d window.y:%d window.width:%d window.height:%d window.clipRect size:%dx%d", + newWindowRef, newContextRef, m_npWindow.x, m_npWindow.y, m_npWindow.width, m_npWindow.height, + m_npWindow.clipRect.right - m_npWindow.clipRect.left, m_npWindow.clipRect.bottom - m_npWindow.clipRect.top); + PluginView::setCurrentPluginView(this); - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); setCallingPlugin(true); m_plugin->pluginFuncs()->setwindow(m_instance, &m_npWindow); setCallingPlugin(false); @@ -410,7 +478,7 @@ void PluginView::updatePluginWidget() void PluginView::paint(GraphicsContext* context, const IntRect& rect) { - if (!m_isStarted) { + if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully) { paintMissingPluginIcon(context, rect); return; } @@ -467,6 +535,9 @@ void PluginView::forceRedraw() void PluginView::handleMouseEvent(MouseEvent* event) { + if (!m_isStarted) + return; + EventRecord record; if (event->type() == eventNames().mousemoveEvent) { @@ -510,6 +581,9 @@ void PluginView::handleMouseEvent(MouseEvent* event) void PluginView::handleKeyboardEvent(KeyboardEvent* event) { + if (!m_isStarted) + return; + LOG(Plugins, "PluginView::handleKeyboardEvent() ----------------- "); LOG(Plugins, "PV::hKE(): KE.keyCode: 0x%02X, KE.charCode: %d", @@ -638,7 +712,7 @@ Point PluginView::globalMousePosForPlugin() const bool PluginView::dispatchNPEvent(NPEvent& event) { PluginView::setCurrentPluginView(this); - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); setCallingPlugin(true); bool accepted = m_plugin->pluginFuncs()->event(m_instance, &event); diff --git a/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp b/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp index 4140d898b..b9c1656b9 100644 --- a/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp @@ -44,19 +44,19 @@ bool PluginPackage::fetchInfo() typedef char *(*NPP_GetMIMEDescriptionProcPtr)(); NPP_GetMIMEDescriptionProcPtr gm = (NPP_GetMIMEDescriptionProcPtr)m_module->resolve("NP_GetMIMEDescription"); - if (!gm || !gv) { + if (!gm || !gv) return false; - } + char *buf = 0; - NPError err = gv(0, NPPVpluginNameString, (void *)&buf); - if (err != NPERR_NO_ERROR) { + NPError err = gv(0, NPPVpluginNameString, (void*) &buf); + if (err != NPERR_NO_ERROR) return false; - } + m_name = buf; - err = gv(0, NPPVpluginDescriptionString, (void *)&buf); - if (err != NPERR_NO_ERROR) { + err = gv(0, NPPVpluginDescriptionString, (void*) &buf); + if (err != NPERR_NO_ERROR) return false; - } + m_description = buf; determineModuleVersionFromDescription(); @@ -65,7 +65,7 @@ bool PluginPackage::fetchInfo() s.split(UChar(';'), false, types); for (int i = 0; i < types.size(); ++i) { Vector mime; - types[i].split(UChar(':'), true, mime); + types[i].split(UChar(':'), true, mime); if (mime.size() > 0) { Vector exts; if (mime.size() > 1) diff --git a/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp b/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp index 25d61f989..883c9aa97 100644 --- a/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp @@ -209,7 +209,7 @@ void PluginView::setNPWindowIfNeeded() m_npWindow.clipRect.bottom = m_clipRect.height(); PluginView::setCurrentPluginView(this); - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); setCallingPlugin(true); m_plugin->pluginFuncs()->setwindow(m_instance, &m_npWindow); setCallingPlugin(false); @@ -243,7 +243,7 @@ void PluginView::stop() m_isStarted = false; - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); PluginMainThreadScheduler::scheduler().unregisterPlugin(m_instance); @@ -287,7 +287,7 @@ const char* PluginView::userAgent() const char* PluginView::userAgentStatic() { - //FIXME - Just say we are Mozilla + // FIXME - Just say we are Mozilla return MozillaUserAgent; } @@ -301,10 +301,10 @@ NPError PluginView::handlePostReadFile(Vector& buffer, uint32 len, const c if (!fileExists(filename)) return NPERR_FILE_NOT_FOUND; - //FIXME - read the file data into buffer + // FIXME - read the file data into buffer FILE* fileHandle = fopen((filename.utf8()).data(), "r"); - if (fileHandle == 0) + if (!fileHandle) return NPERR_FILE_NOT_FOUND; //buffer.resize(); @@ -321,6 +321,8 @@ NPError PluginView::handlePostReadFile(Vector& buffer, uint32 len, const c NPError PluginView::getValueStatic(NPNVariable variable, void* value) { + LOG(Plugins, "PluginView::getValueStatic(%s)", prettyNameForNPNVariable(variable).data()); + switch (variable) { case NPNVToolkit: *static_cast(value) = 0; @@ -341,6 +343,8 @@ NPError PluginView::getValueStatic(NPNVariable variable, void* value) NPError PluginView::getValue(NPNVariable variable, void* value) { + LOG(Plugins, "PluginView::getValue(%s)", prettyNameForNPNVariable(variable).data()); + switch (variable) { case NPNVxDisplay: if (platformPluginWidget()) @@ -474,7 +478,7 @@ void PluginView::init() if (m_plugin->pluginFuncs()->getvalue) { PluginView::setCurrentPluginView(this); - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); setCallingPlugin(true); m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginNeedsXEmbed, &m_needsXEmbed); setCallingPlugin(false); @@ -488,7 +492,7 @@ void PluginView::init() m_status = PluginStatusCanNotLoadPlugin; return; } - show (); + show(); NPSetWindowCallbackStruct *wsi = new NPSetWindowCallbackStruct(); diff --git a/src/3rdparty/webkit/WebCore/plugins/win/PluginDatabaseWin.cpp b/src/3rdparty/webkit/WebCore/plugins/win/PluginDatabaseWin.cpp index c59f133e5..634b2a113 100644 --- a/src/3rdparty/webkit/WebCore/plugins/win/PluginDatabaseWin.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/win/PluginDatabaseWin.cpp @@ -1,6 +1,7 @@ /* * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. * Copyright (C) 2008 Collabora, Ltd. All rights reserved. + * Copyright (C) 2008-2009 Torch Mobile, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,6 +38,47 @@ #define _countof(x) (sizeof(x)/sizeof(x[0])) #endif +#if PLATFORM(WINCE) +// WINCE doesn't support Registry Key Access Rights. The parameter should always be 0 +#define KEY_ENUMERATE_SUB_KEYS 0 + +DWORD SHGetValue(HKEY hkey, LPCWSTR pszSubKey, LPCWSTR pszValue, LPDWORD pdwType, LPVOID pvData, LPDWORD pcbData) +{ + HKEY key; + if (RegOpenKeyEx(hkey, pszSubKey, 0, 0, &key) == ERROR_SUCCESS) { + DWORD result = RegQueryValueEx(key, pszValue, 0, pdwType, (LPBYTE)pvData, pcbData); + RegCloseKey(key); + return result; + } + return ERROR_INVALID_NAME; +} + +BOOL PathRemoveFileSpec(LPWSTR moduleFileNameStr) +{ + if (!*moduleFileNameStr) + return FALSE; + + LPWSTR lastPos = 0; + LPWSTR curPos = moduleFileNameStr; + do { + if (*curPos == L'/' || *curPos == L'\\') + lastPos = curPos; + } while (*++curPos); + + if (lastPos == curPos - 1) + return FALSE; + + if (lastPos) + *lastPos = 0; + else { + moduleFileNameStr[0] = L'\\'; + moduleFileNameStr[1] = 0; + } + + return TRUE; +} +#endif + namespace WebCore { static inline void addPluginPathsFromRegistry(HKEY rootKey, HashSet& paths) @@ -210,12 +252,14 @@ static inline void addMozillaPluginDirectories(Vector& directories) static inline void addWindowsMediaPlayerPluginDirectory(Vector& directories) { +#if !PLATFORM(WINCE) // The new WMP Firefox plugin is installed in \PFiles\Plugins if it can't find any Firefox installs WCHAR pluginDirectoryStr[_MAX_PATH + 1]; DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(TEXT("%SYSTEMDRIVE%\\PFiles\\Plugins"), pluginDirectoryStr, _countof(pluginDirectoryStr)); if (pluginDirectorySize > 0 && pluginDirectorySize <= _countof(pluginDirectoryStr)) directories.append(String(pluginDirectoryStr, pluginDirectorySize - 1)); +#endif DWORD type; WCHAR installationDirectoryStr[_MAX_PATH]; @@ -311,6 +355,7 @@ exit: static inline void addMacromediaPluginDirectories(Vector& directories) { +#if !PLATFORM(WINCE) WCHAR systemDirectoryStr[MAX_PATH]; if (GetSystemDirectory(systemDirectoryStr, _countof(systemDirectoryStr)) == 0) @@ -323,6 +368,7 @@ static inline void addMacromediaPluginDirectories(Vector& directories) PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Shockwave 10")); directories.append(macromediaDirectoryStr); +#endif } Vector PluginDatabase::defaultPluginDirectories() diff --git a/src/3rdparty/webkit/WebCore/plugins/win/PluginPackageWin.cpp b/src/3rdparty/webkit/WebCore/plugins/win/PluginPackageWin.cpp index 40d9b2a97..9e38925c8 100644 --- a/src/3rdparty/webkit/WebCore/plugins/win/PluginPackageWin.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/win/PluginPackageWin.cpp @@ -1,6 +1,7 @@ /* * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. * Copyright (C) 2008 Collabora, Ltd. All rights reserved. + * Copyright (C) 2009 Torch Mobile, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -244,6 +245,7 @@ bool PluginPackage::load() m_loadCount++; return true; } else { +#if !PLATFORM(WINCE) WCHAR currentPath[MAX_PATH]; if (!::GetCurrentDirectoryW(MAX_PATH, currentPath)) @@ -253,15 +255,18 @@ bool PluginPackage::load() if (!::SetCurrentDirectoryW(path.charactersWithNullTermination())) return false; +#endif // Load the library m_module = ::LoadLibraryExW(m_path.charactersWithNullTermination(), 0, LOAD_WITH_ALTERED_SEARCH_PATH); +#if !PLATFORM(WINCE) if (!::SetCurrentDirectoryW(currentPath)) { if (m_module) ::FreeLibrary(m_module); return false; } +#endif } if (!m_module) @@ -273,13 +278,19 @@ bool PluginPackage::load() NP_InitializeFuncPtr NP_Initialize = 0; NPError npErr; +#if PLATFORM(WINCE) + NP_Initialize = (NP_InitializeFuncPtr)GetProcAddress(m_module, L"NP_Initialize"); + NP_GetEntryPoints = (NP_GetEntryPointsFuncPtr)GetProcAddress(m_module, L"NP_GetEntryPoints"); + m_NPP_Shutdown = (NPP_ShutdownProcPtr)GetProcAddress(m_module, L"NP_Shutdown"); +#else NP_Initialize = (NP_InitializeFuncPtr)GetProcAddress(m_module, "NP_Initialize"); NP_GetEntryPoints = (NP_GetEntryPointsFuncPtr)GetProcAddress(m_module, "NP_GetEntryPoints"); m_NPP_Shutdown = (NPP_ShutdownProcPtr)GetProcAddress(m_module, "NP_Shutdown"); +#endif if (!NP_Initialize || !NP_GetEntryPoints || !m_NPP_Shutdown) goto abort; - + memset(&m_pluginFuncs, 0, sizeof(m_pluginFuncs)); m_pluginFuncs.size = sizeof(m_pluginFuncs); diff --git a/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp b/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp index 272a540ae..c97984dda 100644 --- a/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/win/PluginViewWin.cpp @@ -1,6 +1,7 @@ /* * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. * Copyright (C) 2008 Collabora Ltd. All rights reserved. + * Copyright (C) 2008-2009 Torch Mobile, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -65,6 +66,13 @@ #include #include +#if PLATFORM(WINCE) +#undef LOG_NPERROR +#define LOG_NPERROR(x) +#undef LOG_PLUGIN_NET_ERROR +#define LOG_PLUGIN_NET_ERROR() +#endif + #if PLATFORM(QT) #include #endif @@ -98,6 +106,7 @@ const LPCWSTR kWebPluginViewProperty = L"WebPluginViewProperty"; static const char* MozillaUserAgent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0"; +#if !PLATFORM(WINCE) // The code used to hook BeginPaint/EndPaint originally came from // . // Copyright (C) 2000 by Feng Yuan (www.fengyuan.com). @@ -154,7 +163,7 @@ BOOL WINAPI PluginView::hookedEndPaint(HWND hWnd, const PAINTSTRUCT* lpPaint) "push %3\n" "call *%4\n" : "=a" (result) - : "a" (endPaintSysCall), "g" (lpPaint), "g" (hWnd), "g" (*endPaint) + : "a" (endPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (*endPaint) ); return result; #else @@ -207,6 +216,7 @@ static void setUpOffscreenPaintingHooks(HDC (WINAPI*hookedBeginPaint)(HWND, PAIN hook("user32.dll", "EndPaint", endPaintSysCall, endPaint, reinterpret_cast(reinterpret_cast(hookedEndPaint))); } +#endif static bool registerPluginView() { @@ -222,11 +232,18 @@ static bool registerPluginView() ASSERT(Page::instanceHandle()); +#if PLATFORM(WINCE) + WNDCLASS wcex = { 0 }; +#else WNDCLASSEX wcex; - wcex.cbSize = sizeof(WNDCLASSEX); + wcex.hIconSm = 0; +#endif wcex.style = CS_DBLCLKS; +#if PLATFORM(WINCE) + wcex.style |= CS_PARENTDC; +#endif wcex.lpfnWndProc = DefWindowProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; @@ -236,9 +253,12 @@ static bool registerPluginView() wcex.hbrBackground = (HBRUSH)COLOR_WINDOW; wcex.lpszMenuName = 0; wcex.lpszClassName = kWebPluginViewdowClassName; - wcex.hIconSm = 0; +#if PLATFORM(WINCE) + return !!RegisterClass(&wcex); +#else return !!RegisterClassEx(&wcex); +#endif } LRESULT CALLBACK PluginView::PluginViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -310,6 +330,7 @@ PluginView::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) m_popPopupsStateTimer.startOneShot(0); } +#if !PLATFORM(WINCE) if (message == WM_PRINTCLIENT) { // Most (all?) windowed plugins don't respond to WM_PRINTCLIENT, so we // change the message to WM_PAINT and rely on our hooked versions of @@ -317,6 +338,7 @@ PluginView::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) message = WM_PAINT; m_wmPrintHDC = reinterpret_cast(wParam); } +#endif // Call the plug-in's window proc. LRESULT result = ::CallWindowProc(m_pluginWndProc, hWnd, message, wParam, lParam); @@ -339,7 +361,11 @@ void PluginView::updatePluginWidget() IntRect oldWindowRect = m_windowRect; IntRect oldClipRect = m_clipRect; +#if PLATFORM(WINCE) + m_windowRect = frameView->contentsToWindow(frameRect()); +#else m_windowRect = IntRect(frameView->contentsToWindow(frameRect().location()), frameRect().size()); +#endif m_clipRect = windowClipRect(); m_clipRect.move(-m_windowRect.x(), -m_windowRect.y()); @@ -413,7 +439,7 @@ bool PluginView::dispatchNPEvent(NPEvent& npEvent) shouldPop = true; } - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); setCallingPlugin(true); bool result = m_plugin->pluginFuncs()->event(m_instance, &npEvent); setCallingPlugin(false); @@ -426,6 +452,7 @@ bool PluginView::dispatchNPEvent(NPEvent& npEvent) void PluginView::paintWindowedPluginIntoContext(GraphicsContext* context, const IntRect& rect) const { +#if !PLATFORM(WINCE) ASSERT(m_isWindowed); ASSERT(context->shouldIncludeChildWindows()); @@ -450,6 +477,7 @@ void PluginView::paintWindowedPluginIntoContext(GraphicsContext* context, const SetWorldTransform(hdc, &originalTransform); context->releaseWindowsContext(hdc, frameRect(), false); +#endif } void PluginView::paint(GraphicsContext* context, const IntRect& rect) @@ -464,8 +492,10 @@ void PluginView::paint(GraphicsContext* context, const IntRect& rect) return; if (m_isWindowed) { +#if !PLATFORM(WINCE) if (context->shouldIncludeChildWindows()) paintWindowedPluginIntoContext(context, rect); +#endif return; } @@ -478,7 +508,7 @@ void PluginView::paint(GraphicsContext* context, const IntRect& rect) // of the window and the plugin expects that the passed in DC has window coordinates. // In the Qt port we always draw in an offscreen buffer and therefore need to preserve // the translation set in getWindowsContext. -#if !PLATFORM(QT) +#if !PLATFORM(QT) && !PLATFORM(WINCE) if (!context->inTransparencyLayer()) { XFORM transform; GetWorldTransform(hdc, &transform); @@ -491,15 +521,24 @@ void PluginView::paint(GraphicsContext* context, const IntRect& rect) m_npWindow.type = NPWindowTypeDrawable; m_npWindow.window = hdc; - IntPoint p = static_cast(parent())->contentsToWindow(frameRect().location()); - WINDOWPOS windowpos; memset(&windowpos, 0, sizeof(windowpos)); +#if PLATFORM(WINCE) + IntRect r = static_cast(parent())->contentsToWindow(frameRect()); + + windowpos.x = r.x(); + windowpos.y = r.y(); + windowpos.cx = r.width(); + windowpos.cy = r.height(); +#else + IntPoint p = static_cast(parent())->contentsToWindow(frameRect().location()); + windowpos.x = p.x(); windowpos.y = p.y(); windowpos.cx = frameRect().width(); windowpos.cy = frameRect().height(); +#endif npEvent.event = WM_WINDOWPOSCHANGED; npEvent.lParam = reinterpret_cast(&windowpos); @@ -535,13 +574,15 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event) npEvent.lParam = 0x8000; } - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); if (!dispatchNPEvent(npEvent)) event->setDefaultHandled(); } +#if !PLATFORM(WINCE) extern HCURSOR lastSetCursor; extern bool ignoreNextSetCursor; +#endif void PluginView::handleMouseEvent(MouseEvent* event) { @@ -602,11 +643,11 @@ void PluginView::handleMouseEvent(MouseEvent* event) } else return; - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); if (!dispatchNPEvent(npEvent)) event->setDefaultHandled(); -#if !PLATFORM(QT) +#if !PLATFORM(QT) && !PLATFORM(WINCE) // Currently, Widget::setCursor is always called after this function in EventHandler.cpp // and since we don't want that we set ignoreNextSetCursor to true here to prevent that. ignoreNextSetCursor = true; @@ -618,6 +659,15 @@ void PluginView::setParent(ScrollView* parent) { Widget::setParent(parent); +#if PLATFORM(WINCE) + if (parent) { + init(); + if (parent->isVisible()) + show(); + else + hide(); + } +#else if (parent) init(); else { @@ -631,7 +681,7 @@ void PluginView::setParent(ScrollView* parent) if (platformPluginWidget() == focusedWindow || ::IsChild(platformPluginWidget(), focusedWindow)) ::SetFocus(0); } - +#endif } void PluginView::setParentVisible(bool visible) @@ -654,6 +704,17 @@ void PluginView::setNPWindowRect(const IntRect& rect) if (!m_isStarted) return; +#if PLATFORM(WINCE) + IntRect r = static_cast(parent())->contentsToWindow(rect); + m_npWindow.x = r.x(); + m_npWindow.y = r.y(); + + m_npWindow.width = r.width(); + m_npWindow.height = r.height(); + + m_npWindow.clipRect.right = r.width(); + m_npWindow.clipRect.bottom = r.height(); +#else IntPoint p = static_cast(parent())->contentsToWindow(rect.location()); m_npWindow.x = p.x(); m_npWindow.y = p.y(); @@ -661,13 +722,14 @@ void PluginView::setNPWindowRect(const IntRect& rect) m_npWindow.width = rect.width(); m_npWindow.height = rect.height(); - m_npWindow.clipRect.left = 0; - m_npWindow.clipRect.top = 0; m_npWindow.clipRect.right = rect.width(); m_npWindow.clipRect.bottom = rect.height(); +#endif + m_npWindow.clipRect.left = 0; + m_npWindow.clipRect.top = 0; if (m_plugin->pluginFuncs()->setwindow) { - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); setCallingPlugin(true); m_plugin->pluginFuncs()->setwindow(m_instance, &m_npWindow); setCallingPlugin(false); @@ -677,9 +739,17 @@ void PluginView::setNPWindowRect(const IntRect& rect) ASSERT(platformPluginWidget()); +#if PLATFORM(WINCE) + if (!m_pluginWndProc) { + WNDPROC currentWndProc = (WNDPROC)GetWindowLong(platformPluginWidget(), GWL_WNDPROC); + if (currentWndProc != PluginViewWndProc) + m_pluginWndProc = (WNDPROC)SetWindowLong(platformPluginWidget(), GWL_WNDPROC, (LONG)PluginViewWndProc); + } +#else WNDPROC currentWndProc = (WNDPROC)GetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC); if (currentWndProc != PluginViewWndProc) m_pluginWndProc = (WNDPROC)SetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC, (LONG)PluginViewWndProc); +#endif } } @@ -701,13 +771,20 @@ void PluginView::stop() // Unsubclass the window if (m_isWindowed) { +#if PLATFORM(WINCE) + WNDPROC currentWndProc = (WNDPROC)GetWindowLong(platformPluginWidget(), GWL_WNDPROC); + + if (currentWndProc == PluginViewWndProc) + SetWindowLong(platformPluginWidget(), GWL_WNDPROC, (LONG)m_pluginWndProc); +#else WNDPROC currentWndProc = (WNDPROC)GetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC); - + if (currentWndProc == PluginViewWndProc) SetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC, (LONG)m_pluginWndProc); +#endif } - JSC::JSLock::DropAllLocks dropAllLocks(false); + JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); // Clear the window m_npWindow.window = 0; @@ -785,11 +862,15 @@ NPError PluginView::handlePostReadFile(Vector& buffer, uint32 len, const c NPError PluginView::getValueStatic(NPNVariable variable, void* value) { + LOG(Plugins, "PluginView::getValueStatic(%s)", prettyNameForNPNVariable(variable).data()); + return NPERR_GENERIC_ERROR; } NPError PluginView::getValue(NPNVariable variable, void* value) { + LOG(Plugins, "PluginView::getValue(%s)", prettyNameForNPNVariable(variable).data()); + switch (variable) { #if ENABLE(NETSCAPE_PLUGIN_API) case NPNVWindowNPObject: { @@ -950,7 +1031,9 @@ void PluginView::init() if (m_isWindowed) { registerPluginView(); +#if !PLATFORM(WINCE) setUpOffscreenPaintingHooks(hookedBeginPaint, hookedEndPaint); +#endif DWORD flags = WS_CHILD; if (isSelfVisible()) @@ -959,6 +1042,7 @@ void PluginView::init() HWND parentWindowHandle = windowHandleForPlatformWidget(m_parentFrame->view()->hostWindow()->platformWindow()); HWND window = ::CreateWindowEx(0, kWebPluginViewdowClassName, 0, flags, 0, 0, 0, 0, parentWindowHandle, 0, Page::instanceHandle(), 0); + #if PLATFORM(WIN_OS) && PLATFORM(QT) m_window = window; #else @@ -969,6 +1053,8 @@ void PluginView::init() // the Shockwave Director plug-in. #if PLATFORM(WIN_OS) && PLATFORM(X86_64) && COMPILER(MSVC) ::SetWindowLongPtrA(platformPluginWidget(), GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); +#elif PLATFORM(WINCE) + ::SetWindowLong(platformPluginWidget(), GWL_WNDPROC, (LONG)DefWindowProc); #else ::SetWindowLongPtrA(platformPluginWidget(), GWL_WNDPROC, (LONG)DefWindowProcA); #endif diff --git a/src/3rdparty/webkit/WebCore/rendering/CounterNode.h b/src/3rdparty/webkit/WebCore/rendering/CounterNode.h index 57f956310..b432e1d5c 100644 --- a/src/3rdparty/webkit/WebCore/rendering/CounterNode.h +++ b/src/3rdparty/webkit/WebCore/rendering/CounterNode.h @@ -37,7 +37,7 @@ namespace WebCore { class RenderObject; -class CounterNode : Noncopyable { +class CounterNode : public Noncopyable { public: CounterNode(RenderObject*, bool isReset, int value); diff --git a/src/3rdparty/webkit/WebCore/rendering/HitTestResult.cpp b/src/3rdparty/webkit/WebCore/rendering/HitTestResult.cpp index f2ed7dbe6..b7de46be5 100644 --- a/src/3rdparty/webkit/WebCore/rendering/HitTestResult.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/HitTestResult.cpp @@ -26,6 +26,7 @@ #include "HTMLAnchorElement.h" #include "HTMLImageElement.h" #include "HTMLInputElement.h" +#include "HTMLMediaElement.h" #include "HTMLNames.h" #include "RenderImage.h" #include "Scrollbar.h" @@ -145,17 +146,20 @@ bool HitTestResult::isSelected() const return frame->selection()->contains(m_point); } -String HitTestResult::spellingToolTip() const +String HitTestResult::spellingToolTip(TextDirection& dir) const { + dir = LTR; // Return the tool tip string associated with this point, if any. Only markers associated with bad grammar // currently supply strings, but maybe someday markers associated with misspelled words will also. if (!m_innerNonSharedNode) return String(); - DocumentMarker* marker = m_innerNonSharedNode->document()->markerContainingPoint(m_point, DocumentMarker::Grammar); + DocumentMarker* marker = m_innerNonSharedNode->document()->markerContainingPoint(m_point, DocumentMarker::Grammar); if (!marker) return String(); + if (RenderObject* renderer = m_innerNonSharedNode->renderer()) + dir = renderer->style()->direction(); return marker->description; } @@ -173,15 +177,19 @@ String HitTestResult::replacedString() const return marker->description; } -String HitTestResult::title() const +String HitTestResult::title(TextDirection& dir) const { + dir = LTR; // Find the title in the nearest enclosing DOM node. // For tags in image maps, walk the tree for the , not the using it. for (Node* titleNode = m_innerNode.get(); titleNode; titleNode = titleNode->parentNode()) { if (titleNode->isElementNode()) { String title = static_cast(titleNode)->title(); - if (!title.isEmpty()) + if (!title.isEmpty()) { + if (RenderObject* renderer = titleNode->renderer()) + dir = renderer->style()->direction(); return title; + } } } return String(); @@ -208,7 +216,7 @@ String HitTestResult::altDisplayString() const HTMLInputElement* input = static_cast(m_innerNonSharedNode.get()); return displayString(input->alt(), m_innerNonSharedNode.get()); } - + #if ENABLE(WML) if (m_innerNonSharedNode->hasTagName(WMLNames::imgTag)) { WMLImageElement* image = static_cast(m_innerNonSharedNode.get()); @@ -266,7 +274,29 @@ KURL HitTestResult::absoluteImageURL() const } else return KURL(); - return m_innerNonSharedNode->document()->completeURL(parseURL(urlString)); + return m_innerNonSharedNode->document()->completeURL(deprecatedParseURL(urlString)); +} + +KURL HitTestResult::absoluteMediaURL() const +{ +#if ENABLE(VIDEO) + if (!(m_innerNonSharedNode && m_innerNonSharedNode->document())) + return KURL(); + + if (!(m_innerNonSharedNode->renderer() && m_innerNonSharedNode->renderer()->isMedia())) + return KURL(); + + AtomicString urlString; + if (m_innerNonSharedNode->hasTagName(HTMLNames::videoTag) || m_innerNonSharedNode->hasTagName(HTMLNames::audioTag)) { + HTMLMediaElement* mediaElement = static_cast(m_innerNonSharedNode.get()); + urlString = mediaElement->currentSrc(); + } else + return KURL(); + + return m_innerNonSharedNode->document()->completeURL(deprecatedParseURL(urlString)); +#else + return KURL(); +#endif } KURL HitTestResult::absoluteLinkURL() const @@ -288,7 +318,7 @@ KURL HitTestResult::absoluteLinkURL() const else return KURL(); - return m_innerURLElement->document()->completeURL(parseURL(urlString)); + return m_innerURLElement->document()->completeURL(deprecatedParseURL(urlString)); } bool HitTestResult::isLiveLink() const diff --git a/src/3rdparty/webkit/WebCore/rendering/HitTestResult.h b/src/3rdparty/webkit/WebCore/rendering/HitTestResult.h index 4f0383fd6..f29ca4195 100644 --- a/src/3rdparty/webkit/WebCore/rendering/HitTestResult.h +++ b/src/3rdparty/webkit/WebCore/rendering/HitTestResult.h @@ -23,6 +23,7 @@ #define HitTestResult_h #include "IntPoint.h" +#include "TextDirection.h" #include namespace WebCore { @@ -30,8 +31,8 @@ namespace WebCore { class Element; class Frame; class Image; -class KURL; class IntRect; +class KURL; class Node; class Scrollbar; class String; @@ -64,14 +65,15 @@ public: Frame* targetFrame() const; IntRect boundingBox() const; bool isSelected() const; - String spellingToolTip() const; + String spellingToolTip(TextDirection&) const; String replacedString() const; - String title() const; + String title(TextDirection&) const; String altDisplayString() const; String titleDisplayString() const; Image* image() const; IntRect imageRect() const; KURL absoluteImageURL() const; + KURL absoluteMediaURL() const; KURL absoluteLinkURL() const; String textContent() const; bool isLiveLink() const; diff --git a/src/3rdparty/webkit/WebCore/rendering/InlineFlowBox.cpp b/src/3rdparty/webkit/WebCore/rendering/InlineFlowBox.cpp index e46ba382d..b397bce60 100644 --- a/src/3rdparty/webkit/WebCore/rendering/InlineFlowBox.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/InlineFlowBox.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. + * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -256,8 +256,8 @@ int InlineFlowBox::placeBoxesHorizontally(int xPos, int& leftPosition, int& righ int boxShadowLeft = 0; int boxShadowRight = 0; for (ShadowData* boxShadow = renderer()->style(m_firstLine)->boxShadow(); boxShadow; boxShadow = boxShadow->next) { - boxShadowLeft = min(boxShadow->x - boxShadow->blur, boxShadowLeft); - boxShadowRight = max(boxShadow->x + boxShadow->blur, boxShadowRight); + boxShadowLeft = min(boxShadow->x - boxShadow->blur - boxShadow->spread, boxShadowLeft); + boxShadowRight = max(boxShadow->x + boxShadow->blur + boxShadow->spread, boxShadowRight); } leftPosition = min(xPos + boxShadowLeft, leftPosition); @@ -529,8 +529,8 @@ void InlineFlowBox::placeBoxesVertically(int yPos, int maxHeight, int maxAscent, } for (ShadowData* boxShadow = curr->renderer()->style(m_firstLine)->boxShadow(); boxShadow; boxShadow = boxShadow->next) { - overflowTop = min(overflowTop, boxShadow->y - boxShadow->blur); - overflowBottom = max(overflowBottom, boxShadow->y + boxShadow->blur); + overflowTop = min(overflowTop, boxShadow->y - boxShadow->blur - boxShadow->spread); + overflowBottom = max(overflowBottom, boxShadow->y + boxShadow->blur + boxShadow->spread); } for (ShadowData* textShadow = curr->renderer()->style(m_firstLine)->textShadow(); textShadow; textShadow = textShadow->next) { @@ -601,8 +601,8 @@ void InlineFlowBox::paint(RenderObject::PaintInfo& paintInfo, int tx, int ty) int shadowLeft = 0; int shadowRight = 0; for (ShadowData* boxShadow = renderer()->style(m_firstLine)->boxShadow(); boxShadow; boxShadow = boxShadow->next) { - shadowLeft = min(boxShadow->x - boxShadow->blur, shadowLeft); - shadowRight = max(boxShadow->x + boxShadow->blur, shadowRight); + shadowLeft = min(boxShadow->x - boxShadow->blur - boxShadow->spread, shadowLeft); + shadowRight = max(boxShadow->x + boxShadow->blur + boxShadow->spread, shadowRight); } for (ShadowData* textShadow = renderer()->style(m_firstLine)->textShadow(); textShadow; textShadow = textShadow->next) { shadowLeft = min(textShadow->x - textShadow->blur, shadowLeft); @@ -696,14 +696,14 @@ void InlineFlowBox::paintFillLayer(const RenderObject::PaintInfo& paintInfo, con } } -void InlineFlowBox::paintBoxShadow(GraphicsContext* context, RenderStyle* s, int tx, int ty, int w, int h) +void InlineFlowBox::paintBoxShadow(GraphicsContext* context, RenderStyle* s, ShadowStyle shadowStyle, int tx, int ty, int w, int h) { if ((!prevLineBox() && !nextLineBox()) || !parent()) - boxModelObject()->paintBoxShadow(context, tx, ty, w, h, s); + boxModelObject()->paintBoxShadow(context, tx, ty, w, h, s, shadowStyle); else { // FIXME: We can do better here in the multi-line case. We want to push a clip so that the shadow doesn't // protrude incorrectly at the edges, and we want to possibly include shadows cast from the previous/following lines - boxModelObject()->paintBoxShadow(context, tx, ty, w, h, s, includeLeftEdge(), includeRightEdge()); + boxModelObject()->paintBoxShadow(context, tx, ty, w, h, s, shadowStyle, includeLeftEdge(), includeRightEdge()); } } @@ -727,11 +727,14 @@ void InlineFlowBox::paintBoxDecorations(RenderObject::PaintInfo& paintInfo, int if ((!parent() && m_firstLine && styleToUse != renderer()->style()) || (parent() && renderer()->hasBoxDecorations())) { // Shadow comes first and is behind the background and border. if (styleToUse->boxShadow()) - paintBoxShadow(context, styleToUse, tx, ty, w, h); + paintBoxShadow(context, styleToUse, Normal, tx, ty, w, h); Color c = styleToUse->backgroundColor(); paintFillLayers(paintInfo, c, styleToUse->backgroundLayers(), tx, ty, w, h); + if (styleToUse->boxShadow()) + paintBoxShadow(context, styleToUse, Inset, tx, ty, w, h); + // :first-line cannot be used to put borders on a line. Always paint borders with our // non-first-line style. if (parent() && renderer()->style()->hasBorder()) { diff --git a/src/3rdparty/webkit/WebCore/rendering/InlineFlowBox.h b/src/3rdparty/webkit/WebCore/rendering/InlineFlowBox.h index 9bb1162ce..809fd54cb 100644 --- a/src/3rdparty/webkit/WebCore/rendering/InlineFlowBox.h +++ b/src/3rdparty/webkit/WebCore/rendering/InlineFlowBox.h @@ -89,7 +89,7 @@ public: virtual void paintMask(RenderObject::PaintInfo&, int tx, int ty); void paintFillLayers(const RenderObject::PaintInfo&, const Color&, const FillLayer*, int tx, int ty, int w, int h, CompositeOperator = CompositeSourceOver); void paintFillLayer(const RenderObject::PaintInfo&, const Color&, const FillLayer*, int tx, int ty, int w, int h, CompositeOperator = CompositeSourceOver); - void paintBoxShadow(GraphicsContext*, RenderStyle*, int tx, int ty, int w, int h); + void paintBoxShadow(GraphicsContext*, RenderStyle*, ShadowStyle, int tx, int ty, int w, int h); virtual void paintTextDecorations(RenderObject::PaintInfo&, int tx, int ty, bool paintedChildren = false); virtual void paint(RenderObject::PaintInfo&, int tx, int ty); virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty); diff --git a/src/3rdparty/webkit/WebCore/rendering/InlineTextBox.cpp b/src/3rdparty/webkit/WebCore/rendering/InlineTextBox.cpp index 94dd4f392..619fb952b 100644 --- a/src/3rdparty/webkit/WebCore/rendering/InlineTextBox.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/InlineTextBox.cpp @@ -256,6 +256,11 @@ bool InlineTextBox::nodeAtPoint(const HitTestRequest&, HitTestResult& result, in static void paintTextWithShadows(GraphicsContext* context, const Font& font, const TextRun& textRun, int startOffset, int endOffset, const IntPoint& textOrigin, int x, int y, int w, int h, ShadowData* shadow, bool stroked) { + Color fillColor = context->fillColor(); + bool opaque = fillColor.alpha() == 255; + if (!opaque) + context->setFillColor(Color::black); + do { IntSize extraOffset; @@ -264,7 +269,7 @@ static void paintTextWithShadows(GraphicsContext* context, const Font& font, con int shadowBlur = shadow->blur; const Color& shadowColor = shadow->color; - if (shadow->next || stroked) { + if (shadow->next || stroked || !opaque) { IntRect shadowRect(x, y, w, h); shadowRect.inflate(shadowBlur); shadowRect.move(shadowOffset); @@ -275,7 +280,8 @@ static void paintTextWithShadows(GraphicsContext* context, const Font& font, con shadowOffset -= extraOffset; } context->setShadow(shadowOffset, shadowBlur, shadowColor); - } + } else if (!opaque) + context->setFillColor(fillColor); if (startOffset <= endOffset) context->drawText(font, textRun, textOrigin + extraOffset, startOffset, endOffset); @@ -289,13 +295,13 @@ static void paintTextWithShadows(GraphicsContext* context, const Font& font, con if (!shadow) break; - if (shadow->next || stroked) + if (shadow->next || stroked || !opaque) context->restore(); else context->clearShadow(); shadow = shadow->next; - } while (shadow || stroked); + } while (shadow || stroked || !opaque); } void InlineTextBox::paint(RenderObject::PaintInfo& paintInfo, int tx, int ty) diff --git a/src/3rdparty/webkit/WebCore/rendering/LayoutState.h b/src/3rdparty/webkit/WebCore/rendering/LayoutState.h index afa295206..2f040c82c 100644 --- a/src/3rdparty/webkit/WebCore/rendering/LayoutState.h +++ b/src/3rdparty/webkit/WebCore/rendering/LayoutState.h @@ -36,7 +36,7 @@ class RenderArena; class RenderBox; class RenderObject; -class LayoutState : Noncopyable { +class LayoutState : public Noncopyable { public: LayoutState() : m_clipped(false) diff --git a/src/3rdparty/webkit/WebCore/rendering/MediaControlElements.cpp b/src/3rdparty/webkit/WebCore/rendering/MediaControlElements.cpp index 74293e030..d0af9811d 100644 --- a/src/3rdparty/webkit/WebCore/rendering/MediaControlElements.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/MediaControlElements.cpp @@ -556,14 +556,15 @@ PassRefPtr MediaControlTimeDisplayElement::styleForElement() void MediaControlTimeDisplayElement::setVisible(bool visible) { + if (visible == m_isVisible) + return; + m_isVisible = visible; + // This function is used during the RenderMedia::layout() // call, where we cannot change the renderer at this time. if (!renderer() || !renderer()->style()) return; - if (visible == m_isVisible) - return; - m_isVisible = visible; RefPtr style = styleForElement(); renderer()->setStyle(style.get()); } diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderBlock.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderBlock.cpp index c949eda8f..be1bab3e3 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderBlock.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderBlock.cpp @@ -555,7 +555,7 @@ int RenderBlock::overflowHeight(bool includeInterior) const if (!includeInterior && hasOverflowClip()) { int shadowHeight = 0; for (ShadowData* boxShadow = style()->boxShadow(); boxShadow; boxShadow = boxShadow->next) - shadowHeight = max(boxShadow->y + boxShadow->blur, shadowHeight); + shadowHeight = max(boxShadow->y + boxShadow->blur + boxShadow->spread, shadowHeight); int inflatedHeight = height() + shadowHeight; if (hasReflection()) inflatedHeight = max(inflatedHeight, reflectionBox().bottom()); @@ -569,7 +569,7 @@ int RenderBlock::overflowWidth(bool includeInterior) const if (!includeInterior && hasOverflowClip()) { int shadowWidth = 0; for (ShadowData* boxShadow = style()->boxShadow(); boxShadow; boxShadow = boxShadow->next) - shadowWidth = max(boxShadow->x + boxShadow->blur, shadowWidth); + shadowWidth = max(boxShadow->x + boxShadow->blur + boxShadow->spread, shadowWidth); int inflatedWidth = width() + shadowWidth; if (hasReflection()) inflatedWidth = max(inflatedWidth, reflectionBox().right()); @@ -583,7 +583,7 @@ int RenderBlock::overflowLeft(bool includeInterior) const if (!includeInterior && hasOverflowClip()) { int shadowLeft = 0; for (ShadowData* boxShadow = style()->boxShadow(); boxShadow; boxShadow = boxShadow->next) - shadowLeft = min(boxShadow->x - boxShadow->blur, shadowLeft); + shadowLeft = min(boxShadow->x - boxShadow->blur - boxShadow->spread, shadowLeft); int left = shadowLeft; if (hasReflection()) left = min(left, reflectionBox().x()); @@ -597,7 +597,7 @@ int RenderBlock::overflowTop(bool includeInterior) const if (!includeInterior && hasOverflowClip()) { int shadowTop = 0; for (ShadowData* boxShadow = style()->boxShadow(); boxShadow; boxShadow = boxShadow->next) - shadowTop = min(boxShadow->y - boxShadow->blur, shadowTop); + shadowTop = min(boxShadow->y - boxShadow->blur - boxShadow->spread, shadowTop); int top = shadowTop; if (hasReflection()) top = min(top, reflectionBox().y()); @@ -616,10 +616,10 @@ IntRect RenderBlock::overflowRect(bool includeInterior) const int shadowBottom = 0; for (ShadowData* boxShadow = style()->boxShadow(); boxShadow; boxShadow = boxShadow->next) { - shadowLeft = min(boxShadow->x - boxShadow->blur, shadowLeft); - shadowRight = max(boxShadow->x + boxShadow->blur, shadowRight); - shadowTop = min(boxShadow->y - boxShadow->blur, shadowTop); - shadowBottom = max(boxShadow->y + boxShadow->blur, shadowBottom); + shadowLeft = min(boxShadow->x - boxShadow->blur - boxShadow->spread, shadowLeft); + shadowRight = max(boxShadow->x + boxShadow->blur + boxShadow->spread, shadowRight); + shadowTop = min(boxShadow->y - boxShadow->blur - boxShadow->spread, shadowTop); + shadowBottom = max(boxShadow->y + boxShadow->blur + boxShadow->spread, shadowBottom); } box.move(shadowLeft, shadowTop); @@ -871,10 +871,10 @@ void RenderBlock::layoutBlock(bool relayoutChildren) if (!hasOverflowClip()) { for (ShadowData* boxShadow = style()->boxShadow(); boxShadow; boxShadow = boxShadow->next) { - m_overflowLeft = min(m_overflowLeft, boxShadow->x - boxShadow->blur); - m_overflowWidth = max(m_overflowWidth, width() + boxShadow->x + boxShadow->blur); - m_overflowTop = min(m_overflowTop, boxShadow->y - boxShadow->blur); - m_overflowHeight = max(m_overflowHeight, height() + boxShadow->y + boxShadow->blur); + m_overflowLeft = min(m_overflowLeft, boxShadow->x - boxShadow->blur - boxShadow->spread); + m_overflowWidth = max(m_overflowWidth, width() + boxShadow->x + boxShadow->blur + boxShadow->spread); + m_overflowTop = min(m_overflowTop, boxShadow->y - boxShadow->blur - boxShadow->spread); + m_overflowHeight = max(m_overflowHeight, height() + boxShadow->y + boxShadow->blur + boxShadow->spread); } if (hasReflection()) { @@ -1013,13 +1013,13 @@ bool RenderBlock::handleRunInChild(RenderBox* child) if (!child->isRunIn() || !child->childrenInline() && !child->isReplaced()) return false; - RenderBlock* blockRunIn = toRenderBlock(child); // Get the next non-positioned/non-floating RenderBlock. + RenderBlock* blockRunIn = toRenderBlock(child); RenderObject* curr = blockRunIn->nextSibling(); while (curr && curr->isFloatingOrPositioned()) curr = curr->nextSibling(); - if (!curr || !curr->isRenderBlock() || !curr->childrenInline() || curr->isRunIn()) + if (!curr || !curr->isRenderBlock() || !curr->childrenInline() || curr->isRunIn() || curr->isAnonymous()) return false; RenderBlock* currBlock = toRenderBlock(curr); @@ -3937,6 +3937,9 @@ void RenderBlock::calcPrefWidths() int toAdd = 0; toAdd = borderLeft() + borderRight() + paddingLeft() + paddingRight(); + if (hasOverflowClip() && style()->overflowY() == OSCROLL) + toAdd += verticalScrollbarWidth(); + m_minPrefWidth += toAdd; m_maxPrefWidth += toAdd; diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderBox.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderBox.cpp index 4db5c5576..19a2167d5 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderBox.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderBox.cpp @@ -3,7 +3,7 @@ * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) - * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -607,7 +607,7 @@ void RenderBox::paintBoxDecorations(PaintInfo& paintInfo, int tx, int ty) // FIXME: Should eventually give the theme control over whether the box shadow should paint, since controls could have // custom shadows of their own. - paintBoxShadow(paintInfo.context, tx, ty, w, h, style()); + paintBoxShadow(paintInfo.context, tx, ty, w, h, style(), Normal); // If we have a native theme appearance, paint that before painting our background. // The theme will tell us whether or not we should also paint the CSS background. @@ -621,6 +621,7 @@ void RenderBox::paintBoxDecorations(PaintInfo& paintInfo, int tx, int ty) if (style()->hasAppearance()) theme()->paintDecorations(this, paintInfo, IntRect(tx, ty, w, h)); } + paintBoxShadow(paintInfo.context, tx, ty, w, h, style(), Inset); // The theme will tell us whether or not we should also paint the CSS border. if ((!style()->hasAppearance() || (!themePainted && theme()->paintBorderOnly(this, paintInfo, IntRect(tx, ty, w, h)))) && style()->hasBorder()) diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderBoxModelObject.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderBoxModelObject.cpp index ced5a7853..c22462509 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderBoxModelObject.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderBoxModelObject.cpp @@ -173,13 +173,20 @@ void RenderBoxModelObject::updateBoxModelInfoFromStyle() int RenderBoxModelObject::relativePositionOffsetX() const { + // Objects that shrink to avoid floats normally use available line width when computing containing block width. However + // in the case of relative positioning using percentages, we can't do this. The offset should always be resolved using the + // available width of the containing block. Therefore we don't use containingBlockWidthForContent() here, but instead explicitly + // call availableWidth on our containing block. if (!style()->left().isAuto()) { + RenderBlock* cb = containingBlock(); if (!style()->right().isAuto() && containingBlock()->style()->direction() == RTL) - return -style()->right().calcValue(containingBlockWidthForContent()); - return style()->left().calcValue(containingBlockWidthForContent()); + return -style()->right().calcValue(cb->availableWidth()); + return style()->left().calcValue(cb->availableWidth()); + } + if (!style()->right().isAuto()) { + RenderBlock* cb = containingBlock(); + return -style()->right().calcValue(cb->availableWidth()); } - if (!style()->right().isAuto()) - return -style()->right().calcValue(containingBlockWidthForContent()); return 0; } @@ -322,6 +329,18 @@ void RenderBoxModelObject::paintFillLayerExtended(const PaintInfo& paintInfo, co clippedToBorderRadius = true; } + bool clippedWithLocalScrolling = hasOverflowClip() && bgLayer->attachment() == LocalBackgroundAttachment; + if (clippedWithLocalScrolling) { + // Clip to the overflow area. + context->save(); + context->clip(toRenderBox(this)->overflowClipRect(tx, ty)); + + // Now adjust our tx, ty, w, h to reflect a scrolled content box with borders at the ends. + layer()->subtractScrolledContentOffset(tx, ty); + w = bLeft + layer()->scrollWidth() + bRight; + h = borderTop() + layer()->scrollHeight() + borderBottom(); + } + if (bgLayer->clip() == PaddingFillBox || bgLayer->clip() == ContentFillBox) { // Clip to the padding or content boxes as necessary. bool includePadding = bgLayer->clip() == ContentFillBox; @@ -465,6 +484,9 @@ void RenderBoxModelObject::paintFillLayerExtended(const PaintInfo& paintInfo, co if (clippedToBorderRadius) // Undo the border radius clip context->restore(); + + if (clippedWithLocalScrolling) // Undo the clip for local background attachments. + context->restore(); } IntSize RenderBoxModelObject::calculateBackgroundSize(const FillLayer* bgLayer, int scaledWidth, int scaledHeight) const @@ -521,9 +543,9 @@ void RenderBoxModelObject::calculateBackgroundImageGeometry(const FillLayer* bgL int rh = 0; // CSS2 chapter 14.2.1 - - if (bgLayer->attachment()) { - // Scroll + bool fixedAttachment = bgLayer->attachment() == FixedBackgroundAttachment; + if (!fixedAttachment) { + // Scroll and Local if (bgLayer->origin() != BorderFillBox) { left = borderLeft(); right = borderRight(); @@ -553,7 +575,7 @@ void RenderBoxModelObject::calculateBackgroundImageGeometry(const FillLayer* bgL pw = w - left - right; ph = h - top - bottom; } else { - // Fixed + // Fixed background attachment. IntRect vr = viewRect(); cx = vr.x(); cy = vr.y(); @@ -567,7 +589,7 @@ void RenderBoxModelObject::calculateBackgroundImageGeometry(const FillLayer* bgL int ch; IntSize scaledImageSize; - if (isRoot() && bgLayer->attachment()) + if (isRoot() && !fixedAttachment) scaledImageSize = calculateBackgroundSize(bgLayer, rw, rh); else scaledImageSize = calculateBackgroundSize(bgLayer, pw, ph); @@ -578,7 +600,7 @@ void RenderBoxModelObject::calculateBackgroundImageGeometry(const FillLayer* bgL EFillRepeat backgroundRepeat = bgLayer->repeat(); int xPosition; - if (isRoot() && bgLayer->attachment()) + if (isRoot() && !fixedAttachment) xPosition = bgLayer->xPosition().calcMinValue(rw - scaledImageWidth, true); else xPosition = bgLayer->xPosition().calcMinValue(pw - scaledImageWidth, true); @@ -592,7 +614,7 @@ void RenderBoxModelObject::calculateBackgroundImageGeometry(const FillLayer* bgL } int yPosition; - if (isRoot() && bgLayer->attachment()) + if (isRoot() && !fixedAttachment) yPosition = bgLayer->yPosition().calcMinValue(rh - scaledImageHeight, true); else yPosition = bgLayer->yPosition().calcMinValue(ph - scaledImageHeight, true); @@ -605,7 +627,7 @@ void RenderBoxModelObject::calculateBackgroundImageGeometry(const FillLayer* bgL ch = scaledImageHeight + min(yPosition + top, 0); } - if (!bgLayer->attachment()) { + if (fixedAttachment) { sx += max(tx - cx, 0); sy += max(ty - cy, 0); } @@ -1120,7 +1142,7 @@ void RenderBoxModelObject::paintBorder(GraphicsContext* graphicsContext, int tx, graphicsContext->restore(); } -void RenderBoxModelObject::paintBoxShadow(GraphicsContext* context, int tx, int ty, int w, int h, const RenderStyle* s, bool begin, bool end) +void RenderBoxModelObject::paintBoxShadow(GraphicsContext* context, int tx, int ty, int w, int h, const RenderStyle* s, ShadowStyle shadowStyle, bool begin, bool end) { // FIXME: Deal with border-image. Would be great to use border-image as a mask. @@ -1128,83 +1150,201 @@ void RenderBoxModelObject::paintBoxShadow(GraphicsContext* context, int tx, int return; IntRect rect(tx, ty, w, h); + IntSize topLeft; + IntSize topRight; + IntSize bottomLeft; + IntSize bottomRight; + bool hasBorderRadius = s->hasBorderRadius(); + if (hasBorderRadius && (begin || end)) { + IntSize topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius; + s->getBorderRadiiForRect(rect, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius); + + if (begin) { + if (shadowStyle == Inset) { + topLeftRadius.expand(-borderLeft(), -borderTop()); + topLeftRadius.clampNegativeToZero(); + bottomLeftRadius.expand(-borderLeft(), -borderBottom()); + bottomLeftRadius.clampNegativeToZero(); + } + topLeft = topLeftRadius; + bottomLeft = bottomLeftRadius; + } + if (end) { + if (shadowStyle == Inset) { + topRightRadius.expand(-borderRight(), -borderTop()); + topRightRadius.clampNegativeToZero(); + bottomRightRadius.expand(-borderRight(), -borderBottom()); + bottomRightRadius.clampNegativeToZero(); + } + topRight = topRightRadius; + bottomRight = bottomRightRadius; + } + } + + if (shadowStyle == Inset) { + rect.move(begin ? borderLeft() : 0, borderTop()); + rect.setWidth(rect.width() - (begin ? borderLeft() : 0) - (end ? borderRight() : 0)); + rect.setHeight(rect.height() - borderTop() - borderBottom()); + } + bool hasOpaqueBackground = s->backgroundColor().isValid() && s->backgroundColor().alpha() == 255; for (ShadowData* shadow = s->boxShadow(); shadow; shadow = shadow->next) { - context->save(); + if (shadow->style != shadowStyle) + continue; IntSize shadowOffset(shadow->x, shadow->y); int shadowBlur = shadow->blur; - IntRect fillRect(rect); - - IntRect shadowRect(rect); - shadowRect.inflate(shadowBlur); - shadowRect.move(shadowOffset); - context->clip(shadowRect); - - // Move the fill just outside the clip, adding 1 pixel separation so that the fill does not - // bleed in (due to antialiasing) if the context is transformed. - IntSize extraOffset(w + max(0, shadowOffset.width()) + shadowBlur + 1, 0); - shadowOffset -= extraOffset; - fillRect.move(extraOffset); - - context->setShadow(shadowOffset, shadowBlur, shadow->color); - if (hasBorderRadius) { - IntSize topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius; - s->getBorderRadiiForRect(rect, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius); - - IntSize topLeft = begin ? topLeftRadius : IntSize(); - IntSize topRight = end ? topRightRadius : IntSize(); - IntSize bottomLeft = begin ? bottomLeftRadius : IntSize(); - IntSize bottomRight = end ? bottomRightRadius : IntSize(); - - IntRect rectToClipOut = rect; - IntSize topLeftToClipOut = topLeft; - IntSize topRightToClipOut = topRight; - IntSize bottomLeftToClipOut = bottomLeft; - IntSize bottomRightToClipOut = bottomRight; - - // If the box is opaque, it is unnecessary to clip it out. However, doing so saves time - // when painting the shadow. On the other hand, it introduces subpixel gaps along the - // corners. Those are avoided by insetting the clipping path by one pixel. - if (hasOpaqueBackground) { - rectToClipOut.inflate(-1); - - topLeftToClipOut.expand(-1, -1); - topLeftToClipOut.clampNegativeToZero(); - - topRightToClipOut.expand(-1, -1); - topRightToClipOut.clampNegativeToZero(); - - bottomLeftToClipOut.expand(-1, -1); - bottomLeftToClipOut.clampNegativeToZero(); - - bottomRightToClipOut.expand(-1, -1); - bottomRightToClipOut.clampNegativeToZero(); + int shadowSpread = shadow->spread; + Color& shadowColor = shadow->color; + + if (shadow->style == Normal) { + IntRect fillRect(rect); + fillRect.inflate(shadowSpread); + if (fillRect.isEmpty()) + continue; + + IntRect shadowRect(rect); + shadowRect.inflate(shadowBlur + shadowSpread); + shadowRect.move(shadowOffset); + + context->save(); + context->clip(shadowRect); + + // Move the fill just outside the clip, adding 1 pixel separation so that the fill does not + // bleed in (due to antialiasing) if the context is transformed. + IntSize extraOffset(w + max(0, shadowOffset.width()) + shadowBlur + 2 * shadowSpread + 1, 0); + shadowOffset -= extraOffset; + fillRect.move(extraOffset); + + context->setShadow(shadowOffset, shadowBlur, shadowColor); + if (hasBorderRadius) { + IntRect rectToClipOut = rect; + IntSize topLeftToClipOut = topLeft; + IntSize topRightToClipOut = topRight; + IntSize bottomLeftToClipOut = bottomLeft; + IntSize bottomRightToClipOut = bottomRight; + + if (shadowSpread < 0) { + topLeft.expand(shadowSpread, shadowSpread); + topLeft.clampNegativeToZero(); + + topRight.expand(shadowSpread, shadowSpread); + topRight.clampNegativeToZero(); + + bottomLeft.expand(shadowSpread, shadowSpread); + bottomLeft.clampNegativeToZero(); + + bottomRight.expand(shadowSpread, shadowSpread); + bottomRight.clampNegativeToZero(); + } + + // If the box is opaque, it is unnecessary to clip it out. However, doing so saves time + // when painting the shadow. On the other hand, it introduces subpixel gaps along the + // corners. Those are avoided by insetting the clipping path by one pixel. + if (hasOpaqueBackground) { + rectToClipOut.inflate(-1); + + topLeftToClipOut.expand(-1, -1); + topLeftToClipOut.clampNegativeToZero(); + + topRightToClipOut.expand(-1, -1); + topRightToClipOut.clampNegativeToZero(); + + bottomLeftToClipOut.expand(-1, -1); + bottomLeftToClipOut.clampNegativeToZero(); + + bottomRightToClipOut.expand(-1, -1); + bottomRightToClipOut.clampNegativeToZero(); + } + + if (!rectToClipOut.isEmpty()) + context->clipOutRoundedRect(rectToClipOut, topLeftToClipOut, topRightToClipOut, bottomLeftToClipOut, bottomRightToClipOut); + context->fillRoundedRect(fillRect, topLeft, topRight, bottomLeft, bottomRight, Color::black); + } else { + IntRect rectToClipOut = rect; + + // If the box is opaque, it is unnecessary to clip it out. However, doing so saves time + // when painting the shadow. On the other hand, it introduces subpixel gaps along the + // edges if they are not pixel-aligned. Those are avoided by insetting the clipping path + // by one pixel. + if (hasOpaqueBackground) { + TransformationMatrix currentTransformation = context->getCTM(); + if (currentTransformation.a() != 1 || (currentTransformation.d() != 1 && currentTransformation.d() != -1) + || currentTransformation.b() || currentTransformation.c()) + rectToClipOut.inflate(-1); + } + + if (!rectToClipOut.isEmpty()) + context->clipOut(rectToClipOut); + context->fillRect(fillRect, Color::black); } - if (!rectToClipOut.isEmpty()) - context->clipOutRoundedRect(rectToClipOut, topLeftToClipOut, topRightToClipOut, bottomLeftToClipOut, bottomRightToClipOut); - context->fillRoundedRect(fillRect, topLeft, topRight, bottomLeft, bottomRight, Color::black); + context->restore(); } else { - IntRect rectToClipOut = rect; - - // If the box is opaque, it is unnecessary to clip it out. However, doing so saves time - // when painting the shadow. On the other hand, it introduces subpixel gaps along the - // edges if they are not pixel-aligned. Those are avoided by insetting the clipping path - // by one pixel. - if (hasOpaqueBackground) { - TransformationMatrix currentTransformation = context->getCTM(); - if (currentTransformation.a() != 1 || (currentTransformation.d() != 1 && currentTransformation.d() != -1) - || currentTransformation.b() || currentTransformation.c()) - rectToClipOut.inflate(-1); + // Inset shadow. + IntRect holeRect(rect); + holeRect.inflate(-shadowSpread); + + if (holeRect.isEmpty()) { + if (hasBorderRadius) + context->fillRoundedRect(rect, topLeft, topRight, bottomLeft, bottomRight, shadowColor); + else + context->fillRect(rect, shadowColor); + continue; + } + if (!begin) { + holeRect.move(-max(shadowOffset.width(), 0) - shadowBlur, 0); + holeRect.setWidth(holeRect.width() + max(shadowOffset.width(), 0) + shadowBlur); } + if (!end) + holeRect.setWidth(holeRect.width() - min(shadowOffset.width(), 0) + shadowBlur); + + Color fillColor(shadowColor.red(), shadowColor.green(), shadowColor.blue(), 255); - if (!rectToClipOut.isEmpty()) - context->clipOut(rectToClipOut); - context->fillRect(fillRect, Color::black); + IntRect outerRect(rect); + outerRect.inflateX(w - 2 * shadowSpread); + outerRect.inflateY(h - 2 * shadowSpread); + + context->save(); + + if (hasBorderRadius) + context->clip(Path::createRoundedRectangle(rect, topLeft, topRight, bottomLeft, bottomRight)); + else + context->clip(rect); + + IntSize extraOffset(2 * w + max(0, shadowOffset.width()) + shadowBlur - 2 * shadowSpread + 1, 0); + context->translate(extraOffset.width(), extraOffset.height()); + shadowOffset -= extraOffset; + + context->beginPath(); + context->addPath(Path::createRectangle(outerRect)); + + if (hasBorderRadius) { + if (shadowSpread > 0) { + topLeft.expand(-shadowSpread, -shadowSpread); + topLeft.clampNegativeToZero(); + + topRight.expand(-shadowSpread, -shadowSpread); + topRight.clampNegativeToZero(); + + bottomLeft.expand(-shadowSpread, -shadowSpread); + bottomLeft.clampNegativeToZero(); + + bottomRight.expand(-shadowSpread, -shadowSpread); + bottomRight.clampNegativeToZero(); + } + context->addPath(Path::createRoundedRectangle(holeRect, topLeft, topRight, bottomLeft, bottomRight)); + } else + context->addPath(Path::createRectangle(holeRect)); + + context->setFillRule(RULE_EVENODD); + context->setFillColor(fillColor); + context->setShadow(shadowOffset, shadowBlur, shadowColor); + context->fillPath(); + + context->restore(); } - context->restore(); } } diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderBoxModelObject.h b/src/3rdparty/webkit/WebCore/rendering/RenderBoxModelObject.h index 9feaf2f89..c67477808 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderBoxModelObject.h +++ b/src/3rdparty/webkit/WebCore/rendering/RenderBoxModelObject.h @@ -89,7 +89,7 @@ public: void paintBorder(GraphicsContext*, int tx, int ty, int w, int h, const RenderStyle*, bool begin = true, bool end = true); bool paintNinePieceImage(GraphicsContext*, int tx, int ty, int w, int h, const RenderStyle*, const NinePieceImage&, CompositeOperator = CompositeSourceOver); - void paintBoxShadow(GraphicsContext*, int tx, int ty, int w, int h, const RenderStyle*, bool begin = true, bool end = true); + void paintBoxShadow(GraphicsContext*, int tx, int ty, int w, int h, const RenderStyle*, ShadowStyle, bool begin = true, bool end = true); void paintFillLayerExtended(const PaintInfo&, const Color&, const FillLayer*, int tx, int ty, int width, int height, InlineFlowBox* = 0, CompositeOperator = CompositeSourceOver); // The difference between this inline's baseline position and the line's baseline position. diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderButton.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderButton.cpp index b266f42e5..6d36a0f8a 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderButton.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderButton.cpp @@ -164,6 +164,11 @@ void RenderButton::setText(const String& str) } } +String RenderButton::text() const +{ + return m_buttonText ? m_buttonText->text() : 0; +} + void RenderButton::updateBeforeAfterContent(PseudoId type) { if (m_inner) diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderButton.h b/src/3rdparty/webkit/WebCore/rendering/RenderButton.h index 89f7cf86b..3b4ff3f4e 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderButton.h +++ b/src/3rdparty/webkit/WebCore/rendering/RenderButton.h @@ -55,7 +55,8 @@ public: virtual IntRect controlClipRect(int /*tx*/, int /*ty*/) const; void setText(const String&); - + String text() const; + virtual bool canHaveChildren() const; protected: diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderFieldset.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderFieldset.cpp index 393c23711..437991acd 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderFieldset.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderFieldset.cpp @@ -131,9 +131,10 @@ void RenderFieldset::paintBoxDecorations(PaintInfo& paintInfo, int tx, int ty) h -= yOff; ty += yOff; - paintBoxShadow(paintInfo.context, tx, ty, w, h, style()); + paintBoxShadow(paintInfo.context, tx, ty, w, h, style(), Normal); paintFillLayers(paintInfo, style()->backgroundColor(), style()->backgroundLayers(), tx, ty, w, h); + paintBoxShadow(paintInfo.context, tx, ty, w, h, style(), Inset); if (!style()->hasBorder()) return; diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderFlexibleBox.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderFlexibleBox.cpp index 65990f274..e9fc7aa60 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderFlexibleBox.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderFlexibleBox.cpp @@ -191,6 +191,10 @@ void RenderFlexibleBox::calcPrefWidths() } int toAdd = borderLeft() + borderRight() + paddingLeft() + paddingRight(); + + if (hasOverflowClip() && style()->overflowY() == OSCROLL) + toAdd += verticalScrollbarWidth(); + m_minPrefWidth += toAdd; m_maxPrefWidth += toAdd; @@ -276,10 +280,10 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren) if (!hasOverflowClip()) { for (ShadowData* boxShadow = style()->boxShadow(); boxShadow; boxShadow = boxShadow->next) { - m_overflowLeft = min(m_overflowLeft, boxShadow->x - boxShadow->blur); - m_overflowWidth = max(m_overflowWidth, width() + boxShadow->x + boxShadow->blur); - m_overflowTop = min(m_overflowTop, boxShadow->y - boxShadow->blur); - m_overflowHeight = max(m_overflowHeight, height() + boxShadow->y + boxShadow->blur); + m_overflowLeft = min(m_overflowLeft, boxShadow->x - boxShadow->blur - boxShadow->spread); + m_overflowWidth = max(m_overflowWidth, width() + boxShadow->x + boxShadow->blur + boxShadow->spread); + m_overflowTop = min(m_overflowTop, boxShadow->y - boxShadow->blur - boxShadow->spread); + m_overflowHeight = max(m_overflowHeight, height() + boxShadow->y + boxShadow->blur + boxShadow->spread); } if (hasReflection()) { diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderFrameSet.h b/src/3rdparty/webkit/WebCore/rendering/RenderFrameSet.h index 713a24851..9f905023b 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderFrameSet.h +++ b/src/3rdparty/webkit/WebCore/rendering/RenderFrameSet.h @@ -83,7 +83,7 @@ public: private: static const int noSplit = -1; - class GridAxis : Noncopyable { + class GridAxis : public Noncopyable { public: GridAxis(); void resize(int); diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderLayer.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderLayer.cpp index 5de1bbf16..4b6d291d0 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderLayer.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderLayer.cpp @@ -2709,7 +2709,7 @@ void RenderLayer::calculateRects(const RenderLayer* rootLayer, const IntRect& pa do { IntRect shadowRect = layerBounds; shadowRect.move(boxShadow->x, boxShadow->y); - shadowRect.inflate(boxShadow->blur); + shadowRect.inflate(boxShadow->blur + boxShadow->spread); overflow.unite(shadowRect); boxShadow = boxShadow->next; } while (boxShadow); diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderObject.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderObject.cpp index adf6debee..df8c58a0e 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderObject.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderObject.cpp @@ -1218,7 +1218,7 @@ bool RenderObject::repaintAfterLayoutIfNeeded(RenderBoxModelObject* repaintConta if (width) { int shadowRight = 0; for (ShadowData* shadow = boxShadow; shadow; shadow = shadow->next) - shadowRight = max(shadow->x + shadow->blur, shadowRight); + shadowRight = max(shadow->x + shadow->blur + shadow->spread, shadowRight); int borderRight = isBox() ? toRenderBox(this)->borderRight() : 0; int borderWidth = max(-outlineStyle->outlineOffset(), max(borderRight, max(style()->borderTopRightRadius().width(), style()->borderBottomRightRadius().width()))) + max(ow, shadowRight); @@ -1236,7 +1236,7 @@ bool RenderObject::repaintAfterLayoutIfNeeded(RenderBoxModelObject* repaintConta if (height) { int shadowBottom = 0; for (ShadowData* shadow = boxShadow; shadow; shadow = shadow->next) - shadowBottom = max(shadow->y + shadow->blur, shadowBottom); + shadowBottom = max(shadow->y + shadow->blur + shadow->spread, shadowBottom); int borderBottom = isBox() ? toRenderBox(this)->borderBottom() : 0; int borderHeight = max(-outlineStyle->outlineOffset(), max(borderBottom, max(style()->borderBottomLeftRadius().height(), style()->borderBottomRightRadius().height()))) + max(ow, shadowBottom); @@ -2240,10 +2240,10 @@ void RenderObject::adjustRectForOutlineAndShadow(IntRect& rect) const int shadowBottom = 0; do { - shadowLeft = min(boxShadow->x - boxShadow->blur - outlineSize, shadowLeft); - shadowRight = max(boxShadow->x + boxShadow->blur + outlineSize, shadowRight); - shadowTop = min(boxShadow->y - boxShadow->blur - outlineSize, shadowTop); - shadowBottom = max(boxShadow->y + boxShadow->blur + outlineSize, shadowBottom); + shadowLeft = min(boxShadow->x - boxShadow->blur - boxShadow->spread - outlineSize, shadowLeft); + shadowRight = max(boxShadow->x + boxShadow->blur + boxShadow->spread + outlineSize, shadowRight); + shadowTop = min(boxShadow->y - boxShadow->blur - boxShadow->spread - outlineSize, shadowTop); + shadowBottom = max(boxShadow->y + boxShadow->blur + boxShadow->spread + outlineSize, shadowBottom); boxShadow = boxShadow->next; } while (boxShadow); diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderReplaced.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderReplaced.cpp index d9a0b6211..ba045eab3 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderReplaced.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderReplaced.cpp @@ -333,7 +333,7 @@ void RenderReplaced::adjustOverflowForBoxShadowAndReflect() for (ShadowData* boxShadow = style()->boxShadow(); boxShadow; boxShadow = boxShadow->next) { IntRect shadow = borderBoxRect(); shadow.move(boxShadow->x, boxShadow->y); - shadow.inflate(boxShadow->blur); + shadow.inflate(boxShadow->blur + boxShadow->spread); overflow.unite(shadow); } diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderTable.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderTable.cpp index 5d7078425..009a37529 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderTable.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderTable.cpp @@ -4,7 +4,7 @@ * (C) 1998 Waldo Bastian (bastian@kde.org) * (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) * * This library is free software; you can redistribute it and/or @@ -514,9 +514,10 @@ void RenderTable::paintBoxDecorations(PaintInfo& paintInfo, int tx, int ty) ty += captionHeight; } - paintBoxShadow(paintInfo.context, tx, ty, w, h, style()); + paintBoxShadow(paintInfo.context, tx, ty, w, h, style(), Normal); paintFillLayers(paintInfo, style()->backgroundColor(), style()->backgroundLayers(), tx, ty, w, h); + paintBoxShadow(paintInfo.context, tx, ty, w, h, style(), Inset); if (style()->hasBorder() && !collapseBorders()) paintBorder(paintInfo.context, tx, ty, w, h, style()); diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderTableCell.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderTableCell.cpp index 9b02c9d29..acdd5d52c 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderTableCell.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderTableCell.cpp @@ -4,7 +4,7 @@ * (C) 1998 Waldo Bastian (bastian@kde.org) * (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. + * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -847,10 +847,12 @@ void RenderTableCell::paintBoxDecorations(PaintInfo& paintInfo, int tx, int ty) int h = height(); if (style()->boxShadow()) - paintBoxShadow(paintInfo.context, tx, ty, w, h, style()); + paintBoxShadow(paintInfo.context, tx, ty, w, h, style(), Normal); // Paint our cell background. paintBackgroundsBehindCell(paintInfo, tx, ty, this); + if (style()->boxShadow()) + paintBoxShadow(paintInfo.context, tx, ty, w, h, style(), Inset); if (!style()->hasBorder() || tableElt->collapseBorders()) return; diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderTextControl.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderTextControl.cpp index 9acd9b214..95e71ddee 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderTextControl.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderTextControl.cpp @@ -235,7 +235,7 @@ void RenderTextControl::setSelectionRange(int start, int end) end = max(end, 0); start = min(max(start, 0), end); - document()->updateLayout(); + ASSERT(!document()->childNeedsAndNotInStyleRecalc()); if (style()->visibility() == HIDDEN || !m_innerText || !m_innerText->renderer() || !m_innerText->renderBox()->height()) { cacheSelection(start, end); diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderTextControlMultiLine.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderTextControlMultiLine.cpp index df31c2bdf..566a81c86 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderTextControlMultiLine.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderTextControlMultiLine.cpp @@ -106,19 +106,6 @@ PassRefPtr RenderTextControlMultiLine::createInnerTextStyle(const R textBlockStyle->inheritFrom(startStyle); adjustInnerTextStyle(startStyle, textBlockStyle.get()); - - // FIXME: This code should just map wrap into CSS in the DOM code. - // Then here we should set the textBlockStyle appropriately based off this - // object's style()->whiteSpace() and style->wordWrap(). - // Set word wrap property based on wrap attribute. - if (static_cast(node())->shouldWrapText()) { - textBlockStyle->setWhiteSpace(PRE_WRAP); - textBlockStyle->setWordWrap(BreakWordWrap); - } else { - textBlockStyle->setWhiteSpace(PRE); - textBlockStyle->setWordWrap(NormalWordWrap); - } - textBlockStyle->setDisplay(BLOCK); return textBlockStyle.release(); diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderTheme.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderTheme.cpp index 23b634394..d48652fbf 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderTheme.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/RenderTheme.cpp @@ -319,6 +319,7 @@ bool RenderTheme::paintBorderOnly(RenderObject* o, const RenderObject::PaintInfo case TextAreaPart: return paintTextArea(o, paintInfo, r); case MenulistButtonPart: + case SearchFieldPart: return true; case CheckboxPart: case RadioPart: @@ -331,7 +332,6 @@ bool RenderTheme::paintBorderOnly(RenderObject* o, const RenderObject::PaintInfo case SliderVerticalPart: case SliderThumbHorizontalPart: case SliderThumbVerticalPart: - case SearchFieldPart: case SearchFieldCancelButtonPart: case SearchFieldDecorationPart: case SearchFieldResultsDecorationPart: diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderThemeWince.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderThemeWince.cpp new file mode 100644 index 000000000..fb89678b6 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/rendering/RenderThemeWince.cpp @@ -0,0 +1,667 @@ +/* + * This file is part of the WebKit project. + * + * Copyright (C) 2006, 2007 Apple Computer, Inc. + * Copyright (C) 2007-2009 Torch Mobile, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ + +#include "config.h" +#include "RenderThemeWince.h" + +#include "CSSStyleSheet.h" +#include "CSSValueKeywords.h" +#include "Document.h" +#include "GraphicsContext.h" +#if ENABLE(VIDEO) +#include "HTMLMediaElement.h" +#endif + +#include + +/* + * The following constants are used to determine how a widget is drawn using + * Windows' Theme API. For more information on theme parts and states see + * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/commctls/userex/topics/partsandstates.asp + */ +#define THEME_COLOR 204 +#define THEME_FONT 210 + +// Generic state constants +#define TS_NORMAL 1 +#define TS_HOVER 2 +#define TS_ACTIVE 3 +#define TS_DISABLED 4 +#define TS_FOCUSED 5 + +// Button constants +#define BP_BUTTON 1 +#define BP_RADIO 2 +#define BP_CHECKBOX 3 + +// Textfield constants +#define TFP_TEXTFIELD 1 +#define TFS_READONLY 6 + +typedef HANDLE (WINAPI*openThemeDataPtr)(HWND hwnd, LPCWSTR pszClassList); +typedef HRESULT (WINAPI*closeThemeDataPtr)(HANDLE hTheme); +typedef HRESULT (WINAPI*drawThemeBackgroundPtr)(HANDLE hTheme, HDC hdc, int iPartId, + int iStateId, const RECT *pRect, + const RECT* pClipRect); +typedef HRESULT (WINAPI*drawThemeEdgePtr)(HANDLE hTheme, HDC hdc, int iPartId, + int iStateId, const RECT *pRect, + unsigned uEdge, unsigned uFlags, + const RECT* pClipRect); +typedef HRESULT (WINAPI*getThemeContentRectPtr)(HANDLE hTheme, HDC hdc, int iPartId, + int iStateId, const RECT* pRect, + RECT* pContentRect); +typedef HRESULT (WINAPI*getThemePartSizePtr)(HANDLE hTheme, HDC hdc, int iPartId, + int iStateId, RECT* prc, int ts, + SIZE* psz); +typedef HRESULT (WINAPI*getThemeSysFontPtr)(HANDLE hTheme, int iFontId, OUT LOGFONT* pFont); +typedef HRESULT (WINAPI*getThemeColorPtr)(HANDLE hTheme, HDC hdc, int iPartId, + int iStateId, int iPropId, OUT COLORREF* pFont); + +namespace WebCore { + +static const int dropDownButtonWidth = 17; +static const int trackWidth = 4; + +PassRefPtr RenderThemeWince::create() +{ + return adoptRef(new RenderThemeWince); +} + +PassRefPtr RenderTheme::themeForPage(Page* page) +{ + static RenderTheme* winceTheme = RenderThemeWince::create().releaseRef(); + return winceTheme; +} + +RenderThemeWince::RenderThemeWince() +{ +} + +RenderThemeWince::~RenderThemeWince() +{ +} + +Color RenderThemeWince::platformActiveSelectionBackgroundColor() const +{ + COLORREF color = GetSysColor(COLOR_HIGHLIGHT); + return Color(GetRValue(color), GetGValue(color), GetBValue(color), 255); +} + +Color RenderThemeWince::platformInactiveSelectionBackgroundColor() const +{ + COLORREF color = GetSysColor(COLOR_GRAYTEXT); + return Color(GetRValue(color), GetGValue(color), GetBValue(color), 255); +} + +Color RenderThemeWince::platformActiveSelectionForegroundColor() const +{ + COLORREF color = GetSysColor(COLOR_HIGHLIGHTTEXT); + return Color(GetRValue(color), GetGValue(color), GetBValue(color), 255); +} + +Color RenderThemeWince::platformInactiveSelectionForegroundColor() const +{ + return Color::white; +} + +bool RenderThemeWince::supportsFocus(ControlPart appearance) const +{ + switch (appearance) { + case PushButtonPart: + case ButtonPart: + case TextFieldPart: + case TextAreaPart: + return true; + default: + return false; + } + + return false; +} + +bool RenderThemeWince::supportsFocusRing(const RenderStyle *style) const +{ + return supportsFocus(style->appearance()); +} + +unsigned RenderThemeWince::determineClassicState(RenderObject* o) +{ + unsigned result = 0; + if (!isEnabled(o) || isReadOnlyControl(o)) + result = DFCS_INACTIVE; + else if (isPressed(o)) // Active supersedes hover + result = DFCS_PUSHED; + + if (isChecked(o)) + result |= DFCS_CHECKED; + return result; +} + +ThemeData RenderThemeWince::getThemeData(RenderObject* o) +{ + ThemeData result; + switch (o->style()->appearance()) { + case PushButtonPart: + case ButtonPart: + result.m_part = BP_BUTTON; + result.m_classicState = DFCS_BUTTONPUSH; + break; + case CheckboxPart: + result.m_part = BP_CHECKBOX; + result.m_classicState = DFCS_BUTTONCHECK; + break; + case RadioPart: + result.m_part = BP_RADIO; + result.m_classicState = DFCS_BUTTONRADIO; + break; + case ListboxPart: + case MenulistPart: + case TextFieldPart: + case TextAreaPart: + result.m_part = TFP_TEXTFIELD; + break; + } + + result.m_classicState |= determineClassicState(o); + + return result; +} + +bool RenderThemeWince::paintButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) +{ + // Get the correct theme data for a button + ThemeData themeData = getThemeData(o); + + // Now paint the button. + i.context->drawFrameControl(r, DFC_BUTTON, themeData.m_classicState); + if (isFocused(o)) { + if (themeData.m_part == BP_BUTTON) { + IntRect focusRect(r); + focusRect.inflate(-2); + i.context->drawFocusRect(focusRect); + } else + i.context->drawFocusRect(r); + } + + return false; +} + +void RenderThemeWince::setCheckboxSize(RenderStyle* style) const +{ + // If the width and height are both specified, then we have nothing to do. + if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto()) + return; + + // FIXME: A hard-coded size of 13 is used. This is wrong but necessary for now. It matches Firefox. + // At different DPI settings on Windows, querying the theme gives you a larger size that accounts for + // the higher DPI. Until our entire engine honors a DPI setting other than 96, we can't rely on the theme's + // metrics. + if (style->width().isIntrinsicOrAuto()) + style->setWidth(Length(13, Fixed)); + if (style->height().isAuto()) + style->setHeight(Length(13, Fixed)); +} + +bool RenderThemeWince::paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) +{ + // Get the correct theme data for a textfield + ThemeData themeData = getThemeData(o); + + // Now paint the text field. + i.context->paintTextField(r, themeData.m_classicState); + + return false; +} + +void RenderThemeWince::adjustMenuListStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const +{ + style->resetBorder(); + adjustMenuListButtonStyle(selector, style, e); +} + +bool RenderThemeWince::paintMenuList(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) +{ + paintTextField(o, i, r); + paintMenuListButton(o, i, r); + return true; +} + +bool RenderThemeWince::paintMenuListButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) +{ + IntRect buttonRect(r.right() - dropDownButtonWidth - 1, r.y(), dropDownButtonWidth, r.height()); + buttonRect.inflateY(-1); + i.context->drawFrameControl(buttonRect, DFC_SCROLL, DFCS_SCROLLCOMBOBOX | determineClassicState(o)); + return true; +} + +void RenderThemeWince::systemFont(int propId, FontDescription& fontDescription) const +{ + notImplemented(); +} + +void RenderThemeWince::themeChanged() +{ +} + +String RenderThemeWince::extraDefaultStyleSheet() +{ + notImplemented(); + return String(); +} + +String RenderThemeWince::extraQuirksStyleSheet() +{ + notImplemented(); + return String(); +} + +bool RenderThemeWince::supportsHover(const RenderStyle*) const +{ + return false; +} + +// Map a CSSValue* system color to an index understood by GetSysColor +static int cssValueIdToSysColorIndex(int cssValueId) +{ + switch (cssValueId) { + case CSSValueActiveborder: return COLOR_ACTIVEBORDER; + case CSSValueActivecaption: return COLOR_ACTIVECAPTION; + case CSSValueAppworkspace: return COLOR_APPWORKSPACE; + case CSSValueBackground: return COLOR_BACKGROUND; + case CSSValueButtonface: return COLOR_BTNFACE; + case CSSValueButtonhighlight: return COLOR_BTNHIGHLIGHT; + case CSSValueButtonshadow: return COLOR_BTNSHADOW; + case CSSValueButtontext: return COLOR_BTNTEXT; + case CSSValueCaptiontext: return COLOR_CAPTIONTEXT; + case CSSValueGraytext: return COLOR_GRAYTEXT; + case CSSValueHighlight: return COLOR_HIGHLIGHT; + case CSSValueHighlighttext: return COLOR_HIGHLIGHTTEXT; + case CSSValueInactiveborder: return COLOR_INACTIVEBORDER; + case CSSValueInactivecaption: return COLOR_INACTIVECAPTION; + case CSSValueInactivecaptiontext: return COLOR_INACTIVECAPTIONTEXT; + case CSSValueInfobackground: return COLOR_INFOBK; + case CSSValueInfotext: return COLOR_INFOTEXT; + case CSSValueMenu: return COLOR_MENU; + case CSSValueMenutext: return COLOR_MENUTEXT; + case CSSValueScrollbar: return COLOR_SCROLLBAR; + case CSSValueThreeddarkshadow: return COLOR_3DDKSHADOW; + case CSSValueThreedface: return COLOR_3DFACE; + case CSSValueThreedhighlight: return COLOR_3DHIGHLIGHT; + case CSSValueThreedlightshadow: return COLOR_3DLIGHT; + case CSSValueThreedshadow: return COLOR_3DSHADOW; + case CSSValueWindow: return COLOR_WINDOW; + case CSSValueWindowframe: return COLOR_WINDOWFRAME; + case CSSValueWindowtext: return COLOR_WINDOWTEXT; + default: return -1; // Unsupported CSSValue + } +} + +Color RenderThemeWince::systemColor(int cssValueId) const +{ + int sysColorIndex = cssValueIdToSysColorIndex(cssValueId); + if (sysColorIndex == -1) + return RenderTheme::systemColor(cssValueId); + + COLORREF color = GetSysColor(sysColorIndex); + return Color(GetRValue(color), GetGValue(color), GetBValue(color)); +} + +const int sliderThumbWidth = 7; +const int sliderThumbHeight = 15; + +void RenderThemeWince::adjustSliderThumbSize(RenderObject* o) const +{ + if (o->style()->appearance() == SliderThumbVerticalPart) { + o->style()->setWidth(Length(sliderThumbHeight, Fixed)); + o->style()->setHeight(Length(sliderThumbWidth, Fixed)); + } else if (o->style()->appearance() == SliderThumbHorizontalPart) { + o->style()->setWidth(Length(sliderThumbWidth, Fixed)); + o->style()->setHeight(Length(sliderThumbHeight, Fixed)); + } +} + +#if 0 +void RenderThemeWince::adjustButtonInnerStyle(RenderStyle* style) const +{ + // This inner padding matches Firefox. + style->setPaddingTop(Length(1, Fixed)); + style->setPaddingRight(Length(3, Fixed)); + style->setPaddingBottom(Length(1, Fixed)); + style->setPaddingLeft(Length(3, Fixed)); +} + +void RenderThemeWince::adjustSearchFieldStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const +{ + // Override padding size to match AppKit text positioning. + const int padding = 1; + style->setPaddingLeft(Length(padding, Fixed)); + style->setPaddingRight(Length(padding, Fixed)); + style->setPaddingTop(Length(padding, Fixed)); + style->setPaddingBottom(Length(padding, Fixed)); +} +#endif + +bool RenderThemeWince::paintSearchField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) +{ + return paintTextField(o, i, r); +} + +bool RenderThemeWince::paintSearchFieldCancelButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) +{ + Color buttonColor = (o->node() && o->node()->active()) ? Color(138, 138, 138) : Color(186, 186, 186); + + IntSize cancelSize(10, 10); + IntSize cancelRadius(cancelSize.width() / 2, cancelSize.height() / 2); + int x = r.x() + (r.width() - cancelSize.width()) / 2; + int y = r.y() + (r.height() - cancelSize.height()) / 2 + 1; + IntRect cancelBounds(IntPoint(x, y), cancelSize); + paintInfo.context->save(); + paintInfo.context->addRoundedRectClip(cancelBounds, cancelRadius, cancelRadius, cancelRadius, cancelRadius); + paintInfo.context->fillRect(cancelBounds, buttonColor); + + // Draw the 'x' + IntSize xSize(3, 3); + IntRect xBounds(cancelBounds.location() + IntSize(3, 3), xSize); + paintInfo.context->setStrokeColor(Color::white); + paintInfo.context->drawLine(xBounds.location(), xBounds.location() + xBounds.size()); + paintInfo.context->drawLine(IntPoint(xBounds.right(), xBounds.y()), IntPoint(xBounds.x(), xBounds.bottom())); + + paintInfo.context->restore(); + return false; +} + +void RenderThemeWince::adjustSearchFieldCancelButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const +{ + IntSize cancelSize(13, 11); + style->setWidth(Length(cancelSize.width(), Fixed)); + style->setHeight(Length(cancelSize.height(), Fixed)); +} + +void RenderThemeWince::adjustSearchFieldDecorationStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const +{ + IntSize emptySize(1, 11); + style->setWidth(Length(emptySize.width(), Fixed)); + style->setHeight(Length(emptySize.height(), Fixed)); +} + +void RenderThemeWince::adjustSearchFieldResultsDecorationStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const +{ + IntSize magnifierSize(15, 11); + style->setWidth(Length(magnifierSize.width(), Fixed)); + style->setHeight(Length(magnifierSize.height(), Fixed)); +} + +bool RenderThemeWince::paintSearchFieldResultsDecoration(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) +{ + notImplemented(); + return false; +} + +void RenderThemeWince::adjustSearchFieldResultsButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const +{ + IntSize magnifierSize(15, 11); + style->setWidth(Length(magnifierSize.width(), Fixed)); + style->setHeight(Length(magnifierSize.height(), Fixed)); +} + +bool RenderThemeWince::paintSearchFieldResultsButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) +{ + paintSearchFieldResultsDecoration(o, paintInfo, r); + return false; +} + +void RenderThemeWince::adjustMenuListButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const +{ + // These are the paddings needed to place the text correctly in the box must be at least 12px high for the button to render nicely on Windows + const int dropDownBoxMinHeight = 12; + + // Position the text correctly within the select box and make the box wide enough to fit the dropdown button + style->setPaddingTop(Length(dropDownBoxPaddingTop, Fixed)); + style->setPaddingRight(Length(dropDownBoxPaddingRight, Fixed)); + style->setPaddingBottom(Length(dropDownBoxPaddingBottom, Fixed)); + style->setPaddingLeft(Length(dropDownBoxPaddingLeft, Fixed)); + + // Height is locked to auto + style->setHeight(Length(Auto)); + + // Calculate our min-height + int minHeight = style->font().height(); + minHeight = max(minHeight, dropDownBoxMinHeight); + + style->setMinHeight(Length(minHeight, Fixed)); + + // White-space is locked to pre + style->setWhiteSpace(PRE); + + DWORD colorMenu = GetSysColor(COLOR_MENU); + DWORD colorMenuText = GetSysColor(COLOR_MENUTEXT); + Color bgColor(GetRValue(colorMenu), GetGValue(colorMenu), GetBValue(colorMenu), 255); + Color textColor(GetRValue(colorMenuText), GetGValue(colorMenuText), GetBValue(colorMenuText), 255); + if (bgColor == textColor) + textColor.setRGB((~bgColor.rgb()) | 0xFF000000); + style->clearBackgroundLayers(); + style->accessBackgroundLayers()->setClip(ContentFillBox); + style->setBackgroundColor(bgColor); + style->setColor(textColor); +} + +#if ENABLE(VIDEO) +// Attempt to retrieve a HTMLMediaElement from a Node. Returns 0 if one cannot be found. +static HTMLMediaElement* mediaElementParent(Node* node) +{ + if (!node) + return 0; + Node* mediaNode = node->shadowAncestorNode(); + if (!mediaNode || (!mediaNode->hasTagName(HTMLNames::videoTag) && !mediaNode->hasTagName(HTMLNames::audioTag))) + return 0; + + return static_cast(mediaNode); +} +#endif + +bool RenderThemeWince::paintSliderTrack(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) +{ + bool rc = RenderTheme::paintSliderTrack(o, i, r); + IntPoint left = IntPoint(r.x() + 2, (r.y() + r.bottom()) / 2); + i.context->save(); + i.context->setStrokeColor(Color::gray); + i.context->setFillColor(Color::gray); + i.context->fillRect(r); +#if ENABLE(VIDEO) + HTMLMediaElement *mediaElement = mediaElementParent(o->node()); + if (mediaElement) { + i.context->setStrokeColor(Color(0, 0xff, 0)); + IntPoint right = IntPoint(left.x() + mediaElement->percentLoaded() * (r.right() - r.x() - 4), (r.y() + r.bottom()) / 2); + i.context->drawLine(left, right); + left = right; + } +#endif + i.context->setStrokeColor(Color::black); + i.context->drawLine(left, IntPoint(r.right() - 2, left.y())); + i.context->restore(); + return rc; +} + +bool RenderThemeWince::paintSliderThumb(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) +{ + bool rc = RenderTheme::paintSliderThumb(o, i, r); + i.context->save(); + i.context->setStrokeColor(Color::black); + i.context->setFillColor(Color::black); +#if ENABLE(VIDEO) + HTMLMediaElement *mediaElement = mediaElementParent(o->node()); + if (mediaElement) { + float pt = (mediaElement->currentTime() - mediaElement->startTime()) / mediaElement->duration(); + FloatRect intRect = r; + intRect.setX(intRect.x() + intRect.width() * pt - 2); + intRect.setWidth(5); + i.context->fillRect(intRect); + } +#endif + i.context->restore(); + return rc; +} + +int RenderThemeWince::buttonInternalPaddingLeft() const +{ + return 3; +} + +int RenderThemeWince::buttonInternalPaddingRight() const +{ + return 3; +} + +int RenderThemeWince::buttonInternalPaddingTop() const +{ + return 1; +} + +int RenderThemeWince::buttonInternalPaddingBottom() const +{ + return 1; +} + +void RenderThemeWince::adjustSearchFieldStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const +{ + const int padding = 1; + style->setPaddingLeft(Length(padding, Fixed)); + style->setPaddingRight(Length(padding, Fixed)); + style->setPaddingTop(Length(padding, Fixed)); + style->setPaddingBottom(Length(padding, Fixed)); +} + +#if ENABLE(VIDEO) + +bool RenderThemeWince::paintMediaFullscreenButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) +{ + bool rc = paintButton(o, paintInfo, r); + FloatRect imRect = r; + imRect.inflate(-2); + paintInfo.context->save(); + paintInfo.context->setStrokeColor(Color::black); + paintInfo.context->setFillColor(Color::gray); + paintInfo.context->fillRect(imRect); + paintInfo.context->restore(); + return rc; +} + +bool RenderThemeWince::paintMediaMuteButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) +{ + bool rc = paintButton(o, paintInfo, r); + HTMLMediaElement *mediaElement = mediaElementParent(o->node()); + bool muted = !mediaElement || mediaElement->muted(); + FloatRect imRect = r; + imRect.inflate(-2); + paintInfo.context->save(); + paintInfo.context->setStrokeColor(Color::black); + paintInfo.context->setFillColor(Color::black); + FloatPoint pts[6] = { + FloatPoint(imRect.x() + 1, imRect.y() + imRect.height() / 3.0), + FloatPoint(imRect.x() + 1 + imRect.width() / 2.0, imRect.y() + imRect.height() / 3.0), + FloatPoint(imRect.right() - 1, imRect.y()), + FloatPoint(imRect.right() - 1, imRect.bottom()), + FloatPoint(imRect.x() + 1 + imRect.width() / 2.0, imRect.y() + 2.0 * imRect.height() / 3.0), + FloatPoint(imRect.x() + 1, imRect.y() + 2.0 * imRect.height() / 3.0) + }; + paintInfo.context->drawConvexPolygon(6, pts); + if (muted) + paintInfo.context->drawLine(IntPoint(imRect.right(), imRect.y()), IntPoint(imRect.x(), imRect.bottom())); + paintInfo.context->restore(); + return rc; +} + +bool RenderThemeWince::paintMediaPlayButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) +{ + bool rc = paintButton(o, paintInfo, r); + FloatRect imRect = r; + imRect.inflate(-3); + paintInfo.context->save(); + paintInfo.context->setStrokeColor(Color::black); + paintInfo.context->setFillColor(Color::black); + HTMLMediaElement *mediaElement = mediaElementParent(o->node()); + bool paused = !mediaElement || mediaElement->paused(); + if (paused) { + float width = imRect.width(); + imRect.setWidth(width / 3.0); + paintInfo.context->fillRect(imRect); + imRect.move(2.0 * width / 3.0, 0); + paintInfo.context->fillRect(imRect); + } else { + FloatPoint pts[3] = { FloatPoint(imRect.x(), imRect.y()), FloatPoint(imRect.right(), (imRect.y() + imRect.bottom()) / 2.0), FloatPoint(imRect.x(), imRect.bottom()) }; + paintInfo.context->drawConvexPolygon(3, pts); + } + paintInfo.context->restore(); + return rc; +} + +bool RenderThemeWince::paintMediaSeekBackButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) +{ + bool rc = paintButton(o, paintInfo, r); + FloatRect imRect = r; + imRect.inflate(-3); + FloatPoint pts[3] = { FloatPoint((imRect.x() + imRect.right()) / 2.0, imRect.y()), FloatPoint(imRect.x(), (imRect.y() + imRect.bottom()) / 2.0), FloatPoint((imRect.x() + imRect.right()) / 2.0, imRect.bottom()) }; + FloatPoint pts2[3] = { FloatPoint(imRect.right(), imRect.y()), FloatPoint((imRect.x() + imRect.right()) / 2.0, (imRect.y() + imRect.bottom()) / 2.0), FloatPoint(imRect.right(), imRect.bottom()) }; + paintInfo.context->save(); + paintInfo.context->setStrokeColor(Color::black); + paintInfo.context->setFillColor(Color::black); + paintInfo.context->drawConvexPolygon(3, pts); + paintInfo.context->drawConvexPolygon(3, pts2); + paintInfo.context->restore(); + return rc; +} + +bool RenderThemeWince::paintMediaSeekForwardButton(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) +{ + bool rc = paintButton(o, paintInfo, r); + FloatRect imRect = r; + imRect.inflate(-3); + FloatPoint pts[3] = { FloatPoint(imRect.x(), imRect.y()), FloatPoint((imRect.x() + imRect.right()) / 2.0, (imRect.y() + imRect.bottom()) / 2.0), FloatPoint(imRect.x(), imRect.bottom()) }; + FloatPoint pts2[3] = { FloatPoint((imRect.x() + imRect.right()) / 2.0, imRect.y()), FloatPoint(imRect.right(), (imRect.y() + imRect.bottom()) / 2.0), FloatPoint((imRect.x() + imRect.right()) / 2.0, imRect.bottom()) }; + paintInfo.context->save(); + paintInfo.context->setStrokeColor(Color::black); + paintInfo.context->setFillColor(Color::black); + paintInfo.context->drawConvexPolygon(3, pts); + paintInfo.context->drawConvexPolygon(3, pts2); + paintInfo.context->restore(); + return rc; +} + +bool RenderThemeWince::paintMediaSliderTrack(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) +{ + return paintSliderTrack(o, paintInfo, r); +} + +bool RenderThemeWince::paintMediaSliderThumb(RenderObject* o, const RenderObject::PaintInfo& paintInfo, const IntRect& r) +{ + return paintSliderThumb(o, paintInfo, r); +} +#endif + +} + diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderThemeWince.h b/src/3rdparty/webkit/WebCore/rendering/RenderThemeWince.h new file mode 100644 index 000000000..a2d04e121 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/rendering/RenderThemeWince.h @@ -0,0 +1,147 @@ +/* + * This file is part of the WebKit project. + * + * Copyright (C) 2006, 2008 Apple Computer, Inc. + * Copyright (C) 2009 Torch Mobile, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ + +#ifndef RenderThemeWince_h +#define RenderThemeWince_h + +#include "RenderTheme.h" + +typedef void* HANDLE; +typedef struct HINSTANCE__* HINSTANCE; +typedef HINSTANCE HMODULE; + +namespace WebCore { + + struct ThemeData { + ThemeData() :m_part(0), m_state(0), m_classicState(0) {} + ThemeData(int part, int state) + : m_part(part) + , m_state(state) + , m_classicState(0) + { } + + unsigned m_part; + unsigned m_state; + unsigned m_classicState; + }; + + class RenderThemeWince : public RenderTheme { + public: + static PassRefPtr create(); + ~RenderThemeWince(); + + virtual String extraDefaultStyleSheet(); + virtual String extraQuirksStyleSheet(); + + // A method asking if the theme's controls actually care about redrawing when hovered. + virtual bool supportsHover(const RenderStyle*) const; + + virtual Color platformActiveSelectionBackgroundColor() const; + virtual Color platformInactiveSelectionBackgroundColor() const; + virtual Color platformActiveSelectionForegroundColor() const; + virtual Color platformInactiveSelectionForegroundColor() const; + + // System fonts. + virtual void systemFont(int propId, FontDescription&) const; + virtual Color systemColor(int cssValueId) const; + + virtual bool paintCheckbox(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) + { return paintButton(o, i, r); } + virtual void setCheckboxSize(RenderStyle*) const; + + virtual bool paintRadio(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) + { return paintButton(o, i, r); } + virtual void setRadioSize(RenderStyle* style) const + { return setCheckboxSize(style); } + + virtual bool paintButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + + virtual bool paintTextField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + + virtual bool paintTextArea(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) + { return paintTextField(o, i, r); } + + virtual void adjustMenuListStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const; + virtual bool paintMenuList(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + virtual void adjustMenuListButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const; + + virtual bool paintMenuListButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + + virtual bool paintSliderTrack(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r); + virtual bool paintSliderThumb(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r); + virtual void adjustSliderThumbSize(RenderObject*) const; + + virtual bool popupOptionSupportsTextIndent() const { return true; } + + virtual int buttonInternalPaddingLeft() const; + virtual int buttonInternalPaddingRight() const; + virtual int buttonInternalPaddingTop() const; + virtual int buttonInternalPaddingBottom() const; + + virtual void adjustSearchFieldStyle(CSSStyleSelector*, RenderStyle*, Element*) const; + virtual bool paintSearchField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + + virtual void adjustSearchFieldCancelButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const; + virtual bool paintSearchFieldCancelButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + + virtual void adjustSearchFieldDecorationStyle(CSSStyleSelector*, RenderStyle*, Element*) const; + virtual bool paintSearchFieldDecoration(RenderObject*, const RenderObject::PaintInfo&, const IntRect&) { return false; } + + virtual void adjustSearchFieldResultsDecorationStyle(CSSStyleSelector*, RenderStyle*, Element*) const; + virtual bool paintSearchFieldResultsDecoration(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + + virtual void adjustSearchFieldResultsButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const; + virtual bool paintSearchFieldResultsButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + + virtual void themeChanged(); + + virtual void adjustButtonStyle(CSSStyleSelector*, RenderStyle* style, Element*) const {} + virtual void adjustTextFieldStyle(CSSStyleSelector*, RenderStyle* style, Element*) const {} + virtual void adjustTextAreaStyle(CSSStyleSelector*, RenderStyle* style, Element*) const {} + + static void setWebKitIsBeingUnloaded(); + + virtual bool supportsFocusRing(const RenderStyle*) const; + + #if ENABLE(VIDEO) + virtual bool paintMediaFullscreenButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + virtual bool paintMediaPlayButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + virtual bool paintMediaMuteButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + virtual bool paintMediaSeekBackButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + virtual bool paintMediaSeekForwardButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + virtual bool paintMediaSliderTrack(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + virtual bool paintMediaSliderThumb(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); + #endif + + private: + RenderThemeWince(); + + unsigned determineClassicState(RenderObject*); + bool supportsFocus(ControlPart) const; + + ThemeData getThemeData(RenderObject*); + }; + +}; + +#endif diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderView.h b/src/3rdparty/webkit/WebCore/rendering/RenderView.h index b0de7dd8f..854a4214d 100644 --- a/src/3rdparty/webkit/WebCore/rendering/RenderView.h +++ b/src/3rdparty/webkit/WebCore/rendering/RenderView.h @@ -222,7 +222,7 @@ void toRenderView(const RenderView*); // Stack-based class to assist with LayoutState push/pop -class LayoutStateMaintainer : Noncopyable { +class LayoutStateMaintainer : public Noncopyable { public: // ctor to push now LayoutStateMaintainer(RenderView* view, RenderBox* root, IntSize offset, bool disableState = false) diff --git a/src/3rdparty/webkit/WebCore/rendering/SVGRenderTreeAsText.cpp b/src/3rdparty/webkit/WebCore/rendering/SVGRenderTreeAsText.cpp index 33baebac8..cc5e4b855 100644 --- a/src/3rdparty/webkit/WebCore/rendering/SVGRenderTreeAsText.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/SVGRenderTreeAsText.cpp @@ -33,6 +33,7 @@ #include "GraphicsTypes.h" #include "InlineTextBox.h" #include "HTMLNames.h" +#include "NodeRenderStyle.h" #include "RenderPath.h" #include "RenderSVGContainer.h" #include "RenderSVGImage.h" @@ -272,7 +273,7 @@ static void writeStyle(TextStream& ts, const RenderObject& object) ts << s << *strokePaintServer; double dashOffset = SVGRenderStyle::cssPrimitiveToLength(&path, svgStyle->strokeDashOffset(), 0.0f); - const DashArray& dashArray = dashArrayFromRenderingStyle(style); + const DashArray& dashArray = dashArrayFromRenderingStyle(style, object.document()->documentElement()->renderStyle()); double strokeWidth = SVGRenderStyle::cssPrimitiveToLength(&path, svgStyle->strokeWidth(), 1.0f); writeIfNotDefault(ts, "opacity", svgStyle->strokeOpacity(), 1.0f); diff --git a/src/3rdparty/webkit/WebCore/rendering/TransformState.h b/src/3rdparty/webkit/WebCore/rendering/TransformState.h index 92275f9fe..d2c962a90 100644 --- a/src/3rdparty/webkit/WebCore/rendering/TransformState.h +++ b/src/3rdparty/webkit/WebCore/rendering/TransformState.h @@ -37,7 +37,7 @@ namespace WebCore { -class TransformState : Noncopyable { +class TransformState : public Noncopyable { public: enum TransformDirection { ApplyTransformDirection, UnapplyInverseTransformDirection }; enum TransformAccumulation { FlattenTransform, AccumulateTransform }; diff --git a/src/3rdparty/webkit/WebCore/rendering/style/FillLayer.h b/src/3rdparty/webkit/WebCore/rendering/style/FillLayer.h index 2dc587188..c3944adc9 100644 --- a/src/3rdparty/webkit/WebCore/rendering/style/FillLayer.h +++ b/src/3rdparty/webkit/WebCore/rendering/style/FillLayer.h @@ -42,7 +42,7 @@ public: StyleImage* image() const { return m_image.get(); } Length xPosition() const { return m_xPosition; } Length yPosition() const { return m_yPosition; } - bool attachment() const { return m_attachment; } + EFillAttachment attachment() const { return static_cast(m_attachment); } EFillBox clip() const { return static_cast(m_clip); } EFillBox origin() const { return static_cast(m_origin); } EFillRepeat repeat() const { return static_cast(m_repeat); } @@ -65,7 +65,7 @@ public: void setImage(StyleImage* i) { m_image = i; m_imageSet = true; } void setXPosition(const Length& l) { m_xPosition = l; m_xPosSet = true; } void setYPosition(const Length& l) { m_yPosition = l; m_yPosSet = true; } - void setAttachment(bool b) { m_attachment = b; m_attachmentSet = true; } + void setAttachment(EFillAttachment attachment) { m_attachment = attachment; m_attachmentSet = true; } void setClip(EFillBox b) { m_clip = b; m_clipSet = true; } void setOrigin(EFillBox b) { m_origin = b; m_originSet = true; } void setRepeat(EFillRepeat r) { m_repeat = r; m_repeatSet = true; } @@ -104,7 +104,7 @@ public: bool hasFixedImage() const { - if (m_image && !m_attachment) + if (m_image && m_attachment == FixedBackgroundAttachment) return true; return m_next ? m_next->hasFixedImage() : false; } @@ -114,7 +114,7 @@ public: void fillUnsetProperties(); void cullEmptyLayers(); - static bool initialFillAttachment(EFillLayerType) { return true; } + static EFillAttachment initialFillAttachment(EFillLayerType) { return ScrollBackgroundAttachment; } static EFillBox initialFillClip(EFillLayerType) { return BorderFillBox; } static EFillBox initialFillOrigin(EFillLayerType type) { return type == BackgroundFillLayer ? PaddingFillBox : BorderFillBox; } static EFillRepeat initialFillRepeat(EFillLayerType) { return RepeatFill; } @@ -133,7 +133,7 @@ public: Length m_xPosition; Length m_yPosition; - bool m_attachment : 1; + unsigned m_attachment : 2; // EFillAttachment unsigned m_clip : 2; // EFillBox unsigned m_origin : 2; // EFillBox unsigned m_repeat : 2; // EFillRepeat diff --git a/src/3rdparty/webkit/WebCore/rendering/style/RenderStyle.cpp b/src/3rdparty/webkit/WebCore/rendering/style/RenderStyle.cpp index 36255b813..efec1bdd5 100644 --- a/src/3rdparty/webkit/WebCore/rendering/style/RenderStyle.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/style/RenderStyle.cpp @@ -695,6 +695,8 @@ void RenderStyle::addBindingURI(StringImpl* uri) void RenderStyle::setTextShadow(ShadowData* val, bool add) { + ASSERT(!val || !val->spread); + StyleRareInheritedData* rareData = rareInheritedData.access(); if (!add) { delete rareData->textShadow; diff --git a/src/3rdparty/webkit/WebCore/rendering/style/RenderStyle.h b/src/3rdparty/webkit/WebCore/rendering/style/RenderStyle.h index 6922c8870..4582dbb2b 100644 --- a/src/3rdparty/webkit/WebCore/rendering/style/RenderStyle.h +++ b/src/3rdparty/webkit/WebCore/rendering/style/RenderStyle.h @@ -523,7 +523,7 @@ public: StyleImage* backgroundImage() const { return background->m_background.m_image.get(); } EFillRepeat backgroundRepeat() const { return static_cast(background->m_background.m_repeat); } CompositeOperator backgroundComposite() const { return static_cast(background->m_background.m_composite); } - bool backgroundAttachment() const { return background->m_background.m_attachment; } + EFillAttachment backgroundAttachment() const { return static_cast(background->m_background.m_attachment); } EFillBox backgroundClip() const { return static_cast(background->m_background.m_clip); } EFillBox backgroundOrigin() const { return static_cast(background->m_background.m_origin); } Length backgroundXPosition() const { return background->m_background.m_xPosition; } @@ -535,7 +535,7 @@ public: StyleImage* maskImage() const { return rareNonInheritedData->m_mask.m_image.get(); } EFillRepeat maskRepeat() const { return static_cast(rareNonInheritedData->m_mask.m_repeat); } CompositeOperator maskComposite() const { return static_cast(rareNonInheritedData->m_mask.m_composite); } - bool maskAttachment() const { return rareNonInheritedData->m_mask.m_attachment; } + EFillAttachment maskAttachment() const { return static_cast(rareNonInheritedData->m_mask.m_attachment); } EFillBox maskClip() const { return static_cast(rareNonInheritedData->m_mask.m_clip); } EFillBox maskOrigin() const { return static_cast(rareNonInheritedData->m_mask.m_origin); } Length maskXPosition() const { return rareNonInheritedData->m_mask.m_xPosition; } diff --git a/src/3rdparty/webkit/WebCore/rendering/style/RenderStyleConstants.h b/src/3rdparty/webkit/WebCore/rendering/style/RenderStyleConstants.h index b08dd87e0..1b3e1f405 100644 --- a/src/3rdparty/webkit/WebCore/rendering/style/RenderStyleConstants.h +++ b/src/3rdparty/webkit/WebCore/rendering/style/RenderStyleConstants.h @@ -122,6 +122,10 @@ enum EUnicodeBidi { UBNormal, Embed, Override }; +enum EFillAttachment { + ScrollBackgroundAttachment, LocalBackgroundAttachment, FixedBackgroundAttachment +}; + enum EFillBox { BorderFillBox, PaddingFillBox, ContentFillBox, TextFillBox }; diff --git a/src/3rdparty/webkit/WebCore/rendering/style/SVGRenderStyle.cpp b/src/3rdparty/webkit/WebCore/rendering/style/SVGRenderStyle.cpp index c5f06481f..1289b06b7 100644 --- a/src/3rdparty/webkit/WebCore/rendering/style/SVGRenderStyle.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/style/SVGRenderStyle.cpp @@ -32,6 +32,7 @@ #include "CSSPrimitiveValue.h" #include "CSSValueList.h" +#include "NodeRenderStyle.h" #include "RenderObject.h" #include "RenderStyle.h" #include "SVGStyledElement.h" @@ -136,7 +137,7 @@ float SVGRenderStyle::cssPrimitiveToLength(const RenderObject* item, CSSValue* v } } - return primitive->computeLengthFloat(const_cast(item->style())); + return primitive->computeLengthFloat(const_cast(item->style()), item->document()->documentElement()->renderStyle()); } } diff --git a/src/3rdparty/webkit/WebCore/rendering/style/ShadowData.cpp b/src/3rdparty/webkit/WebCore/rendering/style/ShadowData.cpp index 75fb9dc89..1954224e0 100644 --- a/src/3rdparty/webkit/WebCore/rendering/style/ShadowData.cpp +++ b/src/3rdparty/webkit/WebCore/rendering/style/ShadowData.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) - * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -28,6 +28,8 @@ ShadowData::ShadowData(const ShadowData& o) : x(o.x) , y(o.y) , blur(o.blur) + , spread(o.spread) + , style(o.style) , color(o.color) { next = o.next ? new ShadowData(*o.next) : 0; @@ -39,7 +41,7 @@ bool ShadowData::operator==(const ShadowData& o) const (next && o.next && *next != *o.next)) return false; - return x == o.x && y == o.y && blur == o.blur && color == o.color; + return x == o.x && y == o.y && blur == o.blur && spread == o.spread && style == o.style && color == o.color; } } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/rendering/style/ShadowData.h b/src/3rdparty/webkit/WebCore/rendering/style/ShadowData.h index dac2b1884..f4061f2e5 100644 --- a/src/3rdparty/webkit/WebCore/rendering/style/ShadowData.h +++ b/src/3rdparty/webkit/WebCore/rendering/style/ShadowData.h @@ -2,7 +2,7 @@ * Copyright (C) 2000 Lars Knoll (knoll@kde.org) * (C) 2000 Antti Koivisto (koivisto@kde.org) * (C) 2000 Dirk Mueller (mueller@kde.org) - * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) * * This library is free software; you can redistribute it and/or @@ -29,6 +29,8 @@ namespace WebCore { +enum ShadowStyle { Normal, Inset }; + // This struct holds information about shadows for the text-shadow and box-shadow properties. struct ShadowData { @@ -36,15 +38,19 @@ struct ShadowData { : x(0) , y(0) , blur(0) + , spread(0) + , style(Normal) , next(0) { } - ShadowData(int _x, int _y, int _blur, const Color& _color) - : x(_x) - , y(_y) - , blur(_blur) - , color(_color) + ShadowData(int x, int y, int blur, int spread, ShadowStyle style, const Color& color) + : x(x) + , y(y) + , blur(blur) + , spread(spread) + , style(style) + , color(color) , next(0) { } @@ -62,6 +68,8 @@ struct ShadowData { int x; int y; int blur; + int spread; + ShadowStyle style; Color color; ShadowData* next; }; diff --git a/src/3rdparty/webkit/WebCore/storage/DatabaseTracker.cpp b/src/3rdparty/webkit/WebCore/storage/DatabaseTracker.cpp index 4a64fe62b..e7c9485ef 100644 --- a/src/3rdparty/webkit/WebCore/storage/DatabaseTracker.cpp +++ b/src/3rdparty/webkit/WebCore/storage/DatabaseTracker.cpp @@ -227,13 +227,6 @@ String DatabaseTracker::fullPathForDatabase(SecurityOrigin* origin, const String } statement.finalize(); - SQLiteStatement sequenceStatement(m_database, "SELECT seq FROM sqlite_sequence WHERE name='Databases';"); - - // FIXME: More informative error handling here, even though these steps should never fail - if (sequenceStatement.prepare() != SQLResultOk) - return String(); - result = sequenceStatement.step(); - String fileName = SQLiteFileSystem::getFileNameForNewDatabase(originPath, origin->databaseIdentifier(), name, &m_database); if (!addDatabase(origin, name, fileName)) return String(); diff --git a/src/3rdparty/webkit/WebCore/storage/LocalStorageTask.cpp b/src/3rdparty/webkit/WebCore/storage/LocalStorageTask.cpp index f9b8dc23a..f5d4890ea 100644 --- a/src/3rdparty/webkit/WebCore/storage/LocalStorageTask.cpp +++ b/src/3rdparty/webkit/WebCore/storage/LocalStorageTask.cpp @@ -49,6 +49,10 @@ LocalStorageTask::LocalStorageTask(Type type, PassRefPtr thr ASSERT(m_type == TerminateThread); } +LocalStorageTask::~LocalStorageTask() +{ +} + void LocalStorageTask::performTask() { switch (m_type) { diff --git a/src/3rdparty/webkit/WebCore/storage/LocalStorageTask.h b/src/3rdparty/webkit/WebCore/storage/LocalStorageTask.h index 2c397dad7..b12a26b8f 100644 --- a/src/3rdparty/webkit/WebCore/storage/LocalStorageTask.h +++ b/src/3rdparty/webkit/WebCore/storage/LocalStorageTask.h @@ -42,6 +42,8 @@ namespace WebCore { public: enum Type { AreaImport, AreaSync, TerminateThread }; + ~LocalStorageTask(); + static PassRefPtr createImport(PassRefPtr area) { return adoptRef(new LocalStorageTask(AreaImport, area)); } static PassRefPtr createSync(PassRefPtr area) { return adoptRef(new LocalStorageTask(AreaSync, area)); } static PassRefPtr createTerminate(PassRefPtr thread) { return adoptRef(new LocalStorageTask(TerminateThread, thread)); } diff --git a/src/3rdparty/webkit/WebCore/storage/Storage.cpp b/src/3rdparty/webkit/WebCore/storage/Storage.cpp index e22897125..016609849 100644 --- a/src/3rdparty/webkit/WebCore/storage/Storage.cpp +++ b/src/3rdparty/webkit/WebCore/storage/Storage.cpp @@ -47,6 +47,10 @@ Storage::Storage(Frame* frame, PassRefPtr storageArea) ASSERT(m_storageArea); } +Storage::~Storage() +{ +} + unsigned Storage::length() const { if (!m_frame) diff --git a/src/3rdparty/webkit/WebCore/storage/Storage.h b/src/3rdparty/webkit/WebCore/storage/Storage.h index ca7a32eb5..77c572003 100644 --- a/src/3rdparty/webkit/WebCore/storage/Storage.h +++ b/src/3rdparty/webkit/WebCore/storage/Storage.h @@ -28,8 +28,6 @@ #if ENABLE(DOM_STORAGE) -#include "StorageArea.h" - #include #include #include @@ -37,13 +35,15 @@ namespace WebCore { class Frame; + class StorageArea; class String; typedef int ExceptionCode; class Storage : public RefCounted { public: static PassRefPtr create(Frame*, PassRefPtr); - + ~Storage(); + unsigned length() const; String key(unsigned index, ExceptionCode&) const; String getItem(const String&) const; diff --git a/src/3rdparty/webkit/WebCore/storage/StorageArea.cpp b/src/3rdparty/webkit/WebCore/storage/StorageArea.cpp index 11b3517f6..e69de29bb 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageArea.cpp +++ b/src/3rdparty/webkit/WebCore/storage/StorageArea.cpp @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2008 Apple Inc. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "StorageArea.h" - -#if PLATFORM(CHROMIUM) -#error "Chromium should not compile this file and instead define its own version of these factories that navigate the multi-process boundry." -#endif - -#if ENABLE(DOM_STORAGE) - -#include "StorageAreaImpl.h" - -namespace WebCore { - -PassRefPtr StorageArea::create(StorageType storageType, SecurityOrigin* origin, PassRefPtr syncManager) -{ - return StorageAreaImpl::create(storageType, origin, syncManager); -} - -} - -#endif // ENABLE(DOM_STORAGE) - diff --git a/src/3rdparty/webkit/WebCore/storage/StorageArea.h b/src/3rdparty/webkit/WebCore/storage/StorageArea.h index 31f716a0a..6ae10c198 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageArea.h +++ b/src/3rdparty/webkit/WebCore/storage/StorageArea.h @@ -29,23 +29,14 @@ #if ENABLE(DOM_STORAGE) #include "PlatformString.h" -#include "SecurityOrigin.h" -#include "StorageAreaSync.h" -#include "StorageMap.h" -#include "StorageSyncManager.h" -#include #include -#include -#include +#include namespace WebCore { class Frame; - class Page; class SecurityOrigin; - class StorageAreaSync; - class StorageMap; class StorageSyncManager; typedef int ExceptionCode; enum StorageType { LocalStorage, SessionStorage }; @@ -53,9 +44,7 @@ namespace WebCore { // This interface is required for Chromium since these actions need to be proxied between processes. class StorageArea : public ThreadSafeShared { public: - static PassRefPtr create(StorageType, SecurityOrigin*, PassRefPtr); virtual ~StorageArea() { } - virtual PassRefPtr copy(SecurityOrigin*) = 0; // The HTML5 DOM Storage API virtual unsigned length() const = 0; @@ -64,13 +53,7 @@ namespace WebCore { virtual void setItem(const String& key, const String& value, ExceptionCode& ec, Frame* sourceFrame) = 0; virtual void removeItem(const String& key, Frame* sourceFrame) = 0; virtual void clear(Frame* sourceFrame) = 0; - virtual bool contains(const String& key) const = 0; - virtual void close() = 0; - - // Could be called from a background thread. - virtual void importItem(const String& key, const String& value) = 0; - virtual SecurityOrigin* securityOrigin() = 0; }; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.cpp b/src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.cpp index ba316583a..9eb59e33c 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.cpp +++ b/src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.cpp @@ -43,11 +43,6 @@ namespace WebCore { -PassRefPtr StorageAreaImpl::create(StorageType storageType, SecurityOrigin* origin, PassRefPtr syncManager) -{ - return adoptRef(new StorageAreaImpl(storageType, origin, syncManager)); -} - StorageAreaImpl::~StorageAreaImpl() { } @@ -72,7 +67,7 @@ StorageAreaImpl::StorageAreaImpl(StorageType storageType, SecurityOrigin* origin } } -PassRefPtr StorageAreaImpl::copy(SecurityOrigin* origin) +PassRefPtr StorageAreaImpl::copy(SecurityOrigin* origin) { ASSERT(!m_isShutdown); return adoptRef(new StorageAreaImpl(origin, this)); diff --git a/src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.h b/src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.h index e2d14f169..d3f078567 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.h +++ b/src/3rdparty/webkit/WebCore/storage/StorageAreaImpl.h @@ -30,31 +30,36 @@ #include "StorageArea.h" +#include + namespace WebCore { + class SecurityOrigin; + class StorageMap; + class StorageAreaSync; + class StorageAreaImpl : public StorageArea { public: - static PassRefPtr create(StorageType, SecurityOrigin*, PassRefPtr); + StorageAreaImpl(StorageType, SecurityOrigin*, PassRefPtr); virtual ~StorageAreaImpl(); - virtual PassRefPtr copy(SecurityOrigin*); - // The HTML5 DOM Storage API + // The HTML5 DOM Storage API (and contains) virtual unsigned length() const; virtual String key(unsigned index, ExceptionCode& ec) const; virtual String getItem(const String& key) const; virtual void setItem(const String& key, const String& value, ExceptionCode& ec, Frame* sourceFrame); virtual void removeItem(const String& key, Frame* sourceFrame); virtual void clear(Frame* sourceFrame); - virtual bool contains(const String& key) const; - virtual void close(); + + PassRefPtr copy(SecurityOrigin*); + void close(); // Could be called from a background thread. void importItem(const String& key, const String& value); SecurityOrigin* securityOrigin(); private: - StorageAreaImpl(StorageType, SecurityOrigin*, PassRefPtr); StorageAreaImpl(SecurityOrigin*, StorageAreaImpl*); void blockUntilImportComplete() const; diff --git a/src/3rdparty/webkit/WebCore/storage/StorageAreaSync.cpp b/src/3rdparty/webkit/WebCore/storage/StorageAreaSync.cpp index 2cef56d8d..01d2a65e7 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageAreaSync.cpp +++ b/src/3rdparty/webkit/WebCore/storage/StorageAreaSync.cpp @@ -32,7 +32,8 @@ #include "EventNames.h" #include "HTMLElement.h" #include "SQLiteStatement.h" -#include "StorageArea.h" +#include "StorageAreaImpl.h" +#include "StorageSyncManager.h" #include "SuddenTermination.h" namespace WebCore { @@ -41,12 +42,12 @@ namespace WebCore { // Instead, queue up a batch of items to sync and actually do the sync at the following interval. static const double StorageSyncInterval = 1.0; -PassRefPtr StorageAreaSync::create(PassRefPtr storageSyncManager, PassRefPtr storageArea) +PassRefPtr StorageAreaSync::create(PassRefPtr storageSyncManager, PassRefPtr storageArea) { return adoptRef(new StorageAreaSync(storageSyncManager, storageArea)); } -StorageAreaSync::StorageAreaSync(PassRefPtr storageSyncManager, PassRefPtr storageArea) +StorageAreaSync::StorageAreaSync(PassRefPtr storageSyncManager, PassRefPtr storageArea) : m_syncTimer(this, &StorageAreaSync::syncTimerFired) , m_itemsCleared(false) , m_finalSyncScheduled(false) @@ -65,12 +66,10 @@ StorageAreaSync::StorageAreaSync(PassRefPtr storageSyncManag m_importComplete = true; } -#ifndef NDEBUG StorageAreaSync::~StorageAreaSync() { ASSERT(!m_syncTimer.isActive()); } -#endif void StorageAreaSync::scheduleFinalSync() { diff --git a/src/3rdparty/webkit/WebCore/storage/StorageAreaSync.h b/src/3rdparty/webkit/WebCore/storage/StorageAreaSync.h index a7f1082c4..e436befa7 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageAreaSync.h +++ b/src/3rdparty/webkit/WebCore/storage/StorageAreaSync.h @@ -28,26 +28,23 @@ #if ENABLE(DOM_STORAGE) +#include "PlatformString.h" #include "SQLiteDatabase.h" #include "StringHash.h" -#include "StorageSyncManager.h" #include "Timer.h" #include namespace WebCore { class Frame; - class StorageArea; + class StorageAreaImpl; class StorageSyncManager; class StorageAreaSync : public RefCounted { public: -#ifndef NDEBUG + static PassRefPtr create(PassRefPtr storageSyncManager, PassRefPtr storageArea); ~StorageAreaSync(); -#endif - static PassRefPtr create(PassRefPtr storageSyncManager, PassRefPtr storageArea); - void scheduleFinalSync(); void blockUntilImportComplete() const; @@ -55,7 +52,7 @@ namespace WebCore { void scheduleClear(); private: - StorageAreaSync(PassRefPtr storageSyncManager, PassRefPtr storageArea); + StorageAreaSync(PassRefPtr storageSyncManager, PassRefPtr storageArea); void dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, Frame* sourceFrame); @@ -65,7 +62,7 @@ namespace WebCore { bool m_finalSyncScheduled; - RefPtr m_storageArea; + RefPtr m_storageArea; RefPtr m_syncManager; // The database handle will only ever be opened and used on the background thread. diff --git a/src/3rdparty/webkit/WebCore/storage/StorageEvent.cpp b/src/3rdparty/webkit/WebCore/storage/StorageEvent.cpp index f2945a9dd..2e620d510 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageEvent.cpp +++ b/src/3rdparty/webkit/WebCore/storage/StorageEvent.cpp @@ -33,6 +33,20 @@ namespace WebCore { +PassRefPtr StorageEvent::create() +{ + return adoptRef(new StorageEvent); +} + +StorageEvent::StorageEvent() +{ +} + +PassRefPtr StorageEvent::create(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr source, Storage* storageArea) +{ + return adoptRef(new StorageEvent(type, key, oldValue, newValue, uri, source, storageArea)); +} + StorageEvent::StorageEvent(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr source, Storage* storageArea) : Event(type, false, true) , m_key(key) diff --git a/src/3rdparty/webkit/WebCore/storage/StorageEvent.h b/src/3rdparty/webkit/WebCore/storage/StorageEvent.h index ee3d5ad21..703fb5aff 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageEvent.h +++ b/src/3rdparty/webkit/WebCore/storage/StorageEvent.h @@ -29,22 +29,17 @@ #if ENABLE(DOM_STORAGE) #include "Event.h" -#include "Storage.h" +#include "PlatformString.h" namespace WebCore { class DOMWindow; + class Storage; class StorageEvent : public Event { public: - static PassRefPtr create() - { - return adoptRef(new StorageEvent); - } - static PassRefPtr create(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr source, Storage* storageArea) - { - return adoptRef(new StorageEvent(type, key, oldValue, newValue, uri, source, storageArea)); - } + static PassRefPtr create(); + static PassRefPtr create(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr source, Storage* storageArea); const String& key() const { return m_key; } const String& oldValue() const { return m_oldValue; } @@ -61,7 +56,7 @@ namespace WebCore { virtual bool isStorageEvent() const { return true; } private: - StorageEvent() { } + StorageEvent(); StorageEvent(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr source, Storage* storageArea); String m_key; diff --git a/src/3rdparty/webkit/WebCore/storage/StorageNamespace.h b/src/3rdparty/webkit/WebCore/storage/StorageNamespace.h index 687cea2bb..edbe33986 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageNamespace.h +++ b/src/3rdparty/webkit/WebCore/storage/StorageNamespace.h @@ -28,16 +28,15 @@ #if ENABLE(DOM_STORAGE) -#include "SecurityOriginHash.h" -#include "StorageArea.h" +#include "PlatformString.h" -#include +#include #include namespace WebCore { + class SecurityOrigin; class StorageArea; - class StorageSyncManager; // This interface is required for Chromium since these actions need to be proxied between processes. class StorageNamespace : public RefCounted { diff --git a/src/3rdparty/webkit/WebCore/storage/StorageNamespaceImpl.cpp b/src/3rdparty/webkit/WebCore/storage/StorageNamespaceImpl.cpp index 39ec27bd3..8b08a27ec 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageNamespaceImpl.cpp +++ b/src/3rdparty/webkit/WebCore/storage/StorageNamespaceImpl.cpp @@ -28,6 +28,10 @@ #if ENABLE(DOM_STORAGE) +#include "SecurityOriginHash.h" +#include "StringHash.h" +#include "StorageAreaImpl.h" +#include "StorageSyncManager.h" #include namespace WebCore { @@ -89,7 +93,7 @@ PassRefPtr StorageNamespaceImpl::copy() StorageAreaMap::iterator end = m_storageAreaMap.end(); for (StorageAreaMap::iterator i = m_storageAreaMap.begin(); i != end; ++i) { - RefPtr areaCopy = i->second->copy(i->first.get()); + RefPtr areaCopy = i->second->copy(i->first.get()); newNamespace->m_storageAreaMap.set(i->first, areaCopy.release()); } @@ -101,11 +105,11 @@ PassRefPtr StorageNamespaceImpl::storageArea(SecurityOrigin* origin ASSERT(isMainThread()); ASSERT(!m_isShutdown); - RefPtr storageArea; + RefPtr storageArea; if (storageArea = m_storageAreaMap.get(origin)) return storageArea.release(); - storageArea = StorageArea::create(m_storageType, origin, m_syncManager); + storageArea = new StorageAreaImpl(m_storageType, origin, m_syncManager); m_storageAreaMap.set(origin, storageArea); return storageArea.release(); } diff --git a/src/3rdparty/webkit/WebCore/storage/StorageNamespaceImpl.h b/src/3rdparty/webkit/WebCore/storage/StorageNamespaceImpl.h index 6c5a9dcf7..4ec2f72a1 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageNamespaceImpl.h +++ b/src/3rdparty/webkit/WebCore/storage/StorageNamespaceImpl.h @@ -28,10 +28,18 @@ #if ENABLE(DOM_STORAGE) +#include "PlatformString.h" +#include "SecurityOriginHash.h" +#include "StorageArea.h" #include "StorageNamespace.h" +#include +#include + namespace WebCore { + class StorageAreaImpl; + class StorageNamespaceImpl : public StorageNamespace { public: static PassRefPtr localStorageNamespace(const String& path); @@ -45,7 +53,7 @@ namespace WebCore { private: StorageNamespaceImpl(StorageType, const String& path); - typedef HashMap, RefPtr, SecurityOriginHash> StorageAreaMap; + typedef HashMap, RefPtr, SecurityOriginHash> StorageAreaMap; StorageAreaMap m_storageAreaMap; StorageType m_storageType; diff --git a/src/3rdparty/webkit/WebCore/storage/StorageSyncManager.cpp b/src/3rdparty/webkit/WebCore/storage/StorageSyncManager.cpp index 5dab7a603..a93524282 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageSyncManager.cpp +++ b/src/3rdparty/webkit/WebCore/storage/StorageSyncManager.cpp @@ -33,6 +33,8 @@ #include "FileSystem.h" #include "Frame.h" #include "FrameTree.h" +#include "LocalStorageTask.h" +#include "LocalStorageThread.h" #include "Page.h" #include "PageGroup.h" #include "StorageAreaSync.h" @@ -53,6 +55,10 @@ StorageSyncManager::StorageSyncManager(const String& path) m_thread->start(); } +StorageSyncManager::~StorageSyncManager() +{ +} + String StorageSyncManager::fullDatabaseFilename(SecurityOrigin* origin) { ASSERT(origin); diff --git a/src/3rdparty/webkit/WebCore/storage/StorageSyncManager.h b/src/3rdparty/webkit/WebCore/storage/StorageSyncManager.h index 83353ed8a..4c5e82101 100644 --- a/src/3rdparty/webkit/WebCore/storage/StorageSyncManager.h +++ b/src/3rdparty/webkit/WebCore/storage/StorageSyncManager.h @@ -28,18 +28,22 @@ #if ENABLE(DOM_STORAGE) -#include "LocalStorageTask.h" -#include "LocalStorageThread.h" -#include "StorageArea.h" -#include "StorageAreaSync.h" +#include "PlatformString.h" +#include +#include #include namespace WebCore { + class LocalStorageThread; + class SecurityOrigin; + class StorageAreaSync; + class StorageSyncManager : public ThreadSafeShared { public: static PassRefPtr create(const String& path); + ~StorageSyncManager(); bool scheduleImport(PassRefPtr); void scheduleSync(PassRefPtr); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGAElement.cpp b/src/3rdparty/webkit/WebCore/svg/SVGAElement.cpp index 6fd0274a0..991970261 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGAElement.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGAElement.cpp @@ -138,7 +138,7 @@ void SVGAElement::defaultEventHandler(Event* evt) target = (getAttribute(XLinkNames::showAttr) == "new") ? "_blank" : "_self"; if (!evt->defaultPrevented()) { - String url = parseURL(href()); + String url = deprecatedParseURL(href()); #if ENABLE(SVG_ANIMATION) if (url.startsWith("#")) { Element* targetElement = document()->getElementById(url.substring(1)); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGAnimatedProperty.h b/src/3rdparty/webkit/WebCore/svg/SVGAnimatedProperty.h index 334a6ebd1..680305558 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGAnimatedProperty.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGAnimatedProperty.h @@ -66,7 +66,7 @@ namespace WebCore { void synchronizeProperty(const OwnerElement* ownerElement, const QualifiedName& attributeName, DecoratedType baseValue); // Abstract base class - class SVGAnimatedPropertyBase : Noncopyable { + class SVGAnimatedPropertyBase : public Noncopyable { public: virtual ~SVGAnimatedPropertyBase() { } virtual void synchronize() const = 0; diff --git a/src/3rdparty/webkit/WebCore/svg/SVGColor.cpp b/src/3rdparty/webkit/WebCore/svg/SVGColor.cpp index 5939b48e5..f939ef096 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGColor.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGColor.cpp @@ -25,6 +25,7 @@ #include "SVGColor.h" #include "CSSParser.h" +#include "RGBColor.h" #include "SVGException.h" namespace WebCore { @@ -61,9 +62,9 @@ unsigned short SVGColor::colorType() const return m_colorType; } -unsigned SVGColor::rgbColor() const +RGBColor* SVGColor::rgbColor() const { - return m_color.rgb(); + return RGBColor::create(m_color.rgb()).releaseRef(); } void SVGColor::setRGBColor(const String& rgbColor, ExceptionCode& ec) diff --git a/src/3rdparty/webkit/WebCore/svg/SVGColor.h b/src/3rdparty/webkit/WebCore/svg/SVGColor.h index e3a4b1936..5dfb694e1 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGColor.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGColor.h @@ -28,6 +28,8 @@ namespace WebCore { + class RGBColor; + class SVGColor : public CSSValue { public: static PassRefPtr create(const String& color) @@ -55,7 +57,7 @@ namespace WebCore { // 'SVGColor' functions unsigned short colorType() const; - unsigned rgbColor() const; + RGBColor* rgbColor() const; static Color colorFromRGBColorString(const String&); diff --git a/src/3rdparty/webkit/WebCore/svg/SVGImageLoader.cpp b/src/3rdparty/webkit/WebCore/svg/SVGImageLoader.cpp index 9333f7536..f8380f58c 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGImageLoader.cpp +++ b/src/3rdparty/webkit/WebCore/svg/SVGImageLoader.cpp @@ -53,7 +53,7 @@ void SVGImageLoader::dispatchLoadEvent() String SVGImageLoader::sourceURI(const AtomicString& attr) const { - return parseURL(KURL(element()->baseURI(), attr).string()); + return deprecatedParseURL(KURL(element()->baseURI(), attr).string()); } } diff --git a/src/3rdparty/webkit/WebCore/svg/SVGPolyElement.h b/src/3rdparty/webkit/WebCore/svg/SVGPolyElement.h index 0de9f1b01..8dd16cd1b 100644 --- a/src/3rdparty/webkit/WebCore/svg/SVGPolyElement.h +++ b/src/3rdparty/webkit/WebCore/svg/SVGPolyElement.h @@ -58,7 +58,6 @@ namespace WebCore { virtual const SVGElement* contextElement() const { return this; } private: - bool m_ignoreAttributeChanges : 1; mutable RefPtr m_points; }; diff --git a/src/3rdparty/webkit/WebCore/svg/SynchronizableTypeWrapper.h b/src/3rdparty/webkit/WebCore/svg/SynchronizableTypeWrapper.h index 418c76d89..12f84263d 100644 --- a/src/3rdparty/webkit/WebCore/svg/SynchronizableTypeWrapper.h +++ b/src/3rdparty/webkit/WebCore/svg/SynchronizableTypeWrapper.h @@ -26,7 +26,7 @@ namespace WebCore { template - class SynchronizableTypeWrapperBase : Noncopyable { + class SynchronizableTypeWrapperBase : public Noncopyable { protected: SynchronizableTypeWrapperBase(); diff --git a/src/3rdparty/webkit/WebCore/svg/graphics/SVGPaintServer.cpp b/src/3rdparty/webkit/WebCore/svg/graphics/SVGPaintServer.cpp index 0fcd7224f..728ff1b86 100644 --- a/src/3rdparty/webkit/WebCore/svg/graphics/SVGPaintServer.cpp +++ b/src/3rdparty/webkit/WebCore/svg/graphics/SVGPaintServer.cpp @@ -31,6 +31,7 @@ #include "SVGPaintServer.h" #include "GraphicsContext.h" +#include "NodeRenderStyle.h" #include "RenderObject.h" #include "RenderStyle.h" #include "SVGPaintServerSolid.h" @@ -158,7 +159,7 @@ void applyStrokeStyleToContext(GraphicsContext* context, RenderStyle* style, con if (style->svgStyle()->joinStyle() == MiterJoin) context->setMiterLimit(style->svgStyle()->strokeMiterLimit()); - const DashArray& dashes = dashArrayFromRenderingStyle(object->style()); + const DashArray& dashes = dashArrayFromRenderingStyle(object->style(), object->document()->documentElement()->renderStyle()); float dashOffset = SVGRenderStyle::cssPrimitiveToLength(object, style->svgStyle()->strokeDashOffset(), 0.0f); context->setLineDash(dashes, dashOffset); } @@ -192,8 +193,8 @@ void SVGPaintServer::teardown(GraphicsContext*& context, const RenderObject*, SV // added back to the context after filling. This is because internally it // calls CGContextFillPath() which closes the path. context->beginPath(); - context->platformContext()->setGradient(0); - context->platformContext()->setPattern(0); + context->platformContext()->setFillShader(0); + context->platformContext()->setStrokeShader(0); } #else void SVGPaintServer::teardown(GraphicsContext*&, const RenderObject*, SVGPaintTargetType, bool) const @@ -201,7 +202,7 @@ void SVGPaintServer::teardown(GraphicsContext*&, const RenderObject*, SVGPaintTa } #endif -DashArray dashArrayFromRenderingStyle(const RenderStyle* style) +DashArray dashArrayFromRenderingStyle(const RenderStyle* style, RenderStyle* rootStyle) { DashArray array; @@ -214,7 +215,7 @@ DashArray dashArrayFromRenderingStyle(const RenderStyle* style) if (!dash) continue; - array.append((float) dash->computeLengthFloat(const_cast(style))); + array.append((float) dash->computeLengthFloat(const_cast(style), rootStyle)); } } diff --git a/src/3rdparty/webkit/WebCore/svg/graphics/SVGPaintServer.h b/src/3rdparty/webkit/WebCore/svg/graphics/SVGPaintServer.h index 9174f66f7..244243ccb 100644 --- a/src/3rdparty/webkit/WebCore/svg/graphics/SVGPaintServer.h +++ b/src/3rdparty/webkit/WebCore/svg/graphics/SVGPaintServer.h @@ -85,7 +85,7 @@ namespace WebCore { SVGPaintServer* getPaintServerById(Document*, const AtomicString&); void applyStrokeStyleToContext(GraphicsContext*, RenderStyle*, const RenderObject*); - DashArray dashArrayFromRenderingStyle(const RenderStyle* style); + DashArray dashArrayFromRenderingStyle(const RenderStyle* style, RenderStyle* rootStyle); } // namespace WebCore #endif diff --git a/src/3rdparty/webkit/WebCore/wml/WMLAElement.cpp b/src/3rdparty/webkit/WebCore/wml/WMLAElement.cpp index 5fbeac63d..9c84193cf 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLAElement.cpp +++ b/src/3rdparty/webkit/WebCore/wml/WMLAElement.cpp @@ -150,7 +150,7 @@ void WMLAElement::defaultEventHandler(Event* event) } if (!event->defaultPrevented() && document()->frame()) { - KURL url = document()->completeURL(parseURL(getAttribute(HTMLNames::hrefAttr))); + KURL url = document()->completeURL(deprecatedParseURL(getAttribute(HTMLNames::hrefAttr))); document()->frame()->loader()->urlSelected(url, target(), event, false, false, true); } diff --git a/src/3rdparty/webkit/WebCore/wml/WMLCardElement.cpp b/src/3rdparty/webkit/WebCore/wml/WMLCardElement.cpp index 0f49bd732..0b73f5251 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLCardElement.cpp +++ b/src/3rdparty/webkit/WebCore/wml/WMLCardElement.cpp @@ -28,6 +28,7 @@ #include "HTMLNames.h" #include "MappedAttribute.h" #include "NodeList.h" +#include "Page.h" #include "RenderStyle.h" #include "WMLDocument.h" #include "WMLDoElement.h" @@ -131,20 +132,21 @@ void WMLCardElement::handleIntrinsicEventIfNeeded() FrameLoader* loader = frame->loader(); if (!loader) return; - - int currentHistoryLength = loader->getHistoryLength(); - int lastHistoryLength = pageState->historyLength(); // Calculate the entry method of current card WMLIntrinsicEventType eventType = WMLIntrinsicEventUnknown; - if (lastHistoryLength > currentHistoryLength) + + switch (loader->loadType()) { + case FrameLoadTypeReload: + break; + case FrameLoadTypeBack: eventType = WMLIntrinsicEventOnEnterBackward; - else if (lastHistoryLength < currentHistoryLength) + break; + default: eventType = WMLIntrinsicEventOnEnterForward; + break; + } - // Synchronize history length with WMLPageState - pageState->setHistoryLength(currentHistoryLength); - // Figure out target event handler WMLIntrinsicEventHandler* eventHandler = this->eventHandler(); bool hasIntrinsicEvent = false; @@ -204,11 +206,6 @@ void WMLCardElement::handleDeckLevelTaskOverridesIfNeeded() (*it)->setActive(!cardDoElementNames.contains((*it)->name())); } -String WMLCardElement::title() const -{ - return parseValueSubstitutingVariableReferences(getAttribute(HTMLNames::titleAttr)); -} - void WMLCardElement::parseMappedAttribute(MappedAttribute* attr) { WMLIntrinsicEventType eventType = WMLIntrinsicEventUnknown; @@ -241,13 +238,25 @@ void WMLCardElement::parseMappedAttribute(MappedAttribute* attr) void WMLCardElement::insertedIntoDocument() { WMLElement::insertedIntoDocument(); + Document* document = this->document(); // The first card inserted into a document, is visible by default. if (!m_isVisible) { - RefPtr nodeList = document()->getElementsByTagName("card"); + RefPtr nodeList = document->getElementsByTagName("card"); if (nodeList && nodeList->length() == 1 && nodeList->item(0) == this) m_isVisible = true; } + + // For the WML layout tests we embed WML content in a XHTML document. Navigating to different cards + // within the same deck has a different behaviour in HTML than in WML. HTML wants to "scroll to anchor" + // (see FrameLoader) but WML wants a reload. Notify the root document of the layout test that we want + // to mimic WML behaviour. This is rather tricky, but has been tested extensively. Usually it's not possible + // at all to embed WML in HTML, it's not designed that way, we're just "abusing" it for dynamically created layout tests. + if (document->page() && document->page()->mainFrame()) { + Document* rootDocument = document->page()->mainFrame()->document(); + if (rootDocument && rootDocument != document) + rootDocument->setContainsWMLContent(true); + } } RenderObject* WMLCardElement::createRenderer(RenderArena* arena, RenderStyle* style) diff --git a/src/3rdparty/webkit/WebCore/wml/WMLCardElement.h b/src/3rdparty/webkit/WebCore/wml/WMLCardElement.h index e033e3da7..972961e59 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLCardElement.h +++ b/src/3rdparty/webkit/WebCore/wml/WMLCardElement.h @@ -47,7 +47,6 @@ public: void handleIntrinsicEventIfNeeded(); void handleDeckLevelTaskOverridesIfNeeded(); - virtual String title() const; virtual void parseMappedAttribute(MappedAttribute*); virtual void insertedIntoDocument(); virtual RenderObject* createRenderer(RenderArena*, RenderStyle*); diff --git a/src/3rdparty/webkit/WebCore/wml/WMLDoElement.cpp b/src/3rdparty/webkit/WebCore/wml/WMLDoElement.cpp index f553fff3d..830009eef 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLDoElement.cpp +++ b/src/3rdparty/webkit/WebCore/wml/WMLDoElement.cpp @@ -122,6 +122,17 @@ void WMLDoElement::insertedIntoDocument() eventHandlingElement->registerDoElement(this, document()); } +void WMLDoElement::attach() +{ + WMLElement::attach(); + + // The call to updateFromElement() needs to go after the call through + // to the base class's attach() because that can sometimes do a close + // on the renderer. + if (renderer()) + renderer()->updateFromElement(); +} + RenderObject* WMLDoElement::createRenderer(RenderArena* arena, RenderStyle* style) { if (!m_isActive || m_isOptional || m_isNoop) diff --git a/src/3rdparty/webkit/WebCore/wml/WMLDoElement.h b/src/3rdparty/webkit/WebCore/wml/WMLDoElement.h index 51e37c434..eff258919 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLDoElement.h +++ b/src/3rdparty/webkit/WebCore/wml/WMLDoElement.h @@ -36,6 +36,7 @@ public: virtual void parseMappedAttribute(MappedAttribute*); virtual void insertedIntoDocument(); + virtual void attach(); virtual RenderObject* createRenderer(RenderArena*, RenderStyle*); virtual void recalcStyle(StyleChange); diff --git a/src/3rdparty/webkit/WebCore/wml/WMLElement.cpp b/src/3rdparty/webkit/WebCore/wml/WMLElement.cpp index f59a3a195..a9e4b5d95 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLElement.cpp +++ b/src/3rdparty/webkit/WebCore/wml/WMLElement.cpp @@ -77,6 +77,11 @@ void WMLElement::parseMappedAttribute(MappedAttribute* attr) } } +String WMLElement::title() const +{ + return parseValueSubstitutingVariableReferences(getAttribute(HTMLNames::titleAttr)); +} + bool WMLElement::rendererIsNeeded(RenderStyle* style) { return document()->documentElement() == this || style->display() != NONE; diff --git a/src/3rdparty/webkit/WebCore/wml/WMLElement.h b/src/3rdparty/webkit/WebCore/wml/WMLElement.h index 04e28d045..46b0ff41d 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLElement.h +++ b/src/3rdparty/webkit/WebCore/wml/WMLElement.h @@ -37,6 +37,8 @@ public: virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const; virtual void parseMappedAttribute(MappedAttribute*); + virtual String title() const; + virtual bool rendererIsNeeded(RenderStyle*); virtual RenderObject* createRenderer(RenderArena*, RenderStyle*); diff --git a/src/3rdparty/webkit/WebCore/wml/WMLGoElement.cpp b/src/3rdparty/webkit/WebCore/wml/WMLGoElement.cpp index 7293e6684..c1bf28361 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLGoElement.cpp +++ b/src/3rdparty/webkit/WebCore/wml/WMLGoElement.cpp @@ -1,5 +1,5 @@ /** - * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) + * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -102,9 +102,6 @@ void WMLGoElement::executeTask(Event*) // FIXME: 'newcontext' handling not implemented for external cards bool inSameDeck = doc->url().path() == url.path(); if (inSameDeck && url.hasRef()) { - // Force frame loader to load the URL with fragment identifier - loader->setForceReloadWmlDeck(true); - if (WMLCardElement* card = WMLCardElement::findNamedCardInDocument(doc, url.ref())) { if (card->isNewContext()) pageState->reset(); diff --git a/src/3rdparty/webkit/WebCore/wml/WMLImageLoader.cpp b/src/3rdparty/webkit/WebCore/wml/WMLImageLoader.cpp index c77b5119a..3c402155d 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLImageLoader.cpp +++ b/src/3rdparty/webkit/WebCore/wml/WMLImageLoader.cpp @@ -49,7 +49,7 @@ void WMLImageLoader::dispatchLoadEvent() String WMLImageLoader::sourceURI(const AtomicString& attr) const { - return parseURL(KURL(element()->baseURI(), attr).string()); + return deprecatedParseURL(KURL(element()->baseURI(), attr).string()); } void WMLImageLoader::notifyFinished(CachedResource* image) diff --git a/src/3rdparty/webkit/WebCore/wml/WMLNoopElement.cpp b/src/3rdparty/webkit/WebCore/wml/WMLNoopElement.cpp index 1ba1c18b3..7c69ddcac 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLNoopElement.cpp +++ b/src/3rdparty/webkit/WebCore/wml/WMLNoopElement.cpp @@ -53,7 +53,12 @@ void WMLNoopElement::insertedIntoDocument() if (parent->hasTagName(doTag)) { WMLDoElement* doElement = static_cast(parent); doElement->setNoop(true); - doElement->setNeedsStyleRecalc(); + + if (doElement->attached()) + doElement->detach(); + + ASSERT(!doElement->attached()); + doElement->attach(); } else if (parent->hasTagName(anchorTag)) reportWMLError(document(), WMLErrorForbiddenTaskInAnchorElement); } diff --git a/src/3rdparty/webkit/WebCore/wml/WMLOptGroupElement.cpp b/src/3rdparty/webkit/WebCore/wml/WMLOptGroupElement.cpp index 3614c6c53..9a7ea8825 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLOptGroupElement.cpp +++ b/src/3rdparty/webkit/WebCore/wml/WMLOptGroupElement.cpp @@ -44,11 +44,6 @@ WMLOptGroupElement::~WMLOptGroupElement() { } -String WMLOptGroupElement::title() const -{ - return parseValueSubstitutingVariableReferences(getAttribute(HTMLNames::titleAttr)); -} - const AtomicString& WMLOptGroupElement::formControlType() const { DEFINE_STATIC_LOCAL(const AtomicString, optgroup, ("optgroup")); diff --git a/src/3rdparty/webkit/WebCore/wml/WMLOptGroupElement.h b/src/3rdparty/webkit/WebCore/wml/WMLOptGroupElement.h index 04600565c..e1b921736 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLOptGroupElement.h +++ b/src/3rdparty/webkit/WebCore/wml/WMLOptGroupElement.h @@ -32,8 +32,6 @@ public: WMLOptGroupElement(const QualifiedName& tagName, Document*); virtual ~WMLOptGroupElement(); - String title() const; - virtual const AtomicString& formControlType() const; virtual bool rendererIsNeeded(RenderStyle*) { return false; } diff --git a/src/3rdparty/webkit/WebCore/wml/WMLOptionElement.cpp b/src/3rdparty/webkit/WebCore/wml/WMLOptionElement.cpp index 1087134ff..60d3de6e7 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLOptionElement.cpp +++ b/src/3rdparty/webkit/WebCore/wml/WMLOptionElement.cpp @@ -125,7 +125,15 @@ bool WMLOptionElement::selected() const void WMLOptionElement::setSelectedState(bool selected) { + if (this->selected() == selected) + return; + OptionElement::setSelectedState(m_data, this, selected); + + if (WMLSelectElement* select = ownerSelectElement(this)) { + if (select->multiple() || selected) + handleIntrinsicEventIfNeeded(); + } } String WMLOptionElement::value() const diff --git a/src/3rdparty/webkit/WebCore/wml/WMLPageState.cpp b/src/3rdparty/webkit/WebCore/wml/WMLPageState.cpp index 1afc0c91e..6b6a76388 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLPageState.cpp +++ b/src/3rdparty/webkit/WebCore/wml/WMLPageState.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) - * + * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) * Copyright (C) 2004-2007 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or @@ -25,6 +24,7 @@ #if ENABLE(WML) #include "WMLPageState.h" +#include "CString.h" #include "HistoryItem.h" #include "KURL.h" #include "Page.h" @@ -33,7 +33,6 @@ namespace WebCore { WMLPageState::WMLPageState(Page* page) : m_page(page) - , m_historyLength(0) , m_activeCard(0) , m_hasDeckAccess(false) { @@ -44,17 +43,27 @@ WMLPageState::~WMLPageState() m_variables.clear(); } +#ifndef NDEBUG +// Debugging helper for use within gdb +void WMLPageState::dump() +{ + WMLVariableMap::iterator it = m_variables.begin(); + WMLVariableMap::iterator end = m_variables.end(); + + fprintf(stderr, "Dumping WMLPageState (this=%p) associated with Page (page=%p)...\n", this, m_page); + for (; it != end; ++it) + fprintf(stderr, "\t-> name: '%s'\tvalue: '%s'\n", (*it).first.latin1().data(), (*it).second.latin1().data()); +} +#endif + void WMLPageState::reset() { - // remove all the variables in the current browser context + // Remove all the variables m_variables.clear(); - // clear the navigation history state - if (m_page) - m_page->backForwardList()->clearWmlPageHistory(); - - // reset implementation-specfic state if UA has - m_historyLength = 0; + // Clear the navigation history state + if (BackForwardList* list = m_page ? m_page->backForwardList() : 0) + list->clearWMLPageHistory(); } bool WMLPageState::setNeedCheckDeckAccess(bool need) diff --git a/src/3rdparty/webkit/WebCore/wml/WMLPageState.h b/src/3rdparty/webkit/WebCore/wml/WMLPageState.h index 6a1d960d3..72bc72c2f 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLPageState.h +++ b/src/3rdparty/webkit/WebCore/wml/WMLPageState.h @@ -39,6 +39,10 @@ public: WMLPageState(Page*); virtual ~WMLPageState(); +#ifndef NDEBUG + void dump(); +#endif + // reset the browser context when 'newcontext' attribute // of card element is performed as part of go task void reset(); diff --git a/src/3rdparty/webkit/WebCore/wml/WMLSelectElement.cpp b/src/3rdparty/webkit/WebCore/wml/WMLSelectElement.cpp index 5e70098f2..2d03a3f02 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLSelectElement.cpp +++ b/src/3rdparty/webkit/WebCore/wml/WMLSelectElement.cpp @@ -46,11 +46,6 @@ WMLSelectElement::~WMLSelectElement() { } -String WMLSelectElement::title() const -{ - return substituteVariableReferences(getAttribute(HTMLNames::titleAttr), document()); -} - const AtomicString& WMLSelectElement::formControlName() const { AtomicString name = this->name(); diff --git a/src/3rdparty/webkit/WebCore/wml/WMLSelectElement.h b/src/3rdparty/webkit/WebCore/wml/WMLSelectElement.h index 6cd3bcbdd..412a9509a 100644 --- a/src/3rdparty/webkit/WebCore/wml/WMLSelectElement.h +++ b/src/3rdparty/webkit/WebCore/wml/WMLSelectElement.h @@ -32,8 +32,6 @@ public: WMLSelectElement(const QualifiedName&, Document*); virtual ~WMLSelectElement(); - virtual String title() const; - virtual const AtomicString& formControlName() const; virtual const AtomicString& formControlType() const; diff --git a/src/3rdparty/webkit/WebCore/workers/AbstractWorker.cpp b/src/3rdparty/webkit/WebCore/workers/AbstractWorker.cpp index 120f78a2f..7cb2c11db 100644 --- a/src/3rdparty/webkit/WebCore/workers/AbstractWorker.cpp +++ b/src/3rdparty/webkit/WebCore/workers/AbstractWorker.cpp @@ -30,10 +30,11 @@ #include "config.h" -#if ENABLE(SHARED_WORKERS) +#if ENABLE(WORKERS) #include "AbstractWorker.h" +#include "ErrorEvent.h" #include "Event.h" #include "EventException.h" #include "EventNames.h" @@ -114,12 +115,25 @@ void AbstractWorker::dispatchLoadErrorEvent() ASSERT(!ec); } -void AbstractWorker::dispatchScriptErrorEvent(const String&, const String&, int) +bool AbstractWorker::dispatchScriptErrorEvent(const String& message, const String& sourceURL, int lineNumber) { - //FIXME: Generate an ErrorEvent instead of a simple event - dispatchLoadErrorEvent(); + bool handled = false; + RefPtr event = ErrorEvent::create(message, sourceURL, static_cast(lineNumber)); + if (m_onErrorListener) { + event->setTarget(this); + event->setCurrentTarget(this); + m_onErrorListener->handleEvent(event.get(), true); + if (event->defaultPrevented()) + handled = true; + } + + ExceptionCode ec = 0; + dispatchEvent(event.release(), ec); + ASSERT(!ec); + + return handled; } } // namespace WebCore -#endif // ENABLE(SHARED_WORKERS) +#endif // ENABLE(WORKERS) diff --git a/src/3rdparty/webkit/WebCore/workers/AbstractWorker.h b/src/3rdparty/webkit/WebCore/workers/AbstractWorker.h index 89e425882..28cc50d96 100644 --- a/src/3rdparty/webkit/WebCore/workers/AbstractWorker.h +++ b/src/3rdparty/webkit/WebCore/workers/AbstractWorker.h @@ -31,7 +31,7 @@ #ifndef AbstractWorker_h #define AbstractWorker_h -#if ENABLE(SHARED_WORKERS) +#if ENABLE(WORKERS) #include "ActiveDOMObject.h" #include "AtomicStringHash.h" @@ -56,7 +56,7 @@ namespace WebCore { // Utility routines to generate appropriate error events for loading and script exceptions. void dispatchLoadErrorEvent(); - void dispatchScriptErrorEvent(const String& errorMessage, const String& sourceURL, int); + bool dispatchScriptErrorEvent(const String& errorMessage, const String& sourceURL, int); void setOnerror(PassRefPtr eventListener) { m_onErrorListener = eventListener; } EventListener* onerror() const { return m_onErrorListener.get(); } @@ -81,6 +81,6 @@ namespace WebCore { } // namespace WebCore -#endif // ENABLE(SHARED_WORKERS) +#endif // ENABLE(WORKERS) #endif // AbstractWorker_h diff --git a/src/3rdparty/webkit/WebCore/workers/AbstractWorker.idl b/src/3rdparty/webkit/WebCore/workers/AbstractWorker.idl index 1234c0de1..ae7ebc6cf 100644 --- a/src/3rdparty/webkit/WebCore/workers/AbstractWorker.idl +++ b/src/3rdparty/webkit/WebCore/workers/AbstractWorker.idl @@ -31,7 +31,7 @@ module threads { interface [ - Conditional=SHARED_WORKERS, + Conditional=WORKERS, CustomMarkFunction, CustomToJS, GenerateConstructor diff --git a/src/3rdparty/webkit/WebCore/workers/DedicatedWorkerContext.cpp b/src/3rdparty/webkit/WebCore/workers/DedicatedWorkerContext.cpp new file mode 100644 index 000000000..97c15811b --- /dev/null +++ b/src/3rdparty/webkit/WebCore/workers/DedicatedWorkerContext.cpp @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" + +#if ENABLE(WORKERS) + +#include "DedicatedWorkerContext.h" + +#include "DOMWindow.h" +#include "MessageEvent.h" +#include "WorkerObjectProxy.h" +#include "WorkerThread.h" + +namespace WebCore { + +DedicatedWorkerContext::DedicatedWorkerContext(const KURL& url, const String& userAgent, WorkerThread* thread) + : WorkerContext(url, userAgent, thread) +{ +} + +DedicatedWorkerContext::~DedicatedWorkerContext() +{ + ASSERT(currentThread() == thread()->threadID()); + // Notify parent worker we are going away. This can free the WorkerThread object, so do not access it after this. + thread()->workerObjectProxy().workerContextDestroyed(); +} + +void DedicatedWorkerContext::reportException(const String& errorMessage, int lineNumber, const String& sourceURL) +{ + bool errorHandled = false; + if (onerror()) + errorHandled = onerror()->reportError(errorMessage, sourceURL, lineNumber); + + if (!errorHandled) + thread()->workerObjectProxy().postExceptionToWorkerObject(errorMessage, lineNumber, sourceURL); +} + +void DedicatedWorkerContext::postMessage(const String& message, ExceptionCode& ec) +{ + postMessage(message, 0, ec); +} + +void DedicatedWorkerContext::postMessage(const String& message, MessagePort* port, ExceptionCode& ec) +{ + if (isClosing()) + return; + // Disentangle the port in preparation for sending it to the remote context. + OwnPtr channel = port ? port->disentangle(ec) : 0; + if (ec) + return; + thread()->workerObjectProxy().postMessageToWorkerObject(message, channel.release()); +} + +void DedicatedWorkerContext::dispatchMessage(const String& message, PassRefPtr port) +{ + // Since close() stops the thread event loop, this should not ever get called while closing. + ASSERT(!isClosing()); + RefPtr evt = MessageEvent::create(message, "", "", 0, port); + + if (m_onmessageListener.get()) { + evt->setTarget(this); + evt->setCurrentTarget(this); + m_onmessageListener->handleEvent(evt.get(), false); + } + + ExceptionCode ec = 0; + dispatchEvent(evt.release(), ec); + ASSERT(!ec); +} + +} // namespace WebCore + +#endif // ENABLE(WORKERS) diff --git a/src/3rdparty/webkit/WebCore/workers/DedicatedWorkerContext.h b/src/3rdparty/webkit/WebCore/workers/DedicatedWorkerContext.h new file mode 100644 index 000000000..e37c13fe2 --- /dev/null +++ b/src/3rdparty/webkit/WebCore/workers/DedicatedWorkerContext.h @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef DedicatedWorkerContext_h +#define DedicatedWorkerContext_h + +#include "WorkerContext.h" + +namespace WebCore { + + class DedicatedWorkerContext : public WorkerContext { + public: + static PassRefPtr create(const KURL& url, const String& userAgent, WorkerThread* thread) + { + return adoptRef(new DedicatedWorkerContext(url, userAgent, thread)); + } + virtual ~DedicatedWorkerContext(); + + virtual void reportException(const String& errorMessage, int lineNumber, const String& sourceURL); + + // EventTarget + virtual DedicatedWorkerContext* toDedicatedWorkerContext() { return this; } + void postMessage(const String&, ExceptionCode&); + void postMessage(const String&, MessagePort*, ExceptionCode&); + void setOnmessage(PassRefPtr eventListener) { m_onmessageListener = eventListener; } + EventListener* onmessage() const { return m_onmessageListener.get(); } + + void dispatchMessage(const String&, PassRefPtr); + + private: + DedicatedWorkerContext(const KURL&, const String&, WorkerThread*); + RefPtr m_onmessageListener; + }; + +} // namespace WebCore + +#endif // DedicatedWorkerContext_h diff --git a/src/3rdparty/webkit/WebCore/workers/DedicatedWorkerContext.idl b/src/3rdparty/webkit/WebCore/workers/DedicatedWorkerContext.idl new file mode 100644 index 000000000..ebbee338f --- /dev/null +++ b/src/3rdparty/webkit/WebCore/workers/DedicatedWorkerContext.idl @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +module threads { + + interface [ + Conditional=WORKERS, + CustomMarkFunction, + ExtendsDOMGlobalObject, + IsWorkerContext, + GenerateNativeConverter, + NoStaticTables + ] DedicatedWorkerContext : WorkerContext { + + void postMessage(in DOMString message, in [Optional] MessagePort messagePort) + raises(DOMException); + attribute EventListener onmessage; + + }; + +} diff --git a/src/3rdparty/webkit/WebCore/workers/Worker.cpp b/src/3rdparty/webkit/WebCore/workers/Worker.cpp index 2e03e3d83..866687f92 100644 --- a/src/3rdparty/webkit/WebCore/workers/Worker.cpp +++ b/src/3rdparty/webkit/WebCore/workers/Worker.cpp @@ -50,23 +50,12 @@ namespace WebCore { -Worker::Worker(const String& url, ScriptExecutionContext* context, ExceptionCode& ec) - : ActiveDOMObject(context, this) +Worker::Worker(const String& url, ScriptExecutionContext* context) + : AbstractWorker(context) , m_contextProxy(WorkerContextProxy::create(this)) { - m_scriptURL = context->completeURL(url); - if (url.isEmpty() || !m_scriptURL.isValid()) { - ec = SYNTAX_ERR; - return; - } - - if (!context->securityOrigin()->canAccess(SecurityOrigin::create(m_scriptURL).get())) { - ec = SECURITY_ERR; - return; - } - m_scriptLoader = new WorkerScriptLoader(); - m_scriptLoader->loadAsynchronously(scriptExecutionContext(), m_scriptURL, DenyCrossOriginRedirect, this); + m_scriptLoader->loadAsynchronously(scriptExecutionContext(), url, CompleteURL, DenyCrossOriginLoad, this); setPendingActivity(this); // The worker context does not exist while loading, so we must ensure that the worker object is not collected, as well as its event listeners. } @@ -115,80 +104,15 @@ bool Worker::hasPendingActivity() const void Worker::notifyFinished() { if (m_scriptLoader->failed()) - dispatchErrorEvent(); + dispatchLoadErrorEvent(); else - m_contextProxy->startWorkerContext(m_scriptURL, scriptExecutionContext()->userAgent(m_scriptURL), m_scriptLoader->script()); + m_contextProxy->startWorkerContext(m_scriptLoader->url(), scriptExecutionContext()->userAgent(m_scriptLoader->url()), m_scriptLoader->script()); m_scriptLoader = 0; unsetPendingActivity(this); } -void Worker::dispatchErrorEvent() -{ - RefPtr evt = Event::create(eventNames().errorEvent, false, true); - if (m_onErrorListener) { - evt->setTarget(this); - evt->setCurrentTarget(this); - m_onErrorListener->handleEvent(evt.get(), true); - } - - ExceptionCode ec = 0; - dispatchEvent(evt.release(), ec); - ASSERT(!ec); -} - -void Worker::addEventListener(const AtomicString& eventType, PassRefPtr eventListener, bool) -{ - EventListenersMap::iterator iter = m_eventListeners.find(eventType); - if (iter == m_eventListeners.end()) { - ListenerVector listeners; - listeners.append(eventListener); - m_eventListeners.add(eventType, listeners); - } else { - ListenerVector& listeners = iter->second; - for (ListenerVector::iterator listenerIter = listeners.begin(); listenerIter != listeners.end(); ++listenerIter) { - if (*listenerIter == eventListener) - return; - } - - listeners.append(eventListener); - m_eventListeners.add(eventType, listeners); - } -} - -void Worker::removeEventListener(const AtomicString& eventType, EventListener* eventListener, bool) -{ - EventListenersMap::iterator iter = m_eventListeners.find(eventType); - if (iter == m_eventListeners.end()) - return; - - ListenerVector& listeners = iter->second; - for (ListenerVector::const_iterator listenerIter = listeners.begin(); listenerIter != listeners.end(); ++listenerIter) { - if (*listenerIter == eventListener) { - listeners.remove(listenerIter - listeners.begin()); - return; - } - } -} - -bool Worker::dispatchEvent(PassRefPtr event, ExceptionCode& ec) -{ - if (!event || event->type().isEmpty()) { - ec = EventException::UNSPECIFIED_EVENT_TYPE_ERR; - return true; - } - - ListenerVector listenersCopy = m_eventListeners.get(event->type()); - for (ListenerVector::const_iterator listenerIter = listenersCopy.begin(); listenerIter != listenersCopy.end(); ++listenerIter) { - event->setTarget(this); - event->setCurrentTarget(this); - listenerIter->get()->handleEvent(event.get(), false); - } - - return !event->defaultPrevented(); -} - void Worker::dispatchMessage(const String& message, PassRefPtr port) { RefPtr evt = MessageEvent::create(message, "", "", 0, port); diff --git a/src/3rdparty/webkit/WebCore/workers/Worker.h b/src/3rdparty/webkit/WebCore/workers/Worker.h index 1fcc8be7b..6b8ee63a1 100644 --- a/src/3rdparty/webkit/WebCore/workers/Worker.h +++ b/src/3rdparty/webkit/WebCore/workers/Worker.h @@ -29,11 +29,11 @@ #if ENABLE(WORKERS) -#include "AtomicStringHash.h" +#include "AbstractWorker.h" #include "ActiveDOMObject.h" +#include "AtomicStringHash.h" #include "EventListener.h" #include "EventTarget.h" -#include "KURL.h" #include "WorkerScriptLoaderClient.h" #include #include @@ -49,13 +49,11 @@ namespace WebCore { typedef int ExceptionCode; - class Worker : public RefCounted, public ActiveDOMObject, private WorkerScriptLoaderClient, public EventTarget { + class Worker : public AbstractWorker, private WorkerScriptLoaderClient { public: - static PassRefPtr create(const String& url, ScriptExecutionContext* context, ExceptionCode& ec) { return adoptRef(new Worker(url, context, ec)); } + static PassRefPtr create(const String& url, ScriptExecutionContext* context) { return adoptRef(new Worker(url, context)); } ~Worker(); - virtual ScriptExecutionContext* scriptExecutionContext() const { return ActiveDOMObject::scriptExecutionContext(); } - virtual Worker* toWorker() { return this; } void postMessage(const String&, ExceptionCode&); @@ -70,39 +68,22 @@ namespace WebCore { virtual void stop(); virtual bool hasPendingActivity() const; - virtual void addEventListener(const AtomicString& eventType, PassRefPtr, bool useCapture); - virtual void removeEventListener(const AtomicString& eventType, EventListener*, bool useCapture); - virtual bool dispatchEvent(PassRefPtr, ExceptionCode&); - - typedef Vector > ListenerVector; - typedef HashMap EventListenersMap; - EventListenersMap& eventListeners() { return m_eventListeners; } - - using RefCounted::ref; - using RefCounted::deref; - void setOnmessage(PassRefPtr eventListener) { m_onMessageListener = eventListener; } EventListener* onmessage() const { return m_onMessageListener.get(); } - void setOnerror(PassRefPtr eventListener) { m_onErrorListener = eventListener; } - EventListener* onerror() const { return m_onErrorListener.get(); } - private: - Worker(const String&, ScriptExecutionContext*, ExceptionCode&); + Worker(const String&, ScriptExecutionContext*); virtual void notifyFinished(); virtual void refEventTarget() { ref(); } virtual void derefEventTarget() { deref(); } - KURL m_scriptURL; OwnPtr m_scriptLoader; WorkerContextProxy* m_contextProxy; // The proxy outlives the worker to perform thread shutdown. RefPtr m_onMessageListener; - RefPtr m_onErrorListener; - EventListenersMap m_eventListeners; }; } // namespace WebCore diff --git a/src/3rdparty/webkit/WebCore/workers/Worker.idl b/src/3rdparty/webkit/WebCore/workers/Worker.idl index e078e7cd9..e701523d3 100644 --- a/src/3rdparty/webkit/WebCore/workers/Worker.idl +++ b/src/3rdparty/webkit/WebCore/workers/Worker.idl @@ -26,24 +26,18 @@ module threads { - interface [CustomMarkFunction, Conditional=WORKERS] Worker { + interface [ + Conditional=WORKERS, + CustomMarkFunction, + GenerateNativeConverter, + GenerateToJS + ] Worker : AbstractWorker { - attribute EventListener onerror; attribute EventListener onmessage; void postMessage(in DOMString message, in [Optional] MessagePort messagePort) raises(DOMException); void terminate(); - - // EventTarget interface - [Custom] void addEventListener(in DOMString type, - in EventListener listener, - in boolean useCapture); - [Custom] void removeEventListener(in DOMString type, - in EventListener listener, - in boolean useCapture); - boolean dispatchEvent(in Event evt) - raises(EventException); }; } diff --git a/src/3rdparty/webkit/WebCore/workers/WorkerContext.cpp b/src/3rdparty/webkit/WebCore/workers/WorkerContext.cpp index 8e9fb9783..9d88b75bc 100644 --- a/src/3rdparty/webkit/WebCore/workers/WorkerContext.cpp +++ b/src/3rdparty/webkit/WebCore/workers/WorkerContext.cpp @@ -36,7 +36,7 @@ #include "DOMWindow.h" #include "Event.h" #include "EventException.h" -#include "MessageEvent.h" +#include "MessagePort.h" #include "NotImplemented.h" #include "ScriptSourceCode.h" #include "ScriptValue.h" @@ -64,9 +64,6 @@ WorkerContext::WorkerContext(const KURL& url, const String& userAgent, WorkerThr WorkerContext::~WorkerContext() { - ASSERT(currentThread() == m_thread->threadID()); - - m_thread->workerObjectProxy().workerContextDestroyed(); } ScriptExecutionContext* WorkerContext::scriptExecutionContext() const @@ -141,11 +138,6 @@ bool WorkerContext::hasPendingActivity() const return false; } -void WorkerContext::reportException(const String& errorMessage, int lineNumber, const String& sourceURL) -{ - m_thread->workerObjectProxy().postExceptionToWorkerObject(errorMessage, lineNumber, sourceURL); -} - void WorkerContext::addMessage(MessageDestination destination, MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceURL) { m_thread->workerObjectProxy().postConsoleMessageToWorkerObject(destination, source, type, level, message, lineNumber, sourceURL); @@ -163,22 +155,6 @@ void WorkerContext::scriptImported(unsigned long, const String&) notImplemented(); } -void WorkerContext::postMessage(const String& message, ExceptionCode& ec) -{ - postMessage(message, 0, ec); -} - -void WorkerContext::postMessage(const String& message, MessagePort* port, ExceptionCode& ec) -{ - if (m_closing) - return; - // Disentangle the port in preparation for sending it to the remote context. - OwnPtr channel = port ? port->disentangle(ec) : 0; - if (ec) - return; - m_thread->workerObjectProxy().postMessageToWorkerObject(message, channel.release()); -} - void WorkerContext::addEventListener(const AtomicString& eventType, PassRefPtr eventListener, bool) { EventListenersMap::iterator iter = m_eventListeners.find(eventType); @@ -255,23 +231,6 @@ void WorkerContext::clearInterval(int timeoutId) DOMTimer::removeById(scriptExecutionContext(), timeoutId); } -void WorkerContext::dispatchMessage(const String& message, PassRefPtr port) -{ - // Since close() stops the thread event loop, this should not ever get called while closing. - ASSERT(!m_closing); - RefPtr evt = MessageEvent::create(message, "", "", 0, port); - - if (m_onmessageListener.get()) { - evt->setTarget(this); - evt->setCurrentTarget(this); - m_onmessageListener->handleEvent(evt.get(), false); - } - - ExceptionCode ec = 0; - dispatchEvent(evt.release(), ec); - ASSERT(!ec); -} - void WorkerContext::importScripts(const Vector& urls, const String& callerURL, int callerLine, ExceptionCode& ec) { ec = 0; @@ -290,7 +249,7 @@ void WorkerContext::importScripts(const Vector& urls, const String& call for (Vector::const_iterator it = completedURLs.begin(); it != end; ++it) { WorkerScriptLoader scriptLoader; - scriptLoader.loadSynchronously(scriptExecutionContext(), *it, AllowCrossOriginRedirect); + scriptLoader.loadSynchronously(scriptExecutionContext(), *it, DoNotCompleteURL, AllowCrossOriginLoad); // If the fetching attempt failed, throw a NETWORK_ERR exception and abort all these steps. if (scriptLoader.failed()) { diff --git a/src/3rdparty/webkit/WebCore/workers/WorkerContext.h b/src/3rdparty/webkit/WebCore/workers/WorkerContext.h index 16f43fd55..266553a9e 100644 --- a/src/3rdparty/webkit/WebCore/workers/WorkerContext.h +++ b/src/3rdparty/webkit/WebCore/workers/WorkerContext.h @@ -48,17 +48,11 @@ namespace WebCore { class WorkerContext : public RefCounted, public ScriptExecutionContext, public EventTarget { public: - static PassRefPtr create(const KURL& url, const String& userAgent, WorkerThread* thread) - { - return adoptRef(new WorkerContext(url, userAgent, thread)); - } virtual ~WorkerContext(); virtual bool isWorkerContext() const { return true; } - virtual WorkerContext* toWorkerContext() { return this; } - virtual ScriptExecutionContext* scriptExecutionContext() const; const KURL& url() const { return m_url; } @@ -73,7 +67,7 @@ namespace WebCore { bool hasPendingActivity() const; - virtual void reportException(const String& errorMessage, int lineNumber, const String& sourceURL); + virtual void reportException(const String& errorMessage, int lineNumber, const String& sourceURL) = 0; virtual void addMessage(MessageDestination, MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceURL); virtual void resourceRetrievedByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString); virtual void scriptImported(unsigned long identifier, const String& sourceString); @@ -84,17 +78,13 @@ namespace WebCore { WorkerContext* self() { return this; } WorkerLocation* location() const; void close(); + void setOnerror(PassRefPtr eventListener) { m_onerrorListener = eventListener; } + EventListener* onerror() const { return m_onerrorListener.get(); } // WorkerUtils void importScripts(const Vector& urls, const String& callerURL, int callerLine, ExceptionCode&); WorkerNavigator* navigator() const; - // DedicatedWorkerGlobalScope - void postMessage(const String&, ExceptionCode&); - void postMessage(const String&, MessagePort*, ExceptionCode&); - void setOnmessage(PassRefPtr eventListener) { m_onmessageListener = eventListener; } - EventListener* onmessage() const { return m_onmessageListener.get(); } - // Timers int setTimeout(ScheduledAction*, int timeout); void clearTimeout(int timeoutId); @@ -110,7 +100,6 @@ namespace WebCore { typedef HashMap EventListenersMap; EventListenersMap& eventListeners() { return m_eventListeners; } - void dispatchMessage(const String&, PassRefPtr); // These methods are used for GC marking. See JSWorkerContext::mark() in // JSWorkerContextCustom.cpp. @@ -120,9 +109,11 @@ namespace WebCore { using RefCounted::ref; using RefCounted::deref; - private: + protected: WorkerContext(const KURL&, const String&, WorkerThread*); + bool isClosing() { return m_closing; } + private: virtual void refScriptExecutionContext() { ref(); } virtual void derefScriptExecutionContext() { deref(); } virtual void refEventTarget() { ref(); } @@ -140,7 +131,7 @@ namespace WebCore { OwnPtr m_script; WorkerThread* m_thread; - RefPtr m_onmessageListener; + RefPtr m_onerrorListener; EventListenersMap m_eventListeners; bool m_closing; diff --git a/src/3rdparty/webkit/WebCore/workers/WorkerContext.idl b/src/3rdparty/webkit/WebCore/workers/WorkerContext.idl index 709410a26..2404d228f 100644 --- a/src/3rdparty/webkit/WebCore/workers/WorkerContext.idl +++ b/src/3rdparty/webkit/WebCore/workers/WorkerContext.idl @@ -28,9 +28,10 @@ module threads { interface [ Conditional=WORKERS, - DelegatingGetOwnPropertySlot, CustomMarkFunction, + DelegatingGetOwnPropertySlot, ExtendsDOMGlobalObject, + IsWorkerContext, LegacyParent=JSWorkerContextBase, NoStaticTables ] WorkerContext { @@ -41,7 +42,7 @@ module threads { #endif attribute [Replaceable] WorkerLocation location; void close(); - // attribute EventListener onerror; + attribute EventListener onerror; // WorkerUtils [Custom] void importScripts(/*[Variadic] in DOMString urls */); @@ -49,12 +50,6 @@ module threads { // Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize); // DatabaseSync openDatabaseSync(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize); - - // DedicatedWorkerGlobalScope - void postMessage(in DOMString message, in [Optional] MessagePort messagePort) - raises(DOMException); - attribute EventListener onmessage; - // Timers [Custom] long setTimeout(in TimeoutHandler handler, in long timeout); // [Custom] long setTimeout(in DOMString code, in long timeout); diff --git a/src/3rdparty/webkit/WebCore/workers/WorkerMessagingProxy.cpp b/src/3rdparty/webkit/WebCore/workers/WorkerMessagingProxy.cpp index b6e16424b..5971c1dac 100644 --- a/src/3rdparty/webkit/WebCore/workers/WorkerMessagingProxy.cpp +++ b/src/3rdparty/webkit/WebCore/workers/WorkerMessagingProxy.cpp @@ -31,13 +31,13 @@ #include "WorkerMessagingProxy.h" +#include "DedicatedWorkerContext.h" #include "DOMWindow.h" #include "Document.h" #include "GenericWorkerTask.h" #include "MessageEvent.h" #include "ScriptExecutionContext.h" #include "Worker.h" -#include "WorkerContext.h" #include "WorkerThread.h" namespace WebCore { @@ -59,7 +59,7 @@ private: virtual void performTask(ScriptExecutionContext* scriptContext) { ASSERT(scriptContext->isWorkerContext()); - WorkerContext* context = static_cast(scriptContext); + DedicatedWorkerContext* context = static_cast(scriptContext); RefPtr port; if (m_channel) { port = MessagePort::create(*scriptContext); @@ -127,7 +127,15 @@ private: virtual void performTask(ScriptExecutionContext* context) { - if (!m_messagingProxy->askedToTerminate()) + Worker* workerObject = m_messagingProxy->workerObject(); + if (!workerObject || m_messagingProxy->askedToTerminate()) + return; + + bool errorHandled = false; + if (workerObject->onerror()) + errorHandled = workerObject->dispatchScriptErrorEvent(m_errorMessage, m_sourceURL, m_lineNumber); + + if (!errorHandled) context->reportException(m_errorMessage, m_lineNumber, m_sourceURL); } diff --git a/src/3rdparty/webkit/WebCore/workers/WorkerMessagingProxy.h b/src/3rdparty/webkit/WebCore/workers/WorkerMessagingProxy.h index f9e1cd48c..b705ca4d2 100644 --- a/src/3rdparty/webkit/WebCore/workers/WorkerMessagingProxy.h +++ b/src/3rdparty/webkit/WebCore/workers/WorkerMessagingProxy.h @@ -47,7 +47,7 @@ namespace WebCore { class Worker; class WorkerThread; - class WorkerMessagingProxy : public WorkerContextProxy, public WorkerObjectProxy, public WorkerLoaderProxy, Noncopyable { + class WorkerMessagingProxy : public WorkerContextProxy, public WorkerObjectProxy, public WorkerLoaderProxy, public Noncopyable { public: WorkerMessagingProxy(Worker*); @@ -82,6 +82,7 @@ namespace WebCore { private: friend class MessageWorkerTask; friend class WorkerContextDestroyedTask; + friend class WorkerExceptionTask; friend class WorkerThreadActivityReportTask; virtual ~WorkerMessagingProxy(); diff --git a/src/3rdparty/webkit/WebCore/workers/WorkerRunLoop.cpp b/src/3rdparty/webkit/WebCore/workers/WorkerRunLoop.cpp index b6f6487b2..cb31fe7f1 100644 --- a/src/3rdparty/webkit/WebCore/workers/WorkerRunLoop.cpp +++ b/src/3rdparty/webkit/WebCore/workers/WorkerRunLoop.cpp @@ -125,7 +125,7 @@ String WorkerRunLoop::defaultMode() return String(); } -class RunLoopSetup : Noncopyable { +class RunLoopSetup : public Noncopyable { public: RunLoopSetup(WorkerRunLoop& runLoop) : m_runLoop(runLoop) diff --git a/src/3rdparty/webkit/WebCore/workers/WorkerScriptLoader.cpp b/src/3rdparty/webkit/WebCore/workers/WorkerScriptLoader.cpp index 8737b881b..093bf07d3 100644 --- a/src/3rdparty/webkit/WebCore/workers/WorkerScriptLoader.cpp +++ b/src/3rdparty/webkit/WebCore/workers/WorkerScriptLoader.cpp @@ -31,12 +31,15 @@ #include "WorkerScriptLoader.h" +#include "GenericWorkerTask.h" #include "ResourceRequest.h" #include "ScriptExecutionContext.h" #include "SecurityOrigin.h" #include "WorkerContext.h" #include "WorkerScriptLoaderClient.h" #include "WorkerThreadableLoader.h" +#include +#include namespace WebCore { @@ -47,24 +50,59 @@ WorkerScriptLoader::WorkerScriptLoader() { } -void WorkerScriptLoader::loadSynchronously(ScriptExecutionContext* scriptExecutionContext, const String& url, CrossOriginRedirectPolicy crossOriginRedirectPolicy) +static CrossOriginRedirectPolicy toCrossOriginRedirectPolicy(CrossOriginLoadPolicy crossOriginLoadPolicy) { - ResourceRequest request(url); - request.setHTTPMethod("GET"); + return (crossOriginLoadPolicy == DenyCrossOriginLoad) ? DenyCrossOriginRedirect : AllowCrossOriginRedirect; +} + +void WorkerScriptLoader::loadSynchronously(ScriptExecutionContext* scriptExecutionContext, const String& url, URLCompletionPolicy urlCompletionPolicy, CrossOriginLoadPolicy crossOriginLoadPolicy) +{ + OwnPtr request(createResourceRequest(scriptExecutionContext, url, urlCompletionPolicy, crossOriginLoadPolicy)); + if (!request) + return; ASSERT(scriptExecutionContext->isWorkerContext()); - WorkerThreadableLoader::loadResourceSynchronously(static_cast(scriptExecutionContext), request, *this, AllowStoredCredentials, crossOriginRedirectPolicy); + WorkerThreadableLoader::loadResourceSynchronously(static_cast(scriptExecutionContext), *request, *this, AllowStoredCredentials, toCrossOriginRedirectPolicy(crossOriginLoadPolicy)); } -void WorkerScriptLoader::loadAsynchronously(ScriptExecutionContext* scriptExecutionContext, const String& url, CrossOriginRedirectPolicy crossOriginRedirectPolicy, WorkerScriptLoaderClient* client) +void WorkerScriptLoader::loadAsynchronously(ScriptExecutionContext* scriptExecutionContext, const String& url, URLCompletionPolicy urlCompletionPolicy, CrossOriginLoadPolicy crossOriginLoadPolicy, WorkerScriptLoaderClient* client) { ASSERT(client); m_client = client; - ResourceRequest request(url); - request.setHTTPMethod("GET"); + OwnPtr request(createResourceRequest(scriptExecutionContext, url, urlCompletionPolicy, crossOriginLoadPolicy)); + if (!request) + return; - m_threadableLoader = ThreadableLoader::create(scriptExecutionContext, this, request, DoNotSendLoadCallbacks, DoNotSniffContent, AllowStoredCredentials, crossOriginRedirectPolicy); + m_threadableLoader = ThreadableLoader::create(scriptExecutionContext, this, *request, DoNotSendLoadCallbacks, DoNotSniffContent, AllowStoredCredentials, toCrossOriginRedirectPolicy(crossOriginLoadPolicy)); +} + +static void notifyLoadErrorTask(ScriptExecutionContext* context, WorkerScriptLoader* loader) +{ + UNUSED_PARAM(context); + loader->notifyError(); +} + +PassOwnPtr WorkerScriptLoader::createResourceRequest(ScriptExecutionContext* scriptExecutionContext, const String& url, URLCompletionPolicy urlCompletionPolicy, CrossOriginLoadPolicy crossOriginLoadPolicy) +{ + if (urlCompletionPolicy == CompleteURL) { + m_url = scriptExecutionContext->completeURL(url); + if (url.isEmpty() || !m_url.isValid()) { + scriptExecutionContext->postTask(createCallbackTask(¬ifyLoadErrorTask, this)); + return 0; + } + } else + m_url = KURL(url); + + if (crossOriginLoadPolicy == DenyCrossOriginLoad && !scriptExecutionContext->securityOrigin()->canAccess(SecurityOrigin::create(m_url).get())) { + scriptExecutionContext->postTask(createCallbackTask(¬ifyLoadErrorTask, this)); + return 0; + } + + OwnPtr request(new ResourceRequest(m_url)); + request->setHTTPMethod("GET"); + + return request.release(); } void WorkerScriptLoader::didReceiveResponse(const ResourceResponse& response) @@ -111,17 +149,20 @@ void WorkerScriptLoader::didFinishLoading(unsigned long identifier) void WorkerScriptLoader::didFail(const ResourceError&) { - m_failed = true; - notifyFinished(); + notifyError(); } void WorkerScriptLoader::didFailRedirectCheck() { - m_failed = true; - notifyFinished(); + notifyError(); } void WorkerScriptLoader::didReceiveAuthenticationCancellation(const ResourceResponse&) +{ + notifyError(); +} + +void WorkerScriptLoader::notifyError() { m_failed = true; notifyFinished(); diff --git a/src/3rdparty/webkit/WebCore/workers/WorkerScriptLoader.h b/src/3rdparty/webkit/WebCore/workers/WorkerScriptLoader.h index e3a96637e..f465d7f33 100644 --- a/src/3rdparty/webkit/WebCore/workers/WorkerScriptLoader.h +++ b/src/3rdparty/webkit/WebCore/workers/WorkerScriptLoader.h @@ -30,6 +30,7 @@ #if ENABLE(WORKERS) +#include "KURL.h" #include "ResourceResponse.h" #include "ScriptString.h" #include "TextResourceDecoder.h" @@ -41,14 +42,27 @@ namespace WebCore { class ScriptExecutionContext; class WorkerScriptLoaderClient; + enum URLCompletionPolicy { + CompleteURL, + DoNotCompleteURL + }; + + enum CrossOriginLoadPolicy { + DenyCrossOriginLoad, + AllowCrossOriginLoad + }; + class WorkerScriptLoader : public ThreadableLoaderClient { public: WorkerScriptLoader(); - void loadSynchronously(ScriptExecutionContext*, const String& url, CrossOriginRedirectPolicy); - void loadAsynchronously(ScriptExecutionContext*, const String& url, CrossOriginRedirectPolicy, WorkerScriptLoaderClient*); + void loadSynchronously(ScriptExecutionContext*, const String& url, URLCompletionPolicy, CrossOriginLoadPolicy); + void loadAsynchronously(ScriptExecutionContext*, const String& url, URLCompletionPolicy, CrossOriginLoadPolicy, WorkerScriptLoaderClient*); + + void notifyError(); const String& script() const { return m_script; } + const KURL& url() const { return m_url; } bool failed() const { return m_failed; } unsigned long identifier() const { return m_identifier; } @@ -60,6 +74,7 @@ namespace WebCore { virtual void didReceiveAuthenticationCancellation(const ResourceResponse&); private: + PassOwnPtr createResourceRequest(ScriptExecutionContext*, const String& url, URLCompletionPolicy, CrossOriginLoadPolicy); void notifyFinished(); WorkerScriptLoaderClient* m_client; @@ -67,6 +82,7 @@ namespace WebCore { String m_responseEncoding; RefPtr m_decoder; String m_script; + KURL m_url; bool m_failed; unsigned long m_identifier; }; diff --git a/src/3rdparty/webkit/WebCore/workers/WorkerThread.cpp b/src/3rdparty/webkit/WebCore/workers/WorkerThread.cpp index 0745226de..5d58eea85 100644 --- a/src/3rdparty/webkit/WebCore/workers/WorkerThread.cpp +++ b/src/3rdparty/webkit/WebCore/workers/WorkerThread.cpp @@ -30,11 +30,11 @@ #include "WorkerThread.h" +#include "DedicatedWorkerContext.h" #include "KURL.h" #include "PlatformString.h" #include "ScriptSourceCode.h" #include "ScriptValue.h" -#include "WorkerContext.h" #include "WorkerObjectProxy.h" #include @@ -101,9 +101,9 @@ void* WorkerThread::workerThread() { { MutexLocker lock(m_threadCreationMutex); - m_workerContext = WorkerContext::create(m_startupData->m_scriptURL, m_startupData->m_userAgent, this); + m_workerContext = DedicatedWorkerContext::create(m_startupData->m_scriptURL, m_startupData->m_userAgent, this); if (m_runLoop.terminated()) { - // The worker was terminated before the thread had a chance to run. Since the context didn't exist yet, + // The worker was terminated before the thread had a chance to run. Since the context didn't exist yet, // forbidExecution() couldn't be called from stop(). m_workerContext->script()->forbidExecution(); } diff --git a/src/3rdparty/webkit/WebCore/xml/XPathExpressionNode.h b/src/3rdparty/webkit/WebCore/xml/XPathExpressionNode.h index d12b451dd..74b134e7b 100644 --- a/src/3rdparty/webkit/WebCore/xml/XPathExpressionNode.h +++ b/src/3rdparty/webkit/WebCore/xml/XPathExpressionNode.h @@ -53,7 +53,7 @@ namespace WebCore { virtual ~ParseNode() { } }; - class Expression : public ParseNode, Noncopyable { + class Expression : public ParseNode, public Noncopyable { public: static EvaluationContext& evaluationContext(); diff --git a/src/3rdparty/webkit/WebCore/xml/XPathGrammar.y b/src/3rdparty/webkit/WebCore/xml/XPathGrammar.y index 15a859bff..14e9fa394 100644 --- a/src/3rdparty/webkit/WebCore/xml/XPathGrammar.y +++ b/src/3rdparty/webkit/WebCore/xml/XPathGrammar.y @@ -37,6 +37,10 @@ #include "XPathPath.h" #include "XPathPredicate.h" #include "XPathVariableReference.h" +#include + +#define YYMALLOC fastMalloc +#define YYFREE fastFree #define YYENABLE_NLS 0 #define YYLTYPE_IS_TRIVIAL 1 diff --git a/src/3rdparty/webkit/WebCore/xml/XPathParser.h b/src/3rdparty/webkit/WebCore/xml/XPathParser.h index 8d6da3f97..e77960308 100644 --- a/src/3rdparty/webkit/WebCore/xml/XPathParser.h +++ b/src/3rdparty/webkit/WebCore/xml/XPathParser.h @@ -58,7 +58,7 @@ namespace WebCore { Token(int t, EqTestOp::Opcode v): type(t), eqop(v) {} }; - class Parser : Noncopyable { + class Parser : public Noncopyable { public: Parser(); diff --git a/src/3rdparty/webkit/WebCore/xml/XPathPredicate.h b/src/3rdparty/webkit/WebCore/xml/XPathPredicate.h index 6c9d413e3..5f2482a02 100644 --- a/src/3rdparty/webkit/WebCore/xml/XPathPredicate.h +++ b/src/3rdparty/webkit/WebCore/xml/XPathPredicate.h @@ -105,7 +105,7 @@ namespace WebCore { virtual Value::Type resultType() const { return Value::NodeSetValue; } }; - class Predicate : Noncopyable { + class Predicate : public Noncopyable { public: Predicate(Expression*); ~Predicate(); diff --git a/src/3rdparty/webkit/WebCore/xml/XPathStep.h b/src/3rdparty/webkit/WebCore/xml/XPathStep.h index 1c2632773..11612e92f 100644 --- a/src/3rdparty/webkit/WebCore/xml/XPathStep.h +++ b/src/3rdparty/webkit/WebCore/xml/XPathStep.h @@ -39,7 +39,7 @@ namespace WebCore { class Predicate; - class Step : public ParseNode, Noncopyable { + class Step : public ParseNode, public Noncopyable { public: enum Axis { AncestorAxis, AncestorOrSelfAxis, AttributeAxis, diff --git a/src/3rdparty/webkit/WebKit.pri b/src/3rdparty/webkit/WebKit.pri index 73288abc0..b363365e3 100644 --- a/src/3rdparty/webkit/WebKit.pri +++ b/src/3rdparty/webkit/WebKit.pri @@ -39,6 +39,23 @@ CONFIG(release, debug|release) { BASE_DIR = $$PWD INCLUDEPATH += $$PWD/WebKit/qt/Api +# Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT +*-armcc { + QMAKE_CFLAGS += --gnu + QMAKE_CXXFLAGS += --gnu --no_parse_templates +} + +symbian { + QMAKE_CXXFLAGS.ARMCC += --gnu --no_parse_templates + DEFINES *= QT_NO_UITOOLS +} + +contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools + +# Disable a few warnings on Windows. The warnings are also +# disabled in WebKitLibraries/win/tools/vsprops/common.vsprops +win32-msvc*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4503 -wd4800 -wd4819 -wd4996 + # # For builds inside Qt we interpret the output rule and the input of each extra compiler manually # and add the resulting sources to the SOURCES variable, because the build inside Qt contains already diff --git a/src/3rdparty/webkit/WebKit/ChangeLog b/src/3rdparty/webkit/WebKit/ChangeLog index cabdf46a6..c7913d26f 100644 --- a/src/3rdparty/webkit/WebKit/ChangeLog +++ b/src/3rdparty/webkit/WebKit/ChangeLog @@ -1,3 +1,145 @@ +2009-07-24 Andrei Popescu + + ApplicationCache should have size limit + https://bugs.webkit.org/show_bug.cgi?id=22700 + + Updated the project after adding WebApplicationCache.h/mm + + * WebKit.xcodeproj/project.pbxproj: + +2009-07-16 Maxime Simon + + Reviewed by Eric Seidel. + + Added InspectorClient for Haiku WebCore support. + https://bugs.webkit.org/show_bug.cgi?id=26952 + + Adding two files, InspectorClientHaiku.h and InspectorClientHaiku.cpp + + * haiku/WebCoreSupport/InspectorClientHaiku.cpp: Added. + (WebCore::InspectorClientHaiku::inspectorDestroyed): + (WebCore::InspectorClientHaiku::createPage): + (WebCore::InspectorClientHaiku::localizedStringsURL): + (WebCore::InspectorClientHaiku::hiddenPanels): + (WebCore::InspectorClientHaiku::showWindow): + (WebCore::InspectorClientHaiku::closeWindow): + (WebCore::InspectorClientHaiku::attachWindow): + (WebCore::InspectorClientHaiku::detachWindow): + (WebCore::InspectorClientHaiku::setAttachedWindowHeight): + (WebCore::InspectorClientHaiku::highlight): + (WebCore::InspectorClientHaiku::hideHighlight): + (WebCore::InspectorClientHaiku::inspectedURLChanged): + (WebCore::InspectorClientHaiku::populateSetting): + (WebCore::InspectorClientHaiku::storeSetting): + (WebCore::InspectorClientHaiku::removeSetting): + * haiku/WebCoreSupport/InspectorClientHaiku.h: Added. + +2009-07-16 Maxime Simon + + Reviewed by Oliver Hunt. + + Added EditorClient for Haiku WebCore support. + https://bugs.webkit.org/show_bug.cgi?id=26952 + + Adding two files, EditorClientHaiku.h and EditorClientHaiku.cpp + + * haiku/WebCoreSupport/EditorClientHaiku.cpp: Added. + (WebCore::EditorClientHaiku::EditorClientHaiku): + (WebCore::EditorClientHaiku::setPage): + (WebCore::EditorClientHaiku::pageDestroyed): + (WebCore::EditorClientHaiku::shouldDeleteRange): + (WebCore::EditorClientHaiku::shouldShowDeleteInterface): + (WebCore::EditorClientHaiku::smartInsertDeleteEnabled): + (WebCore::EditorClientHaiku::isSelectTrailingWhitespaceEnabled): + (WebCore::EditorClientHaiku::isContinuousSpellCheckingEnabled): + (WebCore::EditorClientHaiku::toggleContinuousSpellChecking): + (WebCore::EditorClientHaiku::isGrammarCheckingEnabled): + (WebCore::EditorClientHaiku::toggleGrammarChecking): + (WebCore::EditorClientHaiku::spellCheckerDocumentTag): + (WebCore::EditorClientHaiku::isEditable): + (WebCore::EditorClientHaiku::shouldBeginEditing): + (WebCore::EditorClientHaiku::shouldEndEditing): + (WebCore::EditorClientHaiku::shouldInsertNode): + (WebCore::EditorClientHaiku::shouldInsertText): + (WebCore::EditorClientHaiku::shouldChangeSelectedRange): + (WebCore::EditorClientHaiku::shouldApplyStyle): + (WebCore::EditorClientHaiku::shouldMoveRangeAfterDelete): + (WebCore::EditorClientHaiku::didBeginEditing): + (WebCore::EditorClientHaiku::respondToChangedContents): + (WebCore::EditorClientHaiku::respondToChangedSelection): + (WebCore::EditorClientHaiku::didEndEditing): + (WebCore::EditorClientHaiku::didWriteSelectionToPasteboard): + (WebCore::EditorClientHaiku::didSetSelectionTypesForPasteboard): + (WebCore::EditorClientHaiku::registerCommandForUndo): + (WebCore::EditorClientHaiku::registerCommandForRedo): + (WebCore::EditorClientHaiku::clearUndoRedoOperations): + (WebCore::EditorClientHaiku::canUndo): + (WebCore::EditorClientHaiku::canRedo): + (WebCore::EditorClientHaiku::undo): + (WebCore::EditorClientHaiku::redo): + (WebCore::EditorClientHaiku::handleKeyboardEvent): + (WebCore::EditorClientHaiku::handleInputMethodKeydown): + (WebCore::EditorClientHaiku::textFieldDidBeginEditing): + (WebCore::EditorClientHaiku::textFieldDidEndEditing): + (WebCore::EditorClientHaiku::textDidChangeInTextField): + (WebCore::EditorClientHaiku::doTextFieldCommandFromEvent): + (WebCore::EditorClientHaiku::textWillBeDeletedInTextField): + (WebCore::EditorClientHaiku::textDidChangeInTextArea): + (WebCore::EditorClientHaiku::ignoreWordInSpellDocument): + (WebCore::EditorClientHaiku::learnWord): + (WebCore::EditorClientHaiku::checkSpellingOfString): + (WebCore::EditorClientHaiku::getAutoCorrectSuggestionForMisspelledWord): + (WebCore::EditorClientHaiku::checkGrammarOfString): + (WebCore::EditorClientHaiku::updateSpellingUIWithGrammarString): + (WebCore::EditorClientHaiku::updateSpellingUIWithMisspelledWord): + (WebCore::EditorClientHaiku::showSpellingUI): + (WebCore::EditorClientHaiku::spellingUIIsShowing): + (WebCore::EditorClientHaiku::getGuessesForWord): + (WebCore::EditorClientHaiku::setInputMethodState): + (WebCore::EditorClientHaiku::isEditing): + * haiku/WebCoreSupport/EditorClientHaiku.h: Added. + +2009-07-16 Maxime Simon + + Reviewed by Eric Seidel. + + Added DragClient for Haiku WebCore support. + https://bugs.webkit.org/show_bug.cgi?id=26952 + + Adding two files, DragClientHaiku.h and DragClientHaiku.cpp + + * haiku/WebCoreSupport/DragClientHaiku.cpp: Added. + (WebCore::DragClientHaiku::actionMaskForDrag): + (WebCore::DragClientHaiku::willPerformDragDestinationAction): + (WebCore::DragClientHaiku::dragControllerDestroyed): + (WebCore::DragClientHaiku::dragSourceActionMaskForPoint): + (WebCore::DragClientHaiku::willPerformDragSourceAction): + (WebCore::DragClientHaiku::startDrag): + (WebCore::DragClientHaiku::createDragImageForLink): + * haiku/WebCoreSupport/DragClientHaiku.h: Added. + +2009-07-16 Maxime Simon + + Reviewed by Oliver Hunt. + + Added ContextMenuClient for Haiku WebCore support. + https://bugs.webkit.org/show_bug.cgi?id=26952 + + Adding two files, ContextMenuClientHaiku.h + and ContextMenuClientHaiku.cpp + + * haiku/WebCoreSupport/ContextMenuClientHaiku.cpp: Added. + (WebCore::ContextMenuClientHaiku::contextMenuDestroyed): + (WebCore::ContextMenuClientHaiku::getCustomMenuFromDefaultItems): + (WebCore::ContextMenuClientHaiku::contextMenuItemSelected): + (WebCore::ContextMenuClientHaiku::downloadURL): + (WebCore::ContextMenuClientHaiku::lookUpInDictionary): + (WebCore::ContextMenuClientHaiku::speak): + (WebCore::ContextMenuClientHaiku::isSpeaking): + (WebCore::ContextMenuClientHaiku::stopSpeaking): + (WebCore::ContextMenuClientHaiku::searchWithGoogle): + * haiku/WebCoreSupport/ContextMenuClientHaiku.h: Added. + 2009-07-10 Adam Roben Sort all our Xcode projects diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp index 0d1138167..d51e4e6fd 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp @@ -55,7 +55,8 @@ using namespace WebCore; /*! Constructs a web database from \a other. */ -QWebDatabase::QWebDatabase(const QWebDatabase& other) : d(other.d) +QWebDatabase::QWebDatabase(const QWebDatabase& other) + : d(other.d) { } @@ -163,7 +164,7 @@ QWebSecurityOrigin QWebDatabase::origin() const Removes the database \a db from its security origin. All data stored in the database \a db will be destroyed. */ -void QWebDatabase::removeDatabase(const QWebDatabase &db) +void QWebDatabase::removeDatabase(const QWebDatabase& db) { #if ENABLE(DATABASE) DatabaseTracker::tracker().deleteDatabase(db.d->origin.get(), db.d->name); diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.h index 5b4f704a7..875b2eb0c 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.h @@ -31,8 +31,7 @@ namespace WebCore { class QWebDatabasePrivate; class QWebSecurityOrigin; -class QWEBKIT_EXPORT QWebDatabase -{ +class QWEBKIT_EXPORT QWebDatabase { public: QWebDatabase(const QWebDatabase& other); QWebDatabase &operator=(const QWebDatabase& other); @@ -45,7 +44,7 @@ public: QString fileName() const; QWebSecurityOrigin origin() const; - static void removeDatabase(const QWebDatabase &db); + static void removeDatabase(const QWebDatabase&); static void removeAllDatabases(); private: diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase_p.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase_p.h index 988fb16ef..9ae8fc83e 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase_p.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase_p.h @@ -27,8 +27,7 @@ #include "RefPtr.h" -class QWebDatabasePrivate : public QSharedData -{ +class QWebDatabasePrivate : public QSharedData { public: WebCore::String name; WTF::RefPtr origin; diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp index 413a66264..1dfb4098a 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp @@ -46,46 +46,52 @@ using namespace WebCore; -class QWebElementPrivate -{ +class QWebElementPrivate { public: }; /*! \class QWebElement \since 4.6 - \brief The QWebElement class provides convenience access to DOM elements in a QWebFrame. - \preliminary + \brief The QWebElement class provides convenient access to DOM elements in a QWebFrame. - QWebElement is the main class to provide easy access to the document model. + QWebElement is the main class to easily access to the document model. The document model is represented by a tree-like structure of DOM elements. The root of the tree is called the document element and can be accessed using QWebFrame::documentElement(). - You can reach specific elements by using the findAll() and findFirst() functions, which - allow the use of CSS selectors to identify elements. + You can reach specific elements using findAll() and findFirst(); the elements + are identified through CSS selectors. \snippet webkitsnippets/webelement/main.cpp FindAll - The first list contains all span elements in the document. The second list contains - only the span elements that are children of the paragraph that is classified - as "intro" paragraph. + The first list contains all \c span elements in the document. The second list contains + \c span elements that are children of \c p, classified with \c intro. + + Using findFirst() is more efficient than calling findAll() and extracting the first element + only in the returned list. Alternatively you can manually traverse the document using firstChild() and nextSibling(): \snippet webkitsnippets/webelement/main.cpp Traversing with QWebElement The underlying content of QWebElement is explicitly shared. Creating a copy of a QWebElement - does not create a copy of the content, both instances point to the same underlying element. + does not create a copy of the content. Instead, both instances point to the same element. + + The element's attributes can be read using attribute() and modified with setAttribute(). - The element's attributes can be read using attribute() and changed using setAttribute(). + The contents of child elements can be converted to plain text with toPlainText() and to + XHTML using toInnerXml(). To also include the element's tag in the output, use toOuterXml(). - The content of the child elements can be converted to plain text using toPlainText() and to - x(html) using toXml(), and it is possible to replace the content using setPlainText() and setXml(). + It is possible to replace the contents using setPlainText() and setInnerXml(). To replace + the element itself and its contents, use setOuterXml(). - Depending on the type of the underlying element there may be extra functionality available, not - covered through QWebElement's API. For example a HTML form element can be triggered to submit the - entire form. These list of these functions is available through functions() and they can be called - directly using callFunction(). + In the JavaScript DOM interfaces, elements can have additional functions depending on their + type. For example an HTML form element can be triggered to submit the entire form to the + web server using the submit() function. A list of these special functions can be obtained + in QWebElement using functions(); they can be invoked using callFunction(). + + Similarly element specific properties can be obtained using scriptableProperties() and + read/written using scriptableProperty()/setScriptableProperty(). */ /*! @@ -178,10 +184,13 @@ bool QWebElement::isNull() const } /*! - Returns a new collection of elements that are children of this element - and that match the given CSS selector \a selectorQuery. + Returns a new list of child elements matching the given CSS selector \a selectorQuery. + If there are no matching elements, an empty list is returned. + + \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector} syntax is + used for the query. - The query is specified using \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{standard CSS2 selectors}. + \note This search is performed recursively. */ QList QWebElement::findAll(const QString &selectorQuery) const { @@ -205,9 +214,10 @@ QList QWebElement::findAll(const QString &selectorQuery) const /*! Returns the first child element that matches the given CSS selector \a selectorQuery. - This function is equivalent to calling findAll() and taking only the - first element in the returned collection of elements. However calling - this function is more efficient. + \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector} syntax is + used for the query. + + \note This search is performed recursively. */ QWebElement QWebElement::findFirst(const QString &selectorQuery) const { @@ -743,7 +753,7 @@ QStringList QWebElement::functions() const continue; JSC::UString ustring = (*it).ustring(); - names << QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size()); + names << QString::fromUtf16((const ushort*)ustring.rep()->data(), ustring.size()); } if (state->hadException()) @@ -868,7 +878,7 @@ QStringList QWebElement::scriptableProperties() const continue; JSC::UString ustring = (*it).ustring(); - names << QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size()); + names << QString::fromUtf16((const ushort*)ustring.rep()->data(), ustring.size()); } if (exec->hadException()) diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h index 7e56d0ff0..bc6f8a956 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h @@ -34,12 +34,11 @@ namespace WebCore { class QWebFrame; class QWebElementPrivate; -class QWEBKIT_EXPORT QWebElement -{ +class QWEBKIT_EXPORT QWebElement { public: QWebElement(); - QWebElement(const QWebElement &); - QWebElement &operator=(const QWebElement &); + QWebElement(const QWebElement&); + QWebElement &operator=(const QWebElement&); ~QWebElement(); bool operator==(const QWebElement& o) const; @@ -47,33 +46,33 @@ public: bool isNull() const; - QList findAll(const QString &selectorQuery) const; - QWebElement findFirst(const QString &selectorQuery) const; + QList findAll(const QString& selectorQuery) const; + QWebElement findFirst(const QString& selectorQuery) const; - void setPlainText(const QString &text); + void setPlainText(const QString& text); QString toPlainText() const; - void setOuterXml(const QString &markup); + void setOuterXml(const QString& markup); QString toOuterXml() const; - void setInnerXml(const QString &markup); + void setInnerXml(const QString& markup); QString toInnerXml() const; - void setAttribute(const QString &name, const QString &value); - void setAttributeNS(const QString &namespaceUri, const QString &name, const QString &value); - QString attribute(const QString &name, const QString &defaultValue = QString()) const; - QString attributeNS(const QString &namespaceUri, const QString &name, const QString &defaultValue = QString()) const; - bool hasAttribute(const QString &name) const; - bool hasAttributeNS(const QString &namespaceUri, const QString &name) const; - void removeAttribute(const QString &name); - void removeAttributeNS(const QString &namespaceUri, const QString &name); + void setAttribute(const QString& name, const QString& value); + void setAttributeNS(const QString& namespaceUri, const QString& name, const QString& value); + QString attribute(const QString& name, const QString& defaultValue = QString()) const; + QString attributeNS(const QString& namespaceUri, const QString& name, const QString& defaultValue = QString()) const; + bool hasAttribute(const QString& name) const; + bool hasAttributeNS(const QString& namespaceUri, const QString& name) const; + void removeAttribute(const QString& name); + void removeAttributeNS(const QString& namespaceUri, const QString& name); bool hasAttributes() const; QStringList classes() const; - bool hasClass(const QString &name) const; - void addClass(const QString &name); - void removeClass(const QString &name); - void toggleClass(const QString &name); + bool hasClass(const QString& name) const; + void addClass(const QString& name); + void removeClass(const QString& name); + void toggleClass(const QString& name); QRect geometry() const; @@ -92,62 +91,62 @@ public: // TODO: Add QList overloads // docs need example snippet - void appendInside(const QString &markup); - void appendInside(const QWebElement &element); + void appendInside(const QString& markup); + void appendInside(const QWebElement& element); // docs need example snippet - void prependInside(const QString &markup); - void prependInside(const QWebElement &element); + void prependInside(const QString& markup); + void prependInside(const QWebElement& element); // docs need example snippet - void appendOutside(const QString &markup); - void appendOutside(const QWebElement &element); + void appendOutside(const QString& markup); + void appendOutside(const QWebElement& element); // docs need example snippet - void prependOutside(const QString &markup); - void prependOutside(const QWebElement &element); + void prependOutside(const QString& markup); + void prependOutside(const QWebElement& element); // docs need example snippet - void encloseContentsWith(const QWebElement &element); - void encloseContentsWith(const QString &markup); - void encloseWith(const QString &markup); - void encloseWith(const QWebElement &element); + void encloseContentsWith(const QWebElement& element); + void encloseContentsWith(const QString& markup); + void encloseWith(const QString& markup); + void encloseWith(const QWebElement& element); - void replace(const QString &markup); - void replace(const QWebElement &element); + void replace(const QString& markup); + void replace(const QWebElement& element); QWebElement clone() const; - QWebElement &takeFromDocument(); + QWebElement& takeFromDocument(); void removeFromDocument(); void removeChildren(); QVariant evaluateScript(const QString& scriptSource); - QVariant callFunction(const QString &functionName, const QVariantList &arguments = QVariantList()); + QVariant callFunction(const QString& functionName, const QVariantList& arguments = QVariantList()); QStringList functions() const; - QVariant scriptableProperty(const QString &name) const; - void setScriptableProperty(const QString &name, const QVariant &value); + QVariant scriptableProperty(const QString& name) const; + void setScriptableProperty(const QString& name, const QVariant& value); QStringList scriptableProperties() const; enum ResolveRule { IgnoreCascadingStyles, RespectCascadingStyles }; - QString styleProperty(const QString &name, ResolveRule = IgnoreCascadingStyles) const; + QString styleProperty(const QString& name, ResolveRule = IgnoreCascadingStyles) const; enum StylePriority { NormalStylePriority, DeclaredStylePriority, ImportantStylePriority }; - void setStyleProperty(const QString &name, const QString &value, StylePriority = DeclaredStylePriority); + void setStyleProperty(const QString& name, const QString& value, StylePriority = DeclaredStylePriority); - QString computedStyleProperty(const QString &name) const; + QString computedStyleProperty(const QString& name) const; private: - explicit QWebElement(WebCore::Element *domElement); - explicit QWebElement(WebCore::Node *node); + explicit QWebElement(WebCore::Element*); + explicit QWebElement(WebCore::Node*); friend class QWebFrame; friend class QWebHitTestResult; friend class QWebHitTestResultPrivate; - QWebElementPrivate *d; - WebCore::Element *m_element; + QWebElementPrivate* d; + WebCore::Element* m_element; }; #endif // QWEBELEMENT_H diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp index 29d380dca..23cb473dc 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp @@ -232,7 +232,7 @@ WebCore::Scrollbar* QWebFramePrivate::verticalScrollBar() const return frame->view()->verticalScrollbar(); } -void QWebFramePrivate::renderPrivate(QPainter *painter, const QRegion &clip, bool contents) +void QWebFramePrivate::renderPrivate(QPainter *painter, const QRegion &clip) { if (!frame->view() || !frame->contentRenderer()) return; @@ -246,7 +246,7 @@ void QWebFramePrivate::renderPrivate(QPainter *painter, const QRegion &clip, boo GraphicsContext context(painter); - if (!contents) + if (clipRenderToViewport) view->paint(&context, vector.first()); else view->paintContents(&context, vector.first()); @@ -255,7 +255,7 @@ void QWebFramePrivate::renderPrivate(QPainter *painter, const QRegion &clip, boo const QRect& clipRect = vector.at(i); painter->save(); painter->setClipRect(clipRect, Qt::IntersectClip); - if (!contents) + if (clipRenderToViewport) view->paint(&context, clipRect); else view->paintContents(&context, clipRect); @@ -280,6 +280,13 @@ void QWebFramePrivate::renderPrivate(QPainter *painter, const QRegion &clip, boo \l{Elements of QWebView} for an explanation of how web frames are related to a web page and web view. + The QWebFrame class also offers methods to retrieve both the URL currently + loaded by the frame (see url()) as well as the URL originally requested + to be loaded (see requestedUrl()). These methods make possible the retrieval + of the URL before and after a DNS resolution or a redirection occurs during + the load process. The requestedUrl() also matches to the URL added to the + frame history (\l{QWebHistory}) if load is successful. + The title of an HTML frame can be accessed with the title() property. Additionally, a frame may also specify an icon, which can be accessed using the icon() property. If the title or the icon changes, the @@ -376,7 +383,7 @@ void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object if (!page()->settings()->testAttribute(QWebSettings::JavascriptEnabled)) return; - JSC::JSLock lock(false); + JSC::JSLock lock(JSC::SilenceAssertionsOnly); JSDOMWindow* window = toJSDOMWindow(d->frame); JSC::Bindings::RootObject* root = d->frame->script()->bindingRootObject(); if (!window) { @@ -443,7 +450,7 @@ QString QWebFrame::title() const { if (d->frame->document()) return d->frame->loader()->documentLoader()->title(); - else return QString(); + return QString(); } /*! @@ -479,10 +486,10 @@ QString QWebFrame::title() const */ QMultiMap QWebFrame::metaData() const { - if(!d->frame->document()) - return QMap(); + if (!d->frame->document()) + return QMap(); - QMultiMap map; + QMultiMap map; Document* doc = d->frame->document(); RefPtr list = doc->getElementsByTagName("meta"); unsigned len = list->length(); @@ -521,6 +528,24 @@ QUrl QWebFrame::url() const } /*! + \since 4.6 + \property QWebFrame::requestedUrl + + The URL requested to loaded by the frame currently viewed. The URL may differ from + the one returned by url() if a DNS resolution or a redirection occurs. + + \sa url(), setUrl() +*/ +QUrl QWebFrame::requestedUrl() const +{ + if (!d->frame->loader()->activeDocumentLoader() + || !d->frameLoaderClient->m_loadSucceeded) + return QUrl(d->frame->loader()->outgoingReferrer()); + + return d->frame->loader()->originalRequest().url(); +} +/*! + \since 4.6 \property QWebFrame::baseUrl \brief the base URL of the frame, can be used to resolve relative URLs \since 4.6 @@ -815,9 +840,8 @@ int QWebFrame::scrollBarValue(Qt::Orientation orientation) const { Scrollbar *sb; sb = (orientation == Qt::Horizontal) ? d->horizontalScrollBar() : d->verticalScrollBar(); - if (sb) { + if (sb) return sb->value(); - } return 0; } @@ -867,7 +891,7 @@ QRect QWebFrame::scrollBarGeometry(Qt::Orientation orientation) const \since 4.5 Scrolls the frame \a dx pixels to the right and \a dy pixels downward. Both \a dx and \a dy may be negative. - + \sa QWebFrame::scrollPosition */ @@ -875,7 +899,7 @@ void QWebFrame::scroll(int dx, int dy) { if (!d->frame->view()) return; - + d->frame->view()->scrollBy(IntSize(dx, dy)); } @@ -888,7 +912,7 @@ void QWebFrame::scroll(int dx, int dy) QPoint QWebFrame::scrollPosition() const { if (!d->frame->view()) - return QPoint(0,0); + return QPoint(0, 0); IntSize ofs = d->frame->view()->scrollOffset(); return QPoint(ofs.width(), ofs.height()); @@ -924,12 +948,23 @@ void QWebFrame::render(QPainter *painter) } /*! - \since 4.6 - Render the frame's \a contents into \a painter while clipping to \a contents. + \since 4.6 + \property QWebFrame::clipRenderToViewport + + Returns true if render will clip content to viewport; otherwise returns false. */ -void QWebFrame::renderContents(QPainter *painter, const QRegion &contents) +bool QWebFrame::clipRenderToViewport() const { - d->renderPrivate(painter, contents, true); + return d->clipRenderToViewport; +} + +/*! + \since 4.6 + Sets whether the content of a frame will be clipped to viewport when rendered. +*/ +void QWebFrame::setClipRenderToViewport(bool clipRenderToViewport) +{ + d->clipRenderToViewport = clipRenderToViewport; } /*! @@ -1051,8 +1086,11 @@ QWebElement QWebFrame::documentElement() const /*! \since 4.6 - Returns a new collection of elements that are children of the frame's - document element and that match the given CSS selector \a selectorQuery. + Returns a new list of elements matching the given CSS selector \a selectorQuery. + If there are no matching elements, an empty list is returned. + + \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector} syntax is + used for the query. \sa QWebElement::findAll() */ @@ -1064,8 +1102,11 @@ QList QWebFrame::findAllElements(const QString &selectorQuery) cons /*! \since 4.6 Returns the first element in the frame's document that matches the - given CSS selector \a selectorQuery. Returns a null element if there is no - match. + given CSS selector \a selectorQuery. If there is no matching element, a + null element is returned. + + \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector} syntax is + used for the query. \sa QWebElement::findFirst() */ @@ -1123,11 +1164,11 @@ void QWebFrame::print(QPrinter *printer) const printContext.begin(pageRect.width()); - printContext.computePageRects(pageRect, /*headerHeight*/0, /*footerHeight*/0, /*userScaleFactor*/1.0, pageHeight); + printContext.computePageRects(pageRect, /* headerHeight */ 0, /* footerHeight */ 0, /* userScaleFactor */ 1.0, pageHeight); int docCopies; int pageCopies; - if (printer->collateCopies() == true){ + if (printer->collateCopies()) { docCopies = 1; pageCopies = printer->numCopies(); } else { @@ -1340,7 +1381,8 @@ QWebHitTestResultPrivate::QWebHitTestResultPrivate(const WebCore::HitTestResult return; pos = hitTest.point(); boundingRect = hitTest.boundingBox(); - title = hitTest.title(); + WebCore::TextDirection dir; + title = hitTest.title(dir); linkText = hitTest.textContent(); linkUrl = hitTest.absoluteLinkURL(); linkTitle = hitTest.titleDisplayString(); diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h index 2c5309aa7..55c73b413 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h @@ -60,8 +60,7 @@ class QWebFrameData; class QWebHitTestResultPrivate; class QWebFrame; -class QWEBKIT_EXPORT QWebHitTestResult -{ +class QWEBKIT_EXPORT QWebHitTestResult { public: QWebHitTestResult(); QWebHitTestResult(const QWebHitTestResult &other); @@ -102,17 +101,18 @@ private: friend class QWebPage; }; -class QWEBKIT_EXPORT QWebFrame : public QObject -{ +class QWEBKIT_EXPORT QWebFrame : public QObject { Q_OBJECT Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false) Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor) Q_PROPERTY(QString title READ title) Q_PROPERTY(QUrl url READ url WRITE setUrl) + Q_PROPERTY(QUrl requestedUrl READ requestedUrl) Q_PROPERTY(QUrl baseUrl READ baseUrl) Q_PROPERTY(QIcon icon READ icon) Q_PROPERTY(QSize contentsSize READ contentsSize) Q_PROPERTY(QPoint scrollPosition READ scrollPosition WRITE setScrollPosition) + Q_PROPERTY(bool clipRenderToViewport READ clipRenderToViewport WRITE setClipRenderToViewport) Q_PROPERTY(bool focus READ hasFocus) private: QWebFrame(QWebPage *parent, QWebFrameData *frameData); @@ -142,6 +142,7 @@ public: QString title() const; void setUrl(const QUrl &url); QUrl url() const; + QUrl requestedUrl() const; QUrl baseUrl() const; QIcon icon() const; QMultiMap metaData() const; @@ -166,7 +167,8 @@ public: void render(QPainter *painter, const QRegion &clip); void render(QPainter *painter); - void renderContents(QPainter *painter, const QRegion &contents); + bool clipRenderToViewport() const; + void setClipRenderToViewport(bool clipRenderToViewport); void setTextSizeMultiplier(qreal factor); qreal textSizeMultiplier() const; diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe_p.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe_p.h index 2b5c1873e..d6afc01bc 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe_p.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe_p.h @@ -31,8 +31,7 @@ #include "wtf/RefPtr.h" #include "Frame.h" -namespace WebCore -{ +namespace WebCore { class FrameLoaderClientQt; class FrameView; class HTMLFrameOwnerElement; @@ -40,8 +39,7 @@ namespace WebCore } class QWebPage; -class QWebFrameData -{ +class QWebFrameData { public: QWebFrameData(WebCore::Page*, WebCore::Frame* parentFrame = 0, WebCore::HTMLFrameOwnerElement* = 0, @@ -60,8 +58,7 @@ public: int marginHeight; }; -class QWebFramePrivate -{ +class QWebFramePrivate { public: QWebFramePrivate() : q(0) @@ -73,6 +70,7 @@ public: , allowsScrolling(true) , marginWidth(-1) , marginHeight(-1) + , clipRenderToViewport(true) {} void init(QWebFrame* qframe, QWebFrameData* frameData); @@ -82,12 +80,12 @@ public: WebCore::Scrollbar* verticalScrollBar() const; Qt::ScrollBarPolicy horizontalScrollBarPolicy; - Qt::ScrollBarPolicy verticalScrollBarPolicy; + Qt::ScrollBarPolicy verticalScrollBarPolicy; static WebCore::Frame* core(QWebFrame*); static QWebFrame* kit(WebCore::Frame*); - void renderPrivate(QPainter *painter, const QRegion &clip, bool contents = false); + void renderPrivate(QPainter *painter, const QRegion &clip); QWebFrame *q; WebCore::FrameLoaderClientQt *frameLoaderClient; @@ -97,10 +95,10 @@ public: bool allowsScrolling; int marginWidth; int marginHeight; + bool clipRenderToViewport; }; -class QWebHitTestResultPrivate -{ +class QWebHitTestResultPrivate { public: QWebHitTestResultPrivate() : isContentEditable(false), isContentSelected(false), isScrollBar(false) {} QWebHitTestResultPrivate(const WebCore::HitTestResult &hitTest); diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp index 7cdc00e11..e5eb3088c 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp @@ -239,7 +239,7 @@ void QWebHistory::clear() { RefPtr current = d->lst->currentItem(); int capacity = d->lst->capacity(); - d->lst->setCapacity(0); + d->lst->setCapacity(0); WebCore::Page* page = d->lst->page(); if (page && page->groupPtr()) diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h index 1a048f4e4..e46f124c0 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h @@ -35,8 +35,8 @@ namespace WebCore { } class QWebHistoryItemPrivate; -class QWEBKIT_EXPORT QWebHistoryItem -{ + +class QWEBKIT_EXPORT QWebHistoryItem { public: QWebHistoryItem(const QWebHistoryItem &other); QWebHistoryItem &operator=(const QWebHistoryItem &other); @@ -74,18 +74,17 @@ private: class QWebHistoryPrivate; -class QWEBKIT_EXPORT QWebHistory -{ +class QWEBKIT_EXPORT QWebHistory { public: enum HistoryStateVersion { HistoryVersion_1, /*, HistoryVersion_2, */ DefaultHistoryVersion = HistoryVersion_1 }; - + bool restoreState(const QByteArray& buffer); QByteArray saveState(HistoryStateVersion version = DefaultHistoryVersion) const; - + void clear(); QList items() const; diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory_p.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory_p.h index 4bee62bb8..e77adefc2 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory_p.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory_p.h @@ -25,8 +25,7 @@ #include #include -class Q_AUTOTEST_EXPORT QWebHistoryItemPrivate : public QSharedData -{ +class Q_AUTOTEST_EXPORT QWebHistoryItemPrivate : public QSharedData { public: static QExplicitlySharedDataPointer get(QWebHistoryItem *q) { @@ -65,8 +64,7 @@ public: WebCore::HistoryItem *item; }; -class QWebHistoryPrivate : public QSharedData -{ +class QWebHistoryPrivate : public QSharedData { public: QWebHistoryPrivate(WebCore::BackForwardList *l) { diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp index 88a1aa38c..87d52cecd 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp @@ -28,13 +28,13 @@ #include "PlatformString.h" -static QWebHistoryInterface *default_interface; +static QWebHistoryInterface* default_interface; static bool gRoutineAdded; static void gCleanupInterface() { - if (default_interface && default_interface->parent() == 0) + if (default_interface && !default_interface->parent()) delete default_interface; default_interface = 0; } @@ -47,11 +47,12 @@ static void gCleanupInterface() When the application exists QWebHistoryInterface will automatically delete the \a defaultInterface if it does not have a parent. */ -void QWebHistoryInterface::setDefaultInterface(QWebHistoryInterface *defaultInterface) +void QWebHistoryInterface::setDefaultInterface(QWebHistoryInterface* defaultInterface) { if (default_interface == defaultInterface) return; - if (default_interface && default_interface->parent() == 0) + + if (default_interface && !default_interface->parent()) delete default_interface; default_interface = defaultInterface; @@ -70,7 +71,7 @@ void QWebHistoryInterface::setDefaultInterface(QWebHistoryInterface *defaultInte Returns the default interface that will be used by WebKit. If no default interface has been set, QtWebkit will not track history. */ -QWebHistoryInterface *QWebHistoryInterface::defaultInterface() +QWebHistoryInterface* QWebHistoryInterface::defaultInterface() { return default_interface; } @@ -91,7 +92,8 @@ QWebHistoryInterface *QWebHistoryInterface::defaultInterface() /*! Constructs a new QWebHistoryInterface with parent \a parent. */ -QWebHistoryInterface::QWebHistoryInterface(QObject *parent) : QObject(parent) +QWebHistoryInterface::QWebHistoryInterface(QObject* parent) + : QObject(parent) { } diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.h index 670fca026..a49c58684 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.h @@ -26,8 +26,7 @@ #include "qwebkitglobal.h" -class QWEBKIT_EXPORT QWebHistoryInterface : public QObject -{ +class QWEBKIT_EXPORT QWebHistoryInterface : public QObject { Q_OBJECT public: QWebHistoryInterface(QObject *parent = 0); diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index 3c2151b37..1a45fe69c 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -59,6 +59,7 @@ #include "Scrollbar.h" #include "PlatformKeyboardEvent.h" #include "PlatformWheelEvent.h" +#include "PluginDatabase.h" #include "ProgressTracker.h" #include "RefPtr.h" #include "HashMap.h" @@ -99,6 +100,18 @@ using namespace WebCore; +void QWEBKIT_EXPORT qt_drt_overwritePluginDirectories() +{ + PluginDatabase* db = PluginDatabase::installedPlugins(/* populate */ false); + + Vector paths; + String qtPath(getenv("QTWEBKIT_PLUGIN_PATH")); + qtPath.split(UChar(':'), /* allowEmptyEntries */ false, paths); + + db->setPluginDirectories(paths); + db->refresh(); +} + bool QWebPagePrivate::drtRun = false; void QWEBKIT_EXPORT qt_drt_run(bool b) { @@ -116,29 +129,29 @@ QString QWEBKIT_EXPORT qt_webpage_groupName(QWebPage* page) } // Lookup table mapping QWebPage::WebActions to the associated Editor commands -static const char* editorCommandWebActions[] = +static const char* editorCommandWebActions[] = { 0, // OpenLink, 0, // OpenLinkInNewWindow, 0, // OpenFrameInNewWindow, - + 0, // DownloadLinkToDisk, 0, // CopyLinkToClipboard, - + 0, // OpenImageInNewWindow, 0, // DownloadImageToDisk, 0, // CopyImageToClipboard, - + 0, // Back, 0, // Forward, 0, // Stop, 0, // Reload, - + "Cut", // Cut, "Copy", // Copy, "Paste", // Paste, - + "Undo", // Undo, "Redo", // Redo, "MoveForward", // MoveToNextChar, @@ -167,21 +180,22 @@ static const char* editorCommandWebActions[] = "MoveToEndOfDocumentAndModifySelection", // SelectEndOfDocument, "DeleteWordBackward", // DeleteStartOfWord, "DeleteWordForward", // DeleteEndOfWord, - + 0, // SetTextDirectionDefault, 0, // SetTextDirectionLeftToRight, 0, // SetTextDirectionRightToLeft, - + "ToggleBold", // ToggleBold, "ToggleItalic", // ToggleItalic, "ToggleUnderline", // ToggleUnderline, - + 0, // InspectElement, "InsertNewline", // InsertParagraphSeparator "InsertLineBreak", // InsertLineSeparator "SelectAll", // SelectAll + 0, // ReloadAndBypassCache, "PasteAndMatchStyle", // PasteAndMatchStyle "RemoveFormat", // RemoveFormat @@ -206,7 +220,6 @@ const char* QWebPagePrivate::editorCommandForWebActions(QWebPage::WebAction acti { if ((action > QWebPage::NoWebAction) && (action < int(sizeof(editorCommandWebActions) / sizeof(const char*)))) return editorCommandWebActions[action]; - return 0; } @@ -252,7 +265,7 @@ static inline Qt::DropAction dragOpToDropAction(unsigned actions) QWebPagePrivate::QWebPagePrivate(QWebPage *qq) : q(qq) , view(0) - , viewportSize(QSize(0,0)) + , viewportSize(QSize(0, 0)) { WebCore::InitializeLoggingChannelsIfNecessary(); JSC::initializeThreading(); @@ -405,9 +418,8 @@ QMenu *QWebPagePrivate::createContextMenu(const WebCore::ContextMenu *webcoreMen if (anyEnabledAction) { subMenu->setTitle(item.title()); menu->addAction(subMenu->menuAction()); - } else { + } else delete subMenu; - } break; } } @@ -456,6 +468,7 @@ void QWebPagePrivate::updateAction(QWebPage::WebAction action) enabled = loader->isLoading(); break; case QWebPage::Reload: + case QWebPage::ReloadAndBypassCache: enabled = !loader->isLoading(); break; #ifndef QT_NO_UNDOSTACK @@ -501,6 +514,7 @@ void QWebPagePrivate::updateNavigationActions() updateAction(QWebPage::Forward); updateAction(QWebPage::Stop); updateAction(QWebPage::Reload); + updateAction(QWebPage::ReloadAndBypassCache); } void QWebPagePrivate::updateEditorActions() @@ -647,12 +661,12 @@ void QWebPagePrivate::mouseReleaseEvent(QMouseEvent *ev) Pasteboard::generalPasteboard()->setSelectionMode(true); WebCore::Frame* focusFrame = page->focusController()->focusedOrMainFrame(); if (ev->button() == Qt::LeftButton) { - if(focusFrame && (focusFrame->editor()->canCopy() || focusFrame->editor()->canDHTMLCopy())) { + if (focusFrame && (focusFrame->editor()->canCopy() || focusFrame->editor()->canDHTMLCopy())) { focusFrame->editor()->copy(); ev->setAccepted(true); } } else if (ev->button() == Qt::MidButton) { - if(focusFrame && (focusFrame->editor()->canPaste() || focusFrame->editor()->canDHTMLPaste())) { + if (focusFrame && (focusFrame->editor()->canPaste() || focusFrame->editor()->canDHTMLPaste())) { focusFrame->editor()->paste(); ev->setAccepted(true); } @@ -822,11 +836,10 @@ void QWebPagePrivate::focusInEvent(QFocusEvent *ev) FocusController *focusController = page->focusController(); Frame *frame = focusController->focusedFrame(); focusController->setActive(true); - if (frame) { + if (frame) focusController->setFocused(true); - } else { + else focusController->setFocusedFrame(QWebFramePrivate::core(mainFrame)); - } } void QWebPagePrivate::focusOutEvent(QFocusEvent *ev) @@ -932,7 +945,7 @@ void QWebPagePrivate::inputMethodEvent(QInputMethodEvent *ev) QString preedit = ev->preeditString(); // ### FIXME: use the provided QTextCharFormat (use color at least) Vector underlines; - underlines.append(CompositionUnderline(0, preedit.length(), Color(0,0,0), false)); + underlines.append(CompositionUnderline(0, preedit.length(), Color(0, 0, 0), false)); editor->setComposition(preedit, underlines, preedit.length(), 0); } ev->accept(); @@ -968,9 +981,8 @@ void QWebPagePrivate::shortcutOverrideEvent(QKeyEvent* event) } } #ifndef QT_NO_SHORTCUT - else if (editorActionForKeyEvent(event) != QWebPage::NoWebAction) { + else if (editorActionForKeyEvent(event) != QWebPage::NoWebAction) event->accept(); - } #endif } } @@ -1036,12 +1048,11 @@ bool QWebPagePrivate::handleScrolling(QKeyEvent *ev, Frame *frame) */ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const { - switch(property) { + switch (property) { case Qt::ImMicroFocus: { Frame *frame = d->page->focusController()->focusedFrame(); - if (frame) { + if (frame) return QVariant(frame->selection()->absoluteCaretBounds()); - } return QVariant(); } case Qt::ImFont: { @@ -1054,9 +1065,8 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const Frame *frame = d->page->focusController()->focusedFrame(); if (frame) { VisibleSelection selection = frame->selection()->selection(); - if (selection.isCaret()) { + if (selection.isCaret()) return QVariant(selection.start().deprecatedEditingOffset()); - } } return QVariant(); } @@ -1064,9 +1074,8 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const Frame *frame = d->page->focusController()->focusedFrame(); if (frame) { Document *document = frame->document(); - if (document->focusedNode()) { + if (document->focusedNode()) return QVariant(document->focusedNode()->nodeValue()); - } } return QVariant(); } @@ -1142,6 +1151,7 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const \value Forward Navigate forward in the history of navigated links. \value Stop Stop loading the current page. \value Reload Reload the current page. + \value ReloadAndBypassCache Reload the current page, but do not use any local cache. (Added in Qt 4.6) \value Cut Cut the content currently selected into the clipboard. \value Copy Copy the content currently selected into the clipboard. \value Paste Paste content from the clipboard. @@ -1415,9 +1425,8 @@ bool QWebPage::javaScriptPrompt(QWebFrame *frame, const QString& msg, const QStr bool ok = false; #ifndef QT_NO_INPUTDIALOG QString x = QInputDialog::getText(d->view, tr("JavaScript Prompt - %1").arg(mainFrame()->url().host()), msg, QLineEdit::Normal, defaultValue, &ok); - if (ok && result) { + if (ok && result) *result = x; - } #endif return ok; } @@ -1568,7 +1577,10 @@ void QWebPage::triggerAction(WebAction action, bool checked) mainFrame()->d->frame->loader()->stopForUserCancel(); break; case Reload: - mainFrame()->d->frame->loader()->reload(); + mainFrame()->d->frame->loader()->reload(/*endtoendreload*/false); + break; + case ReloadAndBypassCache: + mainFrame()->d->frame->loader()->reload(/*endtoendreload*/true); break; case SetTextDirectionDefault: editor->setBaseWritingDirection(NaturalWritingDirection); @@ -1630,9 +1642,8 @@ QSize QWebPage::fixedContentsSize() const QWebFrame* frame = d->mainFrame; if (frame) { WebCore::FrameView* view = frame->d->frame->view(); - if (view && view->useFixedLayout()) { + if (view && view->useFixedLayout()) return d->mainFrame->d->frame->view()->fixedLayoutSize(); - } } return d->fixedLayoutSize; @@ -2140,9 +2151,8 @@ void QWebPage::setContentEditable(bool editable) frame->applyEditingStyleToBodyElement(); // FIXME: mac port calls this if there is no selectedDOMRange //frame->setSelectionFromNone(); - } else { + } else frame->removeEditingStyleFromBodyElement(); - } } d->updateEditorActions(); @@ -2210,9 +2220,8 @@ bool QWebPage::swallowContextMenuEvent(QContextMenuEvent *event) if (QWebFrame* webFrame = frameAt(event->pos())) { Frame* frame = QWebFramePrivate::core(webFrame); - if (Scrollbar* scrollbar = frame->view()->scrollbarAtPoint(PlatformMouseEvent(event, 1).pos())) { + if (Scrollbar* scrollbar = frame->view()->scrollbarAtPoint(PlatformMouseEvent(event, 1).pos())) return scrollbar->contextMenu(PlatformMouseEvent(event, 1)); - } } WebCore::Frame* focusedFrame = d->page->focusController()->focusedOrMainFrame(); @@ -2267,9 +2276,8 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos) originallyEnabledWebActions &= ~visitedWebActions; // Mask out visited actions (they're part of the menu) for (int i = 0; i < QWebPage::WebActionCount; ++i) { if (originallyEnabledWebActions.at(i)) { - if (QAction *a = this->action(QWebPage::WebAction(i))) { + if (QAction *a = this->action(QWebPage::WebAction(i))) a->setEnabled(true); - } } } @@ -2392,9 +2400,8 @@ bool QWebPage::findText(const QString &subString, FindFlags options) if (subString.isEmpty()) { d->page->unmarkAllTextMatches(); return true; - } else { + } else return d->page->markAllMatchesForText(subString, caseSensitivity, true, 0); - } } else { ::FindDirection direction = ::FindDirectionForward; if (options & FindBackward) @@ -2635,7 +2642,7 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const #if defined Q_OS_WIN32 QString ver; - switch(QSysInfo::WindowsVersion) { + switch (QSysInfo::WindowsVersion) { case QSysInfo::WV_32s: ver = "Windows 3.1"; break; @@ -2709,7 +2716,8 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const } -void QWebPagePrivate::_q_onLoadProgressChanged(int) { +void QWebPagePrivate::_q_onLoadProgressChanged(int) +{ m_totalBytes = page->progress()->totalPageAndResourceBytesToLoad(); m_bytesReceived = page->progress()->totalBytesReceived(); } @@ -2721,7 +2729,8 @@ void QWebPagePrivate::_q_onLoadProgressChanged(int) { \sa bytesReceived() */ -quint64 QWebPage::totalBytes() const { +quint64 QWebPage::totalBytes() const +{ return d->m_totalBytes; } @@ -2731,7 +2740,8 @@ quint64 QWebPage::totalBytes() const { \sa totalBytes() */ -quint64 QWebPage::bytesReceived() const { +quint64 QWebPage::bytesReceived() const +{ return d->m_bytesReceived; } diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h index 517a77c61..24741a165 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h @@ -59,8 +59,7 @@ namespace WebCore { struct FrameLoadRequest; } -class QWEBKIT_EXPORT QWebPage : public QObject -{ +class QWEBKIT_EXPORT QWebPage : public QObject { Q_OBJECT Q_PROPERTY(bool modified READ isModified) @@ -149,6 +148,7 @@ public: InsertLineSeparator, SelectAll, + ReloadAndBypassCache, PasteAndMatchStyle, RemoveFormat, diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h index 3a3a674b9..87c624d6e 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h @@ -35,8 +35,7 @@ #include -namespace WebCore -{ +namespace WebCore { class ChromeClientQt; class ContextMenuClientQt; class ContextMenuItem; @@ -66,14 +65,13 @@ class QMenu; class QBitArray; QT_END_NAMESPACE -class QWebPagePrivate -{ +class QWebPagePrivate { public: - QWebPagePrivate(QWebPage *); + QWebPagePrivate(QWebPage*); ~QWebPagePrivate(); void createMainFrame(); #ifndef QT_NO_CONTEXTMENU - QMenu *createContextMenu(const WebCore::ContextMenu *webcoreMenu, const QList *items, QBitArray *visitedWebActions); + QMenu* createContextMenu(const WebCore::ContextMenu* webcoreMenu, const QList* items, QBitArray* visitedWebActions); #endif void _q_onLoadProgressChanged(int); void _q_webActionTriggered(bool checked); diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.h index 3531b06f0..cff774d60 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.h @@ -31,8 +31,7 @@ class QString; QT_END_NAMESPACE class QWebPluginFactoryPrivate; -class QWEBKIT_EXPORT QWebPluginFactory : public QObject -{ +class QWEBKIT_EXPORT QWebPluginFactory : public QObject { Q_OBJECT public: struct MimeType { @@ -47,16 +46,16 @@ public: QList mimeTypes; }; - explicit QWebPluginFactory(QObject *parent = 0); + explicit QWebPluginFactory(QObject* parent = 0); virtual ~QWebPluginFactory(); virtual QList plugins() const = 0; virtual void refreshPlugins(); - virtual QObject *create(const QString &mimeType, - const QUrl &url, - const QStringList &argumentNames, - const QStringList &argumentValues) const = 0; + virtual QObject *create(const QString& mimeType, + const QUrl&, + const QStringList& argumentNames, + const QStringList& argumentValues) const = 0; enum Extension { }; @@ -64,11 +63,11 @@ public: {}; class ExtensionReturn {}; - virtual bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0); + virtual bool extension(Extension extension, const ExtensionOption* option = 0, ExtensionReturn* output = 0); virtual bool supportsExtension(Extension extension) const; private: - QWebPluginFactoryPrivate *d; + QWebPluginFactoryPrivate* d; }; #endif diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.h index b52194d74..3cfb0f49c 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.h @@ -34,8 +34,7 @@ class QWebSecurityOriginPrivate; class QWebDatabase; class QWebFrame; -class QWEBKIT_EXPORT QWebSecurityOrigin -{ +class QWEBKIT_EXPORT QWebSecurityOrigin { public: static QList allOrigins(); diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin_p.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin_p.h index 73fe8ed24..cdc93bd14 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin_p.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin_p.h @@ -23,8 +23,7 @@ #include "SecurityOrigin.h" #include "RefPtr.h" -class QWebSecurityOriginPrivate : public QSharedData -{ +class QWebSecurityOriginPrivate : public QSharedData { public: QWebSecurityOriginPrivate(WebCore::SecurityOrigin* o) { diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp index 02ef4a098..fb94d55b1 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp @@ -42,10 +42,9 @@ #include #include -class QWebSettingsPrivate -{ +class QWebSettingsPrivate { public: - QWebSettingsPrivate(WebCore::Settings *wcSettings = 0) + QWebSettingsPrivate(WebCore::Settings* wcSettings = 0) : settings(wcSettings) { } @@ -60,7 +59,7 @@ public: qint64 offlineStorageDefaultQuota; void apply(); - WebCore::Settings *settings; + WebCore::Settings* settings; }; typedef QHash WebGraphicHash; @@ -80,14 +79,14 @@ static WebGraphicHash* graphics() return hash; } -Q_GLOBAL_STATIC(QList, allSettings); +Q_GLOBAL_STATIC(QList, allSettings); void QWebSettingsPrivate::apply() { if (settings) { settings->setTextAreasAreResizable(true); - QWebSettingsPrivate *global = QWebSettings::globalSettings()->d; + QWebSettingsPrivate* global = QWebSettings::globalSettings()->d; QString family = fontFamilies.value(QWebSettings::StandardFont, global->fontFamilies.value(QWebSettings::StandardFont)); @@ -194,7 +193,7 @@ void QWebSettingsPrivate::apply() global->attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls)); settings->setAllowUniversalAccessFromFileURLs(value); } else { - QList settings = *::allSettings(); + QList settings = *::allSettings(); for (int i = 0; i < settings.count(); ++i) settings[i]->apply(); } @@ -206,9 +205,9 @@ void QWebSettingsPrivate::apply() Any setting changed on the default object is automatically applied to all QWebPage instances where the particular setting is not overriden already. */ -QWebSettings *QWebSettings::globalSettings() +QWebSettings* QWebSettings::globalSettings() { - static QWebSettings *global = 0; + static QWebSettings* global = 0; if (!global) global = new QWebSettings; return global; @@ -365,7 +364,7 @@ QWebSettings::QWebSettings() /*! \internal */ -QWebSettings::QWebSettings(WebCore::Settings *settings) +QWebSettings::QWebSettings(WebCore::Settings* settings) : d(new QWebSettingsPrivate(settings)) { d->settings = settings; @@ -400,7 +399,7 @@ int QWebSettings::fontSize(FontSize type) const { int defaultValue = 0; if (d->settings) { - QWebSettingsPrivate *global = QWebSettings::globalSettings()->d; + QWebSettingsPrivate* global = QWebSettings::globalSettings()->d; defaultValue = global->fontSizes.value(type); } return d->fontSizes.value(type, defaultValue); @@ -427,7 +426,7 @@ void QWebSettings::resetFontSize(FontSize type) \sa userStyleSheetUrl() */ -void QWebSettings::setUserStyleSheetUrl(const QUrl &location) +void QWebSettings::setUserStyleSheetUrl(const QUrl& location) { d->userStyleSheetLocation = location; d->apply(); @@ -453,7 +452,7 @@ QUrl QWebSettings::userStyleSheetUrl() const \sa defaultTextEncoding() */ -void QWebSettings::setDefaultTextEncoding(const QString &encoding) +void QWebSettings::setDefaultTextEncoding(const QString& encoding) { d->defaultTextEncoding = encoding; d->apply(); @@ -478,7 +477,7 @@ QString QWebSettings::defaultTextEncoding() const Setting an empty path disables the icon database. */ -void QWebSettings::setIconDatabasePath(const QString &path) +void QWebSettings::setIconDatabasePath(const QString& path) { WebCore::iconDatabase()->delayDatabaseCleanup(); @@ -501,11 +500,10 @@ void QWebSettings::setIconDatabasePath(const QString &path) */ QString QWebSettings::iconDatabasePath() { - if (WebCore::iconDatabase()->isEnabled() && WebCore::iconDatabase()->isOpen()) { + if (WebCore::iconDatabase()->isEnabled() && WebCore::iconDatabase()->isOpen()) return WebCore::iconDatabase()->databasePath(); - } else { + else return QString(); - } } /*! @@ -527,18 +525,18 @@ void QWebSettings::clearIconDatabase() \sa setIconDatabasePath() */ -QIcon QWebSettings::iconForUrl(const QUrl &url) +QIcon QWebSettings::iconForUrl(const QUrl& url) { WebCore::Image* image = WebCore::iconDatabase()->iconForPageURL(WebCore::KURL(url).string(), WebCore::IntSize(16, 16)); - if (!image) { + if (!image) return QPixmap(); - } - QPixmap *icon = image->nativeImageForCurrentFrame(); - if (!icon) { + + QPixmap* icon = image->nativeImageForCurrentFrame(); + if (!icon) return QPixmap(); - } - return *icon; + + return* icon; } /*! @@ -550,9 +548,9 @@ QIcon QWebSettings::iconForUrl(const QUrl &url) \sa webGraphic() */ -void QWebSettings::setWebGraphic(WebGraphic type, const QPixmap &graphic) +void QWebSettings::setWebGraphic(WebGraphic type, const QPixmap& graphic) { - WebGraphicHash *h = graphics(); + WebGraphicHash* h = graphics(); if (graphic.isNull()) h->remove(type); else @@ -641,7 +639,7 @@ int QWebSettings::maximumPagesInCache() */ void QWebSettings::setObjectCacheCapacities(int cacheMinDeadCapacity, int cacheMaxDead, int totalCapacity) { - bool disableCache = cacheMinDeadCapacity == 0 && cacheMaxDead == 0 && totalCapacity == 0; + bool disableCache = !cacheMinDeadCapacity && !cacheMaxDead && !totalCapacity; WebCore::cache()->setDisabled(disableCache); WebCore::cache()->setCapacities(qMax(0, cacheMinDeadCapacity), @@ -653,7 +651,7 @@ void QWebSettings::setObjectCacheCapacities(int cacheMinDeadCapacity, int cacheM Sets the actual font family to \a family for the specified generic family, \a which. */ -void QWebSettings::setFontFamily(FontFamily which, const QString &family) +void QWebSettings::setFontFamily(FontFamily which, const QString& family) { d->fontFamilies.insert(which, family); d->apply(); @@ -667,7 +665,7 @@ QString QWebSettings::fontFamily(FontFamily which) const { QString defaultValue; if (d->settings) { - QWebSettingsPrivate *global = QWebSettings::globalSettings()->d; + QWebSettingsPrivate* global = QWebSettings::globalSettings()->d; defaultValue = global->fontFamilies.value(which); } return d->fontFamilies.value(which, defaultValue); @@ -708,7 +706,7 @@ bool QWebSettings::testAttribute(WebAttribute attr) const { bool defaultValue = false; if (d->settings) { - QWebSettingsPrivate *global = QWebSettings::globalSettings()->d; + QWebSettingsPrivate* global = QWebSettings::globalSettings()->d; defaultValue = global->attributes.value(attr); } return d->attributes.value(attr, defaultValue); @@ -789,7 +787,7 @@ qint64 QWebSettings::offlineStorageDefaultQuota() /* \internal \relates QWebSettings - + Sets the path for HTML5 offline web application cache storage to \a path. \a path must point to an existing directory where the cache is stored. @@ -808,7 +806,7 @@ void QWEBKIT_EXPORT qt_websettings_setOfflineWebApplicationCachePath(const QStri /* \internal \relates QWebSettings - + Returns the path of the HTML5 offline web application cache storage or an empty string if the feature is disabled. @@ -837,7 +835,7 @@ QString QWEBKIT_EXPORT qt_websettings_offlineWebApplicationCachePath() */ void QWEBKIT_EXPORT qt_websettings_setLocalStorageDatabasePath(QWebSettings* settings, const QString& path) { - QWebSettingsPrivate *d = settings->handle(); + QWebSettingsPrivate* d = settings->handle(); d->localStorageDatabasePath = path; d->apply(); } diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h index 7cbca2558..63144cb40 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h @@ -27,8 +27,7 @@ #include #include -namespace WebCore -{ +namespace WebCore { class Settings; } @@ -38,8 +37,7 @@ QT_BEGIN_NAMESPACE class QUrl; QT_END_NAMESPACE -class QWEBKIT_EXPORT QWebSettings -{ +class QWEBKIT_EXPORT QWebSettings { public: enum FontFamily { StandardFont, diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp index 6c5860cfe..35d873ae7 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp @@ -30,8 +30,7 @@ #include "qdir.h" #include "qfile.h" -class QWebViewPrivate -{ +class QWebViewPrivate { public: QWebViewPrivate(QWebView *view) : view(view) @@ -147,7 +146,7 @@ public: if you do not require QWidget attributes. Nevertheless, QtWebKit depends on QtGui, so you should use a QApplication instead of QCoreApplication. - \sa {Previewer Example}, {Browser} + \sa {Previewer Example}, {Browser}, {Form Extractor}, {Google Chat}, {Fancy Browser} */ /*! @@ -206,16 +205,15 @@ QWebPage *QWebView::page() const \sa page() */ -void QWebView::setPage(QWebPage *page) +void QWebView::setPage(QWebPage* page) { if (d->page == page) return; if (d->page) { - if (d->page->parent() == this) { + if (d->page->parent() == this) delete d->page; - } else { + else d->page->disconnect(this); - } } d->page = page; if (d->page) { @@ -710,9 +708,8 @@ bool QWebView::event(QEvent *e) } #endif #endif - } else if (e->type() == QEvent::Leave) { + } else if (e->type() == QEvent::Leave) d->page->event(e); - } } return QWidget::event(e); @@ -815,7 +812,7 @@ void QWebView::paintEvent(QPaintEvent *ev) #ifdef QWEBKIT_TIME_RENDERING int elapsed = time.elapsed(); - qDebug()<<"paint event on "<region()<<", took to render = "<region() << ", took to render = " << elapsed; #endif } @@ -1011,9 +1008,8 @@ void QWebView::inputMethodEvent(QInputMethodEvent *e) */ void QWebView::changeEvent(QEvent *e) { - if (d->page && e->type() == QEvent::PaletteChange) { + if (d->page && e->type() == QEvent::PaletteChange) d->page->setPalette(palette()); - } QWidget::changeEvent(e); } diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h index 0dab92546..e8861444d 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h @@ -40,8 +40,7 @@ class QWebPage; class QWebViewPrivate; class QWebNetworkRequest; -class QWEBKIT_EXPORT QWebView : public QWidget -{ +class QWEBKIT_EXPORT QWebView : public QWidget { Q_OBJECT Q_PROPERTY(QString title READ title) Q_PROPERTY(QUrl url READ url WRITE setUrl) @@ -54,27 +53,27 @@ class QWEBKIT_EXPORT QWebView : public QWidget Q_PROPERTY(QPainter::RenderHints renderHints READ renderHints WRITE setRenderHints) Q_FLAGS(QPainter::RenderHints) public: - explicit QWebView(QWidget *parent = 0); + explicit QWebView(QWidget* parent = 0); virtual ~QWebView(); - QWebPage *page() const; - void setPage(QWebPage *page); + QWebPage* page() const; + void setPage(QWebPage* page); - static QUrl guessUrlFromString(const QString &string); + static QUrl guessUrlFromString(const QString& string); - void load(const QUrl &url); + void load(const QUrl& url); #if QT_VERSION < 0x040400 && !defined(qdoc) - void load(const QWebNetworkRequest &request); + void load(const QWebNetworkRequest& request); #else - void load(const QNetworkRequest &request, + void load(const QNetworkRequest& request, QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation, const QByteArray &body = QByteArray()); #endif - void setHtml(const QString &html, const QUrl &baseUrl = QUrl()); - void setContent(const QByteArray &data, const QString &mimeType = QString(), const QUrl &baseUrl = QUrl()); + void setHtml(const QString& html, const QUrl& baseUrl = QUrl()); + void setContent(const QByteArray& data, const QString& mimeType = QString(), const QUrl& baseUrl = QUrl()); - QWebHistory *history() const; - QWebSettings *settings() const; + QWebHistory* history() const; + QWebSettings* settings() const; QString title() const; void setUrl(const QUrl &url); @@ -83,7 +82,7 @@ public: QString selectedText() const; - QAction *pageAction(QWebPage::WebAction action) const; + QAction* pageAction(QWebPage::WebAction action) const; void triggerPageAction(QWebPage::WebAction action, bool checked = false); bool isModified() const; @@ -108,9 +107,9 @@ public: void setRenderHints(QPainter::RenderHints hints); void setRenderHint(QPainter::RenderHint hint, bool enabled = true); - bool findText(const QString &subString, QWebPage::FindFlags options = 0); + bool findText(const QString& subString, QWebPage::FindFlags options = 0); - virtual bool event(QEvent *); + virtual bool event(QEvent*); public Q_SLOTS: void stop(); @@ -118,7 +117,7 @@ public Q_SLOTS: void forward(); void reload(); - void print(QPrinter *printer) const; + void print(QPrinter*) const; Q_SIGNALS: void loadStarted(); @@ -126,14 +125,14 @@ Q_SIGNALS: void loadFinished(bool); void titleChanged(const QString& title); void statusBarMessage(const QString& text); - void linkClicked(const QUrl &url); + void linkClicked(const QUrl&); void selectionChanged(); void iconChanged(); - void urlChanged(const QUrl &url); + void urlChanged(const QUrl&); protected: - void resizeEvent(QResizeEvent *e); - void paintEvent(QPaintEvent *ev); + void resizeEvent(QResizeEvent*); + void paintEvent(QPaintEvent*); virtual QWebView *createWindow(QWebPage::WebWindowType type); @@ -150,10 +149,10 @@ protected: #endif virtual void keyPressEvent(QKeyEvent*); virtual void keyReleaseEvent(QKeyEvent*); - virtual void dragEnterEvent(QDragEnterEvent *); - virtual void dragLeaveEvent(QDragLeaveEvent *); - virtual void dragMoveEvent(QDragMoveEvent *); - virtual void dropEvent(QDropEvent *); + virtual void dragEnterEvent(QDragEnterEvent*); + virtual void dragLeaveEvent(QDragLeaveEvent*); + virtual void dragMoveEvent(QDragMoveEvent*); + virtual void dropEvent(QDropEvent*); virtual void focusInEvent(QFocusEvent*); virtual void focusOutEvent(QFocusEvent*); virtual void inputMethodEvent(QInputMethodEvent*); @@ -162,7 +161,7 @@ protected: private: friend class QWebPage; - QWebViewPrivate *d; + QWebViewPrivate* d; }; #endif // QWEBVIEW_H diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index 02aab770a..83808d24b 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,522 @@ +2009-07-28 Simon Hausmann + + Rubber-stamped by Ariya Hidayat. + + Fix compilation with the precompiled header. + + * WebKit_pch.h: Don't include JSDOMBinding.h and MathObject.h, + as they include AtomicString.h. AtomicString.cpp needs to enable + a #define before including AtomicString.h, which breaks if the PCH + forces the inclusion beforehand. + +2009-07-28 Ariya Hidayat + + Reviewed by Simon Hausmann. + + Added tests to ensure that scroll position can be changed + programmatically, even when the scroll bar policy is set to off. + + * tests/qwebframe/tst_qwebframe.cpp: + +2009-07-28 Tor Arne Vestbø + + Reviewed by Simon Hausmann. + + Fix a few compilation warnings in the QWebFrame tests. + + * tests/qwebframe/tst_qwebframe.cpp: + +2009-07-28 Andre Pedralho + + Reviewed by Simon Hausmann. + + Fixed tst_QWebFrame::hasSetFocus test which was using + an undefined resource. + https://bugs.webkit.org/show_bug.cgi?id=27512 + + * tests/qwebframe/tst_qwebframe.cpp: + +2009-07-28 Simon Hausmann + + Reviewed by Ariya Hidayat. + + Make it possible to pass relative file names to QtLauncher. + + * QtLauncher/main.cpp: + (MainWindow::MainWindow): + +2009-07-27 Alexey Proskuryakov + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=27735 + Give a helpful name to JSLock constructor argument + + * Api/qwebframe.cpp: + (QWebFrame::addToJavaScriptWindowObject): + +2009-07-27 Volker Hilsheimer + + Reviewed by Simon Hausmann. + + QWebView's "enabled" parameter should default to true, as with QGraphicsView and + QPainter. + + * Api/qwebview.cpp: Add reference to QPainter::renderHints(). + * Api/qwebview.h: Add default for enabled argument. + +2009-07-26 Kavindra Palaraja + + Reviewed by Simon Hausmann. + + More documentation cleanups in the QWebElement class overview. + + * Api/qwebelement.cpp: + +2009-07-26 Kavindra Palaraja + + Reviewed by Simon Hausmann. + + Clean up documentation of QWebElement's findFirst and findAll functions, + as well as their QWebFrame counterparts. + + * Api/qwebelement.cpp: + * Api/qwebframe.cpp: + +2009-07-26 Kavindra Palaraja + + Reviewed by Simon Hausmann. + + Various documentation cleanups + + * Fixed qdoc warnings + * Hide QWebNetworkInterface from the class overview + * Mention QWebElement in the module overview + * More cleanups + + * Api/qwebframe.cpp: + * Api/qwebnetworkinterface.cpp: + * Api/qwebview.cpp: + * docs/qtwebkit.qdoc: + +2009-07-26 Kavindra Palaraja + + Reviewed by Simon Hausmann. + + Added missing class diagram referenced from the docs, taken from the Qt + documentation. + + * docs/qtwebkit.qdocconf: Register the image directory with + qdoc. + * docs/qwebview-diagram.png: Added. + +2009-07-24 Antonio Gomes + + Reviewed by Adam Treat. + + As per discussion on IRC, changed originalUrl by requestedUrl. + + * Api/qwebframe.cpp: + (QWebFrame::requestedUrl): + * Api/qwebframe.h: + * tests/qwebframe/tst_qwebframe.cpp: + +2009-07-24 Andre Pedralho + + Reviewed by Adam Treat. + + Removed void QWebFrame::renderContents(...) and added the Q_PROPERTY + clipRenderToViewport to control whether QWebFrame::render would call + FrameView::paintContents rather than FrameView::paint and do not clip + the frame content to viewport. + + + * Api/qwebframe.cpp: + (QWebFramePrivate::renderPrivate): + (QWebFrame::clipRenderToViewport): + (QWebFrame::setClipRenderToViewport): + * Api/qwebframe.h: + * Api/qwebframe_p.h: + (QWebFramePrivate::QWebFramePrivate): + * tests/qwebframe/tst_qwebframe.cpp: + +2009-07-24 Antonio Gomes + + Reviewed by Simon Hausmann. + + [QT] Implement originalUrl getter method to the API + https://bugs.webkit.org/show_bug.cgi?id=25867 + + * Api/qwebframe.cpp: + (QWebFrame::originalUrl): + * Api/qwebframe.h: + * tests/qwebframe/qwebframe.qrc: + * tests/qwebframe/test1.html: Added. + * tests/qwebframe/test2.html: Added. + * tests/qwebframe/tst_qwebframe.cpp: + +2009-07-24 Kenneth Rohde Christiansen + + Build fix for Qt. + + Fix build issue introduced in 46344 + ([Bug 22700] ApplicationCache should have size limit) + + Remove method only added to the Qt ChromeClient. + + * WebCoreSupport/ChromeClientQt.h: + +2009-07-24 Andrei Popescu + + Reviewed by Anders Carlsson. + + ApplicationCache should have size limit + https://bugs.webkit.org/show_bug.cgi?id=22700 + + * WebCoreSupport/ChromeClientQt.cpp: + (WebCore::ChromeClientQt::reachedMaxAppCacheSize): + Adds empty implementation of the reachedMaxAppCacheSize callback. + * WebCoreSupport/ChromeClientQt.h: + +2009-07-23 Laszlo Gombos + + Reviewed by Simon Hausmann. + + [Qt] Add simple proxy support for QtLauncher + https://bugs.webkit.org/show_bug.cgi?id=27495 + + Picks up proxy settings from the http_proxy environment + variable. + + * QtLauncher/QtLauncher.pro: Add QtNetwork dependency for all + platforms. + * QtLauncher/main.cpp: + (MainWindow::MainWindow): + +2009-07-23 Simon Hausmann + + Reviewed by Holger Freyther. + + Added a testcase to verify that cached methods in the QOBject bindings + remain alife even after garbage collection. + + * tests/qwebpage/tst_qwebpage.cpp: + (tst_QWebPage::protectBindingsRuntimeObjectsFromCollector): + +2009-07-23 Zoltan Herczeg + + Reviewed by Simon Hausmann. + + Fixing two issues related to QtLauncher + - MainWindow objects are not always freed after close + - JavaScript window.close() sometimes crashes + https://bugs.webkit.org/show_bug.cgi?id=27601 + + * QtLauncher/main.cpp: + (MainWindow::MainWindow): + (main): + +2009-07-21 Volker Hilsheimer + + Reviewed by Simon Hausmann. + + Various improvements to the API documentation. + + * Updated link to W3c Database spec + * Formatting fixes, cleanups + * Add missing \since 4.6 tags to QWebPage::frameAt + * Extend QWebDatabase and QWebSecurityOrigin docs. + + * Api/qwebdatabase.cpp: + * Api/qwebpage.cpp: + * Api/qwebsecurityorigin.cpp: + * Api/qwebview.cpp: + +2009-07-21 Tor Arne Vestbø + + Rubber-stamped by Simon Hausmann. + + Remove preliminary-tag from QWebElement + + * Api/qwebelement.cpp: + +2009-07-20 Kenneth Rohde Christiansen + + Reviewed by Eric Seidel. + + Fix Qt code to follow the WebKit Coding Style. + + * Api/qcookiejar.cpp: + (QCookieJar::setCookieJar): + (QCookieJar::cookieJar): + * Api/qcookiejar.h: + * Api/qwebdatabase.cpp: + (QWebDatabase::QWebDatabase): + (QWebDatabase::removeDatabase): + * Api/qwebdatabase.h: + * Api/qwebdatabase_p.h: + * Api/qwebelement.h: + * Api/qwebframe.cpp: + (QWebFrame::title): + (QWebFrame::print): + * Api/qwebframe.h: + * Api/qwebframe_p.h: + * Api/qwebhistory.cpp: + (QWebHistory::clear): + * Api/qwebhistory.h: + * Api/qwebhistory_p.h: + * Api/qwebhistoryinterface.cpp: + (gCleanupInterface): + (QWebHistoryInterface::setDefaultInterface): + (QWebHistoryInterface::defaultInterface): + (QWebHistoryInterface::QWebHistoryInterface): + * Api/qwebhistoryinterface.h: + * Api/qwebnetworkinterface.cpp: + (QWebNetworkManager::started): + (QWebNetworkManager::finished): + (QWebNetworkInterfacePrivate::parseDataUrl): + (QWebNetworkInterface::addJob): + (WebCoreHttp::onResponseHeaderReceived): + (WebCoreHttp::onReadyRead): + * Api/qwebnetworkinterface.h: + * Api/qwebnetworkinterface_p.h: + * Api/qwebpage.cpp: + (QWebPagePrivate::editorCommandForWebActions): + (QWebPagePrivate::createContextMenu): + (QWebPagePrivate::focusInEvent): + (QWebPage::fixedContentsSize): + (QWebPage::setContentEditable): + (QWebPage::swallowContextMenuEvent): + (QWebPage::findText): + * Api/qwebpage.h: + * Api/qwebpage_p.h: + * Api/qwebpluginfactory.h: + * Api/qwebsecurityorigin.h: + * Api/qwebsecurityorigin_p.h: + * Api/qwebsettings.cpp: + (QWebSettingsPrivate::QWebSettingsPrivate): + (QWebSettingsPrivate::apply): + (QWebSettings::globalSettings): + (QWebSettings::QWebSettings): + (QWebSettings::fontSize): + (QWebSettings::setUserStyleSheetUrl): + (QWebSettings::setDefaultTextEncoding): + (QWebSettings::setIconDatabasePath): + (QWebSettings::iconDatabasePath): + (QWebSettings::iconForUrl): + (QWebSettings::setWebGraphic): + (QWebSettings::setFontFamily): + (QWebSettings::fontFamily): + (QWebSettings::testAttribute): + (qt_websettings_setLocalStorageDatabasePath): + * Api/qwebsettings.h: + * Api/qwebview.cpp: + (QWebView::setPage): + (QWebView::event): + * Api/qwebview.h: + +2009-07-20 Holger Hans Peter Freyther + + Reviewed by Simon Hausmann. + + [Qt] Add test for loading webpages... + + Performance test for loading webpages. Wait for the loadFinished + signal to be fired. This should include a non empty layout. + + * tests/benchmarks/loading/tst_loading.cpp: Added. + (waitForSignal): + (tst_Loading::init): + (tst_Loading::cleanup): + (tst_Loading::load_data): + (tst_Loading::load): + * tests/benchmarks/loading/tst_loading.pro: Added. + * tests/tests.pro: + +2009-07-20 Holger Hans Peter Freyther + + Reviewed by Simon Hausmann. + + [Qt] Add a test case for drawing a simple viewrect to a QPixmap + + * tests/benchmarks/painting/tst_painting.cpp: Added. + (waitForSignal): + (tst_Painting::init): + (tst_Painting::cleanup): + (tst_Painting::paint_data): + (tst_Painting::paint): + * tests/benchmarks/painting/tst_painting.pro: Added. + * tests/tests.pro: + +2009-07-20 Laszlo Gombos + + Reviewed by Holger Freyther. + + [Qt] Add an option for QtLauncher to build without QtUiTools dependency + https://bugs.webkit.org/show_bug.cgi?id=27438 + + Based on Norbert Leser's work. + + * QtLauncher/main.cpp: + (WebPage::createPlugin): + +2009-07-17 Kenneth Rohde Christiansen + + Reviewed by Adam Treat. + + Coding style fixes. + + * Api/qcookiejar.cpp: + (QCookieJarPrivate::QCookieJarPrivate): + (qHash): + (QCookieJar::cookieJar): + * Api/qwebelement.cpp: + (QWebElement::functions): + (QWebElement::scriptableProperties): + * Api/qwebframe.cpp: + (QWebFrame::metaData): + (QWebFrame::scrollBarValue): + (QWebFrame::scroll): + (QWebFrame::scrollPosition): + (QWebFrame::print): + * Api/qwebnetworkinterface.cpp: + (decodePercentEncoding): + (QWebNetworkRequestPrivate::init): + (QWebNetworkRequestPrivate::setURL): + (QWebNetworkRequest::QWebNetworkRequest): + (QWebNetworkRequest::operator=): + (QWebNetworkRequest::setUrl): + (QWebNetworkRequest::setHttpHeader): + (QWebNetworkRequest::httpHeaderField): + (QWebNetworkRequest::setHttpHeaderField): + (QWebNetworkRequest::setPostData): + (QWebNetworkJob::setResponse): + (QWebNetworkJob::frame): + (QWebNetworkManager::add): + (QWebNetworkManager::cancel): + (QWebNetworkManager::started): + (QWebNetworkManager::data): + (QWebNetworkManager::finished): + (QWebNetworkManager::addHttpJob): + (QWebNetworkManager::cancelHttpJob): + (QWebNetworkManager::httpConnectionClosed): + (QWebNetworkInterfacePrivate::sendFileData): + (QWebNetworkInterfacePrivate::parseDataUrl): + (QWebNetworkManager::doWork): + (QWebNetworkInterface::setDefaultInterface): + (QWebNetworkInterface::defaultInterface): + (QWebNetworkInterface::QWebNetworkInterface): + (QWebNetworkInterface::addJob): + (QWebNetworkInterface::cancelJob): + (WebCoreHttp::WebCoreHttp): + (WebCoreHttp::request): + (WebCoreHttp::scheduleNextRequest): + (WebCoreHttp::getConnection): + (WebCoreHttp::onResponseHeaderReceived): + (WebCoreHttp::onReadyRead): + (WebCoreHttp::onRequestFinished): + (WebCoreHttp::onAuthenticationRequired): + (WebCoreHttp::onProxyAuthenticationRequired): + * Api/qwebpage.cpp: + (QWebPagePrivate::QWebPagePrivate): + (QWebPagePrivate::mouseReleaseEvent): + (QWebPagePrivate::inputMethodEvent): + (QWebPagePrivate::shortcutOverrideEvent): + (QWebPage::inputMethodQuery): + (QWebPage::javaScriptPrompt): + (QWebPage::updatePositionDependentActions): + (QWebPage::userAgentForUrl): + (QWebPagePrivate::_q_onLoadProgressChanged): + (QWebPage::totalBytes): + (QWebPage::bytesReceived): + * Api/qwebsettings.cpp: + (QWebSettings::iconForUrl): + (QWebSettings::setObjectCacheCapacities): + * Api/qwebview.cpp: + (QWebView::paintEvent): + (QWebView::changeEvent): + +2009-07-17 Kenneth Rohde Christiansen + + Reviewed by Simon Hausmann. + + Overwrite the plugin directories for the DRT. + Part of https://bugs.webkit.org/show_bug.cgi?id=27215 + + * Api/qwebpage.cpp: + (qt_drt_overwritePluginDirectories): Only set the plugin directories + to the ones in the QTWEBKIT_PLUGIN_PATH environment variable. + +2009-07-16 Xiaomei Ji + + Reviewed by Dan Bernstein. + + This is the 2nd part of fixing "RTL: tooltip does not get its directionlity from its element's." + https://bugs.webkit.org/show_bug.cgi?id=24187 + + Add one extra parameter to the callee of HitTestResult::title() due to the signature change. + + * Api/qwebframe.cpp: + (QWebHitTestResultPrivate::QWebHitTestResultPrivate): Add direction as a parameter to the callee of HitTestResult::title(). + * WebCoreSupport/ChromeClientQt.cpp: + (WebCore::ChromeClientQt::mouseDidMoveOverElement): Add direction as a parameter to the callee of HitTestResult::title(). + +2009-07-16 Benjamin C Meyer + + Reviewed by Adam Treat. + + Add new action to qwebpage to reload without cache. + + * Api/qwebpage.cpp: + (QWebPagePrivate::updateAction): + (QWebPagePrivate::updateNavigationActions): + (QWebPage::triggerAction): + * Api/qwebpage.h: + +2009-07-16 Xiaomei Ji + + Reviewed by Darin Adler. + + Fix tooltip does not get its directionality from its element's directionality. + https://bugs.webkit.org/show_bug.cgi?id=24187 + + Per mitz's suggestion in comment #6, while getting the plain-text + title, we also get the directionality of the title. How to handle + the directionality is up to clients. Clients could ignore it, + or use attribute or unicode control characters to display the title + as what they want. + + + * WebCoreSupport/ChromeClientQt.cpp: + (WebCore::ChromeClientQt::setToolTip): Add directionality as 2nd parameter to setToopTip() (without handling it yet). + * WebCoreSupport/ChromeClientQt.h: Add directionality as 2nd parameter to setToolTip(). + +2009-07-15 Yael Aharon + + Reviewed by Simon Hausmann. + + https://bugs.webkit.org/show_bug.cgi?id=27285 + + When the user clicks a link with a target attribute, the newly created window should be visible. + Make new windows created in Qtlauncher visible. + + * QtLauncher/main.cpp: + (WebPage::createWindow): + +2009-07-14 Adam Treat + + Reviewed by Zack Rusin. + + https://bugs.webkit.org/show_bug.cgi?id=26983 + + The default constructed values for QSize and WebCore::IntSize are different. The former + produces an invalid size whereas the latter produces a size of zero. This was causing + a layout to be triggered when constructing a view and an assert to be hit. This patch fixes + the crash by taking care not to cause an unnecessary layout triggered by ScrollView::setFixedLayoutSize. + + * WebCoreSupport/FrameLoaderClientQt.cpp: + (WebCore::FrameLoaderClientQt::transitionToCommittedForNewPage): + 2009-07-13 Simon Hausmann Reviewed by Ariya Hidayat. diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp index c169a9f67..d65983388 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp @@ -353,18 +353,19 @@ void ChromeClientQt::contentsSizeChanged(Frame* frame, const IntSize& size) cons void ChromeClientQt::mouseDidMoveOverElement(const HitTestResult& result, unsigned modifierFlags) { + TextDirection dir; if (result.absoluteLinkURL() != lastHoverURL - || result.title() != lastHoverTitle + || result.title(dir) != lastHoverTitle || result.textContent() != lastHoverContent) { lastHoverURL = result.absoluteLinkURL(); - lastHoverTitle = result.title(); + lastHoverTitle = result.title(dir); lastHoverContent = result.textContent(); emit m_webPage->linkHovered(lastHoverURL.prettyURL(), lastHoverTitle, lastHoverContent); } } -void ChromeClientQt::setToolTip(const String &tip) +void ChromeClientQt::setToolTip(const String &tip, TextDirection) { #ifndef QT_NO_TOOLTIP QWidget* view = m_webPage->view(); @@ -400,6 +401,14 @@ void ChromeClientQt::exceededDatabaseQuota(Frame* frame, const String& databaseN } #endif +#if ENABLE(OFFLINE_WEB_APPLICATIONS) +void ChromeClientQt::reachedMaxAppCacheSize(int64_t spaceNeeded) +{ + // FIXME: Free some space. + notImplemented(); +} +#endif + void ChromeClientQt::runOpenPanel(Frame* frame, PassRefPtr prpFileChooser) { RefPtr fileChooser = prpFileChooser; diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.h index 67663fbd8..96c7faba9 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.h +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.h @@ -110,11 +110,14 @@ namespace WebCore { virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags); - virtual void setToolTip(const String&); + virtual void setToolTip(const String&, TextDirection); virtual void print(Frame*); #if ENABLE(DATABASE) virtual void exceededDatabaseQuota(Frame*, const String&); +#endif +#if ENABLE(OFFLINE_WEB_APPLICATIONS) + virtual void reachedMaxAppCacheSize(int64_t spaceNeeded); #endif virtual void runOpenPanel(Frame*, PassRefPtr); diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp index 8e6ffed80..5cf86b12c 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp @@ -214,7 +214,7 @@ void FrameLoaderClientQt::transitionToCommittedForNewPage() m_frame->createView(m_webFrame->page()->viewportSize(), backgroundColor, !backgroundColor.alpha(), - fixedLayoutSize, + fixedLayoutSize.isValid() ? IntSize(fixedLayoutSize) : IntSize(), fixedLayoutSize.isValid(), (ScrollbarMode)m_webFrame->scrollBarPolicy(Qt::Horizontal), (ScrollbarMode)m_webFrame->scrollBarPolicy(Qt::Vertical)); diff --git a/src/3rdparty/webkit/WebKit/qt/WebKit_pch.h b/src/3rdparty/webkit/WebKit/qt/WebKit_pch.h index ae8ec889a..1dd4d52f1 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebKit_pch.h +++ b/src/3rdparty/webkit/WebKit/qt/WebKit_pch.h @@ -77,7 +77,4 @@ #include #include #include - -#include "../../WebCore/bindings/js/JSDOMBinding.h" -#include "../../JavaScriptCore/runtime/MathObject.h" #endif diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc index 3def65cbc..f3681ee62 100644 --- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc +++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc @@ -57,16 +57,13 @@ \section1 Configuring the Build Process - Applications that use QtWebKit's classes need to be configured to be built + Applications using QtWebKit's classes need to be configured to be built against the QtWebKit module. The following declaration in a \c qmake project file ensures that an application is compiled and linked appropriately: \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 0 - This line is necessary because only the QtCore and QtGui modules are used - in the default build process. - To include the definitions of the module's classes, use the following directive: @@ -80,17 +77,24 @@ \snippet webkitsnippets/simple/main.cpp Using QWebView - QWebView acts as a view onto Web pages, each of which is represented by an - instance of the QWebPage class. QWebPage provides access to the document - structure in a page, describing features such as frames, the navigation - history, and the undo/redo stack for editable content. + QWebView is used to view Web pages. An instance of QWebView has one + QWebPage. QWebPage provides access to the document structure in a page, + describing features such as frames, the navigation history, and the + undo/redo stack for editable content. HTML documents can be nested using frames in a frameset. An individual - frame in HTML is represented using the QWebFrame class. It includes the + frame in HTML is represented using the QWebFrame class. This class includes the bridge to the JavaScript window object and can be painted using QPainter. - Each QWebPage has one QWebFrame object as its main frame. + Each QWebPage has one QWebFrame object as its main frame, and the main frame + may contain many child frames. + + Individual elements of an HTML document can be accessed via DOM JavaScript + interfaces from within a web page. The equivalent of this API in QtWebKit + is represented by QWebElement. QWebElement objects are obtained using QWebFrame's + \l{QWebFrame::}{findAllElements()} and \l{QWebFrame::}{findFirstElement()} + functions with CSS selector queries. - Individual browser features, defaults and other settings can be configured + Common web browser features, defaults and other settings can be configured through the QWebSettings class. It is possible to provide defaults for all QWebPage instances through the default settings. Individual attributes can be overidden by the page specific settings object. @@ -100,7 +104,7 @@ Since WebKit supports the Netscape Plugin API, Qt applications can display Web pages that embed common plugins, as long as the user has the appropriate binary files for those plugins installed and the \l{QWebSettings::PluginsEnabled} - attribute is set for the application. + attribute is enabled for the application. The following locations are searched for plugins: diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf index 6343b1798..8ee8f6942 100644 --- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf +++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf @@ -9,6 +9,7 @@ outputdir = $OUTPUT_DIR/doc/html outputformats = HTML sources.fileextensions = "*.cpp *.doc *.qdoc *.h" exampledirs = $SRCDIR/WebKit/qt/docs +imagedirs = $SRCDIR/WebKit/qt/docs indexes = $QTDIR/doc/html/qt.index diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qwebview-diagram.png b/src/3rdparty/webkit/WebKit/qt/docs/qwebview-diagram.png new file mode 100644 index 000000000..ada865e2e Binary files /dev/null and b/src/3rdparty/webkit/WebKit/qt/docs/qwebview-diagram.png differ diff --git a/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp b/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp new file mode 100644 index 000000000..0bc87f7bf --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2009 Holger Hans Peter Freyther + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include + +#include +#include +#include + +/** + * Starts an event loop that runs until the given signal is received. + Optionally the event loop + * can return earlier on a timeout. + * + * \return \p true if the requested signal was received + * \p false on timeout + */ +static bool waitForSignal(QObject* obj, const char* signal, int timeout = 0) +{ + QEventLoop loop; + QObject::connect(obj, signal, &loop, SLOT(quit())); + QTimer timer; + QSignalSpy timeoutSpy(&timer, SIGNAL(timeout())); + if (timeout > 0) { + QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit())); + timer.setSingleShot(true); + timer.start(timeout); + } + loop.exec(); + return timeoutSpy.isEmpty(); +} + +class tst_Loading : public QObject +{ + Q_OBJECT + +public: + +public Q_SLOTS: + void init(); + void cleanup(); + +private Q_SLOTS: + void load_data(); + void load(); + +private: + QWebView* m_view; + QWebPage* m_page; +}; + +void tst_Loading::init() +{ + m_view = new QWebView; + m_page = m_view->page(); + + QSize viewportSize(1024, 768); + m_view->setFixedSize(viewportSize); + m_page->setViewportSize(viewportSize); +} + +void tst_Loading::cleanup() +{ + delete m_view; +} + +void tst_Loading::load_data() +{ + QTest::addColumn("url"); + QTest::newRow("amazon") << QUrl("http://www.amazon.com"); + QTest::newRow("kde") << QUrl("http://www.kde.org"); + QTest::newRow("apple") << QUrl("http://www.apple.com"); +} + +void tst_Loading::load() +{ + QFETCH(QUrl, url); + + + QBENCHMARK { + m_view->load(url); + + // really wait for loading, painting is in another test + ::waitForSignal(m_view, SIGNAL(loadFinished(bool))); + } +} + +QTEST_MAIN(tst_Loading) +#include "tst_loading.moc" diff --git a/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/loading/tst_loading.pro b/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/loading/tst_loading.pro new file mode 100644 index 000000000..af0387eb7 --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/loading/tst_loading.pro @@ -0,0 +1,6 @@ +TEMPLATE = app +TARGET = tst_loading +include(../../../../../WebKit.pri) +SOURCES += tst_loading.cpp +QT += testlib network +QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR diff --git a/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp b/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp new file mode 100644 index 000000000..f4531fdac --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2009 Holger Hans Peter Freyther + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include + +#include +#include +#include + +/** + * Starts an event loop that runs until the given signal is received. + Optionally the event loop + * can return earlier on a timeout. + * + * \return \p true if the requested signal was received + * \p false on timeout + */ +static bool waitForSignal(QObject* obj, const char* signal, int timeout = 0) +{ + QEventLoop loop; + QObject::connect(obj, signal, &loop, SLOT(quit())); + QTimer timer; + QSignalSpy timeoutSpy(&timer, SIGNAL(timeout())); + if (timeout > 0) { + QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit())); + timer.setSingleShot(true); + timer.start(timeout); + } + loop.exec(); + return timeoutSpy.isEmpty(); +} + +class tst_Painting : public QObject +{ + Q_OBJECT + +public: + +public Q_SLOTS: + void init(); + void cleanup(); + +private Q_SLOTS: + void paint_data(); + void paint(); + +private: + QWebView* m_view; + QWebPage* m_page; +}; + +void tst_Painting::init() +{ + m_view = new QWebView; + m_page = m_view->page(); + + QSize viewportSize(1024, 768); + m_view->setFixedSize(viewportSize); + m_page->setViewportSize(viewportSize); +} + +void tst_Painting::cleanup() +{ + delete m_view; +} + +void tst_Painting::paint_data() +{ + QTest::addColumn("url"); + QTest::newRow("amazon") << QUrl("http://www.amazon.com"); +} + +void tst_Painting::paint() +{ + QFETCH(QUrl, url); + + m_view->load(url); + ::waitForSignal(m_view, SIGNAL(loadFinished(bool))); + + /* force a layout */ + QWebFrame* mainFrame = m_page->mainFrame(); + mainFrame->toPlainText(); + + QPixmap pixmap(m_page->viewportSize()); + QBENCHMARK { + QPainter painter(&pixmap); + mainFrame->render(&painter, QRect(QPoint(0, 0), m_page->viewportSize())); + painter.end(); + } +} + +QTEST_MAIN(tst_Painting) +#include "tst_painting.moc" diff --git a/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/tst_painting.pro b/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/tst_painting.pro new file mode 100644 index 000000000..496210e0d --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/tst_painting.pro @@ -0,0 +1,6 @@ +TEMPLATE = app +TARGET = tst_painting +include(../../../../../WebKit.pri) +SOURCES += tst_painting.cpp +QT += testlib network +QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.qrc b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.qrc index 266cdce2d..9615e27f4 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.qrc +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.qrc @@ -2,5 +2,7 @@ image.png style.css +test1.html +test2.html diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/test1.html b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/test1.html new file mode 100644 index 000000000..b323f966e --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/test1.html @@ -0,0 +1 @@ +

Some text 1

diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/test2.html b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/test2.html new file mode 100644 index 000000000..63ac1f6ec --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/test2.html @@ -0,0 +1 @@ +

Some text 2

diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp index c0e72be20..a3bcd20ca 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp @@ -29,8 +29,10 @@ #include #include #include +#include #include #include +#include //TESTED_CLASS= //TESTED_FILES= @@ -573,6 +575,7 @@ private slots: void progressSignal(); void urlChange(); void domCycles(); + void requestedUrl(); void setHtml(); void setHtmlWithResource(); void ipv6HostEncoding(); @@ -585,6 +588,8 @@ private slots: void baseUrl_data(); void baseUrl(); void hasSetFocus(); + void render(); + void scrollPosition(); private: QString evalJS(const QString&s) { @@ -2159,6 +2164,93 @@ void tst_QWebFrame::domCycles() QVERIFY(v.type() == QVariant::Map); } +class FakeReply : public QNetworkReply { + Q_OBJECT + + public: + FakeReply(const QNetworkRequest& request, QObject* parent = 0) + : QNetworkReply(parent) + { + setOperation(QNetworkAccessManager::GetOperation); + setRequest(request); + if (request.url() == QUrl("qrc:/test1.html")) { + setHeader(QNetworkRequest::LocationHeader, QString("qrc:/test2.html")); + setAttribute(QNetworkRequest::RedirectionTargetAttribute, QUrl("qrc:/test2.html")); + } else + setError(QNetworkReply::HostNotFoundError, tr("Invalid URL")); + + open(QIODevice::ReadOnly); + QTimer::singleShot(0, this, SLOT(timeout())); + } + ~FakeReply() + { + close(); + } + virtual void abort() {} + virtual void close() {} + protected: + qint64 readData(char*, qint64) + { + return 0; + } + private slots: + void timeout() + { + if (request().url() == QUrl("qrc://test1.html")) + emit error(this->error()); + else if (request().url() == QUrl("http://abcdef.abcdef/")) + emit metaDataChanged(); + + emit readyRead(); + emit finished(); + } +}; + +class FakeNetworkManager : public QNetworkAccessManager { +public: + FakeNetworkManager(QObject* parent) : QNetworkAccessManager(parent) { } + +protected: + virtual QNetworkReply* createRequest(Operation op, const QNetworkRequest& request, QIODevice* outgoingData) + { + if (op == QNetworkAccessManager::GetOperation + && (request.url().toString() == "qrc:/test1.html" + || request.url().toString() == "http://abcdef.abcdef/")) + return new FakeReply(request, this); + + return QNetworkAccessManager::createRequest(op, request, outgoingData); + } +}; + +void tst_QWebFrame::requestedUrl() +{ + QWebPage page; + QWebFrame* frame = page.mainFrame(); + + // in few seconds, the image should be completely loaded + QSignalSpy spy(&page, SIGNAL(loadFinished(bool))); + FakeNetworkManager* networkManager = new FakeNetworkManager(&page); + page.setNetworkAccessManager(networkManager); + + frame->setUrl(QUrl("qrc:/test1.html")); + QTest::qWait(200); + QCOMPARE(spy.count(), 1); + QCOMPARE(frame->requestedUrl(), QUrl("qrc:/test1.html")); + QCOMPARE(frame->url(), QUrl("qrc:/test2.html")); + + frame->setUrl(QUrl("qrc:/non-existent.html")); + QTest::qWait(200); + QCOMPARE(spy.count(), 2); + QCOMPARE(frame->requestedUrl(), QUrl("qrc:/non-existent.html")); + QCOMPARE(frame->url(), QUrl("qrc:/non-existent.html")); + + frame->setUrl(QUrl("http://abcdef.abcdef")); + QTest::qWait(200); + QCOMPARE(spy.count(), 3); + QCOMPARE(frame->requestedUrl(), QUrl("http://abcdef.abcdef/")); + QCOMPARE(frame->url(), QUrl("http://abcdef.abcdef/")); +} + void tst_QWebFrame::setHtml() { QString html("

hello world

"); @@ -2453,16 +2545,29 @@ void tst_QWebFrame::baseUrl() void tst_QWebFrame::hasSetFocus() { + QString html("

top

" \ + "